svn commit: r1731546 - in /jmeter/trunk: bin/jmeter.properties src/core/org/apache/jmeter/gui/util/JSyntaxTextArea.java xdocs/changes.xml

[mi...@apache.org]

Author: milamber
Date: Sun Feb 21 18:18:02 2016
New Revision: 1731546

URL: http://svn.apache.org/viewvc?rev=1731546&view=rev
Log:
JSyntaxTextArea : Ability to set font

This closes #91
Bugzilla Id: 58933

Modified:
    jmeter/trunk/bin/jmeter.properties
    jmeter/trunk/src/core/org/apache/jmeter/gui/util/JSyntaxTextArea.java
    jmeter/trunk/xdocs/changes.xml

Modified: jmeter/trunk/bin/jmeter.properties
URL: http://svn.apache.org/viewvc/jmeter/trunk/bin/jmeter.properties?rev=1731546&r1=1731545&r2=1731546&view=diff
==============================================================================
--- jmeter/trunk/bin/jmeter.properties (original)
+++ jmeter/trunk/bin/jmeter.properties Sun Feb 21 18:18:02 2016
@@ -1079,6 +1079,9 @@ beanshell.server.file=../extras/startup.
 #jsyntaxtextarea.codefolding=true
 # Set 0 to disable undo feature in JSyntaxTextArea
 #jsyntaxtextarea.maxundos=50
+# Change the font on the (JSyntax) Text Areas. (Useful for HiDPI screens)
+#jsyntaxtextarea.font.family=Hack
+#jsyntaxtextarea.font.size=14
 
 # Set this to false to disable the use of JSyntaxTextArea for the Console Logger panel 
 #loggerpanel.usejsyntaxtext=true

Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/util/JSyntaxTextArea.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/util/JSyntaxTextArea.java?rev=1731546&r1=1731545&r2=1731546&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/util/JSyntaxTextArea.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/util/JSyntaxTextArea.java Sun Feb 21 18:18:02 2016
@@ -18,6 +18,7 @@
 
 package org.apache.jmeter.gui.util;
 
+import java.awt.Font;
 import java.util.Properties;
 
 import org.apache.jmeter.util.JMeterUtils;
@@ -39,6 +40,8 @@ public class JSyntaxTextArea extends RSy
     private static final boolean LINE_WRAP       = JMeterUtils.getPropDefault("jsyntaxtextarea.linewrap", true);
     private static final boolean CODE_FOLDING    = JMeterUtils.getPropDefault("jsyntaxtextarea.codefolding", true);
     private static final int MAX_UNDOS           = JMeterUtils.getPropDefault("jsyntaxtextarea.maxundos", 50);
+    private static final String USER_FONT_FAMILY = JMeterUtils.getPropDefault("jsyntaxtextarea.font.family", JSyntaxTextArea.getDefaultFont().getName());
+    private static final int USER_FONT_SIZE      = JMeterUtils.getPropDefault("jsyntaxtextarea.font.size", JSyntaxTextArea.getDefaultFont().getSize());
 
     @Deprecated
     public JSyntaxTextArea() {
@@ -90,6 +93,7 @@ public class JSyntaxTextArea extends RSy
         super.setLineWrap(LINE_WRAP);
         super.setWrapStyleWord(WRAP_STYLE_WORD);
         this.disableUndo = disableUndo;
+        setFont(new Font(USER_FONT_FAMILY, Font.PLAIN, USER_FONT_SIZE));
         if(disableUndo) {
             // We need to do this to force recreation of undoManager which
             // will use the disableUndo otherwise it would always be false

Modified: jmeter/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1731546&r1=1731545&r2=1731546&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml (original)
+++ jmeter/trunk/xdocs/changes.xml Sun Feb 21 18:18:02 2016
@@ -210,6 +210,7 @@ Summary
 <li><bug>58987</bug>Report/Dashboard: Improve error reporting.</li>
 <li><bug>58870</bug>TableEditor: minimum size is too small. Contributed by Vincent Herilier (vherilier at gmail.com)</li>
 <li><bug>59037</bug>Drop HtmlParserHTMLParser and dependencies on htmlparser and htmllexer</li>
+<li><bug>58933</bug>JSyntaxTextArea : Ability to set font.  Contributed by Denis Kirpichenkov (denis.kirpichenkov at gmail.com)</li>
 </ul>
 <ch_section>Non-functional changes</ch_section>
 <ul>
@@ -341,6 +342,7 @@ Summary
 <li>Antonio Gomes Rodrigues (ra0077 at gmail.com)</li>
 <li>Harrison Termotto (harrison dot termotto at stonybrook.edu</li>
 <li>Vincent Herilier (vherilier at gmail.com)</li>
+<li>Denis Kirpichenkov (denis.kirpichenkov at gmail.com)</li>
 </ul>
 
 <br/>