Author: veithen
Date: Wed Dec 31 17:00:25 2008
New Revision: 730495
URL: http://svn.apache.org/viewvc?rev=730495&view=rev
Log:
Some minor code cleanup:
* Removed unused attribute "type" from AbstractSocketRR.
* Leverage the fact that wakeUp() is now defined in AbstractConnection.
Modified:
webservices/commons/trunk/modules/tcpmon/src/org/apache/ws/commons/tcpmon/Connection.java
webservices/commons/trunk/modules/tcpmon/src/org/apache/ws/commons/tcpmon/SocketRR.java
webservices/commons/trunk/modules/tcpmon/src/org/apache/ws/commons/tcpmon/core/AbstractSocketRR.java
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/Connection.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/tcpmon/src/org/apache/ws/commons/tcpmon/Connection.java?rev=730495&r1=730494&r2=730495&view=diff
==============================================================================
---
webservices/commons/trunk/modules/tcpmon/src/org/apache/ws/commons/tcpmon/Connection.java
(original)
+++
webservices/commons/trunk/modules/tcpmon/src/org/apache/ws/commons/tcpmon/Connection.java
Wed Dec 31 17:00:25 2008
@@ -129,15 +129,14 @@
SlowLinkSimulator slowLink) {
return new SocketRR(this, inSocket, inputStream, outSocket,
outputStream,
inputText, format, listener.tableModel,
- listener.connections.indexOf(this) + 1, "request:", slowLink);
+ listener.connections.indexOf(this) + 1, slowLink);
}
protected AbstractSocketRR createOutputSocketRR(Socket outSocket,
InputStream inputStream,
Socket inSocket, OutputStream outputStream, boolean format,
SlowLinkSimulator slowLink) {
return new SocketRR(this, outSocket, inputStream, inSocket,
outputStream,
- outputText, format, null, 0, "response:",
- slowLink);
+ outputText, format, null, 0, slowLink);
}
protected void appendInputText(String data) {
Modified:
webservices/commons/trunk/modules/tcpmon/src/org/apache/ws/commons/tcpmon/SocketRR.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/tcpmon/src/org/apache/ws/commons/tcpmon/SocketRR.java?rev=730495&r1=730494&r2=730495&view=diff
==============================================================================
---
webservices/commons/trunk/modules/tcpmon/src/org/apache/ws/commons/tcpmon/SocketRR.java
(original)
+++
webservices/commons/trunk/modules/tcpmon/src/org/apache/ws/commons/tcpmon/SocketRR.java
Wed Dec 31 17:00:25 2008
@@ -46,11 +46,6 @@
int tableIndex = 0;
/**
- * Field myConnection
- */
- Connection myConnection = null;
-
- /**
* Constructor SocketRR
*
* @param c
@@ -69,12 +64,11 @@
InputStream inputStream, Socket outputSocket,
OutputStream outputStream, JTextArea _textArea,
boolean format, TableModel tModel, int index,
- final String type, SlowLinkSimulator slowLink) {
- super(inputSocket, inputStream, outputSocket, outputStream, format,
type, slowLink);
+ SlowLinkSimulator slowLink) {
+ super(c, inputSocket, inputStream, outputSocket, outputStream, format,
slowLink);
textArea = _textArea;
tmodel = tModel;
tableIndex = index;
- myConnection = c;
start();
}
@@ -93,8 +87,4 @@
protected void appendData(String data) {
textArea.append(data);
}
-
- protected void onFinish() {
- myConnection.wakeUp();
- }
}
Modified:
webservices/commons/trunk/modules/tcpmon/src/org/apache/ws/commons/tcpmon/core/AbstractSocketRR.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/tcpmon/src/org/apache/ws/commons/tcpmon/core/AbstractSocketRR.java?rev=730495&r1=730494&r2=730495&view=diff
==============================================================================
---
webservices/commons/trunk/modules/tcpmon/src/org/apache/ws/commons/tcpmon/core/AbstractSocketRR.java
(original)
+++
webservices/commons/trunk/modules/tcpmon/src/org/apache/ws/commons/tcpmon/core/AbstractSocketRR.java
Wed Dec 31 17:00:25 2008
@@ -27,6 +27,7 @@
* outgoing socket
*/
public abstract class AbstractSocketRR extends Thread {
+ private final AbstractConnection connection;
/**
* Field inSocket
@@ -64,11 +65,6 @@
volatile long elapsed = 0;
/**
- * Field type
- */
- String type = null;
-
- /**
* Field slowLink
*/
SlowLinkSimulator slowLink;
@@ -88,16 +84,16 @@
* @param type
* @param slowLink
*/
- public AbstractSocketRR(Socket inputSocket,
+ public AbstractSocketRR(AbstractConnection connection, Socket inputSocket,
InputStream inputStream, Socket outputSocket,
OutputStream outputStream, boolean format,
- final String type, SlowLinkSimulator slowLink) {
+ SlowLinkSimulator slowLink) {
+ this.connection = connection;
inSocket = inputSocket;
in = inputStream;
outSocket = outputSocket;
out = outputStream;
xmlFormat = format;
- this.type = type;
this.slowLink = slowLink;
}
@@ -292,7 +288,7 @@
}
} catch (Exception e) {
}
- onFinish();
+ connection.wakeUp();
}
}
@@ -327,5 +323,4 @@
protected abstract String getSavedFirstLine();
protected abstract void setSavedFirstLine(String value);
protected abstract void appendData(String data);
- protected abstract void onFinish();
}
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=730495&r1=730494&r2=730495&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
Wed Dec 31 17:00:25 2008
@@ -112,15 +112,14 @@
SlowLinkSimulator slowLink) {
return new SocketRR(this, inSocket, inputStream, outSocket,
outputStream,
inputText, format, listener.connectionTable,
- listener.connections.indexOf(this) + 1, "request:", slowLink);
+ listener.connections.indexOf(this) + 1, slowLink);
}
protected AbstractSocketRR createOutputSocketRR(Socket outSocket,
InputStream inputStream,
Socket inSocket, OutputStream outputStream, boolean format,
SlowLinkSimulator slowLink) {
return new SocketRR(this, outSocket, inputStream, inSocket,
outputStream,
- outputText, format, null, 0, "response:",
- slowLink);
+ outputText, format, null, 0, slowLink);
}
protected void appendInputText(final String data) {
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=730495&r1=730494&r2=730495&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
Wed Dec 31 17:00:25 2008
@@ -46,11 +46,6 @@
int tableIndex = 0;
/**
- * Field myConnection
- */
- Connection myConnection = null;
-
- /**
* Constructor SocketRR
*
* @param c
@@ -69,12 +64,11 @@
InputStream inputStream, Socket outputSocket,
OutputStream outputStream, Text _textArea,
boolean format, Table tModel, int index,
- final String type, SlowLinkSimulator slowLink) {
- super(inputSocket, inputStream, outputSocket, outputStream, format,
type, slowLink);
+ SlowLinkSimulator slowLink) {
+ super(c, inputSocket, inputStream, outputSocket, outputStream, format,
slowLink);
textArea = _textArea;
tmodel = tModel;
tableIndex = index;
- myConnection = c;
start();
}
@@ -107,8 +101,4 @@
}
});
}
-
- protected void onFinish() {
- myConnection.wakeUp();
- }
}
