Author: tfmorris
Date: 2008-11-23 22:23:20-0800
New Revision: 16167
Modified:
trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/FacadeMDRImpl.java
trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/UmlFactoryMDRImpl.java
Log:
Model system deprecations - two missing files
Modified: trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/FacadeMDRImpl.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/FacadeMDRImpl.java?view=diff&rev=16167&p1=trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/FacadeMDRImpl.java&p2=trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/FacadeMDRImpl.java&r1=16166&r2=16167
==============================================================================
--- trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/FacadeMDRImpl.java (original)
+++ trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/FacadeMDRImpl.java 2008-11-23 22:23:20-0800
@@ -441,46 +441,6 @@
return handle instanceof Expression;
}
- @SuppressWarnings("deprecation")
- public boolean isAArgListsExpression(Object handle) {
- return handle instanceof ArgListsExpression;
- }
-
- @SuppressWarnings("deprecation")
- public boolean isABooleanExpression(Object handle) {
- return handle instanceof BooleanExpression;
- }
-
- @SuppressWarnings("deprecation")
- public boolean isAIterationExpression(Object handle) {
- return handle instanceof IterationExpression;
- }
-
- @SuppressWarnings("deprecation")
- public boolean isAMappingExpression(Object handle) {
- return handle instanceof MappingExpression;
- }
-
- @SuppressWarnings("deprecation")
- public boolean isAObjectSetExpression(Object handle) {
- return handle instanceof ObjectSetExpression;
- }
-
- @SuppressWarnings("deprecation")
- public boolean isAProcedureExpression(Object handle) {
- return handle instanceof ProcedureExpression;
- }
-
- @SuppressWarnings("deprecation")
- public boolean isATimeExpression(Object handle) {
- return handle instanceof TimeExpression;
- }
-
- @SuppressWarnings("deprecation")
- public boolean isATypeExpression(Object handle) {
- return handle instanceof TypeExpression;
- }
-
public boolean isAExtend(Object handle) {
return handle instanceof Extend;
}
@@ -622,19 +582,9 @@
return handle instanceof UmlPackage;
}
- @SuppressWarnings("deprecation")
- public boolean isAPrimitive(Object handle) {
- return handle instanceof Primitive;
- }
-
public boolean isAPrimitiveType(Object handle) {
return handle instanceof Primitive;
}
-
- @SuppressWarnings("deprecation")
- public boolean isAProgrammingLanguageDataType(Object handle) {
- return handle instanceof ProgrammingLanguageDataType;
- }
public boolean isAPseudostate(Object handle) {
return handle instanceof Pseudostate;
@@ -645,19 +595,6 @@
}
- @SuppressWarnings("deprecation")
- public Object getPseudostateKind(Object handle) {
- if (handle instanceof Pseudostate) {
- try {
- return ((Pseudostate) handle).getKind();
- } catch (InvalidObjectException e) {
- throw new InvalidElementException(e);
- }
- }
- return illegalArgumentObject(handle);
- }
-
-
public Object getKind(Object handle) {
try {
if (handle instanceof Pseudostate) {
@@ -829,11 +766,7 @@
return handle instanceof UseCase;
}
- @SuppressWarnings("deprecation")
- public boolean isAUseCaseInstance(Object handle) {
- return handle instanceof UseCaseInstance;
- }
-
+
public boolean isAVisibilityKind(Object handle) {
return handle instanceof VisibilityKind;
}
@@ -851,44 +784,6 @@
}
- @SuppressWarnings("deprecation")
- public boolean isChangeable(Object handle) {
- try {
- if (handle instanceof StructuralFeature) {
- ChangeableKind changeability =
- ((StructuralFeature) handle).getChangeability();
- return ChangeableKindEnum.CK_CHANGEABLE.equals(changeability);
- }
- if (handle instanceof AssociationEnd) {
- ChangeableKind changeability =
- ((AssociationEnd) handle).getChangeability();
- return ChangeableKindEnum.CK_CHANGEABLE.equals(changeability);
- }
- } catch (InvalidObjectException e) {
- throw new InvalidElementException(e);
- }
- return illegalArgumentBoolean(handle);
- }
-
-
- @SuppressWarnings("deprecation")
- public boolean isClassifierScope(Object handle) {
- try {
- if (handle instanceof Attribute) {
- Attribute a = (Attribute) handle;
- return ScopeKindEnum.SK_CLASSIFIER.equals(a.getOwnerScope());
- }
- if (handle instanceof Feature) {
- Feature f = (Feature) handle;
- return ScopeKindEnum.SK_CLASSIFIER.equals(f.getOwnerScope());
- }
- } catch (InvalidObjectException e) {
- throw new InvalidElementException(e);
- }
- return illegalArgumentBoolean(handle);
- }
-
-
public boolean isConcurrent(Object handle) {
try {
if (handle instanceof CompositeState) {
@@ -1000,21 +895,7 @@
return illegalArgumentBoolean(handle);
}
-
- @SuppressWarnings("deprecation")
- public boolean isInstanceScope(Object handle) {
- try {
- if (handle instanceof Feature) {
- Feature a = (Feature) handle;
- return ScopeKindEnum.SK_INSTANCE.equals(a.getOwnerScope());
- }
- } catch (InvalidObjectException e) {
- throw new InvalidElementException(e);
- }
- return illegalArgumentBoolean(handle);
- }
-
-
+
public boolean isInternal(Object handle) {
try {
if (handle instanceof Transition) {
@@ -2831,13 +2712,7 @@
}
return opsAndReceps;
}
-
- @SuppressWarnings("deprecation")
- public Object getOppositeEnd(Object handle) {
- return getNextEnd(handle);
- }
-
public Object getNextEnd(Object handle) {
try {
Modified: trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/UmlFactoryMDRImpl.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/UmlFactoryMDRImpl.java?view=diff&rev=16167&p1=trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/UmlFactoryMDRImpl.java&p2=trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/UmlFactoryMDRImpl.java&r1=16166&r2=16167
==============================================================================
--- trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/UmlFactoryMDRImpl.java (original)
+++ trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/UmlFactoryMDRImpl.java 2008-11-23 22:23:20-0800
@@ -585,9 +585,11 @@
// build all other elements using existing buildNode
element = buildNode(elementType);
- if (container instanceof Namespace && element instanceof Namespace)
+ if (container instanceof Namespace
+ && element instanceof Namespace) {
((Namespace) element).setNamespace(
((Namespace) container).getNamespace());
+ }
this.modelImpl.getCoreHelper().addOwnedElement(container, element);
}
@@ -601,13 +603,6 @@
}
- @SuppressWarnings("deprecation")
- 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) {
if (Model.getModelManagementHelper().isReadOnly(fromElement)) {
@@ -959,8 +954,6 @@
modelImpl.getRepository().endTrans();
}
-
-
synchronized (lock) {
// Elements which will be deleted when their container is deleted
// don't get added to the list of elements to be deleted
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.