diff options
| author | Victor Roldan Betancort | 2009-05-20 19:40:21 +0000 |
|---|---|---|
| committer | Victor Roldan Betancort | 2009-05-20 19:40:21 +0000 |
| commit | 4f642ff0e03e43277eecd13ad23b547aadd1f102 (patch) | |
| tree | 209fb85ac2e107654eac8830ae112d11c1ffb9f5 /plugins | |
| parent | 8fa5aebdac03f0ecf8b959397ca291a603dbd9a2 (diff) | |
| download | cdo-4f642ff0e03e43277eecd13ad23b547aadd1f102.tar.gz cdo-4f642ff0e03e43277eecd13ad23b547aadd1f102.tar.xz cdo-4f642ff0e03e43277eecd13ad23b547aadd1f102.zip | |
[272193] [UI] Externalize Strings (Net4j)
https://bugs.eclipse.org/bugs/show_bug.cgi?id=272193
Diffstat (limited to 'plugins')
58 files changed, 514 insertions, 514 deletions
diff --git a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/Net4jDefsPackage.java b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/Net4jDefsPackage.java index 1a8b81a230..f191228954 100644 --- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/Net4jDefsPackage.java +++ b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/Net4jDefsPackage.java @@ -39,21 +39,21 @@ public interface Net4jDefsPackage extends EPackage * * @generated */ - String eNAME = "defs"; + String eNAME = "defs"; //$NON-NLS-1$ /** * The package namespace URI. <!-- begin-user-doc --> <!-- end-user-doc --> * * @generated */ - String eNS_URI = "http://www.eclipse.org/NET4J/defs/1.0.0"; + String eNS_URI = "http://www.eclipse.org/NET4J/defs/1.0.0"; //$NON-NLS-1$ /** * The package namespace name. <!-- begin-user-doc --> <!-- end-user-doc --> * * @generated */ - String eNS_PREFIX = "net4j.defs"; + String eNS_PREFIX = "net4j.defs"; //$NON-NLS-1$ /** * The singleton instance of the package. <!-- begin-user-doc --> <!-- end-user-doc --> diff --git a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/Net4jDefsFactoryImpl.java b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/Net4jDefsFactoryImpl.java index 634e921c82..93ede04c6d 100644 --- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/Net4jDefsFactoryImpl.java +++ b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/Net4jDefsFactoryImpl.java @@ -44,7 +44,7 @@ public class Net4jDefsFactoryImpl extends EFactoryImpl implements Net4jDefsFacto try { Net4jDefsFactory theNet4jDefsFactory = (Net4jDefsFactory)EPackage.Registry.INSTANCE - .getEFactory("http://www.eclipse.org/NET4J/defs/1.0.0"); + .getEFactory("http://www.eclipse.org/NET4J/defs/1.0.0"); //$NON-NLS-1$ if (theNet4jDefsFactory != null) { return theNet4jDefsFactory; @@ -92,7 +92,7 @@ public class Net4jDefsFactoryImpl extends EFactoryImpl implements Net4jDefsFacto case Net4jDefsPackage.BUFFER_POOL_DEF: return createBufferPoolDef(); default: - throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); + throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$ } } diff --git a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/Net4jDefsPackageImpl.java b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/Net4jDefsPackageImpl.java index 78c05f77ec..05ed22acf8 100644 --- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/Net4jDefsPackageImpl.java +++ b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/Net4jDefsPackageImpl.java @@ -635,89 +635,89 @@ public class Net4jDefsPackageImpl extends EPackageImpl implements Net4jDefsPacka protocolProviderDefEClass.getESuperTypes().add(theNet4jUtilDefsPackage.getDef()); // Initialize classes and features; add operations and parameters - initEClass(connectorDefEClass, ConnectorDef.class, "ConnectorDef", IS_ABSTRACT, !IS_INTERFACE, + initEClass(connectorDefEClass, ConnectorDef.class, "ConnectorDef", IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$ IS_GENERATED_INSTANCE_CLASS); - initEAttribute(getConnectorDef_UserID(), ecorePackage.getEString(), "userID", null, 0, 1, ConnectorDef.class, + initEAttribute(getConnectorDef_UserID(), ecorePackage.getEString(), "userID", null, 0, 1, ConnectorDef.class, //$NON-NLS-1$ !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getConnectorDef_BufferProvider(), this.getBufferProviderDef(), null, "bufferProvider", null, 1, 1, + initEReference(getConnectorDef_BufferProvider(), this.getBufferProviderDef(), null, "bufferProvider", null, 1, 1, //$NON-NLS-1$ ConnectorDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEReference(getConnectorDef_ExecutorService(), theNet4jUtilDefsPackage.getExecutorServiceDef(), null, - "executorService", null, 1, 1, ConnectorDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, + "executorService", null, 1, 1, ConnectorDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, //$NON-NLS-1$ IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getConnectorDef_Negotiator(), theNet4jUtilDefsPackage.getNegotiatorDef(), null, "negotiator", null, + initEReference(getConnectorDef_Negotiator(), theNet4jUtilDefsPackage.getNegotiatorDef(), null, "negotiator", null, //$NON-NLS-1$ 0, 1, ConnectorDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEReference(getConnectorDef_ClientProtocolProvider(), this.getClientProtocolFactoryDef(), null, - "clientProtocolProvider", null, 1, -1, ConnectorDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, + "clientProtocolProvider", null, 1, -1, ConnectorDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, //$NON-NLS-1$ !IS_COMPOSITE, IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEClass(clientProtocolFactoryDefEClass, ClientProtocolFactoryDef.class, "ClientProtocolFactoryDef", IS_ABSTRACT, + initEClass(clientProtocolFactoryDefEClass, ClientProtocolFactoryDef.class, "ClientProtocolFactoryDef", IS_ABSTRACT, //$NON-NLS-1$ !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEClass(tcpConnectorDefEClass, TCPConnectorDef.class, "TCPConnectorDef", !IS_ABSTRACT, !IS_INTERFACE, + initEClass(tcpConnectorDefEClass, TCPConnectorDef.class, "TCPConnectorDef", !IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$ IS_GENERATED_INSTANCE_CLASS); - initEReference(getTCPConnectorDef_TcpSelectorDef(), this.getTCPSelectorDef(), null, "tcpSelectorDef", null, 0, 1, + initEReference(getTCPConnectorDef_TcpSelectorDef(), this.getTCPSelectorDef(), null, "tcpSelectorDef", null, 0, 1, //$NON-NLS-1$ TCPConnectorDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEAttribute(getTCPConnectorDef_Host(), ecorePackage.getEString(), "host", null, 1, 1, TCPConnectorDef.class, + initEAttribute(getTCPConnectorDef_Host(), ecorePackage.getEString(), "host", null, 1, 1, TCPConnectorDef.class, //$NON-NLS-1$ !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEAttribute(getTCPConnectorDef_Port(), ecorePackage.getEInt(), "port", null, 0, 1, TCPConnectorDef.class, + initEAttribute(getTCPConnectorDef_Port(), ecorePackage.getEInt(), "port", null, 0, 1, TCPConnectorDef.class, //$NON-NLS-1$ !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEClass(acceptorDefEClass, AcceptorDef.class, "AcceptorDef", IS_ABSTRACT, !IS_INTERFACE, + initEClass(acceptorDefEClass, AcceptorDef.class, "AcceptorDef", IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$ IS_GENERATED_INSTANCE_CLASS); - initEReference(getAcceptorDef_BufferProvider(), this.getBufferPoolDef(), null, "bufferProvider", null, 0, 1, + initEReference(getAcceptorDef_BufferProvider(), this.getBufferPoolDef(), null, "bufferProvider", null, 0, 1, //$NON-NLS-1$ AcceptorDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEReference(getAcceptorDef_ExecutorService(), theNet4jUtilDefsPackage.getThreadPoolDef(), null, - "executorService", null, 0, 1, AcceptorDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, + "executorService", null, 0, 1, AcceptorDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, //$NON-NLS-1$ IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getAcceptorDef_Negotiator(), theNet4jUtilDefsPackage.getNegotiatorDef(), null, "negotiator", null, + initEReference(getAcceptorDef_Negotiator(), theNet4jUtilDefsPackage.getNegotiatorDef(), null, "negotiator", null, //$NON-NLS-1$ 0, 1, AcceptorDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEReference(getAcceptorDef_ServerProtocolProvider(), this.getServerProtocolFactoryDef(), null, - "serverProtocolProvider", null, 1, -1, AcceptorDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, + "serverProtocolProvider", null, 1, -1, AcceptorDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, //$NON-NLS-1$ !IS_COMPOSITE, IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEClass(tcpAcceptorDefEClass, TCPAcceptorDef.class, "TCPAcceptorDef", !IS_ABSTRACT, !IS_INTERFACE, + initEClass(tcpAcceptorDefEClass, TCPAcceptorDef.class, "TCPAcceptorDef", !IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$ IS_GENERATED_INSTANCE_CLASS); - initEAttribute(getTCPAcceptorDef_Host(), ecorePackage.getEString(), "host", null, 1, 1, TCPAcceptorDef.class, + initEAttribute(getTCPAcceptorDef_Host(), ecorePackage.getEString(), "host", null, 1, 1, TCPAcceptorDef.class, //$NON-NLS-1$ !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEAttribute(getTCPAcceptorDef_Port(), ecorePackage.getEInt(), "port", null, 1, 1, TCPAcceptorDef.class, + initEAttribute(getTCPAcceptorDef_Port(), ecorePackage.getEInt(), "port", null, 1, 1, TCPAcceptorDef.class, //$NON-NLS-1$ !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getTCPAcceptorDef_TcpSelectorDef(), this.getTCPSelectorDef(), null, "tcpSelectorDef", null, 1, 1, + initEReference(getTCPAcceptorDef_TcpSelectorDef(), this.getTCPSelectorDef(), null, "tcpSelectorDef", null, 1, 1, //$NON-NLS-1$ TCPAcceptorDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEClass(jvmAcceptorDefEClass, JVMAcceptorDef.class, "JVMAcceptorDef", !IS_ABSTRACT, !IS_INTERFACE, + initEClass(jvmAcceptorDefEClass, JVMAcceptorDef.class, "JVMAcceptorDef", !IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$ IS_GENERATED_INSTANCE_CLASS); - initEAttribute(getJVMAcceptorDef_Name(), ecorePackage.getEString(), "name", null, 0, 1, JVMAcceptorDef.class, + initEAttribute(getJVMAcceptorDef_Name(), ecorePackage.getEString(), "name", null, 0, 1, JVMAcceptorDef.class, //$NON-NLS-1$ !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEClass(jvmConnectorDefEClass, JVMConnectorDef.class, "JVMConnectorDef", !IS_ABSTRACT, !IS_INTERFACE, + initEClass(jvmConnectorDefEClass, JVMConnectorDef.class, "JVMConnectorDef", !IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$ IS_GENERATED_INSTANCE_CLASS); - initEAttribute(getJVMConnectorDef_Name(), ecorePackage.getEString(), "name", null, 0, 1, JVMConnectorDef.class, + initEAttribute(getJVMConnectorDef_Name(), ecorePackage.getEString(), "name", null, 0, 1, JVMConnectorDef.class, //$NON-NLS-1$ !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEClass(httpConnectorDefEClass, HTTPConnectorDef.class, "HTTPConnectorDef", !IS_ABSTRACT, !IS_INTERFACE, + initEClass(httpConnectorDefEClass, HTTPConnectorDef.class, "HTTPConnectorDef", !IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$ IS_GENERATED_INSTANCE_CLASS); - initEAttribute(getHTTPConnectorDef_Url(), ecorePackage.getEString(), "url", null, 0, 1, HTTPConnectorDef.class, + initEAttribute(getHTTPConnectorDef_Url(), ecorePackage.getEString(), "url", null, 0, 1, HTTPConnectorDef.class, //$NON-NLS-1$ !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEClass(tcpSelectorDefEClass, TCPSelectorDef.class, "TCPSelectorDef", !IS_ABSTRACT, !IS_INTERFACE, + initEClass(tcpSelectorDefEClass, TCPSelectorDef.class, "TCPSelectorDef", !IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$ IS_GENERATED_INSTANCE_CLASS); - initEClass(serverProtocolFactoryDefEClass, ServerProtocolFactoryDef.class, "ServerProtocolFactoryDef", IS_ABSTRACT, + initEClass(serverProtocolFactoryDefEClass, ServerProtocolFactoryDef.class, "ServerProtocolFactoryDef", IS_ABSTRACT, //$NON-NLS-1$ !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEClass(bufferProviderDefEClass, BufferProviderDef.class, "BufferProviderDef", IS_ABSTRACT, !IS_INTERFACE, + initEClass(bufferProviderDefEClass, BufferProviderDef.class, "BufferProviderDef", IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$ IS_GENERATED_INSTANCE_CLASS); - initEClass(bufferPoolDefEClass, BufferPoolDef.class, "BufferPoolDef", !IS_ABSTRACT, !IS_INTERFACE, + initEClass(bufferPoolDefEClass, BufferPoolDef.class, "BufferPoolDef", !IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$ IS_GENERATED_INSTANCE_CLASS); - initEClass(protocolProviderDefEClass, ProtocolProviderDef.class, "ProtocolProviderDef", IS_ABSTRACT, !IS_INTERFACE, + initEClass(protocolProviderDefEClass, ProtocolProviderDef.class, "ProtocolProviderDef", IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$ IS_GENERATED_INSTANCE_CLASS); // Create resource diff --git a/plugins/org.eclipse.net4j.examples/src/org/eclipse/net4j/examples/echo/EchoProtocol.java b/plugins/org.eclipse.net4j.examples/src/org/eclipse/net4j/examples/echo/EchoProtocol.java index 809f920490..e95d14dcae 100644 --- a/plugins/org.eclipse.net4j.examples/src/org/eclipse/net4j/examples/echo/EchoProtocol.java +++ b/plugins/org.eclipse.net4j.examples/src/org/eclipse/net4j/examples/echo/EchoProtocol.java @@ -16,7 +16,7 @@ package org.eclipse.net4j.examples.echo; */ public interface EchoProtocol { - public static final String PROTOCOL_NAME = "echo"; + public static final String PROTOCOL_NAME = "echo"; //$NON-NLS-1$ public static final short ECHO_SIGNAL = 1; } diff --git a/plugins/org.eclipse.net4j.examples/src/org/eclipse/net4j/examples/echo/client/EchoClient.java b/plugins/org.eclipse.net4j.examples/src/org/eclipse/net4j/examples/echo/client/EchoClient.java index 0b548e5120..6ef78c100e 100644 --- a/plugins/org.eclipse.net4j.examples/src/org/eclipse/net4j/examples/echo/client/EchoClient.java +++ b/plugins/org.eclipse.net4j.examples/src/org/eclipse/net4j/examples/echo/client/EchoClient.java @@ -42,16 +42,16 @@ public class EchoClient try { // Start a connector that represents the client side of a physical connection - IConnector connector = (IConnector)container.getElement("org.eclipse.net4j.connectors", "tcp", "localhost:2036"); + IConnector connector = (IConnector)container.getElement("org.eclipse.net4j.connectors", "tcp", "localhost:2036"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ // Open a virtual channel with the ECHO protocol, send an ECHO request and close the channel EchoClientProtocol protocol = new EchoClientProtocol(connector); - EchoRequest request = new EchoRequest(protocol, "My cool message"); + EchoRequest request = new EchoRequest(protocol, "My cool message"); //$NON-NLS-1$ String echo = request.send(); protocol.close(); System.out.println(); - System.out.println("ECHO: " + echo); + System.out.println("ECHO: " + echo); //$NON-NLS-1$ System.out.println(); } finally diff --git a/plugins/org.eclipse.net4j.examples/src/org/eclipse/net4j/examples/echo/server/EchoServer.java b/plugins/org.eclipse.net4j.examples/src/org/eclipse/net4j/examples/echo/server/EchoServer.java index e857e08506..92c7222d97 100644 --- a/plugins/org.eclipse.net4j.examples/src/org/eclipse/net4j/examples/echo/server/EchoServer.java +++ b/plugins/org.eclipse.net4j.examples/src/org/eclipse/net4j/examples/echo/server/EchoServer.java @@ -45,10 +45,10 @@ public class EchoServer try { // Start an acceptor - IAcceptor acceptor = (IAcceptor)container.getElement("org.eclipse.net4j.acceptors", "tcp", "0.0.0.0:2036"); - OM.LOG.info("Accepting connections: " + acceptor); + IAcceptor acceptor = (IAcceptor)container.getElement("org.eclipse.net4j.acceptors", "tcp", "0.0.0.0:2036"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + OM.LOG.info("Accepting connections: " + acceptor); //$NON-NLS-1$ - System.out.println("Press any key to shutdown"); + System.out.println("Press any key to shutdown"); //$NON-NLS-1$ while (IOUtil.IN().read() == -1) { Thread.sleep(200); diff --git a/plugins/org.eclipse.net4j.examples/src/org/eclipse/net4j/examples/transfer/UploadClientAction.java b/plugins/org.eclipse.net4j.examples/src/org/eclipse/net4j/examples/transfer/UploadClientAction.java index 7b66892b74..f9450c70f9 100644 --- a/plugins/org.eclipse.net4j.examples/src/org/eclipse/net4j/examples/transfer/UploadClientAction.java +++ b/plugins/org.eclipse.net4j.examples/src/org/eclipse/net4j/examples/transfer/UploadClientAction.java @@ -59,7 +59,7 @@ public class UploadClientAction implements IWorkbenchWindowActionDelegate, Uploa if (path != null) { final File file = new File(path); - new Job("Uploading file") + new Job("Uploading file") //$NON-NLS-1$ { @Override protected IStatus run(IProgressMonitor monitor) @@ -67,7 +67,7 @@ public class UploadClientAction implements IWorkbenchWindowActionDelegate, Uploa try { boolean replaced = transferFile(file, monitor); - OM.LOG.info("File " + path + (replaced ? " replaced" : " stored") + " on the Net4j server."); + OM.LOG.info("File " + path + (replaced ? " replaced" : " stored") + " on the Net4j server."); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ return Status.OK_STATUS; } catch (MonitorCanceledException ex) @@ -76,7 +76,7 @@ public class UploadClientAction implements IWorkbenchWindowActionDelegate, Uploa } catch (Exception ex) { - return new Status(IStatus.ERROR, OM.BUNDLE_ID, "Problem with upload of " + path, ex); + return new Status(IStatus.ERROR, OM.BUNDLE_ID, "Problem with upload of " + path, ex); //$NON-NLS-1$ } finally { @@ -102,8 +102,8 @@ public class UploadClientAction implements IWorkbenchWindowActionDelegate, Uploa try { // Start a connector that represents the client side of a physical connection - IConnector connector = (IConnector)IPluginContainer.INSTANCE.getElement("org.eclipse.net4j.connectors", "tcp", - "localhost:2036"); + IConnector connector = (IConnector)IPluginContainer.INSTANCE.getElement("org.eclipse.net4j.connectors", "tcp", //$NON-NLS-1$ //$NON-NLS-2$ + "localhost:2036"); //$NON-NLS-1$ // Open a virtual channel with the ECHO protocol, send an ECHO request and close the channel protocol = new SignalProtocol<Object>(PROTOCOL_NAME); diff --git a/plugins/org.eclipse.net4j.examples/src/org/eclipse/net4j/examples/transfer/UploadProtocol.java b/plugins/org.eclipse.net4j.examples/src/org/eclipse/net4j/examples/transfer/UploadProtocol.java index da243ca831..e45ce68eb8 100644 --- a/plugins/org.eclipse.net4j.examples/src/org/eclipse/net4j/examples/transfer/UploadProtocol.java +++ b/plugins/org.eclipse.net4j.examples/src/org/eclipse/net4j/examples/transfer/UploadProtocol.java @@ -16,7 +16,7 @@ package org.eclipse.net4j.examples.transfer; */ public interface UploadProtocol { - public static final String PROTOCOL_NAME = "upload"; + public static final String PROTOCOL_NAME = "upload"; //$NON-NLS-1$ public static final short UPLOAD_SIGNAL_ID = 1; diff --git a/plugins/org.eclipse.net4j.examples/src/org/eclipse/net4j/examples/transfer/UploadServer.java b/plugins/org.eclipse.net4j.examples/src/org/eclipse/net4j/examples/transfer/UploadServer.java index 611f5bea63..94a4fbb6a9 100644 --- a/plugins/org.eclipse.net4j.examples/src/org/eclipse/net4j/examples/transfer/UploadServer.java +++ b/plugins/org.eclipse.net4j.examples/src/org/eclipse/net4j/examples/transfer/UploadServer.java @@ -40,7 +40,7 @@ import java.io.FileOutputStream; */ public class UploadServer implements UploadProtocol { - public static final String FOLDER_NAME = "/temp"; + public static final String FOLDER_NAME = "/temp"; //$NON-NLS-1$ public static void main(String[] args) throws Exception { @@ -59,13 +59,13 @@ public class UploadServer implements UploadProtocol try { // Start an acceptor - IAcceptor acceptor = (IAcceptor)container.getElement("org.eclipse.net4j.acceptors", "tcp", "0.0.0.0:2036"); - OM.LOG.info("Accepting connections: " + acceptor); + IAcceptor acceptor = (IAcceptor)container.getElement("org.eclipse.net4j.acceptors", "tcp", "0.0.0.0:2036"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + OM.LOG.info("Accepting connections: " + acceptor); //$NON-NLS-1$ new File(FOLDER_NAME).mkdirs(); - OM.LOG.info("Upload folder: " + FOLDER_NAME); + OM.LOG.info("Upload folder: " + FOLDER_NAME); //$NON-NLS-1$ - System.out.println("Press any key to shutdown"); + System.out.println("Press any key to shutdown"); //$NON-NLS-1$ while (System.in.read() == -1) { Thread.sleep(200); @@ -126,7 +126,7 @@ public class UploadServer implements UploadProtocol String fileName = in.readString(); File file = new File(FOLDER_NAME, fileName); replaced = file.exists(); - System.out.println((replaced ? "Replacing " : "Storing ") + file.getAbsolutePath()); + System.out.println((replaced ? "Replacing " : "Storing ") + file.getAbsolutePath()); //$NON-NLS-1$ //$NON-NLS-2$ monitor.begin((int)size); BufferedOutputStream out = null; diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/AbstractTransportTest.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/AbstractTransportTest.java index 09371fab99..5f1f79bfbf 100644 --- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/AbstractTransportTest.java +++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/AbstractTransportTest.java @@ -25,7 +25,7 @@ import org.eclipse.net4j.util.tests.AbstractOMTest; */ public abstract class AbstractTransportTest extends AbstractOMTest { - protected static final String HOST = "localhost"; + protected static final String HOST = "localhost"; //$NON-NLS-1$ protected IManagedContainer container; @@ -89,7 +89,7 @@ public abstract class AbstractTransportTest extends AbstractOMTest { if (useJVMTransport()) { - acceptor = JVMUtil.getAcceptor(container, "default"); + acceptor = JVMUtil.getAcceptor(container, "default"); //$NON-NLS-1$ } else { @@ -106,7 +106,7 @@ public abstract class AbstractTransportTest extends AbstractOMTest { if (useJVMTransport()) { - connector = JVMUtil.getConnector(container, "default"); + connector = JVMUtil.getConnector(container, "default"); //$NON-NLS-1$ } else { @@ -143,12 +143,12 @@ public abstract class AbstractTransportTest extends AbstractOMTest protected void restartContainer() throws Exception { - msg("RESTARTING CONTAINER"); + msg("RESTARTING CONTAINER"); //$NON-NLS-1$ stopTransport(); LifecycleUtil.deactivate(container); container = createContainer(); LifecycleUtil.activate(container); startTransport(); - msg("RESTARTING CONTAINER - FINISHED"); + msg("RESTARTING CONTAINER - FINISHED"); //$NON-NLS-1$ } } diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/AllTests.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/AllTests.java index 14c39ca4b6..194719bc9d 100644 --- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/AllTests.java +++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/AllTests.java @@ -28,7 +28,7 @@ public class AllTests { public static Test suite() { - TestSuite suite = new TestSuite("Tests for Net4j"); + TestSuite suite = new TestSuite("Tests for Net4j"); //$NON-NLS-1$ suite.addTestSuite(MultiMapTest.class); suite.addTestSuite(SortedFileMapTest.class); suite.addTestSuite(SynchronizingCorrelatorTest.class); diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/BufferPoolTest.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/BufferPoolTest.java index ac502c82ea..b230c59492 100644 --- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/BufferPoolTest.java +++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/BufferPoolTest.java @@ -64,14 +64,14 @@ public class BufferPoolTest extends AbstractOMTest private static void msg() { - msg("pooledBuffers = " + Net4jUtil.getPooledBuffers(bufferPool)); + msg("pooledBuffers = " + Net4jUtil.getPooledBuffers(bufferPool)); //$NON-NLS-1$ } private static boolean allocate() { try { - IOUtil.OUT().println("allocating from " + Runtime.getRuntime().freeMemory()); + IOUtil.OUT().println("allocating from " + Runtime.getRuntime().freeMemory()); //$NON-NLS-1$ for (int i = 0; i < 10; i++) { memory.add(new byte[1000000]); @@ -90,7 +90,7 @@ public class BufferPoolTest extends AbstractOMTest private static void gc() { msg(); - IOUtil.OUT().println("collecting garbage"); + IOUtil.OUT().println("collecting garbage"); //$NON-NLS-1$ System.gc(); msg(); } diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/ChannelTest.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/ChannelTest.java index ede3f82002..a581f68801 100644 --- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/ChannelTest.java +++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/ChannelTest.java @@ -97,7 +97,7 @@ public abstract class ChannelTest extends AbstractProtocolTest disableConsole(); for (int i = 0; i < 100; i++) { - IOUtil.OUT().println(Thread.currentThread().getName() + ": " + i); + IOUtil.OUT().println(Thread.currentThread().getName() + ": " + i); //$NON-NLS-1$ testSingleThreadNoData(); } } @@ -120,7 +120,7 @@ public abstract class ChannelTest extends AbstractProtocolTest disableConsole(); for (int i = 0; i < 100; i++) { - IOUtil.OUT().println(Thread.currentThread().getName() + ": " + i); + IOUtil.OUT().println(Thread.currentThread().getName() + ": " + i); //$NON-NLS-1$ testSingleThreadTinyData(); } } @@ -130,14 +130,14 @@ public abstract class ChannelTest extends AbstractProtocolTest MultiThreadMonitor threadMonitor = new MultiThreadMonitor(TIMEOUT); for (int i = 0; i < THREADS; i++) { - threadMonitor.addThread(new MonitoredThread("TEST-THREAD-" + i, threadMonitor) + threadMonitor.addThread(new MonitoredThread("TEST-THREAD-" + i, threadMonitor) //$NON-NLS-1$ { @Override protected void doRun() throws Exception { for (int i = 0; i < 100; i++) { - IOUtil.OUT().println(Thread.currentThread().getName() + ": " + i); + IOUtil.OUT().println(Thread.currentThread().getName() + ": " + i); //$NON-NLS-1$ TestSignalProtocol protocol = openTestSignalProtocol(); assertActive(protocol); @@ -160,14 +160,14 @@ public abstract class ChannelTest extends AbstractProtocolTest for (int i = 0; i < THREADS; i++) { - threadMonitor.addThread(new MonitoredThread("TEST-THREAD-" + i, threadMonitor) + threadMonitor.addThread(new MonitoredThread("TEST-THREAD-" + i, threadMonitor) //$NON-NLS-1$ { @Override protected void doRun() throws Exception { for (int i = 0; i < 100; i++) { - IOUtil.OUT().println(Thread.currentThread().getName() + ": " + i); + IOUtil.OUT().println(Thread.currentThread().getName() + ": " + i); //$NON-NLS-1$ TestSignalProtocol protocol = openTestSignalProtocol(); assertActive(protocol); heartBeat(); @@ -195,7 +195,7 @@ public abstract class ChannelTest extends AbstractProtocolTest MultiThreadMonitor threadMonitor = new MultiThreadMonitor(TIMEOUT, 10L); for (int i = 0; i < THREADS; i++) { - threadMonitor.addThread(new MonitoredThread("TEST-THREAD-" + i, threadMonitor) + threadMonitor.addThread(new MonitoredThread("TEST-THREAD-" + i, threadMonitor) //$NON-NLS-1$ { @Override protected void doRun() throws Exception @@ -219,7 +219,7 @@ public abstract class ChannelTest extends AbstractProtocolTest protocol.close(); assertInactive(protocol); long stop = System.currentTimeMillis(); - IOUtil.OUT().println(Thread.currentThread().getName() + ": " + i + " (" + (stop - start) + ")"); + IOUtil.OUT().println(Thread.currentThread().getName() + ": " + i + " (" + (stop - start) + ")"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ } } }); diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/ExceptionTest.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/ExceptionTest.java index 77ce55ee53..5d7d4723d0 100644 --- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/ExceptionTest.java +++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/ExceptionTest.java @@ -77,7 +77,7 @@ public class ExceptionTest extends AbstractProtocolTest try { new ExceptionRequest(protocol, phase, ioProblem).send(); - fail("Exception expected"); + fail("Exception expected"); //$NON-NLS-1$ } catch (Exception ex) { @@ -94,7 +94,7 @@ public class ExceptionTest extends AbstractProtocolTest } else { - fail("RemoteException expected"); + fail("RemoteException expected"); //$NON-NLS-1$ } } else @@ -116,7 +116,7 @@ public class ExceptionTest extends AbstractProtocolTest } else { - fail("RemoteException expected"); + fail("RemoteException expected"); //$NON-NLS-1$ } } else diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/HugeData.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/HugeData.java index b64bb3fcbd..d3f7b8b29e 100644 --- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/HugeData.java +++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/HugeData.java @@ -17,7 +17,7 @@ import java.util.StringTokenizer; */ public final class HugeData { - public static final String NL = System.getProperty("line.separator"); + public static final String NL = System.getProperty("line.separator"); //$NON-NLS-1$ public static StringTokenizer getTokenizer() { @@ -36,210 +36,210 @@ public final class HugeData public static String getText() { - return "/**" + NL - + " * COPYRIGHT (C) 2004 - 2008 EIKE STEPPER, GERMANY." + NL - + " * ALL RIGHTS RESERVED. THIS PROGRAM AND THE ACCOMPANYING MATERIALS" + NL - + " * ARE MADE AVAILABLE UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE V1.0" + NL - + " * WHICH ACCOMPANIES THIS DISTRIBUTION, AND IS AVAILABLE AT" + NL - + " * HTTP://WWW.ECLIPSE.ORG/LEGAL/EPL-V10.HTML" + NL + " * " + NL + " * CONTRIBUTORS:" + NL - + " * EIKE STEPPER - INITIAL API AND IMPLEMENTATION" + NL - + " */" + NL - + "PACKAGE ORG.ECLIPSE.INTERNAL.NET4J.TRANSPORT.CONNECTOR;" + NL + "" + NL - + "IMPORT ORG.ECLIPSE.NET4J.TRANSPORT.BUFFER.BUFFERPROVIDER;" + NL - + "IMPORT ORG.ECLIPSE.NET4J.TRANSPORT.CHANNEL.CHANNEL;" + NL - + "IMPORT ORG.ECLIPSE.NET4J.TRANSPORT.CHANNEL.MULTIPLEXER;" + NL - + "IMPORT ORG.ECLIPSE.NET4J.TRANSPORT.CONNECTOR.CONNECTOR;" + NL - + "IMPORT ORG.ECLIPSE.NET4J.TRANSPORT.CONNECTOR.CONNECTOREXCEPTION;" + NL - + "IMPORT ORG.ECLIPSE.NET4J.TRANSPORT.CONNECTOR.CREDENTIALS;" + NL - + "IMPORT ORG.ECLIPSE.NET4J.TRANSPORT.CONNECTOR.PROTOCOL;" + NL - + "IMPORT ORG.ECLIPSE.NET4J.TRANSPORT.CONNECTOR.PROTOCOLFACTORY;" + NL - + "IMPORT ORG.ECLIPSE.NET4J.UTIL.LIFECYCLE.LIFECYCLELISTENER;" + NL - + "IMPORT ORG.ECLIPSE.NET4J.UTIL.LIFECYCLE.LIFECYCLENOTIFIER;" + NL - + "IMPORT ORG.ECLIPSE.NET4J.UTIL.REGISTRY.IREGISTRY;" + NL + "" + NL - + "IMPORT ORG.ECLIPSE.INTERNAL.NET4J.TRANSPORT.CHANNEL.CHANNELIMPL;" + NL - + "IMPORT ORG.ECLIPSE.INTERNAL.NET4J.UTIL.STREAM.BUFFERQUEUE;" + NL - + "IMPORT ORG.ECLIPSE.INTERNAL.NET4J.UTIL.LIFECYCLE.ABSTRACTCOMPONENT;" + NL - + "IMPORT ORG.ECLIPSE.INTERNAL.NET4J.UTIL.LIFECYCLE.LIFECYCLEUTIL;" + NL + "" + NL - + "IMPORT JAVA.UTIL.ARRAYLIST;" + NL + "IMPORT JAVA.UTIL.LIST;" + NL + "IMPORT JAVA.UTIL.QUEUE;" + NL - + "IMPORT JAVA.UTIL.CONCURRENT.CONCURRENTLINKEDQUEUE;" + NL + "IMPORT JAVA.UTIL.CONCURRENT.COUNTDOWNLATCH;" - + NL + "IMPORT JAVA.UTIL.CONCURRENT.EXECUTORSERVICE;" + NL + "IMPORT JAVA.UTIL.CONCURRENT.TIMEUNIT;" + NL + "" - + NL + "/**" + NL + " * @AUTHOR EIKE STEPPER" + NL + " */" + NL - + "PUBLIC ABSTRACT CLASS ABSTRACTCONNECTOR EXTENDS ABSTRACTLIFECYCLE IMPLEMENTS CONNECTOR, CHANNELMULTIPLEXER" - + NL + "{" + NL + " PRIVATE STATIC FINAL CHANNELIMPL NULL_CHANNEL = NEW CHANNELIMPL(NULL);" + NL + "" + NL - + " PRIVATE CONNECTORCREDENTIALS CREDENTIALS;" + NL + "" + NL - + " PRIVATE IREGISTRY<STRING, PROTOCOLFACTORY> PROTOCOLFACTORYREGISTRY;" + NL + "" + NL - + " PRIVATE BUFFERPROVIDER BUFFERPROVIDER;" + NL + "" + NL + " /**" + NL - + " * AN OPTIONAL EXECUTOR TO BE USED BY THE {@LINK CHANNEL}S TO PROCESS THEIR" + NL - + " * {@LINK CHANNELIMPL#RECEIVEQUEUE} INSTEAD OF THE CURRENT THREAD. IF NOT" + NL - + " * <CODE>NULL</CODE> THE SENDER AND THE RECEIVER PEERS BECOME DECOUPLED." + NL + " * <P>" + NL + " */" - + NL + " PRIVATE EXECUTORSERVICE RECEIVEEXECUTOR;" + NL + "" + NL + " /**" + NL - + " * TODO SYNCHRONIZE ON CHANNELS?" + NL + " */" + NL - + " PRIVATE LIST<CHANNELIMPL> CHANNELS = NEW ARRAYLIST();" + NL + "" + NL - + " PRIVATE STATE STATE = STATE.DISCONNECTED;" + NL + "" + NL + " /**" + NL - + " * DON\'T INITIALIZE LAZILY TO CIRCUMVENT SYNCHRONIZATION!" + NL + " */" + NL - + " PRIVATE QUEUE<STATELISTENER> STATELISTENERS = NEW CONCURRENTLINKEDQUEUE();" + NL + "" + NL + " /**" + NL - + " * DON\'T INITIALIZE LAZILY TO CIRCUMVENT SYNCHRONIZATION!" + NL + " */" + NL - + " PRIVATE QUEUE<CHANNELLISTENER> CHANNELLISTENERS = NEW CONCURRENTLINKEDQUEUE();" + NL + "" + NL + " /**" - + NL + " * IS REGISTERED WITH EACH {@LINK CHANNEL} OF THIS {@LINK CONNECTOR}." + NL + " * <P>" + NL - + " */" + NL + " PRIVATE LIFECYCLELISTENER CHANNELLIFECYCLELISTENER = NEW CHANNELLIFECYCLELISTENER();" + NL - + "" + NL + " PRIVATE COUNTDOWNLATCH FINISHEDCONNECTING;" + NL + "" + NL - + " PRIVATE COUNTDOWNLATCH FINISHEDNEGOTIATING;" + NL + "" + NL + " PUBLIC ABSTRACTCONNECTOR()" + NL + " {" - + NL + " }" + NL + "" + NL + " PUBLIC EXECUTORSERVICE GETRECEIVEEXECUTOR()" + NL + " {" + NL - + " RETURN RECEIVEEXECUTOR;" + NL + " }" + NL + "" + NL - + " PUBLIC VOID SETRECEIVEEXECUTOR(EXECUTORSERVICE RECEIVEEXECUTOR)" + NL + " {" + NL - + " THIS.RECEIVEEXECUTOR = RECEIVEEXECUTOR;" + NL + " }" + NL + "" + NL - + " PUBLIC IREGISTRY<STRING, PROTOCOLFACTORY> GETPROTOCOLFACTORYREGISTRY()" + NL + " {" + NL - + " RETURN PROTOCOLFACTORYREGISTRY;" + NL + " }" + NL + "" + NL - + " PUBLIC VOID SETPROTOCOLFACTORYREGISTRY(IREGISTRY<STRING, PROTOCOLFACTORY> PROTOCOLFACTORYREGISTRY)" + NL - + " {" + NL + " THIS.PROTOCOLFACTORYREGISTRY = PROTOCOLFACTORYREGISTRY;" + NL + " }" + NL + "" + NL - + " PUBLIC VOID ADDSTATELISTENER(STATELISTENER LISTENER)" + NL + " {" + NL - + " STATELISTENERS.ADD(LISTENER);" + NL + " }" + NL + "" + NL - + " PUBLIC VOID REMOVESTATELISTENER(STATELISTENER LISTENER)" + NL + " {" + NL - + " STATELISTENERS.REMOVE(LISTENER);" + NL + " }" + NL + "" + NL - + " PUBLIC VOID ADDCHANNELLISTENER(CHANNELLISTENER LISTENER)" + NL + " {" + NL - + " CHANNELLISTENERS.ADD(LISTENER);" + NL + " }" + NL + "" + NL - + " PUBLIC VOID REMOVECHANNELLISTENER(CHANNELLISTENER LISTENER)" + NL + " {" + NL - + " CHANNELLISTENERS.REMOVE(LISTENER);" + NL + " }" + NL + "" + NL - + " PUBLIC BUFFERPROVIDER GETBUFFERPROVIDER()" + NL + " {" + NL + " RETURN BUFFERPROVIDER;" + NL + " }" - + NL + "" + NL + " PUBLIC VOID SETBUFFERPROVIDER(BUFFERPROVIDER BUFFERPROVIDER)" + NL + " {" + NL - + " THIS.BUFFERPROVIDER = BUFFERPROVIDER;" + NL + " }" + NL + "" + NL + " PUBLIC BOOLEAN ISCLIENT()" + NL - + " {" + NL + " RETURN GETTYPE() == TYPE.CLIENT;" + NL + " }" + NL + "" + NL - + " PUBLIC BOOLEAN ISSERVER()" + NL + " {" + NL + " RETURN GETTYPE() == TYPE.SERVER;" + NL + " }" + NL - + "" + NL + " PUBLIC CONNECTORCREDENTIALS GETCREDENTIALS()" + NL + " {" + NL + " RETURN CREDENTIALS;" + NL - + " }" + NL + "" + NL + " PUBLIC VOID SETCREDENTIALS(CONNECTORCREDENTIALS CREDENTIALS)" + NL + " {" + NL - + " THIS.CREDENTIALS = CREDENTIALS;" + NL + " }" + NL + "" + NL + " PUBLIC STATE GETSTATE()" + NL + " {" - + NL + " RETURN STATE;" + NL + " }" + NL + "" + NL - + " PUBLIC VOID SETSTATE(STATE NEWSTATE) THROWS CONNECTOREXCEPTION" + NL + " {" + NL - + " STATE OLDSTATE = GETSTATE();" + NL + " IF (NEWSTATE != OLDSTATE)" + NL + " {" + NL - + " IOUTIL.OUT().PRINTLN(TOSTRING() + \": SETTING STATE \" + NEWSTATE + \" (WAS \"" + NL - + " + OLDSTATE.TOSTRING().TOLOWERCASE() + \")\");" + NL + " STATE = NEWSTATE;" + NL - + " FIRESTATECHANGED(NEWSTATE, OLDSTATE);" + NL + "" + NL + " SWITCH (NEWSTATE)" + NL + " {" - + NL + " CASE DISCONNECTED:" + NL + " IF (FINISHEDCONNECTING != NULL)" + NL + " {" + NL - + " FINISHEDCONNECTING.COUNTDOWN();" + NL + " FINISHEDCONNECTING = NULL;" + NL + " }" - + NL + "" + NL + " IF (FINISHEDNEGOTIATING != NULL)" + NL + " {" + NL - + " FINISHEDNEGOTIATING.COUNTDOWN();" + NL + " FINISHEDNEGOTIATING = NULL;" + NL - + " }" + NL + " BREAK;" + NL + "" + NL + " CASE CONNECTING:" + NL - + " FINISHEDCONNECTING = NEW COUNTDOWNLATCH(1);" + NL - + " FINISHEDNEGOTIATING = NEW COUNTDOWNLATCH(1);" + NL + " IF (GETTYPE() == TYPE.SERVER)" + NL - + " {" + NL + " SETSTATE(STATE.NEGOTIATING);" + NL + " }" + NL + " BREAK;" + NL - + "" + NL + " CASE NEGOTIATING:" + NL + " FINISHEDCONNECTING.COUNTDOWN();" + NL - + " SETSTATE(STATE.CONNECTED); // TODO IMPLEMENT NEGOTIATION" + NL + " BREAK;" + NL + "" + NL - + " CASE CONNECTED:" + NL + " FINISHEDCONNECTING.COUNTDOWN(); // JUST IN CASE OF SUSPICION" + NL - + " FINISHEDNEGOTIATING.COUNTDOWN();" + NL + " BREAK;" + NL + "" + NL + " }" + NL + " }" - + NL + " }" + NL + "" + NL + " PUBLIC BOOLEAN ISCONNECTED()" + NL + " {" + NL - + " RETURN GETSTATE() == STATE.CONNECTED;" + NL + " }" + NL + "" + NL - + " PUBLIC VOID CONNECTASYNC() THROWS CONNECTOREXCEPTION" + NL + " {" + NL + " TRY" + NL + " {" + NL - + " ACTIVATE();" + NL + " }" + NL + " CATCH (CONNECTOREXCEPTION EX)" + NL + " {" + NL - + " THROW EX;" + NL + " }" + NL + " CATCH (EXCEPTION EX)" + NL + " {" + NL - + " THROW NEW CONNECTOREXCEPTION(EX);" + NL + " }" + NL + " }" + NL + "" + NL - + " PUBLIC BOOLEAN WAITFORCONNECTION(LONG TIMEOUT) THROWS CONNECTOREXCEPTION" + NL + " {" + NL - + " STATE STATE = GETSTATE();" + NL + " IF (STATE == STATE.DISCONNECTED)" + NL + " {" + NL - + " RETURN FALSE;" + NL + " }" + NL + "" + NL + " TRY" + NL + " {" + NL - + " IOUTIL.OUT().PRINTLN(TOSTRING() + \": WAITING FOR CONNECTION...\");" + NL - + " RETURN FINISHEDNEGOTIATING.AWAIT(TIMEOUT, TIMEUNIT.MILLISECONDS);" + NL + " }" + NL - + " CATCH (INTERRUPTEDEXCEPTION EX)" + NL + " {" + NL + " RETURN FALSE;" + NL + " }" + NL + " }" - + NL + "" + NL + " PUBLIC BOOLEAN CONNECT(LONG TIMEOUT) THROWS CONNECTOREXCEPTION" + NL + " {" + NL - + " CONNECTASYNC();" + NL + " RETURN WAITFORCONNECTION(TIMEOUT);" + NL + " }" + NL + "" + NL - + " PUBLIC CONNECTOREXCEPTION DISCONNECT()" + NL + " {" + NL + " EXCEPTION EX = DEACTIVATE();" + NL - + " IF (EX == NULL)" + NL + " {" + NL + " RETURN NULL;" + NL + " }" + NL + "" + NL - + " IF (EX INSTANCEOF CONNECTOREXCEPTION)" + NL + " {" + NL + " RETURN (CONNECTOREXCEPTION)EX;" + NL - + " }" + NL + "" + NL + " RETURN NEW CONNECTOREXCEPTION(EX);" + NL + " }" + NL + "" + NL - + " PUBLIC CHANNEL[] GETCHANNELS()" + NL + " {" + NL - + " FINAL LIST<CHANNEL> RESULT = NEW ARRAYLIST<CHANNEL>();" + NL + " SYNCHRONIZED (CHANNELS)" + NL - + " {" + NL + " FOR (FINAL CHANNELIMPL CHANNEL : CHANNELS)" + NL + " {" + NL - + " IF (CHANNEL != NULL_CHANNEL)" + NL + " {" + NL + " RESULT.ADD(CHANNEL);" + NL - + " }" + NL + " }" + NL + " }" + NL + "" + NL - + " RETURN RESULT.TOARRAY(NEW CHANNEL[RESULT.SIZE()]);" + NL + " }" + NL + "" + NL - + " PUBLIC CHANNEL OPENCHANNEL() THROWS CONNECTOREXCEPTION" + NL + " {" + NL - + " RETURN OPENCHANNEL(NULL);" + NL + " }" + NL + "" + NL - + " PUBLIC CHANNEL OPENCHANNEL(STRING PROTOCOLID) THROWS CONNECTOREXCEPTION" + NL + " {" + NL - + " SHORT CHANNELINDEX = FINDFREECHANNELINDEX();" + NL - + " CHANNELIMPL CHANNEL = CREATECHANNEL(CHANNELINDEX, PROTOCOLID);" + NL - + " REGISTERCHANNELWITHPEER(CHANNELINDEX, PROTOCOLID);" + NL + "" + NL + " TRY" + NL + " {" + NL - + " CHANNEL.ACTIVATE();" + NL + " }" + NL + " CATCH (CONNECTOREXCEPTION EX)" + NL + " {" + NL - + " THROW EX;" + NL + " }" + NL + " CATCH (EXCEPTION EX)" + NL + " {" + NL - + " THROW NEW CONNECTOREXCEPTION(EX);" + NL + " }" + NL + "" + NL + " RETURN CHANNEL;" + NL + " }" - + NL + "" + NL + " PUBLIC CHANNELIMPL CREATECHANNEL(SHORT CHANNELINDEX, STRING PROTOCOLID)" + NL + " {" + NL - + " PROTOCOL PROTOCOL = CREATEPROTOCOL(PROTOCOLID);" + NL + " IF (PROTOCOL == NULL)" + NL + " {" + NL - + " IOUTIL.OUT().PRINTLN(TOSTRING() + \": OPENING CHANNEL WITHOUT PROTOCOL\");" + NL + " }" + NL - + " ELSE" + NL + " {" + NL - + " IOUTIL.OUT().PRINTLN(TOSTRING() + \": OPENING CHANNEL WITH PROTOCOL \" + PROTOCOLID);" + NL + " }" - + NL + "" + NL + " CHANNELIMPL CHANNEL = NEW CHANNELIMPL(RECEIVEEXECUTOR);" + NL - + " CHANNEL.SETCHANNELINDEX(CHANNELINDEX);" + NL + " CHANNEL.SETMULTIPLEXER(THIS);" + NL - + " CHANNEL.SETRECEIVEHANDLER(PROTOCOL);" + NL - + " CHANNEL.ADDLIFECYCLELISTENER(CHANNELLIFECYCLELISTENER);" + NL + " ADDCHANNEL(CHANNEL);" + NL - + " RETURN CHANNEL;" + NL + " }" + NL + "" + NL + " PUBLIC CHANNELIMPL GETCHANNEL(SHORT CHANNELINDEX)" - + NL + " {" + NL + " TRY" + NL + " {" + NL + " CHANNELIMPL CHANNEL = CHANNELS.GET(CHANNELINDEX);" - + NL + " IF (CHANNEL == NULL || CHANNEL == NULL_CHANNEL)" + NL + " {" + NL - + " THROW NEW NULLPOINTEREXCEPTION();" + NL + " }" + NL + "" + NL + " RETURN CHANNEL;" + NL - + " }" + NL + " CATCH (INDEXOUTOFBOUNDSEXCEPTION EX)" + NL + " {" + NL - + " IOUTIL.OUT().PRINTLN(TOSTRING() + \": INVALID CHANNELINDEX \" + CHANNELINDEX);" + NL - + " RETURN NULL;" + NL + " }" + NL + " }" + NL + "" + NL - + " PROTECTED LIST<BUFFERQUEUE> GETCHANNELBUFFERQUEUES()" + NL + " {" + NL - + " FINAL LIST<BUFFERQUEUE> RESULT = NEW ARRAYLIST<BUFFERQUEUE>();" + NL + " SYNCHRONIZED (CHANNELS)" - + NL + " {" + NL + " FOR (FINAL CHANNELIMPL CHANNEL : CHANNELS)" + NL + " {" + NL - + " IF (CHANNEL != NULL_CHANNEL)" + NL + " {" + NL - + " BUFFERQUEUE BUFFERQUEUE = CHANNEL.GETSENDQUEUE();" + NL + " RESULT.ADD(BUFFERQUEUE);" - + NL + " }" + NL + " }" + NL + " }" + NL + "" + NL + " RETURN RESULT;" + NL + " }" + NL + "" - + NL + " PROTECTED SHORT FINDFREECHANNELINDEX()" + NL + " {" + NL + " SYNCHRONIZED (CHANNELS)" + NL - + " {" + NL + " INT SIZE = CHANNELS.SIZE();" + NL + " FOR (SHORT I = 0; I < SIZE; I++)" + NL - + " {" + NL + " IF (CHANNELS.GET(I) == NULL_CHANNEL)" + NL + " {" + NL - + " RETURN I;" + NL + " }" + NL + " }" + NL + "" + NL - + " CHANNELS.ADD(NULL_CHANNEL);" + NL + " RETURN (SHORT)SIZE;" + NL + " }" + NL + " }" + NL + "" - + NL + " PROTECTED VOID ADDCHANNEL(CHANNELIMPL CHANNEL)" + NL + " {" + NL - + " SHORT CHANNELINDEX = CHANNEL.GETCHANNELINDEX();" + NL + " WHILE (CHANNELINDEX >= CHANNELS.SIZE())" - + NL + " {" + NL + " CHANNELS.ADD(NULL_CHANNEL);" + NL + " }" + NL + "" + NL - + " CHANNELS.SET(CHANNELINDEX, CHANNEL);" + NL + " }" + NL + "" + NL - + " PROTECTED VOID REMOVECHANNEL(CHANNELIMPL CHANNEL)" + NL + " {" + NL - + " CHANNEL.REMOVELIFECYCLELISTENER(CHANNELLIFECYCLELISTENER);" + NL - + " INT CHANNELINDEX = CHANNEL.GETCHANNELINDEX();" + NL + "" + NL - + " IOUTIL.OUT().PRINTLN(TOSTRING() + \": REMOVING CHANNEL \" + CHANNELINDEX);" + NL - + " CHANNELS.SET(CHANNELINDEX, NULL_CHANNEL);" + NL + " }" + NL + "" + NL - + " PROTECTED PROTOCOL CREATEPROTOCOL(STRING PROTOCOLID)" + NL + " {" + NL - + " IF (PROTOCOLID == NULL || PROTOCOLID.LENGTH() == 0)" + NL + " {" + NL + " RETURN NULL;" + NL - + " }" + NL + "" + NL + " IREGISTRY<STRING, PROTOCOLFACTORY> REGISTRY = GETPROTOCOLFACTORYREGISTRY();" - + NL + " IF (REGISTRY == NULL)" + NL + " {" + NL + " RETURN NULL;" + NL + " }" + NL + "" + NL - + " PROTOCOLFACTORY FACTORY = REGISTRY.LOOKUP(PROTOCOLID);" + NL + " IF (FACTORY == NULL)" + NL + " {" - + NL + " RETURN NULL;" + NL + " }" + NL + "" + NL - + " IOUTIL.OUT().PRINTLN(TOSTRING() + \": CREATING PROTOCOL \" + PROTOCOLID);" + NL - + " RETURN FACTORY.CREATEPROTOCOL();" + NL + " }" + NL + "" + NL - + " PROTECTED VOID FIRECHANNELOPENED(CHANNEL CHANNEL)" + NL + " {" + NL - + " FOR (CHANNELLISTENER LISTENER : CHANNELLISTENERS)" + NL + " {" + NL + " TRY" + NL + " {" - + NL + " LISTENER.NOTIFYCHANNELOPENED(CHANNEL);" + NL + " }" + NL + " CATCH (EXCEPTION EX)" - + NL + " {" + NL + " EX.PRINTSTACKTRACE();" + NL + " }" + NL + " }" + NL + " }" + NL + "" - + NL + " PROTECTED VOID FIRECHANNELCLOSING(CHANNEL CHANNEL)" + NL + " {" + NL - + " FOR (CHANNELLISTENER LISTENER : CHANNELLISTENERS)" + NL + " {" + NL + " TRY" + NL + " {" - + NL + " LISTENER.NOTIFYCHANNELCLOSING(CHANNEL);" + NL + " }" + NL + " CATCH (EXCEPTION EX)" - + NL + " {" + NL + " EX.PRINTSTACKTRACE();" + NL + " }" + NL + " }" + NL + " }" + NL + "" - + NL + " PROTECTED VOID FIRESTATECHANGED(STATE NEWSTATE, STATE OLDSTATE)" + NL + " {" + NL - + " FOR (STATELISTENER LISTENER : STATELISTENERS)" + NL + " {" + NL + " TRY" + NL + " {" + NL - + " LISTENER.NOTIFYSTATECHANGED(THIS, NEWSTATE, OLDSTATE);" + NL + " }" + NL - + " CATCH (EXCEPTION EX)" + NL + " {" + NL + " EX.PRINTSTACKTRACE();" + NL + " }" + NL - + " }" + NL + " }" + NL + "" + NL + " @OVERRIDE" + NL - + " PROTECTED VOID ONACCESSBEFOREACTIVATE() THROWS EXCEPTION" + NL + " {" + NL - + " SUPER.ONACCESSBEFOREACTIVATE();" + NL + " IF (BUFFERPROVIDER == NULL)" + NL + " {" + NL - + " THROW NEW ILLEGALSTATEEXCEPTION(\"BUFFERPROVIDER == NULL\");" + NL + " }" + NL + "" + NL - + " IF (PROTOCOLFACTORYREGISTRY == NULL)" + NL + " {" + NL - + " IOUTIL.OUT().PRINTLN(TOSTRING() + \": (INFO) PROTOCOLFACTORYREGISTRY == NULL\");" + NL + " }" + NL - + "" + NL + " IF (RECEIVEEXECUTOR == NULL)" + NL + " {" + NL - + " IOUTIL.OUT().PRINTLN(TOSTRING() + \": (INFO) RECEIVEEXECUTOR == NULL\");" + NL + " }" + NL + " }" - + NL + "" + NL + " @OVERRIDE" + NL + " PROTECTED VOID ONACTIVATE() THROWS EXCEPTION" + NL + " {" + NL - + " SUPER.ONACTIVATE();" + NL + " SETSTATE(STATE.CONNECTING);" + NL + " }" + NL + "" + NL - + " @OVERRIDE" + NL + " PROTECTED VOID ONDEACTIVATE() THROWS EXCEPTION" + NL + " {" + NL - + " SETSTATE(STATE.DISCONNECTED);" + NL + " FOR (SHORT I = 0; I < CHANNELS.SIZE(); I++)" + NL + " {" - + NL + " CHANNELIMPL CHANNEL = CHANNELS.GET(I);" + NL + " IF (CHANNEL != NULL)" + NL + " {" + NL - + " LIFECYCLEUTIL.DEACTIVATE(CHANNEL);" + NL + " }" + NL + " }" + NL + "" + NL - + " CHANNELS.CLEAR();" + NL + " SUPER.ONDEACTIVATE();" + NL + " }" + NL + "" + NL - + " PROTECTED ABSTRACT VOID REGISTERCHANNELWITHPEER(SHORT CHANNELINDEX, STRING PROTOCOLID)" + NL - + " THROWS CONNECTOREXCEPTION;" + NL + "" + NL + " /**" + NL - + " * IS REGISTERED WITH EACH {@LINK CHANNEL} OF THIS {@LINK CONNECTOR}." + NL + " * <P>" + NL + " * " - + NL + " * @AUTHOR EIKE STEPPER" + NL + " */" + NL - + " PRIVATE FINAL CLASS CHANNELLIFECYCLELISTENER IMPLEMENTS LIFECYCLELISTENER" + NL + " {" + NL - + " PUBLIC VOID NOTIFYLIFECYCLEACTIVATED(LIFECYCLENOTIFIER NOTIFIER)" + NL + " {" + NL - + " CHANNELIMPL CHANNEL = (CHANNELIMPL)NOTIFIER;" + NL + " FIRECHANNELOPENED(CHANNEL);" + NL - + " }" + NL + "" + NL + " PUBLIC VOID NOTIFYLIFECYCLEDEACTIVATING(LIFECYCLENOTIFIER NOTIFIER)" + NL - + " {" + NL + " CHANNELIMPL CHANNEL = (CHANNELIMPL)NOTIFIER;" + NL - + " FIRECHANNELCLOSING(CHANNEL);" + NL + " REMOVECHANNEL(CHANNEL);" + NL + " }" + NL + " }" + NL - + "}" + NL; + return "/**" + NL //$NON-NLS-1$ + + " * COPYRIGHT (C) 2004 - 2008 EIKE STEPPER, GERMANY." + NL //$NON-NLS-1$ + + " * ALL RIGHTS RESERVED. THIS PROGRAM AND THE ACCOMPANYING MATERIALS" + NL //$NON-NLS-1$ + + " * ARE MADE AVAILABLE UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE V1.0" + NL //$NON-NLS-1$ + + " * WHICH ACCOMPANIES THIS DISTRIBUTION, AND IS AVAILABLE AT" + NL //$NON-NLS-1$ + + " * HTTP://WWW.ECLIPSE.ORG/LEGAL/EPL-V10.HTML" + NL + " * " + NL + " * CONTRIBUTORS:" + NL //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + + " * EIKE STEPPER - INITIAL API AND IMPLEMENTATION" + NL //$NON-NLS-1$ + + " */" + NL //$NON-NLS-1$ + + "PACKAGE ORG.ECLIPSE.INTERNAL.NET4J.TRANSPORT.CONNECTOR;" + NL + "" + NL //$NON-NLS-1$ //$NON-NLS-2$ + + "IMPORT ORG.ECLIPSE.NET4J.TRANSPORT.BUFFER.BUFFERPROVIDER;" + NL //$NON-NLS-1$ + + "IMPORT ORG.ECLIPSE.NET4J.TRANSPORT.CHANNEL.CHANNEL;" + NL //$NON-NLS-1$ + + "IMPORT ORG.ECLIPSE.NET4J.TRANSPORT.CHANNEL.MULTIPLEXER;" + NL //$NON-NLS-1$ + + "IMPORT ORG.ECLIPSE.NET4J.TRANSPORT.CONNECTOR.CONNECTOR;" + NL //$NON-NLS-1$ + + "IMPORT ORG.ECLIPSE.NET4J.TRANSPORT.CONNECTOR.CONNECTOREXCEPTION;" + NL //$NON-NLS-1$ + + "IMPORT ORG.ECLIPSE.NET4J.TRANSPORT.CONNECTOR.CREDENTIALS;" + NL //$NON-NLS-1$ + + "IMPORT ORG.ECLIPSE.NET4J.TRANSPORT.CONNECTOR.PROTOCOL;" + NL //$NON-NLS-1$ + + "IMPORT ORG.ECLIPSE.NET4J.TRANSPORT.CONNECTOR.PROTOCOLFACTORY;" + NL //$NON-NLS-1$ + + "IMPORT ORG.ECLIPSE.NET4J.UTIL.LIFECYCLE.LIFECYCLELISTENER;" + NL //$NON-NLS-1$ + + "IMPORT ORG.ECLIPSE.NET4J.UTIL.LIFECYCLE.LIFECYCLENOTIFIER;" + NL //$NON-NLS-1$ + + "IMPORT ORG.ECLIPSE.NET4J.UTIL.REGISTRY.IREGISTRY;" + NL + "" + NL //$NON-NLS-1$ //$NON-NLS-2$ + + "IMPORT ORG.ECLIPSE.INTERNAL.NET4J.TRANSPORT.CHANNEL.CHANNELIMPL;" + NL //$NON-NLS-1$ + + "IMPORT ORG.ECLIPSE.INTERNAL.NET4J.UTIL.STREAM.BUFFERQUEUE;" + NL //$NON-NLS-1$ + + "IMPORT ORG.ECLIPSE.INTERNAL.NET4J.UTIL.LIFECYCLE.ABSTRACTCOMPONENT;" + NL //$NON-NLS-1$ + + "IMPORT ORG.ECLIPSE.INTERNAL.NET4J.UTIL.LIFECYCLE.LIFECYCLEUTIL;" + NL + "" + NL //$NON-NLS-1$ //$NON-NLS-2$ + + "IMPORT JAVA.UTIL.ARRAYLIST;" + NL + "IMPORT JAVA.UTIL.LIST;" + NL + "IMPORT JAVA.UTIL.QUEUE;" + NL //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + + "IMPORT JAVA.UTIL.CONCURRENT.CONCURRENTLINKEDQUEUE;" + NL + "IMPORT JAVA.UTIL.CONCURRENT.COUNTDOWNLATCH;" //$NON-NLS-1$ //$NON-NLS-2$ + + NL + "IMPORT JAVA.UTIL.CONCURRENT.EXECUTORSERVICE;" + NL + "IMPORT JAVA.UTIL.CONCURRENT.TIMEUNIT;" + NL + "" //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + + NL + "/**" + NL + " * @AUTHOR EIKE STEPPER" + NL + " */" + NL //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + + "PUBLIC ABSTRACT CLASS ABSTRACTCONNECTOR EXTENDS ABSTRACTLIFECYCLE IMPLEMENTS CONNECTOR, CHANNELMULTIPLEXER" //$NON-NLS-1$ + + NL + "{" + NL + " PRIVATE STATIC FINAL CHANNELIMPL NULL_CHANNEL = NEW CHANNELIMPL(NULL);" + NL + "" + NL //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + + " PRIVATE CONNECTORCREDENTIALS CREDENTIALS;" + NL + "" + NL //$NON-NLS-1$ //$NON-NLS-2$ + + " PRIVATE IREGISTRY<STRING, PROTOCOLFACTORY> PROTOCOLFACTORYREGISTRY;" + NL + "" + NL //$NON-NLS-1$ //$NON-NLS-2$ + + " PRIVATE BUFFERPROVIDER BUFFERPROVIDER;" + NL + "" + NL + " /**" + NL //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + + " * AN OPTIONAL EXECUTOR TO BE USED BY THE {@LINK CHANNEL}S TO PROCESS THEIR" + NL //$NON-NLS-1$ + + " * {@LINK CHANNELIMPL#RECEIVEQUEUE} INSTEAD OF THE CURRENT THREAD. IF NOT" + NL //$NON-NLS-1$ + + " * <CODE>NULL</CODE> THE SENDER AND THE RECEIVER PEERS BECOME DECOUPLED." + NL + " * <P>" + NL + " */" //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + + NL + " PRIVATE EXECUTORSERVICE RECEIVEEXECUTOR;" + NL + "" + NL + " /**" + NL //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + + " * TODO SYNCHRONIZE ON CHANNELS?" + NL + " */" + NL //$NON-NLS-1$ //$NON-NLS-2$ + + " PRIVATE LIST<CHANNELIMPL> CHANNELS = NEW ARRAYLIST();" + NL + "" + NL //$NON-NLS-1$ //$NON-NLS-2$ + + " PRIVATE STATE STATE = STATE.DISCONNECTED;" + NL + "" + NL + " /**" + NL //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + + " * DON\'T INITIALIZE LAZILY TO CIRCUMVENT SYNCHRONIZATION!" + NL + " */" + NL //$NON-NLS-1$ //$NON-NLS-2$ + + " PRIVATE QUEUE<STATELISTENER> STATELISTENERS = NEW CONCURRENTLINKEDQUEUE();" + NL + "" + NL + " /**" + NL //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + + " * DON\'T INITIALIZE LAZILY TO CIRCUMVENT SYNCHRONIZATION!" + NL + " */" + NL //$NON-NLS-1$ //$NON-NLS-2$ + + " PRIVATE QUEUE<CHANNELLISTENER> CHANNELLISTENERS = NEW CONCURRENTLINKEDQUEUE();" + NL + "" + NL + " /**" //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + + NL + " * IS REGISTERED WITH EACH {@LINK CHANNEL} OF THIS {@LINK CONNECTOR}." + NL + " * <P>" + NL //$NON-NLS-1$ //$NON-NLS-2$ + + " */" + NL + " PRIVATE LIFECYCLELISTENER CHANNELLIFECYCLELISTENER = NEW CHANNELLIFECYCLELISTENER();" + NL //$NON-NLS-1$ //$NON-NLS-2$ + + "" + NL + " PRIVATE COUNTDOWNLATCH FINISHEDCONNECTING;" + NL + "" + NL //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + + " PRIVATE COUNTDOWNLATCH FINISHEDNEGOTIATING;" + NL + "" + NL + " PUBLIC ABSTRACTCONNECTOR()" + NL + " {" //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ + + NL + " }" + NL + "" + NL + " PUBLIC EXECUTORSERVICE GETRECEIVEEXECUTOR()" + NL + " {" + NL //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ + + " RETURN RECEIVEEXECUTOR;" + NL + " }" + NL + "" + NL //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + + " PUBLIC VOID SETRECEIVEEXECUTOR(EXECUTORSERVICE RECEIVEEXECUTOR)" + NL + " {" + NL //$NON-NLS-1$ //$NON-NLS-2$ + + " THIS.RECEIVEEXECUTOR = RECEIVEEXECUTOR;" + NL + " }" + NL + "" + NL //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + + " PUBLIC IREGISTRY<STRING, PROTOCOLFACTORY> GETPROTOCOLFACTORYREGISTRY()" + NL + " {" + NL //$NON-NLS-1$ //$NON-NLS-2$ + + " RETURN PROTOCOLFACTORYREGISTRY;" + NL + " }" + NL + "" + NL //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + + " PUBLIC VOID SETPROTOCOLFACTORYREGISTRY(IREGISTRY<STRING, PROTOCOLFACTORY> PROTOCOLFACTORYREGISTRY)" + NL //$NON-NLS-1$ + + " {" + NL + " THIS.PROTOCOLFACTORYREGISTRY = PROTOCOLFACTORYREGISTRY;" + NL + " }" + NL + "" + NL //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ + + " PUBLIC VOID ADDSTATELISTENER(STATELISTENER LISTENER)" + NL + " {" + NL //$NON-NLS-1$ //$NON-NLS-2$ + + " STATELISTENERS.ADD(LISTENER);" + NL + " }" + NL + "" + NL //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + + " PUBLIC VOID REMOVESTATELISTENER(STATELISTENER LISTENER)" + NL + " {" + NL //$NON-NLS-1$ //$NON-NLS-2$ + + " STATELISTENERS.REMOVE(LISTENER);" + NL + " }" + NL + "" + NL //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + + " PUBLIC VOID ADDCHANNELLISTENER(CHANNELLISTENER LISTENER)" + NL + " {" + NL //$NON-NLS-1$ //$NON-NLS-2$ + + " CHANNELLISTENERS.ADD(LISTENER);" + NL + " }" + NL + "" + NL //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + + " PUBLIC VOID REMOVECHANNELLISTENER(CHANNELLISTENER LISTENER)" + NL + " {" + NL //$NON-NLS-1$ //$NON-NLS-2$ + + " CHANNELLISTENERS.REMOVE(LISTENER);" + NL + " }" + NL + "" + NL //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + + " PUBLIC BUFFERPROVIDER GETBUFFERPROVIDER()" + NL + " {" + NL + " RETURN BUFFERPROVIDER;" + NL + " }" //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ + + NL + "" + NL + " PUBLIC VOID SETBUFFERPROVIDER(BUFFERPROVIDER BUFFERPROVIDER)" + NL + " {" + NL //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + + " THIS.BUFFERPROVIDER = BUFFERPROVIDER;" + NL + " }" + NL + "" + NL + " PUBLIC BOOLEAN ISCLIENT()" + NL //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ + + " {" + NL + " RETURN GETTYPE() == TYPE.CLIENT;" + NL + " }" + NL + "" + NL //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ + + " PUBLIC BOOLEAN ISSERVER()" + NL + " {" + NL + " RETURN GETTYPE() == TYPE.SERVER;" + NL + " }" + NL //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ + + "" + NL + " PUBLIC CONNECTORCREDENTIALS GETCREDENTIALS()" + NL + " {" + NL + " RETURN CREDENTIALS;" + NL //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ + + " }" + NL + "" + NL + " PUBLIC VOID SETCREDENTIALS(CONNECTORCREDENTIALS CREDENTIALS)" + NL + " {" + NL //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ + + " THIS.CREDENTIALS = CREDENTIALS;" + NL + " }" + NL + "" + NL + " PUBLIC STATE GETSTATE()" + NL + " {" //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ + + NL + " RETURN STATE;" + NL + " }" + NL + "" + NL //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + + " PUBLIC VOID SETSTATE(STATE NEWSTATE) THROWS CONNECTOREXCEPTION" + NL + " {" + NL //$NON-NLS-1$ //$NON-NLS-2$ + + " STATE OLDSTATE = GETSTATE();" + NL + " IF (NEWSTATE != OLDSTATE)" + NL + " {" + NL //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + + " IOUTIL.OUT().PRINTLN(TOSTRING() + \": SETTING STATE \" + NEWSTATE + \" (WAS \"" + NL //$NON-NLS-1$ + + " + OLDSTATE.TOSTRING().TOLOWERCASE() + \")\");" + NL + " STATE = NEWSTATE;" + NL //$NON-NLS-1$ //$NON-NLS-2$ + + " FIRESTATECHANGED(NEWSTATE, OLDSTATE);" + NL + "" + NL + " SWITCH (NEWSTATE)" + NL + " {" //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ + + NL + " CASE DISCONNECTED:" + NL + " IF (FINISHEDCONNECTING != NULL)" + NL + " {" + NL //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + + " FINISHEDCONNECTING.COUNTDOWN();" + NL + " FINISHEDCONNECTING = NULL;" + NL + " }" //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + + NL + "" + NL + " IF (FINISHEDNEGOTIATING != NULL)" + NL + " {" + NL //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + + " FINISHEDNEGOTIATING.COUNTDOWN();" + NL + " FINISHEDNEGOTIATING = NULL;" + NL //$NON-NLS-1$ //$NON-NLS-2$ + + " }" + NL + " BREAK;" + NL + "" + NL + " CASE CONNECTING:" + NL //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ + + " FINISHEDCONNECTING = NEW COUNTDOWNLATCH(1);" + NL //$NON-NLS-1$ + + " FINISHEDNEGOTIATING = NEW COUNTDOWNLATCH(1);" + NL + " IF (GETTYPE() == TYPE.SERVER)" + NL //$NON-NLS-1$ //$NON-NLS-2$ + + " {" + NL + " SETSTATE(STATE.NEGOTIATING);" + NL + " }" + NL + " BREAK;" + NL //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ + + "" + NL + " CASE NEGOTIATING:" + NL + " FINISHEDCONNECTING.COUNTDOWN();" + NL //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + + " SETSTATE(STATE.CONNECTED); // TODO IMPLEMENT NEGOTIATION" + NL + " BREAK;" + NL + "" + NL //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + + " CASE CONNECTED:" + NL + " FINISHEDCONNECTING.COUNTDOWN(); // JUST IN CASE OF SUSPICION" + NL //$NON-NLS-1$ //$NON-NLS-2$ + + " FINISHEDNEGOTIATING.COUNTDOWN();" + NL + " BREAK;" + NL + "" + NL + " }" + NL + " }" //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ + + NL + " }" + NL + "" + NL + " PUBLIC BOOLEAN ISCONNECTED()" + NL + " {" + NL //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ + + " RETURN GETSTATE() == STATE.CONNECTED;" + NL + " }" + NL + "" + NL //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + + " PUBLIC VOID CONNECTASYNC() THROWS CONNECTOREXCEPTION" + NL + " {" + NL + " TRY" + NL + " {" + NL //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ + + " ACTIVATE();" + NL + " }" + NL + " CATCH (CONNECTOREXCEPTION EX)" + NL + " {" + NL //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ + + " THROW EX;" + NL + " }" + NL + " CATCH (EXCEPTION EX)" + NL + " {" + NL //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ + + " THROW NEW CONNECTOREXCEPTION(EX);" + NL + " }" + NL + " }" + NL + "" + NL //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ + + " PUBLIC BOOLEAN WAITFORCONNECTION(LONG TIMEOUT) THROWS CONNECTOREXCEPTION" + NL + " {" + NL //$NON-NLS-1$ //$NON-NLS-2$ + + " STATE STATE = GETSTATE();" + NL + " IF (STATE == STATE.DISCONNECTED)" + NL + " {" + NL //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + + " RETURN FALSE;" + NL + " }" + NL + "" + NL + " TRY" + NL + " {" + NL //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ + + " IOUTIL.OUT().PRINTLN(TOSTRING() + \": WAITING FOR CONNECTION...\");" + NL //$NON-NLS-1$ + + " RETURN FINISHEDNEGOTIATING.AWAIT(TIMEOUT, TIMEUNIT.MILLISECONDS);" + NL + " }" + NL //$NON-NLS-1$ //$NON-NLS-2$ + + " CATCH (INTERRUPTEDEXCEPTION EX)" + NL + " {" + NL + " RETURN FALSE;" + NL + " }" + NL + " }" //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ + + NL + "" + NL + " PUBLIC BOOLEAN CONNECT(LONG TIMEOUT) THROWS CONNECTOREXCEPTION" + NL + " {" + NL //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + + " CONNECTASYNC();" + NL + " RETURN WAITFORCONNECTION(TIMEOUT);" + NL + " }" + NL + "" + NL //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ + + " PUBLIC CONNECTOREXCEPTION DISCONNECT()" + NL + " {" + NL + " EXCEPTION EX = DEACTIVATE();" + NL //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + + " IF (EX == NULL)" + NL + " {" + NL + " RETURN NULL;" + NL + " }" + NL + "" + NL //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ + + " IF (EX INSTANCEOF CONNECTOREXCEPTION)" + NL + " {" + NL + " RETURN (CONNECTOREXCEPTION)EX;" + NL //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + + " }" + NL + "" + NL + " RETURN NEW CONNECTOREXCEPTION(EX);" + NL + " }" + NL + "" + NL //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ + + " PUBLIC CHANNEL[] GETCHANNELS()" + NL + " {" + NL //$NON-NLS-1$ //$NON-NLS-2$ + + " FINAL LIST<CHANNEL> RESULT = NEW ARRAYLIST<CHANNEL>();" + NL + " SYNCHRONIZED (CHANNELS)" + NL //$NON-NLS-1$ //$NON-NLS-2$ + + " {" + NL + " FOR (FINAL CHANNELIMPL CHANNEL : CHANNELS)" + NL + " {" + NL //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + + " IF (CHANNEL != NULL_CHANNEL)" + NL + " {" + NL + " RESULT.ADD(CHANNEL);" + NL //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + + " }" + NL + " }" + NL + " }" + NL + "" + NL //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ + + " RETURN RESULT.TOARRAY(NEW CHANNEL[RESULT.SIZE()]);" + NL + " }" + NL + "" + NL //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + + " PUBLIC CHANNEL OPENCHANNEL() THROWS CONNECTOREXCEPTION" + NL + " {" + NL //$NON-NLS-1$ //$NON-NLS-2$ + + " RETURN OPENCHANNEL(NULL);" + NL + " }" + NL + "" + NL //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + + " PUBLIC CHANNEL OPENCHANNEL(STRING PROTOCOLID) THROWS CONNECTOREXCEPTION" + NL + " {" + NL //$NON-NLS-1$ //$NON-NLS-2$ + + " SHORT CHANNELINDEX = FINDFREECHANNELINDEX();" + NL //$NON-NLS-1$ + + " CHANNELIMPL CHANNEL = CREATECHANNEL(CHANNELINDEX, PROTOCOLID);" + NL //$NON-NLS-1$ + + " REGISTERCHANNELWITHPEER(CHANNELINDEX, PROTOCOLID);" + NL + "" + NL + " TRY" + NL + " {" + NL //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ + + " CHANNEL.ACTIVATE();" + NL + " }" + NL + " CATCH (CONNECTOREXCEPTION EX)" + NL + " {" + NL //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ + + " THROW EX;" + NL + " }" + NL + " CATCH (EXCEPTION EX)" + NL + " {" + NL //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ + + " THROW NEW CONNECTOREXCEPTION(EX);" + NL + " }" + NL + "" + NL + " RETURN CHANNEL;" + NL + " }" //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ + + NL + "" + NL + " PUBLIC CHANNELIMPL CREATECHANNEL(SHORT CHANNELINDEX, STRING PROTOCOLID)" + NL + " {" + NL //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + + " PROTOCOL PROTOCOL = CREATEPROTOCOL(PROTOCOLID);" + NL + " IF (PROTOCOL == NULL)" + NL + " {" + NL //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + + " IOUTIL.OUT().PRINTLN(TOSTRING() + \": OPENING CHANNEL WITHOUT PROTOCOL\");" + NL + " }" + NL //$NON-NLS-1$ //$NON-NLS-2$ + + " ELSE" + NL + " {" + NL //$NON-NLS-1$ //$NON-NLS-2$ + + " IOUTIL.OUT().PRINTLN(TOSTRING() + \": OPENING CHANNEL WITH PROTOCOL \" + PROTOCOLID);" + NL + " }" //$NON-NLS-1$ //$NON-NLS-2$ + + NL + "" + NL + " CHANNELIMPL CHANNEL = NEW CHANNELIMPL(RECEIVEEXECUTOR);" + NL //$NON-NLS-1$ //$NON-NLS-2$ + + " CHANNEL.SETCHANNELINDEX(CHANNELINDEX);" + NL + " CHANNEL.SETMULTIPLEXER(THIS);" + NL //$NON-NLS-1$ //$NON-NLS-2$ + + " CHANNEL.SETRECEIVEHANDLER(PROTOCOL);" + NL //$NON-NLS-1$ + + " CHANNEL.ADDLIFECYCLELISTENER(CHANNELLIFECYCLELISTENER);" + NL + " ADDCHANNEL(CHANNEL);" + NL //$NON-NLS-1$ //$NON-NLS-2$ + + " RETURN CHANNEL;" + NL + " }" + NL + "" + NL + " PUBLIC CHANNELIMPL GETCHANNEL(SHORT CHANNELINDEX)" //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ + + NL + " {" + NL + " TRY" + NL + " {" + NL + " CHANNELIMPL CHANNEL = CHANNELS.GET(CHANNELINDEX);" //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ + + NL + " IF (CHANNEL == NULL || CHANNEL == NULL_CHANNEL)" + NL + " {" + NL //$NON-NLS-1$ //$NON-NLS-2$ + + " THROW NEW NULLPOINTEREXCEPTION();" + NL + " }" + NL + "" + NL + " RETURN CHANNEL;" + NL //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ + + " }" + NL + " CATCH (INDEXOUTOFBOUNDSEXCEPTION EX)" + NL + " {" + NL //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + + " IOUTIL.OUT().PRINTLN(TOSTRING() + \": INVALID CHANNELINDEX \" + CHANNELINDEX);" + NL //$NON-NLS-1$ + + " RETURN NULL;" + NL + " }" + NL + " }" + NL + "" + NL //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ + + " PROTECTED LIST<BUFFERQUEUE> GETCHANNELBUFFERQUEUES()" + NL + " {" + NL //$NON-NLS-1$ //$NON-NLS-2$ + + " FINAL LIST<BUFFERQUEUE> RESULT = NEW ARRAYLIST<BUFFERQUEUE>();" + NL + " SYNCHRONIZED (CHANNELS)" //$NON-NLS-1$ //$NON-NLS-2$ + + NL + " {" + NL + " FOR (FINAL CHANNELIMPL CHANNEL : CHANNELS)" + NL + " {" + NL //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + + " IF (CHANNEL != NULL_CHANNEL)" + NL + " {" + NL //$NON-NLS-1$ //$NON-NLS-2$ + + " BUFFERQUEUE BUFFERQUEUE = CHANNEL.GETSENDQUEUE();" + NL + " RESULT.ADD(BUFFERQUEUE);" //$NON-NLS-1$ //$NON-NLS-2$ + + NL + " }" + NL + " }" + NL + " }" + NL + "" + NL + " RETURN RESULT;" + NL + " }" + NL + "" //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ + + NL + " PROTECTED SHORT FINDFREECHANNELINDEX()" + NL + " {" + NL + " SYNCHRONIZED (CHANNELS)" + NL //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + + " {" + NL + " INT SIZE = CHANNELS.SIZE();" + NL + " FOR (SHORT I = 0; I < SIZE; I++)" + NL //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + + " {" + NL + " IF (CHANNELS.GET(I) == NULL_CHANNEL)" + NL + " {" + NL //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + + " RETURN I;" + NL + " }" + NL + " }" + NL + "" + NL //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ + + " CHANNELS.ADD(NULL_CHANNEL);" + NL + " RETURN (SHORT)SIZE;" + NL + " }" + NL + " }" + NL + "" //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ + + NL + " PROTECTED VOID ADDCHANNEL(CHANNELIMPL CHANNEL)" + NL + " {" + NL //$NON-NLS-1$ //$NON-NLS-2$ + + " SHORT CHANNELINDEX = CHANNEL.GETCHANNELINDEX();" + NL + " WHILE (CHANNELINDEX >= CHANNELS.SIZE())" //$NON-NLS-1$ //$NON-NLS-2$ + + NL + " {" + NL + " CHANNELS.ADD(NULL_CHANNEL);" + NL + " }" + NL + "" + NL //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ + + " CHANNELS.SET(CHANNELINDEX, CHANNEL);" + NL + " }" + NL + "" + NL //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + + " PROTECTED VOID REMOVECHANNEL(CHANNELIMPL CHANNEL)" + NL + " {" + NL //$NON-NLS-1$ //$NON-NLS-2$ + + " CHANNEL.REMOVELIFECYCLELISTENER(CHANNELLIFECYCLELISTENER);" + NL //$NON-NLS-1$ + + " INT CHANNELINDEX = CHANNEL.GETCHANNELINDEX();" + NL + "" + NL //$NON-NLS-1$ //$NON-NLS-2$ + + " IOUTIL.OUT().PRINTLN(TOSTRING() + \": REMOVING CHANNEL \" + CHANNELINDEX);" + NL //$NON-NLS-1$ + + " CHANNELS.SET(CHANNELINDEX, NULL_CHANNEL);" + NL + " }" + NL + "" + NL //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + + " PROTECTED PROTOCOL CREATEPROTOCOL(STRING PROTOCOLID)" + NL + " {" + NL //$NON-NLS-1$ //$NON-NLS-2$ + + " IF (PROTOCOLID == NULL || PROTOCOLID.LENGTH() == 0)" + NL + " {" + NL + " RETURN NULL;" + NL //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + + " }" + NL + "" + NL + " IREGISTRY<STRING, PROTOCOLFACTORY> REGISTRY = GETPROTOCOLFACTORYREGISTRY();" //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + + NL + " IF (REGISTRY == NULL)" + NL + " {" + NL + " RETURN NULL;" + NL + " }" + NL + "" + NL //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ + + " PROTOCOLFACTORY FACTORY = REGISTRY.LOOKUP(PROTOCOLID);" + NL + " IF (FACTORY == NULL)" + NL + " {" //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + + NL + " RETURN NULL;" + NL + " }" + NL + "" + NL //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + + " IOUTIL.OUT().PRINTLN(TOSTRING() + \": CREATING PROTOCOL \" + PROTOCOLID);" + NL //$NON-NLS-1$ + + " RETURN FACTORY.CREATEPROTOCOL();" + NL + " }" + NL + "" + NL //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + + " PROTECTED VOID FIRECHANNELOPENED(CHANNEL CHANNEL)" + NL + " {" + NL //$NON-NLS-1$ //$NON-NLS-2$ + + " FOR (CHANNELLISTENER LISTENER : CHANNELLISTENERS)" + NL + " {" + NL + " TRY" + NL + " {" //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ + + NL + " LISTENER.NOTIFYCHANNELOPENED(CHANNEL);" + NL + " }" + NL + " CATCH (EXCEPTION EX)" //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + + NL + " {" + NL + " EX.PRINTSTACKTRACE();" + NL + " }" + NL + " }" + NL + " }" + NL + "" //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ + + NL + " PROTECTED VOID FIRECHANNELCLOSING(CHANNEL CHANNEL)" + NL + " {" + NL //$NON-NLS-1$ //$NON-NLS-2$ + + " FOR (CHANNELLISTENER LISTENER : CHANNELLISTENERS)" + NL + " {" + NL + " TRY" + NL + " {" //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ + + NL + " LISTENER.NOTIFYCHANNELCLOSING(CHANNEL);" + NL + " }" + NL + " CATCH (EXCEPTION EX)" //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + + NL + " {" + NL + " EX.PRINTSTACKTRACE();" + NL + " }" + NL + " }" + NL + " }" + NL + "" //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ + + NL + " PROTECTED VOID FIRESTATECHANGED(STATE NEWSTATE, STATE OLDSTATE)" + NL + " {" + NL //$NON-NLS-1$ //$NON-NLS-2$ + + " FOR (STATELISTENER LISTENER : STATELISTENERS)" + NL + " {" + NL + " TRY" + NL + " {" + NL //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ + + " LISTENER.NOTIFYSTATECHANGED(THIS, NEWSTATE, OLDSTATE);" + NL + " }" + NL //$NON-NLS-1$ //$NON-NLS-2$ + + " CATCH (EXCEPTION EX)" + NL + " {" + NL + " EX.PRINTSTACKTRACE();" + NL + " }" + NL //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ + + " }" + NL + " }" + NL + "" + NL + " @OVERRIDE" + NL //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ + + " PROTECTED VOID ONACCESSBEFOREACTIVATE() THROWS EXCEPTION" + NL + " {" + NL //$NON-NLS-1$ //$NON-NLS-2$ + + " SUPER.ONACCESSBEFOREACTIVATE();" + NL + " IF (BUFFERPROVIDER == NULL)" + NL + " {" + NL //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + + " THROW NEW ILLEGALSTATEEXCEPTION(\"BUFFERPROVIDER == NULL\");" + NL + " }" + NL + "" + NL //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + + " IF (PROTOCOLFACTORYREGISTRY == NULL)" + NL + " {" + NL //$NON-NLS-1$ //$NON-NLS-2$ + + " IOUTIL.OUT().PRINTLN(TOSTRING() + \": (INFO) PROTOCOLFACTORYREGISTRY == NULL\");" + NL + " }" + NL //$NON-NLS-1$ //$NON-NLS-2$ + + "" + NL + " IF (RECEIVEEXECUTOR == NULL)" + NL + " {" + NL //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + + " IOUTIL.OUT().PRINTLN(TOSTRING() + \": (INFO) RECEIVEEXECUTOR == NULL\");" + NL + " }" + NL + " }" //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + + NL + "" + NL + " @OVERRIDE" + NL + " PROTECTED VOID ONACTIVATE() THROWS EXCEPTION" + NL + " {" + NL //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ + + " SUPER.ONACTIVATE();" + NL + " SETSTATE(STATE.CONNECTING);" + NL + " }" + NL + "" + NL //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ + + " @OVERRIDE" + NL + " PROTECTED VOID ONDEACTIVATE() THROWS EXCEPTION" + NL + " {" + NL //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + + " SETSTATE(STATE.DISCONNECTED);" + NL + " FOR (SHORT I = 0; I < CHANNELS.SIZE(); I++)" + NL + " {" //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + + NL + " CHANNELIMPL CHANNEL = CHANNELS.GET(I);" + NL + " IF (CHANNEL != NULL)" + NL + " {" + NL //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + + " LIFECYCLEUTIL.DEACTIVATE(CHANNEL);" + NL + " }" + NL + " }" + NL + "" + NL //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ + + " CHANNELS.CLEAR();" + NL + " SUPER.ONDEACTIVATE();" + NL + " }" + NL + "" + NL //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ + + " PROTECTED ABSTRACT VOID REGISTERCHANNELWITHPEER(SHORT CHANNELINDEX, STRING PROTOCOLID)" + NL //$NON-NLS-1$ + + " THROWS CONNECTOREXCEPTION;" + NL + "" + NL + " /**" + NL //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + + " * IS REGISTERED WITH EACH {@LINK CHANNEL} OF THIS {@LINK CONNECTOR}." + NL + " * <P>" + NL + " * " //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + + NL + " * @AUTHOR EIKE STEPPER" + NL + " */" + NL //$NON-NLS-1$ //$NON-NLS-2$ + + " PRIVATE FINAL CLASS CHANNELLIFECYCLELISTENER IMPLEMENTS LIFECYCLELISTENER" + NL + " {" + NL //$NON-NLS-1$ //$NON-NLS-2$ + + " PUBLIC VOID NOTIFYLIFECYCLEACTIVATED(LIFECYCLENOTIFIER NOTIFIER)" + NL + " {" + NL //$NON-NLS-1$ //$NON-NLS-2$ + + " CHANNELIMPL CHANNEL = (CHANNELIMPL)NOTIFIER;" + NL + " FIRECHANNELOPENED(CHANNEL);" + NL //$NON-NLS-1$ //$NON-NLS-2$ + + " }" + NL + "" + NL + " PUBLIC VOID NOTIFYLIFECYCLEDEACTIVATING(LIFECYCLENOTIFIER NOTIFIER)" + NL //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + + " {" + NL + " CHANNELIMPL CHANNEL = (CHANNELIMPL)NOTIFIER;" + NL //$NON-NLS-1$ //$NON-NLS-2$ + + " FIRECHANNELCLOSING(CHANNEL);" + NL + " REMOVECHANNEL(CHANNEL);" + NL + " }" + NL + " }" + NL //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ + + "}" + NL; //$NON-NLS-1$ } } diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/Performance.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/Performance.java index b114623fac..32bc7c3973 100644 --- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/Performance.java +++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/Performance.java @@ -43,7 +43,7 @@ public class Performance for (int i = 0; i < 2; i++) { long start = System.currentTimeMillis(); - InetAddress inet = InetAddress.getByName("localhost"); + InetAddress inet = InetAddress.getByName("localhost"); //$NON-NLS-1$ inet.getHostAddress(); long duration = System.currentTimeMillis() - start; @@ -67,10 +67,10 @@ public class Performance public static void testRouter() throws Exception { - System.out.println(Socket.class.getName() + " (ROUTER)"); + System.out.println(Socket.class.getName() + " (ROUTER)"); //$NON-NLS-1$ for (int i = 0; i < 2; i++) { - final SocketAddress endpoint = new InetSocketAddress(InetAddress.getByName("192.168.1.1"), 80); + final SocketAddress endpoint = new InetSocketAddress(InetAddress.getByName("192.168.1.1"), 80); //$NON-NLS-1$ Socket socket = new Socket(Proxy.NO_PROXY); long start = System.currentTimeMillis(); @@ -85,10 +85,10 @@ public class Performance public static void testSocket() throws Exception { - System.out.println(Socket.class.getName() + " (LOOPBACK)"); + System.out.println(Socket.class.getName() + " (LOOPBACK)"); //$NON-NLS-1$ for (int i = 0; i < 2; i++) { - final SocketAddress endpoint = new InetSocketAddress(InetAddress.getByName("127.0.0.1"), 2036); + final SocketAddress endpoint = new InetSocketAddress(InetAddress.getByName("127.0.0.1"), 2036); //$NON-NLS-1$ final CountDownLatch latch = new CountDownLatch(1); new Thread() { diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/ServerTestProtocolFactory.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/ServerTestProtocolFactory.java index 381ec6634e..e5e234bf58 100644 --- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/ServerTestProtocolFactory.java +++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/ServerTestProtocolFactory.java @@ -21,7 +21,7 @@ import java.util.concurrent.CountDownLatch; */ public class ServerTestProtocolFactory extends ServerProtocolFactory { - public static final String TYPE = "test.protocol"; + public static final String TYPE = "test.protocol"; //$NON-NLS-1$ private CountDownLatch counter; diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/SignalMonitorTest.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/SignalMonitorTest.java index 799800c1a3..22190b5a3f 100644 --- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/SignalMonitorTest.java +++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/SignalMonitorTest.java @@ -28,7 +28,7 @@ import org.eclipse.spi.net4j.ServerProtocolFactory; */ public class SignalMonitorTest extends AbstractTransportTest { - public static final String PROTOCOL_TYPE = "protocol"; + public static final String PROTOCOL_TYPE = "protocol"; //$NON-NLS-1$ public static final short SIGNAL_ID = 1; @@ -167,7 +167,7 @@ public class SignalMonitorTest extends AbstractTransportTest public OMMonitor begin(double totalWork) { super.begin(totalWork); - System.out.println("totalWork: " + getTotalWork()); + System.out.println("totalWork: " + getTotalWork()); //$NON-NLS-1$ return this; } @@ -175,7 +175,7 @@ public class SignalMonitorTest extends AbstractTransportTest public void worked(double work) { super.worked(work); - System.out.println("work: " + getWork()); + System.out.println("work: " + getWork()); //$NON-NLS-1$ } } } diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/SignalTest.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/SignalTest.java index ca55e58d53..211c6611d5 100644 --- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/SignalTest.java +++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/SignalTest.java @@ -83,7 +83,7 @@ public class SignalTest extends AbstractProtocolTest String data = TinyData.getText(); for (int i = 0; i < 1000; i++) { - msg("Loop " + i); + msg("Loop " + i); //$NON-NLS-1$ new AsyncRequest(protocol, data).sendAsync(); String result = new StringRequest(protocol, data).send(); assertEquals(data, result); diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/TCPConnectivityLoss.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/TCPConnectivityLoss.java index 58a293603d..70ae5005ef 100644 --- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/TCPConnectivityLoss.java +++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/TCPConnectivityLoss.java @@ -44,13 +44,13 @@ public class TCPConnectivityLoss public static void sleep() throws Exception { - System.out.println("Started: " + new Date()); + System.out.println("Started: " + new Date()); //$NON-NLS-1$ stop = false; int count = 0; while (System.in.available() == 0) { Thread.sleep(1000L); - System.out.print("."); + System.out.print("."); //$NON-NLS-1$ if (++count % 80 == 0) { System.out.println(); @@ -58,7 +58,7 @@ public class TCPConnectivityLoss if (stop) { - System.out.println("Loss of connectivity: " + new Date()); + System.out.println("Loss of connectivity: " + new Date()); //$NON-NLS-1$ } } } @@ -85,7 +85,7 @@ public class TCPConnectivityLoss public static void main(String[] args) throws Exception { ManagedContainer container = createContainer(); - ITCPConnector connector = TCPUtil.getConnector(container, "192.168.1.35"); + ITCPConnector connector = TCPUtil.getConnector(container, "192.168.1.35"); //$NON-NLS-1$ connector.addListener(new LifecycleEventAdapter() { @Override diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/TCPConnectorTest.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/TCPConnectorTest.java index f1d3eb5fcf..76cb3b107c 100644 --- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/TCPConnectorTest.java +++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/TCPConnectorTest.java @@ -45,13 +45,13 @@ public class TCPConnectorTest extends AbstractOMTest { private static final int TIMEOUT = 10000; - private static final String USER_ID = "stepper"; + private static final String USER_ID = "stepper"; //$NON-NLS-1$ - private static final String INVALID_USER_ID = "crap"; + private static final String INVALID_USER_ID = "crap"; //$NON-NLS-1$ - private static final char[] PASSWORD = "eike2008".toCharArray(); + private static final char[] PASSWORD = "eike2008".toCharArray(); //$NON-NLS-1$ - private static final char[] INVALID_PASSWORD = "invalid".toCharArray(); + private static final char[] INVALID_PASSWORD = "invalid".toCharArray(); //$NON-NLS-1$ private static final PasswordCredentials CREDENTIALS = new PasswordCredentials(USER_ID, PASSWORD); @@ -174,7 +174,7 @@ public class TCPConnectorTest extends AbstractOMTest acceptor.getConfig().setBufferProvider(bufferPool); acceptor.getConfig().setReceiveExecutor(threadPool); acceptor.setSelector(selector); - acceptor.setAddress("0.0.0.0"); + acceptor.setAddress("0.0.0.0"); //$NON-NLS-1$ acceptor.setPort(2036); acceptor.activate(); @@ -182,7 +182,7 @@ public class TCPConnectorTest extends AbstractOMTest connector.getConfig().setBufferProvider(bufferPool); connector.getConfig().setReceiveExecutor(threadPool); connector.setSelector(selector); - connector.setHost("localhost"); + connector.setHost("localhost"); //$NON-NLS-1$ connector.setPort(2036); connector.activate(); assertEquals(false, connector.isActive()); @@ -199,9 +199,9 @@ public class TCPConnectorTest extends AbstractOMTest IOUtil.OUT().println(); IOUtil.OUT().println(); IOUtil.OUT().println(); - IOUtil.OUT().println("#####################################################"); - IOUtil.OUT().println(" RUN = " + i); - IOUtil.OUT().println("#####################################################"); + IOUtil.OUT().println("#####################################################"); //$NON-NLS-1$ + IOUtil.OUT().println(" RUN = " + i); //$NON-NLS-1$ + IOUtil.OUT().println("#####################################################"); //$NON-NLS-1$ IOUtil.OUT().println(); IOUtil.OUT().println(); IOUtil.OUT().println(); @@ -240,7 +240,7 @@ public class TCPConnectorTest extends AbstractOMTest acceptor.getConfig().setReceiveExecutor(threadPool); acceptor.getConfig().setNegotiator(challengeNegotiator); acceptor.setSelector(selector); - acceptor.setAddress("0.0.0.0"); + acceptor.setAddress("0.0.0.0"); //$NON-NLS-1$ acceptor.setPort(2036); acceptor.activate(); @@ -256,7 +256,7 @@ public class TCPConnectorTest extends AbstractOMTest connector.getConfig().setReceiveExecutor(threadPool); connector.getConfig().setNegotiator(responseNegotiator); connector.setSelector(selector); - connector.setHost("localhost"); + connector.setHost("localhost"); //$NON-NLS-1$ connector.setPort(2036); connector.activate(); @@ -280,9 +280,9 @@ public class TCPConnectorTest extends AbstractOMTest IOUtil.OUT().println(); IOUtil.OUT().println(); IOUtil.OUT().println(); - IOUtil.OUT().println("#####################################################"); - IOUtil.OUT().println(" RUN = " + i); - IOUtil.OUT().println("#####################################################"); + IOUtil.OUT().println("#####################################################"); //$NON-NLS-1$ + IOUtil.OUT().println(" RUN = " + i); //$NON-NLS-1$ + IOUtil.OUT().println("#####################################################"); //$NON-NLS-1$ IOUtil.OUT().println(); IOUtil.OUT().println(); IOUtil.OUT().println(); @@ -321,7 +321,7 @@ public class TCPConnectorTest extends AbstractOMTest acceptor.getConfig().setReceiveExecutor(threadPool); acceptor.getConfig().setNegotiator(challengeNegotiator); acceptor.setSelector(selector); - acceptor.setAddress("0.0.0.0"); + acceptor.setAddress("0.0.0.0"); //$NON-NLS-1$ acceptor.setPort(2036); acceptor.activate(); @@ -337,18 +337,18 @@ public class TCPConnectorTest extends AbstractOMTest connector.getConfig().setReceiveExecutor(threadPool); connector.getConfig().setNegotiator(responseNegotiator); connector.setSelector(selector); - connector.setHost("localhost"); + connector.setHost("localhost"); //$NON-NLS-1$ connector.setPort(2036); try { connector.connectAsync(); connector.waitForConnection(TIMEOUT); - fail("ConnectorException expected"); + fail("ConnectorException expected"); //$NON-NLS-1$ } catch (ConnectorException ex) { - OM.LOG.info("Expected ConnectorException:", ex); + OM.LOG.info("Expected ConnectorException:", ex); //$NON-NLS-1$ assertEquals(true, ex.getCause() instanceof NegotiationException); } } @@ -383,7 +383,7 @@ public class TCPConnectorTest extends AbstractOMTest acceptor.getConfig().setReceiveExecutor(threadPool); acceptor.getConfig().setNegotiator(challengeNegotiator); acceptor.setSelector(selector); - acceptor.setAddress("0.0.0.0"); + acceptor.setAddress("0.0.0.0"); //$NON-NLS-1$ acceptor.setPort(2036); acceptor.activate(); @@ -399,18 +399,18 @@ public class TCPConnectorTest extends AbstractOMTest connector.getConfig().setReceiveExecutor(threadPool); connector.getConfig().setNegotiator(responseNegotiator); connector.setSelector(selector); - connector.setHost("localhost"); + connector.setHost("localhost"); //$NON-NLS-1$ connector.setPort(2036); try { connector.connectAsync(); connector.waitForConnection(TIMEOUT); - fail("ConnectorException expected"); + fail("ConnectorException expected"); //$NON-NLS-1$ } catch (ConnectorException ex) { - OM.LOG.info("Expected ConnectorException:", ex); + OM.LOG.info("Expected ConnectorException:", ex); //$NON-NLS-1$ assertEquals(true, ex.getCause() instanceof NegotiationException); } } @@ -432,7 +432,7 @@ public class TCPConnectorTest extends AbstractOMTest acceptor.getConfig().setBufferProvider(bufferPool); acceptor.getConfig().setReceiveExecutor(threadPool); acceptor.setSelector(selector); - acceptor.setAddress("0.0.0.0"); + acceptor.setAddress("0.0.0.0"); //$NON-NLS-1$ acceptor.setPort(2036); acceptor.activate(); @@ -440,18 +440,18 @@ public class TCPConnectorTest extends AbstractOMTest connector.getConfig().setBufferProvider(bufferPool); connector.getConfig().setReceiveExecutor(threadPool); connector.setSelector(selector); - connector.setHost("localhost"); + connector.setHost("localhost"); //$NON-NLS-1$ connector.setPort(2036); - connector.setUserID("SHOULD_FAIL_LATER"); + connector.setUserID("SHOULD_FAIL_LATER"); //$NON-NLS-1$ try { connector.connect(); - fail("ConnectorException expected"); + fail("ConnectorException expected"); //$NON-NLS-1$ } catch (ConnectorException ex) { - OM.LOG.info("Expected ConnectorException:", ex); + OM.LOG.info("Expected ConnectorException:", ex); //$NON-NLS-1$ assertEquals(true, ex.getCause() instanceof IllegalStateException); } } @@ -473,7 +473,7 @@ public class TCPConnectorTest extends AbstractOMTest acceptor.getConfig().setBufferProvider(bufferPool); acceptor.getConfig().setReceiveExecutor(threadPool); acceptor.setSelector(selector); - acceptor.setAddress("0.0.0.0"); + acceptor.setAddress("0.0.0.0"); //$NON-NLS-1$ acceptor.setPort(2036); acceptor.activate(); @@ -481,7 +481,7 @@ public class TCPConnectorTest extends AbstractOMTest connector.getConfig().setBufferProvider(bufferPool); connector.getConfig().setReceiveExecutor(threadPool); connector.setSelector(selector); - connector.setHost("localhost"); + connector.setHost("localhost"); //$NON-NLS-1$ connector.setPort(2036); connector.connect(); @@ -495,11 +495,11 @@ public class TCPConnectorTest extends AbstractOMTest try { connector.getConfig().setNegotiator(responseNegotiator); - fail("IllegalStateException expected"); + fail("IllegalStateException expected"); //$NON-NLS-1$ } catch (IllegalStateException ex) { - OM.LOG.info("Expected IllegalStateException:", ex); + OM.LOG.info("Expected IllegalStateException:", ex); //$NON-NLS-1$ } } } diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/TestProtocol.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/TestProtocol.java index da9a1716bb..47aed1b489 100644 --- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/TestProtocol.java +++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/TestProtocol.java @@ -30,7 +30,7 @@ public final class TestProtocol extends Protocol<CountDownLatch> public void handleBuffer(IBuffer buffer) { - IOUtil.OUT().println("BUFFER ARRIVED"); + IOUtil.OUT().println("BUFFER ARRIVED"); //$NON-NLS-1$ buffer.release(); getInfraStructure().countDown(); } diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/TinyData.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/TinyData.java index 149b62d357..83a8ab8d9a 100644 --- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/TinyData.java +++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/TinyData.java @@ -17,7 +17,7 @@ import java.util.StringTokenizer; */ public final class TinyData { - public static final String NL = System.getProperty("line.separator"); + public static final String NL = System.getProperty("line.separator"); //$NON-NLS-1$ public static StringTokenizer getTokenizer() { @@ -36,6 +36,6 @@ public final class TinyData public static String getText() { - return "COPYRIGHT (C) 2004 - 2008 EIKE STEPPER, GERMANY. ALL RIGHTS RESERVED."; + return "COPYRIGHT (C) 2004 - 2008 EIKE STEPPER, GERMANY. ALL RIGHTS RESERVED."; //$NON-NLS-1$ } } diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/bugzilla/Bugzilla241463_Test.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/bugzilla/Bugzilla241463_Test.java index 9ac3384965..ac01a56592 100644 --- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/bugzilla/Bugzilla241463_Test.java +++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/bugzilla/Bugzilla241463_Test.java @@ -66,7 +66,7 @@ public class Bugzilla241463_Test extends AbstractTransportTest try { new TestSignalProtocol(connector); - fail("Exception expected"); + fail("Exception expected"); //$NON-NLS-1$ } catch (Exception expected) { @@ -91,7 +91,7 @@ public class Bugzilla241463_Test extends AbstractTransportTest @Override public InternalChannel inverseOpenChannel(short channelIndex, String protocolID) { - throw new ImplementationError("Simulated problem"); + throw new ImplementationError("Simulated problem"); //$NON-NLS-1$ } }; } diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/defs/JVMAcceptorDefImplTest.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/defs/JVMAcceptorDefImplTest.java index 55b7970dba..ef35d0c440 100644 --- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/defs/JVMAcceptorDefImplTest.java +++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/defs/JVMAcceptorDefImplTest.java @@ -30,7 +30,7 @@ import java.util.concurrent.Executors; */ public class JVMAcceptorDefImplTest extends AbstractOMTest { - private static final String NAME = "JVMConnector1"; + private static final String NAME = "JVMConnector1"; //$NON-NLS-1$ private static final long TIMEOUT = 10000l; diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/defs/JVMConnectorDefImplTest.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/defs/JVMConnectorDefImplTest.java index 87eac59886..725871da0f 100644 --- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/defs/JVMConnectorDefImplTest.java +++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/defs/JVMConnectorDefImplTest.java @@ -30,14 +30,14 @@ import java.util.concurrent.Executors; */ public class JVMConnectorDefImplTest extends AbstractOMTest { - private static final String NAME = "test1"; + private static final String NAME = "test1"; //$NON-NLS-1$ public void testIncompleteInitializationThrowsIllegalArgumentException() { try { Net4jDefsFactory.eINSTANCE.createJVMConnectorDef().getInstance(); - fail("IllegalStateException expected!"); + fail("IllegalStateException expected!"); //$NON-NLS-1$ } catch (IllegalStateException e) { diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/defs/TCPAcceptorDefImplTest.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/defs/TCPAcceptorDefImplTest.java index fc0926507b..89a39969f0 100644 --- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/defs/TCPAcceptorDefImplTest.java +++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/defs/TCPAcceptorDefImplTest.java @@ -31,13 +31,13 @@ public class TCPAcceptorDefImplTest extends AbstractOMTest private static final long DELAY = 500; - private static final String HOST = "localhost"; + private static final String HOST = "localhost"; //$NON-NLS-1$ private static final int PORT = 2036; - private static final String USERID = "André"; + private static final String USERID = "André"; //$NON-NLS-1$ - private static final String PASSWORD = "aPassword"; + private static final String PASSWORD = "aPassword"; //$NON-NLS-1$ private TCPConnector tcpConnector; diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/defs/TCPConnectorDefImplTest.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/defs/TCPConnectorDefImplTest.java index c5c8c72c71..65d9105837 100644 --- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/defs/TCPConnectorDefImplTest.java +++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/defs/TCPConnectorDefImplTest.java @@ -32,9 +32,9 @@ public class TCPConnectorDefImplTest extends AbstractProtocolTest private static final long TIMEOUT = 10000l; - private static final String USERID = "André"; + private static final String USERID = "André"; //$NON-NLS-1$ - private static final String PASSWORD = "aPassword"; + private static final String PASSWORD = "aPassword"; //$NON-NLS-1$ private TCPAcceptor tcpAcceptor; diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/TestSignalProtocol.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/TestSignalProtocol.java index ef0bf9fe43..163600d757 100644 --- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/TestSignalProtocol.java +++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/TestSignalProtocol.java @@ -26,7 +26,7 @@ import java.rmi.AlreadyBoundException; */ public class TestSignalProtocol extends SignalProtocol<Object> { - public static final String PROTOCOL_NAME = "signal.protocol"; + public static final String PROTOCOL_NAME = "signal.protocol"; //$NON-NLS-1$ public static final short SIGNAL_INT = 1; @@ -40,7 +40,7 @@ public class TestSignalProtocol extends SignalProtocol<Object> public static final short SIGNAL_EXCEPTION = 6; - public static final String SIMULATED_EXCEPTION = "Simulated exception"; + public static final String SIMULATED_EXCEPTION = "Simulated exception"; //$NON-NLS-1$ public TestSignalProtocol(IConnector connector) { diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/AbstractOMTest.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/AbstractOMTest.java index 0b6826165b..eec23ccf41 100644 --- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/AbstractOMTest.java +++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/AbstractOMTest.java @@ -40,11 +40,11 @@ public abstract class AbstractOMTest extends TestCase enableConsole(); if (!SUPPRESS_OUTPUT) { - IOUtil.OUT().println("*******************************************************"); + IOUtil.OUT().println("*******************************************************"); //$NON-NLS-1$ sleep(1L); IOUtil.ERR().println(this); sleep(1L); - IOUtil.OUT().println("*******************************************************"); + IOUtil.OUT().println("*******************************************************"); //$NON-NLS-1$ } super.setUp(); @@ -53,7 +53,7 @@ public abstract class AbstractOMTest extends TestCase if (!SUPPRESS_OUTPUT) { IOUtil.OUT().println(); - IOUtil.OUT().println("------------------------ START ------------------------"); + IOUtil.OUT().println("------------------------ START ------------------------"); //$NON-NLS-1$ } } @@ -63,7 +63,7 @@ public abstract class AbstractOMTest extends TestCase enableConsole(); if (!SUPPRESS_OUTPUT) { - IOUtil.OUT().println("------------------------- END -------------------------"); + IOUtil.OUT().println("------------------------- END -------------------------"); //$NON-NLS-1$ IOUtil.OUT().println(); } @@ -86,7 +86,7 @@ public abstract class AbstractOMTest extends TestCase } catch (SkipTestException ex) { - OM.LOG.info("Skipped " + this); + OM.LOG.info("Skipped " + this); //$NON-NLS-1$ } catch (Throwable t) { @@ -108,7 +108,7 @@ public abstract class AbstractOMTest extends TestCase } catch (SkipTestException ex) { - OM.LOG.info("Skipped " + this); + OM.LOG.info("Skipped " + this); //$NON-NLS-1$ } catch (RuntimeException ex) { @@ -200,7 +200,7 @@ public abstract class AbstractOMTest extends TestCase { if (consoleEnabled) { - IOUtil.OUT().println("--> " + m); + IOUtil.OUT().println("--> " + m); //$NON-NLS-1$ } } } diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/ExtendedIOTest.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/ExtendedIOTest.java index 45ee3437b3..cf5fe16d89 100644 --- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/ExtendedIOTest.java +++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/ExtendedIOTest.java @@ -120,33 +120,33 @@ public class ExtendedIOTest extends AbstractOMTest private HashMap<String, String> createMap() { HashMap<String, String> map = new HashMap<String, String>(); - putMap(map, "org.eclipse.net4j.util.io.CachedFileMap.java"); - putMap(map, "org.eclipse.net4j.util.io.CloseableIterator.java"); - putMap(map, "org.eclipse.net4j.util.io.DataInputExtender.java"); - putMap(map, "org.eclipse.net4j.util.io.DataOutputExtender.java"); - putMap(map, "org.eclipse.net4j.util.io.DelegatingInputStream.java"); - putMap(map, "org.eclipse.net4j.util.io.DelegatingOutputStream.java"); - putMap(map, "org.eclipse.net4j.util.io.DelegatingStreamWrapper.java"); - putMap(map, "org.eclipse.net4j.util.io.ExtendedDataInput.java"); - putMap(map, "org.eclipse.net4j.util.io.ExtendedDataInputStream.java"); - putMap(map, "org.eclipse.net4j.util.io.ExtendedDataOutput.java"); - putMap(map, "org.eclipse.net4j.util.io.ExtendedDataOutputStream.java"); - putMap(map, "org.eclipse.net4j.util.io.ExtendedIOUtil.java"); - putMap(map, "org.eclipse.net4j.util.io.GZIPStreamWrapper.java"); - putMap(map, "org.eclipse.net4j.util.io.IOFilter.java"); - putMap(map, "org.eclipse.net4j.util.io.IORunnable.java"); - putMap(map, "org.eclipse.net4j.util.io.IORuntimeException.java"); - putMap(map, "org.eclipse.net4j.util.io.IOUtil.java"); - putMap(map, "org.eclipse.net4j.util.io.IOVisitor.java"); - putMap(map, "org.eclipse.net4j.util.io.IStreamWrapper.java"); - putMap(map, "org.eclipse.net4j.util.io.NIOUtil.java"); - putMap(map, "org.eclipse.net4j.util.io.SortedFileMap.java"); - putMap(map, "org.eclipse.net4j.util.io.StreamWrapperChain.java"); - putMap(map, "org.eclipse.net4j.util.io.TMPUtil.java"); - putMap(map, "org.eclipse.net4j.util.io.XORInputStream.java"); - putMap(map, "org.eclipse.net4j.util.io.XOROutputStream.java"); - putMap(map, "org.eclipse.net4j.util.io.XORStreamWrapper.java"); - putMap(map, "org.eclipse.net4j.util.io.ZIPUtil.java"); + putMap(map, "org.eclipse.net4j.util.io.CachedFileMap.java"); //$NON-NLS-1$ + putMap(map, "org.eclipse.net4j.util.io.CloseableIterator.java"); //$NON-NLS-1$ + putMap(map, "org.eclipse.net4j.util.io.DataInputExtender.java"); //$NON-NLS-1$ + putMap(map, "org.eclipse.net4j.util.io.DataOutputExtender.java"); //$NON-NLS-1$ + putMap(map, "org.eclipse.net4j.util.io.DelegatingInputStream.java"); //$NON-NLS-1$ + putMap(map, "org.eclipse.net4j.util.io.DelegatingOutputStream.java"); //$NON-NLS-1$ + putMap(map, "org.eclipse.net4j.util.io.DelegatingStreamWrapper.java"); //$NON-NLS-1$ + putMap(map, "org.eclipse.net4j.util.io.ExtendedDataInput.java"); //$NON-NLS-1$ + putMap(map, "org.eclipse.net4j.util.io.ExtendedDataInputStream.java"); //$NON-NLS-1$ + putMap(map, "org.eclipse.net4j.util.io.ExtendedDataOutput.java"); //$NON-NLS-1$ + putMap(map, "org.eclipse.net4j.util.io.ExtendedDataOutputStream.java"); //$NON-NLS-1$ + putMap(map, "org.eclipse.net4j.util.io.ExtendedIOUtil.java"); //$NON-NLS-1$ + putMap(map, "org.eclipse.net4j.util.io.GZIPStreamWrapper.java"); //$NON-NLS-1$ + putMap(map, "org.eclipse.net4j.util.io.IOFilter.java"); //$NON-NLS-1$ + putMap(map, "org.eclipse.net4j.util.io.IORunnable.java"); //$NON-NLS-1$ + putMap(map, "org.eclipse.net4j.util.io.IORuntimeException.java"); //$NON-NLS-1$ + putMap(map, "org.eclipse.net4j.util.io.IOUtil.java"); //$NON-NLS-1$ + putMap(map, "org.eclipse.net4j.util.io.IOVisitor.java"); //$NON-NLS-1$ + putMap(map, "org.eclipse.net4j.util.io.IStreamWrapper.java"); //$NON-NLS-1$ + putMap(map, "org.eclipse.net4j.util.io.NIOUtil.java"); //$NON-NLS-1$ + putMap(map, "org.eclipse.net4j.util.io.SortedFileMap.java"); //$NON-NLS-1$ + putMap(map, "org.eclipse.net4j.util.io.StreamWrapperChain.java"); //$NON-NLS-1$ + putMap(map, "org.eclipse.net4j.util.io.TMPUtil.java"); //$NON-NLS-1$ + putMap(map, "org.eclipse.net4j.util.io.XORInputStream.java"); //$NON-NLS-1$ + putMap(map, "org.eclipse.net4j.util.io.XOROutputStream.java"); //$NON-NLS-1$ + putMap(map, "org.eclipse.net4j.util.io.XORStreamWrapper.java"); //$NON-NLS-1$ + putMap(map, "org.eclipse.net4j.util.io.ZIPUtil.java"); //$NON-NLS-1$ return map; } diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/MonitorTest.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/MonitorTest.java index 8589c3bf38..b0d46c38e6 100644 --- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/MonitorTest.java +++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/MonitorTest.java @@ -25,7 +25,7 @@ public class MonitorTest extends AbstractOMTest { OMMonitor monitor = new Monitor(); monitor.worked(); - fail("IllegalStateException expected"); + fail("IllegalStateException expected"); //$NON-NLS-1$ } catch (IllegalStateException ex) { @@ -36,7 +36,7 @@ public class MonitorTest extends AbstractOMTest { OMMonitor monitor = new Monitor(); monitor.fork(); - fail("IllegalStateException expected"); + fail("IllegalStateException expected"); //$NON-NLS-1$ } catch (IllegalStateException ex) { @@ -48,7 +48,7 @@ public class MonitorTest extends AbstractOMTest { OMMonitor monitor = new Monitor(); async = monitor.forkAsync(); - fail("IllegalStateException expected"); + fail("IllegalStateException expected"); //$NON-NLS-1$ } catch (IllegalStateException ex) { @@ -69,7 +69,7 @@ public class MonitorTest extends AbstractOMTest { OMMonitor monitor = new Monitor().begin().fork(); monitor.worked(); - fail("IllegalStateException expected"); + fail("IllegalStateException expected"); //$NON-NLS-1$ } catch (IllegalStateException ex) { @@ -80,7 +80,7 @@ public class MonitorTest extends AbstractOMTest { OMMonitor monitor = new Monitor().begin().fork(); monitor.fork(); - fail("IllegalStateException expected"); + fail("IllegalStateException expected"); //$NON-NLS-1$ } catch (IllegalStateException ex) { @@ -92,7 +92,7 @@ public class MonitorTest extends AbstractOMTest { OMMonitor monitor = new Monitor().begin().fork(); async = monitor.forkAsync(); - fail("IllegalStateException expected"); + fail("IllegalStateException expected"); //$NON-NLS-1$ } catch (IllegalStateException ex) { diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/MultiMapTest.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/MultiMapTest.java index 9cd686343f..da0159ce68 100644 --- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/MultiMapTest.java +++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/MultiMapTest.java @@ -30,14 +30,14 @@ public class MultiMapTest extends AbstractOMTest assertEquals(true, multiMap.isEmpty()); assertEquals(0, multiMap.size()); assertEquals(false, multiMap.containsKey(1)); - assertEquals(false, multiMap.containsValue("value" + 1)); + assertEquals(false, multiMap.containsValue("value" + 1)); //$NON-NLS-1$ assertEquals(null, multiMap.get(1)); addDelegate(multiMap, 0, 0); assertEquals(true, multiMap.isEmpty()); assertEquals(0, multiMap.size()); assertEquals(false, multiMap.containsKey(1)); - assertEquals(false, multiMap.containsValue("value" + 1)); + assertEquals(false, multiMap.containsValue("value" + 1)); //$NON-NLS-1$ assertEquals(null, multiMap.get(1)); addDelegate(multiMap, 1, 10); @@ -46,27 +46,27 @@ public class MultiMapTest extends AbstractOMTest assertEquals(false, multiMap.isEmpty()); assertEquals(30, multiMap.size()); assertEquals(true, multiMap.containsKey(1)); - assertEquals(true, multiMap.containsValue("value" + 1)); - assertEquals("value" + 1, multiMap.get(1)); - assertEquals("value" + 6, multiMap.get(6)); + assertEquals(true, multiMap.containsValue("value" + 1)); //$NON-NLS-1$ + assertEquals("value" + 1, multiMap.get(1)); //$NON-NLS-1$ + assertEquals("value" + 6, multiMap.get(6)); //$NON-NLS-1$ addDelegate(multiMap, 6, 10); assertEquals(false, multiMap.isEmpty()); assertEquals(30, multiMap.size()); assertEquals(true, multiMap.containsKey(1)); - assertEquals(true, multiMap.containsValue("value" + 1)); - assertEquals("value" + 1, multiMap.get(1)); - assertEquals("value" + 6, multiMap.get(6)); + assertEquals(true, multiMap.containsValue("value" + 1)); //$NON-NLS-1$ + assertEquals("value" + 1, multiMap.get(1)); //$NON-NLS-1$ + assertEquals("value" + 6, multiMap.get(6)); //$NON-NLS-1$ assertEquals(null, multiMap.get(35)); addDelegate(multiMap, 26, 10); assertEquals(false, multiMap.isEmpty()); assertEquals(35, multiMap.size()); assertEquals(true, multiMap.containsKey(1)); - assertEquals(true, multiMap.containsValue("value" + 1)); - assertEquals("value" + 1, multiMap.get(1)); - assertEquals("value" + 6, multiMap.get(6)); - assertEquals("value" + 35, multiMap.get(35)); + assertEquals(true, multiMap.containsValue("value" + 1)); //$NON-NLS-1$ + assertEquals("value" + 1, multiMap.get(1)); //$NON-NLS-1$ + assertEquals("value" + 6, multiMap.get(6)); //$NON-NLS-1$ + assertEquals("value" + 35, multiMap.get(35)); //$NON-NLS-1$ } public void testEntrySet() throws Exception @@ -74,31 +74,31 @@ public class MultiMapTest extends AbstractOMTest ListBased<Integer, String> multiMap = new ListBased<Integer, String>(); assertEquals(true, multiMap.entrySet().isEmpty()); assertEquals(0, multiMap.entrySet().size()); - assertEquals(false, multiMap.entrySet().contains(new MapEntry<Integer, String>(1, "value1"))); + assertEquals(false, multiMap.entrySet().contains(new MapEntry<Integer, String>(1, "value1"))); //$NON-NLS-1$ addDelegate(multiMap, 0, 0); assertEquals(true, multiMap.entrySet().isEmpty()); assertEquals(0, multiMap.entrySet().size()); - assertEquals(false, multiMap.entrySet().contains(new MapEntry<Integer, String>(1, "value1"))); + assertEquals(false, multiMap.entrySet().contains(new MapEntry<Integer, String>(1, "value1"))); //$NON-NLS-1$ addDelegate(multiMap, 1, 10); addDelegate(multiMap, 11, 10); addDelegate(multiMap, 21, 10); assertEquals(false, multiMap.entrySet().isEmpty()); assertEquals(30, multiMap.entrySet().size()); - assertEquals(true, multiMap.entrySet().contains(new MapEntry<Integer, String>(1, "value1"))); + assertEquals(true, multiMap.entrySet().contains(new MapEntry<Integer, String>(1, "value1"))); //$NON-NLS-1$ addDelegate(multiMap, 6, 10); assertEquals(false, multiMap.entrySet().isEmpty()); assertEquals(30, multiMap.entrySet().size()); - assertEquals(true, multiMap.entrySet().contains(new MapEntry<Integer, String>(1, "value1"))); - assertEquals(false, multiMap.entrySet().contains(new MapEntry<Integer, String>(35, "value35"))); + assertEquals(true, multiMap.entrySet().contains(new MapEntry<Integer, String>(1, "value1"))); //$NON-NLS-1$ + assertEquals(false, multiMap.entrySet().contains(new MapEntry<Integer, String>(35, "value35"))); //$NON-NLS-1$ addDelegate(multiMap, 26, 10); assertEquals(false, multiMap.entrySet().isEmpty()); assertEquals(35, multiMap.entrySet().size()); - assertEquals(true, multiMap.entrySet().contains(new MapEntry<Integer, String>(1, "value1"))); - assertEquals(true, multiMap.entrySet().contains(new MapEntry<Integer, String>(35, "value35"))); + assertEquals(true, multiMap.entrySet().contains(new MapEntry<Integer, String>(1, "value1"))); //$NON-NLS-1$ + assertEquals(true, multiMap.entrySet().contains(new MapEntry<Integer, String>(35, "value35"))); //$NON-NLS-1$ } public void testKeySet() throws Exception @@ -138,31 +138,31 @@ public class MultiMapTest extends AbstractOMTest ListBased<Integer, String> multiMap = new ListBased<Integer, String>(); assertEquals(true, multiMap.values().isEmpty()); assertEquals(0, multiMap.values().size()); - assertEquals(false, multiMap.values().contains("value1")); + assertEquals(false, multiMap.values().contains("value1")); //$NON-NLS-1$ addDelegate(multiMap, 0, 0); assertEquals(true, multiMap.values().isEmpty()); assertEquals(0, multiMap.values().size()); - assertEquals(false, multiMap.values().contains("value1")); + assertEquals(false, multiMap.values().contains("value1")); //$NON-NLS-1$ addDelegate(multiMap, 1, 10); addDelegate(multiMap, 11, 10); addDelegate(multiMap, 21, 10); assertEquals(false, multiMap.values().isEmpty()); assertEquals(30, multiMap.values().size()); - assertEquals(true, multiMap.values().contains("value1")); + assertEquals(true, multiMap.values().contains("value1")); //$NON-NLS-1$ addDelegate(multiMap, 6, 10); assertEquals(false, multiMap.values().isEmpty()); assertEquals(30, multiMap.values().size()); - assertEquals(true, multiMap.values().contains("value1")); - assertEquals(false, multiMap.values().contains("value35")); + assertEquals(true, multiMap.values().contains("value1")); //$NON-NLS-1$ + assertEquals(false, multiMap.values().contains("value35")); //$NON-NLS-1$ addDelegate(multiMap, 26, 10); assertEquals(false, multiMap.values().isEmpty()); assertEquals(35, multiMap.values().size()); - assertEquals(true, multiMap.values().contains("value1")); - assertEquals(true, multiMap.values().contains("value35")); + assertEquals(true, multiMap.values().contains("value1")); //$NON-NLS-1$ + assertEquals(true, multiMap.values().contains("value35")); //$NON-NLS-1$ } public void testEntrySetIterator() throws Exception @@ -231,7 +231,7 @@ public class MultiMapTest extends AbstractOMTest for (int i = 0; i < count; i++) { int key = start + i; - map.put(key, "value" + key); + map.put(key, "value" + key); //$NON-NLS-1$ } multiMap.getDelegates().add(map); @@ -243,13 +243,13 @@ public class MultiMapTest extends AbstractOMTest { if (!expectedObjects.remove(actualObject)) { - fail("Unexpected object: " + actualObject); + fail("Unexpected object: " + actualObject); //$NON-NLS-1$ } } if (!expectedObjects.isEmpty()) { - fail("Missing objects: " + expectedObjects); + fail("Missing objects: " + expectedObjects); //$NON-NLS-1$ } } @@ -259,7 +259,7 @@ public class MultiMapTest extends AbstractOMTest for (int i = 0; i < count; i++) { int key = start + i; - result.add(new MapEntry<Integer, String>(key, "value" + key)); + result.add(new MapEntry<Integer, String>(key, "value" + key)); //$NON-NLS-1$ } return result; @@ -283,7 +283,7 @@ public class MultiMapTest extends AbstractOMTest for (int i = 0; i < count; i++) { int key = start + i; - result.add("value" + key); + result.add("value" + key); //$NON-NLS-1$ } return result; diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/OMTest.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/OMTest.java index f53cbed53c..ed97617ee4 100644 --- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/OMTest.java +++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/OMTest.java @@ -34,7 +34,7 @@ public class OMTest IOUtil.OUT().println(baseUrl); IOUtil.OUT().println(); - InputStream stream = bundle.getInputStream("/plugin.xml"); + InputStream stream = bundle.getInputStream("/plugin.xml"); //$NON-NLS-1$ try { diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/ReferenceValueMapTest.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/ReferenceValueMapTest.java index ebea51d097..50b07ae534 100644 --- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/ReferenceValueMapTest.java +++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/ReferenceValueMapTest.java @@ -22,9 +22,9 @@ public class ReferenceValueMapTest extends AbstractOMTest ReferenceValueMap<String, Object> map = new ReferenceValueMap.Weak<String, Object>(); for (int i = 0; i < 10; i++) { - map.put("SIMON", new Object()); + map.put("SIMON", new Object()); //$NON-NLS-1$ System.gc(); - map.put("SIMON", new Object()); + map.put("SIMON", new Object()); //$NON-NLS-1$ assertEquals(true, map.size() >= 0); } } @@ -34,9 +34,9 @@ public class ReferenceValueMapTest extends AbstractOMTest ReferenceValueMap<String, Object> map = new ReferenceValueMap.Weak<String, Object>(); for (int i = 0; i < 10; i++) { - map.put("SIMON", new Object()); + map.put("SIMON", new Object()); //$NON-NLS-1$ System.gc(); - map.put("SIMON2", new Object()); + map.put("SIMON2", new Object()); //$NON-NLS-1$ assertEquals(true, map.size() >= 1); } } diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/SecurityTest.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/SecurityTest.java index ab8a32fe71..742a185664 100644 --- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/SecurityTest.java +++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/SecurityTest.java @@ -33,11 +33,11 @@ public class SecurityTest extends AbstractOMTest { private static final int TIMEOUT = 1000; - private static final String USER_ID = "stepper"; + private static final String USER_ID = "stepper"; //$NON-NLS-1$ - private static final char[] PASSWORD1 = "eike2007".toCharArray(); + private static final char[] PASSWORD1 = "eike2007".toCharArray(); //$NON-NLS-1$ - private static final char[] PASSWORD2 = "invalid".toCharArray(); + private static final char[] PASSWORD2 = "invalid".toCharArray(); //$NON-NLS-1$ private static final PasswordCredentials CREDENTIALS = new PasswordCredentials(USER_ID, PASSWORD1); @@ -66,12 +66,12 @@ public class SecurityTest extends AbstractOMTest // Prepare challenge context challengeContext.setPeer(responseContext); - Thread challengeThread = new Thread(challengeContext, "challengeThread"); + Thread challengeThread = new Thread(challengeContext, "challengeThread"); //$NON-NLS-1$ challengeThread.start(); // Prepare response context responseContext.setPeer(challengeContext); - Thread responseThread = new Thread(responseContext, "responseThread"); + Thread responseThread = new Thread(responseContext, "responseThread"); //$NON-NLS-1$ responseThread.start(); // Prepare response negotiator @@ -118,12 +118,12 @@ public class SecurityTest extends AbstractOMTest // Prepare challenge context challengeContext.setPeer(responseContext); - Thread challengeThread = new Thread(challengeContext, "challengeThread"); + Thread challengeThread = new Thread(challengeContext, "challengeThread"); //$NON-NLS-1$ challengeThread.start(); // Prepare response context responseContext.setPeer(challengeContext); - Thread responseThread = new Thread(responseContext, "responseThread"); + Thread responseThread = new Thread(responseContext, "responseThread"); //$NON-NLS-1$ responseThread.start(); // Prepare response negotiator diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/SortedFileMapTest.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/SortedFileMapTest.java index 09ef1dec3f..9d3feee6a5 100644 --- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/SortedFileMapTest.java +++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/SortedFileMapTest.java @@ -25,7 +25,7 @@ public class SortedFileMapTest extends AbstractOMTest { public void testMap() throws Exception { - File file = new File("testMap.dat"); + File file = new File("testMap.dat"); //$NON-NLS-1$ if (file.exists()) { file.delete(); @@ -38,7 +38,7 @@ public class SortedFileMapTest extends AbstractOMTest map = new TestMap(file); for (int i = 0; i < 500; i++) { - map.put(i, "Value " + i); + map.put(i, "Value " + i); //$NON-NLS-1$ } for (int i = 0; i < 500; i++) @@ -60,7 +60,7 @@ public class SortedFileMapTest extends AbstractOMTest { public TestMap(File file) { - super(file, "rw"); + super(file, "rw"); //$NON-NLS-1$ } @Override @@ -99,7 +99,7 @@ public class SortedFileMapTest extends AbstractOMTest byte[] bytes = value.getBytes(); if (bytes.length + 4 > getValueSize()) { - throw new IllegalArgumentException("Value size of " + getValueSize() + " exceeded: " + value); + throw new IllegalArgumentException("Value size of " + getValueSize() + " exceeded: " + value); //$NON-NLS-1$ //$NON-NLS-2$ } out.writeByteArray(bytes); diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/SynchronizingCorrelatorTest.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/SynchronizingCorrelatorTest.java index 06aa00052d..ffcce03ebb 100644 --- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/SynchronizingCorrelatorTest.java +++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/SynchronizingCorrelatorTest.java @@ -27,16 +27,16 @@ public class SynchronizingCorrelatorTest extends AbstractOMTest @Override public void run() { - ISynchronizer<Boolean> eike = correlator.correlate("eike"); + ISynchronizer<Boolean> eike = correlator.correlate("eike"); //$NON-NLS-1$ result[0] = eike.get(5000); - msg("RESULT: " + result[0]); + msg("RESULT: " + result[0]); //$NON-NLS-1$ } }; consumer.start(); sleep(50); - correlator.put("eike", true); + correlator.put("eike", true); //$NON-NLS-1$ consumer.join(1000); assertEquals(Boolean.TRUE, result[0]); } @@ -58,17 +58,17 @@ public class SynchronizingCorrelatorTest extends AbstractOMTest @Override public void run() { - ISynchronizer<Boolean> eike = correlator.correlate("eike"); + ISynchronizer<Boolean> eike = correlator.correlate("eike"); //$NON-NLS-1$ result[0] = eike.get(5000); - msg("RESULT: " + result[0]); + msg("RESULT: " + result[0]); //$NON-NLS-1$ } }; consumer.start(); Thread.sleep(10); - boolean consumed = correlator.put("eike", true, 1000); - msg("Consumed: " + consumed); + boolean consumed = correlator.put("eike", true, 1000); //$NON-NLS-1$ + msg("Consumed: " + consumed); //$NON-NLS-1$ assertEquals(true, consumed); consumer.join(1000); @@ -87,16 +87,16 @@ public class SynchronizingCorrelatorTest extends AbstractOMTest { final Boolean[] result = { false }; final SynchronizingCorrelator<String, Boolean> correlator = new SynchronizingCorrelator<String, Boolean>(); - correlator.put("eike", true); + correlator.put("eike", true); //$NON-NLS-1$ final Thread consumer = new Thread() { @Override public void run() { - ISynchronizer<Boolean> eike = correlator.correlate("eike"); + ISynchronizer<Boolean> eike = correlator.correlate("eike"); //$NON-NLS-1$ result[0] = eike.get(5000); - msg("RESULT: " + result[0]); + msg("RESULT: " + result[0]); //$NON-NLS-1$ } }; @@ -119,8 +119,8 @@ public class SynchronizingCorrelatorTest extends AbstractOMTest { final Boolean[] result = { false }; final SynchronizingCorrelator<String, Boolean> correlator = new SynchronizingCorrelator<String, Boolean>(); - boolean consumed = correlator.put("eike", true, 50); - msg("Consumed: " + consumed); + boolean consumed = correlator.put("eike", true, 50); //$NON-NLS-1$ + msg("Consumed: " + consumed); //$NON-NLS-1$ assertEquals(false, consumed); final Thread consumer = new Thread() @@ -128,9 +128,9 @@ public class SynchronizingCorrelatorTest extends AbstractOMTest @Override public void run() { - ISynchronizer<Boolean> eike = correlator.correlate("eike"); + ISynchronizer<Boolean> eike = correlator.correlate("eike"); //$NON-NLS-1$ result[0] = eike.get(5000); - msg("RESULT: " + result[0]); + msg("RESULT: " + result[0]); //$NON-NLS-1$ } }; diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/UTFTest.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/UTFTest.java index f4a812f833..5723b0950b 100644 --- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/UTFTest.java +++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/UTFTest.java @@ -23,7 +23,7 @@ public class UTFTest extends AbstractOMTest public void testUTF8_OneOctet() throws Exception { final int MAX = UNSIGNED_SHORT_MAX / 10 + 1; - String part = "0123456789"; + String part = "0123456789"; //$NON-NLS-1$ assertEquals(10, part.length()); StringBuilder builder = new StringBuilder(); @@ -39,7 +39,7 @@ public class UTFTest extends AbstractOMTest DataOutputStream dos = new DataOutputStream(baos); dos.writeUTF(str); - String received = baos.toString("UTF-8"); + String received = baos.toString("UTF-8"); //$NON-NLS-1$ assertEquals(str, received); } @@ -49,7 +49,7 @@ public class UTFTest extends AbstractOMTest StringBuilder builder = new StringBuilder(); for (int i = 0; i < MAX; i++) { - builder.append("\u6771"); + builder.append("\u6771"); //$NON-NLS-1$ } String str = builder.toString(); @@ -59,7 +59,7 @@ public class UTFTest extends AbstractOMTest DataOutputStream dos = new DataOutputStream(baos); dos.writeUTF(str); - String received = baos.toString("UTF-8"); + String received = baos.toString("UTF-8"); //$NON-NLS-1$ assertEquals(str, received); } } diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/ZipTest.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/ZipTest.java index 946ff9e4b0..7c308f003a 100644 --- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/ZipTest.java +++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/ZipTest.java @@ -22,8 +22,8 @@ public class ZipTest extends AbstractOMTest { public void testZip() throws Exception { - File zipFile = newFile("src.zip"); - File sourceFolder = newFile("src"); + File zipFile = newFile("src.zip"); //$NON-NLS-1$ + File sourceFolder = newFile("src"); //$NON-NLS-1$ ZIPUtil.zip(sourceFolder, false, zipFile); } diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/cache/Revision.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/cache/Revision.java index 499e9a2c78..9417247a80 100644 --- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/cache/Revision.java +++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/cache/Revision.java @@ -55,13 +55,13 @@ public class Revision @Override public String toString() { - return "R" + id + "v" + version; + return "R" + id + "v" + version; //$NON-NLS-1$ //$NON-NLS-2$ } @Override protected void finalize() throws Throwable { - IOUtil.ERR().println("FINALIZE " + this); + IOUtil.ERR().println("FINALIZE " + this); //$NON-NLS-1$ revisionManager.finalizeRevision(this); } } diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/cache/RevisionManager.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/cache/RevisionManager.java index afbd70a201..c616cb4cfb 100644 --- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/cache/RevisionManager.java +++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/cache/RevisionManager.java @@ -141,7 +141,7 @@ public class RevisionManager extends Cache<Revision> @Override public String toString() { - return "R" + id + "v" + version + (get() == null ? "" : " UNCLEARED"); + return "R" + id + "v" + version + (get() == null ? "" : " UNCLEARED"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ } } } diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/cache/SensitiveProtoTest.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/cache/SensitiveProtoTest.java index bd341993dd..544760253b 100644 --- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/cache/SensitiveProtoTest.java +++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/cache/SensitiveProtoTest.java @@ -46,7 +46,7 @@ public class SensitiveProtoTest extends AbstractOMTest while ((ref = (KeyedAndValuedWeakReference<Integer, String>)queue.poll()) != null) { int i = ref.getKey(); - System.out.println("Dequeued i=" + i); + System.out.println("Dequeued i=" + i); //$NON-NLS-1$ if (i < 10) { map.put(i, new KeyedAndValuedWeakReference<Integer, String>(i, ref.getValue(), queue)); diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/defs/DefsPackage.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/defs/DefsPackage.java index a59fe1dbec..de69f792af 100644 --- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/defs/DefsPackage.java +++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/defs/DefsPackage.java @@ -39,21 +39,21 @@ public interface DefsPackage extends EPackage * * @generated */ - String eNAME = "defs"; + String eNAME = "defs"; //$NON-NLS-1$ /** * The package namespace URI. <!-- begin-user-doc --> <!-- end-user-doc --> * * @generated */ - String eNS_URI = "http://www.eclipse.org/NET4J/defs/tests/1.0.0"; + String eNS_URI = "http://www.eclipse.org/NET4J/defs/tests/1.0.0"; //$NON-NLS-1$ /** * The package namespace name. <!-- begin-user-doc --> <!-- end-user-doc --> * * @generated */ - String eNS_PREFIX = "net4j.defs.tests"; + String eNS_PREFIX = "net4j.defs.tests"; //$NON-NLS-1$ /** * The singleton instance of the package. <!-- begin-user-doc --> <!-- end-user-doc --> diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/defs/TestDefTest.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/defs/TestDefTest.java index da360c0bf8..6a19b26c52 100644 --- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/defs/TestDefTest.java +++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/defs/TestDefTest.java @@ -74,7 +74,7 @@ public class TestDefTest extends AbstractOMTest @Override protected Object createInstance() { - return new String(""); + return new String(""); //$NON-NLS-1$ } }; @@ -96,7 +96,7 @@ public class TestDefTest extends AbstractOMTest @Override protected Object createInstance() { - return new String(""); + return new String(""); //$NON-NLS-1$ } }; @@ -109,7 +109,7 @@ public class TestDefTest extends AbstractOMTest { TestDef def = createTestDef(); assertTrue(!def.isTouched()); - def.setAttribute("aValue"); + def.setAttribute("aValue"); //$NON-NLS-1$ assertTrue(def.isTouched()); def.getInstance(); // clears touched assertTrue(!def.isTouched()); @@ -132,7 +132,7 @@ public class TestDefTest extends AbstractOMTest def.getReferences().add(referencedDef); assertTrue(!referencedDef.isTouched()); - referencedDef.setAttribute("newValue"); + referencedDef.setAttribute("newValue"); //$NON-NLS-1$ assertTrue(referencedDef.isTouched()); assertTrue(def.isTouched()); } @@ -215,7 +215,7 @@ public class TestDefTest extends AbstractOMTest { if (isTimeout(startTime)) { - throw new IllegalStateException("was not deactivated while waiting for '" + WAIT_TIMEOUT + "'!"); + throw new IllegalStateException("was not deactivated while waiting for '" + WAIT_TIMEOUT + "'!"); //$NON-NLS-1$ //$NON-NLS-2$ } reentrantLock.wait(WAIT_TIMEOUT); diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/defs/TestDefsPackage.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/defs/TestDefsPackage.java index b91d3d93f5..27c66ce673 100644 --- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/defs/TestDefsPackage.java +++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/defs/TestDefsPackage.java @@ -39,21 +39,21 @@ public interface TestDefsPackage extends EPackage * * @generated */ - String eNAME = "defs"; + String eNAME = "defs"; //$NON-NLS-1$ /** * The package namespace URI. <!-- begin-user-doc --> <!-- end-user-doc --> * * @generated */ - String eNS_URI = "http://www.eclipse.org/NET4J/defs/tests/1.0.0"; + String eNS_URI = "http://www.eclipse.org/NET4J/defs/tests/1.0.0"; //$NON-NLS-1$ /** * The package namespace name. <!-- begin-user-doc --> <!-- end-user-doc --> * * @generated */ - String eNS_PREFIX = "net4j.defs.tests"; + String eNS_PREFIX = "net4j.defs.tests"; //$NON-NLS-1$ /** * The singleton instance of the package. <!-- begin-user-doc --> <!-- end-user-doc --> diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/defs/impl/DefsFactoryImpl.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/defs/impl/DefsFactoryImpl.java index 51ebcc9b7c..e1a308e5d6 100644 --- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/defs/impl/DefsFactoryImpl.java +++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/defs/impl/DefsFactoryImpl.java @@ -38,7 +38,7 @@ public class DefsFactoryImpl extends EFactoryImpl implements DefsFactory try { DefsFactory theDefsFactory = (DefsFactory)EPackage.Registry.INSTANCE - .getEFactory("http://www.eclipse.org/NET4J/defs/tests/1.0.0"); + .getEFactory("http://www.eclipse.org/NET4J/defs/tests/1.0.0"); //$NON-NLS-1$ if (theDefsFactory != null) { return theDefsFactory; @@ -74,7 +74,7 @@ public class DefsFactoryImpl extends EFactoryImpl implements DefsFactory case DefsPackage.TEST_DEF: return createTestDef(); default: - throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); + throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$ } } diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/defs/impl/DefsPackageImpl.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/defs/impl/DefsPackageImpl.java index 6561350fe5..551757d01f 100644 --- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/defs/impl/DefsPackageImpl.java +++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/defs/impl/DefsPackageImpl.java @@ -213,11 +213,11 @@ public class DefsPackageImpl extends EPackageImpl implements DefsPackage testDefEClass.getESuperTypes().add(theNet4jUtilDefsPackage.getDef()); // Initialize classes and features; add operations and parameters - initEClass(testDefEClass, TestDef.class, "TestDef", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getTestDef_References(), theNet4jUtilDefsPackage.getDef(), null, "references", null, 0, -1, + initEClass(testDefEClass, TestDef.class, "TestDef", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$ + initEReference(getTestDef_References(), theNet4jUtilDefsPackage.getDef(), null, "references", null, 0, -1, //$NON-NLS-1$ TestDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEAttribute(getTestDef_Attribute(), ecorePackage.getEString(), "attribute", null, 0, 1, TestDef.class, + initEAttribute(getTestDef_Attribute(), ecorePackage.getEString(), "attribute", null, 0, 1, TestDef.class, //$NON-NLS-1$ !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); // Create resource diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/defs/impl/TestDefImpl.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/defs/impl/TestDefImpl.java index d529579725..5b4c6695df 100644 --- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/defs/impl/TestDefImpl.java +++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/defs/impl/TestDefImpl.java @@ -221,7 +221,7 @@ public class TestDefImpl extends DefImpl implements TestDef } StringBuffer result = new StringBuffer(super.toString()); - result.append(" (attribute: "); + result.append(" (attribute: "); //$NON-NLS-1$ result.append(attribute); result.append(')'); return result.toString(); @@ -230,7 +230,7 @@ public class TestDefImpl extends DefImpl implements TestDef @Override protected Object createInstance() { - return new String("TestDefStringInstance"); + return new String("TestDefStringInstance"); //$NON-NLS-1$ } } // TestDefImpl diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/defs/impl/TestDefsFactoryImpl.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/defs/impl/TestDefsFactoryImpl.java index 7e309d5bdf..514cbb8955 100644 --- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/defs/impl/TestDefsFactoryImpl.java +++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/defs/impl/TestDefsFactoryImpl.java @@ -38,7 +38,7 @@ public class TestDefsFactoryImpl extends EFactoryImpl implements TestDefsFactory try { TestDefsFactory theTestDefsFactory = (TestDefsFactory)EPackage.Registry.INSTANCE - .getEFactory("http://www.eclipse.org/NET4J/defs/tests/1.0.0"); + .getEFactory("http://www.eclipse.org/NET4J/defs/tests/1.0.0"); //$NON-NLS-1$ if (theTestDefsFactory != null) { return theTestDefsFactory; @@ -74,7 +74,7 @@ public class TestDefsFactoryImpl extends EFactoryImpl implements TestDefsFactory case TestDefsPackage.TEST_DEF: return createTestDef(); default: - throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); + throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$ } } diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/defs/impl/TestDefsPackageImpl.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/defs/impl/TestDefsPackageImpl.java index c906423338..2a92a863b5 100644 --- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/defs/impl/TestDefsPackageImpl.java +++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/defs/impl/TestDefsPackageImpl.java @@ -213,11 +213,11 @@ public class TestDefsPackageImpl extends EPackageImpl implements TestDefsPackage testDefEClass.getESuperTypes().add(theNet4jUtilDefsPackage.getDef()); // Initialize classes and features; add operations and parameters - initEClass(testDefEClass, TestDef.class, "TestDef", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getTestDef_References(), theNet4jUtilDefsPackage.getDef(), null, "references", null, 0, -1, + initEClass(testDefEClass, TestDef.class, "TestDef", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$ + initEReference(getTestDef_References(), theNet4jUtilDefsPackage.getDef(), null, "references", null, 0, -1, //$NON-NLS-1$ TestDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEAttribute(getTestDef_Attribute(), ecorePackage.getEString(), "attribute", null, 0, 1, TestDef.class, + initEAttribute(getTestDef_Attribute(), ecorePackage.getEString(), "attribute", null, 0, 1, TestDef.class, //$NON-NLS-1$ !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); // Create resource diff --git a/plugins/org.eclipse.net4j.ui.defs/src/org/eclipse/net4j/ui/defs/Net4JUIDefsPackage.java b/plugins/org.eclipse.net4j.ui.defs/src/org/eclipse/net4j/ui/defs/Net4JUIDefsPackage.java index 10cfcc22b5..66320ed250 100644 --- a/plugins/org.eclipse.net4j.ui.defs/src/org/eclipse/net4j/ui/defs/Net4JUIDefsPackage.java +++ b/plugins/org.eclipse.net4j.ui.defs/src/org/eclipse/net4j/ui/defs/Net4JUIDefsPackage.java @@ -37,21 +37,21 @@ public interface Net4JUIDefsPackage extends EPackage * * @generated */ - String eNAME = "defs"; + String eNAME = "defs"; //$NON-NLS-1$ /** * The package namespace URI. <!-- begin-user-doc --> <!-- end-user-doc --> * * @generated */ - String eNS_URI = "http://www.eclipse.org/NET4J/ui/defs/1.0.0"; + String eNS_URI = "http://www.eclipse.org/NET4J/ui/defs/1.0.0"; //$NON-NLS-1$ /** * The package namespace name. <!-- begin-user-doc --> <!-- end-user-doc --> * * @generated */ - String eNS_PREFIX = "net4j.ui.defs"; + String eNS_PREFIX = "net4j.ui.defs"; //$NON-NLS-1$ /** * The singleton instance of the package. <!-- begin-user-doc --> <!-- end-user-doc --> diff --git a/plugins/org.eclipse.net4j.ui.defs/src/org/eclipse/net4j/ui/defs/impl/Net4JUIDefsFactoryImpl.java b/plugins/org.eclipse.net4j.ui.defs/src/org/eclipse/net4j/ui/defs/impl/Net4JUIDefsFactoryImpl.java index 0240b29dfd..30a94c5405 100644 --- a/plugins/org.eclipse.net4j.ui.defs/src/org/eclipse/net4j/ui/defs/impl/Net4JUIDefsFactoryImpl.java +++ b/plugins/org.eclipse.net4j.ui.defs/src/org/eclipse/net4j/ui/defs/impl/Net4JUIDefsFactoryImpl.java @@ -38,7 +38,7 @@ public class Net4JUIDefsFactoryImpl extends EFactoryImpl implements Net4JUIDefsF try { Net4JUIDefsFactory theNet4JUIDefsFactory = (Net4JUIDefsFactory)EPackage.Registry.INSTANCE - .getEFactory("http://www.eclipse.org/NET4J/ui/defs/1.0.0"); + .getEFactory("http://www.eclipse.org/NET4J/ui/defs/1.0.0"); //$NON-NLS-1$ if (theNet4JUIDefsFactory != null) { return theNet4JUIDefsFactory; @@ -75,7 +75,7 @@ public class Net4JUIDefsFactoryImpl extends EFactoryImpl implements Net4JUIDefsF case Net4JUIDefsPackage.INTERACTIVE_CREDENTIALS_PROVIDER_DEF: return createInteractiveCredentialsProviderDef(); default: - throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); + throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$ } } diff --git a/plugins/org.eclipse.net4j.ui.defs/src/org/eclipse/net4j/ui/defs/impl/Net4JUIDefsPackageImpl.java b/plugins/org.eclipse.net4j.ui.defs/src/org/eclipse/net4j/ui/defs/impl/Net4JUIDefsPackageImpl.java index 0974779a17..6b4fc503b6 100644 --- a/plugins/org.eclipse.net4j.ui.defs/src/org/eclipse/net4j/ui/defs/impl/Net4JUIDefsPackageImpl.java +++ b/plugins/org.eclipse.net4j.ui.defs/src/org/eclipse/net4j/ui/defs/impl/Net4JUIDefsPackageImpl.java @@ -184,7 +184,7 @@ public class Net4JUIDefsPackageImpl extends EPackageImpl implements Net4JUIDefsP // Initialize classes and features; add operations and parameters initEClass(interactiveCredentialsProviderDefEClass, InteractiveCredentialsProviderDef.class, - "InteractiveCredentialsProviderDef", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + "InteractiveCredentialsProviderDef", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$ // Create resource createResource(eNS_URI); diff --git a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/Net4jUtilDefsPackage.java b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/Net4jUtilDefsPackage.java index 7e5823d267..53d2a8502f 100644 --- a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/Net4jUtilDefsPackage.java +++ b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/Net4jUtilDefsPackage.java @@ -37,21 +37,21 @@ public interface Net4jUtilDefsPackage extends EPackage * * @generated */ - String eNAME = "defs"; + String eNAME = "defs"; //$NON-NLS-1$ /** * The package namespace URI. <!-- begin-user-doc --> <!-- end-user-doc --> * * @generated */ - String eNS_URI = "http://www.eclipse.org/NET4J/util/defs/1.0.0"; + String eNS_URI = "http://www.eclipse.org/NET4J/util/defs/1.0.0"; //$NON-NLS-1$ /** * The package namespace name. <!-- begin-user-doc --> <!-- end-user-doc --> * * @generated */ - String eNS_PREFIX = "net4j.util.defs"; + String eNS_PREFIX = "net4j.util.defs"; //$NON-NLS-1$ /** * The singleton instance of the package. <!-- begin-user-doc --> <!-- end-user-doc --> diff --git a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/Net4jUtilDefsFactoryImpl.java b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/Net4jUtilDefsFactoryImpl.java index dbe2006c1f..20f6831517 100644 --- a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/Net4jUtilDefsFactoryImpl.java +++ b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/Net4jUtilDefsFactoryImpl.java @@ -45,7 +45,7 @@ public class Net4jUtilDefsFactoryImpl extends EFactoryImpl implements Net4jUtilD try { Net4jUtilDefsFactory theNet4jUtilDefsFactory = (Net4jUtilDefsFactory)EPackage.Registry.INSTANCE - .getEFactory("http://www.eclipse.org/NET4J/util/defs/1.0.0"); + .getEFactory("http://www.eclipse.org/NET4J/util/defs/1.0.0"); //$NON-NLS-1$ if (theNet4jUtilDefsFactory != null) { return theNet4jUtilDefsFactory; @@ -95,7 +95,7 @@ public class Net4jUtilDefsFactoryImpl extends EFactoryImpl implements Net4jUtilD case Net4jUtilDefsPackage.CHALLENGE_NEGOTIATOR_DEF: return createChallengeNegotiatorDef(); default: - throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); + throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$ } } diff --git a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/Net4jUtilDefsPackageImpl.java b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/Net4jUtilDefsPackageImpl.java index 4eaccd882d..4465e5393f 100644 --- a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/Net4jUtilDefsPackageImpl.java +++ b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/Net4jUtilDefsPackageImpl.java @@ -548,77 +548,77 @@ public class Net4jUtilDefsPackageImpl extends EPackageImpl implements Net4jUtilD challengeNegotiatorDefEClass.getESuperTypes().add(this.getNegotiatorDef()); // Initialize classes and features; add operations and parameters - initEClass(defContainerEClass, DefContainer.class, "DefContainer", !IS_ABSTRACT, !IS_INTERFACE, + initEClass(defContainerEClass, DefContainer.class, "DefContainer", !IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$ IS_GENERATED_INSTANCE_CLASS); - initEReference(getDefContainer_Definitions(), this.getDef(), null, "definitions", null, 1, -1, DefContainer.class, + initEReference(getDefContainer_Definitions(), this.getDef(), null, "definitions", null, 1, -1, DefContainer.class, //$NON-NLS-1$ !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getDefContainer_DefaultDefinition(), this.getDef(), null, "defaultDefinition", null, 0, 1, + initEReference(getDefContainer_DefaultDefinition(), this.getDef(), null, "defaultDefinition", null, 0, 1, //$NON-NLS-1$ DefContainer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEClass(defEClass, Def.class, "Def", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEClass(defEClass, Def.class, "Def", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$ - addEOperation(defEClass, ecorePackage.getEJavaObject(), "getInstance", 0, 1, IS_UNIQUE, IS_ORDERED); + addEOperation(defEClass, ecorePackage.getEJavaObject(), "getInstance", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$ - addEOperation(defEClass, null, "unsetInstance", 0, 1, IS_UNIQUE, IS_ORDERED); + addEOperation(defEClass, null, "unsetInstance", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$ - initEClass(executorServiceDefEClass, ExecutorServiceDef.class, "ExecutorServiceDef", IS_ABSTRACT, !IS_INTERFACE, + initEClass(executorServiceDefEClass, ExecutorServiceDef.class, "ExecutorServiceDef", IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$ IS_GENERATED_INSTANCE_CLASS); - initEClass(threadPoolDefEClass, ThreadPoolDef.class, "ThreadPoolDef", !IS_ABSTRACT, !IS_INTERFACE, + initEClass(threadPoolDefEClass, ThreadPoolDef.class, "ThreadPoolDef", !IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$ IS_GENERATED_INSTANCE_CLASS); - initEClass(randomizerDefEClass, RandomizerDef.class, "RandomizerDef", !IS_ABSTRACT, !IS_INTERFACE, + initEClass(randomizerDefEClass, RandomizerDef.class, "RandomizerDef", !IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$ IS_GENERATED_INSTANCE_CLASS); - initEAttribute(getRandomizerDef_AlgorithmName(), ecorePackage.getEString(), "algorithmName", null, 0, 1, + initEAttribute(getRandomizerDef_AlgorithmName(), ecorePackage.getEString(), "algorithmName", null, 0, 1, //$NON-NLS-1$ RandomizerDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEAttribute(getRandomizerDef_ProviderName(), ecorePackage.getEString(), "providerName", null, 0, 1, + initEAttribute(getRandomizerDef_ProviderName(), ecorePackage.getEString(), "providerName", null, 0, 1, //$NON-NLS-1$ RandomizerDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEAttribute(getRandomizerDef_Seed(), ecorePackage.getEByteArray(), "seed", null, 0, 1, RandomizerDef.class, + initEAttribute(getRandomizerDef_Seed(), ecorePackage.getEByteArray(), "seed", null, 0, 1, RandomizerDef.class, //$NON-NLS-1$ !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEClass(userManagerDefEClass, UserManagerDef.class, "UserManagerDef", !IS_ABSTRACT, !IS_INTERFACE, + initEClass(userManagerDefEClass, UserManagerDef.class, "UserManagerDef", !IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$ IS_GENERATED_INSTANCE_CLASS); - initEReference(getUserManagerDef_User(), this.getUser(), null, "user", null, 1, -1, UserManagerDef.class, + initEReference(getUserManagerDef_User(), this.getUser(), null, "user", null, 1, -1, UserManagerDef.class, //$NON-NLS-1$ !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEClass(userEClass, User.class, "User", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEAttribute(getUser_UserID(), ecorePackage.getEString(), "userID", null, 0, 1, User.class, !IS_TRANSIENT, + initEClass(userEClass, User.class, "User", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$ + initEAttribute(getUser_UserID(), ecorePackage.getEString(), "userID", null, 0, 1, User.class, !IS_TRANSIENT, //$NON-NLS-1$ !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEAttribute(getUser_Password(), ecorePackage.getEString(), "password", null, 0, 1, User.class, !IS_TRANSIENT, + initEAttribute(getUser_Password(), ecorePackage.getEString(), "password", null, 0, 1, User.class, !IS_TRANSIENT, //$NON-NLS-1$ !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(passwordCredentialsProviderDefEClass, PasswordCredentialsProviderDef.class, - "PasswordCredentialsProviderDef", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEAttribute(getPasswordCredentialsProviderDef_Password(), ecorePackage.getEString(), "password", null, 0, 1, + "PasswordCredentialsProviderDef", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$ + initEAttribute(getPasswordCredentialsProviderDef_Password(), ecorePackage.getEString(), "password", null, 0, 1, //$NON-NLS-1$ PasswordCredentialsProviderDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEClass(credentialsProviderDefEClass, CredentialsProviderDef.class, "CredentialsProviderDef", IS_ABSTRACT, + initEClass(credentialsProviderDefEClass, CredentialsProviderDef.class, "CredentialsProviderDef", IS_ABSTRACT, //$NON-NLS-1$ !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEAttribute(getCredentialsProviderDef_UserID(), ecorePackage.getEString(), "userID", null, 0, 1, + initEAttribute(getCredentialsProviderDef_UserID(), ecorePackage.getEString(), "userID", null, 0, 1, //$NON-NLS-1$ CredentialsProviderDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEClass(negotiatorDefEClass, NegotiatorDef.class, "NegotiatorDef", IS_ABSTRACT, !IS_INTERFACE, + initEClass(negotiatorDefEClass, NegotiatorDef.class, "NegotiatorDef", IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$ IS_GENERATED_INSTANCE_CLASS); - initEClass(responseNegotiatorDefEClass, ResponseNegotiatorDef.class, "ResponseNegotiatorDef", !IS_ABSTRACT, + initEClass(responseNegotiatorDefEClass, ResponseNegotiatorDef.class, "ResponseNegotiatorDef", !IS_ABSTRACT, //$NON-NLS-1$ !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEReference(getResponseNegotiatorDef_CredentialsProvider(), this.getCredentialsProviderDef(), null, - "credentialsProvider", null, 0, 1, ResponseNegotiatorDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, + "credentialsProvider", null, 0, 1, ResponseNegotiatorDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, //$NON-NLS-1$ !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEClass(challengeNegotiatorDefEClass, ChallengeNegotiatorDef.class, "ChallengeNegotiatorDef", !IS_ABSTRACT, + initEClass(challengeNegotiatorDefEClass, ChallengeNegotiatorDef.class, "ChallengeNegotiatorDef", !IS_ABSTRACT, //$NON-NLS-1$ !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getChallengeNegotiatorDef_UserManager(), this.getUserManagerDef(), null, "userManager", null, 0, 1, + initEReference(getChallengeNegotiatorDef_UserManager(), this.getUserManagerDef(), null, "userManager", null, 0, 1, //$NON-NLS-1$ ChallengeNegotiatorDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getChallengeNegotiatorDef_Randomizer(), this.getRandomizerDef(), null, "randomizer", null, 0, 1, + initEReference(getChallengeNegotiatorDef_Randomizer(), this.getRandomizerDef(), null, "randomizer", null, 0, 1, //$NON-NLS-1$ ChallengeNegotiatorDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); diff --git a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/ThreadPoolDefImpl.java b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/ThreadPoolDefImpl.java index 6b4a3030f2..2c696423ba 100644 --- a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/ThreadPoolDefImpl.java +++ b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/ThreadPoolDefImpl.java @@ -31,7 +31,7 @@ import java.util.concurrent.ThreadFactory; public class ThreadPoolDefImpl extends ExecutorServiceDefImpl implements ThreadPoolDef { - private static final String THREADGROUP_IDENTIFIER = "net4j"; + private static final String THREADGROUP_IDENTIFIER = "net4j"; //$NON-NLS-1$ /** * <!-- begin-user-doc --> <!-- end-user-doc --> |