Ran "Organize imports" to remove redundant imports etc -

clears up a huge set of warnings in Eclipse so that you
can see the wood for the trees!

diff --git a/ajde/src/org/aspectj/ajde/Ajde.java b/ajde/src/org/aspectj/ajde/Ajde.java
index 7edd825a56c7681f2bc25035567effaa126a6762..7f02929823c28db92b305b1694dbb443295b7ba8 100644 (file)
--- a/ajde/src/org/aspectj/ajde/Ajde.java
+++ b/ajde/src/org/aspectj/ajde/Ajde.java
@@ -19,7 +19,11 @@ import java.util.List;
 
 import org.aspectj.ajde.internal.AspectJBuildManager;
 import org.aspectj.ajde.internal.LstBuildConfigManager;
-import org.aspectj.ajde.ui.*;
+import org.aspectj.ajde.ui.EditorManager;
+import org.aspectj.ajde.ui.IdeUIAdapter;
+import org.aspectj.ajde.ui.StructureSearchManager;
+import org.aspectj.ajde.ui.StructureViewManager;
+import org.aspectj.ajde.ui.StructureViewNodeFactory;
 import org.aspectj.asm.StructureModelManager;
 import org.aspectj.bridge.Version;
 

diff --git a/ajde/src/org/aspectj/ajde/BuildConfigListener.java b/ajde/src/org/aspectj/ajde/BuildConfigListener.java
index 8bdf3823cba9a6f9e130142d9ff3ab2df537552c..d1985ea97085b0ccdac414ecc21444fcfe0e7279 100644 (file)
--- a/ajde/src/org/aspectj/ajde/BuildConfigListener.java
+++ b/ajde/src/org/aspectj/ajde/BuildConfigListener.java
@@ -15,7 +15,8 @@
 
 package org.aspectj.ajde;
 
