Merge branch 'master' of github.com:3D-e-Chem/knime-kripodb

Author: sverhoeven

CHANGELOG.md

@@ -5,7 +5,7 @@ Formatted as described on http://keepachangelog.com/
 
 ## Unreleased
 
-## [2.4.0] - 2018-02-06
+## [2.4.0] - 2018-02-07
 
 ### Changed
 

plugin/META-INF/MANIFEST.MF

@@ -9,7 +9,7 @@ Require-Bundle: org.knime.core;bundle-version="[3.3.0,4.0.0)",
  org.knime.base;bundle-version="[3.3.0,4.0.0)",
  org.knime.chem.types;bundle-version="[3.3.0,4.0.0)",
  org.rdkit.knime.types;bundle-version="[3.0.0,4.0.0)",
- nl.esciencecenter.e3dchem.python.plugin;bundle-version="[2.0.0,3.0.0)",
+ nl.esciencecenter.e3dchem.python.plugin;bundle-version="[2.0.1,3.0.0)",
  nl.esciencecenter.e3dchem.plugin;bundle-version="[1.0.0,2.0.0)",
  nl.esciencecenter.e3dchem.knime.pharmacophore.plugin;bundle-version="[1.0.0,2.0.0)"
 Bundle-Vendor: Netherlands eScience Center

plugin/src/java/nl/esciencecenter/e3dchem/kripodb/fragments/FragmentByIdDialog.java

@@ -59,32 +59,24 @@ public void loadAdditionalSettingsFrom(NodeSettingsRO settings, PortObjectSpec[]
 			throws NotConfigurableException {
 		super.loadAdditionalSettingsFrom(settings, specs);
 		FragmentsByIdConfig config = new FragmentsByIdConfig();
-		try {
-			config.loadFrom(settings);
-			pythonOptions.loadSettingsFrom(config);
-		} catch (InvalidSettingsException e) {
-			// fall back to config defaults
-		}
+		config.loadFromInDialog(settings);
+		pythonOptions.loadSettingsFrom(config);
 	}
 
 	@Override
 	public void loadAdditionalSettingsFrom(NodeSettingsRO settings, DataTableSpec[] specs)
 			throws NotConfigurableException {
 		super.loadAdditionalSettingsFrom(settings, specs);
 		FragmentsByIdConfig config = new FragmentsByIdConfig();
-		try {
-			config.loadFrom(settings);
-			pythonOptions.loadSettingsFrom(config);
-		} catch (InvalidSettingsException e) {
-			// fall back to config defaults
-		}
+		config.loadFromInDialog(settings);
+		pythonOptions.loadSettingsFrom(config);
 	}
 
 	@Override
 	public void saveAdditionalSettingsTo(NodeSettingsWO settings) throws InvalidSettingsException {
 		super.saveAdditionalSettingsTo(settings);
 		FragmentsByIdConfig config = new FragmentsByIdConfig();
 		pythonOptions.saveSettingsTo(config);
-		config.saveTo(settings);
+		config.saveToInDialog(settings);
 	}
 }

plugin/src/java/nl/esciencecenter/e3dchem/kripodb/fragmentsbysimilarity/FragmentBySimilarityDialog.java

@@ -62,32 +62,24 @@ public void loadAdditionalSettingsFrom(NodeSettingsRO settings, PortObjectSpec[]
 			throws NotConfigurableException {
 		super.loadAdditionalSettingsFrom(settings, specs);
 		FragmentsBySimilarityConfig config = new FragmentsBySimilarityConfig();
-		try {
-			config.loadFrom(settings);
-			pythonOptions.loadSettingsFrom(config);
-		} catch (InvalidSettingsException e) {
-			// fall back to config defaults
-		}
+		config.loadFromInDialog(settings);
+		pythonOptions.loadSettingsFrom(config);
 	}
 
 	@Override
 	public void loadAdditionalSettingsFrom(NodeSettingsRO settings, DataTableSpec[] specs)
 			throws NotConfigurableException {
 		super.loadAdditionalSettingsFrom(settings, specs);
 		FragmentsBySimilarityConfig config = new FragmentsBySimilarityConfig();
-		try {
-			config.loadFrom(settings);
-			pythonOptions.loadSettingsFrom(config);
-		} catch (InvalidSettingsException e) {
-			// fall back to config defaults
-		}
+		config.loadFromInDialog(settings);
+		pythonOptions.loadSettingsFrom(config);
 	}
 
 	@Override
 	public void saveAdditionalSettingsTo(NodeSettingsWO settings) throws InvalidSettingsException {
 		super.saveAdditionalSettingsTo(settings);
 		FragmentsBySimilarityConfig config = new FragmentsBySimilarityConfig();
 		pythonOptions.saveSettingsTo(config);
-		config.saveTo(settings);
+		config.saveToInDialog(settings);
 	}
 }

plugin/src/java/nl/esciencecenter/e3dchem/kripodb/local/pharmacophores/PharmacophoresDialog.java

@@ -39,32 +39,24 @@ public void loadAdditionalSettingsFrom(NodeSettingsRO settings, PortObjectSpec[]
 			throws NotConfigurableException {
 		super.loadAdditionalSettingsFrom(settings, specs);
 		PharmacophoresConfig config = new PharmacophoresConfig();
-		try {
-			config.loadFrom(settings);
-			pythonOptions.loadSettingsFrom(config);
-		} catch (InvalidSettingsException e) {
-			// fall back to config defaults
-		}
+		config.loadFromInDialog(settings);
+		pythonOptions.loadSettingsFrom(config);
 	}
 
 	@Override
 	public void loadAdditionalSettingsFrom(NodeSettingsRO settings, DataTableSpec[] specs)
 			throws NotConfigurableException {
 		super.loadAdditionalSettingsFrom(settings, specs);
 		PharmacophoresConfig config = new PharmacophoresConfig();
-		try {
-			config.loadFrom(settings);
-			pythonOptions.loadSettingsFrom(config);
-		} catch (InvalidSettingsException e) {
-			// fall back to config defaults
-		}
+		config.loadFromInDialog(settings);
+		pythonOptions.loadSettingsFrom(config);
 	}
 
 	@Override
 	public void saveAdditionalSettingsTo(NodeSettingsWO settings) throws InvalidSettingsException {
 		super.saveAdditionalSettingsTo(settings);
 		PharmacophoresConfig config = new PharmacophoresConfig();
 		pythonOptions.saveSettingsTo(config);
-		config.saveTo(settings);
+		config.saveToInDialog(settings);
 	}
 }