[Squirrel-sql-commits] SF.net SVN: squirrel-sql:[6615] trunk/sql12

[<ger...@us...>]

Revision: 6615
          http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6615&view=rev
Author:   gerdwagner
Date:     2012-04-24 21:08:50 +0000 (Tue, 24 Apr 2012)
Log Message:
-----------
Syntax Plugin: Upgraded to RSyntax text area version 1.5.2

Modified Paths:
--------------
    trunk/sql12/doc/src/main/resources/changes.txt
    trunk/sql12/plugins/syntax/pom.xml
    trunk/sql12/plugins/syntax/src/main/java/net/sourceforge/squirrel_sql/plugins/syntax/rsyntax/SquirreLRSyntaxTextAreaUI.java

Modified: trunk/sql12/doc/src/main/resources/changes.txt
===================================================================
--- trunk/sql12/doc/src/main/resources/changes.txt	2012-04-17 18:00:42 UTC (rev 6614)
+++ trunk/sql12/doc/src/main/resources/changes.txt	2012-04-24 21:08:50 UTC (rev 6615)
@@ -9,6 +9,8 @@
 
 Enhancements:
 
+Syntax Plugin: Upgraded to RSyntax text area version 1.5.2
+
 Add new default driver definitions for HXTT Cobol and XML drivers.
 
 About Dialog:

Modified: trunk/sql12/plugins/syntax/pom.xml
===================================================================
--- trunk/sql12/plugins/syntax/pom.xml	2012-04-17 18:00:42 UTC (rev 6614)
+++ trunk/sql12/plugins/syntax/pom.xml	2012-04-24 21:08:50 UTC (rev 6615)
@@ -92,17 +92,17 @@
 		<dependency>
 			<groupId>com.fifesoft.rtext</groupId>
 			<artifactId>rtext</artifactId>
-			<version>1.3.0</version>
+			<version>1.5.0</version>
 		</dependency>
 		<dependency>
 			<groupId>com.fifesoft.rtext</groupId>
 			<artifactId>common</artifactId>
-			<version>1.3.0</version>
+			<version>1.5.0</version>
 		</dependency>
 		<dependency>
 			<groupId>com.fifesoft</groupId>
 			<artifactId>rsyntaxtextarea</artifactId>
-			<version>r239</version>
+			<version>1.5.2</version>
 		</dependency>
 		<!--<dependency>-->
 			<!--<groupId>net.sf.squirrel-sql.thirdparty-non-maven</groupId>-->

Modified: trunk/sql12/plugins/syntax/src/main/java/net/sourceforge/squirrel_sql/plugins/syntax/rsyntax/SquirreLRSyntaxTextAreaUI.java
===================================================================
--- trunk/sql12/plugins/syntax/src/main/java/net/sourceforge/squirrel_sql/plugins/syntax/rsyntax/SquirreLRSyntaxTextAreaUI.java	2012-04-17 18:00:42 UTC (rev 6614)
+++ trunk/sql12/plugins/syntax/src/main/java/net/sourceforge/squirrel_sql/plugins/syntax/rsyntax/SquirreLRSyntaxTextAreaUI.java	2012-04-24 21:08:50 UTC (rev 6615)
@@ -67,6 +67,7 @@
       shared.remove(KeyStroke.getKeyStroke(KeyEvent.VK_SPACE, InputEvent.CTRL_MASK));
       shared.remove(KeyStroke.getKeyStroke(KeyEvent.VK_J, InputEvent.CTRL_MASK));
       shared.remove(KeyStroke.getKeyStroke(KeyEvent.VK_D, InputEvent.CTRL_MASK));
+      shared.remove(KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, InputEvent.CTRL_MASK));
 
       /*
        *       Remove this Keystroke, because it triggers auto-complete of the current word with a matching most recent word,

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.