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

Changed JLabel to JTextField to be able to copy&paste current model/properties file name. 

git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@5547 bbc10eb1-c90d-0410-af57-cb519fbb1720
master
Mateusz Ujma 14 years ago
parent
739f83e2ba
commit
2983cde5b2
2 changed files with 20 additions and 14 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. 17
      prism/src/userinterface/model/GUIMultiModel.java
  2. 17
      prism/src/userinterface/properties/GUIMultiProperties.java

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

@ -46,6 +46,7 @@ import javax.swing.JPanel;
import javax.swing.JPopupMenu; import javax.swing.JPopupMenu;
import javax.swing.JScrollPane; import javax.swing.JScrollPane;
import javax.swing.JSeparator; import javax.swing.JSeparator;
import javax.swing.JTextField;
import javax.swing.JToolBar; import javax.swing.JToolBar;
import javax.swing.KeyStroke; import javax.swing.KeyStroke;
@ -77,7 +78,7 @@ public class GUIMultiModel extends GUIPlugin implements PrismSettingsListener
public static final int FILTER_GRAPHIC_MODEL = 2; public static final int FILTER_GRAPHIC_MODEL = 2;
//GUI //GUI
private JLabel fileLabel;
private JTextField fileTextField;
private JMenu modelMenu, newMenu, viewMenu, exportMenu, computeMenu; private JMenu modelMenu, newMenu, viewMenu, exportMenu, computeMenu;
private JMenu exportStatesMenu, exportTransMenu, exportStateRewardsMenu, exportTransRewardsMenu; private JMenu exportStatesMenu, exportTransMenu, exportStateRewardsMenu, exportTransRewardsMenu;
private AbstractAction viewStates, viewTrans, viewStateRewards, viewTransRewards, viewPrismCode, computeSS, computeTr, newPRISMModel, newGraphicModel, private AbstractAction viewStates, viewTrans, viewStateRewards, viewTransRewards, viewPrismCode, computeSS, computeTr, newPRISMModel, newGraphicModel,
@ -156,7 +157,7 @@ public class GUIMultiModel extends GUIPlugin implements PrismSettingsListener
s += handler.getActiveFileName(); s += handler.getActiveFileName();
if (handler.modified()) if (handler.modified())
s += "*"; s += "*";
fileLabel.setText(s);
fileTextField.setText(s);
// model menu // model menu
newPRISMModel.setEnabled(!computing); newPRISMModel.setEnabled(!computing);
newGraphicModel.setEnabled(!computing); newGraphicModel.setEnabled(!computing);
@ -1014,18 +1015,20 @@ public class GUIMultiModel extends GUIPlugin implements PrismSettingsListener
JPanel topPanel = new JPanel(); JPanel topPanel = new JPanel();
{ {
fileLabel = new JLabel();
fileTextField = new JTextField();
{ {
fileLabel.setHorizontalAlignment(javax.swing.SwingConstants.LEFT);
fileLabel.setBorder(new javax.swing.border.EtchedBorder());
fileLabel.setMinimumSize(new java.awt.Dimension(40, 25));
fileTextField.setHorizontalAlignment(javax.swing.SwingConstants.LEFT);
fileTextField.setBorder(new javax.swing.border.EtchedBorder());
fileTextField.setMinimumSize(new java.awt.Dimension(40, 25));
fileTextField.setEditable(false);
fileTextField.setBackground(null);
} }
//progress = new JProgressBar(0, 100); //progress = new JProgressBar(0, 100);
topPanel.setLayout(new BorderLayout()); topPanel.setLayout(new BorderLayout());
handler = new GUIMultiModelHandler(this); handler = new GUIMultiModelHandler(this);
//topPanel.add(progress, BorderLayout.WEST); //topPanel.add(progress, BorderLayout.WEST);
topPanel.add(fileLabel, BorderLayout.NORTH);
topPanel.add(fileTextField, BorderLayout.NORTH);
topPanel.add(handler, BorderLayout.CENTER); topPanel.add(handler, BorderLayout.CENTER);
} }

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

@ -67,6 +67,7 @@ import javax.swing.JScrollPane;
import javax.swing.JSeparator; import javax.swing.JSeparator;
import javax.swing.JSplitPane; import javax.swing.JSplitPane;
import javax.swing.JTextArea; import javax.swing.JTextArea;
import javax.swing.JTextField;
import javax.swing.JToolBar; import javax.swing.JToolBar;
import javax.swing.KeyStroke; import javax.swing.KeyStroke;
import javax.swing.border.TitledBorder; import javax.swing.border.TitledBorder;
@ -142,7 +143,7 @@ public class GUIMultiProperties extends GUIPlugin implements MouseListener, List
private GUIExperimentTable experiments; private GUIExperimentTable experiments;
private GUIGraphHandler graphHandler; private GUIGraphHandler graphHandler;
private JScrollPane expScroller; private JScrollPane expScroller;
private JLabel fileLabel;
private JTextField fileTextField;
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;
@ -586,7 +587,7 @@ public class GUIMultiProperties extends GUIPlugin implements MouseListener, List
protected void setActiveFileLabel() protected void setActiveFileLabel()
{ {
fileLabel.setText("Properties list: " + ((activeFile == null) ? "<Untitled>" : activeFile.getPath()) + (modified ? "*" : ""));
fileTextField.setText("Properties list: " + ((activeFile == null) ? "<Untitled>" : activeFile.getPath()) + (modified ? "*" : ""));
} }
protected void setParsedModel(ModulesFile m) protected void setParsedModel(ModulesFile m)
@ -1582,17 +1583,19 @@ public class GUIMultiProperties extends GUIPlugin implements MouseListener, List
JPanel topPanel = new JPanel(); JPanel topPanel = new JPanel();
{ {
fileLabel = new JLabel();
fileTextField = new JTextField();
{ {
fileLabel.setHorizontalAlignment(javax.swing.SwingConstants.LEFT);
fileLabel.setBorder(new javax.swing.border.EtchedBorder());
fileLabel.setMinimumSize(new java.awt.Dimension(40, 25));
fileTextField.setHorizontalAlignment(javax.swing.SwingConstants.LEFT);
fileTextField.setBorder(new javax.swing.border.EtchedBorder());
fileTextField.setMinimumSize(new java.awt.Dimension(40, 25));
fileTextField.setEditable(false);
fileTextField.setBackground(null);
} }
//progress = new JProgressBar(0, 100); //progress = new JProgressBar(0, 100);
topPanel.setLayout(new BorderLayout()); topPanel.setLayout(new BorderLayout());
//topPanel.add(progress, BorderLayout.WEST); //topPanel.add(progress, BorderLayout.WEST);
topPanel.add(fileLabel, BorderLayout.CENTER);
topPanel.add(fileTextField, BorderLayout.CENTER);
} }
setLayout(new BorderLayout()); setLayout(new BorderLayout());
add(mainSplit, BorderLayout.CENTER); add(mainSplit, BorderLayout.CENTER);

Write Preview
Loading…
Cancel
Save