svn commit: r17082 - trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/UmlFactoryMDRImpl.java

Author: tfmorris
Date: 2009-04-08 15:52:30-0700
New Revision: 17082

Modified:
   trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/UmlFactoryMDRImpl.java

Log:
Use new buildTemplateParameter.  Add TODO for suspicious code.

Modified: trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/UmlFactoryMDRImpl.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/UmlFactoryMDRImpl.java?view=diff&pathrev=17082&r1=17081&r2=17082
==============================================================================
--- trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/UmlFactoryMDRImpl.java	(original)
+++ trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/UmlFactoryMDRImpl.java	2009-04-08 15:52:30-0700
@@ -1,5 +1,5 @@
 // $Id$
-// Copyright (c) 1996-2008 The Regents of the University of California. All
+// Copyright (c) 1996-2009 The Regents of the University of California. All
 // Rights Reserved. Permission to use, copy, modify, and distribute this
 // software and its documentation without fee, and without a written
 // agreement is hereby granted, provided that the above copyright notice
@@ -589,17 +589,16 @@
             element = this.modelImpl.getUseCasesFactory().
                 buildExtensionPoint(container);            
         } else if (elementType == this.metaTypes.getTemplateParameter()) {
-            TemplateParameter templateParam =
-                getCore().createTemplateParameter();
+            // TODO: the type of the model element used in a type parameter
+            // (ie the formal) needs to match the actual parameter that it
+            // gets replaced with later.  This code is going to restrict that
+            // to always being a Parameter which doesn't seem right, but I
+            // don't have time to debug it right now. - tfm - 20090608
             Parameter param = getCore().createParameter();
             param.setName("T"); // default parameter name
-            templateParam.setParameter(param);
-            if (container instanceof ModelElement) {
-                ModelElement template = (ModelElement) container;
-                templateParam.setTemplate(template);
-                template.getTemplateParameter().add(templateParam);
-            }
-            return templateParam;            
+            element = 
+                modelImpl.getCoreFactory().buildTemplateParameter(container, 
+                        param, null);            
         } else {
             // build all other elements using existing buildNode
             element = buildNode(elementType);

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

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