*** empty log message ***
diff --git a/deprecated/examples/org.eclipse.uml2.examples.ui/src/org/eclipse/uml2/examples/ui/actions/ApplyProfileAction.java b/deprecated/examples/org.eclipse.uml2.examples.ui/src/org/eclipse/uml2/examples/ui/actions/ApplyProfileAction.java
index 5f999d6..e2f4aee 100644
--- a/deprecated/examples/org.eclipse.uml2.examples.ui/src/org/eclipse/uml2/examples/ui/actions/ApplyProfileAction.java
+++ b/deprecated/examples/org.eclipse.uml2.examples.ui/src/org/eclipse/uml2/examples/ui/actions/ApplyProfileAction.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - Initial API and implementation
*
- * $Id: ApplyProfileAction.java,v 1.1 2004/04/29 15:31:13 khussey Exp $
+ * $Id: ApplyProfileAction.java,v 1.2 2004/05/04 19:16:52 khussey Exp $
*/
package org.eclipse.uml2.examples.ui.actions;
@@ -34,6 +34,7 @@
import org.eclipse.uml2.edit.util.ChangeCommand;
import org.eclipse.uml2.examples.ui.ExamplesUIPlugin;
import org.eclipse.uml2.presentation.UML2Editor;
+import org.eclipse.uml2.util.UML2Resource;
/**
*
@@ -83,7 +84,7 @@
for (int i = 0; i < editorReferences.length; i++) {
if ("org.eclipse.uml2.presentation.UML2EditorID" //$NON-NLS-1$
- .equals(editorReferences[i].getId())) {
+ .equals(editorReferences[i].getId())) {
Resource resource = (Resource) ((UML2Editor) editorReferences[i]
.getEditor(true)).getEditingDomain().getResourceSet()
@@ -106,10 +107,9 @@
}
}
- String[] uris = new String[] {
- "pathmap://UML2_PROFILES/Basic.profile.uml2", //$NON-NLS-1$
- "pathmap://UML2_PROFILES/Intermediate.profile.uml2", //$NON-NLS-1$
- "pathmap://UML2_PROFILES/Complete.profile.uml2", //$NON-NLS-1$
+ String[] uris = new String[] {UML2Resource.BASIC_PROFILE_URI,
+ UML2Resource.INTERMEDIATE_PROFILE_URI,
+ UML2Resource.COMPLETE_PROFILE_URI,
"pathmap://UML2_PROFILES/Ecore.profile.uml2"}; //$NON-NLS-1$
for (int i = 0; i < uris.length; i++) {
@@ -144,9 +144,9 @@
"_UI_ApplyProfileActionCommand_label"); //$NON-NLS-1$
final FeatureEditorDialog dialog = new FeatureEditorDialog(
- editorPart.getSite().getShell(), getLabelProvider(), package_,
- UML2Package.eINSTANCE.getProfile(), Collections.EMPTY_LIST,
- label, choiceOfValues);
+ editorPart.getSite().getShell(), getLabelProvider(),
+ package_, UML2Package.eINSTANCE.getProfile(),
+ Collections.EMPTY_LIST, label, choiceOfValues);
dialog.open();
if (FeatureEditorDialog.OK == dialog.getReturnCode()) {
diff --git a/deprecated/examples/org.eclipse.uml2.examples.ui/src/org/eclipse/uml2/examples/ui/actions/ImportPrimitiveTypeAction.java b/deprecated/examples/org.eclipse.uml2.examples.ui/src/org/eclipse/uml2/examples/ui/actions/ImportPrimitiveTypeAction.java
index fbfe976..46a705e 100644
--- a/deprecated/examples/org.eclipse.uml2.examples.ui/src/org/eclipse/uml2/examples/ui/actions/ImportPrimitiveTypeAction.java
+++ b/deprecated/examples/org.eclipse.uml2.examples.ui/src/org/eclipse/uml2/examples/ui/actions/ImportPrimitiveTypeAction.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - Initial API and implementation
*
- * $Id: ImportPrimitiveTypeAction.java,v 1.1 2004/04/29 15:31:14 khussey Exp $
+ * $Id: ImportPrimitiveTypeAction.java,v 1.2 2004/05/04 19:16:52 khussey Exp $
*/
package org.eclipse.uml2.examples.ui.actions;
@@ -32,6 +32,7 @@
import org.eclipse.uml2.VisibilityKind;
import org.eclipse.uml2.edit.util.ChangeCommand;
import org.eclipse.uml2.examples.ui.ExamplesUIPlugin;
+import org.eclipse.uml2.util.UML2Resource;
/**
*
@@ -81,7 +82,7 @@
.getResourceSet()
.getResource(
URI
- .createURI("pathmap://UML2_LIBRARIES/UML2PrimitiveTypes.library.uml2"), //$NON-NLS-1$
+ .createURI(UML2Resource.UML2_PRIMITIVE_TYPES_LIBRARY_URI),
true);
for (Iterator contents = resource.getAllContents(); contents
@@ -105,7 +106,7 @@
.getResourceSet()
.getResource(
URI
- .createURI("pathmap://UML2_LIBRARIES/JavaPrimitiveTypes.library.uml2"), //$NON-NLS-1$
+ .createURI(UML2Resource.JAVA_PRIMITIVE_TYPES_LIBRARY_URI),
true);
for (Iterator contents = resource.getAllContents(); contents
@@ -129,7 +130,7 @@
.getResourceSet()
.getResource(
URI
- .createURI("pathmap://UML2_LIBRARIES/EcorePrimitiveTypes.library.uml2"), //$NON-NLS-1$
+ .createURI(UML2Resource.ECORE_PRIMITIVE_TYPES_LIBRARY_URI),
true);
for (Iterator contents = resource.getAllContents(); contents
@@ -159,9 +160,9 @@
"_UI_ImportPrimitiveTypeActionCommand_label"); //$NON-NLS-1$
final FeatureEditorDialog dialog = new FeatureEditorDialog(
- editorPart.getSite().getShell(), getLabelProvider(), package_,
- UML2Package.eINSTANCE.getPackageableElement(),
- Collections.EMPTY_LIST, label, choiceOfValues);
+ editorPart.getSite().getShell(), getLabelProvider(),
+ package_, UML2Package.eINSTANCE.getPackageableElement(),
+ Collections.EMPTY_LIST, label, choiceOfValues);
dialog.open();
if (FeatureEditorDialog.OK == dialog.getReturnCode()) {
diff --git a/deprecated/examples/org.eclipse.uml2.examples.ui/src/org/eclipse/uml2/examples/ui/actions/ReferenceMetaclassAction.java b/deprecated/examples/org.eclipse.uml2.examples.ui/src/org/eclipse/uml2/examples/ui/actions/ReferenceMetaclassAction.java
index bbfa30f..39f28a1 100644
--- a/deprecated/examples/org.eclipse.uml2.examples.ui/src/org/eclipse/uml2/examples/ui/actions/ReferenceMetaclassAction.java
+++ b/deprecated/examples/org.eclipse.uml2.examples.ui/src/org/eclipse/uml2/examples/ui/actions/ReferenceMetaclassAction.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - Initial API and implementation
*
- * $Id: ReferenceMetaclassAction.java,v 1.1 2004/04/29 15:31:13 khussey Exp $
+ * $Id: ReferenceMetaclassAction.java,v 1.2 2004/05/04 19:16:52 khussey Exp $
*/
package org.eclipse.uml2.examples.ui.actions;
@@ -32,6 +32,7 @@
import org.eclipse.uml2.UML2Package;
import org.eclipse.uml2.edit.util.ChangeCommand;
import org.eclipse.uml2.examples.ui.ExamplesUIPlugin;
+import org.eclipse.uml2.util.UML2Resource;
/**
*
@@ -75,13 +76,9 @@
List choiceOfValues = new ArrayList();
try {
- Resource resource = profile
- .eResource()
- .getResourceSet()
+ Resource resource = profile.eResource().getResourceSet()
.getResource(
- URI
- .createURI("pathmap://UML2_METAMODELS/UML2.metamodel.uml2"), //$NON-NLS-1$
- true);
+ URI.createURI(UML2Resource.UML2_METAMODEL_URI), true);
for (Iterator contents = resource.getAllContents(); contents
.hasNext();) {
@@ -113,9 +110,9 @@
"_UI_ReferenceMetaclassActionCommand_label"); //$NON-NLS-1$
final FeatureEditorDialog dialog = new FeatureEditorDialog(
- editorPart.getSite().getShell(), getLabelProvider(), profile,
- UML2Package.eINSTANCE.getClass_(), Collections.EMPTY_LIST,
- label, choiceOfValues);
+ editorPart.getSite().getShell(), getLabelProvider(),
+ profile, UML2Package.eINSTANCE.getClass_(),
+ Collections.EMPTY_LIST, label, choiceOfValues);
dialog.open();
if (FeatureEditorDialog.OK == dialog.getReturnCode()) {
diff --git a/deprecated/examples/org.eclipse.uml2.examples/src/org/eclipse/uml2/examples/ecore2uml2/Ecore2UML2.java b/deprecated/examples/org.eclipse.uml2.examples/src/org/eclipse/uml2/examples/ecore2uml2/Ecore2UML2.java
index 36e8f95..1b49bcf 100644
--- a/deprecated/examples/org.eclipse.uml2.examples/src/org/eclipse/uml2/examples/ecore2uml2/Ecore2UML2.java
+++ b/deprecated/examples/org.eclipse.uml2.examples/src/org/eclipse/uml2/examples/ecore2uml2/Ecore2UML2.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - Initial API and implementation
*
- * $Id: Ecore2UML2.java,v 1.1 2004/04/29 15:14:39 khussey Exp $
+ * $Id: Ecore2UML2.java,v 1.2 2004/05/04 19:16:40 khussey Exp $
*/
package org.eclipse.uml2.examples.ecore2uml2;
@@ -62,6 +62,7 @@
import org.eclipse.uml2.UML2Package;
import org.eclipse.uml2.VisibilityKind;
import org.eclipse.uml2.examples.Converter;
+import org.eclipse.uml2.util.UML2Resource;
import org.eclipse.uml2.util.UML2Switch;
/**
@@ -71,6 +72,14 @@
extends EcoreSwitch
implements Converter {
+ protected static final String ANNOTATION_SOURCE__DERIVED = "derived"; //$NON-NLS-1$
+
+ protected static final String ANNOTATION_SOURCE__REDEFINES = "redefines"; //$NON-NLS-1$
+
+ protected static final String ANNOTATION_SOURCE__SUBSETS = "subsets"; //$NON-NLS-1$
+
+ protected static final String ANNOTATION_SOURCE__UNION = "union"; //$NON-NLS-1$
+
protected final Map modelMap = new HashMap();
protected final Map elementMap = new HashMap();
@@ -82,7 +91,10 @@
}
protected boolean isDerived(EStructuralFeature structuralFeature) {
- return null != structuralFeature.getEAnnotation("derived"); //$NON-NLS-1$
+ return null != structuralFeature
+ .getEAnnotation(ANNOTATION_SOURCE__DERIVED)
+ || null != structuralFeature
+ .getEAnnotation(ANNOTATION_SOURCE__UNION);
}
protected PrimitiveType getEcorePrimitiveType(String name) {
@@ -95,7 +107,7 @@
new ResourceSetImpl()
.getResource(
URI
- .createURI("pathmap://UML2_LIBRARIES/EcorePrimitiveTypes.library.uml2"), //$NON-NLS-1$
+ .createURI(UML2Resource.ECORE_PRIMITIVE_TYPES_LIBRARY_URI),
true).getContents(), UML2Package.eINSTANCE
.getModel());
} catch (Exception e) {
@@ -317,11 +329,11 @@
Property property = (Property) doSwitch(object
.getEModelElement());
- if ("union".equals(object.getSource())) { //$NON-NLS-1$
+ if (ANNOTATION_SOURCE__UNION.equals(object.getSource())) {
property.setIsDerivedUnion(true);
}
- if ("redefines".equals(object.getSource())) { //$NON-NLS-1$
+ if (ANNOTATION_SOURCE__REDEFINES.equals(object.getSource())) {
for (Iterator references = object.getReferences()
.iterator(); references.hasNext();) {
@@ -338,7 +350,7 @@
}
}
- if ("subsets".equals(object.getSource())) { //$NON-NLS-1$
+ if (ANNOTATION_SOURCE__SUBSETS.equals(object.getSource())) {
for (Iterator references = object.getReferences()
.iterator(); references.hasNext();) {
@@ -360,7 +372,7 @@
Operation operation = (Operation) doSwitch(object
.getEModelElement());
- if ("redefines".equals(object.getSource())) { //$NON-NLS-1$
+ if (ANNOTATION_SOURCE__REDEFINES.equals(object.getSource())) {
for (Iterator references = object.getReferences()
.iterator(); references.hasNext();) {
diff --git a/deprecated/plugins/org.eclipse.uml2.edit/plugin.xml b/deprecated/plugins/org.eclipse.uml2.edit/plugin.xml
index c1f8668..946315c 100644
--- a/deprecated/plugins/org.eclipse.uml2.edit/plugin.xml
+++ b/deprecated/plugins/org.eclipse.uml2.edit/plugin.xml
@@ -12,7 +12,7 @@
* Contributors:
* IBM - Initial API and implementation
*
- * $Id: plugin.xml,v 1.2 2004/04/10 03:58:45 khussey Exp $
+ * $Id: plugin.xml,v 1.3 2004/05/04 19:16:48 khussey Exp $
*/
-->
@@ -31,7 +31,6 @@
</runtime>
<requires>
<import plugin="org.eclipse.core.runtime.compatibility"/>
- <import plugin="org.eclipse.emf.ecore.xmi"/>
<import plugin="org.eclipse.emf.ecore.change.edit"/>
<import plugin="org.eclipse.uml2" export="true"/>
</requires>
diff --git a/deprecated/plugins/org.eclipse.uml2.editor/plugin.xml b/deprecated/plugins/org.eclipse.uml2.editor/plugin.xml
index e956dd8..33aacd2 100644
--- a/deprecated/plugins/org.eclipse.uml2.editor/plugin.xml
+++ b/deprecated/plugins/org.eclipse.uml2.editor/plugin.xml
@@ -12,7 +12,7 @@
* Contributors:
* IBM - Initial API and implementation
*
- * $Id: plugin.xml,v 1.2 2004/04/10 03:56:09 khussey Exp $
+ * $Id: plugin.xml,v 1.3 2004/05/04 19:16:45 khussey Exp $
*/
-->
@@ -26,7 +26,6 @@
<requires>
<import plugin="org.eclipse.core.runtime.compatibility"/>
<import plugin="org.eclipse.emf.ecore.edit"/>
- <import plugin="org.eclipse.emf.ecore.xmi"/>
<import plugin="org.eclipse.emf.edit.ui"/>
<import plugin="org.eclipse.uml2.edit" export="true"/>
</requires>
diff --git a/deprecated/plugins/org.eclipse.uml2/model/U2P-UML-Super-v2-040415.cat b/deprecated/plugins/org.eclipse.uml2/model/U2P-UML-Super-v2-040415.cat
index 7d874a6..9a46dfc 100644
--- a/deprecated/plugins/org.eclipse.uml2/model/U2P-UML-Super-v2-040415.cat
+++ b/deprecated/plugins/org.eclipse.uml2/model/U2P-UML-Super-v2-040415.cat
@@ -33237,7 +33237,69 @@
origin_x 0
origin_y 113
items (list diagram_item_list
- (object ClassView "Class" "Logical View::UML::Classes::Kernel::ValueSpecification" @1433
+ (object ClassView "Class" "Logical View::UML::Interactions::Fragments::InteractionOperator" @1433
+ ShowCompartmentStereotypes TRUE
+ SuppressOperation TRUE
+ IncludeAttribute TRUE
+ IncludeOperation TRUE
+ location (1995, 1515)
+ font (object Font
+ size 10
+ face "Arial"
+ bold FALSE
+ italics FALSE
+ underline FALSE
+ strike FALSE
+ color 0
+ default_color TRUE)
+ label (object ItemLabel
+ Parent_View @1433
+ location (1770, 1187)
+ nlines 1
+ max_width 451
+ justify 0
+ label "InteractionOperator")
+ stereotype (object ItemLabel
+ Parent_View @1433
+ location (1770, 1137)
+ anchor 10
+ nlines 1
+ max_width 451
+ justify 0
+ label "<<enumeration>>")
+ icon_style "Icon"
+ fill_color 16777215
+ quidu "3B7A272600B4"
+ width 469
+ height 781)
+ (object ClassView "Class" "Logical View::UML::Interactions::Fragments::Continuation" @1434
+ ShowCompartmentStereotypes TRUE
+ SuppressOperation TRUE
+ IncludeAttribute TRUE
+ IncludeOperation TRUE
+ location (2172, 972)
+ font (object Font
+ size 10
+ face "Arial"
+ bold FALSE
+ italics FALSE
+ underline FALSE
+ strike FALSE
+ color 0
+ default_color TRUE)
+ label (object ItemLabel
+ Parent_View @1434
+ location (1947, 915)
+ nlines 1
+ max_width 451
+ justify 0
+ label "Continuation")
+ icon_style "Icon"
+ fill_color 16777215
+ quidu "3DFC87C303E5"
+ width 469
+ height 138)
+ (object ClassView "Class" "Logical View::UML::Classes::Kernel::ValueSpecification" @1435
ShowCompartmentStereotypes TRUE
SuppressAttribute TRUE
SuppressOperation TRUE
@@ -33254,7 +33316,7 @@
color 0
default_color TRUE)
label (object ItemLabel
- Parent_View @1433
+ Parent_View @1435
location (1138, 1421)
nlines 1
max_width 461
@@ -33267,68 +33329,6 @@
width 479
height 146
annotation 8)
- (object ClassView "Class" "Logical View::UML::Interactions::Fragments::InteractionOperator" @1434
- ShowCompartmentStereotypes TRUE
- SuppressOperation TRUE
- IncludeAttribute TRUE
- IncludeOperation TRUE
- location (1995, 1515)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object ItemLabel
- Parent_View @1434
- location (1770, 1187)
- nlines 1
- max_width 451
- justify 0
- label "InteractionOperator")
- stereotype (object ItemLabel
- Parent_View @1434
- location (1770, 1137)
- anchor 10
- nlines 1
- max_width 451
- justify 0
- label "<<enumeration>>")
- icon_style "Icon"
- fill_color 16777215
- quidu "3B7A272600B4"
- width 469
- height 781)
- (object ClassView "Class" "Logical View::UML::Interactions::Fragments::Continuation" @1435
- ShowCompartmentStereotypes TRUE
- SuppressOperation TRUE
- IncludeAttribute TRUE
- IncludeOperation TRUE
- location (2172, 972)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object ItemLabel
- Parent_View @1435
- location (1947, 915)
- nlines 1
- max_width 451
- justify 0
- label "Continuation")
- icon_style "Icon"
- fill_color 16777215
- quidu "3DFC87C303E5"
- width 469
- height 138)
(object ClassView "Class" "Logical View::UML::Interactions::Fragments::InteractionConstraint" @1436
ShowCompartmentStereotypes TRUE
SuppressAttribute TRUE
@@ -33410,7 +33410,7 @@
line_color 3342489
quidu "3C46E99D02CB"
client @1437
- supplier @1433
+ supplier @1435
line_style 3
origin_attachment (884, 1528)
terminal_attachment (1129, 1528)
@@ -33519,7 +33519,7 @@
line_color 3342489
quidu "3C46E9B702F0"
client @1443
- supplier @1433
+ supplier @1435
line_style 3
origin_attachment (884, 1469)
terminal_attachment (1129, 1469)
@@ -34126,7 +34126,7 @@
stereotype TRUE
line_color 3342489
quidu "40881ACD00D9"
- client @1435
+ client @1434
supplier @1450
line_style 0)
(object ClassView "Class" "Logical View::UML::Classes::Kernel::Constraint" @1477
@@ -62837,22 +62837,6 @@
label "<<enumeration>>")
icon_style "Icon"
quidu "3B94B827009C"
- compartment (object Compartment
- Parent_View @2710
- location (2636, 396)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- icon_style "Icon"
- anchor 2
- nlines 10
- max_width 271)
width 422
height 678
autoResize TRUE)
@@ -62989,22 +62973,6 @@
label "Pseudostate")
icon_style "Icon"
quidu "328A47F10064"
- compartment (object Compartment
- Parent_View @2715
- location (409, 1716)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- icon_style "Icon"
- anchor 2
- nlines 1
- max_width 431)
width 472
height 160)
(object ClassView "Class" "Logical View::UML::StateMachines::BehaviorStateMachines::ConnectionPointReference" @2716
@@ -63521,22 +63489,6 @@
label "State")
icon_style "Icon"
quidu "3287F81C0136"
- compartment (object Compartment
- Parent_View @2740
- location (1211, 1724)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- icon_style "Icon"
- anchor 2
- nlines 4
- max_width 571)
width 728
height 545)
(object AssociationViewNew "$UNNAMED$421" @2741
@@ -65194,22 +65146,6 @@
label "Transition")
icon_style "Icon"
quidu "3288D70A0212"
- compartment (object Compartment
- Parent_View @2822
- location (1856, 1331)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- icon_style "Icon"
- anchor 2
- nlines 1
- max_width 378)
width 1106
height 250)
(object AssociationViewNew "$UNNAMED$416" @2823
@@ -66150,22 +66086,6 @@
label "<<enumeration>>")
icon_style "Icon"
quidu "3E5B99180230"
- compartment (object Compartment
- Parent_View @2869
- location (2187, 406)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- icon_style "Icon"
- anchor 2
- nlines 3
- max_width 153)
width 396
height 305)))
(object ClassDiagram "Redefinitions"
@@ -71563,7 +71483,7 @@
label "ownedActual"
supplier "Logical View::UML::AuxiliaryConstructs::Templates::ParameterableElement"
quidu "3E3126A90208"
- client_cardinality (value cardinality "0..1")
+ client_cardinality (value cardinality "0..*")
Constraints
|subsets actual,
|subsets ownedElement
@@ -73603,8 +73523,8 @@
zoom 100
max_height 28350
max_width 21600
- origin_x 787
- origin_y 2155
+ origin_x 1281
+ origin_y 0
items (list diagram_item_list
(object NoteView @3180
location (2172, 2364)
@@ -73671,15 +73591,15 @@
default_color TRUE)
label (object ItemLabel
Parent_View @3182
- location (1796, 1031)
+ location (1760, 1031)
nlines 1
- max_width 416
+ max_width 488
justify 0
label "DirectedRelationship")
icon_style "Icon"
fill_color 16777215
quidu "3CAAEC1902BE"
- width 434
+ width 506
height 122
annotation 8
autoResize TRUE)
@@ -73701,15 +73621,15 @@
default_color TRUE)
label (object ItemLabel
Parent_View @3183
- location (2151, 197)
+ location (2134, 197)
nlines 1
- max_width 186
+ max_width 220
justify 0
label "Element")
icon_style "Icon"
fill_color 16777215
quidu "3CAAEC0D0176"
- width 204
+ width 238
height 122
annotation 8
autoResize TRUE)
@@ -73759,14 +73679,14 @@
default_color TRUE)
label (object ItemLabel
Parent_View @3185
- location (658, 1309)
+ location (624, 1309)
nlines 1
- max_width 436
+ max_width 504
justify 0
label "TemplateableElement")
icon_style "Icon"
quidu "3E31269A001C"
- width 454
+ width 522
height 107
annotation 8
autoResize TRUE)
@@ -73906,7 +73826,7 @@
origin_attachment (1577, 1624)
terminal_attachment (2033, 1624))))
(object AssociationViewNew "$UNNAMED$489" @3193
- location (1568, 1346)
+ location (1585, 1346)
font (object Font
size 10
face "Arial"
@@ -73921,7 +73841,7 @@
roleview_list (list RoleViews
(object RoleView "boundElement" @3194
Parent_View @3193
- location (-706, 356)
+ location (-689, 356)
font (object Font
size 10
face "Arial"
@@ -73933,7 +73853,7 @@
default_color TRUE)
label (object SegLabel @3195
Parent_View @3194
- location (1283, 1305)
+ location (1311, 1305)
font (object Font
size 10
face "Arial"
@@ -73958,11 +73878,11 @@
client @3193
supplier @3185
line_style 3
- origin_attachment (1568, 1346)
- terminal_attachment (1103, 1346)
+ origin_attachment (1585, 1346)
+ terminal_attachment (1137, 1346)
label (object SegLabel @3196
Parent_View @3194
- location (1138, 1391)
+ location (1171, 1391)
font (object Font
size 10
face "Arial"
@@ -73983,7 +73903,7 @@
orientation 0)
label (object SegLabel @3197
Parent_View @3194
- location (1320, 1410)
+ location (1347, 1410)
font (object Font
size 10
face "Arial"
@@ -74007,7 +73927,7 @@
orientation 0))
(object RoleView "templateBinding" @3198
Parent_View @3193
- location (-706, 356)
+ location (-689, 356)
font (object Font
size 10
face "Arial"
@@ -74019,7 +73939,7 @@
default_color TRUE)
label (object SegLabel @3199
Parent_View @3198
- location (1852, 1302)
+ location (1858, 1302)
font (object Font
size 10
face "Arial"
@@ -74044,7 +73964,7 @@
client @3193
supplier @3186
line_style 3
- origin_attachment (1568, 1346)
+ origin_attachment (1585, 1346)
terminal_attachment (2033, 1346)
label (object SegLabel @3200
Parent_View @3198
@@ -74069,7 +73989,7 @@
orientation 1)
label (object SegLabel @3201
Parent_View @3198
- location (1791, 1440)
+ location (1801, 1440)
font (object Font
size 10
face "Arial"
@@ -74114,14 +74034,14 @@
default_color TRUE)
label (object ItemLabel
Parent_View @3203
- location (676, 415)
+ location (642, 415)
nlines 1
- max_width 388
+ max_width 456
justify 0
label "TemplateParameter")
icon_style "Icon"
quidu "3E28044C000B"
- width 406
+ width 474
height 107
annotation 8
autoResize TRUE)
@@ -74361,7 +74281,7 @@
height 178
orientation 0))))
(object AssociationViewNew "$UNNAMED$490" @3215
- location (1525, 469)
+ location (1542, 469)
font (object Font
size 10
face "Arial"
@@ -74376,7 +74296,7 @@
roleview_list (list RoleViews
(object RoleView "formal" @3216
Parent_View @3215
- location (-713, 355)
+ location (-696, 355)
font (object Font
size 10
face "Arial"
@@ -74388,7 +74308,7 @@
default_color TRUE)
label (object SegLabel @3217
Parent_View @3216
- location (1174, 423)
+ location (1204, 423)
font (object Font
size 10
face "Arial"
@@ -74413,11 +74333,11 @@
client @3215
supplier @3203
line_style 3
- origin_attachment (1525, 469)
- terminal_attachment (1073, 469)
+ origin_attachment (1542, 469)
+ terminal_attachment (1107, 469)
label (object SegLabel @3218
Parent_View @3216
- location (1118, 523)
+ location (1152, 523)
font (object Font
size 10
face "Arial"
@@ -74438,14 +74358,14 @@
orientation 0))
(object RoleView "$UNNAMED$491" @3219
Parent_View @3215
- location (-713, 355)
+ location (-696, 355)
stereotype TRUE
line_color 3342489
quidu "3E28149400AE"
client @3215
supplier @3205
line_style 3
- origin_attachment (1525, 469)
+ origin_attachment (1542, 469)
terminal_attachment (1977, 469))))
(object InheritView "" @3220
stereotype TRUE
@@ -74613,7 +74533,7 @@
nlines 1
max_width 15
justify 0
- label "0..1"
+ label "0..*"
pctDist 0.900000
height 54
orientation 0)
@@ -88094,7 +88014,7 @@
(295, 922))
line_style 3
origin_attachment (178, 628)
- terminal_attachment (271, 922))))
+ terminal_attachment (269, 922))))
(object ClassDiagram "WriteLinkActions"
quid "3DF3A6A10109"
title "WriteLinkActions"
diff --git a/deprecated/plugins/org.eclipse.uml2/plugin.properties b/deprecated/plugins/org.eclipse.uml2/plugin.properties
index 0c85f30..49a6600 100644
--- a/deprecated/plugins/org.eclipse.uml2/plugin.properties
+++ b/deprecated/plugins/org.eclipse.uml2/plugin.properties
@@ -8,7 +8,7 @@
# * Contributors:
# * IBM - Initial API and implementation
# *
-# * $Id: plugin.properties,v 1.5 2004/04/29 01:38:36 khussey Exp $
+# * $Id: plugin.properties,v 1.6 2004/05/04 19:17:48 khussey Exp $
# */
# ====================================================================
@@ -51,7 +51,7 @@
_UI_PackageImport_PublicOrPrivate_diagnostic = The visibility of package import ''{0}'' is neither public nor private.
_UI_Package_ElementsPublicOrPrivate_diagnostic = Element ''{0}'', owned by package ''{1}'', has visibility that is neither public nor private.
_UI_Property_OppositeIsOtherEnd_diagnostic = Navigable property ''{0}'' is associated with a binary association, but the other (navigable) end of the association is not its opposite.
-_UI_Property_MultiplicityOfComposite_diagnostic = The multiplicity of composite aggregation ''{0}'' does not have an upper bound greater than 1.
+_UI_Property_MultiplicityOfComposite_diagnostic = The multiplicity of composite aggregation ''{0}'' has an upper bound greater than 1.
_UI_Property_SubsettingContext_diagnostic = The context of the subsetting property ''{0}'' does not conform to the context of subsetted property ''{1}''.
_UI_Property_NavigablePropertyRedefinition_diagnostic = Navigable property ''{0}'' is redefined or subsetted by non-navigable property ''{1}''.
_UI_Property_SubsettingRules_diagnostic = Subsetting property ''{0}'' either weakens the type of subsetted property ''{1}'', or its upper bound is greater.
diff --git a/deprecated/plugins/org.eclipse.uml2/plugin.xml b/deprecated/plugins/org.eclipse.uml2/plugin.xml
index 5c5467d..fef80cb 100644
--- a/deprecated/plugins/org.eclipse.uml2/plugin.xml
+++ b/deprecated/plugins/org.eclipse.uml2/plugin.xml
@@ -12,7 +12,7 @@
* Contributors:
* IBM - Initial API and implementation
*
- * $Id: plugin.xml,v 1.3 2004/04/29 01:38:36 khussey Exp $
+ * $Id: plugin.xml,v 1.4 2004/05/04 19:17:48 khussey Exp $
*/
-->
@@ -33,8 +33,7 @@
<requires>
<import plugin="org.eclipse.core.runtime.compatibility"/>
<import plugin="org.eclipse.core.resources"/>
- <import plugin="org.eclipse.emf.ecore" export="true"/>
- <import plugin="org.eclipse.emf.ecore.xmi"/>
+ <import plugin="org.eclipse.emf.ecore.xmi" export="true"/>
</requires>
<extension
diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/internal/operation/PropertyOperations.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/internal/operation/PropertyOperations.java
index 81dbceb..ffa915a 100644
--- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/internal/operation/PropertyOperations.java
+++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/internal/operation/PropertyOperations.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - Initial API and implementation
*
- * $Id: PropertyOperations.java,v 1.5 2004/04/29 01:38:36 khussey Exp $
+ * $Id: PropertyOperations.java,v 1.6 2004/05/04 19:17:48 khussey Exp $
*/
package org.eclipse.uml2.internal.operation;
@@ -49,6 +49,21 @@
super();
}
+ protected static Property getOtherEnd(Property property) {
+ Association association = property.getAssociation();
+
+ if (null != association) {
+ List memberEnds = association.getMemberEnds();
+
+ if (2 == memberEnds.size()) {
+ return (Property) memberEnds.get(Math.abs(memberEnds
+ .indexOf(property) - 1));
+ }
+ }
+
+ return null;
+ }
+
public static boolean isConsistentWith(Property property,
RedefinableElement redefinee) {
@@ -72,20 +87,11 @@
public static Property opposite(Property property) {
- if (null == property.getOwningAssociation()
- && null != property.getAssociation()
- && 2 == property.getAssociation().getMemberEnds().size()) {
+ if (null == property.getOwningAssociation()) {
+ Property otherEnd = getOtherEnd(property);
- for (Iterator memberEnds = property.getAssociation()
- .getMemberEnds().iterator(); memberEnds.hasNext();) {
-
- Property memberEnd = (Property) memberEnds.next();
-
- if (property != memberEnd
- && null == memberEnd.getOwningAssociation()) {
-
- return memberEnd;
- }
+ if (null != otherEnd && null == otherEnd.getOwningAssociation()) {
+ return otherEnd;
}
}
@@ -270,26 +276,17 @@
DiagnosticChain diagnostics, Map context) {
boolean result = true;
- Property otherEnd = null;
+ Property opposite = null;
- if (null == property.getOwningAssociation()
- && null != property.getAssociation()
- && 2 == property.getAssociation().getMemberEnds().size()) {
+ if (null == property.getOwningAssociation()) {
+ Property otherEnd = getOtherEnd(property);
- for (Iterator memberEnds = property.getAssociation()
- .getMemberEnds().iterator(); memberEnds.hasNext();) {
-
- Property memberEnd = (Property) memberEnds.next();
-
- if (property != memberEnd
- && null == memberEnd.getOwningAssociation()) {
-
- otherEnd = memberEnd;
- }
+ if (null != otherEnd && null == otherEnd.getOwningAssociation()) {
+ opposite = otherEnd;
}
}
- if (!safeEquals(property.getOpposite(), otherEnd)) {
+ if (!safeEquals(property.getOpposite(), opposite)) {
result = false;
if (null != diagnostics) {
@@ -301,7 +298,7 @@
UML2Plugin.INSTANCE.getString(
"_UI_Property_OppositeIsOtherEnd_diagnostic", //$NON-NLS-1$
getMessageSubstitutions(context, property)),
- new Object[] {otherEnd}));
+ new Object[] {opposite}));
}
}
@@ -310,7 +307,7 @@
}
/**
- * A multiplicity of a composite aggregation must have an upper bound
+ * A multiplicity of a composite aggregation must not have an upper bound
* greater than 1.
*
*/
@@ -318,26 +315,32 @@
DiagnosticChain diagnostics, Map context) {
boolean result = true;
- int upperBound = property.upperBound();
+ if (property.isComposite()) {
+ Property otherEnd = getOtherEnd(property);
- if (property.isComposite()
- && MultiplicityElement.UNLIMITED_UPPER_BOUND != upperBound
- && 2 > upperBound) {
+ if (null != otherEnd) {
+ int upperBound = otherEnd.upperBound();
- result = false;
+ if (MultiplicityElement.UNLIMITED_UPPER_BOUND == upperBound
+ || 1 < upperBound) {
- if (null != diagnostics) {
- diagnostics
- .add(new BasicDiagnostic(
- Diagnostic.WARNING,
- UML2DiagnosticConstants.PLUGIN_ID,
- UML2DiagnosticConstants.PROPERTY__MULTIPLICITY_OF_COMPOSITE,
- UML2Plugin.INSTANCE
- .getString(
- "_UI_Property_MultiplicityOfComposite_diagnostic", //$NON-NLS-1$
- getMessageSubstitutions(context, property)),
- new Object[] {new Integer(upperBound)}));
+ result = false;
+ if (null != diagnostics) {
+ diagnostics
+ .add(new BasicDiagnostic(
+ Diagnostic.WARNING,
+ UML2DiagnosticConstants.PLUGIN_ID,
+ UML2DiagnosticConstants.PROPERTY__MULTIPLICITY_OF_COMPOSITE,
+ UML2Plugin.INSTANCE
+ .getString(
+ "_UI_Property_MultiplicityOfComposite_diagnostic", //$NON-NLS-1$
+ getMessageSubstitutions(context,
+ property)),
+ new Object[] {new Integer(upperBound)}));
+
+ }
+ }
}
}
@@ -495,14 +498,16 @@
}
/**
- * Only a navigable property can be marked as readOnly.
+ * Only a navigable property can be marked as read-only.
*
*/
public static boolean validateNavigableReadonly(Property property,
DiagnosticChain diagnostics, Map context) {
boolean result = true;
- if (property.isReadOnly() && !property.isNavigable()) {
+ if (property.isReadOnly() && null != property.getAssociation()
+ && !property.isNavigable()) {
+
result = false;
if (null != diagnostics) {
diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/util/UML2Resource.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/util/UML2Resource.java
new file mode 100644
index 0000000..2a5e206
--- /dev/null
+++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/util/UML2Resource.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright (c) 2004 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Common Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/cpl-v10.html
+ *
+ * Contributors:
+ * IBM - Initial API and implementation
+ *
+ * $Id: UML2Resource.java,v 1.1 2004/05/04 19:17:48 khussey Exp $
+ */
+package org.eclipse.uml2.util;
+
+import org.eclipse.emf.ecore.xmi.XMIResource;
+
+/**
+ *
+ */
+public interface UML2Resource
+ extends XMIResource {
+
+ public static final String UML2_NS_URI = "http://www.eclipse.org/uml2/1.0.0/UML"; //$NON-NLS-1$
+
+ public static final String FILE_EXTENSION = "uml2"; //$NON-NLS-1$
+
+ public static final String DEFAULT_ENCODING = "UTF-8"; //$NON-NLS-1$
+
+ public static final String METAMODEL_FILE_EXTENSION = "metamodel." //$NON-NLS-1$
+ + FILE_EXTENSION;
+
+ public static final String METAMODELS_PATHMAP = "pathmap://UML2_METAMODELS/"; //$NON-NLS-1$
+
+ public static final String ECORE_METAMODEL_URI = METAMODELS_PATHMAP
+ + "Ecore." + METAMODEL_FILE_EXTENSION; //$NON-NLS-1$
+
+ public static final String UML2_METAMODEL_URI = METAMODELS_PATHMAP
+ + "UML2." + METAMODEL_FILE_EXTENSION; //$NON-NLS-1$
+
+ public static final String LIBRARY_FILE_EXTENSION = "library." //$NON-NLS-1$
+ + FILE_EXTENSION;
+
+ public static final String LIBRARIES_PATHMAP = "pathmap://UML2_LIBRARIES/"; //$NON-NLS-1$
+
+ public static final String ECORE_PRIMITIVE_TYPES_LIBRARY_URI = LIBRARIES_PATHMAP
+ + "EcorePrimitiveTypes." + LIBRARY_FILE_EXTENSION; //$NON-NLS-1$
+
+ public static final String JAVA_PRIMITIVE_TYPES_LIBRARY_URI = LIBRARIES_PATHMAP
+ + "JavaPrimitiveTypes." + LIBRARY_FILE_EXTENSION; //$NON-NLS-1$
+
+ public static final String UML2_PRIMITIVE_TYPES_LIBRARY_URI = LIBRARIES_PATHMAP
+ + "UML2PrimitiveTypes." + LIBRARY_FILE_EXTENSION; //$NON-NLS-1$
+
+ public static final String PROFILE_FILE_EXTENSION = "profile." //$NON-NLS-1$
+ + FILE_EXTENSION;
+
+ public static final String PROFILES_PATHMAP = "pathmap://UML2_PROFILES/"; //$NON-NLS-1$
+
+ public static final String BASIC_PROFILE_URI = PROFILES_PATHMAP + "Basic." //$NON-NLS-1$
+ + PROFILE_FILE_EXTENSION;
+
+ public static final String INTERMEDIATE_PROFILE_URI = PROFILES_PATHMAP
+ + "Intermediate." + PROFILE_FILE_EXTENSION; //$NON-NLS-1$
+
+ public static final String COMPLETE_PROFILE_URI = PROFILES_PATHMAP
+ + "Complete." + PROFILE_FILE_EXTENSION; //$NON-NLS-1$
+
+}
diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/util/UML2ResourceFactoryImpl.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/util/UML2ResourceFactoryImpl.java
index 8f2c138..71c3c97 100644
--- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/util/UML2ResourceFactoryImpl.java
+++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/util/UML2ResourceFactoryImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - Initial API and implementation
*
- * $Id: UML2ResourceFactoryImpl.java,v 1.4 2004/04/23 02:31:52 khussey Exp $
+ * $Id: UML2ResourceFactoryImpl.java,v 1.5 2004/05/04 19:17:48 khussey Exp $
*/
package org.eclipse.uml2.util;
@@ -57,7 +57,7 @@
public Resource createResource(URI uri) {
XMIResource resource = (XMIResource) createResourceGen(uri);
- resource.setEncoding("UTF-8"); //$NON-NLS-1$
+ resource.setEncoding(UML2Resource.DEFAULT_ENCODING);
resource.getDefaultLoadOptions().put(XMIResource.OPTION_DISABLE_NOTIFY,
Boolean.TRUE);
diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/util/UML2ResourceImpl.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/util/UML2ResourceImpl.java
index 6bd64a2..f1d1da4 100644
--- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/util/UML2ResourceImpl.java
+++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/util/UML2ResourceImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - Initial API and implementation
*
- * $Id: UML2ResourceImpl.java,v 1.2 2004/04/10 04:09:50 khussey Exp $
+ * $Id: UML2ResourceImpl.java,v 1.3 2004/05/04 19:17:48 khussey Exp $
*/
package org.eclipse.uml2.util;
@@ -25,7 +25,7 @@
* @see org.eclipse.uml2.util.UML2ResourceFactoryImpl
* @generated
*/
-public class UML2ResourceImpl extends XMIResourceImpl {
+public class UML2ResourceImpl extends XMIResourceImpl implements UML2Resource {
/**
* <!-- begin-user-doc -->
@@ -44,6 +44,7 @@
public UML2ResourceImpl(URI uri) {
super(uri);
}
+
/* (non-Javadoc)
* @see org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl#useIDAttributes()
*/
diff --git a/deprecated/tests/org.eclipse.uml2.tests/plugin.xml b/deprecated/tests/org.eclipse.uml2.tests/plugin.xml
index 2e3e9c3..f45b4ea 100644
--- a/deprecated/tests/org.eclipse.uml2.tests/plugin.xml
+++ b/deprecated/tests/org.eclipse.uml2.tests/plugin.xml
@@ -12,7 +12,7 @@
* Contributors:
* IBM - Initial API and implementation
*
- * $Id: plugin.xml,v 1.1 2004/04/29 14:56:55 khussey Exp $
+ * $Id: plugin.xml,v 1.2 2004/05/04 19:16:36 khussey Exp $
*/
-->
@@ -27,7 +27,6 @@
</runtime>
<requires>
- <import plugin="org.eclipse.emf.ecore.xmi"/>
<import plugin="org.eclipse.uml2"/>
<import plugin="org.junit"/>
</requires>
