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

Code tidy in GUIMultiProperties.java. 

git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@195 bbc10eb1-c90d-0410-af57-cb519fbb1720
master
Dave Parker 19 years ago
parent
d1bca01e7d
commit
ab301c47fd
1 changed files with 24 additions and 62 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. 86
      prism/src/userinterface/properties/GUIMultiProperties.java

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

@ -52,7 +52,6 @@ public class GUIMultiProperties extends GUIPlugin implements MouseListener, List
public static final int NEVER_INVALID_PROPS = 2; public static final int NEVER_INVALID_PROPS = 2;
//ATTRIBUTES //ATTRIBUTES
//private int invalidPropertyStrategy = WARN_INVALID_PROPS;
// current model (gets updated only by event listening to GUIModel) // current model (gets updated only by event listening to GUIModel)
private ModulesFile parsedModel; private ModulesFile parsedModel;
@ -63,15 +62,13 @@ public class GUIMultiProperties extends GUIPlugin implements MouseListener, List
private boolean modified; private boolean modified;
private boolean modifiedSinceBuild; private boolean modifiedSinceBuild;
private boolean computing; private boolean computing;
private boolean newAfterReceiveNewOrLoadModelNotification = true;
private boolean verifyAfterReceiveParseNotification, private boolean verifyAfterReceiveParseNotification,
verifyAfterReceiveBuildNotification, verifyAfterReceiveBuildNotification,
experimentAfterReceiveParseNotification, experimentAfterReceiveParseNotification,
simulateAfterReceiveParseNotification; simulateAfterReceiveParseNotification;
private PropertiesFile verifyThisAfter;
private ArrayList guiVerifyThisAfter;
private PropertiesFile parsedProperties;
private ArrayList propertiesToBeVerified;
private File activeFile; private File activeFile;
//private GUIPropertiesOptions options;
private Values lastPFConstants; private Values lastPFConstants;
private Values lastSimulateValues; private Values lastSimulateValues;
@ -86,8 +83,6 @@ public class GUIMultiProperties extends GUIPlugin implements MouseListener, List
private JLabel fileLabel; private JLabel fileLabel;
private Vector clipboardVector; private Vector clipboardVector;
private GUISimulator simulator;
private Action newProps, openProps, saveProps, savePropsAs, insertProps, private Action newProps, openProps, saveProps, savePropsAs, insertProps,
verifyAll, verifySelected, cutAction, copyAction, pasteAction, deleteAction, verifyAll, verifySelected, cutAction, copyAction, pasteAction, deleteAction,
newProperty, editProperty, selectAllAction, newConstant, newProperty, editProperty, selectAllAction, newConstant,
@ -109,8 +104,7 @@ public class GUIMultiProperties extends GUIPlugin implements MouseListener, List
public GUIMultiProperties(GUIPrism pr, GUISimulator simulator) public GUIMultiProperties(GUIPrism pr, GUISimulator simulator)
{ {
super(pr); super(pr);
this.simulator = simulator;
simulator.setGUIProb(this); //two way link required
simulator.setGUIProb(this); // link required
initComponents(); initComponents();
a_newList(); a_newList();
setBuiltModel(null); setBuiltModel(null);
@ -175,18 +169,8 @@ public class GUIMultiProperties extends GUIPlugin implements MouseListener, List
return getPrism().getSettings().getInteger(PrismSettings.PROPERTIES_ADDITION_STRATEGY)+1; //note the correction return getPrism().getSettings().getInteger(PrismSettings.PROPERTIES_ADDITION_STRATEGY)+1; //note the correction
} }
public boolean isNewAfterReceiveNewOrLoadModelNotification()
{
return newAfterReceiveNewOrLoadModelNotification;
}
/* UPDATE METHODS */ /* UPDATE METHODS */
public void setNewAfterReceiveNewOrLoadModelNotification(boolean b)
{
newAfterReceiveNewOrLoadModelNotification = b;
}
public void repaintList() public void repaintList()
{ {
propList.repaint(); propList.repaint();
@ -198,9 +182,9 @@ public class GUIMultiProperties extends GUIPlugin implements MouseListener, List
propList.setEnabled(true); propList.setEnabled(true);
consTable.setEnabled(true); consTable.setEnabled(true);
labTable.setEnabled(true); labTable.setEnabled(true);
if(builtModel != null && verifyThisAfter != null && guiVerifyThisAfter != null)
if(builtModel != null && parsedProperties != null && propertiesToBeVerified != null)
{ {
Thread t = new ModelCheckThread(this, builtModel, verifyThisAfter, guiVerifyThisAfter, lastBuildValues, lastPFConstants);
Thread t = new ModelCheckThread(this, builtModel, parsedProperties, propertiesToBeVerified, lastBuildValues, lastPFConstants);
t.setPriority(Thread.NORM_PRIORITY); t.setPriority(Thread.NORM_PRIORITY);
t.start(); t.start();
} }
@ -209,13 +193,12 @@ public class GUIMultiProperties extends GUIPlugin implements MouseListener, List
protected void verifyAfterParse() protected void verifyAfterParse()
{ {
verifyAfterReceiveParseNotification = false; verifyAfterReceiveParseNotification = false;
PropertiesFile pf;
ArrayList validGUIProperties; ArrayList validGUIProperties;
Values buildValues; Values buildValues;
UndefinedConstants uCon; UndefinedConstants uCon;
try try
{ {
pf = getPrism().parsePropertiesString(parsedModel, getLabelsString()+"\n"+getConstantsString()+"\n"+propList.getValidSelectedString());
parsedProperties = getPrism().parsePropertiesString(parsedModel, getLabelsString()+"\n"+getConstantsString()+"\n"+propList.getValidSelectedString());
validGUIProperties = propList.getValidSelectedProperties(); validGUIProperties = propList.getValidSelectedProperties();
} }
catch(ParseException e) catch(ParseException e)
@ -232,7 +215,7 @@ public class GUIMultiProperties extends GUIPlugin implements MouseListener, List
//find out any undefined constants //find out any undefined constants
try try
{ {
uCon = new UndefinedConstants(parsedModel, pf);
uCon = new UndefinedConstants(parsedModel, parsedProperties);
if(uCon.getMFNumUndefined() + uCon.getPFNumUndefined() > 0) if(uCon.getMFNumUndefined() + uCon.getPFNumUndefined() > 0)
{ {
int result = GUIConstantsPicker.defineConstantsWithDialog(this.getGUI(), uCon, lastBuildValues, lastPFConstants); int result = GUIConstantsPicker.defineConstantsWithDialog(this.getGUI(), uCon, lastBuildValues, lastPFConstants);
@ -241,7 +224,7 @@ public class GUIMultiProperties extends GUIPlugin implements MouseListener, List
} }
buildValues = uCon.getMFConstantValues(); buildValues = uCon.getMFConstantValues();
lastPFConstants = uCon.getPFConstantValues(); lastPFConstants = uCon.getPFConstantValues();
pf.setUndefinedConstants(lastPFConstants);
parsedProperties.setUndefinedConstants(lastPFConstants);
} }
catch(PrismException e) catch(PrismException e)
{ {
@ -250,8 +233,7 @@ public class GUIMultiProperties extends GUIPlugin implements MouseListener, List
} }
verifyAfterReceiveBuildNotification = true; verifyAfterReceiveBuildNotification = true;
verifyThisAfter = pf;
guiVerifyThisAfter = validGUIProperties;
propertiesToBeVerified = validGUIProperties;
propList.setEnabled(false); propList.setEnabled(false);
consTable.setEnabled(false); consTable.setEnabled(false);
notifyEventListeners(new GUIPropertiesEvent(GUIPropertiesEvent.REQUEST_MODEL_BUILD, buildValues)); notifyEventListeners(new GUIPropertiesEvent(GUIPropertiesEvent.REQUEST_MODEL_BUILD, buildValues));
@ -260,12 +242,11 @@ public class GUIMultiProperties extends GUIPlugin implements MouseListener, List
public void simulateAfterParse() public void simulateAfterParse()
{ {
simulateAfterReceiveParseNotification = false; simulateAfterReceiveParseNotification = false;
PropertiesFile pf;
ArrayList validGUIProperties, simulatableGUIProperties; ArrayList validGUIProperties, simulatableGUIProperties;
UndefinedConstants uCon; UndefinedConstants uCon;
try try
{ {
pf = getPrism().parsePropertiesString(parsedModel, getLabelsString()+"\n"+getConstantsString()+"\n"+propList.getValidSelectedString());
parsedProperties = getPrism().parsePropertiesString(parsedModel, getLabelsString()+"\n"+getConstantsString()+"\n"+propList.getValidSelectedString());
validGUIProperties = propList.getValidSelectedProperties(); validGUIProperties = propList.getValidSelectedProperties();
if (validGUIProperties.size() == 0) { if (validGUIProperties.size() == 0) {
error("None of the selected properties are suitable for simulation"); error("None of the selected properties are suitable for simulation");
@ -290,7 +271,7 @@ public class GUIMultiProperties extends GUIPlugin implements MouseListener, List
GUIProperty guiP = (GUIProperty)validGUIProperties.get(i); GUIProperty guiP = (GUIProperty)validGUIProperties.get(i);
try try
{ {
getPrism().checkPropertyForSimulation(parsedModel, pf, guiP.getPCTLProperty());
getPrism().checkPropertyForSimulation(parsedModel, parsedProperties, guiP.getPCTLProperty());
simulatableGUIProperties.add(guiP); simulatableGUIProperties.add(guiP);
} }
catch(PrismException e) catch(PrismException e)
@ -310,7 +291,7 @@ public class GUIMultiProperties extends GUIPlugin implements MouseListener, List
//find out any undefined constants //find out any undefined constants
try try
{ {
uCon = new UndefinedConstants(parsedModel, pf);
uCon = new UndefinedConstants(parsedModel, parsedProperties);
if(uCon.getMFNumUndefined() + uCon.getPFNumUndefined() > 0) if(uCon.getMFNumUndefined() + uCon.getPFNumUndefined() > 0)
{ {
int result = GUIConstantsPicker.defineConstantsWithDialog(this.getGUI(), uCon, lastSimulateValues, lastPFConstants); int result = GUIConstantsPicker.defineConstantsWithDialog(this.getGUI(), uCon, lastSimulateValues, lastPFConstants);
@ -321,7 +302,7 @@ public class GUIMultiProperties extends GUIPlugin implements MouseListener, List
lastSimulateValues = uCon.getMFConstantValues(); lastSimulateValues = uCon.getMFConstantValues();
lastPFConstants = uCon.getPFConstantValues(); lastPFConstants = uCon.getPFConstantValues();
parsedModel.setUndefinedConstants(lastSimulateValues); parsedModel.setUndefinedConstants(lastSimulateValues);
pf.setUndefinedConstants(lastPFConstants);
parsedProperties.setUndefinedConstants(lastPFConstants);
SimulationInformation info = GUISimulationPicker.defineSimulationWithDialog(this.getGUI(), parsedModel.getInitialValues(), parsedModel); SimulationInformation info = GUISimulationPicker.defineSimulationWithDialog(this.getGUI(), parsedModel.getInitialValues(), parsedModel);
if(info == null) return; if(info == null) return;
@ -330,15 +311,15 @@ public class GUIMultiProperties extends GUIPlugin implements MouseListener, List
int noIterations = info.getNoIterations(); int noIterations = info.getNoIterations();
int maxPathLength = info.getMaxPathLength(); int maxPathLength = info.getMaxPathLength();
if(parsedModel != null && pf != null && validGUIProperties != null)
if(parsedModel != null && parsedProperties != null && validGUIProperties != null)
{ {
if(info.isDistributed()) if(info.isDistributed())
{ {
new GUISimulatorDistributionDialog(getGUI(), getPrism().getSimulator(), true).show(this, parsedModel, pf, validGUIProperties, info);
new GUISimulatorDistributionDialog(getGUI(), getPrism().getSimulator(), true).show(this, parsedModel, parsedProperties, validGUIProperties, info);
} }
else else
{ {
Thread t = new SimulateModelCheckThread(this, parsedModel, pf, validGUIProperties, lastSimulateValues, lastPFConstants, initialState, noIterations, maxPathLength, info);
Thread t = new SimulateModelCheckThread(this, parsedModel, parsedProperties, validGUIProperties, lastSimulateValues, lastPFConstants, initialState, noIterations, maxPathLength, info);
t.setPriority(Thread.NORM_PRIORITY); t.setPriority(Thread.NORM_PRIORITY);
t.start(); t.start();
} }
@ -354,27 +335,26 @@ public class GUIMultiProperties extends GUIPlugin implements MouseListener, List
public void experimentAfterParse() public void experimentAfterParse()
{ {
experimentAfterReceiveParseNotification = false; experimentAfterReceiveParseNotification = false;
PropertiesFile pf = null;
GUIProperty gp = propList.getProperty(propList.getSelectedIndex()); GUIProperty gp = propList.getProperty(propList.getSelectedIndex());
int type; int type;
try try
{ {
// parse property to be used for experiment // parse property to be used for experiment
pf = getPrism().parsePropertiesString(parsedModel, getLabelsString()+"\n"+getConstantsString()+"\n"+gp.getPropString());
if (pf.getNumProperties() <= 0)
parsedProperties = getPrism().parsePropertiesString(parsedModel, getLabelsString()+"\n"+getConstantsString()+"\n"+gp.getPropString());
if (parsedProperties.getNumProperties() <= 0)
{ {
error("There are no properties selected"); error("There are no properties selected");
return; return;
} }
if (pf.getNumProperties() > 1)
if (parsedProperties.getNumProperties() > 1)
{ {
error("Experiments can only be created for a single property"); error("Experiments can only be created for a single property");
return; return;
} }
// check the type of the property // check the type of the property
type = pf.getProperty(0).getType();
type = parsedProperties.getProperty(0).getType();
} }
catch(ParseException e) catch(ParseException e)
{ {
@ -388,7 +368,7 @@ public class GUIMultiProperties extends GUIPlugin implements MouseListener, List
} }
// sort out undefined constants // sort out undefined constants
UndefinedConstants uCon = new UndefinedConstants(parsedModel, pf);
UndefinedConstants uCon = new UndefinedConstants(parsedModel, parsedProperties);
boolean showGraphDialog = false; boolean showGraphDialog = false;
boolean useSimulation = false; boolean useSimulation = false;
if(uCon.getMFNumUndefined()+uCon.getPFNumUndefined() == 0) if(uCon.getMFNumUndefined()+uCon.getPFNumUndefined() == 0)
@ -407,12 +387,12 @@ public class GUIMultiProperties extends GUIPlugin implements MouseListener, List
useSimulation = true; useSimulation = true;
} }
//if we are using simulation, make sure check the property is ok
//if we are using simulation, make sure the property is ok
if(useSimulation) if(useSimulation)
{ {
try try
{ {
getPrism().checkPropertyForSimulation(parsedModel, pf, gp.getPCTLProperty());
getPrism().checkPropertyForSimulation(parsedModel, parsedProperties, gp.getPCTLProperty());
} }
catch(PrismException e) catch(PrismException e)
{ {
@ -429,7 +409,7 @@ public class GUIMultiProperties extends GUIPlugin implements MouseListener, List
} }
// Use these values to create a new experiment // Use these values to create a new experiment
int i = experiments.newExperiment(pf, uCon, parsedModel, useSimulation);
int i = experiments.newExperiment(parsedProperties, uCon, parsedModel, useSimulation);
// start the experiment, via the graph dialog if appropriate // start the experiment, via the graph dialog if appropriate
if(showGraphDialog) if(showGraphDialog)
@ -2039,24 +2019,6 @@ public class GUIMultiProperties extends GUIPlugin implements MouseListener, List
} }
/**
* Getter for property simulator.
* @return Value of property simulator.
*/
public userinterface.simulator.GUISimulator getSimulator()
{
return simulator;
}
/**
* Setter for property simulator.
* @param simulator New value of property simulator.
*/
public void setSimulator(userinterface.simulator.GUISimulator simulator)
{
this.simulator = simulator;
}
/** /**
* Getter for property propList. * Getter for property propList.
* @return Value of property propList. * @return Value of property propList.

Write Preview
Loading…
Cancel
Save