diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/MultiEditDialog.form b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/MultiEditDialog.form
index a7a2d2d525a35ce50908ea9cf741ac8bc4df439f..ad05ac6fe621ffcaec688193824079f757bd11e5 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/MultiEditDialog.form
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/MultiEditDialog.form
@@ -35,41 +35,25 @@
</Group>
<Group type="102" alignment="0" attributes="0">
<EmptySpace max="-2" attributes="0"/>
- <Group type="103" groupAlignment="0" attributes="0">
- <Group type="102" alignment="1" attributes="0">
- <Group type="103" groupAlignment="1" attributes="0">
- <Component id="applyMSNameMask" min="-2" max="-2" attributes="0"/>
- <Component id="applyStorageNodes" min="-2" max="-2" attributes="0"/>
- <Component id="applyStationList" alignment="1" min="-2" max="-2" attributes="0"/>
- </Group>
- <EmptySpace type="separate" max="-2" attributes="0"/>
- <Group type="103" groupAlignment="0" attributes="0">
- <Component id="storageNodeSelectionPanel" alignment="0" min="-2" max="-2" attributes="0"/>
- <Group type="102" alignment="0" attributes="0">
- <Component id="coreStationSelectionPanel" min="-2" max="-2" attributes="0"/>
- <EmptySpace max="-2" attributes="0"/>
- <Component id="remoteStationSelectionPanel" min="-2" max="-2" attributes="0"/>
- <EmptySpace max="-2" attributes="0"/>
- <Component id="europeStationSelectionPanel" min="-2" max="-2" attributes="0"/>
- </Group>
- <Group type="102" alignment="0" attributes="0">
- <Component id="labelMSNameMask" min="-2" pref="84" max="-2" attributes="1"/>
- <EmptySpace max="-2" attributes="0"/>
- <Component id="inputMSNameMask" min="-2" pref="777" max="-2" attributes="1"/>
- </Group>
- </Group>
- <EmptySpace min="-2" pref="53" max="-2" attributes="0"/>
- </Group>
- <Group type="102" alignment="0" attributes="0">
- <Component id="restoreButton" pref="142" max="32767" attributes="0"/>
- <EmptySpace max="-2" attributes="0"/>
- <Component id="cancelButton" min="-2" max="-2" attributes="0"/>
- <EmptySpace max="-2" attributes="0"/>
- <Component id="saveButton" min="-2" pref="90" max="-2" attributes="0"/>
- <EmptySpace type="separate" max="-2" attributes="0"/>
- <Component id="statusLabel" pref="627" max="32767" attributes="0"/>
- </Group>
- </Group>
+ <Component id="applyStationList" min="-2" max="-2" attributes="0"/>
+ <EmptySpace type="separate" max="-2" attributes="0"/>
+ <Component id="coreStationSelectionPanel" min="-2" max="-2" attributes="0"/>
+ <EmptySpace max="-2" attributes="0"/>
+ <Component id="remoteStationSelectionPanel" min="-2" max="-2" attributes="0"/>
+ <EmptySpace max="-2" attributes="0"/>
+ <Component id="europeStationSelectionPanel" min="-2" max="-2" attributes="0"/>
+ <EmptySpace min="-2" pref="53" max="-2" attributes="0"/>
+ </Group>
+ <Group type="102" alignment="1" attributes="0">
+ <EmptySpace max="-2" attributes="0"/>
+ <Component id="restoreButton" pref="196" max="32767" attributes="0"/>
+ <EmptySpace max="-2" attributes="0"/>
+ <Component id="cancelButton" min="-2" max="-2" attributes="0"/>
+ <EmptySpace max="-2" attributes="0"/>
+ <Component id="saveButton" min="-2" pref="90" max="-2" attributes="0"/>
+ <EmptySpace type="separate" max="-2" attributes="0"/>
+ <Component id="statusLabel" min="-2" pref="585" max="-2" attributes="0"/>
+ <EmptySpace min="-2" pref="65" max="-2" attributes="0"/>
</Group>
</Group>
<EmptySpace max="-2" attributes="0"/>
@@ -88,34 +72,22 @@
<Component id="remoteStationSelectionPanel" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="europeStationSelectionPanel" alignment="3" min="-2" max="-2" attributes="0"/>
</Group>
- <EmptySpace type="unrelated" max="-2" attributes="0"/>
- <Component id="storageNodeSelectionPanel" min="-2" pref="207" max="-2" attributes="1"/>
</Group>
<Group type="102" alignment="0" attributes="0">
<EmptySpace min="-2" pref="131" max="-2" attributes="0"/>
<Component id="applyStationList" min="-2" max="-2" attributes="0"/>
- <EmptySpace min="-2" pref="192" max="-2" attributes="0"/>
- <Component id="applyStorageNodes" min="-2" max="-2" attributes="0"/>
- </Group>
- </Group>
- <EmptySpace type="separate" max="-2" attributes="0"/>
- <Group type="103" groupAlignment="0" attributes="0">
- <Group type="103" groupAlignment="3" attributes="0">
- <Component id="inputMSNameMask" alignment="3" min="-2" max="-2" attributes="0"/>
- <Component id="labelMSNameMask" alignment="3" min="-2" max="-2" attributes="0"/>
</Group>
- <Component id="applyMSNameMask" min="-2" max="-2" attributes="0"/>
</Group>
- <EmptySpace min="-2" pref="57" max="-2" attributes="0"/>
- <Group type="103" groupAlignment="1" max="-2" attributes="0">
- <Component id="statusLabel" max="32767" attributes="1"/>
- <Group type="103" alignment="0" groupAlignment="3" attributes="0">
+ <EmptySpace min="-2" pref="68" max="-2" attributes="0"/>
+ <Group type="103" groupAlignment="1" attributes="0">
+ <Component id="statusLabel" pref="26" max="32767" attributes="1"/>
+ <Group type="103" alignment="0" groupAlignment="1" max="-2" attributes="0">
<Component id="restoreButton" alignment="1" max="32767" attributes="1"/>
<Component id="cancelButton" alignment="1" max="32767" attributes="1"/>
- <Component id="saveButton" alignment="1" max="32767" attributes="1"/>
+ <Component id="saveButton" alignment="1" min="-2" max="-2" attributes="1"/>
</Group>
</Group>
- <EmptySpace pref="162" max="32767" attributes="0"/>
+ <EmptySpace pref="38" max="32767" attributes="0"/>
</Group>
</Group>
</DimensionLayout>
@@ -187,28 +159,6 @@
<Property name="enabled" type="boolean" value="false"/>
</Properties>
</Component>
- <Component class="nl.astron.lofar.sas.otbcomponents.StorageSelectionPanel" name="storageNodeSelectionPanel">
- <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 justification="2" title="StorageNode List">
- <Font PropertyName="font" name="Tahoma" size="11" style="1"/>
- </TitledBorder>
- </Border>
- </Property>
- <Property name="enabled" type="boolean" value="false"/>
- </Properties>
- </Component>
- <Component class="javax.swing.JLabel" name="labelMSNameMask">
- <Properties>
- <Property name="text" type="java.lang.String" value="MSNameMask:"/>
- </Properties>
- </Component>
- <Component class="javax.swing.JTextField" name="inputMSNameMask">
- <Properties>
- <Property name="enabled" type="boolean" value="false"/>
- </Properties>
- </Component>
<Component class="javax.swing.JButton" name="restoreButton">
<Properties>
<Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
@@ -227,19 +177,13 @@
</Properties>
</Component>
<Component class="javax.swing.JCheckBox" name="applyStationList">
+ <Properties>
+ <Property name="text" type="java.lang.String" value="Edit?"/>
+ <Property name="toolTipText" type="java.lang.String" value="Select if you want to edit the stationlists"/>
+ </Properties>
<Events>
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="applyStationListActionPerformed"/>
</Events>
</Component>
- <Component class="javax.swing.JCheckBox" name="applyStorageNodes">
- <Events>
- <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="applyStorageNodesActionPerformed"/>
- </Events>
- </Component>
- <Component class="javax.swing.JCheckBox" name="applyMSNameMask">
- <Events>
- <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="applyMSNameMaskActionPerformed"/>
- </Events>
- </Component>
</SubComponents>
</Form>
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/MultiEditDialog.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/MultiEditDialog.java
index 0cf6f0e7dba2f1a63c9046a48b36a265af873c00..807fb00f81adfb73b68ab4e9220dbd20d1819e3b 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/MultiEditDialog.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/MultiEditDialog.java
@@ -93,13 +93,9 @@ public class MultiEditDialog extends javax.swing.JDialog {
europeStationSelectionPanel.setTitle("Europe");
europeStationSelectionPanel.init();
europeStationSelectionPanel.setEnabled(false);
- storageNodeSelectionPanel.init();
- storageNodeSelectionPanel.setEnabled(false);
statusLabel.setText("");
applyStationList.setSelected(false);
- applyStorageNodes.setSelected(false);
- applyMSNameMask.setSelected(false);
isAdministrator = itsMainFrame.getUserAccount().isAdministrator();
jOTDBparam aParam=null;
@@ -108,7 +104,6 @@ public class MultiEditDialog extends javax.swing.JDialog {
//We are looking for:
// VirtualInstrument.stationList
- // VirtualInstrument.storageNodeList
Vector<jOTDBnode> node = OtdbRmi.getRemoteMaintenance().getItemList(itsTreeIDs[0], "VirtualInstrument");
if (node.size() > 0) {
jOTDBnode aNode = node.firstElement();
@@ -126,23 +121,6 @@ public class MultiEditDialog extends javax.swing.JDialog {
}
}
- // Observation.MSNameMask
- node = OtdbRmi.getRemoteMaintenance().getItemList(itsTreeIDs[0], "Observation");
- if (node.size() > 0) {
- jOTDBnode aNode = node.firstElement();
- Vector<jOTDBnode> childs = OtdbRmi.getRemoteMaintenance().getItemList(aNode.treeID(), aNode.nodeID(), 1);
- // get all the params per child
- Enumeration e = childs.elements();
- while (e.hasMoreElements()) {
- jOTDBnode anotherNode = (jOTDBnode) e.nextElement();
- aParam = null;
- // We need to keep all the params needed by this panel
- if (anotherNode.leaf) {
- aParam = OtdbRmi.getRemoteMaintenance().getParam(anotherNode);
- }
- setField("Observation", aParam, anotherNode);
- }
- }
restore();
@@ -197,22 +175,6 @@ public class MultiEditDialog extends javax.swing.JDialog {
this.europeStationSelectionPanel.setToolTipText(aParam.description);
this.itsStationList = aNode;
setStationLists(aNode.limits);
- } else if (aKeyName.equals("storageNodeList")) {
- this.storageNodeSelectionPanel.setToolTipText(aParam.description);
- this.itsStorageNodeList = aNode;
- setStorageNodeLists(aNode.limits);
- }
- } else if (parentName.equals("Observation")) {
- // Observation VirtualInstrument parameters
-
- if (aKeyName.equals("MSNameMask")) {
- inputMSNameMask.setToolTipText(aParam.description);
- itsMSNameMask=aNode;
- if (isRef && aParam != null) {
- inputMSNameMask.setText(aNode.limits + " : " + aParam.limits);
- } else {
- inputMSNameMask.setText(aNode.limits);
- }
}
}
@@ -252,16 +214,6 @@ public class MultiEditDialog extends javax.swing.JDialog {
if (aKeyName.equals("stationList") && setStationList) {
aNode.limits=getUsedStations();
saveNode(aNode);
- } else if (aKeyName.equals("storageNodeList") && setStorageNodes) {
- aNode.limits=getUsedStorageNodes();
- saveNode(aNode);
- }
- } else if (parentName.equals("Observation")) {
- // Observation VirtualInstrument parameters
-
- if (aKeyName.equals("MSNameMask") && setMSNameMask) {
- aNode.limits = inputMSNameMask.getText();
- saveNode(aNode);
}
}
@@ -322,39 +274,6 @@ public class MultiEditDialog extends javax.swing.JDialog {
return aS;
}
- public String getUsedStorageNodes() {
- this.itsUsedStorageNodes = this.storageNodeSelectionPanel.getUsedStorageNodeList();
- String aS= "[";
- boolean first=true;
- for (int i=0; i< itsUsedStorageNodes.size();i++) {
- if (first) {
- first=false;
- aS+=itsUsedStorageNodes.get(i);
- } else {
- aS+=","+itsUsedStorageNodes.get(i);
- }
- }
- aS+="]";
- return aS;
- }
-
- private void setStorageNodeLists(String nodes) {
- itsUsedStorageNodes.clear();
-
- if (nodes.startsWith("[")) {
- nodes = nodes.substring(1, nodes.length());
- }
- if (nodes.endsWith("]")) {
- nodes = nodes.substring(0, nodes.length() - 1);
- }
- if (!nodes.equals("")) {
- String[] aS = nodes.split("\\,");
- for (int i = 0; i < aS.length; i++) {
- itsUsedStorageNodes.add(aS[i]);
- }
- this.storageNodeSelectionPanel.setUsedStorageNodeList(itsUsedStorageNodes);
- }
- }
private void setStationLists(String stations) {
itsUsedCoreStations.clear();
@@ -412,11 +331,6 @@ public class MultiEditDialog extends javax.swing.JDialog {
// determine what fields need to be gathered and rewritten.
// only the ones that have actually been changed should be written
- // Virtual Instrument storageNodes
- if (this.itsStorageNodeList != null && setStorageNodes) {
- itsStorageNodeList.limits = getUsedStorageNodes();
- saveNode(itsStorageNodeList);
- }
// Virtual Instrument StationList
if (this.itsStationList != null && setStationList) {
@@ -424,11 +338,6 @@ public class MultiEditDialog extends javax.swing.JDialog {
saveNode(itsStationList);
}
- // Observation MSNameMask
- if (itsMSNameMask != null && setMSNameMask) {
- itsMSNameMask.limits = inputMSNameMask.getText();
- saveNode(itsMSNameMask);
- }
@@ -439,12 +348,9 @@ public class MultiEditDialog extends javax.swing.JDialog {
// the nodes only need to be collected if the data actually was changed.
for (int i = 1; i < itsTreeIDs.length; i++) {
- if (setStationList || setStorageNodes) {
+ if (setStationList ) {
collectAndSaveVirtualInstrumentNodes(itsTreeIDs[i]);
}
- if(setMSNameMask) {
- collectAndSaveObservationNodes(itsTreeIDs[i]);
- }
}
return true;
@@ -471,14 +377,9 @@ public class MultiEditDialog extends javax.swing.JDialog {
coreStationSelectionPanel = new nl.astron.lofar.sas.otbcomponents.StationSelectionPanel();
remoteStationSelectionPanel = new nl.astron.lofar.sas.otbcomponents.StationSelectionPanel();
europeStationSelectionPanel = new nl.astron.lofar.sas.otbcomponents.StationSelectionPanel();
- storageNodeSelectionPanel = new nl.astron.lofar.sas.otbcomponents.StorageSelectionPanel();
- labelMSNameMask = new javax.swing.JLabel();
- inputMSNameMask = new javax.swing.JTextField();
restoreButton = new javax.swing.JButton();
statusLabel = new javax.swing.JLabel();
applyStationList = new javax.swing.JCheckBox();
- applyStorageNodes = new javax.swing.JCheckBox();
- applyMSNameMask = new javax.swing.JCheckBox();
setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE);
setTitle("LOFAR View TreeInfo");
@@ -524,13 +425,6 @@ public class MultiEditDialog extends javax.swing.JDialog {
europeStationSelectionPanel.setEnabled(false);
- storageNodeSelectionPanel.setBorder(javax.swing.BorderFactory.createTitledBorder(null, "StorageNode List", javax.swing.border.TitledBorder.CENTER, javax.swing.border.TitledBorder.DEFAULT_POSITION, new java.awt.Font("Tahoma", 1, 11))); // NOI18N
- storageNodeSelectionPanel.setEnabled(false);
-
- labelMSNameMask.setText("MSNameMask:");
-
- inputMSNameMask.setEnabled(false);
-
restoreButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otb/icons/16_undo.png"))); // NOI18N
restoreButton.setText("Restore");
restoreButton.addMouseListener(new java.awt.event.MouseAdapter() {
@@ -542,24 +436,14 @@ public class MultiEditDialog extends javax.swing.JDialog {
statusLabel.setText("Ready");
statusLabel.setOpaque(true);
+ applyStationList.setText("Edit?");
+ applyStationList.setToolTipText("Select if you want to edit the stationlists");
applyStationList.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) {
applyStationListActionPerformed(evt);
}
});
- applyStorageNodes.addActionListener(new java.awt.event.ActionListener() {
- public void actionPerformed(java.awt.event.ActionEvent evt) {
- applyStorageNodesActionPerformed(evt);
- }
- });
-
- applyMSNameMask.addActionListener(new java.awt.event.ActionListener() {
- public void actionPerformed(java.awt.event.ActionEvent evt) {
- applyMSNameMaskActionPerformed(evt);
- }
- });
-
org.jdesktop.layout.GroupLayout layout = new org.jdesktop.layout.GroupLayout(getContentPane());
getContentPane().setLayout(layout);
layout.setHorizontalGroup(
@@ -571,34 +455,24 @@ public class MultiEditDialog extends javax.swing.JDialog {
.add(jScrollPane1, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 343, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
.add(layout.createSequentialGroup()
.addContainerGap()
- .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(org.jdesktop.layout.GroupLayout.TRAILING, layout.createSequentialGroup()
- .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING)
- .add(applyMSNameMask)
- .add(applyStorageNodes)
- .add(applyStationList))
- .add(18, 18, 18)
- .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(storageNodeSelectionPanel, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
- .add(layout.createSequentialGroup()
- .add(coreStationSelectionPanel, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
- .add(remoteStationSelectionPanel, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
- .add(europeStationSelectionPanel, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
- .add(layout.createSequentialGroup()
- .add(labelMSNameMask, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 84, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
- .add(inputMSNameMask, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 777, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)))
- .add(53, 53, 53))
- .add(layout.createSequentialGroup()
- .add(restoreButton, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 142, Short.MAX_VALUE)
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
- .add(cancelButton)
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
- .add(saveButton, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 90, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
- .add(18, 18, 18)
- .add(statusLabel, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 627, Short.MAX_VALUE)))))
+ .add(applyStationList)
+ .add(18, 18, 18)
+ .add(coreStationSelectionPanel, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
+ .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
+ .add(remoteStationSelectionPanel, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
+ .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
+ .add(europeStationSelectionPanel, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
+ .add(53, 53, 53))
+ .add(org.jdesktop.layout.GroupLayout.TRAILING, layout.createSequentialGroup()
+ .addContainerGap()
+ .add(restoreButton, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 196, Short.MAX_VALUE)
+ .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
+ .add(cancelButton)
+ .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
+ .add(saveButton, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 90, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
+ .add(18, 18, 18)
+ .add(statusLabel, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 585, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
+ .add(65, 65, 65)))
.addContainerGap())
);
layout.setVerticalGroup(
@@ -611,28 +485,18 @@ public class MultiEditDialog extends javax.swing.JDialog {
.add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
.add(coreStationSelectionPanel, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
.add(remoteStationSelectionPanel, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
- .add(europeStationSelectionPanel, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.UNRELATED)
- .add(storageNodeSelectionPanel, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 207, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
+ .add(europeStationSelectionPanel, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)))
.add(layout.createSequentialGroup()
.add(131, 131, 131)
- .add(applyStationList)
- .add(192, 192, 192)
- .add(applyStorageNodes)))
- .add(18, 18, 18)
- .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
- .add(inputMSNameMask, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
- .add(labelMSNameMask))
- .add(applyMSNameMask))
- .add(57, 57, 57)
- .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING, false)
- .add(statusLabel, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
- .add(org.jdesktop.layout.GroupLayout.LEADING, layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
+ .add(applyStationList)))
+ .add(68, 68, 68)
+ .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING)
+ .add(statusLabel, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 26, Short.MAX_VALUE)
+ .add(org.jdesktop.layout.GroupLayout.LEADING, layout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING, false)
.add(restoreButton, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.add(cancelButton, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
- .add(saveButton, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)))
- .addContainerGap(162, Short.MAX_VALUE))
+ .add(saveButton)))
+ .addContainerGap(38, Short.MAX_VALUE))
);
pack();
@@ -673,50 +537,10 @@ public class MultiEditDialog extends javax.swing.JDialog {
}
- /*
- * Collect the wanted VirtualInstrumentNodes for a specific TreeID, change the value and save again
- *
- */
-
- private void collectAndSaveObservationNodes(int aTreeID) {
-
- jOTDBparam aParam = null;
-
- try {
- Vector<jOTDBnode> node = OtdbRmi.getRemoteMaintenance().getItemList(aTreeID, "Observation");
- // get all the params per child
- if (node.size() > 0) {
- jOTDBnode aNode = node.firstElement();
- Vector<jOTDBnode> childs = OtdbRmi.getRemoteMaintenance().getItemList(aNode.treeID(), aNode.nodeID(), 1);
- Enumeration e = childs.elements();
- while (e.hasMoreElements()) {
- jOTDBnode anotherNode = (jOTDBnode) e.nextElement();
- aParam = null;
- // We need to keep all the params needed by this panel
- if (anotherNode.leaf) {
- aParam = OtdbRmi.getRemoteMaintenance().getParam(anotherNode);
- }
- getAndSaveField("Observation", aParam, anotherNode);
- }
- }
- } catch (RemoteException ex) {
- String aS = "Remote Exception during init: " + ex;
- logger.error(aS);
- LofarUtils.showErrorPanel(this, aS, new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otb/icons/16_warn.gif")));
- return;
- }
-
-
- }
-
/** Restore original Values in panel
*/
private void restore() {
- // Observation Specific parameters
- inputMSNameMask.setText(itsMSNameMask.limits);
- //Virtual Instrument storageNodeList
- setStorageNodeLists(itsStorageNodeList.limits);
//Virtual Instrument stationList
setStationLists(itsStationList.limits);
}
@@ -746,16 +570,6 @@ public class MultiEditDialog extends javax.swing.JDialog {
this.setStationList = applyStationList.isSelected();
}//GEN-LAST:event_applyStationListActionPerformed
- private void applyStorageNodesActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_applyStorageNodesActionPerformed
- this.storageNodeSelectionPanel.setEnabled(applyStorageNodes.isSelected());
- this.setStorageNodes = applyStorageNodes.isSelected();
- }//GEN-LAST:event_applyStorageNodesActionPerformed
-
- private void applyMSNameMaskActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_applyMSNameMaskActionPerformed
- this.inputMSNameMask.setEnabled(applyMSNameMask.isSelected());
- this.setMSNameMask = applyMSNameMask.isSelected();
- }//GEN-LAST:event_applyMSNameMaskActionPerformed
-
private MainFrame itsMainFrame = null;
private jOTDBtree itsTree = null;
@@ -769,36 +583,24 @@ public class MultiEditDialog extends javax.swing.JDialog {
private Vector<String> itsUsedCoreStations = new Vector<String>();
private Vector<String> itsUsedRemoteStations = new Vector<String>();
private Vector<String> itsUsedEuropeStations = new Vector<String>();
- private Vector<String> itsUsedStorageNodes = new Vector<String>();
// Observation Virtual Instrument parameters
private jOTDBnode itsStationList=null;
- private jOTDBnode itsStorageNodeList=null;
-
- // Obsservation.MSNameMask
- private jOTDBnode itsMSNameMask=null;
private boolean isInitialized=false;
private boolean setStationList=false;
- private boolean setStorageNodes=false;
- private boolean setMSNameMask=false;
// Variables declaration - do not modify//GEN-BEGIN:variables
- private javax.swing.JCheckBox applyMSNameMask;
private javax.swing.JCheckBox applyStationList;
- private javax.swing.JCheckBox applyStorageNodes;
private javax.swing.JButton cancelButton;
private nl.astron.lofar.sas.otbcomponents.StationSelectionPanel coreStationSelectionPanel;
private nl.astron.lofar.sas.otbcomponents.StationSelectionPanel europeStationSelectionPanel;
- private javax.swing.JTextField inputMSNameMask;
private javax.swing.JScrollPane jScrollPane1;
- private javax.swing.JLabel labelMSNameMask;
private nl.astron.lofar.sas.otbcomponents.StationSelectionPanel remoteStationSelectionPanel;
private javax.swing.JButton restoreButton;
private javax.swing.JButton saveButton;
private javax.swing.JLabel statusLabel;
- private nl.astron.lofar.sas.otbcomponents.StorageSelectionPanel storageNodeSelectionPanel;
private javax.swing.JTextArea topLabel;
// End of variables declaration//GEN-END:variables
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/userpanels/ObservationPanel.form b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/userpanels/ObservationPanel.form
index 9b1b69cf7fb5e872ed9c5a75df572a3c34015042..6b2ed046dd34d79561bb398a32f4638db02325c5 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/userpanels/ObservationPanel.form
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/userpanels/ObservationPanel.form
@@ -11,7 +11,7 @@
<AuxValue name="FormSettings_listenerGenerationStyle" type="java.lang.Integer" value="0"/>
<AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" value="false"/>
<AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" value="2"/>
- <AuxValue name="designerSize" type="java.awt.Dimension" value="-84,-19,0,5,115,114,0,18,106,97,118,97,46,97,119,116,46,68,105,109,101,110,115,105,111,110,65,-114,-39,-41,-84,95,68,20,2,0,2,73,0,6,104,101,105,103,104,116,73,0,5,119,105,100,116,104,120,112,0,0,3,-54,0,0,4,-119"/>
+ <AuxValue name="designerSize" type="java.awt.Dimension" value="-84,-19,0,5,115,114,0,18,106,97,118,97,46,97,119,116,46,68,105,109,101,110,115,105,111,110,65,-114,-39,-41,-84,95,68,20,2,0,2,73,0,6,104,101,105,103,104,116,73,0,5,119,105,100,116,104,120,112,0,0,3,-54,0,0,4,-47"/>
</AuxValues>
<Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout"/>
@@ -97,6 +97,10 @@
<Group type="103" groupAlignment="0" attributes="0">
<Group type="102" attributes="0">
<Group type="103" groupAlignment="0" attributes="0">
+ <Group type="103" alignment="0" groupAlignment="1" max="-2" attributes="0">
+ <Component id="jPanel3" alignment="0" pref="1344" max="32767" attributes="1"/>
+ <Component id="anaBeamConfiguration" alignment="0" max="32767" attributes="1"/>
+ </Group>
<Group type="103" alignment="0" groupAlignment="1" max="-2" attributes="0">
<Component id="treeDescriptionScrollPane" alignment="0" max="32767" attributes="1"/>
<Component id="descriptionScrollPane" alignment="0" max="32767" attributes="1"/>
@@ -107,12 +111,8 @@
<Component id="jPanel5" min="-2" max="-2" attributes="0"/>
</Group>
</Group>
- <Group type="103" alignment="0" groupAlignment="1" max="-2" attributes="0">
- <Component id="jPanel3" alignment="0" pref="1277" max="32767" attributes="1"/>
- <Component id="anaBeamConfiguration" alignment="0" max="32767" attributes="1"/>
- </Group>
</Group>
- <EmptySpace max="-2" attributes="0"/>
+ <EmptySpace pref="47" max="32767" attributes="0"/>
</Group>
</Group>
</DimensionLayout>
@@ -129,11 +129,11 @@
</Group>
<EmptySpace pref="39" max="32767" attributes="0"/>
<Component id="jPanel10" min="-2" max="-2" attributes="1"/>
- <EmptySpace type="unrelated" max="-2" attributes="0"/>
+ <EmptySpace max="-2" attributes="0"/>
<Component id="descriptionScrollPane" min="-2" pref="54" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<Component id="treeDescriptionScrollPane" min="-2" pref="68" max="-2" attributes="0"/>
- <EmptySpace max="-2" attributes="0"/>
+ <EmptySpace min="-2" pref="49" max="-2" attributes="0"/>
</Group>
</Group>
</DimensionLayout>
@@ -206,27 +206,20 @@
<Group type="102" alignment="0" attributes="0">
<Group type="103" groupAlignment="0" max="-2" attributes="0">
<Component id="labelNrChannelsPerSubband" max="32767" attributes="1"/>
- <Component id="labelMSNameMask" alignment="0" pref="178" max="32767" attributes="1"/>
- <Component id="labelNrSlotsInFrame" alignment="0" max="32767" attributes="1"/>
+ <Component id="labelNrSlotsInFrame" alignment="0" min="-2" max="-2" attributes="1"/>
</Group>
<EmptySpace min="-2" pref="18" max="-2" attributes="0"/>
- <Group type="103" groupAlignment="0" attributes="0">
- <Component id="inputMSNameMask" pref="886" max="32767" attributes="1"/>
- <Component id="inputNrSlotsInFrame" alignment="0" pref="886" max="32767" attributes="1"/>
- <Component id="inputNrChannelsPerSubband" alignment="0" min="-2" pref="102" max="-2" attributes="1"/>
+ <Group type="103" groupAlignment="0" max="-2" attributes="0">
+ <Component id="inputNrSlotsInFrame" max="32767" attributes="1"/>
+ <Component id="inputNrChannelsPerSubband" alignment="0" pref="102" max="32767" attributes="1"/>
</Group>
- <EmptySpace min="-2" pref="273" max="-2" attributes="0"/>
+ <EmptySpace pref="908" max="32767" attributes="0"/>
</Group>
</Group>
</DimensionLayout>
<DimensionLayout dim="1">
<Group type="103" groupAlignment="0" attributes="0">
<Group type="102" alignment="0" attributes="0">
- <Group type="103" groupAlignment="3" attributes="0">
- <Component id="labelMSNameMask" alignment="3" min="-2" max="-2" attributes="0"/>
- <Component id="inputMSNameMask" alignment="3" min="-2" max="-2" attributes="0"/>
- </Group>
- <EmptySpace type="unrelated" max="-2" attributes="0"/>
<Group type="103" groupAlignment="3" attributes="0">
<Component id="labelNrSlotsInFrame" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="inputNrSlotsInFrame" alignment="3" min="-2" max="-2" attributes="0"/>
@@ -242,16 +235,6 @@
</DimensionLayout>
</Layout>
<SubComponents>
- <Component class="javax.swing.JLabel" name="labelMSNameMask">
- <Properties>
- <Property name="text" type="java.lang.String" value="MSNameMask:"/>
- </Properties>
- </Component>
- <Component class="javax.swing.JTextField" name="inputMSNameMask">
- <Events>
- <EventHandler event="focusGained" listener="java.awt.event.FocusListener" parameters="java.awt.event.FocusEvent" handler="inputMSNameMaskFocusGained"/>
- </Events>
- </Component>
<Component class="javax.swing.JLabel" name="labelNrSlotsInFrame">
<Properties>
<Property name="text" type="java.lang.String" value="# Slots In Frame"/>
@@ -298,7 +281,7 @@
<Group type="103" groupAlignment="0" attributes="0">
<Group type="102" attributes="0">
<Group type="103" groupAlignment="0" attributes="0">
- <Component id="beamConfigurationPanel" alignment="0" pref="1255" max="32767" attributes="0"/>
+ <Component id="beamConfigurationPanel" alignment="0" pref="1322" max="32767" attributes="0"/>
<Group type="102" alignment="0" attributes="0">
<Component id="addBeamButton" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
@@ -419,19 +402,15 @@
<Group type="102" alignment="0" attributes="0">
<EmptySpace max="32767" attributes="0"/>
<Component id="stationsPanel" min="-2" pref="145" max="-2" attributes="0"/>
- <EmptySpace type="separate" max="-2" attributes="0"/>
- <Component id="storageNodeSelectionPanel" min="-2" max="-2" attributes="0"/>
+ <EmptySpace min="-2" pref="325" max="-2" attributes="0"/>
</Group>
</Group>
</DimensionLayout>
<DimensionLayout dim="1">
<Group type="103" groupAlignment="0" attributes="0">
<Group type="102" alignment="0" attributes="0">
- <Group type="103" groupAlignment="1" max="-2" attributes="0">
- <Component id="storageNodeSelectionPanel" alignment="0" min="0" pref="0" max="32767" attributes="1"/>
- <Component id="stationsPanel" alignment="0" pref="176" max="32767" attributes="1"/>
- </Group>
- <EmptySpace pref="12" max="32767" attributes="0"/>
+ <Component id="stationsPanel" min="-2" pref="176" max="-2" attributes="1"/>
+ <EmptySpace pref="16" max="32767" attributes="0"/>
</Group>
</Group>
</DimensionLayout>
@@ -501,15 +480,6 @@
</Container>
</SubComponents>
</Container>
- <Component class="nl.astron.lofar.sas.otbcomponents.StorageSelectionPanel" name="storageNodeSelectionPanel">
- <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="StorageNode List"/>
- </Border>
- </Property>
- </Properties>
- </Component>
</SubComponents>
</Container>
<Container class="javax.swing.JPanel" name="jPanel4">
@@ -550,7 +520,7 @@
<Component id="jLabel2" min="-2" max="-2" attributes="0"/>
</Group>
</Group>
- <EmptySpace min="-2" pref="10" max="-2" attributes="0"/>
+ <EmptySpace min="-2" pref="12" max="-2" attributes="0"/>
</Group>
</Group>
</DimensionLayout>
@@ -674,7 +644,7 @@
<DimensionLayout dim="0">
<Group type="103" groupAlignment="0" attributes="0">
<Group type="102" alignment="0" attributes="0">
- <Component id="anaBeamConfigurationPanel" pref="1163" max="32767" attributes="0"/>
+ <Component id="anaBeamConfigurationPanel" pref="1232" max="32767" attributes="0"/>
<EmptySpace min="-2" pref="102" max="-2" attributes="0"/>
</Group>
<Group type="102" alignment="0" attributes="0">
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/userpanels/ObservationPanel.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/userpanels/ObservationPanel.java
index 46f1de1470f0757d6357277937e073965bc8a6e4..a59365ffa05c71fa595556dbd43b0fe32f14c635 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/userpanels/ObservationPanel.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/userpanels/ObservationPanel.java
@@ -115,7 +115,6 @@ public class ObservationPanel extends javax.swing.JPanel implements IViewPanel{
this.antennaConfigPanel.setContent(this.itsNode);
this.campaignInfoPanel.setMainFrame(this.itsMainFrame,false);
- this.storageNodeSelectionPanel.init();
jOTDBparam aParam=null;
try {
@@ -330,15 +329,7 @@ public class ObservationPanel extends javax.swing.JPanel implements IViewPanel{
if(parentName.equals("Observation")){
// Observation Specific parameters
- if (aKeyName.equals("MSNameMask")) {
- inputMSNameMask.setToolTipText(aParam.description);
- itsMSNameMask=aNode;
- if (isRef && aParam != null) {
- inputMSNameMask.setText(aNode.limits + " : " + aParam.limits);
- } else {
- inputMSNameMask.setText(aNode.limits);
- }
- } else if (aKeyName.equals("channelsPerSubband")) {
+ if (aKeyName.equals("channelsPerSubband")) {
inputNrChannelsPerSubband.setToolTipText(aParam.description);
itsChannelsPerSubband=aNode;
if (isRef && aParam != null) {
@@ -475,10 +466,6 @@ public class ObservationPanel extends javax.swing.JPanel implements IViewPanel{
// Observation VirtualInstrument parameters
if (aKeyName.equals("stationList")) {
- } else if (aKeyName.equals("storageNodeList")) {
- this.storageNodeSelectionPanel.setToolTipText(aParam.description);
- this.itsStorageNodeList = aNode;
- setStorageNodeLists(aNode.limits);
}
}
}
@@ -568,7 +555,6 @@ public class ObservationPanel extends javax.swing.JPanel implements IViewPanel{
setStationList(antennaConfigPanel.getStationList());
// Observation Specific parameters
- inputMSNameMask.setText(itsMSNameMask.limits);
inputNrChannelsPerSubband.setText(itsChannelsPerSubband.limits);
inputNrSlotsInFrame.setText(itsNrSlotsInFrame.limits);
inputDescription.setText("");
@@ -609,8 +595,6 @@ public class ObservationPanel extends javax.swing.JPanel implements IViewPanel{
fillBeamformerStationList();
- //Virtual Instrument storageNodeList
- setStorageNodeLists(itsStorageNodeList.limits);
if (beamConfigurationPanel.getTableModel().getRowCount() == 8) {
@@ -799,7 +783,6 @@ public class ObservationPanel extends javax.swing.JPanel implements IViewPanel{
*/
public void setAllEnabled(boolean enabled) {
this.inputDescription.setEnabled(enabled);
- this.inputMSNameMask.setEnabled(enabled);
this.inputNrChannelsPerSubband.setEnabled(enabled);
this.inputTreeDescription.setEnabled(enabled);
}
@@ -1094,19 +1077,8 @@ public class ObservationPanel extends javax.swing.JPanel implements IViewPanel{
aDefaultBFNode.instances=bforms;
saveNode(aDefaultBFNode);
- // Virtual Instrument storageNodes
- if (this.itsStorageNodeList != null && !getUsedStorageNodes().equals(itsStorageNodeList.limits)) {
- itsStorageNodeList.limits = getUsedStorageNodes();
- saveNode(itsStorageNodeList);
- }
-
-
// Generic Observation
- if (itsMSNameMask != null && !this.inputMSNameMask.getText().equals(itsMSNameMask.limits)) {
- itsMSNameMask.limits = inputMSNameMask.getText();
- saveNode(itsMSNameMask);
- }
if (itsChannelsPerSubband != null && !inputNrChannelsPerSubband.getText().equals(itsChannelsPerSubband.limits)) {
itsChannelsPerSubband.limits = inputNrChannelsPerSubband.getText();
saveNode(itsChannelsPerSubband);
@@ -1187,44 +1159,6 @@ public class ObservationPanel extends javax.swing.JPanel implements IViewPanel{
}
}
- /** returns a [a,b,c] string that contain all used stations
- *
- * @return a List with all used stations
- */
- public String getUsedStorageNodes() {
- this.itsUsedStorageNodes = this.storageNodeSelectionPanel.getUsedStorageNodeList();
- String aS= "[";
- boolean first=true;
- for (int i=0; i< itsUsedStorageNodes.size();i++) {
- if (first) {
- first=false;
- aS+=itsUsedStorageNodes.get(i);
- } else {
- aS+=","+itsUsedStorageNodes.get(i);
- }
- }
- aS+="]";
- return aS;
- }
-
- private void setStorageNodeLists(String nodes) {
- itsUsedStorageNodes.clear();
-
- if (nodes.startsWith("[")) {
- nodes = nodes.substring(1, nodes.length());
- }
- if (nodes.endsWith("]")) {
- nodes = nodes.substring(0, nodes.length() - 1);
- }
- if (!nodes.equals("")) {
- String[] aS = nodes.split("\\,");
- for (int i = 0; i < aS.length; i++) {
- itsUsedStorageNodes.add(aS[i]);
- }
- this.storageNodeSelectionPanel.setUsedStorageNodeList(itsUsedStorageNodes);
- }
- }
-
private void deleteBeamformer() {
String selection = itsBeamformerConfigurationTableModel.getSelection(beamformerConfigurationPanel.getSelectedRow());
@@ -1670,8 +1604,6 @@ public class ObservationPanel extends javax.swing.JPanel implements IViewPanel{
descriptionScrollPane = new javax.swing.JScrollPane();
inputDescription = new javax.swing.JTextArea();
jPanel10 = new javax.swing.JPanel();
- labelMSNameMask = new javax.swing.JLabel();
- inputMSNameMask = new javax.swing.JTextField();
labelNrSlotsInFrame = new javax.swing.JLabel();
inputNrSlotsInFrame = new javax.swing.JTextField();
inputNrChannelsPerSubband = new javax.swing.JTextField();
@@ -1689,7 +1621,6 @@ public class ObservationPanel extends javax.swing.JPanel implements IViewPanel{
stationList = new javax.swing.JList();
stationsModPanel = new javax.swing.JPanel();
stationsButtonPanel = new javax.swing.JPanel();
- storageNodeSelectionPanel = new nl.astron.lofar.sas.otbcomponents.StorageSelectionPanel();
jPanel4 = new javax.swing.JPanel();
beamformerConfigurationPanel = new nl.astron.lofar.sas.otbcomponents.TablePanel();
jLabel2 = new javax.swing.JLabel();
@@ -1746,14 +1677,6 @@ public class ObservationPanel extends javax.swing.JPanel implements IViewPanel{
jPanel10.setBorder(javax.swing.BorderFactory.createTitledBorder(null, "Generic Observation Input", javax.swing.border.TitledBorder.DEFAULT_JUSTIFICATION, javax.swing.border.TitledBorder.DEFAULT_POSITION, new java.awt.Font("Tahoma", 1, 11))); // NOI18N
- labelMSNameMask.setText("MSNameMask:");
-
- inputMSNameMask.addFocusListener(new java.awt.event.FocusAdapter() {
- public void focusGained(java.awt.event.FocusEvent evt) {
- inputMSNameMaskFocusGained(evt);
- }
- });
-
labelNrSlotsInFrame.setText("# Slots In Frame");
inputNrSlotsInFrame.addFocusListener(new java.awt.event.FocusAdapter() {
@@ -1778,22 +1701,16 @@ public class ObservationPanel extends javax.swing.JPanel implements IViewPanel{
.add(jPanel10Layout.createSequentialGroup()
.add(jPanel10Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING, false)
.add(labelNrChannelsPerSubband, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
- .add(labelMSNameMask, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 178, Short.MAX_VALUE)
- .add(labelNrSlotsInFrame, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+ .add(labelNrSlotsInFrame))
.add(18, 18, 18)
- .add(jPanel10Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(inputMSNameMask, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 886, Short.MAX_VALUE)
- .add(inputNrSlotsInFrame, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 886, Short.MAX_VALUE)
- .add(inputNrChannelsPerSubband, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 102, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
- .add(273, 273, 273))
+ .add(jPanel10Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING, false)
+ .add(inputNrSlotsInFrame)
+ .add(inputNrChannelsPerSubband, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 102, Short.MAX_VALUE))
+ .addContainerGap(908, Short.MAX_VALUE))
);
jPanel10Layout.setVerticalGroup(
jPanel10Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
.add(jPanel10Layout.createSequentialGroup()
- .add(jPanel10Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
- .add(labelMSNameMask)
- .add(inputMSNameMask, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.UNRELATED)
.add(jPanel10Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
.add(labelNrSlotsInFrame)
.add(inputNrSlotsInFrame, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
@@ -1866,7 +1783,7 @@ public class ObservationPanel extends javax.swing.JPanel implements IViewPanel{
jPanel3Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
.add(jPanel3Layout.createSequentialGroup()
.add(jPanel3Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(beamConfigurationPanel, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 1255, Short.MAX_VALUE)
+ .add(beamConfigurationPanel, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 1322, Short.MAX_VALUE)
.add(jPanel3Layout.createSequentialGroup()
.add(addBeamButton)
.addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
@@ -1919,8 +1836,6 @@ public class ObservationPanel extends javax.swing.JPanel implements IViewPanel{
stationsPanel.add(stationsModPanel, java.awt.BorderLayout.SOUTH);
- storageNodeSelectionPanel.setBorder(javax.swing.BorderFactory.createTitledBorder("StorageNode List"));
-
org.jdesktop.layout.GroupLayout jPanel5Layout = new org.jdesktop.layout.GroupLayout(jPanel5);
jPanel5.setLayout(jPanel5Layout);
jPanel5Layout.setHorizontalGroup(
@@ -1928,16 +1843,13 @@ public class ObservationPanel extends javax.swing.JPanel implements IViewPanel{
.add(jPanel5Layout.createSequentialGroup()
.addContainerGap(org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.add(stationsPanel, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 145, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
- .add(18, 18, 18)
- .add(storageNodeSelectionPanel, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
+ .add(325, 325, 325))
);
jPanel5Layout.setVerticalGroup(
jPanel5Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
.add(jPanel5Layout.createSequentialGroup()
- .add(jPanel5Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING, false)
- .add(org.jdesktop.layout.GroupLayout.LEADING, storageNodeSelectionPanel, 0, 0, Short.MAX_VALUE)
- .add(org.jdesktop.layout.GroupLayout.LEADING, stationsPanel, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 176, Short.MAX_VALUE))
- .addContainerGap(12, Short.MAX_VALUE))
+ .add(stationsPanel, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 176, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
+ .addContainerGap(16, Short.MAX_VALUE))
);
jPanel4.setBorder(javax.swing.BorderFactory.createTitledBorder(null, "Beamformer Input", javax.swing.border.TitledBorder.DEFAULT_JUSTIFICATION, javax.swing.border.TitledBorder.DEFAULT_POSITION, new java.awt.Font("Tahoma", 1, 11))); // NOI18N
@@ -1948,7 +1860,7 @@ public class ObservationPanel extends javax.swing.JPanel implements IViewPanel{
}
});
- jLabel2.setFont(new java.awt.Font("Tahoma", 1, 12)); // NOI18N
+ jLabel2.setFont(new java.awt.Font("Tahoma", 1, 12));
jLabel2.setText("Stations");
addBeamformerButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otb/icons/16_add.gif"))); // NOI18N
@@ -2007,7 +1919,7 @@ public class ObservationPanel extends javax.swing.JPanel implements IViewPanel{
.add(jPanel4Layout.createSequentialGroup()
.add(57, 57, 57)
.add(jLabel2)))
- .add(10, 10, 10))
+ .add(12, 12, 12))
);
jPanel4Layout.setVerticalGroup(
jPanel4Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
@@ -2080,7 +1992,7 @@ public class ObservationPanel extends javax.swing.JPanel implements IViewPanel{
anaBeamConfigurationLayout.setHorizontalGroup(
anaBeamConfigurationLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
.add(anaBeamConfigurationLayout.createSequentialGroup()
- .add(anaBeamConfigurationPanel, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 1163, Short.MAX_VALUE)
+ .add(anaBeamConfigurationPanel, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 1232, Short.MAX_VALUE)
.add(102, 102, 102))
.add(anaBeamConfigurationLayout.createSequentialGroup()
.add(addAnaBeamButton)
@@ -2111,6 +2023,9 @@ public class ObservationPanel extends javax.swing.JPanel implements IViewPanel{
jPanel2Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
.add(jPanel2Layout.createSequentialGroup()
.add(jPanel2Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+ .add(jPanel2Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING, false)
+ .add(org.jdesktop.layout.GroupLayout.LEADING, jPanel3, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 1344, Short.MAX_VALUE)
+ .add(org.jdesktop.layout.GroupLayout.LEADING, anaBeamConfiguration, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
.add(jPanel2Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING, false)
.add(org.jdesktop.layout.GroupLayout.LEADING, treeDescriptionScrollPane)
.add(org.jdesktop.layout.GroupLayout.LEADING, descriptionScrollPane)
@@ -2118,11 +2033,8 @@ public class ObservationPanel extends javax.swing.JPanel implements IViewPanel{
.add(org.jdesktop.layout.GroupLayout.LEADING, jPanel2Layout.createSequentialGroup()
.add(jPanel4, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
.addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
- .add(jPanel5, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)))
- .add(jPanel2Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING, false)
- .add(org.jdesktop.layout.GroupLayout.LEADING, jPanel3, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 1277, Short.MAX_VALUE)
- .add(org.jdesktop.layout.GroupLayout.LEADING, anaBeamConfiguration, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)))
- .addContainerGap())
+ .add(jPanel5, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))))
+ .addContainerGap(47, Short.MAX_VALUE))
);
jPanel2Layout.setVerticalGroup(
jPanel2Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
@@ -2136,11 +2048,11 @@ public class ObservationPanel extends javax.swing.JPanel implements IViewPanel{
.add(jPanel4, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
.addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED, 39, Short.MAX_VALUE)
.add(jPanel10, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.UNRELATED)
+ .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
.add(descriptionScrollPane, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 54, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
.addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
.add(treeDescriptionScrollPane, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 68, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
- .addContainerGap())
+ .add(49, 49, 49))
);
jScrollPane1.setViewportView(jPanel2);
@@ -2178,10 +2090,6 @@ public class ObservationPanel extends javax.swing.JPanel implements IViewPanel{
copyBeamButton.setEnabled(true);
}//GEN-LAST:event_beamConfigurationPanelMouseClicked
- private void inputMSNameMaskFocusGained(java.awt.event.FocusEvent evt) {//GEN-FIRST:event_inputMSNameMaskFocusGained
- changeDescription(itsMSNameMask);
- }//GEN-LAST:event_inputMSNameMaskFocusGained
-
private void buttonPanel1ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_buttonPanel1ActionPerformed
if(evt.getActionCommand().equals("Apply")) {
itsMainFrame.setHourglassCursor();
@@ -2307,7 +2215,6 @@ public class ObservationPanel extends javax.swing.JPanel implements IViewPanel{
private BeamFileDialog beamFileDialog = null;
// Observation Specific parameters
- private jOTDBnode itsMSNameMask=null;
private jOTDBnode itsChannelsPerSubband=null;
private jOTDBnode itsNrSlotsInFrame=null;
private jOTDBnode itsNrBeams=null;
@@ -2346,7 +2253,6 @@ public class ObservationPanel extends javax.swing.JPanel implements IViewPanel{
// Observation Virtual Instrument parameters
private jOTDBnode itsStationList=null;
- private jOTDBnode itsStorageNodeList=null;
// keeps lists of available (unused) and all used stations for Beamformer creation
private Vector<String> itsAvailableBeamformStations = new Vector<String>();
@@ -2358,10 +2264,6 @@ public class ObservationPanel extends javax.swing.JPanel implements IViewPanel{
private int itsSelectedRow = -1;
- // Temp
- private Vector<String> itsUsedStorageNodes = new Vector<String>();
-
-
// Variables declaration - do not modify//GEN-BEGIN:variables
@@ -2385,7 +2287,6 @@ public class ObservationPanel extends javax.swing.JPanel implements IViewPanel{
private javax.swing.JButton editAnaBeamButton;
private javax.swing.JButton editBeamButton;
private javax.swing.JTextArea inputDescription;
- private javax.swing.JTextField inputMSNameMask;
private javax.swing.JTextField inputNrChannelsPerSubband;
private javax.swing.JTextField inputNrSlotsInFrame;
private javax.swing.JTextArea inputTreeDescription;
@@ -2401,7 +2302,6 @@ public class ObservationPanel extends javax.swing.JPanel implements IViewPanel{
private javax.swing.JPanel jPanel5;
private javax.swing.JScrollPane jScrollPane1;
private javax.swing.JTabbedPane jTabbedPane1;
- private javax.swing.JLabel labelMSNameMask;
private javax.swing.JLabel labelNrChannelsPerSubband;
private javax.swing.JLabel labelNrSlotsInFrame;
private javax.swing.JButton loadAnaBeamsButton;
@@ -2411,7 +2311,6 @@ public class ObservationPanel extends javax.swing.JPanel implements IViewPanel{
private javax.swing.JPanel stationsModPanel;
private javax.swing.JPanel stationsPanel;
private javax.swing.JScrollPane stationsScrollPane;
- private nl.astron.lofar.sas.otbcomponents.StorageSelectionPanel storageNodeSelectionPanel;
private javax.swing.JScrollPane treeDescriptionScrollPane;
// End of variables declaration//GEN-END:variables