diff --git a/prism/src/userinterface/properties/ConstantHeader.form b/prism/src/userinterface/properties/ConstantHeader.form
index 1a1bf643..7aaa88cc 100644
--- a/prism/src/userinterface/properties/ConstantHeader.form
+++ b/prism/src/userinterface/properties/ConstantHeader.form
@@ -2,194 +2,185 @@
diff --git a/prism/src/userinterface/properties/ConstantHeader.java b/prism/src/userinterface/properties/ConstantHeader.java
index 8263cd98..8c68c48a 100644
--- a/prism/src/userinterface/properties/ConstantHeader.java
+++ b/prism/src/userinterface/properties/ConstantHeader.java
@@ -49,133 +49,129 @@ public class ConstantHeader extends javax.swing.JPanel
* WARNING: Do NOT modify this code. The content of this method is
* always regenerated by the Form Editor.
*/
- private void initComponents()//GEN-BEGIN:initComponents
- {
+ // //GEN-BEGIN:initComponents
+ private void initComponents() {
java.awt.GridBagConstraints gridBagConstraints;
- jPanel1 = new javax.swing.JPanel();
jLabel1 = new javax.swing.JLabel();
- jPanel2 = new javax.swing.JPanel();
jLabel2 = new javax.swing.JLabel();
- jPanel3 = new javax.swing.JPanel();
- jPanel4 = new javax.swing.JPanel();
- jPanel5 = new javax.swing.JPanel();
- jPanel6 = new javax.swing.JPanel();
jLabel3 = new javax.swing.JLabel();
jLabel4 = new javax.swing.JLabel();
jLabel5 = new javax.swing.JLabel();
jLabel6 = new javax.swing.JLabel();
jLabel7 = new javax.swing.JLabel();
+ jPanel1 = new javax.swing.JPanel();
+ jPanel2 = new javax.swing.JPanel();
setLayout(new java.awt.GridBagLayout());
- setBorder(new javax.swing.border.LineBorder(new java.awt.Color(0, 0, 0)));
setPreferredSize(new java.awt.Dimension(640, 38));
- gridBagConstraints = new java.awt.GridBagConstraints();
- gridBagConstraints.gridx = 0;
- gridBagConstraints.gridy = 1;
- add(jPanel1, gridBagConstraints);
-
jLabel1.setText("Name");
+ jLabel1.setMaximumSize(new java.awt.Dimension(100, 15));
+ jLabel1.setMinimumSize(new java.awt.Dimension(50, 15));
jLabel1.setPreferredSize(new java.awt.Dimension(100, 15));
gridBagConstraints = new java.awt.GridBagConstraints();
- gridBagConstraints.gridx = 1;
+ gridBagConstraints.gridx = 0;
gridBagConstraints.gridy = 1;
- gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
+ gridBagConstraints.ipadx = 5;
gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST;
- gridBagConstraints.weightx = 0.05;
+ gridBagConstraints.weightx = 0.1;
add(jLabel1, gridBagConstraints);
- gridBagConstraints = new java.awt.GridBagConstraints();
- gridBagConstraints.gridx = 2;
- gridBagConstraints.gridy = 1;
- add(jPanel2, gridBagConstraints);
-
jLabel2.setText("Type");
- jLabel2.setPreferredSize(new java.awt.Dimension(50, 15));
+ jLabel2.setMaximumSize(new java.awt.Dimension(150, 15));
+ jLabel2.setMinimumSize(new java.awt.Dimension(50, 15));
+ jLabel2.setPreferredSize(new java.awt.Dimension(100, 15));
gridBagConstraints = new java.awt.GridBagConstraints();
- gridBagConstraints.gridx = 3;
+ gridBagConstraints.gridx = 1;
gridBagConstraints.gridy = 1;
+ gridBagConstraints.ipadx = 5;
gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST;
+ gridBagConstraints.weightx = 0.1;
add(jLabel2, gridBagConstraints);
- gridBagConstraints = new java.awt.GridBagConstraints();
- gridBagConstraints.gridx = 4;
- gridBagConstraints.gridy = 1;
- add(jPanel3, gridBagConstraints);
-
- jPanel4.setPreferredSize(new java.awt.Dimension(20, 10));
- gridBagConstraints = new java.awt.GridBagConstraints();
- gridBagConstraints.gridx = 7;
- gridBagConstraints.gridy = 1;
- add(jPanel4, gridBagConstraints);
-
- jPanel5.setMaximumSize(new java.awt.Dimension(21, 21));
- jPanel5.setMinimumSize(new java.awt.Dimension(21, 21));
- jPanel5.setPreferredSize(new java.awt.Dimension(21, 21));
- gridBagConstraints = new java.awt.GridBagConstraints();
- gridBagConstraints.gridx = 5;
- gridBagConstraints.gridy = 1;
- add(jPanel5, gridBagConstraints);
-
- jPanel6.setMaximumSize(new java.awt.Dimension(21, 21));
- jPanel6.setMinimumSize(new java.awt.Dimension(21, 21));
- jPanel6.setPreferredSize(new java.awt.Dimension(21, 21));
- gridBagConstraints = new java.awt.GridBagConstraints();
- gridBagConstraints.gridx = 8;
- gridBagConstraints.gridy = 1;
- add(jPanel6, gridBagConstraints);
-
- jLabel3.setHorizontalAlignment(javax.swing.SwingConstants.CENTER);
+ jLabel3.setHorizontalAlignment(javax.swing.SwingConstants.LEFT);
jLabel3.setText("Single Value:");
- jLabel3.setPreferredSize(new java.awt.Dimension(10, 15));
+ jLabel3.setMaximumSize(new java.awt.Dimension(1079, 15));
+ jLabel3.setMinimumSize(new java.awt.Dimension(5, 15));
+ jLabel3.setPreferredSize(new java.awt.Dimension(100, 15));
gridBagConstraints = new java.awt.GridBagConstraints();
- gridBagConstraints.gridx = 6;
+ gridBagConstraints.gridx = 3;
gridBagConstraints.gridy = 1;
gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
+ gridBagConstraints.ipadx = 5;
+ gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST;
gridBagConstraints.weightx = 0.2;
add(jLabel3, gridBagConstraints);
- jLabel4.setHorizontalAlignment(javax.swing.SwingConstants.CENTER);
+ jLabel4.setHorizontalAlignment(javax.swing.SwingConstants.LEFT);
jLabel4.setText("Start");
- jLabel4.setPreferredSize(new java.awt.Dimension(10, 15));
+ jLabel4.setMaximumSize(new java.awt.Dimension(1079, 15));
+ jLabel4.setMinimumSize(new java.awt.Dimension(5, 15));
+ jLabel4.setPreferredSize(new java.awt.Dimension(100, 15));
gridBagConstraints = new java.awt.GridBagConstraints();
- gridBagConstraints.gridx = 9;
+ gridBagConstraints.gridx = 5;
gridBagConstraints.gridy = 1;
gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
+ gridBagConstraints.ipadx = 5;
+ gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST;
gridBagConstraints.weightx = 0.2;
add(jLabel4, gridBagConstraints);
- jLabel5.setHorizontalAlignment(javax.swing.SwingConstants.CENTER);
+ jLabel5.setHorizontalAlignment(javax.swing.SwingConstants.LEFT);
jLabel5.setText("End");
- jLabel5.setPreferredSize(new java.awt.Dimension(10, 15));
+ jLabel5.setMaximumSize(new java.awt.Dimension(1079, 15));
+ jLabel5.setMinimumSize(new java.awt.Dimension(5, 15));
+ jLabel5.setPreferredSize(new java.awt.Dimension(100, 15));
gridBagConstraints = new java.awt.GridBagConstraints();
- gridBagConstraints.gridx = 10;
+ gridBagConstraints.gridx = 6;
gridBagConstraints.gridy = 1;
gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
+ gridBagConstraints.ipadx = 5;
+ gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST;
gridBagConstraints.weightx = 0.2;
add(jLabel5, gridBagConstraints);
- jLabel6.setHorizontalAlignment(javax.swing.SwingConstants.CENTER);
+ jLabel6.setHorizontalAlignment(javax.swing.SwingConstants.LEFT);
jLabel6.setText("Step");
- jLabel6.setPreferredSize(new java.awt.Dimension(10, 15));
+ jLabel6.setMinimumSize(new java.awt.Dimension(5, 15));
+ jLabel6.setPreferredSize(new java.awt.Dimension(100, 15));
gridBagConstraints = new java.awt.GridBagConstraints();
- gridBagConstraints.gridx = 11;
+ gridBagConstraints.gridx = 7;
gridBagConstraints.gridy = 1;
gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
+ gridBagConstraints.ipadx = 5;
+ gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST;
gridBagConstraints.weightx = 0.2;
add(jLabel6, gridBagConstraints);
jLabel7.setHorizontalAlignment(javax.swing.SwingConstants.CENTER);
jLabel7.setText("Range:");
gridBagConstraints = new java.awt.GridBagConstraints();
- gridBagConstraints.gridx = 8;
+ gridBagConstraints.gridx = 5;
gridBagConstraints.gridy = 0;
- gridBagConstraints.gridwidth = 4;
- gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
+ gridBagConstraints.gridwidth = 3;
add(jLabel7, gridBagConstraints);
- }//GEN-END:initComponents
+ jPanel1.setMaximumSize(new java.awt.Dimension(21, 21));
+ jPanel1.setMinimumSize(new java.awt.Dimension(21, 21));
+ jPanel1.setPreferredSize(new java.awt.Dimension(21, 21));
+ gridBagConstraints = new java.awt.GridBagConstraints();
+ gridBagConstraints.gridx = 2;
+ gridBagConstraints.gridy = 1;
+ gridBagConstraints.ipadx = 5;
+ add(jPanel1, gridBagConstraints);
+
+ jPanel2.setMaximumSize(new java.awt.Dimension(21, 21));
+ jPanel2.setMinimumSize(new java.awt.Dimension(21, 21));
+ jPanel2.setPreferredSize(new java.awt.Dimension(21, 21));
+ gridBagConstraints = new java.awt.GridBagConstraints();
+ gridBagConstraints.gridx = 4;
+ gridBagConstraints.gridy = 1;
+ gridBagConstraints.ipadx = 5;
+ add(jPanel2, gridBagConstraints);
+
+ }// //GEN-END:initComponents
// Variables declaration - do not modify//GEN-BEGIN:variables
@@ -188,10 +184,6 @@ public class ConstantHeader extends javax.swing.JPanel
private javax.swing.JLabel jLabel7;
private javax.swing.JPanel jPanel1;
private javax.swing.JPanel jPanel2;
- private javax.swing.JPanel jPanel3;
- private javax.swing.JPanel jPanel4;
- private javax.swing.JPanel jPanel5;
- private javax.swing.JPanel jPanel6;
// End of variables declaration//GEN-END:variables
}
diff --git a/prism/src/userinterface/properties/ConstantLine.form b/prism/src/userinterface/properties/ConstantLine.form
index 4f85f1ee..234d6dbc 100644
--- a/prism/src/userinterface/properties/ConstantLine.form
+++ b/prism/src/userinterface/properties/ConstantLine.form
@@ -23,14 +23,14 @@
-
+
-
+
@@ -40,35 +40,20 @@
-
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -83,118 +68,79 @@
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
-
+
-
+
-
+
-
+
@@ -211,12 +157,12 @@
-
+
-
+
@@ -233,12 +179,12 @@
-
+
-
+
diff --git a/prism/src/userinterface/properties/ConstantLine.java b/prism/src/userinterface/properties/ConstantLine.java
index bf6cf79d..4abf2b48 100644
--- a/prism/src/userinterface/properties/ConstantLine.java
+++ b/prism/src/userinterface/properties/ConstantLine.java
@@ -4,6 +4,7 @@
// Authors:
// * Andrew Hinton (University of Birmingham)
// * Dave Parker (University of Oxford, formerly University of Birmingham)
+// * Mark Kattenbelt (University of Oxford)
//
//------------------------------------------------------------------------------
//
@@ -48,7 +49,7 @@ public class ConstantLine extends javax.swing.JPanel
public ConstantLine(String name, int type)
{
initComponents();
- setBorder(new BottomBorder());
+ //setBorder(new BottomBorder());
setPreferredSize(new Dimension(1, getFontMetrics(getFont()).getHeight() + 4));
setConstName(name);
setConstType(type);
@@ -74,13 +75,13 @@ public class ConstantLine extends javax.swing.JPanel
remove(boolSingleValueCombo);
remove(sizerPanel);
java.awt.GridBagConstraints gridBagConstraints = new java.awt.GridBagConstraints();
- gridBagConstraints.gridx = 6;
+ gridBagConstraints.gridx = 3;
gridBagConstraints.gridy = 0;
gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
gridBagConstraints.weightx = 0.2;
- gridBagConstraints.ipadx = 1;
+ gridBagConstraints.ipadx = 5;
add(boolSingleValueCombo, gridBagConstraints);
- add(sizerPanel, gridBagConstraints);
+ //add(sizerPanel, gridBagConstraints);
break;
}
@@ -94,10 +95,11 @@ public class ConstantLine extends javax.swing.JPanel
remove(boolSingleValueCombo);
remove(sizerPanel);
java.awt.GridBagConstraints gridBagConstraints = new java.awt.GridBagConstraints();
- gridBagConstraints.gridx = 6;
+ gridBagConstraints.gridx = 3;
gridBagConstraints.gridy = 0;
gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
gridBagConstraints.weightx = 0.2;
+ gridBagConstraints.ipadx = 5;
add(singleValueField, gridBagConstraints);
break;
}
@@ -110,10 +112,11 @@ public class ConstantLine extends javax.swing.JPanel
remove(boolSingleValueCombo);
remove(sizerPanel);
java.awt.GridBagConstraints gridBagConstraints = new java.awt.GridBagConstraints();
- gridBagConstraints.gridx = 6;
+ gridBagConstraints.gridx = 3;
gridBagConstraints.gridy = 0;
gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
gridBagConstraints.weightx = 0.2;
+ gridBagConstraints.ipadx = 5;
add(singleValueField, gridBagConstraints);
break;
}
@@ -126,7 +129,7 @@ public class ConstantLine extends javax.swing.JPanel
remove(boolSingleValueCombo);
remove(sizerPanel);
java.awt.GridBagConstraints gridBagConstraints = new java.awt.GridBagConstraints();
- gridBagConstraints.gridx = 6;
+ gridBagConstraints.gridx = 3;
gridBagConstraints.gridy = 0;
gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
gridBagConstraints.weightx = 0.2;
@@ -297,140 +300,117 @@ public class ConstantLine extends javax.swing.JPanel
* WARNING: Do NOT modify this code. The content of this method is
* always regenerated by the Form Editor.
*/
- private void initComponents()//GEN-BEGIN:initComponents
- {
- java.awt.GridBagConstraints gridBagConstraints;
+ // //GEN-BEGIN:initComponents
+ private void initComponents() {
+ java.awt.GridBagConstraints gridBagConstraints;
- choiceButtonGroup = new javax.swing.ButtonGroup();
- boolSingleValueCombo = new javax.swing.JComboBox();
- sizerPanel = new javax.swing.JPanel();
- jPanel1 = new javax.swing.JPanel();
- nameLabel = new javax.swing.JLabel();
- jPanel2 = new javax.swing.JPanel();
- typeLabel = new javax.swing.JLabel();
- jPanel3 = new javax.swing.JPanel();
- singleValueField = new javax.swing.JTextField();
- jPanel4 = new javax.swing.JPanel();
- startValueField = new javax.swing.JTextField();
- endValueField = new javax.swing.JTextField();
- stepValueField = new javax.swing.JTextField();
- singleValueCombo = new javax.swing.JRadioButton();
- rangeCombo = new javax.swing.JRadioButton();
+ choiceButtonGroup = new javax.swing.ButtonGroup();
+ boolSingleValueCombo = new javax.swing.JComboBox();
+ sizerPanel = new javax.swing.JPanel();
+ nameLabel = new javax.swing.JLabel();
+ typeLabel = new javax.swing.JLabel();
+ singleValueField = new javax.swing.JTextField();
+ startValueField = new javax.swing.JTextField();
+ endValueField = new javax.swing.JTextField();
+ stepValueField = new javax.swing.JTextField();
+ singleValueCombo = new javax.swing.JRadioButton();
+ rangeCombo = new javax.swing.JRadioButton();
- boolSingleValueCombo.setBackground(new java.awt.Color(255, 255, 255));
- boolSingleValueCombo.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "true", "false" }));
- boolSingleValueCombo.setMinimumSize(new java.awt.Dimension(4, 19));
- boolSingleValueCombo.setPreferredSize(new java.awt.Dimension(4, 19));
+ boolSingleValueCombo.setBackground(new java.awt.Color(255, 255, 255));
+ boolSingleValueCombo.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "true", "false" }));
+ boolSingleValueCombo.setMinimumSize(new java.awt.Dimension(4, 19));
+ boolSingleValueCombo.setPreferredSize(new java.awt.Dimension(4, 19));
- setLayout(new java.awt.GridBagLayout());
+ setLayout(new java.awt.GridBagLayout());
- setBackground(new java.awt.Color(255, 255, 255));
- setBorder(new javax.swing.border.LineBorder(new java.awt.Color(0, 0, 0)));
- setPreferredSize(new java.awt.Dimension(640, 23));
- jPanel1.setBackground(new java.awt.Color(255, 255, 255));
- gridBagConstraints = new java.awt.GridBagConstraints();
- gridBagConstraints.gridx = 0;
- gridBagConstraints.gridy = 0;
- add(jPanel1, gridBagConstraints);
+ setBackground(new java.awt.Color(255, 255, 255));
+ setPreferredSize(new java.awt.Dimension(640, 23));
+ nameLabel.setText("a");
+ nameLabel.setMaximumSize(new java.awt.Dimension(100, 15));
+ nameLabel.setMinimumSize(new java.awt.Dimension(50, 15));
+ nameLabel.setPreferredSize(new java.awt.Dimension(100, 15));
+ gridBagConstraints = new java.awt.GridBagConstraints();
+ gridBagConstraints.gridx = 0;
+ gridBagConstraints.gridy = 0;
+ gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
+ gridBagConstraints.ipadx = 5;
+ gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST;
+ gridBagConstraints.weightx = 0.1;
+ add(nameLabel, gridBagConstraints);
- nameLabel.setText("a");
- nameLabel.setMaximumSize(new java.awt.Dimension(100, 15));
- nameLabel.setMinimumSize(new java.awt.Dimension(50, 15));
- nameLabel.setPreferredSize(new java.awt.Dimension(100, 15));
- gridBagConstraints = new java.awt.GridBagConstraints();
- gridBagConstraints.gridx = 1;
- gridBagConstraints.gridy = 0;
- gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
- gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST;
- gridBagConstraints.weightx = 0.05;
- add(nameLabel, gridBagConstraints);
+ typeLabel.setText("double");
+ typeLabel.setMaximumSize(new java.awt.Dimension(150, 15));
+ typeLabel.setMinimumSize(new java.awt.Dimension(50, 15));
+ typeLabel.setPreferredSize(new java.awt.Dimension(100, 15));
+ gridBagConstraints = new java.awt.GridBagConstraints();
+ gridBagConstraints.gridx = 1;
+ gridBagConstraints.gridy = 0;
+ gridBagConstraints.ipadx = 5;
+ gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST;
+ gridBagConstraints.weightx = 0.1;
+ add(typeLabel, gridBagConstraints);
- jPanel2.setBackground(new java.awt.Color(255, 255, 255));
- gridBagConstraints = new java.awt.GridBagConstraints();
- gridBagConstraints.gridx = 2;
- gridBagConstraints.gridy = 0;
- add(jPanel2, gridBagConstraints);
+ gridBagConstraints = new java.awt.GridBagConstraints();
+ gridBagConstraints.gridx = 3;
+ gridBagConstraints.gridy = 0;
+ gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
+ gridBagConstraints.ipadx = 5;
+ gridBagConstraints.weightx = 0.2;
+ add(singleValueField, gridBagConstraints);
- typeLabel.setText("double");
- typeLabel.setPreferredSize(new java.awt.Dimension(50, 15));
- gridBagConstraints = new java.awt.GridBagConstraints();
- gridBagConstraints.gridx = 3;
- gridBagConstraints.gridy = 0;
- gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST;
- add(typeLabel, gridBagConstraints);
+ gridBagConstraints = new java.awt.GridBagConstraints();
+ gridBagConstraints.gridx = 5;
+ gridBagConstraints.gridy = 0;
+ gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
+ gridBagConstraints.ipadx = 5;
+ gridBagConstraints.weightx = 0.2;
+ add(startValueField, gridBagConstraints);
- jPanel3.setBackground(new java.awt.Color(255, 255, 255));
- gridBagConstraints = new java.awt.GridBagConstraints();
- gridBagConstraints.gridx = 4;
- gridBagConstraints.gridy = 0;
- add(jPanel3, gridBagConstraints);
+ gridBagConstraints = new java.awt.GridBagConstraints();
+ gridBagConstraints.gridx = 6;
+ gridBagConstraints.gridy = 0;
+ gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
+ gridBagConstraints.ipadx = 5;
+ gridBagConstraints.weightx = 0.2;
+ add(endValueField, gridBagConstraints);
- gridBagConstraints = new java.awt.GridBagConstraints();
- gridBagConstraints.gridx = 6;
- gridBagConstraints.gridy = 0;
- gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
- gridBagConstraints.weightx = 0.2;
- add(singleValueField, gridBagConstraints);
+ gridBagConstraints = new java.awt.GridBagConstraints();
+ gridBagConstraints.gridx = 7;
+ gridBagConstraints.gridy = 0;
+ gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
+ gridBagConstraints.ipadx = 5;
+ gridBagConstraints.weightx = 0.2;
+ add(stepValueField, gridBagConstraints);
- jPanel4.setBackground(new java.awt.Color(255, 255, 255));
- jPanel4.setPreferredSize(new java.awt.Dimension(20, 10));
- gridBagConstraints = new java.awt.GridBagConstraints();
- gridBagConstraints.gridx = 7;
- gridBagConstraints.gridy = 0;
- add(jPanel4, gridBagConstraints);
+ singleValueCombo.setBackground(new java.awt.Color(255, 255, 255));
+ choiceButtonGroup.add(singleValueCombo);
+ singleValueCombo.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(java.awt.event.ActionEvent evt) {
+ singleValueComboActionPerformed(evt);
+ }
+ });
- gridBagConstraints = new java.awt.GridBagConstraints();
- gridBagConstraints.gridx = 9;
- gridBagConstraints.gridy = 0;
- gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
- gridBagConstraints.weightx = 0.2;
- add(startValueField, gridBagConstraints);
-
- gridBagConstraints = new java.awt.GridBagConstraints();
- gridBagConstraints.gridx = 10;
- gridBagConstraints.gridy = 0;
- gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
- gridBagConstraints.weightx = 0.2;
- add(endValueField, gridBagConstraints);
-
- gridBagConstraints = new java.awt.GridBagConstraints();
- gridBagConstraints.gridx = 11;
- gridBagConstraints.gridy = 0;
- gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
- gridBagConstraints.weightx = 0.2;
- add(stepValueField, gridBagConstraints);
+ gridBagConstraints = new java.awt.GridBagConstraints();
+ gridBagConstraints.gridx = 2;
+ gridBagConstraints.gridy = 0;
+ gridBagConstraints.ipadx = 5;
+ add(singleValueCombo, gridBagConstraints);
- singleValueCombo.setBackground(new java.awt.Color(255, 255, 255));
- choiceButtonGroup.add(singleValueCombo);
- singleValueCombo.addActionListener(new java.awt.event.ActionListener()
- {
- public void actionPerformed(java.awt.event.ActionEvent evt)
- {
- singleValueComboActionPerformed(evt);
- }
- });
-
- gridBagConstraints = new java.awt.GridBagConstraints();
- gridBagConstraints.gridx = 5;
- gridBagConstraints.gridy = 0;
- add(singleValueCombo, gridBagConstraints);
+ rangeCombo.setBackground(new java.awt.Color(255, 255, 255));
+ choiceButtonGroup.add(rangeCombo);
+ rangeCombo.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(java.awt.event.ActionEvent evt) {
+ rangeComboActionPerformed(evt);
+ }
+ });
- rangeCombo.setBackground(new java.awt.Color(255, 255, 255));
- choiceButtonGroup.add(rangeCombo);
- rangeCombo.addActionListener(new java.awt.event.ActionListener()
- {
- public void actionPerformed(java.awt.event.ActionEvent evt)
- {
- rangeComboActionPerformed(evt);
- }
- });
-
- gridBagConstraints = new java.awt.GridBagConstraints();
- gridBagConstraints.gridx = 8;
- gridBagConstraints.gridy = 0;
- add(rangeCombo, gridBagConstraints);
+ gridBagConstraints = new java.awt.GridBagConstraints();
+ gridBagConstraints.gridx = 4;
+ gridBagConstraints.gridy = 0;
+ gridBagConstraints.ipadx = 5;
+ add(rangeCombo, gridBagConstraints);
- }//GEN-END:initComponents
+ }// //GEN-END:initComponents
private void rangeComboActionPerformed(java.awt.event.ActionEvent evt)//GEN-FIRST:event_rangeComboActionPerformed
{//GEN-HEADEREND:event_rangeComboActionPerformed
@@ -443,23 +423,19 @@ public class ConstantLine extends javax.swing.JPanel
}//GEN-LAST:event_singleValueComboActionPerformed
- // Variables declaration - do not modify//GEN-BEGIN:variables
- private javax.swing.JComboBox boolSingleValueCombo;
- private javax.swing.ButtonGroup choiceButtonGroup;
- private javax.swing.JTextField endValueField;
- private javax.swing.JPanel jPanel1;
- private javax.swing.JPanel jPanel2;
- private javax.swing.JPanel jPanel3;
- private javax.swing.JPanel jPanel4;
- private javax.swing.JLabel nameLabel;
- private javax.swing.JRadioButton rangeCombo;
- private javax.swing.JRadioButton singleValueCombo;
- private javax.swing.JTextField singleValueField;
- private javax.swing.JPanel sizerPanel;
- private javax.swing.JTextField startValueField;
- private javax.swing.JTextField stepValueField;
- private javax.swing.JLabel typeLabel;
- // End of variables declaration//GEN-END:variables
+ // Variables declaration - do not modify//GEN-BEGIN:variables
+ javax.swing.JComboBox boolSingleValueCombo;
+ private javax.swing.ButtonGroup choiceButtonGroup;
+ javax.swing.JTextField endValueField;
+ javax.swing.JLabel nameLabel;
+ javax.swing.JRadioButton rangeCombo;
+ javax.swing.JRadioButton singleValueCombo;
+ javax.swing.JTextField singleValueField;
+ javax.swing.JPanel sizerPanel;
+ javax.swing.JTextField startValueField;
+ javax.swing.JTextField stepValueField;
+ javax.swing.JLabel typeLabel;
+ // End of variables declaration//GEN-END:variables
class BottomBorder implements javax.swing.border.Border
{
diff --git a/prism/src/userinterface/properties/ConstantPickerList.java b/prism/src/userinterface/properties/ConstantPickerList.java
index 2550a077..86d5df2b 100644
--- a/prism/src/userinterface/properties/ConstantPickerList.java
+++ b/prism/src/userinterface/properties/ConstantPickerList.java
@@ -28,6 +28,10 @@
package userinterface.properties;
import javax.swing.*;
+import javax.swing.border.CompoundBorder;
+import javax.swing.border.EmptyBorder;
+import javax.swing.border.LineBorder;
+
import java.awt.*;
import java.util.*;
@@ -53,8 +57,12 @@ public class ConstantPickerList extends JPanel implements Scrollable
public void addConstant(ConstantLine pl)
{
rows.add(pl);
- nextPanel.add(pl, BorderLayout.NORTH);
- JPanel np = new JPanel();
+ JPanel containPl = new JPanel();
+ containPl.setLayout(new BorderLayout());
+ containPl.setBorder(new CompoundBorder(pl.new BottomBorder(), new LineBorder(Color.white, 2)));
+ containPl.add(pl, BorderLayout.CENTER);
+ nextPanel.add(containPl, BorderLayout.NORTH);
+ JPanel np = new JPanel();
np.setLayout(new BorderLayout());
nextPanel.add(np, BorderLayout.CENTER);
nextPanel = np;
diff --git a/prism/src/userinterface/properties/GUIExperimentPicker.java b/prism/src/userinterface/properties/GUIExperimentPicker.java
index cf37a8b7..01295d53 100644
--- a/prism/src/userinterface/properties/GUIExperimentPicker.java
+++ b/prism/src/userinterface/properties/GUIExperimentPicker.java
@@ -123,7 +123,7 @@ public class GUIExperimentPicker extends javax.swing.JDialog
initTables(areModel, areProp);
initValues(undef);
- setResizable(false);
+ //setResizable(false);
pack();
setLocationRelativeTo(getParent()); // centre
@@ -303,11 +303,13 @@ public class GUIExperimentPicker extends javax.swing.JDialog
{
for(int i = 0; i < undef.getMFNumUndefined(); i++)
{
- modelTable.addConstant(new ConstantLine(undef.getMFUndefinedName(i), undef.getMFUndefinedType(i)));
+ ConstantLine line = new ConstantLine(undef.getMFUndefinedName(i), undef.getMFUndefinedType(i));
+ modelTable.addConstant(line);
}
for(int i = 0; i < undef.getPFNumUndefined(); i++)
{
- propTable.addConstant(new ConstantLine(undef.getPFUndefinedName(i), undef.getPFUndefinedType(i)));
+ ConstantLine line = new ConstantLine(undef.getPFUndefinedName(i), undef.getPFUndefinedType(i));
+ propTable.addConstant(line);
}
// go through list of remembered values and see if we can use them