svn commit: r16164 - trunk/src/argouml-app/src/org/argouml/profile/internal/ocl/uml14/ModelAccessModelInterpreter.java

Author: tfmorris
Date: 2008-11-23 22:19:33-0800
New Revision: 16164

Modified:
   trunk/src/argouml-app/src/org/argouml/profile/internal/ocl/uml14/ModelAccessModelInterpreter.java

Log:
Remove deprecated usage of ProgrammingDataType method

Modified: trunk/src/argouml-app/src/org/argouml/profile/internal/ocl/uml14/ModelAccessModelInterpreter.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/profile/internal/ocl/uml14/ModelAccessModelInterpreter.java?view=diff&rev=16164&p1=trunk/src/argouml-app/src/org/argouml/profile/internal/ocl/uml14/ModelAccessModelInterpreter.java&p2=trunk/src/argouml-app/src/org/argouml/profile/internal/ocl/uml14/ModelAccessModelInterpreter.java&r1=16163&r2=16164
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/profile/internal/ocl/uml14/ModelAccessModelInterpreter.java	(original)
+++ trunk/src/argouml-app/src/org/argouml/profile/internal/ocl/uml14/ModelAccessModelInterpreter.java	2008-11-23 22:19:33-0800
@@ -404,6 +404,8 @@
         if (Model.getFacade().isAFeature(subject)) {
             if (type.equals(".")) {
                 if (feature.equals("ownerScope")) {
+                    // TODO: This needs to be switched to use isStatic(), but
+                    // what type of value is the caller expecting?
                     return Model.getFacade().getOwnerScope(subject);
                 }
                 if (feature.equals("visibility")) {
@@ -660,13 +662,14 @@
 
         /* 4.5.2.35 ProgrammingLanguageDataType */          
         
-        if (Model.getFacade().isAProgrammingLanguageDataType(subject)) {
-            if (type.equals(".")) {
-                if (feature.equals("expression")) {
-                    return Model.getFacade().getExpression(subject);
-                }
-            }
-        }                
+        // Gone from UML 2.x, so unsupported here
+//        if (Model.getFacade().isAProgrammingLanguageDataType(subject)) {
+//            if (type.equals(".")) {
+//                if (feature.equals("expression")) {
+//                    return Model.getFacade().getExpression(subject);
+//                }
+//            }
+//        }                
 
         /* 4.5.2.37 StructuralFeature */