Author: tfmorris
Date: 2008-11-23 22:14:33-0800
New Revision: 16157
Modified:
trunk/src/argouml-app/tests/org/argouml/model/TestAgainstUmlModel.java
trunk/src/argouml-app/tests/org/argouml/model/TestDataTypesFactory.java
trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/CoreHelperEUMLImpl.java
trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/DataTypesHelperEUMLImpl.java
trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/ExtensionMechanismsHelperEUMLImpl.java
trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/FacadeEUMLImpl.java
trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/ModelManagementFactoryEUMLImpl.java
trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/ModelManagementHelperEUMLImpl.java
trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/UmlFactoryEUMLImpl.java
trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/UseCasesFactoryEUMLImpl.java
trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/UseCasesHelperEUMLImpl.java
trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/XmiReaderEUMLImpl.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/DataTypesHelperMDRImpl.java
trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/ExtensionMechanismsHelperMDRImpl.java
trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/ModelManagementFactoryMDRImpl.java
trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/ModelManagementHelperMDRImpl.java
trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/UndoCoreHelperDecorator.java
trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/UseCasesFactoryMDRImpl.java
trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/UseCasesHelperMDRImpl.java
trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/XmiReaderImpl.java
trunk/src/argouml-core-model/src/org/argouml/model/AbstractCoreHelperDecorator.java
trunk/src/argouml-core-model/src/org/argouml/model/AbstractDataTypesHelperDecorator.java
trunk/src/argouml-core-model/src/org/argouml/model/AbstractExtensionMechanismsHelperDecorator.java
trunk/src/argouml-core-model/src/org/argouml/model/AbstractUseCasesHelperDecorator.java
trunk/src/argouml-core-model/src/org/argouml/model/CoreHelper.java
trunk/src/argouml-core-model/src/org/argouml/model/DataTypesHelper.java
trunk/src/argouml-core-model/src/org/argouml/model/ExtensionMechanismsHelper.java
trunk/src/argouml-core-model/src/org/argouml/model/Facade.java
trunk/src/argouml-core-model/src/org/argouml/model/Model.java
trunk/src/argouml-core-model/src/org/argouml/model/ModelManagementFactory.java
trunk/src/argouml-core-model/src/org/argouml/model/ModelManagementHelper.java
trunk/src/argouml-core-model/src/org/argouml/model/UmlFactory.java
trunk/src/argouml-core-model/src/org/argouml/model/UseCasesFactory.java
trunk/src/argouml-core-model/src/org/argouml/model/UseCasesHelper.java
trunk/src/argouml-core-model/src/org/argouml/model/XmiReader.java
Log:
Remove deprecated model subsystem 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=16157&p1=trunk/src/argouml-app/tests/org/argouml/model/TestAgainstUmlModel.java&p2=trunk/src/argouml-app/tests/org/argouml/model/TestAgainstUmlModel.java&r1=16156&r2=16157
==============================================================================
--- trunk/src/argouml-app/tests/org/argouml/model/TestAgainstUmlModel.java (original)
+++ trunk/src/argouml-app/tests/org/argouml/model/TestAgainstUmlModel.java 2008-11-23 22:14:33-0800
@@ -356,7 +356,8 @@
dontTest.add("Primitive");
dontTest.add("ProgrammingLanguageDataType");
dontTest.add("UseCaseInstance");
-
+
+ dontTest.add("ActionExpression");
dontTest.add("ArgListsExpression");
dontTest.add("BooleanExpression");
dontTest.add("IterationExpression");
Modified: trunk/src/argouml-app/tests/org/argouml/model/TestDataTypesFactory.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/tests/org/argouml/model/TestDataTypesFactory.java?view=diff&rev=16157&p1=trunk/src/argouml-app/tests/org/argouml/model/TestDataTypesFactory.java&p2=trunk/src/argouml-app/tests/org/argouml/model/TestDataTypesFactory.java&r1=16156&r2=16157
==============================================================================
--- trunk/src/argouml-app/tests/org/argouml/model/TestDataTypesFactory.java (original)
+++ trunk/src/argouml-app/tests/org/argouml/model/TestDataTypesFactory.java 2008-11-23 22:14:33-0800
@@ -74,16 +74,7 @@
};
String[] objs = {
- "ActionExpression",
- "ArgListsExpression",
- "BooleanExpression",
"Expression",
- "IterationExpression",
- "MappingExpression",
- "ObjectSetExpression",
- "ProcedureExpression",
- "TimeExpression",
- "TypeExpression",
null,
};
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=16157&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=16156&r2=16157
==============================================================================
--- 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 22:14:33-0800
@@ -1290,10 +1290,6 @@
throw new NotImplementedException();
}
- @SuppressWarnings("deprecation")
- public void setChangeable(Object handle, boolean changeable) {
- setReadOnly(handle, !changeable);
- }
public void setChild(final Object handle, final Object child) {
if (!(handle instanceof Generalization)) {
@@ -1470,12 +1466,6 @@
throw new NotYetImplementedException();
}
- @SuppressWarnings("deprecation")
- public void setOwnerScope(Object feature, Object scopeKind) {
- // Don't implement - deprecated method in interface.
- throw new NotImplementedException();
- }
-
public void setParameter(Object handle, Object parameter) {
throw new NotYetImplementedException();
}
Modified: trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/DataTypesHelperEUMLImpl.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/DataTypesHelperEUMLImpl.java?view=diff&rev=16157&p1=trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/DataTypesHelperEUMLImpl.java&p2=trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/DataTypesHelperEUMLImpl.java&r1=16156&r2=16157
==============================================================================
--- trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/DataTypesHelperEUMLImpl.java (original)
+++ trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/DataTypesHelperEUMLImpl.java 2008-11-23 22:14:33-0800
@@ -49,10 +49,6 @@
modelImpl = implementation;
}
- public void copyTaggedValues(Object from, Object to) {
- throw new NotYetImplementedException();
- }
-
public boolean equalsCHOICEKind(Object kind) {
// TODO: Auto-generated method stub
return false;
Modified: trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/ExtensionMechanismsHelperEUMLImpl.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/ExtensionMechanismsHelperEUMLImpl.java?view=diff&rev=16157&p1=trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/ExtensionMechanismsHelperEUMLImpl.java&p2=trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/ExtensionMechanismsHelperEUMLImpl.java&r1=16156&r2=16157
==============================================================================
--- trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/ExtensionMechanismsHelperEUMLImpl.java (original)
+++ trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/ExtensionMechanismsHelperEUMLImpl.java 2008-11-23 22:14:33-0800
@@ -115,13 +115,6 @@
return Collections.emptySet();
}
- /**
- * @deprecated Use {@link #hasStereotype(Object,String)} instead
- */
- public boolean hasStereoType(Object handle, String name) {
- return hasStereotype(handle, name);
- }
-
public boolean hasStereotype(Object handle, String name) {
// TODO: Auto-generated method stub
return false;
@@ -137,15 +130,6 @@
return false;
}
- /**
- * @deprecated Use {@link #isValidStereotype(Object,Object)} instead
- */
- @Deprecated
- public boolean isValidStereoType(Object theModelElement,
- Object theStereotype) {
- return isValidStereotype(theModelElement, theStereotype);
- }
-
public boolean isValidStereotype(Object theModelElement,
Object theStereotype) {
// TODO: Auto-generated method stub
Modified: trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/FacadeEUMLImpl.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/FacadeEUMLImpl.java?view=diff&rev=16157&p1=trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/FacadeEUMLImpl.java&p2=trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/FacadeEUMLImpl.java&r1=16156&r2=16157
==============================================================================
--- trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/FacadeEUMLImpl.java (original)
+++ trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/FacadeEUMLImpl.java 2008-11-23 22:14:33-0800
@@ -39,7 +39,6 @@
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EStructuralFeature;
import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.xml.type.AnyType;
import org.eclipse.uml2.uml.Abstraction;
import org.eclipse.uml2.uml.Action;
import org.eclipse.uml2.uml.ActivityPartition;
@@ -898,10 +897,6 @@
return result;
}
- public Object getOppositeEnd(Object handle) {
- return getNextEnd(handle);
- }
-
public Object getOrdering(Object handle) {
if (handle instanceof MultiplicityElement) {
if (((MultiplicityElement) handle).isOrdered()) {
@@ -1015,11 +1010,6 @@
throw new NotYetImplementedException();
}
- @SuppressWarnings("deprecation")
- public Object getPseudostateKind(Object handle) {
- throw new NotImplementedException();
- }
-
public List<Property> getQualifiers(Object handle) {
if (!(handle instanceof Property)) {
throw new IllegalArgumentException();
@@ -1396,11 +1386,6 @@
return handle instanceof Action;
}
- public boolean isAActionExpression(Object handle) {
- // TODO: Fallback for UML 1.4
- return isAExpression(handle);
- }
-
public boolean isAActionSequence(Object handle) {
// TODO: gone in UML 2.x
return false;
@@ -1426,12 +1411,6 @@
return handle instanceof AggregationKind;
}
- @SuppressWarnings("deprecation")
- public boolean isAArgListsExpression(Object handle) {
- // TODO: Fallback for UML 1.4
- return isAExpression(handle);
- }
-
public boolean isAArgument(Object modelElement) {
// TODO: Double check - tfm
return modelElement instanceof InputPin
@@ -1487,11 +1466,6 @@
throw new NotYetImplementedException();
}
- @SuppressWarnings("deprecation")
- public boolean isABooleanExpression(Object handle) {
- // TODO: Fallback for UML 1.4
- return isAExpression(handle);
- }
public boolean isACallAction(Object handle) {
return handle instanceof CallAction;
@@ -1680,12 +1654,6 @@
return handle instanceof Interface;
}
- @SuppressWarnings("deprecation")
- public boolean isAIterationExpression(Object handle) {
- // TODO: Fallback for UML 1.4
- return isAExpression(handle);
- }
-
public boolean isALink(Object handle) {
// TODO: check semantics here - tfm
if (!(handle instanceof InstanceSpecification)) {
@@ -1706,12 +1674,6 @@
throw new NotYetImplementedException();
}
- @SuppressWarnings("deprecation")
- public boolean isAMappingExpression(Object handle) {
- // TODO: Fallback for UML 1.4
- return isAExpression(handle);
- }
-
public boolean isAMessage(Object handle) {
return handle instanceof Message;
}
@@ -1772,12 +1734,6 @@
return false;
}
- @SuppressWarnings("deprecation")
- public boolean isAObjectSetExpression(Object handle) {
- // TODO: Fallback for UML 1.4
- return isAExpression(handle);
- }
-
public boolean isAOperation(Object handle) {
return handle instanceof Operation;
}
@@ -1812,18 +1768,6 @@
return handle instanceof PrimitiveType;
}
- @SuppressWarnings("deprecation")
- public boolean isAProcedureExpression(Object handle) {
- // TODO: Fallback for UML 1.4
- return isAExpression(handle);
- }
-
- @SuppressWarnings("deprecation")
- public boolean isAProgrammingLanguageDataType(Object handle) {
- // TODO: Not in UML 2.x. Fall back to PrimitiveType.
- return isAPrimitiveType(handle);
- }
-
public boolean isAPseudostate(Object handle) {
return handle instanceof Pseudostate;
}
@@ -1950,22 +1894,10 @@
return handle instanceof TimeEvent;
}
- @SuppressWarnings("deprecation")
- public boolean isATimeExpression(Object handle) {
- // TODO: Fallback for UML 1.4
- return isAExpression(handle);
- }
-
public boolean isATransition(Object handle) {
return handle instanceof Transition;
}
- @SuppressWarnings("deprecation")
- public boolean isATypeExpression(Object handle) {
- // TODO: Fallback for UML 1.4
- return isAExpression(handle);
- }
-
public boolean isAUMLElement(Object handle) {
return handle instanceof Element;
}
@@ -1983,11 +1915,6 @@
return handle instanceof UseCase;
}
- @SuppressWarnings("deprecation")
- public boolean isAUseCaseInstance(Object handle) {
- throw new NotImplementedException();
- }
-
public boolean isAVisibilityKind(Object handle) {
return handle instanceof VisibilityKind;
}
@@ -2018,18 +1945,6 @@
return !((CallAction) handle).isSynchronous();
}
- @SuppressWarnings("deprecation")
- public boolean isChangeable(Object handle) {
- return !isReadOnly(handle);
- }
-
- @SuppressWarnings("deprecation")
- public boolean isClassifierScope(Object handle) {
- // Removed from UML 2.x and deprecated in Model API
- // so we won't implement it
- throw new NotImplementedException();
- }
-
public boolean isComposite(Object handle) {
return AggregationKind.COMPOSITE_LITERAL.equals(((Property) handle)
.getAggregation());
@@ -2053,13 +1968,6 @@
throw new NotYetImplementedException();
}
- @SuppressWarnings("deprecation")
- public boolean isInstanceScope(Object handle) {
- // Removed from UML 2.x and deprecated in Model API
- // so we won't implement it
- throw new NotImplementedException();
- }
-
public boolean isInternal(Object handle) {
if (handle instanceof Transition) {
Object state = getState(handle);
Modified: trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/ModelManagementFactoryEUMLImpl.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/ModelManagementFactoryEUMLImpl.java?view=diff&rev=16157&p1=trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/ModelManagementFactoryEUMLImpl.java&p2=trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/ModelManagementFactoryEUMLImpl.java&r1=16156&r2=16157
==============================================================================
--- trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/ModelManagementFactoryEUMLImpl.java (original)
+++ trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/ModelManagementFactoryEUMLImpl.java 2008-11-23 22:14:33-0800
@@ -67,7 +67,9 @@
editingDomain = implementation.getEditingDomain();
}
- public ElementImport buildElementImport(final Object pack, final Object me) {
+ public ElementImport buildElementImport(final Object pack,
+ final Object me) {
+
if (!(pack instanceof Namespace)) {
throw new IllegalArgumentException(
"pack must be instance of Namespace"); //$NON-NLS-1$
@@ -90,19 +92,6 @@
return (ElementImport) run.getParams().get(0);
}
- @Deprecated
- @SuppressWarnings("deprecation")
- public org.eclipse.uml2.uml.Package buildPackage(String name, String uuid) {
- org.eclipse.uml2.uml.Package pkg =
- (org.eclipse.uml2.uml.Package) createPackage();
- if (name != null) {
- pkg.setName(name);
- }
- // We could throw an exception if uuid is not null, but since the
- // Javadoc technically says that it is only used if the element doesn't
- // already have one set, we're going to assume we can ignore it.
- return pkg;
- }
public org.eclipse.uml2.uml.Package buildPackage(String name) {
org.eclipse.uml2.uml.Package pkg =
Modified: trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/ModelManagementHelperEUMLImpl.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/ModelManagementHelperEUMLImpl.java?view=diff&rev=16157&p1=trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/ModelManagementHelperEUMLImpl.java&p2=trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/ModelManagementHelperEUMLImpl.java&r1=16156&r2=16157
==============================================================================
--- trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/ModelManagementHelperEUMLImpl.java (original)
+++ trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/ModelManagementHelperEUMLImpl.java 2008-11-23 22:14:33-0800
@@ -58,16 +58,11 @@
* @param implementation
* The ModelImplementation.
*/
- public ModelManagementHelperEUMLImpl(EUMLModelImplementation implementation) {
+ public ModelManagementHelperEUMLImpl(
+ EUMLModelImplementation implementation) {
modelImpl = implementation;
}
- @SuppressWarnings("deprecation")
- public boolean corresponds(Object obj1, Object obj2) {
- // TODO: Auto-generated method stub
- return false;
- }
-
public Collection getAllBehavioralFeatures(Object ns) {
return modelImpl.getCoreHelper().getAllBehavioralFeatures(ns);
}
@@ -205,16 +200,6 @@
return result;
}
- public Object getCorrespondingElement(Object elem, Object model) {
- // TODO: Auto-generated method stub
- return null;
- }
-
- public Object getCorrespondingElement(Object elem, Object model,
- boolean canCreate) {
- // TODO: Auto-generated method stub
- return null;
- }
public Object getElement(List<String> path) {
return getElement(path, null);
@@ -224,13 +209,6 @@
// TODO: Auto-generated method stub
return null;
}
-
- public Vector<String> getPath(Object element) {
- // TODO: Needs completing - stub implementation only! - tfm
- Vector<String> path = new Vector<String>();
- path.add(modelImpl.getFacade().getName(element));
- return path;
- }
public List<String> getPathList(Object element) {
// TODO: Needs completing - stub implementation only! - tfm
Modified: trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/UmlFactoryEUMLImpl.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/UmlFactoryEUMLImpl.java?view=diff&rev=16157&p1=trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/UmlFactoryEUMLImpl.java&p2=trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/UmlFactoryEUMLImpl.java&r1=16156&r2=16157
==============================================================================
--- trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/UmlFactoryEUMLImpl.java (original)
+++ trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/UmlFactoryEUMLImpl.java 2008-11-23 22:14:33-0800
@@ -349,10 +349,6 @@
throw new NotYetImplementedException();
}
- public boolean isConnectionValid(Object connectionType, Object fromElement,
- Object toElement) {
- return isConnectionValid(connectionType, fromElement, toElement, true);
- }
public boolean isConnectionValid(Object connectionType, Object fromElement,
Object toElement, boolean checkWFR) {
Modified: trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/UseCasesFactoryEUMLImpl.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/UseCasesFactoryEUMLImpl.java?view=diff&rev=16157&p1=trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/UseCasesFactoryEUMLImpl.java&p2=trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/UseCasesFactoryEUMLImpl.java&r1=16156&r2=16157
==============================================================================
--- trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/UseCasesFactoryEUMLImpl.java (original)
+++ trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/UseCasesFactoryEUMLImpl.java 2008-11-23 22:14:33-0800
@@ -182,9 +182,5 @@
return UMLFactory.eINSTANCE.createUseCase();
}
- @SuppressWarnings("deprecation")
- public InstanceSpecification createUseCaseInstance() {
- throw new NotImplementedException();
- }
}
Modified: trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/UseCasesHelperEUMLImpl.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/UseCasesHelperEUMLImpl.java?view=diff&rev=16157&p1=trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/UseCasesHelperEUMLImpl.java&p2=trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/UseCasesHelperEUMLImpl.java&r1=16156&r2=16157
==============================================================================
--- trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/UseCasesHelperEUMLImpl.java (original)
+++ trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/UseCasesHelperEUMLImpl.java 2008-11-23 22:14:33-0800
@@ -29,7 +29,6 @@
import java.util.Collection;
import java.util.HashSet;
-import org.argouml.model.NotImplementedException;
import org.argouml.model.UseCasesHelper;
import org.eclipse.emf.edit.command.CommandParameter;
import org.eclipse.uml2.uml.Actor;
@@ -150,12 +149,6 @@
return result;
}
- @SuppressWarnings("deprecation")
- public Collection<UseCase> getExtendingUseCases(Object usecase) {
- // TODO: association is not navigable in this direction
- throw new NotImplementedException();
- }
-
public Extend getExtends(Object abase, Object anextension) {
if (!(abase instanceof UseCase) || !(anextension instanceof UseCase)) {
throw new IllegalArgumentException();
Modified: trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/XmiReaderEUMLImpl.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/XmiReaderEUMLImpl.java?view=diff&rev=16157&p1=trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/XmiReaderEUMLImpl.java&p2=trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/XmiReaderEUMLImpl.java&r1=16156&r2=16157
==============================================================================
--- trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/XmiReaderEUMLImpl.java (original)
+++ trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/XmiReaderEUMLImpl.java 2008-11-23 22:14:33-0800
@@ -94,12 +94,10 @@
return map;
}
- public Collection parse(InputSource inputSource) throws UmlException {
- return parse(inputSource, false);
- }
public Collection parse(InputSource inputSource, boolean readOnly)
- throws UmlException {
+ throws UmlException {
+
if (inputSource == null) {
throw new NullPointerException(
"The input source must be non-null."); //$NON-NLS-1$
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=16157&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=16156&r2=16157
==============================================================================
--- 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 22:14:33-0800
@@ -2677,11 +2677,6 @@
}
- @SuppressWarnings("deprecation")
- public void setChangeable(Object handle, boolean flag) {
- setReadOnly(handle, !flag);
- }
-
public void setReadOnly(Object handle, boolean isReadOnly) {
setChangeability(handle, isReadOnly ? ChangeableKindEnum.CK_FROZEN
: ChangeableKindEnum.CK_CHANGEABLE);
@@ -3029,17 +3024,6 @@
}
- @Deprecated
- public void setOwnerScope(Object handle, Object os) {
- if (handle instanceof Feature
- && (os == null || os instanceof ScopeKind)) {
- ((Feature) handle).setOwnerScope((ScopeKind) os);
- return;
- }
- throw new IllegalArgumentException("handle: " + handle + " or os: "
- + os);
- }
-
public void setStatic(Object handle, boolean isStatic) {
if (handle instanceof Feature) {
((Feature) handle)
Modified: trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/DataTypesHelperMDRImpl.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/DataTypesHelperMDRImpl.java?view=diff&rev=16157&p1=trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/DataTypesHelperMDRImpl.java&p2=trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/DataTypesHelperMDRImpl.java&r1=16156&r2=16157
==============================================================================
--- trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/DataTypesHelperMDRImpl.java (original)
+++ trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/DataTypesHelperMDRImpl.java 2008-11-23 22:14:33-0800
@@ -56,12 +56,6 @@
}
- @SuppressWarnings("deprecation")
- public void copyTaggedValues(Object from, Object to) {
- modelImpl.getExtensionMechanismsFactory().copyTaggedValues(from, to);
- }
-
-
public boolean equalsINITIALKind(Object kind) {
if (!(kind instanceof PseudostateKind)) {
throw new IllegalArgumentException();
Modified: trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/ExtensionMechanismsHelperMDRImpl.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/ExtensionMechanismsHelperMDRImpl.java?view=diff&rev=16157&p1=trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/ExtensionMechanismsHelperMDRImpl.java&p2=trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/ExtensionMechanismsHelperMDRImpl.java&r1=16156&r2=16157
==============================================================================
--- trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/ExtensionMechanismsHelperMDRImpl.java (original)
+++ trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/ExtensionMechanismsHelperMDRImpl.java 2008-11-23 22:14:33-0800
@@ -293,13 +293,6 @@
}
- @Deprecated
- public boolean isValidStereoType(Object theModelElement,
- Object theStereotype) {
- return isValidStereotype(theModelElement, theStereotype);
- }
-
-
public boolean isValidStereotype(Object theModelElement,
Object theStereotype) {
if (theModelElement == null) {
@@ -529,12 +522,6 @@
}
- @Deprecated
- public boolean hasStereoType(Object handle, String name) {
- return hasStereotype(handle, name);
- }
-
-
public boolean hasStereotype(Object handle, String name) {
if (name == null || !(handle instanceof ModelElement)) {
throw new IllegalArgumentException();
Modified: trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/ModelManagementFactoryMDRImpl.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/ModelManagementFactoryMDRImpl.java?view=diff&rev=16157&p1=trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/ModelManagementFactoryMDRImpl.java&p2=trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/ModelManagementFactoryMDRImpl.java&r1=16156&r2=16157
==============================================================================
--- trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/ModelManagementFactoryMDRImpl.java (original)
+++ trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/ModelManagementFactoryMDRImpl.java 2008-11-23 22:14:33-0800
@@ -137,16 +137,6 @@
return myUmlPackage;
}
- @Deprecated
- @SuppressWarnings("deprecation")
- public Object buildPackage(String name, String uuid) {
- UmlPackage pkg = createPackage();
- pkg.setName(name);
- // We could throw an exception if uuid is not null, but since the
- // Javadoc technically says that it is only used if the element doesn't
- // already have one set, we're going to assume we can ignore it.
- return pkg;
- }
public Object buildPackage(String name) {
UmlPackage pkg = createPackage();
Modified: trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/ModelManagementHelperMDRImpl.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/ModelManagementHelperMDRImpl.java?view=diff&rev=16157&p1=trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/ModelManagementHelperMDRImpl.java&p2=trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/ModelManagementHelperMDRImpl.java&r1=16156&r2=16157
==============================================================================
--- trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/ModelManagementHelperMDRImpl.java (original)
+++ trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/ModelManagementHelperMDRImpl.java 2008-11-23 22:14:33-0800
@@ -412,21 +412,7 @@
}
return element;
}
-
-
- @Deprecated
- public Vector<String> getPath(Object element) {
- Vector<String> path;
-
- if (element == null || element instanceof Model) {
- return new Vector<String>();
- }
- path = getPath(modelImpl.getFacade().getModelElementContainer(element));
- path.add(modelImpl.getFacade().getName(element));
-
- return path;
- }
public List<String> getPathList(Object element) {
@@ -444,22 +430,6 @@
return path;
}
- @Deprecated
- public Object getCorrespondingElement(Object elem, Object model) {
- 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);
- }
-
public boolean isCyclicOwnership(Object parent, Object child) {
return (getOwnerShipPath(parent).contains(child) || parent == child);
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=16157&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=16156&r2=16157
==============================================================================
--- 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 22:14:33-0800
@@ -238,15 +238,6 @@
}
@Override
- public void setChangeable(final Object handle, boolean flag) {
- createCommand(new BooleanSetter() {
- public void set(boolean value) {
- getComponent().setChangeable(handle, value);
- }
- }, flag, Model.getFacade().isChangeable(handle));
- }
-
- @Override
public void setReadOnly(final Object handle, boolean flag) {
createCommand(new BooleanSetter() {
public void set(boolean value) {
@@ -710,11 +701,6 @@
Model.execute(new DummyModelCommand());
}
- public void setOwnerScope(Object handle, Object os) {
- super.setOwnerScope(handle, os);
- Model.execute(new DummyModelCommand());
- }
-
public void setStatic(Object handle, boolean isStatic) {
super.setStatic(handle, isStatic);
Model.execute(new DummyModelCommand());
Modified: trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/UseCasesFactoryMDRImpl.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/UseCasesFactoryMDRImpl.java?view=diff&rev=16157&p1=trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/UseCasesFactoryMDRImpl.java&p2=trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/UseCasesFactoryMDRImpl.java&r1=16156&r2=16157
==============================================================================
--- trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/UseCasesFactoryMDRImpl.java (original)
+++ trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/UseCasesFactoryMDRImpl.java 2008-11-23 22:14:33-0800
@@ -105,15 +105,6 @@
}
- @SuppressWarnings("deprecation")
- public UseCaseInstance createUseCaseInstance() {
- UseCaseInstance myUseCaseInstance = modelImpl.getUmlPackage().
- getUseCases().getUseCaseInstance().createUseCaseInstance();
- super.initialize(myUseCaseInstance);
- return myUseCaseInstance;
- }
-
-
public Extend buildExtend(Object abase, Object anextension) {
return buildExtend(abase, anextension, null);
}
Modified: trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/UseCasesHelperMDRImpl.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/UseCasesHelperMDRImpl.java?view=diff&rev=16157&p1=trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/UseCasesHelperMDRImpl.java&p2=trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/UseCasesHelperMDRImpl.java&r1=16156&r2=16157
==============================================================================
--- trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/UseCasesHelperMDRImpl.java (original)
+++ trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/UseCasesHelperMDRImpl.java 2008-11-23 22:14:33-0800
@@ -132,24 +132,6 @@
}
- public Collection<UseCase> getExtendingUseCases(Object usecase) {
- if (usecase == null) {
- return new ArrayList<UseCase>();
- }
- List<UseCase> list = new ArrayList<UseCase>();
- try {
- for (Extend ext : (Collection<Extend>) Model.getFacade()
- .getExtenders(usecase)) {
- UseCase extension = ext.getExtension();
- list.add(extension);
- }
- } catch (InvalidObjectException e) {
- throw new InvalidElementException(e);
- }
- return list;
- }
-
-
public Extend getExtends(Object abase, Object anextension) {
if (!(abase instanceof UseCase)
|| !(anextension instanceof UseCase)) {
Modified: trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/XmiReaderImpl.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/XmiReaderImpl.java?view=diff&rev=16157&p1=trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/XmiReaderImpl.java&p2=trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/XmiReaderImpl.java&r1=16156&r2=16157
==============================================================================
--- trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/XmiReaderImpl.java (original)
+++ trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/XmiReaderImpl.java 2008-11-23 22:14:33-0800
@@ -139,11 +139,6 @@
modelImpl = parentModelImplementation;
}
- @Deprecated
- public Collection parse(InputSource inputSource) throws UmlException {
- return parse(inputSource, false);
- }
-
public Collection parse(InputSource inputSource, boolean readOnly)
throws UmlException {
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=16157&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=16156&r2=16157
==============================================================================
--- 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 22:14:33-0800
@@ -486,11 +486,6 @@
impl.setOwner(handle, owner);
}
- @Deprecated
- public void setOwnerScope(Object handle, Object os) {
- impl.setOwnerScope(handle, os);
- }
-
public void setStatic(Object handle, boolean isStatic) {
impl.setStatic(handle, isStatic);
}
@@ -560,11 +555,6 @@
public void setChangeability(Object handle, Object ck) {
impl.setChangeability(handle, ck);
}
-
- @Deprecated
- public void setChangeable(Object handle, boolean flag) {
- impl.setChangeable(handle, flag);
- }
public void setReadOnly(Object handle, boolean isReadOnly) {
impl.setReadOnly(handle, isReadOnly);
Modified: trunk/src/argouml-core-model/src/org/argouml/model/AbstractDataTypesHelperDecorator.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-model/src/org/argouml/model/AbstractDataTypesHelperDecorator.java?view=diff&rev=16157&p1=trunk/src/argouml-core-model/src/org/argouml/model/AbstractDataTypesHelperDecorator.java&p2=trunk/src/argouml-core-model/src/org/argouml/model/AbstractDataTypesHelperDecorator.java&r1=16156&r2=16157
==============================================================================
--- trunk/src/argouml-core-model/src/org/argouml/model/AbstractDataTypesHelperDecorator.java (original)
+++ trunk/src/argouml-core-model/src/org/argouml/model/AbstractDataTypesHelperDecorator.java 2008-11-23 22:14:33-0800
@@ -53,14 +53,6 @@
return impl;
}
- /*
- * @see org.argouml.model.DataTypesHelper#copyTaggedValues(java.lang.Object, java.lang.Object)
- */
- @SuppressWarnings("deprecation")
- public void copyTaggedValues(Object from, Object to) {
- impl.copyTaggedValues(from, to);
- }
-
public boolean equalsINITIALKind(Object kind) {
return impl.equalsINITIALKind(kind);
}
Modified: trunk/src/argouml-core-model/src/org/argouml/model/AbstractExtensionMechanismsHelperDecorator.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-model/src/org/argouml/model/AbstractExtensionMechanismsHelperDecorator.java?view=diff&rev=16157&p1=trunk/src/argouml-core-model/src/org/argouml/model/AbstractExtensionMechanismsHelperDecorator.java&p2=trunk/src/argouml-core-model/src/org/argouml/model/AbstractExtensionMechanismsHelperDecorator.java&r1=16156&r2=16157
==============================================================================
--- trunk/src/argouml-core-model/src/org/argouml/model/AbstractExtensionMechanismsHelperDecorator.java (original)
+++ trunk/src/argouml-core-model/src/org/argouml/model/AbstractExtensionMechanismsHelperDecorator.java 2008-11-23 22:14:33-0800
@@ -80,14 +80,6 @@
return impl.getAllPossibleStereotypes(models, modelElement);
}
- /*
- * @deprecated Use {@link #isValidStereotype(Object,Object)} instead
- */
- @Deprecated
- public boolean isValidStereoType(Object theModelElement,
- Object theStereotype) {
- return isValidStereotype(theModelElement, theStereotype);
- }
public boolean isValidStereotype(Object theModelElement,
Object theStereotype) {
@@ -155,14 +147,6 @@
impl.setTaggedValue(handle, taggedValues);
}
- /*
- * @deprecated Use {@link #hasStereotype(Object,String)} instead
- */
- @Deprecated
- public boolean hasStereoType(Object handle, String name) {
- return hasStereotype(handle, name);
- }
-
public boolean hasStereotype(Object handle, String name) {
return impl.hasStereotype(handle, name);
}
Modified: trunk/src/argouml-core-model/src/org/argouml/model/AbstractUseCasesHelperDecorator.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-model/src/org/argouml/model/AbstractUseCasesHelperDecorator.java?view=diff&rev=16157&p1=trunk/src/argouml-core-model/src/org/argouml/model/AbstractUseCasesHelperDecorator.java&p2=trunk/src/argouml-core-model/src/org/argouml/model/AbstractUseCasesHelperDecorator.java&r1=16156&r2=16157
==============================================================================
--- trunk/src/argouml-core-model/src/org/argouml/model/AbstractUseCasesHelperDecorator.java (original)
+++ trunk/src/argouml-core-model/src/org/argouml/model/AbstractUseCasesHelperDecorator.java 2008-11-23 22:14:33-0800
@@ -74,11 +74,6 @@
return impl.getExtendedUseCases(ausecase);
}
- @SuppressWarnings("deprecation")
- public Collection getExtendingUseCases(Object usecase) {
- return impl.getExtendingUseCases(usecase);
- }
-
public Object getExtends(Object abase, Object anextension) {
return impl.getExtends(abase, anextension);
}
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=16157&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=16156&r2=16157
==============================================================================
--- 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 22:14:33-0800
@@ -902,21 +902,6 @@
void setChangeability(Object handle, Object ck);
/**
- * Set the changeability of a StructuralFeature or AssociationEnd. A
- * convenience method which is equivalent to invoking
- * {{@link #setChangeability(Object, Object)} with values of Changeable
- * or Frozen.
- *
- * @param handle
- * is the feature
- * @param changeable true for Changeable and false for Frozen.
- * @deprecated for 0.25.4 by tfmorris. Use
- * {@link #setReadOnly(Object, boolean)} with a negated value.
- */
- @Deprecated
- void setChangeable(Object handle, boolean changeable);
-
- /**
* Set the isReadOnly (UML 2.x) or changeable (UML 1.x) attribute of a
* StructuralFeature or AssociationEnd.
*
@@ -1117,19 +1102,6 @@
void setOwner(Object handle, Object owner);
/**
- * Set the ownerScope of a Feature.
- *
- * @param feature
- * Feature
- * @param scopeKind
- * a {@link ScopeKind} of Instance or Classifier
- * {@link Model#getScopeKind()}.
- * @deprecated for 0.25.4 by tfmorris. Use {@link #setStatic}.
- */
- @Deprecated
- void setOwnerScope(Object feature, Object scopeKind);
-
- /**
* Set the isStatic (UML 2.x) or ownerScope (UML 1.x) attribute of a
* feature. As a special backward compatibility bridge, if passed
* a UML 1.4 AssociationEnd, it will set the targetScope instead of
Modified: trunk/src/argouml-core-model/src/org/argouml/model/DataTypesHelper.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-model/src/org/argouml/model/DataTypesHelper.java?view=diff&rev=16157&p1=trunk/src/argouml-core-model/src/org/argouml/model/DataTypesHelper.java&p2=trunk/src/argouml-core-model/src/org/argouml/model/DataTypesHelper.java&r1=16156&r2=16157
==============================================================================
--- trunk/src/argouml-core-model/src/org/argouml/model/DataTypesHelper.java (original)
+++ trunk/src/argouml-core-model/src/org/argouml/model/DataTypesHelper.java 2008-11-23 22:14:33-0800
@@ -31,15 +31,6 @@
* Created from the old DataTypesHelper.
*/
public interface DataTypesHelper {
-
- /**
- * @param from source
- * @param to destination
- * @deprecated for 0.25.2 by tfmorris. Use
- * {@link ExtensionMechanismsFactory#copyTaggedValues(Object, Object)}.
- */
- @Deprecated
- void copyTaggedValues(Object from, Object to);
/**
* @param kind the pseudostate kind
Modified: trunk/src/argouml-core-model/src/org/argouml/model/ExtensionMechanismsHelper.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-model/src/org/argouml/model/ExtensionMechanismsHelper.java?view=diff&rev=16157&p1=trunk/src/argouml-core-model/src/org/argouml/model/ExtensionMechanismsHelper.java&p2=trunk/src/argouml-core-model/src/org/argouml/model/ExtensionMechanismsHelper.java&r1=16156&r2=16157
==============================================================================
--- trunk/src/argouml-core-model/src/org/argouml/model/ExtensionMechanismsHelper.java (original)
+++ trunk/src/argouml-core-model/src/org/argouml/model/ExtensionMechanismsHelper.java 2008-11-23 22:14:33-0800
@@ -99,21 +99,6 @@
Collection getAllPossibleStereotypes(Collection models,
Object modelElement);
- /**
- * Returns true if the given stereotype has a baseclass that equals the
- * baseclass of the given modelelement or one of the superclasses of the
- * given modelelement.
- *
- * @param theModelElement
- * is the model element
- * @param theStereotype
- * is the stereotype
- * @return boolean
- * @deprecated Deprecated for 0.25.4 by tfmorris. Use
- * {@link #isValidStereotype(Object,Object)} instead (note
- * different capitalization),
- */
- boolean isValidStereoType(Object theModelElement, Object theStereotype);
/**
* Returns <code>true</code> if the given stereotype has a baseclass that
@@ -276,17 +261,6 @@
void setTaggedValue(Object handle, Collection taggedValues);
/**
- * Returns true if the given object has a stereotype with the given name.
- *
- * @param handle the given object
- * @param name the given name
- * @return true if there is such a stereotype
- * @deprecated for 0.25.4 by tfmorris. Use
- * {@link #hasStereotype(Object,String)} instead
- */
- boolean hasStereoType(Object handle, String name);
-
- /**
* Returns <code>true</code> if the given ModelElement has a Stereotype
* with the given name.
*
Modified: trunk/src/argouml-core-model/src/org/argouml/model/Facade.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-model/src/org/argouml/model/Facade.java?view=diff&rev=16157&p1=trunk/src/argouml-core-model/src/org/argouml/model/Facade.java&p2=trunk/src/argouml-core-model/src/org/argouml/model/Facade.java&r1=16156&r2=16157
==============================================================================
--- trunk/src/argouml-core-model/src/org/argouml/model/Facade.java (original)
+++ trunk/src/argouml-core-model/src/org/argouml/model/Facade.java 2008-11-23 22:14:33-0800
@@ -110,14 +110,6 @@
boolean isAAction(Object handle);
/**
- * Recognizer for ActionExpression.
- *
- * @param handle candidate
- * @return true if handle is an ActionExpression
- */
- boolean isAActionExpression(Object handle);
-
- /**
* Recognizer for ActionSequence.
*
* @param handle candidate
@@ -507,84 +499,6 @@
*/
boolean isAExpression(Object handle);
- /**
- * Recognizer for ArgListsExpression.
- *
- * @param handle candidate
- * @return true if handle is an ArgListsExpression
- * @deprecated for 0.25.4 by tfmorris. Removed from UML 2.x.
- */
- @Deprecated
- boolean isAArgListsExpression(Object handle);
-
- /**
- * Recognizer for BooleanExpression.
- *
- * @param handle candidate
- * @return true if handle is an BooleanExpression
- * @deprecated for 0.25.4 by tfmorris. Removed from UML 2.x.
- */
- @Deprecated
- boolean isABooleanExpression(Object handle);
-
- /**
- * Recognizer for IterationExpression.
- *
- * @param handle candidate
- * @return true if handle is an IterationExpression
- * @deprecated for 0.25.4 by tfmorris. Removed from UML 2.x.
- */
- @Deprecated
- boolean isAIterationExpression(Object handle);
-
- /**
- * Recognizer for MappingExpression.
- *
- * @param handle candidate
- * @return true if handle is an MappingExpression
- * @deprecated for 0.25.4 by tfmorris. Removed from UML 2.x.
- */
- @Deprecated
- boolean isAMappingExpression(Object handle);
-
- /**
- * Recognizer for ObjectSetExpression.
- *
- * @param handle candidate
- * @return true if handle is an ObjectSetExpression
- * @deprecated for 0.25.4 by tfmorris. Removed from UML 2.x.
- */
- @Deprecated
- boolean isAObjectSetExpression(Object handle);
- /**
- * Recognizer for ProcedureExpression.
- *
- * @param handle candidate
- * @return true if handle is an ProcedureExpression
- * @deprecated for 0.25.4 by tfmorris. Removed from UML 2.x.
- */
- @Deprecated
- boolean isAProcedureExpression(Object handle);
-
- /**
- * Recognizer for TimeExpression.
- *
- * @param handle candidate
- * @return true if handle is an TimeExpression
- * @deprecated for 0.25.4 by tfmorris. Removed from UML 2.x.
- */
- @Deprecated
- boolean isATimeExpression(Object handle);
-
- /**
- * Recognizer for TypeExpression.
- *
- * @param handle candidate
- * @return true if handle is an TypeExpression
- * @deprecated for 0.25.4 by tfmorris. Removed from UML 2.x.
- */
- @Deprecated
- boolean isATypeExpression(Object handle);
/**
* Recognizer for Extend.
@@ -874,18 +788,6 @@
boolean isAPackage(Object handle);
/**
- * Recognizer for Primitive.
- *
- * @param handle
- * candidate
- * @return true if handle is a Primitive
- * @deprecated for 0.25.4 by tfmorris. Renamed in UML 2.x. Use
- * {@link #isAPrimitiveType(Object)}.
- */
- @Deprecated
- boolean isAPrimitive(Object handle);
-
- /**
* Recognizer for PrimitiveType.
*
* @param handle candidate
@@ -893,17 +795,6 @@
*/
boolean isAPrimitiveType(Object handle);
- /**
- * Recognizer for ProgrammingLanguageDataType.
- *
- * @param handle
- * candidate
- * @return true if handle is a ProgrammingLanguageDataType
- * @deprecated for 0.25.4 by tfmorris. Removed from UML 2.x. Use
- * {@link #isAPrimitiveType(Object)}.
- */
- @Deprecated
- boolean isAProgrammingLanguageDataType(Object handle);
/**
* Recognizer for Pseudostate.
@@ -922,16 +813,6 @@
boolean isAPseudostateKind(Object handle);
/**
- * Return the Kind of a Pseudostate.
- *
- * @param handle the Pseudostate
- * @return the Kind
- * @deprecated by tfmorris for 0.25.3 - use {@link #getKind(Object)}
- */
- @Deprecated
- Object getPseudostateKind(Object handle);
-
- /**
* Return the Kind of a Pseudostate or Parameter.
*
* @param handle the Pseudostate or Parameter
@@ -1196,17 +1077,6 @@
*/
boolean isAUseCase(Object handle);
-
- /**
- * Recognizer for a UseCaseInstance.
- *
- * @param handle candidate
- * @return true if handle is a UseCaseInstance
- * @deprecated for 0.25.4 by tfmorris. UseCaseInstances have been removed
- * from UML 2.x.
- */
- @Deprecated
- boolean isAUseCaseInstance(Object handle);
/**
* Recognizer for VisibilityKind.
@@ -1224,32 +1094,6 @@
*/
boolean isActive(Object handle);
- /**
- * Recognizer for StructuralFeatures and AssociationEnds that are
- * changeable.
- *
- * @param handle
- * candidate
- * @return true if handle is changeable
- * @deprecated for 0.25.4 by tfmorris - use {@link #isReadOnly(Object)}.
- * Note that isChangeable() != !isReadOnly() because UML 1.4
- * also has an enum point of ADD_ONLY. This has been removed in
- * UML 2.x.
- */
- @Deprecated
- boolean isChangeable(Object handle);
-
- /**
- * Recognizer for Attributes and Features with classifier scope.
- *
- * @param handle candidate
- * @return true if handle has classifier scope.
- * @deprecated for 0.25.4 by tfmorris - use {@link #isStatic(Object)} which
- * has the same semantics, but is compatible with the UML 2.x
- * naming.
- */
- @Deprecated
- boolean isClassifierScope(Object handle);
/**
* Recognizer for concurrent CompositeState.
@@ -1317,18 +1161,6 @@
boolean isInitialized(Object handle);
/**
- * Recognizer for attributes with instance scope.
- *
- * @param handle
- * candidate
- * @return true if handle has instance scope.
- * @deprecated for 0.25.4 by tfmorris - use !{@link #isStatic(Object)}
- * which is compatible with the UML 2.x naming.
- */
- @Deprecated
- boolean isInstanceScope(Object handle);
-
- /**
* Recognizer for internal transitions. An internal Transition has
* its owning State as both the source State and target State.
*
@@ -2464,18 +2296,6 @@
//////// Javadoc reviewed above this point - tfm /////////////
- /**
- * Return the "opposite" end of an AssociationEnd. This just
- * calls {@link #getNextEnd(Object)}, so for an Association
- * with more than two AssociationEnds, this returns the nextEnd in
- * sequence.
- *
- * @param handle the association end
- * @return Object the opposite end.
- * @deprecated for 0.25.2 by tfmorris. Use {@link #getNextEnd(Object)}.
- */
- @Deprecated
- Object getOppositeEnd(Object handle);
/**
* Return the next AssociationEnd in the owning Association. If this is the
Modified: trunk/src/argouml-core-model/src/org/argouml/model/Model.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-model/src/org/argouml/model/Model.java?view=diff&rev=16157&p1=trunk/src/argouml-core-model/src/org/argouml/model/Model.java&p2=trunk/src/argouml-core-model/src/org/argouml/model/Model.java&r1=16156&r2=16157
==============================================================================
--- trunk/src/argouml-core-model/src/org/argouml/model/Model.java (original)
+++ trunk/src/argouml-core-model/src/org/argouml/model/Model.java 2008-11-23 22:14:33-0800
@@ -25,7 +25,6 @@
package org.argouml.model;
import java.io.OutputStream;
-import java.io.Writer;
/**
Modified: trunk/src/argouml-core-model/src/org/argouml/model/ModelManagementFactory.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-model/src/org/argouml/model/ModelManagementFactory.java?view=diff&rev=16157&p1=trunk/src/argouml-core-model/src/org/argouml/model/ModelManagementFactory.java&p2=trunk/src/argouml-core-model/src/org/argouml/model/ModelManagementFactory.java&r1=16156&r2=16157
==============================================================================
--- trunk/src/argouml-core-model/src/org/argouml/model/ModelManagementFactory.java (original)
+++ trunk/src/argouml-core-model/src/org/argouml/model/ModelManagementFactory.java 2008-11-23 22:14:33-0800
@@ -85,20 +85,6 @@
*/
Object createPackage();
- /**
- * Build an empty but initialized instance of a UML Package with a given
- * name, and set it's UUID, if it doesn't exist.
- *
- * @param name is the given name
- * @param uuid is the UUID.
- * @return an initialized UML Package instance.
- * @deprecated for 0.25.4 by tfmorris. Current implementations ignore the
- * uuid parameter if null and will throw an exception if it's
- * non-null. Use single argument form
- * {@link #buildPackage(String)}.
- */
- @Deprecated
- Object buildPackage(String name, String uuid);
/**
* Build an empty but initialized instance of a UML Package
Modified: trunk/src/argouml-core-model/src/org/argouml/model/ModelManagementHelper.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-model/src/org/argouml/model/ModelManagementHelper.java?view=diff&rev=16157&p1=trunk/src/argouml-core-model/src/org/argouml/model/ModelManagementHelper.java&p2=trunk/src/argouml-core-model/src/org/argouml/model/ModelManagementHelper.java&r1=16156&r2=16157
==============================================================================
--- trunk/src/argouml-core-model/src/org/argouml/model/ModelManagementHelper.java (original)
+++ trunk/src/argouml-core-model/src/org/argouml/model/ModelManagementHelper.java 2008-11-23 22:14:33-0800
@@ -143,35 +143,6 @@
*/
Object getElement(List<String> path, Object theRootNamespace);
- /**
- * Finds the absolute path of a ModelElement. Ie the name of each namespace
- * starting at the root (the Model) and ending with the name of the element.
- * <p>
- * The returned Vector implicitly starts at the <em>innermost</em>
- * containing model and follows element's chain of owning namespaces back
- * down to element. The first element will thus be the name of the namespace
- * contained the Model, and the last element will be the name of element
- * itself. Note thus that for the model the path will be empty.
- * <p>
- * <em>NOTE:</em>In the case of nested Models (ie a top level UML Model
- * that contains other UML Models, this may not produce the expected
- * results, but the historical behavior has been retained for backward
- * compatibility. All new code should use {@link #getPathList(Object)}.
- *
- * @deprecated for 0.25.4 by tfmorris. Use {@link #getPathList(Object)} but
- * be aware that the implementations are not 100% compatible.
- * Read the Javadoc for the new method to understand the
- * difference.
- * @param element
- * is the object to resolve the path for.
- * @return A Vector as described above.
- * @throws IllegalArgumentException
- * if element isn't a ModelElement properly owned by
- * namespaces and a model.
- *
- */
- @Deprecated
- Vector<String> getPath(Object element);
/**
* Find the absolute path of a ModelElement. Ie the name of each namespace
@@ -200,63 +171,6 @@
*/
List<String> getPathList(Object element);
- /**
- * Get local equivalent to a profile ModelElement. Equivalent to calling
- * getCorrespondingElement(Object, Object, boolean) with a value of
- * <code>true</code> for the third parameter.
- * <p>
- * This function may fail and return null eg if some required object doesn't
- * exist in the target model and cannot be copied.
- *
- * @param elem is some element.
- * @param model is the model the returned object shall belong to.
- * @return An element of the same type and at the same position in the model
- * as elem, or if that would turn out impossible then null.
- * @deprecated for 0.25.4 by tfmorris. Unnecessary because Model
- * implementation maintains cross XMI file references now.
- */
- @Deprecated
- Object getCorrespondingElement(Object elem, Object model);
-
- /**
- * Utility function for managing several overlaid models, eg a user model to
- * which elements from some profile models is imported when needed. This
- * version of the function will only copy objects if canCreate is true, but
- * may then also copy other missing elements.
- * <p>
- * This function may fail and return null eg if the required object doesn't
- * exist in the target model and canCreate is false or some required object
- * doesn't exist in the target model and cannot be copied.
- *
- * @param elem is some element.
- * @param model is the model the returned object shall belong to.
- * @param canCreate determines if objects can be copied into model.
- * @return An element of the same type and at the same position in the model
- * as elem, or if that would turn out impossible then null.
- *
- * @deprecated for 0.25.4 by tfmorris. Unnecessary because Model
- * implementation maintains cross XMI file references now.
- */
- @Deprecated
- Object getCorrespondingElement(Object elem, Object model,
- boolean canCreate);
-
- /**
- * Tests if two objects are of the same type, have the same name and the
- * same relative position in the model.
- *
- * Same relative position implies either:<ul>
- * <li>their owners correspond to each other.
- * <li>they are both owned by model objects.
- * </ul>
- *
- * @param obj1 is an object.
- * @param obj2 is another object.
- * @return true if obj1 corresponds to obj2, false otherwise.
- * @deprecated for 0.25.4 by tfmorris. Equivalent to obj1.equals(obj2).
- */
- @Deprecated
- boolean corresponds(Object obj1, Object obj2);
/**
* Checks if a child for some ownership relationship (as in a
Modified: trunk/src/argouml-core-model/src/org/argouml/model/UmlFactory.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-model/src/org/argouml/model/UmlFactory.java?view=diff&rev=16157&p1=trunk/src/argouml-core-model/src/org/argouml/model/UmlFactory.java&p2=trunk/src/argouml-core-model/src/org/argouml/model/UmlFactory.java&r1=16156&r2=16157
==============================================================================
--- trunk/src/argouml-core-model/src/org/argouml/model/UmlFactory.java (original)
+++ trunk/src/argouml-core-model/src/org/argouml/model/UmlFactory.java 2008-11-23 22:14:33-0800
@@ -90,25 +90,7 @@
*/
boolean isConnectionType(Object connectionType);
- /**
- * Checks if some type of UML model element is valid to
- * connect two other existing UML model elements.<p>
- *
- * This version of the method may also enforce well-formedness rules from
- * the UML spec. To control use behavior use
- * {@link #isConnectionValid(Object, Object, Object, boolean)}.<p>
- *
- * @deprecated for 0.25.1 by tfmorris use 4 arg version
- * {@link #isConnectionValid(Object, Object, Object, boolean)}
- * @param connectionType the UML object type of the connection
- * @param fromElement the UML object type of the "from"
- * @param toElement the UML object type of the "to"
- * @return true if valid
- */
- @Deprecated
- boolean isConnectionValid(Object connectionType, Object fromElement,
- Object toElement);
-
+
/**
* Checks if the given type of UML model element is valid to connect two
* other existing UML model elements, optionally checking UML
Modified: trunk/src/argouml-core-model/src/org/argouml/model/UseCasesFactory.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-model/src/org/argouml/model/UseCasesFactory.java?view=diff&rev=16157&p1=trunk/src/argouml-core-model/src/org/argouml/model/UseCasesFactory.java&p2=trunk/src/argouml-core-model/src/org/argouml/model/UseCasesFactory.java&r1=16156&r2=16157
==============================================================================
--- trunk/src/argouml-core-model/src/org/argouml/model/UseCasesFactory.java (original)
+++ trunk/src/argouml-core-model/src/org/argouml/model/UseCasesFactory.java 2008-11-23 22:14:33-0800
@@ -64,16 +64,6 @@
*/
Object createUseCase();
- /**
- * Create an empty but initialized instance of a UseCaseInstance.
- *
- * @return an initialized UseCaseInstance instance.
- * @deprecated for 0.25.4 by tfmorris. UseCaseInstances have been removed
- * from UML 2.x. Use an InstanceSpecification with a UseCase as
- * its Classifier.
- */
- @Deprecated
- Object createUseCaseInstance();
/**
* Build an extend relationship with a newly created extension point.
Modified: trunk/src/argouml-core-model/src/org/argouml/model/UseCasesHelper.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-model/src/org/argouml/model/UseCasesHelper.java?view=diff&rev=16157&p1=trunk/src/argouml-core-model/src/org/argouml/model/UseCasesHelper.java&p2=trunk/src/argouml-core-model/src/org/argouml/model/UseCasesHelper.java&r1=16156&r2=16157
==============================================================================
--- trunk/src/argouml-core-model/src/org/argouml/model/UseCasesHelper.java (original)
+++ trunk/src/argouml-core-model/src/org/argouml/model/UseCasesHelper.java 2008-11-23 22:14:33-0800
@@ -58,20 +58,6 @@
*/
Collection getExtendedUseCases(Object ausecase);
- /**
- * Find all UseCases that extend this UseCase.
- * <p>
- * NOTE: The association is not navigable in this direction, so a brute
- * force search will be used and it will only include models which are
- * accessable, not any models which are potentially linked to this one.
- *
- * @param usecase
- * the given usecase
- * @return Collection all usecases that extend the given usecase
- * @deprecated for 0.25.4 by tfmorris
- */
- @Deprecated
- Collection getExtendingUseCases(Object usecase);
/**
* Returns the extend relation between two usecases base and
Modified: trunk/src/argouml-core-model/src/org/argouml/model/XmiReader.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-model/src/org/argouml/model/XmiReader.java?view=diff&rev=16157&p1=trunk/src/argouml-core-model/src/org/argouml/model/XmiReader.java&p2=trunk/src/argouml-core-model/src/org/argouml/model/XmiReader.java&r1=16156&r2=16157
==============================================================================
--- trunk/src/argouml-core-model/src/org/argouml/model/XmiReader.java (original)
+++ trunk/src/argouml-core-model/src/org/argouml/model/XmiReader.java 2008-11-23 22:14:33-0800
@@ -42,20 +42,7 @@
* by the implementation to be garbage collected when an XmiReader instance
* falls out of scope.
*/
-
- /**
- * Parse a given inputsource to a collection of top level model elements.
- * All model elements will be modifiable (ie equivalent to parse(InputSource,
- * false).
- *
- * @param pIs the input source for parsing
- * @return a collection of top level elements
- * @throws UmlException on any error
- * @deprecated for 0.25.4 by tfmorris. Use
- * {@link #parse(InputSource, boolean)}.
- */
- @Deprecated
- Collection parse(InputSource pIs) throws UmlException;
+
/**
* Parse a given inputsource to a collection of top level model elements.
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.