Bump to v2.1.5

sverhoeven · sverhoeven · commit 9d5525a1adc1 · 2017-03-01T11:47:34.000+01:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,13 +5,19 @@ Formatted as described on http://keepachangelog.com/
 
 ## Unreleased
 
+## [2.1.5] - 2017-03-01
+
 Requires KripoDB v2.2.0 or higher.
 
 ### Added
 
 - Fragment information node fails completely when just one of the fragment ids is wrong (#11)
 - Fragment similarity node gives warnings for query fragment ids that can not be found
 
+## [2.1.4]
+
+Retracted due to unresolved compilation problems.
+
 ## [2.1.3] - 2017-01-20
 
 ### Added
diff --git a/README.md b/README.md
@@ -48,7 +48,7 @@ Steps to get development environment setup:
 4. Install m2e (Maven integration for Eclipse) + KNIME Python Integration + RDKit KNIME integration + KNIME Testing framework + 3D-e-Chem node category
 
     1. Goto Help > Install new software ...
-    2. Make sure Update site is https://3d-e-chem.github.io/updates ,  http://update.knime.org/analytics-platform/3.1 and http://update.knime.org/community-contributions/trusted/3.1 are in the pull down list otherwise add it
+    2. Make sure Update site is https://3d-e-chem.github.io/updates , http://download.eclipse.org/releases/neon/ ,  http://update.knime.org/analytics-platform/3.1 and http://update.knime.org/community-contributions/trusted/3.1 are in the pull down list otherwise add it
     3. Select --all sites-- in work with pulldown
     4. Select m2e (Maven integration for Eclipse)
     5. Select `RDKit KNIME integration`
diff --git a/feature/feature.xml b/feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="nl.esciencecenter.e3dchem.kripodb.feature"
       label="KripoDB nodes for Knime"
-      version="2.1.4"
+      version="2.1.5"
       provider-name="Netherlands eScience Center">
 
    <description url="https://github.com/3D-e-Chem/knime-kripodb">
diff --git a/feature/pom.xml b/feature/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>nl.esciencecenter.e3dchem.kripodb</groupId>
 		<artifactId>nl.esciencecenter.e3dchem.kripodb</artifactId>
-		<version>2.1.4</version>
+		<version>2.1.5</version>
 	</parent>
 
 	<artifactId>nl.esciencecenter.e3dchem.kripodb.feature</artifactId>
diff --git a/p2/category.xml b/p2/category.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site>
-   <feature url="features/nl.esciencecenter.e3dchem.kripodb.feature-2.1.4.jar" id="nl.esciencecenter.e3dchem.kripodb.feature" version="2.1.4">
+   <feature url="features/nl.esciencecenter.e3dchem.kripodb.feature-2.1.5.jar" id="nl.esciencecenter.e3dchem.kripodb.feature" version="2.1.5">
       <category name="nl.esciencecenter.3D-e-Chem"/>
    </feature>
-   <feature url="features/nl.esciencecenter.e3dchem.kripodb.feature.source_2.1.4.jar" id="nl.esciencecenter.e3dchem.kripodb.feature.source" version="2.1.4">
+   <feature url="features/nl.esciencecenter.e3dchem.kripodb.feature.source_2.1.5.jar" id="nl.esciencecenter.e3dchem.kripodb.feature.source" version="2.1.5">
       <category name="nl.esciencecenter.3D-e-Chem.sources"/>
    </feature>
    <category-def name="nl.esciencecenter.3D-e-Chem" label="KNIME 3D-e-Chem Contributions">
diff --git a/p2/pom.xml b/p2/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>nl.esciencecenter.e3dchem.kripodb</artifactId>
         <groupId>nl.esciencecenter.e3dchem.kripodb</groupId>
-        <version>2.1.4</version>
+        <version>2.1.5</version>
     </parent>
     <artifactId>nl.esciencecenter.e3dchem.kripodb.p2</artifactId>
     <packaging>eclipse-repository</packaging>
diff --git a/plugin/META-INF/MANIFEST.MF b/plugin/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: 3D-e-Chem KNIME KripoDB nodes
 Bundle-SymbolicName: nl.esciencecenter.e3dchem.kripodb.plugin;singleton:=true
-Bundle-Version: 2.1.4
+Bundle-Version: 2.1.5
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Activator: nl.esciencecenter.e3dchem.kripodb.Activator
 Require-Bundle: org.knime.core;bundle-version="[3.1.0,4.0.0)",
diff --git a/plugin/pom.xml b/plugin/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>nl.esciencecenter.e3dchem.kripodb</groupId>
 		<artifactId>nl.esciencecenter.e3dchem.kripodb</artifactId>
-		<version>2.1.4</version>
+		<version>2.1.5</version>
 	</parent>
 	<artifactId>nl.esciencecenter.e3dchem.kripodb.plugin</artifactId>
 	<packaging>eclipse-plugin</packaging>
diff --git a/plugin/src/java/nl/esciencecenter/e3dchem/kripodb/fragments/FragmentByIdDialog.java b/plugin/src/java/nl/esciencecenter/e3dchem/kripodb/fragments/FragmentByIdDialog.java
@@ -34,7 +34,7 @@ protected FragmentByIdDialog() {
         addDialogComponent(new DialogComponentFileChooser(fragmentsdb, historyID, ".sqlite"));
 
         SettingsModelString idType = config.getIdType();
-        Set<String> idTypeChoices = config.LIST_IDENTIFIERTYPES;
+        Set<String> idTypeChoices = FragmentsByIdConfig.LIST_IDENTIFIERTYPES;
         addDialogComponent(new DialogComponentStringSelection(idType, "Type of identifier", idTypeChoices));
     }
 
diff --git a/plugin/src/java/nl/esciencecenter/e3dchem/kripodb/fragments/FragmentByIdFactory.java b/plugin/src/java/nl/esciencecenter/e3dchem/kripodb/fragments/FragmentByIdFactory.java
@@ -42,9 +42,6 @@ public NodeDialogPane createNodeDialogPane() {
 		return new FragmentByIdDialog();
 	}
 
-	/**
-	 * {@inheritDoc}
-	 */
 	@Override
 	public NodeView<FragmentByIdModel> createNodeView(int viewIndex, FragmentByIdModel nodeModel) {
 		return null;
diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>nl.esciencecenter.e3dchem.kripodb</groupId>
 	<artifactId>nl.esciencecenter.e3dchem.kripodb</artifactId>
-	<version>2.1.4</version>
+	<version>2.1.5</version>
 	<packaging>pom</packaging>
 
 	<organization>
diff --git a/tests/META-INF/MANIFEST.MF b/tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Tests
 Bundle-SymbolicName: nl.esciencecenter.e3dchem.kripodb.tests
-Bundle-Version: 2.1.4
+Bundle-Version: 2.1.5
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.junit;bundle-version="4.12.0",
  org.knime.core;bundle-version="[3.1.0,4.0.0)",
diff --git a/tests/pom.xml b/tests/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>nl.esciencecenter.e3dchem.kripodb</groupId>
 		<artifactId>nl.esciencecenter.e3dchem.kripodb</artifactId>
-		<version>2.1.4</version>
+		<version>2.1.5</version>
 	</parent>
 
 	<artifactId>nl.esciencecenter.e3dchem.kripodb.tests</artifactId>
diff --git a/tests/src/java/nl/esciencecenter/e3dchem/kripodb/FragmentByIdFactoryTest.java b/tests/src/java/nl/esciencecenter/e3dchem/kripodb/FragmentByIdFactoryTest.java
@@ -0,0 +1,16 @@
+package nl.esciencecenter.e3dchem.kripodb;
+
+import static org.junit.Assert.*;
+
+import org.junit.Test;
+
+import nl.esciencecenter.e3dchem.kripodb.fragments.FragmentByIdFactory;
+
+public class FragmentByIdFactoryTest {
+	
+	@Test
+	public void getNrNodeViewsTest() {
+		FragmentByIdFactory factory = new FragmentByIdFactory();
+		assertEquals(factory.getNrNodeViews(), 0);
+	}
+}

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ protected FragmentByIdDialog() {`
`34`	`34`	`addDialogComponent(new DialogComponentFileChooser(fragmentsdb, historyID, ".sqlite"));`
`35`	`35`
`36`	`36`	`SettingsModelString idType = config.getIdType();`
`37`		`- Set<String> idTypeChoices = config.LIST_IDENTIFIERTYPES;`
	`37`	`+ Set<String> idTypeChoices = FragmentsByIdConfig.LIST_IDENTIFIERTYPES;`
`38`	`38`	`addDialogComponent(new DialogComponentStringSelection(idType, "Type of identifier", idTypeChoices));`
`39`	`39`	`}`
`40`	`40`
Original file line number	Diff line number	Diff line change
`@@ -42,9 +42,6 @@ public NodeDialogPane createNodeDialogPane() {`
`42`	`42`	`return new FragmentByIdDialog();`
`43`	`43`	`}`
`44`	`44`
`45`		`- /**`
`46`		`- * {@inheritDoc}`
`47`		`- */`
`48`	`45`	`@Override`
`49`	`46`	`public NodeView<FragmentByIdModel> createNodeView(int viewIndex, FragmentByIdModel nodeModel) {`
`50`	`47`	`return null;`