Revision: 3566
Author: [email protected]
Date: Thu May 27 15:14:51 2010
Log: Corrected the move of objects from a server. A move of an object is
still noted by a remove and an add of the same object
from the server. Previously the object on the client was being removed and
then a new object was being created and
added. Since objects, like TablePane, referenced the previous object, and
there was not always a remove and add on the
objects like TablePane with the remove and add 'move' call of the model the
UI components were pointing at model objects
no longer connected to the persistence tree. Now when an object is being
added the removed objects list is checked for
the old object and, if found, is added back to the tree instead of creating
a new one.
http://code.google.com/p/power-architect/source/detail?r=3566
Modified:
/trunk/src/main/java/ca/sqlpower/architect/enterprise/NetworkConflictResolver.java
=======================================
---
/trunk/src/main/java/ca/sqlpower/architect/enterprise/NetworkConflictResolver.java
Tue May 25 14:03:00 2010
+++
/trunk/src/main/java/ca/sqlpower/architect/enterprise/NetworkConflictResolver.java
Thu May 27 15:14:51 2010
@@ -409,7 +409,7 @@
for (PersistedSPOProperty prop :
listener.getPersistedProperties()) {
outboundPropertiesToChange.put(prop.getUUID(), prop);
}
- for (RemovedObjectEntry rem : listener.getObjectsToRemove()) {
+ for (RemovedObjectEntry rem :
listener.getObjectsToRemove().values()) {
outboundObjectsToRemove.put(rem.getRemovedChild().getUUID(),
rem);
}
}
