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 2008/12/29 12:14:47 UTC

svn commit: r729864 - in /webservices/commons/trunk/modules/tcpmon: resources/eclipse/ src/org/apache/ws/commons/tcpmon/eclipse/ui/

Author: veithen
Date: Mon Dec 29 03:14:47 2008
New Revision: 729864

URL: http://svn.apache.org/viewvc?rev=729864&view=rev
Log:
WSCOMMONS-385: Applied patch provided by Saliya Ekanayake.

Modified:
    webservices/commons/trunk/modules/tcpmon/resources/eclipse/plugin.xml
    webservices/commons/trunk/modules/tcpmon/src/org/apache/ws/commons/tcpmon/eclipse/ui/Listener.java
    webservices/commons/trunk/modules/tcpmon/src/org/apache/ws/commons/tcpmon/eclipse/ui/MainView.java
    webservices/commons/trunk/modules/tcpmon/src/org/apache/ws/commons/tcpmon/eclipse/ui/Sender.java

Modified: webservices/commons/trunk/modules/tcpmon/resources/eclipse/plugin.xml
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/tcpmon/resources/eclipse/plugin.xml?rev=729864&r1=729863&r2=729864&view=diff
==============================================================================
--- webservices/commons/trunk/modules/tcpmon/resources/eclipse/plugin.xml (original)
+++ webservices/commons/trunk/modules/tcpmon/resources/eclipse/plugin.xml Mon Dec 29 03:14:47 2008
@@ -5,15 +5,15 @@
    <extension
          point="org.eclipse.ui.views">
       <category
-            name="TCP Monitor"
+            name="Apache TCPMon"
             id="tcpmonitor">
       </category>
       <view
-            name="TCP Monitor"
+            name="Apache TCPMon"
             icon="icons/monitor.gif"
             category="tcpmonitor"
             class="org.apache.ws.commons.tcpmon.eclipse.ui.MainView"
-            id="tcpmonitor.views.MainView">
+            id="org.apache.ws.commons.tcpmon.eclipse.ui.MainView">
       </view>
    </extension>
    <extension
@@ -24,9 +24,9 @@
                ratio="0.5"
                relative="org.eclipse.ui.views.TaskList"
                relationship="right"
-               id="tcpmonitor.views.MainView">
+               id="org.apache.ws.commons.tcpmon.eclipse.ui.MainView">
          </view>
       </perspectiveExtension>
    </extension>
 
-</plugin>
+</plugin>
\ No newline at end of file

Modified: webservices/commons/trunk/modules/tcpmon/src/org/apache/ws/commons/tcpmon/eclipse/ui/Listener.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/tcpmon/src/org/apache/ws/commons/tcpmon/eclipse/ui/Listener.java?rev=729864&r1=729863&r2=729864&view=diff
==============================================================================
--- webservices/commons/trunk/modules/tcpmon/src/org/apache/ws/commons/tcpmon/eclipse/ui/Listener.java (original)
+++ webservices/commons/trunk/modules/tcpmon/src/org/apache/ws/commons/tcpmon/eclipse/ui/Listener.java Mon Dec 29 03:14:47 2008
@@ -15,13 +15,12 @@
  */
 package org.apache.ws.commons.tcpmon.eclipse.ui;
 
+import org.apache.ws.commons.tcpmon.SlowLinkSimulator;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.layout.*;
 import org.eclipse.swt.widgets.*;
-import org.apache.ws.commons.tcpmon.eclipse.ui.Connection;
-import org.apache.ws.commons.tcpmon.SlowLinkSimulator;
 
 import java.io.ByteArrayInputStream;
 import java.io.File;
@@ -115,7 +114,6 @@
 
         portField = new Text(composite, SWT.BORDER);
         portField.setText("" + listenPort);
-        portField.setTextLimit(4);
         gd = new GridData(SWT.FILL, SWT.CENTER, false, false);
         gd.widthHint = 40;
         portField.setLayoutData(gd);
@@ -124,7 +122,6 @@
 
         hostField = new Text(composite, SWT.BORDER);
         hostField.setText(host);
-        hostField.setTextLimit(30);
         gd = new GridData(SWT.FILL, SWT.CENTER, false, false);
         gd.widthHint = 202;
         hostField.setLayoutData(gd);
