Permalink
Browse files

This commit was manufactured by cvs2svn to create tag 'v20050310'.

  • Loading branch information...
2 parents 87e26d1 + 1ff9f3a commit 087cddec55aa1e63caba065df641643aa93d58aa ndai committed Mar 29, 2005
Showing with 102 additions and 279 deletions.
  1. +0 −5 plugins/org.eclipse.jst.server.generic.modules/.cvsignore
  2. +0 −28 plugins/org.eclipse.jst.server.generic.modules/.project
  3. +1 −0 plugins/org.eclipse.wst.internet.monitor.core/component.xml
  4. +1 −1 ...eclipse.wst.internet.monitor.core/monitorcore/org/eclipse/wst/internet/monitor/core/IMonitor.java
  5. +18 −0 ...ternet.monitor.core/monitorcore/org/eclipse/wst/internet/monitor/core/internal/ContentFilter.java
  6. +1 −3 ...ernet.monitor.core/monitorcore/org/eclipse/wst/internet/monitor/core/internal/IContentFilter.java
  7. +0 −3 ...st.internet.monitor.core/monitorcore/org/eclipse/wst/internet/monitor/core/internal/IMemento.java
  8. +1 −6 ...net.monitor.core/monitorcore/org/eclipse/wst/internet/monitor/core/internal/IProtocolAdapter.java
  9. +4 −3 ...ernet.monitor.core/monitorcore/org/eclipse/wst/internet/monitor/core/internal/MonitorManager.java
  10. +5 −5 ...ternet.monitor.core/monitorcore/org/eclipse/wst/internet/monitor/core/internal/MonitorPlugin.java
  11. +1 −1 ...itor.core/monitorcore/org/eclipse/wst/internet/monitor/core/internal/ProtocolAdapterDelegate.java
  12. +39 −146 ....internet.monitor.core/monitorcore/org/eclipse/wst/internet/monitor/core/internal/XMLMemento.java
  13. +9 −6 ....monitor.core/monitorcore/org/eclipse/wst/internet/monitor/core/internal/http/HTTPConnection.java
  14. +2 −2 ...rnet.monitor.core/monitorcore/org/eclipse/wst/internet/monitor/core/internal/http/HTTPThread.java
  15. +20 −70 ....internet.monitor.ui/monitorui/org/eclipse/wst/internet/monitor/ui/internal/view/MonitorView.java
@@ -1,5 +0,0 @@
-bin
-build.xml
-commonmodules.jar
-org.eclipse.jst.server.generic.modules_1.0.0.jar
-temp.folder
@@ -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>
@@ -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>
@@ -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
@@ -25,6 +25,11 @@ protected ContentFilter(IConfigurationElement element) {
this.element = element;
}
+ /**
+ * Return the id.
+ *
+ * @return the id
+ */
public String getId() {
return element.getAttribute("id");
}
@@ -40,10 +45,23 @@ public int getOrder() {
}
}
+ /**
+ * 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 {
@@ -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>
@@ -37,9 +37,6 @@
* </p><p>
* This interface is not intended to be implemented by clients.
* </p>
- *
- * @see IPersistableElement
- * @see IElementFactory
*/
public interface IMemento {
/**
@@ -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";
@@ -157,8 +157,9 @@ public synchronized void removeMonitorListener(IMonitorListener listener) {
/**
* 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 @@ protected synchronized void loadMonitors() {
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");
@@ -80,9 +80,9 @@ public static String getResource(String key, Object[] arguments) {
* 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 @@ public String getDefaultType() {
* 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
*/
@@ -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.
Oops, something went wrong.

0 comments on commit 087cdde

Please sign in to comment.