summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2006-12-18 12:01:43 (EST)
committerEike Stepper2006-12-18 12:01:43 (EST)
commitfc4d86d41f6e5cec358eabd54c2c8aff6e2fc1cd (patch)
tree70f1caf4b1d058a01286e1741ab6bc7b3c93280c
parent8b7b50c62cfea4e4e32ea9d807fd2947fa653cd5 (diff)
downloadcdo-fc4d86d41f6e5cec358eabd54c2c8aff6e2fc1cd.zip
cdo-fc4d86d41f6e5cec358eabd54c2c8aff6e2fc1cd.tar.gz
cdo-fc4d86d41f6e5cec358eabd54c2c8aff6e2fc1cd.tar.bz2
*** empty log message ***
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/AbstractConnector.java2
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/net4j/package.html1
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/net4j/remote/package.html1
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/Connector.java18
4 files changed, 16 insertions, 6 deletions
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/AbstractConnector.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/AbstractConnector.java
index 8f0dabe..5e33e3c 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/AbstractConnector.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/AbstractConnector.java
@@ -607,7 +607,7 @@ public abstract class AbstractConnector extends AbstractLifecycle implements Con
protected abstract void registerChannelWithPeer(short channelIndex, String protocolID)
throws ConnectorException;
- private int getNextConnectorID()
+ private static int getNextConnectorID()
{
int id = nextConnectorID;
if (nextConnectorID == MAX_CONNECTOR_ID)
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/package.html b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/package.html
index 4090603..ab7a22e 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/package.html
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/package.html
@@ -1,6 +1,7 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
<html>
<head>
+<title>Package Description</title>
<!--
Copyright (c) 2004, 2005, 2006 Eike Stepper, Germany.
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/remote/package.html b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/remote/package.html
index d3b7282..9d1693d 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/remote/package.html
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/remote/package.html
@@ -1,6 +1,7 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
<html>
<head>
+<title>Package Description</title>
<!--
Copyright (c) 2004, 2005, 2006 Eike Stepper, Germany.
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/Connector.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/Connector.java
index 6426c4a..28bf96d 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/Connector.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/Connector.java
@@ -13,18 +13,24 @@ package org.eclipse.net4j.transport;
import org.eclipse.net4j.util.registry.HashMapRegistry;
import org.eclipse.net4j.util.registry.IRegistry;
+import org.eclipse.internal.net4j.transport.AbstractConnector;
+import org.eclipse.internal.net4j.transport.ChannelImpl;
+
import java.util.concurrent.ExecutorService;
/**
* One endpoint of a physical connection of arbitrary nature between two
* communicating parties. A {@link Connector} encapsulates the process of
* establishing and closing such connections and has a {@link Type} of
- * {@link Type#CLIENT FOR_CLIENTS} or {@link Type#SERVER FOR_SERVERS} with
+ * {@link Type#CLIENT} or {@link Type#SERVER} with
* respect to this process. Once a connection is established either party can
- * use its {@link Connector} to open multiple {@link Channel}s to
+ * use its connector to open multiple {@link Channel}s to
* asynchronously exchange {@link Buffer}s.
* <p>
- * This interface is <b>not</b> intended to be implemented by clients.
+ * This interface is <b>not</b> intended to be implemented by clients. Providers of
+ * connectors for new physical connection types have to subclass {@link AbstractConnector}
+ * (see {@link ChannelImpl#setConnector(AbstractConnector)}.
+ *
* <p>
*
* @author Eike Stepper
@@ -33,6 +39,8 @@ public interface Connector
{
public static final IRegistry<Integer, Connector> REGISTRY = new HashMapRegistry();
+ public Integer getID();
+
public Type getType();
public boolean isClient();
@@ -59,7 +67,7 @@ public interface Connector
public void connectAsync() throws ConnectorException;
/**
- * Blocks until <code>{@link #isConnected()} == true</code>.
+ * Blocks until <code>{@link #isConnected()} == true</code> or the given timeout expired.
* <p>
*
* @throws ConnectorException
@@ -68,7 +76,7 @@ public interface Connector
/**
* Synchronous connect. Blocks until <code>{@link #isConnected()} ==
- * true</code>.
+ * true</code> or the given timeout expired.
* <p>
*/
public boolean connect(long timeout) throws ConnectorException;