From 20bf213e44aad97b8a1b1efcda24a07b7c92f0d4 Mon Sep 17 00:00:00 2001 From: acolyer Date: Wed, 26 Feb 2003 10:21:24 +0000 Subject: [PATCH] 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! --- ajde/src/org/aspectj/ajde/Ajde.java | 6 +++- .../org/aspectj/ajde/BuildConfigListener.java | 3 +- .../aspectj/ajde/ConfigurationListener.java | 3 +- .../ajde/ProjectPropertiesAdapter.java | 2 +- .../src/org/aspectj/ajde/TaskListManager.java | 3 +- .../ajde/internal/AspectJBuildManager.java | 24 +++++++++++---- .../ajde/internal/CompilerAdapter.java | 17 +++++++++-- .../internal/LstBuildConfigFileUpdater.java | 15 ++++++++-- .../ajde/internal/LstBuildConfigManager.java | 22 ++++++++++---- .../aspectj/ajde/ui/AbstractIconRegistry.java | 6 +++- .../aspectj/ajde/ui/BuildConfigEditor.java | 2 +- .../org/aspectj/ajde/ui/BuildConfigModel.java | 5 +++- .../org/aspectj/ajde/ui/BuildConfigNode.java | 3 +- .../org/aspectj/ajde/ui/EditorManager.java | 12 ++++++-- .../aspectj/ajde/ui/StructureModelUtil.java | 22 ++++++++++++-- .../ajde/ui/StructureSearchManager.java | 8 +++-- .../aspectj/ajde/ui/StructureViewManager.java | 21 +++++++++++--- .../aspectj/ajde/ui/StructureViewNode.java | 3 +- .../ajde/ui/StructureViewNodeFactory.java | 6 +++- .../ajde/ui/StructureViewProperties.java | 9 ++++-- .../ajde/ui/internal/AjcBuildOptions.java | 4 +-- .../ui/internal/BrowserViewProperties.java | 11 +++++-- .../ui/internal/NavigationHistoryModel.java | 5 ++-- .../ui/internal/TreeStructureViewBuilder.java | 20 +++++++++++-- .../ui/internal/UserPreferencesStore.java | 14 +++++++-- .../ajde/ui/swing/AJButtonMenuCombo.java | 11 +++++-- .../aspectj/ajde/ui/swing/AjdeUIManager.java | 12 ++++++-- .../ajde/ui/swing/AjdeWidgetStyles.java | 9 ++++-- .../aspectj/ajde/ui/swing/BasicEditor.java | 11 +++++-- .../swing/BrowserStructureViewToolPanel.java | 24 +++++++++++---- .../aspectj/ajde/ui/swing/BrowserView.java | 17 +++++++++-- .../ajde/ui/swing/BrowserViewManager.java | 14 +++++++-- .../ajde/ui/swing/BrowserViewPanel.java | 19 +++++++++--- .../ui/swing/BrowserViewTreeListener.java | 21 ++++++++++---- .../ajde/ui/swing/BuildConfigPopupMenu.java | 5 +++- .../ajde/ui/swing/BuildOptionsPanel.java | 21 ++++++++++---- .../ajde/ui/swing/BuildProgressPanel.java | 5 +++- .../swing/CompilerMessagesCellRenderer.java | 4 ++- .../aspectj/ajde/ui/swing/ErrorDialog.java | 18 +++++++++--- .../aspectj/ajde/ui/swing/GoToLineThread.java | 4 ++- .../aspectj/ajde/ui/swing/OptionsFrame.java | 17 +++++++++-- .../aspectj/ajde/ui/swing/OptionsPanel.java | 5 ++-- .../aspectj/ajde/ui/swing/PointcutWizard.java | 22 ++++++++++---- .../swing/SimpleStructureViewToolPanel.java | 21 ++++++++++---- .../ajde/ui/swing/StructureTreeManager.java | 16 ++++++++-- .../ajde/ui/swing/StructureViewPanel.java | 9 ++++-- .../ajde/ui/swing/SwingTreeViewNode.java | 4 ++- .../ui/swing/SwingTreeViewNodeFactory.java | 9 ++++-- .../ui/swing/SwingTreeViewNodeRenderer.java | 9 ++++-- .../ui/swing/TreeViewBuildConfigEditor.java | 29 +++++++++++++++---- .../ui/swing/UpdateConfigurationDialog.java | 24 +++++++++++++-- 51 files changed, 476 insertions(+), 130 deletions(-) diff --git a/ajde/src/org/aspectj/ajde/Ajde.java b/ajde/src/org/aspectj/ajde/Ajde.java index 7edd825a5..7f0292982 100644 --- 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 8bdf3823c..d1985ea97 100644 --- 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 21e3e1e44..e46196674 100644 --- 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 472a8425d..fd63560e3 100644 --- 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 59cde6c51..bae3f8c40 100644 --- 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 1c3e201d8..541cef80c 100644 --- 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 325ac75e5..60aa23d02 100644 --- 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 c3f14057c..72a0b1d11 100644 --- 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 26eafbdb8..6e337a161 100644 --- 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 96ef60f4c..97bdf4622 100644 --- 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 7f146505f..b7fee071d 100644 --- 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 cbffa6a25..1687e69ee 100644 --- 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 6e22b8aa8..5c28c7e43 100644 --- 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 f6159ea6f..dc1be0872 100644 --- 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 cb1a3ba82..8415b6dfe 100644 --- 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 776dd4a18..e997091b4 100644 --- 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 947d522ae..68b96fbf5 100644 --- 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 5676078bc..fc2700813 100644 --- 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 f2fa818c9..102d58b95 100644 --- 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 e41faa159..1fa0c00b8 100644 --- 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 da53c5c09..25b9040d7 100644 --- 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 794afb5d5..653ee65cd 100644 --- 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 653f21fd8..d15167926 100644 --- 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 c2f9bcca6..41a9a0bdc 100644 --- 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 617c516a9..c5c001a0b 100644 --- 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 c5e626e1d..0531c1758 100644 --- 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 37cfe6f34..6fe610e00 100644 --- 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 8da23390a..5b31ac341 100644 --- 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 99d070591..7d0a46959 100644 --- 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 963fb9ae0..3b69fd7a6 100644 --- 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 cb36bb809..aa1ed12d3 100644 --- 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 77ff0dceb..68f7741aa 100644 --- 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 96adbff63..33901b2c5 100644 --- 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 f795541c4..e42806bfc 100644 --- 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 5accf747c..67323ea7c 100644 --- 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 90dad5e95..4c1ad0222 100644 --- 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 68f1fe45d..128941357 100644 --- 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 9046b979c..a1a47a169 100644 --- 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 636293945..5acaddde2 100644 --- 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 2082b4d93..b5976b80d 100644 --- 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 14fdbb511..c9b38c67f 100644 --- 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 31fc3e821..dcc3b0cba 100644 --- 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 a3044c08a..91d450ed1 100644 --- 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 532d9dc5d..4ec5e8ff0 100644 --- 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 57dcac9d5..1ab612a80 100644 --- 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 471e3c4e7..8bbb43fea 100644 --- 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 d73b7ad61..75810c575 100644 --- 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 b10e28a97..440e2341f 100644 --- 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 ff8eff318..66f73fb69 100644 --- 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 f7e9d2c2a..0b0eb19db 100644 --- 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 3bc360f28..f25ad7c9d 100644 --- 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; -- 2.39.5