svn commit: r12777 - trunk/src_new/org/argouml: cognitive cognitive/ui kernel ui ui/explorer uml uml/diagram uml/diagram/static_structure/ui uml/diagram/ui uml/diagram/use_case uml/ui

[email protected]
Newsgroups gmane.comp.lang.uml.argouml.cvs
Message-ID <[email protected]>
Author: tfmorris
Date: 2007-06-08 00:46:22-0700
New Revision: 12777

Modified:
   trunk/src_new/org/argouml/cognitive/ItemUID.java
   trunk/src_new/org/argouml/cognitive/ToDoItem.java
   trunk/src_new/org/argouml/cognitive/ui/WizDescription.java
   trunk/src_new/org/argouml/kernel/Project.java
   trunk/src_new/org/argouml/ui/StylePanel.java
   trunk/src_new/org/argouml/ui/explorer/ExplorerPopup.java
   trunk/src_new/org/argouml/uml/ChildGenRelated.java
   trunk/src_new/org/argouml/uml/DocumentationManager.java
   trunk/src_new/org/argouml/uml/PredicateFind.java
   trunk/src_new/org/argouml/uml/diagram/ArgoDiagram.java
   trunk/src_new/org/argouml/uml/diagram/UMLMutableGraphSupport.java
   trunk/src_new/org/argouml/uml/diagram/static_structure/ui/FigClass.java
   trunk/src_new/org/argouml/uml/diagram/static_structure/ui/FigDataType.java
   trunk/src_new/org/argouml/uml/diagram/ui/DnDJGraph.java
   trunk/src_new/org/argouml/uml/diagram/ui/FigEdgeModelElement.java
   trunk/src_new/org/argouml/uml/diagram/ui/FigNodeModelElement.java
   trunk/src_new/org/argouml/uml/diagram/use_case/UseCaseDiagramGraphModel.java
   trunk/src_new/org/argouml/uml/ui/UMLListCellRenderer2.java

Log:
Change to isAUMLModelElement from ModelElement in a bunch of places - more review/change needed

