Revision: 3949
Author: [email protected]
Date: Wed Sep 8 15:54:12 2010
Log: Moved the LiquibaseSettings to the ddl package from the swing to
correct the import errors and allow for a smaller architect library jar to
be imported into DQguru.
http://code.google.com/p/power-architect/source/detail?r=3949
Added:
/trunk/src/main/java/ca/sqlpower/architect/ddl/LiquibaseSettings.java
Deleted:
/trunk/src/main/java/ca/sqlpower/architect/swingui/LiquibaseSettings.java
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/ArchitectSession.java
/trunk/src/main/java/ca/sqlpower/architect/ArchitectSessionImpl.java
/trunk/src/main/java/ca/sqlpower/architect/ddl/LiquibaseDDLGenerator.java
/trunk/src/main/java/ca/sqlpower/architect/swingui/ArchitectSwingSessionImpl.java
/trunk/src/main/java/ca/sqlpower/architect/swingui/CompareDMSettings.java
/trunk/src/main/java/ca/sqlpower/architect/swingui/LiquibaseOptionsPanel.java
/trunk/src/main/java/ca/sqlpower/architect/swingui/SwingUIProjectLoader.java
=======================================
--- /dev/null
+++ /trunk/src/main/java/ca/sqlpower/architect/ddl/LiquibaseSettings.java
Wed Sep 8 15:54:12 2010
@@ -0,0 +1,79 @@
+/*
+ * Copyright (c) 2008, SQL Power Group Inc.
+ *
+ * This file is part of Power*Architect.
+ *
+ * Power*Architect is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Power*Architect is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package ca.sqlpower.architect.ddl;
+
+/**
+ *
+ * @author Thomas Kellerer
+ */
+public class LiquibaseSettings {
+
+ private boolean separateChangesets;
+ private boolean generateID;
+ private String author;
+ private int idStart = 1;
+ private boolean useAddPKTagForSingleColumns = true;
+
+ public LiquibaseSettings() {
+ }
+
+ public String getAuthor() {
+ return author;
+ }
+
+ public void setAuthor(String author) {
+ this.author = author;
+ }
+
+ public boolean getGenerateId() {
+ return generateID;
+ }
+
+ public void setGenerateId(boolean generateID) {
+ this.generateID = generateID;
+ }
+
+ public int getIdStart() {
+ return idStart;
+ }
+
+ public void setIdStart(int idStart) {
+ this.idStart = idStart;
+ }
+
+ public boolean getUseSeparateChangeSets() {
+ return separateChangesets;
+ }
+
+ public void setUseSeparateChangeSets(boolean separateChangesets) {
+ this.separateChangesets = separateChangesets;
+ }
+
+ public boolean getUseAddPKTagForSingleColumns() {
+ return useAddPKTagForSingleColumns;
+ }
+
+ public void setUseAddPKTagForSingleColumns(boolean flag) {
+ useAddPKTagForSingleColumns = flag;
+ }
+
+
+
+}
=======================================
---
/trunk/src/main/java/ca/sqlpower/architect/swingui/LiquibaseSettings.java
Sun Jun 20 10:57:59 2010
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Copyright (c) 2008, SQL Power Group Inc.
- *
- * This file is part of Power*Architect.
- *
- * Power*Architect is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * Power*Architect is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package ca.sqlpower.architect.swingui;
-
-/**
- *
- * @author Thomas Kellerer
- */
-public class LiquibaseSettings {
-
- private boolean separateChangesets;
- private boolean generateID;
- private String author;
- private int idStart = 1;
- private boolean useAddPKTagForSingleColumns = true;
-
- public LiquibaseSettings() {
- }
-
- public String getAuthor() {
- return author;
- }
-
- public void setAuthor(String author) {
- this.author = author;
- }
-
- public boolean getGenerateId() {
- return generateID;
- }
-
- public void setGenerateId(boolean generateID) {
- this.generateID = generateID;
- }
-
- public int getIdStart() {
- return idStart;
- }
-
- public void setIdStart(int idStart) {
- this.idStart = idStart;
- }
-
- public boolean getUseSeparateChangeSets() {
- return separateChangesets;
- }
-
- public void setUseSeparateChangeSets(boolean separateChangesets) {
- this.separateChangesets = separateChangesets;
- }
-
- public boolean getUseAddPKTagForSingleColumns() {
- return useAddPKTagForSingleColumns;
- }
-
- public void setUseAddPKTagForSingleColumns(boolean flag) {
- useAddPKTagForSingleColumns = flag;
- }
-
-
-
-}
=======================================
--- /trunk/regress/ca/sqlpower/architect/StubArchitectSession.java Wed Aug
4 13:00:45 2010
+++ /trunk/regress/ca/sqlpower/architect/StubArchitectSession.java Wed Sep
8 15:54:12 2010
@@ -22,8 +22,8 @@
import java.util.List;
import ca.sqlpower.architect.ddl.DDLGenerator;
+import ca.sqlpower.architect.ddl.LiquibaseSettings;
import ca.sqlpower.architect.profile.ProfileManager;
-import ca.sqlpower.architect.swingui.LiquibaseSettings;
import ca.sqlpower.object.SPObjectSnapshot;
import ca.sqlpower.sql.DataSourceCollection;
import ca.sqlpower.sql.JDBCDataSource;
=======================================
--- /trunk/regress/ca/sqlpower/architect/TestingArchitectSession.java Wed
Aug 4 13:00:45 2010
+++ /trunk/regress/ca/sqlpower/architect/TestingArchitectSession.java Wed
Sep 8 15:54:12 2010
@@ -35,9 +35,9 @@
import java.util.List;
import ca.sqlpower.architect.ddl.DDLGenerator;
+import ca.sqlpower.architect.ddl.LiquibaseSettings;
import ca.sqlpower.architect.olap.OLAPRootObject;
import ca.sqlpower.architect.profile.ProfileManager;
-import ca.sqlpower.architect.swingui.LiquibaseSettings;
import ca.sqlpower.object.SPObjectSnapshot;
import ca.sqlpower.sql.DataSourceCollection;
import ca.sqlpower.sql.JDBCDataSource;
=======================================
---
/trunk/regress/ca/sqlpower/architect/swingui/TestingArchitectSwingSession.java
Wed Aug 4 13:00:45 2010
+++
/trunk/regress/ca/sqlpower/architect/swingui/TestingArchitectSwingSession.java
Wed Sep 8 15:54:12 2010
@@ -41,6 +41,7 @@
import ca.sqlpower.architect.ProjectSettings.ColumnVisibility;
import ca.sqlpower.architect.ddl.DDLGenerator;
import ca.sqlpower.architect.ddl.GenericDDLGenerator;
+import ca.sqlpower.architect.ddl.LiquibaseSettings;
import ca.sqlpower.architect.enterprise.ArchitectClientSideSession;
import ca.sqlpower.architect.etl.kettle.KettleJob;
import ca.sqlpower.architect.olap.OLAPRootObject;
=======================================
--- /trunk/src/main/java/ca/sqlpower/architect/ArchitectSession.java Wed
Sep 8 09:16:07 2010
+++ /trunk/src/main/java/ca/sqlpower/architect/ArchitectSession.java Wed
Sep 8 15:54:12 2010
@@ -22,8 +22,8 @@
import java.util.List;
import ca.sqlpower.architect.ddl.DDLGenerator;
+import ca.sqlpower.architect.ddl.LiquibaseSettings;
import ca.sqlpower.architect.profile.ProfileManager;
-import ca.sqlpower.architect.swingui.LiquibaseSettings;
import ca.sqlpower.object.SPObjectSnapshot;
import ca.sqlpower.sql.DataSourceCollection;
import ca.sqlpower.sql.JDBCDataSource;
=======================================
--- /trunk/src/main/java/ca/sqlpower/architect/ArchitectSessionImpl.java
Fri Aug 6 16:17:03 2010
+++ /trunk/src/main/java/ca/sqlpower/architect/ArchitectSessionImpl.java
Wed Sep 8 15:54:12 2010
@@ -26,9 +26,9 @@
import ca.sqlpower.architect.ddl.DDLGenerator;
import ca.sqlpower.architect.ddl.GenericDDLGenerator;
+import ca.sqlpower.architect.ddl.LiquibaseSettings;
import ca.sqlpower.architect.profile.ProfileManager;
import ca.sqlpower.architect.profile.ProfileManagerImpl;
-import ca.sqlpower.architect.swingui.LiquibaseSettings;
import ca.sqlpower.object.SPObjectSnapshot;
import ca.sqlpower.sql.DataSourceCollection;
import ca.sqlpower.sql.JDBCDataSource;
=======================================
---
/trunk/src/main/java/ca/sqlpower/architect/ddl/LiquibaseDDLGenerator.java
Wed Jul 7 11:16:36 2010
+++
/trunk/src/main/java/ca/sqlpower/architect/ddl/LiquibaseDDLGenerator.java
Wed Sep 8 15:54:12 2010
@@ -33,7 +33,6 @@
import ca.sqlpower.architect.ArchitectUtils;
import ca.sqlpower.architect.ddl.DDLStatement.StatementType;
-import ca.sqlpower.architect.swingui.LiquibaseSettings;
import ca.sqlpower.sqlobject.SQLColumn;
import ca.sqlpower.sqlobject.SQLDatabase;
import ca.sqlpower.sqlobject.SQLIndex;
=======================================
---
/trunk/src/main/java/ca/sqlpower/architect/swingui/ArchitectSwingSessionImpl.java
Wed Aug 25 13:13:44 2010
+++
/trunk/src/main/java/ca/sqlpower/architect/swingui/ArchitectSwingSessionImpl.java
Wed Sep 8 15:54:12 2010
@@ -63,6 +63,7 @@
import ca.sqlpower.architect.UserSettings;
import ca.sqlpower.architect.ProjectSettings.ColumnVisibility;
import ca.sqlpower.architect.ddl.DDLGenerator;
+import ca.sqlpower.architect.ddl.LiquibaseSettings;
import ca.sqlpower.architect.enterprise.ArchitectClientSideSession;
import ca.sqlpower.architect.enterprise.NetworkConflictResolver;
import ca.sqlpower.architect.etl.kettle.KettleJob;
=======================================
---
/trunk/src/main/java/ca/sqlpower/architect/swingui/CompareDMSettings.java
Sat May 22 08:44:54 2010
+++
/trunk/src/main/java/ca/sqlpower/architect/swingui/CompareDMSettings.java
Wed Sep 8 15:54:12 2010
@@ -19,6 +19,7 @@
package ca.sqlpower.architect.swingui;
import ca.sqlpower.architect.ddl.DDLGenerator;
+import ca.sqlpower.architect.ddl.LiquibaseSettings;
import ca.sqlpower.architect.swingui.CompareDMPanel.SourceOrTargetStuff;
public class CompareDMSettings {
=======================================
---
/trunk/src/main/java/ca/sqlpower/architect/swingui/LiquibaseOptionsPanel.java
Sun Jun 20 10:57:59 2010
+++
/trunk/src/main/java/ca/sqlpower/architect/swingui/LiquibaseOptionsPanel.java
Wed Sep 8 15:54:12 2010
@@ -28,6 +28,7 @@
import net.miginfocom.swing.MigLayout;
import ca.sqlpower.architect.ddl.LiquibaseDDLGenerator;
+import ca.sqlpower.architect.ddl.LiquibaseSettings;
import ca.sqlpower.swingui.DataEntryPanel;
/**
=======================================
---
/trunk/src/main/java/ca/sqlpower/architect/swingui/SwingUIProjectLoader.java
Wed Sep 8 08:39:58 2010
+++
/trunk/src/main/java/ca/sqlpower/architect/swingui/SwingUIProjectLoader.java
Wed Sep 8 15:54:12 2010
@@ -51,6 +51,7 @@
import ca.sqlpower.architect.UnclosableInputStream;
import ca.sqlpower.architect.ProjectSettings.ColumnVisibility;
import ca.sqlpower.architect.ddl.DDLGenerator;
+import ca.sqlpower.architect.ddl.LiquibaseSettings;
import ca.sqlpower.architect.ddl.critic.CriticAndSettings;
import ca.sqlpower.architect.ddl.critic.CriticGrouping;
import ca.sqlpower.architect.ddl.critic.CriticManager;
