s14h
/
prism-accumulation
1
0
Fork 0
Code Releases Activity
Browse Source

Code tidy 

git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@4590 bbc10eb1-c90d-0410-af57-cb519fbb1720
master
Dave Parker 14 years ago
parent
38e0844687
commit
20150621ce
3 changed files with 94 additions and 42 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 49
      prism/src/userinterface/model/GUIMultiModel.java
  2. 54
      prism/src/userinterface/model/GUIMultiModelHandler.java
  3. 31
      prism/src/userinterface/properties/GUIMultiProperties.java

49
prism/src/userinterface/model/GUIMultiModel.java
View File

@ -27,16 +27,43 @@
package userinterface.model; 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 public class GUIMultiModel extends GUIPlugin implements PrismSettingsListener
{ {
//Constants //Constants
@ -220,7 +247,7 @@ public class GUIMultiModel extends GUIPlugin implements PrismSettingsListener
diag.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE); diag.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
diag.pack(); diag.pack();
diag.setLocationRelativeTo(getGUI()); // centre diag.setLocationRelativeTo(getGUI()); // centre
diag.show();
diag.setVisible(true);
} }
//Action methods //Action methods
@ -434,7 +461,6 @@ public class GUIMultiModel extends GUIPlugin implements PrismSettingsListener
} }
} }
@SuppressWarnings("serial")
private void setupActions() private void setupActions()
{ {
newPRISMModel = new AbstractAction() newPRISMModel = new AbstractAction()
@ -1080,7 +1106,6 @@ public class GUIMultiModel extends GUIPlugin implements PrismSettingsListener
@Override @Override
public boolean canDoClipBoardAction(Action action) public boolean canDoClipBoardAction(Action action)
{ {
// TODO Auto-generated method stub
if (computing) if (computing)
return false; return false;

54
prism/src/userinterface/model/GUIMultiModelHandler.java
View File

@ -27,19 +27,49 @@
package userinterface.model; 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 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") @SuppressWarnings("serial")
public class GUIMultiModelHandler extends JPanel implements PrismModelListener public class GUIMultiModelHandler extends JPanel implements PrismModelListener

31
prism/src/userinterface/properties/GUIMultiProperties.java
View File

@ -53,7 +53,6 @@ import java.io.FileWriter;
import java.io.IOException; import java.io.IOException;
import java.io.PrintWriter; import java.io.PrintWriter;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Vector;
import javax.swing.AbstractAction; import javax.swing.AbstractAction;
import javax.swing.Action; import javax.swing.Action;
@ -144,7 +143,6 @@ public class GUIMultiProperties extends GUIPlugin implements MouseListener, List
private GUIGraphHandler graphHandler; private GUIGraphHandler graphHandler;
private JScrollPane expScroller; private JScrollPane expScroller;
private JLabel fileLabel; private JLabel fileLabel;
private Vector clipboardVector;
private Action newProps, openProps, saveProps, savePropsAs, insertProps, verifySelected, newProperty, editProperty, newConstant, removeConstant, newLabel, private Action newProps, openProps, saveProps, savePropsAs, insertProps, verifySelected, newProperty, editProperty, newConstant, removeConstant, newLabel,
removeLabel, newExperiment, deleteExperiment, stopExperiment, viewResults, plotResults, removeLabel, newExperiment, deleteExperiment, stopExperiment, viewResults, plotResults,
exportResultsListText, exportResultsListCSV, exportResultsMatrixText, exportResultsMatrixCSV, simulate, details; exportResultsListText, exportResultsListCSV, exportResultsMatrixText, exportResultsMatrixCSV, simulate, details;
@ -678,9 +676,9 @@ public class GUIMultiProperties extends GUIPlugin implements MouseListener, List
private void updateCommentLabel() private void updateCommentLabel()
{ {
ArrayList selectedProps = propList.getSelectedProperties();
ArrayList<GUIProperty> selectedProps = propList.getSelectedProperties();
if (selectedProps.size() == 1) { if (selectedProps.size() == 1) {
GUIProperty p = (GUIProperty) selectedProps.get(0);
GUIProperty p = selectedProps.get(0);
comLabel.setText(p.getComment()); comLabel.setText(p.getComment());
} else { } else {
comLabel.setText(""); comLabel.setText("");
@ -882,7 +880,7 @@ public class GUIMultiProperties extends GUIPlugin implements MouseListener, List
if (contents.isDataFlavorSupported(getGUIClipboardPropertiesDataFlavor())) { if (contents.isDataFlavorSupported(getGUIClipboardPropertiesDataFlavor())) {
try { try {
GUIClipboardProperties gcp = (GUIClipboardProperties) contents.getTransferData(getGUIClipboardPropertiesDataFlavor()); GUIClipboardProperties gcp = (GUIClipboardProperties) contents.getTransferData(getGUIClipboardPropertiesDataFlavor());
ArrayList listOfProperties = gcp.getProperties();
ArrayList<GUIProperty> listOfProperties = gcp.getProperties();
for (int i = 0; i < listOfProperties.size(); i++) { for (int i = 0; i < listOfProperties.size(); i++) {
GUIProperty property = (GUIProperty) listOfProperties.get(i); GUIProperty property = (GUIProperty) listOfProperties.get(i);
propList.addProperty(property.getName(), property.getPropString(), property.getComment()); 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) // 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) public void a_exportResults(boolean exportMatrix, String sep)
@ -1103,7 +1100,7 @@ public class GUIMultiProperties extends GUIPlugin implements MouseListener, List
{ {
if (e instanceof GUIModelEvent) { if (e instanceof GUIModelEvent) {
GUIModelEvent me = (GUIModelEvent) e; GUIModelEvent me = (GUIModelEvent) e;
if (me.getID() == me.NEW_MODEL) {
if (me.getID() == GUIModelEvent.NEW_MODEL) {
//New Model //New Model
setParsedModel(null); setParsedModel(null);
doEnables(); doEnables();
@ -1142,15 +1139,15 @@ public class GUIMultiProperties extends GUIPlugin implements MouseListener, List
if (ce.getComponent() == this || ce.getComponent() == propList) { if (ce.getComponent() == this || ce.getComponent() == propList) {
if (!computing) { if (!computing) {
if (ce.getID() == ce.CUT) {
if (ce.getID() == GUIClipboardEvent.CUT) {
a_cut(); a_cut();
} else if (ce.getID() == ce.COPY) {
} else if (ce.getID() == GUIClipboardEvent.COPY) {
a_copy(); a_copy();
} else if (ce.getID() == ce.PASTE) {
} else if (ce.getID() == GUIClipboardEvent.PASTE) {
a_paste(); a_paste();
} else if (ce.getID() == ce.DELETE) {
} else if (ce.getID() == GUIClipboardEvent.DELETE) {
a_delete(); a_delete();
} else if (ce.getID() == ce.SELECT_ALL) {
} else if (ce.getID() == GUIClipboardEvent.SELECT_ALL) {
a_selectAll(); a_selectAll();
} }
} }
@ -1984,15 +1981,15 @@ public class GUIMultiProperties extends GUIPlugin implements MouseListener, List
*/ */
public class GUIClipboardProperties implements Transferable public class GUIClipboardProperties implements Transferable
{ {
private ArrayList listOfProperties;
private ArrayList<GUIProperty> listOfProperties;
private StringSelection stringRepresentation; private StringSelection stringRepresentation;
public GUIClipboardProperties(ArrayList listOfProperties)
public GUIClipboardProperties(ArrayList<GUIProperty> listOfProperties)
{ {
this.listOfProperties = listOfProperties; this.listOfProperties = listOfProperties;
String tmpString = ""; String tmpString = "";
for (int i = 0; i < listOfProperties.size(); i++) { 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) { if (gp.getComment().trim().length() > 0) {
tmpString += "//" + gp.getComment() + "\n"; tmpString += "//" + gp.getComment() + "\n";
} }
@ -2032,7 +2029,7 @@ public class GUIMultiProperties extends GUIPlugin implements MouseListener, List
return (stringRepresentation.isDataFlavorSupported(flavor) || flavor.equals(GUIMultiProperties.getGUIClipboardPropertiesDataFlavor())); return (stringRepresentation.isDataFlavorSupported(flavor) || flavor.equals(GUIMultiProperties.getGUIClipboardPropertiesDataFlavor()));
} }
public ArrayList getProperties()
public ArrayList<GUIProperty> getProperties()
{ {
return listOfProperties; return listOfProperties;
} }

Write Preview
Loading…
Cancel
Save