Author: [email protected]
Date: Mon Dec 15 13:18:07 2008
New Revision: 2879
Added:
trunk/src/ca/sqlpower/architect/undo/ArchitectUndoManager.java
- copied, changed from r2878,
/trunk/src/ca/sqlpower/architect/undo/UndoManager.java
Removed:
trunk/src/ca/sqlpower/architect/undo/UndoManager.java
Modified:
trunk/regress/ca/sqlpower/architect/SQLTestCase.java
trunk/regress/ca/sqlpower/architect/swingui/TestingArchitectSwingSession.java
trunk/regress/ca/sqlpower/architect/undo/ArchitectPropertyChangeUndoableEditTest.java
trunk/regress/ca/sqlpower/architect/undo/TestSQLObjectChildrenInsert.java
trunk/regress/ca/sqlpower/architect/undo/TestSQLObjectUndoableEventAdapter.java
trunk/regress/ca/sqlpower/architect/undo/TestUndoManager.java
trunk/src/ca/sqlpower/architect/swingui/ArchitectSwingSession.java
trunk/src/ca/sqlpower/architect/swingui/ArchitectSwingSessionImpl.java
trunk/src/ca/sqlpower/architect/swingui/PlayPenComponentLocationEdit.java
Log:
Fixed a findBugs warning by renaming the UndoManager to
ArchitectUndoManager. FindBugs did not like the fact that the UndoManager
has the same name as its super class which is in a different package.
Modified: trunk/regress/ca/sqlpower/architect/SQLTestCase.java
==============================================================================
--- trunk/regress/ca/sqlpower/architect/SQLTestCase.java (original)
+++ trunk/regress/ca/sqlpower/architect/SQLTestCase.java Mon Dec 15
13:18:07 2008
@@ -31,7 +31,7 @@
import org.apache.commons.beanutils.PropertyUtils;
import ca.sqlpower.ArchitectTestCase;
-import ca.sqlpower.architect.undo.UndoManager;
+import ca.sqlpower.architect.undo.ArchitectUndoManager;
import ca.sqlpower.sql.DataSourceCollection;
import ca.sqlpower.sql.PlDotIni;
import ca.sqlpower.sql.SPDataSource;
@@ -245,7 +245,7 @@
// should be handled in the Datasource
propertiesToIgnoreForUndo.add("name");
}
- UndoManager undoManager= new UndoManager(so);
+ ArchitectUndoManager undoManager= new ArchitectUndoManager(so);
List<PropertyDescriptor> settableProperties;
settableProperties =
Arrays.asList(PropertyUtils.getPropertyDescriptors(so.getClass()));
if(so instanceof SQLDatabase)
Modified:
trunk/regress/ca/sqlpower/architect/swingui/TestingArchitectSwingSession.java
==============================================================================
---
trunk/regress/ca/sqlpower/architect/swingui/TestingArchitectSwingSession.java
(original)
+++
trunk/regress/ca/sqlpower/architect/swingui/TestingArchitectSwingSession.java
Mon Dec 15 13:18:07 2008
@@ -44,7 +44,7 @@
import ca.sqlpower.architect.profile.ProfileManager;
import ca.sqlpower.architect.profile.ProfileManagerImpl;
import ca.sqlpower.architect.swingui.olap.OLAPEditSession;
-import ca.sqlpower.architect.undo.UndoManager;
+import ca.sqlpower.architect.undo.ArchitectUndoManager;
import ca.sqlpower.swingui.SPSwingWorker;
import ca.sqlpower.swingui.event.SessionLifecycleListener;
@@ -59,7 +59,7 @@
private SwingUIProject project;
private ArchitectFrame frame;
private PlayPen playpen;
- private UndoManager undoManager;
+ private ArchitectUndoManager undoManager;
private DBTree sourceDatabases;
private SQLObjectRoot rootObject;
private ProfileManager profileManager;
@@ -96,7 +96,7 @@
rootObject.addChild(getTargetDatabase());
sourceDatabases = new DBTree(this);
playpen = RelationalPlayPenFactory.createPlayPen(this,
sourceDatabases);
- undoManager = new UndoManager(playpen);
+ undoManager = new ArchitectUndoManager(playpen);
olapRootObject = new OLAPRootObject(delegateSession);
compareDMSettings = new CompareDMSettings();
@@ -177,7 +177,7 @@
return sourceDatabases;
}
- public UndoManager getUndoManager() {
+ public ArchitectUndoManager getUndoManager() {
return undoManager;
}
Modified:
trunk/regress/ca/sqlpower/architect/undo/ArchitectPropertyChangeUndoableEditTest.java
==============================================================================
---
trunk/regress/ca/sqlpower/architect/undo/ArchitectPropertyChangeUndoableEditTest.java
(original)
+++
trunk/regress/ca/sqlpower/architect/undo/ArchitectPropertyChangeUndoableEditTest.java
Mon Dec 15 13:18:07 2008
@@ -30,14 +30,14 @@
public class ArchitectPropertyChangeUndoableEditTest extends TestCase {
- private UndoManager undoManager;
+ private ArchitectUndoManager undoManager;
private TestSQLObject testObject;
protected void setUp() throws Exception {
super.setUp();
testObject = new TestSQLObject();
- undoManager = new UndoManager(testObject);
+ undoManager = new ArchitectUndoManager(testObject);
}
Modified:
trunk/regress/ca/sqlpower/architect/undo/TestSQLObjectChildrenInsert.java
==============================================================================
---
trunk/regress/ca/sqlpower/architect/undo/TestSQLObjectChildrenInsert.java
(original)
+++
trunk/regress/ca/sqlpower/architect/undo/TestSQLObjectChildrenInsert.java
Mon Dec 15 13:18:07 2008
@@ -50,7 +50,7 @@
// setup a playpen like database
SQLDatabase db = new SQLDatabase();
- UndoManager undoManager = new UndoManager(db);
+ ArchitectUndoManager undoManager = new ArchitectUndoManager(db);
db.setPlayPenDatabase(true);
SQLTable table1 = new
SQLTable(db,"table1","remark1","TABLE",true);
SQLTable table2 = new
SQLTable(db,"table2","remark2","TABLE",true);
Modified:
trunk/regress/ca/sqlpower/architect/undo/TestSQLObjectUndoableEventAdapter.java
==============================================================================
---
trunk/regress/ca/sqlpower/architect/undo/TestSQLObjectUndoableEventAdapter.java
(original)
+++
trunk/regress/ca/sqlpower/architect/undo/TestSQLObjectUndoableEventAdapter.java
Mon Dec 15 13:18:07 2008
@@ -66,7 +66,7 @@
SQLTable table = new SQLTable(session.getTargetDatabase(),true);
TablePane tp = new TablePane(table,pp.getContentPane());
pp.addTablePane(tp, new Point());
- UndoManager undoManager = new UndoManager(pp);
+ ArchitectUndoManager undoManager = new ArchitectUndoManager(pp);
pp.getPlayPenContentPane().addPropertyChangeListener(undoManager.getEventAdapter());
Point location;
Point newLocation;
@@ -101,7 +101,7 @@
pp.addTablePane(tp2,new Point());
Point newLocation2;
location2 = tp2.getLocation();
- UndoManager undoManager = new UndoManager(pp);
+ ArchitectUndoManager undoManager = new ArchitectUndoManager(pp);
pp.getPlayPenContentPane().addPropertyChangeListener("location",
undoManager.getEventAdapter());
assertTrue("Moved to the right location",
location2.equals(tp2.getLocation() ));
assertTrue("Moved to the right location",
location.equals(tp.getLocation() ));
@@ -128,7 +128,7 @@
public void testCompoundEditEvent() throws ArchitectException{
PlayPen pp = new PlayPen(session);
- UndoManager manager = new UndoManager(pp);
+ ArchitectUndoManager manager = new ArchitectUndoManager(pp);
pp.getPlayPenContentPane().addPropertyChangeListener("location",
manager.getEventAdapter());
pp.getPlayPenContentPane().addPropertyChangeListener("connectionPoints",
manager.getEventAdapter());
pp.getPlayPenContentPane().addPropertyChangeListener("backgroundColor",
manager.getEventAdapter());
@@ -137,7 +137,7 @@
pp.getPlayPenContentPane().addPropertyChangeListener("rounded",
manager.getEventAdapter());
StateChangeTestListner listner = new StateChangeTestListner();
manager.addChangeListener(listner);
- UndoManager.SQLObjectUndoableEventAdapter adapter =
manager.getEventAdapter();
+ ArchitectUndoManager.SQLObjectUndoableEventAdapter adapter =
manager.getEventAdapter();
assertTrue(adapter.canUndoOrRedo());
adapter.compoundEditStart(new
UndoCompoundEvent(EventTypes.COMPOUND_EDIT_START, "Test"));
Modified: trunk/regress/ca/sqlpower/architect/undo/TestUndoManager.java
==============================================================================
--- trunk/regress/ca/sqlpower/architect/undo/TestUndoManager.java
(original)
+++ trunk/regress/ca/sqlpower/architect/undo/TestUndoManager.java Mon Dec
15 13:18:07 2008
@@ -45,7 +45,7 @@
import ca.sqlpower.architect.swingui.TestingArchitectSwingSessionContext;
import ca.sqlpower.architect.swingui.action.CreateRelationshipAction;
import ca.sqlpower.architect.undo.UndoCompoundEvent.EventTypes;
-import
ca.sqlpower.architect.undo.UndoManager.SQLObjectUndoableEventAdapter;
+import
ca.sqlpower.architect.undo.ArchitectUndoManager.SQLObjectUndoableEventAdapter;
public class TestUndoManager extends TestCase {
@@ -73,7 +73,7 @@
}
- UndoManager undoManager;
+ ArchitectUndoManager undoManager;
PlayPen pp;
SQLTable fkTable;
SQLTable pkTable;
@@ -94,7 +94,7 @@
pkTable.setName("parent");
tp2 = new TablePane(pkTable,pp.getContentPane());
pp.addTablePane(tp2,new Point(1,1));
- undoManager = new UndoManager(pp);
+ undoManager = new ArchitectUndoManager(pp);
pp.getPlayPenContentPane().addPropertyChangeListener("location",
undoManager.getEventAdapter());
pp.getPlayPenContentPane().addPropertyChangeListener("connectionPoints",
undoManager.getEventAdapter());
pkTable.addColumn(new SQLColumn());
@@ -115,7 +115,7 @@
{
// TODO: add a change listener to the undo manager and make sure it
fires events when it changes
- undoManager = new UndoManager(pp);
+ undoManager = new ArchitectUndoManager(pp);
pp.getPlayPenContentPane().addPropertyChangeListener("location",
undoManager.getEventAdapter());
pp.getPlayPenContentPane().addPropertyChangeListener("connectionPoints",
undoManager.getEventAdapter());
UndoableEdit stubEdit = new AbstractUndoableEdit() {
Modified: trunk/src/ca/sqlpower/architect/swingui/ArchitectSwingSession.java
==============================================================================
--- trunk/src/ca/sqlpower/architect/swingui/ArchitectSwingSession.java
(original)
+++ trunk/src/ca/sqlpower/architect/swingui/ArchitectSwingSession.java Mon
Dec 15 13:18:07 2008
@@ -31,7 +31,7 @@
import ca.sqlpower.architect.olap.OLAPRootObject;
import ca.sqlpower.architect.olap.OLAPSession;
import ca.sqlpower.architect.swingui.olap.OLAPEditSession;
-import ca.sqlpower.architect.undo.UndoManager;
+import ca.sqlpower.architect.undo.ArchitectUndoManager;
import ca.sqlpower.swingui.SwingWorkerRegistry;
import ca.sqlpower.swingui.event.SessionLifecycleListener;
@@ -83,7 +83,7 @@
/**
* Gets the UndoManager keeping track of changes in this session
*/
- public UndoManager getUndoManager();
+ public ArchitectUndoManager getUndoManager();
public CompareDMSettings getCompareDMSettings();
Modified:
trunk/src/ca/sqlpower/architect/swingui/ArchitectSwingSessionImpl.java
==============================================================================
--- trunk/src/ca/sqlpower/architect/swingui/ArchitectSwingSessionImpl.java
(original)
+++ trunk/src/ca/sqlpower/architect/swingui/ArchitectSwingSessionImpl.java
Mon Dec 15 13:18:07 2008
@@ -68,7 +68,7 @@
import ca.sqlpower.architect.swingui.action.PreferencesAction;
import ca.sqlpower.architect.swingui.olap.OLAPEditSession;
import ca.sqlpower.architect.swingui.olap.OLAPSchemaManager;
-import ca.sqlpower.architect.undo.UndoManager;
+import ca.sqlpower.architect.undo.ArchitectUndoManager;
import ca.sqlpower.sql.SPDataSource;
import ca.sqlpower.swingui.SPSUtils;
import ca.sqlpower.swingui.SPSwingWorker;
@@ -118,7 +118,7 @@
private CompareDMSettings compareDMSettings;
- private UndoManager undoManager;
+ private ArchitectUndoManager undoManager;
private boolean savingEntireSource;
@@ -205,7 +205,7 @@
}
projectModificationWatcher = new
ProjectModificationWatcher(playPen);
- undoManager = new UndoManager(playPen);
+ undoManager = new ArchitectUndoManager(playPen);
playPen.getPlayPenContentPane().addPropertyChangeListener("location",
undoManager.getEventAdapter()); //$NON-NLS-1$
playPen.getPlayPenContentPane().addPropertyChangeListener("connectionPoints",
undoManager.getEventAdapter()); //$NON-NLS-1$
playPen.getPlayPenContentPane().addPropertyChangeListener("backgroundColor",
undoManager.getEventAdapter()); //$NON-NLS-1$
@@ -696,7 +696,7 @@
this.compareDMSettings = compareDMSettings;
}
- public UndoManager getUndoManager() {
+ public ArchitectUndoManager getUndoManager() {
return undoManager;
}
Modified:
trunk/src/ca/sqlpower/architect/swingui/PlayPenComponentLocationEdit.java
==============================================================================
---
trunk/src/ca/sqlpower/architect/swingui/PlayPenComponentLocationEdit.java
(original)
+++
trunk/src/ca/sqlpower/architect/swingui/PlayPenComponentLocationEdit.java
Mon Dec 15 13:18:07 2008
@@ -29,12 +29,12 @@
import javax.swing.undo.UndoableEdit;
import ca.sqlpower.architect.undo.PropertyChangeEdit;
-import ca.sqlpower.architect.undo.UndoManager;
+import ca.sqlpower.architect.undo.ArchitectUndoManager;
/**
* An undoable edit that absorbs PropertyChangeEdits from
PlayPenComponents. The
* way it is used is to add it to the undo manager using
- * {...@link UndoManager#addEdit(UndoableEdit)} before any components start
moving.
+ * {...@link ArchitectUndoManager#addEdit(UndoableEdit)} before any
components start moving.
* Then as each successive {...@link PropertyChangeEdit} is added to the undo
* manager, this edit will absorb it if it represents a change in location
of a
* PlayPenComponent. As soon as any other type of edit is added to the undo
Copied: trunk/src/ca/sqlpower/architect/undo/ArchitectUndoManager.java
(from r2878, /trunk/src/ca/sqlpower/architect/undo/UndoManager.java)
==============================================================================
--- /trunk/src/ca/sqlpower/architect/undo/UndoManager.java (original)
+++ trunk/src/ca/sqlpower/architect/undo/ArchitectUndoManager.java Mon Dec
15 13:18:07 2008
@@ -41,9 +41,9 @@
import ca.sqlpower.architect.SQLObjectListener;
import ca.sqlpower.architect.swingui.PlayPen;
-public class UndoManager extends javax.swing.undo.UndoManager implements
NotifyingUndoManager {
+public class ArchitectUndoManager extends javax.swing.undo.UndoManager
implements NotifyingUndoManager {
- private static final Logger logger =
Logger.getLogger(UndoManager.class);
+ private static final Logger logger =
Logger.getLogger(ArchitectUndoManager.class);
/**
* Converts received SQLObjectEvents into UndoableEdits,
PropertyChangeEvents
@@ -129,7 +129,7 @@
* fires a state changed event when a new compound edit is created
*/
private void compoundGroupStart(String toolTip) {
- if (UndoManager.this.isUndoOrRedoing())
+ if (ArchitectUndoManager.this.isUndoOrRedoing())
return;
compoundEditStackCount++;
if (compoundEditStackCount == 1) {
@@ -150,7 +150,7 @@
* if there wasn't already a compound edit in progress.
*/
private void compoundGroupEnd() {
- if (UndoManager.this.isUndoOrRedoing())
+ if (ArchitectUndoManager.this.isUndoOrRedoing())
return;
if (compoundEditStackCount <= 0) {
throw new IllegalStateException("No compound edit in
progress");
@@ -170,14 +170,14 @@
// if we are not in a compound edit
if (compoundEditStackCount == 0) {
- UndoManager.this.addEdit(undoEdit);
+ ArchitectUndoManager.this.addEdit(undoEdit);
} else {
ce.addEdit(undoEdit);
}
}
public void dbChildrenInserted(SQLObjectEvent e) {
- if (UndoManager.this.isUndoOrRedoing())
+ if (ArchitectUndoManager.this.isUndoOrRedoing())
return;
SQLObjectInsertChildren undoEvent = new
SQLObjectInsertChildren();
@@ -194,7 +194,7 @@
}
public void dbChildrenRemoved(SQLObjectEvent e) {
- if (UndoManager.this.isUndoOrRedoing())
+ if (ArchitectUndoManager.this.isUndoOrRedoing())
return;
SQLObjectRemoveChildren undoEvent = new
SQLObjectRemoveChildren();
@@ -203,7 +203,7 @@
}
public void dbObjectChanged(SQLObjectEvent e) {
- if (UndoManager.this.isUndoOrRedoing())
+ if (ArchitectUndoManager.this.isUndoOrRedoing())
return;
if (e.getSource() instanceof SQLDatabase &&
e.getPropertyName().equals("shortDisplayName")) {
// this is not undoable at this time.
@@ -217,7 +217,7 @@
logger.error("Unexpected structure change event");
// too many changes clear undo
- UndoManager.this.discardAllEdits();
+ ArchitectUndoManager.this.discardAllEdits();
}
/**
@@ -225,7 +225,7 @@
* to the undo manager.
*/
public void propertyChange(PropertyChangeEvent evt) {
- if (UndoManager.this.isUndoOrRedoing()) {
+ if (ArchitectUndoManager.this.isUndoOrRedoing()) {
return;
}
PropertyChangeEdit edit = new PropertyChangeEdit(evt);
@@ -244,7 +244,7 @@
if (ce.canUndo()) {
if (logger.isDebugEnabled())
logger.debug("Adding compound edit " + ce + " to
undo manager");
- UndoManager.this.addEdit(ce);
+ ArchitectUndoManager.this.addEdit(ce);
} else {
if (logger.isDebugEnabled())
logger.debug("Compound edit " + ce + " is not
undoable so we are not adding it");
@@ -288,11 +288,11 @@
* If the manager fails to listen to all objects in the
play
* pen's database hierarchy.
*/
- public UndoManager(PlayPen playPen) throws ArchitectException {
+ public ArchitectUndoManager(PlayPen playPen) throws ArchitectException
{
init(playPen, playPen.getSession().getTargetDatabase());
}
- public UndoManager(SQLObject sqlObjectRoot) throws ArchitectException {
+ public ArchitectUndoManager(SQLObject sqlObjectRoot) throws
ArchitectException {
init(null, sqlObjectRoot);
}
