You can subscribe to this list here.
| 2004 |
Jan
|
Feb
|
Mar
|
Apr
(121) |
May
(188) |
Jun
(134) |
Jul
(115) |
Aug
(201) |
Sep
(22) |
Oct
(22) |
Nov
(15) |
Dec
(32) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2005 |
Jan
(20) |
Feb
(4) |
Mar
(1) |
Apr
(84) |
May
(107) |
Jun
(101) |
Jul
(131) |
Aug
(66) |
Sep
(55) |
Oct
(189) |
Nov
(164) |
Dec
(60) |
| 2006 |
Jan
(75) |
Feb
(107) |
Mar
(117) |
Apr
(115) |
May
(91) |
Jun
(91) |
Jul
(225) |
Aug
(151) |
Sep
(117) |
Oct
(165) |
Nov
(263) |
Dec
(233) |
| 2007 |
Jan
(244) |
Feb
(116) |
Mar
(185) |
Apr
(263) |
May
(149) |
Jun
(292) |
Jul
(260) |
Aug
(306) |
Sep
(130) |
Oct
(61) |
Nov
(103) |
Dec
(144) |
| 2008 |
Jan
(112) |
Feb
(55) |
Mar
(116) |
Apr
(76) |
May
(69) |
Jun
(130) |
Jul
(75) |
Aug
(56) |
Sep
(76) |
Oct
(87) |
Nov
(403) |
Dec
(410) |
| 2009 |
Jan
(132) |
Feb
(168) |
Mar
(197) |
Apr
(67) |
May
(8) |
Jun
(44) |
Jul
(144) |
Aug
(126) |
Sep
(88) |
Oct
(3) |
Nov
(81) |
Dec
(97) |
| 2010 |
Jan
(238) |
Feb
(41) |
Mar
(61) |
Apr
(37) |
May
(31) |
Jun
(22) |
Jul
(92) |
Aug
(105) |
Sep
(46) |
Oct
(45) |
Nov
(55) |
Dec
(92) |
| 2011 |
Jan
(51) |
Feb
(21) |
Mar
(57) |
Apr
(20) |
May
(32) |
Jun
(29) |
Jul
(26) |
Aug
(50) |
Sep
(59) |
Oct
(25) |
Nov
(79) |
Dec
(2) |
| 2012 |
Jan
(14) |
Feb
(31) |
Mar
(11) |
Apr
(9) |
May
(13) |
Jun
(9) |
Jul
(6) |
Aug
(12) |
Sep
(16) |
Oct
(37) |
Nov
(12) |
Dec
(7) |
| 2013 |
Jan
(9) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <man...@us...> - 2010-12-20 14:08:57
|
Revision: 6035
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6035&view=rev
Author: manningr
Date: 2010-12-20 14:08:51 +0000 (Mon, 20 Dec 2010)
Log Message:
-----------
Added Toshiki's Japanese translation to the installer.
Modified Paths:
--------------
trunk/sql12/installer/squirrelsql-other-installer/src/main/resources/izpack-other.xml
trunk/sql12/installer/squirrelsql-other-installer/src/test/resources/optional-auto-install.xml
Modified: trunk/sql12/installer/squirrelsql-other-installer/src/main/resources/izpack-other.xml
===================================================================
--- trunk/sql12/installer/squirrelsql-other-installer/src/main/resources/izpack-other.xml 2010-12-20 14:06:22 UTC (rev 6034)
+++ trunk/sql12/installer/squirrelsql-other-installer/src/main/resources/izpack-other.xml 2010-12-20 14:08:51 UTC (rev 6035)
@@ -345,6 +345,13 @@
<file targetdir="$INSTALL_PATH/lib" src="translations/squirrel-sql_it_IT.jar" />
</pack>
+ <pack required="no" preselected="no" installGroups="Translations" name="Optional Translation - Japanese">
+ <description>
+ Provides native labels and user messages for use in an Japanese locale (Toshiki IGA)
+ </description>
+ <file targetdir="$INSTALL_PATH/lib" src="translations/squirrel-sql_ja_JP.jar" />
+ </pack>
+
<pack required="no" preselected="no" installGroups="Translations" name="Optional Translation - Korean">
<description>
Provides native labels and user messages for use in a Korean locale (Youngwoo)
Modified: trunk/sql12/installer/squirrelsql-other-installer/src/test/resources/optional-auto-install.xml
===================================================================
--- trunk/sql12/installer/squirrelsql-other-installer/src/test/resources/optional-auto-install.xml 2010-12-20 14:06:22 UTC (rev 6034)
+++ trunk/sql12/installer/squirrelsql-other-installer/src/test/resources/optional-auto-install.xml 2010-12-20 14:08:51 UTC (rev 6035)
@@ -38,10 +38,11 @@
<pack index="29" name="Optional Translation - French" selected="true"/>
<pack index="30" name="Optional Translation - German" selected="true"/>
<pack index="31" name="Optional Translation - Italian" selected="true"/>
-<pack index="32" name="Optional Translation - Korean" selected="true"/>
-<pack index="33" name="Optional Translation - Polish" selected="true"/>
-<pack index="34" name="Optional Translation - Russian" selected="true"/>
-<pack index="35" name="Optional Translation - Spanish" selected="true"/>
+<pack index="32" name="Optional Translation - Japanese" selected="true"/>
+<pack index="33" name="Optional Translation - Korean" selected="true"/>
+<pack index="34" name="Optional Translation - Polish" selected="true"/>
+<pack index="35" name="Optional Translation - Russian" selected="true"/>
+<pack index="36" name="Optional Translation - Spanish" selected="true"/>
</com.izforge.izpack.panels.PacksPanel>
<com.izforge.izpack.panels.InstallPanel id="UNKNOWN (com.izforge.izpack.panels.InstallPanel)"/>
<com.izforge.izpack.panels.ShortcutPanel id="UNKNOWN (com.izforge.izpack.panels.ShortcutPanel)"/>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <man...@us...> - 2010-12-20 14:06:28
|
Revision: 6034
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6034&view=rev
Author: manningr
Date: 2010-12-20 14:06:22 +0000 (Mon, 20 Dec 2010)
Log Message:
-----------
changed group for consistency with other projects in this level of the build tree.
Modified Paths:
--------------
trunk/sql12/plugins/squirrelsql-plugins-assembly-descriptor/pom.xml
Modified: trunk/sql12/plugins/squirrelsql-plugins-assembly-descriptor/pom.xml
===================================================================
--- trunk/sql12/plugins/squirrelsql-plugins-assembly-descriptor/pom.xml 2010-12-19 22:14:58 UTC (rev 6033)
+++ trunk/sql12/plugins/squirrelsql-plugins-assembly-descriptor/pom.xml 2010-12-20 14:06:22 UTC (rev 6034)
@@ -8,6 +8,7 @@
<relativePath>../../pom.xml</relativePath>
</parent>
+ <groupId>net.sf.squirrel-sql.plugins</groupId>
<artifactId>squirrelsql-plugins-assembly-descriptor</artifactId>
<packaging>jar</packaging>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <man...@us...> - 2010-12-19 22:15:04
|
Revision: 6033
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6033&view=rev
Author: manningr
Date: 2010-12-19 22:14:58 +0000 (Sun, 19 Dec 2010)
Log Message:
-----------
3138746: Typo within PluginClassName of SyntaxPlugin.
Modified Paths:
--------------
trunk/sql12/doc/src/main/resources/changes.txt
Modified: trunk/sql12/doc/src/main/resources/changes.txt
===================================================================
--- trunk/sql12/doc/src/main/resources/changes.txt 2010-12-19 22:13:25 UTC (rev 6032)
+++ trunk/sql12/doc/src/main/resources/changes.txt 2010-12-19 22:14:58 UTC (rev 6033)
@@ -23,20 +23,21 @@
New Session property to let SQuirreL set fetch size (call Statement.setFetchSize(int)).
See Session properties --> SQL tab.
- Thanks to Stefan (wis775) for the patch
+ Thanks to Stefan (wis775) for the patch.
Bug-fixes:
+3138746: Typo within PluginClassName of SyntaxPlugin.
3137390: Cannot connect after latest software update.
-3136386: Deleting table content via context menu does not work
-3123014: StackOverflow ProgressCallBackDialog.
+3136386: Deleting table content via context menu does not work.
+3123014: StackOverflow ProgressCallBackDialog.
Thanks to Stefan (wis775) for the patch.
-3055859: Regular expressions did not work in find & replace dialog
+3055859: Regular expressions did not work in find & replace dialog.
Thanks to Stefan (wis775) for the patch.
Fixed translation label that was not being applied to "Initialize Session Timezone" checkbox.
- Thanks to Ivo Neri for the patch.
+ Thanks to Ivo Neri for the patch.
3.2.0 (11/21/2010)
==================
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <man...@us...> - 2010-12-19 22:13:33
|
Revision: 6032
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6032&view=rev
Author: manningr
Date: 2010-12-19 22:13:25 +0000 (Sun, 19 Dec 2010)
Log Message:
-----------
3138746: Typo within PluginClassName of SyntaxPlugin.
Modified Paths:
--------------
trunk/sql12/plugins/syntax/src/main/java/net/sourceforge/squirrel_sql/plugins/syntax/AutoCorrectController.java
trunk/sql12/plugins/syntax/src/main/java/net/sourceforge/squirrel_sql/plugins/syntax/AutoCorrector.java
trunk/sql12/plugins/syntax/src/main/java/net/sourceforge/squirrel_sql/plugins/syntax/ConfigureAutoCorrectAction.java
trunk/sql12/plugins/syntax/src/main/java/net/sourceforge/squirrel_sql/plugins/syntax/SQLEntryPanelFactoryProxy.java
trunk/sql12/plugins/syntax/src/main/java/net/sourceforge/squirrel_sql/plugins/syntax/ToolsPopupHandler.java
trunk/sql12/plugins/syntax/src/main/java/net/sourceforge/squirrel_sql/plugins/syntax/netbeans/NetbeansSQLEditorPane.java
trunk/sql12/plugins/syntax/src/main/java/net/sourceforge/squirrel_sql/plugins/syntax/netbeans/NetbeansSQLEntryAreaFactory.java
trunk/sql12/plugins/syntax/src/main/java/net/sourceforge/squirrel_sql/plugins/syntax/netbeans/NetbeansSQLEntryPanel.java
trunk/sql12/plugins/syntax/src/main/java/net/sourceforge/squirrel_sql/plugins/syntax/netbeans/SQLSettingsDefaults.java
trunk/sql12/plugins/syntax/src/main/java/net/sourceforge/squirrel_sql/plugins/syntax/netbeans/SQLSettingsInitializer.java
trunk/sql12/plugins/syntax/src/main/java/net/sourceforge/squirrel_sql/plugins/syntax/netbeans/SquirrelNBDialogFactory.java
trunk/sql12/plugins/syntax/src/main/java/net/sourceforge/squirrel_sql/plugins/syntax/oster/OsterSQLEntryAreaFactory.java
trunk/sql12/plugins/syntax/src/main/java/net/sourceforge/squirrel_sql/plugins/syntax/rsyntax/RSyntaxSQLEntryAreaFactory.java
trunk/sql12/plugins/syntax/src/test/java/net/sourceforge/squirrel_sql/plugins/syntax/SyntaxPluginTest.java
Added Paths:
-----------
trunk/sql12/plugins/syntax/src/main/java/net/sourceforge/squirrel_sql/plugins/syntax/SyntaxPlugin.java
Removed Paths:
-------------
trunk/sql12/plugins/syntax/src/main/java/net/sourceforge/squirrel_sql/plugins/syntax/SyntaxPugin.java
Modified: trunk/sql12/plugins/syntax/src/main/java/net/sourceforge/squirrel_sql/plugins/syntax/AutoCorrectController.java
===================================================================
--- trunk/sql12/plugins/syntax/src/main/java/net/sourceforge/squirrel_sql/plugins/syntax/AutoCorrectController.java 2010-12-19 21:51:31 UTC (rev 6031)
+++ trunk/sql12/plugins/syntax/src/main/java/net/sourceforge/squirrel_sql/plugins/syntax/AutoCorrectController.java 2010-12-19 22:13:25 UTC (rev 6032)
@@ -18,9 +18,9 @@
private AutoCorrectDlg _dlg;
- private SyntaxPugin _syntaxPugin;
+ private SyntaxPlugin _syntaxPugin;
- public AutoCorrectController(SyntaxPugin syntaxPugin)
+ public AutoCorrectController(SyntaxPlugin syntaxPugin)
{
_syntaxPugin = syntaxPugin;
Modified: trunk/sql12/plugins/syntax/src/main/java/net/sourceforge/squirrel_sql/plugins/syntax/AutoCorrector.java
===================================================================
--- trunk/sql12/plugins/syntax/src/main/java/net/sourceforge/squirrel_sql/plugins/syntax/AutoCorrector.java 2010-12-19 21:51:31 UTC (rev 6031)
+++ trunk/sql12/plugins/syntax/src/main/java/net/sourceforge/squirrel_sql/plugins/syntax/AutoCorrector.java 2010-12-19 22:13:25 UTC (rev 6032)
@@ -17,13 +17,13 @@
private JTextComponent _txtComp;
- private SyntaxPugin _plugin;
+ private SyntaxPlugin _plugin;
private int _autocorrectionsCount = 0;
private static final String PREFS_KEY_AUTO_COORECTIONS_COUNT = "squirrelSql_syntax_autocorrections_count";
- public AutoCorrector(JTextComponent txtComp, SyntaxPugin plugin)
+ public AutoCorrector(JTextComponent txtComp, SyntaxPlugin plugin)
{
_txtComp = txtComp;
_plugin = plugin;
Modified: trunk/sql12/plugins/syntax/src/main/java/net/sourceforge/squirrel_sql/plugins/syntax/ConfigureAutoCorrectAction.java
===================================================================
--- trunk/sql12/plugins/syntax/src/main/java/net/sourceforge/squirrel_sql/plugins/syntax/ConfigureAutoCorrectAction.java 2010-12-19 21:51:31 UTC (rev 6031)
+++ trunk/sql12/plugins/syntax/src/main/java/net/sourceforge/squirrel_sql/plugins/syntax/ConfigureAutoCorrectAction.java 2010-12-19 22:13:25 UTC (rev 6032)
@@ -1,19 +1,18 @@
package net.sourceforge.squirrel_sql.plugins.syntax;
+import java.awt.event.ActionEvent;
+
import net.sourceforge.squirrel_sql.client.IApplication;
-import net.sourceforge.squirrel_sql.client.session.action.ISessionAction;
-import net.sourceforge.squirrel_sql.client.session.ISession;
import net.sourceforge.squirrel_sql.client.action.SquirrelAction;
+import net.sourceforge.squirrel_sql.client.session.ISession;
+import net.sourceforge.squirrel_sql.client.session.action.ISessionAction;
-import javax.swing.*;
-import java.awt.event.ActionEvent;
-
public class ConfigureAutoCorrectAction extends SquirrelAction implements ISessionAction
{
- private SyntaxPugin _syntaxPugin;
+ private SyntaxPlugin _syntaxPugin;
- public ConfigureAutoCorrectAction(IApplication app, SyntaxPluginResources resources, SyntaxPugin syntaxPugin)
+ public ConfigureAutoCorrectAction(IApplication app, SyntaxPluginResources resources, SyntaxPlugin syntaxPugin)
{
super(app, resources);
_syntaxPugin = syntaxPugin;
Modified: trunk/sql12/plugins/syntax/src/main/java/net/sourceforge/squirrel_sql/plugins/syntax/SQLEntryPanelFactoryProxy.java
===================================================================
--- trunk/sql12/plugins/syntax/src/main/java/net/sourceforge/squirrel_sql/plugins/syntax/SQLEntryPanelFactoryProxy.java 2010-12-19 21:51:31 UTC (rev 6031)
+++ trunk/sql12/plugins/syntax/src/main/java/net/sourceforge/squirrel_sql/plugins/syntax/SQLEntryPanelFactoryProxy.java 2010-12-19 22:13:25 UTC (rev 6032)
@@ -22,7 +22,7 @@
private NetbeansSQLEntryAreaFactory _netbeansFactory;
private OsterSQLEntryAreaFactory _osterFactory;
- private SyntaxPugin _syntaxPugin;
+ private SyntaxPlugin _syntaxPugin;
/** The original Squirrel SQL CLient factory for creating SQL entry panels. */
private ISQLEntryPanelFactory _originalFactory;
@@ -30,7 +30,7 @@
private RSyntaxSQLEntryAreaFactory _rsyntaxFactory;
- SQLEntryPanelFactoryProxy(SyntaxPugin syntaxPugin, ISQLEntryPanelFactory originalFactory)
+ SQLEntryPanelFactoryProxy(SyntaxPlugin syntaxPugin, ISQLEntryPanelFactory originalFactory)
{
_originalFactory = originalFactory;
_rsyntaxFactory = new RSyntaxSQLEntryAreaFactory(syntaxPugin);
Copied: trunk/sql12/plugins/syntax/src/main/java/net/sourceforge/squirrel_sql/plugins/syntax/SyntaxPlugin.java (from rev 6018, trunk/sql12/plugins/syntax/src/main/java/net/sourceforge/squirrel_sql/plugins/syntax/SyntaxPugin.java)
===================================================================
--- trunk/sql12/plugins/syntax/src/main/java/net/sourceforge/squirrel_sql/plugins/syntax/SyntaxPlugin.java (rev 0)
+++ trunk/sql12/plugins/syntax/src/main/java/net/sourceforge/squirrel_sql/plugins/syntax/SyntaxPlugin.java 2010-12-19 22:13:25 UTC (rev 6032)
@@ -0,0 +1,588 @@
+package net.sourceforge.squirrel_sql.plugins.syntax;
+/*
+ * Copyright (C) 2003 Colin Bell
+ * co...@us...
+ *
+ * This program 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 2
+ * of the License, or any later version.
+ *
+ * This program 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, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+import net.sourceforge.squirrel_sql.client.IApplication;
+import net.sourceforge.squirrel_sql.client.action.ActionCollection;
+import net.sourceforge.squirrel_sql.client.gui.session.ObjectTreeInternalFrame;
+import net.sourceforge.squirrel_sql.client.gui.session.SQLInternalFrame;
+import net.sourceforge.squirrel_sql.client.gui.session.SessionInternalFrame;
+import net.sourceforge.squirrel_sql.client.plugin.DefaultSessionPlugin;
+import net.sourceforge.squirrel_sql.client.plugin.PluginException;
+import net.sourceforge.squirrel_sql.client.plugin.PluginSessionCallback;
+import net.sourceforge.squirrel_sql.client.preferences.INewSessionPropertiesPanel;
+import net.sourceforge.squirrel_sql.client.session.ISQLEntryPanelFactory;
+import net.sourceforge.squirrel_sql.client.session.ISQLPanelAPI;
+import net.sourceforge.squirrel_sql.client.session.ISession;
+import net.sourceforge.squirrel_sql.client.session.properties.ISessionPropertiesPanel;
+import net.sourceforge.squirrel_sql.fw.id.IIdentifier;
+import net.sourceforge.squirrel_sql.fw.util.StringManager;
+import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory;
+import net.sourceforge.squirrel_sql.fw.util.log.ILogger;
+import net.sourceforge.squirrel_sql.fw.util.log.LoggerController;
+import net.sourceforge.squirrel_sql.fw.xml.XMLBeanReader;
+import net.sourceforge.squirrel_sql.fw.xml.XMLBeanWriter;
+import net.sourceforge.squirrel_sql.plugins.syntax.netbeans.NetbeansSQLEntryPanel;
+import net.sourceforge.squirrel_sql.plugins.syntax.ReplaceAction;
+import net.sourceforge.squirrel_sql.plugins.syntax.oster.OsterSQLEntryPanel;
+import net.sourceforge.squirrel_sql.plugins.syntax.rsyntax.RSyntaxSQLEntryPanel;
+import net.sourceforge.squirrel_sql.plugins.syntax.UnmarkAction;
+
+import javax.swing.*;
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+
+/**
+ * The Ostermiller plugin class. This plugin adds syntax highlighting to the
+ * SQL entry area.
+ *
+ * @author <A HREF="mailto:co...@us...">Colin Bell</A>
+ */
+public class SyntaxPlugin extends DefaultSessionPlugin
+{
+ private static final StringManager s_stringMgr =
+ StringManagerFactory.getStringManager(SyntaxPlugin.class);
+
+ static interface i18n
+ {
+ //i18n[SyntaxPlugin.touppercase=touppercase]
+ String TO_UPPER_CASE =
+ s_stringMgr.getString("SyntaxPlugin.touppercase");
+ //i18n[SyntaxPlugin.tolowercase=tolowercase]
+ String TO_LOWER_CASE =
+ s_stringMgr.getString("SyntaxPlugin.tolowercase");
+ //i18n[SyntaxPlugin.find=find]
+ String FIND = s_stringMgr.getString("SyntaxPlugin.find");
+ //i18n[SyntaxPlugin.findSelected=findselected]
+ String FIND_SELECTED = s_stringMgr.getString("SyntaxPlugin.findselected");
+ //i18n[SyntaxPlugin.repeatLastFind=findrepeatlast]
+ String REPEAT_LAST_FIND = s_stringMgr.getString("SyntaxPlugin.repeatLastFind");
+ //i18n[SyntaxPlugin.markSelected=markselected]
+ String MARK_SELECTED = s_stringMgr.getString("SyntaxPlugin.markSelected");
+ //i18n[SyntaxPlugin.replace=replace]
+ String REPLACE = s_stringMgr.getString("SyntaxPlugin.replace");
+ //i18n[SyntaxPlugin.unmark=unmark]
+ String UNMARK = s_stringMgr.getString("SyntaxPlugin.unmark");
+ //i18n[SyntaxPlugin.gotoline=gotoline]
+ String GO_TO_LINE = s_stringMgr.getString("SyntaxPlugin.gotoline");
+ //i18n[SyntaxPlugin.autocorr=autocorr]
+ String AUTO_CORR = s_stringMgr.getString("SyntaxPlugin.autocorr");
+ //i18n[SyntaxPlugin.duplicateline=duplicateline]
+ String DUP_LINE = s_stringMgr.getString("SyntaxPlugin.duplicateline");
+ //i18n[SyntaxPlugin.comment=comment]
+ String COMMENT = s_stringMgr.getString("SyntaxPlugin.comment");
+ //i18n[SyntaxPlugin.uncomment=uncomment]
+ String UNCOMMENT = s_stringMgr.getString("SyntaxPlugin.uncomment");
+
+ }
+
+ /** Logger for this class. */
+ private static final ILogger s_log = LoggerController.createLogger(SyntaxPlugin.class);
+
+ /** SyntaxPreferences for new sessions. */
+ private SyntaxPreferences _newSessionPrefs;
+
+ /** Folder to store user settings in. */
+ private File _userSettingsFolder;
+
+ /** Factory that creates text controls. */
+ private SQLEntryPanelFactoryProxy _sqlEntryFactoryProxy;
+
+ /** Listeners to the preferences object in each open session. */
+ private Map<IIdentifier, SessionPreferencesListener> _prefListeners =
+ new HashMap<IIdentifier, SessionPreferencesListener>();
+
+ /** Resources for this plugin. */
+ private SyntaxPluginResources _resources;
+ private AutoCorrectProviderImpl _autoCorrectProvider;
+
+ private interface IMenuResourceKeys
+ {
+ String MENU = "syntax";
+ }
+
+
+ /**
+ * Return the internal name of this plugin.
+ *
+ * @return the internal name of this plugin.
+ */
+ public String getInternalName()
+ {
+ return "syntax";
+ }
+
+ /**
+ * Return the descriptive name of this plugin.
+ *
+ * @return the descriptive name of this plugin.
+ */
+ public String getDescriptiveName()
+ {
+ return "Syntax Highlighting Plugin";
+ }
+
+ /**
+ * Returns the current version of this plugin.
+ *
+ * @return the current version of this plugin.
+ */
+ public String getVersion()
+ {
+ return "1.0";
+ }
+
+ /**
+ * Returns the authors name.
+ *
+ * @return the authors name.
+ */
+ public String getAuthor()
+ {
+ return "Gerd Wagner, Colin Bell";
+ }
+
+
+ /**
+ * Returns the name of the change log for the plugin. This should
+ * be a text or HTML file residing in the <TT>getPluginAppSettingsFolder</TT>
+ * directory.
+ *
+ * @return the changelog file name or <TT>null</TT> if plugin doesn't have
+ * a change log.
+ */
+ public String getChangeLogFileName()
+ {
+ return "changes.txt";
+ }
+
+ /**
+ * Returns the name of the Help file for the plugin. This should
+ * be a text or HTML file residing in the <TT>getPluginAppSettingsFolder</TT>
+ * directory.
+ *
+ * @return the Help file name or <TT>null</TT> if plugin doesn't have
+ * a help file.
+ */
+ public String getHelpFileName()
+ {
+ return "readme.html";
+ }
+
+ /**
+ * Returns the name of the Licence file for the plugin. This should
+ * be a text or HTML file residing in the <TT>getPluginAppSettingsFolder</TT>
+ * directory.
+ *
+ * @return the Licence file name or <TT>null</TT> if plugin doesn't have
+ * a licence file.
+ */
+ public String getLicenceFileName()
+ {
+ return "licence.txt";
+ }
+
+ /**
+ * Initialize this plugin.
+ */
+ public synchronized void initialize() throws PluginException
+ {
+ super.initialize();
+
+ _resources = new SyntaxPluginResources(this);
+
+ // Folder to store user settings.
+ try
+ {
+ _userSettingsFolder = getPluginUserSettingsFolder();
+ }
+ catch (IOException ex)
+ {
+ throw new PluginException(ex);
+ }
+
+ // Load plugin preferences.
+ loadPrefs();
+
+ // Install the factory for creating SQL entry text controls.
+ final IApplication app = getApplication();
+ final ISQLEntryPanelFactory originalFactory = app.getSQLEntryPanelFactory();
+ //_sqlEntryFactoryProxy = new OsterSQLEntryAreaFactory(this, originalFactory);
+
+ _sqlEntryFactoryProxy = new SQLEntryPanelFactoryProxy(this, originalFactory);
+
+ app.setSQLEntryPanelFactory(_sqlEntryFactoryProxy);
+
+ _autoCorrectProvider = new AutoCorrectProviderImpl(_userSettingsFolder);
+
+ createMenu();
+ }
+
+ private void createMenu()
+ {
+ IApplication app = getApplication();
+ ActionCollection coll = app.getActionCollection();
+
+ JMenu menu = _resources.createMenu(IMenuResourceKeys.MENU);
+ app.addToMenu(IApplication.IMenuIDs.SESSION_MENU, menu);
+
+ Action act = new ConfigureAutoCorrectAction(app, _resources, this);
+ coll.add(act);
+ _resources.addToMenu(act, menu);
+
+ act = new FindAction(getApplication(), _resources);
+ coll.add(act);
+ _resources.addToMenu(act, menu);
+
+ act = new FindSelectedAction(getApplication(), _resources);
+ coll.add(act);
+ _resources.addToMenu(act, menu);
+
+ act = new RepeatLastFindAction(getApplication(), _resources);
+ coll.add(act);
+ _resources.addToMenu(act, menu);
+
+ act = new MarkSelectedAction(getApplication(), _resources);
+ coll.add(act);
+ _resources.addToMenu(act, menu);
+
+ act = new ReplaceAction(getApplication(), _resources);
+ coll.add(act);
+ _resources.addToMenu(act, menu);
+
+ act = new UnmarkAction(getApplication(), _resources);
+ coll.add(act);
+ _resources.addToMenu(act, menu);
+
+ act = new GoToLineAction(getApplication(), _resources);
+ coll.add(act);
+ _resources.addToMenu(act, menu);
+
+ act = new DuplicateLineAction(getApplication(), _resources);
+ coll.add(act);
+ _resources.addToMenu(act, menu);
+
+ act = new CommentAction(getApplication(), _resources);
+ coll.add(act);
+ _resources.addToMenu(act, menu);
+
+ act = new UncommentAction(getApplication(), _resources);
+ coll.add(act);
+ _resources.addToMenu(act, menu);
+
+ }
+
+
+ /**
+ * Application is shutting down so save preferences.
+ */
+ public void unload()
+ {
+ savePrefs();
+ super.unload();
+ }
+
+ /**
+ * Called when a session created but the UI hasn't been built for the
+ * session.
+ *
+ * @param session The session that is starting.
+ */
+ public void sessionCreated(ISession session)
+ {
+ SyntaxPreferences prefs = null;
+
+ try
+ {
+ prefs = (SyntaxPreferences)_newSessionPrefs.clone();
+ }
+ catch (CloneNotSupportedException ex)
+ {
+ throw new InternalError("CloneNotSupportedException for SyntaxPreferences");
+ }
+
+ session.putPluginObject(this, IConstants.ISessionKeys.PREFS, prefs);
+
+ SessionPreferencesListener lis =
+ new SessionPreferencesListener(this, session);
+ prefs.addPropertyChangeListener(lis);
+ _prefListeners.put(session.getIdentifier(), lis);
+ }
+
+
+ public PluginSessionCallback sessionStarted(final ISession session)
+ {
+ PluginSessionCallback ret = new PluginSessionCallback()
+ {
+ public void sqlInternalFrameOpened(SQLInternalFrame sqlInternalFrame, ISession sess)
+ {
+ initSqlInternalFrame(sqlInternalFrame);
+ }
+
+ public void objectTreeInternalFrameOpened(ObjectTreeInternalFrame objectTreeInternalFrame, ISession sess)
+ {
+ }
+ };
+
+ initSessionSheet(session);
+
+ return ret;
+ }
+
+ private void initSessionSheet(ISession session)
+ {
+ ActionCollection coll = getApplication().getActionCollection();
+ session.addSeparatorToToolbar();
+ session.addToToolbar(coll.get(FindAction.class));
+ session.addToToolbar(coll.get(ReplaceAction.class));
+ session.addToToolbar(coll.get(ConfigureAutoCorrectAction.class));
+
+ SessionInternalFrame sif = session.getSessionInternalFrame();
+
+ ISQLPanelAPI sqlPanelAPI = sif.getSQLPanelAPI();
+
+ new ToolsPopupHandler(this).initToolsPopup(sif, coll);
+
+ JMenuItem mnuComment = sqlPanelAPI.addToSQLEntryAreaMenu(coll.get(CommentAction.class));
+ _resources.configureMenuItem(coll.get(CommentAction.class), mnuComment);
+ JMenuItem mnuUncomment = sqlPanelAPI.addToSQLEntryAreaMenu(coll.get(UncommentAction.class));
+ _resources.configureMenuItem(coll.get(UncommentAction.class), mnuUncomment);
+ }
+
+ private void initSqlInternalFrame(SQLInternalFrame sqlInternalFrame)
+ {
+ ActionCollection coll = getApplication().getActionCollection();
+ FindAction findAction = ((FindAction) coll.get(FindAction.class));
+ ReplaceAction replaceAction = (ReplaceAction) coll.get(ReplaceAction.class);
+
+ sqlInternalFrame.addSeparatorToToolbar();
+ sqlInternalFrame.addToToolbar(findAction);
+ sqlInternalFrame.addToToolbar(replaceAction);
+ sqlInternalFrame.addToToolbar(coll.get(ConfigureAutoCorrectAction.class));
+
+ new ToolsPopupHandler(this).initToolsPopup(sqlInternalFrame, coll);
+
+ ISQLPanelAPI sqlPanelAPI = sqlInternalFrame.getSQLPanelAPI();
+
+ JMenuItem mnuUnmark = sqlPanelAPI.addToSQLEntryAreaMenu(coll.get(UnmarkAction.class));
+ _resources.configureMenuItem(coll.get(UnmarkAction.class), mnuUnmark);
+ JMenuItem mnuComment = sqlPanelAPI.addToSQLEntryAreaMenu(coll.get(CommentAction.class));
+ _resources.configureMenuItem(coll.get(CommentAction.class), mnuComment);
+ JMenuItem mnuUncomment = sqlPanelAPI.addToSQLEntryAreaMenu(coll.get(UncommentAction.class));
+ _resources.configureMenuItem(coll.get(UncommentAction.class), mnuUncomment);
+
+ }
+
+
+
+ /**
+ * Called when a session shutdown.
+ *
+ * @param session The session that is ending.
+ */
+ public void sessionEnding(ISession session)
+ {
+ super.sessionEnding(session);
+
+ session.removePluginObject(this, IConstants.ISessionKeys.PREFS);
+ _prefListeners.remove(session.getIdentifier());
+ _sqlEntryFactoryProxy.sessionEnding(session);
+ }
+
+ /**
+ * Create preferences panel for the New Session Properties dialog.
+ *
+ * @return preferences panel.
+ */
+ public INewSessionPropertiesPanel[] getNewSessionPropertiesPanels()
+ {
+ return new INewSessionPropertiesPanel[]
+ {
+ new SyntaxPreferencesPanel(_newSessionPrefs, _resources)
+ };
+ }
+
+ /**
+ * Create panels for the Session Properties dialog.
+ *
+ * @return Array of panels for the properties dialog.
+ */
+ public ISessionPropertiesPanel[] getSessionPropertiesPanels(ISession session)
+ {
+ SyntaxPreferences sessionPrefs = (SyntaxPreferences)session.getPluginObject(this,
+ IConstants.ISessionKeys.PREFS);
+
+ return new ISessionPropertiesPanel[]
+ {
+ new SyntaxPreferencesPanel(sessionPrefs, _resources)
+ };
+ }
+
+ SyntaxPluginResources getResources()
+ {
+ return _resources;
+ }
+
+ ISQLEntryPanelFactory getSQLEntryAreaFactory()
+ {
+ return _sqlEntryFactoryProxy;
+ }
+
+ /**
+ * Load from preferences file.
+ */
+ private void loadPrefs()
+ {
+ try
+ {
+ final XMLBeanReader doc = new XMLBeanReader();
+ final File file = new File(_userSettingsFolder,
+ IConstants.USER_PREFS_FILE_NAME);
+ doc.load(file, getClass().getClassLoader());
+
+ Iterator<?> it = doc.iterator();
+
+ if (it.hasNext())
+ {
+ _newSessionPrefs = (SyntaxPreferences)it.next();
+ }
+ }
+ catch (FileNotFoundException ignore)
+ {
+ // property file not found for user - first time user ran pgm.
+ }
+ catch (Exception ex)
+ {
+ final String msg = "Error occured reading from preferences file: " +
+ IConstants.USER_PREFS_FILE_NAME;
+ s_log.error(msg, ex);
+ }
+
+ if (_newSessionPrefs == null)
+ {
+ _newSessionPrefs = new SyntaxPreferences();
+ }
+ }
+
+ /**
+ * Save preferences to disk.
+ */
+ private void savePrefs()
+ {
+ try
+ {
+ final XMLBeanWriter wtr = new XMLBeanWriter(_newSessionPrefs);
+ wtr.save(new File(_userSettingsFolder, IConstants.USER_PREFS_FILE_NAME));
+ }
+ catch (Exception ex)
+ {
+ final String msg = "Error occured writing to preferences file: " +
+ IConstants.USER_PREFS_FILE_NAME;
+ s_log.error(msg, ex);
+ }
+ }
+
+
+ public Object getExternalService()
+ {
+ return getAutoCorrectProviderImpl();
+ }
+
+
+ public AutoCorrectProviderImpl getAutoCorrectProviderImpl()
+ {
+ return _autoCorrectProvider;
+ }
+
+ private static final class SessionPreferencesListener
+ implements PropertyChangeListener
+ {
+ private SyntaxPlugin _plugin;
+ private ISession _session;
+
+ SessionPreferencesListener(SyntaxPlugin plugin, ISession session)
+ {
+ super();
+ _plugin = plugin;
+ _session = session;
+ }
+
+ public void propertyChange(PropertyChangeEvent evt)
+ {
+ String propName = evt.getPropertyName();
+
+ if( false == SyntaxPreferences.IPropertyNames.USE_NETBEANS_CONTROL.equals(propName)
+ && false == SyntaxPreferences.IPropertyNames.USE_OSTER_CONTROL.equals(propName)
+ && false == SyntaxPreferences.IPropertyNames.USE_RSYNTAX_CONTROL.equals(propName) )
+ {
+
+ // Not the Textcontrol itself changed but some other of the Syntax Preferences, for example a color.
+ // So we tell the current control to update the preferences.
+ Object pluginObject = _session.getPluginObject(_plugin, IConstants.ISessionKeys.SQL_ENTRY_CONTROL);
+
+ if(pluginObject instanceof NetbeansSQLEntryPanel)
+ {
+ ((NetbeansSQLEntryPanel)pluginObject).updateFromPreferences();
+ }
+
+ if(pluginObject instanceof OsterSQLEntryPanel)
+ {
+ ((OsterSQLEntryPanel)pluginObject).updateFromPreferences();
+ }
+
+ if(pluginObject instanceof RSyntaxSQLEntryPanel)
+ {
+ ((RSyntaxSQLEntryPanel)pluginObject).updateFromPreferences();
+ }
+ }
+ else
+ {
+ /*
+ We don't support switching the entry control during a session
+ because serveral things, that are attached to the entry control
+ from outside this plugin would need to reinitialze too.
+ For example code completion and edit extras.
+
+ synchronized (_session)
+ {
+ ISQLEntryPanelFactory factory = _plugin.getSQLEntryAreaFactory();
+ ISQLEntryPanel pnl = factory.createSQLEntryPanel(_session);
+ _session.getSQLPanelAPI(_plugin).installSQLEntryPanel(pnl);
+ }
+ */
+
+ String msg =
+ // i18n[syntax.switchingNotSupported=Switching the editor of a runninig session is not supported.\nYou may switch the entry area in the New Session Properties dialog]
+ s_stringMgr.getString("syntax.switchingNotSupported");
+
+ JOptionPane.showMessageDialog(_session.getApplication().getMainFrame(), msg);
+
+ throw new SyntaxPrefChangeNotSupportedException();
+
+ }
+
+ }
+ }
+}
Deleted: trunk/sql12/plugins/syntax/src/main/java/net/sourceforge/squirrel_sql/plugins/syntax/SyntaxPugin.java
===================================================================
--- trunk/sql12/plugins/syntax/src/main/java/net/sourceforge/squirrel_sql/plugins/syntax/SyntaxPugin.java 2010-12-19 21:51:31 UTC (rev 6031)
+++ trunk/sql12/plugins/syntax/src/main/java/net/sourceforge/squirrel_sql/plugins/syntax/SyntaxPugin.java 2010-12-19 22:13:25 UTC (rev 6032)
@@ -1,588 +0,0 @@
-package net.sourceforge.squirrel_sql.plugins.syntax;
-/*
- * Copyright (C) 2003 Colin Bell
- * co...@us...
- *
- * This program 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 2
- * of the License, or any later version.
- *
- * This program 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, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- */
-
-import net.sourceforge.squirrel_sql.client.IApplication;
-import net.sourceforge.squirrel_sql.client.action.ActionCollection;
-import net.sourceforge.squirrel_sql.client.gui.session.ObjectTreeInternalFrame;
-import net.sourceforge.squirrel_sql.client.gui.session.SQLInternalFrame;
-import net.sourceforge.squirrel_sql.client.gui.session.SessionInternalFrame;
-import net.sourceforge.squirrel_sql.client.plugin.DefaultSessionPlugin;
-import net.sourceforge.squirrel_sql.client.plugin.PluginException;
-import net.sourceforge.squirrel_sql.client.plugin.PluginSessionCallback;
-import net.sourceforge.squirrel_sql.client.preferences.INewSessionPropertiesPanel;
-import net.sourceforge.squirrel_sql.client.session.ISQLEntryPanelFactory;
-import net.sourceforge.squirrel_sql.client.session.ISQLPanelAPI;
-import net.sourceforge.squirrel_sql.client.session.ISession;
-import net.sourceforge.squirrel_sql.client.session.properties.ISessionPropertiesPanel;
-import net.sourceforge.squirrel_sql.fw.id.IIdentifier;
-import net.sourceforge.squirrel_sql.fw.util.StringManager;
-import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory;
-import net.sourceforge.squirrel_sql.fw.util.log.ILogger;
-import net.sourceforge.squirrel_sql.fw.util.log.LoggerController;
-import net.sourceforge.squirrel_sql.fw.xml.XMLBeanReader;
-import net.sourceforge.squirrel_sql.fw.xml.XMLBeanWriter;
-import net.sourceforge.squirrel_sql.plugins.syntax.netbeans.NetbeansSQLEntryPanel;
-import net.sourceforge.squirrel_sql.plugins.syntax.ReplaceAction;
-import net.sourceforge.squirrel_sql.plugins.syntax.oster.OsterSQLEntryPanel;
-import net.sourceforge.squirrel_sql.plugins.syntax.rsyntax.RSyntaxSQLEntryPanel;
-import net.sourceforge.squirrel_sql.plugins.syntax.UnmarkAction;
-
-import javax.swing.*;
-import java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeListener;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-
-/**
- * The Ostermiller plugin class. This plugin adds syntax highlighting to the
- * SQL entry area.
- *
- * @author <A HREF="mailto:co...@us...">Colin Bell</A>
- */
-public class SyntaxPugin extends DefaultSessionPlugin
-{
- private static final StringManager s_stringMgr =
- StringManagerFactory.getStringManager(SyntaxPugin.class);
-
- static interface i18n
- {
- //i18n[SyntaxPlugin.touppercase=touppercase]
- String TO_UPPER_CASE =
- s_stringMgr.getString("SyntaxPlugin.touppercase");
- //i18n[SyntaxPlugin.tolowercase=tolowercase]
- String TO_LOWER_CASE =
- s_stringMgr.getString("SyntaxPlugin.tolowercase");
- //i18n[SyntaxPlugin.find=find]
- String FIND = s_stringMgr.getString("SyntaxPlugin.find");
- //i18n[SyntaxPlugin.findSelected=findselected]
- String FIND_SELECTED = s_stringMgr.getString("SyntaxPlugin.findselected");
- //i18n[SyntaxPlugin.repeatLastFind=findrepeatlast]
- String REPEAT_LAST_FIND = s_stringMgr.getString("SyntaxPlugin.repeatLastFind");
- //i18n[SyntaxPlugin.markSelected=markselected]
- String MARK_SELECTED = s_stringMgr.getString("SyntaxPlugin.markSelected");
- //i18n[SyntaxPlugin.replace=replace]
- String REPLACE = s_stringMgr.getString("SyntaxPlugin.replace");
- //i18n[SyntaxPlugin.unmark=unmark]
- String UNMARK = s_stringMgr.getString("SyntaxPlugin.unmark");
- //i18n[SyntaxPlugin.gotoline=gotoline]
- String GO_TO_LINE = s_stringMgr.getString("SyntaxPlugin.gotoline");
- //i18n[SyntaxPlugin.autocorr=autocorr]
- String AUTO_CORR = s_stringMgr.getString("SyntaxPlugin.autocorr");
- //i18n[SyntaxPlugin.duplicateline=duplicateline]
- String DUP_LINE = s_stringMgr.getString("SyntaxPlugin.duplicateline");
- //i18n[SyntaxPlugin.comment=comment]
- String COMMENT = s_stringMgr.getString("SyntaxPlugin.comment");
- //i18n[SyntaxPlugin.uncomment=uncomment]
- String UNCOMMENT = s_stringMgr.getString("SyntaxPlugin.uncomment");
-
- }
-
- /** Logger for this class. */
- private static final ILogger s_log = LoggerController.createLogger(SyntaxPugin.class);
-
- /** SyntaxPreferences for new sessions. */
- private SyntaxPreferences _newSessionPrefs;
-
- /** Folder to store user settings in. */
- private File _userSettingsFolder;
-
- /** Factory that creates text controls. */
- private SQLEntryPanelFactoryProxy _sqlEntryFactoryProxy;
-
- /** Listeners to the preferences object in each open session. */
- private Map<IIdentifier, SessionPreferencesListener> _prefListeners =
- new HashMap<IIdentifier, SessionPreferencesListener>();
-
- /** Resources for this plugin. */
- private SyntaxPluginResources _resources;
- private AutoCorrectProviderImpl _autoCorrectProvider;
-
- private interface IMenuResourceKeys
- {
- String MENU = "syntax";
- }
-
-
- /**
- * Return the internal name of this plugin.
- *
- * @return the internal name of this plugin.
- */
- public String getInternalName()
- {
- return "syntax";
- }
-
- /**
- * Return the descriptive name of this plugin.
- *
- * @return the descriptive name of this plugin.
- */
- public String getDescriptiveName()
- {
- return "Syntax Highlighting Plugin";
- }
-
- /**
- * Returns the current version of this plugin.
- *
- * @return the current version of this plugin.
- */
- public String getVersion()
- {
- return "1.0";
- }
-
- /**
- * Returns the authors name.
- *
- * @return the authors name.
- */
- public String getAuthor()
- {
- return "Gerd Wagner, Colin Bell";
- }
-
-
- /**
- * Returns the name of the change log for the plugin. This should
- * be a text or HTML file residing in the <TT>getPluginAppSettingsFolder</TT>
- * directory.
- *
- * @return the changelog file name or <TT>null</TT> if plugin doesn't have
- * a change log.
- */
- public String getChangeLogFileName()
- {
- return "changes.txt";
- }
-
- /**
- * Returns the name of the Help file for the plugin. This should
- * be a text or HTML file residing in the <TT>getPluginAppSettingsFolder</TT>
- * directory.
- *
- * @return the Help file name or <TT>null</TT> if plugin doesn't have
- * a help file.
- */
- public String getHelpFileName()
- {
- return "readme.html";
- }
-
- /**
- * Returns the name of the Licence file for the plugin. This should
- * be a text or HTML file residing in the <TT>getPluginAppSettingsFolder</TT>
- * directory.
- *
- * @return the Licence file name or <TT>null</TT> if plugin doesn't have
- * a licence file.
- */
- public String getLicenceFileName()
- {
- return "licence.txt";
- }
-
- /**
- * Initialize this plugin.
- */
- public synchronized void initialize() throws PluginException
- {
- super.initialize();
-
- _resources = new SyntaxPluginResources(this);
-
- // Folder to store user settings.
- try
- {
- _userSettingsFolder = getPluginUserSettingsFolder();
- }
- catch (IOException ex)
- {
- throw new PluginException(ex);
- }
-
- // Load plugin preferences.
- loadPrefs();
-
- // Install the factory for creating SQL entry text controls.
- final IApplication app = getApplication();
- final ISQLEntryPanelFactory originalFactory = app.getSQLEntryPanelFactory();
- //_sqlEntryFactoryProxy = new OsterSQLEntryAreaFactory(this, originalFactory);
-
- _sqlEntryFactoryProxy = new SQLEntryPanelFactoryProxy(this, originalFactory);
-
- app.setSQLEntryPanelFactory(_sqlEntryFactoryProxy);
-
- _autoCorrectProvider = new AutoCorrectProviderImpl(_userSettingsFolder);
-
- createMenu();
- }
-
- private void createMenu()
- {
- IApplication app = getApplication();
- ActionCollection coll = app.getActionCollection();
-
- JMenu menu = _resources.createMenu(IMenuResourceKeys.MENU);
- app.addToMenu(IApplication.IMenuIDs.SESSION_MENU, menu);
-
- Action act = new ConfigureAutoCorrectAction(app, _resources, this);
- coll.add(act);
- _resources.addToMenu(act, menu);
-
- act = new FindAction(getApplication(), _resources);
- coll.add(act);
- _resources.addToMenu(act, menu);
-
- act = new FindSelectedAction(getApplication(), _resources);
- coll.add(act);
- _resources.addToMenu(act, menu);
-
- act = new RepeatLastFindAction(getApplication(), _resources);
- coll.add(act);
- _resources.addToMenu(act, menu);
-
- act = new MarkSelectedAction(getApplication(), _resources);
- coll.add(act);
- _resources.addToMenu(act, menu);
-
- act = new ReplaceAction(getApplication(), _resources);
- coll.add(act);
- _resources.addToMenu(act, menu);
-
- act = new UnmarkAction(getApplication(), _resources);
- coll.add(act);
- _resources.addToMenu(act, menu);
-
- act = new GoToLineAction(getApplication(), _resources);
- coll.add(act);
- _resources.addToMenu(act, menu);
-
- act = new DuplicateLineAction(getApplication(), _resources);
- coll.add(act);
- _resources.addToMenu(act, menu);
-
- act = new CommentAction(getApplication(), _resources);
- coll.add(act);
- _resources.addToMenu(act, menu);
-
- act = new UncommentAction(getApplication(), _resources);
- coll.add(act);
- _resources.addToMenu(act, menu);
-
- }
-
-
- /**
- * Application is shutting down so save preferences.
- */
- public void unload()
- {
- savePrefs();
- super.unload();
- }
-
- /**
- * Called when a session created but the UI hasn't been built for the
- * session.
- *
- * @param session The session that is starting.
- */
- public void sessionCreated(ISession session)
- {
- SyntaxPreferences prefs = null;
-
- try
- {
- prefs = (SyntaxPreferences)_newSessionPrefs.clone();
- }
- catch (CloneNotSupportedException ex)
- {
- throw new InternalError("CloneNotSupportedException for SyntaxPreferences");
- }
-
- session.putPluginObject(this, IConstants.ISessionKeys.PREFS, prefs);
-
- SessionPreferencesListener lis =
- new SessionPreferencesListener(this, session);
- prefs.addPropertyChangeListener(lis);
- _prefListeners.put(session.getIdentifier(), lis);
- }
-
-
- public PluginSessionCallback sessionStarted(final ISession session)
- {
- PluginSessionCallback ret = new PluginSessionCallback()
- {
- public void sqlInternalFrameOpened(SQLInternalFrame sqlInternalFrame, ISession sess)
- {
- initSqlInternalFrame(sqlInternalFrame);
- }
-
- public void objectTreeInternalFrameOpened(ObjectTreeInternalFrame objectTreeInternalFrame, ISession sess)
- {
- }
- };
-
- initSessionSheet(session);
-
- return ret;
- }
-
- private void initSessionSheet(ISession session)
- {
- ActionCollection coll = getApplication().getActionCollection();
- session.addSeparatorToToolbar();
- session.addToToolbar(coll.get(FindAction.class));
- session.addToToolbar(coll.get(ReplaceAction.class));
- session.addToToolbar(coll.get(ConfigureAutoCorrectAction.class));
-
- SessionInternalFrame sif = session.getSessionInternalFrame();
-
- ISQLPanelAPI sqlPanelAPI = sif.getSQLPanelAPI();
-
- new ToolsPopupHandler(this).initToolsPopup(sif, coll);
-
- JMenuItem mnuComment = sqlPanelAPI.addToSQLEntryAreaMenu(coll.get(CommentAction.class));
- _resources.configureMenuItem(coll.get(CommentAction.class), mnuComment);
- JMenuItem mnuUncomment = sqlPanelAPI.addToSQLEntryAreaMenu(coll.get(UncommentAction.class));
- _resources.configureMenuItem(coll.get(UncommentAction.class), mnuUncomment);
- }
-
- private void initSqlInternalFrame(SQLInternalFrame sqlInternalFrame)
- {
- ActionCollection coll = getApplication().getActionCollection();
- FindAction findAction = ((FindAction) coll.get(FindAction.class));
- ReplaceAction replaceAction = (ReplaceAction) coll.get(ReplaceAction.class);
-
- sqlInternalFrame.addSeparatorToToolbar();
- sqlInternalFrame.addToToolbar(findAction);
- sqlInternalFrame.addToToolbar(replaceAction);
- sqlInternalFrame.addToToolbar(coll.get(ConfigureAutoCorrectAction.class));
-
- new ToolsPopupHandler(this).initToolsPopup(sqlInternalFrame, coll);
-
- ISQLPanelAPI sqlPanelAPI = sqlInternalFrame.getSQLPanelAPI();
-
- JMenuItem mnuUnmark = sqlPanelAPI.addToSQLEntryAreaMenu(coll.get(UnmarkAction.class));
- _resources.configureMenuItem(coll.get(UnmarkAction.class), mnuUnmark);
- JMenuItem mnuComment = sqlPanelAPI.addToSQLEntryAreaMenu(coll.get(CommentAction.class));
- _resources.configureMenuItem(coll.get(CommentAction.class), mnuComment);
- JMenuItem mnuUncomment = sqlPanelAPI.addToSQLEntryAreaMenu(coll.get(UncommentAction.class));
- _resources.configureMenuItem(coll.get(UncommentAction.class), mnuUncomment);
-
- }
-
-
-
- /**
- * Called when a session shutdown.
- *
- * @param session The session that is ending.
- */
- public void sessionEnding(ISession session)
- {
- super.sessionEnding(session);
-
- session.removePluginObject(this, IConstants.ISessionKeys.PREFS);
- _prefListeners.remove(session.getIdentifier());
- _sqlEntryFactoryProxy.sessionEnding(session);
- }
-
- /**
- * Create preferences panel for the New Session Properties dialog.
- *
- * @return preferences panel.
- */
- public INewSessionPropertiesPanel[] getNewSessionPropertiesPanels()
- {
- return new INewSessionPropertiesPanel[]
- {
- new SyntaxPreferencesPanel(_newSessionPrefs, _resources)
- };
- }
-
- /**
- * Create panels for the Session Properties dialog.
- *
- * @return Array of panels for the properties dialog.
- */
- public ISessionPropertiesPanel[] getSessionPropertiesPanels(ISession session)
- {
- SyntaxPreferences sessionPrefs = (SyntaxPreferences)session.getPluginObject(this,
- IConstants.ISessionKeys.PREFS);
-
- return new ISessionPropertiesPanel[]
- {
- new SyntaxPreferencesPanel(sessionPrefs, _resources)
- };
- }
-
- SyntaxPluginResources getResources()
- {
- return _resources;
- }
-
- ISQLEntryPanelFactory getSQLEntryAreaFactory()
- {
- return _sqlEntryFactoryProxy;
- }
-
- /**
- * Load from preferences file.
- */
- private void loadPrefs()
- {
- try
- {
- final XMLBeanReader doc = new XMLBeanReader();
- final File file = new File(_userSettingsFolder,
- IConstants.USER_PREFS_FILE_NAME);
- doc.load(file, getClass().getClassLoader());
-
- Iterator<?> it = doc.iterator();
-
- if (it.hasNext())
- {
- _newSessionPrefs = (SyntaxPreferences)it.next();
- }
- }
- catch (FileNotFoundException ignore)
- {
- // property file not found for user - first time user ran pgm.
- }
- catch (Exception ex)
- {
- final String msg = "Error occured reading from preferences file: " +
- IConstants.USER_PREFS_FILE_NAME;
- s_log.error(msg, ex);
- }
-
- if (_newSessionPrefs == null)
- {
- _newSessionPrefs = new SyntaxPreferences();
- }
- }
-
- /**
- * Save preferences to disk.
- */
- private void savePrefs()
- {
- try
- {
- final XMLBeanWriter wtr = new XMLBeanWriter(_newSessionPrefs);
- wtr.save(new File(_userSettingsFolder, IConstants.USER_PREFS_FILE_NAME));
- }
- catch (Exception ex)
- {
- final String msg = "Error occured writing to preferences file: " +
- IConstants.USER_PREFS_FILE_NAME;
- s_log.error(msg, ex);
- }
- }
-
-
- public Object getExternalService()
- {
- return getAutoCorrectProviderImpl();
- }
-
-
- public AutoCorrectProviderImpl getAutoCorrectProviderImpl()
- {
- return _autoCorrectProvider;
- }
-
- private static final class SessionPreferencesListener
- implements PropertyChangeListener
- {
- private SyntaxPugin _plugin;
- private ISession _session;
-
- SessionPreferencesListener(SyntaxPugin plugin, ISession session)
- {
- super();
- _plugin = plugin;
- _session = session;
- }
-
- public void propertyChange(PropertyChangeEvent evt)
- {
- String propName = evt.getPropertyName();
-
- if( false == SyntaxPreferences.IPropertyNames.USE_NETBEANS_CONTROL.equals(propName)
- && false == SyntaxPreferences.IPropertyNames.USE_OSTER_CONTROL.equals(propName)
- && false == SyntaxPreferences.IPropertyNames.USE_RSYNTAX_CONTROL.equals(propName) )
- {
-
- // Not the Textcontrol itself changed but some other of the Syntax Preferences, for example a color.
- // So we tell the current control to update the preferences.
- Object pluginObject = _session.getPluginObject(_plugin, IConstants.ISessionKeys.SQL_ENTRY_CONTROL);
-
- if(pluginObject instanceof NetbeansSQLEntryPanel)
- {
- ((NetbeansSQLEntryPanel)pluginObject).updateFromPreferences();
- }
-
- if(pluginObject instanceof OsterSQLEntryPanel)
- {
- ((OsterSQLEntryPanel)pluginObject).updateFromPreferences();
- }
-
- if(pluginObject instanceof RSyntaxSQLEntryPanel)
- {
- ((RSyntaxSQLEntryPanel)pluginObject).updateFromPreferences();
- }
- }
- else
- {
- /*
- We don't support switching the entry control during a session
- because serveral things, that are attached to the entry control
- from outside this plugin would need to reinitialze too.
- For example code completion and edit extras.
-
- synchronized (_session)
- {
- ISQLEntryPanelFactory factory = _plugin.getSQLEntryAreaFactory();
- ISQLEntryPanel pnl = factory.createSQLEntryPanel(_session);
- _session.getSQLPanelAPI(_plugin).installSQLEntryPanel(pnl);
- }
- */
-
- String msg =
- // i18n[syntax.switchingNotSupported=Switching the editor of a runninig session is not supported.\nYou may switch the entry area in the New Session Properties dialog]
- s_stringMgr.getString("syntax.switchingNotSupported");
-
- JOptionPane.showMessageDialog(_session.getApplication().getMainFrame(), msg);
-
- throw new SyntaxPrefChangeNotSupportedException();
-
- }
-
- }
- }
-}
Modified: trunk/sql12/plugins/syntax/src/main/java/net/sourceforge/squirrel_sql/plugins/syntax/ToolsPopupHandler.java
===================================================================
--- trunk/sql12/plugins/syntax/src/main/java/net/sourceforge/squirrel_sql/plugins/syntax/ToolsPopupHandler.java 2010-12-19 21:51:31 UTC (rev 6031)
+++ trunk/sql12/plugins/syntax/src/main/java/net/sourceforge/squirrel_sql/plugins/syntax/ToolsPopupHandler.java 2010-12-19 22:13:25 UTC (rev 6032)
@@ -23,9 +23,9 @@
public class ToolsPopupHandler
{
- private SyntaxPugin _syntaxPugin;
+ private SyntaxPlugin _syntaxPugin;
- ToolsPopupHandler(SyntaxPugin syntaxPugin)
+ ToolsPopupHandler(SyntaxPlugin syntaxPugin)
{
_syntaxPugin = syntaxPugin;
}
@@ -45,28 +45,28 @@
SyntaxPluginResources rsrc = _syntaxPugin.getResources();
IApplication app = _syntaxPugin.getApplication();
- tpa.addToToolsPopup(SyntaxPugin.i18n.FIND , new FindAction(app, rsrc, isqlEntryPanel));
- tpa.addToToolsPopup(SyntaxPugin.i18n.FIND_SELECTED , new FindSelectedAction(app, rsrc, isqlEntryPanel));
- tpa.addToToolsPopup(SyntaxPugin.i18n.REPEAT_LAST_FIND , new RepeatLastFindAction(app, rsrc, isqlEntryPanel));
- tpa.addToToolsPopup(SyntaxPugin.i18n.MARK_SELECTED , new MarkSelectedAction(app, rsrc, isqlEntryPanel));
- tpa.addToToolsPopup(SyntaxPugin.i18n.REPLACE , new ReplaceAction(app, rsrc, isqlEntryPanel));
- tpa.addToToolsPopup(SyntaxPugin.i18n.UNMARK , new UnmarkAction(app, rsrc, isqlEntryPanel));
- tpa.addToToolsPopup(SyntaxPugin.i18n.GO_TO_LINE , new GoToLineAction(app, rsrc, isqlEntryPanel));
- tpa.addToToolsPopup(SyntaxPugin.i18n.AUTO_CORR , new ConfigureAutoCorrectAction(app, rsrc, _syntaxPugin));
- tpa.addToToolsPopup(SyntaxPugin.i18n.DUP_LINE , new DuplicateLineAction(app, rsrc, isqlEntryPanel));
- tpa.addToToolsPopup(SyntaxPugin.i18n.COMMENT , new CommentAction(app, rsrc, isqlEntryPanel));
- tpa.addToToolsPopup(SyntaxPugin.i18n.UNCOMMENT , new UncommentAction(app,rsrc,isqlEntryPanel));
+ tpa.addToToolsPopup(SyntaxPlugin.i18n.FIND , new FindAction(app, rsrc, isqlEntryPanel));
+ tpa.addToToolsPopup(SyntaxPlugin.i18n.FIND_SELECTED , new FindSelectedAction(app, rsrc, isqlEntryPanel));
+ tpa.addToToolsPopup(SyntaxPlugin.i18n.REPEAT_LAST_FIND , new RepeatLastFindAction(app, rsrc, isqlEntryPanel));
+ tpa.addToToolsPopup(SyntaxPlugin.i18n.MARK_SELECTED , new MarkSelectedAction(app, rsrc, isqlEntryPanel));
+ tpa.addToToolsPopup(SyntaxPlugin.i18n.REPLACE , new ReplaceAction(app, rsrc, isqlEntryPanel));
+ tpa.addToToolsPopup(SyntaxPlugin.i18n.UNMARK , new UnmarkAction(app, rsrc, isqlEntryPanel));
+ tpa.addToToolsPopup(SyntaxPlugin.i18n.GO_TO_LINE , new GoToLineAction(app, rsrc, isqlEntryPanel));
+ tpa.addToToolsPopup(SyntaxPlugin.i18n.AUTO_CORR , new ConfigureAutoCorrectAction(app, rsrc, _syntaxPugin));
+ tpa.addToToolsPopup(SyntaxPlugin.i18n.DUP_LINE , new DuplicateLineAction(app, rsrc, isqlEntryPanel));
+ tpa.addToToolsPopup(SyntaxPlugin.i18n.COMMENT , new CommentAction(app, rsrc, isqlEntryPanel));
+ tpa.addToToolsPopup(SyntaxPlugin.i18n.UNCOMMENT , new UncommentAction(app,rsrc,isqlEntryPanel));
if (isqlEntryPanel.getTextComponent() instanceof NetbeansSQLEditorPane)
{
NetbeansSQLEditorPane nbEdit = (NetbeansSQLEditorPane) isqlEntryPanel.getTextComponent();
Action toUpperAction = ((SQLKit) nbEdit.getEditorKit()).getActionByName(BaseKit.toUpperCaseAction);
toUpperAction.putValue(Resources.ACCELERATOR_STRING, SQLSettingsInitializer.ACCELERATOR_STRING_TO_UPPER_CASE);
- tpa.addToToolsPopup(SyntaxPugin.i18n.TO_UPPER_CASE, toUpperAction);
+ tpa.addToToolsPopup(SyntaxPlugin.i18n.TO_UPPER_CASE, toUpperAction);
Action toLowerAction = ((SQLKit) nbEdit.getEditorKit()).getActionByName(BaseKit.toLowerCaseAction);
toLowerAction.putValue(Resources.ACCELERATOR_STRING, SQLSettingsInitializer.ACCELERATOR_STRING_TO_LOWER_CASE);
- tpa.addToToolsPopup(SyntaxPugin.i18n.TO_LOWER_CASE, toLowerAction);
+ tpa.addToToolsPopup(SyntaxPlugin.i18n.TO_LOWER_CASE, toLowerAction);
}
else if (isqlEntryPanel.getTextComponent() instanceof SquirrelRSyntaxTextArea)
{
@@ -74,11 +74,11 @@
Action toUpperAction = SquirreLRSyntaxTextAreaUI.getActionForName(rsEdit, RTextAreaEditorKit.rtaUpperSelectionCaseAction);
toUpperAction.putValue(Resources.ACCELERATOR_STRING, SquirreLRSyntaxTextAreaUI.RS_ACCELERATOR_STRING_TO_UPPER_CASE);
- tpa.addToToolsPopup(SyntaxPugin.i18n.TO_UPPER_CASE, toUpperAction);
+ tpa.addToToolsPopup(SyntaxPlugin.i18n.TO_UPPER_CASE, toUpperAction);
Action toLowerAction = SquirreLRSyntaxTextAreaUI.getActionForName(rsEdit, RTextAreaEditorKit.rtaLowerSelectionCaseAction);
toLowerAction.putValue(Resources.ACCELERATOR_STRING, SquirreLRSyntaxTextAreaUI.RS_ACCELERATOR_STRING_TO_LOWER_CASE);
- tpa.addToToolsPopup(SyntaxPugin.i18n.TO_LOWER_CASE, toLowerAction);
+ tpa.addToToolsPopup(SyntaxPlugin.i18n.TO_LOWER_CASE, toLowerAction);
}
}
@@ -89,17 +89,17 @@
ISQLEntryPanel sep = sif.getSQLPanelAPI().getSQLEntryPanel();
JComponent septc = sep.getTextComponent();
- sif.addToToolsPopUp(SyntaxPugin.i18n.FIND, coll.get(FindAction.class));
- sif.addToToolsPopUp(SyntaxPugin.i18n.FIND_SELECTED , coll.get(FindSelectedAction.class));
- sif.addToToolsPopUp(SyntaxPugin.i18n.REPEAT_LAST_FIND , coll.get(RepeatLastFindAction.class));
- sif.addToToolsPopUp(SyntaxPugin.i18n.MARK_SELECTED , coll.get(MarkSelectedAction.class));
- sif.addToToolsPopUp(SyntaxPugin.i18n.REPLACE, coll.get(ReplaceAction.class));
- sif.addToToolsPopUp(SyntaxPugin.i18n.UNMARK, coll.get(UnmarkAction.class));
- sif.addToToolsPopUp(SyntaxPugin.i18n.GO_TO_LINE, coll.get(GoToLineAction.class));
- sif.addToToolsPopUp(SyntaxPugin.i18n.AUTO_CORR, coll.get(ConfigureAutoCorrectAction.class));
- sif.addToToolsPopUp(SyntaxPugin.i18n.DUP_LINE, coll.get(DuplicateLineAction.class));
- sif.addToToolsPopUp(SyntaxPugin.i18n.COMMENT, coll.get(CommentAction.class));
- sif.addToToolsPopUp(SyntaxPugin.i18n.UNCOMMENT, coll.get(UncommentAction.class));
+ sif.addToToolsPopUp(SyntaxPlugin.i18n.FIND, coll.get(FindAction.class));
+ sif.addToToolsPopUp(SyntaxPlugin.i18n.FIND_SELECTED , coll.get(FindSelectedAction.class));
+ sif.addToToolsPopUp(SyntaxPlugin.i18n.REPEAT_LAST_FIND , coll.get(RepeatLastFindAction.class));
+ sif.addToToolsPopUp(SyntaxPlugin.i18n.MARK_SELECTED , coll.get(MarkSelectedAction.class));
+ sif.addToToolsPopUp(SyntaxPlugin.i18n.REPLACE, coll.get(ReplaceAction.class));
+ sif.addToToolsPopUp(SyntaxPlugin.i18n.UNMARK, coll.get(UnmarkAction.class));
+ sif.addToToolsPopUp(SyntaxPlugin.i18n.GO_TO_LINE, coll.get(GoToLineAction.class));
+ sif.addToToolsPopUp(SyntaxPlugin.i18n.AUTO_CORR, coll.get(ConfigureAutoCorrectAction.class));
+ sif.addToToolsPopUp(SyntaxPlugin.i18n.DUP_LINE, coll.get(DuplicateLineAction.class));
+ sif.addToToolsPopUp(SyntaxPlugin.i18n.COMMENT, coll.get(CommentAction.class));
+ sif.addToToolsPopUp(SyntaxPlugin.i18n.UNCOMMENT, coll.get(UncommentAction.class));
if (sep.getTextComponent() instanceof NetbeansSQLEditorPane)
{
@@ -108,11 +108,11 @@
Action toUpperAction = kit.getActionByName(BaseKit.toUpperCaseAction);
toUpperAction.putValue(Resources.ACCELERATOR_STRING, SQLSettingsInitializer.ACCELERATOR_STRING_TO_UPPER_CASE);
- sif.addToToolsPopUp(SyntaxPugin.i18n.TO_UPPER_CASE, toUpperAction);
+ sif.addToToolsPopUp(SyntaxPlugin.i18n.TO_UPPER_CASE, toUpperAction);
Action toLowerAction = kit.getActionByName(BaseKit.toLowerCaseAction);
toLowerAction.putValue(Resources.ACCELERATOR_STRING, SQLSettingsInitializer.ACCELERATOR_STRING_TO_LOWER_CASE);
- sif.addToToolsPopUp(SyntaxPugin.i18n.TO_LOWER_CASE, toLowerAction);
+ sif.addToToolsPopUp(SyntaxPlugin.i18n.TO_LOWER_CASE, toLowerAction);
}
else if (sep.getTextComponent() instanceof SquirrelRSyntaxTextArea)
{
@@ -120,11 +120,11 @@
Action toUpperAction = SquirreLRSyntaxTextAreaUI.getActionForName(rsEdit, RTextAreaEditorKit.rtaUpperSelectionCaseAction);
toUpperAction.putValue(Resources.ACCELERATOR_STRING, SquirreLRSyntaxTextAreaUI.RS_ACCELERATOR_STRING_TO_UPPER_CASE);
- sif.addToToolsPopUp(SyntaxPugin.i18n.TO_UPPER_CASE, toUpperAction);
+ sif.addToToolsPopUp(SyntaxPlugin.i18n.TO_UPPER_CASE, toUpperAction);
Action toLowerAction = SquirreLRSyntaxTextAreaUI.getActionForName(rsEdit, RTextAreaEditorKit.rtaLowerSelectionCaseAction);
toLowerAction.putValue(Resources.ACCELERATOR_STRING, SquirreLRSyntaxTextAreaUI.RS_ACCELERATOR_STRING_TO_LOWER_CASE);
- sif.addToToolsPopUp(SyntaxPugin.i18n.TO_LOWER_CASE, toLowerAction);
+ sif.addToToolsPopUp(SyntaxPlugin.i18n.TO_LOWER_CASE, toLowerAction);
}
@@ -132,17 +132,17 @@
void initToolsPopup(SQLInternalFrame sqlInternalFrame, ActionCollection coll)
{
- sqlInternalFrame.addToToolsPopUp(SyntaxPugin.i18n.FIND , coll.get(FindAction.class));
- sqlInternalFrame.addToToolsPopUp(SyntaxPugin.i18n.FIND_SELECTED , coll.get(FindSelectedAction.class));
- sqlInternalFrame.addToToolsPopUp(SyntaxPugin.i18n.REPEAT_LAST_FIND , coll.get(RepeatLastFindAction.class));
- sqlInternalFrame.addToToolsPopUp(SyntaxPugin.i18n.MARK_SELECTED , coll.get(MarkSelectedAction.class));
- sqlInternalFrame.addToToolsPopUp(SyntaxPugin.i18n.REPLACE , coll.get(ReplaceAction.class));
- sqlInternalFrame.addToToolsPopUp(SyntaxPugin.i18n.UNMARK , coll.get(UnmarkAction.class));
- sqlInternalFrame.addToToolsPopUp(SyntaxPugin.i18n.GO_TO_LINE , coll.get(GoToLineAction.class));
- sqlInternalFrame.addToToolsPopUp(SyntaxPugin.i18n.AUTO_CORR , coll.get(ConfigureAutoCorrectAction.class));
- sqlInternalFrame.addToToolsPopUp(SyntaxPugin.i18n.DUP_LINE , coll.get(DuplicateLineAction.class));
- sqlInternalFrame.addToToolsPopUp(SyntaxPugin.i18n.COMMENT , coll.get(CommentAction.class));
- sqlInternalFrame.addToToolsPopUp(SyntaxPugin.i18n.UNCOMMENT , coll.get(UncommentAction.class));
+ sqlInternalFrame.addToToolsPopUp(SyntaxPlugin.i18n.FIND , coll.get(FindAction.class));
+ sqlInternalFrame.addToToolsPopUp(SyntaxPlugin.i18n.FIND_SELECTED , coll.get(FindSelectedAction.class));
+ sqlInternalFrame.addToToolsPopUp(SyntaxPlugin.i18n.REPEAT_LAST_FIND , coll.get(RepeatLastFindAction.class));
+ sqlInternalFrame.addToToolsPopUp(SyntaxPlugin.i18n.MARK_SELECTED , coll.get(MarkSelectedAction.class));
+ sqlInternalFrame.addToToolsPopUp(SyntaxPlugin.i18n.REPLACE , coll.get(ReplaceAction.class));
+ sqlInternalFrame.addToToolsPopUp(SyntaxPlugin.i18n.UNMARK , coll.get(UnmarkAction.class));
+ sqlInternalFrame.addToToolsPopUp(SyntaxPlugin.i18n.GO_TO_LINE , coll.get(GoToLineAction.class));
+ sqlInternalFrame.addToToolsPopUp(SyntaxPlugin.i18n.AUTO_CORR , coll.get(ConfigureAutoCorrectAction.class));
+ sqlInternalFrame.addToToolsPopUp(SyntaxPlugin.i18n.DUP_LINE , coll.get(DuplicateLineAction.class));
+ sqlInternalFrame.addToToolsPopUp(SyntaxPlugin.i18n.COMMENT , coll.get(CommentAction.class));
+ sqlInternalFrame.addToToolsPopUp(SyntaxPlugin.i18n.UNCOMMENT , coll.get(UncommentAction.class));
ISQLPanelAPI sqlPanelAPI = sqlInternalFrame.getSQLPanelAPI();
@@ -151,11 +151,11 @@
NetbeansSQLEditorPane nbEdit = (NetbeansSQLEditorPane) sqlPanelAPI.getSQLEntryPanel().getTextComponent();
Action toUpperAction = ((SQLKit) nbEdit.getEditorKit()).getActionByName(BaseKit.toUpperCaseAction);
toUpperAction.putValue(Resources.ACCELERATOR_STRING, SQLSettingsInitializer.ACCELERATOR_STRING_TO_UPPER_CASE);
- sqlInternalFrame.addToToolsPopUp(SyntaxPugin.i18n.TO_UPPER_CASE, toUpperAction);
+ sqlInternalFrame.addToToolsPopUp(SyntaxPlugin.i18n.TO_UPPER_CASE, toUpperAction);
Action toLowerAction = ((SQLKit) nbEdit.getEditorKit()).getActionByName(BaseKit.toLowerCaseAction);
toLowerAction.putValue(Resources.ACCELERATOR_STRING, SQLSettingsInitializer.ACCELERATOR_STRING_TO_LOWER_CASE);
- sqlInternalFrame.addToToolsPopUp(SyntaxPugin.i18n.TO_LOWER_CASE, toLowerAction);
+ sqlInternalFrame.addToToolsPopUp(SyntaxPlugin.i18n.TO_LOWER_CASE, toLowerAction);
}
else if (sqlPanelAPI.getSQLEntryPanel().getTextComponent() instanceof SquirrelRSyntaxTextArea)
{
@@ -163,11 +163,11 @@
Action toUpperAction = SquirreLRSyntaxTextAreaUI.getActionForName(rsEdit, RTextAreaEditorKit.rtaUpperSelectionCaseAction);
toUpperAction.putValue(Resources.ACCELERATOR_STRING, SquirreLRSyntaxTextAreaUI.RS_ACCELERATOR_STRING_TO_UPPER_CASE);
- sqlInternalFrame.addToToolsPopUp(SyntaxPugin.i18n.TO_UPPER_CASE, toUpperAction);
+ sqlInternalFrame.addToToolsPopUp(SyntaxPlugin.i18n.TO_UPPER_CASE, toUpperAction);
Action toLowerAction = SquirreLRSyntaxTextAreaUI.getActionForName(rsEdit, RTextAreaEditorKit.rtaLowerSelectionCaseAction);
toLowerAction.putValue(Resources.ACCELERATOR_STRING, SquirreLRSyntaxTextAreaUI.RS_ACCELERATOR_STRING_TO_LOWER_CASE);
- sqlInternalFrame.addToToolsPopUp(SyntaxPugin.i18n.TO_LOWER_CASE, toLowerAction);
+ sqlInternalFrame.addToToolsPopUp(SyntaxPlugin.i18n.TO_LOWER_CASE, toLowerAction);
}
}
Modified: trunk/sql12/plugins/syntax/src/main/java/net/sourceforge/squirrel_sql/plugins/syntax/netbeans/NetbeansSQLEditorPane.java
===================================================================
--- trunk/sql12/plugins/syntax/src/main/java/net/sourceforge/squirrel_sql/plugins/syntax/netbeans/NetbeansSQLEditorPane.java 2010-12-19 21:51:31 UTC (rev 6031)
+++ trunk/sql12/plugins/syntax/src/main/java/net/sourceforge/squirrel_sql/plugins/syntax/netbeans/NetbeansSQLEditorPane.java 2010-12-19 22:13:25 UTC (rev 6032)
@@ -23,7 +23,7 @@
import net.sourceforge.squirrel_sql.fw.id.IIdentifier;
import net.sourceforge.squirrel_sql.plugins.syntax.KeyManager;
import net.sourceforge.squirrel_sql.plugins.syntax.SyntaxPreferences;
-import net.sourceforge.squirrel_sql.plugins.syntax.SyntaxPugin;
+import net.sourceforge.squirrel_sql.plugins.syntax.SyntaxPlugin;
import org.netbeans.editor.BaseDocument;
import org.netbeans.editor.BaseSettingsInitializer;
@@ -41,13 +41,13 @@
private ErrorInfo[] _currentErrorInfos = new ErrorInfo[0];
private SyntaxPreferences _prefs;
private SyntaxFactory _syntaxFactory;
- private SyntaxPugin _plugin;
+ private SyntaxPlugin _plugin;
private IIdentifier _sqlEntryPanelIdentifier;
private SessionAdapter _sessionListener;
private NetbeansPropertiesWrapper _propertiesWrapper;
- public NetbeansSQLEditorPane(ISession session, SyntaxPreferences prefs, SyntaxFactory syntaxFactory, SyntaxPugin plugin, IIdentifier sqlEntryPanelIdentifier, NetbeansPropertiesWrapper propertiesWrapper)
+ public NetbeansSQLEditorPane(ISession session, SyntaxPreferences prefs, SyntaxFactory syntaxFactory, SyntaxPlugin plugin, IIdentifier sqlEntryPanelIdentifier, NetbeansPropertiesWrapper propertiesWrapper)
{
_session = session;
Modified: trunk/sql12/plugins/syntax/src/main/java/net/sourceforge/squirrel_sql/plugins/syntax/netbeans/NetbeansSQLEntryAreaFactory.java
===================================================================
--- trunk/sql12/plugins/syntax/src/main/java/net/sourceforge/squirrel_sql/plugins/syntax/netbeans/NetbeansSQLEntryAreaFactory.java 2010-12-19 21:51:31 UTC (rev 6031)
+++ trunk/sql12/plugins/syntax/src/main/java/net/sourceforge/squirrel_sql/p...
[truncated message content] |
|
From: <man...@us...> - 2010-12-19 21:51:37
|
Revision: 6031
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6031&view=rev
Author: manningr
Date: 2010-12-19 21:51:31 +0000 (Sun, 19 Dec 2010)
Log Message:
-----------
Stack overflow patch fixed this bug as well.
Modified Paths:
--------------
trunk/sql12/doc/src/main/resources/changes.txt
Modified: trunk/sql12/doc/src/main/resources/changes.txt
===================================================================
--- trunk/sql12/doc/src/main/resources/changes.txt 2010-12-19 21:47:28 UTC (rev 6030)
+++ trunk/sql12/doc/src/main/resources/changes.txt 2010-12-19 21:51:31 UTC (rev 6031)
@@ -29,6 +29,7 @@
Bug-fixes:
3137390: Cannot connect after latest software update.
+3136386: Deleting table content via context menu does not work
3123014: StackOverflow ProgressCallBackDialog.
Thanks to Stefan (wis775) for the patch.
3055859: Regular expressions did not work in find & replace dialog
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <man...@us...> - 2010-12-19 21:47:34
|
Revision: 6030
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6030&view=rev
Author: manningr
Date: 2010-12-19 21:47:28 +0000 (Sun, 19 Dec 2010)
Log Message:
-----------
Feature request #1608435 (second checkbox in I18N administration: "show only bundles with missing translations"). Thanks to Ivo Neri for the patch.
Modified Paths:
--------------
trunk/sql12/doc/src/main/resources/changes.txt
Modified: trunk/sql12/doc/src/main/resources/changes.txt
===================================================================
--- trunk/sql12/doc/src/main/resources/changes.txt 2010-12-19 21:44:23 UTC (rev 6029)
+++ trunk/sql12/doc/src/main/resources/changes.txt 2010-12-19 21:47:28 UTC (rev 6030)
@@ -6,6 +6,9 @@
Enhancements:
+Feature request #1608435 (checkbox in I18N administration: "show only bundles with missing translations").
+ Thanks to Ivo Neri for the patch.
+
New icons in Object tree
Updated translation for Italian (Thanks to Ivo Neri)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <man...@us...> - 2010-12-19 21:44:29
|
Revision: 6029
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6029&view=rev
Author: manningr
Date: 2010-12-19 21:44:23 +0000 (Sun, 19 Dec 2010)
Log Message:
-----------
Feature request #1608435 (second checkbox in I18N administration: "show only bundles with missing translations"). Thanks to Ivo Neri for the patch.
Modified Paths:
--------------
trunk/sql12/plugins/i18n/src/main/java/net/sourceforge/squirrel_sql/plugins/i18n/TranslatorsController.java
trunk/sql12/plugins/i18n/src/main/java/net/sourceforge/squirrel_sql/plugins/i18n/TranslatorsPanel.java
trunk/sql12/plugins/i18n/src/main/resources/net/sourceforge/squirrel_sql/plugins/i18n/I18NStrings.properties
Modified: trunk/sql12/plugins/i18n/src/main/java/net/sourceforge/squirrel_sql/plugins/i18n/TranslatorsController.java
===================================================================
--- trunk/sql12/plugins/i18n/src/main/java/net/sourceforge/squirrel_sql/plugins/i18n/TranslatorsController.java 2010-12-19 17:35:46 UTC (rev 6028)
+++ trunk/sql12/plugins/i18n/src/main/java/net/sourceforge/squirrel_sql/plugins/i18n/TranslatorsController.java 2010-12-19 21:44:23 UTC (rev 6029)
@@ -88,6 +88,16 @@
}
});
+ _panel.cbxExcludeComplete.addActionListener(new ActionListener()
+ {
+ public void actionPerformed(ActionEvent e)
+ {
+ onLoadBundels(_app);
+ String excludeComplete = Boolean.valueOf(_panel.cbxExcludeComplete.isSelected()).toString();
+ Preferences.userRoot().put(TranslatorsPanel.PREF_KEY_EXCLUDE_COMPLETE, excludeComplete);
+ }
+ });
+
_panel.btnChooseWorkDir.addActionListener(new ActionListener()
{
public void actionPerformed(ActionEvent e)
@@ -554,7 +564,9 @@
{
I18nProps i18nProps = defaultI18nProps.get(i);
I18nBundle pack = new I18nBundle(i18nProps, selLocale, getWorkDir(false), sourceUrls);
- i18nBundlesByName.put(i18nProps.getPath(), pack);
+ if (!_panel.cbxExcludeComplete.isSelected() || pack.getMissingTranslationsCount()!=0) {
+ i18nBundlesByName.put(i18nProps.getPath(), pack);
+ }
}
for (int i = 0; i < localizedI18nProps.size(); i++)
Modified: trunk/sql12/plugins/i18n/src/main/java/net/sourceforge/squirrel_sql/plugins/i18n/TranslatorsPanel.java
===================================================================
--- trunk/sql12/plugins/i18n/src/main/java/net/sourceforge/squirrel_sql/plugins/i18n/TranslatorsPanel.java 2010-12-19 17:35:46 UTC (rev 6028)
+++ trunk/sql12/plugins/i18n/src/main/java/net/sourceforge/squirrel_sql/plugins/i18n/TranslatorsPanel.java 2010-12-19 21:44:23 UTC (rev 6029)
@@ -50,8 +50,12 @@
JCheckBox cbxIncludeTimestamp = null;
+ JCheckBox cbxExcludeComplete = null;
+
private static final String PREF_KEY_INCLUDE_TIMESTAMP = "SquirrelSQL.i18n.includeTimestamp";
+ public static final String PREF_KEY_EXCLUDE_COMPLETE = "SquirrelSQL.i18n.excludeComplete";
+
public TranslatorsPanel(PluginResources resources)
{
setLayout(new GridLayout(1,1));
@@ -70,6 +74,11 @@
Preferences.userRoot().get(PREF_KEY_INCLUDE_TIMESTAMP, "true");
cbxIncludeTimestamp.setSelected(includeTimestamp.equals("true"));
+
+ String excludeComplete =
+ Preferences.userRoot().get(PREF_KEY_EXCLUDE_COMPLETE, "false");
+
+ cbxExcludeComplete.setSelected(excludeComplete.equals("true"));
}
private JPanel getTranslationsPanel(PluginResources resources)
@@ -139,12 +148,16 @@
btnChooseNativeToAsciiOutDir = new JButton(resources.getIcon("Open"));
gbc = new GridBagConstraints(2, 4, 1, 1, 0, 0, GridBagConstraints.SOUTHWEST, GridBagConstraints.NONE, new Insets(5, 0, 0, 5), 0, 0);
ret.add(btnChooseNativeToAsciiOutDir, gbc);
-
+
gbc = new GridBagConstraints(1,5,1,1,0,0, GridBagConstraints.SOUTHWEST, GridBagConstraints.NONE, new Insets(5,0,0,5),0,0);
// i18n[I18n.includeTimestamp=Include timestamp in modified properties file]
cbxIncludeTimestamp = new JCheckBox(s_stringMgr.getString("I18n.includeTimestamp"));
ret.add(cbxIncludeTimestamp, gbc);
+ // i18n[I18n.excludeComplete=Show only partially translated bundles]
+ cbxExcludeComplete = new JCheckBox(s_stringMgr.getString("I18n.excludeComplete"));
+ gbc = new GridBagConstraints(1,6,1,1,0,0, GridBagConstraints.SOUTHWEST, GridBagConstraints.NONE, new Insets(5,0,0,5),0,0);
+ ret.add(cbxExcludeComplete, gbc);
/* gbc = new GridBagConstraints(1,5,1,1,0,0, GridBagConstraints.SOUTHWEST, GridBagConstraints.NONE, new Insets(5,0,0,5),0,0);
// i18n[I18n.includeTimestamp=Include timestamp in modified properties file]
@@ -152,11 +165,11 @@
ret.add(timestampLabel, gbc);
*/
- gbc = new GridBagConstraints(0, 6, 3, 1, 0, 0, GridBagConstraints.NORTHWEST, GridBagConstraints.NONE, new Insets(5, 0, 0, 5), 0, 0);
+ gbc = new GridBagConstraints(0, 7, 3, 1, 0, 0, GridBagConstraints.NORTHWEST, GridBagConstraints.NONE, new Insets(5, 0, 0, 5), 0, 0);
// i18n[I18n.bundles=Bundles]
ret.add(new JLabel(s_stringMgr.getString("I18n.bundles")), gbc);
- gbc = new GridBagConstraints(0, 7, 3, 1, 1, 1, GridBagConstraints.NORTHWEST, GridBagConstraints.BOTH, new Insets(5, 0, 0, 5), 0, 0);
+ gbc = new GridBagConstraints(0, 8, 3, 1, 1, 1, GridBagConstraints.NORTHWEST, GridBagConstraints.BOTH, new Insets(5, 0, 0, 5), 0, 0);
ret.add(new JScrollPane(tblBundels), gbc);
return ret;
Modified: trunk/sql12/plugins/i18n/src/main/resources/net/sourceforge/squirrel_sql/plugins/i18n/I18NStrings.properties
===================================================================
--- trunk/sql12/plugins/i18n/src/main/resources/net/sourceforge/squirrel_sql/plugins/i18n/I18NStrings.properties 2010-12-19 17:35:46 UTC (rev 6028)
+++ trunk/sql12/plugins/i18n/src/main/resources/net/sourceforge/squirrel_sql/plugins/i18n/I18NStrings.properties 2010-12-19 21:44:23 UTC (rev 6029)
@@ -87,4 +87,6 @@
i18n.noNativeToAsciiOutDirNotCreated=Could not create native2Ascii output dir. native2Ascii will not be executed.
-I18n.includeTimestamp=Include timestamp in new or modified I18nStrings.properties file
\ No newline at end of file
+I18n.includeTimestamp=Include timestamp in new or modified I18nStrings.properties file
+
+I18n.excludeComplete=Show only partially translated bundles
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <man...@us...> - 2010-12-19 17:35:52
|
Revision: 6028
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6028&view=rev
Author: manningr
Date: 2010-12-19 17:35:46 +0000 (Sun, 19 Dec 2010)
Log Message:
-----------
Synchronized the dependency on the plugin assembly descriptor to be the same as the version of this project.
Modified Paths:
--------------
trunk/sql12/plugins/squirrelsql-plugins-parent-pom/pom.xml
Modified: trunk/sql12/plugins/squirrelsql-plugins-parent-pom/pom.xml
===================================================================
--- trunk/sql12/plugins/squirrelsql-plugins-parent-pom/pom.xml 2010-12-18 20:34:25 UTC (rev 6027)
+++ trunk/sql12/plugins/squirrelsql-plugins-parent-pom/pom.xml 2010-12-19 17:35:46 UTC (rev 6028)
@@ -210,7 +210,7 @@
<dependency>
<groupId>net.sf.squirrel-sql.plugins</groupId>
<artifactId>squirrelsql-plugins-assembly-descriptor</artifactId>
- <version>3.2.0-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
</dependencies>
<executions>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <man...@us...> - 2010-12-18 20:34:31
|
Revision: 6027
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6027&view=rev
Author: manningr
Date: 2010-12-18 20:34:25 +0000 (Sat, 18 Dec 2010)
Log Message:
-----------
Updated squirrelsql-version-plugin to set the value for the changelog header (in changes.txt). Now, based on the project version, the header will be set to either the "latest changes in SVN or Snapshot" if the project version ends in -SNAPSHOT, or else the header is set to the version followed by the current date.
Modified Paths:
--------------
trunk/sql12/doc/pom.xml
trunk/sql12/doc/src/main/resources/changes.txt
trunk/sql12/pom.xml
Modified: trunk/sql12/doc/pom.xml
===================================================================
--- trunk/sql12/doc/pom.xml 2010-12-18 20:26:15 UTC (rev 6026)
+++ trunk/sql12/doc/pom.xml 2010-12-18 20:34:25 UTC (rev 6027)
@@ -58,10 +58,35 @@
<resources>
<resource>
<directory>src/main/resources</directory>
+ <excludes>
+ <exclude>changes.txt</exclude>
+ </excludes>
+ <filtering>false</filtering>
</resource>
+ <resource>
+ <directory>src/main/resources</directory>
+ <includes>
+ <include>changes.txt</include>
+ </includes>
+ <filtering>true</filtering>
+ </resource>
</resources>
<plugins>
+ <!-- Set the squirrelsql.changelog.header if it has not already been set. -->
<plugin>
+ <groupId>net.sf.squirrel-sql</groupId>
+ <artifactId>squirrelsql-version-plugin</artifactId>
+ <version>${squirrelsql-version-plugin-version}</version>
+ <executions>
+ <execution>
+ <phase>initialize</phase>
+ <goals>
+ <goal>set-version</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
@@ -72,5 +97,4 @@
</plugin>
</plugins>
</build>
-
-</project>
\ No newline at end of file
+</project>
Modified: trunk/sql12/doc/src/main/resources/changes.txt
===================================================================
--- trunk/sql12/doc/src/main/resources/changes.txt 2010-12-18 20:26:15 UTC (rev 6026)
+++ trunk/sql12/doc/src/main/resources/changes.txt 2010-12-18 20:34:25 UTC (rev 6027)
@@ -2,8 +2,7 @@
==============================
-Not yet released - available from SVN or in the latest snapshot:
-----------------------------------------------------------------
+${squirrelsql.changelog.header}
Enhancements:
@@ -26,7 +25,7 @@
Bug-fixes:
-3137390: Cannot connect after latest software update.
+3137390: Cannot connect after latest software update.
3123014: StackOverflow ProgressCallBackDialog.
Thanks to Stefan (wis775) for the patch.
3055859: Regular expressions did not work in find & replace dialog
Modified: trunk/sql12/pom.xml
===================================================================
--- trunk/sql12/pom.xml 2010-12-18 20:26:15 UTC (rev 6026)
+++ trunk/sql12/pom.xml 2010-12-18 20:34:25 UTC (rev 6027)
@@ -73,7 +73,7 @@
<release-plugin-version>2.1</release-plugin-version>
<scm-plugin-version>1.4</scm-plugin-version>
<source-plugin-version>2.1.2</source-plugin-version>
- <squirrelsql-version-plugin-version>1.0.4</squirrelsql-version-plugin-version>
+ <squirrelsql-version-plugin-version>1.0.5</squirrelsql-version-plugin-version>
<squirrelsql-update-site-plugin-version>1.0.4</squirrelsql-update-site-plugin-version>
<surefire-plugin-version>2.6</surefire-plugin-version>
<surefire-report-plugin-version>2.0-beta-1</surefire-report-plugin-version>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <man...@us...> - 2010-12-18 20:26:21
|
Revision: 6026
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6026&view=rev
Author: manningr
Date: 2010-12-18 20:26:15 +0000 (Sat, 18 Dec 2010)
Log Message:
-----------
[maven-release-plugin] prepare for next development iteration
Modified Paths:
--------------
trunk/maven-plugin-workspace/pom.xml
trunk/maven-plugin-workspace/squirrelsql-update-site-plugin/pom.xml
trunk/maven-plugin-workspace/squirrelsql-version-plugin/pom.xml
Modified: trunk/maven-plugin-workspace/pom.xml
===================================================================
--- trunk/maven-plugin-workspace/pom.xml 2010-12-18 20:26:11 UTC (rev 6025)
+++ trunk/maven-plugin-workspace/pom.xml 2010-12-18 20:26:15 UTC (rev 6026)
@@ -9,7 +9,7 @@
<groupId>net.sf.squirrel-sql</groupId>
<artifactId>maven-plugin-workspace</artifactId>
- <version>1.0.5</version>
+ <version>1.0.6-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Maven Plugin Workspace</name>
<description>
@@ -41,9 +41,9 @@
</licenses>
<url>http://www.squirrelsql.org/</url>
<scm>
- <connection>scm:svn:http://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/maven-plugin-workspace-1.0.5</connection>
- <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/maven-plugin-workspace-1.0.5</developerConnection>
- <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/maven-plugin-workspace-1.0.5</url>
+ <connection>scm:svn:http://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/maven-plugin-workspace</connection>
+ <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/maven-plugin-workspace</developerConnection>
+ <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/maven-plugin-workspace</url>
</scm>
<issueManagement>
<system>SourceForge Tracker</system>
Modified: trunk/maven-plugin-workspace/squirrelsql-update-site-plugin/pom.xml
===================================================================
--- trunk/maven-plugin-workspace/squirrelsql-update-site-plugin/pom.xml 2010-12-18 20:26:11 UTC (rev 6025)
+++ trunk/maven-plugin-workspace/squirrelsql-update-site-plugin/pom.xml 2010-12-18 20:26:15 UTC (rev 6026)
@@ -4,7 +4,7 @@
<parent>
<groupId>net.sf.squirrel-sql</groupId>
<artifactId>maven-plugin-workspace</artifactId>
- <version>1.0.5</version>
+ <version>1.0.6-SNAPSHOT</version>
</parent>
<artifactId>squirrelsql-update-site-plugin</artifactId>
@@ -45,9 +45,9 @@
</licenses>
<url>http://www.squirrelsql.org/</url>
<scm>
- <connection>scm:svn:http://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/maven-plugin-workspace-1.0.5/squirrelsql-update-site-plugin</connection>
- <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/maven-plugin-workspace-1.0.5/squirrelsql-update-site-plugin</developerConnection>
- <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/maven-plugin-workspace-1.0.5/squirrelsql-update-site-plugin</url>
+ <connection>scm:svn:http://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/maven-plugin-workspace/squirrelsql-update-site-plugin</connection>
+ <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/maven-plugin-workspace/squirrelsql-update-site-plugin</developerConnection>
+ <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/maven-plugin-workspace/squirrelsql-update-site-plugin</url>
</scm>
<issueManagement>
<system>SourceForge Tracker</system>
Modified: trunk/maven-plugin-workspace/squirrelsql-version-plugin/pom.xml
===================================================================
--- trunk/maven-plugin-workspace/squirrelsql-version-plugin/pom.xml 2010-12-18 20:26:11 UTC (rev 6025)
+++ trunk/maven-plugin-workspace/squirrelsql-version-plugin/pom.xml 2010-12-18 20:26:15 UTC (rev 6026)
@@ -3,7 +3,7 @@
<parent>
<groupId>net.sf.squirrel-sql</groupId>
<artifactId>maven-plugin-workspace</artifactId>
- <version>1.0.5</version>
+ <version>1.0.6-SNAPSHOT</version>
</parent>
<artifactId>squirrelsql-version-plugin</artifactId>
@@ -45,9 +45,9 @@
</licenses>
<url>http://www.squirrelsql.org/</url>
<scm>
- <connection>scm:svn:http://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/maven-plugin-workspace-1.0.5/squirrelsql-version-plugin</connection>
- <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/maven-plugin-workspace-1.0.5/squirrelsql-version-plugin</developerConnection>
- <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/maven-plugin-workspace-1.0.5/squirrelsql-version-plugin</url>
+ <connection>scm:svn:http://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/maven-plugin-workspace/squirrelsql-version-plugin</connection>
+ <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/maven-plugin-workspace/squirrelsql-version-plugin</developerConnection>
+ <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/maven-plugin-workspace/squirrelsql-version-plugin</url>
</scm>
<issueManagement>
<system>SourceForge Tracker</system>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <man...@us...> - 2010-12-18 20:26:17
|
Revision: 6025
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6025&view=rev
Author: manningr
Date: 2010-12-18 20:26:11 +0000 (Sat, 18 Dec 2010)
Log Message:
-----------
[maven-release-plugin] copy for tag maven-plugin-workspace-1.0.5
Added Paths:
-----------
tags/maven-plugin-workspace-1.0.5/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <man...@us...> - 2010-12-18 20:26:11
|
Revision: 6024
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6024&view=rev
Author: manningr
Date: 2010-12-18 20:26:04 +0000 (Sat, 18 Dec 2010)
Log Message:
-----------
[maven-release-plugin] prepare release maven-plugin-workspace-1.0.5
Modified Paths:
--------------
trunk/maven-plugin-workspace/pom.xml
trunk/maven-plugin-workspace/squirrelsql-update-site-plugin/pom.xml
trunk/maven-plugin-workspace/squirrelsql-version-plugin/pom.xml
Modified: trunk/maven-plugin-workspace/pom.xml
===================================================================
--- trunk/maven-plugin-workspace/pom.xml 2010-12-18 20:22:28 UTC (rev 6023)
+++ trunk/maven-plugin-workspace/pom.xml 2010-12-18 20:26:04 UTC (rev 6024)
@@ -9,7 +9,7 @@
<groupId>net.sf.squirrel-sql</groupId>
<artifactId>maven-plugin-workspace</artifactId>
- <version>1.0.5-SNAPSHOT</version>
+ <version>1.0.5</version>
<packaging>pom</packaging>
<name>Maven Plugin Workspace</name>
<description>
@@ -41,9 +41,9 @@
</licenses>
<url>http://www.squirrelsql.org/</url>
<scm>
- <connection>scm:svn:http://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/maven-plugin-workspace</connection>
- <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/maven-plugin-workspace</developerConnection>
- <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/maven-plugin-workspace</url>
+ <connection>scm:svn:http://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/maven-plugin-workspace-1.0.5</connection>
+ <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/maven-plugin-workspace-1.0.5</developerConnection>
+ <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/maven-plugin-workspace-1.0.5</url>
</scm>
<issueManagement>
<system>SourceForge Tracker</system>
Modified: trunk/maven-plugin-workspace/squirrelsql-update-site-plugin/pom.xml
===================================================================
--- trunk/maven-plugin-workspace/squirrelsql-update-site-plugin/pom.xml 2010-12-18 20:22:28 UTC (rev 6023)
+++ trunk/maven-plugin-workspace/squirrelsql-update-site-plugin/pom.xml 2010-12-18 20:26:04 UTC (rev 6024)
@@ -4,7 +4,7 @@
<parent>
<groupId>net.sf.squirrel-sql</groupId>
<artifactId>maven-plugin-workspace</artifactId>
- <version>1.0.5-SNAPSHOT</version>
+ <version>1.0.5</version>
</parent>
<artifactId>squirrelsql-update-site-plugin</artifactId>
@@ -45,9 +45,9 @@
</licenses>
<url>http://www.squirrelsql.org/</url>
<scm>
- <connection>scm:svn:http://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/maven-plugin-workspace/squirrelsql-update-site-plugin</connection>
- <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/maven-plugin-workspace/squirrelsql-update-site-plugin</developerConnection>
- <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/maven-plugin-workspace/squirrelsql-update-site-plugin</url>
+ <connection>scm:svn:http://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/maven-plugin-workspace-1.0.5/squirrelsql-update-site-plugin</connection>
+ <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/maven-plugin-workspace-1.0.5/squirrelsql-update-site-plugin</developerConnection>
+ <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/maven-plugin-workspace-1.0.5/squirrelsql-update-site-plugin</url>
</scm>
<issueManagement>
<system>SourceForge Tracker</system>
Modified: trunk/maven-plugin-workspace/squirrelsql-version-plugin/pom.xml
===================================================================
--- trunk/maven-plugin-workspace/squirrelsql-version-plugin/pom.xml 2010-12-18 20:22:28 UTC (rev 6023)
+++ trunk/maven-plugin-workspace/squirrelsql-version-plugin/pom.xml 2010-12-18 20:26:04 UTC (rev 6024)
@@ -3,7 +3,7 @@
<parent>
<groupId>net.sf.squirrel-sql</groupId>
<artifactId>maven-plugin-workspace</artifactId>
- <version>1.0.5-SNAPSHOT</version>
+ <version>1.0.5</version>
</parent>
<artifactId>squirrelsql-version-plugin</artifactId>
@@ -45,9 +45,9 @@
</licenses>
<url>http://www.squirrelsql.org/</url>
<scm>
- <connection>scm:svn:http://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/maven-plugin-workspace/squirrelsql-version-plugin</connection>
- <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/maven-plugin-workspace/squirrelsql-version-plugin</developerConnection>
- <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/maven-plugin-workspace/squirrelsql-version-plugin</url>
+ <connection>scm:svn:http://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/maven-plugin-workspace-1.0.5/squirrelsql-version-plugin</connection>
+ <developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/maven-plugin-workspace-1.0.5/squirrelsql-version-plugin</developerConnection>
+ <url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/maven-plugin-workspace-1.0.5/squirrelsql-version-plugin</url>
</scm>
<issueManagement>
<system>SourceForge Tracker</system>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Revision: 6023
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6023&view=rev
Author: manningr
Date: 2010-12-18 20:22:28 +0000 (Sat, 18 Dec 2010)
Log Message:
-----------
Store the value of the change log header in a system property so that it can be filtered into the changes.txt file.
Modified Paths:
--------------
trunk/maven-plugin-workspace/squirrelsql-version-plugin/src/main/java/net/sf/squirrel_sql/SquirrelSqlVersionMojo.java
Modified: trunk/maven-plugin-workspace/squirrelsql-version-plugin/src/main/java/net/sf/squirrel_sql/SquirrelSqlVersionMojo.java
===================================================================
--- trunk/maven-plugin-workspace/squirrelsql-version-plugin/src/main/java/net/sf/squirrel_sql/SquirrelSqlVersionMojo.java 2010-12-18 18:20:12 UTC (rev 6022)
+++ trunk/maven-plugin-workspace/squirrelsql-version-plugin/src/main/java/net/sf/squirrel_sql/SquirrelSqlVersionMojo.java 2010-12-18 20:22:28 UTC (rev 6023)
@@ -62,15 +62,36 @@
*/
public static String RPM_VERSION_PROPERTY_KEY = "squirrelsql.rpm.version";
+ /**
+ * If the version is a snapshot, then this is the contents of the header in changes.txt
+ */
+ public static String NOT_YET_RELEASED_HEADER_VALUE =
+ "Not yet released - available from SVN or in the latest snapshot:\n" +
+ "----------------------------------------------------------------\n";
+
+ /**
+ * The value of this property is what appears at the very top of the changelog
+ * (doc/src/main/resources/changes.txt)
+ */
+ public static String CHANGELOG_HEADER_KEY = "squirrelsql.changelog.header";
+
/** The format of the timestamp that follows the prefix SNAPSHOT- in the version string */
public static String TIMESTAMP_PATTERN = "yyyyMMdd_kkmm";
+ /**
+ * Format of the date that is displayed next to a non-snapshot release version
+ */
+ public static String CHANGELOG_DATE_FORMAT = "MM/dd/yyyy";
+
/** A place to keep the version after it has been generated. */
private static String squirrelsqlVersion = null;
/** A place to keep the rpm version after it has been generated from the squirrelsqlVersion */
private static String squirrelsqlRpmVersion = null;
+ /** A place to keep the changelog header after it has been generated. */
+ private static String changeLogHeader = null;
+
/**
* The maven project in which this plugin is configured.
*
@@ -106,6 +127,7 @@
{
if (project == null) { throw new MojoExecutionException("project cannot be null."); }
+ Date currentDate = new Date();
squirrelsqlVersion = project.getVersion();
// override the project's version with the value of "projectVersion" if it is configured
@@ -117,18 +139,11 @@
// If the squirrelsqlVersion ends with -snapshot, then we need to generate a timestamp
if (squirrelsqlVersion.toLowerCase().endsWith("-snapshot"))
{
- try
- {
- SimpleDateFormat sdf = new SimpleDateFormat(TIMESTAMP_PATTERN);
- String timestampStr = sdf.format(new Date());
- squirrelsqlVersion = "Snapshot-" + timestampStr;
- }
- catch (IllegalStateException e)
- {
-
- log.error("Could not convert date format pattern " + TIMESTAMP_PATTERN);
- throw e;
- }
+ squirrelsqlVersion = "Snapshot-" + getFormattedDate(currentDate, TIMESTAMP_PATTERN);
+ changeLogHeader = NOT_YET_RELEASED_HEADER_VALUE;
+ } else {
+ String releaseDateStr = getFormattedDate(currentDate, CHANGELOG_DATE_FORMAT);
+ changeLogHeader = getReleaseChangeLogHeader(squirrelsqlVersion, releaseDateStr);
}
// RPM requires that the version string have no dashes. So create a special RPM-safe version of the
// version string.
@@ -144,14 +159,42 @@
Properties props = project.getProperties();
props.put(VERSION_PROPERTY_KEY, squirrelsqlVersion);
props.put(RPM_VERSION_PROPERTY_KEY, squirrelsqlVersion.replace('-', '_'));
+ props.put(CHANGELOG_HEADER_KEY, changeLogHeader);
// Also a global system property so that this is accessible from any pom as a pom property.
System.setProperty(VERSION_PROPERTY_KEY, squirrelsqlVersion);
System.setProperty(RPM_VERSION_PROPERTY_KEY, squirrelsqlVersion.replace('-', '_'));
+ System.setProperty(CHANGELOG_HEADER_KEY, changeLogHeader);
//writeVersionToFile();
}
+ private String getReleaseChangeLogHeader(String version, String releaseDateStr) {
+ StringBuilder result = new StringBuilder();
+ result.append(version).append(" (").append(releaseDateStr).append(")");
+ int length = result.length();
+ result.append("\n");
+ for (int i = 0; i < length; i++) {
+ result.append("=");
+ }
+ return result.toString();
+ }
+
+ private String getFormattedDate(Date dateToFormat, String formatToApply) {
+ String result = null;
+ try
+ {
+ SimpleDateFormat sdf = new SimpleDateFormat(formatToApply);
+ result = sdf.format(dateToFormat);
+ }
+ catch (IllegalStateException e)
+ {
+ log.error("Could not convert date format pattern " + formatToApply);
+ throw e;
+ }
+ return result;
+ }
+
private void writeVersionToFile() {
File buildDir = new File(project.getBuild().getDirectory());
if (!buildDir.exists()) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <man...@us...> - 2010-12-18 18:20:18
|
Revision: 6022
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6022&view=rev
Author: manningr
Date: 2010-12-18 18:20:12 +0000 (Sat, 18 Dec 2010)
Log Message:
-----------
Bug-fix 3137390: Plugin assemblies all have the form <plugin name>-assembly.zip in the release.xml now.
Modified Paths:
--------------
trunk/sql12/doc/src/main/resources/changes.txt
Modified: trunk/sql12/doc/src/main/resources/changes.txt
===================================================================
--- trunk/sql12/doc/src/main/resources/changes.txt 2010-12-18 18:18:56 UTC (rev 6021)
+++ trunk/sql12/doc/src/main/resources/changes.txt 2010-12-18 18:20:12 UTC (rev 6022)
@@ -26,9 +26,10 @@
Bug-fixes:
-Bug 3123014: StackOverflow ProgressCallBackDialog.
+3137390: Cannot connect after latest software update.
+3123014: StackOverflow ProgressCallBackDialog.
Thanks to Stefan (wis775) for the patch.
-Bug 3055859: Regular expressions did not work in find & replace dialog
+3055859: Regular expressions did not work in find & replace dialog
Thanks to Stefan (wis775) for the patch.
Fixed translation label that was not being applied to "Initialize Session Timezone" checkbox.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <man...@us...> - 2010-12-18 18:19:02
|
Revision: 6021
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6021&view=rev
Author: manningr
Date: 2010-12-18 18:18:56 +0000 (Sat, 18 Dec 2010)
Log Message:
-----------
Bug-fix 3137390: Plugin assemblies all have the form <plugin name>-assembly.zip in the release.xml now.
Modified Paths:
--------------
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/update/UpdateUtilImpl.java
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/update/UpdateUtilImpl.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/update/UpdateUtilImpl.java 2010-12-18 00:16:15 UTC (rev 6020)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/update/UpdateUtilImpl.java 2010-12-18 18:18:56 UTC (rev 6021)
@@ -672,7 +672,7 @@
for (PluginInfo info : _pluginManager.getPluginInformation())
{
- result.add(info.getInternalName() + ".zip");
+ result.add(info.getInternalName() + "-assembly.zip");
}
return result;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <man...@us...> - 2010-12-18 00:16:21
|
Revision: 6020
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6020&view=rev
Author: manningr
Date: 2010-12-18 00:16:15 +0000 (Sat, 18 Dec 2010)
Log Message:
-----------
Fixed groupId now that parent is root pom.
Modified Paths:
--------------
trunk/sql12/plugins/laf/pom.xml
Modified: trunk/sql12/plugins/laf/pom.xml
===================================================================
--- trunk/sql12/plugins/laf/pom.xml 2010-12-18 00:04:18 UTC (rev 6019)
+++ trunk/sql12/plugins/laf/pom.xml 2010-12-18 00:16:15 UTC (rev 6020)
@@ -17,6 +17,7 @@
<relativePath>../../pom.xml</relativePath>
</parent>
+ <groupId>net.sf.squirrel-sql.plugins</groupId>
<artifactId>laf</artifactId>
<packaging>jar</packaging>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <man...@us...> - 2010-12-18 00:04:24
|
Revision: 6019
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6019&view=rev
Author: manningr
Date: 2010-12-18 00:04:18 +0000 (Sat, 18 Dec 2010)
Log Message:
-----------
Don't produce javadoc during the non-release build.
Modified Paths:
--------------
trunk/sql12/plugins/laf/pom.xml
Modified: trunk/sql12/plugins/laf/pom.xml
===================================================================
--- trunk/sql12/plugins/laf/pom.xml 2010-12-17 23:39:42 UTC (rev 6018)
+++ trunk/sql12/plugins/laf/pom.xml 2010-12-18 00:04:18 UTC (rev 6019)
@@ -237,20 +237,6 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>${javadoc-plugin-version}</version>
- <executions>
- <execution>
- <id>attach-javadocs</id>
- <phase>package</phase>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>${jar-plugin-version}</version>
<configuration>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <man...@us...> - 2010-12-17 23:39:49
|
Revision: 6018
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6018&view=rev
Author: manningr
Date: 2010-12-17 23:39:42 +0000 (Fri, 17 Dec 2010)
Log Message:
-----------
Removed the plugins parent pom from the inheritance of this pom. The assembly defined in the plugins parent pom was somehow not being overridden by this pom's special assembly and lafs and themes weren't being picked up properly.
Modified Paths:
--------------
trunk/sql12/plugins/laf/pom.xml
Modified: trunk/sql12/plugins/laf/pom.xml
===================================================================
--- trunk/sql12/plugins/laf/pom.xml 2010-12-17 23:15:57 UTC (rev 6017)
+++ trunk/sql12/plugins/laf/pom.xml 2010-12-17 23:39:42 UTC (rev 6018)
@@ -1,18 +1,20 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<!--
This pom is slightly different from other plugin poms because it requires special assembly
instructions since it includes LAF jars from other projects in the lafs/ folder of the assembly.
- Since no other plugin has special needs like this, this plugin's pom overrides the plugin parent's
- assembly definition, providing it's own. To add/remove/modify the LAFS that get included in the
- assembly archive, you must add/remove/modify the dependency below on the maven project that
+ Since no other plugin has special needs like this, this plugin's pom doesn't inherit from the
+ plugin parent pom (the assembly that is inherited from plugin parent somehow cannot be overridden
+ by this pom's assembly plugin configuration). To add/remove/modify the LAFS that get included in
+ the assembly archive, you must add/remove/modify the dependency below on the maven project that
contains the LAF artifact *and* add the artifactId to the laf.artifactIds property.
-->
<parent>
- <groupId>net.sf.squirrel-sql.plugins</groupId>
- <artifactId>squirrelsql-plugins-parent-pom</artifactId>
+ <groupId>net.sf.squirrel-sql</groupId>
+ <artifactId>squirrel-root-pom</artifactId>
<version>3.3.0-SNAPSHOT</version>
- <relativePath>../squirrelsql-plugins-parent-pom/pom.xml</relativePath>
+ <relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>laf</artifactId>
@@ -20,15 +22,16 @@
<name>Look and Feel Plugin</name>
<description>
- This plugin gives SQuirreLSQL client the ability to configure alternate LaFs provided by the plugin
- as well as others that the user can provide. All dependencies listed with a groupId of
- net.sf.squirrel-sql and artifactId starting with squirrelsql-lf- are externally available open-source
- look and feels whose project maintainers have decided to not use maven, or those which were built and
- maintained only before the introduction of maven. Maven's central repository policy requires any
- pom that is deployed there to reference only artifacts which are also hosted in central. And a
- project may only use the groupId that is related to that project. So, this only leaves us with one
- option which is to host these external third-party artifacts using our groupId. The hope is that
- someday these projects will start using maven and the need for this will no longer be.
+ This plugin gives SQuirreLSQL client the ability to configure alternate LaFs provided by the plugin
+ as well as others that the user can provide. All dependencies listed with a groupId of
+ net.sf.squirrel-sql and artifactId starting with squirrelsql-lf- are externally available
+ open-source
+ look and feels whose project maintainers have decided to not use maven, or those which were built and
+ maintained only before the introduction of maven. Maven's central repository policy requires any
+ pom that is deployed there to reference only artifacts which are also hosted in central. And a
+ project may only use the groupId that is related to that project. So, this only leaves us with one
+ option which is to host these external third-party artifacts using our groupId. The hope is that
+ someday these projects will start using maven and the need for this will no longer be.
</description>
<inceptionYear>2001</inceptionYear>
<developers>
@@ -78,36 +81,49 @@
<dependency>
<groupId>net.sf.squirrel-sql</groupId>
<artifactId>fw</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>net.sf.squirrel-sql</groupId>
<artifactId>squirrel-sql</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>net.sf.squirrel-sql</groupId>
<artifactId>squirrel-sql</artifactId>
+ <version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>gsbase</groupId>
<artifactId>gsbase</artifactId>
+ <version>${gsbase-version}</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
+ <version>${junit-version}</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
+ <version>${easymock-version}</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymockclassextension</artifactId>
+ <version>${easymockclassextension-version}</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
+ <version>${mockito-version}</version>
+ <scope>test</scope>
</dependency>
<dependency>
@@ -185,18 +201,85 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
+ <version>${source-plugin-version}</version>
+ <configuration>
+ <outputDirectory>target</outputDirectory>
+ <finalName>${project.artifactId}</finalName>
+ <includePom>true</includePom>
+ <!--
+ We exclude docs from the source jar, because the assembly has to have them for the plugin
+ install to work; and we don't want the source jar to contain them as well as the assembly jar
+ as that just makes the assembly jar bigger.
+ -->
+ <excludes>
+ <exclude>**/doc/**</exclude>
+ <exclude>**/doc</exclude>
+ </excludes>
+ </configuration>
+ <executions>
+ <execution>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
+ <version>${surefire-plugin-version}</version>
+ <configuration>
+ <redirectTestOutputToFile>true</redirectTestOutputToFile>
+ <parallel>${surefire-parallel-type}</parallel>
+ <threadCount>${surefire-thread-count}</threadCount>
+ </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>${javadoc-plugin-version}</version>
+ <executions>
+ <execution>
+ <id>attach-javadocs</id>
+ <phase>package</phase>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
+ <version>${jar-plugin-version}</version>
+ <configuration>
+ <archive>
+ <addMavenDescriptor>false</addMavenDescriptor>
+ </archive>
+ <finalName>${project.artifactId}</finalName>
+ <!--
+ We exclude docs from the classes jar, for the same reason as
+ above
+ -->
+ <excludes>
+ <exclude>**/doc/**</exclude>
+ <exclude>**/doc</exclude>
+ </excludes>
+ </configuration>
+ <executions>
+ <execution>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
+ <version>${dependency-plugin-version}</version>
<executions>
<execution>
<id>copy-lafs</id>
@@ -210,13 +293,6 @@
<outputDirectory>${staging.dir}/lafs</outputDirectory>
</configuration>
</execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <version>${dependency-plugin-version}</version>
- <executions>
<execution>
<id>unpack-skinlf-theme-packs</id>
<phase>process-resources</phase>
@@ -241,6 +317,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
+ <version>${assembly-plugin-version}</version>
<executions>
<execution>
<id>create-plugin-archives</id>
@@ -258,6 +335,20 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-gpg-plugin</artifactId>
+ <version>${gpg-plugin-version}</version>
+ <executions>
+ <execution>
+ <id>sign-artifacts</id>
+ <phase>verify</phase>
+ <goals>
+ <goal>sign</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
</project>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <man...@us...> - 2010-12-17 23:16:03
|
Revision: 6017
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6017&view=rev
Author: manningr
Date: 2010-12-17 23:15:57 +0000 (Fri, 17 Dec 2010)
Log Message:
-----------
Added stub expectation for getDatabaseObjectType.
Modified Paths:
--------------
trunk/sql12/plugins/oracle/src/test/java/net/sourceforge/squirrel_sql/plugins/oracle/expander/OracleTableParentExpanderTest.java
trunk/sql12/plugins/oracle/src/test/java/net/sourceforge/squirrel_sql/plugins/oracle/expander/ProcedureExpanderTest.java
Modified: trunk/sql12/plugins/oracle/src/test/java/net/sourceforge/squirrel_sql/plugins/oracle/expander/OracleTableParentExpanderTest.java
===================================================================
--- trunk/sql12/plugins/oracle/src/test/java/net/sourceforge/squirrel_sql/plugins/oracle/expander/OracleTableParentExpanderTest.java 2010-12-17 22:34:41 UTC (rev 6016)
+++ trunk/sql12/plugins/oracle/src/test/java/net/sourceforge/squirrel_sql/plugins/oracle/expander/OracleTableParentExpanderTest.java 2010-12-17 23:15:57 UTC (rev 6017)
@@ -25,6 +25,7 @@
import static org.easymock.EasyMock.isA;
import net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.AbstractINodeExpanderTest;
import net.sourceforge.squirrel_sql.client.session.schemainfo.ObjFilterMatcher;
+import net.sourceforge.squirrel_sql.fw.sql.DatabaseObjectType;
import net.sourceforge.squirrel_sql.fw.sql.ITableInfo;
import net.sourceforge.squirrel_sql.plugins.oracle.prefs.OraclePreferenceBean;
@@ -36,12 +37,14 @@
@Before
public void setUp() throws Exception
{
- OraclePreferenceBean prefs = mockHelper.createMock(OraclePreferenceBean.class);
- classUnderTest = new OracleTableParentExpander(prefs);
+ OraclePreferenceBean mockOraclePreferenceBean =
+ mockHelper.createMock("mockOraclePreferenceBean", OraclePreferenceBean.class);
+ classUnderTest = new OracleTableParentExpander(mockOraclePreferenceBean);
- expect(prefs.isExcludeRecycleBinTables()).andStubReturn(true);
- ITableInfo mockTableInfo = mockHelper.createMock(ITableInfo.class);
+ expect(mockOraclePreferenceBean.isExcludeRecycleBinTables()).andStubReturn(true);
+ ITableInfo mockTableInfo = mockHelper.createMock("mockTableInfo", ITableInfo.class);
expect(mockTableInfo.getSimpleName()).andReturn(TEST_SIMPLE_NAME);
+ expect(mockTableInfo.getDatabaseObjectType()).andStubReturn(DatabaseObjectType.TABLE);
String[] tableTypes = new String[] { TEST_SIMPLE_NAME };
ITableInfo[] tables = new ITableInfo[] { mockTableInfo };
expect(
Modified: trunk/sql12/plugins/oracle/src/test/java/net/sourceforge/squirrel_sql/plugins/oracle/expander/ProcedureExpanderTest.java
===================================================================
--- trunk/sql12/plugins/oracle/src/test/java/net/sourceforge/squirrel_sql/plugins/oracle/expander/ProcedureExpanderTest.java 2010-12-17 22:34:41 UTC (rev 6016)
+++ trunk/sql12/plugins/oracle/src/test/java/net/sourceforge/squirrel_sql/plugins/oracle/expander/ProcedureExpanderTest.java 2010-12-17 23:15:57 UTC (rev 6017)
@@ -27,6 +27,7 @@
import net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.AbstractINodeExpanderTest;
import net.sourceforge.squirrel_sql.client.session.schemainfo.ObjFilterMatcher;
+import net.sourceforge.squirrel_sql.fw.sql.DatabaseObjectType;
import net.sourceforge.squirrel_sql.fw.sql.IProcedureInfo;
import org.junit.Before;
@@ -38,8 +39,9 @@
public void setUp() throws Exception
{
- IProcedureInfo mockProcedureInfo = mockHelper.createMock(IProcedureInfo.class);
+ IProcedureInfo mockProcedureInfo = mockHelper.createMock("mockProcedureInfo", IProcedureInfo.class);
expect(mockProcedureInfo.getProcedureType()).andStubReturn(DatabaseMetaData.procedureNoResult);
+ expect(mockProcedureInfo.getDatabaseObjectType()).andStubReturn(DatabaseObjectType.PROCEDURE);
IProcedureInfo[] procedures = new IProcedureInfo[] { mockProcedureInfo };
expect(
mockSchemaInfo.getStoredProceduresInfos((String)isNull(), eq(TEST_SCHEMA_NAME), isA(ObjFilterMatcher.class)))
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <man...@us...> - 2010-12-17 22:34:47
|
Revision: 6016
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6016&view=rev
Author: manningr
Date: 2010-12-17 22:34:41 +0000 (Fri, 17 Dec 2010)
Log Message:
-----------
Commented out code that depends on refactorings that aren't ready for check-in.
Modified Paths:
--------------
trunk/sql12/app/src/test/java/net/sourceforge/squirrel_sql/client/session/action/DeleteTablesCommandTest.java
Modified: trunk/sql12/app/src/test/java/net/sourceforge/squirrel_sql/client/session/action/DeleteTablesCommandTest.java
===================================================================
--- trunk/sql12/app/src/test/java/net/sourceforge/squirrel_sql/client/session/action/DeleteTablesCommandTest.java 2010-12-17 22:25:14 UTC (rev 6015)
+++ trunk/sql12/app/src/test/java/net/sourceforge/squirrel_sql/client/session/action/DeleteTablesCommandTest.java 2010-12-17 22:34:41 UTC (rev 6016)
@@ -17,13 +17,13 @@
import net.sourceforge.squirrel_sql.client.gui.mainframe.MainFrame;
import net.sourceforge.squirrel_sql.client.session.IObjectTreeAPI;
import net.sourceforge.squirrel_sql.client.session.ISQLExecuterHandler;
-import net.sourceforge.squirrel_sql.client.session.ISQLExecuterTask;
-import net.sourceforge.squirrel_sql.client.session.ISQLExecuterTaskFactory;
+//import net.sourceforge.squirrel_sql.client.session.ISQLExecuterTask;
+//import net.sourceforge.squirrel_sql.client.session.ISQLExecuterTaskFactory;
import net.sourceforge.squirrel_sql.client.session.ISession;
-import net.sourceforge.squirrel_sql.fw.dialects.IDialectFactory;
+//import net.sourceforge.squirrel_sql.fw.dialects.IDialectFactory;
import net.sourceforge.squirrel_sql.fw.sql.IQueryTokenizer;
import net.sourceforge.squirrel_sql.fw.sql.ISQLConnection;
-import net.sourceforge.squirrel_sql.fw.sql.ISQLUtilities;
+//import net.sourceforge.squirrel_sql.fw.sql.ISQLUtilities;
import net.sourceforge.squirrel_sql.fw.sql.ITableInfo;
import net.sourceforge.squirrel_sql.fw.sql.ProgressCallBack;
import net.sourceforge.squirrel_sql.fw.sql.SQLDatabaseMetaData;
@@ -72,11 +72,11 @@
@Mock
private IProgressCallBackFactory mockProgressCallBackFactory;
- @Mock
- private ISQLExecuterTaskFactory mockSqlExecuterTaskFactory;
+// @Mock
+// private ISQLExecuterTaskFactory mockSqlExecuterTaskFactory;
- @Mock
- private ProgressCallBack mockProgressCallBack;
+// @Mock
+// private ProgressCallBack mockProgressCallBack;
@Mock
private ISession mockSession;
@@ -90,8 +90,8 @@
@Mock
private TaskThreadPool mockTaskThreadPool;
- @Mock
- private ISQLUtilities mockSqlUtilities;
+// @Mock
+// private ISQLUtilities mockSqlUtilities;
@Mock
private ISQLConnection mockSqlConnection;
@@ -108,8 +108,8 @@
@Mock
private ITableInfo mockMatViewTableInfo;
- @Mock
- private ISQLExecuterTask mockSqlExecuterTask;
+// @Mock
+// private ISQLExecuterTask mockSqlExecuterTask;
@Mock
private PreparedStatement mockPreparedStatement;
@@ -117,8 +117,8 @@
@Mock
private ResultSet mockResultSet;
- @Mock
- private IDialectFactory mockDialectFactory;
+// @Mock
+// private IDialectFactory mockDialectFactory;
private List<ITableInfo> selectedTables = new ArrayList<ITableInfo>();
@@ -152,47 +152,47 @@
@Test
public void testExecute() throws SQLException
{
- when(mockProgressCallBackFactory.create(isA(MainFrame.class), anyString(), eq(selectedTables.size()))).thenReturn(
- mockProgressCallBack);
- when(mockSqlUtilities.getDeletionOrder(selectedTables, mockSqlDatabaseMetaData, mockProgressCallBack)).thenReturn(
- selectedTables);
- when(
- mockSqlExecuterTaskFactory.createSQLExecuterTask(eq(mockSession), anyString(),
- (ISQLExecuterHandler) Mockito.isNull())).thenReturn(mockSqlExecuterTask);
- when(mockSqlDatabaseMetaData.getCascadeClause()).thenReturn("CASCADE");
-
- classUnderTest = new DeleteTablesCommand(mockObjectTreeApi, selectedTables);
- classUnderTest.setProgressCallBackFactory(mockProgressCallBackFactory);
- classUnderTest.setSqlExecuterTaskFactory(mockSqlExecuterTaskFactory);
- classUnderTest.setSqlUtilities(mockSqlUtilities);
- classUnderTest.setDialectFactory(mockDialectFactory);
- classUnderTest.execute();
-
- // Capture the Runnable that was given to the thread pool and call it's run method.
- verify(mockTaskThreadPool).addTask(runnableArgument.capture());
- Runnable deleteExecuter = runnableArgument.getValue();
- deleteExecuter.run();
+// when(mockProgressCallBackFactory.create(isA(MainFrame.class), anyString(), eq(selectedTables.size()))).thenReturn(
+// mockProgressCallBack);
+// when(mockSqlUtilities.getDeletionOrder(selectedTables, mockSqlDatabaseMetaData, mockProgressCallBack)).thenReturn(
+// selectedTables);
+// when(
+// mockSqlExecuterTaskFactory.createSQLExecuterTask(eq(mockSession), anyString(),
+// (ISQLExecuterHandler) Mockito.isNull())).thenReturn(mockSqlExecuterTask);
+// when(mockSqlDatabaseMetaData.getCascadeClause()).thenReturn("CASCADE");
+//
+// classUnderTest = new DeleteTablesCommand(mockObjectTreeApi, selectedTables);
+// classUnderTest.setProgressCallBackFactory(mockProgressCallBackFactory);
+// classUnderTest.setSqlExecuterTaskFactory(mockSqlExecuterTaskFactory);
+// classUnderTest.setSqlUtilities(mockSqlUtilities);
+// classUnderTest.setDialectFactory(mockDialectFactory);
+// classUnderTest.execute();
+//
+// // Capture the Runnable that was given to the thread pool and call it's run method.
+// verify(mockTaskThreadPool).addTask(runnableArgument.capture());
+// Runnable deleteExecuter = runnableArgument.getValue();
+// deleteExecuter.run();
}
@Test
public void testGetCascadeClauseSqlException() throws SQLException
{
- when(mockProgressCallBackFactory.create(isA(MainFrame.class), anyString(), eq(selectedTables.size()))).thenReturn(
- mockProgressCallBack);
- when(mockSqlDatabaseMetaData.getCascadeClause()).thenThrow(new SQLException("Test Exception"));
+// when(mockProgressCallBackFactory.create(isA(MainFrame.class), anyString(), eq(selectedTables.size()))).thenReturn(
+// mockProgressCallBack);
+// when(mockSqlDatabaseMetaData.getCascadeClause()).thenThrow(new SQLException("Test Exception"));
+//
+// classUnderTest = new DeleteTablesCommand(mockObjectTreeApi, selectedTables);
+// classUnderTest.setProgressCallBackFactory(mockProgressCallBackFactory);
+// classUnderTest.setSqlExecuterTaskFactory(mockSqlExecuterTaskFactory);
+// classUnderTest.setSqlUtilities(mockSqlUtilities);
+// classUnderTest.setDialectFactory(mockDialectFactory);
+// classUnderTest.execute();
+//
+// // Capture the Runnable that was given to the thread pool and call it's run method.
+// verify(mockTaskThreadPool).addTask(runnableArgument.capture());
+// Runnable deleteExecuter = runnableArgument.getValue();
+// deleteExecuter.run();
- classUnderTest = new DeleteTablesCommand(mockObjectTreeApi, selectedTables);
- classUnderTest.setProgressCallBackFactory(mockProgressCallBackFactory);
- classUnderTest.setSqlExecuterTaskFactory(mockSqlExecuterTaskFactory);
- classUnderTest.setSqlUtilities(mockSqlUtilities);
- classUnderTest.setDialectFactory(mockDialectFactory);
- classUnderTest.execute();
-
- // Capture the Runnable that was given to the thread pool and call it's run method.
- verify(mockTaskThreadPool).addTask(runnableArgument.capture());
- Runnable deleteExecuter = runnableArgument.getValue();
- deleteExecuter.run();
-
}
@Test(expected = IllegalArgumentException.class)
@@ -211,73 +211,73 @@
public void testOracleSessionWithMaterializedView() throws SQLException
{
- final String MAT_VIEW_NAME = "matview";
-
- when(mockMatViewTableInfo.getSimpleName()).thenReturn(MAT_VIEW_NAME);
- when(mockMatViewTableInfo.getQualifiedName()).thenReturn(MAT_VIEW_NAME);
- selectedTables.add(mockMatViewTableInfo);
+// final String MAT_VIEW_NAME = "matview";
+//
+// when(mockMatViewTableInfo.getSimpleName()).thenReturn(MAT_VIEW_NAME);
+// when(mockMatViewTableInfo.getQualifiedName()).thenReturn(MAT_VIEW_NAME);
+// selectedTables.add(mockMatViewTableInfo);
+//
+// when(mockProgressCallBackFactory.create(isA(MainFrame.class), anyString(), eq(selectedTables.size()))).thenReturn(
+// mockProgressCallBack);
+//
+// when(mockDialectFactory.isOracle(mockSqlDatabaseMetaData)).thenReturn(true);
+// when(mockSqlConnection.prepareStatement(anyString())).thenReturn(mockPreparedStatement);
+// when(mockPreparedStatement.executeQuery()).thenReturn(mockResultSet);
+// when(mockResultSet.next()).thenReturn(true).thenReturn(false);
+// when(mockResultSet.getString(1)).thenReturn(MAT_VIEW_NAME);
+//
+// when(mockSqlUtilities.getDeletionOrder(selectedTables, mockSqlDatabaseMetaData, mockProgressCallBack)).thenReturn(
+// selectedTables);
+// when(
+// mockSqlExecuterTaskFactory.createSQLExecuterTask(eq(mockSession), anyString(),
+// (ISQLExecuterHandler) Mockito.isNull())).thenReturn(mockSqlExecuterTask);
+//
+// classUnderTest = new DeleteTablesCommand(mockObjectTreeApi, selectedTables);
+// classUnderTest.setProgressCallBackFactory(mockProgressCallBackFactory);
+// classUnderTest.setSqlExecuterTaskFactory(mockSqlExecuterTaskFactory);
+// classUnderTest.setSqlUtilities(mockSqlUtilities);
+// classUnderTest.setDialectFactory(mockDialectFactory);
+// classUnderTest.execute();
+//
+// // Capture the Runnable that was given to the thread pool and call it's run method.
+// verify(mockTaskThreadPool).addTask(runnableArgument.capture());
+// Runnable deleteExecuter = runnableArgument.getValue();
+// deleteExecuter.run();
+//
+// // Capture the SQL delete statement that was generated and given to the sqlExecuterTaskFactory
+// verify(mockSqlExecuterTaskFactory).createSQLExecuterTask(eq(mockSession), sqlArgument.capture(),
+// (ISQLExecuterHandler) Mockito.isNull());
+// String deleteSql = sqlArgument.getValue();
+// Assert.assertTrue(deleteSql.contains(TEST_TABLE_NAME));
+// Assert.assertFalse(deleteSql.contains(MAT_VIEW_NAME));
+//
+// verify(mockSqlUtilities).closeResultSet(mockResultSet, true);
- when(mockProgressCallBackFactory.create(isA(MainFrame.class), anyString(), eq(selectedTables.size()))).thenReturn(
- mockProgressCallBack);
-
- when(mockDialectFactory.isOracle(mockSqlDatabaseMetaData)).thenReturn(true);
- when(mockSqlConnection.prepareStatement(anyString())).thenReturn(mockPreparedStatement);
- when(mockPreparedStatement.executeQuery()).thenReturn(mockResultSet);
- when(mockResultSet.next()).thenReturn(true).thenReturn(false);
- when(mockResultSet.getString(1)).thenReturn(MAT_VIEW_NAME);
-
- when(mockSqlUtilities.getDeletionOrder(selectedTables, mockSqlDatabaseMetaData, mockProgressCallBack)).thenReturn(
- selectedTables);
- when(
- mockSqlExecuterTaskFactory.createSQLExecuterTask(eq(mockSession), anyString(),
- (ISQLExecuterHandler) Mockito.isNull())).thenReturn(mockSqlExecuterTask);
-
- classUnderTest = new DeleteTablesCommand(mockObjectTreeApi, selectedTables);
- classUnderTest.setProgressCallBackFactory(mockProgressCallBackFactory);
- classUnderTest.setSqlExecuterTaskFactory(mockSqlExecuterTaskFactory);
- classUnderTest.setSqlUtilities(mockSqlUtilities);
- classUnderTest.setDialectFactory(mockDialectFactory);
- classUnderTest.execute();
-
- // Capture the Runnable that was given to the thread pool and call it's run method.
- verify(mockTaskThreadPool).addTask(runnableArgument.capture());
- Runnable deleteExecuter = runnableArgument.getValue();
- deleteExecuter.run();
-
- // Capture the SQL delete statement that was generated and given to the sqlExecuterTaskFactory
- verify(mockSqlExecuterTaskFactory).createSQLExecuterTask(eq(mockSession), sqlArgument.capture(),
- (ISQLExecuterHandler) Mockito.isNull());
- String deleteSql = sqlArgument.getValue();
- Assert.assertTrue(deleteSql.contains(TEST_TABLE_NAME));
- Assert.assertFalse(deleteSql.contains(MAT_VIEW_NAME));
-
- verify(mockSqlUtilities).closeResultSet(mockResultSet, true);
-
}
@Test
public void testGetDeletionOrderSqlException() throws SQLException
{
- when(mockProgressCallBackFactory.create(isA(MainFrame.class), anyString(), eq(selectedTables.size()))).thenReturn(
- mockProgressCallBack);
+// when(mockProgressCallBackFactory.create(isA(MainFrame.class), anyString(), eq(selectedTables.size()))).thenReturn(
+// mockProgressCallBack);
+//
+// when(
+// mockSqlExecuterTaskFactory.createSQLExecuterTask(eq(mockSession), anyString(),
+// (ISQLExecuterHandler) Mockito.isNull())).thenReturn(mockSqlExecuterTask);
+//
+// when(mockSqlUtilities.getDeletionOrder(selectedTables, mockSqlDatabaseMetaData, mockProgressCallBack)).thenThrow(
+// new SQLException("Test Exception"));
+//
+// classUnderTest = new DeleteTablesCommand(mockObjectTreeApi, selectedTables);
+// classUnderTest.setProgressCallBackFactory(mockProgressCallBackFactory);
+// classUnderTest.setSqlExecuterTaskFactory(mockSqlExecuterTaskFactory);
+// classUnderTest.setSqlUtilities(mockSqlUtilities);
+// classUnderTest.execute();
+//
+// // Capture the Runnable that was given to the thread pool and call it's run method.
+// verify(mockTaskThreadPool).addTask(runnableArgument.capture());
+// Runnable deleteExecuter = runnableArgument.getValue();
+// deleteExecuter.run();
- when(
- mockSqlExecuterTaskFactory.createSQLExecuterTask(eq(mockSession), anyString(),
- (ISQLExecuterHandler) Mockito.isNull())).thenReturn(mockSqlExecuterTask);
-
- when(mockSqlUtilities.getDeletionOrder(selectedTables, mockSqlDatabaseMetaData, mockProgressCallBack)).thenThrow(
- new SQLException("Test Exception"));
-
- classUnderTest = new DeleteTablesCommand(mockObjectTreeApi, selectedTables);
- classUnderTest.setProgressCallBackFactory(mockProgressCallBackFactory);
- classUnderTest.setSqlExecuterTaskFactory(mockSqlExecuterTaskFactory);
- classUnderTest.setSqlUtilities(mockSqlUtilities);
- classUnderTest.execute();
-
- // Capture the Runnable that was given to the thread pool and call it's run method.
- verify(mockTaskThreadPool).addTask(runnableArgument.capture());
- Runnable deleteExecuter = runnableArgument.getValue();
- deleteExecuter.run();
-
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <man...@us...> - 2010-12-17 22:25:21
|
Revision: 6015
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6015&view=rev
Author: manningr
Date: 2010-12-17 22:25:14 +0000 (Fri, 17 Dec 2010)
Log Message:
-----------
New unit test for DeleteTablesCommand.
Added Paths:
-----------
trunk/sql12/app/src/test/java/net/sourceforge/squirrel_sql/client/session/action/
trunk/sql12/app/src/test/java/net/sourceforge/squirrel_sql/client/session/action/DeleteTablesCommandTest.java
Added: trunk/sql12/app/src/test/java/net/sourceforge/squirrel_sql/client/session/action/DeleteTablesCommandTest.java
===================================================================
--- trunk/sql12/app/src/test/java/net/sourceforge/squirrel_sql/client/session/action/DeleteTablesCommandTest.java (rev 0)
+++ trunk/sql12/app/src/test/java/net/sourceforge/squirrel_sql/client/session/action/DeleteTablesCommandTest.java 2010-12-17 22:25:14 UTC (rev 6015)
@@ -0,0 +1,283 @@
+package net.sourceforge.squirrel_sql.client.session.action;
+
+import static org.mockito.Matchers.anyString;
+import static org.mockito.Matchers.isA;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+import static org.mockito.Mockito.eq;
+
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.List;
+
+import net.sourceforge.squirrel_sql.client.IApplication;
+import net.sourceforge.squirrel_sql.client.gui.IProgressCallBackFactory;
+import net.sourceforge.squirrel_sql.client.gui.mainframe.MainFrame;
+import net.sourceforge.squirrel_sql.client.session.IObjectTreeAPI;
+import net.sourceforge.squirrel_sql.client.session.ISQLExecuterHandler;
+import net.sourceforge.squirrel_sql.client.session.ISQLExecuterTask;
+import net.sourceforge.squirrel_sql.client.session.ISQLExecuterTaskFactory;
+import net.sourceforge.squirrel_sql.client.session.ISession;
+import net.sourceforge.squirrel_sql.fw.dialects.IDialectFactory;
+import net.sourceforge.squirrel_sql.fw.sql.IQueryTokenizer;
+import net.sourceforge.squirrel_sql.fw.sql.ISQLConnection;
+import net.sourceforge.squirrel_sql.fw.sql.ISQLUtilities;
+import net.sourceforge.squirrel_sql.fw.sql.ITableInfo;
+import net.sourceforge.squirrel_sql.fw.sql.ProgressCallBack;
+import net.sourceforge.squirrel_sql.fw.sql.SQLDatabaseMetaData;
+import net.sourceforge.squirrel_sql.fw.util.TaskThreadPool;
+
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.runners.MockitoJUnitRunner;
+
+/*
+ * Copyright (C) 2010 Rob Manning
+ * man...@us...
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+@RunWith(MockitoJUnitRunner.class)
+public class DeleteTablesCommandTest
+{
+
+ private static final String TEST_TABLE_NAME = "TestTable1";
+
+ private DeleteTablesCommand classUnderTest = null;
+
+ @Mock
+ private IObjectTreeAPI mockObjectTreeApi;
+
+ @Mock
+ private IProgressCallBackFactory mockProgressCallBackFactory;
+
+ @Mock
+ private ISQLExecuterTaskFactory mockSqlExecuterTaskFactory;
+
+ @Mock
+ private ProgressCallBack mockProgressCallBack;
+
+ @Mock
+ private ISession mockSession;
+
+ @Mock
+ private IApplication mockApplication;
+
+ @Mock
+ private MainFrame mockMainFrame;
+
+ @Mock
+ private TaskThreadPool mockTaskThreadPool;
+
+ @Mock
+ private ISQLUtilities mockSqlUtilities;
+
+ @Mock
+ private ISQLConnection mockSqlConnection;
+
+ @Mock
+ private SQLDatabaseMetaData mockSqlDatabaseMetaData;
+
+ @Mock
+ private IQueryTokenizer mockQueryTokenizer;
+
+ @Mock
+ private ITableInfo mockTableInfo;
+
+ @Mock
+ private ITableInfo mockMatViewTableInfo;
+
+ @Mock
+ private ISQLExecuterTask mockSqlExecuterTask;
+
+ @Mock
+ private PreparedStatement mockPreparedStatement;
+
+ @Mock
+ private ResultSet mockResultSet;
+
+ @Mock
+ private IDialectFactory mockDialectFactory;
+
+ private List<ITableInfo> selectedTables = new ArrayList<ITableInfo>();
+
+ private ArgumentCaptor<Runnable> runnableArgument = ArgumentCaptor.forClass(Runnable.class);
+
+ private ArgumentCaptor<String> sqlArgument = ArgumentCaptor.forClass(String.class);
+
+ @Before
+ public void setUp() throws SQLException
+ {
+ when(mockObjectTreeApi.getSession()).thenReturn(mockSession);
+ when(mockSession.getApplication()).thenReturn(mockApplication);
+ when(mockSession.getSQLConnection()).thenReturn(mockSqlConnection);
+ when(mockSession.getQueryTokenizer()).thenReturn(mockQueryTokenizer);
+ when(mockSession.getMetaData()).thenReturn(mockSqlDatabaseMetaData);
+ when(mockApplication.getMainFrame()).thenReturn(mockMainFrame);
+ when(mockApplication.getThreadPool()).thenReturn(mockTaskThreadPool);
+ when(mockSqlConnection.getSQLMetaData()).thenReturn(mockSqlDatabaseMetaData);
+ when(mockSqlDatabaseMetaData.getDatabaseProductName()).thenReturn("testdb");
+ when(mockTableInfo.getQualifiedName()).thenReturn(TEST_TABLE_NAME);
+
+ selectedTables.add(mockTableInfo);
+ }
+
+ @After
+ public void tearDown()
+ {
+ selectedTables.clear();
+ }
+
+ @Test
+ public void testExecute() throws SQLException
+ {
+ when(mockProgressCallBackFactory.create(isA(MainFrame.class), anyString(), eq(selectedTables.size()))).thenReturn(
+ mockProgressCallBack);
+ when(mockSqlUtilities.getDeletionOrder(selectedTables, mockSqlDatabaseMetaData, mockProgressCallBack)).thenReturn(
+ selectedTables);
+ when(
+ mockSqlExecuterTaskFactory.createSQLExecuterTask(eq(mockSession), anyString(),
+ (ISQLExecuterHandler) Mockito.isNull())).thenReturn(mockSqlExecuterTask);
+ when(mockSqlDatabaseMetaData.getCascadeClause()).thenReturn("CASCADE");
+
+ classUnderTest = new DeleteTablesCommand(mockObjectTreeApi, selectedTables);
+ classUnderTest.setProgressCallBackFactory(mockProgressCallBackFactory);
+ classUnderTest.setSqlExecuterTaskFactory(mockSqlExecuterTaskFactory);
+ classUnderTest.setSqlUtilities(mockSqlUtilities);
+ classUnderTest.setDialectFactory(mockDialectFactory);
+ classUnderTest.execute();
+
+ // Capture the Runnable that was given to the thread pool and call it's run method.
+ verify(mockTaskThreadPool).addTask(runnableArgument.capture());
+ Runnable deleteExecuter = runnableArgument.getValue();
+ deleteExecuter.run();
+ }
+
+ @Test
+ public void testGetCascadeClauseSqlException() throws SQLException
+ {
+ when(mockProgressCallBackFactory.create(isA(MainFrame.class), anyString(), eq(selectedTables.size()))).thenReturn(
+ mockProgressCallBack);
+ when(mockSqlDatabaseMetaData.getCascadeClause()).thenThrow(new SQLException("Test Exception"));
+
+ classUnderTest = new DeleteTablesCommand(mockObjectTreeApi, selectedTables);
+ classUnderTest.setProgressCallBackFactory(mockProgressCallBackFactory);
+ classUnderTest.setSqlExecuterTaskFactory(mockSqlExecuterTaskFactory);
+ classUnderTest.setSqlUtilities(mockSqlUtilities);
+ classUnderTest.setDialectFactory(mockDialectFactory);
+ classUnderTest.execute();
+
+ // Capture the Runnable that was given to the thread pool and call it's run method.
+ verify(mockTaskThreadPool).addTask(runnableArgument.capture());
+ Runnable deleteExecuter = runnableArgument.getValue();
+ deleteExecuter.run();
+
+ }
+
+ @Test(expected = IllegalArgumentException.class)
+ public void testNullTreeArgument()
+ {
+ classUnderTest = new DeleteTablesCommand(null, selectedTables);
+ }
+
+ @Test(expected = IllegalArgumentException.class)
+ public void testNullTablesArgument()
+ {
+ classUnderTest = new DeleteTablesCommand(mockObjectTreeApi, null);
+ }
+
+ @Test
+ public void testOracleSessionWithMaterializedView() throws SQLException
+ {
+
+ final String MAT_VIEW_NAME = "matview";
+
+ when(mockMatViewTableInfo.getSimpleName()).thenReturn(MAT_VIEW_NAME);
+ when(mockMatViewTableInfo.getQualifiedName()).thenReturn(MAT_VIEW_NAME);
+ selectedTables.add(mockMatViewTableInfo);
+
+ when(mockProgressCallBackFactory.create(isA(MainFrame.class), anyString(), eq(selectedTables.size()))).thenReturn(
+ mockProgressCallBack);
+
+ when(mockDialectFactory.isOracle(mockSqlDatabaseMetaData)).thenReturn(true);
+ when(mockSqlConnection.prepareStatement(anyString())).thenReturn(mockPreparedStatement);
+ when(mockPreparedStatement.executeQuery()).thenReturn(mockResultSet);
+ when(mockResultSet.next()).thenReturn(true).thenReturn(false);
+ when(mockResultSet.getString(1)).thenReturn(MAT_VIEW_NAME);
+
+ when(mockSqlUtilities.getDeletionOrder(selectedTables, mockSqlDatabaseMetaData, mockProgressCallBack)).thenReturn(
+ selectedTables);
+ when(
+ mockSqlExecuterTaskFactory.createSQLExecuterTask(eq(mockSession), anyString(),
+ (ISQLExecuterHandler) Mockito.isNull())).thenReturn(mockSqlExecuterTask);
+
+ classUnderTest = new DeleteTablesCommand(mockObjectTreeApi, selectedTables);
+ classUnderTest.setProgressCallBackFactory(mockProgressCallBackFactory);
+ classUnderTest.setSqlExecuterTaskFactory(mockSqlExecuterTaskFactory);
+ classUnderTest.setSqlUtilities(mockSqlUtilities);
+ classUnderTest.setDialectFactory(mockDialectFactory);
+ classUnderTest.execute();
+
+ // Capture the Runnable that was given to the thread pool and call it's run method.
+ verify(mockTaskThreadPool).addTask(runnableArgument.capture());
+ Runnable deleteExecuter = runnableArgument.getValue();
+ deleteExecuter.run();
+
+ // Capture the SQL delete statement that was generated and given to the sqlExecuterTaskFactory
+ verify(mockSqlExecuterTaskFactory).createSQLExecuterTask(eq(mockSession), sqlArgument.capture(),
+ (ISQLExecuterHandler) Mockito.isNull());
+ String deleteSql = sqlArgument.getValue();
+ Assert.assertTrue(deleteSql.contains(TEST_TABLE_NAME));
+ Assert.assertFalse(deleteSql.contains(MAT_VIEW_NAME));
+
+ verify(mockSqlUtilities).closeResultSet(mockResultSet, true);
+
+ }
+
+ @Test
+ public void testGetDeletionOrderSqlException() throws SQLException
+ {
+ when(mockProgressCallBackFactory.create(isA(MainFrame.class), anyString(), eq(selectedTables.size()))).thenReturn(
+ mockProgressCallBack);
+
+ when(
+ mockSqlExecuterTaskFactory.createSQLExecuterTask(eq(mockSession), anyString(),
+ (ISQLExecuterHandler) Mockito.isNull())).thenReturn(mockSqlExecuterTask);
+
+ when(mockSqlUtilities.getDeletionOrder(selectedTables, mockSqlDatabaseMetaData, mockProgressCallBack)).thenThrow(
+ new SQLException("Test Exception"));
+
+ classUnderTest = new DeleteTablesCommand(mockObjectTreeApi, selectedTables);
+ classUnderTest.setProgressCallBackFactory(mockProgressCallBackFactory);
+ classUnderTest.setSqlExecuterTaskFactory(mockSqlExecuterTaskFactory);
+ classUnderTest.setSqlUtilities(mockSqlUtilities);
+ classUnderTest.execute();
+
+ // Capture the Runnable that was given to the thread pool and call it's run method.
+ verify(mockTaskThreadPool).addTask(runnableArgument.capture());
+ Runnable deleteExecuter = runnableArgument.getValue();
+ deleteExecuter.run();
+
+ }
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Revision: 6014
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6014&view=rev
Author: manningr
Date: 2010-12-17 22:23:49 +0000 (Fri, 17 Dec 2010)
Log Message:
-----------
Added stub expectation for getDatabaseObjectType.
Modified Paths:
--------------
trunk/sql12/app/src/test/java/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/AbstractINodeExpanderTest.java
Modified: trunk/sql12/app/src/test/java/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/AbstractINodeExpanderTest.java
===================================================================
--- trunk/sql12/app/src/test/java/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/AbstractINodeExpanderTest.java 2010-12-17 22:20:53 UTC (rev 6013)
+++ trunk/sql12/app/src/test/java/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/AbstractINodeExpanderTest.java 2010-12-17 22:23:49 UTC (rev 6014)
@@ -31,6 +31,7 @@
import net.sourceforge.squirrel_sql.client.session.properties.SessionProperties;
import net.sourceforge.squirrel_sql.client.session.schemainfo.SchemaInfo;
import net.sourceforge.squirrel_sql.fw.id.IIdentifier;
+import net.sourceforge.squirrel_sql.fw.sql.DatabaseObjectType;
import net.sourceforge.squirrel_sql.fw.sql.IDatabaseObjectInfo;
import net.sourceforge.squirrel_sql.fw.sql.ISQLConnection;
import net.sourceforge.squirrel_sql.fw.sql.SQLDatabaseMetaData;
@@ -42,18 +43,18 @@
{
protected INodeExpander classUnderTest = null;
- protected ISession mockSession = mockHelper.createMock(ISession.class);
- protected ObjectTreeNode mockObjectTreeNode = mockHelper.createMock(ObjectTreeNode.class);
- protected ISQLConnection mockSQLConnection = mockHelper.createMock(ISQLConnection.class);
- protected SQLDatabaseMetaData mockSQLDatabaseMetaData = mockHelper.createMock(SQLDatabaseMetaData.class);
- protected IDatabaseObjectInfo mockDatabaseObjectInfo = mockHelper.createMock(IDatabaseObjectInfo.class);
- protected PreparedStatement mockPreparedStatement = mockHelper.createMock(PreparedStatement.class);
- protected ResultSet mockResultSet = mockHelper.createMock(ResultSet.class);
- protected IApplication mockApplication = mockHelper.createMock(IApplication.class);
- protected IIdentifier mockIdentifier = mockHelper.createMock(IIdentifier.class);
- protected SessionProperties mockSessionProperties = mockHelper.createMock(SessionProperties.class);
+ protected ISession mockSession = mockHelper.createMock("mockSession", ISession.class);
+ protected ObjectTreeNode mockObjectTreeNode = mockHelper.createMock("mockObjectTreeNode", ObjectTreeNode.class);
+ protected ISQLConnection mockSQLConnection = mockHelper.createMock("mockSQLConnection", ISQLConnection.class);
+ protected SQLDatabaseMetaData mockSQLDatabaseMetaData = mockHelper.createMock("mockSQLDatabaseMetaData", SQLDatabaseMetaData.class);
+ protected IDatabaseObjectInfo mockDatabaseObjectInfo = mockHelper.createMock("mockDatabaseObjectInfo", IDatabaseObjectInfo.class);
+ protected PreparedStatement mockPreparedStatement = mockHelper.createMock("mockPreparedStatement", PreparedStatement.class);
+ protected ResultSet mockResultSet = mockHelper.createMock("mockResultSet", ResultSet.class);
+ protected IApplication mockApplication = mockHelper.createMock("mockApplication", IApplication.class);
+ protected IIdentifier mockIdentifier = mockHelper.createMock("mockIdentifier", IIdentifier.class);
+ protected SessionProperties mockSessionProperties = mockHelper.createMock("mockSessionProperties", SessionProperties.class);
protected Class<?> clazz = null;
- protected SchemaInfo mockSchemaInfo = mockHelper.createMock(SchemaInfo.class);
+ protected SchemaInfo mockSchemaInfo = mockHelper.createMock("mockSchemaInfo", SchemaInfo.class);
@Test
public void testCreateChildren() throws SQLException
@@ -104,6 +105,7 @@
expect(mockDatabaseObjectInfo.getCatalogName()).andStubReturn(TEST_CATALOG_NAME);
expect(mockDatabaseObjectInfo.getSimpleName()).andStubReturn(TEST_SIMPLE_NAME);
expect(mockDatabaseObjectInfo.getQualifiedName()).andStubReturn(TEST_QUALIFIED_NAME);
+ expect(mockDatabaseObjectInfo.getDatabaseObjectType()).andStubReturn(DatabaseObjectType.TABLE);
}
}
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <man...@us...> - 2010-12-17 22:20:59
|
Revision: 6013
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6013&view=rev
Author: manningr
Date: 2010-12-17 22:20:53 +0000 (Fri, 17 Dec 2010)
Log Message:
-----------
Patch from Ivo Neri to fix translation label that was not being applied to "Initialize Session Timezone" checkbox.
Modified Paths:
--------------
trunk/sql12/doc/src/main/resources/changes.txt
Modified: trunk/sql12/doc/src/main/resources/changes.txt
===================================================================
--- trunk/sql12/doc/src/main/resources/changes.txt 2010-12-17 22:19:29 UTC (rev 6012)
+++ trunk/sql12/doc/src/main/resources/changes.txt 2010-12-17 22:20:53 UTC (rev 6013)
@@ -31,6 +31,8 @@
Bug 3055859: Regular expressions did not work in find & replace dialog
Thanks to Stefan (wis775) for the patch.
+Fixed translation label that was not being applied to "Initialize Session Timezone" checkbox.
+ Thanks to Ivo Neri for the patch.
3.2.0 (11/21/2010)
==================
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Revision: 6012
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6012&view=rev
Author: manningr
Date: 2010-12-17 22:19:29 +0000 (Fri, 17 Dec 2010)
Log Message:
-----------
Patch from Ivo Neri to fix translation label that was not being applied to "Initialize Session Timezone" checkbox.
Modified Paths:
--------------
trunk/sql12/plugins/oracle/src/main/java/net/sourceforge/squirrel_sql/plugins/oracle/prefs/OraclePluginPreferencesPanel.java
Modified: trunk/sql12/plugins/oracle/src/main/java/net/sourceforge/squirrel_sql/plugins/oracle/prefs/OraclePluginPreferencesPanel.java
===================================================================
--- trunk/sql12/plugins/oracle/src/main/java/net/sourceforge/squirrel_sql/plugins/oracle/prefs/OraclePluginPreferencesPanel.java 2010-12-17 21:57:46 UTC (rev 6011)
+++ trunk/sql12/plugins/oracle/src/main/java/net/sourceforge/squirrel_sql/plugins/oracle/prefs/OraclePluginPreferencesPanel.java 2010-12-17 22:19:29 UTC (rev 6012)
@@ -87,7 +87,7 @@
private final static JCheckBox showErrorOffsetCheckBox = new JCheckBox(i18n.SHOW_ERROR_OFFSET_LABEL);
- private final static JCheckBox initSessionTimezoneCheckBox = new JCheckBox("Initialize Session Timezone");
+ private final static JCheckBox initSessionTimezoneCheckBox = new JCheckBox(i18n.SESSION_TIMEZONE_LABEL);
private final static JTextField sessionTimezoneTextField = new JTextField();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <man...@us...> - 2010-12-17 21:57:52
|
Revision: 6011
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6011&view=rev
Author: manningr
Date: 2010-12-17 21:57:46 +0000 (Fri, 17 Dec 2010)
Log Message:
-----------
Updated translation for Italian (Thanks to Ivo Neri)
Modified Paths:
--------------
trunk/sql12/doc/src/main/resources/changes.txt
trunk/sql12/squirrelsql-translations/src/main/resources/squirrel-sql_it_IT.jar
Modified: trunk/sql12/doc/src/main/resources/changes.txt
===================================================================
--- trunk/sql12/doc/src/main/resources/changes.txt 2010-12-15 23:37:24 UTC (rev 6010)
+++ trunk/sql12/doc/src/main/resources/changes.txt 2010-12-17 21:57:46 UTC (rev 6011)
@@ -9,8 +9,10 @@
New icons in Object tree
+Updated translation for Italian (Thanks to Ivo Neri)
+
New translation
- Japanese (thanks to Toshiki IGA)
+ Japanese (Thanks to Toshiki IGA)
Feature request 3030479: New global preference that allows scrollable tabbed pane for Session tabs.
Modified: trunk/sql12/squirrelsql-translations/src/main/resources/squirrel-sql_it_IT.jar
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
