Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkhussey2006-05-24 20:12:48 +0000
committerkhussey2006-05-24 20:12:48 +0000
commitf5bc534734ae1bbc47bd941f20f6b4bafe8b9ff2 (patch)
tree8dafde8d471e9cc3f95c62c6624e45fd6a9a5e8d
parente3b17608d06f1b04c71048af1eeb86df896231a5 (diff)
downloadorg.eclipse.uml2.test-f5bc534734ae1bbc47bd941f20f6b4bafe8b9ff2.tar.gz
org.eclipse.uml2.test-f5bc534734ae1bbc47bd941f20f6b4bafe8b9ff2.tar.xz
org.eclipse.uml2.test-f5bc534734ae1bbc47bd941f20f6b4bafe8b9ff2.zip
[143570] Ensuring that union features are made volatile.
-rw-r--r--deprecated/plugins/org.eclipse.uml2.importer.rose/src/org/eclipse/uml2/importer/rose/builder/RoseEcoreBuilder.java12
-rw-r--r--deprecated/plugins/org.eclipse.uml2.importer.rose/src/org/eclipse/uml2/importer/rose/ui/RoseImporterWizard.java18
-rw-r--r--plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/util/UMLUtil.java5
3 files changed, 15 insertions, 20 deletions
diff --git a/deprecated/plugins/org.eclipse.uml2.importer.rose/src/org/eclipse/uml2/importer/rose/builder/RoseEcoreBuilder.java b/deprecated/plugins/org.eclipse.uml2.importer.rose/src/org/eclipse/uml2/importer/rose/builder/RoseEcoreBuilder.java
index f5f6f911..4a8a252e 100644
--- a/deprecated/plugins/org.eclipse.uml2.importer.rose/src/org/eclipse/uml2/importer/rose/builder/RoseEcoreBuilder.java
+++ b/deprecated/plugins/org.eclipse.uml2.importer.rose/src/org/eclipse/uml2/importer/rose/builder/RoseEcoreBuilder.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005 IBM Corporation and others.
+ * Copyright (c) 2005, 2006 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: RoseEcoreBuilder.java,v 1.6 2005/11/29 13:31:27 khussey Exp $
+ * $Id: RoseEcoreBuilder.java,v 1.7 2006/05/24 20:12:48 khussey Exp $
*/
package org.eclipse.uml2.importer.rose.builder;
@@ -1718,15 +1718,11 @@ public class RoseEcoreBuilder
eOpposite.setContainment(false);
- if (!Generator.isUnion(eOpposite)) {
- eOpposite.setVolatile(true);
- }
+ eOpposite.setVolatile(true);
}
}
- if (!Generator.isUnion(eStructuralFeature)) {
- eStructuralFeature.setVolatile(true);
- }
+ eStructuralFeature.setVolatile(true);
}
return eStructuralFeature;
diff --git a/deprecated/plugins/org.eclipse.uml2.importer.rose/src/org/eclipse/uml2/importer/rose/ui/RoseImporterWizard.java b/deprecated/plugins/org.eclipse.uml2.importer.rose/src/org/eclipse/uml2/importer/rose/ui/RoseImporterWizard.java
index 4c03d273..7c29a5c8 100644
--- a/deprecated/plugins/org.eclipse.uml2.importer.rose/src/org/eclipse/uml2/importer/rose/ui/RoseImporterWizard.java
+++ b/deprecated/plugins/org.eclipse.uml2.importer.rose/src/org/eclipse/uml2/importer/rose/ui/RoseImporterWizard.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005 IBM Corporation and others.
+ * Copyright (c) 2005, 2006 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -8,22 +8,21 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: RoseImporterWizard.java,v 1.5 2005/12/14 17:02:50 khussey Exp $
+ * $Id: RoseImporterWizard.java,v 1.6 2006/05/24 20:12:48 khussey Exp $
*/
package org.eclipse.uml2.importer.rose.ui;
import org.eclipse.emf.common.util.Diagnostic;
-import org.eclipse.emf.importer.ModelImporter;
+import org.eclipse.emf.converter.ModelConverter;
+import org.eclipse.emf.converter.util.ConverterUtil;
import org.eclipse.emf.importer.rose.ui.RoseDetailPage;
import org.eclipse.emf.importer.ui.contribution.base.ModelImporterPackagePage;
-import org.eclipse.emf.converter.util.ConverterUtil;
-
import org.eclipse.uml2.importer.rose.RoseImporter;
public class RoseImporterWizard
extends org.eclipse.emf.importer.rose.ui.RoseImporterWizard {
- protected ModelImporter createModelImporter() {
+ protected ModelConverter createModelConverter() {
return new RoseImporter();
}
@@ -31,15 +30,16 @@ public class RoseImporterWizard
RoseDetailPage detailPage = new RoseDetailPage(getModelImporter(),
"RoseModel") { //$NON-NLS-1$
- protected ConverterUtil.DecodedAction decodeAction(Diagnostic diagnostic) {
+ protected ConverterUtil.DecodedAction decodeAction(
+ Diagnostic diagnostic) {
return ConverterUtil
.decodeAction(ConverterUtil.ACTION_MESSAGE_SET);
}
};
addPage(detailPage);
- ModelImporterPackagePage packagePage = new ModelImporterPackagePage(getModelImporter(),
- "RosePackages"); //$NON-NLS-1$
+ ModelImporterPackagePage packagePage = new ModelImporterPackagePage(
+ getModelImporter(), "RosePackages"); //$NON-NLS-1$
packagePage.setShowReferencedGenModels(true);
addPage(packagePage);
}
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 8a7aa6cc..49551d02 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,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: UMLUtil.java,v 1.31 2006/05/13 04:43:40 khussey Exp $
+ * $Id: UMLUtil.java,v 1.32 2006/05/24 20:12:54 khussey Exp $
*/
package org.eclipse.uml2.uml.util;
@@ -3014,7 +3014,6 @@ public class UMLUtil
.next();
if (redefinedProperty.getOwningAssociation() == null) {
-
EStructuralFeature eStructuralFeature = (EStructuralFeature) elementToEModelElementMap
.get(redefinedProperty);
@@ -3232,7 +3231,7 @@ public class UMLUtil
true);
eStructuralFeature.setChangeable(false);
- eStructuralFeature.setVolatile(false);
+ eStructuralFeature.setVolatile(true);
} else if (OPTION__REPORT.equals(options
.get(OPTION__UNION_PROPERTIES))
&& diagnostics != null) {

Back to the top