You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by se...@apache.org on 2013/07/07 03:41:46 UTC
svn commit: r1500350 - in /jmeter/trunk/src:
components/org/apache/jmeter/assertions/gui/BeanShellAssertionGui.java
core/org/apache/jmeter/testbeans/gui/TextAreaEditor.java
protocol/java/org/apache/jmeter/protocol/java/control/gui/BeanShellSamplerGui.java
Author: sebb
Date: Sun Jul 7 01:41:46 2013
New Revision: 1500350
URL: http://svn.apache.org/r1500350
Log:
Only access RSyntaxTextArea through utility classes
Modified:
jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/BeanShellAssertionGui.java
jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/TextAreaEditor.java
jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/control/gui/BeanShellSamplerGui.java
Modified: jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/BeanShellAssertionGui.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/BeanShellAssertionGui.java?rev=1500350&r1=1500349&r2=1500350&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/BeanShellAssertionGui.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/BeanShellAssertionGui.java Sun Jul 7 01:41:46 2013
@@ -31,9 +31,8 @@ import org.apache.jmeter.assertions.Bean
import org.apache.jmeter.testelement.TestElement;
import org.apache.jmeter.testelement.property.BooleanProperty;
import org.apache.jmeter.util.JMeterUtils;
-import org.fife.ui.rsyntaxtextarea.RSyntaxTextArea;
-import org.fife.ui.rsyntaxtextarea.SyntaxConstants;
-import org.fife.ui.rtextarea.RTextScrollPane;
+import org.apache.jorphan.gui.JSyntaxTextArea;
+import org.apache.jorphan.gui.JTextScrollPane;
public class BeanShellAssertionGui extends AbstractAssertionGui {
@@ -45,7 +44,7 @@ public class BeanShellAssertionGui exten
private JTextField parameters;// parameters to pass to script file (or script)
- private RSyntaxTextArea scriptField; // script area
+ private JSyntaxTextArea scriptField; // script area
public BeanShellAssertionGui() {
init();
@@ -141,19 +140,14 @@ public class BeanShellAssertionGui exten
}
private JPanel createScriptPanel() {
- scriptField = new RSyntaxTextArea(20,20);
- scriptField.setSyntaxEditingStyle(SyntaxConstants.SYNTAX_STYLE_JAVA);
- scriptField.setCodeFoldingEnabled(true);
- scriptField.setAntiAliasingEnabled(true);
- scriptField.setLineWrap(true);
- scriptField.setWrapStyleWord(true);
+ scriptField = new JSyntaxTextArea(20,20);
JLabel label = new JLabel(JMeterUtils.getResString("bsh_assertion_script")); //$NON-NLS-1$
label.setLabelFor(scriptField);
JPanel panel = new JPanel(new BorderLayout());
panel.add(label, BorderLayout.NORTH);
- panel.add(new RTextScrollPane(scriptField), BorderLayout.CENTER);
+ panel.add(new JTextScrollPane(scriptField), BorderLayout.CENTER);
JTextArea explain = new JTextArea(JMeterUtils.getResString("bsh_assertion_script_variables")); //$NON-NLS-1$
explain.setLineWrap(true);
Modified: jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/TextAreaEditor.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/TextAreaEditor.java?rev=1500350&r1=1500349&r2=1500350&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/TextAreaEditor.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/TextAreaEditor.java Sun Jul 7 01:41:46 2013
@@ -30,15 +30,14 @@ import java.beans.PropertyEditorSupport;
import java.util.Properties;
import org.apache.jmeter.util.JMeterUtils;
-import org.fife.ui.rsyntaxtextarea.RSyntaxTextArea;
-import org.fife.ui.rsyntaxtextarea.SyntaxConstants;
-import org.fife.ui.rtextarea.RTextScrollPane;
+import org.apache.jorphan.gui.JSyntaxTextArea;
+import org.apache.jorphan.gui.JTextScrollPane;
public class TextAreaEditor extends PropertyEditorSupport implements FocusListener, PropertyChangeListener {
- private final RSyntaxTextArea textUI;
+ private final JSyntaxTextArea textUI;
- private final RTextScrollPane scroller;
+ private final JTextScrollPane scroller;
private final Properties languageProperties = JMeterUtils.loadProperties("org/apache/jmeter/testbeans/gui/textarea.properties"); //$NON-NLS-1$;
@@ -55,13 +54,7 @@ public class TextAreaEditor extends Prop
private final void init() {// called from ctor, so must not be overridable
textUI.discardAllEdits();
- textUI.setSyntaxEditingStyle(SyntaxConstants.SYNTAX_STYLE_JAVA);
- textUI.setCodeFoldingEnabled(true);
- textUI.setAntiAliasingEnabled(true);
textUI.addFocusListener(this);
- textUI.setWrapStyleWord(true);
- textUI.setLineWrap(true);
- scroller.setFoldIndicatorEnabled(true);
}
/**
@@ -69,8 +62,8 @@ public class TextAreaEditor extends Prop
*/
public TextAreaEditor() {
super();
- textUI = new RSyntaxTextArea(20, 20);
- scroller = new RTextScrollPane(textUI);
+ textUI = new JSyntaxTextArea(20, 20);
+ scroller = new JTextScrollPane(textUI, true);
init();
}
@@ -79,8 +72,8 @@ public class TextAreaEditor extends Prop
*/
public TextAreaEditor(Object source) {
super(source);
- textUI = new RSyntaxTextArea(20, 20);
- scroller = new RTextScrollPane(textUI);
+ textUI = new JSyntaxTextArea(20, 20);
+ scroller = new JTextScrollPane(textUI, true);
init();
setValue(source);
}
@@ -134,7 +127,7 @@ public class TextAreaEditor extends Prop
if (languageProperties.containsKey(lang)) {
textUI.setSyntaxEditingStyle(languageProperties.getProperty(lang));
} else {
- textUI.setSyntaxEditingStyle(SyntaxConstants.SYNTAX_STYLE_NONE);
+ textUI.setSyntaxEditingStyle(null);
}
}
Modified: jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/control/gui/BeanShellSamplerGui.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/control/gui/BeanShellSamplerGui.java?rev=1500350&r1=1500349&r2=1500350&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/control/gui/BeanShellSamplerGui.java (original)
+++ jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/control/gui/BeanShellSamplerGui.java Sun Jul 7 01:41:46 2013
@@ -32,9 +32,8 @@ import org.apache.jmeter.samplers.gui.Ab
import org.apache.jmeter.testelement.TestElement;
import org.apache.jmeter.testelement.property.BooleanProperty;
import org.apache.jmeter.util.JMeterUtils;
-import org.fife.ui.rsyntaxtextarea.RSyntaxTextArea;
-import org.fife.ui.rsyntaxtextarea.SyntaxConstants;
-import org.fife.ui.rtextarea.RTextScrollPane;
+import org.apache.jorphan.gui.JSyntaxTextArea;
+import org.apache.jorphan.gui.JTextScrollPane;
public class BeanShellSamplerGui extends AbstractSamplerGui {
@@ -46,7 +45,7 @@ public class BeanShellSamplerGui extends
private JTextField parameters;// parameters to pass to script file (or script)
- private RSyntaxTextArea scriptField;// script area
+ private JSyntaxTextArea scriptField;// script area
public BeanShellSamplerGui() {
init();
@@ -155,18 +154,14 @@ public class BeanShellSamplerGui extends
}
private JPanel createScriptPanel() {
- scriptField = new RSyntaxTextArea(20, 20);
- scriptField.setSyntaxEditingStyle(SyntaxConstants.SYNTAX_STYLE_JAVA);
- scriptField.setCodeFoldingEnabled(true);
- scriptField.setLineWrap(true);
- scriptField.setWrapStyleWord(true);
+ scriptField = new JSyntaxTextArea(20, 20);
JLabel label = new JLabel(JMeterUtils.getResString("bsh_script")); // $NON-NLS-1$
label.setLabelFor(scriptField);
JPanel panel = new JPanel(new BorderLayout());
panel.add(label, BorderLayout.NORTH);
- panel.add(new RTextScrollPane(scriptField), BorderLayout.CENTER);
+ panel.add(new JTextScrollPane(scriptField), BorderLayout.CENTER);
JTextArea explain = new JTextArea(JMeterUtils.getResString("bsh_script_variables")); //$NON-NLS-1$
explain.setLineWrap(true);