diff --git a/prism/src/userinterface/model/GUIMultiModel.java b/prism/src/userinterface/model/GUIMultiModel.java index 2fc6f87e..9cd5cfbb 100644 --- a/prism/src/userinterface/model/GUIMultiModel.java +++ b/prism/src/userinterface/model/GUIMultiModel.java @@ -27,16 +27,43 @@ package userinterface.model; -import userinterface.*; - -import javax.swing.*; - -import java.awt.*; -import java.awt.event.*; -import java.io.*; -import prism.*; -import userinterface.util.*; - +import java.awt.BorderLayout; +import java.awt.Color; +import java.awt.Dimension; +import java.awt.Toolkit; +import java.awt.event.ActionEvent; +import java.awt.event.KeyEvent; +import java.io.File; + +import javax.swing.AbstractAction; +import javax.swing.Action; +import javax.swing.JDialog; +import javax.swing.JFileChooser; +import javax.swing.JLabel; +import javax.swing.JMenu; +import javax.swing.JOptionPane; +import javax.swing.JPanel; +import javax.swing.JPopupMenu; +import javax.swing.JScrollPane; +import javax.swing.JSeparator; +import javax.swing.JToolBar; +import javax.swing.KeyStroke; + +import prism.ModelType; +import prism.Prism; +import prism.PrismSettings; +import prism.PrismSettingsListener; +import userinterface.GUIClipboardEvent; +import userinterface.GUIPlugin; +import userinterface.GUIPrism; +import userinterface.OptionsPanel; +import userinterface.util.GUIComputationEvent; +import userinterface.util.GUIEvent; +import userinterface.util.GUIExitEvent; +import userinterface.util.GUIPrismFileFilter; +import userinterface.util.GUIUndoManager; + +@SuppressWarnings("serial") public class GUIMultiModel extends GUIPlugin implements PrismSettingsListener { //Constants @@ -220,7 +247,7 @@ public class GUIMultiModel extends GUIPlugin implements PrismSettingsListener diag.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE); diag.pack(); diag.setLocationRelativeTo(getGUI()); // centre - diag.show(); + diag.setVisible(true); } //Action methods @@ -434,7 +461,6 @@ public class GUIMultiModel extends GUIPlugin implements PrismSettingsListener } } - @SuppressWarnings("serial") private void setupActions() { newPRISMModel = new AbstractAction() @@ -1080,7 +1106,6 @@ public class GUIMultiModel extends GUIPlugin implements PrismSettingsListener @Override public boolean canDoClipBoardAction(Action action) { - // TODO Auto-generated method stub if (computing) return false; diff --git a/prism/src/userinterface/model/GUIMultiModelHandler.java b/prism/src/userinterface/model/GUIMultiModelHandler.java index 4c459434..4181e624 100644 --- a/prism/src/userinterface/model/GUIMultiModelHandler.java +++ b/prism/src/userinterface/model/GUIMultiModelHandler.java @@ -27,19 +27,49 @@ package userinterface.model; -import javax.swing.*; -import javax.swing.border.*; - -import java.awt.*; -import java.io.*; -import parser.*; +import java.awt.BorderLayout; +import java.awt.Color; +import java.awt.Font; +import java.awt.GridLayout; +import java.io.File; +import java.io.FileWriter; +import java.io.IOException; + +import javax.swing.Action; +import javax.swing.JLabel; +import javax.swing.JPanel; +import javax.swing.JSplitPane; +import javax.swing.SwingUtilities; +import javax.swing.border.CompoundBorder; +import javax.swing.border.EmptyBorder; +import javax.swing.border.TitledBorder; + +import parser.Values; import parser.ast.ModulesFile; -import prism.*; -import userinterface.model.pepaModel.*; -import userinterface.model.graphicModel.*; -import userinterface.model.computation.*; -import userinterface.*; -import userinterface.util.*; +import prism.Model; +import prism.ModelType; +import prism.Prism; +import prism.PrismException; +import prism.PrismLangException; +import prism.PrismModelListener; +import prism.PrismSettings; +import prism.UndefinedConstants; +import userinterface.GUIConstantsPicker; +import userinterface.GUIPlugin; +import userinterface.model.computation.BuildModelThread; +import userinterface.model.computation.ComputeSteadyStateThread; +import userinterface.model.computation.ComputeTransientThread; +import userinterface.model.computation.ExportBuiltModelThread; +import userinterface.model.computation.LoadGraphicModelThread; +import userinterface.model.computation.LoadPEPAModelThread; +import userinterface.model.computation.LoadPRISMModelThread; +import userinterface.model.computation.ParseModelThread; +import userinterface.model.computation.SaveGraphicModelThread; +import userinterface.model.graphicModel.GUIGraphicModelEditor; +import userinterface.model.pepaModel.GUIPepaModelEditor; +import userinterface.util.GUIUndoManager; +import userinterface.util.PropertyTable; +import userinterface.util.PropertyTableModel; @SuppressWarnings("serial") public class GUIMultiModelHandler extends JPanel implements PrismModelListener diff --git a/prism/src/userinterface/properties/GUIMultiProperties.java b/prism/src/userinterface/properties/GUIMultiProperties.java index b70c4427..60be8da2 100644 --- a/prism/src/userinterface/properties/GUIMultiProperties.java +++ b/prism/src/userinterface/properties/GUIMultiProperties.java @@ -53,7 +53,6 @@ import java.io.FileWriter; import java.io.IOException; import java.io.PrintWriter; import java.util.ArrayList; -import java.util.Vector; import javax.swing.AbstractAction; import javax.swing.Action; @@ -144,7 +143,6 @@ public class GUIMultiProperties extends GUIPlugin implements MouseListener, List private GUIGraphHandler graphHandler; private JScrollPane expScroller; private JLabel fileLabel; - private Vector clipboardVector; private Action newProps, openProps, saveProps, savePropsAs, insertProps, verifySelected, newProperty, editProperty, newConstant, removeConstant, newLabel, removeLabel, newExperiment, deleteExperiment, stopExperiment, viewResults, plotResults, exportResultsListText, exportResultsListCSV, exportResultsMatrixText, exportResultsMatrixCSV, simulate, details; @@ -678,9 +676,9 @@ public class GUIMultiProperties extends GUIPlugin implements MouseListener, List private void updateCommentLabel() { - ArrayList selectedProps = propList.getSelectedProperties(); + ArrayList selectedProps = propList.getSelectedProperties(); if (selectedProps.size() == 1) { - GUIProperty p = (GUIProperty) selectedProps.get(0); + GUIProperty p = selectedProps.get(0); comLabel.setText(p.getComment()); } else { comLabel.setText(""); @@ -882,7 +880,7 @@ public class GUIMultiProperties extends GUIPlugin implements MouseListener, List if (contents.isDataFlavorSupported(getGUIClipboardPropertiesDataFlavor())) { try { GUIClipboardProperties gcp = (GUIClipboardProperties) contents.getTransferData(getGUIClipboardPropertiesDataFlavor()); - ArrayList listOfProperties = gcp.getProperties(); + ArrayList listOfProperties = gcp.getProperties(); for (int i = 0; i < listOfProperties.size(); i++) { GUIProperty property = (GUIProperty) listOfProperties.get(i); propList.addProperty(property.getName(), property.getPropString(), property.getComment()); @@ -1030,8 +1028,7 @@ public class GUIMultiProperties extends GUIPlugin implements MouseListener, List } // launch dialog, plot series (modal) - GUIGraphPicker ggp = new GUIGraphPicker(getGUI(), this, exp, graphHandler, true); - + new GUIGraphPicker(getGUI(), this, exp, graphHandler, true); } public void a_exportResults(boolean exportMatrix, String sep) @@ -1103,7 +1100,7 @@ public class GUIMultiProperties extends GUIPlugin implements MouseListener, List { if (e instanceof GUIModelEvent) { GUIModelEvent me = (GUIModelEvent) e; - if (me.getID() == me.NEW_MODEL) { + if (me.getID() == GUIModelEvent.NEW_MODEL) { //New Model setParsedModel(null); doEnables(); @@ -1142,15 +1139,15 @@ public class GUIMultiProperties extends GUIPlugin implements MouseListener, List if (ce.getComponent() == this || ce.getComponent() == propList) { if (!computing) { - if (ce.getID() == ce.CUT) { + if (ce.getID() == GUIClipboardEvent.CUT) { a_cut(); - } else if (ce.getID() == ce.COPY) { + } else if (ce.getID() == GUIClipboardEvent.COPY) { a_copy(); - } else if (ce.getID() == ce.PASTE) { + } else if (ce.getID() == GUIClipboardEvent.PASTE) { a_paste(); - } else if (ce.getID() == ce.DELETE) { + } else if (ce.getID() == GUIClipboardEvent.DELETE) { a_delete(); - } else if (ce.getID() == ce.SELECT_ALL) { + } else if (ce.getID() == GUIClipboardEvent.SELECT_ALL) { a_selectAll(); } } @@ -1984,15 +1981,15 @@ public class GUIMultiProperties extends GUIPlugin implements MouseListener, List */ public class GUIClipboardProperties implements Transferable { - private ArrayList listOfProperties; + private ArrayList listOfProperties; private StringSelection stringRepresentation; - public GUIClipboardProperties(ArrayList listOfProperties) + public GUIClipboardProperties(ArrayList listOfProperties) { this.listOfProperties = listOfProperties; String tmpString = ""; for (int i = 0; i < listOfProperties.size(); i++) { - GUIProperty gp = (GUIProperty) listOfProperties.get(i); + GUIProperty gp = listOfProperties.get(i); if (gp.getComment().trim().length() > 0) { tmpString += "//" + gp.getComment() + "\n"; } @@ -2032,7 +2029,7 @@ public class GUIMultiProperties extends GUIPlugin implements MouseListener, List return (stringRepresentation.isDataFlavorSupported(flavor) || flavor.equals(GUIMultiProperties.getGUIClipboardPropertiesDataFlavor())); } - public ArrayList getProperties() + public ArrayList getProperties() { return listOfProperties; }