Author: tfmorris Date: 2008-05-13 06:48:24-0700 New Revision: 14719 Modified: trunk/src/argouml-app/src/org/argouml/language/java/generator/GeneratorJava.java trunk/src/argouml-app/src/org/argouml/ocl/ArgoFacade.java trunk/src/argouml-app/src/org/argouml/uml/diagram/UmlDiagramRenderer.java
Log: Use hasStereotype() helper method where appropriate Modified: trunk/src/argouml-app/src/org/argouml/language/java/generator/GeneratorJava.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/language/java/generator/GeneratorJava.java?view=diff&rev=14719&p1=trunk/src/argouml-app/src/org/argouml/language/java/generator/GeneratorJava.java&p2=trunk/src/argouml-app/src/org/argouml/language/java/generator/GeneratorJava.java&r1=14718&r2=14719 ============================================================================== --- trunk/src/argouml-app/src/org/argouml/language/java/generator/GeneratorJava.java (original) +++ trunk/src/argouml-app/src/org/argouml/language/java/generator/GeneratorJava.java 2008-05-13 06:48:24-0700 @@ -521,22 +521,15 @@ String nameStr = null; boolean constructor = false; - String name = null; - for (Object o : Model.getFacade().getStereotypes(op)) { - name = Model.getFacade().getName(o); - if ("create".equals(name)) { - break; - } - } - if ("create".equals(name)) { - // constructor + if (Model.getExtensionMechanismsHelper().hasStereotype(op, "create")) { nameStr = generateName(Model.getFacade().getName( Model.getFacade().getOwner(op))); - constructor = true; + constructor = true; } else { nameStr = generateName(Model.getFacade().getName(op)); } + // Each pattern here must be similar to corresponding code piece // Operation code piece doesn't start with '\n' // so the next line is commented. See Issue 1505 Modified: trunk/src/argouml-app/src/org/argouml/ocl/ArgoFacade.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/ocl/ArgoFacade.java?view=diff&rev=14719&p1=trunk/src/argouml-app/src/org/argouml/ocl/ArgoFacade.java&p2=trunk/src/argouml-app/src/org/argouml/ocl/ArgoFacade.java&r1=14718&r2=14719 ============================================================================== --- trunk/src/argouml-app/src/org/argouml/ocl/ArgoFacade.java (original) +++ trunk/src/argouml-app/src/org/argouml/ocl/ArgoFacade.java 2008-05-13 06:48:24-0700 @@ -176,21 +176,12 @@ && (Model.getFacade().getUpper(multiplicity) > 1 || Model.getFacade().getUpper(multiplicity) == -1)) { - Collection c = Model.getFacade().getStereotypes(ae); - Iterator i = c.iterator(); - String stname = ""; - while (i.hasNext()) { - Object o = i.next(); - stname = Model.getFacade().getName(o); - if ("ordered".equals(stname)) { - break; - } - } - if ("ordered".equals(stname)) { - isSequence = true; - } else { - isSet = true; - } + if (Model.getExtensionMechanismsHelper().hasStereotype(ae, + "ordered")) { + isSequence = true; + } else { + isSet = true; + } } } } Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/UmlDiagramRenderer.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/UmlDiagramRenderer.java?view=diff&rev=14719&p1=trunk/src/argouml-app/src/org/argouml/uml/diagram/UmlDiagramRenderer.java&p2=trunk/src/argouml-app/src/org/argouml/uml/diagram/UmlDiagramRenderer.java&r1=14718&r2=14719 ============================================================================== --- trunk/src/argouml-app/src/org/argouml/uml/diagram/UmlDiagramRenderer.java (original) +++ trunk/src/argouml-app/src/org/argouml/uml/diagram/UmlDiagramRenderer.java 2008-05-13 06:48:24-0700 @@ -265,17 +265,8 @@ } else if (Model.getFacade().isAUsage(edge)) { newEdge = new FigUsage(); } else if (Model.getFacade().isADependency(edge)) { - Collection c = Model.getFacade().getStereotypes(edge); - Iterator i = c.iterator(); - String name = ""; - while (i.hasNext()) { - Object o = i.next(); - name = Model.getFacade().getName(o); - if (CoreFactory.REALIZE_STEREOTYPE.equals(name)) { - break; - } - } - if (CoreFactory.REALIZE_STEREOTYPE.equals(name)) { + if (Model.getExtensionMechanismsHelper().hasStereotype(edge, + CoreFactory.REALIZE_STEREOTYPE)) { newEdge = new FigRealization(); } else { newEdge = new FigDependency(); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
