Revision: 4030
Author: [email protected]
Date: Tue Dec 7 14:09:21 2010
Log: Corrected listeners that were waiting on events for bounds to now look
for topLeftCorner or lengths as appropriate. Also removed the
isLocationChange method from PlayPenComponent as it became a complicated
method of returning true.
http://code.google.com/p/power-architect/source/detail?r=4030
Modified:
/trunk/regress/ca/sqlpower/architect/swingui/PlayPenComponentEventCounter.java
/trunk/regress/ca/sqlpower/architect/swingui/TestTablePane.java
/trunk/regress/ca/sqlpower/architect/undo/TestArchitectUndoManager.java
/trunk/src/main/java/ca/sqlpower/architect/swingui/ArchitectSwingSessionImpl.java
/trunk/src/main/java/ca/sqlpower/architect/swingui/PlayPenComponent.java
/trunk/src/main/java/ca/sqlpower/architect/swingui/PlayPenComponentLocationEdit.java
/trunk/src/main/java/ca/sqlpower/architect/swingui/PlayPenContentPane.java
/trunk/src/main/java/ca/sqlpower/architect/swingui/olap/OLAPPlayPenFactory.java
/trunk/src/main/java/ca/sqlpower/architect/swingui/olap/UsageComponentUI.java
=======================================
---
/trunk/regress/ca/sqlpower/architect/swingui/PlayPenComponentEventCounter.java
Wed Dec 1 09:21:10 2010
+++
/trunk/regress/ca/sqlpower/architect/swingui/PlayPenComponentEventCounter.java
Tue Dec 7 14:09:21 2010
@@ -65,7 +65,7 @@
conPointsMoved++;
} else if (evt.getPropertyName().equals("lengths")) {
resized++;
- } else if (evt.getPropertyName().equals("topLeftCorner") &&
PlayPenComponent.isLocationChange(evt)) {
+ } else if (evt.getPropertyName().equals("topLeftCorner")) {
moved++;
}
}
=======================================
--- /trunk/regress/ca/sqlpower/architect/swingui/TestTablePane.java Wed
Dec 1 09:21:10 2010
+++ /trunk/regress/ca/sqlpower/architect/swingui/TestTablePane.java Tue
Dec 7 14:09:21 2010
@@ -366,7 +366,7 @@
final PlayPenComponentEventCounter eventCounter = new
PlayPenComponentEventCounter();
tp.addSPListener(new AbstractSPListener() {
public void propertyChanged(PropertyChangeEvent evt) {
- if (evt.getPropertyName().equals("topLeftCorner") &&
PlayPenComponent.isLocationChange(evt)) {
+ if (evt.getPropertyName().equals("topLeftCorner")) {
eventCounter.propertyChange(evt);
}
}
=======================================
--- /trunk/regress/ca/sqlpower/architect/undo/TestArchitectUndoManager.java
Wed Dec 1 09:19:39 2010
+++ /trunk/regress/ca/sqlpower/architect/undo/TestArchitectUndoManager.java
Tue Dec 7 14:09:21 2010
@@ -234,7 +234,7 @@
TestPlayPenComp comp = new TestPlayPenComp(new
PlayPenContentPane(new SQLDatabase()));
comp.addSPListener(new AbstractSPListener() {
public void propertyChanged(PropertyChangeEvent evt) {
- if (evt.getPropertyName().equals("topLeftCorner") &&
PlayPenComponent.isLocationChange(evt)) {
+ if (evt.getPropertyName().equals("topLeftCorner")) {
l.propertyChange(evt);
}
}
@@ -330,7 +330,7 @@
final PropertyChangeListener l = undoManager.getEventAdapter();
pp.getContentPane().addComponentPropertyListener(new
AbstractSPListener() {
public void propertyChanged(PropertyChangeEvent evt) {
- if (evt.getPropertyName().equals("topLeftCorner") &&
PlayPenComponent.isLocationChange(evt)) {
+ if (evt.getPropertyName().equals("topLeftCorner")) {
l.propertyChange(evt);
}
}
@@ -495,7 +495,7 @@
final PropertyChangeListener l = undoManager.getEventAdapter();
pp.getContentPane().addComponentPropertyListener(new
AbstractSPListener() {
public void propertyChanged(PropertyChangeEvent evt) {
- if (evt.getPropertyName().equals("bounds") &&
PlayPenComponent.isLocationChange(evt) ||
+ if (evt.getPropertyName().equals("topLeftCorner") ||
evt.getPropertyName().equals("connectionPoints")) {
l.propertyChange(evt);
}
=======================================
---
/trunk/src/main/java/ca/sqlpower/architect/swingui/ArchitectSwingSessionImpl.java
Tue Dec 7 13:31:30 2010
+++
/trunk/src/main/java/ca/sqlpower/architect/swingui/ArchitectSwingSessionImpl.java
Tue Dec 7 14:09:21 2010
@@ -399,7 +399,8 @@
playPen.getContentPane().addComponentPropertyListener(
new String[] {
- "bounds",
+ "topLeftCorner",
+ "lengths",
"pkConnection",
"fkConnection",
"backgroundColor",
=======================================
---
/trunk/src/main/java/ca/sqlpower/architect/swingui/PlayPenComponent.java
Wed Dec 1 09:21:10 2010
+++
/trunk/src/main/java/ca/sqlpower/architect/swingui/PlayPenComponent.java
Tue Dec 7 14:09:21 2010
@@ -29,7 +29,6 @@
import java.awt.event.MouseEvent;
import java.awt.event.MouseMotionListener;
import java.awt.font.FontRenderContext;
-import java.beans.PropertyChangeEvent;
import java.util.Collections;
import java.util.Iterator;
import java.util.LinkedList;
@@ -332,13 +331,6 @@
return p;
}
- @NonBound
- public static boolean isLocationChange(PropertyChangeEvent evt) {
- Point oldVal = (Point) evt.getOldValue();
- Point newVal = (Point) evt.getNewValue();
- return (oldVal.x != newVal.x || oldVal.y != newVal.y);
- }
-
/**
* Forwards to {...@link #repaint(Rectangle)}.
*/
=======================================
---
/trunk/src/main/java/ca/sqlpower/architect/swingui/PlayPenComponentLocationEdit.java
Tue Apr 6 14:44:35 2010
+++
/trunk/src/main/java/ca/sqlpower/architect/swingui/PlayPenComponentLocationEdit.java
Tue Dec 7 14:09:21 2010
@@ -58,9 +58,8 @@
PropertyChangeEvent evt = new PropertyChangeEvent(
pce.getSource(), pce.getPropertyName(),
pce.getOldValue(), pce.getNewValue());
- if (pce.getPropertyName().equals("bounds")
- && pce.getSource() instanceof PlayPenComponent
- && PlayPenComponent.isLocationChange(evt)) {
+ if (pce.getPropertyName().equals("topLeftCorner")
+ && pce.getSource() instanceof PlayPenComponent) {
PlayPenComponent ppc = (PlayPenComponent) pce.getSource();
if (!initialBounds.containsKey(pce.getSource())) {
initialBounds.put(ppc, new Rectangle((Rectangle)
pce.getOldValue()));
=======================================
---
/trunk/src/main/java/ca/sqlpower/architect/swingui/PlayPenContentPane.java
Wed Dec 1 09:08:22 2010
+++
/trunk/src/main/java/ca/sqlpower/architect/swingui/PlayPenContentPane.java
Tue Dec 7 14:09:21 2010
@@ -114,7 +114,8 @@
@Override
public void propertyChanged(PropertyChangeEvent evt) {
- if (evt.getPropertyName().equals("bounds") && playPen != null)
{
+ if ((evt.getPropertyName().equals("topLeftCorner") ||
+ evt.getPropertyName().equals("lengths")) && playPen !=
null) {
playPen.revalidate();
}
}
=======================================
---
/trunk/src/main/java/ca/sqlpower/architect/swingui/olap/OLAPPlayPenFactory.java
Thu May 27 08:31:55 2010
+++
/trunk/src/main/java/ca/sqlpower/architect/swingui/olap/OLAPPlayPenFactory.java
Tue Dec 7 14:09:21 2010
@@ -317,7 +317,7 @@
}
public void propertyChanged(PropertyChangeEvent e) {
- if (e.getPropertyName().equals("bounds") &&
PlayPenComponent.isLocationChange(e)) {
+ if (e.getPropertyName().equals("topLeftCorner")) {
// this edit will be absorbed by our
PlayPenComponentLocationEdit
PropertyChangeEdit edit = new PropertyChangeEdit(e);
undoManager.addEdit(edit);
=======================================
---
/trunk/src/main/java/ca/sqlpower/architect/swingui/olap/UsageComponentUI.java
Fri Jun 11 09:19:49 2010
+++
/trunk/src/main/java/ca/sqlpower/architect/swingui/olap/UsageComponentUI.java
Tue Dec 7 14:09:21 2010
@@ -62,7 +62,8 @@
private SPListener componentEventHandler = new AbstractSPListener() {
public void propertyChanged(PropertyChangeEvent evt) {
- if ("bounds".equals(evt.getPropertyName()) &&
evt.getSource() != c) {
+ if (("topLeftCorner".equals(evt.getPropertyName()) ||
+ "lengths".equals(evt.getPropertyName())) &&
evt.getSource() != c) {
revalidate();
c.repaint();
}
