spring cleaning in advance of 1.2 enhancements:

removed unused imports, local variables, and private methods
(still there, just commented out).

diff --git a/build/src/$installer$/org/aspectj/Main.java b/build/src/$installer$/org/aspectj/Main.java
index 49ebafc513b1e15b32c344081aaf6dbc714c69eb..d413340d0c595c94c190412022478faec2aeaf09 100644 (file)
--- a/build/src/$installer$/org/aspectj/Main.java
+++ b/build/src/$installer$/org/aspectj/Main.java
@@ -177,7 +177,7 @@ public class Main {
                     throw new Exception("invalid javaPath: " + javaPath);
                 }
                 // directly set context and run
-                installer.getInstallPane().setContext(installerContext);
+                WizardPane.setContext(installerContext);
                 installer.run();
             }
         } catch (Exception e) {
@@ -518,7 +518,7 @@ abstract class Installer {
     }
 
     public void moveToPane(WizardPane pane) {
-        pane.setContext(this.context);
+        WizardPane.setContext(this.context);
 
         Dimension size = frame.getContentPane().getSize();
 
@@ -1786,11 +1786,11 @@ class JarUnpacker {
         URL url = getClass().getResource(jarName);
         InputStream stream = url.openStream();
         ZipInputStream zis = new ZipInputStream(stream);
-        int i = 0;
+//        int i = 0;
 
         ZipEntry entry;
         while ((entry = zis.getNextEntry()) != null) {
-            final String name = entry.getName();
+//            final String name = entry.getName();
             writeEntry(zis, entry, outputDir);
             //
         }

diff --git a/build/src/org/aspectj/internal/tools/ant/taskdefs/AntBuilder.java b/build/src/org/aspectj/internal/tools/ant/taskdefs/AntBuilder.java
index d665149a2a1f35f6dd3a4853aaa55b8ca54d9649..86208cb515f6c0c279ec5c836f48a263738fe361 100644 (file)
--- a/build/src/org/aspectj/internal/tools/ant/taskdefs/AntBuilder.java
+++ b/build/src/org/aspectj/internal/tools/ant/taskdefs/AntBuilder.java
@@ -336,7 +336,7 @@ public class AntBuilder extends Builder {
         
         // -- merge any merge jars
         List mergeJars =  module.getMerges();
-        final boolean useManifest = false;
+//        final boolean useManifest = false;
         if (0 < mergeJars.size()) {
             for (Iterator iter = mergeJars.iterator(); iter.hasNext();) {
                 File mergeJar = (File) iter.next();
@@ -550,7 +550,7 @@ class ProductBuilder extends AntBuilder {
     private static String getProductInstallResourcesSrc(BuildSpec buildSpec) {
         final String resourcesName = "installer-resources";  // XXXFileLiteral
         File dir = buildSpec.productDir.getParentFile();
-        String result = null;
+//        String result = null;
         if (null == dir) {
             return "../../" + resourcesName;
         } 
@@ -735,18 +735,18 @@ class ProductBuilder extends AntBuilder {
             + "/lib/build/build.jar" ; // XXX
     }
     
-    private Module moduleForReplaceFile(File replaceFile, Modules modules) {
-        String jarName = moduleAliasFor(replaceFile.getName().toLowerCase());
-        if (jarName.endsWith(".jar") || jarName.endsWith(".zip")) {   // XXXFileLiteral
-            jarName = jarName.substring(0, jarName.length()-4);
-        } else {
-            throw new IllegalArgumentException("can only replace .[jar|zip]");
-        }
-        boolean assembleAll = jarName.endsWith("-all");
-        String name = (!assembleAll ? jarName : jarName.substring(0, jarName.length()-4));
-        return modules.getModule(name);
-    }
-    
+//    private Module moduleForReplaceFile(File replaceFile, Modules modules) {
+//        String jarName = moduleAliasFor(replaceFile.getName().toLowerCase());
+//        if (jarName.endsWith(".jar") || jarName.endsWith(".zip")) {   // XXXFileLiteral
+//            jarName = jarName.substring(0, jarName.length()-4);
+//        } else {
+//            throw new IllegalArgumentException("can only replace .[jar|zip]");
+//        }
+//        boolean assembleAll = jarName.endsWith("-all");
+//        String name = (!assembleAll ? jarName : jarName.substring(0, jarName.length()-4));
+//        return modules.getModule(name);
+//    }
+//    
 }
 
 

diff --git a/build/src/org/aspectj/internal/tools/ant/taskdefs/Checklics.java b/build/src/org/aspectj/internal/tools/ant/taskdefs/Checklics.java
index 7b8b61425d6299317b9aed400e1219b3bd2f2535..f604e4f44aa199506c775aecb8649dc5a0047712 100644 (file)
--- a/build/src/org/aspectj/internal/tools/ant/taskdefs/Checklics.java
+++ b/build/src/org/aspectj/internal/tools/ant/taskdefs/Checklics.java
@@ -237,7 +237,7 @@ public class Checklics extends MatchingTask {
     
     /** visit all .java files in all directories... */
     private void visitAll(FileVisitor visitor) {
-        List filelist = new ArrayList();
+//        List filelist = new ArrayList();
         String[] dirs = sourcepath.list();
         for (int i = 0; i < dirs.length; i++) {
             File dir = project.resolveFile(dirs[i]);
@@ -445,7 +445,7 @@ public class Checklics extends MatchingTask {
 
                public boolean checkFile(final File file) {
                        clear();
-                       boolean result = false;
+//                     boolean result = false;
                        BufferedReader input = null;
                        int lineNum = 0;
                        try {
@@ -643,8 +643,8 @@ class Header {
     
     /** replace the header in file */
     public static boolean replaceHeader(File file, HeaderInfo info) {
-        ArrayList years = new ArrayList();
-        int endLine = 0;
+//        ArrayList years = new ArrayList();
+//        int endLine = 0;
         BufferedReader input = null;
         PrintWriter output = null;
         FileWriter outWriter = null;

diff --git a/build/src/org/aspectj/internal/tools/ant/taskdefs/StripNonBodyHtml.java b/build/src/org/aspectj/internal/tools/ant/taskdefs/StripNonBodyHtml.java
index 70b18c08644d45da06e14c32b93223f5f4cb5504..f08d0618ea18d060584213935a5e7e88f63db749 100644 (file)
--- a/build/src/org/aspectj/internal/tools/ant/taskdefs/StripNonBodyHtml.java
+++ b/build/src/org/aspectj/internal/tools/ant/taskdefs/StripNonBodyHtml.java
@@ -137,10 +137,10 @@ public class StripNonBodyHtml extends MatchingTask {
     }
 
     private boolean writeBodyTo(String s, File f) throws IOException {
-        int start, end;
+        int start;//, end;
         try {
             start = findStart(s);
-            end = findEnd(s, start);
+            findEnd(s, start);
         } catch (ParseException e) {
             return false; // if we get confused, just don't write the file.
         }

diff --git a/build/src/org/aspectj/internal/tools/ant/taskdefs/TestBuildModule.java b/build/src/org/aspectj/internal/tools/ant/taskdefs/TestBuildModule.java
index 076e49894c45ae973d4ba37537c68a005e83a3fa..ceeacee8530711cfca06039384d445bf4b7999a4 100644 (file)
--- a/build/src/org/aspectj/internal/tools/ant/taskdefs/TestBuildModule.java
+++ b/build/src/org/aspectj/internal/tools/ant/taskdefs/TestBuildModule.java
@@ -23,7 +23,7 @@ import org.aspectj.internal.tools.build.Builder;
 import org.aspectj.internal.tools.build.Util;
 
 public class TestBuildModule {
-    private static boolean REBUILD = false;
+//    private static boolean REBUILD = false;
     private static final String SYNTAX = "java {classname} <[product|module]dir>";
     public static void main(String[] args) {
         

diff --git a/build/src/org/aspectj/internal/tools/build/BuildSpec.java b/build/src/org/aspectj/internal/tools/build/BuildSpec.java
index 208992cbe772454a798afcbf8a3b789f7ee45319..692a8e552d69b5f06c26d569387ffa3ef3be4563 100644 (file)
--- a/build/src/org/aspectj/internal/tools/build/BuildSpec.java
+++ b/build/src/org/aspectj/internal/tools/build/BuildSpec.java
@@ -16,7 +16,7 @@ package org.aspectj.internal.tools.build;
 
 
 import java.io.File;
-import java.util.Properties;
+//import java.util.Properties;
 
 /** 
  * Open struct for specifying builds for both modules and products.
@@ -156,7 +156,7 @@ public class BuildSpec {
     public boolean assembleAll;
     public boolean failonerror;
     public boolean verbose;
-    private Properties buildProperties;
+//    private Properties buildProperties;
 
     // building products
     public File productDir;

diff --git a/build/src/org/aspectj/internal/tools/build/Builder.java b/build/src/org/aspectj/internal/tools/build/Builder.java
index 1c35072c70bd336b24764eae3d0c783828ceca3f..e57a49f523e3c9182c068987973621b401a31319 100644 (file)
--- a/build/src/org/aspectj/internal/tools/build/Builder.java
+++ b/build/src/org/aspectj/internal/tools/build/Builder.java
@@ -245,7 +245,7 @@ public abstract class Builder {
                        final Modules modules = module.getModules();
                        final Messager handler = this.handler;
                        final boolean log = (verbose && (null != handler));
-                       final boolean verbose = this.verbose;
+//                     final boolean verbose = this.verbose;
                        if (log) {
                                handler.log(
                                        "modules to build: " + Arrays.asList(buildList));

diff --git a/build/src/org/aspectj/internal/tools/build/Module.java b/build/src/org/aspectj/internal/tools/build/Module.java
index 6fefdcdba8c3991bdf2dc7448df1c39d4f8f8e43..b2ba39b4b1b96ef76dc124aed191213fa43fb140 100644 (file)
--- a/build/src/org/aspectj/internal/tools/build/Module.java
+++ b/build/src/org/aspectj/internal/tools/build/Module.java
@@ -361,7 +361,7 @@ public class Module {
             String line;
             
             XMLEntry entry = new XMLEntry("classpathentry", ATTS);
-            String lastKind = null;
+//            String lastKind = null;
             while (null != (line = reader.readLine())) {
                 // we assume no internal spaces...
                 entry.acceptTokens(line);

diff --git a/build/src/org/aspectj/internal/tools/build/SampleGatherer.java b/build/src/org/aspectj/internal/tools/build/SampleGatherer.java
index ea198d968dc6c6c5c0cfda9f3456ec44abda094e..dbc94b7d107e09a3a4ef0d9f1a4e685fca44842a 100644 (file)
--- a/build/src/org/aspectj/internal/tools/build/SampleGatherer.java
+++ b/build/src/org/aspectj/internal/tools/build/SampleGatherer.java
@@ -44,26 +44,26 @@ public class SampleGatherer {
     static final String AUTHOR = "@author";
     static final String FLAG = "XXX";
 
-    private static void test(String[] args){
-        String[] from = new String[] { "<pre>", "</pre>" };
-        String[] to = new String[] { "&lt;pre>", "&lt;/pre>" };
-        String source = "in this <pre> day and </pre> age of <pre and /pre>";
-        System.err.println("from " + source);
-        System.err.println("  to " + SampleUtil.replace(source, from, to));
-        source = "<pre> day and </pre>";
-        System.err.println("from " + source);
-        System.err.println("  to " + SampleUtil.replace(source, from, to));
-        source = "<pre day and </pre";
-        System.err.println("from " + source);
-        System.err.println("  to " + SampleUtil.replace(source, from, to));
-        source = "<pre> day and </pre> age";
-        System.err.println("from " + source);
-        System.err.println("  to " + SampleUtil.replace(source, from, to));
-        source = "in this <pre> day and </pre> age";
-        System.err.println("from " + source);
-        System.err.println("  to " + SampleUtil.replace(source, from, to));
-        
-    }
+//    private static void test(String[] args){
+//        String[] from = new String[] { "<pre>", "</pre>" };
+//        String[] to = new String[] { "&lt;pre>", "&lt;/pre>" };
+//        String source = "in this <pre> day and </pre> age of <pre and /pre>";
+//        System.err.println("from " + source);
+//        System.err.println("  to " + SampleUtil.replace(source, from, to));
+//        source = "<pre> day and </pre>";
+//        System.err.println("from " + source);
+//        System.err.println("  to " + SampleUtil.replace(source, from, to));
+//        source = "<pre day and </pre";
+//        System.err.println("from " + source);
+//        System.err.println("  to " + SampleUtil.replace(source, from, to));
+//        source = "<pre> day and </pre> age";
+//        System.err.println("from " + source);
+//        System.err.println("  to " + SampleUtil.replace(source, from, to));
+//        source = "in this <pre> day and </pre> age";
+//        System.err.println("from " + source);
+//        System.err.println("  to " + SampleUtil.replace(source, from, to));
+//        
+//    }
     /**
      * Emit samples gathered from any input args.
      * @param args the String[] of paths to files or directories to search
@@ -248,11 +248,11 @@ public class SampleGatherer {
             throws Abort {
         throw new Abort(why + " at " + file + ":" + lineNumber + ": " + line);
     }
-    private static void delay(Object toDelay) {
-        synchronized (toDelay) { // XXX sleep instead?
-            toDelay.notifyAll();
-        }
-    }
+//    private static void delay(Object toDelay) {
+//        synchronized (toDelay) { // XXX sleep instead?
+//            toDelay.notifyAll();
+//        }
+//    }
     static class Abort extends IOException {
         Abort(String s) {
             super(s);
@@ -339,7 +339,7 @@ class Sample {
         this.startLine = startLine;
         this.endLine = endLine;
         this.kind = Kind.getKind(sourcePath);
-        List theFlags;
+//        List theFlags;
         if ((null == flags) || (0 == flags.length)) {
             this.flags = Collections.EMPTY_LIST;
         } else {

diff --git a/build/testsrc/org/aspectj/internal/build/BuildModuleTest.java b/build/testsrc/org/aspectj/internal/build/BuildModuleTest.java
index e3d714a9ac1855b85db2e2cf1db30b3497da537b..df5861a0da645ebf41e4de2688f726396eb564d1 100644 (file)
--- a/build/testsrc/org/aspectj/internal/build/BuildModuleTest.java
+++ b/build/testsrc/org/aspectj/internal/build/BuildModuleTest.java
@@ -27,7 +27,7 @@ import java.io.File;
 import java.util.ArrayList;
 import java.util.Iterator;
 
-import junit.framework.*;
+//import junit.framework.*;
 import junit.framework.TestCase;
 
 /**

diff --git a/build/testsrc/org/aspectj/internal/build/ModulesTest.java b/build/testsrc/org/aspectj/internal/build/ModulesTest.java
index 67b6d1a3ed8b83bc304053664cc66a6f6e8898aa..2522f256ba592b85dc52d895882a04d529ac33d9 100644 (file)
--- a/build/testsrc/org/aspectj/internal/build/ModulesTest.java
+++ b/build/testsrc/org/aspectj/internal/build/ModulesTest.java
@@ -13,21 +13,18 @@
 
 package org.aspectj.internal.build;
 
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Iterator;
+
+import junit.framework.TestCase;
+
 import org.apache.tools.ant.Project;
-import org.apache.tools.ant.taskdefs.Java;
 import org.apache.tools.ant.types.Path;
-import org.apache.tools.ant.types.Commandline.Argument;
 import org.aspectj.internal.tools.ant.taskdefs.AntBuilder;
-import org.aspectj.internal.tools.ant.taskdefs.BuildModule;
 import org.aspectj.internal.tools.build.Messager;
 import org.aspectj.internal.tools.build.Module;
 import org.aspectj.internal.tools.build.Modules;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Iterator;
-
-import junit.framework.TestCase;
 /**
  * 
  */