Author: tfmorris
Date: 2007-11-04 13:21:01-0700
New Revision: 13725
Modified:
trunk/src/model-mdr/src/org/argouml/model/mdr/CoreFactoryMDRImpl.java
trunk/src/model-mdr/src/org/argouml/model/mdr/ExtensionMechanismsFactoryMDRImpl.java
trunk/src/model-mdr/src/org/argouml/model/mdr/ExtensionMechanismsHelperMDRImpl.java
trunk/src/model-mdr/src/org/argouml/model/mdr/ModelManagementHelperMDRImpl.java
Log:
remove uses of deprecated getCorrespondingElement()
Modified: trunk/src/model-mdr/src/org/argouml/model/mdr/CoreFactoryMDRImpl.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/model-mdr/src/org/argouml/model/mdr/CoreFactoryMDRImpl.java?view=diff&rev=13725&p1=trunk/src/model-mdr/src/org/argouml/model/mdr/CoreFactoryMDRImpl.java&p2=trunk/src/model-mdr/src/org/argouml/model/mdr/CoreFactoryMDRImpl.java&r1=13724&r2=13725
==============================================================================
--- trunk/src/model-mdr/src/org/argouml/model/mdr/CoreFactoryMDRImpl.java (original)
+++ trunk/src/model-mdr/src/org/argouml/model/mdr/CoreFactoryMDRImpl.java 2007-11-04 13:21:01-0700
@@ -2185,10 +2185,7 @@
Model targetModel = (Model) org.argouml.model.Model.getFacade()
.getModel(targetME);
for (Stereotype s : sourceME.getStereotype()) {
- Stereotype st = (Stereotype) modelImpl
- .getModelManagementHelper().getCorrespondingElement(
- s, targetModel, true);
- targetME.getStereotype().add(st);
+ targetME.getStereotype().add(s);
}
}
}
Modified: trunk/src/model-mdr/src/org/argouml/model/mdr/ExtensionMechanismsFactoryMDRImpl.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/model-mdr/src/org/argouml/model/mdr/ExtensionMechanismsFactoryMDRImpl.java?view=diff&rev=13725&p1=trunk/src/model-mdr/src/org/argouml/model/mdr/ExtensionMechanismsFactoryMDRImpl.java&p2=trunk/src/model-mdr/src/org/argouml/model/mdr/ExtensionMechanismsFactoryMDRImpl.java&r1=13724&r2=13725
==============================================================================
--- trunk/src/model-mdr/src/org/argouml/model/mdr/ExtensionMechanismsFactoryMDRImpl.java (original)
+++ trunk/src/model-mdr/src/org/argouml/model/mdr/ExtensionMechanismsFactoryMDRImpl.java 2007-11-04 13:21:01-0700
@@ -212,10 +212,6 @@
public TaggedValue buildTaggedValue(String tag, String value) {
TaggedValue tv = createTaggedValue();
TagDefinition td = getTagDefinition(tag);
- td =
- (TagDefinition)
- modelImpl.getModelManagementHelper().getCorrespondingElement(
- td, modelImpl.getModelManagementFactory().getRootModel(), true);
tv.setType(td);
// TODO: Some CASE tools appear to manage only one
// dataValue. This is an array of String according to the
Modified: trunk/src/model-mdr/src/org/argouml/model/mdr/ExtensionMechanismsHelperMDRImpl.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/model-mdr/src/org/argouml/model/mdr/ExtensionMechanismsHelperMDRImpl.java?view=diff&rev=13725&p1=trunk/src/model-mdr/src/org/argouml/model/mdr/ExtensionMechanismsHelperMDRImpl.java&p2=trunk/src/model-mdr/src/org/argouml/model/mdr/ExtensionMechanismsHelperMDRImpl.java&r1=13724&r2=13725
==============================================================================
--- trunk/src/model-mdr/src/org/argouml/model/mdr/ExtensionMechanismsHelperMDRImpl.java (original)
+++ trunk/src/model-mdr/src/org/argouml/model/mdr/ExtensionMechanismsHelperMDRImpl.java 2007-11-04 13:21:01-0700
@@ -330,12 +330,6 @@
public void addCopyStereotype(Object modelElement, Object stereotype) {
- if (stereotype != null) {
- stereotype =
- modelImpl.getModelManagementHelper().
- getCorrespondingElement(stereotype,
- modelImpl.getFacade().getModel(modelElement), true);
- }
modelImpl.getCoreHelper().addStereotype(modelElement, stereotype);
}
@@ -451,10 +445,6 @@
if (handle instanceof TaggedValue) {
TaggedValue tv = (TaggedValue) handle;
if (tag instanceof TagDefinition) {
- tag =
- modelImpl.getModelManagementHelper()
- .getCorrespondingElement(tag,
- modelImpl.getFacade().getModel(handle), true);
tv.setType((TagDefinition) tag);
} else {
// TODO: Remove old UML 1.3 code
@@ -465,7 +455,6 @@
}
if (td == null) {
td =
- (TagDefinition)
((ExtensionMechanismsFactoryMDRImpl) modelImpl
.getExtensionMechanismsFactory())
.getTagDefinition(tag.toString());
@@ -474,12 +463,6 @@
model = modelImpl.getModelManagementFactory()
.getRootModel();
}
- td =
- (TagDefinition)
- modelImpl.getModelManagementHelper()
- .getCorrespondingElement(
- td, model,
- true);
tv.setType(td);
} else {
// TODO: This is going to change the name of the
@@ -572,9 +555,6 @@
model =
modelImpl.getModelManagementFactory().getRootModel();
}
- type =
- modelImpl.getModelManagementHelper()
- .getCorrespondingElement(type, model, true);
((TaggedValue) handle).setType((TagDefinition) type);
return;
}
@@ -587,6 +567,7 @@
/**
* @deprecated Use {@link #hasStereotype(Object,String)} instead
*/
+ @Deprecated
public boolean hasStereoType(Object handle, String name) {
return hasStereotype(handle, name);
}
Modified: trunk/src/model-mdr/src/org/argouml/model/mdr/ModelManagementHelperMDRImpl.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/model-mdr/src/org/argouml/model/mdr/ModelManagementHelperMDRImpl.java?view=diff&rev=13725&p1=trunk/src/model-mdr/src/org/argouml/model/mdr/ModelManagementHelperMDRImpl.java&p2=trunk/src/model-mdr/src/org/argouml/model/mdr/ModelManagementHelperMDRImpl.java&r1=13724&r2=13725
==============================================================================
--- trunk/src/model-mdr/src/org/argouml/model/mdr/ModelManagementHelperMDRImpl.java (original)
+++ trunk/src/model-mdr/src/org/argouml/model/mdr/ModelManagementHelperMDRImpl.java 2007-11-04 13:21:01-0700
@@ -383,17 +383,18 @@
return path;
}
+ @Deprecated
public Object getCorrespondingElement(Object elem, Object model) {
- return getCorrespondingElement(elem, model, true);
+ return elem;
}
-
+ @Deprecated
public Object getCorrespondingElement(Object elem, Object model,
boolean canCreate) {
return elem;
}
-
+ @Deprecated
public boolean corresponds(Object obj1, Object obj2) {
return obj1.equals(obj2);
}
lmpx.com only provides a reader for public news (NNTP) servers. It is not
affiliated with the servers or forums shown here and is not responsible for
the content of articles, which is written by their respective authors.