svn commit: r905034 - in /jakarta/jmeter/trunk/src/reports/org/apache/jmeter: control/gui/ReportGui.java testelement/ReportPlan.java

Author: sebb
Date: Sun Jan 31 13:11:24 2010
New Revision: 905034

URL: http://svn.apache.org/viewvc?rev=905034&view=rev
Log:
Avoid name hiding

Modified:
    jakarta/jmeter/trunk/src/reports/org/apache/jmeter/control/gui/ReportGui.java
    jakarta/jmeter/trunk/src/reports/org/apache/jmeter/testelement/ReportPlan.java

Modified: jakarta/jmeter/trunk/src/reports/org/apache/jmeter/control/gui/ReportGui.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/reports/org/apache/jmeter/control/gui/ReportGui.java?rev=905034&r1=905033&r2=905034&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/reports/org/apache/jmeter/control/gui/ReportGui.java (original)
+++ jakarta/jmeter/trunk/src/reports/org/apache/jmeter/control/gui/ReportGui.java Sun Jan 31 13:11:24 2010
@@ -101,7 +101,7 @@
         if (plan instanceof ReportPlan) {
             ReportPlan rp = (ReportPlan) plan;
             rp.setUserDefinedVariables((Arguments) argsPanel.createTestElement());
-            rp.setProperty(ReportPlan.COMMENTS, commentPanel.getText());
+            rp.setProperty(ReportPlan.REPORT_COMMENTS, commentPanel.getText());
             rp.setBasedir(baseDir.getFilename());
         }
     }
@@ -140,7 +140,7 @@
         if (el.getProperty(ReportPlan.USER_DEFINED_VARIABLES) != null) {
             argsPanel.configure((Arguments) el.getProperty(ReportPlan.USER_DEFINED_VARIABLES).getObjectValue());
         }
-        commentPanel.setText(el.getPropertyAsString(ReportPlan.COMMENTS));
+        commentPanel.setText(el.getPropertyAsString(ReportPlan.REPORT_COMMENTS));
         baseDir.setFilename(el.getPropertyAsString(ReportPlan.BASEDIR));
     }
 

Modified: jakarta/jmeter/trunk/src/reports/org/apache/jmeter/testelement/ReportPlan.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/reports/org/apache/jmeter/testelement/ReportPlan.java?rev=905034&r1=905033&r2=905034&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/reports/org/apache/jmeter/testelement/ReportPlan.java (original)
+++ jakarta/jmeter/trunk/src/reports/org/apache/jmeter/testelement/ReportPlan.java Sun Jan 31 13:11:24 2010
@@ -46,7 +46,7 @@
 
     public static final String USER_DEFINED_VARIABLES = "ReportPlan.user_defined_variables";
 
-    public static final String COMMENTS = "ReportPlan.comments";
+    public static final String REPORT_COMMENTS = "ReportPlan.comments";
 
     public static final String BASEDIR = "ReportPlan.basedir";