@@ -133,7 +130,6 @@
 
         tPortField = new Text(composite, SWT.BORDER);
         tPortField.setText("" + targetPort);
-        tPortField.setTextLimit(4);
         gd = new GridData(SWT.FILL, SWT.CENTER, false, false);
         gd.widthHint = 40;
         tPortField.setLayoutData(gd);

Modified: webservices/commons/trunk/modules/tcpmon/src/org/apache/ws/commons/tcpmon/eclipse/ui/MainView.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/tcpmon/src/org/apache/ws/commons/tcpmon/eclipse/ui/MainView.java?rev=729864&r1=729863&r2=729864&view=diff
==============================================================================
--- webservices/commons/trunk/modules/tcpmon/src/org/apache/ws/commons/tcpmon/eclipse/ui/MainView.java (original)
+++ webservices/commons/trunk/modules/tcpmon/src/org/apache/ws/commons/tcpmon/eclipse/ui/MainView.java Mon Dec 29 03:14:47 2008
@@ -16,28 +16,20 @@
 package org.apache.ws.commons.tcpmon.eclipse.ui;
 
 
-import java.util.ResourceBundle;
-
+import org.apache.ws.commons.tcpmon.SlowLinkSimulator;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.TabFolder;
-import org.eclipse.swt.widgets.TabItem;
-import org.eclipse.swt.widgets.Text;
+import org.eclipse.swt.widgets.*;
 import org.eclipse.ui.part.ViewPart;
-import org.apache.ws.commons.tcpmon.eclipse.ui.Listener;
-import org.apache.ws.commons.tcpmon.SlowLinkSimulator;
+
+import java.util.ResourceBundle;
 
 /**
  * 
- * Main view to be mounted into Eclipse
+ * The class <code>MainView</code> is the UI mounted into Eclipse as a View
  *
  */
 public class MainView extends ViewPart{
@@ -97,9 +89,8 @@
 
         gd = new GridData();
         gd.verticalIndent = 15;
-        gd.widthHint = 30;
+        gd.widthHint = 60;
         port = new Text(composite, SWT.BORDER);
-        port.setTextLimit(4);
         port.setLayoutData(gd);
 
         addActAsOptions(composite);
@@ -198,9 +189,8 @@
 
         gd = new GridData(SWT.NONE, SWT.NONE, false, false);
         gd.verticalIndent = 2;
-        gd.widthHint = 30;
+        gd.widthHint = 60;
         tport = new Text(composite, SWT.BORDER);
-        tport.setTextLimit(4);
         tport.setText("8080");
         tport.setLayoutData(gd);
 
@@ -237,21 +227,20 @@
         final Label hTTPProxyHostLabel = new Label(optGroup, SWT.NONE);
         hTTPProxyHostLabel.setEnabled(false);
         hTTPProxyHostLabel.setText(MainView.getMessage("hostname00", "Hostname"));
-        hTTPProxyHostLabel.setBounds(30, 50, 50, 20);
+        hTTPProxyHostLabel.setBounds(30, 50, 70, 25);
 
         hTTPProxyHost = new Text(optGroup, SWT.BORDER);
         hTTPProxyHost.setEnabled(false);
-        hTTPProxyHost.setBounds(90, 50, 150, 20);
+        hTTPProxyHost.setBounds(110, 50, 300, 25);
 
         final Label hTTPProxyPortLabel = new Label(optGroup, SWT.NONE);
         hTTPProxyPortLabel.setEnabled(false);
         hTTPProxyPortLabel.setText(MainView.getMessage("port00", "Port #"));
-        hTTPProxyPortLabel.setBounds(30, 75, 50, 20);
+        hTTPProxyPortLabel.setBounds(30, 85, 70, 25);
 
         hTTPProxyPort = new Text(optGroup, SWT.BORDER);
-        hTTPProxyPort.setTextLimit(4);
         hTTPProxyPort.setEnabled(false);
-        hTTPProxyPort.setBounds(90, 75, 40, 20);
+        hTTPProxyPort.setBounds(110, 85, 70, 25);
 
         // Set default proxy values...
         String tmp = System.getProperty("http.proxyHost");
@@ -278,27 +267,27 @@
         }
 
         delayBox = new Button(optGroup, SWT.CHECK);
