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 2011/11/26 15:24:58 UTC
svn commit: r1206442 - in /jmeter/trunk/src:
core/org/apache/jmeter/testbeans/ core/org/apache/jmeter/testbeans/gui/
examples/org/apache/jmeter/examples/testbeans/example3/
Author: sebb
Date: Sat Nov 26 14:24:53 2011
New Revision: 1206442
URL: http://svn.apache.org/viewvc?rev=1206442&view=rev
Log:
GuiEditor was the wrong name; they are really type editors
Added:
jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/TypeEditor.java
- copied, changed from r1205639, jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/GuiEditor.java
Removed:
jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/GuiEditor.java
Modified:
jmeter/trunk/src/core/org/apache/jmeter/testbeans/BeanInfoSupport.java
jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/GenericTestBeanCustomizer.java
jmeter/trunk/src/examples/org/apache/jmeter/examples/testbeans/example3/Example3BeanInfo.java
Modified: jmeter/trunk/src/core/org/apache/jmeter/testbeans/BeanInfoSupport.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/testbeans/BeanInfoSupport.java?rev=1206442&r1=1206441&r2=1206442&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/testbeans/BeanInfoSupport.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/testbeans/BeanInfoSupport.java Sat Nov 26 14:24:53 2011
@@ -29,7 +29,7 @@ import java.util.MissingResourceExceptio
import java.util.ResourceBundle;
import org.apache.jmeter.testbeans.gui.GenericTestBeanCustomizer;
-import org.apache.jmeter.testbeans.gui.GuiEditor;
+import org.apache.jmeter.testbeans.gui.TypeEditor;
import org.apache.jmeter.util.JMeterUtils;
import org.apache.jorphan.logging.LoggingManager;
import org.apache.log.Logger;
@@ -167,7 +167,7 @@ public abstract class BeanInfoSupport ex
* property name
* @return descriptor for a property of that name, or null if there's none
*/
- protected PropertyDescriptor property(String name, GuiEditor editor) {
+ protected PropertyDescriptor property(String name, TypeEditor editor) {
PropertyDescriptor property = property(name);
if (property != null) {
property.setValue(GenericTestBeanCustomizer.GUITYPE, editor);
Modified: jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/GenericTestBeanCustomizer.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/GenericTestBeanCustomizer.java?rev=1206442&r1=1206441&r2=1206442&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/GenericTestBeanCustomizer.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/GenericTestBeanCustomizer.java Sat Nov 26 14:24:53 2011
@@ -135,7 +135,7 @@ public class GenericTestBeanCustomizer e
public static final String RESOURCE_BUNDLE = "resourceBundle"; //$NON-NLS-1$
- /** Property editor override; must be an enum of type {@link GuiEditor} */
+ /** Property editor override; must be an enum of type {@link TypeEditor} */
public static final String GUITYPE = "guiType"; // $NON-NLS-$
public static final String ORDER(String group) {
@@ -217,8 +217,8 @@ public class GenericTestBeanCustomizer e
PropertyEditor propertyEditor;
Object guiType = descriptor.getValue(GUITYPE);
- if (guiType instanceof GuiEditor) {
- propertyEditor = ((GuiEditor) guiType).getInstance(descriptor);
+ if (guiType instanceof TypeEditor) {
+ propertyEditor = ((TypeEditor) guiType).getInstance(descriptor);
} else {
Class<?> editorClass = descriptor.getPropertyEditorClass();
if (log.isDebugEnabled()) {
Copied: jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/TypeEditor.java (from r1205639, jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/GuiEditor.java)
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/TypeEditor.java?p2=jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/TypeEditor.java&p1=jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/GuiEditor.java&r1=1205639&r2=1206442&rev=1206442&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/GuiEditor.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/TypeEditor.java Sat Nov 26 14:24:53 2011
@@ -24,7 +24,7 @@ import java.beans.PropertyEditor;
/**
* Allow direct specification of property editors.
*/
-public enum GuiEditor {
+public enum TypeEditor {
FileEditor {@Override PropertyEditor getInstance(PropertyDescriptor descriptor) { return new FileEditor(descriptor); }},
PasswordEditor {@Override PropertyEditor getInstance(PropertyDescriptor descriptor) { return new PasswordEditor(); }},
TableEditor {@Override PropertyEditor getInstance(PropertyDescriptor descriptor) { return new TableEditor(); }},
Modified: jmeter/trunk/src/examples/org/apache/jmeter/examples/testbeans/example3/Example3BeanInfo.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/examples/org/apache/jmeter/examples/testbeans/example3/Example3BeanInfo.java?rev=1206442&r1=1206441&r2=1206442&view=diff
==============================================================================
--- jmeter/trunk/src/examples/org/apache/jmeter/examples/testbeans/example3/Example3BeanInfo.java (original)
+++ jmeter/trunk/src/examples/org/apache/jmeter/examples/testbeans/example3/Example3BeanInfo.java Sat Nov 26 14:24:53 2011
@@ -21,7 +21,7 @@ package org.apache.jmeter.examples.testb
import java.beans.PropertyDescriptor;
import org.apache.jmeter.testbeans.BeanInfoSupport;
-import org.apache.jmeter.testbeans.gui.GuiEditor;
+import org.apache.jmeter.testbeans.gui.TypeEditor;
public class Example3BeanInfo extends BeanInfoSupport {
@@ -50,6 +50,6 @@ public class Example3BeanInfo extends Be
getprop("myLong2", Long.valueOf(456));
getprop("myString1");
getprop("myString2","abcd");
- property("myFile2", GuiEditor.FileEditor);
+ property("myFile2", TypeEditor.FileEditor);
}
}