You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commons-dev@ws.apache.org by ve...@apache.org on 2009/05/29 16:38:26 UTC
svn commit: r779998 - in /webservices/commons/trunk/modules/tcpmon/modules:
tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/
tcpmon-eclipse-plugin/src/main/java/org/apache/ws/commons/tcpmon/eclipse/ui/
tcpmon-ui/src/main/java/org/apache/ws/...
Author: veithen
Date: Fri May 29 14:38:25 2009
New Revision: 779998
URL: http://svn.apache.org/viewvc?rev=779998&view=rev
Log:
Some further code simplifications.
Modified:
webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/Configuration.java
webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/Connection.java
webservices/commons/trunk/modules/tcpmon/modules/tcpmon-eclipse-plugin/src/main/java/org/apache/ws/commons/tcpmon/eclipse/ui/Listener.java
webservices/commons/trunk/modules/tcpmon/modules/tcpmon-ui/src/main/java/org/apache/ws/commons/tcpmon/Listener.java
Modified: webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/Configuration.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/Configuration.java?rev=779998&r1=779997&r2=779998&view=diff
==============================================================================
--- webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/Configuration.java (original)
+++ webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/Configuration.java Fri May 29 14:38:25 2009
@@ -18,7 +18,7 @@
import org.apache.ws.commons.tcpmon.core.filter.throttle.ThrottleConfiguration;
-public class Configuration {
+public class Configuration implements Cloneable {
private int listenPort;
private String targetHost;
private int targetPort;
@@ -43,6 +43,14 @@
}
}
+ public Object clone() {
+ try {
+ return super.clone();
+ } catch (CloneNotSupportedException ex) {
+ throw new InternalError();
+ }
+ }
+
public int getListenPort() {
return listenPort;
}
Modified: webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/Connection.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/Connection.java?rev=779998&r1=779997&r2=779998&view=diff
==============================================================================
--- webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/Connection.java (original)
+++ webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/Connection.java Fri May 29 14:38:25 2009
@@ -24,6 +24,7 @@
import org.apache.ws.commons.tcpmon.core.filter.http.HttpProxyServerHandler;
import org.apache.ws.commons.tcpmon.core.filter.http.HttpRequestFilter;
import org.apache.ws.commons.tcpmon.core.filter.throttle.Throttle;
+import org.apache.ws.commons.tcpmon.core.filter.throttle.ThrottleConfiguration;
import java.io.IOException;
import java.io.InputStream;
@@ -101,6 +102,7 @@
active = true;
String HTTPProxyHost = config.getHttpProxyHost();
int HTTPProxyPort = config.getHttpProxyPort();
+ ThrottleConfiguration throttleConfig = config.getThrottleConfiguration();
String fromHost;
if (inSocket != null) {
fromHost = (inSocket.getInetAddress()).getHostName();
@@ -147,7 +149,9 @@
requestFilter.addHandler(new HttpProxyClientHandler(targetHost, targetPort));
outSocket = new Socket(HTTPProxyHost, HTTPProxyPort);
}
- requestPipeline.addFilter(new Throttle(config.getThrottleConfiguration()));
+ if (throttleConfig != null) {
+ requestPipeline.addFilter(new Throttle(throttleConfig));
+ }
Tee requestTee = new Tee();
requestPipeline.addFilter(requestTee);
@@ -163,7 +167,9 @@
requestTee.setOutputStream(tmpOut2);
Pipeline responsePipeline = new Pipeline();
- responsePipeline.addFilter(new Throttle(config.getThrottleConfiguration()));
+ if (throttleConfig != null) {
+ responsePipeline.addFilter(new Throttle(throttleConfig));
+ }
if (tmpOut1 != null) {
responsePipeline.addFilter(new Tee(tmpOut1));
}
Modified: webservices/commons/trunk/modules/tcpmon/modules/tcpmon-eclipse-plugin/src/main/java/org/apache/ws/commons/tcpmon/eclipse/ui/Listener.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/tcpmon/modules/tcpmon-eclipse-plugin/src/main/java/org/apache/ws/commons/tcpmon/eclipse/ui/Listener.java?rev=779998&r1=779997&r2=779998&view=diff
==============================================================================
--- webservices/commons/trunk/modules/tcpmon/modules/tcpmon-eclipse-plugin/src/main/java/org/apache/ws/commons/tcpmon/eclipse/ui/Listener.java (original)
+++ webservices/commons/trunk/modules/tcpmon/modules/tcpmon-eclipse-plugin/src/main/java/org/apache/ws/commons/tcpmon/eclipse/ui/Listener.java Fri May 29 14:38:25 2009
@@ -20,7 +20,6 @@
import org.apache.ws.commons.tcpmon.core.Configuration;
import org.apache.ws.commons.tcpmon.core.IRequestResponse;
import org.apache.ws.commons.tcpmon.core.SocketWaiter;
-import org.apache.ws.commons.tcpmon.core.filter.throttle.ThrottleConfiguration;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.SelectionAdapter;
import org.eclipse.swt.events.SelectionEvent;
@@ -57,27 +56,17 @@
private TabItem portTabItem;
private SocketWaiter sw = null;
- private ThrottleConfiguration throttleConfig;
public final Vector requestResponses = new Vector();
- private String HTTPProxyHost = null;
- private int HTTPProxyPort = 80;
+ private final Configuration baseConfiguration;
public Listener(TabFolder tabFolder, String name,
Configuration config) {
if (name == null) {
name = TCPMonBundle.getMessage("port01", "Port") + " " + config.getListenPort();
}
- // set the slow link to the passed down link
- if (throttleConfig != null) {
- this.throttleConfig = config.getThrottleConfiguration();
- } else {
- // or make up a no-op one.
- this.throttleConfig = new ThrottleConfiguration(0, 0);
- }
- HTTPProxyHost = config.getHttpProxyHost();
- HTTPProxyPort = config.getHttpProxyPort();
+ baseConfiguration = config;
this.tabFolder = tabFolder;
createPortTab(config);
@@ -608,7 +597,7 @@
}
public Configuration getConfiguration() {
- final Configuration config = new Configuration();
+ final Configuration config = (Configuration)baseConfiguration.clone();
MainView.display.syncExec(new Runnable() {
public void run() {
config.setListenPort(Integer.parseInt(portField.getText()));
@@ -618,13 +607,9 @@
config.setXmlFormat(xmlFormatBox.getSelection());
}
});
- if (HTTPProxyHost == null) {
+ if (config.getHttpProxyHost() == null) {
config.configProxyFromSystemProperties();
- } else {
- config.setHttpProxyHost(HTTPProxyHost);
- config.setHttpProxyPort(HTTPProxyPort);
}
- config.setThrottleConfiguration(throttleConfig);
return config;
}
Modified: webservices/commons/trunk/modules/tcpmon/modules/tcpmon-ui/src/main/java/org/apache/ws/commons/tcpmon/Listener.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/tcpmon/modules/tcpmon-ui/src/main/java/org/apache/ws/commons/tcpmon/Listener.java?rev=779998&r1=779997&r2=779998&view=diff
==============================================================================
--- webservices/commons/trunk/modules/tcpmon/modules/tcpmon-ui/src/main/java/org/apache/ws/commons/tcpmon/Listener.java (original)
+++ webservices/commons/trunk/modules/tcpmon/modules/tcpmon-ui/src/main/java/org/apache/ws/commons/tcpmon/Listener.java Fri May 29 14:38:25 2009
@@ -44,7 +44,6 @@
import org.apache.ws.commons.tcpmon.core.Configuration;
import org.apache.ws.commons.tcpmon.core.IRequestResponse;
import org.apache.ws.commons.tcpmon.core.SocketWaiter;
-import org.apache.ws.commons.tcpmon.core.filter.throttle.ThrottleConfiguration;
import java.awt.BorderLayout;
import java.awt.Color;
@@ -152,20 +151,7 @@
*/
private JTabbedPane notebook = null;
- /**
- * Field HTTPProxyHost
- */
- private String HTTPProxyHost = null;
-
- /**
- * Field HTTPProxyPort
- */
- private int HTTPProxyPort = 80;
-
- /**
- * Field slowLink
- */
- private ThrottleConfiguration throttleConfig;
+ private final Configuration baseConfiguration;
/**
* Field connections
@@ -190,16 +176,7 @@
name = TCPMonBundle.getMessage("port01", "Port") + " " + config.getListenPort();
}
- // set the slow link to the passed down link
- if (throttleConfig != null) {
- this.throttleConfig = config.getThrottleConfiguration();
- } else {
-
- // or make up a no-op one.
- this.throttleConfig = new ThrottleConfiguration(0, 0);
- }
- HTTPProxyHost = config.getHttpProxyHost();
- HTTPProxyPort = config.getHttpProxyPort();
+ baseConfiguration = config;
panel = new JPanel(new BorderLayout());
// 1st component is just a row of labels and 1-line entry fields
@@ -590,19 +567,15 @@
}
public Configuration getConfiguration() {
- Configuration config = new Configuration();
+ Configuration config = (Configuration)baseConfiguration.clone();
config.setListenPort(Integer.parseInt(portField.getText()));
config.setTargetHost(hostField.getText());
config.setTargetPort(Integer.parseInt(tPortField.getText()));
config.setProxy(isProxyBox.isSelected());
config.setXmlFormat(xmlFormatBox.isSelected());
- if (HTTPProxyHost == null) {
+ if (config.getHttpProxyHost() == null) {
config.configProxyFromSystemProperties();
- } else {
- config.setHttpProxyHost(HTTPProxyHost);
- config.setHttpProxyPort(HTTPProxyPort);
}
- config.setThrottleConfiguration(throttleConfig);
return config;
}