diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/MainFrame.form b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/MainFrame.form
index 2c4bbd022e194d25180a582e2db519b60b8d0176..e6c4334a03925fb6ceaa68d18542c99dccf61bdf 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/MainFrame.form
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/MainFrame.form
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?xml version="1.1" encoding="UTF-8" ?>
<Form version="1.2" maxVersion="1.2" type="org.netbeans.modules.form.forminfo.JFrameFormInfo">
<NonVisualComponents>
@@ -10,15 +10,6 @@
<Property name="text" type="java.lang.String" value="File" noResource="true"/>
</Properties>
<SubComponents>
- <MenuItem class="javax.swing.JMenuItem" name="jMenuItemLogout">
- <Properties>
- <Property name="mnemonic" type="int" value="108"/>
- <Property name="text" type="java.lang.String" value="Logout" noResource="true"/>
- </Properties>
- <Events>
- <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jMenuItemLogoutActionPerformed"/>
- </Events>
- </MenuItem>
<MenuItem class="javax.swing.JSeparator" name="jSeparator1">
</MenuItem>
<MenuItem class="javax.swing.JMenuItem" name="jMenuItemExit">
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/MainFrame.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/MainFrame.java
index aff889c73bf1aefbbea9f3f85494ef1608dac0fd..7a5425258e362dcc12f06e96f6fc629ec32a4284 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/MainFrame.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/MainFrame.java
@@ -62,6 +62,8 @@ public class MainFrame extends javax.swing.JFrame {
private String itsUserName = "";
private String itsServiceName = "";
+
+ private boolean isEnded = false;
@@ -401,7 +403,6 @@ public class MainFrame extends javax.swing.JFrame {
jToolBarPlugins = new javax.swing.JToolBar();
jMenuBarMainFrame = new javax.swing.JMenuBar();
jMenuFile = new javax.swing.JMenu();
- jMenuItemLogout = new javax.swing.JMenuItem();
jSeparator1 = new javax.swing.JSeparator();
jMenuItemExit = new javax.swing.JMenuItem();
jMenuPlugins = new javax.swing.JMenu();
@@ -420,15 +421,6 @@ public class MainFrame extends javax.swing.JFrame {
jMenuFile.setMnemonic('f');
jMenuFile.setText("File"); // NOI18N
-
- jMenuItemLogout.setMnemonic('l');
- jMenuItemLogout.setText("Logout"); // NOI18N
- jMenuItemLogout.addActionListener(new java.awt.event.ActionListener() {
- public void actionPerformed(java.awt.event.ActionEvent evt) {
- jMenuItemLogoutActionPerformed(evt);
- }
- });
- jMenuFile.add(jMenuItemLogout);
jMenuFile.add(jSeparator1);
jMenuItemExit.setMnemonic('x');
@@ -465,25 +457,6 @@ public class MainFrame extends javax.swing.JFrame {
pack();
}// </editor-fold>//GEN-END:initComponents
- private void jMenuItemLogoutActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jMenuItemLogoutActionPerformed
- logger.info("Logout requested");
- logout();
- setVisible(false);
- try {
- login();
- setVisible(true);
- showPanel(MainPanel.getFriendlyNameStatic());
- } catch (NoServerConnectionException e) {
- String aS= "No Server connection"+e.getMessage();
- logger.fatal(aS);
- LofarUtils.showErrorPanel(this,aS,new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otb/icons/16_death.gif")));
- } catch (NotLoggedInException e) {
- String aS= "Not logged in "+e.getMessage();
- logger.fatal(aS);
- LofarUtils.showErrorPanel(this,aS,new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otb/icons/16_death.gif")));
- }
- }//GEN-LAST:event_jMenuItemLogoutActionPerformed
-
private void jMenuItemExitActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jMenuItemExitActionPerformed
exit();
}//GEN-LAST:event_jMenuItemExitActionPerformed
@@ -500,20 +473,23 @@ public class MainFrame extends javax.swing.JFrame {
}//GEN-LAST:event_formWindowClosing
public void exit() {
- logger.info("Exit requested");
- logout();
- setVisible(false);
- // remove used rmi connections from server
- try {
- if ( OtdbRmi.getRemoteOTDBaccess() != null) {
- OtdbRmi.getRemoteOTDBaccess().logout(OtdbRmi.getRMIRegistryName());
+ if (!isEnded) {
+ logger.info("Exit requested");
+ logout();
+ setVisible(false);
+ // remove used rmi connections from server
+ try {
+ if ( OtdbRmi.getRemoteOTDBaccess() != null) {
+ OtdbRmi.getRemoteOTDBaccess().logout(OtdbRmi.getRMIRegistryName());
+ }
+ } catch (RemoteException ex) {
+ String aS= "Remote Exception "+ex.getMessage();
+ logger.error(aS);
+ LofarUtils.showErrorPanel(this,aS,new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otb/icons/16_warn.gif")));
}
- } catch (RemoteException ex) {
- String aS= "Remote Exception "+ex.getMessage();
- logger.error(aS);
- LofarUtils.showErrorPanel(this,aS,new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otb/icons/16_warn.gif")));
+ this.dispose();
+ isEnded=true;
}
- this.dispose();
}
/** Event handler called when a button in the button panel is called
@@ -680,7 +656,6 @@ public class MainFrame extends javax.swing.JFrame {
private javax.swing.JMenu jMenuFile;
private javax.swing.JMenuItem jMenuItemCoordChange;
private javax.swing.JMenuItem jMenuItemExit;
- private javax.swing.JMenuItem jMenuItemLogout;
private javax.swing.JMenu jMenuPlugins;
private javax.swing.JMenu jMenuTools;
private javax.swing.JSeparator jSeparator1;
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 4117b28bf6f6459d63fa65dcc14cdffcf8a12623..bdfa841825802989be7df653d4de573904510dac 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
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?xml version="1.1" encoding="UTF-8" ?>
<Form version="1.3" maxVersion="1.3" type="org.netbeans.modules.form.forminfo.JPanelFormInfo">
<AuxValues>
@@ -108,7 +108,7 @@
<Component id="jPanel10" min="-2" max="-2" attributes="1"/>
</Group>
<Component id="descriptionScrollPane" alignment="0" max="32767" attributes="1"/>
- <Component id="jPanel3" alignment="0" pref="1277" max="32767" attributes="1"/>
+ <Component id="jPanel3" alignment="0" pref="1344" max="32767" attributes="1"/>
<Component id="anaBeamConfiguration" alignment="0" max="32767" attributes="1"/>
<Component id="treeDescriptionScrollPane" alignment="0" max="32767" attributes="1"/>
</Group>
@@ -286,7 +286,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"/>
@@ -649,7 +649,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 ddfa61e6d73bcb2fb895449de180bd022074aa95..3d87209ed0fe848dca44efd0be60ba03cae5bd57 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
@@ -605,7 +605,7 @@ public class ObservationPanel extends javax.swing.JPanel implements IViewPanel{
fillBeamformerStationList();
- if (beamConfigurationPanel.getTableModel().getRowCount() == 8) {
+ if (beamConfigurationPanel.getTableModel().getRowCount() == 244) {
this.addBeamButton.setEnabled(false);
} else {
this.addBeamButton.setEnabled(true);
@@ -1210,7 +1210,7 @@ public class ObservationPanel extends javax.swing.JPanel implements IViewPanel{
}
}
- if (beamConfigurationPanel.getTableModel().getRowCount() == 8) {
+ if (beamConfigurationPanel.getTableModel().getRowCount() == 244) {
this.addBeamButton.setEnabled(false);
} else {
this.addBeamButton.setEnabled(true);
@@ -1231,7 +1231,7 @@ public class ObservationPanel extends javax.swing.JPanel implements IViewPanel{
}
}
- if (anaBeamConfigurationPanel.getTableModel().getRowCount() == 8) {
+ if (anaBeamConfigurationPanel.getTableModel().getRowCount() == 1) {
this.addAnaBeamButton.setEnabled(false);
} else {
this.addAnaBeamButton.setEnabled(true);
@@ -1284,7 +1284,7 @@ public class ObservationPanel extends javax.swing.JPanel implements IViewPanel{
this.editBeamButton.setEnabled(false);
this.deleteBeamButton.setEnabled(false);
this.copyBeamButton.setEnabled(false);
- if (beamConfigurationPanel.getTableModel().getRowCount() == 8 ) {
+ if (beamConfigurationPanel.getTableModel().getRowCount() == 244 ) {
this.addBeamButton.setEnabled(false);
} else {
this.addBeamButton.setEnabled(true);
@@ -1367,7 +1367,7 @@ public class ObservationPanel extends javax.swing.JPanel implements IViewPanel{
this.editAnaBeamButton.setEnabled(false);
this.deleteAnaBeamButton.setEnabled(false);
- if (anaBeamConfigurationPanel.getTableModel().getRowCount() == 8 ) {
+ if (anaBeamConfigurationPanel.getTableModel().getRowCount() == 1 ) {
this.addAnaBeamButton.setEnabled(false);
} else {
this.addAnaBeamButton.setEnabled(true);
@@ -1480,8 +1480,8 @@ public class ObservationPanel extends javax.swing.JPanel implements IViewPanel{
check = "anabeam";
}
int idx = Integer.parseInt(beamKey[0].toLowerCase().replace(check, ""));
- if (idx < 0 || idx > 7) {
- String aS = "Error in index, only beam 0-7 allowed : " + idx;
+ if (idx < 0 || idx > 243) {
+ String aS = "Error in index, only beam 0-243 allowed : " + idx;
logger.error(aS);
LofarUtils.showErrorPanel(this, aS, new javax.swing.ImageIcon(getClass().getResource("/nl/astron/lofar/sas/otb/icons/16_warn.gif")));
continue;
@@ -1542,7 +1542,7 @@ public class ObservationPanel extends javax.swing.JPanel implements IViewPanel{
startTimes.setElementAt(keyVal[1], idx + 1);
} else if (beamKey[1].toLowerCase().equals("duration")) {
durations.setElementAt(keyVal[1], idx + 1);
- } else if (beamKey[1].toLowerCase().equals("maximizeDuration")) {
+ } else if (beamKey[1].toLowerCase().equals("maximizeduration")) {
maxdurs.setElementAt(keyVal[1], idx + 1);
} else if (beamKey[1].toLowerCase().equals("subbandlist")) {
subbandList.setElementAt(keyVal[1], idx + 1);