Revision: 3948
Author: [email protected]
Date: Wed Sep 8 11:59:31 2010
Log: Fix core class import to outer gui/enterprise/OLAP components
(SuperConverter)
http://code.google.com/p/power-architect/source/detail?r=3948
Modified:
/trunk/src/main/java/ca/sqlpower/architect/diff/CompareSQL.java
/trunk/src/main/java/ca/sqlpower/architect/profile/ProfileManagerImpl.java
=======================================
--- /trunk/src/main/java/ca/sqlpower/architect/diff/CompareSQL.java Wed Jul
14 08:51:55 2010
+++ /trunk/src/main/java/ca/sqlpower/architect/diff/CompareSQL.java Wed
Sep 8 11:59:31 2010
@@ -30,7 +30,6 @@
import org.apache.log4j.Logger;
import ca.sqlpower.architect.ArchitectUtils;
-import ca.sqlpower.architect.enterprise.ArchitectPersisterSuperConverter;
import ca.sqlpower.dao.PersisterUtils;
import ca.sqlpower.dao.session.SessionPersisterSuperConverter;
import ca.sqlpower.diff.DiffChunk;
@@ -805,7 +804,7 @@
try {
- SessionPersisterSuperConverter converter = new
ArchitectPersisterSuperConverter(null, sourceObject);
+ SessionPersisterSuperConverter converter = new
SessionPersisterSuperConverter(null, sourceObject);
Map<String, Object> sourceProperties =
PersisterUtils.getInterestingProperties(sourceObject, converter);
converter = new SessionPersisterSuperConverter(null,
targetObject);
Map<String, Object> targetProperties =
PersisterUtils.getInterestingProperties(targetObject, converter);
=======================================
---
/trunk/src/main/java/ca/sqlpower/architect/profile/ProfileManagerImpl.java
Wed Jul 28 09:52:56 2010
+++
/trunk/src/main/java/ca/sqlpower/architect/profile/ProfileManagerImpl.java
Wed Sep 8 11:59:31 2010
@@ -32,11 +32,12 @@
import org.apache.log4j.Logger;
import ca.sqlpower.architect.ArchitectProject;
-import ca.sqlpower.architect.enterprise.ArchitectPersisterSuperConverter;
-import ca.sqlpower.architect.enterprise.ArchitectSessionPersister;
import ca.sqlpower.architect.profile.event.ProfileChangeEvent;
import ca.sqlpower.architect.profile.event.ProfileChangeListener;
+import ca.sqlpower.dao.PersistedSPObject;
import ca.sqlpower.dao.SPPersisterListener;
+import ca.sqlpower.dao.SPSessionPersister;
+import ca.sqlpower.dao.session.SessionPersisterSuperConverter;
import ca.sqlpower.object.AbstractSPObject;
import ca.sqlpower.object.SPObject;
import ca.sqlpower.object.annotation.Accessor;
@@ -251,10 +252,15 @@
DataSourceCollection<SPDataSource> dsCollection = new
PlDotIni();
SPObject root =
actualTPR.getWorkspaceContainer().getWorkspace();
- ArchitectPersisterSuperConverter converter =
- new ArchitectPersisterSuperConverter(dsCollection,
root);
- ArchitectSessionPersister persister =
- new ArchitectSessionPersister("Profiling
persister", root, converter);
+ SessionPersisterSuperConverter converter =
+ new SessionPersisterSuperConverter(dsCollection,
root);
+ SPSessionPersister persister =
+ new SPSessionPersister("Profiling persister",
root, converter) {
+ @Override
+ protected void
refreshRootNode(PersistedSPObject pso) {
+ //do nothing, this is not needed for the
profiling update.
+ }
+ };
persister.setWorkspaceContainer(actualTPR.getWorkspaceContainer());
SPPersisterListener eventCreator = new
SPPersisterListener(persister, converter);
eventCreator.persistObject(tpr,