-import java.util.*;
+import java.util.EventListener;
+import java.util.List;
 
 /**
  * @author Mik Kersten

diff --git a/ajde/src/org/aspectj/ajde/ConfigurationListener.java b/ajde/src/org/aspectj/ajde/ConfigurationListener.java
index 21e3e1e4484e3df6bc7bbab5033d3278698e6921..e46196674a541052cc74af43cddebc7fb199f12b 100644 (file)
--- a/ajde/src/org/aspectj/ajde/ConfigurationListener.java
+++ b/ajde/src/org/aspectj/ajde/ConfigurationListener.java
@@ -15,7 +15,8 @@
 
 package org.aspectj.ajde;
 
-import java.util.*;
+import java.util.EventListener;
+import java.util.List;
 
 /**
  * @author Mik Kersten

diff --git a/ajde/src/org/aspectj/ajde/ProjectPropertiesAdapter.java b/ajde/src/org/aspectj/ajde/ProjectPropertiesAdapter.java
index 472a8425d23a70515cd3843130f4fda5f8143c93..fd63560e3af97d9de0fcfe4e4933854628fced26 100644 (file)
--- a/ajde/src/org/aspectj/ajde/ProjectPropertiesAdapter.java
+++ b/ajde/src/org/aspectj/ajde/ProjectPropertiesAdapter.java
@@ -16,8 +16,8 @@
  
 package org.aspectj.ajde;
 
-import java.util.Set;
 import java.util.List;
+import java.util.Set;
 
 /**
  * @author     Mik Kersten

diff --git a/ajde/src/org/aspectj/ajde/TaskListManager.java b/ajde/src/org/aspectj/ajde/TaskListManager.java
index 59cde6c515d27cae2912e8e4687425b70613e9b2..bae3f8c40c0fe7b7633d4b8650163fdfb8dbb00e 100644 (file)
--- a/ajde/src/org/aspectj/ajde/TaskListManager.java
+++ b/ajde/src/org/aspectj/ajde/TaskListManager.java
@@ -14,7 +14,8 @@
 
 package org.aspectj.ajde;
 
-import org.aspectj.bridge.*;
+import org.aspectj.bridge.IMessage;
+import org.aspectj.bridge.ISourceLocation;
 
 /**
  * Used for displaying tasks, such as compiler messages, to the user.

diff --git a/ajde/src/org/aspectj/ajde/internal/AspectJBuildManager.java b/ajde/src/org/aspectj/ajde/internal/AspectJBuildManager.java
index 1c3e201d89b0fc0c6ccedabcc0c73b283d1d6db3..541cef80c9a9f0f35cf4c2ba8bc98ccd2ac484c5 100644 (file)
--- a/ajde/src/org/aspectj/ajde/internal/AspectJBuildManager.java
+++ b/ajde/src/org/aspectj/ajde/internal/AspectJBuildManager.java
@@ -14,12 +14,26 @@
 
 package org.aspectj.ajde.internal;
 
-import java.io.*;
-import java.util.*;
-
-import org.aspectj.ajde.*;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.IOException;
+import java.io.StringReader;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.Set;
+import java.util.Vector;
+
+import org.aspectj.ajde.Ajde;
+import org.aspectj.ajde.BuildListener;
+import org.aspectj.ajde.BuildManager;
+import org.aspectj.ajde.BuildOptionsAdapter;
+import org.aspectj.ajde.BuildProgressMonitor;
+import org.aspectj.ajde.ProjectPropertiesAdapter;
+import org.aspectj.ajde.TaskListManager;
 import org.aspectj.asm.StructureNode;
-import org.aspectj.bridge.*;
+import org.aspectj.bridge.IMessage;
+import org.aspectj.bridge.Message;
+import org.aspectj.bridge.SourceLocation;
 import org.aspectj.util.ConfigParser;
 
 /**

diff --git a/ajde/src/org/aspectj/ajde/internal/CompilerAdapter.java b/ajde/src/org/aspectj/ajde/internal/CompilerAdapter.java
index 325ac75e58d9ef95f16d285f2e6b82c18eae0056..60aa23d02f595bd6714b41211701bd0875a41227 100644 (file)
--- a/ajde/src/org/aspectj/ajde/internal/CompilerAdapter.java
+++ b/ajde/src/org/aspectj/ajde/internal/CompilerAdapter.java
@@ -16,13 +16,24 @@
 package org.aspectj.ajde.internal;
 
 import java.io.File;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.StringTokenizer;
 
-import org.aspectj.ajde.*;
+import org.aspectj.ajde.Ajde;
+import org.aspectj.ajde.BuildOptionsAdapter;
+import org.aspectj.ajde.BuildProgressMonitor;
+import org.aspectj.ajde.ProjectPropertiesAdapter;
+import org.aspectj.ajde.TaskListManager;
 import org.aspectj.ajdt.ajc.BuildArgParser;
 import org.aspectj.ajdt.internal.core.builder.AjBuildConfig;
 import org.aspectj.ajdt.internal.core.builder.AjBuildManager;
-import org.aspectj.bridge.*;
+import org.aspectj.bridge.AbortException;
+import org.aspectj.bridge.IMessage;
+import org.aspectj.bridge.IMessageHandler;
 import org.aspectj.util.ConfigParser;
 import org.aspectj.util.LangUtil;
 import org.eclipse.core.runtime.OperationCanceledException;

diff --git a/ajde/src/org/aspectj/ajde/internal/LstBuildConfigFileUpdater.java b/ajde/src/org/aspectj/ajde/internal/LstBuildConfigFileUpdater.java
index c3f14057c20d94f19061272e891619895b764638..72a0b1d11481c4557e5d227e8440e4199e2f1d26 100644 (file)
--- a/ajde/src/org/aspectj/ajde/internal/LstBuildConfigFileUpdater.java
+++ b/ajde/src/org/aspectj/ajde/internal/LstBuildConfigFileUpdater.java
@@ -14,11 +14,20 @@
 
 package org.aspectj.ajde.internal;
 
-import java.util.*;
-import java.io.*;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileOutputStream;
+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;
 
 import org.aspectj.ajde.Ajde;
-import org.aspectj.ajde.ui.*;
+import org.aspectj.ajde.ui.BuildConfigNode;
 import org.aspectj.util.ConfigParser;
 
 /**

diff --git a/ajde/src/org/aspectj/ajde/internal/LstBuildConfigManager.java b/ajde/src/org/aspectj/ajde/internal/LstBuildConfigManager.java
index 26eafbdb88ecabb4b3af8de8a44a337d63d7921f..6e337a16151b057ec3e3dd8b34634bf2bab1b807 100644 (file)
--- a/ajde/src/org/aspectj/ajde/internal/LstBuildConfigManager.java
+++ b/ajde/src/org/aspectj/ajde/internal/LstBuildConfigManager.java
@@ -14,13 +14,23 @@
  
 package org.aspectj.ajde.internal;
 
-import java.util.*;
-import java.io.*;
+import java.io.File;
+import java.io.FileFilter;
+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.*;
-import org.aspectj.ajde.ui.*;
-import org.aspectj.asm.*;
-import org.aspectj.bridge.*;
+import org.aspectj.ajde.Ajde;
+import org.aspectj.ajde.BuildConfigListener;
+import org.aspectj.ajde.BuildConfigManager;
+import org.aspectj.ajde.ui.BuildConfigModel;
+import org.aspectj.ajde.ui.BuildConfigNode;
+import org.aspectj.asm.StructureNode;
+import org.aspectj.bridge.IMessage;
+import org.aspectj.bridge.SourceLocation;
 import org.aspectj.util.ConfigParser;
 
 /**

diff --git a/ajde/src/org/aspectj/ajde/ui/AbstractIconRegistry.java b/ajde/src/org/aspectj/ajde/ui/AbstractIconRegistry.java
index 96ef60f4c065933445993dbebcd0e5d3002ed952..97bdf462249e5081970da184649f1783dcb1e2ec 100644 (file)
--- a/ajde/src/org/aspectj/ajde/ui/AbstractIconRegistry.java
+++ b/ajde/src/org/aspectj/ajde/ui/AbstractIconRegistry.java
@@ -14,7 +14,11 @@
 
 package org.aspectj.ajde.ui;
 
-import org.aspectj.asm.*;
+import org.aspectj.asm.AdviceAssociation;
+import org.aspectj.asm.InheritanceAssociation;
+import org.aspectj.asm.IntroductionAssociation;
+import org.aspectj.asm.ProgramElementNode;
+import org.aspectj.asm.Relation;
 
 /**
  * Uses the factory pattern.

diff --git a/ajde/src/org/aspectj/ajde/ui/BuildConfigEditor.java b/ajde/src/org/aspectj/ajde/ui/BuildConfigEditor.java
index 7f146505f53f8aa999928e6d5497c5ba15c2fe57..b7fee071d8576527be2e88256d83658032fa50d4 100644 (file)
--- a/ajde/src/org/aspectj/ajde/ui/BuildConfigEditor.java
+++ b/ajde/src/org/aspectj/ajde/ui/BuildConfigEditor.java
@@ -14,7 +14,7 @@
 
 package org.aspectj.ajde.ui;
 
-import java.io.*;
+import java.io.IOException;
 
 /**
  * @author Mik Kersten

diff --git a/ajde/src/org/aspectj/ajde/ui/BuildConfigModel.java b/ajde/src/org/aspectj/ajde/ui/BuildConfigModel.java
index cbffa6a25e8df19572c446cf2a21b07b3d6578eb..1687e69eec58148cf6d4e6f3d1de014d3a7d1575 100644 (file)
--- a/ajde/src/org/aspectj/ajde/ui/BuildConfigModel.java
+++ b/ajde/src/org/aspectj/ajde/ui/BuildConfigModel.java
@@ -14,7 +14,10 @@
 
 package org.aspectj.ajde.ui;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.StringTokenizer;
 
 import org.aspectj.asm.StructureModel;
 

diff --git a/ajde/src/org/aspectj/ajde/ui/BuildConfigNode.java b/ajde/src/org/aspectj/ajde/ui/BuildConfigNode.java
index 6e22b8aa8185cbf5e2d35036866d16d5805cb770..5c28c7e43ace85fda31c58ac9eaf59636827c640 100644 (file)
--- a/ajde/src/org/aspectj/ajde/ui/BuildConfigNode.java
+++ b/ajde/src/org/aspectj/ajde/ui/BuildConfigNode.java
@@ -14,8 +14,9 @@
 
 package org.aspectj.ajde.ui;
 
+import java.io.ObjectStreamException;
+import java.io.Serializable;
 import java.util.List;
-import java.io.*;
 
 import org.aspectj.asm.StructureNode;
 

diff --git a/ajde/src/org/aspectj/ajde/ui/EditorManager.java b/ajde/src/org/aspectj/ajde/ui/EditorManager.java
index f6159ea6f71fe1f5afa7604f1b17c0d99325c48f..dc1be087257642483e1e9a2d4f51f6da7b973c74 100644 (file)
--- a/ajde/src/org/aspectj/ajde/ui/EditorManager.java
+++ b/ajde/src/org/aspectj/ajde/ui/EditorManager.java
@@ -16,11 +16,17 @@ package org.aspectj.ajde.ui;
 
 import java.awt.BorderLayout;
 import java.io.IOException;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.Vector;
 
-import javax.swing.*;
+import javax.swing.Box;
+import javax.swing.JPanel;
+import javax.swing.SwingUtilities;
 
-import org.aspectj.ajde.*;
+import org.aspectj.ajde.Ajde;
+import org.aspectj.ajde.EditorAdapter;
+import org.aspectj.ajde.EditorListener;
 import org.aspectj.ajde.ui.swing.BasicEditor;
 import org.aspectj.bridge.ISourceLocation;
 

diff --git a/ajde/src/org/aspectj/ajde/ui/StructureModelUtil.java b/ajde/src/org/aspectj/ajde/ui/StructureModelUtil.java
index cb1a3ba82ffa6c39e197f1ebc8093ea2cf5038f7..8415b6dfeeb0f360bdbdf69b5c803026444b910e 100644 (file)
--- a/ajde/src/org/aspectj/ajde/ui/StructureModelUtil.java
+++ b/ajde/src/org/aspectj/ajde/ui/StructureModelUtil.java
@@ -14,9 +14,25 @@
 
 package org.aspectj.ajde.ui;
 
-import java.util.*;
-import org.aspectj.asm.*;
-import org.aspectj.ajde.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.Vector;
+
+import org.aspectj.ajde.Ajde;
+import org.aspectj.asm.LinkNode;
+import org.aspectj.asm.ProgramElementNode;
+import org.aspectj.asm.RelationNode;
+import org.aspectj.asm.StructureModel;
+import org.aspectj.asm.StructureModelManager;
+import org.aspectj.asm.StructureNode;
 
 /**
  * Prototype functionality for package view clients.

diff --git a/ajde/src/org/aspectj/ajde/ui/StructureSearchManager.java b/ajde/src/org/aspectj/ajde/ui/StructureSearchManager.java
index 776dd4a1837f4f6e1cf5f171d6b59a3739739b5f..e997091b4fa7dc73c3320d12669dc3fa036ecdd2 100644 (file)
--- a/ajde/src/org/aspectj/ajde/ui/StructureSearchManager.java
+++ b/ajde/src/org/aspectj/ajde/ui/StructureSearchManager.java
@@ -14,10 +14,14 @@
  
 package org.aspectj.ajde.ui;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
 
 import org.aspectj.ajde.Ajde;
-import org.aspectj.asm.*;
+import org.aspectj.asm.ProgramElementNode;
+import org.aspectj.asm.StructureModel;
+import org.aspectj.asm.StructureNode;
 
 /**
  * @author     Mik Kersten

diff --git a/ajde/src/org/aspectj/ajde/ui/StructureViewManager.java b/ajde/src/org/aspectj/ajde/ui/StructureViewManager.java
index 947d522ae45f29093c12cc4d1fe440c89c40e9c6..68b96fbf5837c48e370a942f5afaa2e07a2101ca 100644 (file)
--- a/ajde/src/org/aspectj/ajde/ui/StructureViewManager.java
+++ b/ajde/src/org/aspectj/ajde/ui/StructureViewManager.java
@@ -14,10 +14,23 @@
  
 package org.aspectj.ajde.ui;
 
-import java.util.*;
-import org.aspectj.ajde.*;
-import org.aspectj.ajde.ui.internal.*;
-import org.aspectj.asm.*;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import org.aspectj.ajde.Ajde;
+import org.aspectj.ajde.ui.internal.NavigationHistoryModel;
+import org.aspectj.ajde.ui.internal.TreeStructureViewBuilder;
+import org.aspectj.asm.AdviceAssociation;
+import org.aspectj.asm.InheritanceAssociation;
+import org.aspectj.asm.IntroductionAssociation;
+import org.aspectj.asm.LinkNode;
+import org.aspectj.asm.ProgramElementNode;
+import org.aspectj.asm.ReferenceAssociation;
+import org.aspectj.asm.StructureModel;
+import org.aspectj.asm.StructureModelListener;
+import org.aspectj.asm.StructureModelManager;
+import org.aspectj.asm.StructureNode;
 
 /**
  * @author     Mik Kersten

diff --git a/ajde/src/org/aspectj/ajde/ui/StructureViewNode.java b/ajde/src/org/aspectj/ajde/ui/StructureViewNode.java
index 5676078bc6bb96f0b0b568595026eb2f321bd653..fc2700813db1c257563c7725432812f2f27c8d35 100644 (file)
--- a/ajde/src/org/aspectj/ajde/ui/StructureViewNode.java
+++ b/ajde/src/org/aspectj/ajde/ui/StructureViewNode.java
@@ -14,9 +14,10 @@
  
 package org.aspectj.ajde.ui;
 
-import org.aspectj.asm.*;
 import java.util.List;
 
+import org.aspectj.asm.StructureNode;
+
 /**
  * @author Mik Kersten
  */ 

diff --git a/ajde/src/org/aspectj/ajde/ui/StructureViewNodeFactory.java b/ajde/src/org/aspectj/ajde/ui/StructureViewNodeFactory.java
index f2fa818c922fff92d781feaeb32983a2ec7600ab..102d58b9536e8d3b374a6300d9dafcb0ae2c9e23 100644 (file)
--- a/ajde/src/org/aspectj/ajde/ui/StructureViewNodeFactory.java
+++ b/ajde/src/org/aspectj/ajde/ui/StructureViewNodeFactory.java
@@ -14,9 +14,13 @@
  
 package org.aspectj.ajde.ui;
 
-import org.aspectj.asm.*;
 import java.util.List;
 
+import org.aspectj.asm.LinkNode;
+import org.aspectj.asm.ProgramElementNode;
+import org.aspectj.asm.RelationNode;
+import org.aspectj.asm.StructureNode;
+
 /**
  * @author Mik Kersten
  */ 

diff --git a/ajde/src/org/aspectj/ajde/ui/StructureViewProperties.java b/ajde/src/org/aspectj/ajde/ui/StructureViewProperties.java
index e41faa1598cb46ecfe7840cb69fd97c10d7c2d7b..1fa0c00b82f2bebd388e15c247c23f268641f4eb 100644 (file)
--- a/ajde/src/org/aspectj/ajde/ui/StructureViewProperties.java
+++ b/ajde/src/org/aspectj/ajde/ui/StructureViewProperties.java
@@ -14,9 +14,12 @@
 
 package org.aspectj.ajde.ui;
 
