Author: veithen
Date: Thu Jan 1 04:33:28 2009
New Revision: 730535
URL: http://svn.apache.org/viewvc?rev=730535&view=rev
Log:
Some minor improvements in the code.
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/core/AbstractConnection.java
webservices/commons/trunk/modules/tcpmon/src/org/apache/ws/commons/tcpmon/eclipse/ui/Connection.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=730535&r1=730534&r2=730535&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
Thu Jan 1 04:33:28 2009
@@ -122,6 +122,8 @@
listener.outPane.setDividerLocation(divLoc);
listener.outPane.setVisible(true);
}
+ inputWriter = new JTextAreaWriter(inputText);
+ outputWriter = new JTextAreaWriter(outputText);
}
protected AbstractSocketRR createInputSocketRR(Socket inSocket,
InputStream inputStream,
@@ -129,30 +131,16 @@
SlowLinkSimulator slowLink) {
return new SocketRR(this, inSocket, inputStream, outSocket,
outputStream,
format, listener.tableModel,
- listener.connections.indexOf(this) + 1, slowLink,
- new JTextAreaWriter(inputText));
+ listener.connections.indexOf(this) + 1, slowLink, inputWriter);
}
protected AbstractSocketRR createOutputSocketRR(Socket outSocket,
InputStream inputStream,
Socket inSocket, OutputStream outputStream, boolean format,
SlowLinkSimulator slowLink) {
return new SocketRR(this, outSocket, inputStream, inSocket,
outputStream,
- format, null, 0, slowLink, new JTextAreaWriter(outputText));
+ format, null, 0, slowLink, outputWriter);
}
- protected void appendInputText(String data) {
- inputText.append(data);
- }
-
- protected void appendOutputText(String data) {
- if (outputText != null) {
- outputText.append(data);
- } else {
- // something went wrong before we had the output area
- System.out.println(data);
- }
- }
-
private void setValue(int column, String value) {
int index = listener.connections.indexOf(this);
if (index >= 0) {
Modified:
webservices/commons/trunk/modules/tcpmon/src/org/apache/ws/commons/tcpmon/core/AbstractConnection.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/tcpmon/src/org/apache/ws/commons/tcpmon/core/AbstractConnection.java?rev=730535&r1=730534&r2=730535&view=diff
==============================================================================
---
webservices/commons/trunk/modules/tcpmon/src/org/apache/ws/commons/tcpmon/core/AbstractConnection.java
(original)
+++
webservices/commons/trunk/modules/tcpmon/src/org/apache/ws/commons/tcpmon/core/AbstractConnection.java
Thu Jan 1 04:33:28 2009
@@ -19,10 +19,12 @@
import org.apache.ws.commons.tcpmon.SlowLinkSimulator;
import org.apache.ws.commons.tcpmon.TCPMonBundle;
+import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.io.PrintWriter;
import java.io.StringWriter;
+import java.io.Writer;
import java.net.Socket;
import java.net.URL;
import java.text.DateFormat;
@@ -90,6 +92,9 @@
*/
InputStream inputStream = null;
+ protected Writer inputWriter;
+ protected Writer outputWriter;
+
/**
* Constructor Connection
*
@@ -181,7 +186,7 @@
break;
}
bufferedData = buf.toString();
- appendInputText(bufferedData);
+ inputWriter.write(bufferedData);
if (bufferedData.startsWith("GET ")
|| bufferedData.startsWith("POST ")
|| bufferedData.startsWith("PUT ")
@@ -270,7 +275,7 @@
lastLine = line;
}
if (bufferedData != null) {
- appendInputText(bufferedData);
+ inputWriter.write(bufferedData);
int idx = (bufferedData.length() < 50)
? bufferedData.length()
: 50;
@@ -351,7 +356,13 @@
setState(TCPMonBundle.getMessage("error00", "Error"));
e.printStackTrace(wr);
wr.close();
- appendOutputText(st.toString());
+ if (outputWriter != null) {
+ try {
+ outputWriter.write(st.toString());
+ } catch (IOException ex) {
+ ex.printStackTrace();
+ }
+ }
halt();
}
}
@@ -398,8 +409,6 @@
protected abstract AbstractSocketRR createOutputSocketRR(Socket outSocket,
InputStream inputStream, Socket inSocket, OutputStream
outputStream, boolean format,
SlowLinkSimulator slowLink);
- protected abstract void appendInputText(String data);
- protected abstract void appendOutputText(String data);
protected abstract void setOutHost(String outHost);
protected abstract void setState(String state);
protected abstract void setRequest(String request);
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=730535&r1=730534&r2=730535&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
Thu Jan 1 04:33:28 2009
@@ -105,6 +105,8 @@
});
}
+ inputWriter = new TextWidgetWriter(inputText);
+ outputWriter = new TextWidgetWriter(outputText);
}
protected AbstractSocketRR createInputSocketRR(Socket inSocket,
InputStream inputStream,
@@ -112,38 +114,16 @@
SlowLinkSimulator slowLink) {
return new SocketRR(this, inSocket, inputStream, outSocket,
outputStream,
format, listener.connectionTable,
- listener.connections.indexOf(this) + 1, slowLink,
- new TextWidgetWriter(inputText));
+ listener.connections.indexOf(this) + 1, slowLink, inputWriter);
}
protected AbstractSocketRR createOutputSocketRR(Socket outSocket,
InputStream inputStream,
Socket inSocket, OutputStream outputStream, boolean format,
SlowLinkSimulator slowLink) {
return new SocketRR(this, outSocket, inputStream, inSocket,
outputStream,
- format, null, 0, slowLink, new TextWidgetWriter(outputText));
+ format, null, 0, slowLink, outputWriter);
}
- protected void appendInputText(final String data) {
- MainView.display.syncExec(new Runnable() {
- public void run() {
- inputText.append(data);
- }
- });
- }
-
- protected void appendOutputText(final String data) {
- MainView.display.syncExec(new Runnable() {
- public void run() {
- if (outputText != null) {
- outputText.append(data);
- } else {
- // something went wrong before we had the output area
- System.out.println(data);
- }
- }
- });
- }
-
private void setValue(final int column, final String value) {
final int index = listener.connections.indexOf(this);
if (index >= 0) {
