From 8f476872dfeb263653e37f136cc554f34e16508b Mon Sep 17 00:00:00 2001
From: pompert <sdos@astron.nl>
Date: Wed, 19 Jul 2006 12:23:53 +0000
Subject: [PATCH] 791 Commit to prepare for move to subpackage bbs.

---
 .../lofar/sas/otbcomponents/BBSPanel.form     | 570 +-----------------
 .../lofar/sas/otbcomponents/BBSPanel.java     | 406 ++-----------
 .../lofar/sas/otbcomponents/bbs/BBSPanel.form | 570 +-----------------
 .../lofar/sas/otbcomponents/bbs/BBSPanel.java | 406 ++-----------
 4 files changed, 102 insertions(+), 1850 deletions(-)

diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/BBSPanel.form b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/BBSPanel.form
index 9988d0ae706..74571868cae 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/BBSPanel.form
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/BBSPanel.form
@@ -275,22 +275,29 @@
                 </Constraint>
               </Constraints>
             </Component>
-            <Component class="javax.swing.JButton" name="configurationSaveButton">
+            <Component class="javax.swing.JTextField" name="BBSDatasetDeRefText">
               <Properties>
-                <Property name="text" type="java.lang.String" value="Save"/>
+                <Property name="editable" type="boolean" value="false"/>
+                <Property name="toolTipText" type="java.lang.String" value="Dereferenced and actually used value."/>
+                <Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+                  <Dimension value="[440, 19]"/>
+                </Property>
+                <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+                  <Dimension value="[440, 19]"/>
+                </Property>
+                <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+                  <Dimension value="[440, 19]"/>
+                </Property>
               </Properties>
-              <Events>
-                <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="configurationSaveButtonActionPerformed"/>
-              </Events>
               <Constraints>
                 <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
-                  <AbsoluteConstraints x="290" y="330" width="-1" height="-1"/>
+                  <AbsoluteConstraints x="360" y="30" width="180" height="-1"/>
                 </Constraint>
               </Constraints>
             </Component>
           </SubComponents>
         </Container>
-        <Container class="javax.swing.JPanel" name="BBSStrategyPanel">
+        <Component class="nl.astron.lofar.sas.otbcomponents.bbs.BBSStrategyPanel" name="BBSStrategyPanel">
           <Constraints>
             <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JTabbedPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JTabbedPaneSupportLayout$JTabbedPaneConstraintsDescription">
               <JTabbedPaneConstraints tabName="Strategy">
@@ -298,554 +305,7 @@
               </JTabbedPaneConstraints>
             </Constraint>
           </Constraints>
