svn commit: r14830 - branches/work_ocl2_tfmorris/src/argouml-app/src/org/argouml/ocl/OCLUtil.java

Author: tfmorris
Date: 2008-05-28 18:22:35-0700
New Revision: 14830

Modified:
   branches/work_ocl2_tfmorris/src/argouml-app/src/org/argouml/ocl/OCLUtil.java

Log:
Use Model facade instead of JMI directly

Modified: branches/work_ocl2_tfmorris/src/argouml-app/src/org/argouml/ocl/OCLUtil.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/work_ocl2_tfmorris/src/argouml-app/src/org/argouml/ocl/OCLUtil.java?view=diff&rev=14830&p1=branches/work_ocl2_tfmorris/src/argouml-app/src/org/argouml/ocl/OCLUtil.java&p2=branches/work_ocl2_tfmorris/src/argouml-app/src/org/argouml/ocl/OCLUtil.java&r1=14829&r2=14830
==============================================================================
--- branches/work_ocl2_tfmorris/src/argouml-app/src/org/argouml/ocl/OCLUtil.java	(original)
+++ branches/work_ocl2_tfmorris/src/argouml-app/src/org/argouml/ocl/OCLUtil.java	2008-05-28 18:22:35-0700
@@ -32,6 +32,7 @@
  * Helper methods for OCL support.
  *
  * @author Steffen Zschaler
+ * @author Raphael Schmid
  */
 public final class OCLUtil {
 
@@ -76,26 +77,26 @@
 
         // Object selectedObject = TargetManager.getInstance().getTarget();
         Object selectedObject = me;
-        if (selectedObject instanceof org.omg.uml.foundation.core.UmlClass) {
-            packageName = ((org.omg.uml.foundation.core.UmlClass) selectedObject)
-                    .getNamespace().getName();
-            className = ((org.omg.uml.foundation.core.UmlClass) selectedObject)
-                    .getName();
-        }
-        if (selectedObject instanceof org.omg.uml.foundation.core.Feature) {
-            packageName = ((org.omg.uml.foundation.core.Feature) selectedObject)
-                    .getOwner().getNamespace().getName();
-            className = ((org.omg.uml.foundation.core.Feature) selectedObject)
-                    .getOwner().getName();
-            featureName = ((org.omg.uml.foundation.core.Feature) selectedObject)
-                    .getName();
-
-            if (selectedObject instanceof org.omg.uml.foundation.core.BehavioralFeature) {
-                List<org.omg.uml.foundation.core.Parameter> parameters = ((org.omg.uml.foundation.core.BehavioralFeature) selectedObject)
-                        .getParameter();
-                for (org.omg.uml.foundation.core.Parameter p : parameters) {
-                    if (p.getKind() == org.omg.uml.foundation.datatypes.ParameterDirectionKindEnum.PDK_RETURN) {
-                        returnTypeName = p.getType().getName();
+        if (Model.getFacade().isAClass(selectedObject)) {
+            packageName = Model.getFacade().getName(
+                    Model.getFacade().getNamespace(selectedObject));
+            className = Model.getFacade().getName(selectedObject);
+        }
+        if (Model.getFacade().isAFeature(selectedObject)) {
+            packageName = Model.getFacade().getName(
+                    Model.getFacade().getNamespace(
+                            Model.getFacade().getOwner(selectedObject)));
+            className = Model.getFacade().getName(
+                    Model.getFacade().getOwner(selectedObject));
+            featureName = Model.getFacade().getName(selectedObject);
+
+            if (Model.getFacade().isABehavioralFeature(selectedObject)) {
+                List parameters = Model.getFacade().getParametersList(
+                        selectedObject);
+                for (Object p : parameters) {
+                    if (Model.getFacade().hasReturnParameterDirectionKind(p)) {
+                        returnTypeName = Model.getFacade().getName(
+                                Model.getFacade().getType(p));
                         break;
                     }
                 }