Return-Path: X-Original-To: apmail-jmeter-dev-archive@minotaur.apache.org Delivered-To: apmail-jmeter-dev-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 95B4610FC7 for ; Tue, 9 Jul 2013 15:14:42 +0000 (UTC) Received: (qmail 22495 invoked by uid 500); 9 Jul 2013 15:14:42 -0000 Delivered-To: apmail-jmeter-dev-archive@jmeter.apache.org Received: (qmail 22474 invoked by uid 500); 9 Jul 2013 15:14:42 -0000 Mailing-List: contact dev-help@jmeter.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@jmeter.apache.org Delivered-To: mailing list dev@jmeter.apache.org Received: (qmail 22466 invoked by uid 99); 9 Jul 2013 15:14:42 -0000 Received: from minotaur.apache.org (HELO minotaur.apache.org) (140.211.11.9) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 09 Jul 2013 15:14:42 +0000 Received: from localhost (HELO [192.168.7.235]) (127.0.0.1) (smtp-auth username milamber, mechanism plain) by minotaur.apache.org (qpsmtpd/0.29) with ESMTP; Tue, 09 Jul 2013 15:14:41 +0000 Message-ID: <51DC28DF.10706@apache.org> Date: Tue, 09 Jul 2013 15:14:39 +0000 From: Milamber Organization: Apache Software Fondation User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:20.0) Gecko/20100101 Firefox/20.0 SeaMonkey/2.17.1 MIME-Version: 1.0 To: dev@jmeter.apache.org Subject: 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 References: <20130709144950.BFD7F23889EA@eris.apache.org> In-Reply-To: <20130709144950.BFD7F23889EA@eris.apache.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Le 09/07/2013 14:49, sebb@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$ > > } > } > > >