Re: svn commit: r1501306 - in /jmeter/trunk/src: core/org/apache/jmeter/testbeans/gui/TextAreaEditor.java protocol/jdbc/org/apache/jmeter/protocol/jdbc/JDBCTestElementBeanInfoSupport.java

[Milamber]

Le 09/07/2013 14:49, s...@apache.org a ecrit :

Author: sebb
Date: Tue Jul  9 14:49:50 2013
New Revision: 1501306

URL: http://svn.apache.org/r1501306
Log:
Add syntax color for scripts elements (BeanShell, BSF, and JSR223) with 
RSyntaxTextArea
JDBC now uses SQL language format

Thanks.

Bugzilla Id: 55202

Modified:
     jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/TextAreaEditor.java
     
jmeter/trunk/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/JDBCTestElementBeanInfoSupport.java

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=1501306&r1=1501305&r2=1501306&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 
Tue Jul  9 14:49:50 2013
@@ -81,7 +81,7 @@ public class TextAreaEditor extends Prop
       */
      public TextAreaEditor(PropertyDescriptor descriptor) {
          textUI = new JSyntaxTextArea(20, 20);
-//        textUI.setSyntaxEditingStyle((String) 
descriptor.getValue(GenericTestBeanCustomizer.SYNTAX_TYPE));
+        textUI.setLanguage((String) 
descriptor.getValue(GenericTestBeanCustomizer.TEXT_LANGUAGE));
          scroller = new JTextScrollPane(textUI, true);
          init();
      }

Modified: 
jmeter/trunk/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/JDBCTestElementBeanInfoSupport.java
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/JDBCTestElementBeanInfoSupport.java?rev=1501306&r1=1501305&r2=1501306&view=diff
==============================================================================
--- 
jmeter/trunk/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/JDBCTestElementBeanInfoSupport.java
 (original)
+++ 
jmeter/trunk/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/JDBCTestElementBeanInfoSupport.java
 Tue Jul  9 14:49:50 2013
@@ -22,7 +22,7 @@ import java.beans.PropertyDescriptor;

import org.apache.jmeter.testbeans.BeanInfoSupport;

  import org.apache.jmeter.testbeans.TestBean;
-import org.apache.jmeter.testbeans.gui.TextAreaEditor;
+import org.apache.jmeter.testbeans.gui.TypeEditor;

public abstract class JDBCTestElementBeanInfoSupport extends BeanInfoSupport { @@ -86,10 +86,10 @@ public abstract class JDBCTestElementBea

                  AbstractJDBCTestElement.AUTOCOMMIT_TRUE,
                  });

- p = property("query"); // $NON-NLS-1$

+        p = property("query", TypeEditor.TextAreaEditor); // $NON-NLS-1$
          p.setValue(NOT_UNDEFINED, Boolean.TRUE);
          p.setValue(DEFAULT, ""); // $NON-NLS-1$
-        p.setPropertyEditorClass(TextAreaEditor.class);
+        p.setValue(TEXT_LANGUAGE, "sql");  // $NON-NLS-1$

}

  }