svn commit: r14339 - trunk/src/argouml-core-diagrams-sequence2/src/org/argouml/uml/diagram/sequence2/ui/FigClassifierRole.java

Author: mvw
Date: 2008-04-13 23:56:34-0700
New Revision: 14339

Modified:
   trunk/src/argouml-core-diagrams-sequence2/src/org/argouml/uml/diagram/sequence2/ui/FigClassifierRole.java

Log:
Cleaning out unnecessary code. Is the original problem now solved, too?

Modified: trunk/src/argouml-core-diagrams-sequence2/src/org/argouml/uml/diagram/sequence2/ui/FigClassifierRole.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-sequence2/src/org/argouml/uml/diagram/sequence2/ui/FigClassifierRole.java?view=diff&rev=14339&p1=trunk/src/argouml-core-diagrams-sequence2/src/org/argouml/uml/diagram/sequence2/ui/FigClassifierRole.java&p2=trunk/src/argouml-core-diagrams-sequence2/src/org/argouml/uml/diagram/sequence2/ui/FigClassifierRole.java&r1=14338&r2=14339
==============================================================================
--- trunk/src/argouml-core-diagrams-sequence2/src/org/argouml/uml/diagram/sequence2/ui/FigClassifierRole.java	(original)
+++ trunk/src/argouml-core-diagrams-sequence2/src/org/argouml/uml/diagram/sequence2/ui/FigClassifierRole.java	2008-04-13 23:56:34-0700
@@ -1,5 +1,5 @@
 // $Id$
-// Copyright (c) 2007 The Regents of the University of California. All
+// Copyright (c) 2007-2008 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
@@ -27,24 +27,17 @@
 import java.awt.Color;
 import java.awt.Point;
 import java.awt.Rectangle;
-import java.beans.PropertyChangeEvent;
-import java.beans.PropertyVetoException;
 import java.util.ArrayList;
 import java.util.List;
 
 import org.apache.log4j.Logger;
-import org.argouml.model.AddAssociationEvent;
-import org.argouml.model.AttributeChangeEvent;
 import org.argouml.model.Model;
-import org.argouml.model.RemoveAssociationEvent;
-import org.argouml.notation.NotationProvider;
 import org.argouml.notation.NotationProviderFactory2;
 import org.argouml.uml.diagram.ui.FigEmptyRect;
 import org.argouml.uml.diagram.ui.FigNodeModelElement;
 import org.tigris.gef.base.Geometry;
 import org.tigris.gef.presentation.FigEdge;
 import org.tigris.gef.presentation.FigRect;
-import org.tigris.gef.presentation.FigText;
 
 /**
  * The Fig that represents a Classifier Role
@@ -59,23 +52,6 @@
         Logger.getLogger(FigClassifierRole.class);
 
     /**
-     * The NotationProvider for the ClassifierRole. <p>
-     * 
-     * The syntax is for UML is:
-     * <pre>
-     * baselist := [base] [, base]*
-     * classifierRole := [name] [/ role] [: baselist]
-     * </pre></p>
-     * 
-     * The <code>name</code> is the Instance name, not used currently.
-     * See ClassifierRoleNotationUml for details.<p>
-     *
-     * This syntax is compatible with the UML 1.4 specification.
-     * 
-     */
-    private NotationProvider notationProvider;
-
-    /**
      * This is an empty rectangle needed to keep the size of the CR.
      */
     private FigEmptyRect emptyFig;
@@ -120,62 +96,24 @@
         setOwner(node);
     }
 
-    /*
-     * @see org.argouml.uml.diagram.ui.FigNodeModelElement#initNotationProviders(java.lang.Object)
-     */
-    protected void initNotationProviders(Object own) {
-        super.initNotationProviders(own);
-        if (Model.getFacade().isAClassifierRole(own)) {
-            notationProvider =
-                NotationProviderFactory2.getInstance().getNotationProvider(
-                    NotationProviderFactory2.TYPE_CLASSIFIERROLE, own);
-        }
-    }
-    
-    /*
-     * @see org.argouml.uml.diagram.ui.FigNodeModelElement#modelChanged(java.beans.PropertyChangeEvent)
-     */
-    protected void modelChanged(final PropertyChangeEvent mee) {
-        super.modelChanged(mee);
-        if (mee instanceof AddAssociationEvent
-                || mee instanceof RemoveAssociationEvent
-                || mee instanceof AttributeChangeEvent) {
-            notationProvider.updateListener(this, getOwner(), mee);
-        }
-    }
-
     /**
-     * Called after text has been edited directly on the screen.<p>
-     *
-     * @param ft  The text that was edited.
-     * @throws PropertyVetoException by the parser
-     * @see org.argouml.uml.diagram.ui.FigNodeModelElement#textEdited(org.tigris.gef.presentation.FigText)
-     */
-    protected void textEdited(FigText ft) throws PropertyVetoException {
-        if (ft == getNameFig()) {
-            notationProvider.parse(getOwner(), ft.getText());
-            ft.setText(notationProvider.toString(getOwner(), null));
-        }
-    }
-
-    /*
-     * @see org.argouml.uml.diagram.ui.FigNodeModelElement#textEditStarted(org.tigris.gef.presentation.FigText)
-     */
-    protected void textEditStarted(FigText ft) {
-        if (ft == getNameFig()) {
-            showHelp(notationProvider.getParsingHelp());
-        }
-    }
-
-    /**
-     * Adjust the fig in the light of some change to the model.<p>
+     * The NotationProvider for the ClassifierRole. <p>
+     * 
+     * The syntax is for UML is:
+     * <pre>
+     * baselist := [base] [, base]*
+     * classifierRole := [name] [/ role] [: baselist]
+     * </pre></p>
+     * 
+     * The <code>name</code> is the Instance name, not used currently.
+     * See ClassifierRoleNotationUml for details.<p>
      *
-     * @see org.argouml.uml.diagram.ui.FigNodeModelElement#updateNameText()
+     * This syntax is compatible with the UML 1.4 specification.
+     * 
      */
-    protected void updateNameText() {
-        if (notationProvider != null) {
-            getNameFig().setText(notationProvider.toString(getOwner(), null));
-        }
+    @Override
+    protected int getNotationProviderType() {
+        return NotationProviderFactory2.TYPE_CLASSIFIERROLE;
     }
 
     protected void setBoundsImpl(final int x, final int y,