From f004b521eaeed29316af42e199e8fa98f52c191f Mon Sep 17 00:00:00 2001
From: Arthur Coolen <coolen@astron.nl>
Date: Tue, 8 Mar 2011 12:56:32 +0000
Subject: [PATCH] Bug 756: if beamlets and subbands length differs, warning is
given but you are allowed to continue
---
.../src/nl/astron/lofar/sas/otbcomponents/BeamDialog.java | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/BeamDialog.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/BeamDialog.java
index c0c37c6b1ed..66af1283bac 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/BeamDialog.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/BeamDialog.java
@@ -339,13 +339,12 @@ public class BeamDialog extends javax.swing.JDialog {
setVisible(false);
dispose();
} else {
+ itsUsedBeamlets=(BitSet)itsSavedBeamlets.clone();
return;
}
} else if (hasChanged() && !checkNrOfBeamletsAndSubbands() ) {
- if (JOptionPane.showConfirmDialog(this,"The number of beamlets and subbands differ. Continueing discards all changes. Continue?","Beamlet-subband amount differ Error",JOptionPane.YES_NO_OPTION,JOptionPane.WARNING_MESSAGE) == JOptionPane.YES_OPTION ) {
- itsUsedBeamlets=(BitSet)itsSavedBeamlets.clone();
- isChanged=false;
+ if (JOptionPane.showConfirmDialog(this,"The number of beamlets and subbands differ.","Beamlet-subband amount differ Error",JOptionPane.OK_CANCEL_OPTION,JOptionPane.WARNING_MESSAGE) == JOptionPane.OK_OPTION ) {
setVisible(false);
dispose();
} else {
--
GitLab