-import java.util.*;
-import java.io.*;
-import org.aspectj.asm.*;
+import java.io.ObjectStreamException;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.aspectj.asm.ProgramElementNode;
+import org.aspectj.asm.Relation;
 
 /** 
  * Nested properties use the typesafe enum pattern.

diff --git a/ajde/src/org/aspectj/ajde/ui/internal/AjcBuildOptions.java b/ajde/src/org/aspectj/ajde/ui/internal/AjcBuildOptions.java
index da53c5c099dc1e4310d97e79fad1c0086404eeeb..25b9040d76090329926251bf88a11fe7e97df125 100644 (file)
--- a/ajde/src/org/aspectj/ajde/ui/internal/AjcBuildOptions.java
+++ b/ajde/src/org/aspectj/ajde/ui/internal/AjcBuildOptions.java
@@ -22,8 +22,8 @@ import java.util.Iterator;
 import java.util.Set;
 import java.util.StringTokenizer;
 
-import org.aspectj.ajde.*;
-import org.aspectj.ajde.ui.*;
+import org.aspectj.ajde.BuildOptionsAdapter;
+import org.aspectj.ajde.ui.UserPreferencesAdapter;
 
 public class AjcBuildOptions implements BuildOptionsAdapter {
        

diff --git a/ajde/src/org/aspectj/ajde/ui/internal/BrowserViewProperties.java b/ajde/src/org/aspectj/ajde/ui/internal/BrowserViewProperties.java
index 794afb5d581eddfc94084e4ea6c3e2bb3bc83852..653ee65cd03471a5479e039ce4b455f42f0bf6d9 100644 (file)
--- a/ajde/src/org/aspectj/ajde/ui/internal/BrowserViewProperties.java
+++ b/ajde/src/org/aspectj/ajde/ui/internal/BrowserViewProperties.java
@@ -15,8 +15,15 @@
  
 package org.aspectj.ajde.ui.internal;
 
-import java.io.*;
-import java.util.*;
+import java.io.File;
+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;
 
 import org.aspectj.ajde.Ajde;
 

diff --git a/ajde/src/org/aspectj/ajde/ui/internal/NavigationHistoryModel.java b/ajde/src/org/aspectj/ajde/ui/internal/NavigationHistoryModel.java
index 653f21fd8dfa3111e2a3199e56f4205dde29fc56..d15167926b47863ba54a9c4b3575a5e0bd0855ac 100644 (file)
--- a/ajde/src/org/aspectj/ajde/ui/internal/NavigationHistoryModel.java
+++ b/ajde/src/org/aspectj/ajde/ui/internal/NavigationHistoryModel.java
@@ -14,8 +14,9 @@
 
 package org.aspectj.ajde.ui.internal;
 
-import java.util.*;
-import org.aspectj.asm.*;
+import java.util.Stack;
+
+import org.aspectj.asm.ProgramElementNode;
 
 /**
  * @author Mik Kersten

diff --git a/ajde/src/org/aspectj/ajde/ui/internal/TreeStructureViewBuilder.java b/ajde/src/org/aspectj/ajde/ui/internal/TreeStructureViewBuilder.java
index c2f9bcca6370e9cd8520adf67d5a541c3fef74f7..41a9a0bdc7e0ece06263bca5991706ed82227432 100644 (file)
--- a/ajde/src/org/aspectj/ajde/ui/internal/TreeStructureViewBuilder.java
+++ b/ajde/src/org/aspectj/ajde/ui/internal/TreeStructureViewBuilder.java
@@ -14,10 +14,24 @@
 
 package org.aspectj.ajde.ui.internal;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Iterator;
+import java.util.List;
 
-import org.aspectj.ajde.ui.*;
-import org.aspectj.asm.*;
+import org.aspectj.ajde.ui.FileStructureView;
+import org.aspectj.ajde.ui.GlobalStructureView;
+import org.aspectj.ajde.ui.StructureView;
+import org.aspectj.ajde.ui.StructureViewNode;
+import org.aspectj.ajde.ui.StructureViewNodeFactory;
+import org.aspectj.ajde.ui.StructureViewProperties;
+import org.aspectj.asm.LinkNode;
+import org.aspectj.asm.ProgramElementNode;
+import org.aspectj.asm.Relation;
+import org.aspectj.asm.RelationNode;
+import org.aspectj.asm.StructureModel;
+import org.aspectj.asm.StructureNode;
 
 /**
  * @author Mik Kersten

diff --git a/ajde/src/org/aspectj/ajde/ui/internal/UserPreferencesStore.java b/ajde/src/org/aspectj/ajde/ui/internal/UserPreferencesStore.java
index 617c516a914d81205ec0afaf7b2bf35e7a899a5d..c5c001a0b512b79ec7c80f1dc6fef40e02ad226a 100644 (file)
--- a/ajde/src/org/aspectj/ajde/ui/internal/UserPreferencesStore.java
+++ b/ajde/src/org/aspectj/ajde/ui/internal/UserPreferencesStore.java
@@ -15,9 +15,17 @@
  
 package org.aspectj.ajde.ui.internal;
 
-import java.util.*;
-import java.io.*;
-import org.aspectj.ajde.*;
+import java.io.File;
+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;
+
+import org.aspectj.ajde.Ajde;
 import org.aspectj.ajde.ui.UserPreferencesAdapter;
 
 public class UserPreferencesStore implements UserPreferencesAdapter {

diff --git a/ajde/src/org/aspectj/ajde/ui/swing/AJButtonMenuCombo.java b/ajde/src/org/aspectj/ajde/ui/swing/AJButtonMenuCombo.java
index c5e626e1d13681b2f51ed945f26b1904e7353f6f..0531c175862765bd546f6da87b1b5bab4b283136 100644 (file)
--- a/ajde/src/org/aspectj/ajde/ui/swing/AJButtonMenuCombo.java
+++ b/ajde/src/org/aspectj/ajde/ui/swing/AJButtonMenuCombo.java
@@ -16,9 +16,16 @@ package org.aspectj.ajde.ui.swing;
 
 import java.awt.BorderLayout;
 import java.awt.Dimension;
-import java.awt.event.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
 
-import javax.swing.*;
+import javax.swing.BorderFactory;
+import javax.swing.Icon;
+import javax.swing.JButton;
+import javax.swing.JPanel;
+import javax.swing.JPopupMenu;
 
 public class AJButtonMenuCombo extends JPanel {
        

diff --git a/ajde/src/org/aspectj/ajde/ui/swing/AjdeUIManager.java b/ajde/src/org/aspectj/ajde/ui/swing/AjdeUIManager.java
index 37cfe6f3446e3370a8f4bb144d1de70626495bce..6fe610e006ec4bda129687b80e0d71954e6b38b9 100644 (file)
--- a/ajde/src/org/aspectj/ajde/ui/swing/AjdeUIManager.java
+++ b/ajde/src/org/aspectj/ajde/ui/swing/AjdeUIManager.java
@@ -16,8 +16,16 @@ package org.aspectj.ajde.ui.swing;
 
 import java.awt.Frame;
 
-import org.aspectj.ajde.*;
-import org.aspectj.ajde.ui.*;
+import org.aspectj.ajde.Ajde;
+import org.aspectj.ajde.BuildListener;
+import org.aspectj.ajde.BuildProgressMonitor;
+import org.aspectj.ajde.EditorAdapter;
+import org.aspectj.ajde.ErrorHandler;
+import org.aspectj.ajde.ProjectPropertiesAdapter;
+import org.aspectj.ajde.TaskListManager;
+import org.aspectj.ajde.ui.FileStructureView;
+import org.aspectj.ajde.ui.IdeUIAdapter;
+import org.aspectj.ajde.ui.UserPreferencesAdapter;
 import org.aspectj.ajde.ui.internal.AjcBuildOptions;
 
 /**

diff --git a/ajde/src/org/aspectj/ajde/ui/swing/AjdeWidgetStyles.java b/ajde/src/org/aspectj/ajde/ui/swing/AjdeWidgetStyles.java
index 8da23390ac4660c9648b00b98a6d20b12e5659da..5b31ac341c2d0dbd82a8c5a89fcec19e6ab5ac0a 100644 (file)
--- a/ajde/src/org/aspectj/ajde/ui/swing/AjdeWidgetStyles.java
+++ b/ajde/src/org/aspectj/ajde/ui/swing/AjdeWidgetStyles.java
@@ -14,9 +14,12 @@
 
 package org.aspectj.ajde.ui.swing;
 
-import java.awt.*;
-import javax.swing.*;
-import javax.swing.border.*;
+import java.awt.Color;
+import java.awt.Font;
+
+import javax.swing.BorderFactory;
+import javax.swing.border.BevelBorder;
+import javax.swing.border.Border;
 
 public interface AjdeWidgetStyles {
 

diff --git a/ajde/src/org/aspectj/ajde/ui/swing/BasicEditor.java b/ajde/src/org/aspectj/ajde/ui/swing/BasicEditor.java
index 99d07059158a19471e7c1e9756d298227525aa66..7d0a46959ee495e0cfbaee3b86b458c32c66ba98 100644 (file)
--- a/ajde/src/org/aspectj/ajde/ui/swing/BasicEditor.java
+++ b/ajde/src/org/aspectj/ajde/ui/swing/BasicEditor.java
@@ -16,10 +16,17 @@ package org.aspectj.ajde.ui.swing;
 
 import java.awt.BorderLayout;
 import java.awt.Font;
-import java.io.*;
+import java.io.BufferedReader;
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileReader;
+import java.io.FileWriter;
+import java.io.IOException;
 import java.net.URL;
 
-import javax.swing.*;
+import javax.swing.JEditorPane;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
 import javax.swing.text.BadLocationException;
 import javax.swing.text.DefaultHighlighter;
 

diff --git a/ajde/src/org/aspectj/ajde/ui/swing/BrowserStructureViewToolPanel.java b/ajde/src/org/aspectj/ajde/ui/swing/BrowserStructureViewToolPanel.java
index 963fb9ae0a16c00e60d65624ce23ccb4302fc982..3b69fd7a634154b292bdc7515618ddc79b14a51d 100644 (file)
--- a/ajde/src/org/aspectj/ajde/ui/swing/BrowserStructureViewToolPanel.java
+++ b/ajde/src/org/aspectj/ajde/ui/swing/BrowserStructureViewToolPanel.java
@@ -14,15 +14,29 @@
 
 package org.aspectj.ajde.ui.swing;
 
-import java.awt.*;
-import java.awt.event.*;
+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.*;
+import javax.swing.ButtonGroup;
+import javax.swing.Icon;
+import javax.swing.JCheckBoxMenuItem;
+import javax.swing.JComboBox;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.JPopupMenu;
+import javax.swing.JRadioButtonMenuItem;
+import javax.swing.JSeparator;
 import javax.swing.border.Border;
+
 import org.aspectj.ajde.Ajde;
-import org.aspectj.ajde.ui.*;
-import org.aspectj.asm.*;
+import org.aspectj.ajde.ui.GlobalStructureView;
+import org.aspectj.ajde.ui.StructureView;
+import org.aspectj.ajde.ui.StructureViewProperties;
+import org.aspectj.asm.ProgramElementNode;
+import org.aspectj.asm.Relation;
 
 public class BrowserStructureViewToolPanel extends JPanel {
 

diff --git a/ajde/src/org/aspectj/ajde/ui/swing/BrowserView.java b/ajde/src/org/aspectj/ajde/ui/swing/BrowserView.java
index cb36bb8097ffbadd36ff3040e271658d1d20b241..aa1ed12d3693290aa5eb55713fa805f2c97f135f 100644 (file)
--- a/ajde/src/org/aspectj/ajde/ui/swing/BrowserView.java
+++ b/ajde/src/org/aspectj/ajde/ui/swing/BrowserView.java
@@ -14,13 +14,26 @@
 
 package org.aspectj.ajde.ui.swing;
 
-import java.awt.*;
+import java.awt.BorderLayout;
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.Dimension;
+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.*;
+import javax.swing.BorderFactory;
+import javax.swing.JButton;
+import javax.swing.JComboBox;
+import javax.swing.JLabel;
+import javax.swing.JList;
+import javax.swing.JPanel;
+import javax.swing.JSplitPane;
+import javax.swing.JToggleButton;
+import javax.swing.JToolBar;
+import javax.swing.ListCellRenderer;
 import javax.swing.border.Border;
 
 import org.aspectj.ajde.Ajde;

diff --git a/ajde/src/org/aspectj/ajde/ui/swing/BrowserViewManager.java b/ajde/src/org/aspectj/ajde/ui/swing/BrowserViewManager.java
index 77ff0dceb73b90a9bea8b4cf32c2e6bb25237ea0..68f7741aa5a641e8a1daf1c6fdd94eea8eb1113d 100644 (file)
--- a/ajde/src/org/aspectj/ajde/ui/swing/BrowserViewManager.java
+++ b/ajde/src/org/aspectj/ajde/ui/swing/BrowserViewManager.java
@@ -14,11 +14,19 @@
 
 package org.aspectj.ajde.ui.swing;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.Stack;
 
 import org.aspectj.ajde.Ajde;
-import org.aspectj.ajde.ui.*;
-import org.aspectj.asm.*;
+import org.aspectj.ajde.ui.GlobalStructureView;
+import org.aspectj.ajde.ui.GlobalViewProperties;
+import org.aspectj.ajde.ui.StructureViewProperties;
+import org.aspectj.asm.AdviceAssociation;
+import org.aspectj.asm.InheritanceAssociation;
+import org.aspectj.asm.LinkNode;
+import org.aspectj.asm.ProgramElementNode;
+import org.aspectj.asm.StructureNode;
 
 /**
  * Responsible for displaying and controlling the configuration and output of a

diff --git a/ajde/src/org/aspectj/ajde/ui/swing/BrowserViewPanel.java b/ajde/src/org/aspectj/ajde/ui/swing/BrowserViewPanel.java
index 96adbff63ab8aad4be54f459809950f2b105dcf5..33901b2c5d6cb65fe97c268db2bb6fda3060d6a2 100644 (file)
--- a/ajde/src/org/aspectj/ajde/ui/swing/BrowserViewPanel.java
+++ b/ajde/src/org/aspectj/ajde/ui/swing/BrowserViewPanel.java
@@ -14,14 +14,25 @@
 
 package org.aspectj.ajde.ui.swing;
 
-import java.awt.*;
+import java.awt.BorderLayout;
+import java.awt.Dimension;
 import java.awt.event.ActionEvent;
 import java.util.Iterator;
 
-import javax.swing.*;
-import javax.swing.event.*;
+import javax.swing.JComboBox;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.JSlider;
+import javax.swing.JToolBar;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+
 import org.aspectj.ajde.Ajde;
-import org.aspectj.ajde.ui.*;
+import org.aspectj.ajde.ui.GlobalStructureView;
+import org.aspectj.ajde.ui.StructureView;
+import org.aspectj.ajde.ui.StructureViewNode;
+import org.aspectj.ajde.ui.StructureViewProperties;
+import org.aspectj.ajde.ui.StructureViewRenderer;
 
 /**
  * Represents the configuration of a structure view of the system, rendered

diff --git a/ajde/src/org/aspectj/ajde/ui/swing/BrowserViewTreeListener.java b/ajde/src/org/aspectj/ajde/ui/swing/BrowserViewTreeListener.java
index f795541c43d9fc9cd4ee6f35a3572208098255df..e42806bfc6fa892233410e0538ade6d138f9e1fc 100644 (file)
--- a/ajde/src/org/aspectj/ajde/ui/swing/BrowserViewTreeListener.java
+++ b/ajde/src/org/aspectj/ajde/ui/swing/BrowserViewTreeListener.java
@@ -14,13 +14,22 @@
      
 package org.aspectj.ajde.ui.swing;
 
-import java.awt.event.*;
-import java.util.*;
-
-import javax.swing.*;
-import javax.swing.event.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.MouseEvent;
+import java.awt.event.MouseListener;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.swing.AbstractAction;
+import javax.swing.JMenuItem;
+import javax.swing.JPopupMenu;
+import javax.swing.event.TreeSelectionEvent;
+import javax.swing.event.TreeSelectionListener;
 import javax.swing.tree.TreePath;
-import org.aspectj.asm.*;
+
+import org.aspectj.asm.LinkNode;
+import org.aspectj.asm.ProgramElementNode;
+import org.aspectj.asm.StructureNode;
 
 /**
  * @author  Mik Kersten

diff --git a/ajde/src/org/aspectj/ajde/ui/swing/BuildConfigPopupMenu.java b/ajde/src/org/aspectj/ajde/ui/swing/BuildConfigPopupMenu.java
index 5accf747c7269dab8be3661dc27d04e0e4d1b945..67323ea7c5930e0e19713bcecf03cc4deed6a00e 100644 (file)
--- a/ajde/src/org/aspectj/ajde/ui/swing/BuildConfigPopupMenu.java
+++ b/ajde/src/org/aspectj/ajde/ui/swing/BuildConfigPopupMenu.java
@@ -18,7 +18,10 @@ import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.util.Iterator;
 
-import javax.swing.*;
+import javax.swing.AbstractAction;
+import javax.swing.Icon;
+import javax.swing.JMenuItem;
+import javax.swing.JPopupMenu;
 
 import org.aspectj.ajde.Ajde;
 import org.aspectj.asm.ProgramElementNode;

diff --git a/ajde/src/org/aspectj/ajde/ui/swing/BuildOptionsPanel.java b/ajde/src/org/aspectj/ajde/ui/swing/BuildOptionsPanel.java
index 90dad5e9565ec43d0dede1989afdb79aff93c248..4c1ad022268ddab71dec5fa3fd41d170af910616 100644 (file)
--- a/ajde/src/org/aspectj/ajde/ui/swing/BuildOptionsPanel.java
+++ b/ajde/src/org/aspectj/ajde/ui/swing/BuildOptionsPanel.java
@@ -14,11 +14,22 @@
 
 package org.aspectj.ajde.ui.swing;
 
-import javax.swing.*;
-import java.io.*;
-import java.awt.*;
-import javax.swing.border.*;
-import org.aspectj.ajde.*;
+import java.awt.BorderLayout;
+import java.awt.Color;
+import java.awt.Dimension;
+import java.io.IOException;
+
+import javax.swing.BorderFactory;
+import javax.swing.Box;
+import javax.swing.ButtonGroup;
+import javax.swing.JCheckBox;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.JTextField;
+import javax.swing.border.Border;
+import javax.swing.border.TitledBorder;
+
+import org.aspectj.ajde.Ajde;
 
 /**
  * @author Mik Kersten

diff --git a/ajde/src/org/aspectj/ajde/ui/swing/BuildProgressPanel.java b/ajde/src/org/aspectj/ajde/ui/swing/BuildProgressPanel.java
index 68f1fe45df7dbce4f87e27b9d357224438ea4855..12894135787b07ee56c04bfd4762d0751570bb6d 100644 (file)
--- a/ajde/src/org/aspectj/ajde/ui/swing/BuildProgressPanel.java
+++ b/ajde/src/org/aspectj/ajde/ui/swing/BuildProgressPanel.java
@@ -18,7 +18,10 @@ import java.awt.BorderLayout;
 import java.awt.Dimension;
 import java.awt.event.ActionEvent;
 
-import javax.swing.*;
+import javax.swing.JButton;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.JProgressBar;
 
 import org.aspectj.ajde.Ajde;
 

diff --git a/ajde/src/org/aspectj/ajde/ui/swing/CompilerMessagesCellRenderer.java b/ajde/src/org/aspectj/ajde/ui/swing/CompilerMessagesCellRenderer.java
index 9046b979cd7d46489d1806d757dbff0a510ca060..a1a47a1698609aba092212e7124b63ca0173d9ce 100644 (file)
--- a/ajde/src/org/aspectj/ajde/ui/swing/CompilerMessagesCellRenderer.java
+++ b/ajde/src/org/aspectj/ajde/ui/swing/CompilerMessagesCellRenderer.java
@@ -16,7 +16,9 @@ package org.aspectj.ajde.ui.swing;
    
 import java.awt.Component;
 
-import javax.swing.*;
+import javax.swing.JLabel;
+import javax.swing.JList;
+import javax.swing.ListCellRenderer;
 
 import org.aspectj.bridge.IMessage;
 

diff --git a/ajde/src/org/aspectj/ajde/ui/swing/ErrorDialog.java b/ajde/src/org/aspectj/ajde/ui/swing/ErrorDialog.java
index 63629394551d26ae5d89e29e71ffb609b40993a7..5acaddde2ae0f03446244b1467828c774f370338 100644 (file)
--- a/ajde/src/org/aspectj/ajde/ui/swing/ErrorDialog.java
+++ b/ajde/src/org/aspectj/ajde/ui/swing/ErrorDialog.java
@@ -14,10 +14,20 @@
 
 package org.aspectj.ajde.ui.swing;
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import javax.swing.border.*;
+import java.awt.BorderLayout;
+import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.Frame;
+import java.awt.event.ActionEvent;
+
+import javax.swing.BorderFactory;
+import javax.swing.JButton;
+import javax.swing.JDialog;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.JTextArea;
+import javax.swing.border.Border;
 
 class ErrorDialog extends JDialog {
     JPanel top_panel = new JPanel();

diff --git a/ajde/src/org/aspectj/ajde/ui/swing/GoToLineThread.java b/ajde/src/org/aspectj/ajde/ui/swing/GoToLineThread.java
index 2082b4d938e9cf45b916fdd976d20ca4e0913589..b5976b80d79d3853879b7e19f79790d302cf412d 100644 (file)
--- a/ajde/src/org/aspectj/ajde/ui/swing/GoToLineThread.java
+++ b/ajde/src/org/aspectj/ajde/ui/swing/GoToLineThread.java
@@ -16,7 +16,9 @@
 package org.aspectj.ajde.ui.swing;
 
 import javax.swing.SwingUtilities;
-import org.aspectj.ajde.*;
+
+import org.aspectj.ajde.Ajde;
+import org.aspectj.ajde.EditorAdapter;
 
 /**
  * Used to ensure that a source line has been seeked to.  Will repeatedly attempt

diff --git a/ajde/src/org/aspectj/ajde/ui/swing/OptionsFrame.java b/ajde/src/org/aspectj/ajde/ui/swing/OptionsFrame.java
index 14fdbb511baabe4029861c0b225b0dc62a9151af..c9b38c67f6dedfd3773a06e272114901a027a751 100644 (file)
--- a/ajde/src/org/aspectj/ajde/ui/swing/OptionsFrame.java
+++ b/ajde/src/org/aspectj/ajde/ui/swing/OptionsFrame.java
@@ -14,12 +14,25 @@
 
 package org.aspectj.ajde.ui.swing;
 
-import java.awt.*;
+import java.awt.BorderLayout;
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.Dimension;
 import java.awt.event.ActionEvent;
 import java.io.IOException;
 import java.util.Date;
 
-import javax.swing.*;
+import javax.swing.BorderFactory;
+import javax.swing.Box;
+import javax.swing.ButtonGroup;
+import javax.swing.ImageIcon;
+import javax.swing.JButton;
+import javax.swing.JFrame;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.JTabbedPane;
+import javax.swing.JTextArea;
+import javax.swing.UIManager;
 import javax.swing.border.Border;
 import javax.swing.border.TitledBorder;
 

diff --git a/ajde/src/org/aspectj/ajde/ui/swing/OptionsPanel.java b/ajde/src/org/aspectj/ajde/ui/swing/OptionsPanel.java
index 31fc3e821d5fadd71ca8c9624a2c5da7fe7fcfb3..dcc3b0cba0bc8aefd6db28540ba46c5c2bea2679 100644 (file)
--- a/ajde/src/org/aspectj/ajde/ui/swing/OptionsPanel.java
+++ b/ajde/src/org/aspectj/ajde/ui/swing/OptionsPanel.java
@@ -14,8 +14,9 @@
 
 package org.aspectj.ajde.ui.swing;
 
-import javax.swing.*;
-import java.io.*;
+import java.io.IOException;
+
+import javax.swing.JPanel;
 
 /**
  * @author Mik Kersten

diff --git a/ajde/src/org/aspectj/ajde/ui/swing/PointcutWizard.java b/ajde/src/org/aspectj/ajde/ui/swing/PointcutWizard.java
index a3044c08aacc17103a81cf4aa85dbf445f8cc432..91d450ed14e4ce86653bc19e7a952b5208471e6a 100644 (file)
--- a/ajde/src/org/aspectj/ajde/ui/swing/PointcutWizard.java
+++ b/ajde/src/org/aspectj/ajde/ui/swing/PointcutWizard.java
@@ -14,14 +14,26 @@
 
 package org.aspectj.ajde.ui.swing;
 
-import java.awt.*;
+import java.awt.BorderLayout;
+import java.awt.Dimension;
 import java.awt.event.ActionEvent;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+
+import javax.swing.ImageIcon;
+import javax.swing.JButton;
+import javax.swing.JCheckBox;
+import javax.swing.JFrame;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
 
-import javax.swing.*;
 import org.aspectj.ajde.Ajde;
-import org.aspectj.ajde.ui.*;
-import org.aspectj.asm.*;
+import org.aspectj.ajde.ui.GlobalViewProperties;
+import org.aspectj.ajde.ui.StructureViewProperties;
+import org.aspectj.asm.InheritanceAssociation;
+import org.aspectj.asm.ProgramElementNode;
 
 /**
  * @author Mik Kersten

diff --git a/ajde/src/org/aspectj/ajde/ui/swing/SimpleStructureViewToolPanel.java b/ajde/src/org/aspectj/ajde/ui/swing/SimpleStructureViewToolPanel.java
index 532d9dc5d587dee88cdfb78a3d58da03a4ff82e9..4ec5e8ff064983fd8f1fe2f118d3b35b24b6c777 100644 (file)
--- a/ajde/src/org/aspectj/ajde/ui/swing/SimpleStructureViewToolPanel.java
+++ b/ajde/src/org/aspectj/ajde/ui/swing/SimpleStructureViewToolPanel.java
@@ -14,16 +14,27 @@
 
 package org.aspectj.ajde.ui.swing;
 
-import java.awt.*;
+import java.awt.BorderLayout;
+import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.SystemColor;
 import java.awt.event.ActionEvent;
 import java.io.File;
 import java.util.ArrayList;
 
-import javax.swing.*;
-import javax.swing.border.*;
+import javax.swing.BorderFactory;
+import javax.swing.JButton;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.border.BevelBorder;
+import javax.swing.border.Border;
+
 import org.aspectj.ajde.Ajde;
-import org.aspectj.ajde.ui.*;
-import org.aspectj.asm.*;
+import org.aspectj.ajde.ui.StructureView;
+import org.aspectj.ajde.ui.StructureViewProperties;
+import org.aspectj.asm.ProgramElementNode;
+import org.aspectj.asm.StructureModel;
+import org.aspectj.asm.StructureModelListener;
 
 public class SimpleStructureViewToolPanel extends JPanel {
 

diff --git a/ajde/src/org/aspectj/ajde/ui/swing/StructureTreeManager.java b/ajde/src/org/aspectj/ajde/ui/swing/StructureTreeManager.java
index 57dcac9d58535a4e889b9d19f67c26230806bf9a..1ab612a80b492fe6d2916e0b92b55b547e3cea12 100644 (file)
--- a/ajde/src/org/aspectj/ajde/ui/swing/StructureTreeManager.java
+++ b/ajde/src/org/aspectj/ajde/ui/swing/StructureTreeManager.java
@@ -19,11 +19,21 @@ import java.util.ArrayList;
 
 import javax.swing.SwingUtilities;
 import javax.swing.event.TreeSelectionListener;
-import javax.swing.tree.*;
+import javax.swing.tree.DefaultMutableTreeNode;
+import javax.swing.tree.DefaultTreeModel;
+import javax.swing.tree.TreeModel;
+import javax.swing.tree.TreeNode;
+import javax.swing.tree.TreePath;
 
 import org.aspectj.ajde.Ajde;
-import org.aspectj.ajde.ui.*;
-import org.aspectj.asm.*;
+import org.aspectj.ajde.ui.AbstractIcon;
+import org.aspectj.ajde.ui.GlobalStructureView;
+import org.aspectj.ajde.ui.StructureView;
+import org.aspectj.ajde.ui.StructureViewProperties;
+import org.aspectj.asm.ProgramElementNode;
+import org.aspectj.asm.RelationNode;
+import org.aspectj.asm.StructureModel;
+import org.aspectj.asm.StructureNode;
 
 /**
  * @author  Mik Kersten

diff --git a/ajde/src/org/aspectj/ajde/ui/swing/StructureViewPanel.java b/ajde/src/org/aspectj/ajde/ui/swing/StructureViewPanel.java
index 471e3c4e7f4b3b9140dcc2d3b49abe0adb7224c4..8bbb43fea0603afd2816f1a70b1908bbf0afa002 100644 (file)
--- a/ajde/src/org/aspectj/ajde/ui/swing/StructureViewPanel.java
+++ b/ajde/src/org/aspectj/ajde/ui/swing/StructureViewPanel.java
@@ -18,12 +18,17 @@ import java.awt.BorderLayout;
 import java.awt.Color;
 import java.util.Iterator;
 
-import javax.swing.*;
+import javax.swing.BorderFactory;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
 import javax.swing.border.BevelBorder;
 import javax.swing.border.Border;
 
 import org.aspectj.ajde.Ajde;
-import org.aspectj.ajde.ui.*;
+import org.aspectj.ajde.ui.FileStructureView;
+import org.aspectj.ajde.ui.StructureView;
+import org.aspectj.ajde.ui.StructureViewNode;
+import org.aspectj.ajde.ui.StructureViewRenderer;
 import org.aspectj.asm.ProgramElementNode;
 import org.aspectj.asm.StructureNode;
 

diff --git a/ajde/src/org/aspectj/ajde/ui/swing/SwingTreeViewNode.java b/ajde/src/org/aspectj/ajde/ui/swing/SwingTreeViewNode.java
index d73b7ad619d9a20d75c8216c97bad67bb446c27f..75810c5759819b150a018364a0d85f6b9669f42a 100644 (file)
--- a/ajde/src/org/aspectj/ajde/ui/swing/SwingTreeViewNode.java
+++ b/ajde/src/org/aspectj/ajde/ui/swing/SwingTreeViewNode.java
@@ -14,7 +14,9 @@
 
 package org.aspectj.ajde.ui.swing;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
 
 import javax.swing.tree.DefaultMutableTreeNode;
 

diff --git a/ajde/src/org/aspectj/ajde/ui/swing/SwingTreeViewNodeFactory.java b/ajde/src/org/aspectj/ajde/ui/swing/SwingTreeViewNodeFactory.java
index b10e28a97c0306332b4c3c819e4ac5d26f09fa73..440e2341f15fbc838eaebe23d84d6ac57ffabf86 100644 (file)
--- a/ajde/src/org/aspectj/ajde/ui/swing/SwingTreeViewNodeFactory.java
+++ b/ajde/src/org/aspectj/ajde/ui/swing/SwingTreeViewNodeFactory.java
@@ -14,9 +14,12 @@
 
 package org.aspectj.ajde.ui.swing;
 
-import java.util.*;
-import org.aspectj.asm.*;
-import org.aspectj.ajde.ui.*;
+import java.util.List;
+
+import org.aspectj.ajde.ui.AbstractIcon;
+import org.aspectj.ajde.ui.StructureViewNode;
+import org.aspectj.ajde.ui.StructureViewNodeFactory;
+import org.aspectj.asm.StructureNode;
 
 /**
  * @author Mik Kersten

diff --git a/ajde/src/org/aspectj/ajde/ui/swing/SwingTreeViewNodeRenderer.java b/ajde/src/org/aspectj/ajde/ui/swing/SwingTreeViewNodeRenderer.java
index ff8eff318f83f00666b232e41ea69dcc8895f1c7..66f73fb693fa3a7bd619b5481faeeb4506b60b20 100644 (file)
--- a/ajde/src/org/aspectj/ajde/ui/swing/SwingTreeViewNodeRenderer.java
+++ b/ajde/src/org/aspectj/ajde/ui/swing/SwingTreeViewNodeRenderer.java
@@ -14,13 +14,18 @@
 
 package org.aspectj.ajde.ui.swing;
 
-import java.awt.*;
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.Font;
 
 import javax.swing.Icon;
 import javax.swing.JTree;
 import javax.swing.tree.DefaultTreeCellRenderer;
 
-import org.aspectj.asm.*;
+import org.aspectj.asm.LinkNode;
+import org.aspectj.asm.ProgramElementNode;
+import org.aspectj.asm.RelationNode;
+import org.aspectj.asm.StructureNode;
 import org.aspectj.bridge.IMessage;
 
 /**

diff --git a/ajde/src/org/aspectj/ajde/ui/swing/TreeViewBuildConfigEditor.java b/ajde/src/org/aspectj/ajde/ui/swing/TreeViewBuildConfigEditor.java
index f7e9d2c2a25dbfa6283ec4ba7094c86c6de66112..0b0eb19dbb34e34eda2798629993fabd5e6437b9 100644 (file)
--- a/ajde/src/org/aspectj/ajde/ui/swing/TreeViewBuildConfigEditor.java
+++ b/ajde/src/org/aspectj/ajde/ui/swing/TreeViewBuildConfigEditor.java
@@ -15,18 +15,37 @@
 
 package org.aspectj.ajde.ui.swing;
 
-import java.awt.*;
-import java.awt.event.*;
+import java.awt.BorderLayout;
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.Dimension;
+import java.awt.Font;
+import java.awt.event.ActionEvent;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
 import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Iterator;
 
-import javax.swing.*;
-import javax.swing.tree.*;
+import javax.swing.BoxLayout;
+import javax.swing.Icon;
+import javax.swing.JButton;
+import javax.swing.JCheckBox;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.JTree;
+import javax.swing.tree.DefaultMutableTreeNode;
+import javax.swing.tree.DefaultTreeCellRenderer;
+import javax.swing.tree.DefaultTreeModel;
+import javax.swing.tree.TreePath;
 
 import org.aspectj.ajde.Ajde;
-import org.aspectj.ajde.ui.*;
+import org.aspectj.ajde.ui.BuildConfigEditor;
+import org.aspectj.ajde.ui.BuildConfigModel;
+import org.aspectj.ajde.ui.BuildConfigNode;
+import org.aspectj.ajde.ui.InvalidResourceException;
 import org.aspectj.asm.ProgramElementNode;
 /**
  * UI for editing build configuration (".lst") files via a graphical tree-based

diff --git a/ajde/src/org/aspectj/ajde/ui/swing/UpdateConfigurationDialog.java b/ajde/src/org/aspectj/ajde/ui/swing/UpdateConfigurationDialog.java
index 3bc360f28863d1f37f0bc2f17706684cd7b08ca9..f25ad7c9d6a0fa34d95886f26af42d9bc54b13a1 100644 (file)
--- a/ajde/src/org/aspectj/ajde/ui/swing/UpdateConfigurationDialog.java
+++ b/ajde/src/org/aspectj/ajde/ui/swing/UpdateConfigurationDialog.java
@@ -15,11 +15,29 @@
 
 package org.aspectj.ajde.ui.swing;
 
-import java.awt.*;
-import java.awt.event.*;
+import java.awt.BorderLayout;
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.Dimension;
+import java.awt.FlowLayout;
+import java.awt.GridLayout;
+import java.awt.event.ActionEvent;
+import java.awt.event.KeyEvent;
+import java.awt.event.KeyListener;
+import java.awt.event.MouseEvent;
+import java.awt.event.MouseListener;
 import java.util.Vector;
 
-import javax.swing.*;
+import javax.swing.BorderFactory;
+import javax.swing.Box;
+import javax.swing.JButton;
+import javax.swing.JCheckBox;
+import javax.swing.JFrame;
+import javax.swing.JLabel;
+import javax.swing.JList;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.ListCellRenderer;
 import javax.swing.border.TitledBorder;
 
 import org.aspectj.ajde.Ajde;