mavenizing ajde - wip

165 files changed, 49 insertions, 33 deletions

diff --git a/ajde/.classpath b/ajde/.classpath.2
index 40d054d59..40d054d59 100644
--- a/ajde/.classpath
+++ b/ajde/.classpath.2
diff --git a/ajde/.cvsignore b/ajde/.cvsignore
deleted file mode 100644
index 6a4a0f15f..000000000
--- a/ajde/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-bin
-default.ajsym
-default.lst
-bintest
diff --git a/ajde/.isJava5 b/ajde/.isJava5
deleted file mode 100644
index 136d06384..000000000
--- a/ajde/.isJava5
+++ /dev/null
@@ -1 +0,0 @@
-  
\ No newline at end of file
diff --git a/ajde/.project b/ajde/.project
deleted file mode 100644
index 6a9272f79..000000000
--- a/ajde/.project
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>ajde</name>
-	<comment></comment>
-	<projects>
-		<project>asm</project>
-		<project>bridge</project>
-		<project>org.aspectj.ajdt.core</project>
-		<project>org.eclipse.jdt.core</project>
-		<project>util</project>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/ajde/build.xml b/ajde/build.xml
deleted file mode 100644
index 783410312..000000000
--- a/ajde/build.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0"?>
-<!-- see ../build/*.html for explanation -->
-<project name="ajde" default="test" basedir=".">
-    <import file="${basedir}/../build/build.xml"/>  
-</project>
-
diff --git a/ajde/pom.xml b/ajde/pom.xml
new file mode 100644
index 000000000..aecd6318f
--- /dev/null
+++ b/ajde/pom.xml
@@ -0,0 +1,49 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.aspectj</groupId>
+    <artifactId>aspectj-parent</artifactId>
+    <version>1.9.3.BUILD-SNAPSHOT</version>
+    <relativePath>..</relativePath>
+  </parent>
+
+  <artifactId>ajde</artifactId>
+  <packaging>jar</packaging>
+  <name>ajde</name>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.aspectj</groupId>
+      <artifactId>util</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.aspectj</groupId>
+      <artifactId>bridge</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.aspectj</groupId>
+      <artifactId>asm</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.aspectj</groupId>
+      <artifactId>org.aspectj.ajdt.core</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.aspectj</groupId>
+      <artifactId>org.eclipse.jdt.core</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.aspectj</groupId>
+      <artifactId>ajde.core</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+  </dependencies>
+</project>
diff --git a/ajde/src/org/aspectj/ajde/Ajde.java b/ajde/src/main/java/org/aspectj/ajde/Ajde.java
index 2e25e50fc..2e25e50fc 100644
--- a/ajde/src/org/aspectj/ajde/Ajde.java
+++ b/ajde/src/main/java/org/aspectj/ajde/Ajde.java
diff --git a/ajde/src/org/aspectj/ajde/EditorAdapter.java b/ajde/src/main/java/org/aspectj/ajde/EditorAdapter.java
index b601f74e3..b601f74e3 100644
--- a/ajde/src/org/aspectj/ajde/EditorAdapter.java
+++ b/ajde/src/main/java/org/aspectj/ajde/EditorAdapter.java
diff --git a/ajde/src/org/aspectj/ajde/EditorListener.java b/ajde/src/main/java/org/aspectj/ajde/EditorListener.java
index f39cfa074..f39cfa074 100644
--- a/ajde/src/org/aspectj/ajde/EditorListener.java
+++ b/ajde/src/main/java/org/aspectj/ajde/EditorListener.java
diff --git a/ajde/src/org/aspectj/ajde/IRuntimeProperties.java b/ajde/src/main/java/org/aspectj/ajde/IRuntimeProperties.java
index 9970c597e..9970c597e 100644
--- a/ajde/src/org/aspectj/ajde/IRuntimeProperties.java
+++ b/ajde/src/main/java/org/aspectj/ajde/IRuntimeProperties.java
diff --git a/ajde/src/org/aspectj/ajde/IUIBuildMessageHandler.java b/ajde/src/main/java/org/aspectj/ajde/IUIBuildMessageHandler.java
index 7e9678d22..7e9678d22 100644
--- a/ajde/src/org/aspectj/ajde/IUIBuildMessageHandler.java
+++ b/ajde/src/main/java/org/aspectj/ajde/IUIBuildMessageHandler.java
diff --git a/ajde/src/org/aspectj/ajde/IconRegistry.java b/ajde/src/main/java/org/aspectj/ajde/IconRegistry.java
index 4cdec89f2..4cdec89f2 100644
--- a/ajde/src/org/aspectj/ajde/IconRegistry.java
+++ b/ajde/src/main/java/org/aspectj/ajde/IconRegistry.java
diff --git a/ajde/src/org/aspectj/ajde/IdeUIAdapter.java b/ajde/src/main/java/org/aspectj/ajde/IdeUIAdapter.java
index 9c526fb0d..9c526fb0d 100644
--- a/ajde/src/org/aspectj/ajde/IdeUIAdapter.java
+++ b/ajde/src/main/java/org/aspectj/ajde/IdeUIAdapter.java
diff --git a/ajde/src/org/aspectj/ajde/internal/BuildConfigListener.java b/ajde/src/main/java/org/aspectj/ajde/internal/BuildConfigListener.java
index 30d3f1e35..30d3f1e35 100644
--- a/ajde/src/org/aspectj/ajde/internal/BuildConfigListener.java
+++ b/ajde/src/main/java/org/aspectj/ajde/internal/BuildConfigListener.java
diff --git a/ajde/src/org/aspectj/ajde/internal/BuildConfigManager.java b/ajde/src/main/java/org/aspectj/ajde/internal/BuildConfigManager.java
index f049357c5..f049357c5 100644
--- a/ajde/src/org/aspectj/ajde/internal/BuildConfigManager.java
+++ b/ajde/src/main/java/org/aspectj/ajde/internal/BuildConfigManager.java
diff --git a/ajde/src/org/aspectj/ajde/internal/LstBuildConfigFileParser.java b/ajde/src/main/java/org/aspectj/ajde/internal/LstBuildConfigFileParser.java
index 7eb195716..7eb195716 100644
--- a/ajde/src/org/aspectj/ajde/internal/LstBuildConfigFileParser.java
+++ b/ajde/src/main/java/org/aspectj/ajde/internal/LstBuildConfigFileParser.java
diff --git a/ajde/src/org/aspectj/ajde/internal/LstBuildConfigFileUpdater.java b/ajde/src/main/java/org/aspectj/ajde/internal/LstBuildConfigFileUpdater.java
index 24e264d70..24e264d70 100644
--- a/ajde/src/org/aspectj/ajde/internal/LstBuildConfigFileUpdater.java
+++ b/ajde/src/main/java/org/aspectj/ajde/internal/LstBuildConfigFileUpdater.java
diff --git a/ajde/src/org/aspectj/ajde/internal/LstBuildConfigManager.java b/ajde/src/main/java/org/aspectj/ajde/internal/LstBuildConfigManager.java
index 05c4cc2a0..05c4cc2a0 100644
--- a/ajde/src/org/aspectj/ajde/internal/LstBuildConfigManager.java
+++ b/ajde/src/main/java/org/aspectj/ajde/internal/LstBuildConfigManager.java
diff --git a/ajde/src/org/aspectj/ajde/internal/StructureUtilities.java b/ajde/src/main/java/org/aspectj/ajde/internal/StructureUtilities.java
index 866a5bad8..866a5bad8 100644
--- a/ajde/src/org/aspectj/ajde/internal/StructureUtilities.java
+++ b/ajde/src/main/java/org/aspectj/ajde/internal/StructureUtilities.java
diff --git a/ajde/src/org/aspectj/ajde/resources/actions/ajdeSmall.gif b/ajde/src/main/java/org/aspectj/ajde/resources/actions/ajdeSmall.gif
index 2b08761cb..2b08761cb 100644
--- a/ajde/src/org/aspectj/ajde/resources/actions/ajdeSmall.gif
+++ b/ajde/src/main/java/org/aspectj/ajde/resources/actions/ajdeSmall.gif
diff --git a/ajde/src/org/aspectj/ajde/resources/actions/back.gif b/ajde/src/main/java/org/aspectj/ajde/resources/actions/back.gif
index 06960ea56..06960ea56 100644
--- a/ajde/src/org/aspectj/ajde/resources/actions/back.gif
+++ b/ajde/src/main/java/org/aspectj/ajde/resources/actions/back.gif
diff --git a/ajde/src/org/aspectj/ajde/resources/actions/browserDisabled.gif b/ajde/src/main/java/org/aspectj/ajde/resources/actions/browserDisabled.gif
index 0ed9ecac9..0ed9ecac9 100644
--- a/ajde/src/org/aspectj/ajde/resources/actions/browserDisabled.gif
+++ b/ajde/src/main/java/org/aspectj/ajde/resources/actions/browserDisabled.gif
diff --git a/ajde/src/org/aspectj/ajde/resources/actions/browserEnabled.gif b/ajde/src/main/java/org/aspectj/ajde/resources/actions/browserEnabled.gif
index 876dd51f2..876dd51f2 100644
--- a/ajde/src/org/aspectj/ajde/resources/actions/browserEnabled.gif
+++ b/ajde/src/main/java/org/aspectj/ajde/resources/actions/browserEnabled.gif
diff --git a/ajde/src/org/aspectj/ajde/resources/actions/browseroptions.gif b/ajde/src/main/java/org/aspectj/ajde/resources/actions/browseroptions.gif
index 4c8aa8d01..4c8aa8d01 100644
--- a/ajde/src/org/aspectj/ajde/resources/actions/browseroptions.gif
+++ b/ajde/src/main/java/org/aspectj/ajde/resources/actions/browseroptions.gif
diff --git a/ajde/src/org/aspectj/ajde/resources/actions/build.gif b/ajde/src/main/java/org/aspectj/ajde/resources/actions/build.gif
index 2673baa2d..2673baa2d 100644
--- a/ajde/src/org/aspectj/ajde/resources/actions/build.gif
+++ b/ajde/src/main/java/org/aspectj/ajde/resources/actions/build.gif
diff --git a/ajde/src/org/aspectj/ajde/resources/actions/clean.gif b/ajde/src/main/java/org/aspectj/ajde/resources/actions/clean.gif
index 9dc08247b..9dc08247b 100644
--- a/ajde/src/org/aspectj/ajde/resources/actions/clean.gif
+++ b/ajde/src/main/java/org/aspectj/ajde/resources/actions/clean.gif
diff --git a/ajde/src/org/aspectj/ajde/resources/actions/closeConfig.gif b/ajde/src/main/java/org/aspectj/ajde/resources/actions/closeConfig.gif
index e11d635a9..e11d635a9 100644
--- a/ajde/src/org/aspectj/ajde/resources/actions/closeConfig.gif
+++ b/ajde/src/main/java/org/aspectj/ajde/resources/actions/closeConfig.gif
diff --git a/ajde/src/org/aspectj/ajde/resources/actions/debug.gif b/ajde/src/main/java/org/aspectj/ajde/resources/actions/debug.gif
index 9c38140c0..9c38140c0 100644
--- a/ajde/src/org/aspectj/ajde/resources/actions/debug.gif
+++ b/ajde/src/main/java/org/aspectj/ajde/resources/actions/debug.gif
diff --git a/ajde/src/org/aspectj/ajde/resources/actions/default.gif b/ajde/src/main/java/org/aspectj/ajde/resources/actions/default.gif
index b1341dff4..b1341dff4 100644
--- a/ajde/src/org/aspectj/ajde/resources/actions/default.gif
+++ b/ajde/src/main/java/org/aspectj/ajde/resources/actions/default.gif
diff --git a/ajde/src/org/aspectj/ajde/resources/actions/execute.gif b/ajde/src/main/java/org/aspectj/ajde/resources/actions/execute.gif
index 5d7bfcc96..5d7bfcc96 100644
--- a/ajde/src/org/aspectj/ajde/resources/actions/execute.gif
+++ b/ajde/src/main/java/org/aspectj/ajde/resources/actions/execute.gif
diff --git a/ajde/src/org/aspectj/ajde/resources/actions/filter.gif b/ajde/src/main/java/org/aspectj/ajde/resources/actions/filter.gif
index b73b8fff5..b73b8fff5 100644
--- a/ajde/src/org/aspectj/ajde/resources/actions/filter.gif
+++ b/ajde/src/main/java/org/aspectj/ajde/resources/actions/filter.gif
diff --git a/ajde/src/org/aspectj/ajde/resources/actions/find.gif b/ajde/src/main/java/org/aspectj/ajde/resources/actions/find.gif
index bca27b12a..bca27b12a 100644
--- a/ajde/src/org/aspectj/ajde/resources/actions/find.gif
+++ b/ajde/src/main/java/org/aspectj/ajde/resources/actions/find.gif
diff --git a/ajde/src/org/aspectj/ajde/resources/actions/forward.gif b/ajde/src/main/java/org/aspectj/ajde/resources/actions/forward.gif
index cc7f973d2..cc7f973d2 100644
--- a/ajde/src/org/aspectj/ajde/resources/actions/forward.gif
+++ b/ajde/src/main/java/org/aspectj/ajde/resources/actions/forward.gif
diff --git a/ajde/src/org/aspectj/ajde/resources/actions/granularity.gif b/ajde/src/main/java/org/aspectj/ajde/resources/actions/granularity.gif
index 286ee1945..286ee1945 100644
--- a/ajde/src/org/aspectj/ajde/resources/actions/granularity.gif
+++ b/ajde/src/main/java/org/aspectj/ajde/resources/actions/granularity.gif
diff --git a/ajde/src/org/aspectj/ajde/resources/actions/hideAssociations.gif b/ajde/src/main/java/org/aspectj/ajde/resources/actions/hideAssociations.gif
index 492e148e8..492e148e8 100644
--- a/ajde/src/org/aspectj/ajde/resources/actions/hideAssociations.gif
+++ b/ajde/src/main/java/org/aspectj/ajde/resources/actions/hideAssociations.gif
diff --git a/ajde/src/org/aspectj/ajde/resources/actions/hideNonAJ.gif b/ajde/src/main/java/org/aspectj/ajde/resources/actions/hideNonAJ.gif
index 3e1ce96ef..3e1ce96ef 100644
--- a/ajde/src/org/aspectj/ajde/resources/actions/hideNonAJ.gif
+++ b/ajde/src/main/java/org/aspectj/ajde/resources/actions/hideNonAJ.gif
diff --git a/ajde/src/org/aspectj/ajde/resources/actions/mergeStructureView.gif b/ajde/src/main/java/org/aspectj/ajde/resources/actions/mergeStructureView.gif
index 359d2888d..359d2888d 100644
--- a/ajde/src/org/aspectj/ajde/resources/actions/mergeStructureView.gif
+++ b/ajde/src/main/java/org/aspectj/ajde/resources/actions/mergeStructureView.gif
diff --git a/ajde/src/org/aspectj/ajde/resources/actions/new.gif b/ajde/src/main/java/org/aspectj/ajde/resources/actions/new.gif
index 1d02decea..1d02decea 100644
--- a/ajde/src/org/aspectj/ajde/resources/actions/new.gif
+++ b/ajde/src/main/java/org/aspectj/ajde/resources/actions/new.gif
diff --git a/ajde/src/org/aspectj/ajde/resources/actions/open.gif b/ajde/src/main/java/org/aspectj/ajde/resources/actions/open.gif
index 1549ecd7b..1549ecd7b 100644
--- a/ajde/src/org/aspectj/ajde/resources/actions/open.gif
+++ b/ajde/src/main/java/org/aspectj/ajde/resources/actions/open.gif
diff --git a/ajde/src/org/aspectj/ajde/resources/actions/openConfig.gif b/ajde/src/main/java/org/aspectj/ajde/resources/actions/openConfig.gif
index 64d7028e5..64d7028e5 100644
--- a/ajde/src/org/aspectj/ajde/resources/actions/openConfig.gif
+++ b/ajde/src/main/java/org/aspectj/ajde/resources/actions/openConfig.gif
diff --git a/ajde/src/org/aspectj/ajde/resources/actions/options.gif b/ajde/src/main/java/org/aspectj/ajde/resources/actions/options.gif
index 02538e940..02538e940 100644
--- a/ajde/src/org/aspectj/ajde/resources/actions/options.gif
+++ b/ajde/src/main/java/org/aspectj/ajde/resources/actions/options.gif
diff --git a/ajde/src/org/aspectj/ajde/resources/actions/order.gif b/ajde/src/main/java/org/aspectj/ajde/resources/actions/order.gif
index 67586ef30..67586ef30 100644
--- a/ajde/src/org/aspectj/ajde/resources/actions/order.gif
+++ b/ajde/src/main/java/org/aspectj/ajde/resources/actions/order.gif
diff --git a/ajde/src/org/aspectj/ajde/resources/actions/outputWindow.gif b/ajde/src/main/java/org/aspectj/ajde/resources/actions/outputWindow.gif
index 9b65c6b6e..9b65c6b6e 100644
--- a/ajde/src/org/aspectj/ajde/resources/actions/outputWindow.gif
+++ b/ajde/src/main/java/org/aspectj/ajde/resources/actions/outputWindow.gif
diff --git a/ajde/src/org/aspectj/ajde/resources/actions/popup.gif b/ajde/src/main/java/org/aspectj/ajde/resources/actions/popup.gif
index 3030e1954..3030e1954 100644
--- a/ajde/src/org/aspectj/ajde/resources/actions/popup.gif
+++ b/ajde/src/main/java/org/aspectj/ajde/resources/actions/popup.gif
diff --git a/ajde/src/org/aspectj/ajde/resources/actions/refresh.gif b/ajde/src/main/java/org/aspectj/ajde/resources/actions/refresh.gif
index 7e6bd1747..7e6bd1747 100644
--- a/ajde/src/org/aspectj/ajde/resources/actions/refresh.gif
+++ b/ajde/src/main/java/org/aspectj/ajde/resources/actions/refresh.gif
diff --git a/ajde/src/org/aspectj/ajde/resources/actions/relations.gif b/ajde/src/main/java/org/aspectj/ajde/resources/actions/relations.gif
index e091ac2b5..e091ac2b5 100644
--- a/ajde/src/org/aspectj/ajde/resources/actions/relations.gif
+++ b/ajde/src/main/java/org/aspectj/ajde/resources/actions/relations.gif
diff --git a/ajde/src/org/aspectj/ajde/resources/actions/save.gif b/ajde/src/main/java/org/aspectj/ajde/resources/actions/save.gif
index ed704396c..ed704396c 100644
--- a/ajde/src/org/aspectj/ajde/resources/actions/save.gif
+++ b/ajde/src/main/java/org/aspectj/ajde/resources/actions/save.gif
diff --git a/ajde/src/org/aspectj/ajde/resources/actions/saveAll.gif b/ajde/src/main/java/org/aspectj/ajde/resources/actions/saveAll.gif
index 18d0c9ff5..18d0c9ff5 100644
--- a/ajde/src/org/aspectj/ajde/resources/actions/saveAll.gif
+++ b/ajde/src/main/java/org/aspectj/ajde/resources/actions/saveAll.gif
diff --git a/ajde/src/org/aspectj/ajde/resources/actions/search.gif b/ajde/src/main/java/org/aspectj/ajde/resources/actions/search.gif
index 164b9123e..164b9123e 100644
--- a/ajde/src/org/aspectj/ajde/resources/actions/search.gif
+++ b/ajde/src/main/java/org/aspectj/ajde/resources/actions/search.gif
diff --git a/ajde/src/org/aspectj/ajde/resources/actions/splitStructureView.gif b/ajde/src/main/java/org/aspectj/ajde/resources/actions/splitStructureView.gif
index 825dcfea7..825dcfea7 100644
--- a/ajde/src/org/aspectj/ajde/resources/actions/splitStructureView.gif
+++ b/ajde/src/main/java/org/aspectj/ajde/resources/actions/splitStructureView.gif
diff --git a/ajde/src/org/aspectj/ajde/resources/actions/startAjde.gif b/ajde/src/main/java/org/aspectj/ajde/resources/actions/startAjde.gif
index 5c49b6a32..5c49b6a32 100644
--- a/ajde/src/org/aspectj/ajde/resources/actions/startAjde.gif
+++ b/ajde/src/main/java/org/aspectj/ajde/resources/actions/startAjde.gif
diff --git a/ajde/src/org/aspectj/ajde/resources/actions/stopAjde.gif b/ajde/src/main/java/org/aspectj/ajde/resources/actions/stopAjde.gif
index 97cfa4c71..97cfa4c71 100644
--- a/ajde/src/org/aspectj/ajde/resources/actions/stopAjde.gif
+++ b/ajde/src/main/java/org/aspectj/ajde/resources/actions/stopAjde.gif
diff --git a/ajde/src/org/aspectj/ajde/resources/actions/structureView.gif b/ajde/src/main/java/org/aspectj/ajde/resources/actions/structureView.gif
index 8e2d2e7d0..8e2d2e7d0 100644
--- a/ajde/src/org/aspectj/ajde/resources/actions/structureView.gif
+++ b/ajde/src/main/java/org/aspectj/ajde/resources/actions/structureView.gif
diff --git a/ajde/src/org/aspectj/ajde/resources/actions/zoomStructureToFileMode.gif b/ajde/src/main/java/org/aspectj/ajde/resources/actions/zoomStructureToFileMode.gif
index 0c1d83eec..0c1d83eec 100644
--- a/ajde/src/org/aspectj/ajde/resources/actions/zoomStructureToFileMode.gif
+++ b/ajde/src/main/java/org/aspectj/ajde/resources/actions/zoomStructureToFileMode.gif
diff --git a/ajde/src/org/aspectj/ajde/resources/actions/zoomStructureToGlobalMode.gif b/ajde/src/main/java/org/aspectj/ajde/resources/actions/zoomStructureToGlobalMode.gif
index 98a93e096..98a93e096 100644
--- a/ajde/src/org/aspectj/ajde/resources/actions/zoomStructureToGlobalMode.gif
+++ b/ajde/src/main/java/org/aspectj/ajde/resources/actions/zoomStructureToGlobalMode.gif
diff --git a/ajde/src/org/aspectj/ajde/resources/structure/accessibility-package.gif b/ajde/src/main/java/org/aspectj/ajde/resources/structure/accessibility-package.gif
index 0c7bfc426..0c7bfc426 100644
--- a/ajde/src/org/aspectj/ajde/resources/structure/accessibility-package.gif
+++ b/ajde/src/main/java/org/aspectj/ajde/resources/structure/accessibility-package.gif
diff --git a/ajde/src/org/aspectj/ajde/resources/structure/accessibility-private.gif b/ajde/src/main/java/org/aspectj/ajde/resources/structure/accessibility-private.gif
index d543c82f5..d543c82f5 100644
--- a/ajde/src/org/aspectj/ajde/resources/structure/accessibility-private.gif
+++ b/ajde/src/main/java/org/aspectj/ajde/resources/structure/accessibility-private.gif
diff --git a/ajde/src/org/aspectj/ajde/resources/structure/accessibility-privileged.gif b/ajde/src/main/java/org/aspectj/ajde/resources/structure/accessibility-privileged.gif
index 3b65259bd..3b65259bd 100644
--- a/ajde/src/org/aspectj/ajde/resources/structure/accessibility-privileged.gif
+++ b/ajde/src/main/java/org/aspectj/ajde/resources/structure/accessibility-privileged.gif
diff --git a/ajde/src/org/aspectj/ajde/resources/structure/accessibility-protected.gif b/ajde/src/main/java/org/aspectj/ajde/resources/structure/accessibility-protected.gif
index dd2a5f0c6..dd2a5f0c6 100644
--- a/ajde/src/org/aspectj/ajde/resources/structure/accessibility-protected.gif
+++ b/ajde/src/main/java/org/aspectj/ajde/resources/structure/accessibility-protected.gif
diff --git a/ajde/src/org/aspectj/ajde/resources/structure/accessibility-public.gif b/ajde/src/main/java/org/aspectj/ajde/resources/structure/accessibility-public.gif
index 45b759436..45b759436 100644
--- a/ajde/src/org/aspectj/ajde/resources/structure/accessibility-public.gif
+++ b/ajde/src/main/java/org/aspectj/ajde/resources/structure/accessibility-public.gif
diff --git a/ajde/src/org/aspectj/ajde/resources/structure/advice.gif b/ajde/src/main/java/org/aspectj/ajde/resources/structure/advice.gif
index 48317f8b9..48317f8b9 100644
--- a/ajde/src/org/aspectj/ajde/resources/structure/advice.gif
+++ b/ajde/src/main/java/org/aspectj/ajde/resources/structure/advice.gif
diff --git a/ajde/src/org/aspectj/ajde/resources/structure/adviceBack.gif b/ajde/src/main/java/org/aspectj/ajde/resources/structure/adviceBack.gif
index 81a3bb684..81a3bb684 100644
--- a/ajde/src/org/aspectj/ajde/resources/structure/adviceBack.gif
+++ b/ajde/src/main/java/org/aspectj/ajde/resources/structure/adviceBack.gif
diff --git a/ajde/src/org/aspectj/ajde/resources/structure/adviceForward.gif b/ajde/src/main/java/org/aspectj/ajde/resources/structure/adviceForward.gif
index 06ed1932c..06ed1932c 100644
--- a/ajde/src/org/aspectj/ajde/resources/structure/adviceForward.gif
+++ b/ajde/src/main/java/org/aspectj/ajde/resources/structure/adviceForward.gif
diff --git a/ajde/src/org/aspectj/ajde/resources/structure/annotation.gif b/ajde/src/main/java/org/aspectj/ajde/resources/structure/annotation.gif
index 435d62ed4..435d62ed4 100644
--- a/ajde/src/org/aspectj/ajde/resources/structure/annotation.gif
+++ b/ajde/src/main/java/org/aspectj/ajde/resources/structure/annotation.gif
diff --git a/ajde/src/org/aspectj/ajde/resources/structure/aspect.gif b/ajde/src/main/java/org/aspectj/ajde/resources/structure/aspect.gif
index 3c4bcbe43..3c4bcbe43 100644
--- a/ajde/src/org/aspectj/ajde/resources/structure/aspect.gif
+++ b/ajde/src/main/java/org/aspectj/ajde/resources/structure/aspect.gif
diff --git a/ajde/src/org/aspectj/ajde/resources/structure/class.gif b/ajde/src/main/java/org/aspectj/ajde/resources/structure/class.gif
index 3c5670560..3c5670560 100644
--- a/ajde/src/org/aspectj/ajde/resources/structure/class.gif
+++ b/ajde/src/main/java/org/aspectj/ajde/resources/structure/class.gif
diff --git a/ajde/src/org/aspectj/ajde/resources/structure/code.gif b/ajde/src/main/java/org/aspectj/ajde/resources/structure/code.gif
index 177155246..177155246 100644
--- a/ajde/src/org/aspectj/ajde/resources/structure/code.gif
+++ b/ajde/src/main/java/org/aspectj/ajde/resources/structure/code.gif
diff --git a/ajde/src/org/aspectj/ajde/resources/structure/declareError.gif b/ajde/src/main/java/org/aspectj/ajde/resources/structure/declareError.gif
index 1db5788e2..1db5788e2 100644
--- a/ajde/src/org/aspectj/ajde/resources/structure/declareError.gif
+++ b/ajde/src/main/java/org/aspectj/ajde/resources/structure/declareError.gif
diff --git a/ajde/src/org/aspectj/ajde/resources/structure/declareParents.gif b/ajde/src/main/java/org/aspectj/ajde/resources/structure/declareParents.gif
index c768f43c8..c768f43c8 100644
--- a/ajde/src/org/aspectj/ajde/resources/structure/declareParents.gif
+++ b/ajde/src/main/java/org/aspectj/ajde/resources/structure/declareParents.gif
diff --git a/ajde/src/org/aspectj/ajde/resources/structure/declarePrecedence.gif b/ajde/src/main/java/org/aspectj/ajde/resources/structure/declarePrecedence.gif
index b5e1ce406..b5e1ce406 100644
--- a/ajde/src/org/aspectj/ajde/resources/structure/declarePrecedence.gif
+++ b/ajde/src/main/java/org/aspectj/ajde/resources/structure/declarePrecedence.gif
diff --git a/ajde/src/org/aspectj/ajde/resources/structure/declareSoft.gif b/ajde/src/main/java/org/aspectj/ajde/resources/structure/declareSoft.gif
index a78b43e4c..a78b43e4c 100644
--- a/ajde/src/org/aspectj/ajde/resources/structure/declareSoft.gif
+++ b/ajde/src/main/java/org/aspectj/ajde/resources/structure/declareSoft.gif
diff --git a/ajde/src/org/aspectj/ajde/resources/structure/declareWarning.gif b/ajde/src/main/java/org/aspectj/ajde/resources/structure/declareWarning.gif
index 6f80eec9d..6f80eec9d 100644
--- a/ajde/src/org/aspectj/ajde/resources/structure/declareWarning.gif
+++ b/ajde/src/main/java/org/aspectj/ajde/resources/structure/declareWarning.gif
diff --git a/ajde/src/org/aspectj/ajde/resources/structure/enum.gif b/ajde/src/main/java/org/aspectj/ajde/resources/structure/enum.gif
index 15535f52f..15535f52f 100644
--- a/ajde/src/org/aspectj/ajde/resources/structure/enum.gif
+++ b/ajde/src/main/java/org/aspectj/ajde/resources/structure/enum.gif
diff --git a/ajde/src/org/aspectj/ajde/resources/structure/error.gif b/ajde/src/main/java/org/aspectj/ajde/resources/structure/error.gif
index 964229dcc..964229dcc 100644
--- a/ajde/src/org/aspectj/ajde/resources/structure/error.gif
+++ b/ajde/src/main/java/org/aspectj/ajde/resources/structure/error.gif
diff --git a/ajde/src/org/aspectj/ajde/resources/structure/field.gif b/ajde/src/main/java/org/aspectj/ajde/resources/structure/field.gif
index 2df264501..2df264501 100644
--- a/ajde/src/org/aspectj/ajde/resources/structure/field.gif
+++ b/ajde/src/main/java/org/aspectj/ajde/resources/structure/field.gif
diff --git a/ajde/src/org/aspectj/ajde/resources/structure/file-aspectj.gif b/ajde/src/main/java/org/aspectj/ajde/resources/structure/file-aspectj.gif
index c6b3df108..c6b3df108 100644
--- a/ajde/src/org/aspectj/ajde/resources/structure/file-aspectj.gif
+++ b/ajde/src/main/java/org/aspectj/ajde/resources/structure/file-aspectj.gif
diff --git a/ajde/src/org/aspectj/ajde/resources/structure/file-java.gif b/ajde/src/main/java/org/aspectj/ajde/resources/structure/file-java.gif
index 3cab52eb2..3cab52eb2 100644
--- a/ajde/src/org/aspectj/ajde/resources/structure/file-java.gif
+++ b/ajde/src/main/java/org/aspectj/ajde/resources/structure/file-java.gif
diff --git a/ajde/src/org/aspectj/ajde/resources/structure/file-lst.gif b/ajde/src/main/java/org/aspectj/ajde/resources/structure/file-lst.gif
index d67e52bb8..d67e52bb8 100644
--- a/ajde/src/org/aspectj/ajde/resources/structure/file-lst.gif
+++ b/ajde/src/main/java/org/aspectj/ajde/resources/structure/file-lst.gif
diff --git a/ajde/src/org/aspectj/ajde/resources/structure/file.gif b/ajde/src/main/java/org/aspectj/ajde/resources/structure/file.gif
index 53eafb09c..53eafb09c 100644
--- a/ajde/src/org/aspectj/ajde/resources/structure/file.gif
+++ b/ajde/src/main/java/org/aspectj/ajde/resources/structure/file.gif
diff --git a/ajde/src/org/aspectj/ajde/resources/structure/info.gif b/ajde/src/main/java/org/aspectj/ajde/resources/structure/info.gif
index 6a6d53745..6a6d53745 100644
--- a/ajde/src/org/aspectj/ajde/resources/structure/info.gif
+++ b/ajde/src/main/java/org/aspectj/ajde/resources/structure/info.gif
diff --git a/ajde/src/org/aspectj/ajde/resources/structure/inheritanceBack.gif b/ajde/src/main/java/org/aspectj/ajde/resources/structure/inheritanceBack.gif
index 42db4fe5e..42db4fe5e 100644
--- a/ajde/src/org/aspectj/ajde/resources/structure/inheritanceBack.gif
+++ b/ajde/src/main/java/org/aspectj/ajde/resources/structure/inheritanceBack.gif
diff --git a/ajde/src/org/aspectj/ajde/resources/structure/inheritanceForward.gif b/ajde/src/main/java/org/aspectj/ajde/resources/structure/inheritanceForward.gif
index cc55b3c86..cc55b3c86 100644
--- a/ajde/src/org/aspectj/ajde/resources/structure/inheritanceForward.gif
+++ b/ajde/src/main/java/org/aspectj/ajde/resources/structure/inheritanceForward.gif
diff --git a/ajde/src/org/aspectj/ajde/resources/structure/interface.gif b/ajde/src/main/java/org/aspectj/ajde/resources/structure/interface.gif
index 1b3eaec83..1b3eaec83 100644
--- a/ajde/src/org/aspectj/ajde/resources/structure/interface.gif
+++ b/ajde/src/main/java/org/aspectj/ajde/resources/structure/interface.gif
diff --git a/ajde/src/org/aspectj/ajde/resources/structure/introduction.gif b/ajde/src/main/java/org/aspectj/ajde/resources/structure/introduction.gif
index 389d1429e..389d1429e 100644
--- a/ajde/src/org/aspectj/ajde/resources/structure/introduction.gif
+++ b/ajde/src/main/java/org/aspectj/ajde/resources/structure/introduction.gif
diff --git a/ajde/src/org/aspectj/ajde/resources/structure/method.gif b/ajde/src/main/java/org/aspectj/ajde/resources/structure/method.gif
index 14308e89a..14308e89a 100644
--- a/ajde/src/org/aspectj/ajde/resources/structure/method.gif
+++ b/ajde/src/main/java/org/aspectj/ajde/resources/structure/method.gif
diff --git a/ajde/src/org/aspectj/ajde/resources/structure/package.gif b/ajde/src/main/java/org/aspectj/ajde/resources/structure/package.gif
index f9be40a97..f9be40a97 100644
--- a/ajde/src/org/aspectj/ajde/resources/structure/package.gif
+++ b/ajde/src/main/java/org/aspectj/ajde/resources/structure/package.gif
diff --git a/ajde/src/org/aspectj/ajde/resources/structure/pointcut.gif b/ajde/src/main/java/org/aspectj/ajde/resources/structure/pointcut.gif
index d6e9454ac..d6e9454ac 100644
--- a/ajde/src/org/aspectj/ajde/resources/structure/pointcut.gif
+++ b/ajde/src/main/java/org/aspectj/ajde/resources/structure/pointcut.gif
diff --git a/ajde/src/org/aspectj/ajde/resources/structure/precedenceBack.gif b/ajde/src/main/java/org/aspectj/ajde/resources/structure/precedenceBack.gif
index 3c347653f..3c347653f 100644
--- a/ajde/src/org/aspectj/ajde/resources/structure/precedenceBack.gif
+++ b/ajde/src/main/java/org/aspectj/ajde/resources/structure/precedenceBack.gif
diff --git a/ajde/src/org/aspectj/ajde/resources/structure/precedenceForward.gif b/ajde/src/main/java/org/aspectj/ajde/resources/structure/precedenceForward.gif
index 51a913b6c..51a913b6c 100644
--- a/ajde/src/org/aspectj/ajde/resources/structure/precedenceForward.gif
+++ b/ajde/src/main/java/org/aspectj/ajde/resources/structure/precedenceForward.gif
diff --git a/ajde/src/org/aspectj/ajde/resources/structure/project.gif b/ajde/src/main/java/org/aspectj/ajde/resources/structure/project.gif
index 8e2d2e7d0..8e2d2e7d0 100644
--- a/ajde/src/org/aspectj/ajde/resources/structure/project.gif
+++ b/ajde/src/main/java/org/aspectj/ajde/resources/structure/project.gif
diff --git a/ajde/src/org/aspectj/ajde/resources/structure/referenceBack.gif b/ajde/src/main/java/org/aspectj/ajde/resources/structure/referenceBack.gif
index 0a8207c0e..0a8207c0e 100644
--- a/ajde/src/org/aspectj/ajde/resources/structure/referenceBack.gif
+++ b/ajde/src/main/java/org/aspectj/ajde/resources/structure/referenceBack.gif
diff --git a/ajde/src/org/aspectj/ajde/resources/structure/referenceForward.gif b/ajde/src/main/java/org/aspectj/ajde/resources/structure/referenceForward.gif
index f5ecde63f..f5ecde63f 100644
--- a/ajde/src/org/aspectj/ajde/resources/structure/referenceForward.gif
+++ b/ajde/src/main/java/org/aspectj/ajde/resources/structure/referenceForward.gif
diff --git a/ajde/src/org/aspectj/ajde/resources/structure/search.gif b/ajde/src/main/java/org/aspectj/ajde/resources/structure/search.gif
index 164b9123e..164b9123e 100644
--- a/ajde/src/org/aspectj/ajde/resources/structure/search.gif
+++ b/ajde/src/main/java/org/aspectj/ajde/resources/structure/search.gif
diff --git a/ajde/src/org/aspectj/ajde/resources/structure/warning.gif b/ajde/src/main/java/org/aspectj/ajde/resources/structure/warning.gif
index 4430459ce..4430459ce 100644
--- a/ajde/src/org/aspectj/ajde/resources/structure/warning.gif
+++ b/ajde/src/main/java/org/aspectj/ajde/resources/structure/warning.gif
diff --git a/ajde/src/org/aspectj/ajde/ui/AbstractIcon.java b/ajde/src/main/java/org/aspectj/ajde/ui/AbstractIcon.java
index c9485c885..c9485c885 100644
--- a/ajde/src/org/aspectj/ajde/ui/AbstractIcon.java
+++ b/ajde/src/main/java/org/aspectj/ajde/ui/AbstractIcon.java
diff --git a/ajde/src/org/aspectj/ajde/ui/AbstractIconRegistry.java b/ajde/src/main/java/org/aspectj/ajde/ui/AbstractIconRegistry.java
index 742cc1a6b..742cc1a6b 100644
--- a/ajde/src/org/aspectj/ajde/ui/AbstractIconRegistry.java
+++ b/ajde/src/main/java/org/aspectj/ajde/ui/AbstractIconRegistry.java
diff --git a/ajde/src/org/aspectj/ajde/ui/BuildConfigEditor.java b/ajde/src/main/java/org/aspectj/ajde/ui/BuildConfigEditor.java
index 174f92c0c..174f92c0c 100644
--- a/ajde/src/org/aspectj/ajde/ui/BuildConfigEditor.java
+++ b/ajde/src/main/java/org/aspectj/ajde/ui/BuildConfigEditor.java
diff --git a/ajde/src/org/aspectj/ajde/ui/BuildConfigModel.java b/ajde/src/main/java/org/aspectj/ajde/ui/BuildConfigModel.java
index 717818034..717818034 100644
--- a/ajde/src/org/aspectj/ajde/ui/BuildConfigModel.java
+++ b/ajde/src/main/java/org/aspectj/ajde/ui/BuildConfigModel.java
diff --git a/ajde/src/org/aspectj/ajde/ui/BuildConfigNode.java b/ajde/src/main/java/org/aspectj/ajde/ui/BuildConfigNode.java
index 73e0bead0..73e0bead0 100644
--- a/ajde/src/org/aspectj/ajde/ui/BuildConfigNode.java
+++ b/ajde/src/main/java/org/aspectj/ajde/ui/BuildConfigNode.java
diff --git a/ajde/src/org/aspectj/ajde/ui/FileStructureView.java b/ajde/src/main/java/org/aspectj/ajde/ui/FileStructureView.java
index 6e5107549..6e5107549 100644
--- a/ajde/src/org/aspectj/ajde/ui/FileStructureView.java
+++ b/ajde/src/main/java/org/aspectj/ajde/ui/FileStructureView.java
diff --git a/ajde/src/org/aspectj/ajde/ui/GlobalStructureView.java b/ajde/src/main/java/org/aspectj/ajde/ui/GlobalStructureView.java
index 3abf9c31f..3abf9c31f 100644
--- a/ajde/src/org/aspectj/ajde/ui/GlobalStructureView.java
+++ b/ajde/src/main/java/org/aspectj/ajde/ui/GlobalStructureView.java
diff --git a/ajde/src/org/aspectj/ajde/ui/GlobalViewProperties.java b/ajde/src/main/java/org/aspectj/ajde/ui/GlobalViewProperties.java
index fb58021cc..fb58021cc 100644
--- a/ajde/src/org/aspectj/ajde/ui/GlobalViewProperties.java
+++ b/ajde/src/main/java/org/aspectj/ajde/ui/GlobalViewProperties.java
diff --git a/ajde/src/org/aspectj/ajde/ui/IStructureViewNode.java b/ajde/src/main/java/org/aspectj/ajde/ui/IStructureViewNode.java
index 312a4a688..312a4a688 100644
--- a/ajde/src/org/aspectj/ajde/ui/IStructureViewNode.java
+++ b/ajde/src/main/java/org/aspectj/ajde/ui/IStructureViewNode.java
diff --git a/ajde/src/org/aspectj/ajde/ui/InvalidResourceException.java b/ajde/src/main/java/org/aspectj/ajde/ui/InvalidResourceException.java
index a868292a3..a868292a3 100644
--- a/ajde/src/org/aspectj/ajde/ui/InvalidResourceException.java
+++ b/ajde/src/main/java/org/aspectj/ajde/ui/InvalidResourceException.java
diff --git a/ajde/src/org/aspectj/ajde/ui/StructureSearchManager.java b/ajde/src/main/java/org/aspectj/ajde/ui/StructureSearchManager.java
index a8fa324bf..a8fa324bf 100644
--- a/ajde/src/org/aspectj/ajde/ui/StructureSearchManager.java
+++ b/ajde/src/main/java/org/aspectj/ajde/ui/StructureSearchManager.java
diff --git a/ajde/src/org/aspectj/ajde/ui/StructureView.java b/ajde/src/main/java/org/aspectj/ajde/ui/StructureView.java
index edbae4698..edbae4698 100644
--- a/ajde/src/org/aspectj/ajde/ui/StructureView.java
+++ b/ajde/src/main/java/org/aspectj/ajde/ui/StructureView.java
diff --git a/ajde/src/org/aspectj/ajde/ui/StructureViewManager.java b/ajde/src/main/java/org/aspectj/ajde/ui/StructureViewManager.java
index eb8fdc033..eb8fdc033 100644
--- a/ajde/src/org/aspectj/ajde/ui/StructureViewManager.java
+++ b/ajde/src/main/java/org/aspectj/ajde/ui/StructureViewManager.java
diff --git a/ajde/src/org/aspectj/ajde/ui/StructureViewNodeFactory.java b/ajde/src/main/java/org/aspectj/ajde/ui/StructureViewNodeFactory.java
index cb82a65db..cb82a65db 100644
--- a/ajde/src/org/aspectj/ajde/ui/StructureViewNodeFactory.java
+++ b/ajde/src/main/java/org/aspectj/ajde/ui/StructureViewNodeFactory.java
diff --git a/ajde/src/org/aspectj/ajde/ui/StructureViewProperties.java b/ajde/src/main/java/org/aspectj/ajde/ui/StructureViewProperties.java
index 5351803d4..5351803d4 100644
--- a/ajde/src/org/aspectj/ajde/ui/StructureViewProperties.java
+++ b/ajde/src/main/java/org/aspectj/ajde/ui/StructureViewProperties.java
diff --git a/ajde/src/org/aspectj/ajde/ui/StructureViewRenderer.java b/ajde/src/main/java/org/aspectj/ajde/ui/StructureViewRenderer.java
index c31a130fa..c31a130fa 100644
--- a/ajde/src/org/aspectj/ajde/ui/StructureViewRenderer.java
+++ b/ajde/src/main/java/org/aspectj/ajde/ui/StructureViewRenderer.java
diff --git a/ajde/src/org/aspectj/ajde/ui/UserPreferencesAdapter.java b/ajde/src/main/java/org/aspectj/ajde/ui/UserPreferencesAdapter.java
index 5d8560952..5d8560952 100644
--- a/ajde/src/org/aspectj/ajde/ui/UserPreferencesAdapter.java
+++ b/ajde/src/main/java/org/aspectj/ajde/ui/UserPreferencesAdapter.java
diff --git a/ajde/src/org/aspectj/ajde/ui/internal/NavigationHistoryModel.java b/ajde/src/main/java/org/aspectj/ajde/ui/internal/NavigationHistoryModel.java
index 0aad967fb..0aad967fb 100644
--- a/ajde/src/org/aspectj/ajde/ui/internal/NavigationHistoryModel.java
+++ b/ajde/src/main/java/org/aspectj/ajde/ui/internal/NavigationHistoryModel.java
diff --git a/ajde/src/org/aspectj/ajde/ui/internal/TreeStructureViewBuilder.java b/ajde/src/main/java/org/aspectj/ajde/ui/internal/TreeStructureViewBuilder.java
index af1a2477f..af1a2477f 100644
--- a/ajde/src/org/aspectj/ajde/ui/internal/TreeStructureViewBuilder.java
+++ b/ajde/src/main/java/org/aspectj/ajde/ui/internal/TreeStructureViewBuilder.java
diff --git a/ajde/src/org/aspectj/ajde/ui/internal/UserPreferencesStore.java b/ajde/src/main/java/org/aspectj/ajde/ui/internal/UserPreferencesStore.java
index b1120f0fb..b1120f0fb 100644
--- a/ajde/src/org/aspectj/ajde/ui/internal/UserPreferencesStore.java
+++ b/ajde/src/main/java/org/aspectj/ajde/ui/internal/UserPreferencesStore.java
diff --git a/ajde/src/org/aspectj/ajde/ui/javaoptions/JavaBuildOptions.java b/ajde/src/main/java/org/aspectj/ajde/ui/javaoptions/JavaBuildOptions.java
index 0fd719f85..0fd719f85 100644
--- a/ajde/src/org/aspectj/ajde/ui/javaoptions/JavaBuildOptions.java
+++ b/ajde/src/main/java/org/aspectj/ajde/ui/javaoptions/JavaBuildOptions.java
diff --git a/ajde/src/org/aspectj/ajde/ui/javaoptions/JavaCompilerWarningsOptionsPanel.java b/ajde/src/main/java/org/aspectj/ajde/ui/javaoptions/JavaCompilerWarningsOptionsPanel.java
index f34ace5df..f34ace5df 100644
--- a/ajde/src/org/aspectj/ajde/ui/javaoptions/JavaCompilerWarningsOptionsPanel.java
+++ b/ajde/src/main/java/org/aspectj/ajde/ui/javaoptions/JavaCompilerWarningsOptionsPanel.java
diff --git a/ajde/src/org/aspectj/ajde/ui/javaoptions/JavaComplianceOptionsPanel.java b/ajde/src/main/java/org/aspectj/ajde/ui/javaoptions/JavaComplianceOptionsPanel.java
index 09eabe901..09eabe901 100644
--- a/ajde/src/org/aspectj/ajde/ui/javaoptions/JavaComplianceOptionsPanel.java
+++ b/ajde/src/main/java/org/aspectj/ajde/ui/javaoptions/JavaComplianceOptionsPanel.java
diff --git a/ajde/src/org/aspectj/ajde/ui/javaoptions/JavaDebugOptionsPanel.java b/ajde/src/main/java/org/aspectj/ajde/ui/javaoptions/JavaDebugOptionsPanel.java
index 7d19d6a08..7d19d6a08 100644
--- a/ajde/src/org/aspectj/ajde/ui/javaoptions/JavaDebugOptionsPanel.java
+++ b/ajde/src/main/java/org/aspectj/ajde/ui/javaoptions/JavaDebugOptionsPanel.java
diff --git a/ajde/src/org/aspectj/ajde/ui/javaoptions/JavaOtherOptionsPanel.java b/ajde/src/main/java/org/aspectj/ajde/ui/javaoptions/JavaOtherOptionsPanel.java
index 5ffaf13c3..5ffaf13c3 100644
--- a/ajde/src/org/aspectj/ajde/ui/javaoptions/JavaOtherOptionsPanel.java
+++ b/ajde/src/main/java/org/aspectj/ajde/ui/javaoptions/JavaOtherOptionsPanel.java
diff --git a/ajde/src/org/aspectj/ajde/ui/swing/AJButtonMenuCombo.java b/ajde/src/main/java/org/aspectj/ajde/ui/swing/AJButtonMenuCombo.java
index 72b7abeba..72b7abeba 100644
--- a/ajde/src/org/aspectj/ajde/ui/swing/AJButtonMenuCombo.java
+++ b/ajde/src/main/java/org/aspectj/ajde/ui/swing/AJButtonMenuCombo.java
diff --git a/ajde/src/org/aspectj/ajde/ui/swing/AjdeWidgetStyles.java b/ajde/src/main/java/org/aspectj/ajde/ui/swing/AjdeWidgetStyles.java
index f0637446a..f0637446a 100644
--- a/ajde/src/org/aspectj/ajde/ui/swing/AjdeWidgetStyles.java
+++ b/ajde/src/main/java/org/aspectj/ajde/ui/swing/AjdeWidgetStyles.java
diff --git a/ajde/src/org/aspectj/ajde/ui/swing/BrowserStructureViewToolPanel.java b/ajde/src/main/java/org/aspectj/ajde/ui/swing/BrowserStructureViewToolPanel.java
index 6988536da..6988536da 100644
--- a/ajde/src/org/aspectj/ajde/ui/swing/BrowserStructureViewToolPanel.java
+++ b/ajde/src/main/java/org/aspectj/ajde/ui/swing/BrowserStructureViewToolPanel.java
diff --git a/ajde/src/org/aspectj/ajde/ui/swing/BrowserView.java b/ajde/src/main/java/org/aspectj/ajde/ui/swing/BrowserView.java
index d41827a41..d41827a41 100644
--- a/ajde/src/org/aspectj/ajde/ui/swing/BrowserView.java
+++ b/ajde/src/main/java/org/aspectj/ajde/ui/swing/BrowserView.java
diff --git a/ajde/src/org/aspectj/ajde/ui/swing/BrowserViewManager.java b/ajde/src/main/java/org/aspectj/ajde/ui/swing/BrowserViewManager.java
index cd01dec70..cd01dec70 100644
--- a/ajde/src/org/aspectj/ajde/ui/swing/BrowserViewManager.java
+++ b/ajde/src/main/java/org/aspectj/ajde/ui/swing/BrowserViewManager.java
diff --git a/ajde/src/org/aspectj/ajde/ui/swing/BrowserViewPanel.java b/ajde/src/main/java/org/aspectj/ajde/ui/swing/BrowserViewPanel.java
index 0b15049b6..0b15049b6 100644
--- a/ajde/src/org/aspectj/ajde/ui/swing/BrowserViewPanel.java
+++ b/ajde/src/main/java/org/aspectj/ajde/ui/swing/BrowserViewPanel.java
diff --git a/ajde/src/org/aspectj/ajde/ui/swing/BrowserViewTreeListener.java b/ajde/src/main/java/org/aspectj/ajde/ui/swing/BrowserViewTreeListener.java
index 8e88a38a4..8e88a38a4 100644
--- a/ajde/src/org/aspectj/ajde/ui/swing/BrowserViewTreeListener.java
+++ b/ajde/src/main/java/org/aspectj/ajde/ui/swing/BrowserViewTreeListener.java
diff --git a/ajde/src/org/aspectj/ajde/ui/swing/BuildConfigPopupMenu.java b/ajde/src/main/java/org/aspectj/ajde/ui/swing/BuildConfigPopupMenu.java
index 7ca7a35fd..7ca7a35fd 100644
--- a/ajde/src/org/aspectj/ajde/ui/swing/BuildConfigPopupMenu.java
+++ b/ajde/src/main/java/org/aspectj/ajde/ui/swing/BuildConfigPopupMenu.java
diff --git a/ajde/src/org/aspectj/ajde/ui/swing/BuildProgressPanel.java b/ajde/src/main/java/org/aspectj/ajde/ui/swing/BuildProgressPanel.java
index 8b778cd8a..8b778cd8a 100644
--- a/ajde/src/org/aspectj/ajde/ui/swing/BuildProgressPanel.java
+++ b/ajde/src/main/java/org/aspectj/ajde/ui/swing/BuildProgressPanel.java
diff --git a/ajde/src/org/aspectj/ajde/ui/swing/CompilerMessagesCellRenderer.java b/ajde/src/main/java/org/aspectj/ajde/ui/swing/CompilerMessagesCellRenderer.java
index ea681475f..ea681475f 100644
--- a/ajde/src/org/aspectj/ajde/ui/swing/CompilerMessagesCellRenderer.java
+++ b/ajde/src/main/java/org/aspectj/ajde/ui/swing/CompilerMessagesCellRenderer.java
diff --git a/ajde/src/org/aspectj/ajde/ui/swing/DefaultBuildProgressMonitor.java b/ajde/src/main/java/org/aspectj/ajde/ui/swing/DefaultBuildProgressMonitor.java
index 7fab45d91..7fab45d91 100644
--- a/ajde/src/org/aspectj/ajde/ui/swing/DefaultBuildProgressMonitor.java
+++ b/ajde/src/main/java/org/aspectj/ajde/ui/swing/DefaultBuildProgressMonitor.java
diff --git a/ajde/src/org/aspectj/ajde/ui/swing/ErrorDialog.java b/ajde/src/main/java/org/aspectj/ajde/ui/swing/ErrorDialog.java
index 582926a92..582926a92 100644
--- a/ajde/src/org/aspectj/ajde/ui/swing/ErrorDialog.java
+++ b/ajde/src/main/java/org/aspectj/ajde/ui/swing/ErrorDialog.java
diff --git a/ajde/src/org/aspectj/ajde/ui/swing/GoToLineThread.java b/ajde/src/main/java/org/aspectj/ajde/ui/swing/GoToLineThread.java
index 7b7ae7b68..7b7ae7b68 100644
--- a/ajde/src/org/aspectj/ajde/ui/swing/GoToLineThread.java
+++ b/ajde/src/main/java/org/aspectj/ajde/ui/swing/GoToLineThread.java
diff --git a/ajde/src/org/aspectj/ajde/ui/swing/MultiStructureViewPanel.java b/ajde/src/main/java/org/aspectj/ajde/ui/swing/MultiStructureViewPanel.java
index 5c44d09ba..5c44d09ba 100644
--- a/ajde/src/org/aspectj/ajde/ui/swing/MultiStructureViewPanel.java
+++ b/ajde/src/main/java/org/aspectj/ajde/ui/swing/MultiStructureViewPanel.java
diff --git a/ajde/src/org/aspectj/ajde/ui/swing/OptionsFrame.java b/ajde/src/main/java/org/aspectj/ajde/ui/swing/OptionsFrame.java
index 130183676..130183676 100644
--- a/ajde/src/org/aspectj/ajde/ui/swing/OptionsFrame.java
+++ b/ajde/src/main/java/org/aspectj/ajde/ui/swing/OptionsFrame.java
diff --git a/ajde/src/org/aspectj/ajde/ui/swing/OptionsPanel.java b/ajde/src/main/java/org/aspectj/ajde/ui/swing/OptionsPanel.java
index e49fc247a..e49fc247a 100644
--- a/ajde/src/org/aspectj/ajde/ui/swing/OptionsPanel.java
+++ b/ajde/src/main/java/org/aspectj/ajde/ui/swing/OptionsPanel.java
diff --git a/ajde/src/org/aspectj/ajde/ui/swing/PointcutWizard.java b/ajde/src/main/java/org/aspectj/ajde/ui/swing/PointcutWizard.java
index ed7235186..ed7235186 100644
--- a/ajde/src/org/aspectj/ajde/ui/swing/PointcutWizard.java
+++ b/ajde/src/main/java/org/aspectj/ajde/ui/swing/PointcutWizard.java
diff --git a/ajde/src/org/aspectj/ajde/ui/swing/SimpleStructureViewToolPanel.java b/ajde/src/main/java/org/aspectj/ajde/ui/swing/SimpleStructureViewToolPanel.java
index b12698d5e..b12698d5e 100644
--- a/ajde/src/org/aspectj/ajde/ui/swing/SimpleStructureViewToolPanel.java
+++ b/ajde/src/main/java/org/aspectj/ajde/ui/swing/SimpleStructureViewToolPanel.java
diff --git a/ajde/src/org/aspectj/ajde/ui/swing/StructureTree.java b/ajde/src/main/java/org/aspectj/ajde/ui/swing/StructureTree.java
index af4cd16e2..af4cd16e2 100644
--- a/ajde/src/org/aspectj/ajde/ui/swing/StructureTree.java
+++ b/ajde/src/main/java/org/aspectj/ajde/ui/swing/StructureTree.java
diff --git a/ajde/src/org/aspectj/ajde/ui/swing/StructureTreeManager.java b/ajde/src/main/java/org/aspectj/ajde/ui/swing/StructureTreeManager.java
index 474ba1f60..474ba1f60 100644
--- a/ajde/src/org/aspectj/ajde/ui/swing/StructureTreeManager.java
+++ b/ajde/src/main/java/org/aspectj/ajde/ui/swing/StructureTreeManager.java
diff --git a/ajde/src/org/aspectj/ajde/ui/swing/StructureViewPanel.java b/ajde/src/main/java/org/aspectj/ajde/ui/swing/StructureViewPanel.java
index c1435051a..c1435051a 100644
--- a/ajde/src/org/aspectj/ajde/ui/swing/StructureViewPanel.java
+++ b/ajde/src/main/java/org/aspectj/ajde/ui/swing/StructureViewPanel.java
diff --git a/ajde/src/org/aspectj/ajde/ui/swing/StructureViewTreeListener.java b/ajde/src/main/java/org/aspectj/ajde/ui/swing/StructureViewTreeListener.java
index 589762fef..589762fef 100644
--- a/ajde/src/org/aspectj/ajde/ui/swing/StructureViewTreeListener.java
+++ b/ajde/src/main/java/org/aspectj/ajde/ui/swing/StructureViewTreeListener.java
diff --git a/ajde/src/org/aspectj/ajde/ui/swing/SwingTreeViewNode.java b/ajde/src/main/java/org/aspectj/ajde/ui/swing/SwingTreeViewNode.java
index 253ea359e..253ea359e 100644
--- a/ajde/src/org/aspectj/ajde/ui/swing/SwingTreeViewNode.java
+++ b/ajde/src/main/java/org/aspectj/ajde/ui/swing/SwingTreeViewNode.java
diff --git a/ajde/src/org/aspectj/ajde/ui/swing/SwingTreeViewNodeFactory.java b/ajde/src/main/java/org/aspectj/ajde/ui/swing/SwingTreeViewNodeFactory.java
index 02b8ba52c..02b8ba52c 100644
--- a/ajde/src/org/aspectj/ajde/ui/swing/SwingTreeViewNodeFactory.java
+++ b/ajde/src/main/java/org/aspectj/ajde/ui/swing/SwingTreeViewNodeFactory.java
diff --git a/ajde/src/org/aspectj/ajde/ui/swing/SwingTreeViewNodeRenderer.java b/ajde/src/main/java/org/aspectj/ajde/ui/swing/SwingTreeViewNodeRenderer.java
index 80396be73..80396be73 100644
--- a/ajde/src/org/aspectj/ajde/ui/swing/SwingTreeViewNodeRenderer.java
+++ b/ajde/src/main/java/org/aspectj/ajde/ui/swing/SwingTreeViewNodeRenderer.java
diff --git a/ajde/src/org/aspectj/ajde/ui/swing/TreeViewBuildConfigEditor.java b/ajde/src/main/java/org/aspectj/ajde/ui/swing/TreeViewBuildConfigEditor.java
index 3d332c865..3d332c865 100644
--- a/ajde/src/org/aspectj/ajde/ui/swing/TreeViewBuildConfigEditor.java
+++ b/ajde/src/main/java/org/aspectj/ajde/ui/swing/TreeViewBuildConfigEditor.java
diff --git a/ajde/src/org/aspectj/ajde/ui/swing/UpdateConfigurationDialog.java b/ajde/src/main/java/org/aspectj/ajde/ui/swing/UpdateConfigurationDialog.java
index 2fc7bf201..2fc7bf201 100644
--- a/ajde/src/org/aspectj/ajde/ui/swing/UpdateConfigurationDialog.java
+++ b/ajde/src/main/java/org/aspectj/ajde/ui/swing/UpdateConfigurationDialog.java
diff --git a/ajde/testsrc/org/aspectj/ajde/AjdeCompilerTests.java b/ajde/src/test/java/org/aspectj/ajde/AjdeCompilerTests.java
index 0d9d6d68d..0d9d6d68d 100644
--- a/ajde/testsrc/org/aspectj/ajde/AjdeCompilerTests.java
+++ b/ajde/src/test/java/org/aspectj/ajde/AjdeCompilerTests.java
diff --git a/ajde/testsrc/org/aspectj/ajde/AjdeModuleTests.java b/ajde/src/test/java/org/aspectj/ajde/AjdeModuleTests.java
index b6a1daa55..b6a1daa55 100644
--- a/ajde/testsrc/org/aspectj/ajde/AjdeModuleTests.java
+++ b/ajde/src/test/java/org/aspectj/ajde/AjdeModuleTests.java
diff --git a/ajde/testsrc/org/aspectj/ajde/AjdeTestCase.java b/ajde/src/test/java/org/aspectj/ajde/AjdeTestCase.java
index 5f2b2f2f7..5f2b2f2f7 100644
--- a/ajde/testsrc/org/aspectj/ajde/AjdeTestCase.java
+++ b/ajde/src/test/java/org/aspectj/ajde/AjdeTestCase.java
diff --git a/ajde/testsrc/org/aspectj/ajde/AjdeTests.java b/ajde/src/test/java/org/aspectj/ajde/AjdeTests.java
index c48b9d2fe..c48b9d2fe 100644
--- a/ajde/testsrc/org/aspectj/ajde/AjdeTests.java
+++ b/ajde/src/test/java/org/aspectj/ajde/AjdeTests.java
diff --git a/ajde/testsrc/org/aspectj/ajde/ExtensionTests.java b/ajde/src/test/java/org/aspectj/ajde/ExtensionTests.java
index 0a445ba8b..0a445ba8b 100644
--- a/ajde/testsrc/org/aspectj/ajde/ExtensionTests.java
+++ b/ajde/src/test/java/org/aspectj/ajde/ExtensionTests.java
diff --git a/ajde/testsrc/org/aspectj/ajde/SymbolFileGenerationTest.java b/ajde/src/test/java/org/aspectj/ajde/SymbolFileGenerationTest.java
index 2d1669695..2d1669695 100644
--- a/ajde/testsrc/org/aspectj/ajde/SymbolFileGenerationTest.java
+++ b/ajde/src/test/java/org/aspectj/ajde/SymbolFileGenerationTest.java
diff --git a/ajde/testsrc/org/aspectj/ajde/internal/AspectJBuildManagerTest.java b/ajde/src/test/java/org/aspectj/ajde/internal/AspectJBuildManagerTest.java
index 41c2aec9f..41c2aec9f 100644
--- a/ajde/testsrc/org/aspectj/ajde/internal/AspectJBuildManagerTest.java
+++ b/ajde/src/test/java/org/aspectj/ajde/internal/AspectJBuildManagerTest.java
diff --git a/ajde/testsrc/org/aspectj/ajde/internal/LstBuildConfigManagerTest.java b/ajde/src/test/java/org/aspectj/ajde/internal/LstBuildConfigManagerTest.java
index 902c34d62..902c34d62 100644
--- a/ajde/testsrc/org/aspectj/ajde/internal/LstBuildConfigManagerTest.java
+++ b/ajde/src/test/java/org/aspectj/ajde/internal/LstBuildConfigManagerTest.java
diff --git a/ajde/testsrc/org/aspectj/ajde/ui/NullIdeFileStructureView.java b/ajde/src/test/java/org/aspectj/ajde/ui/NullIdeFileStructureView.java
index 40c0b2b92..40c0b2b92 100644
--- a/ajde/testsrc/org/aspectj/ajde/ui/NullIdeFileStructureView.java
+++ b/ajde/src/test/java/org/aspectj/ajde/ui/NullIdeFileStructureView.java
diff --git a/ajde/testsrc/org/aspectj/ajde/ui/NullIdeStructureViewRenderer.java b/ajde/src/test/java/org/aspectj/ajde/ui/NullIdeStructureViewRenderer.java
index 81b65dea0..81b65dea0 100644
--- a/ajde/testsrc/org/aspectj/ajde/ui/NullIdeStructureViewRenderer.java
+++ b/ajde/src/test/java/org/aspectj/ajde/ui/NullIdeStructureViewRenderer.java
diff --git a/ajde/testsrc/org/aspectj/ajde/ui/StructureSearchManagerTest.java b/ajde/src/test/java/org/aspectj/ajde/ui/StructureSearchManagerTest.java
index f25262424..f25262424 100644
--- a/ajde/testsrc/org/aspectj/ajde/ui/StructureSearchManagerTest.java
+++ b/ajde/src/test/java/org/aspectj/ajde/ui/StructureSearchManagerTest.java
diff --git a/ajde/testsrc/org/aspectj/ajde/ui/StructureViewManagerTest.java b/ajde/src/test/java/org/aspectj/ajde/ui/StructureViewManagerTest.java
index 8e407f48d..8e407f48d 100644
--- a/ajde/testsrc/org/aspectj/ajde/ui/StructureViewManagerTest.java
+++ b/ajde/src/test/java/org/aspectj/ajde/ui/StructureViewManagerTest.java
diff --git a/ajde/testsrc/org/aspectj/ajde/ui/utils/TestBuildProgressMonitor.java b/ajde/src/test/java/org/aspectj/ajde/ui/utils/TestBuildProgressMonitor.java
index 935dcc363..935dcc363 100644
--- a/ajde/testsrc/org/aspectj/ajde/ui/utils/TestBuildProgressMonitor.java
+++ b/ajde/src/test/java/org/aspectj/ajde/ui/utils/TestBuildProgressMonitor.java
diff --git a/ajde/testsrc/org/aspectj/ajde/ui/utils/TestCompilerConfiguration.java b/ajde/src/test/java/org/aspectj/ajde/ui/utils/TestCompilerConfiguration.java
index 69e5ea9d9..69e5ea9d9 100644
--- a/ajde/testsrc/org/aspectj/ajde/ui/utils/TestCompilerConfiguration.java
+++ b/ajde/src/test/java/org/aspectj/ajde/ui/utils/TestCompilerConfiguration.java
diff --git a/ajde/testsrc/org/aspectj/ajde/ui/utils/TestEditorAdapter.java b/ajde/src/test/java/org/aspectj/ajde/ui/utils/TestEditorAdapter.java
index 6c94e7f33..6c94e7f33 100644
--- a/ajde/testsrc/org/aspectj/ajde/ui/utils/TestEditorAdapter.java
+++ b/ajde/src/test/java/org/aspectj/ajde/ui/utils/TestEditorAdapter.java
diff --git a/ajde/testsrc/org/aspectj/ajde/ui/utils/TestIdeUIAdapter.java b/ajde/src/test/java/org/aspectj/ajde/ui/utils/TestIdeUIAdapter.java
index 2bc23ec60..2bc23ec60 100644
--- a/ajde/testsrc/org/aspectj/ajde/ui/utils/TestIdeUIAdapter.java
+++ b/ajde/src/test/java/org/aspectj/ajde/ui/utils/TestIdeUIAdapter.java
diff --git a/ajde/testsrc/org/aspectj/ajde/ui/utils/TestMessageHandler.java b/ajde/src/test/java/org/aspectj/ajde/ui/utils/TestMessageHandler.java
index 8901b02f4..8901b02f4 100644
--- a/ajde/testsrc/org/aspectj/ajde/ui/utils/TestMessageHandler.java
+++ b/ajde/src/test/java/org/aspectj/ajde/ui/utils/TestMessageHandler.java
diff --git a/ajde/testsrc/org/aspectj/ajde/ui/utils/TestOutputLocationManager.java b/ajde/src/test/java/org/aspectj/ajde/ui/utils/TestOutputLocationManager.java
index 157f3ecd4..157f3ecd4 100644
--- a/ajde/testsrc/org/aspectj/ajde/ui/utils/TestOutputLocationManager.java
+++ b/ajde/src/test/java/org/aspectj/ajde/ui/utils/TestOutputLocationManager.java
diff --git a/ajde/testsrc/org/aspectj/ajde/ui/utils/TestRuntimeProperties.java b/ajde/src/test/java/org/aspectj/ajde/ui/utils/TestRuntimeProperties.java
index a9e923e2a..a9e923e2a 100644
--- a/ajde/testsrc/org/aspectj/ajde/ui/utils/TestRuntimeProperties.java
+++ b/ajde/src/test/java/org/aspectj/ajde/ui/utils/TestRuntimeProperties.java