cmlenz      2003/06/29 11:19:34

  Modified:    
integration/eclipse/org.apache.cactus.eclipse.runner/src/java/org/apache/cactus/eclipse/runner/launcher
                        JettyCactusLaunchConfiguration.java
               
integration/eclipse/org.apache.cactus.eclipse.runner/src/java/org/apache/cactus/eclipse/runner/common
                        LibraryHelper.java
  Log:
  Removed unused variables/methods and a bit of formatting cleanup
  
  Revision  Changes    Path
  1.2       +3 -20     
jakarta-cactus/integration/eclipse/org.apache.cactus.eclipse.runner/src/java/org/apache/cactus/eclipse/runner/launcher/JettyCactusLaunchConfiguration.java
  
  Index: JettyCactusLaunchConfiguration.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-cactus/integration/eclipse/org.apache.cactus.eclipse.runner/src/java/org/apache/cactus/eclipse/runner/launcher/JettyCactusLaunchConfiguration.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- JettyCactusLaunchConfiguration.java       29 Apr 2003 10:42:40 -0000      1.1
  +++ JettyCactusLaunchConfiguration.java       29 Jun 2003 18:19:34 -0000      1.2
  @@ -190,27 +190,12 @@
       }
   
       /**
  -     * @param theAntURLs array of URLs to convert to Jar paths
  -     * @return the array of jar paths from the given URLs
  -     */
  -    private String[] getJarPaths(URL[] theAntURLs)
  -    {
  -        String[] jarPaths = new String[theAntURLs.length];
  -        for (int i = 0; i < theAntURLs.length; i++)
  -        {
  -            jarPaths[i] = theAntURLs[i].getFile();
  -        }
  -        return jarPaths;
  -    }
  -
  -    /**
        * @param theDescriptor the plug-in descriptor to get libraries from
        * @param thePackagePrefix package prefix used to filter libraries 
        * @return an array of jar paths exposed by the plug-in
        */
       private IClasspathEntry[] getLibrariesPaths(
  -        IPluginDescriptor theDescriptor,
  -        String thePackagePrefix)
  +        IPluginDescriptor theDescriptor, String thePackagePrefix)
       {
           Vector result = new Vector();
           URL root = theDescriptor.getInstallURL();
  @@ -245,9 +230,7 @@
        * @param theCurrentLib the library in which the prefix will be searched 
        * @return true if the library declares the given package prefix
        */
  -    private boolean isContained(
  -        String thePackagePrefix,
  -        ILibrary theCurrentLib)
  +    private boolean isContained(String thePackagePrefix, ILibrary theCurrentLib)
       {
           String[] prefixes = theCurrentLib.getPackagePrefixes();
           for (int i = 0; i < prefixes.length; i++)
  
  
  
  1.3       +4 -5      
jakarta-cactus/integration/eclipse/org.apache.cactus.eclipse.runner/src/java/org/apache/cactus/eclipse/runner/common/LibraryHelper.java
  
  Index: LibraryHelper.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-cactus/integration/eclipse/org.apache.cactus.eclipse.runner/src/java/org/apache/cactus/eclipse/runner/common/LibraryHelper.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- LibraryHelper.java        29 Apr 2003 10:43:09 -0000      1.2
  +++ LibraryHelper.java        29 Jun 2003 18:19:34 -0000      1.3
  @@ -78,10 +78,12 @@
        * Path to the plugin's library directory
        */
       private static final String CACTUS_LIBRARY_PATH = "./ant/lib/";
  +
       /**
        * Name of the common libraries folder
        */
       private static final String CACTUS_COMMON_LIBRARY_PATH = "/common";
  +
       /**
        * Name of the client libraries folder
        */
  @@ -109,7 +111,6 @@
        */
       private static IPath[] getClientJarPathArray()
       {
  -        CactusPlugin thePlugin = CactusPlugin.getDefault();
           File clientLibDir = getClientLibPath().toFile();
           return getJarPathArray(clientLibDir);
       }
  @@ -119,7 +120,6 @@
        */
       private static IPath[] getCommonJarPathArray()
       {
  -        CactusPlugin thePlugin = CactusPlugin.getDefault();
           File commmonLibDir = getCommonLibPath().toFile();
           return getJarPathArray(commmonLibDir);
       }
  @@ -171,8 +171,7 @@
        *         followed by the second one
        */
       public static IClasspathEntry[] concatenateEntries(
  -        IClasspathEntry[] theArray1,
  -        IClasspathEntry[] theArray2)
  +        IClasspathEntry[] theArray1, IClasspathEntry[] theArray2)
       {
           IClasspathEntry[] newArray =
               new IClasspathEntry[theArray1.length + theArray2.length];
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to