Author: sebb
Date: Tue Aug 18 12:44:22 2009
New Revision: 805391
URL: http://svn.apache.org/viewvc?rev=805391&view=rev
Log:
Remove some JDK 1.3 work-rounds
Modified:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/LineGraph.java
jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/util/JMeterError.java
jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/util/JMeterException.java
jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/util/JOrphanUtils.java
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/HTMLParseError.java
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/HTMLParseException.java
jakarta/jmeter/trunk/test/src/org/apache/jorphan/test/AllTests.java
Modified:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/LineGraph.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/LineGraph.java?rev=805391&r1=805390&r2=805391&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/LineGraph.java
(original)
+++
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/LineGraph.java
Tue Aug 18 12:44:22 2009
@@ -68,7 +68,7 @@
private static final Paint[] PAINT_ARRAY = {Color.black,
Color.blue,Color.green,Color.magenta,Color.orange,
Color.red,Color.yellow,Color.darkGray,Color.gray,Color.lightGray,
- Color.pink,Color.cyan};// Using lower-case for JDK 1.3
compatibility
+ Color.pink,Color.cyan};
protected int shape_counter = 0;
protected int paint_counter = -1;
Modified:
jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/util/JMeterError.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/util/JMeterError.java?rev=805391&r1=805390&r2=805391&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/util/JMeterError.java
(original)
+++ jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/util/JMeterError.java
Tue Aug 18 12:44:22 2009
@@ -19,52 +19,27 @@
package org.apache.jorphan.util;
/**
- * The rationale for this class is to support chained Errors in JDK 1.3
- *
+ * The rationale for this class was originally to support chained Errors in
JDK 1.3
+ * However, the class is now used in its own right.
+ *
* @version $Revision$
*/
public class JMeterError extends Error {
- private Throwable savedCause; // Support JDK1.4 getCause() on JDK1.3
- /**
- *
- */
public JMeterError() {
super();
}
- /**
- * @param s
- */
public JMeterError(String s) {
super(s);
}
- /**
- * @param cause
- */
public JMeterError(Throwable cause) {
- // JDK1.4: super(cause);
- savedCause = cause;
+ super(cause);
}
- /**
- * @param message
- * @param cause
- */
public JMeterError(String message, Throwable cause) {
- // JDK1.4: super(message, cause);
- super(message);
- savedCause = cause;
- }
-
- /**
- * Local version of getCause() for JDK1.3 support
- *
- */
- @Override
- public Throwable getCause() {
- return savedCause;
+ super(message, cause);
}
}
Modified:
jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/util/JMeterException.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/util/JMeterException.java?rev=805391&r1=805390&r2=805391&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/util/JMeterException.java
(original)
+++
jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/util/JMeterException.java
Tue Aug 18 12:44:22 2009
@@ -19,54 +19,26 @@
package org.apache.jorphan.util;
/**
- * The rationale for this class is to support chained Errors in JDK 1.3
- *
+ * The rationale for this class was originally to support chained Exceptions
in JDK 1.3
+ * However, the class is now used in its own right.
+ *
* @version $Revision$
*/
public class JMeterException extends Exception {
- private Throwable savedCause; // Support JDK1.4 getCause() on JDK1.3
- /**
- *
- */
public JMeterException() {
super();
- // TODO Auto-generated constructor stub
}
- /**
- * @param s
- */
public JMeterException(String s) {
super(s);
- // TODO Auto-generated constructor stub
}
- /**
- * @param cause
- */
public JMeterException(Throwable cause) {
- // JDK1.4: super(cause);
- savedCause = cause;
+ super(cause);
}
- /**
- * @param message
- * @param cause
- */
public JMeterException(String message, Throwable cause) {
- // JDK1.4: super(message, cause);
- super(message);
- savedCause = cause;
+ super(message, cause);
}
-
- /**
- * Local version of getCause() for JDK1.3 support
- *
- */
- @Override
- public Throwable getCause() {
- return savedCause;
- }
-
}
Modified:
jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/util/JOrphanUtils.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/util/JOrphanUtils.java?rev=805391&r1=805390&r2=805391&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/util/JOrphanUtils.java
(original)
+++ jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/util/JOrphanUtils.java
Tue Aug 18 12:44:22 2009
@@ -215,9 +215,8 @@
}
/**
- * Convert a boolean to its string representation Equivalent to
- * Boolean.valueOf(boolean).toString().toUpperCase() but valid also for JDK
- * 1.3, which does not have valueOf(boolean)
+ * Convert a boolean to its upper case string representation.
+ * Equivalent to Boolean.valueOf(boolean).toString().toUpperCase().
*
* @param value
* boolean to convert
Modified:
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/HTMLParseError.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/HTMLParseError.java?rev=805391&r1=805390&r2=805391&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/HTMLParseError.java
(original)
+++
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/HTMLParseError.java
Tue Aug 18 12:44:22 2009
@@ -18,52 +18,27 @@
package org.apache.jmeter.protocol.http.parser;
/**
- * Error class for use with HTMLParser classes. The main rationale for the
class
- * is to support chained Errors in JDK 1.3
+ * Error class for use with HTMLParser classes.
+ * The main rationale for the class
+ * was to support chained Errors in JDK 1.3,
+ * however it is now used in its own right.
*
* @version $Revision$
*/
public class HTMLParseError extends Error {
- private Throwable savedCause; // Support JDK1.4 getCause() on JDK1.3
-
- /**
- *
- */
public HTMLParseError() {
super();
}
- /**
- * @param message
- */
public HTMLParseError(String message) {
super(message);
}
- /**
- * @param cause
- */
public HTMLParseError(Throwable cause) {
- // JDK1.4: super(cause);
- savedCause = cause;
+ super(cause);
}
- /**
- * @param message
- * @param cause
- */
public HTMLParseError(String message, Throwable cause) {
- // JDK1.4: super(message, cause);
- super(message);
- savedCause = cause;
- }
-
- /**
- * Local verstion of getCause() for JDK1.3 support
- *
- */
- @Override
- public Throwable getCause() {
- return savedCause;
+ super(message, cause);
}
}
Modified:
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/HTMLParseException.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/HTMLParseException.java?rev=805391&r1=805390&r2=805391&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/HTMLParseException.java
(original)
+++
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/HTMLParseException.java
Tue Aug 18 12:44:22 2009
@@ -17,48 +17,28 @@
*/
package org.apache.jmeter.protocol.http.parser;
+/**
+ * Exception class for use with HTMLParser classes.
+ * The main rationale for the class
+ * was to support chained Exceptions in JDK 1.3,
+ * however it is now used in its own right.
+ *
+ * @version $Revision$
+ */
public class HTMLParseException extends Exception {
- private Throwable savedCause; // Support JDK1.4 getCause() on JDK1.3
-
- /**
- *
- */
public HTMLParseException() {
super();
}
- /**
- * @param message
- */
public HTMLParseException(String message) {
super(message);
}
- /**
- * @param cause
- */
public HTMLParseException(Throwable cause) {
- // JDK1.4: super(cause);
- super();
- savedCause = cause;
+ super(cause);
}
- /**
- * @param message
- * @param cause
- */
public HTMLParseException(String message, Throwable cause) {
- // JDK1.4: super(message, cause);
- super(message);
- savedCause = cause;
- }
-
- /**
- * Local verstion of getCause() for JDK1.3 support
- *
- */
- @Override
- public Throwable getCause() {
- return savedCause;
+ super(message, cause);
}
}
Modified: jakarta/jmeter/trunk/test/src/org/apache/jorphan/test/AllTests.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/test/src/org/apache/jorphan/test/AllTests.java?rev=805391&r1=805390&r2=805391&view=diff
==============================================================================
--- jakarta/jmeter/trunk/test/src/org/apache/jorphan/test/AllTests.java
(original)
+++ jakarta/jmeter/trunk/test/src/org/apache/jorphan/test/AllTests.java Tue Aug
18 12:44:22 2009
@@ -228,7 +228,7 @@
// System.out.println(e+"="+System.getProperty(e));
// System.out.println(g+"="+System.getProperty(g));
// System.out.println("Headless?
- // "+java.awt.GraphicsEnvironment.isHeadless());//JDK 1.4
+ // "+java.awt.GraphicsEnvironment.isHeadless());
// try {
// Class c = Class.forName(n);
// System.out.println("Found class: "+n);
---------------------------------------------------------------------
To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org
