Commit in lcsim/src/org/lcsim/plugin/conditions on MAIN
ConditionsWizardPage.java+13-71.1 -> 1.2
ConditionsWizardPage.form+20-111.1 -> 1.2
+33-18
2 modified files
Cleanup wizard dialog. Disable currently unimplemented options.

lcsim/src/org/lcsim/plugin/conditions
ConditionsWizardPage.java 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- ConditionsWizardPage.java	5 Apr 2006 09:09:11 -0000	1.1
+++ ConditionsWizardPage.java	5 Apr 2006 10:40:21 -0000	1.2
@@ -75,21 +75,25 @@
 
       setLayout(new java.awt.GridBagLayout());
 
+      setBorder(javax.swing.BorderFactory.createEmptyBorder(10, 10, 10, 10));
       jLabel1.setText("Sorry, no information could be found on the following detector:");
       gridBagConstraints = new java.awt.GridBagConstraints();
       gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER;
+      gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST;
       add(jLabel1, gridBagConstraints);
 
       detectorLabel.setText("jLabel2");
       gridBagConstraints = new java.awt.GridBagConstraints();
       gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER;
       gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST;
+      gridBagConstraints.insets = new java.awt.Insets(5, 0, 0, 0);
       add(detectorLabel, gridBagConstraints);
 
       jLabel3.setText("Please choose one of the following");
       gridBagConstraints = new java.awt.GridBagConstraints();
       gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER;
       gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST;
+      gridBagConstraints.insets = new java.awt.Insets(5, 0, 0, 0);
       add(jLabel3, gridBagConstraints);
 
       buttonGroup1.add(aliasButton);
@@ -107,12 +111,13 @@
       gridBagConstraints = new java.awt.GridBagConstraints();
       gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER;
       gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST;
-      gridBagConstraints.insets = new java.awt.Insets(0, 10, 0, 0);
+      gridBagConstraints.insets = new java.awt.Insets(5, 10, 0, 0);
       add(aliasButton, gridBagConstraints);
 
       buttonGroup1.add(locateButton);
-      locateButton.setText("Give location of a conditions database for this detector");
+      locateButton.setText("Give location of a conditions database for this detector (not yet implemented)");
       locateButton.setBorder(javax.swing.BorderFactory.createEmptyBorder(0, 0, 0, 0));
