Author: tfmorris
Date: 2007-08-03 13:05:03-0700
New Revision: 13227
Modified:
branches/gsoc2007/b00__1/model-euml/src/org/argouml/model/euml/CoreFactoryEUMLImpl.java
branches/gsoc2007/b00__1/model-euml/src/org/argouml/model/euml/CoreHelperEUMLImpl.java
branches/gsoc2007/b00__1/model-euml/src/org/argouml/model/euml/FacadeEUMLImpl.java
branches/gsoc2007/b00__1/model-euml/src/org/argouml/model/euml/MetaTypesEUMLImpl.java
branches/gsoc2007/b00__1/model-euml/src/org/argouml/model/euml/UmlFactoryEUMLImpl.java
Log:
Add methods for UML 2.x PackageImport. Deprecate UML 1.x Permission methods.
Modified: branches/gsoc2007/b00__1/model-euml/src/org/argouml/model/euml/CoreFactoryEUMLImpl.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/b00__1/model-euml/src/org/argouml/model/euml/CoreFactoryEUMLImpl.java?view=diff&rev=13227&p1=branches/gsoc2007/b00__1/model-euml/src/org/argouml/model/euml/CoreFactoryEUMLImpl.java&p2=branches/gsoc2007/b00__1/model-euml/src/org/argouml/model/euml/CoreFactoryEUMLImpl.java&r1=13226&r2=13227
==============================================================================
--- branches/gsoc2007/b00__1/model-euml/src/org/argouml/model/euml/CoreFactoryEUMLImpl.java (original)
+++ branches/gsoc2007/b00__1/model-euml/src/org/argouml/model/euml/CoreFactoryEUMLImpl.java 2007-08-03 13:05:03-0700
@@ -833,25 +833,33 @@
* Removed from UML2.x, use buildPackageImport instead.
*/
@Deprecated
- public PackageImport buildPermission(Object clientObj, Object supplierObj) {
- return buildPackageImport(clientObj, supplierObj);
+ public PackageImport buildPermission(Object client, Object supplier) {
+ return buildPackageImport(client, supplier);
}
- public PackageImport buildPackageImport(final Object clientObj,
- final Object supplierObj) {
- if (!(clientObj instanceof Namespace)) {
+ public PackageImport buildPackageAccess(final Object client,
+ final Object supplier) {
+ PackageImport packageImport = buildPackageImport(client, supplier);
+ // TODO: Do we care if this is undoable?
+ packageImport.setVisibility(VisibilityKind.PACKAGE_LITERAL);
+ return packageImport;
+ }
+
+ public PackageImport buildPackageImport(final Object client,
+ final Object supplier) {
+ if (!(client instanceof Namespace)) {
throw new IllegalArgumentException(
"The client must be instance of Namespace."); //$NON-NLS-1$
}
- if (!(supplierObj instanceof org.eclipse.uml2.uml.Package)) {
+ if (!(supplier instanceof org.eclipse.uml2.uml.Package)) {
throw new IllegalArgumentException(
"The supplier must be instance of Package."); //$NON-NLS-1$
}
RunnableClass run = new RunnableClass() {
public void run() {
PackageImport packageImport = createPackageImport();
- packageImport.setImportedPackage((org.eclipse.uml2.uml.Package) supplierObj);
- packageImport.setImportingNamespace((Namespace) clientObj);
+ packageImport.setImportedPackage((org.eclipse.uml2.uml.Package) supplier);
+ packageImport.setImportingNamespace((Namespace) client);
getParams().add(packageImport);
}
};
Modified: branches/gsoc2007/b00__1/model-euml/src/org/argouml/model/euml/CoreHelperEUMLImpl.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/b00__1/model-euml/src/org/argouml/model/euml/CoreHelperEUMLImpl.java?view=diff&rev=13227&p1=branches/gsoc2007/b00__1/model-euml/src/org/argouml/model/euml/CoreHelperEUMLImpl.java&p2=branches/gsoc2007/b00__1/model-euml/src/org/argouml/model/euml/CoreHelperEUMLImpl.java&r1=13226&r2=13227
==============================================================================
--- branches/gsoc2007/b00__1/model-euml/src/org/argouml/model/euml/CoreHelperEUMLImpl.java (original)
+++ branches/gsoc2007/b00__1/model-euml/src/org/argouml/model/euml/CoreHelperEUMLImpl.java 2007-08-03 13:05:03-0700
@@ -1039,4 +1039,16 @@
((NamedElement) handle).setVisibility((VisibilityKind) visibility);
}
+ public Collection getParents(Object generalizableElement) {
+ throw new NotYetImplementedException();
+ }
+
+ public Object getPackageImport(Object supplier, Object client) {
+ throw new NotYetImplementedException();
+ }
+
+ public Collection getPackageImports(Object client) {
+ throw new NotYetImplementedException();
+ }
+
}
Modified: branches/gsoc2007/b00__1/model-euml/src/org/argouml/model/euml/FacadeEUMLImpl.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/b00__1/model-euml/src/org/argouml/model/euml/FacadeEUMLImpl.java?view=diff&rev=13227&p1=branches/gsoc2007/b00__1/model-euml/src/org/argouml/model/euml/FacadeEUMLImpl.java&p2=branches/gsoc2007/b00__1/model-euml/src/org/argouml/model/euml/FacadeEUMLImpl.java&r1=13226&r2=13227
==============================================================================
--- branches/gsoc2007/b00__1/model-euml/src/org/argouml/model/euml/FacadeEUMLImpl.java (original)
+++ branches/gsoc2007/b00__1/model-euml/src/org/argouml/model/euml/FacadeEUMLImpl.java 2007-08-03 13:05:03-0700
@@ -1594,10 +1594,15 @@
return handle instanceof ActivityPartition;
}
+ @SuppressWarnings("deprecation")
public boolean isAPermission(Object handle) {
return handle instanceof PackageImport;
}
-
+
+ public boolean isAPackageImport(Object handle) {
+ return handle instanceof PackageImport;
+ }
+
@SuppressWarnings("deprecation")
public boolean isAPrimitive(Object handle) {
return isAPrimitiveType(handle);
Modified: branches/gsoc2007/b00__1/model-euml/src/org/argouml/model/euml/MetaTypesEUMLImpl.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/b00__1/model-euml/src/org/argouml/model/euml/MetaTypesEUMLImpl.java?view=diff&rev=13227&p1=branches/gsoc2007/b00__1/model-euml/src/org/argouml/model/euml/MetaTypesEUMLImpl.java&p2=branches/gsoc2007/b00__1/model-euml/src/org/argouml/model/euml/MetaTypesEUMLImpl.java&r1=13226&r2=13227
==============================================================================
--- branches/gsoc2007/b00__1/model-euml/src/org/argouml/model/euml/MetaTypesEUMLImpl.java (original)
+++ branches/gsoc2007/b00__1/model-euml/src/org/argouml/model/euml/MetaTypesEUMLImpl.java 2007-08-03 13:05:03-0700
@@ -384,11 +384,15 @@
return ActivityPartition.class;
}
+ @SuppressWarnings("deprecation")
public Object getPermission() {
- // TODO: double check this - tfm
return PackageImport.class;
}
+ public Object getPackageImport() {
+ return PackageImport.class;
+ }
+
public Object getPseudostate() {
return Pseudostate.class;
}
Modified: branches/gsoc2007/b00__1/model-euml/src/org/argouml/model/euml/UmlFactoryEUMLImpl.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/b00__1/model-euml/src/org/argouml/model/euml/UmlFactoryEUMLImpl.java?view=diff&rev=13227&p1=branches/gsoc2007/b00__1/model-euml/src/org/argouml/model/euml/UmlFactoryEUMLImpl.java&p2=branches/gsoc2007/b00__1/model-euml/src/org/argouml/model/euml/UmlFactoryEUMLImpl.java&r1=13226&r2=13227
==============================================================================
--- branches/gsoc2007/b00__1/model-euml/src/org/argouml/model/euml/UmlFactoryEUMLImpl.java (original)
+++ branches/gsoc2007/b00__1/model-euml/src/org/argouml/model/euml/UmlFactoryEUMLImpl.java 2007-08-03 13:05:03-0700
@@ -191,8 +191,8 @@
fromStyle, toElement, toStyle, (Boolean) unidirectional);
} else if (elementType == metaTypes.getGeneralization()) {
connection = getCore().buildGeneralization(fromElement, toElement);
- } else if (elementType == metaTypes.getPermission()) {
- connection = getCore().buildPermission(fromElement, toElement);
+ } else if (elementType == metaTypes.getPackageImport()) {
+ connection = getCore().buildPackageImport(fromElement, toElement);
} else if (elementType == metaTypes.getUsage()) {
connection = getCore().buildUsage(fromElement, toElement);
} else if (elementType == metaTypes.getGeneralization()) {
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.