Changed the dialog boxes such that the "Okay" button is default when you press enter.

git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@87 bbc10eb1-c90d-0410-af57-cb519fbb1720

prism/src/userinterface/GUIConstantsPicker.java

@@ -82,6 +82,7 @@ public class GUIConstantsPicker extends javax.swing.JDialog
 		
 		//initialise
 		initComponents();
+		this.getRootPane().setDefaultButton(okayButton);
 		initTables(areModel, areProp);
 		initValues(undef, modelDefaults, propDefaults);
 		

prism/src/userinterface/GUIOptionsDialog.java

@@ -42,6 +42,7 @@ public class GUIOptionsDialog extends javax.swing.JDialog
 		settings = parent.getPrism().getSettings();
 		panels = new ArrayList();
 		initComponents();
+		this.getRootPane().setDefaultButton(cancelButton);
 		setLocationRelativeTo(getParent()); // centre
 		//setResizable(false);
 		
@@ -136,7 +137,7 @@ public class GUIOptionsDialog extends javax.swing.JDialog
 
 		jPanel4.setLayout(new java.awt.FlowLayout(java.awt.FlowLayout.RIGHT));
 
-		cancelButton.setText("OK");
+		cancelButton.setText("Okay");
 		cancelButton.setMaximumSize(new java.awt.Dimension(200, 50));
 		cancelButton.setMinimumSize(new java.awt.Dimension(80, 25));
 		cancelButton.setPreferredSize(new java.awt.Dimension(80, 25));
@@ -153,7 +154,7 @@ public class GUIOptionsDialog extends javax.swing.JDialog
 		jPanel2.add(jPanel4, java.awt.BorderLayout.EAST);
 
 		getContentPane().add(jPanel2, java.awt.BorderLayout.SOUTH);
-
+		
 		pack();
 	}//GEN-END:initComponents
 	

prism/src/userinterface/GUISimulationPicker.java

@@ -133,6 +133,8 @@ public class GUISimulationPicker extends javax.swing.JDialog implements KeyListe
 		
 		// initialise
 		initComponents();
+		this.getRootPane().setDefaultButton(okayButton);
+		
 		initTable();
 		initValues();
 		approximationField.addKeyListener(this);

prism/src/userinterface/model/GUITransientTime.java

@@ -60,6 +60,7 @@ public class GUITransientTime extends javax.swing.JDialog
     public GUITransientTime(java.awt.Frame parent) {
         super(parent, "Define time", true);
         initComponents();
+        this.getRootPane().setDefaultButton(okayButton);
 		setLocationRelativeTo(getParent()); // centre
 		if (!first) timeField.setText(""+time);
     }
@@ -142,7 +143,8 @@ public class GUITransientTime extends javax.swing.JDialog
         jPanel6.add(cancelButton);
 
         getContentPane().add(jPanel6, java.awt.BorderLayout.SOUTH);
-
+        
+        
         pack();
     }//GEN-END:initComponents
 

prism/src/userinterface/properties/GUIExperimentPicker.java

@@ -88,6 +88,7 @@ public class GUIExperimentPicker extends javax.swing.JDialog
 		
 		//initialise
 		initComponents();
+		this.getRootPane().setDefaultButton(okayButton);
 		if (offerGraph)
 		{
 			createGraphCheck.setEnabled(true);
@@ -213,7 +214,8 @@ public class GUIExperimentPicker extends javax.swing.JDialog
 		jPanel1.add(useSimulationCheck, gridBagConstraints);
 
 		getContentPane().add(jPanel1, java.awt.BorderLayout.CENTER);
-
+		
+		
 		jPanel6.setLayout(new java.awt.FlowLayout(java.awt.FlowLayout.RIGHT));
 
 		okayButton.setText("Okay");

prism/src/userinterface/properties/GUIGraphPicker.java

@@ -63,6 +63,7 @@ public class GUIGraphPicker extends javax.swing.JDialog
         this.gh = gh;
         multiSeries = new ArrayList();
         initComponents();
+        getRootPane().setDefaultButton(lineOkayButton);
         setResizable(false);
         init();
 		setLocationRelativeTo(getParent()); // centre

prism/src/userinterface/properties/GUIPropertyEditor.java

@@ -84,6 +84,7 @@ public class GUIPropertyEditor extends javax.swing.JDialog implements ActionList
 		this.parsedModel = parsedModel;
 		this.propertyInvalidStrategy = strategy;
 		initComponents();
+		this.getRootPane().setDefaultButton(okayButton);
 		setLocationRelativeTo(getParent()); // centre
 		//propertyList.setListData(props);
 		if(prop == null)
@@ -781,7 +782,7 @@ public class GUIPropertyEditor extends javax.swing.JDialog implements ActionList
         jPanel2.add(cancelButton);
 
         getContentPane().add(jPanel2, java.awt.BorderLayout.SOUTH);
-
+        
         pack();
     }//GEN-END:initComponents
 

prism/src/userinterface/properties/GUIPropertyResultDialog.java

@@ -39,7 +39,7 @@ public class GUIPropertyResultDialog extends javax.swing.JDialog
 		super(parent, false);
 		
 		initComponents();
-		
+		getRootPane().setDefaultButton(jButton1);
 		setTitle("Property Details");
 		
 		propertyLabel.setText(gp.getPropString());
@@ -109,7 +109,7 @@ public class GUIPropertyResultDialog extends javax.swing.JDialog
 		jPanel2.add(jButton1);
 
 		getContentPane().add(jPanel2, java.awt.BorderLayout.SOUTH);
-
+		
 		jPanel10.setLayout(new java.awt.GridBagLayout());
 
 		jPanel1.setLayout(new java.awt.GridBagLayout());

prism/src/userinterface/properties/GUIResultsTable.java

@@ -57,6 +57,7 @@ public class GUIResultsTable extends javax.swing.JDialog
 		
 		//initialise
 		initComponents();
+		getRootPane().setDefaultButton(closeButton);
 		setResizable(true);
 		pack();
 		setLocationRelativeTo(getParent()); // centre

prism/src/userinterface/simulator/GUIInitialStatePicker.java

@@ -98,6 +98,7 @@ public class GUIInitialStatePicker extends javax.swing.JDialog implements KeyLis
 	
 		//initialise
 		initComponents();
+		this.getRootPane().setDefaultButton(okayButton);
 		initTable();
 		initValues();
 		
@@ -198,7 +199,7 @@ public class GUIInitialStatePicker extends javax.swing.JDialog implements KeyLis
         jPanel7.add(jPanel1, java.awt.BorderLayout.CENTER);
 
         getContentPane().add(jPanel7, java.awt.BorderLayout.CENTER);
-
+        
         pack();
     }//GEN-END:initComponents