You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jmeter-dev@jakarta.apache.org by se...@apache.org on 2007/01/30 02:16:30 UTC
svn commit: r501270 - in /jakarta/jmeter/branches/rel-2-2/src:
core/org/apache/jmeter/gui/ core/org/apache/jmeter/gui/action/
core/org/apache/jmeter/save/converters/ core/org/apache/jmeter/util/
jorphan/org/apache/jorphan/collections/ jorphan/org/apach...
Author: sebb
Date: Mon Jan 29 17:16:29 2007
New Revision: 501270
URL: http://svn.apache.org/viewvc?view=rev&rev=501270
Log:
Elimimate various JDK 1.3 work-rounds
Modified:
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/gui/SavePropertyDialog.java
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/gui/action/ActionRouter.java
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/save/converters/ConversionHelp.java
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/save/converters/SampleResultConverter.java
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/util/BeanShellServer.java
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/util/JMeterUtils.java
jakarta/jmeter/branches/rel-2-2/src/jorphan/org/apache/jorphan/collections/ConfigurationTree.java
jakarta/jmeter/branches/rel-2-2/src/jorphan/org/apache/jorphan/util/Converter.java
jakarta/jmeter/branches/rel-2-2/src/monitor/components/org/apache/jmeter/monitor/util/MemoryBenchmark.java
Modified: jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/gui/SavePropertyDialog.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/gui/SavePropertyDialog.java?view=diff&rev=501270&r1=501269&r2=501270
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/gui/SavePropertyDialog.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/gui/SavePropertyDialog.java Mon Jan 29 17:16:29 2007
@@ -146,8 +146,8 @@
public void actionPerformed(ActionEvent e) {
String action = e.getActionCommand();
Functor f = (Functor) functors.get(action);
- f.invoke(saveConfig, new Object[] {// JDK1.4 was Boolean.valueOf()
- JOrphanUtils.valueOf(((JCheckBox) e.getSource()).isSelected()) });
+ f.invoke(saveConfig, new Object[] {
+ Boolean.valueOf(((JCheckBox) e.getSource()).isSelected()) });
}
/**
Modified: jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/gui/action/ActionRouter.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/gui/action/ActionRouter.java?view=diff&rev=501270&r1=501269&r2=501270
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/gui/action/ActionRouter.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/gui/action/ActionRouter.java Mon Jan 29 17:16:29 2007
@@ -18,6 +18,7 @@
package org.apache.jmeter.gui.action;
+import java.awt.HeadlessException;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.lang.reflect.Modifier;
@@ -283,13 +284,10 @@
}
}
}
+ } catch (HeadlessException e){
+ log.warn(e.toString());
} catch (Exception e) {
- if ("java.awt.HeadlessException".equals(e.getClass().getName())) // JDK1.4:
- {
- log.warn(e.toString());
- } else {
- log.error("exception finding action handlers", e);
- }
+ log.error("exception finding action handlers", e);
}
}
Modified: jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/save/converters/ConversionHelp.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/save/converters/ConversionHelp.java?view=diff&rev=501270&r1=501269&r2=501270
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/save/converters/ConversionHelp.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/save/converters/ConversionHelp.java Mon Jan 29 17:16:29 2007
@@ -22,6 +22,8 @@
package org.apache.jmeter.save.converters;
import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import java.net.URLEncoder;
import java.util.HashMap;
import java.util.Map;
@@ -79,7 +81,7 @@
return "";
}
try {
- String p1 = JOrphanUtils.encode(p, CHAR_SET);
+ String p1 = URLEncoder.encode(p, CHAR_SET);
return p1;
} catch (UnsupportedEncodingException e) {
log.warn("System doesn't support " + CHAR_SET, e);
@@ -95,7 +97,7 @@
return null;
}
try {
- return JOrphanUtils.decode(p, CHAR_SET);
+ return URLDecoder.decode(p, CHAR_SET);
} catch (UnsupportedEncodingException e) {
log.warn("System doesn't support " + CHAR_SET, e);
return p;
Modified: jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/save/converters/SampleResultConverter.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/save/converters/SampleResultConverter.java?view=diff&rev=501270&r1=501269&r2=501270
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/save/converters/SampleResultConverter.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/save/converters/SampleResultConverter.java Mon Jan 29 17:16:29 2007
@@ -30,8 +30,6 @@
import org.apache.jmeter.samplers.SampleSaveConfiguration;
import org.apache.jmeter.threads.JMeterContextService;
import org.apache.jorphan.util.Converter;
-import org.apache.jorphan.util.JOrphanUtils;
-
import com.thoughtworks.xstream.alias.ClassMapper;
import com.thoughtworks.xstream.converters.MarshallingContext;
import com.thoughtworks.xstream.converters.UnmarshallingContext;
@@ -235,8 +233,7 @@
writer.addAttribute(ATT_TIME_STAMP, Long.toString(res.getTimeStamp()));
if (save.saveSuccess())
writer.addAttribute(ATT_SUCCESS,
- JOrphanUtils.booleanToString(res.isSuccessful()));
- // JDK1.4 Boolean.toString(res.isSuccessful()));
+ Boolean.toString(res.isSuccessful()));
if (save.saveLabel())
writer.addAttribute(ATT_LABEL, ConversionHelp.encode(res.getSampleLabel()));
if (save.saveCode())
Modified: jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/util/BeanShellServer.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/util/BeanShellServer.java?view=diff&rev=501270&r1=501269&r2=501270
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/util/BeanShellServer.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/util/BeanShellServer.java Mon Jan 29 17:16:29 2007
@@ -89,8 +89,8 @@
source.invoke(instance, new Object[] { serverfile });
} catch (InvocationTargetException e1) {
log.warn("Could not source " + serverfile);
- // JDK1.4: Throwable t= e1.getCause();
- // JDK1.4: if (t != null) log.warn(t.toString());
+ Throwable t= e1.getCause();
+ if (t != null) log.warn(t.toString());
}
}
eval.invoke(instance, new Object[] { "setAccessibility(true);" });//$NON-NLS-1$
Modified: jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/util/JMeterUtils.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/util/JMeterUtils.java?view=diff&rev=501270&r1=501269&r2=501270
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/util/JMeterUtils.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/util/JMeterUtils.java Mon Jan 29 17:16:29 2007
@@ -19,6 +19,7 @@
package org.apache.jmeter.util;
import java.awt.Dimension;
+import java.awt.HeadlessException;
import java.awt.event.ActionListener;
import java.io.BufferedReader;
import java.io.File;
@@ -194,8 +195,7 @@
String[] result = new String[1];
if (p != null) {
- String[] paths = JOrphanUtils.split(p, ";");// was p.split(";") - // $NON-NLS-1$
- // JDK1.4
+ String[] paths = p.split(";"); // $NON-NLS-1$
result = new String[paths.length + 1];
for (int i = 1; i < result.length; i++) {
result[i] = paths[i - 1];
@@ -876,15 +876,8 @@
try {
JOptionPane.showMessageDialog(instance.getMainFrame(), errorMsg, "Error",
JOptionPane.ERROR_MESSAGE);
- } catch (RuntimeException e) {
- if (e.getClass().getName().equals("java.awt.HeadlessException")) // JDK1.4: // $NON-NLS-1$
- {
- // System.out.println(errorMsg+"[HeadlessException]");
- // throw e;
+ } catch (HeadlessException e) {
log.warn("reportErrorToUser(\"" + errorMsg + "\") caused", e);
- } else {
- throw e;
- }
}
}
Modified: jakarta/jmeter/branches/rel-2-2/src/jorphan/org/apache/jorphan/collections/ConfigurationTree.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/jorphan/org/apache/jorphan/collections/ConfigurationTree.java?view=diff&rev=501270&r1=501269&r2=501270
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/jorphan/org/apache/jorphan/collections/ConfigurationTree.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/jorphan/org/apache/jorphan/collections/ConfigurationTree.java Mon Jan 29 17:16:29 2007
@@ -32,8 +32,6 @@
import java.util.Map;
import java.util.Properties;
-import org.apache.jorphan.util.JOrphanUtils;
-
/**
* @author mike
* TODO does not appear to be used anywhere (except by the test class)
@@ -261,8 +259,7 @@
protected String[] getPath(String key) {
if (key != null) {
- //JDK 1.4 String[] keys = key.split("/");
- String[] keys = JOrphanUtils.split(key,"/");
+ String[] keys = key.split("/"); // $NON-NLS-1$
return keys;
}
return new String[0];
@@ -451,8 +448,7 @@
* @return
*/
public String remove(String key) {
- //JDK 1.4 String[] keys = key.split("/");
- String[] keys = JOrphanUtils.split(key,"/");
+ String[] keys = key.split("/");
String prop = null;
HashTree tree = propTree;
for (int i = 0; i < keys.length && tree != null; i++) {
Modified: jakarta/jmeter/branches/rel-2-2/src/jorphan/org/apache/jorphan/util/Converter.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/jorphan/org/apache/jorphan/util/Converter.java?view=diff&rev=501270&r1=501269&r2=501270
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/jorphan/org/apache/jorphan/util/Converter.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/jorphan/org/apache/jorphan/util/Converter.java Mon Jan 29 17:16:29 2007
@@ -58,7 +58,7 @@
} else if (toType.equals(long.class) || toType.equals(Long.class)) {
return new Long(getLong(value));
} else if (toType.equals(boolean.class) || toType.equals(Boolean.class)) {
- return JOrphanUtils.valueOf(getBoolean(value));//JDK1.4 was Boolean.valueOf()
+ return Boolean.valueOf(getBoolean(value));
} else if (toType.equals(java.util.Date.class)) {
return getDate(value);
} else if (toType.equals(Calendar.class)) {
Modified: jakarta/jmeter/branches/rel-2-2/src/monitor/components/org/apache/jmeter/monitor/util/MemoryBenchmark.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/monitor/components/org/apache/jmeter/monitor/util/MemoryBenchmark.java?view=diff&rev=501270&r1=501269&r2=501270
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/monitor/components/org/apache/jmeter/monitor/util/MemoryBenchmark.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/monitor/components/org/apache/jmeter/monitor/util/MemoryBenchmark.java Mon Jan 29 17:16:29 2007
@@ -38,12 +38,12 @@
long bfree = Runtime.getRuntime().freeMemory();
long btotal = Runtime.getRuntime().totalMemory();
- // long bmax = Runtime.getRuntime().maxMemory();//JDK1.4 only
+ long bmax = Runtime.getRuntime().maxMemory();
System.out.println("Before we create objects:");
System.out.println("------------------------------");
System.out.println("free: " + bfree);
System.out.println("total: " + btotal);
- // System.out.println("max: " + bmax);
+ System.out.println("max: " + bmax);
for (int idx = 0; idx < objects; idx++) {
Connector cnn = of.createConnector();
@@ -99,13 +99,13 @@
}
long afree = Runtime.getRuntime().freeMemory();
long atotal = Runtime.getRuntime().totalMemory();
- // long amax = Runtime.getRuntime().maxMemory();//JDK1.4 only
+ long amax = Runtime.getRuntime().maxMemory();
long delta = ((atotal - afree) - (btotal - bfree));
System.out.println("After we create objects:");
System.out.println("------------------------------");
System.out.println("free: " + afree);
System.out.println("total: " + atotal);
- // System.out.println("max: " + amax);
+ System.out.println("max: " + amax);
System.out.println("------------------------------");
System.out.println("delta: " + (delta / 1024) + " kilobytes");
System.out.println("delta: " + (delta / 1024 / 1024) + " megabytes");
---------------------------------------------------------------------
To unsubscribe, e-mail: jmeter-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-help@jakarta.apache.org