|
From: <man...@us...> - 2011-02-22 14:59:19
|
Revision: 6167
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6167&view=rev
Author: manningr
Date: 2011-02-22 14:59:13 +0000 (Tue, 22 Feb 2011)
Log Message:
-----------
Pulled prefence bean into base class as it is likely to be used by all diff presentations at some point.
Modified Paths:
--------------
trunk/sql12/plugins/dbdiff/src/main/java/net/sourceforge/squirrel_sql/plugins/dbdiff/gui/AbstractDiffPresentation.java
trunk/sql12/plugins/dbdiff/src/main/java/net/sourceforge/squirrel_sql/plugins/dbdiff/gui/AbstractSideBySideDiffPresentation.java
trunk/sql12/plugins/dbdiff/src/main/java/net/sourceforge/squirrel_sql/plugins/dbdiff/gui/DiffPresentationFactoryImpl.java
trunk/sql12/plugins/dbdiff/src/main/java/net/sourceforge/squirrel_sql/plugins/dbdiff/gui/IDiffPresentation.java
Modified: trunk/sql12/plugins/dbdiff/src/main/java/net/sourceforge/squirrel_sql/plugins/dbdiff/gui/AbstractDiffPresentation.java
===================================================================
--- trunk/sql12/plugins/dbdiff/src/main/java/net/sourceforge/squirrel_sql/plugins/dbdiff/gui/AbstractDiffPresentation.java 2011-02-22 14:57:13 UTC (rev 6166)
+++ trunk/sql12/plugins/dbdiff/src/main/java/net/sourceforge/squirrel_sql/plugins/dbdiff/gui/AbstractDiffPresentation.java 2011-02-22 14:59:13 UTC (rev 6167)
@@ -22,6 +22,7 @@
import net.sourceforge.squirrel_sql.client.session.ISession;
import net.sourceforge.squirrel_sql.fw.util.Utilities;
import net.sourceforge.squirrel_sql.plugins.dbdiff.SessionInfoProvider;
+import net.sourceforge.squirrel_sql.plugins.dbdiff.prefs.DBDiffPreferenceBean;
/**
* Base class for all DiffPresentation implementations that supports the common requirement to have access to
@@ -39,6 +40,11 @@
/** the destination session. This comes from prov */
protected ISession destSession = null;
+ /**
+ * preferenceBean
+ */
+ protected DBDiffPreferenceBean preferenceBean = null;
+
public void setSessionInfoProvider(SessionInfoProvider provider)
{
Utilities.checkNull("setSessionInfoProvider", "provider", provider);
@@ -47,4 +53,14 @@
destSession = sessionInfoProvider.getDestSession();
}
+ /**
+ * @param preferenceBean
+ * the preferenceBean to set
+ */
+ public void setPreferenceBean(DBDiffPreferenceBean preferenceBean)
+ {
+ Utilities.checkNull("setPreferenceBean", "preferenceBean", preferenceBean);
+ this.preferenceBean = preferenceBean;
+ }
+
}
Modified: trunk/sql12/plugins/dbdiff/src/main/java/net/sourceforge/squirrel_sql/plugins/dbdiff/gui/AbstractSideBySideDiffPresentation.java
===================================================================
--- trunk/sql12/plugins/dbdiff/src/main/java/net/sourceforge/squirrel_sql/plugins/dbdiff/gui/AbstractSideBySideDiffPresentation.java 2011-02-22 14:57:13 UTC (rev 6166)
+++ trunk/sql12/plugins/dbdiff/src/main/java/net/sourceforge/squirrel_sql/plugins/dbdiff/gui/AbstractSideBySideDiffPresentation.java 2011-02-22 14:59:13 UTC (rev 6167)
@@ -40,7 +40,6 @@
import net.sourceforge.squirrel_sql.fw.util.log.ILogger;
import net.sourceforge.squirrel_sql.fw.util.log.LoggerController;
import net.sourceforge.squirrel_sql.plugins.dbdiff.IScriptFileManager;
-import net.sourceforge.squirrel_sql.plugins.dbdiff.prefs.DBDiffPreferenceBean;
/**
* Base class for all DiffPresentation implementations that display a comparison of the contents of two files
@@ -62,11 +61,6 @@
private IDialectFactory dialectFactory = new DialectFactoryImpl();
/**
- * preferenceBean
- */
- protected DBDiffPreferenceBean preferenceBean = null;
-
- /**
* Sub-class implementations should override this method to provide the implementation for comparing the
* contents of the specified script filenames.
*
@@ -193,14 +187,4 @@
this.dialectFactory = dialectFactory;
}
- /**
- * @param preferenceBean
- * the preferenceBean to set
- */
- public void setPreferenceBean(DBDiffPreferenceBean preferenceBean)
- {
- Utilities.checkNull("setPreferenceBean", preferenceBean, "preferenceBean");
- this.preferenceBean = preferenceBean;
- }
-
}
Modified: trunk/sql12/plugins/dbdiff/src/main/java/net/sourceforge/squirrel_sql/plugins/dbdiff/gui/DiffPresentationFactoryImpl.java
===================================================================
--- trunk/sql12/plugins/dbdiff/src/main/java/net/sourceforge/squirrel_sql/plugins/dbdiff/gui/DiffPresentationFactoryImpl.java 2011-02-22 14:57:13 UTC (rev 6166)
+++ trunk/sql12/plugins/dbdiff/src/main/java/net/sourceforge/squirrel_sql/plugins/dbdiff/gui/DiffPresentationFactoryImpl.java 2011-02-22 14:59:13 UTC (rev 6167)
@@ -55,6 +55,7 @@
}
result.setSessionInfoProvider(sessionInfoProvider);
+ result.setPreferenceBean(preferenceBean);
return result;
}
Modified: trunk/sql12/plugins/dbdiff/src/main/java/net/sourceforge/squirrel_sql/plugins/dbdiff/gui/IDiffPresentation.java
===================================================================
--- trunk/sql12/plugins/dbdiff/src/main/java/net/sourceforge/squirrel_sql/plugins/dbdiff/gui/IDiffPresentation.java 2011-02-22 14:57:13 UTC (rev 6166)
+++ trunk/sql12/plugins/dbdiff/src/main/java/net/sourceforge/squirrel_sql/plugins/dbdiff/gui/IDiffPresentation.java 2011-02-22 14:59:13 UTC (rev 6167)
@@ -20,6 +20,7 @@
package net.sourceforge.squirrel_sql.plugins.dbdiff.gui;
import net.sourceforge.squirrel_sql.plugins.dbdiff.SessionInfoProvider;
+import net.sourceforge.squirrel_sql.plugins.dbdiff.prefs.DBDiffPreferenceBean;
/**
* Interface for classes that display differences between the two sessions given in the SessionInfoProvider.
@@ -39,4 +40,10 @@
* Execute the comparison.
*/
void execute();
+
+ /**
+ * @param preferenceBean
+ * the preferenceBean to set
+ */
+ public void setPreferenceBean(DBDiffPreferenceBean preferenceBean);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