-        delayBox.setBounds(10, 110, 200, 20);
+        delayBox.setBounds(10, 120, 200, 20);
         final String delaySupport = MainView.getMessage("delay00", "Simulate Slow Connection");
         delayBox.setText(delaySupport);
 
         final Label delayBytesLabel = new Label(optGroup, SWT.NONE);
         delayBytesLabel.setEnabled(false);
         delayBytesLabel.setText(MainView.getMessage("delay01", "Bytes per Pause"));
-        delayBytesLabel.setBounds(30, 140, 100, 20);
+        delayBytesLabel.setBounds(30, 150, 130, 25);
 
         delayBytes = new Text(optGroup, SWT.BORDER);
         delayBytes.setEnabled(false);
-        delayBytes.setBounds(140, 140, 40, 20);
+        delayBytes.setBounds(170, 150, 70, 25);
 
         final Label delayTimeLabel = new Label(optGroup, SWT.NONE);
         delayTimeLabel.setEnabled(false);
         delayTimeLabel.setText(MainView.getMessage("delay02", "Delay in Milliseconds"));
-        delayTimeLabel.setBounds(30, 165, 100, 20);
+        delayTimeLabel.setBounds(30, 185, 130, 25);
 
         delayTime = new Text(optGroup, SWT.BORDER);
         delayTime.setEnabled(false);
-        delayTime.setBounds(140, 165, 40, 20);
+        delayTime.setBounds(170, 185, 70, 25);
 
 
         hTTPProxyBox.addSelectionListener(new SelectionAdapter() {
@@ -354,4 +343,5 @@
         }
         return result;
     }
+
 }
\ No newline at end of file

Modified: webservices/commons/trunk/modules/tcpmon/src/org/apache/ws/commons/tcpmon/eclipse/ui/Sender.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/tcpmon/src/org/apache/ws/commons/tcpmon/eclipse/ui/Sender.java?rev=729864&r1=729863&r2=729864&view=diff
==============================================================================
--- webservices/commons/trunk/modules/tcpmon/src/org/apache/ws/commons/tcpmon/eclipse/ui/Sender.java (original)
+++ webservices/commons/trunk/modules/tcpmon/src/org/apache/ws/commons/tcpmon/eclipse/ui/Sender.java Mon Dec 29 03:14:47 2008
@@ -15,46 +15,26 @@
  */
 package org.apache.ws.commons.tcpmon.eclipse.ui;
 
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.OutputStream;
-import java.io.OutputStreamWriter;
-import java.io.PrintWriter;
-import java.io.StringReader;
-import java.io.StringWriter;
-import java.io.Writer;
-import java.net.HttpURLConnection;
-import java.net.URL;
-import java.net.URLConnection;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.layout.*;
+import org.eclipse.swt.widgets.*;
 
 import javax.xml.transform.OutputKeys;
 import javax.xml.transform.Transformer;
 import javax.xml.transform.TransformerFactory;
 import javax.xml.transform.stream.StreamResult;
 import javax.xml.transform.stream.StreamSource;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.FillLayout;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.layout.RowData;
-import org.eclipse.swt.layout.RowLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.TabFolder;
-import org.eclipse.swt.widgets.TabItem;
-import org.eclipse.swt.widgets.Text;
-import org.apache.ws.commons.tcpmon.eclipse.ui.MainView;
+import java.io.*;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.net.URLConnection;
 
 /**
  *   This is similar to the main swing sender but includes SWT components instead of Swing ones
  */
- class Sender {
+class Sender {
     private TabFolder tabFolder = null;
 
     public Text endpointField;
@@ -86,9 +66,9 @@
         endpointField.setLayoutData(new GridData(312, SWT.DEFAULT));
 
         (new Label(tabComposite, SWT.NONE)).setText("SOAP Action");
-        ;
 
         actionField = new Text(tabComposite, SWT.BORDER);
+        actionField.setLayoutData(new GridData(60, SWT.DEFAULT));
 
         final Composite textComposite = new Composite(tabComposite, SWT.NONE);
         textComposite.setLayout(new FillLayout(SWT.VERTICAL));