Modified: trunk/src_new/org/argouml/cognitive/ItemUID.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/cognitive/ItemUID.java?view=diff&rev=12777&p1=trunk/src_new/org/argouml/cognitive/ItemUID.java&p2=trunk/src_new/org/argouml/cognitive/ItemUID.java&r1=12776&r2=12777
==============================================================================
--- trunk/src_new/org/argouml/cognitive/ItemUID.java	(original)
+++ trunk/src_new/org/argouml/cognitive/ItemUID.java	2007-06-08 00:46:22-0700
@@ -157,7 +157,7 @@
      * @return	The ID of the object, or null.
      */
     protected static String readObjectID(Object obj) {
-        if (Model.getFacade().isAModelElement(obj)) {
+        if (Model.getFacade().isAUMLElement(obj)) {
             return UUIDHelper.getUUID(obj);
         }
 	/*
@@ -226,7 +226,7 @@
      * @return	The new ID of the object, or null.
      */
     protected static String createObjectID(Object obj) {
-	if (Model.getFacade().isAModelElement(obj)) {
+	if (Model.getFacade().isAUMLElement(obj)) {
 	    return null;
 	}
 

Modified: trunk/src_new/org/argouml/cognitive/ToDoItem.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/cognitive/ToDoItem.java?view=diff&rev=12777&p1=trunk/src_new/org/argouml/cognitive/ToDoItem.java&p2=trunk/src_new/org/argouml/cognitive/ToDoItem.java&r1=12776&r2=12777
==============================================================================
--- trunk/src_new/org/argouml/cognitive/ToDoItem.java	(original)
+++ trunk/src_new/org/argouml/cognitive/ToDoItem.java	2007-06-08 00:46:22-0700
@@ -163,15 +163,7 @@
      * @param dsgr the designer
      */
     public ToDoItem(Critic c, Object dm, Designer dsgr) {
-        if (!Model.getFacade().isAModelElement(dm)
-                && !(dm instanceof Fig)
-                && !(dm instanceof Diagram)) {
-            //TODO: The cognitive system should not be aware of any other
-            // system. Find a better way to do this.
-            throw new IllegalArgumentException(
-                    "The offender must be a model element, "
-                    + "a Fig or a Diagram");
-        }
+        checkArgument(dm);
 
         thePoster = c;
         theHeadline = c.getHeadline(dm, dsgr);
@@ -182,6 +174,19 @@
         theWizard = c.makeWizard(this);
     }
 
+    //TODO: The cognitive system should not be aware of any other
+    // system. Find a better way to do this.
+    private void checkArgument(Object dm) {
+        if (!Model.getFacade().isAUMLElement(dm)
+                && !(dm instanceof Fig)
+                && !(dm instanceof Diagram)) {
+
+            throw new IllegalArgumentException(
+                    "The offender must be a model element, "
+                    + "a Fig or a Diagram");
+        }
+    }
+
     /**
      * The constructor.
      *
@@ -231,28 +236,13 @@
                     "A ListSet of offenders must be supplied.");
         }
         Object offender = CollectionUtil.getFirstItemOrNull(offs);
-        if (offender != null
-                && !Model.getFacade().isAModelElement(offender)
-                && !(offender instanceof Fig)
-                && !(offender instanceof Diagram)) {
-            //TODO: The cognitive system should not be aware of any other
-            // system. Find a better way to do this.
-            throw new IllegalArgumentException(
-                    "The first offender must be a model element, "
-                    + "a Fig or a Diagram");
+        if (offender != null) {
+            checkArgument(offender);
         }
 
         if (offs.size() >= 2) {
             offender = offs.elementAt(1);
-            if (!Model.getFacade().isAModelElement(offender)
-                    && !(offender instanceof Fig)
-                    && !(offender instanceof Diagram)) {
-                //TODO: The cognitive system should not be aware of any other
-                // system. Find a better way to do this.
-                throw new IllegalArgumentException(
-                        "The second offender must be a model element, "
-                        + "a Fig or a Diagram");
-            }
+            checkArgument(offender);
         }
     }
 
@@ -343,7 +333,7 @@
         // system. Find a better way to do this. We should not use
         // assert on public methods.
         assert theOffenders.size() <= 0
-        	|| Model.getFacade().isAModelElement(theOffenders.elementAt(0))
+        	|| Model.getFacade().isAUMLElement(theOffenders.elementAt(0))
         	|| theOffenders.elementAt(0) instanceof Fig
         	|| theOffenders.elementAt(0) instanceof Diagram;
         return theOffenders;

Modified: trunk/src_new/org/argouml/cognitive/ui/WizDescription.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/cognitive/ui/WizDescription.java?view=diff&rev=12777&p1=trunk/src_new/org/argouml/cognitive/ui/WizDescription.java&p2=trunk/src_new/org/argouml/cognitive/ui/WizDescription.java&r1=12776&r2=12777
==============================================================================
--- trunk/src_new/org/argouml/cognitive/ui/WizDescription.java	(original)
+++ trunk/src_new/org/argouml/cognitive/ui/WizDescription.java	2007-06-08 00:46:22-0700
@@ -113,7 +113,7 @@
 	    description.setText(message);
 
 	    return;
-	} else if (Model.getFacade().isAModelElement(target)) {
+	} else if (Model.getFacade().isAUMLElement(target)) {
 	    message =
                 MessageFormat.format(
                         Translator.localize("message.item.branch-model"),

Modified: trunk/src_new/org/argouml/kernel/Project.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/kernel/Project.java?view=diff&rev=12777&p1=trunk/src_new/org/argouml/kernel/Project.java&p2=trunk/src_new/org/argouml/kernel/Project.java&r1=12776&r2=12777
==============================================================================
--- trunk/src_new/org/argouml/kernel/Project.java	(original)
+++ trunk/src_new/org/argouml/kernel/Project.java	2007-06-08 00:46:22-0700
@@ -929,7 +929,7 @@
      */
     public int getPresentationCountFor(Object me) {
 
-        if (!Model.getFacade().isAModelElement(me)) {
+        if (!Model.getFacade().isAUMLElement(me)) {
             throw new IllegalArgumentException();
     	}
 

Modified: trunk/src_new/org/argouml/ui/StylePanel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/ui/StylePanel.java?view=diff&rev=12777&p1=trunk/src_new/org/argouml/ui/StylePanel.java&p2=trunk/src_new/org/argouml/ui/StylePanel.java&r1=12776&r2=12777
==============================================================================
--- trunk/src_new/org/argouml/ui/StylePanel.java	(original)
+++ trunk/src_new/org/argouml/ui/StylePanel.java	2007-06-08 00:46:22-0700
@@ -92,7 +92,7 @@
      */
     public void setTarget(Object t) {
 	if (!(t instanceof Fig)) {
-	    if (Model.getFacade().isAModelElement(t)) {
+	    if (Model.getFacade().isAUMLElement(t)) {
 		Project p =
                     ProjectManager.getManager()
                         .getCurrentProject();

Modified: trunk/src_new/org/argouml/ui/explorer/ExplorerPopup.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/ui/explorer/ExplorerPopup.java?view=diff&rev=12777&p1=trunk/src_new/org/argouml/ui/explorer/ExplorerPopup.java&p2=trunk/src_new/org/argouml/ui/explorer/ExplorerPopup.java&r1=12776&r2=12777
==============================================================================
--- trunk/src_new/org/argouml/ui/explorer/ExplorerPopup.java	(original)
+++ trunk/src_new/org/argouml/ui/explorer/ExplorerPopup.java	2007-06-08 00:46:22-0700
@@ -99,7 +99,7 @@
         boolean modelElementsOnly = true;
         for (Iterator it = TargetManager.getInstance().getTargets().iterator();
                 it.hasNext() && modelElementsOnly; ) {
-            if (!Model.getFacade().isAModelElement(it.next())) {
+            if (!Model.getFacade().isAUMLElement(it.next())) {
         	modelElementsOnly = false;
             }
         }
@@ -137,7 +137,7 @@
 
         final Object projectModel = currentProject.getModel();
         final boolean modelElementSelected =
-            Model.getFacade().isAModelElement(selectedItem);
+            Model.getFacade().isAUMLElement(selectedItem);
 
         if (modelElementSelected) {
             final boolean nAryAssociationSelected =

Modified: trunk/src_new/org/argouml/uml/ChildGenRelated.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ChildGenRelated.java?view=diff&rev=12777&p1=trunk/src_new/org/argouml/uml/ChildGenRelated.java&p2=trunk/src_new/org/argouml/uml/ChildGenRelated.java&r1=12776&r2=12777
==============================================================================
--- trunk/src_new/org/argouml/uml/ChildGenRelated.java	(original)
+++ trunk/src_new/org/argouml/uml/ChildGenRelated.java	2007-06-08 00:46:22-0700
@@ -78,7 +78,7 @@
 
         // For all other model elements, return any elements
         // associated in any way
-        if (Model.getFacade().isAModelElement(o)) {
+        if (Model.getFacade().isAUMLElement(o)) {
             return Collections.enumeration(Model.getFacade()
                     .getModelElementAssociated(o));
         }

Modified: trunk/src_new/org/argouml/uml/DocumentationManager.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/DocumentationManager.java?view=diff&rev=12777&p1=trunk/src_new/org/argouml/uml/DocumentationManager.java&p2=trunk/src_new/org/argouml/uml/DocumentationManager.java&r1=12776&r2=12777
==============================================================================
--- trunk/src_new/org/argouml/uml/DocumentationManager.java	(original)
+++ trunk/src_new/org/argouml/uml/DocumentationManager.java	2007-06-08 00:46:22-0700
@@ -230,7 +230,7 @@
 	    result.append(header).append(LINE_SEPARATOR);
 	}
 
-	if (Model.getFacade().isAModelElement(o)) {
+	if (Model.getFacade().isAUMLElement(o)) {
 	    Collection comments = Model.getFacade().getComments(o);
 	    if (!comments.isEmpty()) {
 		int nlcount = 2;

Modified: trunk/src_new/org/argouml/uml/PredicateFind.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/PredicateFind.java?view=diff&rev=12777&p1=trunk/src_new/org/argouml/uml/PredicateFind.java&p2=trunk/src_new/org/argouml/uml/PredicateFind.java&r1=12776&r2=12777
==============================================================================
--- trunk/src_new/org/argouml/uml/PredicateFind.java	(original)
+++ trunk/src_new/org/argouml/uml/PredicateFind.java	2007-06-08 00:46:22-0700
@@ -90,7 +90,7 @@
      * @see org.tigris.gef.util.Predicate#predicate(java.lang.Object)
      */
     public boolean predicate(Object o) {
-	if (!(Model.getFacade().isAModelElement(o))) {
+	if (!(Model.getFacade().isAUMLElement(o))) {
             return false;
         }
 	Object me = o;

Modified: trunk/src_new/org/argouml/uml/diagram/ArgoDiagram.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/ArgoDiagram.java?view=diff&rev=12777&p1=trunk/src_new/org/argouml/uml/diagram/ArgoDiagram.java&p2=trunk/src_new/org/argouml/uml/diagram/ArgoDiagram.java&r1=12776&r2=12777
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/ArgoDiagram.java	(original)
+++ trunk/src_new/org/argouml/uml/diagram/ArgoDiagram.java	2007-06-08 00:46:22-0700
@@ -147,7 +147,7 @@
      */
     public Fig getContainingFig(Object obj) {
         Fig fig = super.presentationFor(obj);
-        if (fig == null && Model.getFacade().isAModelElement(obj)) {
+        if (fig == null && Model.getFacade().isAUMLElement(obj)) {
 	    // maybe we have a modelelement that is part of some other
             // fig
             if (Model.getFacade().isAOperation(obj)
@@ -352,7 +352,7 @@
             // The fix
             f.removeFromDiagram();
         } else if ((f instanceof FigNode || f instanceof FigEdge)
-                &&  Model.getFacade().isAModelElement(f.getOwner())
+                &&  Model.getFacade().isAUMLElement(f.getOwner())
                 &&  Model.getUmlFactory().isRemoved(f.getOwner())) {
             if (figDescription == null) {
                 figDescription = figDescription(f);

Modified: trunk/src_new/org/argouml/uml/diagram/UMLMutableGraphSupport.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/UMLMutableGraphSupport.java?view=diff&rev=12777&p1=trunk/src_new/org/argouml/uml/diagram/UMLMutableGraphSupport.java&p2=trunk/src_new/org/argouml/uml/diagram/UMLMutableGraphSupport.java&r1=12776&r2=12777
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/UMLMutableGraphSupport.java	(original)
+++ trunk/src_new/org/argouml/uml/diagram/UMLMutableGraphSupport.java	2007-06-08 00:46:22-0700
@@ -393,6 +393,7 @@
         if (Model.getFacade().isAComment(node)) {
             cmnt.addAll(Model.getFacade().getAnnotatedElements(node));
         }
+        // TODO: Comments are on Element in UML 2.x
         if (Model.getFacade().isAModelElement(node)) {
             cmnt.addAll(Model.getFacade().getComments(node));
         }

Modified: trunk/src_new/org/argouml/uml/diagram/static_structure/ui/FigClass.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/static_structure/ui/FigClass.java?view=diff&rev=12777&p1=trunk/src_new/org/argouml/uml/diagram/static_structure/ui/FigClass.java&p2=trunk/src_new/org/argouml/uml/diagram/static_structure/ui/FigClass.java&r1=12776&r2=12777
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/static_structure/ui/FigClass.java	(original)
+++ trunk/src_new/org/argouml/uml/diagram/static_structure/ui/FigClass.java	2007-06-08 00:46:22-0700
@@ -548,7 +548,7 @@
                 && !Model.getFacade().isAInstance(encloser.getOwner()))) {
             super.setEnclosingFig(encloser);
         }
-        if (!(Model.getFacade().isAModelElement(getOwner()))) {
+        if (!(Model.getFacade().isAUMLElement(getOwner()))) {
             return;
         }
         if (encloser != null

Modified: trunk/src_new/org/argouml/uml/diagram/static_structure/ui/FigDataType.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/static_structure/ui/FigDataType.java?view=diff&rev=12777&p1=trunk/src_new/org/argouml/uml/diagram/static_structure/ui/FigDataType.java&p2=trunk/src_new/org/argouml/uml/diagram/static_structure/ui/FigDataType.java&r1=12776&r2=12777
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/static_structure/ui/FigDataType.java	(original)
+++ trunk/src_new/org/argouml/uml/diagram/static_structure/ui/FigDataType.java	2007-06-08 00:46:22-0700
@@ -218,7 +218,7 @@
                 && !Model.getFacade().isAInstance(encloser.getOwner()))) {
             super.setEnclosingFig(encloser);
         }
-        if (!(Model.getFacade().isAModelElement(getOwner()))) {
+        if (!(Model.getFacade().isAUMLElement(getOwner()))) {
             return;
         }
         /* If this fig is not visible, do not adapt the UML model!

Modified: trunk/src_new/org/argouml/uml/diagram/ui/DnDJGraph.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/ui/DnDJGraph.java?view=diff&rev=12777&p1=trunk/src_new/org/argouml/uml/diagram/ui/DnDJGraph.java&p2=trunk/src_new/org/argouml/uml/diagram/ui/DnDJGraph.java&r1=12776&r2=12777
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/ui/DnDJGraph.java	(original)
+++ trunk/src_new/org/argouml/uml/diagram/ui/DnDJGraph.java	2007-06-08 00:46:22-0700
@@ -197,7 +197,7 @@
                         new AddExistingNodeCommand(me, dropTargetDropEvent,
                                 count++);
                     cmd.execute();
-                } else if (Model.getFacade().isAModelElement(me)) {
+                } else if (Model.getFacade().isAUMLElement(me)) {
                     if (gm.canAddEdge(me)) {
                         gm.addEdge(me);
                         // TODO: An AssociationClass should be possible to add

Modified: trunk/src_new/org/argouml/uml/diagram/ui/FigEdgeModelElement.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/ui/FigEdgeModelElement.java?view=diff&rev=12777&p1=trunk/src_new/org/argouml/uml/diagram/ui/FigEdgeModelElement.java&p2=trunk/src_new/org/argouml/uml/diagram/ui/FigEdgeModelElement.java&r1=12776&r2=12777
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/ui/FigEdgeModelElement.java	(original)
+++ trunk/src_new/org/argouml/uml/diagram/ui/FigEdgeModelElement.java	2007-06-08 00:46:22-0700
@@ -568,7 +568,7 @@
             super.propertyChange(pve);
         }
 
-        if (Model.getFacade().isAModelElement(src) 
+        if (Model.getFacade().isAUMLElement(src) 
                 && getOwner() != null
                 && !Model.getUmlFactory().isRemoved(getOwner())) {
             /* If the source of the event is an UML object,
@@ -859,7 +859,7 @@
             throw new IllegalStateException(
                     "The owner cannot be changed once set");
         }
-        if (!Model.getFacade().isAModelElement(owner)) {
+        if (!Model.getFacade().isAUMLElement(owner)) {
             throw new IllegalArgumentException(
                     "The owner must be a model element - got a "
                     + owner.getClass().getName());
@@ -882,6 +882,7 @@
         if (notationProviderName != null) {
             notationProviderName.cleanListener(this, own);
         }
+        // TODO: Should this be looking for a NamedElement? - tfm
         if (Model.getFacade().isAModelElement(own)) {
             notationProviderName =
                 NotationProviderFactory2.getInstance().getNotationProvider(

Modified: trunk/src_new/org/argouml/uml/diagram/ui/FigNodeModelElement.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/ui/FigNodeModelElement.java?view=diff&rev=12777&p1=trunk/src_new/org/argouml/uml/diagram/ui/FigNodeModelElement.java&p2=trunk/src_new/org/argouml/uml/diagram/ui/FigNodeModelElement.java&r1=12776&r2=12777
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/ui/FigNodeModelElement.java	(original)
+++ trunk/src_new/org/argouml/uml/diagram/ui/FigNodeModelElement.java	2007-06-08 00:46:22-0700
@@ -609,7 +609,7 @@
         Object owner = getOwner();
 
         assert Model.getFacade().isAComponent(component);
-        assert Model.getFacade().isAModelElement(owner);
+        assert Model.getFacade().isAUMLElement(owner);
 
         Collection er1 = Model.getFacade().getElementResidences(owner);
         Collection er2 = Model.getFacade().getResidentElements(component);
@@ -885,7 +885,7 @@
         } else {
             super.propertyChange(pve);
         }
-        if (Model.getFacade().isAModelElement(src)) {
+        if (Model.getFacade().isAUMLElement(src)) {
             /* If the source of the event is an UML object,
              * e.g. the owner of this Fig (but not always only the owner
              * is shown, e.g. for a class, also its attributes are shown),
@@ -1192,7 +1192,7 @@
             throw new IllegalStateException(
                     "The owner cannot be changed once set");
         }
-        if (!Model.getFacade().isAModelElement(owner)) {
+        if (!Model.getFacade().isAUMLElement(owner)) {
             throw new IllegalArgumentException(
                     "The owner must be a model element - got a "
                     + owner.getClass().getName());
@@ -1215,7 +1215,7 @@
         if (notationProviderName != null) {
             notationProviderName.cleanListener(this, own);
         }
-        if (Model.getFacade().isAModelElement(own)) {
+        if (Model.getFacade().isAUMLElement(own)) {
             notationProviderName =
                 NotationProviderFactory2.getInstance().getNotationProvider(
                         getNotationProviderType(), own, this);

Modified: trunk/src_new/org/argouml/uml/diagram/use_case/UseCaseDiagramGraphModel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/use_case/UseCaseDiagramGraphModel.java?view=diff&rev=12777&p1=trunk/src_new/org/argouml/uml/diagram/use_case/UseCaseDiagramGraphModel.java&p2=trunk/src_new/org/argouml/uml/diagram/use_case/UseCaseDiagramGraphModel.java&r1=12776&r2=12777
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/use_case/UseCaseDiagramGraphModel.java	(original)
+++ trunk/src_new/org/argouml/uml/diagram/use_case/UseCaseDiagramGraphModel.java	2007-06-08 00:46:22-0700
@@ -356,7 +356,7 @@
 
         getNodes().add(node);
 
-        if (Model.getFacade().isAModelElement(node)
+        if (Model.getFacade().isAUMLElement(node)
                 && Model.getFacade().getNamespace(node) == null) {
             Model.getCoreHelper().addOwnedElement(getHomeModel(), node);
         }
@@ -406,7 +406,7 @@
         getEdges().add(edge);
 
         // TODO: assumes public
-        if (Model.getFacade().isAModelElement(edge)
+        if (Model.getFacade().isAUMLElement(edge)
                 && Model.getFacade().getNamespace(edge) == null) {
             Model.getCoreHelper().addOwnedElement(getHomeModel(), edge);
         }
@@ -510,7 +510,7 @@
         // Dependencies for model elements. Iterate over client and suppliers
         // together.
 
-        if (Model.getFacade().isAModelElement(node)) {
+        if (Model.getFacade().isAUMLElement(node)) {
             Vector specs =
                 new Vector(Model.getFacade().getClientDependencies(node));
 

Modified: trunk/src_new/org/argouml/uml/ui/UMLListCellRenderer2.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/UMLListCellRenderer2.java?view=diff&rev=12777&p1=trunk/src_new/org/argouml/uml/ui/UMLListCellRenderer2.java&p2=trunk/src_new/org/argouml/uml/ui/UMLListCellRenderer2.java&r1=12776&r2=12777
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/UMLListCellRenderer2.java	(original)
+++ trunk/src_new/org/argouml/uml/ui/UMLListCellRenderer2.java	2007-06-08 00:46:22-0700
@@ -98,8 +98,7 @@
         // Leave logging commented out by default for efficiency
 //        LOG.debug("determine rendering for: " + value);
 //        LOG.debug("show icon: " + showIcon);
-        if (Model.getFacade().isAModelElement(value)
-                || Model.getFacade().isAMultiplicity(value)) {
+        if (Model.getFacade().isAUMLElement(value)) {
 
 //            LOG.debug("is a Base or Multiplicity");
             String text = makeText(value);
@@ -171,7 +170,7 @@
             }
             return name;
         }
-        if (Model.getFacade().isAModelElement(value)) {
+        if (Model.getFacade().isAUMLElement(value)) {
             try {
                 name = getName(value);
                 if (Model.getFacade().isAStereotype(value)) {
@@ -232,7 +231,7 @@
     }
 
     private String makeTypeName(Object elem) {
-        if (Model.getFacade().isAModelElement(elem)) {
+        if (Model.getFacade().isAUMLElement(elem)) {
             return Model.getFacade().getUMLClassName(elem);
         }
         return null;
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.