-
-          <Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout"/>
-          <SubComponents>
-            <Container class="javax.swing.JScrollPane" name="strategyScrollPane">
-              <Constraints>
-                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription">
-                  <BorderConstraints direction="Center"/>
-                </Constraint>
-              </Constraints>
-
-              <Layout class="org.netbeans.modules.form.compat2.layouts.support.JScrollPaneSupportLayout"/>
-              <SubComponents>
-                <Container class="javax.swing.JPanel" name="strategyPanel">
-
-                  <Layout class="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout">
-                    <Property name="useNullLayout" type="boolean" value="false"/>
-                  </Layout>
-                  <SubComponents>
-                    <Component class="javax.swing.JLabel" name="inputDataLabel">
-                      <Properties>
-                        <Property name="text" type="java.lang.String" value="Input Data Column:"/>
-                      </Properties>
-                      <Constraints>
-                        <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
-                          <AbsoluteConstraints x="30" y="30" width="-1" height="-1"/>
-                        </Constraint>
-                      </Constraints>
-                    </Component>
-                    <Component class="javax.swing.JTextField" name="inputDataText">
-                      <Properties>
-                        <Property name="toolTipText" type="java.lang.String" value="Name of the column in the measurement set that contains the input data"/>
-                      </Properties>
-                      <Constraints>
-                        <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
-                          <AbsoluteConstraints x="160" y="30" width="120" height="-1"/>
-                        </Constraint>
-                      </Constraints>
-                    </Component>
-                    <Component class="javax.swing.JButton" name="strategyRevertButton">
-                      <Properties>
-                        <Property name="text" type="java.lang.String" value="Revert"/>
-                      </Properties>
-                      <Events>
-                        <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="strategyRevertButtonActionPerformed"/>
-                      </Events>
-                      <Constraints>
-                        <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
-                          <AbsoluteConstraints x="30" y="500" width="-1" height="-1"/>
-                        </Constraint>
-                      </Constraints>
-                    </Component>
-                    <Container class="javax.swing.JPanel" name="stationsPanel">
-                      <Properties>
-                        <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
-                          <Border info="org.netbeans.modules.form.compat2.border.TitledBorderInfo">
-                            <TitledBorder title="Station Names"/>
-                          </Border>
-                        </Property>
-                        <Property name="toolTipText" type="java.lang.String" value="Identifiers of the participating stations."/>
-                      </Properties>
-                      <Constraints>
-                        <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
-                          <AbsoluteConstraints x="20" y="150" width="220" height="330"/>
-                        </Constraint>
-                      </Constraints>
-
-                      <Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout"/>
-                      <SubComponents>
-                        <Container class="javax.swing.JScrollPane" name="stationsScrollPane">
-                          <AuxValues>
-                            <AuxValue name="autoScrollPane" type="java.lang.Boolean" value="true"/>
-                          </AuxValues>
-                          <Constraints>
-                            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription">
-                              <BorderConstraints direction="Center"/>
-                            </Constraint>
-                          </Constraints>
-
-                          <Layout class="org.netbeans.modules.form.compat2.layouts.support.JScrollPaneSupportLayout"/>
-                          <SubComponents>
-                            <Component class="javax.swing.JList" name="stationsList">
-                              <Properties>
-                                <Property name="model" type="javax.swing.ListModel" editor="org.netbeans.modules.form.editors2.ListModelEditor">
-                                  <StringArray count="5">
-                                    <StringItem index="0" value="1"/>
-                                    <StringItem index="1" value="2"/>
-                                    <StringItem index="2" value="3"/>
-                                    <StringItem index="3" value="4"/>
-                                    <StringItem index="4" value="5"/>
-                                  </StringArray>
-                                </Property>
-                                <Property name="toolTipText" type="java.lang.String" value="Identifiers of the participating stations."/>
-                              </Properties>
-                            </Component>
-                          </SubComponents>
-                        </Container>
-                        <Container class="javax.swing.JPanel" name="stationsModPanel">
-                          <Constraints>
-                            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription">
-                              <BorderConstraints direction="South"/>
-                            </Constraint>
-                          </Constraints>
-
-                          <Layout class="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout"/>
-                          <SubComponents>
-                            <Component class="javax.swing.JCheckBox" name="stationsUseAllCheckbox">
-                              <Properties>
-                                <Property name="text" type="java.lang.String" value="Use all stations"/>
-                                <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
-                                  <Border info="org.netbeans.modules.form.compat2.border.EmptyBorderInfo">
-                                    <EmptyBorder bottom="0" left="0" right="0" top="0"/>
-                                  </Border>
-                                </Property>
-                                <Property name="margin" type="java.awt.Insets" editor="org.netbeans.beaninfo.editors.InsetsEditor">
-                                  <Insets value="[0, 0, 0, 0]"/>
-                                </Property>
-                              </Properties>
-                              <Events>
-                                <EventHandler event="stateChanged" listener="javax.swing.event.ChangeListener" parameters="javax.swing.event.ChangeEvent" handler="stationsUseAllCheckboxStateChanged"/>
-                              </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="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="A"/>
-                              </Properties>
-                              <Constraints>
-                                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
-                                  <GridBagConstraints gridX="-1" gridY="-1" gridWidth="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"/>
-                                </Constraint>
-                              </Constraints>
-                            </Component>
-                            <Component class="javax.swing.JButton" name="deleteStationButton">
-                              <Properties>
-                                <Property name="text" type="java.lang.String" value="D"/>
-                              </Properties>
-                              <Constraints>
-                                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
-                                  <GridBagConstraints gridX="-1" gridY="-1" gridWidth="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"/>
-                                </Constraint>
-                              </Constraints>
-                            </Component>
-                          </SubComponents>
-                        </Container>
-                      </SubComponents>
-                    </Container>
-                    <Container class="javax.swing.JPanel" name="stepsPanel">
-                      <Properties>
-                        <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
-                          <Border info="org.netbeans.modules.form.compat2.border.TitledBorderInfo">
-                            <TitledBorder title="Steps"/>
-                          </Border>
-                        </Property>
-                        <Property name="toolTipText" type="java.lang.String" value="The names of the steps that compose the strategy."/>
-                        <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
-                          <Dimension value="[100, 100]"/>
-                        </Property>
-                      </Properties>
-                      <Constraints>
-                        <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
-                          <AbsoluteConstraints x="250" y="150" width="400" height="330"/>
-                        </Constraint>
-                      </Constraints>
-
-                      <Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout"/>
-                      <SubComponents>
-                        <Container class="javax.swing.JScrollPane" name="stepsScrollPane">
-                          <AuxValues>
-                            <AuxValue name="autoScrollPane" type="java.lang.Boolean" value="true"/>
-                          </AuxValues>
-                          <Constraints>
-                            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription">
-                              <BorderConstraints direction="Center"/>
-                            </Constraint>
-                          </Constraints>
-
-                          <Layout class="org.netbeans.modules.form.compat2.layouts.support.JScrollPaneSupportLayout"/>
-                          <SubComponents>
-                            <Component class="javax.swing.JTree" name="stepsTree">
-                              <Properties>
-                                <Property name="toolTipText" type="java.lang.String" value="The names of the steps that compose the strategy."/>
-                              </Properties>
-                            </Component>
-                          </SubComponents>
-                        </Container>
-                        <Container class="javax.swing.JPanel" name="stepsModsPanel">
-                          <Properties>
-                            <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
-                              <Dimension value="[100, 30]"/>
-                            </Property>
-                            <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
-                              <Dimension value="[100, 30]"/>
-                            </Property>
-                          </Properties>
-                          <Constraints>
-                            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription">
-                              <BorderConstraints direction="South"/>
-                            </Constraint>
-                          </Constraints>
-
-                          <Layout class="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout"/>
-                          <SubComponents>
-                            <Component class="javax.swing.JButton" name="addStepButton">
-                              <Properties>
-                                <Property name="text" type="java.lang.String" value="Add"/>
-                              </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"/>
-                                </Constraint>
-                              </Constraints>
-                            </Component>
-                            <Component class="javax.swing.JButton" name="removeStepButton">
-                              <Properties>
-                                <Property name="text" type="java.lang.String" value="Delete"/>
-                              </Properties>
-                              <Constraints>
-                                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
-                                  <GridBagConstraints gridX="2" gridY="0" 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"/>
-                                </Constraint>
-                              </Constraints>
-                            </Component>
-                            <Component class="javax.swing.JButton" name="modifyStepButton">
-                              <Properties>
-                                <Property name="text" type="java.lang.String" value="Modify"/>
-                              </Properties>
-                              <Constraints>
-                                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
-                                  <GridBagConstraints gridX="1" gridY="0" 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"/>
-                                </Constraint>
-                              </Constraints>
-                            </Component>
-                            <Component class="javax.swing.JButton" name="loadTemplateStepButton">
-                              <Properties>
-                                <Property name="text" type="java.lang.String" value="Load from template"/>
-                              </Properties>
-                              <Constraints>
-                                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
-                                  <GridBagConstraints gridX="3" gridY="0" 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"/>
-                                </Constraint>
-                              </Constraints>
-                            </Component>
-                          </SubComponents>
-                        </Container>
-                        <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]"/>
-                            </Property>
-                            <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
-                              <Dimension value="[50, 60]"/>
-                            </Property>
-                          </Properties>
-                          <Constraints>
-                            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription">
-                              <BorderConstraints direction="East"/>
-                            </Constraint>
-                          </Constraints>
-
-                          <Layout class="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout"/>
-                          <SubComponents>
-                            <Component class="javax.swing.JButton" name="moveStepUpButton">
-                              <Properties>
-                                <Property name="text" type="java.lang.String" value="U"/>
-                              </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="10" weightX="0.0" weightY="0.0"/>
-                                </Constraint>
-                              </Constraints>
-                            </Component>
-                            <Component class="javax.swing.JButton" name="moveStepDownButton">
-                              <Properties>
-                                <Property name="text" type="java.lang.String" value="D"/>
-                              </Properties>
-                              <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="10" weightX="0.0" weightY="0.0"/>
-                                </Constraint>
-                              </Constraints>
-                            </Component>
-                          </SubComponents>
-                        </Container>
-                      </SubComponents>
-                    </Container>
-                    <Container class="javax.swing.JPanel" name="correlationPanel">
-                      <Properties>
-                        <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
-                          <Border info="org.netbeans.modules.form.compat2.border.TitledBorderInfo">
-                            <TitledBorder title="Correlation"/>
-                          </Border>
-                        </Property>
-                      </Properties>
-                      <Constraints>
-                        <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
-                          <AbsoluteConstraints x="480" y="20" width="170" height="120"/>
-                        </Constraint>
-                      </Constraints>
-
-                      <Layout class="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout">
-                        <Property name="useNullLayout" type="boolean" value="false"/>
-                      </Layout>
-                      <SubComponents>
-                        <Component class="javax.swing.JLabel" name="correlationSelectionLabel">
-                          <Properties>
-                            <Property name="text" type="java.lang.String" value="Selection :"/>
-                          </Properties>
-                          <Constraints>
-                            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
-                              <AbsoluteConstraints x="20" y="30" width="-1" height="-1"/>
-                            </Constraint>
-                          </Constraints>
-                        </Component>
-                        <Component class="javax.swing.JComboBox" name="correlationSelectionBox">
-                          <Properties>
-                            <Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor">
-                              <StringArray count="3">
-                                <StringItem index="0" value="AUTO"/>
-                                <StringItem index="1" value="CROSS"/>
-                                <StringItem index="2" value="ALL"/>
-                              </StringArray>
-                            </Property>
-                            <Property name="toolTipText" type="java.lang.String" value="Station correlations to use.&#xa;&#xa;AUTO: Use only correlations of each station with itself (i.e. no base lines).Not yet implemented.&#xa;CROSS: Use only correlations between stations (i.e. base lines).&#xa;ALL: Use both AUTO and CROSS correlations."/>
-                          </Properties>
-                          <Constraints>
-                            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
-                              <AbsoluteConstraints x="20" y="50" width="80" height="-1"/>
-                            </Constraint>
-                          </Constraints>
-                        </Component>
-                        <Component class="javax.swing.JLabel" name="correlationTypeLabel">
-                          <Properties>
-                            <Property name="text" type="java.lang.String" value="Type :"/>
-                          </Properties>
-                          <Constraints>
-                            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
-                              <AbsoluteConstraints x="110" y="10" width="-1" height="-1"/>
-                            </Constraint>
-                          </Constraints>
-                        </Component>
-                        <Container class="javax.swing.JScrollPane" name="correlationTypeScrollPane">
-                          <AuxValues>
-                            <AuxValue name="autoScrollPane" type="java.lang.Boolean" value="true"/>
-                          </AuxValues>
-                          <Constraints>
-                            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
-                              <AbsoluteConstraints x="110" y="30" width="50" height="80"/>
-                            </Constraint>
-                          </Constraints>
-
-                          <Layout class="org.netbeans.modules.form.compat2.layouts.support.JScrollPaneSupportLayout"/>
-                          <SubComponents>
-                            <Component class="javax.swing.JList" name="correlationTypeList">
-                              <Properties>
-                                <Property name="model" type="javax.swing.ListModel" editor="org.netbeans.modules.form.editors2.ListModelEditor">
-                                  <StringArray count="4">
-                                    <StringItem index="0" value="XX"/>
-                                    <StringItem index="1" value="XY"/>
-                                    <StringItem index="2" value="YX"/>
-                                    <StringItem index="3" value="YY"/>
-                                  </StringArray>
-                                </Property>
-                                <Property name="toolTipText" type="java.lang.String" value="Correlations of which polarizations to use, one or more of XX,XY,YX,YY. &#xa;&#xa;As an example, suppose you select &apos;XX&apos; here and set Selection to AUTO, then the X polarization signal of each station is correlated with itself. However if we set Selection to CROSS, then the X polarization of station A is correlated with the X polarization of station B for each base line."/>
-                              </Properties>
-                            </Component>
-                          </SubComponents>
-                        </Container>
-                      </SubComponents>
-                    </Container>
-                    <Container class="javax.swing.JPanel" name="workDomainSizePanel">
-                      <Properties>
-                        <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
-                          <Border info="org.netbeans.modules.form.compat2.border.TitledBorderInfo">
-                            <TitledBorder title="Work Domain Size"/>
-                          </Border>
-                        </Property>
-                        <Property name="toolTipText" type="java.lang.String" value="Size of the work domain in frequency and time. A work domain represents an amount of input data that is loaded into memory and processed as a single block. A large work domain size should reduce the overhead due to disk access."/>
-                      </Properties>
-                      <Constraints>
-                        <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
-                          <AbsoluteConstraints x="20" y="60" width="220" height="80"/>
-                        </Constraint>
-                      </Constraints>
-
-                      <Layout class="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout">
-                        <Property name="useNullLayout" type="boolean" value="false"/>
-                      </Layout>
-                      <SubComponents>
-                        <Component class="javax.swing.JLabel" name="wdsFrequencyLabel">
-                          <Properties>
-                            <Property name="text" type="java.lang.String" value="Frequency :"/>
-                          </Properties>
-                          <Constraints>
-                            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
-                              <AbsoluteConstraints x="20" y="20" width="-1" height="-1"/>
-                            </Constraint>
-                          </Constraints>
-                        </Component>
-                        <Component class="javax.swing.JTextField" name="wdsFrequencyText">
-                          <Properties>
-                            <Property name="toolTipText" type="java.lang.String" value="Size of the work domain in frequency"/>
-                          </Properties>
-                          <Constraints>
-                            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
-                              <AbsoluteConstraints x="100" y="20" width="80" height="-1"/>
-                            </Constraint>
-                          </Constraints>
-                        </Component>
-                        <Component class="javax.swing.JLabel" name="wdsFrequencyUnitLabel">
-                          <Properties>
-                            <Property name="text" type="java.lang.String" value="Hz"/>
-                          </Properties>
-                          <Constraints>
-                            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
-                              <AbsoluteConstraints x="190" y="20" width="-1" height="-1"/>
-                            </Constraint>
-                          </Constraints>
-                        </Component>
-                        <Component class="javax.swing.JLabel" name="wdsTimeLabel">
-                          <Properties>
-                            <Property name="text" type="java.lang.String" value="Time :"/>
-                          </Properties>
-                          <Constraints>
-                            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
-                              <AbsoluteConstraints x="20" y="50" width="-1" height="-1"/>
-                            </Constraint>
-                          </Constraints>
-                        </Component>
-                        <Component class="javax.swing.JTextField" name="wdsTimeText">
-                          <Properties>
-                            <Property name="toolTipText" type="java.lang.String" value="Size of the work work domain in time"/>
-                          </Properties>
-                          <Constraints>
-                            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
-                              <AbsoluteConstraints x="100" y="50" width="80" height="-1"/>
-                            </Constraint>
-                          </Constraints>
-                        </Component>
-                        <Component class="javax.swing.JLabel" name="wdsTimeUnitLabel">
-                          <Properties>
-                            <Property name="text" type="java.lang.String" value="s"/>
-                          </Properties>
-                          <Constraints>
-                            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
-                              <AbsoluteConstraints x="190" y="50" width="10" height="-1"/>
-                            </Constraint>
-                          </Constraints>
-                        </Component>
-                      </SubComponents>
-                    </Container>
-                    <Container class="javax.swing.JPanel" name="integrationIntervalPanel">
-                      <Properties>
-                        <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
-                          <Border info="org.netbeans.modules.form.compat2.border.TitledBorderInfo">
-                            <TitledBorder title="Integration"/>
-                          </Border>
-                        </Property>
-                        <Property name="toolTipText" type="java.lang.String" value="Cell size for integration. Allows the user to perform operations on a lower resolution, which should be faster in most cases"/>
-                      </Properties>
-                      <Constraints>
-                        <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
-                          <AbsoluteConstraints x="250" y="60" width="220" height="80"/>
-                        </Constraint>
-                      </Constraints>
-
-                      <Layout class="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout">
-                        <Property name="useNullLayout" type="boolean" value="false"/>
-                      </Layout>
-                      <SubComponents>
-                        <Component class="javax.swing.JLabel" name="integrationFrequencyLabel">
-                          <Properties>
-                            <Property name="text" type="java.lang.String" value="Freq. Interval :"/>
-                          </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="-1"/>
-                            </Constraint>
-                          </Constraints>
-                        </Component>
-                        <Component class="javax.swing.JTextField" name="integrationFrequencyText">
-                          <Constraints>
-                            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
-                              <AbsoluteConstraints x="110" y="20" width="70" height="-1"/>
-                            </Constraint>
-                          </Constraints>
-                        </Component>
-                        <Component class="javax.swing.JLabel" name="integrationFrequencyUnitLabel">
-                          <Properties>
-                            <Property name="text" type="java.lang.String" value="Hz"/>
-                          </Properties>
-                          <Constraints>
-                            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
-                              <AbsoluteConstraints x="190" y="20" width="-1" height="-1"/>
-                            </Constraint>
-                          </Constraints>
-                        </Component>
-                        <Component class="javax.swing.JLabel" name="integrationTimeLabel">
-                          <Properties>
-                            <Property name="text" type="java.lang.String" value="Time Interval :"/>
-                          </Properties>
-                          <Constraints>
-                            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
-                              <AbsoluteConstraints x="10" y="50" width="-1" height="-1"/>
-                            </Constraint>
-                          </Constraints>
-                        </Component>
-                        <Component class="javax.swing.JTextField" name="integrationTimeText">
-                          <Constraints>
-                            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
-                              <AbsoluteConstraints x="110" y="50" width="70" height="-1"/>
-                            </Constraint>
-                          </Constraints>
-                        </Component>
-                        <Component class="javax.swing.JLabel" name="integrationTimeUnitLabel">
-                          <Properties>
-                            <Property name="text" type="java.lang.String" value="s"/>
-                          </Properties>
-                          <Constraints>
-                            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
-                              <AbsoluteConstraints x="190" y="50" width="10" height="-1"/>
-                            </Constraint>
-                          </Constraints>
-                        </Component>
-                      </SubComponents>
-                    </Container>
-                    <Component class="javax.swing.JButton" name="strategySaveButton">
-                      <Properties>
-                        <Property name="text" type="java.lang.String" value="Save"/>
-                      </Properties>
-                      <Events>
-                        <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="strategySaveButtonActionPerformed"/>
-                      </Events>
-                      <Constraints>
-                        <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
-                          <AbsoluteConstraints x="580" y="500" width="-1" height="-1"/>
-                        </Constraint>
-                      </Constraints>
-                    </Component>
-                  </SubComponents>
-                </Container>
-              </SubComponents>
-            </Container>
-          </SubComponents>
-        </Container>
+        </Component>
         <Container class="javax.swing.JPanel" name="BBSStepExplorerPanel">
           <Constraints>
             <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JTabbedPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JTabbedPaneSupportLayout$JTabbedPaneConstraintsDescription">
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/BBSPanel.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/BBSPanel.java
index 625c3e3bef7..e0b566c1fe2 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/BBSPanel.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/BBSPanel.java
@@ -1,5 +1,5 @@
 /*
- * OLAPConficPanel.java
+ *  BBSPanel.java
  *
  *  Copyright (C) 2002-2007
  *  ASTRON (Netherlands Foundation for Research in Astronomy)
@@ -258,15 +258,20 @@ public class BBSPanel extends javax.swing.JPanel implements IViewPanel{
         String aKeyName = LofarUtils.keyName(aNode.name);
         
         if (aKeyName.equals("DataSet")) {
-            this.BBSDatasetText.setToolTipText(aNode.description);
+            this.BBSDatasetText.setToolTipText(aParam.description);
             this.dataSet=aNode;
+            
             if (isRef && aParam != null) {
-                BBSDatasetText.setText(aNode.limits + " : " + aParam.limits);
+                this.BBSDatasetDeRefText.setVisible(true);
+                BBSDatasetText.setText(aNode.limits);
+                BBSDatasetDeRefText.setText(aParam.limits);
             } else {
+                BBSDatasetDeRefText.setVisible(false);
+                BBSDatasetDeRefText.setText("");
                 BBSDatasetText.setText(aNode.limits);
             }
         }else if (aKeyName.equals("DBName")) {
-            this.BBDBDBNameText.setToolTipText(aNode.description);
+            this.BBDBDBNameText.setToolTipText(aParam.description);
             this.BBDBDBName=aNode;
             if (isRef && aParam != null) {
                 BBDBDBNameText.setText(aNode.limits + " : " + aParam.limits);
@@ -274,7 +279,7 @@ public class BBSPanel extends javax.swing.JPanel implements IViewPanel{
                 BBDBDBNameText.setText(aNode.limits);
             }
         }else if (aKeyName.equals("Host")) {
-            this.BBDBHostText.setToolTipText(aNode.description);
+            this.BBDBHostText.setToolTipText(aParam.description);
             this.BBDBHost=aNode;
             if (isRef && aParam != null) {
                 BBDBHostText.setText(aNode.limits + " : " + aParam.limits);
@@ -282,7 +287,7 @@ public class BBSPanel extends javax.swing.JPanel implements IViewPanel{
                 BBDBHostText.setText(aNode.limits);
             }
         }else if (aKeyName.equals("Port")) {
-            this.BBDBPortText.setToolTipText(aNode.description);
+            this.BBDBPortText.setToolTipText(aParam.description);
             this.BBDBPort=aNode;
             if (isRef && aParam != null) {
                 BBDBPortText.setText(aNode.limits + " : " + aParam.limits);
@@ -290,7 +295,7 @@ public class BBSPanel extends javax.swing.JPanel implements IViewPanel{
                 BBDBPortText.setText(aNode.limits);
             }
         }else if (aKeyName.equals("UserName")) {
-            this.BBDBDBUsernameText.setToolTipText(aNode.description);
+            this.BBDBDBUsernameText.setToolTipText(aParam.description);
             this.BBDBUsername=aNode;
             if (isRef && aParam != null) {
                 BBDBDBUsernameText.setText(aNode.limits + " : " + aParam.limits);
@@ -298,7 +303,7 @@ public class BBSPanel extends javax.swing.JPanel implements IViewPanel{
                 BBDBDBUsernameText.setText(aNode.limits);
             }
         }else if (aKeyName.equals("PassWord")) {
-            this.BBDBDBPasswordText.setToolTipText(aNode.description);
+            this.BBDBDBPasswordText.setToolTipText(aParam.description);
             this.BBDBPassword=aNode;
             if (isRef && aParam != null) {
                 BBDBDBPasswordText.setText(aNode.limits + " : " + aParam.limits);
@@ -306,7 +311,7 @@ public class BBSPanel extends javax.swing.JPanel implements IViewPanel{
                 BBDBDBPasswordText.setText(aNode.limits);
             }
         }else if (aKeyName.equals("Instrument")) {
-            this.ParmDBInstrumentText.setToolTipText(aNode.description);
+            this.ParmDBInstrumentText.setToolTipText(aParam.description);
             this.ParmDBInstrument=aNode;
             if (isRef && aParam != null) {
                 ParmDBInstrumentText.setText(aNode.limits + " : " + aParam.limits);
@@ -314,7 +319,7 @@ public class BBSPanel extends javax.swing.JPanel implements IViewPanel{
                 ParmDBInstrumentText.setText(aNode.limits);
             }
         }else if (aKeyName.equals("LocalSky")) {
-            this.ParmDBLocalSkyText.setToolTipText(aNode.description);
+            this.ParmDBLocalSkyText.setToolTipText(aParam.description);
             this.ParmDBLocalSky=aNode;
             if (isRef && aParam != null) {
                 ParmDBLocalSkyText.setText(aNode.limits + " : " + aParam.limits);
@@ -343,7 +348,6 @@ public class BBSPanel extends javax.swing.JPanel implements IViewPanel{
      */
     public void enableButtons(boolean enabled) {
         this.enableOverviewButtons(enabled);
-        this.enableDetailButtons(enabled);
     }
     
     /** Sets the buttons visible/invisible
@@ -352,7 +356,6 @@ public class BBSPanel extends javax.swing.JPanel implements IViewPanel{
      */
     public void setButtonsVisible(boolean visible) {
         this.setOverviewButtonsVisible(visible);
-        this.setDetailsButtonsVisible(visible);
     }
     private void enableOverviewButtons(boolean enabled) {
         this.configurationRevertButton.setEnabled(enabled);
@@ -362,49 +365,47 @@ public class BBSPanel extends javax.swing.JPanel implements IViewPanel{
         this.configurationRevertButton.setVisible(visible);
     }
     
-    private void enableDetailButtons(boolean enabled) {
-        this.strategyRevertButton.setEnabled(enabled);
-    }
-    
-    private void setDetailsButtonsVisible(boolean visible) {
-        this.strategyRevertButton.setVisible(visible);
-    }
-    
-    
     /** Enables/disables the complete form
      *
      * @param   enabled     true/false enabled/disabled
      */
     public void setAllEnabled(boolean enabled) {
         enableOverviewButtons(enabled);
-        enableDetailButtons(enabled);
     }
     
     private void saveInput() {
        
         if (this.dataSet != null && !this.BBSDatasetText.getText().equals(dataSet.limits)) {
             dataSet.limits = BBSDatasetText.getText();
+            logger.trace("Variable BBS ("+dataSet.name+"//"+dataSet.treeID()+"//"+dataSet.nodeID()+"//"+dataSet.parentID()+"//"+dataSet.paramDefID()+") from value ("+BBSDatasetText.getText()+") updated to :"+dataSet.limits);
             saveNode(dataSet);
         } else if (this.BBDBHost != null && !this.BBDBHostText.getText().equals(BBDBHost.limits)) {
             BBDBHost.limits = BBDBHostText.getText();
+            logger.trace("Variable BBS ("+BBDBHost.name+"//"+BBDBHost.treeID()+"//"+BBDBHost.nodeID()+"//"+BBDBHost.parentID()+"//"+BBDBHost.paramDefID()+") updated to :"+BBDBHost.limits);
             saveNode(BBDBHost);
         } else if (this.BBDBPort != null && !this.BBDBPortText.getText().equals(BBDBPort.limits)) {
             BBDBPort.limits = BBDBPortText.getText();
+            logger.trace("Variable BBS ("+BBDBPort.name+"//"+BBDBPort.treeID()+"//"+BBDBPort.nodeID()+"//"+BBDBPort.parentID()+"//"+BBDBPort.paramDefID()+") updated to :"+BBDBPort.limits);
             saveNode(BBDBPort);
         } else if (this.BBDBDBName != null && !this.BBDBDBNameText.getText().equals(BBDBDBName.limits)) {
             BBDBDBName.limits = BBDBDBNameText.getText();
+            logger.trace("Variable BBS ("+BBDBDBName.name+"//"+BBDBDBName.treeID()+"//"+BBDBDBName.nodeID()+"//"+BBDBDBName.parentID()+"//"+BBDBDBName.paramDefID()+") updated to :"+BBDBDBName.limits);
             saveNode(BBDBDBName);
         } else if (this.BBDBUsername != null && !this.BBDBDBUsernameText.getText().equals(BBDBUsername.limits)) {
             BBDBUsername.limits = BBDBDBUsernameText.getText();
+            logger.trace("Variable BBS ("+BBDBUsername.name+"//"+BBDBUsername.treeID()+"//"+BBDBUsername.nodeID()+"//"+BBDBUsername.parentID()+"//"+BBDBUsername.paramDefID()+") updated to :"+BBDBUsername.limits);
             saveNode(BBDBUsername);
         } else if (this.BBDBPassword != null && !this.BBDBDBPasswordText.getText().equals(BBDBPassword.limits)) {
             BBDBPassword.limits = BBDBDBPasswordText.getText();
+            logger.trace("Variable BBS ("+BBDBPassword.name+"//"+BBDBPassword.treeID()+"//"+BBDBPassword.nodeID()+"//"+BBDBPassword.parentID()+"//"+BBDBPassword.paramDefID()+") updated to :"+BBDBPassword.limits);
             saveNode(BBDBPassword);
         } else if (this.ParmDBInstrument != null && !this.ParmDBInstrumentText.getText().equals(ParmDBInstrument.limits)) {
             ParmDBInstrument.limits = ParmDBInstrumentText.getText();
+            logger.trace("Variable BBS ("+ParmDBInstrument.name+"//"+ParmDBInstrument.treeID()+"//"+ParmDBInstrument.nodeID()+"//"+ParmDBInstrument.parentID()+"//"+ParmDBInstrument.paramDefID()+") updated to :"+ParmDBInstrument.limits);
             saveNode(ParmDBInstrument);
         } else if (this.ParmDBLocalSky != null && !this.ParmDBLocalSkyText.getText().equals(ParmDBLocalSky.limits)) {
             ParmDBLocalSky.limits = ParmDBLocalSkyText.getText();
+            logger.trace("Variable BBS ("+ParmDBLocalSky.name+"//"+ParmDBLocalSky.treeID()+"//"+ParmDBLocalSky.nodeID()+"//"+ParmDBLocalSky.parentID()+"//"+ParmDBLocalSky.paramDefID()+") updated to :"+ParmDBLocalSky.limits);
             saveNode(ParmDBLocalSky);
         }
     }
@@ -440,52 +441,8 @@ public class BBSPanel extends javax.swing.JPanel implements IViewPanel{
         ParmDBLocalSkyLabel = new javax.swing.JLabel();
         ParmDBLocalSkyText = new javax.swing.JTextField();
         configurationRevertButton = new javax.swing.JButton();
-        configurationSaveButton = new javax.swing.JButton();
-        BBSStrategyPanel = new javax.swing.JPanel();
-        strategyScrollPane = new javax.swing.JScrollPane();
-        strategyPanel = new javax.swing.JPanel();
-        inputDataLabel = new javax.swing.JLabel();
-        inputDataText = new javax.swing.JTextField();
-        strategyRevertButton = new javax.swing.JButton();
-        stationsPanel = new javax.swing.JPanel();
-        stationsScrollPane = new javax.swing.JScrollPane();
-        stationsList = new javax.swing.JList();
-        stationsModPanel = new javax.swing.JPanel();
-        stationsUseAllCheckbox = new javax.swing.JCheckBox();
-        addStationButton = new javax.swing.JButton();
-        deleteStationButton = new javax.swing.JButton();
-        stepsPanel = new javax.swing.JPanel();
-        stepsScrollPane = new javax.swing.JScrollPane();
-        stepsTree = new javax.swing.JTree();
-        stepsModsPanel = new javax.swing.JPanel();
-        addStepButton = new javax.swing.JButton();
-        removeStepButton = new javax.swing.JButton();
-        modifyStepButton = new javax.swing.JButton();
-        loadTemplateStepButton = new javax.swing.JButton();
-        stepsMoveUpDownPanel = new javax.swing.JPanel();
-        moveStepUpButton = new javax.swing.JButton();
-        moveStepDownButton = new javax.swing.JButton();
-        correlationPanel = new javax.swing.JPanel();
-        correlationSelectionLabel = new javax.swing.JLabel();
-        correlationSelectionBox = new javax.swing.JComboBox();
-        correlationTypeLabel = new javax.swing.JLabel();
-        correlationTypeScrollPane = new javax.swing.JScrollPane();
-        correlationTypeList = new javax.swing.JList();
-        workDomainSizePanel = new javax.swing.JPanel();
-        wdsFrequencyLabel = new javax.swing.JLabel();
-        wdsFrequencyText = new javax.swing.JTextField();
-        wdsFrequencyUnitLabel = new javax.swing.JLabel();
-        wdsTimeLabel = new javax.swing.JLabel();
-        wdsTimeText = new javax.swing.JTextField();
-        wdsTimeUnitLabel = new javax.swing.JLabel();
-        integrationIntervalPanel = new javax.swing.JPanel();
-        integrationFrequencyLabel = new javax.swing.JLabel();
-        integrationFrequencyText = new javax.swing.JTextField();
-        integrationFrequencyUnitLabel = new javax.swing.JLabel();
-        integrationTimeLabel = new javax.swing.JLabel();
-        integrationTimeText = new javax.swing.JTextField();
-        integrationTimeUnitLabel = new javax.swing.JLabel();
-        strategySaveButton = new javax.swing.JButton();
+        BBSDatasetDeRefText = new javax.swing.JTextField();
+        BBSStrategyPanel = new nl.astron.lofar.sas.otbcomponents.bbs.BBSStrategyPanel();
         BBSStepExplorerPanel = new javax.swing.JPanel();
         stepExplorerScrollPanel = new javax.swing.JScrollPane();
         stepExplorerPanel = new javax.swing.JPanel();
@@ -662,231 +619,15 @@ public class BBSPanel extends javax.swing.JPanel implements IViewPanel{
 
         BBSGlobalSettingsPanel.add(configurationRevertButton, new org.netbeans.lib.awtextra.AbsoluteConstraints(20, 330, 81, -1));
 
-        configurationSaveButton.setText("Save");
-        configurationSaveButton.addActionListener(new java.awt.event.ActionListener() {
-            public void actionPerformed(java.awt.event.ActionEvent evt) {
-                configurationSaveButtonActionPerformed(evt);
-            }
-        });
-
-        BBSGlobalSettingsPanel.add(configurationSaveButton, new org.netbeans.lib.awtextra.AbsoluteConstraints(290, 330, -1, -1));
+        BBSDatasetDeRefText.setEditable(false);
+        BBSDatasetDeRefText.setToolTipText("Dereferenced and actually used value.");
+        BBSDatasetDeRefText.setMaximumSize(new java.awt.Dimension(440, 19));
+        BBSDatasetDeRefText.setMinimumSize(new java.awt.Dimension(440, 19));
+        BBSDatasetDeRefText.setPreferredSize(new java.awt.Dimension(440, 19));
+        BBSGlobalSettingsPanel.add(BBSDatasetDeRefText, new org.netbeans.lib.awtextra.AbsoluteConstraints(360, 30, 180, -1));
 
         jTabbedPane1.addTab("Global Settings", BBSGlobalSettingsPanel);
 
-        BBSStrategyPanel.setLayout(new java.awt.BorderLayout());
-
-        strategyPanel.setLayout(new org.netbeans.lib.awtextra.AbsoluteLayout());
-
-        inputDataLabel.setText("Input Data Column:");
-        strategyPanel.add(inputDataLabel, new org.netbeans.lib.awtextra.AbsoluteConstraints(30, 30, -1, -1));
-
-        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, 120, -1));
-
-        strategyRevertButton.setText("Revert");
-        strategyRevertButton.addActionListener(new java.awt.event.ActionListener() {
-            public void actionPerformed(java.awt.event.ActionEvent evt) {
-                strategyRevertButtonActionPerformed(evt);
-            }
-        });
-
-        strategyPanel.add(strategyRevertButton, new org.netbeans.lib.awtextra.AbsoluteConstraints(30, 500, -1, -1));
-
-        stationsPanel.setLayout(new java.awt.BorderLayout());
-
-        stationsPanel.setBorder(javax.swing.BorderFactory.createTitledBorder("Station Names"));
-        stationsPanel.setToolTipText("Identifiers of the participating stations.");
-        stationsList.setModel(new javax.swing.AbstractListModel() {
-            String[] strings = { "1", "2", "3", "4", "5" };
-            public int getSize() { return strings.length; }
-            public Object getElementAt(int i) { return strings[i]; }
-        });
-        stationsList.setToolTipText("Identifiers of the participating stations.");
-        stationsScrollPane.setViewportView(stationsList);
-
-        stationsPanel.add(stationsScrollPane, java.awt.BorderLayout.CENTER);
-
-        stationsModPanel.setLayout(new java.awt.GridBagLayout());
-
-        stationsUseAllCheckbox.setText("Use all stations");
-        stationsUseAllCheckbox.setBorder(javax.swing.BorderFactory.createEmptyBorder(0, 0, 0, 0));
-        stationsUseAllCheckbox.setMargin(new java.awt.Insets(0, 0, 0, 0));
-        stationsUseAllCheckbox.addChangeListener(new javax.swing.event.ChangeListener() {
-            public void stateChanged(javax.swing.event.ChangeEvent evt) {
-                stationsUseAllCheckboxStateChanged(evt);
-            }
-        });
-
-        gridBagConstraints = new java.awt.GridBagConstraints();
-        gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST;
-        gridBagConstraints.insets = new java.awt.Insets(2, 2, 2, 2);
-        stationsModPanel.add(stationsUseAllCheckbox, gridBagConstraints);
-
-        addStationButton.setText("A");
-        gridBagConstraints = new java.awt.GridBagConstraints();
-        gridBagConstraints.insets = new java.awt.Insets(2, 2, 2, 2);
-        stationsModPanel.add(addStationButton, gridBagConstraints);
-
-        deleteStationButton.setText("D");
-        gridBagConstraints = new java.awt.GridBagConstraints();
-        gridBagConstraints.insets = new java.awt.Insets(2, 2, 2, 2);
-        stationsModPanel.add(deleteStationButton, gridBagConstraints);
-
-        stationsPanel.add(stationsModPanel, java.awt.BorderLayout.SOUTH);
-
-        strategyPanel.add(stationsPanel, new org.netbeans.lib.awtextra.AbsoluteConstraints(20, 150, 220, 330));
-
-        stepsPanel.setLayout(new java.awt.BorderLayout());
-
-        stepsPanel.setBorder(javax.swing.BorderFactory.createTitledBorder("Steps"));
-        stepsPanel.setToolTipText("The names of the steps that compose the strategy.");
-        stepsPanel.setPreferredSize(new java.awt.Dimension(100, 100));
-        stepsTree.setToolTipText("The names of the steps that compose the strategy.");
-        stepsScrollPane.setViewportView(stepsTree);
-
-        stepsPanel.add(stepsScrollPane, java.awt.BorderLayout.CENTER);
-
-        stepsModsPanel.setLayout(new java.awt.GridBagLayout());
-
-        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");
-        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");
-        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");
-        gridBagConstraints = new java.awt.GridBagConstraints();
-        gridBagConstraints.gridx = 3;
-        gridBagConstraints.gridy = 0;
-        gridBagConstraints.insets = new java.awt.Insets(2, 2, 2, 2);
-        stepsModsPanel.add(loadTemplateStepButton, gridBagConstraints);
-
-        stepsPanel.add(stepsModsPanel, java.awt.BorderLayout.SOUTH);
-
-        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");
-        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");
-        gridBagConstraints = new java.awt.GridBagConstraints();
-        gridBagConstraints.gridx = 0;
-        gridBagConstraints.gridy = 1;
-        gridBagConstraints.insets = new java.awt.Insets(2, 2, 2, 2);
-        stepsMoveUpDownPanel.add(moveStepDownButton, gridBagConstraints);
-
-        stepsPanel.add(stepsMoveUpDownPanel, java.awt.BorderLayout.EAST);
-
-        strategyPanel.add(stepsPanel, new org.netbeans.lib.awtextra.AbsoluteConstraints(250, 150, 400, 330));
-
-        correlationPanel.setLayout(new org.netbeans.lib.awtextra.AbsoluteLayout());
-
-        correlationPanel.setBorder(javax.swing.BorderFactory.createTitledBorder("Correlation"));
-        correlationSelectionLabel.setText("Selection :");
-        correlationPanel.add(correlationSelectionLabel, new org.netbeans.lib.awtextra.AbsoluteConstraints(20, 30, -1, -1));
-
-        correlationSelectionBox.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "AUTO", "CROSS", "ALL" }));
-        correlationSelectionBox.setToolTipText("Station correlations to use.\n\nAUTO: Use only correlations of each station with itself (i.e. no base lines).Not yet implemented.\nCROSS: Use only correlations between stations (i.e. base lines).\nALL: Use both AUTO and CROSS correlations.");
-        correlationPanel.add(correlationSelectionBox, new org.netbeans.lib.awtextra.AbsoluteConstraints(20, 50, 80, -1));
-
-        correlationTypeLabel.setText("Type :");
-        correlationPanel.add(correlationTypeLabel, new org.netbeans.lib.awtextra.AbsoluteConstraints(110, 10, -1, -1));
-
-        correlationTypeList.setModel(new javax.swing.AbstractListModel() {
-            String[] strings = { "XX", "XY", "YX", "YY" };
-            public int getSize() { return strings.length; }
-            public Object getElementAt(int i) { return strings[i]; }
-        });
-        correlationTypeList.setToolTipText("Correlations of which polarizations to use, one or more of XX,XY,YX,YY. \n\nAs an example, suppose you select 'XX' here and set Selection to AUTO, then the X polarization signal of each station is correlated with itself. However if we set Selection to CROSS, then the X polarization of station A is correlated with the X polarization of station B for each base line.");
-        correlationTypeScrollPane.setViewportView(correlationTypeList);
-
-        correlationPanel.add(correlationTypeScrollPane, new org.netbeans.lib.awtextra.AbsoluteConstraints(110, 30, 50, 80));
-
-        strategyPanel.add(correlationPanel, new org.netbeans.lib.awtextra.AbsoluteConstraints(480, 20, 170, 120));
-
-        workDomainSizePanel.setLayout(new org.netbeans.lib.awtextra.AbsoluteLayout());
-
-        workDomainSizePanel.setBorder(javax.swing.BorderFactory.createTitledBorder("Work Domain Size"));
-        workDomainSizePanel.setToolTipText("Size of the work domain in frequency and time. A work domain represents an amount of input data that is loaded into memory and processed as a single block. A large work domain size should reduce the overhead due to disk access.");
-        wdsFrequencyLabel.setText("Frequency :");
-        workDomainSizePanel.add(wdsFrequencyLabel, new org.netbeans.lib.awtextra.AbsoluteConstraints(20, 20, -1, -1));
-
-        wdsFrequencyText.setToolTipText("Size of the work domain in frequency");
-        workDomainSizePanel.add(wdsFrequencyText, new org.netbeans.lib.awtextra.AbsoluteConstraints(100, 20, 80, -1));
-
-        wdsFrequencyUnitLabel.setText("Hz");
-        workDomainSizePanel.add(wdsFrequencyUnitLabel, new org.netbeans.lib.awtextra.AbsoluteConstraints(190, 20, -1, -1));
-
-        wdsTimeLabel.setText("Time :");
-        workDomainSizePanel.add(wdsTimeLabel, new org.netbeans.lib.awtextra.AbsoluteConstraints(20, 50, -1, -1));
-
-        wdsTimeText.setToolTipText("Size of the work work domain in time");
-        workDomainSizePanel.add(wdsTimeText, new org.netbeans.lib.awtextra.AbsoluteConstraints(100, 50, 80, -1));
-
-        wdsTimeUnitLabel.setText("s");
-        workDomainSizePanel.add(wdsTimeUnitLabel, new org.netbeans.lib.awtextra.AbsoluteConstraints(190, 50, 10, -1));
-
-        strategyPanel.add(workDomainSizePanel, new org.netbeans.lib.awtextra.AbsoluteConstraints(20, 60, 220, 80));
-
-        integrationIntervalPanel.setLayout(new org.netbeans.lib.awtextra.AbsoluteLayout());
-
-        integrationIntervalPanel.setBorder(javax.swing.BorderFactory.createTitledBorder("Integration"));
-        integrationIntervalPanel.setToolTipText("Cell size for integration. Allows the user to perform operations on a lower resolution, which should be faster in most cases");
-        integrationFrequencyLabel.setText("Freq. Interval :");
-        integrationIntervalPanel.add(integrationFrequencyLabel, new org.netbeans.lib.awtextra.AbsoluteConstraints(10, 20, -1, -1));
-
-        integrationIntervalPanel.add(integrationFrequencyText, new org.netbeans.lib.awtextra.AbsoluteConstraints(110, 20, 70, -1));
-
-        integrationFrequencyUnitLabel.setText("Hz");
-        integrationIntervalPanel.add(integrationFrequencyUnitLabel, new org.netbeans.lib.awtextra.AbsoluteConstraints(190, 20, -1, -1));
-
-        integrationTimeLabel.setText("Time Interval :");
-        integrationIntervalPanel.add(integrationTimeLabel, new org.netbeans.lib.awtextra.AbsoluteConstraints(10, 50, -1, -1));
-
-        integrationIntervalPanel.add(integrationTimeText, new org.netbeans.lib.awtextra.AbsoluteConstraints(110, 50, 70, -1));
-
-        integrationTimeUnitLabel.setText("s");
-        integrationIntervalPanel.add(integrationTimeUnitLabel, new org.netbeans.lib.awtextra.AbsoluteConstraints(190, 50, 10, -1));
-
-        strategyPanel.add(integrationIntervalPanel, new org.netbeans.lib.awtextra.AbsoluteConstraints(250, 60, 220, 80));
-
-        strategySaveButton.setText("Save");
-        strategySaveButton.addActionListener(new java.awt.event.ActionListener() {
-            public void actionPerformed(java.awt.event.ActionEvent evt) {
-                strategySaveButtonActionPerformed(evt);
-            }
-        });
-
-        strategyPanel.add(strategySaveButton, new org.netbeans.lib.awtextra.AbsoluteConstraints(580, 500, -1, -1));
-
-        strategyScrollPane.setViewportView(strategyPanel);
-
-        BBSStrategyPanel.add(strategyScrollPane, java.awt.BorderLayout.CENTER);
-
         jTabbedPane1.addTab("Strategy", BBSStrategyPanel);
 
         BBSStepExplorerPanel.setLayout(new java.awt.BorderLayout());
@@ -1313,29 +1054,11 @@ public class BBSPanel extends javax.swing.JPanel implements IViewPanel{
         add(buttonPanel1, java.awt.BorderLayout.SOUTH);
 
     }// </editor-fold>//GEN-END:initComponents
-    
-    private void configurationSaveButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_configurationSaveButtonActionPerformed
-// TODO add your handling code here:
-    }//GEN-LAST:event_configurationSaveButtonActionPerformed
-    
-    private void strategySaveButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_strategySaveButtonActionPerformed
-// TODO add your handling code here:
-    }//GEN-LAST:event_strategySaveButtonActionPerformed
-    
+            
     private void stepExplorerSaveButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_stepExplorerSaveButtonActionPerformed
 // TODO add your handling code here:
     }//GEN-LAST:event_stepExplorerSaveButtonActionPerformed
-    
-    private void stationsUseAllCheckboxStateChanged(javax.swing.event.ChangeEvent evt) {//GEN-FIRST:event_stationsUseAllCheckboxStateChanged
-        if(this.stationsUseAllCheckbox.isSelected()){
-            this.stationsList.setBackground(Color.LIGHT_GRAY);
-            this.stationsList.setEnabled(false);
-        }else{
-            this.stationsList.setBackground(Color.WHITE);
-            this.stationsList.setEnabled(true);
-        }
-    }//GEN-LAST:event_stationsUseAllCheckboxStateChanged
-    
+        
     private void stepExplorerRevertButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_stepExplorerRevertButtonActionPerformed
 // TODO add your handling code here:
     }//GEN-LAST:event_stepExplorerRevertButtonActionPerformed
