Author: mvw
Date: 2010-11-29 13:37:03-0800
New Revision: 18859
Modified:
trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/FigState.java
trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigEdgeModelElement.java
trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigNodeModelElement.java
trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigSingleLineTextWithNotation.java
Log:
Since my last commits around notation, these statements can go.
The NotationProviders now listen to their own model change events.
Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/FigState.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/FigState.java?view=diff&pathrev=18859&r1=18858&r2=18859
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/FigState.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/FigState.java 2010-11-29 13:37:03-0800
@@ -167,7 +167,6 @@
}
renderingChanged();
- notationProviderBody.updateListener(getOwner(), mee);
damage();
}
}
Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigEdgeModelElement.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigEdgeModelElement.java?view=diff&pathrev=18859&r1=18858&r2=18859
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigEdgeModelElement.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigEdgeModelElement.java 2010-11-29 13:37:03-0800
@@ -939,10 +939,6 @@
if (e instanceof AssociationChangeEvent
|| e instanceof AttributeChangeEvent) {
- if (notationProviderName != null) {
- notationProviderName.updateListener(getOwner(), e);
- updateNameText();
- }
updateListeners(getOwner(), getOwner());
}
Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigNodeModelElement.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigNodeModelElement.java?view=diff&pathrev=18859&r1=18858&r2=18859
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigNodeModelElement.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigNodeModelElement.java 2010-11-29 13:37:03-0800
@@ -1402,9 +1402,6 @@
protected void modelChanged(PropertyChangeEvent event) {
if (event instanceof AssociationChangeEvent
|| event instanceof AttributeChangeEvent) {
- if (notationProviderName != null) {
- notationProviderName.updateListener(getOwner(), event);
- }
// TODO: This brute force approach of updating listeners on each
// and every event, without checking the event type or any other
// information is going to cause lots of InvalidElementExceptions
Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigSingleLineTextWithNotation.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigSingleLineTextWithNotation.java?view=diff&pathrev=18859&r1=18858&r2=18859
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigSingleLineTextWithNotation.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigSingleLineTextWithNotation.java 2010-11-29 13:37:03-0800
@@ -39,7 +39,6 @@
package org.argouml.uml.diagram.ui;
import java.awt.Rectangle;
-import java.beans.PropertyChangeEvent;
import org.argouml.application.events.ArgoEventPump;
import org.argouml.application.events.ArgoEventTypes;
@@ -116,15 +115,7 @@
notationProvider.cleanListener();
super.removeFromDiagram();
}
-
- @Override
- public void propertyChange(PropertyChangeEvent pce) {
- if (notationProvider != null) {
- notationProvider.updateListener(getOwner(), pce);
- }
- super.propertyChange(pce);
- }
-
+
/**
* This is a template method called by the ArgoUML framework as the result
* of a change to a model element. Do not call this method directly
------------------------------------------------------
http://argouml.tigris.org/ds/viewMessage.do?dsForumId=5905&dsMessageId=2686553
To unsubscribe from this discussion, e-mail: [[email protected]].
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.