+      locateButton.setEnabled(false);
       locateButton.setMargin(new java.awt.Insets(0, 0, 0, 0));
       locateButton.addActionListener(new java.awt.event.ActionListener()
       {
@@ -125,12 +130,13 @@
       gridBagConstraints = new java.awt.GridBagConstraints();
       gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER;
       gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST;
-      gridBagConstraints.insets = new java.awt.Insets(0, 10, 0, 0);
+      gridBagConstraints.insets = new java.awt.Insets(5, 10, 0, 0);
       add(locateButton, gridBagConstraints);
 
       buttonGroup1.add(heprepButton);
-      heprepButton.setText("Give location of a HepRep file for this detector");
+      heprepButton.setText("Give location of a HepRep file for this detector (not yet implemented)");
       heprepButton.setBorder(javax.swing.BorderFactory.createEmptyBorder(0, 0, 0, 0));
+      heprepButton.setEnabled(false);
       heprepButton.setMargin(new java.awt.Insets(0, 0, 0, 0));
       heprepButton.addActionListener(new java.awt.event.ActionListener()
       {
@@ -143,11 +149,11 @@
       gridBagConstraints = new java.awt.GridBagConstraints();
       gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER;
       gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST;
-      gridBagConstraints.insets = new java.awt.Insets(0, 10, 0, 0);
+      gridBagConstraints.insets = new java.awt.Insets(5, 10, 0, 0);
       add(heprepButton, gridBagConstraints);
 
       buttonGroup1.add(noDetectorButton);
-      noDetectorButton.setText("Proceed with no detector information");
+      noDetectorButton.setText("Proceed with no detector information (limited functionality)");
       noDetectorButton.setBorder(javax.swing.BorderFactory.createEmptyBorder(0, 0, 0, 0));
       noDetectorButton.setMargin(new java.awt.Insets(0, 0, 0, 0));
       noDetectorButton.addActionListener(new java.awt.event.ActionListener()
@@ -161,7 +167,7 @@
       gridBagConstraints = new java.awt.GridBagConstraints();
       gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER;
       gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST;
-      gridBagConstraints.insets = new java.awt.Insets(0, 10, 0, 0);
+      gridBagConstraints.insets = new java.awt.Insets(5, 10, 0, 0);
       add(noDetectorButton, gridBagConstraints);
 
    }// </editor-fold>//GEN-END:initComponents

lcsim/src/org/lcsim/plugin/conditions
ConditionsWizardPage.form 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- ConditionsWizardPage.form	5 Apr 2006 09:09:11 -0000	1.1
+++ ConditionsWizardPage.form	5 Apr 2006 10:40:21 -0000	1.2
@@ -5,12 +5,19 @@
     <Component class="javax.swing.ButtonGroup" name="buttonGroup1">
     </Component>
   </NonVisualComponents>
+  <Properties>
+    <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
+      <Border info="org.netbeans.modules.form.compat2.border.EmptyBorderInfo">
+        <EmptyBorder bottom="10" left="10" right="10" top="10"/>
+      </Border>
+    </Property>
+  </Properties>
   <AuxValues>
     <AuxValue name="FormSettings_generateMnemonicsCode" type="java.lang.Boolean" value="false"/>
     <AuxValue name="FormSettings_listenerGenerationStyle" type="java.lang.Integer" value="0"/>
     <AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" value="false"/>
     <AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" value="2"/>
-    <AuxValue name="designerSize" type="java.awt.Dimension" value="-84,-19,0,5,115,114,0,18,106,97,118,97,46,97,119,116,46,68,105,109,101,110,115,105,111,110,65,-114,-39,-41,-84,95,68,20,2,0,2,73,0,6,104,101,105,103,104,116,73,0,5,119,105,100,116,104,120,112,0,0,0,-125,0,0,1,-110"/>
+    <AuxValue name="designerSize" type="java.awt.Dimension" value="-84,-19,0,5,115,114,0,18,106,97,118,97,46,97,119,116,46,68,105,109,101,110,115,105,111,110,65,-114,-39,-41,-84,95,68,20,2,0,2,73,0,6,104,101,105,103,104,116,73,0,5,119,105,100,116,104,120,112,0,0,0,-116,0,0,1,107"/>
   </AuxValues>
 
   <Layout class="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout"/>
@@ -25,7 +32,7 @@
       </AuxValues>
       <Constraints>
         <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
-          <GridBagConstraints gridX="-1" gridY="-1" gridWidth="0" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="10" weightX="0.0" weightY="0.0"/>
+          <GridBagConstraints gridX="-1" gridY="-1" gridWidth="0" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="17" weightX="0.0" weightY="0.0"/>
         </Constraint>
       </Constraints>
     </Component>
@@ -35,7 +42,7 @@
       </Properties>
       <Constraints>
         <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
-          <GridBagConstraints gridX="-1" gridY="-1" gridWidth="0" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="17" weightX="0.0" weightY="0.0"/>
+          <GridBagConstraints gridX="-1" gridY="-1" gridWidth="0" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="5" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="17" weightX="0.0" weightY="0.0"/>
         </Constraint>
       </Constraints>
     </Component>
@@ -49,7 +56,7 @@
       </AuxValues>
       <Constraints>
         <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
-          <GridBagConstraints gridX="-1" gridY="-1" gridWidth="0" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="17" weightX="0.0" weightY="0.0"/>
+          <GridBagConstraints gridX="-1" gridY="-1" gridWidth="0" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="5" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="17" weightX="0.0" weightY="0.0"/>
         </Constraint>
       </Constraints>
     </Component>
@@ -73,7 +80,7 @@
       </Events>
       <Constraints>
         <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
-          <GridBagConstraints gridX="-1" gridY="-1" gridWidth="0" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="10" insetsBottom="0" insetsRight="0" anchor="17" weightX="0.0" weightY="0.0"/>
+          <GridBagConstraints gridX="-1" gridY="-1" gridWidth="0" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="5" insetsLeft="10" insetsBottom="0" insetsRight="0" anchor="17" weightX="0.0" weightY="0.0"/>
         </Constraint>
       </Constraints>
     </Component>
@@ -82,12 +89,13 @@
         <Property name="buttonGroup" type="javax.swing.ButtonGroup" editor="org.netbeans.modules.form.RADComponent$ButtonGroupPropertyEditor">
           <ComponentRef name="buttonGroup1"/>
         </Property>
-        <Property name="text" type="java.lang.String" value="Give location of a conditions database for this detector"/>
+        <Property name="text" type="java.lang.String" value="Give location of a conditions database for this detector (not yet implemented)"/>
         <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
           <Border info="org.netbeans.modules.form.compat2.border.EmptyBorderInfo">
             <EmptyBorder bottom="0" left="0" right="0" top="0"/>
           </Border>
         </Property>
+        <Property name="enabled" type="boolean" value="false"/>
         <Property name="margin" type="java.awt.Insets" editor="org.netbeans.beaninfo.editors.InsetsEditor">
           <Insets value="[0, 0, 0, 0]"/>
         </Property>
@@ -97,7 +105,7 @@
       </Events>
       <Constraints>
         <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
-          <GridBagConstraints gridX="-1" gridY="-1" gridWidth="0" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="10" insetsBottom="0" insetsRight="0" anchor="17" weightX="0.0" weightY="0.0"/>
+          <GridBagConstraints gridX="-1" gridY="-1" gridWidth="0" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="5" insetsLeft="10" insetsBottom="0" insetsRight="0" anchor="17" weightX="0.0" weightY="0.0"/>
         </Constraint>
       </Constraints>
     </Component>
@@ -106,12 +114,13 @@
         <Property name="buttonGroup" type="javax.swing.ButtonGroup" editor="org.netbeans.modules.form.RADComponent$ButtonGroupPropertyEditor">
           <ComponentRef name="buttonGroup1"/>
         </Property>
-        <Property name="text" type="java.lang.String" value="Give location of a HepRep file for this detector"/>
+        <Property name="text" type="java.lang.String" value="Give location of a HepRep file for this detector (not yet implemented)"/>
         <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
           <Border info="org.netbeans.modules.form.compat2.border.EmptyBorderInfo">
             <EmptyBorder bottom="0" left="0" right="0" top="0"/>
           </Border>
         </Property>
+        <Property name="enabled" type="boolean" value="false"/>
         <Property name="margin" type="java.awt.Insets" editor="org.netbeans.beaninfo.editors.InsetsEditor">
           <Insets value="[0, 0, 0, 0]"/>
         </Property>
@@ -121,7 +130,7 @@
       </Events>
       <Constraints>
         <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
-          <GridBagConstraints gridX="-1" gridY="-1" gridWidth="0" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="10" insetsBottom="0" insetsRight="0" anchor="17" weightX="0.0" weightY="0.0"/>
+          <GridBagConstraints gridX="-1" gridY="-1" gridWidth="0" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="5" insetsLeft="10" insetsBottom="0" insetsRight="0" anchor="17" weightX="0.0" weightY="0.0"/>
         </Constraint>
       </Constraints>
     </Component>
@@ -130,7 +139,7 @@
         <Property name="buttonGroup" type="javax.swing.ButtonGroup" editor="org.netbeans.modules.form.RADComponent$ButtonGroupPropertyEditor">
           <ComponentRef name="buttonGroup1"/>
         </Property>
-        <Property name="text" type="java.lang.String" value="Proceed with no detector information"/>
+        <Property name="text" type="java.lang.String" value="Proceed with no detector information (limited functionality)"/>
         <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
           <Border info="org.netbeans.modules.form.compat2.border.EmptyBorderInfo">
             <EmptyBorder bottom="0" left="0" right="0" top="0"/>
@@ -145,7 +154,7 @@
       </Events>
       <Constraints>
         <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
-          <GridBagConstraints gridX="-1" gridY="-1" gridWidth="0" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="10" insetsBottom="0" insetsRight="0" anchor="17" weightX="0.0" weightY="0.0"/>
+          <GridBagConstraints gridX="-1" gridY="-1" gridWidth="0" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="5" insetsLeft="10" insetsBottom="0" insetsRight="0" anchor="17" weightX="0.0" weightY="0.0"/>
         </Constraint>
       </Constraints>
     </Component>
CVSspam 0.2.8