[Squirrel-sql-commits] SF.net SVN: squirrel-sql:[6305] trunk/sql12
A Java SQL client for any JDBC compliant database
Brought to you by:
colbell,
gerdwagner
From: <ger...@us...> - 2011-06-12 19:50:13
|
Revision: 6305 http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6305&view=rev Author: gerdwagner Date: 2011-06-12 19:50:06 +0000 (Sun, 12 Jun 2011) Log Message: ----------- Removed Netbeans and Ostermiller editors Modified Paths: -------------- trunk/sql12/doc/src/main/resources/changes.txt trunk/sql12/installer/pom.xml trunk/sql12/plugins/syntax/pom.xml trunk/sql12/plugins/syntax/src/main/java/net/sourceforge/squirrel_sql/plugins/syntax/FindAction.java trunk/sql12/plugins/syntax/src/main/java/net/sourceforge/squirrel_sql/plugins/syntax/FindSelectedAction.java trunk/sql12/plugins/syntax/src/main/java/net/sourceforge/squirrel_sql/plugins/syntax/MarkSelectedAction.java trunk/sql12/plugins/syntax/src/main/java/net/sourceforge/squirrel_sql/plugins/syntax/ReplaceAction.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/SyntaxPlugin.java trunk/sql12/plugins/syntax/src/main/java/net/sourceforge/squirrel_sql/plugins/syntax/SyntaxPreferences.java trunk/sql12/plugins/syntax/src/main/java/net/sourceforge/squirrel_sql/plugins/syntax/SyntaxPreferencesPanel.java trunk/sql12/plugins/syntax/src/main/java/net/sourceforge/squirrel_sql/plugins/syntax/ToolsPopupHandler.java trunk/sql12/plugins/syntax/src/test/java/net/sourceforge/squirrel_sql/plugins/syntax/SyntaxPreferencesTest.java Removed Paths: ------------- trunk/sql12/plugins/syntax/src/main/java/net/sourceforge/squirrel_sql/plugins/syntax/netbeans/ trunk/sql12/plugins/syntax/src/main/java/net/sourceforge/squirrel_sql/plugins/syntax/oster/ trunk/sql12/plugins/syntax/src/main/resources/net/sourceforge/squirrel_sql/plugins/syntax/netbeans/ trunk/sql12/plugins/syntax/src/main/resources/org/ Modified: trunk/sql12/doc/src/main/resources/changes.txt =================================================================== --- trunk/sql12/doc/src/main/resources/changes.txt 2011-06-12 19:13:05 UTC (rev 6304) +++ trunk/sql12/doc/src/main/resources/changes.txt 2011-06-12 19:50:06 UTC (rev 6305) @@ -7,6 +7,11 @@ Enhancements: +Syntax Plugin: + Ostermiller and Netbeans editors were removed. Users that still used these editors are automatically + switched to the RSyntax editor. + + MSSQL Plugin: - Added display of triggers source code. - If two views with same name in different schemas exist now the views' source code is Modified: trunk/sql12/installer/pom.xml =================================================================== --- trunk/sql12/installer/pom.xml 2011-06-12 19:13:05 UTC (rev 6304) +++ trunk/sql12/installer/pom.xml 2011-06-12 19:50:06 UTC (rev 6305) @@ -114,14 +114,14 @@ <includedArtifact>net.sourceforge.jexcelapi:jxl</includedArtifact> <includedArtifact>log4j:log4j</includedArtifact> <includedArtifact>be.cyberelf.nanoxml:nanoxml</includedArtifact> - <includedArtifact>net.sf.squirrel-sql.thirdparty-non-maven:openide</includedArtifact> - <includedArtifact>net.sf.squirrel-sql.thirdparty-non-maven:openide-loaders</includedArtifact> - <includedArtifact>net.sf.squirrel-sql.thirdparty-non-maven:org-netbeans-modules-editor</includedArtifact> - <includedArtifact>net.sf.squirrel-sql.thirdparty-non-maven:org-netbeans-modules-editor-fold</includedArtifact> - <includedArtifact>net.sf.squirrel-sql.thirdparty-non-maven:org-netbeans-modules-editor-lib</includedArtifact> - <includedArtifact>net.sf.squirrel-sql.thirdparty-non-maven:org-netbeans-modules-editor-util</includedArtifact> - <includedArtifact>net.sf.squirrel-sql.thirdparty-non-maven:ostermiller-syntax</includedArtifact> - <includedArtifact>net.sf.squirrel-sql.thirdparty-non-maven:ostermiller-bte</includedArtifact> + <!--<includedArtifact>net.sf.squirrel-sql.thirdparty-non-maven:openide</includedArtifact>--> + <!--<includedArtifact>net.sf.squirrel-sql.thirdparty-non-maven:openide-loaders</includedArtifact>--> + <!--<includedArtifact>net.sf.squirrel-sql.thirdparty-non-maven:org-netbeans-modules-editor</includedArtifact>--> + <!--<includedArtifact>net.sf.squirrel-sql.thirdparty-non-maven:org-netbeans-modules-editor-fold</includedArtifact>--> + <!--<includedArtifact>net.sf.squirrel-sql.thirdparty-non-maven:org-netbeans-modules-editor-lib</includedArtifact>--> + <!--<includedArtifact>net.sf.squirrel-sql.thirdparty-non-maven:org-netbeans-modules-editor-util</includedArtifact>--> + <!--<includedArtifact>net.sf.squirrel-sql.thirdparty-non-maven:ostermiller-syntax</includedArtifact>--> + <!--<includedArtifact>net.sf.squirrel-sql.thirdparty-non-maven:ostermiller-bte</includedArtifact>--> <includedArtifact>com.fifesoft:rsyntaxtextarea</includedArtifact> <includedArtifact>com.fifesoft.rtext:rtext</includedArtifact> <includedArtifact>org.springframework:spring-beans</includedArtifact> Modified: trunk/sql12/plugins/syntax/pom.xml =================================================================== --- trunk/sql12/plugins/syntax/pom.xml 2011-06-12 19:13:05 UTC (rev 6304) +++ trunk/sql12/plugins/syntax/pom.xml 2011-06-12 19:50:06 UTC (rev 6305) @@ -104,41 +104,41 @@ <artifactId>rsyntaxtextarea</artifactId> <version>r239</version> </dependency> - <dependency> - <groupId>net.sf.squirrel-sql.thirdparty-non-maven</groupId> - <artifactId>openide</artifactId> - <version>4.0</version> - </dependency> - <dependency> - <groupId>net.sf.squirrel-sql.thirdparty-non-maven</groupId> - <artifactId>openide-loaders</artifactId> - <version>4.0</version> - </dependency> - <dependency> - <groupId>net.sf.squirrel-sql.thirdparty-non-maven</groupId> - <artifactId>org-netbeans-modules-editor</artifactId> - <version>4.0</version> - </dependency> - <dependency> - <groupId>net.sf.squirrel-sql.thirdparty-non-maven</groupId> - <artifactId>org-netbeans-modules-editor-fold</artifactId> - <version>4.0</version> - </dependency> - <dependency> - <groupId>net.sf.squirrel-sql.thirdparty-non-maven</groupId> - <artifactId>org-netbeans-modules-editor-lib</artifactId> - <version>4.0</version> - </dependency> - <dependency> - <groupId>net.sf.squirrel-sql.thirdparty-non-maven</groupId> - <artifactId>org-netbeans-modules-editor-util</artifactId> - <version>4.0</version> - </dependency> - <dependency> - <groupId>net.sf.squirrel-sql.thirdparty-non-maven</groupId> - <artifactId>ostermiller-syntax</artifactId> - <version>1.1.1</version> - </dependency> + <!--<dependency>--> + <!--<groupId>net.sf.squirrel-sql.thirdparty-non-maven</groupId>--> + <!--<artifactId>openide</artifactId>--> + <!--<version>4.0</version>--> + <!--</dependency>--> + <!--<dependency>--> + <!--<groupId>net.sf.squirrel-sql.thirdparty-non-maven</groupId>--> + <!--<artifactId>openide-loaders</artifactId>--> + <!--<version>4.0</version>--> + <!--</dependency>--> + <!--<dependency>--> + <!--<groupId>net.sf.squirrel-sql.thirdparty-non-maven</groupId>--> + <!--<artifactId>org-netbeans-modules-editor</artifactId>--> + <!--<version>4.0</version>--> + <!--</dependency>--> + <!--<dependency>--> + <!--<groupId>net.sf.squirrel-sql.thirdparty-non-maven</groupId>--> + <!--<artifactId>org-netbeans-modules-editor-fold</artifactId>--> + <!--<version>4.0</version>--> + <!--</dependency>--> + <!--<dependency>--> + <!--<groupId>net.sf.squirrel-sql.thirdparty-non-maven</groupId>--> + <!--<artifactId>org-netbeans-modules-editor-lib</artifactId>--> + <!--<version>4.0</version>--> + <!--</dependency>--> + <!--<dependency>--> + <!--<groupId>net.sf.squirrel-sql.thirdparty-non-maven</groupId>--> + <!--<artifactId>org-netbeans-modules-editor-util</artifactId>--> + <!--<version>4.0</version>--> + <!--</dependency>--> + <!--<dependency>--> + <!--<groupId>net.sf.squirrel-sql.thirdparty-non-maven</groupId>--> + <!--<artifactId>ostermiller-syntax</artifactId>--> + <!--<version>1.1.1</version>--> + <!--</dependency>--> </dependencies> <properties> <pluginClassName>net.sourceforge.squirrel_sql.plugins.syntax.SyntaxPlugin</pluginClassName> Modified: trunk/sql12/plugins/syntax/src/main/java/net/sourceforge/squirrel_sql/plugins/syntax/FindAction.java =================================================================== --- trunk/sql12/plugins/syntax/src/main/java/net/sourceforge/squirrel_sql/plugins/syntax/FindAction.java 2011-06-12 19:13:05 UTC (rev 6304) +++ trunk/sql12/plugins/syntax/src/main/java/net/sourceforge/squirrel_sql/plugins/syntax/FindAction.java 2011-06-12 19:50:06 UTC (rev 6305) @@ -2,16 +2,14 @@ import net.sourceforge.squirrel_sql.client.IApplication; import net.sourceforge.squirrel_sql.client.action.SquirrelAction; -import net.sourceforge.squirrel_sql.client.session.ISession; import net.sourceforge.squirrel_sql.client.session.ISQLEntryPanel; import net.sourceforge.squirrel_sql.client.session.ISQLPanelAPI; +import net.sourceforge.squirrel_sql.client.session.ISession; import net.sourceforge.squirrel_sql.client.session.action.ISQLPanelAction; -import net.sourceforge.squirrel_sql.plugins.syntax.SyntaxPluginResources; -import net.sourceforge.squirrel_sql.plugins.syntax.rsyntax.SquirrelRSyntaxTextArea; -import net.sourceforge.squirrel_sql.plugins.syntax.rsyntax.RSyntaxSQLEntryPanel; -import net.sourceforge.squirrel_sql.plugins.syntax.netbeans.NetbeansSQLEntryPanel; import net.sourceforge.squirrel_sql.fw.util.StringManager; import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory; +import net.sourceforge.squirrel_sql.plugins.syntax.rsyntax.RSyntaxSQLEntryPanel; +import net.sourceforge.squirrel_sql.plugins.syntax.rsyntax.SquirrelRSyntaxTextArea; import javax.swing.*; import java.awt.event.ActionEvent; @@ -54,13 +52,8 @@ private void doActionPerformed(ISQLEntryPanel sqlEntryPanel, ActionEvent evt) { - if(sqlEntryPanel instanceof NetbeansSQLEntryPanel) + if(sqlEntryPanel instanceof RSyntaxSQLEntryPanel) { - NetbeansSQLEntryPanel nsep = (NetbeansSQLEntryPanel) sqlEntryPanel; - nsep.showFindDialog(evt); - } - else if(sqlEntryPanel instanceof RSyntaxSQLEntryPanel) - { SquirrelRSyntaxTextArea rsep = (SquirrelRSyntaxTextArea) sqlEntryPanel.getTextComponent(); rsep.showFindDialog(evt); } Modified: trunk/sql12/plugins/syntax/src/main/java/net/sourceforge/squirrel_sql/plugins/syntax/FindSelectedAction.java =================================================================== --- trunk/sql12/plugins/syntax/src/main/java/net/sourceforge/squirrel_sql/plugins/syntax/FindSelectedAction.java 2011-06-12 19:13:05 UTC (rev 6304) +++ trunk/sql12/plugins/syntax/src/main/java/net/sourceforge/squirrel_sql/plugins/syntax/FindSelectedAction.java 2011-06-12 19:50:06 UTC (rev 6305) @@ -2,16 +2,14 @@ import net.sourceforge.squirrel_sql.client.IApplication; import net.sourceforge.squirrel_sql.client.action.SquirrelAction; -import net.sourceforge.squirrel_sql.client.session.ISession; import net.sourceforge.squirrel_sql.client.session.ISQLEntryPanel; import net.sourceforge.squirrel_sql.client.session.ISQLPanelAPI; +import net.sourceforge.squirrel_sql.client.session.ISession; import net.sourceforge.squirrel_sql.client.session.action.ISQLPanelAction; -import net.sourceforge.squirrel_sql.plugins.syntax.SyntaxPluginResources; -import net.sourceforge.squirrel_sql.plugins.syntax.rsyntax.SquirrelRSyntaxTextArea; -import net.sourceforge.squirrel_sql.plugins.syntax.rsyntax.RSyntaxSQLEntryPanel; -import net.sourceforge.squirrel_sql.plugins.syntax.netbeans.NetbeansSQLEntryPanel; import net.sourceforge.squirrel_sql.fw.util.StringManager; import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory; +import net.sourceforge.squirrel_sql.plugins.syntax.rsyntax.RSyntaxSQLEntryPanel; +import net.sourceforge.squirrel_sql.plugins.syntax.rsyntax.SquirrelRSyntaxTextArea; import javax.swing.*; import java.awt.event.ActionEvent; Modified: trunk/sql12/plugins/syntax/src/main/java/net/sourceforge/squirrel_sql/plugins/syntax/MarkSelectedAction.java =================================================================== --- trunk/sql12/plugins/syntax/src/main/java/net/sourceforge/squirrel_sql/plugins/syntax/MarkSelectedAction.java 2011-06-12 19:13:05 UTC (rev 6304) +++ trunk/sql12/plugins/syntax/src/main/java/net/sourceforge/squirrel_sql/plugins/syntax/MarkSelectedAction.java 2011-06-12 19:50:06 UTC (rev 6305) @@ -2,16 +2,14 @@ import net.sourceforge.squirrel_sql.client.IApplication; import net.sourceforge.squirrel_sql.client.action.SquirrelAction; -import net.sourceforge.squirrel_sql.client.session.ISession; import net.sourceforge.squirrel_sql.client.session.ISQLEntryPanel; import net.sourceforge.squirrel_sql.client.session.ISQLPanelAPI; +import net.sourceforge.squirrel_sql.client.session.ISession; import net.sourceforge.squirrel_sql.client.session.action.ISQLPanelAction; -import net.sourceforge.squirrel_sql.plugins.syntax.SyntaxPluginResources; -import net.sourceforge.squirrel_sql.plugins.syntax.rsyntax.SquirrelRSyntaxTextArea; -import net.sourceforge.squirrel_sql.plugins.syntax.rsyntax.RSyntaxSQLEntryPanel; -import net.sourceforge.squirrel_sql.plugins.syntax.netbeans.NetbeansSQLEntryPanel; import net.sourceforge.squirrel_sql.fw.util.StringManager; import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory; +import net.sourceforge.squirrel_sql.plugins.syntax.rsyntax.RSyntaxSQLEntryPanel; +import net.sourceforge.squirrel_sql.plugins.syntax.rsyntax.SquirrelRSyntaxTextArea; import javax.swing.*; import java.awt.event.ActionEvent; Modified: trunk/sql12/plugins/syntax/src/main/java/net/sourceforge/squirrel_sql/plugins/syntax/ReplaceAction.java =================================================================== --- trunk/sql12/plugins/syntax/src/main/java/net/sourceforge/squirrel_sql/plugins/syntax/ReplaceAction.java 2011-06-12 19:13:05 UTC (rev 6304) +++ trunk/sql12/plugins/syntax/src/main/java/net/sourceforge/squirrel_sql/plugins/syntax/ReplaceAction.java 2011-06-12 19:50:06 UTC (rev 6305) @@ -2,16 +2,14 @@ import net.sourceforge.squirrel_sql.client.IApplication; import net.sourceforge.squirrel_sql.client.action.SquirrelAction; -import net.sourceforge.squirrel_sql.client.session.ISession; import net.sourceforge.squirrel_sql.client.session.ISQLEntryPanel; import net.sourceforge.squirrel_sql.client.session.ISQLPanelAPI; +import net.sourceforge.squirrel_sql.client.session.ISession; import net.sourceforge.squirrel_sql.client.session.action.ISQLPanelAction; -import net.sourceforge.squirrel_sql.plugins.syntax.SyntaxPluginResources; -import net.sourceforge.squirrel_sql.plugins.syntax.rsyntax.RSyntaxSQLEntryPanel; -import net.sourceforge.squirrel_sql.plugins.syntax.rsyntax.SquirrelRSyntaxTextArea; -import net.sourceforge.squirrel_sql.plugins.syntax.netbeans.NetbeansSQLEntryPanel; import net.sourceforge.squirrel_sql.fw.util.StringManager; import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory; +import net.sourceforge.squirrel_sql.plugins.syntax.rsyntax.RSyntaxSQLEntryPanel; +import net.sourceforge.squirrel_sql.plugins.syntax.rsyntax.SquirrelRSyntaxTextArea; import javax.swing.*; import java.awt.event.ActionEvent; @@ -51,13 +49,8 @@ private void doActionPerformed(ISQLEntryPanel sqlEntryPanel, ActionEvent evt) { - if(sqlEntryPanel instanceof NetbeansSQLEntryPanel) + if(sqlEntryPanel instanceof RSyntaxSQLEntryPanel) { - NetbeansSQLEntryPanel nsep = (NetbeansSQLEntryPanel) sqlEntryPanel; - nsep.showReplaceDialog(evt); - } - else if(sqlEntryPanel instanceof RSyntaxSQLEntryPanel) - { SquirrelRSyntaxTextArea rsep = (SquirrelRSyntaxTextArea) sqlEntryPanel.getTextComponent(); rsep.showReplaceDialog(evt); } 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 2011-06-12 19:13:05 UTC (rev 6304) +++ trunk/sql12/plugins/syntax/src/main/java/net/sourceforge/squirrel_sql/plugins/syntax/SQLEntryPanelFactoryProxy.java 2011-06-12 19:50:06 UTC (rev 6305) @@ -1,27 +1,21 @@ package net.sourceforge.squirrel_sql.plugins.syntax; -import java.util.HashMap; - -import javax.swing.SwingUtilities; - import net.sourceforge.squirrel_sql.client.session.ISQLEntryPanel; import net.sourceforge.squirrel_sql.client.session.ISQLEntryPanelFactory; import net.sourceforge.squirrel_sql.client.session.ISession; import net.sourceforge.squirrel_sql.fw.util.StringManager; import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory; -import net.sourceforge.squirrel_sql.plugins.syntax.netbeans.NetbeansSQLEntryAreaFactory; -import net.sourceforge.squirrel_sql.plugins.syntax.oster.OsterSQLEntryAreaFactory; import net.sourceforge.squirrel_sql.plugins.syntax.rsyntax.RSyntaxSQLEntryAreaFactory; +import java.util.HashMap; + public class SQLEntryPanelFactoryProxy implements ISQLEntryPanelFactory { private static final StringManager s_stringMgr = StringManagerFactory.getStringManager(SQLEntryPanelFactoryProxy.class); - private NetbeansSQLEntryAreaFactory _netbeansFactory; - private OsterSQLEntryAreaFactory _osterFactory; private SyntaxPlugin _syntaxPugin; /** The original Squirrel SQL CLient factory for creating SQL entry panels. */ @@ -34,14 +28,11 @@ { _originalFactory = originalFactory; _rsyntaxFactory = new RSyntaxSQLEntryAreaFactory(syntaxPugin); - _netbeansFactory = new NetbeansSQLEntryAreaFactory(syntaxPugin); - _osterFactory = new OsterSQLEntryAreaFactory(syntaxPugin); _syntaxPugin = syntaxPugin; } public void sessionEnding(ISession session) { - _netbeansFactory.sessionEnding(session); _rsyntaxFactory.sessionEnding(session); } @@ -63,24 +54,6 @@ { newPnl = _rsyntaxFactory.createSQLEntryPanel(session, props); } - else if (prefs.getUseNetbeansTextControl()) - { - newPnl = _netbeansFactory.createSQLEntryPanel(session, props); - } - else if (prefs.getUseOsterTextControl()) - { - SwingUtilities.invokeLater(new Runnable() - { - public void run() - { - session.showMessage( - // i18n[syntax.osterWarning=You are using the Oster editor. Please consider using the Netbeans editor. See menu File --> New Session Properties --> Syntax] - s_stringMgr.getString("syntax.osterWarning")); - } - }); - - newPnl = _osterFactory.createSQLEntryPanel(session); - } else { newPnl = _originalFactory.createSQLEntryPanel(session, props); Modified: trunk/sql12/plugins/syntax/src/main/java/net/sourceforge/squirrel_sql/plugins/syntax/SyntaxPlugin.java =================================================================== --- trunk/sql12/plugins/syntax/src/main/java/net/sourceforge/squirrel_sql/plugins/syntax/SyntaxPlugin.java 2011-06-12 19:13:05 UTC (rev 6304) +++ trunk/sql12/plugins/syntax/src/main/java/net/sourceforge/squirrel_sql/plugins/syntax/SyntaxPlugin.java 2011-06-12 19:50:06 UTC (rev 6305) @@ -19,19 +19,6 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -import java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; -import java.io.FileNotFoundException; -import java.io.IOException; -import java.util.HashMap; -import java.util.Iterator; -import java.util.Map; - -import javax.swing.Action; -import javax.swing.JMenu; -import javax.swing.JMenuItem; -import javax.swing.JOptionPane; - import net.sourceforge.squirrel_sql.client.IApplication; import net.sourceforge.squirrel_sql.client.action.ActionCollection; import net.sourceforge.squirrel_sql.client.gui.session.ObjectTreeInternalFrame; @@ -53,11 +40,18 @@ 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.oster.OsterSQLEntryPanel; import net.sourceforge.squirrel_sql.plugins.syntax.rsyntax.RSyntaxSQLEntryPanel; import net.sourceforge.squirrel_sql.plugins.syntax.rsyntax.action.SquirrelCopyAsRtfAction; +import javax.swing.*; +import java.beans.PropertyChangeEvent; +import java.beans.PropertyChangeListener; +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. * @@ -543,9 +537,7 @@ { 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)) + if (false == SyntaxPreferences.IPropertyNames.USE_RSYNTAX_CONTROL.equals(propName)) { // Not the Textcontrol itself changed but some other of the Syntax Preferences, for example a @@ -554,16 +546,7 @@ 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(); Modified: trunk/sql12/plugins/syntax/src/main/java/net/sourceforge/squirrel_sql/plugins/syntax/SyntaxPreferences.java =================================================================== --- trunk/sql12/plugins/syntax/src/main/java/net/sourceforge/squirrel_sql/plugins/syntax/SyntaxPreferences.java 2011-06-12 19:13:05 UTC (rev 6304) +++ trunk/sql12/plugins/syntax/src/main/java/net/sourceforge/squirrel_sql/plugins/syntax/SyntaxPreferences.java 2011-06-12 19:50:06 UTC (rev 6305) @@ -30,9 +30,6 @@ */ public class SyntaxPreferences implements Serializable, Cloneable { - private static final long serialVersionUID = 1L; - - public interface IPropertyNames { // String BLINK_CARET = "blinkCaret"; // String BLOCK_CARET_ENABLED = "blockCaretEnabled"; @@ -57,8 +54,6 @@ // String SELECTION_COLOR = "selectionColor"; // String SHOW_LINE_NBRS = "showLineNumbers"; String TABLE_STYLE = "tableStyle"; - String USE_OSTER_CONTROL = "useOsterControl"; - String USE_NETBEANS_CONTROL = "useNetbeansControl"; String USE_RSYNTAX_CONTROL = "useRSyntaxControl"; String USE_PLAIN_CONTROL = "usePlainControl"; String WHITE_SPACE_STYLE = "whiteSpaceStyle"; @@ -71,9 +66,6 @@ /** Object to handle property change events. */ private transient PropertyChangeReporter _propChgReporter; - /** If <TT>true</TT> use the Oster text control else use the standard Java control. */ - private boolean _useOsterTextControl = false; - private boolean _useNetbeansTextControl = false; private boolean _usePlainTextControl = false; private boolean _useRSyntaxTextArea = true; @@ -241,32 +233,30 @@ getPropertyChangeReporter().removePropertyChangeListener(listener); } - public boolean getUseOsterTextControl() - { - return _useOsterTextControl; - } + /** + * @deprecated Oster editor has been removed. This is just here to automatically switch + * users of the Oster editor to RSyntax + */ public void setUseOsterTextControl(boolean data) { - if (_useOsterTextControl != data) - { - getPropertyChangeReporter().firePropertyChange(IPropertyNames.USE_OSTER_CONTROL, _useOsterTextControl, data); - _useOsterTextControl = data; + if(data) + { + setUseRSyntaxTextArea(true); } } - public boolean getUseNetbeansTextControl() - { - return _useNetbeansTextControl; - } + /** + * @deprecated Netbeans editor has been removed. This is just here to automatically switch + * users of the Netbeans editor to RSyntax + */ public void setUseNetbeansTextControl(boolean data) { - if (_useNetbeansTextControl != data) + if(data) { - getPropertyChangeReporter().firePropertyChange(IPropertyNames.USE_NETBEANS_CONTROL, _useNetbeansTextControl, data); - _useNetbeansTextControl = data; + setUseRSyntaxTextArea(true); } } Modified: trunk/sql12/plugins/syntax/src/main/java/net/sourceforge/squirrel_sql/plugins/syntax/SyntaxPreferencesPanel.java =================================================================== --- trunk/sql12/plugins/syntax/src/main/java/net/sourceforge/squirrel_sql/plugins/syntax/SyntaxPreferencesPanel.java 2011-06-12 19:13:05 UTC (rev 6304) +++ trunk/sql12/plugins/syntax/src/main/java/net/sourceforge/squirrel_sql/plugins/syntax/SyntaxPreferencesPanel.java 2011-06-12 19:50:06 UTC (rev 6305) @@ -196,9 +196,7 @@ } - private final JRadioButton _netbeansActiveOpt = new JRadioButton(i18n.NETBEANS); private final JRadioButton _rsyntaxActiveOpt = new JRadioButton(i18n.RSYNTAX); - private final JRadioButton _osterActiveOpt = new JRadioButton(i18n.OSTER); private final JRadioButton _plainActiveOpt = new JRadioButton(i18n.PLAIN); private final JCheckBox _chkTextLimitLineVisible = new JCheckBox(i18n.TEXT_LIMIT_LINE_VISIBLE); @@ -251,8 +249,6 @@ void loadData(SyntaxPreferences prefs) { - _osterActiveOpt.setSelected(prefs.getUseOsterTextControl()); - _netbeansActiveOpt.setSelected(prefs.getUseNetbeansTextControl()); _rsyntaxActiveOpt.setSelected(prefs.getUseRSyntaxTextArea()); _plainActiveOpt.setSelected(prefs.getUsePlainTextControl()); @@ -275,22 +271,16 @@ void applyChanges(SyntaxPreferences prefs) { boolean oldUseRSyntaxTextArea = prefs.getUseRSyntaxTextArea(); - boolean oldUseNetbeansTextControl = prefs.getUseNetbeansTextControl(); - boolean oldUseOsterTextControl = prefs.getUseOsterTextControl(); boolean oldUsePlainTextControl = prefs.getUsePlainTextControl(); try { - prefs.setUseNetbeansTextControl(_netbeansActiveOpt.isSelected()); prefs.setUseRSyntaxTextArea(_rsyntaxActiveOpt.isSelected()); - prefs.setUseOsterTextControl(_osterActiveOpt.isSelected()); prefs.setUsePlainTextControl(_plainActiveOpt.isSelected()); } catch (SyntaxPrefChangeNotSupportedException e) { - prefs.setUseNetbeansTextControl(oldUseNetbeansTextControl); prefs.setUseRSyntaxTextArea(oldUseRSyntaxTextArea); - prefs.setUseOsterTextControl(oldUseOsterTextControl); prefs.setUsePlainTextControl(oldUsePlainTextControl); } @@ -337,18 +327,16 @@ private void updateControlStatus() { - final boolean useOsterControl = _osterActiveOpt.isSelected(); - final boolean useNetbeansControl = _netbeansActiveOpt.isSelected(); final boolean useRSyntaxControl = _rsyntaxActiveOpt.isSelected(); final boolean usePlainControl = _plainActiveOpt.isSelected(); - _stylesList.setEnabled(useOsterControl || useNetbeansControl || useRSyntaxControl); - _styleMaintPnl.setEnabled(useOsterControl || useNetbeansControl || useRSyntaxControl); + _stylesList.setEnabled(useRSyntaxControl); + _styleMaintPnl.setEnabled(useRSyntaxControl); - _chkTextLimitLineVisible.setEnabled(useNetbeansControl || useRSyntaxControl); - _txtTextLimitLineWidth.setEnabled(useNetbeansControl || useRSyntaxControl); + _chkTextLimitLineVisible.setEnabled(useRSyntaxControl); + _txtTextLimitLineWidth.setEnabled(useRSyntaxControl); - if(useNetbeansControl || useRSyntaxControl) + if(useRSyntaxControl) { _txtTextLimitLineWidth.setEnabled(_chkTextLimitLineVisible.isSelected()); } @@ -366,26 +354,9 @@ ButtonGroup bg = new ButtonGroup(); bg.add(_rsyntaxActiveOpt); - bg.add(_netbeansActiveOpt); - bg.add(_osterActiveOpt); bg.add(_plainActiveOpt); - _osterActiveOpt.addChangeListener(new ChangeListener() - { - public void stateChanged(ChangeEvent evt) - { - updateControlStatus(); - } - }); - _netbeansActiveOpt.addChangeListener(new ChangeListener() - { - public void stateChanged(ChangeEvent evt) - { - updateControlStatus(); - } - }); - _rsyntaxActiveOpt.addChangeListener(new ChangeListener() { public void stateChanged(ChangeEvent evt) @@ -466,25 +437,19 @@ pnlRet.add(_rsyntaxActiveOpt, gbc); gbc = new GridBagConstraints(0,1,1,1,0,0,GridBagConstraints.NORTHWEST, GridBagConstraints.NONE, new Insets(0,5,5,5), 0,0); - pnlRet.add(_netbeansActiveOpt, gbc); - - gbc = new GridBagConstraints(0,2,1,1,0,0,GridBagConstraints.NORTHWEST, GridBagConstraints.NONE, new Insets(0,5,5,5), 0,0); - pnlRet.add(_osterActiveOpt, gbc); - - gbc = new GridBagConstraints(0,3,1,1,0,0,GridBagConstraints.NORTHWEST, GridBagConstraints.NONE, new Insets(0,5,5,5), 0,0); pnlRet.add(_plainActiveOpt, gbc); - gbc = new GridBagConstraints(0,4,1,1,0,0,GridBagConstraints.NORTHWEST, GridBagConstraints.NONE, new Insets(40,5,0,5), 0,0); + gbc = new GridBagConstraints(0,2,1,1,0,0,GridBagConstraints.NORTHWEST, GridBagConstraints.NONE, new Insets(40,5,0,5), 0,0); pnlRet.add(createPnlLineLimit(), gbc); - gbc = new GridBagConstraints(0,5,1,1,0,0,GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(5,5,5,5), 0,0); + gbc = new GridBagConstraints(0,3,1,1,0,0,GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(5,5,5,5), 0,0); pnlRet.add(_chkHighlightCurrentLine, gbc); - gbc = new GridBagConstraints(0,6,1,1,0,0,GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(5,5,5,5), 0,0); + gbc = new GridBagConstraints(0,4,1,1,0,0,GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(5,5,5,5), 0,0); pnlRet.add(_chkLineNumbersEnabled, gbc); - gbc = new GridBagConstraints(0,7,1,1,0,0,GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(5,5,5,5), 0,0); + gbc = new GridBagConstraints(0,5,1,1,0,0,GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(5,5,5,5), 0,0); pnlRet.add(_useCopyAsRtf, gbc); return pnlRet; 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 2011-06-12 19:13:05 UTC (rev 6304) +++ trunk/sql12/plugins/syntax/src/main/java/net/sourceforge/squirrel_sql/plugins/syntax/ToolsPopupHandler.java 2011-06-12 19:50:06 UTC (rev 6305) @@ -1,10 +1,5 @@ package net.sourceforge.squirrel_sql.plugins.syntax; -import java.util.HashMap; - -import javax.swing.Action; -import javax.swing.JComponent; - import net.sourceforge.squirrel_sql.client.IApplication; import net.sourceforge.squirrel_sql.client.action.ActionCollection; import net.sourceforge.squirrel_sql.client.gui.session.SQLInternalFrame; @@ -13,16 +8,14 @@ import net.sourceforge.squirrel_sql.client.session.ISQLEntryPanel; import net.sourceforge.squirrel_sql.client.session.ISQLPanelAPI; import net.sourceforge.squirrel_sql.fw.util.Resources; -import net.sourceforge.squirrel_sql.plugins.syntax.netbeans.NetbeansSQLEditorPane; -import net.sourceforge.squirrel_sql.plugins.syntax.netbeans.SQLKit; -import net.sourceforge.squirrel_sql.plugins.syntax.netbeans.SQLSettingsInitializer; import net.sourceforge.squirrel_sql.plugins.syntax.rsyntax.SquirreLRSyntaxTextAreaUI; import net.sourceforge.squirrel_sql.plugins.syntax.rsyntax.SquirrelRSyntaxTextArea; import net.sourceforge.squirrel_sql.plugins.syntax.rsyntax.action.SquirrelCopyAsRtfAction; - import org.fife.ui.rtextarea.RTextAreaEditorKit; -import org.netbeans.editor.BaseKit; +import javax.swing.*; +import java.util.HashMap; + public class ToolsPopupHandler { private SyntaxPlugin _syntaxPugin; @@ -59,19 +52,8 @@ 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) + if (isqlEntryPanel.getTextComponent() instanceof SquirrelRSyntaxTextArea) { - 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(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(SyntaxPlugin.i18n.TO_LOWER_CASE, toLowerAction); - } - else if (isqlEntryPanel.getTextComponent() instanceof SquirrelRSyntaxTextArea) - { SquirrelRSyntaxTextArea rsEdit = (SquirrelRSyntaxTextArea) isqlEntryPanel.getTextComponent(); Action toUpperAction = SquirreLRSyntaxTextAreaUI.getActionForName(rsEdit, RTextAreaEditorKit.rtaUpperSelectionCaseAction); @@ -104,21 +86,8 @@ sif.addToToolsPopUp(SyntaxPlugin.i18n.COMMENT, coll.get(CommentAction.class)); sif.addToToolsPopUp(SyntaxPlugin.i18n.UNCOMMENT, coll.get(UncommentAction.class)); - if (sep.getTextComponent() instanceof NetbeansSQLEditorPane) + if (sep.getTextComponent() instanceof SquirrelRSyntaxTextArea) { - NetbeansSQLEditorPane nbEdit = (NetbeansSQLEditorPane) septc; - SQLKit kit = (SQLKit) nbEdit.getEditorKit(); - - Action toUpperAction = kit.getActionByName(BaseKit.toUpperCaseAction); - toUpperAction.putValue(Resources.ACCELERATOR_STRING, SQLSettingsInitializer.ACCELERATOR_STRING_TO_UPPER_CASE); - 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(SyntaxPlugin.i18n.TO_LOWER_CASE, toLowerAction); - } - else if (sep.getTextComponent() instanceof SquirrelRSyntaxTextArea) - { SquirrelRSyntaxTextArea rsEdit = (SquirrelRSyntaxTextArea) sep.getTextComponent(); Action toUpperAction = SquirreLRSyntaxTextAreaUI.getActionForName(rsEdit, RTextAreaEditorKit.rtaUpperSelectionCaseAction); @@ -150,19 +119,8 @@ ISQLPanelAPI sqlPanelAPI = sqlInternalFrame.getSQLPanelAPI(); - if (sqlPanelAPI.getSQLEntryPanel().getTextComponent() instanceof NetbeansSQLEditorPane) + if (sqlPanelAPI.getSQLEntryPanel().getTextComponent() instanceof SquirrelRSyntaxTextArea) { - 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(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(SyntaxPlugin.i18n.TO_LOWER_CASE, toLowerAction); - } - else if (sqlPanelAPI.getSQLEntryPanel().getTextComponent() instanceof SquirrelRSyntaxTextArea) - { SquirrelRSyntaxTextArea rsEdit = (SquirrelRSyntaxTextArea) sqlPanelAPI.getSQLEntryPanel().getTextComponent(); Action toUpperAction = SquirreLRSyntaxTextAreaUI.getActionForName(rsEdit, RTextAreaEditorKit.rtaUpperSelectionCaseAction); Modified: trunk/sql12/plugins/syntax/src/test/java/net/sourceforge/squirrel_sql/plugins/syntax/SyntaxPreferencesTest.java =================================================================== --- trunk/sql12/plugins/syntax/src/test/java/net/sourceforge/squirrel_sql/plugins/syntax/SyntaxPreferencesTest.java 2011-06-12 19:13:05 UTC (rev 6304) +++ trunk/sql12/plugins/syntax/src/test/java/net/sourceforge/squirrel_sql/plugins/syntax/SyntaxPreferencesTest.java 2011-06-12 19:50:06 UTC (rev 6305) @@ -50,20 +50,6 @@ } @Test - public void testGetUseOsterTextControl() throws Exception - { - classUnderTest.setUseOsterTextControl(true); - assertEquals(true, classUnderTest.getUseOsterTextControl()); - } - - @Test - public void testGetUseNetbeansTextControl() throws Exception - { - classUnderTest.setUseNetbeansTextControl(true); - assertEquals(true, classUnderTest.getUseNetbeansTextControl()); - } - - @Test public void testGetUsePlainTextControl() throws Exception { classUnderTest.setUsePlainTextControl(true); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |