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
*/
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.
*/
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.
*/
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.
+ "\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 ) {
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() {
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);
}
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) {
*/
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");
*/
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");
*/
public class InvalidResourceException extends Exception {
+ private static final long serialVersionUID = -5290919159396792978L;
+
/**
* Constructor for InvalidResourceException.
*/
public class StructureModelUtil {
public static class ModelIncorrectException extends Exception {
+
+ private static final long serialVersionUID = 8920868549577870993L;
+
public ModelIncorrectException(String s) {
super(s);
}
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,
boolean depressable) {
this.menu = menu;
- this.depressable = depressable;
+// this.depressable = depressable;
mainButton = new JButton();
mainButton.setIcon(icon);
mainButton.setBorder(AjdeWidgetStyles.DEFAULT_BORDER);
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;
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;
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() {
public class BrowserStructureViewToolPanel extends JPanel {
+ private static final long serialVersionUID = 7960528108612681776L;
+
private StructureView currentView;
private StructureViewPanel viewPanel;
protected BorderLayout borderLayout1 = new BorderLayout();
}
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);
private class CheckBoxSelectionMenuButton extends JCheckBoxMenuItem {
+ private static final long serialVersionUID = -4555502313984854787L;
+
public CheckBoxSelectionMenuButton(String name) {
super(name);
this.setFont(AjdeWidgetStyles.DEFAULT_LABEL_FONT);
* @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 = "";
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());
// }
static class ConfigsCellRenderer extends JLabel implements ListCellRenderer {
- public ConfigsCellRenderer() {
+
+ private static final long serialVersionUID = 8795959045339903340L;
+
+ public ConfigsCellRenderer() {
setOpaque(true);
}
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;
*/
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();
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) {
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) {
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);
}
});
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(); ) {
// + "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;
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();
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() {
// 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);
}
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()
// );
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);
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()
// );
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());
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)),
// 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);
// 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);
*/
class BuildProgressPanel extends JPanel {
+ private static final long serialVersionUID = -8045879840621749183L;
private static final int MAX_VAL = 100;
//private JDialog dialog = null;
*/
public class CompilerMessagesCellRenderer extends JLabel implements ListCellRenderer {
+ private static final long serialVersionUID = -4406791252357837712L;
+
public Component getListCellRendererComponent(
JList list,
Object value,
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();
* @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) {
*/
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" +
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;
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");
* @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();
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());
public class SimpleStructureViewToolPanel extends JPanel {
+ private static final long serialVersionUID = -7573973278642540506L;
private StructureView currentView;
private JButton separator_button = new JButton();
private boolean hideNonAJEnabled = false;
*/
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;
}
private class StructureTreeModel extends DefaultTreeModel implements TreeModel {
- public StructureTreeModel(TreeNode newRoot) {
+
+ private static final long serialVersionUID = 1L;
+
+ public StructureTreeModel(TreeNode newRoot) {
super(newRoot);
}
*/
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;
}
public StructureViewPanel(java.util.List structureViews) {
- this.structureViews = structureViews;
+// this.structureViews = structureViews;
for (Iterator it = structureViews.iterator(); it.hasNext(); ) {
initView((StructureView)it.next());
*/
public class SwingTreeViewNode extends DefaultMutableTreeNode implements IStructureViewNode {
+ private static final long serialVersionUID = 4957761341510335532L;
private String relationshipName;
private IProgramElement programElement;
private AbstractIcon icon;
*/
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,
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;
*/
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();
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);
}
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) {
}
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,
* @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.";
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";
}
class CheckListCellRenderer extends JCheckBox implements ListCellRenderer {
- public CheckListCellRenderer() {
+ private static final long serialVersionUID = -9183012434083509581L;
+
+ public CheckListCellRenderer() {
super();
setOpaque(true);
}
public class AjdeTestCase extends TestCase {
- private static final String TEST_DATA_PATH = AjdeTests.testDataPath(null);
+// private static final String TEST_DATA_PATH = AjdeTests.testDataPath(null);
protected NullIdeManager ideManager = NullIdeManager.getIdeManager();
protected TestBuildListener testerBuildListener = new TestBuildListener();
"declare parents: implements Serializable"/*Point"*/);
assertNotNull(dp);
- List relations = manager.getRelationshipMap().get(dp);
+ /*List relations = */manager.getRelationshipMap().get(dp);
List rels = AsmManager.getDefault().getRelationshipMap().get(dp);
assertTrue(rels.size()>0);
assertTrue("character encoding", buildOptions.getCharacterEncoding().equals("mumble"));
}
- public void testPortingMode() {
- buildOptions.setPortingMode(true);
- assertTrue("porting mode", buildOptions.getPortingMode());
- }
+// public void testPortingMode() {
+// buildOptions.setPortingMode(true);
+// assertTrue("porting mode", buildOptions.getPortingMode());
+// }
public void testVerboseMode() {
buildOptions.setVerboseMode(true);
protected void tearDown() throws Exception {
super.tearDown();
buildOptions.setCharacterEncoding("");
- buildOptions.setPortingMode(true);
+// buildOptions.setPortingMode(true);
}
}
import java.util.Iterator;
import java.util.List;
-import java.util.Properties;
+//import java.util.Properties;
import java.io.File;
import org.aspectj.asm.AsmManager;
public void testInnerClassesInASM() {
String[] args = new String[] {"InnerClasses.java","-emacssym"};
CompilationResult result = ajc(baseDir,args);
- List l = result.getWarningMessages();
- Properties p = AsmManager.ModelInfo.summarizeModel().getProperties();
+ /*List l = */result.getWarningMessages();
+ /*Properties p = */AsmManager.ModelInfo.summarizeModel().getProperties();
if (debugTests) System.out.println("Structure Model for InnerClasses.java:");
walkit(AsmManager.getDefault().getHierarchy().getRoot(),0);
foundNode = null;
*******************************************************************************/
package org.aspectj.ajde;
-import org.aspectj.asm.AsmManager;
+//import org.aspectj.asm.AsmManager;
/**
* @author Mik Kersten
*/
public class GenericsTest extends AjdeTestCase {
- private AsmManager manager = null;
+ //private AsmManager manager = null;
// TODO-path
- private static final String CONFIG_FILE_PATH = "../bug-83565/build.lst";
+ //private static final String CONFIG_FILE_PATH = "../bug-83565/build.lst";
public void testBuild() {
// assertTrue("build success", doSynchronousBuild(CONFIG_FILE_PATH));
protected void setUp() throws Exception {
super.setUp("examples");
- manager = AsmManager.getDefault();
+ //manager = AsmManager.getDefault();
}
}
public static final String outjarName = "/bin/output.jar";
- private static int nonreweavesize_CalculatePI;
- private static int nonreweavesize_Logger;
- private static int reweavablesize_CalculatePI;
- private static int reweavablesize_Logger;
+// private static int nonreweavesize_CalculatePI;
+// private static int nonreweavesize_Logger;
+// private static int reweavablesize_CalculatePI;
+// private static int reweavablesize_Logger;
/**
* Constructor for JarResourceCopyTestCase.
if (debugTests) System.out.println("CalculatePI.class is of size: "+fCalc.length());
if (debugTests) System.out.println("Logger.class is of size: "+fLog.length());
if (debugTests) System.out.println("\n\n\n");
- nonreweavesize_CalculatePI = (int)fCalc.length();
- nonreweavesize_Logger = (int)fLog.length();
+ /*nonreweavesize_CalculatePI = (int)*/fCalc.length();
+ /*nonreweavesize_Logger = (int)*/fLog.length();
}
// assertTrue("Reweavable version should be larger than non-reweavable version of Logger",
// fLog.length()>nonreweavesize_Logger);
- reweavablesize_CalculatePI = (int)fCalc.length();
- reweavablesize_Logger = (int)fLog.length();
+ /*reweavablesize_CalculatePI = (int)*/fCalc.length();
+ /*reweavablesize_Logger = (int)*/fLog.length();
if (debugTests) System.out.println("\n\n\n");
}
aspectpath.add(openFile("AspectAdvice.jar"));
ideManager.getProjectProperties().setAspectPath(aspectpath);
assertTrue("Build failed", doSynchronousBuild("Empty.lst"));
- List l = ideManager.getCompilationSourceLineTasks();
+ /*List l = */ideManager.getCompilationSourceLineTasks();
verifyWeavingMessages("advice.binary",true);
}
aspectpath.add(openFile("AspectITD.jar"));
ideManager.getProjectProperties().setAspectPath(aspectpath);
assertTrue("Build failed", doSynchronousBuild("Empty.lst"));
- List l = ideManager.getCompilationSourceLineTasks();
+ /*List l = */ideManager.getCompilationSourceLineTasks();
verifyWeavingMessages("itd",false);
}
aspectpath.add(openFile("AspectAdvice_nodebug.jar"));
ideManager.getProjectProperties().setAspectPath(aspectpath);
assertTrue("Build failed", doSynchronousBuild("Empty.lst"));
- List l = ideManager.getCompilationSourceLineTasks();
+ /*List l = */ideManager.getCompilationSourceLineTasks();
verifyWeavingMessages("advice.binary.nodebug",true);
}
aspectpath.add(openFile("AspectITD_nodebug.jar"));
ideManager.getProjectProperties().setAspectPath(aspectpath);
assertTrue("Build failed", doSynchronousBuild("Empty.lst"));
- List l = ideManager.getCompilationSourceLineTasks();
+ /*List l = */ideManager.getCompilationSourceLineTasks();
verifyWeavingMessages("itd.nodebug",true);
}
// private static final String BAD_PATHS_FILE = "C:/Dev/aspectj/tests/ajde/examples/figures-coverage/test-error.lst";
// private static final String INCLUDES_FILE = "C:/Dev/aspectj/tests/ajde/examples/spacewar/spacewar/demo.lst";
- private static final String WILDCARDS_FILE_CONTENTS;
- private static final String BAD_PATHS_FILE_CONTENTS;
- private static final String INCLUDES_FILE_CONTENTS;
+// private static final String WILDCARDS_FILE_CONTENTS;
+// private static final String BAD_PATHS_FILE_CONTENTS;
+// private static final String INCLUDES_FILE_CONTENTS;
static {
- WILDCARDS_FILE_CONTENTS =
- "figures/Debug.java;" +
- "figures/Figure.java;" +
- "figures/FigureElement.java;" +
- "figures/Main.java;" +
- "figures/composites/Line.java;" +
- "figures/composites/Square.java;" +
- "figures/primitives/planar/Point.java;" +
- "figures/primitives/solid/SolidPoint.java;";
-
- BAD_PATHS_FILE_CONTENTS = WILDCARDS_FILE_CONTENTS;
-
- // TODO-path
- INCLUDES_FILE_CONTENTS =
- "../coordination/Condition.java;" +
- "../coordination/CoordinationAction.java;" +
- "../coordination/Coordinator.java;" +
- "../coordination/Exclusion.java;" +
- "../coordination/MethodState.java;" +
- "../coordination/Mutex.java;" +
- "../coordination/Selfex.java;" +
- "../coordination/TimeoutException.java;" +
- "Bullet.java;" +
- "Display.java;" +
- "Display1.java;" +
- "Display2.java;" +
- "EnergyPacket.java;" +
- "EnergyPacketProducer.java;" +
- "EnsureShipIsAlive.java;" +
- "Game.java;" +
- "GameSynchronization.java;" +
- "Pilot.java;" +
- "Player.java;" +
- "Registry.java;" +
- "RegistrySynchronization.java;" +
- "Robot.java;" +
- "SWFrame.java;" +
- "Ship.java;" +
- "SpaceObject.java;" +
- "Timer.java;";
+// WILDCARDS_FILE_CONTENTS =
+// "figures/Debug.java;" +
+// "figures/Figure.java;" +
+// "figures/FigureElement.java;" +
+// "figures/Main.java;" +
+// "figures/composites/Line.java;" +
+// "figures/composites/Square.java;" +
+// "figures/primitives/planar/Point.java;" +
+// "figures/primitives/solid/SolidPoint.java;";
+
+// BAD_PATHS_FILE_CONTENTS = WILDCARDS_FILE_CONTENTS;
+//
+// // TODO-path
+// INCLUDES_FILE_CONTENTS =
+// "../coordination/Condition.java;" +
+// "../coordination/CoordinationAction.java;" +
+// "../coordination/Coordinator.java;" +
+// "../coordination/Exclusion.java;" +
+// "../coordination/MethodState.java;" +
+// "../coordination/Mutex.java;" +
+// "../coordination/Selfex.java;" +
+// "../coordination/TimeoutException.java;" +
+// "Bullet.java;" +
+// "Display.java;" +
+// "Display1.java;" +
+// "Display2.java;" +
+// "EnergyPacket.java;" +
+// "EnergyPacketProducer.java;" +
+// "EnsureShipIsAlive.java;" +
+// "Game.java;" +
+// "GameSynchronization.java;" +
+// "Pilot.java;" +
+// "Player.java;" +
+// "Registry.java;" +
+// "RegistrySynchronization.java;" +
+// "Robot.java;" +
+// "SWFrame.java;" +
+// "Ship.java;" +
+// "SpaceObject.java;" +
+// "Timer.java;";
}
}
projects / aspectj.git / commitdiff