From f03f853dc38db42a7f76bdd2872b7df02d9cff63 Mon Sep 17 00:00:00 2001
From: hjkhjk54 <hjkhjk54@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Thu, 28 Jun 2012 21:25:07 +0000
Subject: [PATCH] NIHVIVO-3843 - updated dependent resource delete to loop
 through unique set of change statements instead of through duplicates as was
 possible before (and which leading to error stated in the JIRA issue) - and
 updated EditConfigurationVTwo to set default value of
 useDependentResourceDelete to false, since technically we really shouldn't be
 employing the DependentResourceDeleteJena code anymore (setting that flag to
 false will skip over that code entirely).

---
 .../vitro/webapp/dao/jena/DependentResourceDeleteJena.java   | 5 ++++-
 .../webapp/edit/n3editing/VTwo/EditConfigurationVTwo.java    | 3 ++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/DependentResourceDeleteJena.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/DependentResourceDeleteJena.java
index f2e5b6925..08b879c0b 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/DependentResourceDeleteJena.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/DependentResourceDeleteJena.java
@@ -60,7 +60,10 @@ public class DependentResourceDeleteJena {
 		List<Statement> removedStmts = getRemovedStmts( assertions, retractions);
 
 		/* Get ride of any statements that seem to be a change */
-		List<Statement>changedStmts = getChangedStmts( assertions, retractions);
+		HashSet<Statement> changedStatementsSet = new HashSet<Statement>();
+		changedStatementsSet.addAll(getChangedStmts( assertions, retractions));
+		List<Statement>changedStmts = new LinkedList<Statement>();
+		changedStmts.addAll(changedStatementsSet);
 		ListIterator <Statement>removed = removedStmts.listIterator();
 		while( removed.hasNext()){
 			Statement removedStmt = removed.next();
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/EditConfigurationVTwo.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/EditConfigurationVTwo.java
index bdf684f48..39be126fb 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/EditConfigurationVTwo.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/EditConfigurationVTwo.java
@@ -162,8 +162,9 @@ public class EditConfigurationVTwo {
     /** 
      * If true, then any dependent resources that are unlinked should be
      * removed using DependentResourceDelete. 
+     *Setting to false for now as we should no longer be utilizing dependent resource deletion.
      */
-    private boolean useDependentResourceDelete = true;   
+    private boolean useDependentResourceDelete = false;   
 
     /** Model id from write model. */
     private String writeModelId;