diff --git a/JAVA/LofarUtils/src/nl/astron/lofar/lofarutils/DateTimeChooser.form b/JAVA/LofarUtils/src/nl/astron/lofar/lofarutils/DateTimeChooser.form index db94b61202273ff00336583f32b6b844cc89bf8e..da19e9086ca6824c00c7b7b4fc59c58e527148f1 100644 --- a/JAVA/LofarUtils/src/nl/astron/lofar/lofarutils/DateTimeChooser.form +++ b/JAVA/LofarUtils/src/nl/astron/lofar/lofarutils/DateTimeChooser.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> @@ -20,7 +20,7 @@ <EmptySpace max="-2" attributes="0"/> <Group type="103" groupAlignment="0" attributes="0"> <Group type="102" alignment="0" attributes="0"> - <Component id="calendar" pref="294" max="32767" attributes="1"/> + <Component id="calendar" pref="365" max="32767" attributes="1"/> <EmptySpace max="-2" attributes="0"/> </Group> <Group type="102" alignment="0" attributes="0"> @@ -30,7 +30,7 @@ <Group type="102" alignment="1" attributes="0"> <Group type="103" groupAlignment="0" attributes="0"> <Group type="102" attributes="0"> - <Component id="jLabel1" pref="52" max="32767" attributes="0"/> + <Component id="jLabel1" pref="120" max="32767" attributes="0"/> <EmptySpace min="-2" pref="44" max="-2" attributes="0"/> </Group> <Group type="102" alignment="0" attributes="0"> diff --git a/JAVA/LofarUtils/src/nl/astron/lofar/lofarutils/DateTimeChooser.java b/JAVA/LofarUtils/src/nl/astron/lofar/lofarutils/DateTimeChooser.java index d69d39889a4cd1e4d5e26cae2bd6968f2c3c2716..cb9b61f2e2218f3e5dda040e36870a34b735188d 100644 --- a/JAVA/LofarUtils/src/nl/astron/lofar/lofarutils/DateTimeChooser.java +++ b/JAVA/LofarUtils/src/nl/astron/lofar/lofarutils/DateTimeChooser.java @@ -42,7 +42,7 @@ import javax.swing.event.EventListenerList; * * Minor changes to adepts to LOFAR */ -public class DateTimeChooser +public final class DateTimeChooser extends javax.swing.JPanel { @@ -340,7 +340,7 @@ public class DateTimeChooser try { aD=aDate.parse(aS); } catch (ParseException ex) { - ex.printStackTrace(); + System.out.println(ex.getMessage()); } DateTimeChooser.this.setDate(aD,false); }//GEN-LAST:event_nowActionPerformed diff --git a/JAVA/LofarUtils/src/nl/astron/lofar/lofarutils/inputfieldbuilder/test/inputFieldBuilderTest.form b/JAVA/LofarUtils/src/nl/astron/lofar/lofarutils/inputfieldbuilder/test/inputFieldBuilderTest.form index a16ee166ecf47202f3e8e49060fa08ebca818f17..6aeb13859b98c1a8de2ec0f42717bc5c0a070438 100644 --- a/JAVA/LofarUtils/src/nl/astron/lofar/lofarutils/inputfieldbuilder/test/inputFieldBuilderTest.form +++ b/JAVA/LofarUtils/src/nl/astron/lofar/lofarutils/inputfieldbuilder/test/inputFieldBuilderTest.form @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="UTF-8" ?> +<?xml version="1.1" encoding="UTF-8" ?> <Form version="1.5" maxVersion="1.7" type="org.netbeans.modules.form.forminfo.JFrameFormInfo"> <Properties> diff --git a/JAVA/LofarUtils/src/nl/astron/lofar/lofarutils/inputfieldbuilder/test/inputFieldBuilderTest.java b/JAVA/LofarUtils/src/nl/astron/lofar/lofarutils/inputfieldbuilder/test/inputFieldBuilderTest.java index 33d1360fffc4cfeae13865cfcf4f7dc1f9b0c4d1..4d994b85f6fe7f5af460069bf7b156a8dc557f0f 100644 --- a/JAVA/LofarUtils/src/nl/astron/lofar/lofarutils/inputfieldbuilder/test/inputFieldBuilderTest.java +++ b/JAVA/LofarUtils/src/nl/astron/lofar/lofarutils/inputfieldbuilder/test/inputFieldBuilderTest.java @@ -11,7 +11,6 @@ package nl.astron.lofar.lofarutils.inputfieldbuilder.test; -import javax.swing.JFrame; import javax.swing.JPanel; /** @@ -126,6 +125,7 @@ public class inputFieldBuilderTest extends javax.swing.JFrame { */ public static void main(String args[]) { java.awt.EventQueue.invokeLater(new Runnable() { + @Override public void run() { new inputFieldBuilderTest().setVisible(true); } diff --git a/JAVA/LofarUtils/src/nl/astron/lofar/lofarutils/remoteFile.java b/JAVA/LofarUtils/src/nl/astron/lofar/lofarutils/remoteFile.java index 004cdfd73fe8222f83aa7125521c963ee190ef15..7c69b46b3c98f2488c4c4fc1b83fe774969d63f2 100644 --- a/JAVA/LofarUtils/src/nl/astron/lofar/lofarutils/remoteFile.java +++ b/JAVA/LofarUtils/src/nl/astron/lofar/lofarutils/remoteFile.java @@ -47,6 +47,7 @@ public class remoteFile implements remoteFileInterface{ itsName=ext; } + @Override public boolean deleteTempFile(String aFileName) throws RemoteException { if (aFileName != null) { try { @@ -60,7 +61,6 @@ public class remoteFile implements remoteFileInterface{ } } catch (Exception ex) { System.out.println("RemoteFileImpl: " + ex.getMessage()); - ex.printStackTrace(); return false; } } else { @@ -69,6 +69,7 @@ public class remoteFile implements remoteFileInterface{ } } + @Override public byte[] downloadFile(String aFileName) throws RemoteException { if (aFileName != null) { try { @@ -81,7 +82,6 @@ public class remoteFile implements remoteFileInterface{ return(buffer); } catch (Exception ex) { System.out.println("RemoteFileImpl: " + ex.getMessage()); - ex.printStackTrace(); return(null); } } else { @@ -90,6 +90,7 @@ public class remoteFile implements remoteFileInterface{ } } + @Override public boolean uploadFile(byte[] buffer,String aFileName) throws RemoteException { boolean succes=false; if (buffer != null && aFileName.length() > 0) { @@ -103,7 +104,6 @@ public class remoteFile implements remoteFileInterface{ return(true); } catch (Exception ex) { System.out.println("RemoteFileAdapter: " + ex.getMessage()); - ex.printStackTrace(); return(succes); } } else { diff --git a/JAVA/LofarUtils/src/nl/astron/lofar/lofarutils/validation/AbstractValidator.java b/JAVA/LofarUtils/src/nl/astron/lofar/lofarutils/validation/AbstractValidator.java index a1a495d54f65569b8b6fd754f66a76d0875b72e9..04fec939e2e41a805c342b85b1af3b08510381fa 100644 --- a/JAVA/LofarUtils/src/nl/astron/lofar/lofarutils/validation/AbstractValidator.java +++ b/JAVA/LofarUtils/src/nl/astron/lofar/lofarutils/validation/AbstractValidator.java @@ -85,6 +85,7 @@ public abstract class AbstractValidator extends InputVerifier implements KeyList * validationCriteria() instead. */ + @Override public boolean verify(JComponent c) { // System.out.println("AbstractValidator-entered verify. Component-"+ c.getName()+" popup.visible: "+popup.isVisible()); popup.setVisible(false); @@ -129,6 +130,7 @@ public abstract class AbstractValidator extends InputVerifier implements KeyList * @see KeyListener */ + @Override public void keyPressed(KeyEvent e) { checkPopup(); } @@ -137,12 +139,14 @@ public abstract class AbstractValidator extends InputVerifier implements KeyList * @see KeyListener */ + @Override public void keyTyped(KeyEvent e) {} /** * @see KeyListener */ + @Override public void keyReleased(KeyEvent e) {} public boolean isVisible() { diff --git a/JAVA/LofarUtils/src/nl/astron/lofar/lofarutils/validation/BoolValidator.java b/JAVA/LofarUtils/src/nl/astron/lofar/lofarutils/validation/BoolValidator.java index 19db4313e3b75438d7e14d1930f6c3d4470bebf3..aeedcefa400095b949f94bd6f51720858c845e9f 100644 --- a/JAVA/LofarUtils/src/nl/astron/lofar/lofarutils/validation/BoolValidator.java +++ b/JAVA/LofarUtils/src/nl/astron/lofar/lofarutils/validation/BoolValidator.java @@ -22,6 +22,7 @@ public class BoolValidator extends AbstractValidator { super(parent, c, message); } + @Override protected boolean validationCriteria(JComponent c) { String input = ((JTextField)c).getText(); diff --git a/JAVA/LofarUtils/src/nl/astron/lofar/lofarutils/validation/BoolVectorValidator.java b/JAVA/LofarUtils/src/nl/astron/lofar/lofarutils/validation/BoolVectorValidator.java index 24ae5ec05f0fd519ddbcc31fa6e5cb42251fa5d8..b873e8ded47b12ba849521413ba90e8e8399146e 100644 --- a/JAVA/LofarUtils/src/nl/astron/lofar/lofarutils/validation/BoolVectorValidator.java +++ b/JAVA/LofarUtils/src/nl/astron/lofar/lofarutils/validation/BoolVectorValidator.java @@ -21,6 +21,7 @@ public class BoolVectorValidator extends AbstractValidator { super(parent, c, ""); } + @Override protected boolean validationCriteria(JComponent c) { String input = ((JTextField)c).getText();