Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkhussey2010-05-25 13:37:10 +0000
committerkhussey2010-05-25 13:37:10 +0000
commit4cd4a78cc5b8515dbd215ae72682014f478df5d1 (patch)
tree5f5354d3060298340d616814891981dc5876204e /plugins/org.eclipse.uml2.uml
parent3bafbc8eeb1085369d4a4d66811b62eae06501de (diff)
downloadorg.eclipse.uml2.test-4cd4a78cc5b8515dbd215ae72682014f478df5d1.tar.gz
org.eclipse.uml2.test-4cd4a78cc5b8515dbd215ae72682014f478df5d1.tar.xz
org.eclipse.uml2.test-4cd4a78cc5b8515dbd215ae72682014f478df5d1.zip
[313837] Fixing problems with package merge w.r.t. invalid subsets and redundant generalizations.
Diffstat (limited to 'plugins/org.eclipse.uml2.uml')
-rw-r--r--plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/util/UMLUtil.java7
1 files changed, 4 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 71637c05..967131c8 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
@@ -8,10 +8,10 @@
* Contributors:
* IBM - initial API and implementation
* Kenn Hussey (Embarcadero Technologies) - 199624, 184249, 204406, 208125, 204200, 213218, 213903, 220669, 208016, 226396, 271470
- * Nicolas Rouquette (JPL) - 260120
+ * Nicolas Rouquette (JPL) - 260120, 313837
* Kenn Hussey - 286329
*
- * $Id: UMLUtil.java,v 1.85 2010/03/02 03:10:32 khussey Exp $
+ * $Id: UMLUtil.java,v 1.86 2010/05/25 13:37:10 khussey Exp $
*/
package org.eclipse.uml2.uml.util;
@@ -1544,7 +1544,6 @@ public class UMLUtil
new Object[]{subsettingProperty,
subsettedProperty}));
}
- }
if (OPTION__PROCESS.equals(options
.get(OPTION__INVALID_SUBSETS))) {
@@ -1588,6 +1587,7 @@ public class UMLUtil
}
}
}
+ }
}
}
}
@@ -1730,6 +1730,7 @@ public class UMLUtil
}
g.remove();
+ otherGeneralization.destroy();
} else if (OPTION__REPORT
.equals(options
.get(OPTION__REDUNDANT_GENERALIZATIONS))

Back to the top