You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by nt...@apache.org on 2017/03/10 11:39:12 UTC
cayenne git commit: CAY-2240 Modeler: issue with cursor rendering for
EJBQL query (on Windows)
Repository: cayenne
Updated Branches:
refs/heads/master 3ecc08ebe -> 9c32b7604
CAY-2240 Modeler: issue with cursor rendering for EJBQL query (on Windows)
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/9c32b760
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/9c32b760
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/9c32b760
Branch: refs/heads/master
Commit: 9c32b7604b4a826b3e4e32ea72a071d3118c5907
Parents: 3ecc08e
Author: Nikita Timofeev <st...@gmail.com>
Authored: Fri Mar 10 14:39:06 2017 +0300
Committer: Nikita Timofeev <st...@gmail.com>
Committed: Fri Mar 10 14:39:06 2017 +0300
----------------------------------------------------------------------
docs/doc/src/main/resources/RELEASE-NOTES.txt | 1 +
.../textpane/syntax/EJBQLSyntaxConstant.java | 2 +-
.../textpane/syntax/SQLSyntaxConstants.java | 2 +-
.../textpane/syntax/SyntaxConstant.java | 32 ++++++++++++--------
4 files changed, 22 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/9c32b760/docs/doc/src/main/resources/RELEASE-NOTES.txt
----------------------------------------------------------------------
diff --git a/docs/doc/src/main/resources/RELEASE-NOTES.txt b/docs/doc/src/main/resources/RELEASE-NOTES.txt
index 6fc7b0f..57547c1 100644
--- a/docs/doc/src/main/resources/RELEASE-NOTES.txt
+++ b/docs/doc/src/main/resources/RELEASE-NOTES.txt
@@ -17,6 +17,7 @@ Changes/New Features:
Bug Fixes:
+CAY-2240 Modeler: issue with cursor rendering for EJBQL query
CAY-2256 Cannot Save/Insert an Object With null Flattened (complex) toOne Relationship (see also CAY-2146)
----------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/9c32b760/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/swing/components/textpane/syntax/EJBQLSyntaxConstant.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/swing/components/textpane/syntax/EJBQLSyntaxConstant.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/swing/components/textpane/syntax/EJBQLSyntaxConstant.java
index d692aed..fbbe76d 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/swing/components/textpane/syntax/EJBQLSyntaxConstant.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/swing/components/textpane/syntax/EJBQLSyntaxConstant.java
@@ -18,7 +18,7 @@
****************************************************************/
package org.apache.cayenne.swing.components.textpane.syntax;
-public class EJBQLSyntaxConstant implements SyntaxConstant{
+public class EJBQLSyntaxConstant extends SyntaxConstant{
private static String[] KEYWORDS = { "AS", "ABS", "ASC", "AVG", "BETWEEN",
"BOTH", "BIT_LENGTH", "CHARACTER_LENGTH", "CHAR_LENGTH", "COUNT",
"CONCAT", "CURRENT_TIME", "CURRENT_DATE", "CURRENT_TIMESTAMP",
http://git-wip-us.apache.org/repos/asf/cayenne/blob/9c32b760/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/swing/components/textpane/syntax/SQLSyntaxConstants.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/swing/components/textpane/syntax/SQLSyntaxConstants.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/swing/components/textpane/syntax/SQLSyntaxConstants.java
index 7284634..b55db85 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/swing/components/textpane/syntax/SQLSyntaxConstants.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/swing/components/textpane/syntax/SQLSyntaxConstants.java
@@ -19,7 +19,7 @@
package org.apache.cayenne.swing.components.textpane.syntax;
-public class SQLSyntaxConstants implements SyntaxConstant{
+public class SQLSyntaxConstants extends SyntaxConstant{
private static String[] KEYWORDS = {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/9c32b760/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/swing/components/textpane/syntax/SyntaxConstant.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/swing/components/textpane/syntax/SyntaxConstant.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/swing/components/textpane/syntax/SyntaxConstant.java
index bc9ed17..e6f029d 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/swing/components/textpane/syntax/SyntaxConstant.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/swing/components/textpane/syntax/SyntaxConstant.java
@@ -21,23 +21,29 @@ package org.apache.cayenne.swing.components.textpane.syntax;
import java.awt.Color;
import java.awt.Font;
-public interface SyntaxConstant {
+public abstract class SyntaxConstant {
- Font DEFAULT_FONT = new Font("Courier", Font.PLAIN, 14);
- Color DEFAULT_COLOR = Color.black;
- String COMMENT_TEXT = "(?:/\\*(?:[^*]|(?:\\*+[^*/]))*\\*+/)|(?://.*)";
- String COMMENT_TEXT_START = "/\\*.?";
- String STRING_TEXT = "'[^']*'";
- String NUMBER_TEXT = "\\d+";
+ public static final Font DEFAULT_FONT;
+ static {
+ String fontName = System.getProperty("os.name").toLowerCase().contains("win")
+ ? "Courier New" : "Courier";
+ DEFAULT_FONT = new Font(fontName, Font.PLAIN, 14);
+ }
- String[] getKEYWORDS();
+ public static final Color DEFAULT_COLOR = Color.black;
+ public static final String COMMENT_TEXT = "(?:/\\*(?:[^*]|(?:\\*+[^*/]))*\\*+/)|(?://.*)";
+ public static final String COMMENT_TEXT_START = "/\\*.?";
+ public static final String STRING_TEXT = "'[^']*'";
+ public static final String NUMBER_TEXT = "\\d+";
- String[] getKEYWORDS2();
+ public abstract String[] getKEYWORDS();
- String[] getTYPES();
+ public abstract String[] getKEYWORDS2();
- String[] getOPERATORS();
-
- String getContentType();
+ public abstract String[] getTYPES();
+
+ public abstract String[] getOPERATORS();
+
+ public abstract String getContentType();
}