Merge branch 'master' into feature/collection-performance

20 files changed, 0 insertions, 31 deletions

diff --git a/ajde/src/main/java/org/aspectj/ajde/Ajde.java b/ajde/src/main/java/org/aspectj/ajde/Ajde.java
index b458eb9da..14995d75d 100644
--- a/ajde/src/main/java/org/aspectj/ajde/Ajde.java
+++ b/ajde/src/main/java/org/aspectj/ajde/Ajde.java
@@ -18,7 +18,6 @@ import java.awt.Frame;
 import java.io.File;
 import java.util.Arrays;
 import java.util.Collections;
-import java.util.Iterator;
 import java.util.List;
 
 import javax.swing.JOptionPane;
diff --git a/ajde/src/main/java/org/aspectj/ajde/internal/LstBuildConfigFileUpdater.java b/ajde/src/main/java/org/aspectj/ajde/internal/LstBuildConfigFileUpdater.java
index 4ca7316f4..ece904adf 100644
--- a/ajde/src/main/java/org/aspectj/ajde/internal/LstBuildConfigFileUpdater.java
+++ b/ajde/src/main/java/org/aspectj/ajde/internal/LstBuildConfigFileUpdater.java
@@ -21,7 +21,6 @@ import java.io.FileReader;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.HashSet;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
 import java.util.TreeSet;
diff --git a/ajde/src/main/java/org/aspectj/ajde/internal/LstBuildConfigManager.java b/ajde/src/main/java/org/aspectj/ajde/internal/LstBuildConfigManager.java
index 20db17581..2837de76b 100644
--- a/ajde/src/main/java/org/aspectj/ajde/internal/LstBuildConfigManager.java
+++ b/ajde/src/main/java/org/aspectj/ajde/internal/LstBuildConfigManager.java
@@ -20,7 +20,6 @@ import java.io.FilenameFilter;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
-import java.util.Iterator;
 import java.util.List;
 
 import org.aspectj.ajde.Ajde;
diff --git a/ajde/src/main/java/org/aspectj/ajde/ui/StructureSearchManager.java b/ajde/src/main/java/org/aspectj/ajde/ui/StructureSearchManager.java
index 8839b00da..ce0560287 100644
--- a/ajde/src/main/java/org/aspectj/ajde/ui/StructureSearchManager.java
+++ b/ajde/src/main/java/org/aspectj/ajde/ui/StructureSearchManager.java
@@ -15,7 +15,6 @@
 package org.aspectj.ajde.ui;
 
 import java.util.ArrayList;
-import java.util.Iterator;
 import java.util.List;
 
 import org.aspectj.asm.AsmManager;
diff --git a/ajde/src/main/java/org/aspectj/ajde/ui/StructureView.java b/ajde/src/main/java/org/aspectj/ajde/ui/StructureView.java
index 7d6e4838b..4a10462a2 100644
--- a/ajde/src/main/java/org/aspectj/ajde/ui/StructureView.java
+++ b/ajde/src/main/java/org/aspectj/ajde/ui/StructureView.java
@@ -14,8 +14,6 @@
 
 package org.aspectj.ajde.ui;
 
