Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkhussey2010-05-31 20:24:36 +0000
committerkhussey2010-05-31 20:24:36 +0000
commitcc7e18dd41dbd3fafba240a21d6615d3dc599cf8 (patch)
treeb07b054d65ea1cbecfc38a95b095d7e3646f4808 /plugins/org.eclipse.uml2.uml
parent741ca04ad2dfc390254ccf5d675dd196585e33ae (diff)
downloadorg.eclipse.uml2.test-cc7e18dd41dbd3fafba240a21d6615d3dc599cf8.tar.gz
org.eclipse.uml2.test-cc7e18dd41dbd3fafba240a21d6615d3dc599cf8.tar.xz
org.eclipse.uml2.test-cc7e18dd41dbd3fafba240a21d6615d3dc599cf8.zip
[314971] Ensuring package merge relationships are properly destroyed after a merge operation.v201006071150
Diffstat (limited to 'plugins/org.eclipse.uml2.uml')
-rw-r--r--plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/util/UMLUtil.java12
1 files changed, 9 insertions, 3 deletions
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/util/UMLUtil.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/util/UMLUtil.java
index f3426308..c3e19f2f 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/util/UMLUtil.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/util/UMLUtil.java
@@ -9,9 +9,9 @@
* IBM - initial API and implementation
* Kenn Hussey (Embarcadero Technologies) - 199624, 184249, 204406, 208125, 204200, 213218, 213903, 220669, 208016, 226396, 271470
* Nicolas Rouquette (JPL) - 260120, 313837
- * Kenn Hussey - 286329, 313601
+ * Kenn Hussey - 286329, 313601, 314971
*
- * $Id: UMLUtil.java,v 1.87 2010/05/26 15:54:18 khussey Exp $
+ * $Id: UMLUtil.java,v 1.88 2010/05/31 20:24:36 khussey Exp $
*/
package org.eclipse.uml2.uml.util;
@@ -1991,7 +1991,13 @@ public class UMLUtil
copyAll(mergedPackages);
copyReferences();
- receivingPackage.getPackageMerges().clear();
+ for (Iterator<PackageMerge> packageMerges = receivingPackage
+ .getPackageMerges().iterator(); packageMerges.hasNext();) {
+
+ PackageMerge packageMerge = packageMerges.next();
+ packageMerges.remove();
+ packageMerge.destroy();
+ }
if (options != null) {
processOptions(options, diagnostics, context);

Back to the top