diff --git a/.gitattributes b/.gitattributes
index 5896f47aa451d08be039d2d151760b5f15a9ea3c..cc4e9d64e484d7258281cbfb01bad66a4ec9d680 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -870,6 +870,15 @@ SAS/OTB/MoM-OTDB-adapter/lib/xercesImpl.jar -text
SAS/OTB/MoM-OTDB-adapter/lib/xml-apis.jar -text
SAS/OTB/MoM-OTDB-adapter/sharedlib/jotdb.jar -text
SAS/OTB/OTB/doc/OTB.EAP -text
+SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/bbs/icons/general/Add16.gif -text
+SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/bbs/icons/general/Delete16.gif -text
+SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/bbs/icons/general/Edit16.gif -text
+SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/bbs/icons/general/New16.gif -text
+SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/bbs/icons/general/Open16.gif -text
+SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/bbs/icons/general/Remove16.gif -text
+SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/bbs/icons/general/Undo16.gif -text
+SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/bbs/icons/navigation/Down16.gif -text
+SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/bbs/icons/navigation/Up16.gif -text
SAS/OTB/jOTDB2/.cvsignore -text
SAS/OTB/jOTDB2/How_to_build_jOTDB2.doc -text
SAS/OTB/jOTDB2/make_jar.sh -text svneol=native#application/octet-stream
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/bbs/BBSPanel.form b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/bbs/BBSPanel.form
index 0fac629333b4d405da6331a0d9103cbcb89b5101..615414b74fcefe0e44122bb806be2cf1ba5c4adf 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/bbs/BBSPanel.form
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/bbs/BBSPanel.form
@@ -273,14 +273,26 @@
</Container>
<Component class="javax.swing.JButton" name="configurationRevertButton">
<Properties>
+ <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
+ <Image iconType="3" name="/nl/astron/lofar/sas/otbcomponents/bbs/icons/general/Undo16.gif"/>
+ </Property>
<Property name="text" type="java.lang.String" value="Revert"/>
+ <Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[100, 25]"/>
+ </Property>
+ <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[100, 25]"/>
+ </Property>
+ <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[100, 25]"/>
+ </Property>
</Properties>
<Events>
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="configurationRevertButtonActionPerformed"/>
</Events>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
- <AbsoluteConstraints x="20" y="330" width="81" height="-1"/>
+ <AbsoluteConstraints x="20" y="330" width="100" height="-1"/>
</Constraint>
</Constraints>
</Component>
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/bbs/BBSPanel.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/bbs/BBSPanel.java
index cca44be849202a022b4748af1be583ef650c349c..c5e164c5fa829aa235fa3bd79607b9f666b5dde6 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/bbs/BBSPanel.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/bbs/BBSPanel.java
@@ -532,14 +532,18 @@ public class BBSPanel extends javax.swing.JPanel implements IViewPanel{
BBSGlobalSettingsFieldPanel.add(ParmDBPanel, new org.netbeans.lib.awtextra.AbsoluteConstraints(10, 240, 350, 80));
+ configurationRevertButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otbcomponents/bbs/icons/general/Undo16.gif")));
configurationRevertButton.setText("Revert");
+ configurationRevertButton.setMaximumSize(new java.awt.Dimension(100, 25));
+ configurationRevertButton.setMinimumSize(new java.awt.Dimension(100, 25));
+ configurationRevertButton.setPreferredSize(new java.awt.Dimension(100, 25));
configurationRevertButton.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) {
configurationRevertButtonActionPerformed(evt);
}
});
- BBSGlobalSettingsFieldPanel.add(configurationRevertButton, new org.netbeans.lib.awtextra.AbsoluteConstraints(20, 330, 81, -1));
+ BBSGlobalSettingsFieldPanel.add(configurationRevertButton, new org.netbeans.lib.awtextra.AbsoluteConstraints(20, 330, 100, -1));
BBSDatasetDeRefText.setEditable(false);
BBSDatasetDeRefText.setToolTipText("Dereferenced and actually used value.");
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/bbs/BBSStepExplorerPanel.form b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/bbs/BBSStepExplorerPanel.form
index 5508364ce01fe1dce18d89f5f501631f3eae57fc..7b7b6398526d2ab11aa65c1099048a825534a45e 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/bbs/BBSStepExplorerPanel.form
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/bbs/BBSStepExplorerPanel.form
@@ -89,14 +89,26 @@
</Component>
<Component class="javax.swing.JButton" name="stepExplorerRevertButton">
<Properties>
+ <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
+ <Image iconType="3" name="/nl/astron/lofar/sas/otbcomponents/bbs/icons/general/Undo16.gif"/>
+ </Property>
<Property name="text" type="java.lang.String" value="Revert"/>
+ <Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[100, 25]"/>
+ </Property>
+ <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[100, 25]"/>
+ </Property>
+ <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[100, 25]"/>
+ </Property>
</Properties>
<Events>
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="stepExplorerRevertButtonActionPerformed"/>
</Events>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
- <AbsoluteConstraints x="20" y="620" width="80" height="-1"/>
+ <AbsoluteConstraints x="20" y="620" width="100" height="-1"/>
</Constraint>
</Constraints>
</Component>
@@ -110,7 +122,7 @@
</Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
- <AbsoluteConstraints x="350" y="230" width="160" height="120"/>
+ <AbsoluteConstraints x="360" y="230" width="160" height="120"/>
</Constraint>
</Constraints>
@@ -152,7 +164,18 @@
<SubComponents>
<Component class="javax.swing.JButton" name="addInstrumentModelButton">
<Properties>
- <Property name="text" type="java.lang.String" value="A"/>
+ <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
+ <Image iconType="3" name="/nl/astron/lofar/sas/otbcomponents/bbs/icons/general/Add16.gif"/>
+ </Property>
+ <Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[30, 25]"/>
+ </Property>
+ <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[30, 25]"/>
+ </Property>
+ <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[30, 25]"/>
+ </Property>
</Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
@@ -162,7 +185,18 @@
</Component>
<Component class="javax.swing.JButton" name="modifyInstrumentModelButton">
<Properties>
- <Property name="text" type="java.lang.String" value="M"/>
+ <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
+ <Image iconType="3" name="/nl/astron/lofar/sas/otbcomponents/bbs/icons/general/Edit16.gif"/>
+ </Property>
+ <Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[30, 25]"/>
+ </Property>
+ <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[30, 25]"/>
+ </Property>
+ <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[30, 25]"/>
+ </Property>
</Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
@@ -172,7 +206,18 @@
</Component>
<Component class="javax.swing.JButton" name="deleteInstrumentModelButton">
<Properties>
- <Property name="text" type="java.lang.String" value="D"/>
+ <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
+ <Image iconType="3" name="/nl/astron/lofar/sas/otbcomponents/bbs/icons/general/Delete16.gif"/>
+ </Property>
+ <Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[30, 25]"/>
+ </Property>
+ <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[30, 25]"/>
+ </Property>
+ <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[30, 25]"/>
+ </Property>
</Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
@@ -194,7 +239,7 @@
</Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
- <AbsoluteConstraints x="20" y="360" width="670" height="250"/>
+ <AbsoluteConstraints x="20" y="360" width="680" height="250"/>
</Constraint>
</Constraints>
@@ -479,7 +524,18 @@
<SubComponents>
<Component class="javax.swing.JButton" name="addSolvableParmButton1">
<Properties>
- <Property name="text" type="java.lang.String" value="A"/>
+ <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
+ <Image iconType="3" name="/nl/astron/lofar/sas/otbcomponents/bbs/icons/general/Add16.gif"/>
+ </Property>
+ <Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[30, 25]"/>
+ </Property>
+ <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[30, 25]"/>
+ </Property>
+ <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[30, 25]"/>
+ </Property>
</Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
@@ -489,7 +545,18 @@
</Component>
<Component class="javax.swing.JButton" name="modifySolvableParmButton1">
<Properties>
- <Property name="text" type="java.lang.String" value="M"/>
+ <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
+ <Image iconType="3" name="/nl/astron/lofar/sas/otbcomponents/bbs/icons/general/Edit16.gif"/>
+ </Property>
+ <Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[30, 25]"/>
+ </Property>
+ <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[30, 25]"/>
+ </Property>
+ <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[30, 25]"/>
+ </Property>
</Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
@@ -499,7 +566,18 @@
</Component>
<Component class="javax.swing.JButton" name="deleteSolvableParmButton1">
<Properties>
- <Property name="text" type="java.lang.String" value="D"/>
+ <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
+ <Image iconType="3" name="/nl/astron/lofar/sas/otbcomponents/bbs/icons/general/Delete16.gif"/>
+ </Property>
+ <Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[30, 25]"/>
+ </Property>
+ <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[30, 25]"/>
+ </Property>
+ <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[30, 25]"/>
+ </Property>
</Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
@@ -559,7 +637,18 @@
<SubComponents>
<Component class="javax.swing.JButton" name="addSolvableParmButton">
<Properties>
- <Property name="text" type="java.lang.String" value="A"/>
+ <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
+ <Image iconType="3" name="/nl/astron/lofar/sas/otbcomponents/bbs/icons/general/Add16.gif"/>
+ </Property>
+ <Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[30, 25]"/>
+ </Property>
+ <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[30, 25]"/>
+ </Property>
+ <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[30, 25]"/>
+ </Property>
</Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
@@ -569,7 +658,18 @@
</Component>
<Component class="javax.swing.JButton" name="modifySolvableParmButton">
<Properties>
- <Property name="text" type="java.lang.String" value="M"/>
+ <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
+ <Image iconType="3" name="/nl/astron/lofar/sas/otbcomponents/bbs/icons/general/Edit16.gif"/>
+ </Property>
+ <Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[30, 25]"/>
+ </Property>
+ <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[30, 25]"/>
+ </Property>
+ <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[30, 25]"/>
+ </Property>
</Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
@@ -579,7 +679,18 @@
</Component>
<Component class="javax.swing.JButton" name="deleteSolvableParmButton">
<Properties>
- <Property name="text" type="java.lang.String" value="D"/>
+ <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
+ <Image iconType="3" name="/nl/astron/lofar/sas/otbcomponents/bbs/icons/general/Delete16.gif"/>
+ </Property>
+ <Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[30, 25]"/>
+ </Property>
+ <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[30, 25]"/>
+ </Property>
+ <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[30, 25]"/>
+ </Property>
</Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
@@ -649,7 +760,7 @@
</Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
- <AbsoluteConstraints x="10" y="30" width="140" height="-1"/>
+ <AbsoluteConstraints x="10" y="30" width="140" height="20"/>
</Constraint>
</Constraints>
</Component>
@@ -823,7 +934,18 @@
<SubComponents>
<Component class="javax.swing.JButton" name="addBaseLineButton">
<Properties>
- <Property name="text" type="java.lang.String" value="A"/>
+ <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
+ <Image iconType="3" name="/nl/astron/lofar/sas/otbcomponents/bbs/icons/general/Add16.gif"/>
+ </Property>
+ <Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[30, 25]"/>
+ </Property>
+ <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[30, 25]"/>
+ </Property>
+ <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[30, 25]"/>
+ </Property>
</Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
@@ -833,7 +955,18 @@
</Component>
<Component class="javax.swing.JButton" name="modifyBaseLineButton">
<Properties>
- <Property name="text" type="java.lang.String" value="M"/>
+ <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
+ <Image iconType="3" name="/nl/astron/lofar/sas/otbcomponents/bbs/icons/general/Edit16.gif"/>
+ </Property>
+ <Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[30, 25]"/>
+ </Property>
+ <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[30, 25]"/>
+ </Property>
+ <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[30, 25]"/>
+ </Property>
</Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
@@ -843,7 +976,18 @@
</Component>
<Component class="javax.swing.JButton" name="deleteBaseLineButton">
<Properties>
- <Property name="text" type="java.lang.String" value="D"/>
+ <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
+ <Image iconType="3" name="/nl/astron/lofar/sas/otbcomponents/bbs/icons/general/Delete16.gif"/>
+ </Property>
+ <Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[30, 25]"/>
+ </Property>
+ <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[30, 25]"/>
+ </Property>
+ <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[30, 25]"/>
+ </Property>
</Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
@@ -886,7 +1030,7 @@
</Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
- <AbsoluteConstraints x="350" y="40" width="340" height="180"/>
+ <AbsoluteConstraints x="350" y="40" width="350" height="180"/>
</Constraint>
</Constraints>
@@ -904,7 +1048,7 @@
</Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
- <AbsoluteConstraints x="10" y="20" width="-1" height="150"/>
+ <AbsoluteConstraints x="10" y="20" width="160" height="150"/>
</Constraint>
</Constraints>
@@ -921,7 +1065,18 @@
<SubComponents>
<Component class="javax.swing.JButton" name="addSourceButton1">
<Properties>
- <Property name="text" type="java.lang.String" value="A"/>
+ <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
+ <Image iconType="3" name="/nl/astron/lofar/sas/otbcomponents/bbs/icons/general/Add16.gif"/>
+ </Property>
+ <Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[30, 25]"/>
+ </Property>
+ <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[30, 25]"/>
+ </Property>
+ <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[30, 25]"/>
+ </Property>
</Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
@@ -931,7 +1086,18 @@
</Component>
<Component class="javax.swing.JButton" name="modifySourceButton1">
<Properties>
- <Property name="text" type="java.lang.String" value="M"/>
+ <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
+ <Image iconType="3" name="/nl/astron/lofar/sas/otbcomponents/bbs/icons/general/Edit16.gif"/>
+ </Property>
+ <Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[30, 25]"/>
+ </Property>
+ <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[30, 25]"/>
+ </Property>
+ <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[30, 25]"/>
+ </Property>
</Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
@@ -941,7 +1107,18 @@
</Component>
<Component class="javax.swing.JButton" name="deleteSourceButton2">
<Properties>
- <Property name="text" type="java.lang.String" value="D"/>
+ <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
+ <Image iconType="3" name="/nl/astron/lofar/sas/otbcomponents/bbs/icons/general/Delete16.gif"/>
+ </Property>
+ <Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[30, 25]"/>
+ </Property>
+ <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[30, 25]"/>
+ </Property>
+ <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[30, 25]"/>
+ </Property>
</Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
@@ -989,7 +1166,7 @@
</Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
- <AbsoluteConstraints x="180" y="20" width="150" height="150"/>
+ <AbsoluteConstraints x="180" y="20" width="160" height="150"/>
</Constraint>
</Constraints>
@@ -1006,7 +1183,18 @@
<SubComponents>
<Component class="javax.swing.JButton" name="addSourceButton">
<Properties>
- <Property name="text" type="java.lang.String" value="A"/>
+ <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
+ <Image iconType="3" name="/nl/astron/lofar/sas/otbcomponents/bbs/icons/general/Add16.gif"/>
+ </Property>
+ <Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[30, 25]"/>
+ </Property>
+ <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[30, 25]"/>
+ </Property>
+ <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[30, 25]"/>
+ </Property>
</Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
@@ -1016,7 +1204,18 @@
</Component>
<Component class="javax.swing.JButton" name="modifySourceButton">
<Properties>
- <Property name="text" type="java.lang.String" value="M"/>
+ <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
+ <Image iconType="3" name="/nl/astron/lofar/sas/otbcomponents/bbs/icons/general/Edit16.gif"/>
+ </Property>
+ <Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[30, 25]"/>
+ </Property>
+ <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[30, 25]"/>
+ </Property>
+ <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[30, 25]"/>
+ </Property>
</Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
@@ -1026,7 +1225,18 @@
</Component>
<Component class="javax.swing.JButton" name="deleteSourceButton1">
<Properties>
- <Property name="text" type="java.lang.String" value="D"/>
+ <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
+ <Image iconType="3" name="/nl/astron/lofar/sas/otbcomponents/bbs/icons/general/Delete16.gif"/>
+ </Property>
+ <Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[30, 25]"/>
+ </Property>
+ <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[30, 25]"/>
+ </Property>
+ <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[30, 25]"/>
+ </Property>
</Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/bbs/BBSStepExplorerPanel.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/bbs/BBSStepExplorerPanel.java
index 8b5f7ae891965d5a99ac9f2ca3b2e96d889f9aa6..5b83ac97fb8830dd354e63d262dcfd4bbd29d3df 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/bbs/BBSStepExplorerPanel.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/bbs/BBSStepExplorerPanel.java
@@ -495,14 +495,18 @@ public class BBSStepExplorerPanel extends javax.swing.JPanel implements IViewPan
exploreNextStepButton.setText("View next step");
stepExplorerPanel.add(exploreNextStepButton, new org.netbeans.lib.awtextra.AbsoluteConstraints(540, 10, -1, -1));
+ stepExplorerRevertButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otbcomponents/bbs/icons/general/Undo16.gif")));
stepExplorerRevertButton.setText("Revert");
+ stepExplorerRevertButton.setMaximumSize(new java.awt.Dimension(100, 25));
+ stepExplorerRevertButton.setMinimumSize(new java.awt.Dimension(100, 25));
+ stepExplorerRevertButton.setPreferredSize(new java.awt.Dimension(100, 25));
stepExplorerRevertButton.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) {
stepExplorerRevertButtonActionPerformed(evt);
}
});
- stepExplorerPanel.add(stepExplorerRevertButton, new org.netbeans.lib.awtextra.AbsoluteConstraints(20, 620, 80, -1));
+ stepExplorerPanel.add(stepExplorerRevertButton, new org.netbeans.lib.awtextra.AbsoluteConstraints(20, 620, 100, -1));
stepExplorerInstrumentModelPanel.setLayout(new java.awt.BorderLayout());
@@ -518,24 +522,33 @@ public class BBSStepExplorerPanel extends javax.swing.JPanel implements IViewPan
stepExplorerInstrumentModelModsPanel.setLayout(new java.awt.GridBagLayout());
- addInstrumentModelButton.setText("A");
+ addInstrumentModelButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otbcomponents/bbs/icons/general/Add16.gif")));
+ addInstrumentModelButton.setMaximumSize(new java.awt.Dimension(30, 25));
+ addInstrumentModelButton.setMinimumSize(new java.awt.Dimension(30, 25));
+ addInstrumentModelButton.setPreferredSize(new java.awt.Dimension(30, 25));
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.insets = new java.awt.Insets(2, 2, 2, 2);
stepExplorerInstrumentModelModsPanel.add(addInstrumentModelButton, gridBagConstraints);
- modifyInstrumentModelButton.setText("M");
+ modifyInstrumentModelButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otbcomponents/bbs/icons/general/Edit16.gif")));
+ modifyInstrumentModelButton.setMaximumSize(new java.awt.Dimension(30, 25));
+ modifyInstrumentModelButton.setMinimumSize(new java.awt.Dimension(30, 25));
+ modifyInstrumentModelButton.setPreferredSize(new java.awt.Dimension(30, 25));
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.insets = new java.awt.Insets(2, 2, 2, 2);
stepExplorerInstrumentModelModsPanel.add(modifyInstrumentModelButton, gridBagConstraints);
- deleteInstrumentModelButton.setText("D");
+ deleteInstrumentModelButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otbcomponents/bbs/icons/general/Delete16.gif")));
+ deleteInstrumentModelButton.setMaximumSize(new java.awt.Dimension(30, 25));
+ deleteInstrumentModelButton.setMinimumSize(new java.awt.Dimension(30, 25));
+ deleteInstrumentModelButton.setPreferredSize(new java.awt.Dimension(30, 25));
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.insets = new java.awt.Insets(2, 2, 2, 2);
stepExplorerInstrumentModelModsPanel.add(deleteInstrumentModelButton, gridBagConstraints);
stepExplorerInstrumentModelPanel.add(stepExplorerInstrumentModelModsPanel, java.awt.BorderLayout.SOUTH);
- stepExplorerPanel.add(stepExplorerInstrumentModelPanel, new org.netbeans.lib.awtextra.AbsoluteConstraints(350, 230, 160, 120));
+ stepExplorerPanel.add(stepExplorerInstrumentModelPanel, new org.netbeans.lib.awtextra.AbsoluteConstraints(360, 230, 160, 120));
stepExplorerOperationPanel.setLayout(new java.awt.BorderLayout());
@@ -617,17 +630,26 @@ public class BBSStepExplorerPanel extends javax.swing.JPanel implements IViewPan
seOperationAttributeGroup3.setBorder(javax.swing.BorderFactory.createTitledBorder("Excluded"));
stepExplorerSourcesModsPanel2.setLayout(new java.awt.GridBagLayout());
- addSolvableParmButton1.setText("A");
+ addSolvableParmButton1.setIcon(new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otbcomponents/bbs/icons/general/Add16.gif")));
+ addSolvableParmButton1.setMaximumSize(new java.awt.Dimension(30, 25));
+ addSolvableParmButton1.setMinimumSize(new java.awt.Dimension(30, 25));
+ addSolvableParmButton1.setPreferredSize(new java.awt.Dimension(30, 25));
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.insets = new java.awt.Insets(2, 2, 2, 2);
stepExplorerSourcesModsPanel2.add(addSolvableParmButton1, gridBagConstraints);
- modifySolvableParmButton1.setText("M");
+ modifySolvableParmButton1.setIcon(new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otbcomponents/bbs/icons/general/Edit16.gif")));
+ modifySolvableParmButton1.setMaximumSize(new java.awt.Dimension(30, 25));
+ modifySolvableParmButton1.setMinimumSize(new java.awt.Dimension(30, 25));
+ modifySolvableParmButton1.setPreferredSize(new java.awt.Dimension(30, 25));
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.insets = new java.awt.Insets(2, 2, 2, 2);
stepExplorerSourcesModsPanel2.add(modifySolvableParmButton1, gridBagConstraints);
- deleteSolvableParmButton1.setText("D");
+ deleteSolvableParmButton1.setIcon(new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otbcomponents/bbs/icons/general/Delete16.gif")));
+ deleteSolvableParmButton1.setMaximumSize(new java.awt.Dimension(30, 25));
+ deleteSolvableParmButton1.setMinimumSize(new java.awt.Dimension(30, 25));
+ deleteSolvableParmButton1.setPreferredSize(new java.awt.Dimension(30, 25));
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.insets = new java.awt.Insets(2, 2, 2, 2);
stepExplorerSourcesModsPanel2.add(deleteSolvableParmButton1, gridBagConstraints);
@@ -645,17 +667,26 @@ public class BBSStepExplorerPanel extends javax.swing.JPanel implements IViewPan
seOperationAttributeGroup2.setBorder(javax.swing.BorderFactory.createTitledBorder("Solvable"));
seOperationAttributeSolvableParmPanel.setLayout(new java.awt.GridBagLayout());
- addSolvableParmButton.setText("A");
+ addSolvableParmButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otbcomponents/bbs/icons/general/Add16.gif")));
+ addSolvableParmButton.setMaximumSize(new java.awt.Dimension(30, 25));
+ addSolvableParmButton.setMinimumSize(new java.awt.Dimension(30, 25));
+ addSolvableParmButton.setPreferredSize(new java.awt.Dimension(30, 25));
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.insets = new java.awt.Insets(2, 2, 2, 2);
seOperationAttributeSolvableParmPanel.add(addSolvableParmButton, gridBagConstraints);
- modifySolvableParmButton.setText("M");
+ modifySolvableParmButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otbcomponents/bbs/icons/general/Edit16.gif")));
+ modifySolvableParmButton.setMaximumSize(new java.awt.Dimension(30, 25));
+ modifySolvableParmButton.setMinimumSize(new java.awt.Dimension(30, 25));
+ modifySolvableParmButton.setPreferredSize(new java.awt.Dimension(30, 25));
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.insets = new java.awt.Insets(2, 2, 2, 2);
seOperationAttributeSolvableParmPanel.add(modifySolvableParmButton, gridBagConstraints);
- deleteSolvableParmButton.setText("D");
+ deleteSolvableParmButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otbcomponents/bbs/icons/general/Delete16.gif")));
+ deleteSolvableParmButton.setMaximumSize(new java.awt.Dimension(30, 25));
+ deleteSolvableParmButton.setMinimumSize(new java.awt.Dimension(30, 25));
+ deleteSolvableParmButton.setPreferredSize(new java.awt.Dimension(30, 25));
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.insets = new java.awt.Insets(2, 2, 2, 2);
seOperationAttributeSolvableParmPanel.add(deleteSolvableParmButton, gridBagConstraints);
@@ -681,13 +712,13 @@ public class BBSStepExplorerPanel extends javax.swing.JPanel implements IViewPan
stepExplorerOperationPanel.add(stepExplorerOperationAttributesPanel, java.awt.BorderLayout.CENTER);
- stepExplorerPanel.add(stepExplorerOperationPanel, new org.netbeans.lib.awtextra.AbsoluteConstraints(20, 360, 670, 250));
+ stepExplorerPanel.add(stepExplorerOperationPanel, new org.netbeans.lib.awtextra.AbsoluteConstraints(20, 360, 680, 250));
stepExplorerOutputDataPanel.setLayout(new org.netbeans.lib.awtextra.AbsoluteLayout());
stepExplorerOutputDataPanel.setBorder(javax.swing.BorderFactory.createTitledBorder("Output Data Column"));
stepExplorerOutputDataText.setText("OUTDATA2");
- stepExplorerOutputDataPanel.add(stepExplorerOutputDataText, new org.netbeans.lib.awtextra.AbsoluteConstraints(10, 30, 140, -1));
+ stepExplorerOutputDataPanel.add(stepExplorerOutputDataText, new org.netbeans.lib.awtextra.AbsoluteConstraints(10, 30, 140, 20));
stepExplorerPanel.add(stepExplorerOutputDataPanel, new org.netbeans.lib.awtextra.AbsoluteConstraints(530, 230, 160, 120));
@@ -757,7 +788,10 @@ public class BBSStepExplorerPanel extends javax.swing.JPanel implements IViewPan
baselineModsPanel.setLayout(new java.awt.GridBagLayout());
- addBaseLineButton.setText("A");
+ addBaseLineButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otbcomponents/bbs/icons/general/Add16.gif")));
+ addBaseLineButton.setMaximumSize(new java.awt.Dimension(30, 25));
+ addBaseLineButton.setMinimumSize(new java.awt.Dimension(30, 25));
+ addBaseLineButton.setPreferredSize(new java.awt.Dimension(30, 25));
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 1;
gridBagConstraints.gridy = 0;
@@ -766,7 +800,10 @@ public class BBSStepExplorerPanel extends javax.swing.JPanel implements IViewPan
gridBagConstraints.insets = new java.awt.Insets(2, 2, 2, 2);
baselineModsPanel.add(addBaseLineButton, gridBagConstraints);
- modifyBaseLineButton.setText("M");
+ modifyBaseLineButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otbcomponents/bbs/icons/general/Edit16.gif")));
+ modifyBaseLineButton.setMaximumSize(new java.awt.Dimension(30, 25));
+ modifyBaseLineButton.setMinimumSize(new java.awt.Dimension(30, 25));
+ modifyBaseLineButton.setPreferredSize(new java.awt.Dimension(30, 25));
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 2;
gridBagConstraints.gridy = 0;
@@ -774,7 +811,10 @@ public class BBSStepExplorerPanel extends javax.swing.JPanel implements IViewPan
gridBagConstraints.insets = new java.awt.Insets(2, 2, 2, 2);
baselineModsPanel.add(modifyBaseLineButton, gridBagConstraints);
- deleteBaseLineButton.setText("D");
+ deleteBaseLineButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otbcomponents/bbs/icons/general/Delete16.gif")));
+ deleteBaseLineButton.setMaximumSize(new java.awt.Dimension(30, 25));
+ deleteBaseLineButton.setMinimumSize(new java.awt.Dimension(30, 25));
+ deleteBaseLineButton.setPreferredSize(new java.awt.Dimension(30, 25));
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 3;
gridBagConstraints.gridy = 0;
@@ -812,17 +852,26 @@ public class BBSStepExplorerPanel extends javax.swing.JPanel implements IViewPan
stepExplorerSourcesPanel1.setBorder(javax.swing.BorderFactory.createTitledBorder("Predict"));
stepExplorerSourcesModsPanel1.setLayout(new java.awt.GridBagLayout());
- addSourceButton1.setText("A");
+ addSourceButton1.setIcon(new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otbcomponents/bbs/icons/general/Add16.gif")));
+ addSourceButton1.setMaximumSize(new java.awt.Dimension(30, 25));
+ addSourceButton1.setMinimumSize(new java.awt.Dimension(30, 25));
+ addSourceButton1.setPreferredSize(new java.awt.Dimension(30, 25));
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.insets = new java.awt.Insets(2, 2, 2, 2);
stepExplorerSourcesModsPanel1.add(addSourceButton1, gridBagConstraints);
- modifySourceButton1.setText("M");
+ modifySourceButton1.setIcon(new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otbcomponents/bbs/icons/general/Edit16.gif")));
+ modifySourceButton1.setMaximumSize(new java.awt.Dimension(30, 25));
+ modifySourceButton1.setMinimumSize(new java.awt.Dimension(30, 25));
+ modifySourceButton1.setPreferredSize(new java.awt.Dimension(30, 25));
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.insets = new java.awt.Insets(2, 2, 2, 2);
stepExplorerSourcesModsPanel1.add(modifySourceButton1, gridBagConstraints);
- deleteSourceButton2.setText("D");
+ deleteSourceButton2.setIcon(new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otbcomponents/bbs/icons/general/Delete16.gif")));
+ deleteSourceButton2.setMaximumSize(new java.awt.Dimension(30, 25));
+ deleteSourceButton2.setMinimumSize(new java.awt.Dimension(30, 25));
+ deleteSourceButton2.setPreferredSize(new java.awt.Dimension(30, 25));
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.insets = new java.awt.Insets(2, 2, 2, 2);
stepExplorerSourcesModsPanel1.add(deleteSourceButton2, gridBagConstraints);
@@ -838,24 +887,33 @@ public class BBSStepExplorerPanel extends javax.swing.JPanel implements IViewPan
stepExplorerSourcesPanel1.add(stepExplorerSourcesScrollPane1, java.awt.BorderLayout.CENTER);
- stepExplorerGlobalSources.add(stepExplorerSourcesPanel1, new org.netbeans.lib.awtextra.AbsoluteConstraints(10, 20, -1, 150));
+ stepExplorerGlobalSources.add(stepExplorerSourcesPanel1, new org.netbeans.lib.awtextra.AbsoluteConstraints(10, 20, 160, 150));
stepExplorerSourcesPanel.setLayout(new java.awt.BorderLayout());
stepExplorerSourcesPanel.setBorder(javax.swing.BorderFactory.createTitledBorder("Peel"));
stepExplorerSourcesModsPanel.setLayout(new java.awt.GridBagLayout());
- addSourceButton.setText("A");
+ addSourceButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otbcomponents/bbs/icons/general/Add16.gif")));
+ addSourceButton.setMaximumSize(new java.awt.Dimension(30, 25));
+ addSourceButton.setMinimumSize(new java.awt.Dimension(30, 25));
+ addSourceButton.setPreferredSize(new java.awt.Dimension(30, 25));
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.insets = new java.awt.Insets(2, 2, 2, 2);
stepExplorerSourcesModsPanel.add(addSourceButton, gridBagConstraints);
- modifySourceButton.setText("M");
+ modifySourceButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otbcomponents/bbs/icons/general/Edit16.gif")));
+ modifySourceButton.setMaximumSize(new java.awt.Dimension(30, 25));
+ modifySourceButton.setMinimumSize(new java.awt.Dimension(30, 25));
+ modifySourceButton.setPreferredSize(new java.awt.Dimension(30, 25));
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.insets = new java.awt.Insets(2, 2, 2, 2);
stepExplorerSourcesModsPanel.add(modifySourceButton, gridBagConstraints);
- deleteSourceButton1.setText("D");
+ deleteSourceButton1.setIcon(new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otbcomponents/bbs/icons/general/Delete16.gif")));
+ deleteSourceButton1.setMaximumSize(new java.awt.Dimension(30, 25));
+ deleteSourceButton1.setMinimumSize(new java.awt.Dimension(30, 25));
+ deleteSourceButton1.setPreferredSize(new java.awt.Dimension(30, 25));
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.insets = new java.awt.Insets(2, 2, 2, 2);
stepExplorerSourcesModsPanel.add(deleteSourceButton1, gridBagConstraints);
@@ -871,9 +929,9 @@ public class BBSStepExplorerPanel extends javax.swing.JPanel implements IViewPan
stepExplorerSourcesPanel.add(stepExplorerSourcesScrollPane, java.awt.BorderLayout.CENTER);
- stepExplorerGlobalSources.add(stepExplorerSourcesPanel, new org.netbeans.lib.awtextra.AbsoluteConstraints(180, 20, 150, 150));
+ stepExplorerGlobalSources.add(stepExplorerSourcesPanel, new org.netbeans.lib.awtextra.AbsoluteConstraints(180, 20, 160, 150));
- stepExplorerPanel.add(stepExplorerGlobalSources, new org.netbeans.lib.awtextra.AbsoluteConstraints(350, 40, 340, 180));
+ stepExplorerPanel.add(stepExplorerGlobalSources, new org.netbeans.lib.awtextra.AbsoluteConstraints(350, 40, 350, 180));
stepExplorerScrollPanel.setViewportView(stepExplorerPanel);
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/bbs/BBSStrategyPanel.form b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/bbs/BBSStrategyPanel.form
index 61db2f7b16c223278829b2302d5fcab79a021fd5..aab119b244f86504a4e575ff3e37def008eb5d47 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/bbs/BBSStrategyPanel.form
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/bbs/BBSStrategyPanel.form
@@ -58,7 +58,19 @@
</Component>
<Component class="javax.swing.JButton" name="strategyRevertButton">
<Properties>
+ <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
+ <Image iconType="3" name="/nl/astron/lofar/sas/otbcomponents/bbs/icons/general/Undo16.gif"/>
+ </Property>
<Property name="text" type="java.lang.String" value="Revert"/>
+ <Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[100, 25]"/>
+ </Property>
+ <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[100, 25]"/>
+ </Property>
+ <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[100, 25]"/>
+ </Property>
</Properties>
<Events>
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="strategyRevertButtonActionPerformed"/>
@@ -143,35 +155,59 @@
</Events>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
- <GridBagConstraints gridX="0" gridY="1" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="2" insetsLeft="2" insetsBottom="2" insetsRight="2" anchor="17" weightX="0.0" weightY="0.0"/>
+ <GridBagConstraints gridX="0" gridY="1" gridWidth="1" gridHeight="1" fill="2" ipadX="0" ipadY="0" insetsTop="2" insetsLeft="2" insetsBottom="2" insetsRight="2" anchor="17" weightX="0.0" weightY="0.0"/>
</Constraint>
</Constraints>
</Component>
<Component class="javax.swing.JButton" name="addStationButton">
<Properties>
- <Property name="text" type="java.lang.String" value="+"/>
+ <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
+ <Image iconType="3" name="/nl/astron/lofar/sas/otbcomponents/bbs/icons/general/Add16.gif"/>
+ </Property>
+ <Property name="toolTipText" type="java.lang.String" value="Add the station entered to the list"/>
<Property name="enabled" type="boolean" value="false"/>
+ <Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[30, 25]"/>
+ </Property>
+ <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[30, 25]"/>
+ </Property>
+ <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[30, 25]"/>
+ </Property>
</Properties>
<Events>
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="addStationButtonActionPerformed"/>
</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="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="2" insetsLeft="2" insetsBottom="2" insetsRight="2" anchor="10" weightX="0.0" weightY="0.0"/>
+ <GridBagConstraints gridX="1" gridY="1" gridWidth="1" gridHeight="1" fill="2" ipadX="0" ipadY="0" insetsTop="2" insetsLeft="2" insetsBottom="2" insetsRight="2" anchor="10" weightX="0.0" weightY="0.0"/>
</Constraint>
</Constraints>
</Component>
<Component class="javax.swing.JButton" name="deleteStationButton">
<Properties>
- <Property name="text" type="java.lang.String" value="-"/>
+ <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
+ <Image iconType="3" name="/nl/astron/lofar/sas/otbcomponents/bbs/icons/general/Delete16.gif"/>
+ </Property>
+ <Property name="toolTipText" type="java.lang.String" value="Remove the selected Station from the list"/>
<Property name="enabled" type="boolean" value="false"/>
+ <Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[30, 25]"/>
+ </Property>
+ <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[30, 25]"/>
+ </Property>
+ <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[30, 25]"/>
+ </Property>
</Properties>
<Events>
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="deleteStationButtonActionPerformed"/>
</Events>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
- <GridBagConstraints gridX="2" gridY="1" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="2" insetsLeft="2" insetsBottom="2" insetsRight="2" anchor="10" weightX="0.0" weightY="0.0"/>
+ <GridBagConstraints gridX="2" gridY="1" gridWidth="1" gridHeight="1" fill="2" ipadX="0" ipadY="0" insetsTop="2" insetsLeft="2" insetsBottom="2" insetsRight="2" anchor="10" weightX="0.0" weightY="0.0"/>
</Constraint>
</Constraints>
</Component>
@@ -247,17 +283,39 @@
<SubComponents>
<Component class="javax.swing.JButton" name="addStepButton">
<Properties>
- <Property name="text" type="java.lang.String" value="Add"/>
+ <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
+ <Image iconType="3" name="/nl/astron/lofar/sas/otbcomponents/bbs/icons/general/Add16.gif"/>
+ </Property>
+ <Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[30, 25]"/>
+ </Property>
+ <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[30, 25]"/>
+ </Property>
+ <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[30, 25]"/>
+ </Property>
</Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
- <GridBagConstraints gridX="0" gridY="0" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="2" insetsLeft="2" insetsBottom="2" insetsRight="2" anchor="18" weightX="0.0" weightY="0.0"/>
+ <GridBagConstraints gridX="-1" gridY="-1" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="10" weightX="0.0" weightY="0.0"/>
</Constraint>
</Constraints>
</Component>
<Component class="javax.swing.JButton" name="removeStepButton">
<Properties>
- <Property name="text" type="java.lang.String" value="Delete"/>
+ <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
+ <Image iconType="3" name="/nl/astron/lofar/sas/otbcomponents/bbs/icons/general/Delete16.gif"/>
+ </Property>
+ <Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[30, 25]"/>
+ </Property>
+ <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[30, 25]"/>
+ </Property>
+ <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[30, 25]"/>
+ </Property>
</Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
@@ -267,7 +325,18 @@
</Component>
<Component class="javax.swing.JButton" name="modifyStepButton">
<Properties>
- <Property name="text" type="java.lang.String" value="Modify"/>
+ <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
+ <Image iconType="3" name="/nl/astron/lofar/sas/otbcomponents/bbs/icons/general/Edit16.gif"/>
+ </Property>
+ <Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[30, 25]"/>
+ </Property>
+ <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[30, 25]"/>
+ </Property>
+ <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[30, 25]"/>
+ </Property>
</Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
@@ -277,7 +346,10 @@
</Component>
<Component class="javax.swing.JButton" name="loadTemplateStepButton">
<Properties>
- <Property name="text" type="java.lang.String" value="Load from template"/>
+ <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
+ <Image iconType="3" name="/nl/astron/lofar/sas/otbcomponents/bbs/icons/general/Open16.gif"/>
+ </Property>
+ <Property name="text" type="java.lang.String" value="Template"/>
</Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
@@ -290,10 +362,11 @@
<Container class="javax.swing.JPanel" name="stepsMoveUpDownPanel">
<Properties>
<Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
- <Dimension value="[50, 60]"/>
+ <Dimension value="[25, 60]"/>
</Property>
+ <Property name="opaque" type="boolean" value="false"/>
<Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
- <Dimension value="[50, 60]"/>
+ <Dimension value="[25, 60]"/>
</Property>
</Properties>
<Constraints>
@@ -306,7 +379,19 @@
<SubComponents>
<Component class="javax.swing.JButton" name="moveStepUpButton">
<Properties>
- <Property name="text" type="java.lang.String" value="U"/>
+ <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
+ <Image iconType="3" name="/nl/astron/lofar/sas/otbcomponents/bbs/icons/navigation/Up16.gif"/>
+ </Property>
+ <Property name="actionCommand" type="java.lang.String" value="Up"/>
+ <Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[25, 25]"/>
+ </Property>
+ <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[25, 25]"/>
+ </Property>
+ <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[25, 25]"/>
+ </Property>
</Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
@@ -316,7 +401,19 @@
</Component>
<Component class="javax.swing.JButton" name="moveStepDownButton">
<Properties>
- <Property name="text" type="java.lang.String" value="D"/>
+ <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
+ <Image iconType="3" name="/nl/astron/lofar/sas/otbcomponents/bbs/icons/navigation/Down16.gif"/>
+ </Property>
+ <Property name="actionCommand" type="java.lang.String" value="Down"/>
+ <Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[25, 25]"/>
+ </Property>
+ <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[25, 25]"/>
+ </Property>
+ <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[25, 25]"/>
+ </Property>
</Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/bbs/BBSStrategyPanel.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/bbs/BBSStrategyPanel.java
index e593acf7596d0ad01cdef8d1a69a3580bb84ebc2..1ba6da38f9a7679c3ff5cbbf96b2cd9f02533581 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/bbs/BBSStrategyPanel.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/bbs/BBSStrategyPanel.java
@@ -33,6 +33,7 @@ import javax.swing.JMenuItem;
import javax.swing.JPanel;
import javax.swing.JPopupMenu;
import javax.swing.JTextField;
+import javax.swing.SwingUtilities;
import javax.swing.border.TitledBorder;
import nl.astron.lofar.lofarutils.LofarUtils;
import nl.astron.lofar.sas.otb.MainFrame;
@@ -614,7 +615,11 @@ public class BBSStrategyPanel extends javax.swing.JPanel implements IViewPanel{
inputDataText.setToolTipText("Name of the column in the measurement set that contains the input data");
strategyPanel.add(inputDataText, new org.netbeans.lib.awtextra.AbsoluteConstraints(160, 30, 170, -1));
+ strategyRevertButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otbcomponents/bbs/icons/general/Undo16.gif")));
strategyRevertButton.setText("Revert");
+ strategyRevertButton.setMaximumSize(new java.awt.Dimension(100, 25));
+ strategyRevertButton.setMinimumSize(new java.awt.Dimension(100, 25));
+ strategyRevertButton.setPreferredSize(new java.awt.Dimension(100, 25));
strategyRevertButton.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) {
strategyRevertButtonActionPerformed(evt);
@@ -657,12 +662,17 @@ public class BBSStrategyPanel extends javax.swing.JPanel implements IViewPanel{
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 0;
gridBagConstraints.gridy = 1;
+ gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST;
gridBagConstraints.insets = new java.awt.Insets(2, 2, 2, 2);
stationsModPanel.add(stationsUseAllCheckbox, gridBagConstraints);
- addStationButton.setText("+");
+ addStationButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otbcomponents/bbs/icons/general/Add16.gif")));
+ addStationButton.setToolTipText("Add the station entered to the list");
addStationButton.setEnabled(false);
+ addStationButton.setMaximumSize(new java.awt.Dimension(30, 25));
+ addStationButton.setMinimumSize(new java.awt.Dimension(30, 25));
+ addStationButton.setPreferredSize(new java.awt.Dimension(30, 25));
addStationButton.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) {
addStationButtonActionPerformed(evt);
@@ -672,11 +682,16 @@ public class BBSStrategyPanel extends javax.swing.JPanel implements IViewPanel{
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 1;
gridBagConstraints.gridy = 1;
+ gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
gridBagConstraints.insets = new java.awt.Insets(2, 2, 2, 2);
stationsModPanel.add(addStationButton, gridBagConstraints);
- deleteStationButton.setText("-");
+ deleteStationButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otbcomponents/bbs/icons/general/Delete16.gif")));
+ deleteStationButton.setToolTipText("Remove the selected Station from the list");
deleteStationButton.setEnabled(false);
+ deleteStationButton.setMaximumSize(new java.awt.Dimension(30, 25));
+ deleteStationButton.setMinimumSize(new java.awt.Dimension(30, 25));
+ deleteStationButton.setPreferredSize(new java.awt.Dimension(30, 25));
deleteStationButton.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) {
deleteStationButtonActionPerformed(evt);
@@ -686,6 +701,7 @@ public class BBSStrategyPanel extends javax.swing.JPanel implements IViewPanel{
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 2;
gridBagConstraints.gridy = 1;
+ gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
gridBagConstraints.insets = new java.awt.Insets(2, 2, 2, 2);
stationsModPanel.add(deleteStationButton, gridBagConstraints);
@@ -721,29 +737,34 @@ public class BBSStrategyPanel extends javax.swing.JPanel implements IViewPanel{
stepsModsPanel.setMinimumSize(new java.awt.Dimension(100, 30));
stepsModsPanel.setPreferredSize(new java.awt.Dimension(100, 30));
- addStepButton.setText("Add");
- gridBagConstraints = new java.awt.GridBagConstraints();
- gridBagConstraints.gridx = 0;
- gridBagConstraints.gridy = 0;
- gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHWEST;
- gridBagConstraints.insets = new java.awt.Insets(2, 2, 2, 2);
- stepsModsPanel.add(addStepButton, gridBagConstraints);
-
- removeStepButton.setText("Delete");
+ addStepButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otbcomponents/bbs/icons/general/Add16.gif")));
+ addStepButton.setMaximumSize(new java.awt.Dimension(30, 25));
+ addStepButton.setMinimumSize(new java.awt.Dimension(30, 25));
+ addStepButton.setPreferredSize(new java.awt.Dimension(30, 25));
+ stepsModsPanel.add(addStepButton, new java.awt.GridBagConstraints());
+
+ removeStepButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otbcomponents/bbs/icons/general/Delete16.gif")));
+ removeStepButton.setMaximumSize(new java.awt.Dimension(30, 25));
+ removeStepButton.setMinimumSize(new java.awt.Dimension(30, 25));
+ removeStepButton.setPreferredSize(new java.awt.Dimension(30, 25));
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 2;
gridBagConstraints.gridy = 0;
gridBagConstraints.insets = new java.awt.Insets(2, 2, 2, 2);
stepsModsPanel.add(removeStepButton, gridBagConstraints);
- modifyStepButton.setText("Modify");
+ modifyStepButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otbcomponents/bbs/icons/general/Edit16.gif")));
+ modifyStepButton.setMaximumSize(new java.awt.Dimension(30, 25));
+ modifyStepButton.setMinimumSize(new java.awt.Dimension(30, 25));
+ modifyStepButton.setPreferredSize(new java.awt.Dimension(30, 25));
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 1;
gridBagConstraints.gridy = 0;
gridBagConstraints.insets = new java.awt.Insets(2, 2, 2, 2);
stepsModsPanel.add(modifyStepButton, gridBagConstraints);
- loadTemplateStepButton.setText("Load from template");
+ loadTemplateStepButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otbcomponents/bbs/icons/general/Open16.gif")));
+ loadTemplateStepButton.setText("Template");
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 3;
gridBagConstraints.gridy = 0;
@@ -754,16 +775,25 @@ public class BBSStrategyPanel extends javax.swing.JPanel implements IViewPanel{
stepsMoveUpDownPanel.setLayout(new java.awt.GridBagLayout());
- stepsMoveUpDownPanel.setMinimumSize(new java.awt.Dimension(50, 60));
- stepsMoveUpDownPanel.setPreferredSize(new java.awt.Dimension(50, 60));
- moveStepUpButton.setText("U");
+ stepsMoveUpDownPanel.setMinimumSize(new java.awt.Dimension(25, 60));
+ stepsMoveUpDownPanel.setOpaque(false);
+ stepsMoveUpDownPanel.setPreferredSize(new java.awt.Dimension(25, 60));
+ moveStepUpButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otbcomponents/bbs/icons/navigation/Up16.gif")));
+ moveStepUpButton.setActionCommand("Up");
+ moveStepUpButton.setMaximumSize(new java.awt.Dimension(25, 25));
+ moveStepUpButton.setMinimumSize(new java.awt.Dimension(25, 25));
+ moveStepUpButton.setPreferredSize(new java.awt.Dimension(25, 25));
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 0;
gridBagConstraints.gridy = 0;
gridBagConstraints.insets = new java.awt.Insets(2, 2, 2, 2);
stepsMoveUpDownPanel.add(moveStepUpButton, gridBagConstraints);
- moveStepDownButton.setText("D");
+ moveStepDownButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otbcomponents/bbs/icons/navigation/Down16.gif")));
+ moveStepDownButton.setActionCommand("Down");
+ moveStepDownButton.setMaximumSize(new java.awt.Dimension(25, 25));
+ moveStepDownButton.setMinimumSize(new java.awt.Dimension(25, 25));
+ moveStepDownButton.setPreferredSize(new java.awt.Dimension(25, 25));
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 0;
gridBagConstraints.gridy = 1;
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/bbs/icons/general/Add16.gif b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/bbs/icons/general/Add16.gif
new file mode 100644
index 0000000000000000000000000000000000000000..0fc47e193cf88cea7e6718e602e71f560cfad5cd
Binary files /dev/null and b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/bbs/icons/general/Add16.gif differ
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/bbs/icons/general/Delete16.gif b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/bbs/icons/general/Delete16.gif
new file mode 100644
index 0000000000000000000000000000000000000000..d9d1a338f4dea468baac6c6ad2a763b4af4d5b5e
Binary files /dev/null and b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/bbs/icons/general/Delete16.gif differ
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/bbs/icons/general/Edit16.gif b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/bbs/icons/general/Edit16.gif
new file mode 100644
index 0000000000000000000000000000000000000000..f56a27e18cb6b099a14306d402269b5fe080e49a
Binary files /dev/null and b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/bbs/icons/general/Edit16.gif differ
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/bbs/icons/general/New16.gif b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/bbs/icons/general/New16.gif
new file mode 100644
index 0000000000000000000000000000000000000000..3513dfddbb9402244b189c1886e738051f83b256
Binary files /dev/null and b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/bbs/icons/general/New16.gif differ
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/bbs/icons/general/Open16.gif b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/bbs/icons/general/Open16.gif
new file mode 100644
index 0000000000000000000000000000000000000000..fabd5676f96cf46b62fe3c91fce204c2339b64ea
Binary files /dev/null and b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/bbs/icons/general/Open16.gif differ
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/bbs/icons/general/Remove16.gif b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/bbs/icons/general/Remove16.gif
new file mode 100644
index 0000000000000000000000000000000000000000..c1b4ca11db482031fb59ece38e8f5b5798cd3663
Binary files /dev/null and b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/bbs/icons/general/Remove16.gif differ
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/bbs/icons/general/Undo16.gif b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/bbs/icons/general/Undo16.gif
new file mode 100644
index 0000000000000000000000000000000000000000..5731d2d34ed6537b7b449eec06a71468f7286ecf
Binary files /dev/null and b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/bbs/icons/general/Undo16.gif differ
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/bbs/icons/navigation/Down16.gif b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/bbs/icons/navigation/Down16.gif
new file mode 100644
index 0000000000000000000000000000000000000000..39849181f1d0b1e96de5fa17ca2a5ee5c76f9b49
Binary files /dev/null and b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/bbs/icons/navigation/Down16.gif differ
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/bbs/icons/navigation/Up16.gif b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/bbs/icons/navigation/Up16.gif
new file mode 100644
index 0000000000000000000000000000000000000000..cebe60d956c076a382dcbc1fbd4e1677b160212b
Binary files /dev/null and b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/bbs/icons/navigation/Up16.gif differ
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/bbs/stepmanagement/BBSStepExplorerPanel.form b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/bbs/stepmanagement/BBSStepExplorerPanel.form
index 5508364ce01fe1dce18d89f5f501631f3eae57fc..7b7b6398526d2ab11aa65c1099048a825534a45e 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/bbs/stepmanagement/BBSStepExplorerPanel.form
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/bbs/stepmanagement/BBSStepExplorerPanel.form
@@ -89,14 +89,26 @@
</Component>
<Component class="javax.swing.JButton" name="stepExplorerRevertButton">
<Properties>
+ <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
+ <Image iconType="3" name="/nl/astron/lofar/sas/otbcomponents/bbs/icons/general/Undo16.gif"/>
+ </Property>
<Property name="text" type="java.lang.String" value="Revert"/>
+ <Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[100, 25]"/>
+ </Property>
+ <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[100, 25]"/>
+ </Property>
+ <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[100, 25]"/>
+ </Property>
</Properties>
<Events>
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="stepExplorerRevertButtonActionPerformed"/>
</Events>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
- <AbsoluteConstraints x="20" y="620" width="80" height="-1"/>
+ <AbsoluteConstraints x="20" y="620" width="100" height="-1"/>
</Constraint>
</Constraints>
</Component>
@@ -110,7 +122,7 @@
</Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
- <AbsoluteConstraints x="350" y="230" width="160" height="120"/>
+ <AbsoluteConstraints x="360" y="230" width="160" height="120"/>
</Constraint>
</Constraints>
@@ -152,7 +164,18 @@
<SubComponents>
<Component class="javax.swing.JButton" name="addInstrumentModelButton">
<Properties>
- <Property name="text" type="java.lang.String" value="A"/>
+ <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
+ <Image iconType="3" name="/nl/astron/lofar/sas/otbcomponents/bbs/icons/general/Add16.gif"/>
+ </Property>
+ <Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[30, 25]"/>
+ </Property>
+ <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[30, 25]"/>
+ </Property>
+ <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[30, 25]"/>
+ </Property>
</Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
@@ -162,7 +185,18 @@
</Component>
<Component class="javax.swing.JButton" name="modifyInstrumentModelButton">
<Properties>
- <Property name="text" type="java.lang.String" value="M"/>
+ <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
+ <Image iconType="3" name="/nl/astron/lofar/sas/otbcomponents/bbs/icons/general/Edit16.gif"/>
+ </Property>
+ <Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[30, 25]"/>
+ </Property>
+ <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[30, 25]"/>
+ </Property>
+ <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[30, 25]"/>
+ </Property>
</Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
@@ -172,7 +206,18 @@
</Component>
<Component class="javax.swing.JButton" name="deleteInstrumentModelButton">
<Properties>
- <Property name="text" type="java.lang.String" value="D"/>
+ <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
+ <Image iconType="3" name="/nl/astron/lofar/sas/otbcomponents/bbs/icons/general/Delete16.gif"/>
+ </Property>
+ <Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[30, 25]"/>
+ </Property>
+ <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[30, 25]"/>
+ </Property>
+ <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[30, 25]"/>
+ </Property>
</Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
@@ -194,7 +239,7 @@
</Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
- <AbsoluteConstraints x="20" y="360" width="670" height="250"/>
+ <AbsoluteConstraints x="20" y="360" width="680" height="250"/>
</Constraint>
</Constraints>
@@ -479,7 +524,18 @@
<SubComponents>
<Component class="javax.swing.JButton" name="addSolvableParmButton1">
<Properties>
- <Property name="text" type="java.lang.String" value="A"/>
+ <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
+ <Image iconType="3" name="/nl/astron/lofar/sas/otbcomponents/bbs/icons/general/Add16.gif"/>
+ </Property>
+ <Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[30, 25]"/>
+ </Property>
+ <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[30, 25]"/>
+ </Property>
+ <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[30, 25]"/>
+ </Property>
</Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
@@ -489,7 +545,18 @@
</Component>
<Component class="javax.swing.JButton" name="modifySolvableParmButton1">
<Properties>
- <Property name="text" type="java.lang.String" value="M"/>
+ <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
+ <Image iconType="3" name="/nl/astron/lofar/sas/otbcomponents/bbs/icons/general/Edit16.gif"/>
+ </Property>
+ <Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[30, 25]"/>
+ </Property>
+ <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[30, 25]"/>
+ </Property>
+ <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[30, 25]"/>
+ </Property>
</Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
@@ -499,7 +566,18 @@
</Component>
<Component class="javax.swing.JButton" name="deleteSolvableParmButton1">
<Properties>
- <Property name="text" type="java.lang.String" value="D"/>
+ <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
+ <Image iconType="3" name="/nl/astron/lofar/sas/otbcomponents/bbs/icons/general/Delete16.gif"/>
+ </Property>
+ <Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[30, 25]"/>
+ </Property>
+ <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[30, 25]"/>
+ </Property>
+ <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[30, 25]"/>
+ </Property>
</Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
@@ -559,7 +637,18 @@
<SubComponents>
<Component class="javax.swing.JButton" name="addSolvableParmButton">
<Properties>
- <Property name="text" type="java.lang.String" value="A"/>
+ <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
+ <Image iconType="3" name="/nl/astron/lofar/sas/otbcomponents/bbs/icons/general/Add16.gif"/>
+ </Property>
+ <Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[30, 25]"/>
+ </Property>
+ <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[30, 25]"/>
+ </Property>
+ <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[30, 25]"/>
+ </Property>
</Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
@@ -569,7 +658,18 @@
</Component>
<Component class="javax.swing.JButton" name="modifySolvableParmButton">
<Properties>
- <Property name="text" type="java.lang.String" value="M"/>
+ <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
+ <Image iconType="3" name="/nl/astron/lofar/sas/otbcomponents/bbs/icons/general/Edit16.gif"/>
+ </Property>
+ <Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[30, 25]"/>
+ </Property>
+ <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[30, 25]"/>
+ </Property>
+ <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[30, 25]"/>
+ </Property>
</Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
@@ -579,7 +679,18 @@
</Component>
<Component class="javax.swing.JButton" name="deleteSolvableParmButton">
<Properties>
- <Property name="text" type="java.lang.String" value="D"/>
+ <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
+ <Image iconType="3" name="/nl/astron/lofar/sas/otbcomponents/bbs/icons/general/Delete16.gif"/>
+ </Property>
+ <Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[30, 25]"/>
+ </Property>
+ <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[30, 25]"/>
+ </Property>
+ <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[30, 25]"/>
+ </Property>
</Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
@@ -649,7 +760,7 @@
</Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
- <AbsoluteConstraints x="10" y="30" width="140" height="-1"/>
+ <AbsoluteConstraints x="10" y="30" width="140" height="20"/>
</Constraint>
</Constraints>
</Component>
@@ -823,7 +934,18 @@
<SubComponents>
<Component class="javax.swing.JButton" name="addBaseLineButton">
<Properties>
- <Property name="text" type="java.lang.String" value="A"/>
+ <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
+ <Image iconType="3" name="/nl/astron/lofar/sas/otbcomponents/bbs/icons/general/Add16.gif"/>
+ </Property>
+ <Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[30, 25]"/>
+ </Property>
+ <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[30, 25]"/>
+ </Property>
+ <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[30, 25]"/>
+ </Property>
</Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
@@ -833,7 +955,18 @@
</Component>
<Component class="javax.swing.JButton" name="modifyBaseLineButton">
<Properties>
- <Property name="text" type="java.lang.String" value="M"/>
+ <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
+ <Image iconType="3" name="/nl/astron/lofar/sas/otbcomponents/bbs/icons/general/Edit16.gif"/>
+ </Property>
+ <Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[30, 25]"/>
+ </Property>
+ <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[30, 25]"/>
+ </Property>
+ <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[30, 25]"/>
+ </Property>
</Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
@@ -843,7 +976,18 @@
</Component>
<Component class="javax.swing.JButton" name="deleteBaseLineButton">
<Properties>
- <Property name="text" type="java.lang.String" value="D"/>
+ <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
+ <Image iconType="3" name="/nl/astron/lofar/sas/otbcomponents/bbs/icons/general/Delete16.gif"/>
+ </Property>
+ <Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[30, 25]"/>
+ </Property>
+ <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[30, 25]"/>
+ </Property>
+ <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[30, 25]"/>
+ </Property>
</Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
@@ -886,7 +1030,7 @@
</Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
- <AbsoluteConstraints x="350" y="40" width="340" height="180"/>
+ <AbsoluteConstraints x="350" y="40" width="350" height="180"/>
</Constraint>
</Constraints>
@@ -904,7 +1048,7 @@
</Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
- <AbsoluteConstraints x="10" y="20" width="-1" height="150"/>
+ <AbsoluteConstraints x="10" y="20" width="160" height="150"/>
</Constraint>
</Constraints>
@@ -921,7 +1065,18 @@
<SubComponents>
<Component class="javax.swing.JButton" name="addSourceButton1">
<Properties>
- <Property name="text" type="java.lang.String" value="A"/>
+ <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
+ <Image iconType="3" name="/nl/astron/lofar/sas/otbcomponents/bbs/icons/general/Add16.gif"/>
+ </Property>
+ <Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[30, 25]"/>
+ </Property>
+ <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[30, 25]"/>
+ </Property>
+ <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[30, 25]"/>
+ </Property>
</Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
@@ -931,7 +1086,18 @@
</Component>
<Component class="javax.swing.JButton" name="modifySourceButton1">
<Properties>
- <Property name="text" type="java.lang.String" value="M"/>
+ <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
+ <Image iconType="3" name="/nl/astron/lofar/sas/otbcomponents/bbs/icons/general/Edit16.gif"/>
+ </Property>
+ <Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[30, 25]"/>
+ </Property>
+ <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[30, 25]"/>
+ </Property>
+ <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[30, 25]"/>
+ </Property>
</Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
@@ -941,7 +1107,18 @@
</Component>
<Component class="javax.swing.JButton" name="deleteSourceButton2">
<Properties>
- <Property name="text" type="java.lang.String" value="D"/>
+ <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
+ <Image iconType="3" name="/nl/astron/lofar/sas/otbcomponents/bbs/icons/general/Delete16.gif"/>
+ </Property>
+ <Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[30, 25]"/>
+ </Property>
+ <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[30, 25]"/>
+ </Property>
+ <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[30, 25]"/>
+ </Property>
</Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
@@ -989,7 +1166,7 @@
</Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
- <AbsoluteConstraints x="180" y="20" width="150" height="150"/>
+ <AbsoluteConstraints x="180" y="20" width="160" height="150"/>
</Constraint>
</Constraints>
@@ -1006,7 +1183,18 @@
<SubComponents>
<Component class="javax.swing.JButton" name="addSourceButton">
<Properties>
- <Property name="text" type="java.lang.String" value="A"/>
+ <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
+ <Image iconType="3" name="/nl/astron/lofar/sas/otbcomponents/bbs/icons/general/Add16.gif"/>
+ </Property>
+ <Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[30, 25]"/>
+ </Property>
+ <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[30, 25]"/>
+ </Property>
+ <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[30, 25]"/>
+ </Property>
</Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
@@ -1016,7 +1204,18 @@
</Component>
<Component class="javax.swing.JButton" name="modifySourceButton">
<Properties>
- <Property name="text" type="java.lang.String" value="M"/>
+ <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
+ <Image iconType="3" name="/nl/astron/lofar/sas/otbcomponents/bbs/icons/general/Edit16.gif"/>
+ </Property>
+ <Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[30, 25]"/>
+ </Property>
+ <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[30, 25]"/>
+ </Property>
+ <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[30, 25]"/>
+ </Property>
</Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
@@ -1026,7 +1225,18 @@
</Component>
<Component class="javax.swing.JButton" name="deleteSourceButton1">
<Properties>
- <Property name="text" type="java.lang.String" value="D"/>
+ <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
+ <Image iconType="3" name="/nl/astron/lofar/sas/otbcomponents/bbs/icons/general/Delete16.gif"/>
+ </Property>
+ <Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[30, 25]"/>
+ </Property>
+ <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[30, 25]"/>
+ </Property>
+ <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[30, 25]"/>
+ </Property>
</Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/bbs/stepmanagement/BBSStepExplorerPanel.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/bbs/stepmanagement/BBSStepExplorerPanel.java
index 8b5f7ae891965d5a99ac9f2ca3b2e96d889f9aa6..5b83ac97fb8830dd354e63d262dcfd4bbd29d3df 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/bbs/stepmanagement/BBSStepExplorerPanel.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/bbs/stepmanagement/BBSStepExplorerPanel.java
@@ -495,14 +495,18 @@ public class BBSStepExplorerPanel extends javax.swing.JPanel implements IViewPan
exploreNextStepButton.setText("View next step");
stepExplorerPanel.add(exploreNextStepButton, new org.netbeans.lib.awtextra.AbsoluteConstraints(540, 10, -1, -1));
+ stepExplorerRevertButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otbcomponents/bbs/icons/general/Undo16.gif")));
stepExplorerRevertButton.setText("Revert");
+ stepExplorerRevertButton.setMaximumSize(new java.awt.Dimension(100, 25));
+ stepExplorerRevertButton.setMinimumSize(new java.awt.Dimension(100, 25));
+ stepExplorerRevertButton.setPreferredSize(new java.awt.Dimension(100, 25));
stepExplorerRevertButton.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) {
stepExplorerRevertButtonActionPerformed(evt);
}
});
- stepExplorerPanel.add(stepExplorerRevertButton, new org.netbeans.lib.awtextra.AbsoluteConstraints(20, 620, 80, -1));
+ stepExplorerPanel.add(stepExplorerRevertButton, new org.netbeans.lib.awtextra.AbsoluteConstraints(20, 620, 100, -1));
stepExplorerInstrumentModelPanel.setLayout(new java.awt.BorderLayout());
@@ -518,24 +522,33 @@ public class BBSStepExplorerPanel extends javax.swing.JPanel implements IViewPan
stepExplorerInstrumentModelModsPanel.setLayout(new java.awt.GridBagLayout());
- addInstrumentModelButton.setText("A");
+ addInstrumentModelButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otbcomponents/bbs/icons/general/Add16.gif")));
+ addInstrumentModelButton.setMaximumSize(new java.awt.Dimension(30, 25));
+ addInstrumentModelButton.setMinimumSize(new java.awt.Dimension(30, 25));
+ addInstrumentModelButton.setPreferredSize(new java.awt.Dimension(30, 25));
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.insets = new java.awt.Insets(2, 2, 2, 2);
stepExplorerInstrumentModelModsPanel.add(addInstrumentModelButton, gridBagConstraints);
- modifyInstrumentModelButton.setText("M");
+ modifyInstrumentModelButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otbcomponents/bbs/icons/general/Edit16.gif")));
+ modifyInstrumentModelButton.setMaximumSize(new java.awt.Dimension(30, 25));
+ modifyInstrumentModelButton.setMinimumSize(new java.awt.Dimension(30, 25));
+ modifyInstrumentModelButton.setPreferredSize(new java.awt.Dimension(30, 25));
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.insets = new java.awt.Insets(2, 2, 2, 2);
stepExplorerInstrumentModelModsPanel.add(modifyInstrumentModelButton, gridBagConstraints);
- deleteInstrumentModelButton.setText("D");
+ deleteInstrumentModelButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otbcomponents/bbs/icons/general/Delete16.gif")));
+ deleteInstrumentModelButton.setMaximumSize(new java.awt.Dimension(30, 25));
+ deleteInstrumentModelButton.setMinimumSize(new java.awt.Dimension(30, 25));
+ deleteInstrumentModelButton.setPreferredSize(new java.awt.Dimension(30, 25));
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.insets = new java.awt.Insets(2, 2, 2, 2);
stepExplorerInstrumentModelModsPanel.add(deleteInstrumentModelButton, gridBagConstraints);
stepExplorerInstrumentModelPanel.add(stepExplorerInstrumentModelModsPanel, java.awt.BorderLayout.SOUTH);
- stepExplorerPanel.add(stepExplorerInstrumentModelPanel, new org.netbeans.lib.awtextra.AbsoluteConstraints(350, 230, 160, 120));
+ stepExplorerPanel.add(stepExplorerInstrumentModelPanel, new org.netbeans.lib.awtextra.AbsoluteConstraints(360, 230, 160, 120));
stepExplorerOperationPanel.setLayout(new java.awt.BorderLayout());
@@ -617,17 +630,26 @@ public class BBSStepExplorerPanel extends javax.swing.JPanel implements IViewPan
seOperationAttributeGroup3.setBorder(javax.swing.BorderFactory.createTitledBorder("Excluded"));
stepExplorerSourcesModsPanel2.setLayout(new java.awt.GridBagLayout());
- addSolvableParmButton1.setText("A");
+ addSolvableParmButton1.setIcon(new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otbcomponents/bbs/icons/general/Add16.gif")));
+ addSolvableParmButton1.setMaximumSize(new java.awt.Dimension(30, 25));
+ addSolvableParmButton1.setMinimumSize(new java.awt.Dimension(30, 25));
+ addSolvableParmButton1.setPreferredSize(new java.awt.Dimension(30, 25));
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.insets = new java.awt.Insets(2, 2, 2, 2);
stepExplorerSourcesModsPanel2.add(addSolvableParmButton1, gridBagConstraints);
- modifySolvableParmButton1.setText("M");
+ modifySolvableParmButton1.setIcon(new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otbcomponents/bbs/icons/general/Edit16.gif")));
+ modifySolvableParmButton1.setMaximumSize(new java.awt.Dimension(30, 25));
+ modifySolvableParmButton1.setMinimumSize(new java.awt.Dimension(30, 25));
+ modifySolvableParmButton1.setPreferredSize(new java.awt.Dimension(30, 25));
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.insets = new java.awt.Insets(2, 2, 2, 2);
stepExplorerSourcesModsPanel2.add(modifySolvableParmButton1, gridBagConstraints);
- deleteSolvableParmButton1.setText("D");
+ deleteSolvableParmButton1.setIcon(new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otbcomponents/bbs/icons/general/Delete16.gif")));
+ deleteSolvableParmButton1.setMaximumSize(new java.awt.Dimension(30, 25));
+ deleteSolvableParmButton1.setMinimumSize(new java.awt.Dimension(30, 25));
+ deleteSolvableParmButton1.setPreferredSize(new java.awt.Dimension(30, 25));
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.insets = new java.awt.Insets(2, 2, 2, 2);
stepExplorerSourcesModsPanel2.add(deleteSolvableParmButton1, gridBagConstraints);
@@ -645,17 +667,26 @@ public class BBSStepExplorerPanel extends javax.swing.JPanel implements IViewPan
seOperationAttributeGroup2.setBorder(javax.swing.BorderFactory.createTitledBorder("Solvable"));
seOperationAttributeSolvableParmPanel.setLayout(new java.awt.GridBagLayout());
- addSolvableParmButton.setText("A");
+ addSolvableParmButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otbcomponents/bbs/icons/general/Add16.gif")));
+ addSolvableParmButton.setMaximumSize(new java.awt.Dimension(30, 25));
+ addSolvableParmButton.setMinimumSize(new java.awt.Dimension(30, 25));
+ addSolvableParmButton.setPreferredSize(new java.awt.Dimension(30, 25));
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.insets = new java.awt.Insets(2, 2, 2, 2);
seOperationAttributeSolvableParmPanel.add(addSolvableParmButton, gridBagConstraints);
- modifySolvableParmButton.setText("M");
+ modifySolvableParmButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otbcomponents/bbs/icons/general/Edit16.gif")));
+ modifySolvableParmButton.setMaximumSize(new java.awt.Dimension(30, 25));
+ modifySolvableParmButton.setMinimumSize(new java.awt.Dimension(30, 25));
+ modifySolvableParmButton.setPreferredSize(new java.awt.Dimension(30, 25));
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.insets = new java.awt.Insets(2, 2, 2, 2);
seOperationAttributeSolvableParmPanel.add(modifySolvableParmButton, gridBagConstraints);
- deleteSolvableParmButton.setText("D");
+ deleteSolvableParmButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otbcomponents/bbs/icons/general/Delete16.gif")));
+ deleteSolvableParmButton.setMaximumSize(new java.awt.Dimension(30, 25));
+ deleteSolvableParmButton.setMinimumSize(new java.awt.Dimension(30, 25));
+ deleteSolvableParmButton.setPreferredSize(new java.awt.Dimension(30, 25));
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.insets = new java.awt.Insets(2, 2, 2, 2);
seOperationAttributeSolvableParmPanel.add(deleteSolvableParmButton, gridBagConstraints);
@@ -681,13 +712,13 @@ public class BBSStepExplorerPanel extends javax.swing.JPanel implements IViewPan
stepExplorerOperationPanel.add(stepExplorerOperationAttributesPanel, java.awt.BorderLayout.CENTER);
- stepExplorerPanel.add(stepExplorerOperationPanel, new org.netbeans.lib.awtextra.AbsoluteConstraints(20, 360, 670, 250));
+ stepExplorerPanel.add(stepExplorerOperationPanel, new org.netbeans.lib.awtextra.AbsoluteConstraints(20, 360, 680, 250));
stepExplorerOutputDataPanel.setLayout(new org.netbeans.lib.awtextra.AbsoluteLayout());
stepExplorerOutputDataPanel.setBorder(javax.swing.BorderFactory.createTitledBorder("Output Data Column"));
stepExplorerOutputDataText.setText("OUTDATA2");
- stepExplorerOutputDataPanel.add(stepExplorerOutputDataText, new org.netbeans.lib.awtextra.AbsoluteConstraints(10, 30, 140, -1));
+ stepExplorerOutputDataPanel.add(stepExplorerOutputDataText, new org.netbeans.lib.awtextra.AbsoluteConstraints(10, 30, 140, 20));
stepExplorerPanel.add(stepExplorerOutputDataPanel, new org.netbeans.lib.awtextra.AbsoluteConstraints(530, 230, 160, 120));
@@ -757,7 +788,10 @@ public class BBSStepExplorerPanel extends javax.swing.JPanel implements IViewPan
baselineModsPanel.setLayout(new java.awt.GridBagLayout());
- addBaseLineButton.setText("A");
+ addBaseLineButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otbcomponents/bbs/icons/general/Add16.gif")));
+ addBaseLineButton.setMaximumSize(new java.awt.Dimension(30, 25));
+ addBaseLineButton.setMinimumSize(new java.awt.Dimension(30, 25));
+ addBaseLineButton.setPreferredSize(new java.awt.Dimension(30, 25));
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 1;
gridBagConstraints.gridy = 0;
@@ -766,7 +800,10 @@ public class BBSStepExplorerPanel extends javax.swing.JPanel implements IViewPan
gridBagConstraints.insets = new java.awt.Insets(2, 2, 2, 2);
baselineModsPanel.add(addBaseLineButton, gridBagConstraints);
- modifyBaseLineButton.setText("M");
+ modifyBaseLineButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otbcomponents/bbs/icons/general/Edit16.gif")));
+ modifyBaseLineButton.setMaximumSize(new java.awt.Dimension(30, 25));
+ modifyBaseLineButton.setMinimumSize(new java.awt.Dimension(30, 25));
+ modifyBaseLineButton.setPreferredSize(new java.awt.Dimension(30, 25));
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 2;
gridBagConstraints.gridy = 0;
@@ -774,7 +811,10 @@ public class BBSStepExplorerPanel extends javax.swing.JPanel implements IViewPan
gridBagConstraints.insets = new java.awt.Insets(2, 2, 2, 2);
baselineModsPanel.add(modifyBaseLineButton, gridBagConstraints);
- deleteBaseLineButton.setText("D");
+ deleteBaseLineButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otbcomponents/bbs/icons/general/Delete16.gif")));
+ deleteBaseLineButton.setMaximumSize(new java.awt.Dimension(30, 25));
+ deleteBaseLineButton.setMinimumSize(new java.awt.Dimension(30, 25));
+ deleteBaseLineButton.setPreferredSize(new java.awt.Dimension(30, 25));
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 3;
gridBagConstraints.gridy = 0;
@@ -812,17 +852,26 @@ public class BBSStepExplorerPanel extends javax.swing.JPanel implements IViewPan
stepExplorerSourcesPanel1.setBorder(javax.swing.BorderFactory.createTitledBorder("Predict"));
stepExplorerSourcesModsPanel1.setLayout(new java.awt.GridBagLayout());
- addSourceButton1.setText("A");
+ addSourceButton1.setIcon(new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otbcomponents/bbs/icons/general/Add16.gif")));
+ addSourceButton1.setMaximumSize(new java.awt.Dimension(30, 25));
+ addSourceButton1.setMinimumSize(new java.awt.Dimension(30, 25));
+ addSourceButton1.setPreferredSize(new java.awt.Dimension(30, 25));
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.insets = new java.awt.Insets(2, 2, 2, 2);
stepExplorerSourcesModsPanel1.add(addSourceButton1, gridBagConstraints);
- modifySourceButton1.setText("M");
+ modifySourceButton1.setIcon(new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otbcomponents/bbs/icons/general/Edit16.gif")));
+ modifySourceButton1.setMaximumSize(new java.awt.Dimension(30, 25));
+ modifySourceButton1.setMinimumSize(new java.awt.Dimension(30, 25));
+ modifySourceButton1.setPreferredSize(new java.awt.Dimension(30, 25));
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.insets = new java.awt.Insets(2, 2, 2, 2);
stepExplorerSourcesModsPanel1.add(modifySourceButton1, gridBagConstraints);
- deleteSourceButton2.setText("D");
+ deleteSourceButton2.setIcon(new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otbcomponents/bbs/icons/general/Delete16.gif")));
+ deleteSourceButton2.setMaximumSize(new java.awt.Dimension(30, 25));
+ deleteSourceButton2.setMinimumSize(new java.awt.Dimension(30, 25));
+ deleteSourceButton2.setPreferredSize(new java.awt.Dimension(30, 25));
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.insets = new java.awt.Insets(2, 2, 2, 2);
stepExplorerSourcesModsPanel1.add(deleteSourceButton2, gridBagConstraints);
@@ -838,24 +887,33 @@ public class BBSStepExplorerPanel extends javax.swing.JPanel implements IViewPan
stepExplorerSourcesPanel1.add(stepExplorerSourcesScrollPane1, java.awt.BorderLayout.CENTER);
- stepExplorerGlobalSources.add(stepExplorerSourcesPanel1, new org.netbeans.lib.awtextra.AbsoluteConstraints(10, 20, -1, 150));
+ stepExplorerGlobalSources.add(stepExplorerSourcesPanel1, new org.netbeans.lib.awtextra.AbsoluteConstraints(10, 20, 160, 150));
stepExplorerSourcesPanel.setLayout(new java.awt.BorderLayout());
stepExplorerSourcesPanel.setBorder(javax.swing.BorderFactory.createTitledBorder("Peel"));
stepExplorerSourcesModsPanel.setLayout(new java.awt.GridBagLayout());
- addSourceButton.setText("A");
+ addSourceButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otbcomponents/bbs/icons/general/Add16.gif")));
+ addSourceButton.setMaximumSize(new java.awt.Dimension(30, 25));
+ addSourceButton.setMinimumSize(new java.awt.Dimension(30, 25));
+ addSourceButton.setPreferredSize(new java.awt.Dimension(30, 25));
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.insets = new java.awt.Insets(2, 2, 2, 2);
stepExplorerSourcesModsPanel.add(addSourceButton, gridBagConstraints);
- modifySourceButton.setText("M");
+ modifySourceButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otbcomponents/bbs/icons/general/Edit16.gif")));
+ modifySourceButton.setMaximumSize(new java.awt.Dimension(30, 25));
+ modifySourceButton.setMinimumSize(new java.awt.Dimension(30, 25));
+ modifySourceButton.setPreferredSize(new java.awt.Dimension(30, 25));
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.insets = new java.awt.Insets(2, 2, 2, 2);
stepExplorerSourcesModsPanel.add(modifySourceButton, gridBagConstraints);
- deleteSourceButton1.setText("D");
+ deleteSourceButton1.setIcon(new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otbcomponents/bbs/icons/general/Delete16.gif")));
+ deleteSourceButton1.setMaximumSize(new java.awt.Dimension(30, 25));
+ deleteSourceButton1.setMinimumSize(new java.awt.Dimension(30, 25));
+ deleteSourceButton1.setPreferredSize(new java.awt.Dimension(30, 25));
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.insets = new java.awt.Insets(2, 2, 2, 2);
stepExplorerSourcesModsPanel.add(deleteSourceButton1, gridBagConstraints);
@@ -871,9 +929,9 @@ public class BBSStepExplorerPanel extends javax.swing.JPanel implements IViewPan
stepExplorerSourcesPanel.add(stepExplorerSourcesScrollPane, java.awt.BorderLayout.CENTER);
- stepExplorerGlobalSources.add(stepExplorerSourcesPanel, new org.netbeans.lib.awtextra.AbsoluteConstraints(180, 20, 150, 150));
+ stepExplorerGlobalSources.add(stepExplorerSourcesPanel, new org.netbeans.lib.awtextra.AbsoluteConstraints(180, 20, 160, 150));
- stepExplorerPanel.add(stepExplorerGlobalSources, new org.netbeans.lib.awtextra.AbsoluteConstraints(350, 40, 340, 180));
+ stepExplorerPanel.add(stepExplorerGlobalSources, new org.netbeans.lib.awtextra.AbsoluteConstraints(350, 40, 350, 180));
stepExplorerScrollPanel.setViewportView(stepExplorerPanel);