svn commit: r18227 - trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/MetaTypesEUMLImpl.java

Author: tfmorris
Date: 2010-04-08 16:27:52-0700
New Revision: 18227

Modified:
   trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/MetaTypesEUMLImpl.java

Log:
Merge ArgoEclipse fork.  No functional changes. Headers, comments, and annotations.

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=18227&r1=18226&r2=18227
==============================================================================
--- 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	2010-04-08 16:27:52-0700
@@ -1,12 +1,13 @@
-/* $Id$
- *****************************************************************************
- * Copyright (c) 2009 Contributors - see below
+// $Id$
+/*******************************************************************************
+ * Copyright (c) 2007,2010 Tom Morris and other contributors
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
+ *    Tom Morris - initial implementation
  *    thn
  *****************************************************************************
  *
@@ -379,7 +380,7 @@
         String name = clazz.getName();
 
         // The name of the meta type is the class name (after the last .)
-        // and before the next $ or end of class name.
+        // and before the "Impl" or end of class name.
         int startName = name.lastIndexOf('.') + 1;
 
         // Eclipse UML2 implementation classes often start with "UML"
@@ -415,6 +416,8 @@
     public Object getObject() {
         // is used as InstanceSpecification, see UMLDeploymentDiagram
         return org.eclipse.uml2.uml.InstanceSpecification.class;
+        // TODO: what about ObjectNode?
+//        return org.eclipse.uml2.uml.ObjectNode.class;        
     }
 
     public Object getObjectFlowState() {

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

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