|
From: <man...@us...> - 2010-05-30 17:19:03
|
Revision: 5628
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=5628&view=rev
Author: manningr
Date: 2010-05-30 17:18:56 +0000 (Sun, 30 May 2010)
Log Message:
-----------
Merged from trunk revision 5625 (Bug-Fix for 2991971: RSyntax text editor ignores font settings)
Revision Links:
--------------
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=5625&view=rev
Modified Paths:
--------------
branches/squirrel-sql_3_1_1/sql12/plugins/syntax/src/net/sourceforge/squirrel_sql/plugins/syntax/rsyntax/SquirrelRSyntaxTextArea.java
branches/squirrel-sql_3_1_1/sql12/plugins/syntax/src/net/sourceforge/squirrel_sql/plugins/syntax/rsyntax/SquirrelSyntaxScheme.java
Modified: branches/squirrel-sql_3_1_1/sql12/plugins/syntax/src/net/sourceforge/squirrel_sql/plugins/syntax/rsyntax/SquirrelRSyntaxTextArea.java
===================================================================
--- branches/squirrel-sql_3_1_1/sql12/plugins/syntax/src/net/sourceforge/squirrel_sql/plugins/syntax/rsyntax/SquirrelRSyntaxTextArea.java 2010-05-27 04:09:30 UTC (rev 5627)
+++ branches/squirrel-sql_3_1_1/sql12/plugins/syntax/src/net/sourceforge/squirrel_sql/plugins/syntax/rsyntax/SquirrelRSyntaxTextArea.java 2010-05-30 17:18:56 UTC (rev 5628)
@@ -1,30 +1,33 @@
package net.sourceforge.squirrel_sql.plugins.syntax.rsyntax;
+import java.awt.event.ActionEvent;
+import java.awt.event.MouseEvent;
+
+import javax.swing.JPopupMenu;
+import javax.swing.event.ChangeListener;
+import javax.swing.event.UndoableEditListener;
+import javax.swing.text.DefaultCaret;
+import javax.swing.text.Document;
+
import net.sourceforge.squirrel_sql.client.session.ISession;
import net.sourceforge.squirrel_sql.client.session.SQLTokenListener;
+import net.sourceforge.squirrel_sql.client.session.mainpanel.IUndoHandler;
+import net.sourceforge.squirrel_sql.client.session.parser.IParserEventsProcessor;
import net.sourceforge.squirrel_sql.client.session.parser.ParserEventsAdapter;
-import net.sourceforge.squirrel_sql.client.session.parser.IParserEventsProcessor;
import net.sourceforge.squirrel_sql.client.session.parser.kernel.ErrorInfo;
-import net.sourceforge.squirrel_sql.client.session.mainpanel.IUndoHandler;
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.plugins.syntax.KeyManager;
import net.sourceforge.squirrel_sql.plugins.syntax.SyntaxPreferences;
import net.sourceforge.squirrel_sql.plugins.syntax.rsyntax.search.SquirrelRSyntaxSearchEngine;
+
import org.fife.ui.rsyntaxtextarea.RSyntaxDocument;
import org.fife.ui.rsyntaxtextarea.RSyntaxTextArea;
+import org.fife.ui.rsyntaxtextarea.RSyntaxTextAreaEditorKit;
import org.fife.ui.rsyntaxtextarea.SyntaxScheme;
import org.fife.ui.rtextarea.RTextAreaUI;
-import javax.swing.*;
-import javax.swing.event.UndoableEditListener;
-import javax.swing.event.ChangeListener;
-import javax.swing.text.Document;
-import javax.swing.text.DefaultCaret;
-import java.awt.event.MouseEvent;
-import java.awt.event.ActionEvent;
-
public class SquirrelRSyntaxTextArea extends RSyntaxTextArea
{
private static final StringManager s_stringMgr =
@@ -122,7 +125,10 @@
public void updateFromPreferences()
{
- _squirrelSyntaxScheme.initSytles(_prefs);
+ setFont(_session.getProperties().getFontInfo().createFont());
+ _squirrelSyntaxScheme.initSytles(_prefs, _session.getProperties().getFontInfo());
+ new RSyntaxTextAreaEditorKit.IncreaseFontSizeAction().actionPerformedImpl(new ActionEvent(this, 1, "foo"), this);
+ new RSyntaxTextAreaEditorKit.DecreaseFontSizeAction().actionPerformedImpl(new ActionEvent(this, 1, "bar"), this);
repaint();
}
Modified: branches/squirrel-sql_3_1_1/sql12/plugins/syntax/src/net/sourceforge/squirrel_sql/plugins/syntax/rsyntax/SquirrelSyntaxScheme.java
===================================================================
--- branches/squirrel-sql_3_1_1/sql12/plugins/syntax/src/net/sourceforge/squirrel_sql/plugins/syntax/rsyntax/SquirrelSyntaxScheme.java 2010-05-27 04:09:30 UTC (rev 5627)
+++ branches/squirrel-sql_3_1_1/sql12/plugins/syntax/src/net/sourceforge/squirrel_sql/plugins/syntax/rsyntax/SquirrelSyntaxScheme.java 2010-05-30 17:18:56 UTC (rev 5628)
@@ -1,20 +1,20 @@
package net.sourceforge.squirrel_sql.plugins.syntax.rsyntax;
-import org.fife.ui.rsyntaxtextarea.RSyntaxTextArea;
-import org.fife.ui.rsyntaxtextarea.Style;
-import org.fife.ui.rsyntaxtextarea.SyntaxScheme;
-import org.fife.ui.rsyntaxtextarea.Token;
+import java.awt.Color;
+import java.awt.Font;
import javax.swing.text.StyleContext;
-import java.awt.*;
import net.sourceforge.squirrel_sql.plugins.syntax.SyntaxPreferences;
import net.sourceforge.squirrel_sql.plugins.syntax.SyntaxStyle;
-import net.sourceforge.squirrel_sql.client.session.parser.IParserEventsProcessor;
-import net.sourceforge.squirrel_sql.client.session.parser.ParserEventsListener;
-import net.sourceforge.squirrel_sql.client.session.parser.kernel.TableAliasInfo;
-import net.sourceforge.squirrel_sql.client.session.parser.kernel.ErrorInfo;
+import net.sourceforge.squirrel_sql.client.session.properties.SessionProperties;
+import net.sourceforge.squirrel_sql.fw.gui.FontInfo;
+import org.fife.ui.rsyntaxtextarea.RSyntaxTextArea;
+import org.fife.ui.rsyntaxtextarea.Style;
+import org.fife.ui.rsyntaxtextarea.SyntaxScheme;
+import org.fife.ui.rsyntaxtextarea.Token;
+
public class SquirrelSyntaxScheme extends SyntaxScheme
{
public SquirrelSyntaxScheme()
@@ -22,19 +22,17 @@
super(true);
}
- public void initSytles(SyntaxPreferences prefs)
+ public void initSytles(SyntaxPreferences prefs, FontInfo fontInfo)
{
super.restoreDefaults();
Style[] stylesBuf = new Style[SquirrelTokenMarker.getNumTokenTypes()];
System.arraycopy(styles, 0, stylesBuf, 0, styles.length);
- Font temp = RSyntaxTextArea.getDefaultFont();
- StyleContext sc = StyleContext.getDefaultStyleContext();
- Font boldFont = sc.getFont(temp.getFamily(), Font.BOLD,
- temp.getSize());
- Font italicFont = sc.getFont(temp.getFamily(), Font.ITALIC,
- temp.getSize());
+ StyleContext sc = StyleContext.getDefaultStyleContext();
+ Font boldFont = sc.getFont(fontInfo.getFamily(), Font.BOLD, fontInfo.getSize());
+ Font italicFont = sc.getFont(fontInfo.getFamily(), Font.ITALIC, fontInfo.getSize());
+
// stylesBuf[SquirrelTokenMarker.TOKEN_IDENTIFIER_TABLE] = new Style(Color.green, null);
// stylesBuf[SquirrelTokenMarker.TOKEN_IDENTIFIER_DATA_TYPE] = new Style(new Color(178,178,0), null, boldFont);
// stylesBuf[SquirrelTokenMarker.TOKEN_IDENTIFIER_COLUMN] = new Style(new Color(102,102,0), null, boldFont);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
