This commit was manufactured by cvs2svn to create tag 'v20050310'.
diff --git a/plugins/org.eclipse.jst.server.generic.modules/.cvsignore b/plugins/org.eclipse.jst.server.generic.modules/.cvsignore
deleted file mode 100644
index 42654c1..0000000
--- a/plugins/org.eclipse.jst.server.generic.modules/.cvsignore
+++ /dev/null
@@ -1,5 +0,0 @@
-bin
-build.xml
-commonmodules.jar
-org.eclipse.jst.server.generic.modules_1.0.0.jar
-temp.folder
diff --git a/plugins/org.eclipse.jst.server.generic.modules/.project b/plugins/org.eclipse.jst.server.generic.modules/.project
deleted file mode 100644
index af14ba8..0000000
--- a/plugins/org.eclipse.jst.server.generic.modules/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.server.generic.ui</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/plugins/org.eclipse.wst.internet.monitor.core/component.xml b/plugins/org.eclipse.wst.internet.monitor.core/component.xml
new file mode 100644
index 0000000..bbc5ba3
--- /dev/null
+++ b/plugins/org.eclipse.wst.internet.monitor.core/component.xml
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><component xmlns="http://eclipse.org/wtp/releng/tools/component-model" name="org.eclipse.wst.internet"><component-depends unrestricted="true"></component-depends><plugin id="org.eclipse.wst.internet.monitor.core" fragment="false"/><plugin id="org.eclipse.wst.internet.monitor.ui" fragment="false"/><plugin id="org.eclipse.wst.internet.proxy" fragment="false"/><plugin id="org.eclipse.wst.internet.webbrowser" fragment="false"/><package name="org.eclipse.wst.internet.monitor.core"><type name="IRequestListener" implement="false" subclass="false" instantiate="false"/><type name="MonitorCore" implement="false" subclass="false" instantiate="false"/><type name="IMonitorWorkingCopy" implement="false" subclass="false" instantiate="false"/><type name="ContentFilterDelegate"/><type name="Request"/><type name="IMonitorListener" subclass="false"/><type name="IMonitor" implement="false" subclass="false" instantiate="false"/></package><package name="org.eclipse.wst.internet.monitor.ui"><type name="MonitorUICore" implement="false" subclass="false" instantiate="false"/><type name="ContentViewer"/></package><package name="org.eclipse.wst.internet.webbrowser"><type name="ToolbarBrowser"/><type name="IWebBrowser" implement="false" subclass="false"/><type name="WebBrowser" implement="false" subclass="false"/></package></component>
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/internet/monitor/core/IMonitor.java b/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/internet/monitor/core/IMonitor.java
index 0f4a2c2..e46d882 100644
--- a/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/internet/monitor/core/IMonitor.java
+++ b/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/internet/monitor/core/IMonitor.java
@@ -16,7 +16,7 @@
* Represents a monitor between a client and server.
* The monitor watches all network traffic between a local client (talking
* on a given local port) and a remote server (identified by host and port).
- * The global list of known monitors is available via {@link MonitorCore.getMonitors()}.
+ * The global list of known monitors is available via {@link MonitorCore#getMonitors()}.
* IMonitor is thread-safe.
* <p>
* IMonitors are read-only. To make changes to a monitor, you must create an
diff --git a/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/internet/monitor/core/internal/ContentFilter.java b/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/internet/monitor/core/internal/ContentFilter.java
index 3fc3f3e..28e727e 100644
--- a/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/internet/monitor/core/internal/ContentFilter.java
+++ b/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/internet/monitor/core/internal/ContentFilter.java
@@ -25,6 +25,11 @@
this.element = element;
}
+ /**
+ * Return the id.
+ *
+ * @return the id
+ */
public String getId() {
return element.getAttribute("id");
}
@@ -40,10 +45,23 @@
}
}
+ /**
+ * Returns the name.
+ *
+ * @return the name
+ */
public String getName() {
return element.getAttribute("name");
}
+ /**
+ * Do the filtering.
+ *
+ * @param request the request
+ * @param isRequest true if request, false if response
+ * @param content the content
+ * @return the filtered content
+ */
public byte[] filter(Request request, boolean isRequest, byte[] content) throws IOException {
if (delegate == null) {
try {
diff --git a/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/internet/monitor/core/internal/IContentFilter.java b/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/internet/monitor/core/internal/IContentFilter.java
index d8df4ee..fd89588 100644
--- a/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/internet/monitor/core/internal/IContentFilter.java
+++ b/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/internet/monitor/core/internal/IContentFilter.java
@@ -14,9 +14,7 @@
import org.eclipse.wst.internet.monitor.core.Request;
/**
* A content filter that filters specific contents from the monitor traffic
- * of a request.
- * The global list of known content filters is available via
- * {@link MonitorCore.getContentFilters()}.
+ * of a request.
* <p>
* This interface is not intended to be implemented by clients.
* </p>
diff --git a/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/internet/monitor/core/internal/IMemento.java b/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/internet/monitor/core/internal/IMemento.java
index 3450bd2..b6c1626 100644
--- a/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/internet/monitor/core/internal/IMemento.java
+++ b/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/internet/monitor/core/internal/IMemento.java
@@ -37,9 +37,6 @@
* </p><p>
* This interface is not intended to be implemented by clients.
* </p>
- *
- * @see IPersistableElement
- * @see IElementFactory
*/
public interface IMemento {
/**
diff --git a/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/internet/monitor/core/internal/IProtocolAdapter.java b/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/internet/monitor/core/internal/IProtocolAdapter.java
index 83af936..4403f1c 100644
--- a/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/internet/monitor/core/internal/IProtocolAdapter.java
+++ b/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/internet/monitor/core/internal/IProtocolAdapter.java
@@ -17,30 +17,25 @@
* Protocol adapters are registered via the <code>protocolAdapaters</code>
* extension point in the <code>org.eclipse.wst.internet.monitor.core</code>
* plug-in. The global list of known protocol adapters is available via
- * {@link MonitorCore.getProtocolAdapters()}. Standard protocol
+ * {@link MonitorPlugin#getProtocolAdapters()}. Standard protocol
* adapters for {@linkplain #HTTP_PROTOCOL_ID HTTP} and
* {@linkplain #TCPIP_PROTOCOL_ID TCP/IP} are built-in.
* <p>
* This interface is not intended to be implemented by clients.
* </p>
*
- * @see IMonitorWorkingCopy#setProtocolAdapter(IProtocolAdapter)
* @since 1.0
*/
public interface IProtocolAdapter {
/**
* Protocol adapter id (value {@value}) for TCP/IP.
* The TCP/IP protocol adapter is standard.
- *
- * @see MonitorCore#findProtocolAdapter(String)
*/
public static String TCPIP_PROTOCOL_ID = "TCP/IP";
/**
* Protocol adapter id (value {@value}) for HTTP.
* The HTTP protocol adapter is standard.
- *
- * @see MonitorCore#findProtocolAdapter(String)
*/
public static String HTTP_PROTOCOL_ID = "HTTP";
diff --git a/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/internet/monitor/core/internal/MonitorManager.java b/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/internet/monitor/core/internal/MonitorManager.java
index c7e4b2d..0fe190d 100644
--- a/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/internet/monitor/core/internal/MonitorManager.java
+++ b/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/internet/monitor/core/internal/MonitorManager.java
@@ -157,8 +157,9 @@
/**
* Fire a monitor event.
- * @param rr
- * @param type
+ *
+ * @param monitor the monitor
+ * @param type the type of event
*/
protected void fireMonitorEvent(IMonitor monitor, int type) {
Object[] obj = monitorListeners.toArray();
@@ -183,7 +184,7 @@
String xmlString = prefs.getString("monitors");
if (xmlString != null && xmlString.length() > 0) {
try {
- ByteArrayInputStream in = new ByteArrayInputStream(xmlString.getBytes());
+ ByteArrayInputStream in = new ByteArrayInputStream(xmlString.getBytes("UTF-8"));
IMemento memento = XMLMemento.loadMemento(in);
IMemento[] children = memento.getChildren("monitor");
diff --git a/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/internet/monitor/core/internal/MonitorPlugin.java b/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/internet/monitor/core/internal/MonitorPlugin.java
index d79c94e..c895de0 100644
--- a/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/internet/monitor/core/internal/MonitorPlugin.java
+++ b/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/internet/monitor/core/internal/MonitorPlugin.java
@@ -80,9 +80,9 @@
* Returns the translated String found with the given key,
* and formatted with the given arguments using java.text.MessageFormat.
*
- * @param key java.lang.String
- * @param arguments java.lang.Object[]
- * @return java.lang.String
+ * @param key the key
+ * @param arg an argument
+ * @return the translated string
*/
public static String getResource(String key, String arg) {
return getResource(key, new String[] { arg });
@@ -96,9 +96,9 @@
* Returns the protocol adapter with the given id, or <code>null</code>
* if none. This convenience method searches the list of known
* protocol adapters ({@link #getProtocolAdapters()}) for the one with a
- * matching id ({@link IProtocolAdater#getId()}).
+ * matching id.
*
- * @param the protocol adapter id; must not be <code>null</code>
+ * @param id the protocol adapter id; must not be <code>null</code>
* @return the protocol adapter instance, or <code>null</code> if there
* is no protocol adapter with the given id
*/
diff --git a/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/internet/monitor/core/internal/ProtocolAdapterDelegate.java b/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/internet/monitor/core/internal/ProtocolAdapterDelegate.java
index edab6ac..db48eb1 100644
--- a/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/internet/monitor/core/internal/ProtocolAdapterDelegate.java
+++ b/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/internet/monitor/core/internal/ProtocolAdapterDelegate.java
@@ -18,7 +18,7 @@
* implementation behind a particular protocol adapter.
* A protocol adapter watches the message traffic passing between client and
* server; it parses the messages and reports them in the form of
- * {@link Request} objects.
+ * Request objects.
* <p>
* This abstract class is intended to be subclassed only by clients
* to extend the <code>protocolAdapters</code> extension point.
diff --git a/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/internet/monitor/core/internal/XMLMemento.java b/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/internet/monitor/core/internal/XMLMemento.java
index c838fd2..5f6c615 100644
--- a/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/internet/monitor/core/internal/XMLMemento.java
+++ b/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/internet/monitor/core/internal/XMLMemento.java
@@ -12,7 +12,6 @@
import java.io.*;
import java.util.*;
-import java.net.URL;
import org.w3c.dom.*;
import org.xml.sax.*;
@@ -45,13 +44,13 @@
* you should use createReadRoot and createWriteRoot to create the initial
* mementos on a document.
*/
- public XMLMemento(Document doc, Element el) {
+ private XMLMemento(Document doc, Element el) {
factory = doc;
element = el;
}
- /**
- * @see IMemento.
+ /*
+ * @see IMemento
*/
public IMemento createChild(String type) {
Element child = factory.createElement(type);
@@ -59,8 +58,8 @@
return new XMLMemento(factory, child);
}
- /**
- * @see IMemento.
+ /*
+ * @see IMemento
*/
public IMemento createChild(String type, String id) {
Element child = factory.createElement(type);
@@ -73,12 +72,12 @@
* Create a Document from a Reader and answer a root memento for reading
* a document.
*/
- protected static XMLMemento createReadRoot(Reader reader) {
+ protected static XMLMemento createReadRoot(InputStream in) {
Document document = null;
try {
DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
DocumentBuilder parser = factory.newDocumentBuilder();
- document = parser.parse(new InputSource(reader));
+ document = parser.parse(new InputSource(in));
Node node = document.getFirstChild();
if (node instanceof Element)
return new XMLMemento(document, (Element) node);
@@ -90,7 +89,7 @@
// ignore
} finally {
try {
- reader.close();
+ in.close();
} catch (Exception e) {
// ignore
}
@@ -113,8 +112,8 @@
}
}
- /**
- * @see IMemento.
+ /*
+ * @see IMemento
*/
public IMemento getChild(String type) {
// Get the nodes.
@@ -137,8 +136,8 @@
return null;
}
- /**
- * @see IMemento.
+ /*
+ * @see IMemento
*/
public IMemento [] getChildren(String type) {
// Get the nodes.
@@ -168,20 +167,9 @@
}
/**
- * Return the contents of this memento as a byte array.
- *
- * @return byte[]
- */
- public byte[] getContents() throws IOException {
- ByteArrayOutputStream out = new ByteArrayOutputStream();
- save(out);
- return out.toByteArray();
- }
-
- /**
* Returns an input stream for writing to the disk with a local locale.
*
- * @return java.io.InputStream
+ * @return the input stream
*/
public InputStream getInputStream() throws IOException {
ByteArrayOutputStream out = new ByteArrayOutputStream();
@@ -189,8 +177,8 @@
return new ByteArrayInputStream(out.toByteArray());
}
- /**
- * @see IMemento.
+ /*
+ * @see IMemento
*/
public Float getFloat(String key) {
Attr attr = element.getAttributeNode(key);
@@ -204,22 +192,22 @@
}
}
- /**
- * @see IMemento.
+ /*
+ * @see IMemento
*/
public String getId() {
return element.getAttribute(TAG_ID);
}
- /**
- * @see IMemento.
+ /*
+ * @see IMemento
*/
public String getName() {
return element.getNodeName();
}
- /**
- * @see IMemento.
+ /*
+ * @see IMemento
*/
public Integer getInteger(String key) {
Attr attr = element.getAttributeNode(key);
@@ -233,8 +221,8 @@
}
}
- /**
- * @see IMemento.
+ /*
+ * @see IMemento
*/
public String getString(String key) {
Attr attr = element.getAttributeNode(key);
@@ -258,70 +246,16 @@
/**
* Loads a memento from the given filename.
*
- * @param in java.io.InputStream
- * @return org.eclipse.ui.IMemento
+ * @param in the input stream
+ * @return a memento
* @exception java.io.IOException
*/
public static IMemento loadMemento(InputStream in) {
- return createReadRoot(new InputStreamReader(in));
- }
-
- /**
- * Loads a memento from the given filename.
- *
- * @param in java.io.InputStream
- * @return org.eclipse.ui.IMemento
- * @exception java.io.IOException
- */
- public static IMemento loadCorruptMemento(InputStream in) {
- Document document = null;
- try {
- DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
- DocumentBuilder parser = factory.newDocumentBuilder();
- document = parser.parse(in);
- Node node = document.getFirstChild();
- if (node instanceof Element)
- return new XMLMemento(document, (Element) node);
- } catch (ParserConfigurationException e) {
- // ignore
- } catch (IOException e) {
- // ignore
- } catch (SAXException e) {
- // ignore
- } finally {
- try {
- in.close();
- } catch (Exception e) {
- // ignore
- }
- }
- return null;
+ return createReadRoot(in);
}
- /**
- * Loads a memento from the given filename.
- *
- * @param filename java.lang.String
- * @return org.eclipse.ui.IMemento
- * @exception java.io.IOException
- */
- public static IMemento loadMemento(String filename) throws IOException {
- return XMLMemento.createReadRoot(new FileReader(filename));
- }
-
- /**
- * Loads a memento from the given filename.
- *
- * @param url java.net.URL
- * @return org.eclipse.ui.IMemento
- * @exception java.io.IOException
- */
- public static IMemento loadMemento(URL url) throws IOException {
- return XMLMemento.createReadRoot(new InputStreamReader(url.openStream()));
- }
-
- /**
- * @see IMemento.
+ /*
+ * @see IMemento
*/
private void putElement(Element element2) {
NamedNodeMap nodeMap = element2.getAttributes();
@@ -342,55 +276,39 @@
}
}
- /**
- * @see IMemento.
+ /*
+ * @see IMemento
*/
public void putFloat(String key, float f) {
element.setAttribute(key, String.valueOf(f));
}
- /**
- * @see IMemento.
+ /*
+ * @see IMemento
*/
public void putInteger(String key, int n) {
element.setAttribute(key, String.valueOf(n));
}
- /**
- * @see IMemento.
+ /*
+ * @see IMemento
*/
public void putMemento(IMemento memento) {
XMLMemento xmlMemento = (XMLMemento) memento;
putElement(xmlMemento.element);
}
- /**
- * @see IMemento.
+ /*
+ * @see IMemento
*/
public void putString(String key, String value) {
if (value == null)
return;
element.setAttribute(key, value);
}
-
- /**
- * Save this Memento to a Writer.
- */
- public void save(Writer writer) throws IOException {
- Result result = new StreamResult(writer);
- Source source = new DOMSource(factory);
- try {
- Transformer transformer = TransformerFactory.newInstance().newTransformer();
- transformer.setOutputProperty(OutputKeys.INDENT, "yes"); //$NON-NLS-1$
- transformer.setOutputProperty(OutputKeys.METHOD, "xml"); //$NON-NLS-1$
- transformer.transform(source, result);
- } catch (Exception e) {
- throw (IOException) (new IOException().initCause(e));
- }
- }
/**
- * Save this Memento to a Writer.
+ * Save this Memento to an output stream.
*/
public void save(OutputStream os) throws IOException {
Result result = new StreamResult(os);
@@ -399,44 +317,19 @@
Transformer transformer = TransformerFactory.newInstance().newTransformer();
transformer.setOutputProperty(OutputKeys.INDENT, "yes"); //$NON-NLS-1$
transformer.setOutputProperty(OutputKeys.METHOD, "xml"); //$NON-NLS-1$
+ transformer.setOutputProperty(OutputKeys.ENCODING, "UTF-8"); //$NON-NLS-1$
transformer.transform(source, result);
} catch (Exception e) {
throw (IOException) (new IOException().initCause(e));
}
}
- /**
- * Saves the memento to the given file.
- *
- * @param filename java.lang.String
- * @exception java.io.IOException
- */
- public void saveToFile(String filename) throws IOException {
- Writer w = null;
- try {
- w = new FileWriter(filename);
- save(w);
- } catch (IOException e) {
- throw e;
- } catch (Exception e) {
- throw new IOException(e.getLocalizedMessage());
- } finally {
- if (w != null) {
- try {
- w.close();
- } catch (Exception e) {
- // ignore
- }
- }
- }
- }
-
public String saveToString() throws IOException {
ByteArrayOutputStream out = new ByteArrayOutputStream();
save(out);
return out.toString("UTF-8");
}
-
+
/*
* @see IMemento#getBoolean(String)
*/
diff --git a/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/internet/monitor/core/internal/http/HTTPConnection.java b/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/internet/monitor/core/internal/http/HTTPConnection.java
index bb8c03e..ca7231b 100644
--- a/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/internet/monitor/core/internal/http/HTTPConnection.java
+++ b/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/internet/monitor/core/internal/http/HTTPConnection.java
@@ -41,8 +41,9 @@
/**
* Add a request.
- * @param req byte[]
- * @param isNew boolean
+ *
+ * @param b the request data
+ * @param isNew true if new
*/
public void addRequest(byte[] b, boolean isNew) {
if (isNew)
@@ -53,8 +54,9 @@
/**
* Add a response.
- * @param req byte[]
- * @param isNew boolean
+ *
+ * @param b the response data
+ * @param isNew true if new
*/
public void addResponse(byte[] b, boolean isNew) {
if (isNew)
@@ -96,8 +98,9 @@
}
/**
- * Set the title
- * @param req byte[]
+ * Set the title.
+ *
+ * @param title the title
* @param isNew boolean
*/
public void setLabel(String title, boolean isNew) {
diff --git a/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/internet/monitor/core/internal/http/HTTPThread.java b/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/internet/monitor/core/internal/http/HTTPThread.java
index 8efc19a..6363c26 100644
--- a/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/internet/monitor/core/internal/http/HTTPThread.java
+++ b/plugins/org.eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/internet/monitor/core/internal/http/HTTPThread.java
@@ -406,8 +406,8 @@
* Remove data from the buffer up to the absolute index n.
* Return the data from between bufferIndex and n.
*
- * @return byte[]
- * @param index int
+ * @param n the bytes to remove
+ * @return a byte array
*/
protected byte[] removeFromBuffer(int n) {
// copy line out of buffer
diff --git a/plugins/org.eclipse.wst.internet.monitor.ui/monitorui/org/eclipse/wst/internet/monitor/ui/internal/view/MonitorView.java b/plugins/org.eclipse.wst.internet.monitor.ui/monitorui/org/eclipse/wst/internet/monitor/ui/internal/view/MonitorView.java
index 2ea3991..a4313f7 100644
--- a/plugins/org.eclipse.wst.internet.monitor.ui/monitorui/org/eclipse/wst/internet/monitor/ui/internal/view/MonitorView.java
+++ b/plugins/org.eclipse.wst.internet.monitor.ui/monitorui/org/eclipse/wst/internet/monitor/ui/internal/view/MonitorView.java
@@ -194,51 +194,26 @@
Composite requestHeader = new Composite(request, SWT.NONE);
layout = new GridLayout();
- layout.verticalSpacing = 0;
+ layout.verticalSpacing = 1;
layout.numColumns = 2;
layout.marginHeight = 0;
layout.marginWidth = 2;
data = new GridData(GridData.FILL_HORIZONTAL | GridData.VERTICAL_ALIGN_BEGINNING);
- data.heightHint = 30;
requestHeader.setLayout(layout);
requestHeader.setLayoutData(data);
- Composite requestHeaderLeft = new Composite(requestHeader, SWT.NONE);
- layout = new GridLayout();
- layout.verticalSpacing = 2;
- layout.marginHeight = 0;
- layout.marginWidth = 0;
- data = new GridData(GridData.FILL_HORIZONTAL | GridData.FILL_VERTICAL);
- data.heightHint = 30;
- requestHeaderLeft.setLayout(layout);
- requestHeaderLeft.setLayoutData(data);
-
- Label empty1 = new Label(requestHeaderLeft, SWT.NONE);
- empty1.setLayoutData(new GridData(GridData.FILL_HORIZONTAL | GridData.FILL_VERTICAL));
-
- final Label requestLabel = new Label(requestHeaderLeft, SWT.NONE);
+ final Label requestLabel = new Label(requestHeader, SWT.NONE);
requestLabel.setText(MonitorUIPlugin.getResource("%viewRequest", ""));
- requestLabel.setLayoutData(new GridData(GridData.FILL_HORIZONTAL | GridData.VERTICAL_ALIGN_END));
+ requestLabel.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+
+ Combo requestViewerCombo = new Combo(requestHeader, SWT.DROP_DOWN | SWT.READ_ONLY);
+ data = new GridData(GridData.HORIZONTAL_ALIGN_END);
+ data.verticalSpan = 2;
+ requestViewerCombo.setLayoutData(data);
- final Label requestSizeLabel = new Label(requestHeaderLeft, SWT.NONE);
+ final Label requestSizeLabel = new Label(requestHeader, SWT.NONE);
requestSizeLabel.setText(MonitorUIPlugin.getResource("%viewSize", ""));
- requestSizeLabel.setLayoutData(new GridData(GridData.FILL_HORIZONTAL | GridData.VERTICAL_ALIGN_END));
-
- Composite requestHeaderRight = new Composite(requestHeader, SWT.NONE);
- layout = new GridLayout();
- layout.verticalSpacing = 0;
- layout.marginHeight = 0;
- layout.marginWidth = 0;
- data = new GridData(GridData.HORIZONTAL_ALIGN_END | GridData.FILL_VERTICAL);
- data.heightHint = 30;
- requestHeaderRight.setLayout(layout);
- requestHeaderRight.setLayoutData(data);
-
- Label empty2 = new Label(requestHeaderRight, SWT.NONE);
- empty2.setLayoutData(new GridData(GridData.FILL_HORIZONTAL | GridData.FILL_VERTICAL));
-
- Combo requestViewerCombo = new Combo(requestHeaderRight, SWT.DROP_DOWN | SWT.READ_ONLY);
- requestViewerCombo.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END | GridData.VERTICAL_ALIGN_END));
+ requestSizeLabel.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
// response panel
Composite response = new Composite(sashFchild, SWT.NONE);
@@ -251,51 +226,26 @@
Composite responseHeader = new Composite(response, SWT.NONE);
layout = new GridLayout();
- layout.verticalSpacing = 0;
+ layout.verticalSpacing = 1;
layout.numColumns = 2;
layout.marginHeight = 0;
layout.marginWidth = 2;
data = new GridData(GridData.FILL_HORIZONTAL | GridData.VERTICAL_ALIGN_BEGINNING);
- data.heightHint = 30;
responseHeader.setLayout(layout);
responseHeader.setLayoutData(data);
- Composite responseHeaderLeft = new Composite(responseHeader, SWT.NONE);
- layout = new GridLayout();
- layout.verticalSpacing = 2;
- layout.marginHeight = 0;
- layout.marginWidth = 0;
- data = new GridData(GridData.FILL_HORIZONTAL | GridData.FILL_VERTICAL);
- data.heightHint = 30;
- responseHeaderLeft.setLayout(layout);
- responseHeaderLeft.setLayoutData(data);
-
- Label empty3 = new Label(responseHeaderLeft, SWT.NONE);
- empty3.setLayoutData(new GridData(GridData.FILL_HORIZONTAL | GridData.FILL_VERTICAL));
-
- final Label responseLabel = new Label(responseHeaderLeft, SWT.NONE);
+ final Label responseLabel = new Label(responseHeader, SWT.NONE);
responseLabel.setText(MonitorUIPlugin.getResource("%viewResponse", ""));
- responseLabel.setLayoutData(new GridData(GridData.FILL_HORIZONTAL | GridData.VERTICAL_ALIGN_BEGINNING));
+ responseLabel.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+
+ Combo responseViewerCombo = new Combo(responseHeader, SWT.DROP_DOWN | SWT.READ_ONLY);
+ data = new GridData(GridData.HORIZONTAL_ALIGN_END);
+ data.verticalSpan = 2;
+ responseViewerCombo.setLayoutData(data);
- final Label responseSizeLabel = new Label(responseHeaderLeft, SWT.NONE);
+ final Label responseSizeLabel = new Label(responseHeader, SWT.NONE);
responseSizeLabel.setText(MonitorUIPlugin.getResource("%viewSize", ""));
- responseSizeLabel.setLayoutData(new GridData(GridData.FILL_HORIZONTAL | GridData.VERTICAL_ALIGN_END));
-
- Composite responseHeaderRight = new Composite(responseHeader, SWT.NONE);
- layout = new GridLayout();
- layout.verticalSpacing = 0;
- layout.marginHeight = 0;
- layout.marginWidth = 0;
- data = new GridData(GridData.HORIZONTAL_ALIGN_END | GridData.FILL_VERTICAL);
- data.heightHint = 30;
- responseHeaderRight.setLayout(layout);
- responseHeaderRight.setLayoutData(data);
-
- Label empty4 = new Label(responseHeaderRight, SWT.NONE);
- empty4.setLayoutData(new GridData(GridData.FILL_HORIZONTAL | GridData.FILL_VERTICAL));
-
- Combo responseViewerCombo = new Combo(responseHeaderRight, SWT.DROP_DOWN | SWT.READ_ONLY);
- responseViewerCombo.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END | GridData.VERTICAL_ALIGN_END));
+ responseSizeLabel.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
// viewer manager
vm = new ViewerManager(request, request, response, response);