-import java.util.Iterator;
-
 import org.aspectj.asm.IProgramElement;
 
 /**
diff --git a/ajde/src/main/java/org/aspectj/ajde/ui/StructureViewManager.java b/ajde/src/main/java/org/aspectj/ajde/ui/StructureViewManager.java
index 8f60ff824..8fa1c7539 100644
--- a/ajde/src/main/java/org/aspectj/ajde/ui/StructureViewManager.java
+++ b/ajde/src/main/java/org/aspectj/ajde/ui/StructureViewManager.java
@@ -15,7 +15,6 @@
 package org.aspectj.ajde.ui;
 
 import java.util.ArrayList;
-import java.util.Iterator;
 import java.util.List;
 
 import org.aspectj.ajde.Ajde;
diff --git a/ajde/src/main/java/org/aspectj/ajde/ui/StructureViewNodeFactory.java b/ajde/src/main/java/org/aspectj/ajde/ui/StructureViewNodeFactory.java
index 43513c14b..afefbbe18 100644
--- a/ajde/src/main/java/org/aspectj/ajde/ui/StructureViewNodeFactory.java
+++ b/ajde/src/main/java/org/aspectj/ajde/ui/StructureViewNodeFactory.java
@@ -13,7 +13,6 @@
 
 package org.aspectj.ajde.ui;
 
-import java.util.Iterator;
 import java.util.List;
 
 import org.aspectj.ajde.Ajde;
diff --git a/ajde/src/main/java/org/aspectj/ajde/ui/internal/UserPreferencesStore.java b/ajde/src/main/java/org/aspectj/ajde/ui/internal/UserPreferencesStore.java
index 611af0b4e..b827e9231 100644
--- a/ajde/src/main/java/org/aspectj/ajde/ui/internal/UserPreferencesStore.java
+++ b/ajde/src/main/java/org/aspectj/ajde/ui/internal/UserPreferencesStore.java
@@ -21,7 +21,6 @@ import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.util.ArrayList;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Properties;
 import java.util.StringTokenizer;
diff --git a/ajde/src/main/java/org/aspectj/ajde/ui/javaoptions/JavaCompilerWarningsOptionsPanel.java b/ajde/src/main/java/org/aspectj/ajde/ui/javaoptions/JavaCompilerWarningsOptionsPanel.java
index 51248d6c4..d00146ff9 100644
--- a/ajde/src/main/java/org/aspectj/ajde/ui/javaoptions/JavaCompilerWarningsOptionsPanel.java
+++ b/ajde/src/main/java/org/aspectj/ajde/ui/javaoptions/JavaCompilerWarningsOptionsPanel.java
@@ -14,7 +14,6 @@ import java.awt.BorderLayout;
 import java.awt.Color;
 import java.io.IOException;
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
diff --git a/ajde/src/main/java/org/aspectj/ajde/ui/swing/BrowserStructureViewToolPanel.java b/ajde/src/main/java/org/aspectj/ajde/ui/swing/BrowserStructureViewToolPanel.java
index 6431eb851..10601a27b 100644
--- a/ajde/src/main/java/org/aspectj/ajde/ui/swing/BrowserStructureViewToolPanel.java
+++ b/ajde/src/main/java/org/aspectj/ajde/ui/swing/BrowserStructureViewToolPanel.java
@@ -19,7 +19,6 @@ import java.awt.BorderLayout;
 import java.awt.Dimension;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-import java.util.Iterator;
 
 import javax.swing.ButtonGroup;
 import javax.swing.Icon;
diff --git a/ajde/src/main/java/org/aspectj/ajde/ui/swing/BrowserView.java b/ajde/src/main/java/org/aspectj/ajde/ui/swing/BrowserView.java
index e9c1196e2..de7a16d54 100644
--- a/ajde/src/main/java/org/aspectj/ajde/ui/swing/BrowserView.java
+++ b/ajde/src/main/java/org/aspectj/ajde/ui/swing/BrowserView.java
@@ -23,7 +23,6 @@ import java.awt.GridLayout;
 import java.awt.event.ActionEvent;
 import java.awt.event.MouseEvent;
 import java.io.File;
-import java.util.Iterator;
 
 import javax.swing.BorderFactory;
 import javax.swing.JButton;
diff --git a/ajde/src/main/java/org/aspectj/ajde/ui/swing/BrowserViewPanel.java b/ajde/src/main/java/org/aspectj/ajde/ui/swing/BrowserViewPanel.java
index a32c53c52..5459e916f 100644
--- a/ajde/src/main/java/org/aspectj/ajde/ui/swing/BrowserViewPanel.java
+++ b/ajde/src/main/java/org/aspectj/ajde/ui/swing/BrowserViewPanel.java
@@ -18,7 +18,6 @@ package org.aspectj.ajde.ui.swing;
 import java.awt.BorderLayout;
 import java.awt.Dimension;
 import java.awt.event.ActionEvent;
-import java.util.Iterator;
 
 import javax.swing.JComboBox;
 import javax.swing.JPanel;
diff --git a/ajde/src/main/java/org/aspectj/ajde/ui/swing/BuildConfigPopupMenu.java b/ajde/src/main/java/org/aspectj/ajde/ui/swing/BuildConfigPopupMenu.java
index 0a59ab71a..f1aca6bcd 100644
--- a/ajde/src/main/java/org/aspectj/ajde/ui/swing/BuildConfigPopupMenu.java
+++ b/ajde/src/main/java/org/aspectj/ajde/ui/swing/BuildConfigPopupMenu.java
@@ -17,7 +17,6 @@ package org.aspectj.ajde.ui.swing;
 
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-import java.util.Iterator;
 import java.util.List;
 
 import javax.swing.AbstractAction;
diff --git a/ajde/src/main/java/org/aspectj/ajde/ui/swing/StructureViewPanel.java b/ajde/src/main/java/org/aspectj/ajde/ui/swing/StructureViewPanel.java
index add41298c..c3e87bcf8 100644
--- a/ajde/src/main/java/org/aspectj/ajde/ui/swing/StructureViewPanel.java
+++ b/ajde/src/main/java/org/aspectj/ajde/ui/swing/StructureViewPanel.java
@@ -17,7 +17,6 @@ package org.aspectj.ajde.ui.swing;
 
 import java.awt.BorderLayout;
 import java.awt.Color;
-import java.util.Iterator;
 
 import javax.swing.BorderFactory;
 import javax.swing.JPanel;
diff --git a/ajde/src/main/java/org/aspectj/ajde/ui/swing/SwingTreeViewNode.java b/ajde/src/main/java/org/aspectj/ajde/ui/swing/SwingTreeViewNode.java
index ef756f6e4..987c2d130 100644
--- a/ajde/src/main/java/org/aspectj/ajde/ui/swing/SwingTreeViewNode.java
+++ b/ajde/src/main/java/org/aspectj/ajde/ui/swing/SwingTreeViewNode.java
@@ -15,7 +15,6 @@
 package org.aspectj.ajde.ui.swing;
 
 import java.util.ArrayList;
-import java.util.Iterator;
 import java.util.List;
 
 import javax.swing.tree.DefaultMutableTreeNode;
diff --git a/ajde/src/main/java/org/aspectj/ajde/ui/swing/TreeViewBuildConfigEditor.java b/ajde/src/main/java/org/aspectj/ajde/ui/swing/TreeViewBuildConfigEditor.java
index 02f9aaf8f..9e8b21fb5 100644
--- a/ajde/src/main/java/org/aspectj/ajde/ui/swing/TreeViewBuildConfigEditor.java
+++ b/ajde/src/main/java/org/aspectj/ajde/ui/swing/TreeViewBuildConfigEditor.java
@@ -26,7 +26,6 @@ import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 import java.io.IOException;
 import java.util.ArrayList;
-import java.util.Iterator;
 
 import javax.swing.BoxLayout;
 import javax.swing.Icon;
diff --git a/ajde/src/test/java/org/aspectj/ajde/ExtensionTest.java b/ajde/src/test/java/org/aspectj/ajde/ExtensionTest.java
index ce0269930..384d417f7 100644
--- a/ajde/src/test/java/org/aspectj/ajde/ExtensionTest.java
+++ b/ajde/src/test/java/org/aspectj/ajde/ExtensionTest.java
@@ -11,7 +11,6 @@
 package org.aspectj.ajde;
 
 import java.io.File;
-import java.util.Iterator;
 import java.util.List;
 
 import org.aspectj.asm.AsmManager;
diff --git a/ajde/src/test/java/org/aspectj/ajde/internal/LstBuildConfigManagerTest.java b/ajde/src/test/java/org/aspectj/ajde/internal/LstBuildConfigManagerTest.java
index fe642ff95..74a8cc1eb 100644
--- a/ajde/src/test/java/org/aspectj/ajde/internal/LstBuildConfigManagerTest.java
+++ b/ajde/src/test/java/org/aspectj/ajde/internal/LstBuildConfigManagerTest.java
@@ -28,10 +28,6 @@ public class LstBuildConfigManagerTest extends AjdeTestCase {
 	
 	private BuildConfigManager buildConfigManager = new LstBuildConfigManager();
 
-	public static void main(String[] args) {
-		junit.swingui.TestRunner.run(LstBuildConfigManagerTest.class);
-	}
-
 	public static TestSuite suite() {
 		TestSuite result = new TestSuite();
 		result.addTestSuite(LstBuildConfigManagerTest.class);	
diff --git a/ajde/src/test/java/org/aspectj/ajde/ui/StructureSearchManagerTest.java b/ajde/src/test/java/org/aspectj/ajde/ui/StructureSearchManagerTest.java
index 1dc3d9928..ecbfed0d7 100644
--- a/ajde/src/test/java/org/aspectj/ajde/ui/StructureSearchManagerTest.java
+++ b/ajde/src/test/java/org/aspectj/ajde/ui/StructureSearchManagerTest.java
@@ -26,10 +26,6 @@ import junit.framework.TestSuite;
  * @author Mik Kersten
  */
 public class StructureSearchManagerTest extends AjdeTestCase {
-	
-	public static void main(String[] args) {
-		junit.swingui.TestRunner.run(StructureSearchManagerTest.class);
-	}
 
 	public static TestSuite suite() {
 		TestSuite result = new TestSuite();
diff --git a/ajde/src/test/java/org/aspectj/ajde/ui/StructureViewManagerTest.java b/ajde/src/test/java/org/aspectj/ajde/ui/StructureViewManagerTest.java
index eca56feec..5948d2c5a 100644
--- a/ajde/src/test/java/org/aspectj/ajde/ui/StructureViewManagerTest.java
+++ b/ajde/src/test/java/org/aspectj/ajde/ui/StructureViewManagerTest.java
@@ -14,7 +14,6 @@
 package org.aspectj.ajde.ui;
 
 import java.io.File;
-import java.util.Iterator;
 
 import org.aspectj.ajde.Ajde;
 import org.aspectj.ajde.AjdeTestCase;
@@ -38,10 +37,6 @@ public class StructureViewManagerTest extends AjdeTestCase {
 	private File testFile;
 	private StructureViewProperties properties;
 
-	public static void main(String[] args) {
-		junit.swingui.TestRunner.run(StructureViewManagerTest.class);
-	}
-
 	public static TestSuite suite() {
 		TestSuite result = new TestSuite();
 		result.addTestSuite(StructureViewManagerTest.class);