@@ -1358,11 +1081,7 @@ public class BBSPanel extends javax.swing.JPanel implements IViewPanel{
     private void configurationRevertButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_configurationRevertButtonActionPerformed
         this.restoreBBSGlobalSettingsPanel();
     }//GEN-LAST:event_configurationRevertButtonActionPerformed
-    
-    private void strategyRevertButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_strategyRevertButtonActionPerformed
-        this.restoreBBSStrategyPanel();
-    }//GEN-LAST:event_strategyRevertButtonActionPerformed
-    
+        
     private void buttonPanel1ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_buttonPanel1ActionPerformed
         if(evt.getActionCommand() == "Save Settings") {
             saveInput();
@@ -1375,15 +1094,6 @@ public class BBSPanel extends javax.swing.JPanel implements IViewPanel{
     
     // Global Settings parameters
     private jOTDBnode dataSet;
-    private jOTDBnode StrategySteps;
-    private jOTDBnode StrategyStations;
-    private jOTDBnode StrategyInputData;
-    private jOTDBnode StrategyCorrelationSelection;
-    private jOTDBnode StrategyCorrelationType;
-    private jOTDBnode StrategyWDSFrequency;
-    private jOTDBnode StrategyWDSTime;
-    private jOTDBnode StrategyIntegrationFrequency;
-    private jOTDBnode StrategyIntegrationTime;
     
     private jOTDBnode BBDBHost;
     private jOTDBnode BBDBPort;
@@ -1406,11 +1116,12 @@ public class BBSPanel extends javax.swing.JPanel implements IViewPanel{
     private javax.swing.JLabel BBDBPortLabel;
     private javax.swing.JTextField BBDBPortText;
     private javax.swing.JPanel BBDatabasePanel;
+    private javax.swing.JTextField BBSDatasetDeRefText;
     private javax.swing.JLabel BBSDatasetLabel;
     private javax.swing.JTextField BBSDatasetText;
     private javax.swing.JPanel BBSGlobalSettingsPanel;
     private javax.swing.JPanel BBSStepExplorerPanel;
-    private javax.swing.JPanel BBSStrategyPanel;
+    private nl.astron.lofar.sas.otbcomponents.bbs.BBSStrategyPanel BBSStrategyPanel;
     private javax.swing.JPanel BaselineSelectionPanel;
     private javax.swing.JLabel ParmDBInstrumentLabel;
     private javax.swing.JTextField ParmDBInstrumentText;
@@ -1423,8 +1134,6 @@ public class BBSPanel extends javax.swing.JPanel implements IViewPanel{
     private javax.swing.JButton addSolvableParmButton1;
     private javax.swing.JButton addSourceButton;
     private javax.swing.JButton addSourceButton1;
-    private javax.swing.JButton addStationButton;
-    private javax.swing.JButton addStepButton;
     private javax.swing.JPanel baseLineCorrelationPanel;
     private javax.swing.JPanel baselineGlobalPanel;
     private javax.swing.JPanel baselineModsPanel;
@@ -1438,45 +1147,23 @@ public class BBSPanel extends javax.swing.JPanel implements IViewPanel{
     private javax.swing.JScrollPane blCorrelationTypeScrollPane;
     private nl.astron.lofar.sas.otbcomponents.ButtonPanel buttonPanel1;
     private javax.swing.JButton configurationRevertButton;
-    private javax.swing.JButton configurationSaveButton;
-    private javax.swing.JPanel correlationPanel;
-    private javax.swing.JComboBox correlationSelectionBox;
-    private javax.swing.JLabel correlationSelectionLabel;
-    private javax.swing.JLabel correlationTypeLabel;
-    private javax.swing.JList correlationTypeList;
-    private javax.swing.JScrollPane correlationTypeScrollPane;
     private javax.swing.JButton deleteBaseLineButton;
     private javax.swing.JButton deleteInstrumentModelButton;
     private javax.swing.JButton deleteSolvableParmButton;
     private javax.swing.JButton deleteSolvableParmButton1;
     private javax.swing.JButton deleteSourceButton1;
     private javax.swing.JButton deleteSourceButton2;
-    private javax.swing.JButton deleteStationButton;
     private javax.swing.JButton exploreFirstChildStepButton;
     private javax.swing.JButton exploreNextStepButton;
     private javax.swing.JButton exploreParentStepButton;
     private javax.swing.JButton explorePreviousStepButton;
-    private javax.swing.JLabel inputDataLabel;
-    private javax.swing.JTextField inputDataText;
-    private javax.swing.JLabel integrationFrequencyLabel;
-    private javax.swing.JTextField integrationFrequencyText;
-    private javax.swing.JLabel integrationFrequencyUnitLabel;
-    private javax.swing.JPanel integrationIntervalPanel;
-    private javax.swing.JLabel integrationTimeLabel;
-    private javax.swing.JTextField integrationTimeText;
-    private javax.swing.JLabel integrationTimeUnitLabel;
     private javax.swing.JTabbedPane jTabbedPane1;
-    private javax.swing.JButton loadTemplateStepButton;
     private javax.swing.JButton modifyBaseLineButton;
     private javax.swing.JButton modifyInstrumentModelButton;
     private javax.swing.JButton modifySolvableParmButton;
     private javax.swing.JButton modifySolvableParmButton1;
     private javax.swing.JButton modifySourceButton;
     private javax.swing.JButton modifySourceButton1;
-    private javax.swing.JButton modifyStepButton;
-    private javax.swing.JButton moveStepDownButton;
-    private javax.swing.JButton moveStepUpButton;
-    private javax.swing.JButton removeStepButton;
     private javax.swing.JPanel seOperationAttributeGroup1;
     private javax.swing.JPanel seOperationAttributeGroup2;
     private javax.swing.JPanel seOperationAttributeGroup3;
@@ -1500,11 +1187,6 @@ public class BBSPanel extends javax.swing.JPanel implements IViewPanel{
     private javax.swing.JList seSolvableParmList1;
     private javax.swing.JScrollPane seSolvableParmScrollPane;
     private javax.swing.JScrollPane seSolvableParmScrollPane1;
-    private javax.swing.JList stationsList;
-    private javax.swing.JPanel stationsModPanel;
-    private javax.swing.JPanel stationsPanel;
-    private javax.swing.JScrollPane stationsScrollPane;
-    private javax.swing.JCheckBox stationsUseAllCheckbox;
     private javax.swing.JPanel stepExplorerGlobalSources;
     private javax.swing.JList stepExplorerInstrumentModelList;
     private javax.swing.JPanel stepExplorerInstrumentModelModsPanel;
@@ -1530,22 +1212,6 @@ public class BBSPanel extends javax.swing.JPanel implements IViewPanel{
     private javax.swing.JPanel stepExplorerSourcesPanel1;
     private javax.swing.JScrollPane stepExplorerSourcesScrollPane;
     private javax.swing.JScrollPane stepExplorerSourcesScrollPane1;
-    private javax.swing.JPanel stepsModsPanel;
-    private javax.swing.JPanel stepsMoveUpDownPanel;
-    private javax.swing.JPanel stepsPanel;
-    private javax.swing.JScrollPane stepsScrollPane;
-    private javax.swing.JTree stepsTree;
-    private javax.swing.JPanel strategyPanel;
-    private javax.swing.JButton strategyRevertButton;
-    private javax.swing.JButton strategySaveButton;
-    private javax.swing.JScrollPane strategyScrollPane;
-    private javax.swing.JLabel wdsFrequencyLabel;
-    private javax.swing.JTextField wdsFrequencyText;
-    private javax.swing.JLabel wdsFrequencyUnitLabel;
-    private javax.swing.JLabel wdsTimeLabel;
-    private javax.swing.JTextField wdsTimeText;
-    private javax.swing.JLabel wdsTimeUnitLabel;
-    private javax.swing.JPanel workDomainSizePanel;
     // End of variables declaration//GEN-END:variables
     
     /**
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 9988d0ae706..74571868cae 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
@@ -275,22 +275,29 @@
                 </Constraint>
               </Constraints>
             </Component>
-            <Component class="javax.swing.JButton" name="configurationSaveButton">
+            <Component class="javax.swing.JTextField" name="BBSDatasetDeRefText">
               <Properties>
-                <Property name="text" type="java.lang.String" value="Save"/>
+                <Property name="editable" type="boolean" value="false"/>
+                <Property name="toolTipText" type="java.lang.String" value="Dereferenced and actually used value."/>
+                <Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+                  <Dimension value="[440, 19]"/>
+                </Property>
+                <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+                  <Dimension value="[440, 19]"/>
+                </Property>
+                <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+                  <Dimension value="[440, 19]"/>
+                </Property>
               </Properties>
-              <Events>
-                <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="configurationSaveButtonActionPerformed"/>
-              </Events>
               <Constraints>
                 <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
-                  <AbsoluteConstraints x="290" y="330" width="-1" height="-1"/>
+                  <AbsoluteConstraints x="360" y="30" width="180" height="-1"/>
                 </Constraint>
               </Constraints>
             </Component>
           </SubComponents>
         </Container>
-        <Container class="javax.swing.JPanel" name="BBSStrategyPanel">
+        <Component class="nl.astron.lofar.sas.otbcomponents.bbs.BBSStrategyPanel" name="BBSStrategyPanel">
           <Constraints>
             <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JTabbedPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JTabbedPaneSupportLayout$JTabbedPaneConstraintsDescription">
               <JTabbedPaneConstraints tabName="Strategy">
@@ -298,554 +305,7 @@
               </JTabbedPaneConstraints>
             </Constraint>
           </Constraints>
-
-          <Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout"/>
-          <SubComponents>
-            <Container class="javax.swing.JScrollPane" name="strategyScrollPane">
-              <Constraints>
-                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription">
-                  <BorderConstraints direction="Center"/>
-                </Constraint>
-              </Constraints>
-
-              <Layout class="org.netbeans.modules.form.compat2.layouts.support.JScrollPaneSupportLayout"/>
-              <SubComponents>
-                <Container class="javax.swing.JPanel" name="strategyPanel">
-
-                  <Layout class="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout">
-                    <Property name="useNullLayout" type="boolean" value="false"/>
-                  </Layout>
-                  <SubComponents>
-                    <Component class="javax.swing.JLabel" name="inputDataLabel">
-                      <Properties>
-                        <Property name="text" type="java.lang.String" value="Input Data Column:"/>
-                      </Properties>
-                      <Constraints>
-                        <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
-                          <AbsoluteConstraints x="30" y="30" width="-1" height="-1"/>
-                        </Constraint>
-                      </Constraints>
-                    </Component>
-                    <Component class="javax.swing.JTextField" name="inputDataText">
-                      <Properties>
-                        <Property name="toolTipText" type="java.lang.String" value="Name of the column in the measurement set that contains the input data"/>
-                      </Properties>
-                      <Constraints>
-                        <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
-                          <AbsoluteConstraints x="160" y="30" width="120" height="-1"/>
-                        </Constraint>
-                      </Constraints>
-                    </Component>
-                    <Component class="javax.swing.JButton" name="strategyRevertButton">
-                      <Properties>
-                        <Property name="text" type="java.lang.String" value="Revert"/>
-                      </Properties>
-                      <Events>
-                        <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="strategyRevertButtonActionPerformed"/>
-                      </Events>
-                      <Constraints>
-                        <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
-                          <AbsoluteConstraints x="30" y="500" width="-1" height="-1"/>
-                        </Constraint>
-                      </Constraints>
-                    </Component>
-                    <Container class="javax.swing.JPanel" name="stationsPanel">
-                      <Properties>
-                        <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
-                          <Border info="org.netbeans.modules.form.compat2.border.TitledBorderInfo">
-                            <TitledBorder title="Station Names"/>
-                          </Border>
-                        </Property>
-                        <Property name="toolTipText" type="java.lang.String" value="Identifiers of the participating stations."/>
-                      </Properties>
-                      <Constraints>
-                        <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
-                          <AbsoluteConstraints x="20" y="150" width="220" height="330"/>
-                        </Constraint>
-                      </Constraints>
-
-                      <Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout"/>
-                      <SubComponents>
-                        <Container class="javax.swing.JScrollPane" name="stationsScrollPane">
-                          <AuxValues>
-                            <AuxValue name="autoScrollPane" type="java.lang.Boolean" value="true"/>
-                          </AuxValues>
-                          <Constraints>
-                            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription">
-                              <BorderConstraints direction="Center"/>
-                            </Constraint>
-                          </Constraints>
-
-                          <Layout class="org.netbeans.modules.form.compat2.layouts.support.JScrollPaneSupportLayout"/>
-                          <SubComponents>
-                            <Component class="javax.swing.JList" name="stationsList">
-                              <Properties>
-                                <Property name="model" type="javax.swing.ListModel" editor="org.netbeans.modules.form.editors2.ListModelEditor">
-                                  <StringArray count="5">
-                                    <StringItem index="0" value="1"/>
-                                    <StringItem index="1" value="2"/>
-                                    <StringItem index="2" value="3"/>
-                                    <StringItem index="3" value="4"/>
-                                    <StringItem index="4" value="5"/>
-                                  </StringArray>
-                                </Property>
-                                <Property name="toolTipText" type="java.lang.String" value="Identifiers of the participating stations."/>
-                              </Properties>
-                            </Component>
-                          </SubComponents>
-                        </Container>
-                        <Container class="javax.swing.JPanel" name="stationsModPanel">
-                          <Constraints>
-                            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription">
-                              <BorderConstraints direction="South"/>
-                            </Constraint>
-                          </Constraints>
-
-                          <Layout class="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout"/>
-                          <SubComponents>
-                            <Component class="javax.swing.JCheckBox" name="stationsUseAllCheckbox">
-                              <Properties>
-                                <Property name="text" type="java.lang.String" value="Use all stations"/>
-                                <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
-                                  <Border info="org.netbeans.modules.form.compat2.border.EmptyBorderInfo">
-                                    <EmptyBorder bottom="0" left="0" right="0" top="0"/>
-                                  </Border>
-                                </Property>
-                                <Property name="margin" type="java.awt.Insets" editor="org.netbeans.beaninfo.editors.InsetsEditor">
-                                  <Insets value="[0, 0, 0, 0]"/>
-                                </Property>
-                              </Properties>
-                              <Events>
-                                <EventHandler event="stateChanged" listener="javax.swing.event.ChangeListener" parameters="javax.swing.event.ChangeEvent" handler="stationsUseAllCheckboxStateChanged"/>
-                              </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="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="A"/>
-                              </Properties>
-                              <Constraints>
-                                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
-                                  <GridBagConstraints gridX="-1" gridY="-1" gridWidth="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"/>
-                                </Constraint>
-                              </Constraints>
-                            </Component>
-                            <Component class="javax.swing.JButton" name="deleteStationButton">
-                              <Properties>
-                                <Property name="text" type="java.lang.String" value="D"/>
-                              </Properties>
-                              <Constraints>
-                                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
-                                  <GridBagConstraints gridX="-1" gridY="-1" gridWidth="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"/>
-                                </Constraint>
-                              </Constraints>
-                            </Component>
-                          </SubComponents>
-                        </Container>
-                      </SubComponents>
-                    </Container>
-                    <Container class="javax.swing.JPanel" name="stepsPanel">
-                      <Properties>
-                        <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
-                          <Border info="org.netbeans.modules.form.compat2.border.TitledBorderInfo">
-                            <TitledBorder title="Steps"/>
-                          </Border>
-                        </Property>
-                        <Property name="toolTipText" type="java.lang.String" value="The names of the steps that compose the strategy."/>
-                        <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
-                          <Dimension value="[100, 100]"/>
-                        </Property>
-                      </Properties>
-                      <Constraints>
-                        <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
-                          <AbsoluteConstraints x="250" y="150" width="400" height="330"/>
-                        </Constraint>
-                      </Constraints>
-
-                      <Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout"/>
-                      <SubComponents>
-                        <Container class="javax.swing.JScrollPane" name="stepsScrollPane">
-                          <AuxValues>
-                            <AuxValue name="autoScrollPane" type="java.lang.Boolean" value="true"/>
-                          </AuxValues>
-                          <Constraints>
-                            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription">
-                              <BorderConstraints direction="Center"/>
-                            </Constraint>
-                          </Constraints>
-
-                          <Layout class="org.netbeans.modules.form.compat2.layouts.support.JScrollPaneSupportLayout"/>
-                          <SubComponents>
-                            <Component class="javax.swing.JTree" name="stepsTree">
-                              <Properties>
-                                <Property name="toolTipText" type="java.lang.String" value="The names of the steps that compose the strategy."/>
-                              </Properties>
-                            </Component>
-                          </SubComponents>
-                        </Container>
-                        <Container class="javax.swing.JPanel" name="stepsModsPanel">
-                          <Properties>
-                            <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
-                              <Dimension value="[100, 30]"/>
-                            </Property>
-                            <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
-                              <Dimension value="[100, 30]"/>
-                            </Property>
-                          </Properties>
-                          <Constraints>
-                            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription">
-                              <BorderConstraints direction="South"/>
-                            </Constraint>
-                          </Constraints>
-
-                          <Layout class="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout"/>
-                          <SubComponents>
-                            <Component class="javax.swing.JButton" name="addStepButton">
-                              <Properties>
-                                <Property name="text" type="java.lang.String" value="Add"/>
-                              </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"/>
-                                </Constraint>
-                              </Constraints>
-                            </Component>
-                            <Component class="javax.swing.JButton" name="removeStepButton">
-                              <Properties>
-                                <Property name="text" type="java.lang.String" value="Delete"/>
-                              </Properties>
-                              <Constraints>
-                                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
-                                  <GridBagConstraints gridX="2" gridY="0" 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"/>
-                                </Constraint>
-                              </Constraints>
-                            </Component>
-                            <Component class="javax.swing.JButton" name="modifyStepButton">
-                              <Properties>
-                                <Property name="text" type="java.lang.String" value="Modify"/>
-                              </Properties>
-                              <Constraints>
-                                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
-                                  <GridBagConstraints gridX="1" gridY="0" 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"/>
-                                </Constraint>
-                              </Constraints>
-                            </Component>
-                            <Component class="javax.swing.JButton" name="loadTemplateStepButton">
-                              <Properties>
-                                <Property name="text" type="java.lang.String" value="Load from template"/>
-                              </Properties>
-                              <Constraints>
-                                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
-                                  <GridBagConstraints gridX="3" gridY="0" 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"/>
-                                </Constraint>
-                              </Constraints>
-                            </Component>
-                          </SubComponents>
-                        </Container>
-                        <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]"/>
-                            </Property>
-                            <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
-                              <Dimension value="[50, 60]"/>
-                            </Property>
-                          </Properties>
-                          <Constraints>
-                            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription">
-                              <BorderConstraints direction="East"/>
-                            </Constraint>
-                          </Constraints>
-
-                          <Layout class="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout"/>
-                          <SubComponents>
-                            <Component class="javax.swing.JButton" name="moveStepUpButton">
-                              <Properties>
-                                <Property name="text" type="java.lang.String" value="U"/>
-                              </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="10" weightX="0.0" weightY="0.0"/>
-                                </Constraint>
-                              </Constraints>
-                            </Component>
-                            <Component class="javax.swing.JButton" name="moveStepDownButton">
-                              <Properties>
-                                <Property name="text" type="java.lang.String" value="D"/>
-                              </Properties>
-                              <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="10" weightX="0.0" weightY="0.0"/>
-                                </Constraint>
-                              </Constraints>
-                            </Component>
-                          </SubComponents>
-                        </Container>
-                      </SubComponents>
-                    </Container>
-                    <Container class="javax.swing.JPanel" name="correlationPanel">
-                      <Properties>
-                        <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
-                          <Border info="org.netbeans.modules.form.compat2.border.TitledBorderInfo">
-                            <TitledBorder title="Correlation"/>
-                          </Border>
-                        </Property>
-                      </Properties>
-                      <Constraints>
-                        <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
-                          <AbsoluteConstraints x="480" y="20" width="170" height="120"/>
-                        </Constraint>
-                      </Constraints>
-
-                      <Layout class="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout">
-                        <Property name="useNullLayout" type="boolean" value="false"/>
-                      </Layout>
-                      <SubComponents>
-                        <Component class="javax.swing.JLabel" name="correlationSelectionLabel">
-                          <Properties>
-                            <Property name="text" type="java.lang.String" value="Selection :"/>
-                          </Properties>
-                          <Constraints>
-                            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
-                              <AbsoluteConstraints x="20" y="30" width="-1" height="-1"/>
-                            </Constraint>
-                          </Constraints>
-                        </Component>
-                        <Component class="javax.swing.JComboBox" name="correlationSelectionBox">
-                          <Properties>
-                            <Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor">
-                              <StringArray count="3">
-                                <StringItem index="0" value="AUTO"/>
-                                <StringItem index="1" value="CROSS"/>
-                                <StringItem index="2" value="ALL"/>
-                              </StringArray>
-                            </Property>
-                            <Property name="toolTipText" type="java.lang.String" value="Station correlations to use.&#xa;&#xa;AUTO: Use only correlations of each station with itself (i.e. no base lines).Not yet implemented.&#xa;CROSS: Use only correlations between stations (i.e. base lines).&#xa;ALL: Use both AUTO and CROSS correlations."/>
-                          </Properties>
-                          <Constraints>
-                            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
-                              <AbsoluteConstraints x="20" y="50" width="80" height="-1"/>
-                            </Constraint>
-                          </Constraints>
-                        </Component>
-                        <Component class="javax.swing.JLabel" name="correlationTypeLabel">
-                          <Properties>
-                            <Property name="text" type="java.lang.String" value="Type :"/>
-                          </Properties>
-                          <Constraints>
-                            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
-                              <AbsoluteConstraints x="110" y="10" width="-1" height="-1"/>
-                            </Constraint>
-                          </Constraints>
-                        </Component>
-                        <Container class="javax.swing.JScrollPane" name="correlationTypeScrollPane">
-                          <AuxValues>
-                            <AuxValue name="autoScrollPane" type="java.lang.Boolean" value="true"/>
-                          </AuxValues>
-                          <Constraints>
-                            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
-                              <AbsoluteConstraints x="110" y="30" width="50" height="80"/>
-                            </Constraint>
-                          </Constraints>
-
-                          <Layout class="org.netbeans.modules.form.compat2.layouts.support.JScrollPaneSupportLayout"/>
-                          <SubComponents>
-                            <Component class="javax.swing.JList" name="correlationTypeList">
-                              <Properties>
-                                <Property name="model" type="javax.swing.ListModel" editor="org.netbeans.modules.form.editors2.ListModelEditor">
-                                  <StringArray count="4">
-                                    <StringItem index="0" value="XX"/>
-                                    <StringItem index="1" value="XY"/>
-                                    <StringItem index="2" value="YX"/>
-                                    <StringItem index="3" value="YY"/>
-                                  </StringArray>
-                                </Property>
-                                <Property name="toolTipText" type="java.lang.String" value="Correlations of which polarizations to use, one or more of XX,XY,YX,YY. &#xa;&#xa;As an example, suppose you select &apos;XX&apos; here and set Selection to AUTO, then the X polarization signal of each station is correlated with itself. However if we set Selection to CROSS, then the X polarization of station A is correlated with the X polarization of station B for each base line."/>
-                              </Properties>
-                            </Component>
-                          </SubComponents>
-                        </Container>
-                      </SubComponents>
-                    </Container>
-                    <Container class="javax.swing.JPanel" name="workDomainSizePanel">
-                      <Properties>
-                        <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
-                          <Border info="org.netbeans.modules.form.compat2.border.TitledBorderInfo">
-                            <TitledBorder title="Work Domain Size"/>
-                          </Border>
-                        </Property>
-                        <Property name="toolTipText" type="java.lang.String" value="Size of the work domain in frequency and time. A work domain represents an amount of input data that is loaded into memory and processed as a single block. A large work domain size should reduce the overhead due to disk access."/>
-                      </Properties>
-                      <Constraints>
-                        <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
-                          <AbsoluteConstraints x="20" y="60" width="220" height="80"/>
-                        </Constraint>
-                      </Constraints>
-
-                      <Layout class="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout">
-                        <Property name="useNullLayout" type="boolean" value="false"/>
-                      </Layout>
-                      <SubComponents>
-                        <Component class="javax.swing.JLabel" name="wdsFrequencyLabel">
-                          <Properties>
-                            <Property name="text" type="java.lang.String" value="Frequency :"/>
-                          </Properties>
-                          <Constraints>
-                            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
-                              <AbsoluteConstraints x="20" y="20" width="-1" height="-1"/>
-                            </Constraint>
-                          </Constraints>
-                        </Component>
-                        <Component class="javax.swing.JTextField" name="wdsFrequencyText">
-                          <Properties>
-                            <Property name="toolTipText" type="java.lang.String" value="Size of the work domain in frequency"/>
-                          </Properties>
-                          <Constraints>
-                            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
-                              <AbsoluteConstraints x="100" y="20" width="80" height="-1"/>
-                            </Constraint>
-                          </Constraints>
-                        </Component>
-                        <Component class="javax.swing.JLabel" name="wdsFrequencyUnitLabel">
-                          <Properties>
-                            <Property name="text" type="java.lang.String" value="Hz"/>
-                          </Properties>
-                          <Constraints>
-                            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
-                              <AbsoluteConstraints x="190" y="20" width="-1" height="-1"/>
-                            </Constraint>
-                          </Constraints>
-                        </Component>
-                        <Component class="javax.swing.JLabel" name="wdsTimeLabel">
-                          <Properties>
-                            <Property name="text" type="java.lang.String" value="Time :"/>
-                          </Properties>
-                          <Constraints>
-                            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
-                              <AbsoluteConstraints x="20" y="50" width="-1" height="-1"/>
-                            </Constraint>
-                          </Constraints>
-                        </Component>
-                        <Component class="javax.swing.JTextField" name="wdsTimeText">
-                          <Properties>
-                            <Property name="toolTipText" type="java.lang.String" value="Size of the work work domain in time"/>
-                          </Properties>
-                          <Constraints>
-                            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
-                              <AbsoluteConstraints x="100" y="50" width="80" height="-1"/>
-                            </Constraint>
-                          </Constraints>
-                        </Component>
-                        <Component class="javax.swing.JLabel" name="wdsTimeUnitLabel">
-                          <Properties>
-                            <Property name="text" type="java.lang.String" value="s"/>
-                          </Properties>
-                          <Constraints>
-                            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
-                              <AbsoluteConstraints x="190" y="50" width="10" height="-1"/>
-                            </Constraint>
-                          </Constraints>
-                        </Component>
-                      </SubComponents>
-                    </Container>
-                    <Container class="javax.swing.JPanel" name="integrationIntervalPanel">
-                      <Properties>
-                        <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
-                          <Border info="org.netbeans.modules.form.compat2.border.TitledBorderInfo">
-                            <TitledBorder title="Integration"/>
-                          </Border>
-                        </Property>
-                        <Property name="toolTipText" type="java.lang.String" value="Cell size for integration. Allows the user to perform operations on a lower resolution, which should be faster in most cases"/>
-                      </Properties>
-                      <Constraints>
-                        <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
-                          <AbsoluteConstraints x="250" y="60" width="220" height="80"/>
-                        </Constraint>
-                      </Constraints>
-
-                      <Layout class="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout">
-                        <Property name="useNullLayout" type="boolean" value="false"/>
-                      </Layout>
-                      <SubComponents>
-                        <Component class="javax.swing.JLabel" name="integrationFrequencyLabel">
-                          <Properties>
-                            <Property name="text" type="java.lang.String" value="Freq. Interval :"/>
-                          </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="-1"/>
-                            </Constraint>
-                          </Constraints>
-                        </Component>
-                        <Component class="javax.swing.JTextField" name="integrationFrequencyText">
-                          <Constraints>
-                            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
-                              <AbsoluteConstraints x="110" y="20" width="70" height="-1"/>
-                            </Constraint>
-                          </Constraints>
-                        </Component>
-                        <Component class="javax.swing.JLabel" name="integrationFrequencyUnitLabel">
-                          <Properties>
-                            <Property name="text" type="java.lang.String" value="Hz"/>
-                          </Properties>
-                          <Constraints>
-                            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
-                              <AbsoluteConstraints x="190" y="20" width="-1" height="-1"/>
-                            </Constraint>
-                          </Constraints>
-                        </Component>
-                        <Component class="javax.swing.JLabel" name="integrationTimeLabel">
-                          <Properties>
-                            <Property name="text" type="java.lang.String" value="Time Interval :"/>
-                          </Properties>
-                          <Constraints>
-                            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
-                              <AbsoluteConstraints x="10" y="50" width="-1" height="-1"/>
-                            </Constraint>
-                          </Constraints>
-                        </Component>
-                        <Component class="javax.swing.JTextField" name="integrationTimeText">
-                          <Constraints>
-                            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
-                              <AbsoluteConstraints x="110" y="50" width="70" height="-1"/>
-                            </Constraint>
-                          </Constraints>
-                        </Component>
-                        <Component class="javax.swing.JLabel" name="integrationTimeUnitLabel">
-                          <Properties>
-                            <Property name="text" type="java.lang.String" value="s"/>
-                          </Properties>
-                          <Constraints>
-                            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
-                              <AbsoluteConstraints x="190" y="50" width="10" height="-1"/>
-                            </Constraint>
-                          </Constraints>
-                        </Component>
-                      </SubComponents>
-                    </Container>
-                    <Component class="javax.swing.JButton" name="strategySaveButton">
-                      <Properties>
-                        <Property name="text" type="java.lang.String" value="Save"/>
-                      </Properties>
-                      <Events>
-                        <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="strategySaveButtonActionPerformed"/>
-                      </Events>
-                      <Constraints>
-                        <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
-                          <AbsoluteConstraints x="580" y="500" width="-1" height="-1"/>
-                        </Constraint>
-                      </Constraints>
-                    </Component>
-                  </SubComponents>
-                </Container>
-              </SubComponents>
-            </Container>
-          </SubComponents>
-        </Container>
+        </Component>
         <Container class="javax.swing.JPanel" name="BBSStepExplorerPanel">
           <Constraints>
             <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JTabbedPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JTabbedPaneSupportLayout$JTabbedPaneConstraintsDescription">
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 625c3e3bef7..e0b566c1fe2 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
@@ -1,5 +1,5 @@
 /*
- * OLAPConficPanel.java
+ *  BBSPanel.java
  *
  *  Copyright (C) 2002-2007
  *  ASTRON (Netherlands Foundation for Research in Astronomy)
@@ -258,15 +258,20 @@ public class BBSPanel extends javax.swing.JPanel implements IViewPanel{
         String aKeyName = LofarUtils.keyName(aNode.name);
         
         if (aKeyName.equals("DataSet")) {
-            this.BBSDatasetText.setToolTipText(aNode.description);
+            this.BBSDatasetText.setToolTipText(aParam.description);
             this.dataSet=aNode;
+            
             if (isRef && aParam != null) {
-                BBSDatasetText.setText(aNode.limits + " : " + aParam.limits);
+                this.BBSDatasetDeRefText.setVisible(true);
+                BBSDatasetText.setText(aNode.limits);
+                BBSDatasetDeRefText.setText(aParam.limits);
             } else {
+                BBSDatasetDeRefText.setVisible(false);
+                BBSDatasetDeRefText.setText("");
                 BBSDatasetText.setText(aNode.limits);
             }
         }else if (aKeyName.equals("DBName")) {
-            this.BBDBDBNameText.setToolTipText(aNode.description);
+            this.BBDBDBNameText.setToolTipText(aParam.description);
             this.BBDBDBName=aNode;
             if (isRef && aParam != null) {
                 BBDBDBNameText.setText(aNode.limits + " : " + aParam.limits);
@@ -274,7 +279,7 @@ public class BBSPanel extends javax.swing.JPanel implements IViewPanel{
                 BBDBDBNameText.setText(aNode.limits);
             }
         }else if (aKeyName.equals("Host")) {
-            this.BBDBHostText.setToolTipText(aNode.description);
+            this.BBDBHostText.setToolTipText(aParam.description);
             this.BBDBHost=aNode;
             if (isRef && aParam != null) {
                 BBDBHostText.setText(aNode.limits + " : " + aParam.limits);
@@ -282,7 +287,7 @@ public class BBSPanel extends javax.swing.JPanel implements IViewPanel{
                 BBDBHostText.setText(aNode.limits);
             }
         }else if (aKeyName.equals("Port")) {
-            this.BBDBPortText.setToolTipText(aNode.description);
+            this.BBDBPortText.setToolTipText(aParam.description);
             this.BBDBPort=aNode;
             if (isRef && aParam != null) {
                 BBDBPortText.setText(aNode.limits + " : " + aParam.limits);
@@ -290,7 +295,7 @@ public class BBSPanel extends javax.swing.JPanel implements IViewPanel{
                 BBDBPortText.setText(aNode.limits);
             }
         }else if (aKeyName.equals("UserName")) {
-            this.BBDBDBUsernameText.setToolTipText(aNode.description);
+            this.BBDBDBUsernameText.setToolTipText(aParam.description);
             this.BBDBUsername=aNode;
             if (isRef && aParam != null) {
                 BBDBDBUsernameText.setText(aNode.limits + " : " + aParam.limits);
@@ -298,7 +303,7 @@ public class BBSPanel extends javax.swing.JPanel implements IViewPanel{
                 BBDBDBUsernameText.setText(aNode.limits);
             }
         }else if (aKeyName.equals("PassWord")) {
-            this.BBDBDBPasswordText.setToolTipText(aNode.description);
+            this.BBDBDBPasswordText.setToolTipText(aParam.description);
             this.BBDBPassword=aNode;
             if (isRef && aParam != null) {
                 BBDBDBPasswordText.setText(aNode.limits + " : " + aParam.limits);
@@ -306,7 +311,7 @@ public class BBSPanel extends javax.swing.JPanel implements IViewPanel{
                 BBDBDBPasswordText.setText(aNode.limits);
             }
         }else if (aKeyName.equals("Instrument")) {
-            this.ParmDBInstrumentText.setToolTipText(aNode.description);
+            this.ParmDBInstrumentText.setToolTipText(aParam.description);
             this.ParmDBInstrument=aNode;
             if (isRef && aParam != null) {
                 ParmDBInstrumentText.setText(aNode.limits + " : " + aParam.limits);
@@ -314,7 +319,7 @@ public class BBSPanel extends javax.swing.JPanel implements IViewPanel{
                 ParmDBInstrumentText.setText(aNode.limits);
             }
         }else if (aKeyName.equals("LocalSky")) {
-            this.ParmDBLocalSkyText.setToolTipText(aNode.description);
+            this.ParmDBLocalSkyText.setToolTipText(aParam.description);
             this.ParmDBLocalSky=aNode;
             if (isRef && aParam != null) {
                 ParmDBLocalSkyText.setText(aNode.limits + " : " + aParam.limits);
@@ -343,7 +348,6 @@ public class BBSPanel extends javax.swing.JPanel implements IViewPanel{
      */
     public void enableButtons(boolean enabled) {
         this.enableOverviewButtons(enabled);
-        this.enableDetailButtons(enabled);
     }
     
     /** Sets the buttons visible/invisible
@@ -352,7 +356,6 @@ public class BBSPanel extends javax.swing.JPanel implements IViewPanel{
      */
     public void setButtonsVisible(boolean visible) {
         this.setOverviewButtonsVisible(visible);
-        this.setDetailsButtonsVisible(visible);
     }
     private void enableOverviewButtons(boolean enabled) {
         this.configurationRevertButton.setEnabled(enabled);
@@ -362,49 +365,47 @@ public class BBSPanel extends javax.swing.JPanel implements IViewPanel{
         this.configurationRevertButton.setVisible(visible);
     }
     
-    private void enableDetailButtons(boolean enabled) {
-        this.strategyRevertButton.setEnabled(enabled);
-    }
-    
-    private void setDetailsButtonsVisible(boolean visible) {
-        this.strategyRevertButton.setVisible(visible);
-    }
-    
-    
     /** Enables/disables the complete form
      *
      * @param   enabled     true/false enabled/disabled
      */
     public void setAllEnabled(boolean enabled) {
         enableOverviewButtons(enabled);
-        enableDetailButtons(enabled);
     }
     
     private void saveInput() {
        
         if (this.dataSet != null && !this.BBSDatasetText.getText().equals(dataSet.limits)) {
             dataSet.limits = BBSDatasetText.getText();
+            logger.trace("Variable BBS ("+dataSet.name+"//"+dataSet.treeID()+"//"+dataSet.nodeID()+"//"+dataSet.parentID()+"//"+dataSet.paramDefID()+") from value ("+BBSDatasetText.getText()+") updated to :"+dataSet.limits);
             saveNode(dataSet);
         } else if (this.BBDBHost != null && !this.BBDBHostText.getText().equals(BBDBHost.limits)) {
             BBDBHost.limits = BBDBHostText.getText();
+            logger.trace("Variable BBS ("+BBDBHost.name+"//"+BBDBHost.treeID()+"//"+BBDBHost.nodeID()+"//"+BBDBHost.parentID()+"//"+BBDBHost.paramDefID()+") updated to :"+BBDBHost.limits);
             saveNode(BBDBHost);
         } else if (this.BBDBPort != null && !this.BBDBPortText.getText().equals(BBDBPort.limits)) {
             BBDBPort.limits = BBDBPortText.getText();
+            logger.trace("Variable BBS ("+BBDBPort.name+"//"+BBDBPort.treeID()+"//"+BBDBPort.nodeID()+"//"+BBDBPort.parentID()+"//"+BBDBPort.paramDefID()+") updated to :"+BBDBPort.limits);
             saveNode(BBDBPort);
         } else if (this.BBDBDBName != null && !this.BBDBDBNameText.getText().equals(BBDBDBName.limits)) {
             BBDBDBName.limits = BBDBDBNameText.getText();
+            logger.trace("Variable BBS ("+BBDBDBName.name+"//"+BBDBDBName.treeID()+"//"+BBDBDBName.nodeID()+"//"+BBDBDBName.parentID()+"//"+BBDBDBName.paramDefID()+") updated to :"+BBDBDBName.limits);
             saveNode(BBDBDBName);
         } else if (this.BBDBUsername != null && !this.BBDBDBUsernameText.getText().equals(BBDBUsername.limits)) {
             BBDBUsername.limits = BBDBDBUsernameText.getText();
+            logger.trace("Variable BBS ("+BBDBUsername.name+"//"+BBDBUsername.treeID()+"//"+BBDBUsername.nodeID()+"//"+BBDBUsername.parentID()+"//"+BBDBUsername.paramDefID()+") updated to :"+BBDBUsername.limits);
             saveNode(BBDBUsername);
         } else if (this.BBDBPassword != null && !this.BBDBDBPasswordText.getText().equals(BBDBPassword.limits)) {
             BBDBPassword.limits = BBDBDBPasswordText.getText();
+            logger.trace("Variable BBS ("+BBDBPassword.name+"//"+BBDBPassword.treeID()+"//"+BBDBPassword.nodeID()+"//"+BBDBPassword.parentID()+"//"+BBDBPassword.paramDefID()+") updated to :"+BBDBPassword.limits);
             saveNode(BBDBPassword);
         } else if (this.ParmDBInstrument != null && !this.ParmDBInstrumentText.getText().equals(ParmDBInstrument.limits)) {
             ParmDBInstrument.limits = ParmDBInstrumentText.getText();
+            logger.trace("Variable BBS ("+ParmDBInstrument.name+"//"+ParmDBInstrument.treeID()+"//"+ParmDBInstrument.nodeID()+"//"+ParmDBInstrument.parentID()+"//"+ParmDBInstrument.paramDefID()+") updated to :"+ParmDBInstrument.limits);
             saveNode(ParmDBInstrument);
         } else if (this.ParmDBLocalSky != null && !this.ParmDBLocalSkyText.getText().equals(ParmDBLocalSky.limits)) {
             ParmDBLocalSky.limits = ParmDBLocalSkyText.getText();
+            logger.trace("Variable BBS ("+ParmDBLocalSky.name+"//"+ParmDBLocalSky.treeID()+"//"+ParmDBLocalSky.nodeID()+"//"+ParmDBLocalSky.parentID()+"//"+ParmDBLocalSky.paramDefID()+") updated to :"+ParmDBLocalSky.limits);
             saveNode(ParmDBLocalSky);
         }
     }
@@ -440,52 +441,8 @@ public class BBSPanel extends javax.swing.JPanel implements IViewPanel{
         ParmDBLocalSkyLabel = new javax.swing.JLabel();
         ParmDBLocalSkyText = new javax.swing.JTextField();
         configurationRevertButton = new javax.swing.JButton();
-        configurationSaveButton = new javax.swing.JButton();
-        BBSStrategyPanel = new javax.swing.JPanel();
-        strategyScrollPane = new javax.swing.JScrollPane();
-        strategyPanel = new javax.swing.JPanel();
-        inputDataLabel = new javax.swing.JLabel();
-        inputDataText = new javax.swing.JTextField();
-        strategyRevertButton = new javax.swing.JButton();
-        stationsPanel = new javax.swing.JPanel();
-        stationsScrollPane = new javax.swing.JScrollPane();
-        stationsList = new javax.swing.JList();
-        stationsModPanel = new javax.swing.JPanel();
-        stationsUseAllCheckbox = new javax.swing.JCheckBox();
-        addStationButton = new javax.swing.JButton();
-        deleteStationButton = new javax.swing.JButton();
-        stepsPanel = new javax.swing.JPanel();
-        stepsScrollPane = new javax.swing.JScrollPane();
-        stepsTree = new javax.swing.JTree();
-        stepsModsPanel = new javax.swing.JPanel();
-        addStepButton = new javax.swing.JButton();
-        removeStepButton = new javax.swing.JButton();
-        modifyStepButton = new javax.swing.JButton();
-        loadTemplateStepButton = new javax.swing.JButton();
-        stepsMoveUpDownPanel = new javax.swing.JPanel();
-        moveStepUpButton = new javax.swing.JButton();
-        moveStepDownButton = new javax.swing.JButton();
-        correlationPanel = new javax.swing.JPanel();
-        correlationSelectionLabel = new javax.swing.JLabel();
-        correlationSelectionBox = new javax.swing.JComboBox();
-        correlationTypeLabel = new javax.swing.JLabel();
-        correlationTypeScrollPane = new javax.swing.JScrollPane();
-        correlationTypeList = new javax.swing.JList();
-        workDomainSizePanel = new javax.swing.JPanel();
-        wdsFrequencyLabel = new javax.swing.JLabel();
-        wdsFrequencyText = new javax.swing.JTextField();
-        wdsFrequencyUnitLabel = new javax.swing.JLabel();
-        wdsTimeLabel = new javax.swing.JLabel();
-        wdsTimeText = new javax.swing.JTextField();
-        wdsTimeUnitLabel = new javax.swing.JLabel();
-        integrationIntervalPanel = new javax.swing.JPanel();
-        integrationFrequencyLabel = new javax.swing.JLabel();
-        integrationFrequencyText = new javax.swing.JTextField();
-        integrationFrequencyUnitLabel = new javax.swing.JLabel();
-        integrationTimeLabel = new javax.swing.JLabel();
-        integrationTimeText = new javax.swing.JTextField();
-        integrationTimeUnitLabel = new javax.swing.JLabel();
-        strategySaveButton = new javax.swing.JButton();
+        BBSDatasetDeRefText = new javax.swing.JTextField();
+        BBSStrategyPanel = new nl.astron.lofar.sas.otbcomponents.bbs.BBSStrategyPanel();
         BBSStepExplorerPanel = new javax.swing.JPanel();
         stepExplorerScrollPanel = new javax.swing.JScrollPane();
         stepExplorerPanel = new javax.swing.JPanel();
@@ -662,231 +619,15 @@ public class BBSPanel extends javax.swing.JPanel implements IViewPanel{
 
         BBSGlobalSettingsPanel.add(configurationRevertButton, new org.netbeans.lib.awtextra.AbsoluteConstraints(20, 330, 81, -1));
 
-        configurationSaveButton.setText("Save");
-        configurationSaveButton.addActionListener(new java.awt.event.ActionListener() {
-            public void actionPerformed(java.awt.event.ActionEvent evt) {
-                configurationSaveButtonActionPerformed(evt);
-            }
-        });
-
-        BBSGlobalSettingsPanel.add(configurationSaveButton, new org.netbeans.lib.awtextra.AbsoluteConstraints(290, 330, -1, -1));
+        BBSDatasetDeRefText.setEditable(false);
+        BBSDatasetDeRefText.setToolTipText("Dereferenced and actually used value.");
+        BBSDatasetDeRefText.setMaximumSize(new java.awt.Dimension(440, 19));
+        BBSDatasetDeRefText.setMinimumSize(new java.awt.Dimension(440, 19));
+        BBSDatasetDeRefText.setPreferredSize(new java.awt.Dimension(440, 19));
+        BBSGlobalSettingsPanel.add(BBSDatasetDeRefText, new org.netbeans.lib.awtextra.AbsoluteConstraints(360, 30, 180, -1));
 
         jTabbedPane1.addTab("Global Settings", BBSGlobalSettingsPanel);
 
-        BBSStrategyPanel.setLayout(new java.awt.BorderLayout());
-
-        strategyPanel.setLayout(new org.netbeans.lib.awtextra.AbsoluteLayout());
-
-        inputDataLabel.setText("Input Data Column:");
-        strategyPanel.add(inputDataLabel, new org.netbeans.lib.awtextra.AbsoluteConstraints(30, 30, -1, -1));
-
-        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, 120, -1));
-
-        strategyRevertButton.setText("Revert");
-        strategyRevertButton.addActionListener(new java.awt.event.ActionListener() {
-            public void actionPerformed(java.awt.event.ActionEvent evt) {
-                strategyRevertButtonActionPerformed(evt);
-            }
-        });
-
-        strategyPanel.add(strategyRevertButton, new org.netbeans.lib.awtextra.AbsoluteConstraints(30, 500, -1, -1));
-
-        stationsPanel.setLayout(new java.awt.BorderLayout());
-
-        stationsPanel.setBorder(javax.swing.BorderFactory.createTitledBorder("Station Names"));
-        stationsPanel.setToolTipText("Identifiers of the participating stations.");
-        stationsList.setModel(new javax.swing.AbstractListModel() {
-            String[] strings = { "1", "2", "3", "4", "5" };
-            public int getSize() { return strings.length; }
-            public Object getElementAt(int i) { return strings[i]; }
-        });
-        stationsList.setToolTipText("Identifiers of the participating stations.");
-        stationsScrollPane.setViewportView(stationsList);
-
-        stationsPanel.add(stationsScrollPane, java.awt.BorderLayout.CENTER);
-
-        stationsModPanel.setLayout(new java.awt.GridBagLayout());
-
-        stationsUseAllCheckbox.setText("Use all stations");
-        stationsUseAllCheckbox.setBorder(javax.swing.BorderFactory.createEmptyBorder(0, 0, 0, 0));
-        stationsUseAllCheckbox.setMargin(new java.awt.Insets(0, 0, 0, 0));
-        stationsUseAllCheckbox.addChangeListener(new javax.swing.event.ChangeListener() {
-            public void stateChanged(javax.swing.event.ChangeEvent evt) {
-                stationsUseAllCheckboxStateChanged(evt);
-            }
-        });
-
-        gridBagConstraints = new java.awt.GridBagConstraints();
-        gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST;
-        gridBagConstraints.insets = new java.awt.Insets(2, 2, 2, 2);
-        stationsModPanel.add(stationsUseAllCheckbox, gridBagConstraints);
-
-        addStationButton.setText("A");
-        gridBagConstraints = new java.awt.GridBagConstraints();
-        gridBagConstraints.insets = new java.awt.Insets(2, 2, 2, 2);
-        stationsModPanel.add(addStationButton, gridBagConstraints);
-
-        deleteStationButton.setText("D");
-        gridBagConstraints = new java.awt.GridBagConstraints();
-        gridBagConstraints.insets = new java.awt.Insets(2, 2, 2, 2);
-        stationsModPanel.add(deleteStationButton, gridBagConstraints);
-
-        stationsPanel.add(stationsModPanel, java.awt.BorderLayout.SOUTH);
-
-        strategyPanel.add(stationsPanel, new org.netbeans.lib.awtextra.AbsoluteConstraints(20, 150, 220, 330));
-
-        stepsPanel.setLayout(new java.awt.BorderLayout());
-
-        stepsPanel.setBorder(javax.swing.BorderFactory.createTitledBorder("Steps"));
-        stepsPanel.setToolTipText("The names of the steps that compose the strategy.");
-        stepsPanel.setPreferredSize(new java.awt.Dimension(100, 100));
-        stepsTree.setToolTipText("The names of the steps that compose the strategy.");
-        stepsScrollPane.setViewportView(stepsTree);
-
-        stepsPanel.add(stepsScrollPane, java.awt.BorderLayout.CENTER);
-
-        stepsModsPanel.setLayout(new java.awt.GridBagLayout());
-
-        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");
-        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");
-        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");
-        gridBagConstraints = new java.awt.GridBagConstraints();
-        gridBagConstraints.gridx = 3;
-        gridBagConstraints.gridy = 0;
-        gridBagConstraints.insets = new java.awt.Insets(2, 2, 2, 2);
-        stepsModsPanel.add(loadTemplateStepButton, gridBagConstraints);
-
-        stepsPanel.add(stepsModsPanel, java.awt.BorderLayout.SOUTH);
-
-        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");
-        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");
-        gridBagConstraints = new java.awt.GridBagConstraints();
-        gridBagConstraints.gridx = 0;
-        gridBagConstraints.gridy = 1;
-        gridBagConstraints.insets = new java.awt.Insets(2, 2, 2, 2);
-        stepsMoveUpDownPanel.add(moveStepDownButton, gridBagConstraints);
-
-        stepsPanel.add(stepsMoveUpDownPanel, java.awt.BorderLayout.EAST);
-
-        strategyPanel.add(stepsPanel, new org.netbeans.lib.awtextra.AbsoluteConstraints(250, 150, 400, 330));
-
-        correlationPanel.setLayout(new org.netbeans.lib.awtextra.AbsoluteLayout());
-
-        correlationPanel.setBorder(javax.swing.BorderFactory.createTitledBorder("Correlation"));
-        correlationSelectionLabel.setText("Selection :");
-        correlationPanel.add(correlationSelectionLabel, new org.netbeans.lib.awtextra.AbsoluteConstraints(20, 30, -1, -1));
-
-        correlationSelectionBox.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "AUTO", "CROSS", "ALL" }));
-        correlationSelectionBox.setToolTipText("Station correlations to use.\n\nAUTO: Use only correlations of each station with itself (i.e. no base lines).Not yet implemented.\nCROSS: Use only correlations between stations (i.e. base lines).\nALL: Use both AUTO and CROSS correlations.");
-        correlationPanel.add(correlationSelectionBox, new org.netbeans.lib.awtextra.AbsoluteConstraints(20, 50, 80, -1));
-
-        correlationTypeLabel.setText("Type :");
-        correlationPanel.add(correlationTypeLabel, new org.netbeans.lib.awtextra.AbsoluteConstraints(110, 10, -1, -1));
-
-        correlationTypeList.setModel(new javax.swing.AbstractListModel() {
-            String[] strings = { "XX", "XY", "YX", "YY" };
-            public int getSize() { return strings.length; }
-            public Object getElementAt(int i) { return strings[i]; }
-        });
-        correlationTypeList.setToolTipText("Correlations of which polarizations to use, one or more of XX,XY,YX,YY. \n\nAs an example, suppose you select 'XX' here and set Selection to AUTO, then the X polarization signal of each station is correlated with itself. However if we set Selection to CROSS, then the X polarization of station A is correlated with the X polarization of station B for each base line.");
-        correlationTypeScrollPane.setViewportView(correlationTypeList);
-
-        correlationPanel.add(correlationTypeScrollPane, new org.netbeans.lib.awtextra.AbsoluteConstraints(110, 30, 50, 80));
-
-        strategyPanel.add(correlationPanel, new org.netbeans.lib.awtextra.AbsoluteConstraints(480, 20, 170, 120));
-
-        workDomainSizePanel.setLayout(new org.netbeans.lib.awtextra.AbsoluteLayout());
-
-        workDomainSizePanel.setBorder(javax.swing.BorderFactory.createTitledBorder("Work Domain Size"));
-        workDomainSizePanel.setToolTipText("Size of the work domain in frequency and time. A work domain represents an amount of input data that is loaded into memory and processed as a single block. A large work domain size should reduce the overhead due to disk access.");
-        wdsFrequencyLabel.setText("Frequency :");
-        workDomainSizePanel.add(wdsFrequencyLabel, new org.netbeans.lib.awtextra.AbsoluteConstraints(20, 20, -1, -1));
-
-        wdsFrequencyText.setToolTipText("Size of the work domain in frequency");
-        workDomainSizePanel.add(wdsFrequencyText, new org.netbeans.lib.awtextra.AbsoluteConstraints(100, 20, 80, -1));
-
-        wdsFrequencyUnitLabel.setText("Hz");
-        workDomainSizePanel.add(wdsFrequencyUnitLabel, new org.netbeans.lib.awtextra.AbsoluteConstraints(190, 20, -1, -1));
-
-        wdsTimeLabel.setText("Time :");
-        workDomainSizePanel.add(wdsTimeLabel, new org.netbeans.lib.awtextra.AbsoluteConstraints(20, 50, -1, -1));
-
-        wdsTimeText.setToolTipText("Size of the work work domain in time");
-        workDomainSizePanel.add(wdsTimeText, new org.netbeans.lib.awtextra.AbsoluteConstraints(100, 50, 80, -1));
-
-        wdsTimeUnitLabel.setText("s");
-        workDomainSizePanel.add(wdsTimeUnitLabel, new org.netbeans.lib.awtextra.AbsoluteConstraints(190, 50, 10, -1));
-
-        strategyPanel.add(workDomainSizePanel, new org.netbeans.lib.awtextra.AbsoluteConstraints(20, 60, 220, 80));
-
-        integrationIntervalPanel.setLayout(new org.netbeans.lib.awtextra.AbsoluteLayout());
-
-        integrationIntervalPanel.setBorder(javax.swing.BorderFactory.createTitledBorder("Integration"));
-        integrationIntervalPanel.setToolTipText("Cell size for integration. Allows the user to perform operations on a lower resolution, which should be faster in most cases");
-        integrationFrequencyLabel.setText("Freq. Interval :");
-        integrationIntervalPanel.add(integrationFrequencyLabel, new org.netbeans.lib.awtextra.AbsoluteConstraints(10, 20, -1, -1));
-
-        integrationIntervalPanel.add(integrationFrequencyText, new org.netbeans.lib.awtextra.AbsoluteConstraints(110, 20, 70, -1));
-
-        integrationFrequencyUnitLabel.setText("Hz");
-        integrationIntervalPanel.add(integrationFrequencyUnitLabel, new org.netbeans.lib.awtextra.AbsoluteConstraints(190, 20, -1, -1));
-
-        integrationTimeLabel.setText("Time Interval :");
-        integrationIntervalPanel.add(integrationTimeLabel, new org.netbeans.lib.awtextra.AbsoluteConstraints(10, 50, -1, -1));
-
-        integrationIntervalPanel.add(integrationTimeText, new org.netbeans.lib.awtextra.AbsoluteConstraints(110, 50, 70, -1));
-
-        integrationTimeUnitLabel.setText("s");
-        integrationIntervalPanel.add(integrationTimeUnitLabel, new org.netbeans.lib.awtextra.AbsoluteConstraints(190, 50, 10, -1));
-
-        strategyPanel.add(integrationIntervalPanel, new org.netbeans.lib.awtextra.AbsoluteConstraints(250, 60, 220, 80));
-
-        strategySaveButton.setText("Save");
-        strategySaveButton.addActionListener(new java.awt.event.ActionListener() {
-            public void actionPerformed(java.awt.event.ActionEvent evt) {
-                strategySaveButtonActionPerformed(evt);
-            }
-        });
-
-        strategyPanel.add(strategySaveButton, new org.netbeans.lib.awtextra.AbsoluteConstraints(580, 500, -1, -1));
-
-        strategyScrollPane.setViewportView(strategyPanel);
-
-        BBSStrategyPanel.add(strategyScrollPane, java.awt.BorderLayout.CENTER);
-
         jTabbedPane1.addTab("Strategy", BBSStrategyPanel);
 
         BBSStepExplorerPanel.setLayout(new java.awt.BorderLayout());
@@ -1313,29 +1054,11 @@ public class BBSPanel extends javax.swing.JPanel implements IViewPanel{
         add(buttonPanel1, java.awt.BorderLayout.SOUTH);
 
     }// </editor-fold>//GEN-END:initComponents
-    
-    private void configurationSaveButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_configurationSaveButtonActionPerformed
-// TODO add your handling code here:
-    }//GEN-LAST:event_configurationSaveButtonActionPerformed
-    
-    private void strategySaveButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_strategySaveButtonActionPerformed
-// TODO add your handling code here:
-    }//GEN-LAST:event_strategySaveButtonActionPerformed
-    
+            
     private void stepExplorerSaveButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_stepExplorerSaveButtonActionPerformed
 // TODO add your handling code here:
     }//GEN-LAST:event_stepExplorerSaveButtonActionPerformed
-    
-    private void stationsUseAllCheckboxStateChanged(javax.swing.event.ChangeEvent evt) {//GEN-FIRST:event_stationsUseAllCheckboxStateChanged
-        if(this.stationsUseAllCheckbox.isSelected()){
-            this.stationsList.setBackground(Color.LIGHT_GRAY);
-            this.stationsList.setEnabled(false);
-        }else{
-            this.stationsList.setBackground(Color.WHITE);
-            this.stationsList.setEnabled(true);
-        }
-    }//GEN-LAST:event_stationsUseAllCheckboxStateChanged
-    
+        
     private void stepExplorerRevertButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_stepExplorerRevertButtonActionPerformed
 // TODO add your handling code here:
     }//GEN-LAST:event_stepExplorerRevertButtonActionPerformed
@@ -1358,11 +1081,7 @@ public class BBSPanel extends javax.swing.JPanel implements IViewPanel{
     private void configurationRevertButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_configurationRevertButtonActionPerformed
         this.restoreBBSGlobalSettingsPanel();
     }//GEN-LAST:event_configurationRevertButtonActionPerformed
-    
-    private void strategyRevertButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_strategyRevertButtonActionPerformed
-        this.restoreBBSStrategyPanel();
-    }//GEN-LAST:event_strategyRevertButtonActionPerformed
-    
+        
     private void buttonPanel1ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_buttonPanel1ActionPerformed
         if(evt.getActionCommand() == "Save Settings") {
             saveInput();
@@ -1375,15 +1094,6 @@ public class BBSPanel extends javax.swing.JPanel implements IViewPanel{
     
     // Global Settings parameters
     private jOTDBnode dataSet;
-    private jOTDBnode StrategySteps;
-    private jOTDBnode StrategyStations;
-    private jOTDBnode StrategyInputData;
-    private jOTDBnode StrategyCorrelationSelection;
-    private jOTDBnode StrategyCorrelationType;
-    private jOTDBnode StrategyWDSFrequency;
-    private jOTDBnode StrategyWDSTime;
-    private jOTDBnode StrategyIntegrationFrequency;
-    private jOTDBnode StrategyIntegrationTime;
     
     private jOTDBnode BBDBHost;
     private jOTDBnode BBDBPort;
@@ -1406,11 +1116,12 @@ public class BBSPanel extends javax.swing.JPanel implements IViewPanel{
     private javax.swing.JLabel BBDBPortLabel;
     private javax.swing.JTextField BBDBPortText;
     private javax.swing.JPanel BBDatabasePanel;
+    private javax.swing.JTextField BBSDatasetDeRefText;
     private javax.swing.JLabel BBSDatasetLabel;
     private javax.swing.JTextField BBSDatasetText;
     private javax.swing.JPanel BBSGlobalSettingsPanel;
     private javax.swing.JPanel BBSStepExplorerPanel;
-    private javax.swing.JPanel BBSStrategyPanel;
+    private nl.astron.lofar.sas.otbcomponents.bbs.BBSStrategyPanel BBSStrategyPanel;
     private javax.swing.JPanel BaselineSelectionPanel;
     private javax.swing.JLabel ParmDBInstrumentLabel;
     private javax.swing.JTextField ParmDBInstrumentText;
@@ -1423,8 +1134,6 @@ public class BBSPanel extends javax.swing.JPanel implements IViewPanel{
     private javax.swing.JButton addSolvableParmButton1;
     private javax.swing.JButton addSourceButton;
     private javax.swing.JButton addSourceButton1;
-    private javax.swing.JButton addStationButton;
-    private javax.swing.JButton addStepButton;
     private javax.swing.JPanel baseLineCorrelationPanel;
     private javax.swing.JPanel baselineGlobalPanel;
     private javax.swing.JPanel baselineModsPanel;
@@ -1438,45 +1147,23 @@ public class BBSPanel extends javax.swing.JPanel implements IViewPanel{
     private javax.swing.JScrollPane blCorrelationTypeScrollPane;
     private nl.astron.lofar.sas.otbcomponents.ButtonPanel buttonPanel1;
     private javax.swing.JButton configurationRevertButton;
-    private javax.swing.JButton configurationSaveButton;
-    private javax.swing.JPanel correlationPanel;
-    private javax.swing.JComboBox correlationSelectionBox;
-    private javax.swing.JLabel correlationSelectionLabel;
-    private javax.swing.JLabel correlationTypeLabel;
-    private javax.swing.JList correlationTypeList;
-    private javax.swing.JScrollPane correlationTypeScrollPane;
     private javax.swing.JButton deleteBaseLineButton;
     private javax.swing.JButton deleteInstrumentModelButton;
     private javax.swing.JButton deleteSolvableParmButton;
     private javax.swing.JButton deleteSolvableParmButton1;
     private javax.swing.JButton deleteSourceButton1;
     private javax.swing.JButton deleteSourceButton2;
-    private javax.swing.JButton deleteStationButton;
     private javax.swing.JButton exploreFirstChildStepButton;
     private javax.swing.JButton exploreNextStepButton;
     private javax.swing.JButton exploreParentStepButton;
     private javax.swing.JButton explorePreviousStepButton;
-    private javax.swing.JLabel inputDataLabel;
-    private javax.swing.JTextField inputDataText;
-    private javax.swing.JLabel integrationFrequencyLabel;
-    private javax.swing.JTextField integrationFrequencyText;
-    private javax.swing.JLabel integrationFrequencyUnitLabel;
-    private javax.swing.JPanel integrationIntervalPanel;
-    private javax.swing.JLabel integrationTimeLabel;
-    private javax.swing.JTextField integrationTimeText;
-    private javax.swing.JLabel integrationTimeUnitLabel;
     private javax.swing.JTabbedPane jTabbedPane1;
-    private javax.swing.JButton loadTemplateStepButton;
     private javax.swing.JButton modifyBaseLineButton;
     private javax.swing.JButton modifyInstrumentModelButton;
     private javax.swing.JButton modifySolvableParmButton;
     private javax.swing.JButton modifySolvableParmButton1;
     private javax.swing.JButton modifySourceButton;
     private javax.swing.JButton modifySourceButton1;
-    private javax.swing.JButton modifyStepButton;
-    private javax.swing.JButton moveStepDownButton;
-    private javax.swing.JButton moveStepUpButton;
-    private javax.swing.JButton removeStepButton;
     private javax.swing.JPanel seOperationAttributeGroup1;
     private javax.swing.JPanel seOperationAttributeGroup2;
     private javax.swing.JPanel seOperationAttributeGroup3;
@@ -1500,11 +1187,6 @@ public class BBSPanel extends javax.swing.JPanel implements IViewPanel{
     private javax.swing.JList seSolvableParmList1;
     private javax.swing.JScrollPane seSolvableParmScrollPane;
     private javax.swing.JScrollPane seSolvableParmScrollPane1;
-    private javax.swing.JList stationsList;
-    private javax.swing.JPanel stationsModPanel;
-    private javax.swing.JPanel stationsPanel;
-    private javax.swing.JScrollPane stationsScrollPane;
-    private javax.swing.JCheckBox stationsUseAllCheckbox;
     private javax.swing.JPanel stepExplorerGlobalSources;
     private javax.swing.JList stepExplorerInstrumentModelList;
     private javax.swing.JPanel stepExplorerInstrumentModelModsPanel;
@@ -1530,22 +1212,6 @@ public class BBSPanel extends javax.swing.JPanel implements IViewPanel{
     private javax.swing.JPanel stepExplorerSourcesPanel1;
     private javax.swing.JScrollPane stepExplorerSourcesScrollPane;
     private javax.swing.JScrollPane stepExplorerSourcesScrollPane1;
-    private javax.swing.JPanel stepsModsPanel;
-    private javax.swing.JPanel stepsMoveUpDownPanel;
-    private javax.swing.JPanel stepsPanel;
-    private javax.swing.JScrollPane stepsScrollPane;
-    private javax.swing.JTree stepsTree;
-    private javax.swing.JPanel strategyPanel;
-    private javax.swing.JButton strategyRevertButton;
-    private javax.swing.JButton strategySaveButton;
-    private javax.swing.JScrollPane strategyScrollPane;
-    private javax.swing.JLabel wdsFrequencyLabel;
-    private javax.swing.JTextField wdsFrequencyText;
-    private javax.swing.JLabel wdsFrequencyUnitLabel;
-    private javax.swing.JLabel wdsTimeLabel;
-    private javax.swing.JTextField wdsTimeText;
-    private javax.swing.JLabel wdsTimeUnitLabel;
-    private javax.swing.JPanel workDomainSizePanel;
     // End of variables declaration//GEN-END:variables
     
     /**
-- 
GitLab