svn commit: r16430 - trunk/src/argouml-app/src/org/argouml/notation/providers/uml/AssociationNameNotationUml.java

Author: tfmorris
Date: 2008-12-23 11:16:14-0800
New Revision: 16430

Modified:
   trunk/src/argouml-app/src/org/argouml/notation/providers/uml/AssociationNameNotationUml.java

Log:
Remove deprecated method usage 

Modified: trunk/src/argouml-app/src/org/argouml/notation/providers/uml/AssociationNameNotationUml.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/notation/providers/uml/AssociationNameNotationUml.java?view=diff&pathrev=16430&r1=16429&r2=16430
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/notation/providers/uml/AssociationNameNotationUml.java	(original)
+++ trunk/src/argouml-app/src/org/argouml/notation/providers/uml/AssociationNameNotationUml.java	2008-12-23 11:16:14-0800
@@ -87,22 +87,26 @@
         return toString(modelElement, settings.isShowAssociationNames(),
                 settings.isFullyHandleStereotypes(),
                 settings.isShowPaths(),
-                settings.isShowVisibilities());
+                settings.isShowVisibilities(),
+                settings.isUseGuillemets());
     }
     
     /*
      * @see org.argouml.notation.providers.NotationProvider#toString(java.lang.Object, java.util.Map)
      */
+    @SuppressWarnings("deprecation")
+    @Deprecated
     public String toString(Object modelElement, Map args) {
         return toString(modelElement, (Boolean) args.get("showAssociationName"),
                 isValue("fullyHandleStereotypes", args),
                 isValue("pathVisible", args),
-                isValue("visibilityVisible", args));
+                isValue("visibilityVisible", args),
+                isValue("useGuillemets", args));
     }
 
     private String toString(Object modelElement, Boolean showAssociationName,
             boolean fullyHandleStereotypes, boolean showPath, 
-            boolean showVisibility) {
+            boolean showVisibility, boolean useGuillemets) {
 
         if (showAssociationName == Boolean.FALSE) {
             return "";
@@ -111,7 +115,8 @@
         String name = Model.getFacade().getName(modelElement);
         StringBuffer sb = new StringBuffer("");
         if (fullyHandleStereotypes) {
-            sb.append(generateStereotypes(modelElement));
+            sb.append(NotationUtilityUml.generateStereotype(modelElement, 
+                    useGuillemets));
         }
         if (showVisibility) {
             sb.append(NotationUtilityUml.generateVisibility2(modelElement));
@@ -125,13 +130,5 @@
         }
         return sb.toString();
     }
-    
-    /**
-     * @param modelElement the UML element to generate for
-     * @return a string which represents the stereotypes
-     */
-    protected static String generateStereotypes(Object modelElement) {
-        return NotationUtilityUml.generateStereotype(modelElement);
-    }
 
 }

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

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