Revision: 3464
Author: mo.jeff
Date: Tue Apr 20 15:12:12 2010
Log: Added a means of accessing types from the ArchitectSession API.
http://code.google.com/p/power-architect/source/detail?r=3464
Modified:
/trunk/regress/ca/sqlpower/architect/StubArchitectSession.java
/trunk/regress/ca/sqlpower/architect/TestingArchitectSession.java
/trunk/regress/ca/sqlpower/architect/swingui/TestingArchitectSwingSession.java
/trunk/src/main/java/ca/sqlpower/architect/ArchitectProject.java
/trunk/src/main/java/ca/sqlpower/architect/ArchitectSession.java
/trunk/src/main/java/ca/sqlpower/architect/ArchitectSessionImpl.java
/trunk/src/main/java/ca/sqlpower/architect/enterprise/ArchitectClientSideSession.java
/trunk/src/main/java/ca/sqlpower/architect/swingui/ArchitectSwingSessionImpl.java
=======================================
--- /trunk/regress/ca/sqlpower/architect/StubArchitectSession.java Thu Feb
25 09:46:15 2010
+++ /trunk/regress/ca/sqlpower/architect/StubArchitectSession.java Tue Apr
20 15:12:12 2010
@@ -30,6 +30,7 @@
import ca.sqlpower.sqlobject.SQLDatabase;
import ca.sqlpower.sqlobject.SQLObjectException;
import ca.sqlpower.sqlobject.SQLObjectRoot;
+import ca.sqlpower.sqlobject.UserDefinedSQLType;
import ca.sqlpower.swingui.event.SessionLifecycleListener;
import ca.sqlpower.util.UserPrompter;
import ca.sqlpower.util.UserPrompter.UserPromptOptions;
@@ -163,5 +164,10 @@
// TODO Auto-generated method stub
return null;
}
+
+ public List<UserDefinedSQLType> getSQLTypes() {
+ // TODO Auto-generated method stub
+ return null;
+ }
}
=======================================
--- /trunk/regress/ca/sqlpower/architect/TestingArchitectSession.java Thu
Feb 25 09:46:15 2010
+++ /trunk/regress/ca/sqlpower/architect/TestingArchitectSession.java Tue
Apr 20 15:12:12 2010
@@ -44,6 +44,7 @@
import ca.sqlpower.sqlobject.SQLDatabase;
import ca.sqlpower.sqlobject.SQLObjectException;
import ca.sqlpower.sqlobject.SQLObjectRoot;
+import ca.sqlpower.sqlobject.UserDefinedSQLType;
import ca.sqlpower.swingui.event.SessionLifecycleListener;
import ca.sqlpower.util.DefaultUserPrompterFactory;
import ca.sqlpower.util.UserPrompter;
@@ -199,5 +200,10 @@
// TODO Auto-generated method stub
return null;
}
+
+ public List<UserDefinedSQLType> getSQLTypes() {
+ // TODO Auto-generated method stub
+ return null;
+ }
}
=======================================
---
/trunk/regress/ca/sqlpower/architect/swingui/TestingArchitectSwingSession.java
Thu Apr 8 07:59:33 2010
+++
/trunk/regress/ca/sqlpower/architect/swingui/TestingArchitectSwingSession.java
Tue Apr 20 15:12:12 2010
@@ -51,6 +51,7 @@
import ca.sqlpower.sqlobject.SQLDatabase;
import ca.sqlpower.sqlobject.SQLObjectException;
import ca.sqlpower.sqlobject.SQLObjectRoot;
+import ca.sqlpower.sqlobject.UserDefinedSQLType;
import ca.sqlpower.swingui.RecentMenu;
import ca.sqlpower.swingui.SPSwingWorker;
import ca.sqlpower.swingui.event.SessionLifecycleListener;
@@ -437,4 +438,9 @@
// TODO Auto-generated method stub
return null;
}
-}
+
+ public List<UserDefinedSQLType> getSQLTypes() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+}
=======================================
--- /trunk/src/main/java/ca/sqlpower/architect/ArchitectProject.java Mon
Apr 19 15:22:13 2010
+++ /trunk/src/main/java/ca/sqlpower/architect/ArchitectProject.java Tue
Apr 20 15:12:12 2010
@@ -501,4 +501,13 @@
olapContentPane.setParent(null);
return true;
}
-}
+
+ /**
+ * Returns the list of all child {...@link UserDefinedSQLType} for this
+ * {...@link ArchitectProject}
+ */
+ @NonProperty
+ public List<UserDefinedSQLType> getSqlTypes() {
+ return sqlTypes;
+ }
+}
=======================================
--- /trunk/src/main/java/ca/sqlpower/architect/ArchitectSession.java Fri
Apr 9 08:41:23 2010
+++ /trunk/src/main/java/ca/sqlpower/architect/ArchitectSession.java Tue
Apr 20 15:12:12 2010
@@ -29,6 +29,7 @@
import ca.sqlpower.sqlobject.SQLDatabaseMapping;
import ca.sqlpower.sqlobject.SQLObjectException;
import ca.sqlpower.sqlobject.SQLObjectRoot;
+import ca.sqlpower.sqlobject.UserDefinedSQLType;
import ca.sqlpower.swingui.event.SessionLifecycleListener;
import ca.sqlpower.util.RunnableDispatcher;
import ca.sqlpower.util.UserPrompterFactory;
@@ -134,4 +135,8 @@
*/
public boolean close();
-}
+ /**
+ * Returns a list of {...@link UserDefinedSQLType} defined in this
session.
+ */
+ public List<UserDefinedSQLType> getSQLTypes();
+}
=======================================
--- /trunk/src/main/java/ca/sqlpower/architect/ArchitectSessionImpl.java
Wed Mar 10 08:21:50 2010
+++ /trunk/src/main/java/ca/sqlpower/architect/ArchitectSessionImpl.java
Tue Apr 20 15:12:12 2010
@@ -35,6 +35,7 @@
import ca.sqlpower.sqlobject.SQLDatabase;
import ca.sqlpower.sqlobject.SQLObjectException;
import ca.sqlpower.sqlobject.SQLObjectRoot;
+import ca.sqlpower.sqlobject.UserDefinedSQLType;
import ca.sqlpower.swingui.event.SessionLifecycleEvent;
import ca.sqlpower.swingui.event.SessionLifecycleListener;
import ca.sqlpower.util.DefaultUserPrompterFactory;
@@ -251,5 +252,8 @@
return context.getPlDotIni();
}
+ public List<UserDefinedSQLType> getSQLTypes() {
+ return getDataSources().getSQLTypes();
+ }
}
=======================================
---
/trunk/src/main/java/ca/sqlpower/architect/enterprise/ArchitectClientSideSession.java
Fri Apr 9 08:41:23 2010
+++
/trunk/src/main/java/ca/sqlpower/architect/enterprise/ArchitectClientSideSession.java
Tue Apr 20 15:12:12 2010
@@ -72,6 +72,7 @@
import ca.sqlpower.sql.SPDataSource;
import ca.sqlpower.sql.SpecificDataSourceCollection;
import ca.sqlpower.sqlobject.SQLObjectException;
+import ca.sqlpower.sqlobject.UserDefinedSQLType;
import ca.sqlpower.swingui.event.SessionLifecycleEvent;
import ca.sqlpower.swingui.event.SessionLifecycleListener;
import ca.sqlpower.util.SQLPowerUtils;
@@ -907,4 +908,9 @@
public int getCurrentRevisionNumber() {
return updater.getRevision();
}
-}
+
+ @Override
+ public List<UserDefinedSQLType> getSQLTypes() {
+ return getSystemWorkspace().getSqlTypes();
+ }
+}
=======================================
---
/trunk/src/main/java/ca/sqlpower/architect/swingui/ArchitectSwingSessionImpl.java
Tue Apr 6 14:44:35 2010
+++
/trunk/src/main/java/ca/sqlpower/architect/swingui/ArchitectSwingSessionImpl.java
Tue Apr 20 15:12:12 2010
@@ -86,6 +86,7 @@
import ca.sqlpower.sqlobject.SQLDatabase;
import ca.sqlpower.sqlobject.SQLObjectException;
import ca.sqlpower.sqlobject.SQLObjectRoot;
+import ca.sqlpower.sqlobject.UserDefinedSQLType;
import ca.sqlpower.swingui.ModalDialogUserPrompter;
import ca.sqlpower.swingui.RecentMenu;
import ca.sqlpower.swingui.SPSUtils;
@@ -1208,4 +1209,8 @@
public ArchitectSession getDelegateSession() {
return delegateSession;
}
-}
+
+ public List<UserDefinedSQLType> getSQLTypes() {
+ return delegateSession.getSQLTypes();
+ }
+}
--
Subscription settings:
http://groups.google.com/group/architect-commits/subscribe?hl=en