jsalvata 2004/02/11 09:29:15
Modified: src/core/org/apache/jmeter/testbeans/gui
GenericTestBeanCustomizer.java TestBeanGUI.java
src/core/org/apache/jmeter/util JMeterUtils.java
bin jmeter.properties
Log:
Add support for expert beans and properties.
Revision Changes Path
1.5 +3 -2
jakarta-jmeter/src/core/org/apache/jmeter/testbeans/gui/GenericTestBeanCustomizer.java
Index: GenericTestBeanCustomizer.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/testbeans/gui/GenericTestBeanCustomizer.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- GenericTestBeanCustomizer.java 11 Feb 2004 02:31:53 -0000 1.4
+++ GenericTestBeanCustomizer.java 11 Feb 2004 17:29:14 -0000 1.5
@@ -171,6 +171,7 @@
// Don't get editors for hidden or non-read-write properties:
if (descriptors[i].isHidden()
+ || (descriptors[i].isExpert() && ! JMeterUtils.isExpertMode())
|| descriptors[i].getReadMethod() == null
|| descriptors[i].getWriteMethod() == null)
{
1.13 +10 -2
jakarta-jmeter/src/core/org/apache/jmeter/testbeans/gui/TestBeanGUI.java
Index: TestBeanGUI.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/testbeans/gui/TestBeanGUI.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- TestBeanGUI.java 10 Feb 2004 21:24:01 -0000 1.12
+++ TestBeanGUI.java 11 Feb 2004 17:29:14 -0000 1.13
@@ -369,6 +369,14 @@
{
List menuCategories= new LinkedList();
+ // We don't want to show expert beans in the menus unless we're
+ // in expert mode:
+ if (beanInfo.getBeanDescriptor().isExpert()
+ && ! JMeterUtils.isExpertMode())
+ {
+ return null;
+ }
+
// TODO: there must be a nicer way...
if (Assertion.class.isAssignableFrom(testBeanClass))
{
1.62 +15 -1 jakarta-jmeter/src/core/org/apache/jmeter/util/JMeterUtils.java
Index: JMeterUtils.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/util/JMeterUtils.java,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- JMeterUtils.java 10 Feb 2004 22:05:38 -0000 1.61
+++ JMeterUtils.java 11 Feb 2004 17:29:15 -0000 1.62
@@ -102,6 +102,9 @@
new PatternCacheLRU(1000, new Perl5Compiler());
transient private static Logger log = LoggingManager.getLoggerForClass();
+
+ private static final String EXPERT_MODE_PROPERTY="jmeter.expertMode";
+
private static final SAXParserFactory xmlFactory;
static {
SAXParserFactory temp = null;
@@ -1112,5 +1115,16 @@
String temp = fname.replace('\\','/');
String simpleName = temp.substring(temp.lastIndexOf("/") + 1);
return simpleName + " (" + fname + ") - Apache JMeter";
+ }
+
+ /**
+ * Determine whether we are in 'expert' mode. Certain features may be
+ * hidden from user's view unless in expert mode.
+ *
+ * @return true iif we're in expert mode
+ */
+ public static boolean isExpertMode()
+ {
+ return JMeterUtils.getPropDefault(EXPERT_MODE_PROPERTY, false);
}
}
1.94 +7 -4 jakarta-jmeter/bin/jmeter.properties
Index: jmeter.properties
===================================================================
RCS file: /home/cvs/jakarta-jmeter/bin/jmeter.properties,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -r1.93 -r1.94
--- jmeter.properties 20 Dec 2003 00:29:53 -0000 1.93
+++ jmeter.properties 11 Feb 2004 17:29:15 -0000 1.94
@@ -93,10 +93,10 @@
# category is equivalent to the package/class names described above
# Combined log file (for jmeter and jorphan)
-log_file=jmeter.log
+#log_file=jmeter.log
# To redirect logging to standard output, try the following:
# (it will probably report an error, but output will be to stdout)
-#log_file=
+log_file=
# Or define separate logs if required:
#log_file.jorphan=jorphan.log
@@ -154,7 +154,10 @@
#htmlParser.className=org.apache.jmeter.protocol.http.parser.HtmlParserHTMLParser
# Other parsers:
#htmlParser.className=org.apache.jmeter.protocol.http.parser.JTidyHTMLParser
-#htmlParser.className=org.apache.jmeter.protocol.http.parser.RegexpHTMLParser
+htmlParser.className=org.apache.jmeter.protocol.http.parser.RegexpHTMLParser
# Put the start time stamp in logs instead of the end
-#sampleresult.timestamp.start=true
\ No newline at end of file
+#sampleresult.timestamp.start=true
+
+# Turn expert mode on/off: expert mode will show expert-mode beans and properties
+#jmeter.expertMode=true
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
