svn commit: r19440 - trunk/src: argouml-core-model-euml/src/org/argouml/model/euml argouml-core-model-mdr/src/org/argouml/model/mdr argouml-core-model/src/org/argouml/model

Author: bobtarling
Date: 2011-05-16 04:18:40-0700
New Revision: 19440

Modified:
   trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/FacadeEUMLImpl.java
   trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/MetaTypesEUMLImpl.java
   trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/FacadeMDRImpl.java
   trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/MetaTypesMDRImpl.java
   trunk/src/argouml-core-model/src/org/argouml/model/Facade.java
   trunk/src/argouml-core-model/src/org/argouml/model/MetaTypes.java

Log:
Add support for Instance Specification to model interface before adding to class diagram

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&pathrev=19440&r1=19439&r2=19440
==============================================================================
--- 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	2011-05-16 04:18:40-0700
@@ -2115,6 +2115,10 @@
     }
 
     public boolean isAInstance(Object handle) {
+        return false;
+    }
+
+    public boolean isAInstanceSpecification(Object handle) {
         return handle instanceof InstanceSpecification;
     }
 

Modified: trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/MetaTypesEUMLImpl.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/MetaTypesEUMLImpl.java?view=diff&pathrev=19440&r1=19439&r2=19440
==============================================================================
--- trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/MetaTypesEUMLImpl.java	(original)
+++ trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/MetaTypesEUMLImpl.java	2011-05-16 04:18:40-0700
@@ -365,6 +365,10 @@
             "Not a UML2 model element"); //$NON-NLS-1$
     }
 
+    public Object getInstanceSpecification() {
+        return InstanceSpecification.class;
+    }
+
     public Object getInteraction() {
         return Interaction.class;
     }

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&pathrev=19440&r1=19439&r2=19440
==============================================================================
--- 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	2011-05-16 04:18:40-0700
@@ -528,6 +528,10 @@
         return handle instanceof Instance;
     }
 
+    public boolean isAInstanceSpecification(Object handle) {
+        return false;
+    }
+
     public boolean isAInteraction(Object handle) {
         return handle instanceof Interaction;
     }

Modified: trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/MetaTypesMDRImpl.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/MetaTypesMDRImpl.java?view=diff&pathrev=19440&r1=19439&r2=19440
==============================================================================
--- trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/MetaTypesMDRImpl.java	(original)
+++ trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/MetaTypesMDRImpl.java	2011-05-16 04:18:40-0700
@@ -436,6 +436,10 @@
         return Instance.class;
     }
 
+    public Object getInstanceSpecification() {
+        throw new NotImplementedException("Not a UML1.4 element");
+    }
+
     public Object getInterface() {
         return Interface.class;
     }

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&pathrev=19440&r1=19439&r2=19440
==============================================================================
--- trunk/src/argouml-core-model/src/org/argouml/model/Facade.java	(original)
+++ trunk/src/argouml-core-model/src/org/argouml/model/Facade.java	2011-05-16 04:18:40-0700
@@ -731,6 +731,15 @@
     boolean isAInstance(Object handle);
 
     /**
+     * Recognizer for InstanceSpecification.
+     *
+     * @param handle candidate
+     * @return true if handle is a InstanceSpecification
+     * @since UML 2
+     */
+    boolean isAInstanceSpecification(Object handle);
+
+    /**
      * Recognizer for Interaction.
      *
      * @param handle candidate

Modified: trunk/src/argouml-core-model/src/org/argouml/model/MetaTypes.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-model/src/org/argouml/model/MetaTypes.java?view=diff&pathrev=19440&r1=19439&r2=19440
==============================================================================
--- trunk/src/argouml-core-model/src/org/argouml/model/MetaTypes.java	(original)
+++ trunk/src/argouml-core-model/src/org/argouml/model/MetaTypes.java	2011-05-16 04:18:40-0700
@@ -357,6 +357,12 @@
     Object getInstance();
 
     /**
+     * @return Returns the InstanceSpecification.
+     * @since UML 2
+     */
+    Object getInstanceSpecification();
+
+    /**
      * @return Returns the Interface.
      */
     Object getInterface();

------------------------------------------------------
http://argouml.tigris.org/ds/viewMessage.do?dsForumId=5905&dsMessageId=2738190

To unsubscribe from this discussion, e-mail: [[email protected]].