From 4895d7d40c4591474c54396d6eda576d8004c64d Mon Sep 17 00:00:00 2001
From: eea03 <tomas.caban@eea.sk>
Date: Mon, 14 Dec 2015 14:53:51 +0100
Subject: [PATCH 1/4] Develop snapshot version

---
 CHANGELOG.md | 4 ++++
 pom.xml      | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index aec5213..df48efa 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,10 @@
 E-FilesFromCKAN
 ----------
 
+v1.1.6-SNAPSHOT
+---
+* N/A
+
 v1.1.5
 ---
 * fixed: CKAN resources list in DPU configuration dialog is alphabetically ordered now
diff --git a/pom.xml b/pom.xml
index 496f26a..a3bd1bd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
     <groupId>org.opendatanode.plugins</groupId>
     <artifactId>uv-e-filesFromCKAN</artifactId>
     <name>E-FilesFromCKAN</name>
-    <version>1.1.5</version>
+    <version>1.1.6-SNAPSHOT</version>
     <description>Extractor of CKAN file resources</description>
     <packaging>bundle</packaging>
 

From a3761a42c6678b6a729aa1d39ae4f385a373e9ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Vir=C3=A1g?= <martin.virag@eea.sk>
Date: Thu, 25 Aug 2016 13:19:51 +0200
Subject: [PATCH 2/4] bugfix: UI error caused by resources of different
 datasets having the same ID

---
 CHANGELOG.md                                  |  2 +-
 .../ckan/file/FilesFromCkanVaadinDialog.java  | 17 ++++--
 .../extractor/ckan/file/ResourceItem.java     | 52 +++++++++++--------
 3 files changed, 42 insertions(+), 29 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index df48efa..4172bc1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,7 +3,7 @@ E-FilesFromCKAN
 
 v1.1.6-SNAPSHOT
 ---
-* N/A
+* fixed: UI error caused by resources of different datasets having the same ID
 
 v1.1.5
 ---
diff --git a/src/main/java/org/opendatanode/plugins/extractor/ckan/file/FilesFromCkanVaadinDialog.java b/src/main/java/org/opendatanode/plugins/extractor/ckan/file/FilesFromCkanVaadinDialog.java
index ae16028..264e7ff 100644
--- a/src/main/java/org/opendatanode/plugins/extractor/ckan/file/FilesFromCkanVaadinDialog.java
+++ b/src/main/java/org/opendatanode/plugins/extractor/ckan/file/FilesFromCkanVaadinDialog.java
@@ -75,6 +75,8 @@ public class FilesFromCkanVaadinDialog extends AbstractDialog<FilesFromCkanConfi
 
     private static final String CONFIGURATION_LOCALE = "locale";
 
+	private static final String CAPTION_ITEM_PROPERTY = "caption";
+
     public FilesFromCkanVaadinDialog() {
         super(FilesFromCkan.class);
     }
