diff --git a/src/PamView/PamGui.java b/src/PamView/PamGui.java index ed596c5d..b5d91e8f 100644 --- a/src/PamView/PamGui.java +++ b/src/PamView/PamGui.java @@ -603,17 +603,17 @@ public class PamGui extends PamView implements WindowListener, PamSettings { fileMenu.add(menuItem); } - if (SMRUEnable.isEnable()) { - menuItem = new JMenuItem("Import PAMGuard Modules"); - menuItem.setToolTipText("Import module settings from a different PAMGuard configuration (psfx files only"); - menuItem.addActionListener(new ActionListener() { - @Override - public void actionPerformed(ActionEvent e) { - importSettings(); - } - }); - fileMenu.add(menuItem); - } + // if (SMRUEnable.isEnable()) { + menuItem = new JMenuItem("Import PAMGuard Modules"); + menuItem.setToolTipText("Import module settings from a different PAMGuard configuration (psfx files only"); + menuItem.addActionListener(new ActionListener() { + @Override + public void actionPerformed(ActionEvent e) { + importSettings(); + } + }); + fileMenu.add(menuItem); +// } fileMenu.addSeparator(); diff --git a/src/metadata/PamguardMetaData.java b/src/metadata/PamguardMetaData.java index a15b4373..ae4064ab 100644 --- a/src/metadata/PamguardMetaData.java +++ b/src/metadata/PamguardMetaData.java @@ -92,11 +92,17 @@ public class PamguardMetaData implements Serializable { * @return the deploymentWrapper */ public NilusSettingsWrapper getDeploymentWrapper() { + if (deploymentWrapper == null) { + deploymentWrapper = new NilusSettingsWrapper<>(); + } return deploymentWrapper; } public void checkSerialisation() { // check that all wrappers have their xml up to date. + if (deploymentWrapper == null) { + deploymentWrapper = new NilusSettingsWrapper<>(); + } deploymentWrapper.reSerialise(); } diff --git a/src/tethys/dbxml/DBXMLQueries.java b/src/tethys/dbxml/DBXMLQueries.java index a7967f0f..460fbc66 100644 --- a/src/tethys/dbxml/DBXMLQueries.java +++ b/src/tethys/dbxml/DBXMLQueries.java @@ -206,7 +206,7 @@ public class DBXMLQueries { result = queries.QueryTethys(xQuery); } catch (Exception e) { - e.printStackTrace(); +// e.printStackTrace(); } if (result == null) { return null; diff --git a/src/tethys/niluswraps/NilusSettingsWrapper.java b/src/tethys/niluswraps/NilusSettingsWrapper.java index d5ed1401..68fa9628 100644 --- a/src/tethys/niluswraps/NilusSettingsWrapper.java +++ b/src/tethys/niluswraps/NilusSettingsWrapper.java @@ -74,7 +74,7 @@ public class NilusSettingsWrapper implements Serializable, Clo } /** * Set the nilus object. This marshals the nilus object - * into xml and saves the data as an intetnal xml string which + * into xml and saves the data as an internal xml string which * can be safely serialized. * @param nilusObject nilus object. * @return true if it was marshalled OK.