Revision: 4055
Author: [email protected]
Date: Fri Aug 19 08:36:52 2011
Log: Applied changes after the following changes in the SQLPower
Library:
- Refactored SQLObjectUndoManager to SPObjectUndoManager &
SQLObjectChildEdit to SPObjectChildEdit
- Moved all the classes in src/main/java/ca/sqlpower/sqlobject/undo to
src/main/java/ca/sqlpower/object/undo.
- Moved all the classes in src/test/java/ca/sqlpower/sqlobject/undo to
src/test/java/sqlpower/object/undo.
http://code.google.com/p/power-architect/source/detail?r=4055
Modified:
/trunk/regress/ca/sqlpower/architect/undo/TestArchitectUndoManager.java
/trunk/src/main/java/ca/sqlpower/architect/olap/undo/OLAPUndoManager.java
/trunk/src/main/java/ca/sqlpower/architect/swingui/PlayPen.java
/trunk/src/main/java/ca/sqlpower/architect/swingui/PlayPenComponentLocationEdit.java
/trunk/src/main/java/ca/sqlpower/architect/swingui/action/RedoAction.java
/trunk/src/main/java/ca/sqlpower/architect/swingui/action/UndoAction.java
/trunk/src/main/java/ca/sqlpower/architect/swingui/olap/OLAPPlayPenFactory.java
/trunk/src/main/java/ca/sqlpower/architect/undo/ArchitectUndoManager.java
=======================================
--- /trunk/regress/ca/sqlpower/architect/undo/TestArchitectUndoManager.java
Tue Dec 7 14:09:21 2010
+++ /trunk/regress/ca/sqlpower/architect/undo/TestArchitectUndoManager.java
Fri Aug 19 08:36:52 2011
@@ -48,14 +48,14 @@
import ca.sqlpower.object.AbstractSPListener;
import ca.sqlpower.object.SPListener;
import ca.sqlpower.object.SPObject;
+import ca.sqlpower.object.undo.PropertyChangeEdit;
+import
ca.sqlpower.object.undo.ArchitectPropertyChangeUndoableEditTest.TestSQLObject;
import ca.sqlpower.sqlobject.SQLColumn;
import ca.sqlpower.sqlobject.SQLDatabase;
import ca.sqlpower.sqlobject.SQLObjectException;
import ca.sqlpower.sqlobject.SQLObjectRoot;
import ca.sqlpower.sqlobject.SQLRelationship;
import ca.sqlpower.sqlobject.SQLTable;
-import ca.sqlpower.sqlobject.undo.PropertyChangeEdit;
-import
ca.sqlpower.sqlobject.undo.ArchitectPropertyChangeUndoableEditTest.TestSQLObject;
import ca.sqlpower.util.TransactionEvent;
public class TestArchitectUndoManager extends TestCase {
@@ -382,7 +382,7 @@
StateChangeTestListner listener = new StateChangeTestListner();
manager.addChangeListener(listener);
- ArchitectUndoManager.SQLObjectUndoableEventAdapter adapter =
manager.getEventAdapter();
+ ArchitectUndoManager.SPObjectUndoableEventAdapter adapter =
manager.getEventAdapter();
assertTrue(adapter.canUndoOrRedo());
adapter.transactionStarted(TransactionEvent.createStartTransactionEvent(null, "Test"));
=======================================
---
/trunk/src/main/java/ca/sqlpower/architect/olap/undo/OLAPUndoManager.java
Fri Mar 12 08:02:18 2010
+++
/trunk/src/main/java/ca/sqlpower/architect/olap/undo/OLAPUndoManager.java
Fri Aug 19 08:36:52 2011
@@ -40,8 +40,8 @@
import ca.sqlpower.architect.olap.OLAPUtil;
import ca.sqlpower.object.SPChildEvent;
import ca.sqlpower.object.SPListener;
-import ca.sqlpower.sqlobject.undo.NotifyingUndoManager;
-import ca.sqlpower.sqlobject.undo.PropertyChangeEdit;
+import ca.sqlpower.object.undo.NotifyingUndoManager;
+import ca.sqlpower.object.undo.PropertyChangeEdit;
import ca.sqlpower.util.TransactionEvent;
/**
=======================================
--- /trunk/src/main/java/ca/sqlpower/architect/swingui/PlayPen.java Tue Dec
14 08:42:46 2010
+++ /trunk/src/main/java/ca/sqlpower/architect/swingui/PlayPen.java Fri Aug
19 08:36:52 2011
@@ -128,6 +128,7 @@
import ca.sqlpower.object.SPChildEvent;
import ca.sqlpower.object.SPListener;
import ca.sqlpower.object.SPObject;
+import ca.sqlpower.object.undo.CompoundEventListener;
import ca.sqlpower.sql.JDBCDataSource;
import ca.sqlpower.sqlobject.SQLCatalog;
import ca.sqlpower.sqlobject.SQLColumn;
@@ -142,7 +143,6 @@
import ca.sqlpower.sqlobject.SQLTable;
import ca.sqlpower.sqlobject.SQLTable.TransferStyles;
import ca.sqlpower.sqlobject.SQLTypePhysicalPropertiesProvider;
-import ca.sqlpower.sqlobject.undo.CompoundEventListener;
import ca.sqlpower.swingui.CursorManager;
import ca.sqlpower.swingui.ProgressWatcher;
import ca.sqlpower.swingui.SPSwingWorker;
=======================================
---
/trunk/src/main/java/ca/sqlpower/architect/swingui/PlayPenComponentLocationEdit.java
Thu Dec 9 10:57:57 2010
+++
/trunk/src/main/java/ca/sqlpower/architect/swingui/PlayPenComponentLocationEdit.java
Fri Aug 19 08:36:52 2011
@@ -30,7 +30,7 @@
import javax.swing.undo.UndoableEdit;
import ca.sqlpower.architect.undo.ArchitectUndoManager;
-import ca.sqlpower.sqlobject.undo.PropertyChangeEdit;
+import ca.sqlpower.object.undo.PropertyChangeEdit;
/**
* An undoable edit that absorbs PropertyChangeEdits from
PlayPenComponents. The
=======================================
---
/trunk/src/main/java/ca/sqlpower/architect/swingui/action/RedoAction.java
Mon Jul 12 08:21:11 2010
+++
/trunk/src/main/java/ca/sqlpower/architect/swingui/action/RedoAction.java
Fri Aug 19 08:36:52 2011
@@ -32,7 +32,7 @@
import ca.sqlpower.architect.swingui.ArchitectFrame;
import ca.sqlpower.architect.swingui.ArchitectSwingSession;
-import ca.sqlpower.sqlobject.undo.NotifyingUndoManager;
+import ca.sqlpower.object.undo.NotifyingUndoManager;
public class RedoAction extends AbstractArchitectAction {
=======================================
---
/trunk/src/main/java/ca/sqlpower/architect/swingui/action/UndoAction.java
Mon Jul 12 08:21:11 2010
+++
/trunk/src/main/java/ca/sqlpower/architect/swingui/action/UndoAction.java
Fri Aug 19 08:36:52 2011
@@ -32,7 +32,7 @@
import ca.sqlpower.architect.swingui.ArchitectFrame;
import ca.sqlpower.architect.swingui.ArchitectSwingSession;
-import ca.sqlpower.sqlobject.undo.NotifyingUndoManager;
+import ca.sqlpower.object.undo.NotifyingUndoManager;
public class UndoAction extends AbstractArchitectAction {
=======================================
---
/trunk/src/main/java/ca/sqlpower/architect/swingui/olap/OLAPPlayPenFactory.java
Tue Dec 7 14:09:21 2010
+++
/trunk/src/main/java/ca/sqlpower/architect/swingui/olap/OLAPPlayPenFactory.java
Fri Aug 19 08:36:52 2011
@@ -61,9 +61,9 @@
import ca.sqlpower.object.ObjectDependentException;
import ca.sqlpower.object.SPChildEvent;
import ca.sqlpower.object.SPListener;
+import ca.sqlpower.object.undo.PropertyChangeEdit;
import ca.sqlpower.sqlobject.SQLObjectException;
import ca.sqlpower.sqlobject.SQLObjectRuntimeException;
-import ca.sqlpower.sqlobject.undo.PropertyChangeEdit;
import ca.sqlpower.util.SQLPowerUtils;
import ca.sqlpower.util.TransactionEvent;
=======================================
---
/trunk/src/main/java/ca/sqlpower/architect/undo/ArchitectUndoManager.java
Thu Aug 5 12:09:29 2010
+++
/trunk/src/main/java/ca/sqlpower/architect/undo/ArchitectUndoManager.java
Fri Aug 19 08:36:52 2011
@@ -24,14 +24,14 @@
import ca.sqlpower.architect.swingui.PlayPenContentPane;
import ca.sqlpower.object.AbstractSPListener;
import ca.sqlpower.object.SPChildEvent;
+import ca.sqlpower.object.undo.NotifyingUndoManager;
+import ca.sqlpower.object.undo.SPObjectUndoManager;
import ca.sqlpower.sqlobject.SQLObject;
import ca.sqlpower.sqlobject.SQLObjectException;
import ca.sqlpower.sqlobject.SQLObjectRoot;
-import ca.sqlpower.sqlobject.undo.NotifyingUndoManager;
-import ca.sqlpower.sqlobject.undo.SQLObjectUndoManager;
import ca.sqlpower.util.SQLPowerUtils;
-public class ArchitectUndoManager extends SQLObjectUndoManager implements
NotifyingUndoManager {
+public class ArchitectUndoManager extends SPObjectUndoManager implements
NotifyingUndoManager {
/**
* Creates a new UndoManager and attaches it to the given PlayPen's
@@ -46,7 +46,7 @@
public ArchitectUndoManager(PlayPen playPen) {
super(playPen.getSession().getTargetDatabase());
SQLObjectRoot rootObject = playPen.getSession().getRootObject();
- final SQLObjectUndoableEventAdapter undoListener = new
SQLObjectUndoableEventAdapter(false);
+ final SPObjectUndoableEventAdapter undoListener = new
SPObjectUndoableEventAdapter(false);
rootObject.addSPListener(undoListener);
undoListener.attachToObject(rootObject);
final ArchitectSwingProject workspace =
playPen.getSession().getWorkspace();
