From 18cd16d78d5c1870c1f62746800e35ee6b35ed94 Mon Sep 17 00:00:00 2001 From: Dave Parker Date: Mon, 9 Nov 2015 21:32:17 +0000 Subject: [PATCH] Code tidy (auto-format). git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10866 bbc10eb1-c90d-0410-af57-cb519fbb1720 --- .../userinterface/simulator/GUISimulator.java | 96 +++++++++++++------ 1 file changed, 67 insertions(+), 29 deletions(-) diff --git a/prism/src/userinterface/simulator/GUISimulator.java b/prism/src/userinterface/simulator/GUISimulator.java index be1e8e01..f40b0cf7 100644 --- a/prism/src/userinterface/simulator/GUISimulator.java +++ b/prism/src/userinterface/simulator/GUISimulator.java @@ -28,26 +28,64 @@ package userinterface.simulator; -import java.awt.*; -import java.awt.event.*; - -import javax.swing.*; -import javax.swing.table.*; -import javax.swing.event.*; +import java.awt.Font; +import java.awt.Rectangle; +import java.awt.Toolkit; +import java.awt.event.ActionEvent; +import java.awt.event.ComponentAdapter; +import java.awt.event.ComponentEvent; +import java.awt.event.InputEvent; +import java.awt.event.KeyAdapter; +import java.awt.event.KeyEvent; +import java.awt.event.MouseAdapter; +import java.awt.event.MouseEvent; +import java.awt.event.MouseListener; + +import javax.swing.AbstractAction; +import javax.swing.Action; +import javax.swing.JFileChooser; +import javax.swing.JList; +import javax.swing.JMenu; +import javax.swing.JPopupMenu; +import javax.swing.JScrollPane; +import javax.swing.JTable; +import javax.swing.KeyStroke; +import javax.swing.ListSelectionModel; +import javax.swing.event.ListSelectionEvent; +import javax.swing.event.ListSelectionListener; import javax.swing.filechooser.FileFilter; import javax.swing.filechooser.FileNameExtensionFilter; - -import simulator.*; -import simulator.networking.*; -import parser.*; -import parser.ast.*; -import prism.*; -import userinterface.*; -import userinterface.util.*; +import javax.swing.table.AbstractTableModel; +import javax.swing.table.TableColumn; +import javax.swing.table.TableColumnModel; + +import parser.Values; +import parser.ast.LabelList; +import parser.ast.ModulesFile; +import parser.ast.PropertiesFile; +import prism.PrismException; +import prism.PrismLangException; +import prism.PrismSettings; +import prism.PrismSettingsListener; +import prism.PrismUtils; +import prism.UndefinedConstants; +import simulator.PathFullInfo; +import simulator.SimulatorEngine; +import simulator.networking.SimulatorNetworkHandler; +import userinterface.GUIConstantsPicker; +import userinterface.GUIPlugin; +import userinterface.GUIPrism; +import userinterface.OptionsPanel; import userinterface.graph.Graph; -import userinterface.model.*; -import userinterface.properties.*; -import userinterface.simulator.networking.*; +import userinterface.model.GUIModelEvent; +import userinterface.model.GUIMultiModel; +import userinterface.properties.GUIMultiProperties; +import userinterface.properties.GUIPropertiesEvent; +import userinterface.properties.GUIPropertiesList; +import userinterface.properties.GUIProperty; +import userinterface.simulator.networking.GUINetworkEditor; +import userinterface.util.GUIComputationEvent; +import userinterface.util.GUIExitEvent; @SuppressWarnings("serial") public class GUISimulator extends GUIPlugin implements MouseListener, ListSelectionListener, PrismSettingsListener @@ -181,7 +219,7 @@ public class GUISimulator extends GUIPlugin implements MouseListener, ListSelect totalTimeLabel.setText(formatDouble(0.0)); pathLengthLabel.setText("0"); - textFilter = new FileNameExtensionFilter("Plain text files (*.txt)", "txt"); + textFilter = new FileNameExtensionFilter("Plain text files (*.txt)", "txt"); displayStyleFast = true; displayPathLoops = true; @@ -325,8 +363,8 @@ public class GUISimulator extends GUIPlugin implements MouseListener, ListSelect this.chooseInitialState = chooseInitialState; notifyEventListeners(new GUIPropertiesEvent(GUIPropertiesEvent.REQUEST_MODEL_PARSE)); } - - public void newPathAfterParse() + + public void newPathAfterParse() { newPathAfterReceiveParseNotification = false; Values initialState; @@ -334,7 +372,7 @@ public class GUISimulator extends GUIPlugin implements MouseListener, ListSelect // Check model is simulate-able // (bail out now else causes problems below) engine.checkModelForSimulation(parsedModel); - + // get properties constants/labels PropertiesFile pf; try { @@ -713,8 +751,8 @@ public class GUISimulator extends GUIPlugin implements MouseListener, ListSelect this.chooseInitialState = chooseInitialState; notifyEventListeners(new GUIPropertiesEvent(GUIPropertiesEvent.REQUEST_MODEL_PARSE)); } - - public void newPathPlotAfterParse() + + public void newPathPlotAfterParse() { newPathPlotAfterReceiveParseNotification = false; Values initialState; @@ -722,7 +760,7 @@ public class GUISimulator extends GUIPlugin implements MouseListener, ListSelect // Check model is simulate-able // (bail out now else causes problems below) engine.checkModelForSimulation(parsedModel); - + // if necessary, get values for undefined constants from user UndefinedConstants uCon = new UndefinedConstants(parsedModel, null); if (uCon.getMFNumUndefined() > 0) { @@ -757,7 +795,7 @@ public class GUISimulator extends GUIPlugin implements MouseListener, ListSelect if (simPathDetails == null) return; long maxPathLength = pathPlotDialog.getMaxPathLength(); - + // Create a new path in the simulator and plot it a_clearPath(); setComputing(true); @@ -771,7 +809,7 @@ public class GUISimulator extends GUIPlugin implements MouseListener, ListSelect // store initial state for next time lastInitialState = initialState; - + } catch (PrismException e) { this.error(e.getMessage()); if (e instanceof PrismLangException) { @@ -892,7 +930,8 @@ public class GUISimulator extends GUIPlugin implements MouseListener, ListSelect newPathPlotAfterParse(); } else if (me.getID() == GUIModelEvent.MODEL_PARSE_FAILED) { newPathAfterReceiveParseNotification = false; - newPathPlotAfterReceiveParseNotification = false; } + newPathPlotAfterReceiveParseNotification = false; + } } else if (e instanceof GUIComputationEvent) { if (e.getID() == GUIComputationEvent.COMPUTATION_START) { @@ -1889,8 +1928,7 @@ public class GUISimulator extends GUIPlugin implements MouseListener, ListSelect if (e.getClickCount() == 2 && (e.getSource() == pathTablePlaceHolder || e.getSource() == tableScroll)) { if (newPath.isEnabled()) a_newPath(false); - } - else if (e.isPopupTrigger() + } else if (e.isPopupTrigger() && (e.getSource() == pathTablePlaceHolder || e.getSource() == pathTable || e.getSource() == pathTable.getTableHeader() || e.getSource() == tableScroll)) { randomExploration .setEnabled(!(e.getSource() == pathTable.getTableHeader() || e.getSource() == pathTablePlaceHolder || e.getSource() == tableScroll));