svn commit: r546398 - in /incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/repository/vfs: VfsTestHelper.java VfsURI.java

[gs...@apache.org]

Author: gscokart
Date: Tue Jun 12 00:07:50 2007
New Revision: 546398

URL: http://svn.apache.org/viewvc?view=rev&rev=546398
Log:
code cleaning

Modified:
    incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/repository/vfs/VfsTestHelper.java
    incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/repository/vfs/VfsURI.java

Modified: incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/repository/vfs/VfsTestHelper.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/repository/vfs/VfsTestHelper.java?view=diff&rev=546398&r1=546397&r2=546398
==============================================================================
--- incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/repository/vfs/VfsTestHelper.java (original)
+++ incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/repository/vfs/VfsTestHelper.java Tue Jun 12 00:07:50 2007
@@ -29,29 +29,29 @@
 public class VfsTestHelper {
     private Ivy ivy = null;
 
-    public StandardFileSystemManager fsManager = null;
+    public final StandardFileSystemManager fsManager;
 
-    final static public String VFS_CONF = "ivy_vfs.xml";
+    public static final String VFS_CONF = "ivy_vfs.xml";
 
     // Ivy Variables
-    static final public String PROP_VFS_HOST = "vfs.host";
+    public static final String PROP_VFS_HOST = "vfs.host";
 
-    static final public String PROP_VFS_SAMBA_REPO = "vfs.samba.share";
+    public static final String PROP_VFS_SAMBA_REPO = "vfs.samba.share";
 
-    static final public String PROP_VFS_USER_ID = "vfs.user";
+    public static final String PROP_VFS_USER_ID = "vfs.user";
 
-    static final public String PROP_VFS_USER_PASSWD = "vfs.passwd";
+    public static final String PROP_VFS_USER_PASSWD = "vfs.passwd";
 
     // Resources
-    static final public String CWD = System.getProperty("user.dir");
+    public static final String CWD = System.getProperty("user.dir");
 
-    static final public String TEST_REPO_DIR = "test/repositories";
+    public static final String TEST_REPO_DIR = "test/repositories";
 
-    static final private String IVY_CONFIG_FILE = FileUtil.concat(TEST_REPO_DIR, "ivysettings.xml");
+    public static final String IVY_CONFIG_FILE = FileUtil.concat(TEST_REPO_DIR, "ivysettings.xml");
 
-    static final public String TEST_IVY_XML = "2/mod5.1/ivy-4.2.xml";
+    public static final String TEST_IVY_XML = "2/mod5.1/ivy-4.2.xml";
 
-    static final public String SCRATCH_DIR = "_vfsScratchArea";
+    public static final String SCRATCH_DIR = "_vfsScratchArea";
 
     public VfsTestHelper() throws Exception {
         // setup and initialize VFS

Modified: incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/repository/vfs/VfsURI.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/repository/vfs/VfsURI.java?view=diff&rev=546398&r1=546397&r2=546398
==============================================================================
--- incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/repository/vfs/VfsURI.java (original)
+++ incubator/ivy/core/trunk/test/java/org/apache/ivy/plugins/repository/vfs/VfsURI.java Tue Jun 12 00:07:50 2007
@@ -31,23 +31,23 @@
     private String user;
 
     // VFS Schemes
-    static final public String SCHEME_CIFS = "smb";
+    public static final String SCHEME_CIFS = "smb";
 
-    static final public String SCHEME_FILE = "file";
+    public static final String SCHEME_FILE = "file";
 
-    static final public String SCHEME_FTP = "ftp";
+    public static final String SCHEME_FTP = "ftp";
 
-    static final public String SCHEME_HTTP = "http";
+    public static final String SCHEME_HTTP = "http";
 
-    static final public String SCHEME_HTTPS = "https";
+    public static final String SCHEME_HTTPS = "https";
 
-    static final public String SCHEME_SFTP = "sftp";
+    public static final String SCHEME_SFTP = "sftp";
 
-    static final public String SCHEME_WEBDAV = "webdav";
+    public static final  String SCHEME_WEBDAV = "webdav";
 
-    static final public String[] SUPPORTED_SCHEMES = new String[] {
+    public static final String[] SUPPORTED_SCHEMES = new String[] {
     // add other schemes here if other can be tested on your machine
-    SCHEME_FILE,};
+    SCHEME_FILE};
 
     /**
      * Create a set of valid VFS URIs for the file access protocol
@@ -56,7 +56,7 @@
      *            relative path (from the base repo) to the resource to be accessed
      * @return
      */
-    static public VfsURI vfsURIFactory(String scheme, String resource, Ivy ivy) {
+    public static VfsURI vfsURIFactory(String scheme, String resource, Ivy ivy) {
         VfsURI vfsURI = null;
         if (scheme.equals(SCHEME_CIFS)) {
             vfsURI = new VfsURI(SCHEME_CIFS, ivy.getVariable(VfsTestHelper.PROP_VFS_USER_ID), ivy