@@ -142,8 +144,8 @@ public void valueChange(ValueChangeEvent event) {
         // setting up for filtering
         datasetResourceTree.setMultiSelect(false);
         datasetResourceTree.setItemCaptionMode(ItemCaptionMode.PROPERTY);
-        datasetResourceTree.setItemCaptionPropertyId("caption");
-        datasetResourceTree.addContainerProperty("caption", String.class, "");
+        datasetResourceTree.setItemCaptionPropertyId(CAPTION_ITEM_PROPERTY);
+        datasetResourceTree.addContainerProperty(CAPTION_ITEM_PROPERTY, String.class, "");
 
         // sort alphabetically asc 
         ((HierarchicalContainer) datasetResourceTree.getContainerDataSource()).setItemSorter(new ItemSorter() {
@@ -199,7 +201,7 @@ public void textChange(TextChangeEvent event) {
                 ds.removeAllContainerFilters();
 
                 if (!filterText.isEmpty()) {
-                    SimpleStringFilter filter = new SimpleStringFilter("caption", event.getText(), true, false);
+                    SimpleStringFilter filter = new SimpleStringFilter(CAPTION_ITEM_PROPERTY, event.getText(), true, false);
                     ds.addContainerFilter(filter);
                 }
             }
@@ -415,7 +417,12 @@ private void addPublicDatasets() {
     private void addTreeItem(CkanTreeItem item, CkanTreeItem parent, boolean childrenAllowed) {
 
         // adding item and property for filtering
-        datasetResourceTree.addItem(item).getItemProperty("caption").setValue(item.toString());
+        Item addedItem = datasetResourceTree.addItem(item);
+        if (addedItem == null) { // item is already in the tree
+        	LOG.warn("Item '" + item + "' (id=" + item.getId() + ") is already in the tree. (Parent=" + parent + ")");
+			return;
+		}
+        addedItem.getItemProperty(CAPTION_ITEM_PROPERTY).setValue(item.toString());
         datasetResourceTree.setChildrenAllowed(item, childrenAllowed);
 
         if (item instanceof DatasetItem) {
@@ -436,7 +443,7 @@ private void setDatasetParent(Tree tree, DatasetItem dataset) {
 
         Item orgItem = tree.getItem(orgItemId);
         if (orgItem == null) {
-            tree.addItem(orgItemId).getItemProperty("caption").setValue(orgItemId.toString());
+            tree.addItem(orgItemId).getItemProperty(CAPTION_ITEM_PROPERTY).setValue(orgItemId.toString());
         }
 
         tree.setParent(dataset, orgItemId);
diff --git a/src/main/java/org/opendatanode/plugins/extractor/ckan/file/ResourceItem.java b/src/main/java/org/opendatanode/plugins/extractor/ckan/file/ResourceItem.java
index fc217c0..d4bf198 100644
--- a/src/main/java/org/opendatanode/plugins/extractor/ckan/file/ResourceItem.java
+++ b/src/main/java/org/opendatanode/plugins/extractor/ckan/file/ResourceItem.java
@@ -53,28 +53,34 @@ public String getDescription() {
         return description;
     }
 
-    @Override
-    public int hashCode() {
-        final int prime = 31;
-        int result = 1;
-        result = prime * result + ((id == null) ? 0 : id.hashCode());
-        return result;
-    }
+	@Override
+	public int hashCode() {
+		final int prime = 31;
+		int result = 1;
+		result = prime * result + ((id == null) ? 0 : id.hashCode());
+		result = prime * result + ((packageId == null) ? 0 : packageId.hashCode());
+		return result;
+	}
 
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj)
-            return true;
-        if (obj == null)
-            return false;
-        if (getClass() != obj.getClass())
-            return false;
-        ResourceItem other = (ResourceItem) obj;
-        if (id == null) {
-            if (other.id != null)
-                return false;
-        } else if (!id.equals(other.id))
-            return false;
-        return true;
-    }
+	@Override
+	public boolean equals(Object obj) {
+		if (this == obj)
+			return true;
+		if (obj == null)
+			return false;
+		if (getClass() != obj.getClass())
+			return false;
+		ResourceItem other = (ResourceItem) obj;
+		if (id == null) {
+			if (other.id != null)
+				return false;
+		} else if (!id.equals(other.id))
+			return false;
+		if (packageId == null) {
+			if (other.packageId != null)
+				return false;
+		} else if (!packageId.equals(other.packageId))
+			return false;
+		return true;
+	}
 }
\ No newline at end of file

From 2f97c5c57b6eb4eb66322a003fb4f0e9352ecf13 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Vir=C3=A1g?= <martin.virag@eea.sk>
Date: Thu, 25 Aug 2016 14:42:49 +0200
Subject: [PATCH 3/4] bugfix: prevented CKAN resource id to be set as pipeline
 metadata. This metadata caused creation of CKAN resources with the same id.

---
 CHANGELOG.md                                                 | 1 +
 .../plugins/extractor/ckan/file/FilesFromCkanHelper.java     | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4172bc1..d801bb4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@ E-FilesFromCKAN
 v1.1.6-SNAPSHOT
 ---
 * fixed: UI error caused by resources of different datasets having the same ID
+* prevented CKAN resource id to be set as pipeline metadata. This metadata caused creation of CKAN resources with the same id. 
 
 v1.1.5
 ---
diff --git a/src/main/java/org/opendatanode/plugins/extractor/ckan/file/FilesFromCkanHelper.java b/src/main/java/org/opendatanode/plugins/extractor/ckan/file/FilesFromCkanHelper.java
index 7571737..01db1a1 100644
--- a/src/main/java/org/opendatanode/plugins/extractor/ckan/file/FilesFromCkanHelper.java
+++ b/src/main/java/org/opendatanode/plugins/extractor/ckan/file/FilesFromCkanHelper.java
@@ -386,6 +386,11 @@ private static Resource getResourceFromCkanResponse(JsonObject showResourceResul
         Set<String> jsonKeys = showResourceResult.keySet();
         Map<String, String> resourceMap = new HashMap<>();
         for (String key : jsonKeys) {
+        	if (PARAM_ID.equalsIgnoreCase(key)) {
+        		// ID metadata would cause creation of resource with existing ID, so skip 
+				continue;
+			}
+        	
             if (showResourceResult.get(key).getValueType() == ValueType.STRING) {
                 resourceMap.put(key, showResourceResult.getString(key));
             }

From 3a65e9d499776af7e1bb9aa27d4a7327b6d00f1c Mon Sep 17 00:00:00 2001
From: eea03 <tomas.caban@eea.sk>
Date: Thu, 15 Sep 2016 18:03:28 +0200
Subject: [PATCH 4/4] Version bumped to release version

---
 CHANGELOG.md | 2 +-
 pom.xml      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d801bb4..affa610 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,7 @@
 E-FilesFromCKAN
 ----------
 
-v1.1.6-SNAPSHOT
+v1.1.6
 ---
 * fixed: UI error caused by resources of different datasets having the same ID
 * prevented CKAN resource id to be set as pipeline metadata. This metadata caused creation of CKAN resources with the same id. 
diff --git a/pom.xml b/pom.xml
index a3bd1bd..d539ec6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
     <groupId>org.opendatanode.plugins</groupId>
     <artifactId>uv-e-filesFromCKAN</artifactId>
     <name>E-FilesFromCKAN</name>
-    <version>1.1.6-SNAPSHOT</version>
+    <version>1.1.6</version>
     <description>Extractor of CKAN file resources</description>
     <packaging>bundle</packaging>