diff --git a/proposal/myrmidon/src/java/org/apache/aut/vfs/FileType.java b/proposal/myrmidon/src/java/org/apache/aut/vfs/FileType.java index 79d7327ec..66d9ec8fd 100644 --- a/proposal/myrmidon/src/java/org/apache/aut/vfs/FileType.java +++ b/proposal/myrmidon/src/java/org/apache/aut/vfs/FileType.java @@ -20,6 +20,17 @@ public final class FileType private final static Resources REZ = ResourceManager.getPackageResources( FileType.class ); + /** + * A folder, which can contain other files, but does not have any data + * content. + */ + public final static FileType FOLDER = new FileType( REZ.getString( "folder.name" ) ); + + /** + * A regular file, which has data content, but cannot contain other files. + */ + public final static FileType FILE = new FileType( REZ.getString( "file.name" ) ); + private String m_name; private FileType( String name ) @@ -38,15 +49,4 @@ public final class FileType { return m_name; } - - /** - * A folder, which can contain other files, but does not have any data - * content. - */ - public static final FileType FOLDER = new FileType( REZ.getString( "folder.name" ) ); - - /** - * A regular file, which has data content, but cannot contain other files. - */ - public static final FileType FILE = new FileType( REZ.getString( "file.name" ) ); } diff --git a/proposal/myrmidon/src/java/org/apache/aut/vfs/NameScope.java b/proposal/myrmidon/src/java/org/apache/aut/vfs/NameScope.java index fbf6870d9..b76e9d07d 100644 --- a/proposal/myrmidon/src/java/org/apache/aut/vfs/NameScope.java +++ b/proposal/myrmidon/src/java/org/apache/aut/vfs/NameScope.java @@ -15,25 +15,6 @@ package org.apache.aut.vfs; */ public final class NameScope { - private String m_name; - - private NameScope( String name ) - { - m_name = name; - } - - /** Returns the name of the scope. */ - public String toString() - { - return m_name; - } - - /** Returns the name of the scope. */ - public String getName() - { - return m_name; - } - /** * Resolve against the children of the base file. * @@ -59,4 +40,23 @@ public final class NameScope * and relative if it does not. */ public static final NameScope FILE_SYSTEM = new NameScope( "filesystem" ); + + private String m_name; + + private NameScope( final String name ) + { + m_name = name; + } + + /** Returns the name of the scope. */ + public String toString() + { + return m_name; + } + + /** Returns the name of the scope. */ + public String getName() + { + return m_name; + } }