Revision: 3943
Author: [email protected]
Date: Wed Sep 8 08:39:58 2010
Log: Fix core class import to outer gui/enterprise/OLAP components
http://code.google.com/p/power-architect/source/detail?r=3943
Modified:
/trunk/src/main/java/ca/sqlpower/architect/ProjectLoader.java
/trunk/src/main/java/ca/sqlpower/architect/swingui/SwingUIProjectLoader.java
=======================================
--- /trunk/src/main/java/ca/sqlpower/architect/ProjectLoader.java Wed Aug
25 11:55:47 2010
+++ /trunk/src/main/java/ca/sqlpower/architect/ProjectLoader.java Wed Sep
8 08:39:58 2010
@@ -44,7 +44,6 @@
import org.xml.sax.SAXException;
import ca.sqlpower.architect.ddl.GenericDDLGenerator;
-import ca.sqlpower.architect.olap.OLAPObject;
import ca.sqlpower.architect.profile.ColumnProfileResult;
import ca.sqlpower.architect.profile.ColumnValueCount;
import ca.sqlpower.architect.profile.TableProfileResult;
@@ -154,16 +153,6 @@
*/
protected Map<SQLObject, String> sqlObjectSaveIdMap;
- /**
- * This map maps String ID codes to OLAPObject instances used in
loading.
- */
- protected Map<String, OLAPObject> olapObjectLoadIdMap;
-
- /**
- * This holds mappings from OLAPObject instance to String ID used in
saving.
- */
- protected Map<OLAPObject, String> olapObjectSaveIdMap;
-
/**
* This map maps String ID codes to DBCS instances used in loading.
*/
=======================================
---
/trunk/src/main/java/ca/sqlpower/architect/swingui/SwingUIProjectLoader.java
Wed Aug 25 11:55:47 2010
+++
/trunk/src/main/java/ca/sqlpower/architect/swingui/SwingUIProjectLoader.java
Wed Sep 8 08:39:58 2010
@@ -124,6 +124,16 @@
private static final String RELATIONSHIP_STYLE_DIRECT = "direct";
//$NON-NLS-1$
private static final Logger logger =
Logger.getLogger(SwingUIProjectLoader.class);
+
+ /**
+ * This map maps String ID codes to OLAPObject instances used in
loading.
+ */
+ protected Map<String, OLAPObject> olapObjectLoadIdMap;
+
+ /**
+ * This holds mappings from OLAPObject instance to String ID used in
saving.
+ */
+ protected Map<OLAPObject, String> olapObjectSaveIdMap;
/**
* This holds mappings from OLAPPane instance to String ID used in
saving.
