diff options
author | acolyer <acolyer> | 2005-11-24 15:25:48 +0000 |
---|---|---|
committer | acolyer <acolyer> | 2005-11-24 15:25:48 +0000 |
commit | 5c1a75d0c03f86cf213e3f962b318c967e91910d (patch) | |
tree | 36a6532a1b0b20236414796a4283d863c9e422c7 /ajde/src | |
parent | 6eb77c5a3b8328e67a047bc6410a858302a3c714 (diff) | |
download | aspectj-5c1a75d0c03f86cf213e3f962b318c967e91910d.tar.gz aspectj-5c1a75d0c03f86cf213e3f962b318c967e91910d.zip |
this commit eliminates all bar 2 of the 60 odd compilation warnings in the ajde module
Diffstat (limited to 'ajde/src')
32 files changed, 225 insertions, 170 deletions
diff --git a/ajde/src/org/aspectj/ajde/Ajde.java b/ajde/src/org/aspectj/ajde/Ajde.java index 06a382e1d..992623a8d 100644 --- a/ajde/src/org/aspectj/ajde/Ajde.java +++ b/ajde/src/org/aspectj/ajde/Ajde.java @@ -255,7 +255,7 @@ public class Ajde { final StringBuffer command = new StringBuffer(); LangUtil.ProcessController controller = new LangUtil.ProcessController() { - protected void doCompleting(Throwable thrown, int result) { + public void doCompleting(Throwable thrown, int result) { LangUtil.ProcessController.Thrown any = getThrown(); if (!any.thrown && (null == thrown) && (0 == result)) { return; // no errors diff --git a/ajde/src/org/aspectj/ajde/BuildOptionsAdapter.java b/ajde/src/org/aspectj/ajde/BuildOptionsAdapter.java index 7ac61377a..3c3a58abf 100644 --- a/ajde/src/org/aspectj/ajde/BuildOptionsAdapter.java +++ b/ajde/src/org/aspectj/ajde/BuildOptionsAdapter.java @@ -55,29 +55,29 @@ public interface BuildOptionsAdapter { */ public Map getJavaOptionsMap(); - /** - * Use javac to generate .class files. The default is "false". - * From -usejavac - * @deprecated Not supported from AspectJ 1.1 onwards - */ - public boolean getUseJavacMode(); - - /** - * Only relevant with Use Javac or Preprocess modes. Specify where to place - * intermediate .java files. The default is "workingdir". - * From -workingdir - * @deprecated Not supported from AspectJ 1.1 onwards - */ - public String getWorkingOutputPath(); - - /** - * Generate regular Java code into the Working OutputPath. Don't try to generate - * any .class files. The default is "false". - * From -source - * @deprecated Not supported from AspectJ 1.1 onwards - */ - public boolean getPreprocessMode(); - +// /** +// * Use javac to generate .class files. The default is "false". +// * From -usejavac +// * @deprecated Not supported from AspectJ 1.1 onwards +// */ +// public boolean getUseJavacMode(); +// +// /** +// * Only relevant with Use Javac or Preprocess modes. Specify where to place +// * intermediate .java files. The default is "workingdir". +// * From -workingdir +// * @deprecated Not supported from AspectJ 1.1 onwards +// */ +// public String getWorkingOutputPath(); + +// /** +// * Generate regular Java code into the Working OutputPath. Don't try to generate +// * any .class files. The default is "false". +// * From -source +// * @deprecated Not supported from AspectJ 1.1 onwards +// */ +// public boolean getPreprocessMode(); +// /** * Specify character encoding used by source files. The default is the current * JVM's default. @@ -85,12 +85,12 @@ public interface BuildOptionsAdapter { */ public String getCharacterEncoding(); - /** - * Support assertions as defined in JLS-1.4. The default is "false". - * @deprecated Use getComplianceLevel instead - */ - public boolean getSourceOnePointFourMode(); - +// /** +// * Support assertions as defined in JLS-1.4. The default is "false". +// * @deprecated Use getComplianceLevel instead +// */ +// public boolean getSourceOnePointFourMode(); +// /** * Run compiles incrementally. @@ -98,29 +98,29 @@ public interface BuildOptionsAdapter { */ public boolean getIncrementalMode(); - /** - * Be extra-lenient in interpreting the Java specification. The default is "false", - * i.e. "regular" mode. - * From -lenient - * @deprecated Not supported from AspectJ 1.1 onwards - */ - public boolean getLenientSpecMode(); - - /** - * Be extra-strict in interpreting the Java specification. The default is "false", - * i.e. "regular" mode. - * From -strict - * @deprecated Not supported from AspectJ 1.1 onwards - */ - public boolean getStrictSpecMode(); - - /** - * Make the use of some features from pre-1.0 versions of AspectJ be warnings to ease - * porting of old code. The default is "false". - * From -porting - * @deprecated Not supported from AspectJ 1.1 onwards - */ - public boolean getPortingMode(); +// /** +// * Be extra-lenient in interpreting the Java specification. The default is "false", +// * i.e. "regular" mode. +// * From -lenient +// * @deprecated Not supported from AspectJ 1.1 onwards +// */ +// public boolean getLenientSpecMode(); + +// /** +// * Be extra-strict in interpreting the Java specification. The default is "false", +// * i.e. "regular" mode. +// * From -strict +// * @deprecated Not supported from AspectJ 1.1 onwards +// */ +// public boolean getStrictSpecMode(); +// +// /** +// * Make the use of some features from pre-1.0 versions of AspectJ be warnings to ease +// * porting of old code. The default is "false". +// * From -porting +// * @deprecated Not supported from AspectJ 1.1 onwards +// */ +// public boolean getPortingMode(); /** * The non-standard, typically prefaced with -X when used with a command line compiler. diff --git a/ajde/src/org/aspectj/ajde/internal/AspectJBuildManager.java b/ajde/src/org/aspectj/ajde/internal/AspectJBuildManager.java index 19422611e..ba99b95da 100644 --- a/ajde/src/org/aspectj/ajde/internal/AspectJBuildManager.java +++ b/ajde/src/org/aspectj/ajde/internal/AspectJBuildManager.java @@ -224,14 +224,14 @@ public class AspectJBuildManager implements BuildManager { + "\n-> -warn:" + formatSet(buildOptions.getWarnings()) + "\n-> noImportError: " + buildOptions.getNoImportError() + "\n-> preserveAllLocals:" + buildOptions.getPreserveAllLocals() - + "\n-> non-standard options: " + buildOptions.getNonStandardOptions() - + "\n-> [ignored-deprecated in AspectJ1.1] porting mode: " + buildOptions.getPortingMode() - + "\n-> [ignored-deprecated in AspectJ1.1] source 1.4 mode: " + buildOptions.getSourceOnePointFourMode() - + "\n-> [ignored-deprecated in AspectJ1.1] strict spec mode: " + buildOptions.getStrictSpecMode() - + "\n-> [ignored-deprecated in AspectJ1.1] lenient spec mode: " + buildOptions.getLenientSpecMode() - + "\n-> [ignored-deprecated in AspectJ1.1] use javac mode: " + buildOptions.getUseJavacMode() - + "\n-> [ignored-deprecated in AspectJ1.1] preprocess mode: " + buildOptions.getPreprocessMode() - + "\n-> [ignored-deprecated in AspectJ1.1] working dir: " + buildOptions.getWorkingOutputPath(); + + "\n-> non-standard options: " + buildOptions.getNonStandardOptions(); +// + "\n-> [ignored-deprecated in AspectJ1.1] porting mode: " + buildOptions.getPortingMode() +// + "\n-> [ignored-deprecated in AspectJ1.1] source 1.4 mode: " + buildOptions.getSourceOnePointFourMode() +// + "\n-> [ignored-deprecated in AspectJ1.1] strict spec mode: " + buildOptions.getStrictSpecMode() +// + "\n-> [ignored-deprecated in AspectJ1.1] lenient spec mode: " + buildOptions.getLenientSpecMode() +// + "\n-> [ignored-deprecated in AspectJ1.1] use javac mode: " + buildOptions.getUseJavacMode() +// + "\n-> [ignored-deprecated in AspectJ1.1] preprocess mode: " + buildOptions.getPreprocessMode() +// + "\n-> [ignored-deprecated in AspectJ1.1] working dir: " + buildOptions.getWorkingOutputPath(); } private String formatSet( Set options ) { diff --git a/ajde/src/org/aspectj/ajde/internal/BuildNotifierAdapter.java b/ajde/src/org/aspectj/ajde/internal/BuildNotifierAdapter.java index 37a25f404..3409e2ef8 100644 --- a/ajde/src/org/aspectj/ajde/internal/BuildNotifierAdapter.java +++ b/ajde/src/org/aspectj/ajde/internal/BuildNotifierAdapter.java @@ -21,14 +21,14 @@ import org.aspectj.bridge.IProgressListener; public class BuildNotifierAdapter implements IProgressListener { private BuildProgressMonitor progressMonitor; - private AjBuildManager buildManager; +// private AjBuildManager buildManager; // private int numCompilationUnitPasses = 1; // private int completedPasses = 0; private boolean cancelRequested = false; public BuildNotifierAdapter(BuildProgressMonitor progressMonitor, AjBuildManager buildManager) { this.progressMonitor = progressMonitor; - this.buildManager = buildManager; +// this.buildManager = buildManager; } public void begin() { diff --git a/ajde/src/org/aspectj/ajde/internal/CompilerAdapter.java b/ajde/src/org/aspectj/ajde/internal/CompilerAdapter.java index 3de011737..8a1d318c8 100644 --- a/ajde/src/org/aspectj/ajde/internal/CompilerAdapter.java +++ b/ajde/src/org/aspectj/ajde/internal/CompilerAdapter.java @@ -259,8 +259,7 @@ public class CompilerAdapter { if (options.getSourceCompatibilityLevel() != null && options.getSourceCompatibilityLevel().equals(CompilerOptions.VERSION_1_5)) { optionsToSet.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_1_5); optionsToSet.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_5); - } else if (options.getSourceOnePointFourMode() - || options.getSourceCompatibilityLevel() != null && options.getSourceCompatibilityLevel().equals(CompilerOptions.VERSION_1_4)) { + } else if (options.getSourceCompatibilityLevel() != null && options.getSourceCompatibilityLevel().equals(CompilerOptions.VERSION_1_4)) { optionsToSet.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_1_4); optionsToSet.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_4); } diff --git a/ajde/src/org/aspectj/ajde/internal/LstBuildConfigFileParser.java b/ajde/src/org/aspectj/ajde/internal/LstBuildConfigFileParser.java index 187dda1c0..f5aff5f79 100644 --- a/ajde/src/org/aspectj/ajde/internal/LstBuildConfigFileParser.java +++ b/ajde/src/org/aspectj/ajde/internal/LstBuildConfigFileParser.java @@ -28,10 +28,10 @@ public class LstBuildConfigFileParser extends ConfigParser { private List importedFiles = new ArrayList(); private List problemEntries = new ArrayList(); - private String currFilePath; +// private String currFilePath; public LstBuildConfigFileParser(String currFilePath) { - this.currFilePath = currFilePath; +// this.currFilePath = currFilePath; } protected void showWarning(String message) { diff --git a/ajde/src/org/aspectj/ajde/ui/BuildConfigNode.java b/ajde/src/org/aspectj/ajde/ui/BuildConfigNode.java index cea5fe9e1..a4c3e98ad 100644 --- a/ajde/src/org/aspectj/ajde/ui/BuildConfigNode.java +++ b/ajde/src/org/aspectj/ajde/ui/BuildConfigNode.java @@ -176,6 +176,8 @@ public class BuildConfigNode { */ public static class Kind implements Serializable { + private static final long serialVersionUID = 3924996793884978885L; + public static final Kind FILE_JAVA = new Kind("Java source file"); public static final Kind FILE_ASPECTJ = new Kind("AspectJ source file"); public static final Kind FILE_LST = new Kind("build configuration file"); diff --git a/ajde/src/org/aspectj/ajde/ui/IStructureViewNode.java b/ajde/src/org/aspectj/ajde/ui/IStructureViewNode.java index f0a7ccac5..d6982a45f 100644 --- a/ajde/src/org/aspectj/ajde/ui/IStructureViewNode.java +++ b/ajde/src/org/aspectj/ajde/ui/IStructureViewNode.java @@ -57,6 +57,8 @@ public interface IStructureViewNode { */ public static class Kind implements Serializable { + private static final long serialVersionUID = 6730849292562214877L; + public static final Kind DECLARATION = new Kind("declaration"); public static final Kind RELATIONSHIP = new Kind("relationship"); public static final Kind LINK = new Kind("link"); diff --git a/ajde/src/org/aspectj/ajde/ui/InvalidResourceException.java b/ajde/src/org/aspectj/ajde/ui/InvalidResourceException.java index e7807bec2..feb046acb 100644 --- a/ajde/src/org/aspectj/ajde/ui/InvalidResourceException.java +++ b/ajde/src/org/aspectj/ajde/ui/InvalidResourceException.java @@ -22,6 +22,8 @@ package org.aspectj.ajde.ui; */ public class InvalidResourceException extends Exception { + private static final long serialVersionUID = -5290919159396792978L; + /** * Constructor for InvalidResourceException. */ diff --git a/ajde/src/org/aspectj/ajde/ui/StructureModelUtil.java b/ajde/src/org/aspectj/ajde/ui/StructureModelUtil.java index 61ba5f9ee..975bd7a43 100644 --- a/ajde/src/org/aspectj/ajde/ui/StructureModelUtil.java +++ b/ajde/src/org/aspectj/ajde/ui/StructureModelUtil.java @@ -37,6 +37,9 @@ import org.aspectj.asm.IProgramElement; public class StructureModelUtil { public static class ModelIncorrectException extends Exception { + + private static final long serialVersionUID = 8920868549577870993L; + public ModelIncorrectException(String s) { super(s); } diff --git a/ajde/src/org/aspectj/ajde/ui/swing/AJButtonMenuCombo.java b/ajde/src/org/aspectj/ajde/ui/swing/AJButtonMenuCombo.java index 0531c1758..c27fdd53f 100644 --- a/ajde/src/org/aspectj/ajde/ui/swing/AJButtonMenuCombo.java +++ b/ajde/src/org/aspectj/ajde/ui/swing/AJButtonMenuCombo.java @@ -29,10 +29,12 @@ import javax.swing.JPopupMenu; public class AJButtonMenuCombo extends JPanel { - private JButton mainButton; + private static final long serialVersionUID = -4866207530403336160L; + + private JButton mainButton; private JButton popupButton; private JPopupMenu menu; - private boolean depressable = false; +// private boolean depressable = false; private boolean isPressed = false; public AJButtonMenuCombo(String name, @@ -42,7 +44,7 @@ public class AJButtonMenuCombo extends JPanel { boolean depressable) { this.menu = menu; - this.depressable = depressable; +// this.depressable = depressable; mainButton = new JButton(); mainButton.setIcon(icon); mainButton.setBorder(AjdeWidgetStyles.DEFAULT_BORDER); diff --git a/ajde/src/org/aspectj/ajde/ui/swing/AjdeUIManager.java b/ajde/src/org/aspectj/ajde/ui/swing/AjdeUIManager.java index fc4f43470..d53db5e78 100644 --- a/ajde/src/org/aspectj/ajde/ui/swing/AjdeUIManager.java +++ b/ajde/src/org/aspectj/ajde/ui/swing/AjdeUIManager.java @@ -37,7 +37,7 @@ public class AjdeUIManager { private BrowserViewManager viewManager = null; // private BuildProgressMonitor buildProgressMonitor = null; // private ErrorHandler errorHandler = null; - private UserPreferencesAdapter userPreferencesAdapter = null; +// private UserPreferencesAdapter userPreferencesAdapter = null; private AjcBuildOptions buildOptionsAdapter = null; private IdeUIAdapter ideUIAdapter = null; private TreeViewBuildConfigEditor buildConfigEditor = null; @@ -88,7 +88,7 @@ public class AjdeUIManager { this.iconRegistry = iconRegistry; //ConfigurationManager configManager = new LstConfigurationManager(); this.ideUIAdapter = ideUIAdapter; - this.userPreferencesAdapter = userPreferencesAdapter; +// this.userPreferencesAdapter = userPreferencesAdapter; this.buildOptionsAdapter = new AjcBuildOptions(userPreferencesAdapter); this.buildConfigEditor = new TreeViewBuildConfigEditor(); this.rootFrame = rootFrame; @@ -149,7 +149,7 @@ public class AjdeUIManager { int x = (rootFrame.getWidth()/2) + rootFrame.getX() - optionsFrame.getWidth()/2; int y = (rootFrame.getHeight()/2) + rootFrame.getY() - optionsFrame.getHeight()/2; optionsFrame.setLocation(x, y); - optionsFrame.show(); + optionsFrame.setVisible(true); } public AjcBuildOptions getBuildOptions() { diff --git a/ajde/src/org/aspectj/ajde/ui/swing/BrowserStructureViewToolPanel.java b/ajde/src/org/aspectj/ajde/ui/swing/BrowserStructureViewToolPanel.java index a2e0fb492..c8767db56 100644 --- a/ajde/src/org/aspectj/ajde/ui/swing/BrowserStructureViewToolPanel.java +++ b/ajde/src/org/aspectj/ajde/ui/swing/BrowserStructureViewToolPanel.java @@ -27,6 +27,8 @@ import org.aspectj.asm.*; public class BrowserStructureViewToolPanel extends JPanel { + private static final long serialVersionUID = 7960528108612681776L; + private StructureView currentView; private StructureViewPanel viewPanel; protected BorderLayout borderLayout1 = new BorderLayout(); @@ -155,6 +157,9 @@ public class BrowserStructureViewToolPanel extends JPanel { } private class RadioSelectionMenuButton extends JRadioButtonMenuItem { + + private static final long serialVersionUID = -879644981405801807L; + public RadioSelectionMenuButton(StructureViewProperties.Granularity granularity, ButtonGroup group) { super(granularity.toString()); super.setFont(AjdeWidgetStyles.DEFAULT_LABEL_FONT); @@ -178,6 +183,8 @@ public class BrowserStructureViewToolPanel extends JPanel { private class CheckBoxSelectionMenuButton extends JCheckBoxMenuItem { + private static final long serialVersionUID = -4555502313984854787L; + public CheckBoxSelectionMenuButton(String name) { super(name); this.setFont(AjdeWidgetStyles.DEFAULT_LABEL_FONT); diff --git a/ajde/src/org/aspectj/ajde/ui/swing/BrowserView.java b/ajde/src/org/aspectj/ajde/ui/swing/BrowserView.java index acabee500..ec3da333b 100644 --- a/ajde/src/org/aspectj/ajde/ui/swing/BrowserView.java +++ b/ajde/src/org/aspectj/ajde/ui/swing/BrowserView.java @@ -43,7 +43,8 @@ import org.aspectj.asm.IProgramElement; * @author Mik Kersten */ class BrowserView extends JPanel { - private BrowserViewPanel masterView; + private static final long serialVersionUID = 1L; +// private BrowserViewPanel masterView; private BrowserViewPanel slaveView; private boolean slaveViewVisible = false; private String lastSelectedConfig = ""; @@ -69,7 +70,7 @@ class BrowserView extends JPanel { public BrowserView(BrowserViewPanel masterView, BrowserViewPanel slaveView, IconRegistry icons) { try { - this.masterView = masterView; + // this.masterView = masterView; this.slaveView = slaveView; this.icons = icons; configs_comboBox = new JComboBox(Ajde.getDefault().getProjectProperties().getBuildConfigFiles().toArray()); @@ -248,7 +249,10 @@ class BrowserView extends JPanel { // } static class ConfigsCellRenderer extends JLabel implements ListCellRenderer { - public ConfigsCellRenderer() { + + private static final long serialVersionUID = 8795959045339903340L; + + public ConfigsCellRenderer() { setOpaque(true); } diff --git a/ajde/src/org/aspectj/ajde/ui/swing/BrowserViewPanel.java b/ajde/src/org/aspectj/ajde/ui/swing/BrowserViewPanel.java index 098ca3049..685307cd2 100644 --- a/ajde/src/org/aspectj/ajde/ui/swing/BrowserViewPanel.java +++ b/ajde/src/org/aspectj/ajde/ui/swing/BrowserViewPanel.java @@ -24,8 +24,6 @@ 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.GlobalStructureView; @@ -42,9 +40,11 @@ import org.aspectj.ajde.ui.StructureViewRenderer; */ public class BrowserViewPanel extends JPanel implements StructureViewRenderer { - private StructureTreeManager treeManager; + private static final long serialVersionUID = 2201330630036486567L; + + private StructureTreeManager treeManager; //private StructureView structureView = null; - private int depthSliderVal = 0; + //private int depthSliderVal = 0; private JComboBox view_comboBox = null; private BorderLayout borderLayout1 = new BorderLayout(); @@ -118,14 +118,14 @@ public class BrowserViewPanel extends JPanel implements StructureViewRenderer { depth_slider.setSnapToTicks(true); depth_slider.setPaintTrack(true); depth_slider.setPaintTicks(true); - this.depth_slider.addChangeListener( - new ChangeListener() { - public void stateChanged(ChangeEvent e) { - depthSliderVal = depth_slider.getValue(); - //AjdeUIManager.getDefault().getViewManager().updateView(); - } - }); - depthSliderVal = depth_slider.getValue(); +// this.depth_slider.addChangeListener( +// new ChangeListener() { +// public void stateChanged(ChangeEvent e) { +// depthSliderVal = depth_slider.getValue(); +// //AjdeUIManager.getDefault().getViewManager().updateView(); +// } +// }); +// depthSliderVal = depth_slider.getValue(); } private void view_comboBox_actionPerformed(ActionEvent e) { diff --git a/ajde/src/org/aspectj/ajde/ui/swing/BrowserViewTreeListener.java b/ajde/src/org/aspectj/ajde/ui/swing/BrowserViewTreeListener.java index ecc403fd6..7e4238fe5 100644 --- a/ajde/src/org/aspectj/ajde/ui/swing/BrowserViewTreeListener.java +++ b/ajde/src/org/aspectj/ajde/ui/swing/BrowserViewTreeListener.java @@ -110,7 +110,10 @@ class BrowserViewTreeListener implements TreeSelectionListener, MouseListener { JMenuItem showSourcesItem = new JMenuItem("Display sources", AjdeUIManager.getDefault().getIconRegistry().getStructureSwingIcon(IProgramElement.Kind.CODE)); showSourcesItem.setFont(new java.awt.Font("Dialog", 0, 11)); showSourcesItem.addActionListener(new AbstractAction() { - public void actionPerformed(ActionEvent e) { + + private static final long serialVersionUID = 1L; + + public void actionPerformed(ActionEvent e) { //AjdeUIManager.getDefault().getViewManager().showSourcesNodes(signatures); // USED THE FOLLOWING FROM: BrowserViewManager: // public void showSourcesNodes(java.util.List nodes) { @@ -139,7 +142,10 @@ class BrowserViewTreeListener implements TreeSelectionListener, MouseListener { JMenuItem generatePCD = new JMenuItem("Pointcut Wizard (alpha)...", AjdeUIManager.getDefault().getIconRegistry().getStructureSwingIcon(IProgramElement.Kind.POINTCUT)); generatePCD.setFont(new java.awt.Font("Dialog", 0, 11)); generatePCD.addActionListener(new AbstractAction() { - public void actionPerformed(ActionEvent e) { + + private static final long serialVersionUID = 1L; + + public void actionPerformed(ActionEvent e) { AjdeUIManager.getDefault().getViewManager().extractAndInsertSignatures(signatures, true); } }); diff --git a/ajde/src/org/aspectj/ajde/ui/swing/BuildConfigPopupMenu.java b/ajde/src/org/aspectj/ajde/ui/swing/BuildConfigPopupMenu.java index 0749dbb2e..f5b7ae95c 100644 --- a/ajde/src/org/aspectj/ajde/ui/swing/BuildConfigPopupMenu.java +++ b/ajde/src/org/aspectj/ajde/ui/swing/BuildConfigPopupMenu.java @@ -28,6 +28,8 @@ import org.aspectj.asm.IProgramElement; public class BuildConfigPopupMenu extends JPopupMenu { + private static final long serialVersionUID = -6730132748667530482L; + public BuildConfigPopupMenu(final AbstractAction action) { java.util.List configFiles = Ajde.getDefault().getProjectProperties().getBuildConfigFiles(); for (Iterator it = configFiles.iterator(); it.hasNext(); ) { diff --git a/ajde/src/org/aspectj/ajde/ui/swing/BuildOptionsPanel.java b/ajde/src/org/aspectj/ajde/ui/swing/BuildOptionsPanel.java index ded795586..46eef334c 100644 --- a/ajde/src/org/aspectj/ajde/ui/swing/BuildOptionsPanel.java +++ b/ajde/src/org/aspectj/ajde/ui/swing/BuildOptionsPanel.java @@ -34,12 +34,14 @@ public class BuildOptionsPanel extends OptionsPanel { // + "AspectJ compiler. The Document Outline View will fail to refresh correctly when\n" // + "incremental mode is enabled. Submit any other bugs at http://eclipse.org/aspectj"; + private static final long serialVersionUID = 5891996016897166802L; + protected static final BuildOptionsPanel INSTANCE = new BuildOptionsPanel(); // private ButtonGroup compilerMode_buttonGroup = new ButtonGroup(); private TitledBorder titledBorder1; - private Border border3; - private Border border4; +// private Border border3; +// private Border border4; // private TitledBorder titledBorder2; // private Border border5; private Border border1; @@ -55,7 +57,7 @@ public class BuildOptionsPanel extends OptionsPanel { private BorderLayout borderLayout8 = new BorderLayout(); private Box options_box1 = Box.createVerticalBox(); private BorderLayout borderLayout5 = new BorderLayout(); - private JTextField workingDir_field = new JTextField(); +// private JTextField workingDir_field = new JTextField(); private JPanel jPanel2 = new JPanel(); private JPanel jPanel1 = new JPanel(); private JPanel build_panel = new JPanel(); @@ -76,8 +78,8 @@ public class BuildOptionsPanel extends OptionsPanel { JCheckBox oneFive_checkBox = new JCheckBox(); Box options_box = Box.createVerticalBox(); //JCheckBox incremental_checkBox = new JCheckBox(); - JCheckBox useJavac_checkBox = new JCheckBox(); - JCheckBox preprocess_checkBox = new JCheckBox(); +// JCheckBox useJavac_checkBox = new JCheckBox(); +// JCheckBox preprocess_checkBox = new JCheckBox(); JLabel spacer_label1 = new JLabel(); public BuildOptionsPanel() { @@ -89,10 +91,10 @@ public class BuildOptionsPanel extends OptionsPanel { // compilerMode_buttonGroup.add(strict_radioButton); // compilerMode_buttonGroup.add(lenient_radioButton); - preprocess_checkBox.setEnabled(false); - useJavac_checkBox.setEnabled(false); - workingDir_field.setEnabled(false); - workingDir_label.setEnabled(false); +// preprocess_checkBox.setEnabled(false); +// useJavac_checkBox.setEnabled(false); +// workingDir_field.setEnabled(false); +// workingDir_label.setEnabled(false); } catch (Exception e) { Ajde.getDefault().getErrorHandler().handleError("Could not initialize GUI.", e); } @@ -109,12 +111,12 @@ public class BuildOptionsPanel extends OptionsPanel { Ajde.getDefault().getBuildManager().getBuildOptions().getSourceCompatibilityLevel().equals(CompilerOptions.VERSION_1_4) ); } - preprocess_checkBox.setSelected( - Ajde.getDefault().getBuildManager().getBuildOptions().getPreprocessMode() - ); - useJavac_checkBox.setSelected( - Ajde.getDefault().getBuildManager().getBuildOptions().getUseJavacMode() - ); +// preprocess_checkBox.setSelected( +// Ajde.getDefault().getBuildManager().getBuildOptions().getPreprocessMode() +// ); +// useJavac_checkBox.setSelected( +// Ajde.getDefault().getBuildManager().getBuildOptions().getUseJavacMode() +// ); // incremental_checkBox.setSelected( // Ajde.getDefault().getBuildManager().getBuildOptions().getIncrementalMode() // ); @@ -122,9 +124,9 @@ public class BuildOptionsPanel extends OptionsPanel { nonStandard_field.setText( Ajde.getDefault().getBuildManager().getBuildOptions().getNonStandardOptions() ); - workingDir_field.setText( - Ajde.getDefault().getBuildManager().getBuildOptions().getWorkingOutputPath() - ); +// workingDir_field.setText( +// Ajde.getDefault().getBuildManager().getBuildOptions().getWorkingOutputPath() +// ); // if (Ajde.getDefault().getBuildManager().getBuildOptions().getStrictSpecMode()) { // strict_radioButton.setSelected(true); @@ -139,17 +141,17 @@ public class BuildOptionsPanel extends OptionsPanel { if (oneFive_checkBox.isSelected()) { AjdeUIManager.getDefault().getBuildOptions().setSourceCompatibilityLevel(CompilerOptions.VERSION_1_5); } else if (assertions_checkBox.isSelected()) { - AjdeUIManager.getDefault().getBuildOptions().setSourceOnePointFourMode(true); +// AjdeUIManager.getDefault().getBuildOptions().setSourceOnePointFourMode(true); AjdeUIManager.getDefault().getBuildOptions().setSourceCompatibilityLevel(CompilerOptions.VERSION_1_4); } else { AjdeUIManager.getDefault().getBuildOptions().setSourceCompatibilityLevel(CompilerOptions.VERSION_1_3); } - AjdeUIManager.getDefault().getBuildOptions().setPreprocessMode( - preprocess_checkBox.isSelected() - ); - AjdeUIManager.getDefault().getBuildOptions().setUseJavacMode( - useJavac_checkBox.isSelected() - ); +// AjdeUIManager.getDefault().getBuildOptions().setPreprocessMode( +// preprocess_checkBox.isSelected() +// ); +// AjdeUIManager.getDefault().getBuildOptions().setUseJavacMode( +// useJavac_checkBox.isSelected() +// ); // AjdeUIManager.getDefault().getBuildOptions().setIncrementalMode( // incremental_checkBox.isSelected() // ); @@ -157,9 +159,9 @@ public class BuildOptionsPanel extends OptionsPanel { AjdeUIManager.getDefault().getBuildOptions().setNonStandardOptions( nonStandard_field.getText() ); - AjdeUIManager.getDefault().getBuildOptions().setWorkingDir( - workingDir_field.getText() - ); +// AjdeUIManager.getDefault().getBuildOptions().setWorkingDir( +// workingDir_field.getText() +// ); // AjdeUIManager.getDefault().getBuildOptions().setStrictSpecMode(strict_radioButton.isSelected()); // AjdeUIManager.getDefault().getBuildOptions().setLenientSpecMode(lenient_radioButton.isSelected()); @@ -174,14 +176,12 @@ public class BuildOptionsPanel extends OptionsPanel { new TitledBorder( BorderFactory.createEtchedBorder(Color.white, new Color(156, 156, 158)), "ajc Options"); - border3 = - BorderFactory.createCompoundBorder( + BorderFactory.createCompoundBorder( new TitledBorder( BorderFactory.createEtchedBorder(Color.white, new Color(156, 156, 158)), "ajc Options"), BorderFactory.createEmptyBorder(5, 5, 5, 5)); - border4 = - BorderFactory.createEtchedBorder(Color.white, new Color(156, 156, 158)); + BorderFactory.createEtchedBorder(Color.white, new Color(156, 156, 158)); // titledBorder2 = // new TitledBorder( // BorderFactory.createEtchedBorder(Color.white, new Color(156, 156, 158)), @@ -215,9 +215,9 @@ public class BuildOptionsPanel extends OptionsPanel { // lenient_radioButton.setText( // "Be lenient in interpreting the Java specification"); // lenient_radioButton.setFont(new java.awt.Font("Dialog", 0, 11)); - workingDir_field.setFont(new java.awt.Font("SansSerif", 0, 11)); - workingDir_field.setMinimumSize(new Dimension(200, 21)); - workingDir_field.setPreferredSize(new Dimension(350, 21)); +// workingDir_field.setFont(new java.awt.Font("SansSerif", 0, 11)); +// workingDir_field.setMinimumSize(new Dimension(200, 21)); +// workingDir_field.setPreferredSize(new Dimension(350, 21)); jPanel2.setLayout(borderLayout3); jPanel1.setLayout(borderLayout2); build_panel.setLayout(borderLayout4); @@ -246,23 +246,23 @@ public class BuildOptionsPanel extends OptionsPanel { // incremental_checkBox.setText("Incremental compile"); // incremental_checkBox.setToolTipText("Only recompile necessary sources."); // incremental_checkBox.setFont(new java.awt.Font("Dialog", 0, 11)); - useJavac_checkBox.setText("Use javac to generate .class files"); - useJavac_checkBox.setFont(new java.awt.Font("Dialog", 0, 11)); - preprocess_checkBox.setFont(new java.awt.Font("Dialog", 0, 11)); - preprocess_checkBox.setToolTipText(""); - preprocess_checkBox.setText("Only preprocess and generate .java source files"); +// useJavac_checkBox.setText("Use javac to generate .class files"); +// useJavac_checkBox.setFont(new java.awt.Font("Dialog", 0, 11)); +// preprocess_checkBox.setFont(new java.awt.Font("Dialog", 0, 11)); +// preprocess_checkBox.setToolTipText(""); +// preprocess_checkBox.setText("Only preprocess and generate .java source files"); spacer_label1.setText(" "); - this.add(jPanel3, BorderLayout.NORTH); - jPanel2.add(workingDir_label, BorderLayout.CENTER); - jPanel2.add(workingDir_field, BorderLayout.EAST); +// this.add(jPanel3, BorderLayout.NORTH); +// jPanel2.add(workingDir_label, BorderLayout.CENTER); +// jPanel2.add(workingDir_field, BorderLayout.EAST); compileOptions_panel.add(options_box2, BorderLayout.CENTER); //options_box2.add(incrementalNote, null); options_box2.add(spacer_label1, null); compileOptions_panel.add(options_box, BorderLayout.NORTH); options_box.add(assertions_checkBox, null); options_box.add(oneFive_checkBox, null); - options_box.add(preprocess_checkBox, null); - options_box.add(useJavac_checkBox, null); +// options_box.add(preprocess_checkBox, null); +// options_box.add(useJavac_checkBox, null); //options_box.add(incremental_checkBox, null); options_box.add(spacer_label, null); fields_box.add(jPanel1, null); diff --git a/ajde/src/org/aspectj/ajde/ui/swing/BuildProgressPanel.java b/ajde/src/org/aspectj/ajde/ui/swing/BuildProgressPanel.java index 128941357..7431d8008 100644 --- a/ajde/src/org/aspectj/ajde/ui/swing/BuildProgressPanel.java +++ b/ajde/src/org/aspectj/ajde/ui/swing/BuildProgressPanel.java @@ -30,6 +30,7 @@ import org.aspectj.ajde.Ajde; */ class BuildProgressPanel extends JPanel { + private static final long serialVersionUID = -8045879840621749183L; private static final int MAX_VAL = 100; //private JDialog dialog = null; diff --git a/ajde/src/org/aspectj/ajde/ui/swing/CompilerMessagesCellRenderer.java b/ajde/src/org/aspectj/ajde/ui/swing/CompilerMessagesCellRenderer.java index be0ec1376..84c5207bf 100644 --- a/ajde/src/org/aspectj/ajde/ui/swing/CompilerMessagesCellRenderer.java +++ b/ajde/src/org/aspectj/ajde/ui/swing/CompilerMessagesCellRenderer.java @@ -28,6 +28,8 @@ import org.aspectj.util.LangUtil; */ public class CompilerMessagesCellRenderer extends JLabel implements ListCellRenderer { + private static final long serialVersionUID = -4406791252357837712L; + public Component getListCellRendererComponent( JList list, Object value, diff --git a/ajde/src/org/aspectj/ajde/ui/swing/ErrorDialog.java b/ajde/src/org/aspectj/ajde/ui/swing/ErrorDialog.java index 4d39dada6..e9851ce95 100644 --- a/ajde/src/org/aspectj/ajde/ui/swing/ErrorDialog.java +++ b/ajde/src/org/aspectj/ajde/ui/swing/ErrorDialog.java @@ -30,7 +30,8 @@ import javax.swing.JTextArea; import javax.swing.border.Border; public class ErrorDialog extends JDialog { - JPanel top_panel = new JPanel(); + private static final long serialVersionUID = 5646564514289861666L; + JPanel top_panel = new JPanel(); BorderLayout borderLayout2 = new BorderLayout(); JPanel button_panel = new JPanel(); JButton close_button = new JButton(); diff --git a/ajde/src/org/aspectj/ajde/ui/swing/MultiStructureViewPanel.java b/ajde/src/org/aspectj/ajde/ui/swing/MultiStructureViewPanel.java index 3d973bd24..15d612a20 100644 --- a/ajde/src/org/aspectj/ajde/ui/swing/MultiStructureViewPanel.java +++ b/ajde/src/org/aspectj/ajde/ui/swing/MultiStructureViewPanel.java @@ -25,7 +25,9 @@ import org.aspectj.ajde.Ajde; * @author Mik Kersten */ public class MultiStructureViewPanel extends JPanel { - JSplitPane views_splitPane; + + private static final long serialVersionUID = -4409192026967597082L; + JSplitPane views_splitPane; BorderLayout borderLayout1 = new BorderLayout(); public MultiStructureViewPanel(StructureViewPanel topPanel, StructureViewPanel bottomPanel) { diff --git a/ajde/src/org/aspectj/ajde/ui/swing/OptionsFrame.java b/ajde/src/org/aspectj/ajde/ui/swing/OptionsFrame.java index d05889bc0..cbfea13b6 100644 --- a/ajde/src/org/aspectj/ajde/ui/swing/OptionsFrame.java +++ b/ajde/src/org/aspectj/ajde/ui/swing/OptionsFrame.java @@ -46,7 +46,9 @@ import org.aspectj.bridge.Version; */ public class OptionsFrame extends JFrame { - // XXX using \n b/c JTextArea.setLineWrap(true) lineates inside words. + private static final long serialVersionUID = -859222442871124487L; + + // XXX using \n b/c JTextArea.setLineWrap(true) lineates inside words. private static final String ABOUT_TEXT = "\nThe AspectJ compiler and core tools are produced by the\n" + "AspectJ project.\n\n" + @@ -70,19 +72,19 @@ public class OptionsFrame extends JFrame { private TitledBorder titledBorder1; private TitledBorder titledBorder2; private TitledBorder titledBorder3; - private Border border1; +// private Border border1; private TitledBorder titledBorder4; private TitledBorder titledBorder5; - private Border border2; +// private Border border2; private TitledBorder titledBorder6; // private Box temp_box = Box.createVerticalBox(); - private Border border3; +// private Border border3; private TitledBorder titledBorder7; private Border border4; private TitledBorder titledBorder8; private Border border5; private TitledBorder titledBorder9; - private Border border6; +// private Border border6; private TitledBorder titledBorder10; // private ButtonGroup views_buttonGroup = new ButtonGroup(); private Border border7; @@ -184,18 +186,18 @@ public class OptionsFrame extends JFrame { titledBorder1 = new TitledBorder(BorderFactory.createEtchedBorder(Color.white,new Color(156, 156, 158)),"Sorting"); titledBorder2 = new TitledBorder(BorderFactory.createEtchedBorder(Color.white,new Color(148, 145, 140)),"Associations (navigeable relations between sturcture nodes)"); titledBorder3 = new TitledBorder(BorderFactory.createEtchedBorder(Color.white,new Color(156, 156, 158)),"Member Filtering (nodes to exclude from view)"); - border1 = BorderFactory.createLineBorder(Color.black,2); + BorderFactory.createLineBorder(Color.black,2); titledBorder4 = new TitledBorder(BorderFactory.createEtchedBorder(Color.white,new Color(148, 145, 140)),"Compile Options"); titledBorder5 = new TitledBorder(""); - border2 = BorderFactory.createLineBorder(Color.black,2); + BorderFactory.createLineBorder(Color.black,2); titledBorder6 = new TitledBorder(BorderFactory.createEtchedBorder(Color.white,new Color(148, 145, 140)),"Run Options"); - border3 = BorderFactory.createEtchedBorder(Color.white,new Color(156, 156, 158)); + BorderFactory.createEtchedBorder(Color.white,new Color(156, 156, 158)); titledBorder7 = new TitledBorder(BorderFactory.createEtchedBorder(Color.white,new Color(156, 156, 158)),"Granularity (all nodes below selected level will be hidden)"); border4 = BorderFactory.createEtchedBorder(Color.white,new Color(156, 156, 158)); titledBorder8 = new TitledBorder(border4,"Member Visibility"); border5 = BorderFactory.createEtchedBorder(Color.white,new Color(156, 156, 158)); titledBorder9 = new TitledBorder(border5,"Member Modifiers"); - border6 = BorderFactory.createEmptyBorder(); + BorderFactory.createEmptyBorder(); titledBorder10 = new TitledBorder(BorderFactory.createEtchedBorder(Color.white,new Color(148, 145, 140)),"Structure View Properties"); border7 = BorderFactory.createEtchedBorder(Color.white,new Color(156, 156, 158)); titledBorder11 = new TitledBorder(border7,"Member Kinds"); diff --git a/ajde/src/org/aspectj/ajde/ui/swing/PointcutWizard.java b/ajde/src/org/aspectj/ajde/ui/swing/PointcutWizard.java index e6acc1979..12aa183a5 100644 --- a/ajde/src/org/aspectj/ajde/ui/swing/PointcutWizard.java +++ b/ajde/src/org/aspectj/ajde/ui/swing/PointcutWizard.java @@ -27,8 +27,9 @@ import org.aspectj.ajde.ui.*; * @author Mik Kersten */ class PointcutWizard extends JFrame { - private BrowserViewPanel typeTreeView = null; - private java.util.List signatures = null; + private static final long serialVersionUID = -9058319919402871975L; +// private BrowserViewPanel typeTreeView = null; +// private java.util.List signatures = null; JPanel jPanel1 = new JPanel(); JPanel jPanel2 = new JPanel(); @@ -49,10 +50,10 @@ class PointcutWizard extends JFrame { JPanel jPanel5 = new JPanel(); public PointcutWizard(java.util.List signatures) { - this.signatures = signatures; + // this.signatures = signatures; ArrayList views = new ArrayList(); views.add(StructureViewProperties.Hierarchy.INHERITANCE); - typeTreeView = new BrowserViewPanel(AjdeUIManager.getDefault().getIconRegistry(), views, StructureViewProperties.Hierarchy.INHERITANCE); +// typeTreeView = new BrowserViewPanel(AjdeUIManager.getDefault().getIconRegistry(), views, StructureViewProperties.Hierarchy.INHERITANCE); throw new RuntimeException("unimplemented, can't get the current file"); //typeTreeView.updateTree(Ajde.getDefault().getEditorManager().getCurrFile()); diff --git a/ajde/src/org/aspectj/ajde/ui/swing/SimpleStructureViewToolPanel.java b/ajde/src/org/aspectj/ajde/ui/swing/SimpleStructureViewToolPanel.java index f5b3fb555..b2fc1878b 100644 --- a/ajde/src/org/aspectj/ajde/ui/swing/SimpleStructureViewToolPanel.java +++ b/ajde/src/org/aspectj/ajde/ui/swing/SimpleStructureViewToolPanel.java @@ -28,6 +28,7 @@ import org.aspectj.asm.*; public class SimpleStructureViewToolPanel extends JPanel { + private static final long serialVersionUID = -7573973278642540506L; private StructureView currentView; private JButton separator_button = new JButton(); private boolean hideNonAJEnabled = false; diff --git a/ajde/src/org/aspectj/ajde/ui/swing/StructureTree.java b/ajde/src/org/aspectj/ajde/ui/swing/StructureTree.java index b3c318792..9ba2ae6db 100644 --- a/ajde/src/org/aspectj/ajde/ui/swing/StructureTree.java +++ b/ajde/src/org/aspectj/ajde/ui/swing/StructureTree.java @@ -25,7 +25,9 @@ import org.aspectj.ajde.Ajde; */ class StructureTree extends JTree { - public static final Font DEFAULT_FONT = new java.awt.Font("Dialog", 0, 11); + private static final long serialVersionUID = -5599178058976534562L; + + public static final Font DEFAULT_FONT = new java.awt.Font("Dialog", 0, 11); private String rootFilePath = null; diff --git a/ajde/src/org/aspectj/ajde/ui/swing/StructureTreeManager.java b/ajde/src/org/aspectj/ajde/ui/swing/StructureTreeManager.java index 643f92cb3..7b3459819 100644 --- a/ajde/src/org/aspectj/ajde/ui/swing/StructureTreeManager.java +++ b/ajde/src/org/aspectj/ajde/ui/swing/StructureTreeManager.java @@ -165,7 +165,10 @@ class StructureTreeManager { } private class StructureTreeModel extends DefaultTreeModel implements TreeModel { - public StructureTreeModel(TreeNode newRoot) { + + private static final long serialVersionUID = 1L; + + public StructureTreeModel(TreeNode newRoot) { super(newRoot); } diff --git a/ajde/src/org/aspectj/ajde/ui/swing/StructureViewPanel.java b/ajde/src/org/aspectj/ajde/ui/swing/StructureViewPanel.java index acaf8dd4e..4f7bdb43b 100644 --- a/ajde/src/org/aspectj/ajde/ui/swing/StructureViewPanel.java +++ b/ajde/src/org/aspectj/ajde/ui/swing/StructureViewPanel.java @@ -32,9 +32,10 @@ import org.aspectj.asm.IProgramElement; */ public class StructureViewPanel extends JPanel implements StructureViewRenderer { - protected StructureTreeManager treeManager = new StructureTreeManager(); + private static final long serialVersionUID = 7549744200612883786L; + protected StructureTreeManager treeManager = new StructureTreeManager(); protected StructureView currentView = null; - private java.util.List structureViews = null; +// private java.util.List structureViews = null; protected Border border1; protected Border border2; @@ -50,7 +51,7 @@ public class StructureViewPanel extends JPanel implements StructureViewRenderer } public StructureViewPanel(java.util.List structureViews) { - this.structureViews = structureViews; +// this.structureViews = structureViews; for (Iterator it = structureViews.iterator(); it.hasNext(); ) { initView((StructureView)it.next()); diff --git a/ajde/src/org/aspectj/ajde/ui/swing/SwingTreeViewNode.java b/ajde/src/org/aspectj/ajde/ui/swing/SwingTreeViewNode.java index cfa899f11..60f73869f 100644 --- a/ajde/src/org/aspectj/ajde/ui/swing/SwingTreeViewNode.java +++ b/ajde/src/org/aspectj/ajde/ui/swing/SwingTreeViewNode.java @@ -27,6 +27,7 @@ import org.aspectj.asm.*; */ public class SwingTreeViewNode extends DefaultMutableTreeNode implements IStructureViewNode { + private static final long serialVersionUID = 4957761341510335532L; private String relationshipName; private IProgramElement programElement; private AbstractIcon icon; diff --git a/ajde/src/org/aspectj/ajde/ui/swing/SwingTreeViewNodeRenderer.java b/ajde/src/org/aspectj/ajde/ui/swing/SwingTreeViewNodeRenderer.java index 06e300335..a24696ad2 100644 --- a/ajde/src/org/aspectj/ajde/ui/swing/SwingTreeViewNodeRenderer.java +++ b/ajde/src/org/aspectj/ajde/ui/swing/SwingTreeViewNodeRenderer.java @@ -28,7 +28,9 @@ import org.aspectj.bridge.*; */ class SwingTreeViewNodeRenderer extends DefaultTreeCellRenderer { - public Component getTreeCellRendererComponent(JTree tree, + private static final long serialVersionUID = -4561164526650924465L; + + public Component getTreeCellRendererComponent(JTree tree, Object treeNode, boolean sel, boolean expanded, diff --git a/ajde/src/org/aspectj/ajde/ui/swing/TreeViewBuildConfigEditor.java b/ajde/src/org/aspectj/ajde/ui/swing/TreeViewBuildConfigEditor.java index 6ce787200..a1d5a276f 100644 --- a/ajde/src/org/aspectj/ajde/ui/swing/TreeViewBuildConfigEditor.java +++ b/ajde/src/org/aspectj/ajde/ui/swing/TreeViewBuildConfigEditor.java @@ -23,7 +23,6 @@ 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; @@ -55,13 +54,14 @@ import org.aspectj.asm.IProgramElement; */ public class TreeViewBuildConfigEditor extends JPanel implements BuildConfigEditor { + private static final long serialVersionUID = 8071799814661969685L; private ConfigTreeNode root; // private ConfigTreeNode currNode; private BuildConfigModel model = null; private static java.util.List selectedEntries = new ArrayList(); - private String configFile = null; - private File sourcePath = null; +// private String configFile = null; +// private File sourcePath = null; //private BuildConfigModelBuilder configTreeBuilder = new BuildConfigModelBuilder(); BorderLayout borderLayout1 = new BorderLayout(); @@ -80,8 +80,8 @@ public class TreeViewBuildConfigEditor extends JPanel implements BuildConfigEdit Ajde.getDefault().getErrorHandler().handleError("No structure is selected for editing."); return; } - this.configFile = configFile; - sourcePath = new File(new File(configFile).getParent()); + // this.configFile = configFile; + // sourcePath = new File(new File(configFile).getParent()); jbInit(); jLabel1.setText(" Build configuration: " + configFile); @@ -151,7 +151,9 @@ public class TreeViewBuildConfigEditor extends JPanel implements BuildConfigEdit } private class ConfigTreeNode extends DefaultMutableTreeNode { - public JCheckBox checkBox = null; + + private static final long serialVersionUID = 1L; + public JCheckBox checkBox = null; public BuildConfigNode modelNode; public ConfigTreeNode(BuildConfigNode modelNode) { @@ -213,7 +215,9 @@ public class TreeViewBuildConfigEditor extends JPanel implements BuildConfigEdit } static class ConfigTreeCellRenderer extends DefaultTreeCellRenderer { - public Component getTreeCellRendererComponent(JTree tree, + private static final long serialVersionUID = -3120665318910899066L; + + public Component getTreeCellRendererComponent(JTree tree, Object value, boolean sel, boolean expanded, diff --git a/ajde/src/org/aspectj/ajde/ui/swing/UpdateConfigurationDialog.java b/ajde/src/org/aspectj/ajde/ui/swing/UpdateConfigurationDialog.java index 9ae470295..806c231d3 100644 --- a/ajde/src/org/aspectj/ajde/ui/swing/UpdateConfigurationDialog.java +++ b/ajde/src/org/aspectj/ajde/ui/swing/UpdateConfigurationDialog.java @@ -49,9 +49,10 @@ import org.aspectj.ajde.Ajde; * @author Mik Kersten */ public class UpdateConfigurationDialog extends JFrame { - private Vector buildConfigFiles; - private Vector filesToUpdate; - private boolean addToConfiguration; + private static final long serialVersionUID = 5885112642841314728L; +// private Vector buildConfigFiles; +// private Vector filesToUpdate; +// private boolean addToConfiguration; private String message1 = " Project has been updated."; private String message2 = " File list below."; @@ -79,9 +80,9 @@ public class UpdateConfigurationDialog extends JFrame { public UpdateConfigurationDialog(Vector filesToUpdate, Vector buildConfigFiles, boolean addToConfiguration, Component parentComponent) { try { - this.buildConfigFiles = buildConfigFiles; - this.filesToUpdate = filesToUpdate; - this.addToConfiguration = addToConfiguration; +// this.buildConfigFiles = buildConfigFiles; +// this.filesToUpdate = filesToUpdate; +// this.addToConfiguration = addToConfiguration; updatedFilesList.setListData(filesToUpdate); String action = "removed from"; @@ -174,7 +175,9 @@ public class UpdateConfigurationDialog extends JFrame { } class CheckListCellRenderer extends JCheckBox implements ListCellRenderer { - public CheckListCellRenderer() { + private static final long serialVersionUID = -9183012434083509581L; + + public CheckListCellRenderer() { super(); setOpaque(true); } |