Author: tfmorris
Date: 2008-11-23 14:10:40-0800
New Revision: 16156
Modified:
trunk/src/argouml-app/tests/org/argouml/model/TestAgainstUmlModel.java
trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/CoreFactoryEUMLImpl.java
trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/CoreHelperEUMLImpl.java
trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/CoreFactoryMDRImpl.java
trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/CoreHelperMDRImpl.java
trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/UndoCoreHelperDecorator.java
trunk/src/argouml-core-model/src/org/argouml/model/AbstractCoreHelperDecorator.java
trunk/src/argouml-core-model/src/org/argouml/model/CoreFactory.java
trunk/src/argouml-core-model/src/org/argouml/model/CoreHelper.java
Log:
Remove deprecated methods
Modified: trunk/src/argouml-app/tests/org/argouml/model/TestAgainstUmlModel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/tests/org/argouml/model/TestAgainstUmlModel.java?view=diff&rev=16156&p1=trunk/src/argouml-app/tests/org/argouml/model/TestAgainstUmlModel.java&p2=trunk/src/argouml-app/tests/org/argouml/model/TestAgainstUmlModel.java&r1=16155&r2=16156
==============================================================================
--- trunk/src/argouml-app/tests/org/argouml/model/TestAgainstUmlModel.java (original)
+++ trunk/src/argouml-app/tests/org/argouml/model/TestAgainstUmlModel.java 2008-11-23 14:10:40-0800
@@ -353,6 +353,7 @@
* The following UML 1.4 elements have been removed from UML 2.x, so we
* don't bother testing them.
*/
+ dontTest.add("Primitive");
dontTest.add("ProgrammingLanguageDataType");
dontTest.add("UseCaseInstance");
@@ -372,7 +373,7 @@
remap.put("Core:Stereotype", "ExtensionMechanisms:Stereotype");
remap.put("Core:TaggedValue", "ExtensionMechanisms:TaggedValue");
remap.put("Core:TagDefinition", "ExtensionMechanisms:TagDefinition");
-
+
/*
* The UML 2.x package structure is *entirely* different, so we have to
* remap a bunch of stuff. Names without embedded colons (:) indicate
@@ -383,7 +384,6 @@
*/
// Specific classes to be remapped
// remap.put("", "");
- remap.put("Kernel:PrimitiveType", "Core:Primitive");
remap.put("Kernel:Expression", "DataTypes:Expression");
// Packages to be remapped
Modified: trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/CoreFactoryEUMLImpl.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/CoreFactoryEUMLImpl.java?view=diff&rev=16156&p1=trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/CoreFactoryEUMLImpl.java&p2=trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/CoreFactoryEUMLImpl.java&r1=16155&r2=16156
==============================================================================
--- trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/CoreFactoryEUMLImpl.java (original)
+++ trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/CoreFactoryEUMLImpl.java 2008-11-23 14:10:40-0800
@@ -408,10 +408,6 @@
return property;
}
- @SuppressWarnings("deprecation")
- public Property buildAttribute(Object handle, Object model, Object type) {
- return buildAttribute2(handle, type);
- }
public Property buildAttribute2(final Object handle, final Object type) {
if (!(handle instanceof Type) || !(type instanceof Type)) {
@@ -752,12 +748,6 @@
return (EnumerationLiteral) run.getParams().get(0);
}
- @SuppressWarnings("deprecation")
- public Generalization buildGeneralization(Object child, Object parent,
- String name) {
- // Generalizations are unnamed in UML 2.x
- return buildGeneralization(parent, child);
- }
public Generalization buildGeneralization(final Object child,
final Object parent) {
@@ -836,21 +826,10 @@
throw new NotImplementedException();
}
- @SuppressWarnings("deprecation")
- public Operation buildOperation(Object classifier, Object model,
- Object returnType) {
- return buildOperation2(classifier, returnType, null);
- }
-
public Operation buildOperation(Object classifier, Object returnType) {
return buildOperation2(classifier, returnType, null);
}
- @SuppressWarnings("deprecation")
- public Operation buildOperation(Object cls, Object model,
- Object returnType, String name) {
- return buildOperation2(cls, returnType, name);
- }
public Operation buildOperation2(final Object cls, final Object returnType,
final String name) {
@@ -883,10 +862,6 @@
return (Operation) run.getParams().get(0);
}
- @SuppressWarnings("deprecation")
- public Parameter buildParameter(Object o, Object model, Object type) {
- return buildParameter(o, type);
- }
public Parameter buildParameter(final Object o, final Object type) {
// TODO: In UML2.x Event has no parameters. The Event metaclass in
@@ -916,13 +891,6 @@
return (Parameter) run.getParams().get(0);
}
- /**
- * Removed from UML2.x, use buildPackageImport instead.
- */
- @Deprecated
- public PackageImport buildPermission(Object client, Object supplier) {
- return buildPackageImport(client, supplier);
- }
public PackageImport buildPackageAccess(Object client, Object supplier) {
return buildPackageImport(
@@ -1172,21 +1140,10 @@
return UMLFactory.eINSTANCE.createPackageImport();
}
- @SuppressWarnings("deprecation")
- public Object createPrimitive() {
- return createPrimitiveType();
- }
-
public PrimitiveType createPrimitiveType() {
return UMLFactory.eINSTANCE.createPrimitiveType();
}
- @SuppressWarnings("deprecation")
- public Object createProgrammingLanguageDataType() {
- // Removed from UML 2.x & unused by ArgoUML.
- throw new NotImplementedException();
- }
-
public Object createTemplateArgument() {
// TODO: Is this removed from UML2 ?
throw new NotImplementedException();
Modified: trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/CoreHelperEUMLImpl.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/CoreHelperEUMLImpl.java?view=diff&rev=16156&p1=trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/CoreHelperEUMLImpl.java&p2=trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/CoreHelperEUMLImpl.java&r1=16155&r2=16156
==============================================================================
--- trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/CoreHelperEUMLImpl.java (original)
+++ trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/CoreHelperEUMLImpl.java 2008-11-23 14:10:40-0800
@@ -448,11 +448,6 @@
addSupplier(dependency, supplier);
}
- public void addTaggedValue(Object handle, Object taggedValue) {
- // TODO: implement
- throw new NotYetImplementedException();
- }
-
public void addTargetFlow(Object handle, Object flow) {
// TODO: implement
throw new NotYetImplementedException();
@@ -521,14 +516,9 @@
return modelImpl.getModelManagementHelper().getAllModelElementsOfKind(ns, org.eclipse.uml2.uml.Component.class);
}
- public Collection getAllContents(Object namespace) {
- return modelImpl.getModelManagementHelper().getAllContents(namespace);
- }
-
public Collection getAllDataTypes(Object ns) {
return modelImpl.getModelManagementHelper().getAllModelElementsOfKind(ns, DataType.class);
}
-
public Collection getAllInterfaces(Object ns) {
return modelImpl.getModelManagementHelper().getAllModelElementsOfKind(ns, Interface.class);
@@ -610,9 +600,6 @@
return result;
}
- public Collection getAssociateEnds(Object classifier) {
- return modelImpl.getFacade().getAssociationEnds(classifier);
- }
public Collection getAssociateEndsInh(Object classifier) {
if (!(classifier instanceof Classifier)) {
@@ -620,9 +607,9 @@
"classifier must be instance of Classifier"); //$NON-NLS-1$
}
Collection result = new ArrayList();
- result.addAll(getAssociateEnds(classifier));
+ result.addAll(modelImpl.getFacade().getAssociationEnds(classifier));
for (Classifier o : ((Classifier) classifier).allParents()) {
- result.addAll(getAssociateEnds(o));
+ result.addAll(modelImpl.getFacade().getAssociationEnds(o));
}
return result;
}
@@ -975,10 +962,6 @@
throw new NotYetImplementedException();
}
- public Collection getSpecifications(Object classifier) {
- return getRealizedInterfaces(classifier);
- }
-
public Collection<Element> getSubtypes(Object cls) {
if (!(cls instanceof Classifier)) {
throw new IllegalArgumentException(
@@ -1621,10 +1604,6 @@
throw new NotYetImplementedException();
}
- public void setTaggedValues(Object handle, Collection taggedValues) {
- throw new NotYetImplementedException();
- }
-
@SuppressWarnings("deprecation")
public void setTargetScope(Object handle, Object targetScope) {
// Don't implement - deprecated method in interface.
Modified: trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/CoreFactoryMDRImpl.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/CoreFactoryMDRImpl.java?view=diff&rev=16156&p1=trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/CoreFactoryMDRImpl.java&p2=trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/CoreFactoryMDRImpl.java&r1=16155&r2=16156
==============================================================================
--- trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/CoreFactoryMDRImpl.java (original)
+++ trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/CoreFactoryMDRImpl.java 2008-11-23 14:10:40-0800
@@ -376,12 +376,6 @@
}
- @SuppressWarnings("deprecation")
- public Primitive createPrimitive() {
- return createPrimitiveType();
- }
-
-
public Primitive createPrimitiveType() {
Primitive obj = getCorePackage().getPrimitive().createPrimitive();
super.initialize(obj);
@@ -389,16 +383,6 @@
}
- @SuppressWarnings("deprecation")
- public ProgrammingLanguageDataType createProgrammingLanguageDataType() {
- ProgrammingLanguageDataType obj = getCorePackage()
- .getProgrammingLanguageDataType()
- .createProgrammingLanguageDataType();
- super.initialize(obj);
- return obj;
- }
-
-
public TemplateArgument createTemplateArgument() {
TemplateArgument obj = getCorePackage().getTemplateArgument()
.createTemplateArgument();
@@ -745,22 +729,6 @@
}
- @SuppressWarnings("deprecation")
- public Attribute buildAttribute(Object handle, Object model, Object type) {
- Attribute attr = buildAttribute(model, type);
- if (handle instanceof Classifier) {
- Classifier cls = (Classifier) handle;
- cls.getFeature().add(attr);
- } else if (handle instanceof AssociationEnd) {
- AssociationEnd assend = (AssociationEnd) handle;
- assend.getQualifier().add(attr);
- } else {
- throw new IllegalArgumentException();
- }
- return attr;
- }
-
-
public Attribute buildAttribute2(Object handle, Object type) {
Attribute attr = buildAttribute2(type);
if (handle instanceof Classifier) {
@@ -927,31 +895,7 @@
return dep;
}
-
- @SuppressWarnings("deprecation")
- public Permission buildPermission(Object client, Object supplier) {
- if (!(client instanceof ModelElement)
- || !(supplier instanceof ModelElement)) {
- throw new IllegalArgumentException("client is not a Namespace"
- + " or supplier is not a Package");
- }
- // Warn about historical usage which is not compliant with UML spec.
- if (!(client instanceof Namespace)
- || !(supplier instanceof UmlPackage)) {
- LOG.warn("buildPermission called with client that is not a "
- + "Namespace or supplier that is not a Package");
- }
- Permission per = buildPermissionInternal((ModelElement) client,
- (ModelElement) supplier);
- // TODO: This should fetch the stereotype from our profile
- modelImpl.getExtensionMechanismsFactory().buildStereotype(per,
- ModelManagementHelper.IMPORT_STEREOTYPE,
- per.getNamespace());
- return per;
- }
-
-
public Permission buildPackageImport(Object client, Object supplier) {
if (!(client instanceof Namespace)
|| !(supplier instanceof UmlPackage)) {
@@ -999,21 +943,6 @@
return per;
}
- @Deprecated
- public Generalization buildGeneralization(Object child, Object parent,
- String name) {
- if (child == null || parent == null
- || !(child instanceof GeneralizableElement)
- || !(parent instanceof GeneralizableElement)) {
- throw new IllegalArgumentException();
- }
- Generalization gen = buildGeneralization(child, parent);
- if (gen != null) {
- gen.setName(name);
- }
- return gen;
- }
-
public Generalization buildGeneralization(Object child1, Object parent1) {
// TODO: This is a part implementation of well-formedness rule
@@ -1080,13 +1009,6 @@
}
- @SuppressWarnings("deprecation")
- public Operation buildOperation(Object classifier, Object model,
- Object returnType) {
- return buildOperation(classifier, returnType);
- }
-
-
public Operation buildOperation(Object classifier, Object returnType) {
if (!(classifier instanceof Classifier)) {
throw new IllegalArgumentException("Handle is not a classifier");
@@ -1110,13 +1032,6 @@
}
- @SuppressWarnings("deprecation")
- public Operation buildOperation(Object cls, Object model, Object returnType,
- String name) {
- return buildOperation2(cls, returnType, name);
- }
-
-
public Operation buildOperation2(Object cls, Object returnType,
String name) {
Operation oper = buildOperation(cls, returnType);
@@ -1140,12 +1055,6 @@
}
- @SuppressWarnings("deprecation")
- public Parameter buildParameter(Object o, Object model, Object type) {
- return buildParameter(o, type);
- }
-
-
public Parameter buildParameter(Object o, Object type) {
if (o instanceof Event) {
Event event = (Event) o;
Modified: trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/CoreHelperMDRImpl.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/CoreHelperMDRImpl.java?view=diff&rev=16156&p1=trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/CoreHelperMDRImpl.java&p2=trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/CoreHelperMDRImpl.java&r1=16155&r2=16156
==============================================================================
--- trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/CoreHelperMDRImpl.java (original)
+++ trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/CoreHelperMDRImpl.java 2008-11-23 14:10:40-0800
@@ -239,13 +239,6 @@
}
- @SuppressWarnings("deprecation")
- @Deprecated
- public Collection<AssociationEnd> getAssociateEnds(Object classifier) {
- return Model.getFacade().getAssociationEnds(classifier);
- }
-
-
public Collection<AssociationEnd> getAssociateEndsInh(Object classifier1) {
if (!(classifier1 instanceof Classifier)) {
throw new IllegalArgumentException();
@@ -254,7 +247,7 @@
Classifier classifier = (Classifier) classifier1;
Collection<AssociationEnd> result = new ArrayList<AssociationEnd>();
try {
- result.addAll(getAssociateEnds(classifier));
+ result.addAll(modelImpl.getFacade().getAssociationEnds(classifier));
for (Generalization gen : classifier.getGeneralization()) {
Object parent = gen.getParent();
result.addAll(getAssociateEndsInh(parent));
@@ -507,16 +500,7 @@
}
}
- @SuppressWarnings("deprecation")
- public Collection<Interface> getSpecifications(Object classifier) {
- try {
- return getRealizedInterfaces(classifier);
- } catch (InvalidObjectException e) {
- throw new InvalidElementException(e);
- }
- }
-
-
+
public Collection<GeneralizableElement> getSubtypes(Object cls) {
if (!(cls instanceof Classifier)) {
throw new IllegalArgumentException();
@@ -974,19 +958,6 @@
}
- @SuppressWarnings("deprecation")
- @Deprecated
- public Collection getAllContents(Object clazz) {
- if (clazz == null) {
- return Collections.emptySet();
- }
- if (!(clazz instanceof Classifier)) {
- throw new IllegalArgumentException();
- }
- return modelImpl.getModelManagementHelper().getAllContents(clazz);
- }
-
-
public Collection<Attribute> getAllAttributes(Object clazz) {
if (clazz == null) {
return Collections.emptySet();
@@ -2497,13 +2468,6 @@
}
- @SuppressWarnings("deprecation")
- public void addTaggedValue(Object handle, Object taggedValue) {
- modelImpl.getExtensionMechanismsHelper().addTaggedValue(handle,
- taggedValue);
- }
-
-
public void addTargetFlow(Object handle, Object flow) {
if (handle instanceof ModelElement && flow instanceof Flow) {
((ModelElement) handle).getTargetFlow().add((Flow) flow);
@@ -3276,13 +3240,6 @@
@Deprecated
- public void setTaggedValues(Object handle, Collection taggedValues) {
- Model.getExtensionMechanismsHelper().setTaggedValue(handle,
- taggedValues);
- }
-
-
- @Deprecated
public void setTargetScope(Object handle, Object scopeKind) {
if (scopeKind instanceof ScopeKind) {
if (handle instanceof StructuralFeature) {
Modified: trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/UndoCoreHelperDecorator.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/UndoCoreHelperDecorator.java?view=diff&rev=16156&p1=trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/UndoCoreHelperDecorator.java&p2=trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/UndoCoreHelperDecorator.java&r1=16155&r2=16156
==============================================================================
--- trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/UndoCoreHelperDecorator.java (original)
+++ trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/UndoCoreHelperDecorator.java 2008-11-23 14:10:40-0800
@@ -501,11 +501,6 @@
Model.execute(new DummyModelCommand());
}
- public void addTaggedValue(Object handle, Object taggedValue) {
- super.addTaggedValue(handle, taggedValue);
- Model.execute(new DummyModelCommand());
- }
-
public void addTargetFlow(Object handle, Object flow) {
super.addTargetFlow(handle, flow);
Model.execute(new DummyModelCommand());
@@ -769,11 +764,6 @@
Model.execute(new DummyModelCommand());
}
- public void setTaggedValues(Object handle, Collection taggedValues) {
- super.setTaggedValues(handle, taggedValues);
- Model.execute(new DummyModelCommand());
- }
-
public void setType(Object handle, Object type) {
super.setType(handle, type);
Model.execute(new DummyModelCommand());
Modified: trunk/src/argouml-core-model/src/org/argouml/model/AbstractCoreHelperDecorator.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-model/src/org/argouml/model/AbstractCoreHelperDecorator.java?view=diff&rev=16156&p1=trunk/src/argouml-core-model/src/org/argouml/model/AbstractCoreHelperDecorator.java&p2=trunk/src/argouml-core-model/src/org/argouml/model/AbstractCoreHelperDecorator.java&r1=16155&r2=16156
==============================================================================
--- trunk/src/argouml-core-model/src/org/argouml/model/AbstractCoreHelperDecorator.java (original)
+++ trunk/src/argouml-core-model/src/org/argouml/model/AbstractCoreHelperDecorator.java 2008-11-23 14:10:40-0800
@@ -79,11 +79,6 @@
return impl.getSupertypes(generalizableElement);
}
- @Deprecated
- public Collection getAssociateEnds(Object classifier) {
- return impl.getAssociateEnds(classifier);
- }
-
public Collection getAssociateEndsInh(Object classifier1) {
return impl.getAssociateEndsInh(classifier1);
}
@@ -124,11 +119,6 @@
return impl.getSpecification(object);
}
- @Deprecated
- public Collection getSpecifications(Object classifier) {
- return impl.getSpecifications(classifier);
- }
-
public Collection getSubtypes(Object cls) {
return impl.getSubtypes(cls);
}
@@ -209,11 +199,6 @@
return impl.getAssociationEnd(type, assoc);
}
- @Deprecated
- public Collection getAllContents(Object clazz) {
- return impl.getAllContents(clazz);
- }
-
public Collection getAllAttributes(Object clazz) {
return impl.getAllAttributes(clazz);
}
@@ -416,11 +401,6 @@
impl.addSupplierDependency(supplier, dependency);
}
- @Deprecated
- public void addTaggedValue(Object handle, Object taggedValue) {
- impl.addTaggedValue(handle, taggedValue);
- }
-
public void addTargetFlow(Object handle, Object flow) {
impl.addTargetFlow(handle, flow);
}
@@ -552,11 +532,6 @@
impl.setTaggedValue(handle, tag, value);
}
- @Deprecated
- public void setTaggedValues(Object handle, Collection taggedValues) {
- impl.setTaggedValues(handle, taggedValues);
- }
-
public void setType(Object handle, Object type) {
impl.setType(handle, type);
}
Modified: trunk/src/argouml-core-model/src/org/argouml/model/CoreFactory.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-model/src/org/argouml/model/CoreFactory.java?view=diff&rev=16156&p1=trunk/src/argouml-core-model/src/org/argouml/model/CoreFactory.java&p2=trunk/src/argouml-core-model/src/org/argouml/model/CoreFactory.java&r1=16155&r2=16156
==============================================================================
--- trunk/src/argouml-core-model/src/org/argouml/model/CoreFactory.java (original)
+++ trunk/src/argouml-core-model/src/org/argouml/model/CoreFactory.java 2008-11-23 14:10:40-0800
@@ -270,20 +270,7 @@
*/
Object createPermission();
- /**
- * Create a UML Primitive.
- *
- * @since UML 1.4
- * @return an initialized UML Primitive instance.
- * @deprecated for 0.25.4 by tfmorris. Removed from UML 2.x. Use
- * {@link #createPrimitiveType()}. This can be scheduled for
- * speedy removal since it was just introduced with UML 1.4 and
- * is unused by ArgoUML.
- */
- @Deprecated
- public Object createPrimitive();
-
/**
* Create a UML PrimitiveType.
*
@@ -294,17 +281,6 @@
*/
public Object createPrimitiveType();
- /**
- * Create a UML ProgrammingLanguageDataType.
- *
- * @since UML 1.4
- * @return an initialized ProgrammingLanguageDataType *
- * @deprecated for 0.25.4 by tfmorris. Removed from UML 2.x. This can be
- * scheduled for speedy removal since it was just introduced
- * with UML 1.4 and is unused by ArgoUML.
- */
- @Deprecated
- public Object createProgrammingLanguageDataType();
/**
* Create a UML TemplateArgument.
@@ -441,18 +417,6 @@
*/
Object buildAttribute2(Object type);
- /**
- * Builds an attribute owned by a classifier.
- *
- * @param classifier the classifier to own the new attribute
- * @param model the enclosing model
- * @param type the type
- * @return the newly built attribute
- * @deprecated for 0.25.2 by tfmorris - use the side effect free version
- * {@link #buildAttribute2(Object, Object)}
- */
- @Deprecated
- Object buildAttribute(Object classifier, Object model, Object type);
/**
* Builds an attribute of the given type owned by a classifier.
@@ -575,22 +539,6 @@
*/
Object buildDependency(Object clientObj, Object supplierObj);
- /**
- * Builds a Permission between two Namespaces. For backward compatibility
- * with pre 0.25.4 versions of ArgoUML, this builds an import (a Permission
- * with the <<import>> stereotype).
- *
- * @param client
- * is the client package
- * @param supplier
- * is the supplier
- * @return Permission
- * @see CoreFactory#buildPackageImport(Object, Object)
- * @deprecated for 0.25.4 by tfmorris. Use
- * {@link #buildPackageImport(Object, Object)}.
- */
- @Deprecated
- Object buildPermission(Object client, Object supplier);
/**
* Build an import Permission between a Namespace and a Package. All model
@@ -637,22 +585,6 @@
/**
- * Builds a generalization between a parent and a child with a given name.
- *
- * @param child
- * is the child
- * @param parent
- * is the parent
- * @param name
- * is the given name
- * @return generalization
- * @deprecated for 0.25.4 by tfmorris. Generalizations are unnamed in UML
- * 2.x. Use {@link #buildGeneralization(Object, Object)}.
- */
- @Deprecated
- Object buildGeneralization(Object child, Object parent, String name);
-
- /**
* Builds a generalization between a parent and a child. Does not check if
* multiple inheritance is allowed for the current notation.
*
@@ -673,18 +605,6 @@
*/
Object buildMethod(String name);
- /**
- * Builds an operation for a classifier.
- *
- * @param classifier is the given classifier
- * @param model is the model to which the class belongs
- * @param returnType the type of the return parameter
- * @return the operation
- * @deprecated for 0.25.2 by tfmorris. Use
- * {@link #buildOperation(Object, Object)}.
- */
- @Deprecated
- Object buildOperation(Object classifier, Object model, Object returnType);
/**
* Builds an operation for a classifier.
@@ -695,21 +615,6 @@
*/
Object buildOperation(Object classifier, Object returnType);
- /**
- * Builds an operation with a given name for classifier.
- *
- * @param cls is the classifier that shall own the operation
- * @param model is the model that contains the class
- * @param returnType the type of the return parameter
- * @param name the given name for the operation
- * @return the operation
- * @deprecated for 0.25.2 by tfmorris. Use
- * {@link #buildOperation2(Object, Object, String)}.
- */
- @Deprecated
- Object buildOperation(Object cls, Object model, Object returnType,
- String name);
-
/**
* Builds an operation with a given name for classifier.
@@ -728,22 +633,6 @@
*/
Object buildOperation2(Object cls, Object returnType, String name);
- /**
- * Adds a parameter initialized to default values to a given event or
- * behavioral feature.
- *
- * @param o
- * an event or behavioral feature
- * @param model
- * the model to which the event or behavioral feature belongs
- * @param type
- * the type of the parameter
- * @return the parameter
- * @deprecated for 0.25.2 by tfmorris. Use
- * {@link #buildParameter(Object, Object)}.
- */
- @Deprecated
- Object buildParameter(Object o, Object model, Object type);
/**
* Adds a parameter initialized to default values to a given event
@@ -891,7 +780,8 @@
/**
* Create a generalization in the given extent.
- *
+ *
+ * @extent the extent in which the generalization should be created
* @return A generalization.
*/
Object createGeneralization(Object extent);
Modified: trunk/src/argouml-core-model/src/org/argouml/model/CoreHelper.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-model/src/org/argouml/model/CoreHelper.java?view=diff&rev=16156&p1=trunk/src/argouml-core-model/src/org/argouml/model/CoreHelper.java&p2=trunk/src/argouml-core-model/src/org/argouml/model/CoreHelper.java&r1=16155&r2=16156
==============================================================================
--- trunk/src/argouml-core-model/src/org/argouml/model/CoreHelper.java (original)
+++ trunk/src/argouml-core-model/src/org/argouml/model/CoreHelper.java 2008-11-23 14:10:40-0800
@@ -64,20 +64,6 @@
*/
Collection getSupertypes(Object generalizableElement);
- /**
- * Return all AssociationEnds of a given Classifier. Same as
- * {@link Facade#getAssociationEnds(Object)}.
- *
- * @param classifier
- * the classifier for which to get the association ends
- *
- * @return a collection of the associationends
- * @see Facade#getAssociationEnds(Object)
- * @deprecated for 0.25.4 by tfmorris. Use
- * {@link Facade#getAssociationEnds(Object)}.
- */
- @Deprecated
- Collection getAssociateEnds(Object classifier);
/**
* Return all AssociationEnds of a given Classifier plus all
@@ -179,18 +165,6 @@
Object getSpecification(Object object);
/**
- * Return all Interfaces of which this class is a realization.
- *
- * @param classifier
- * the class you want to have the interfaces for
- * @return a collection of the Interfaces
- * @deprecated for 0.25.2 by tfmorris. Use
- * {@link Facade#getSpecifications(Object)}.
- */
- @Deprecated
- Collection getSpecifications(Object classifier);
-
- /**
* Return all Classifiers of which this class is a
* direct supertype.
*
@@ -363,17 +337,6 @@
*/
Object getAssociationEnd(Object type, Object assoc);
- /**
- * Returns the contents (owned elements) of this Namespace and all its
- * parents as specified in section 2.5.3.8 of the UML 1.3 spec.
- *
- * @param namespace is the classifier
- * @return Collection
- * @deprecated for 0.25.1 by tfmorris. Use
- * {@link ModelManagementHelper#getAllContents(Object)}.
- */
- @Deprecated
- Collection getAllContents(Object namespace);
/**
* Return all Attributes of a Classifier and of its parents.
@@ -811,16 +774,6 @@
*/
void addSupplierDependency(Object supplier, Object dependency);
- /**
- * Add a TaggedValue to a ModelElement.
- *
- * @param handle ModelElement
- * @param taggedValue TaggedValue
- * @deprecated for 0.25.1 by tfmorris. Use
- * {@link ExtensionMechanismsHelper#addTaggedValue(Object, Object)}.
- */
- @Deprecated
- void addTaggedValue(Object handle, Object taggedValue);
/**
* Add a target flow to a ModelElement.
@@ -1356,16 +1309,6 @@
@Deprecated
void setTaggedValue(Object handle, String tag, String value);
- /**
- * Set the TaggedValues of a ModelElement.
- *
- * @param handle ModelElement
- * @param taggedValues Collection of TaggedValues
- * @deprecated for 0.25.1 by tfmorris. Use
- * {@link ExtensionMechanismsHelper#setTaggedValue(Object, Collection)}.
- */
- @Deprecated
- void setTaggedValues(Object handle, Collection taggedValues);
/**
* Set the targetScope of an AssociationEnd or StructuralFeature.
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.