[jbosstools-commits] JBoss Tools SVN: r24475 - in branches/jbosstools-3.2.0.M2/bpel/plugins: org.eclipse.bpel.validator/src/org/eclipse/bpel/validator and 1 other directory.

[jbosstools-commits at lists.jboss.org]

Author: bbrodt
Date: 2010-08-26 13:11:33 -0400 (Thu, 26 Aug 2010)
New Revision: 24475

Modified:
   branches/jbosstools-3.2.0.M2/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/util/BPELReader.java
   branches/jbosstools-3.2.0.M2/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/BPELReader.java
Log:
https://jira.jboss.org/browse/JBIDE-6825
Fix blocking bug. This is still in trunk but will be fixed soon.

Modified: branches/jbosstools-3.2.0.M2/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/util/BPELReader.java
===================================================================
--- branches/jbosstools-3.2.0.M2/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/util/BPELReader.java	2010-08-26 14:26:16 UTC (rev 24474)
+++ branches/jbosstools-3.2.0.M2/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/util/BPELReader.java	2010-08-26 17:11:33 UTC (rev 24475)
@@ -76,7 +76,10 @@
 			// but no parsing errors were logged in the Resource. This is because demand
 			// load was used by createResource(). Force a reload here, this time with
 			// proper error logging.
-			processResource.unload();
+			// FIXME: this somehow breaks the resource change notifications, so that changes to the model
+			// don't cause the Resource to be marked dirty.
+			// This is a quick patch for JBT 3.2.0.M2, I'll fix this later
+//			processResource.unload();
 			processResource.load(Collections.EMPTY_MAP);
 			EList<EObject> contents = processResource.getContents();
 			if (!contents.isEmpty())
@@ -182,7 +185,10 @@
 
 		try {
 			// https://jira.jboss.org/browse/JBIDE-6825
-			processResource.unload();
+			// FIXME: this somehow breaks the resource change notifications, so that changes to the model
+			// don't cause the Resource to be marked dirty.
+			// This is a quick patch for JBT 3.2.0.M2, I'll fix this later
+//			processResource.unload();
 			processResource.load(Collections.EMPTY_MAP);
 			EList<EObject> contents = processResource.getContents();
 			if (!contents.isEmpty())

Modified: branches/jbosstools-3.2.0.M2/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/BPELReader.java
===================================================================
--- branches/jbosstools-3.2.0.M2/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/BPELReader.java	2010-08-26 14:26:16 UTC (rev 24474)
+++ branches/jbosstools-3.2.0.M2/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/BPELReader.java	2010-08-26 17:11:33 UTC (rev 24475)
@@ -121,7 +121,10 @@
 			// but no parsing errors were logged in the Resource. This is because demand
 			// load was used by createResource(). Force a reload here, this time with
 			// proper error logging.
-			processResource.unload();
+			// FIXME: this somehow breaks the resource change notifications, so that changes to the model
+			// don't cause the Resource to be marked dirty.
+			// This is a quick patch for JBT 3.2.0.M2, I'll fix this later
+//			processResource.unload();
 			processResource.load (Collections.EMPTY_MAP);
 			EList contents = processResource.getContents();
 			if (!contents.isEmpty()) {