Author: veithen
Date: Mon Dec 29 04:11:47 2008
New Revision: 729879
URL: http://svn.apache.org/viewvc?rev=729879&view=rev
Log:
Avoid using attributes to pass values to and from anonymous inner classes.
Modified:
webservices/commons/trunk/modules/tcpmon/src/org/apache/ws/commons/tcpmon/eclipse/ui/Connection.java
webservices/commons/trunk/modules/tcpmon/src/org/apache/ws/commons/tcpmon/eclipse/ui/SocketRR.java
Modified:
webservices/commons/trunk/modules/tcpmon/src/org/apache/ws/commons/tcpmon/eclipse/ui/Connection.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/tcpmon/src/org/apache/ws/commons/tcpmon/eclipse/ui/Connection.java?rev=729879&r1=729878&r2=729879&view=diff
==============================================================================
---
webservices/commons/trunk/modules/tcpmon/src/org/apache/ws/commons/tcpmon/eclipse/ui/Connection.java
(original)
+++
webservices/commons/trunk/modules/tcpmon/src/org/apache/ws/commons/tcpmon/eclipse/ui/Connection.java
Mon Dec 29 04:11:47 2008
@@ -36,12 +36,8 @@
* a connection listens to a single current connection
*/
class Connection extends Thread {
- private int inputInt;
- private String inputString;
- private ArrayList outValues = new ArrayList();
public TableItem item;
-
/**
* Field listener
*/
@@ -192,12 +188,11 @@
String dateformat = MainView.getMessage("dateformat00",
"yyyy-MM-dd HH:mm:ss");
DateFormat df = new SimpleDateFormat(dateformat);
time = df.format(new Date());
- int count = listener.connections.size();
+ final int count = listener.connections.size();
- inputInt = count;
MainView.display.syncExec(new Runnable() {
public void run() {
- item = new TableItem(listener.connectionTable, SWT.BORDER,
inputInt + 1);
+ item = new TableItem(listener.connectionTable, SWT.BORDER,
count + 1);
item.setText(new String[]{MainView.getMessage("active00",
"Active"),
time,
fromHost,
@@ -225,9 +220,9 @@
}
+ final ArrayList outValues = new ArrayList();
MainView.display.syncExec(new Runnable() {
public void run() {
- outValues.clear();
outValues.add(listener.hostField.getText());
outValues.add(listener.tPortField.getText());
outValues.add(listener.portField.getText());
@@ -254,15 +249,15 @@
StringBuffer buf = null;
int index = listener.connections.indexOf(this);
+ final ArrayList outValues2 = new ArrayList();
MainView.display.syncExec(new Runnable() {
public void run() {
- outValues.clear();
- outValues.add(listener.isProxyBox.getSelection() ? "true"
: "false");
- outValues.add((HTTPProxyHost != null) ? "true" : "false");
+ outValues2.add(listener.isProxyBox.getSelection() ? "true"
: "false");
+ outValues2.add((HTTPProxyHost != null) ? "true" : "false");
}
});
- if ("true".equals(outValues.get(0)) ||
"true".equals(outValues.get(1))) {
+ if ("true".equals(outValues2.get(0)) ||
"true".equals(outValues2.get(1))) {
// Check if we're a proxy
byte[] b = new byte[1];
@@ -282,7 +277,7 @@
break;
}
bufferedData = buf.toString();
- inputString = bufferedData;
+ final String inputString = bufferedData;
MainView.display.syncExec(new Runnable() {
public void run() {
inputText.append(inputString);
@@ -304,14 +299,14 @@
urlString = urlString.substring(1);
}
+ final boolean[] out = new boolean[1];
MainView.display.syncExec(new Runnable() {
public void run() {
- outValues.clear();
- outValues.add((listener.isProxyBox.getSelection())
? "true" : "false");
+ out[0] = listener.isProxyBox.getSelection();
}
});
- if ("true".equals(outValues.get(0))) {
+ if (out[0]) {
url = new URL(urlString);
targetHost = url.getHost();
targetPort = url.getPort();
@@ -319,11 +314,11 @@
targetPort = 80;
}
- inputInt = index;
- inputString = targetHost;
+ final int inputInt = index;
+ final String inputString2 = targetHost;
MainView.display.syncExec(new Runnable() {
public void run() {
- listener.tableEnhancer.setValueAt(inputString,
+ listener.tableEnhancer.setValueAt(inputString2,
inputInt + 1,
MainView.OUTHOST_COLUMN);
}
@@ -336,11 +331,11 @@
url = new URL("http://"; + targetHost + ":"
+ targetPort + "/" + urlString);
- inputInt = index;
- inputString = targetHost;
+ final int inputInt = index;
+ final String inputString2 = targetHost;
MainView.display.syncExec(new Runnable() {
public void run() {
- listener.tableEnhancer.setValueAt(inputString,
+ listener.tableEnhancer.setValueAt(inputString2,
inputInt + 1,
MainView.OUTHOST_COLUMN);
}
@@ -404,7 +399,7 @@
}
if (bufferedData != null) {
- inputString = bufferedData;
+ final String inputString = bufferedData;
MainView.display.syncExec(new Runnable() {
public void run() {
inputText.append(inputString);
@@ -422,11 +417,11 @@
+ " ";
s1 = s1.substring(0, 51);
- inputInt = index;
- inputString = s1;
+ final int inputInt = index;
+ final String inputString2 = s1;
MainView.display.syncExec(new Runnable() {
public void run() {
- listener.tableEnhancer.setValueAt(inputString,
+ listener.tableEnhancer.setValueAt(inputString2,
inputInt + 1,
MainView.REQ_COLUMN);
}
@@ -445,13 +440,13 @@
slowLink.pump(b.length);
}
+ final boolean[] out = new boolean[1];
MainView.display.syncExec(new Runnable() {
public void run() {
- outValues.clear();
- outValues.add((listener.xmlFormatBox.getSelection()) ?
"true" : "false");
+ out[0] = listener.xmlFormatBox.getSelection();
}
});
- boolean format = ("true".equals(outValues.get(0)));
+ boolean format = out[0];
// this is the channel to the endpoint
rr1 = new SocketRR(this, inSocket, tmpIn1, outSocket, tmpOut2,
@@ -470,7 +465,7 @@
while ((rr1 != null) || (rr2 != null)) {
if (rr2 != null) {
- inputInt = index;
+ final int inputInt = index;
MainView.display.syncExec(new Runnable() {
public void run() {
listener.tableEnhancer.setValueAt(rr2.getElapsed(), 1 + inputInt,
MainView.ELAPSED_COLUMN);
@@ -485,7 +480,7 @@
if ((null != rr1) && rr1.isDone()) {
if ((index >= 0) && (rr2 != null)) {
- inputInt = index;
+ final int inputInt = index;
MainView.display.syncExec(new Runnable() {
public void run() {
listener.tableEnhancer.setValueAt(
@@ -499,7 +494,7 @@
if ((null != rr2) && rr2.isDone()) {
if ((index >= 0) && (rr1 != null)) {
- inputInt = index;
+ final int inputInt = index;
MainView.display.syncExec(new Runnable() {
public void run() {
listener.tableEnhancer.setValueAt(
@@ -519,7 +514,7 @@
active = false;
if (index >= 0) {
- inputInt = index;
+ final int inputInt = index;
MainView.display.syncExec(new Runnable() {
public void run() {
listener.tableEnhancer.setValueAt(
@@ -534,7 +529,7 @@
PrintWriter wr = new PrintWriter(st);
int index = listener.connections.indexOf(this);
if (index >= 0) {
- inputInt = index;
+ final int inputInt = index;
MainView.display.syncExec(new Runnable() {
public void run() {
listener.tableEnhancer.setValueAt(
@@ -547,7 +542,7 @@
e.printStackTrace(wr);
wr.close();
- inputString = st.toString();
+ final String inputString = st.toString();
MainView.display.syncExec(new Runnable() {
public void run() {
if (outputText != null) {
Modified:
webservices/commons/trunk/modules/tcpmon/src/org/apache/ws/commons/tcpmon/eclipse/ui/SocketRR.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/tcpmon/src/org/apache/ws/commons/tcpmon/eclipse/ui/SocketRR.java?rev=729879&r1=729878&r2=729879&view=diff
==============================================================================
---
webservices/commons/trunk/modules/tcpmon/src/org/apache/ws/commons/tcpmon/eclipse/ui/SocketRR.java
(original)
+++
webservices/commons/trunk/modules/tcpmon/src/org/apache/ws/commons/tcpmon/eclipse/ui/SocketRR.java
Mon Dec 29 04:11:47 2008
@@ -30,11 +30,6 @@
*/
class SocketRR extends Thread {
- private int inputInt;
- private String inputString;
- private boolean outBool;
- private String outString;
-
/**
* Field inSocket
*/
@@ -163,18 +158,18 @@
boolean atMargin = true;
int thisIndent = -1, nextIndent = -1, previousIndent = -1;
- inputInt = reqSaved;
+ final int[] result = new int[] { reqSaved };
MainView.display.syncExec(new Runnable() {
public void run() {
if (tmodel != null) {
String tmpStr =
tmodel.getItem(tableIndex).getText(MainView.REQ_COLUMN);
if (!"".equals(tmpStr)) {
- inputInt = tmpStr.length();
+ result[0] = tmpStr.length();
}
}
}
});
- reqSaved = inputInt;
+ reqSaved = result[0];
long start = System.currentTimeMillis();
a:
@@ -227,21 +222,23 @@
out.write(buffer, saved, len);
}
+ final boolean[] outBool = new boolean[1];
MainView.display.syncExec(new Runnable() {
public void run() {
- outBool = (tmodel != null);
+ outBool[0] = (tmodel != null);
}
});
- if (outBool && (reqSaved < 50)) {
+ if (outBool[0] && (reqSaved < 50)) {
+ final String[] outString = new String[1];
MainView.display.syncExec(new Runnable() {
public void run() {
- outString =
tmodel.getItem(tableIndex).getText(MainView.REQ_COLUMN);
+ outString[0] =
tmodel.getItem(tableIndex).getText(MainView.REQ_COLUMN);
}
});
- String old = outString;
+ String old = outString[0];
old = old + new String(buffer, saved, len);
if (old.length() > 50) {
old = old.substring(0, 50);
@@ -252,7 +249,7 @@
reqSaved = 50;
}
- inputString = old;
+ final String inputString = old;
MainView.display.syncExec(new Runnable() {
public void run() {
tmodel.getItem(tableIndex).setText(MainView.REQ_COLUMN, inputString);
@@ -314,7 +311,7 @@
}
}
- inputString = new String(tmpbuffer, 0, i2);
+ final String inputString = new String(tmpbuffer, 0, i2);
MainView.display.syncExec(new Runnable() {
public void run() {
textArea.append(inputString);
@@ -326,7 +323,7 @@
buffer[i] = buffer[bufferLen - saved + i];
}
} else {
- inputString = new String(buffer, 0, len);
+ final String inputString = new String(buffer, 0, len);
MainView.display.syncExec(new Runnable() {
public void run() {
textArea.append(inputString);
