diff options
Diffstat (limited to 'plugins/org.eclipse.net4j/src/org/eclipse')
176 files changed, 1142 insertions, 196 deletions
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/bundle/AbstractOMBundle.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/bundle/AbstractOMBundle.java index 2d9bb487ed..8ae99c1546 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/bundle/AbstractOMBundle.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/bundle/AbstractOMBundle.java @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004-2007 Eike Stepper, Germany. + * Copyright (c) 2004 - 2007 Eike Stepper, Germany. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/bundle/AbstractOMPlatform.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/bundle/AbstractOMPlatform.java index f71d1a7579..b48fa3283f 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/bundle/AbstractOMPlatform.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/bundle/AbstractOMPlatform.java @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004-2007 Eike Stepper, Germany. + * Copyright (c) 2004 - 2007 Eike Stepper, Germany. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/bundle/LegacyBundle.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/bundle/LegacyBundle.java index 8728da56d8..ccbe2aabd8 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/bundle/LegacyBundle.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/bundle/LegacyBundle.java @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004-2007 Eike Stepper, Germany. + * Copyright (c) 2004 - 2007 Eike Stepper, Germany. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/bundle/LegacyPlatform.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/bundle/LegacyPlatform.java index 55892af2a3..9d60b6ea58 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/bundle/LegacyPlatform.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/bundle/LegacyPlatform.java @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004-2007 Eike Stepper, Germany. + * Copyright (c) 2004 - 2007 Eike Stepper, Germany. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/bundle/Net4j.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/bundle/Net4j.java index 74ad1659fb..5966d48bc2 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/bundle/Net4j.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/bundle/Net4j.java @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004-2007 Eike Stepper, Germany. + * Copyright (c) 2004 - 2007 Eike Stepper, Germany. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/bundle/OMLoggerImpl.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/bundle/OMLoggerImpl.java index 3afe0a8df5..28167d4789 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/bundle/OMLoggerImpl.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/bundle/OMLoggerImpl.java @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004-2007 Eike Stepper, Germany. + * Copyright (c) 2004 - 2007 Eike Stepper, Germany. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/bundle/OMTraceHandlerEventImpl.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/bundle/OMTraceHandlerEventImpl.java index ac75e3c9c5..b9511e9290 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/bundle/OMTraceHandlerEventImpl.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/bundle/OMTraceHandlerEventImpl.java @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004-2007 Eike Stepper, Germany. + * Copyright (c) 2004 - 2007 Eike Stepper, Germany. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/bundle/OMTracerImpl.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/bundle/OMTracerImpl.java index 59bfe3d743..2572172653 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/bundle/OMTracerImpl.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/bundle/OMTracerImpl.java @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004-2007 Eike Stepper, Germany. + * Copyright (c) 2004 - 2007 Eike Stepper, Germany. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/bundle/OSGiBundle.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/bundle/OSGiBundle.java index 881430eb72..c14bd0a8ac 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/bundle/OSGiBundle.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/bundle/OSGiBundle.java @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004-2007 Eike Stepper, Germany. + * Copyright (c) 2004 - 2007 Eike Stepper, Germany. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/bundle/OSGiPlatform.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/bundle/OSGiPlatform.java index 64c70c49bb..4b1c7bf67b 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/bundle/OSGiPlatform.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/bundle/OSGiPlatform.java @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004-2007 Eike Stepper, Germany. + * Copyright (c) 2004 - 2007 Eike Stepper, Germany. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/bundle/PluginTransportContainer.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/bundle/PluginTransportContainer.java index 3d708ee89f..309e753622 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/bundle/PluginTransportContainer.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/bundle/PluginTransportContainer.java @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004, 2005, 2006 Eike Stepper, Germany. + * Copyright (c) 2004 - 2007 Eike Stepper, Germany. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/Acceptor.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/Acceptor.java index 7079565ae7..e22a25da78 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/Acceptor.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/Acceptor.java @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004-2007 Eike Stepper, Germany. + * Copyright (c) 2004 - 2007 Eike Stepper, Germany. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/AcceptorFactory.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/AcceptorFactory.java index 3336e8d828..1841aad2e2 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/AcceptorFactory.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/AcceptorFactory.java @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004-2007 Eike Stepper, Germany. + * Copyright (c) 2004 - 2007 Eike Stepper, Germany. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/Buffer.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/Buffer.java index 6c5ee57fc9..df50333a7a 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/Buffer.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/Buffer.java @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004-2007 Eike Stepper, Germany. + * Copyright (c) 2004 - 2007 Eike Stepper, Germany. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/BufferFactory.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/BufferFactory.java index 45f772fb64..d977e0b7a0 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/BufferFactory.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/BufferFactory.java @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004-2007 Eike Stepper, Germany. + * Copyright (c) 2004 - 2007 Eike Stepper, Germany. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/BufferPool.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/BufferPool.java index a666a5fa32..f97339a3e5 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/BufferPool.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/BufferPool.java @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004-2007 Eike Stepper, Germany. + * Copyright (c) 2004 - 2007 Eike Stepper, Germany. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/BufferProvider.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/BufferProvider.java index 801a1bef4a..160d445d98 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/BufferProvider.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/BufferProvider.java @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004-2007 Eike Stepper, Germany. + * Copyright (c) 2004 - 2007 Eike Stepper, Germany. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/BufferUtil.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/BufferUtil.java index 456a11fadc..e64ad1a5c0 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/BufferUtil.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/BufferUtil.java @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004-2007 Eike Stepper, Germany. + * Copyright (c) 2004 - 2007 Eike Stepper, Germany. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/Channel.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/Channel.java index 1b3209b95d..b971b25c59 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/Channel.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/Channel.java @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004-2007 Eike Stepper, Germany. + * Copyright (c) 2004 - 2007 Eike Stepper, Germany. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -20,7 +20,6 @@ import org.eclipse.net4j.transport.IConnector; import org.eclipse.net4j.util.ObjectUtil; import org.eclipse.net4j.util.concurrent.IWorkSerializer; import org.eclipse.net4j.util.om.trace.ContextTracer; -import org.eclipse.net4j.util.registry.IRegistry; import org.eclipse.internal.net4j.bundle.Net4j; import org.eclipse.internal.net4j.util.Value; @@ -56,8 +55,6 @@ public class Channel extends Lifecycle implements IChannel, IBufferProvider private Queue<IBuffer> sendQueue; - public IRegistry<IChannelID, IChannel> channelRegistry; - public Channel(ExecutorService receiveExecutor) { this.receiveExecutor = receiveExecutor; @@ -113,16 +110,6 @@ public class Channel extends Lifecycle implements IChannel, IBufferProvider return sendQueue; } - public IRegistry<IChannelID, IChannel> getChannelRegistry() - { - return channelRegistry; - } - - public void setChannelRegistry(IRegistry<IChannelID, IChannel> channelRegistry) - { - this.channelRegistry = channelRegistry; - } - public IBufferHandler getReceiveHandler() { return receiveHandler; @@ -145,6 +132,7 @@ public class Channel extends Lifecycle implements IChannel, IBufferProvider public void close() { + connector.removeChannel(this, true); deactivate(); } @@ -234,23 +222,11 @@ public class Channel extends Lifecycle implements IChannel, IBufferProvider { receiveSerializer = new AsynchronousWorkSerializer(receiveExecutor); } - - if (!isInternal() && channelRegistry != null) - { - channelRegistry.put(getID(), this); - channelRegistry.commit(); - } } @Override protected void doDeactivate() throws Exception { - if (!isInternal() && channelRegistry != null) - { - channelRegistry.remove(getID()); - channelRegistry.commit(); - } - receiveSerializer = null; if (sendQueue != null) { diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/ClientProtocolFactory.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/ClientProtocolFactory.java index 5b4daf2ac2..f13ea1791c 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/ClientProtocolFactory.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/ClientProtocolFactory.java @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004-2007 Eike Stepper, Germany. + * Copyright (c) 2004 - 2007 Eike Stepper, Germany. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/Connector.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/Connector.java index 14faebf8ca..29e5f31f6d 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/Connector.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/Connector.java @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004-2007 Eike Stepper, Germany. + * Copyright (c) 2004 - 2007 Eike Stepper, Germany. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -65,8 +65,8 @@ public abstract class Connector extends Lifecycle implements IConnector /** * An optional executor to be used by the {@link IChannel}s to process their - * {@link Channel#receiveQueue} instead of the current thread. If not <code>null</code> the - * sender and the receiver peers become decoupled. + * {@link Channel#receiveQueue} instead of the current thread. If not + * <code>null</code> the sender and the receiver peers become decoupled. * <p> */ private ExecutorService receiveExecutor; @@ -86,7 +86,7 @@ public abstract class Connector extends Lifecycle implements IConnector { if (kind == IContainerDelta.Kind.REMOVED) { - removeChannel((Channel)element); + removeChannel((Channel)element, false); } return new ConnectorChannelsEvent((IConnector)container, (IChannel)element, kind); @@ -453,7 +453,7 @@ public abstract class Connector extends Lifecycle implements IConnector } } - protected boolean removeChannel(Channel channel) + protected boolean removeChannel(Channel channel, boolean actively) { synchronized (channels) { diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/ConnectorCredentials.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/ConnectorCredentials.java index 7dca39f1c1..a1c8e908fe 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/ConnectorCredentials.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/ConnectorCredentials.java @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004-2007 Eike Stepper, Germany. + * Copyright (c) 2004 - 2007 Eike Stepper, Germany. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/ConnectorFactory.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/ConnectorFactory.java index 538d22ace2..adebfc1fd4 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/ConnectorFactory.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/ConnectorFactory.java @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004-2007 Eike Stepper, Germany. + * Copyright (c) 2004 - 2007 Eike Stepper, Germany. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/DescriptionUtil.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/DescriptionUtil.java index 022451e8ff..0168bc5012 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/DescriptionUtil.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/DescriptionUtil.java @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004-2007 Eike Stepper, Germany. + * Copyright (c) 2004 - 2007 Eike Stepper, Germany. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/Protocol.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/Protocol.java index 724476a837..112cfa8b3d 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/Protocol.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/Protocol.java @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004-2007 Eike Stepper, Germany. + * Copyright (c) 2004 - 2007 Eike Stepper, Germany. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/ServerProtocolFactory.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/ServerProtocolFactory.java index a359d4caeb..cb22a75761 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/ServerProtocolFactory.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/ServerProtocolFactory.java @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004-2007 Eike Stepper, Germany. + * Copyright (c) 2004 - 2007 Eike Stepper, Germany. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/TransportContainer.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/TransportContainer.java index 1650a03e6b..1450f71672 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/TransportContainer.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/transport/TransportContainer.java @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004, 2005, 2006 Eike Stepper, Germany. + * Copyright (c) 2004 - 2007 Eike Stepper, Germany. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/HashBag.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/HashBag.java index 43e0ffe7e6..0654754088 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/HashBag.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/HashBag.java @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004-2007 Eike Stepper, Germany. + * Copyright (c) 2004 - 2007 Eike Stepper, Germany. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/Value.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/Value.java index 6b4450bf44..484357c4d6 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/Value.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/Value.java @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004-2007 Eike Stepper, Germany. + * Copyright (c) 2004 - 2007 Eike Stepper, Germany. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/concurrent/AsynchronousWorkSerializer.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/concurrent/AsynchronousWorkSerializer.java index dab84fda87..7d1387b215 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/concurrent/AsynchronousWorkSerializer.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/concurrent/AsynchronousWorkSerializer.java @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004-2007 Eike Stepper, Germany. + * Copyright (c) 2004 - 2007 Eike Stepper, Germany. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/concurrent/NamedExecutorService.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/concurrent/NamedExecutorService.java index c9aaeda555..d5121b553f 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/concurrent/NamedExecutorService.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/concurrent/NamedExecutorService.java @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004, 2005, 2006 Eike Stepper, Germany. + * Copyright (c) 2004 - 2007 Eike Stepper, Germany. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/concurrent/ResultSynchronizer.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/concurrent/ResultSynchronizer.java index 26477c2db0..0eb4ffc2e6 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/concurrent/ResultSynchronizer.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/concurrent/ResultSynchronizer.java @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004-2007 Eike Stepper, Germany. + * Copyright (c) 2004 - 2007 Eike Stepper, Germany. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/concurrent/RoundRobinList.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/concurrent/RoundRobinList.java new file mode 100644 index 0000000000..acb3e854b3 --- /dev/null +++ b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/concurrent/RoundRobinList.java @@ -0,0 +1,502 @@ +package org.eclipse.internal.net4j.util.concurrent; + +import java.util.Collection; +import java.util.Iterator; +import java.util.LinkedList; +import java.util.List; +import java.util.concurrent.locks.ReadWriteLock; +import java.util.concurrent.locks.ReentrantReadWriteLock; + +/** + * @author Eike Stepper + */ +public final class RoundRobinList<E> extends LinkedList<E> +{ + private static final long serialVersionUID = 1L; + + private ReadWriteLock lock = new ReentrantReadWriteLock(); + + private Iterator<E> it; + + public RoundRobinList() + { + } + + public RoundRobinList(Collection c) + { + super(c); + } + + public void executeReads(Runnable runnable) + { + try + { + lock.readLock().lock(); + runnable.run(); + } + finally + { + lock.readLock().unlock(); + } + } + + public void executeWrites(Runnable runnable) + { + try + { + lock.writeLock().lock(); + runnable.run(); + } + finally + { + lock.writeLock().unlock(); + } + } + + @Override + public void add(int index, E element) + { + try + { + lock.writeLock().lock(); + super.add(index, element); + it = null; + } + finally + { + lock.writeLock().unlock(); + } + } + + @Override + public boolean add(E o) + { + try + { + lock.writeLock().lock(); + it = null; + return super.add(o); + } + finally + { + lock.writeLock().unlock(); + } + } + + @Override + public boolean addAll(Collection<? extends E> c) + { + try + { + lock.writeLock().lock(); + it = null; + return super.addAll(c); + } + finally + { + lock.writeLock().unlock(); + } + } + + @Override + public boolean addAll(int index, Collection<? extends E> c) + { + try + { + lock.writeLock().lock(); + it = null; + return super.addAll(index, c); + } + finally + { + lock.writeLock().unlock(); + } + } + + @Override + public void addFirst(E o) + { + try + { + lock.writeLock().lock(); + it = null; + super.addFirst(o); + } + finally + { + lock.writeLock().unlock(); + } + } + + @Override + public void addLast(E o) + { + try + { + lock.writeLock().lock(); + it = null; + super.addLast(o); + } + finally + { + lock.writeLock().unlock(); + } + } + + @Override + public void clear() + { + try + { + lock.writeLock().lock(); + it = null; + super.clear(); + } + finally + { + lock.writeLock().unlock(); + } + } + + @Override + public Object clone() + { + try + { + lock.readLock().lock(); + return super.clone(); + } + finally + { + lock.readLock().unlock(); + } + } + + @Override + public boolean contains(Object o) + { + try + { + lock.readLock().lock(); + return super.contains(o); + } + finally + { + lock.readLock().unlock(); + } + } + + @Override + public boolean containsAll(Collection<?> c) + { + try + { + lock.readLock().lock(); + return super.containsAll(c); + } + finally + { + lock.readLock().unlock(); + } + } + + @Override + public E element() + { + try + { + lock.readLock().lock(); + if (isEmpty()) + { + return null; + } + + if (it == null || !it.hasNext()) + { + it = iterator(); + } + + return it.next(); + } + finally + { + lock.readLock().unlock(); + } + } + + @Override + public E get(int index) + { + try + { + lock.readLock().lock(); + return super.get(index); + } + finally + { + lock.readLock().unlock(); + } + } + + @Override + public E getFirst() + { + try + { + lock.readLock().lock(); + return super.getFirst(); + } + finally + { + lock.readLock().unlock(); + } + } + + @Override + public E getLast() + { + try + { + lock.readLock().lock(); + return super.getLast(); + } + finally + { + lock.readLock().unlock(); + } + } + + @Override + public int indexOf(Object o) + { + try + { + lock.readLock().lock(); + return super.indexOf(o); + } + finally + { + lock.readLock().unlock(); + } + } + + @Override + public int lastIndexOf(Object o) + { + try + { + lock.readLock().lock(); + return super.lastIndexOf(o); + } + finally + { + lock.readLock().unlock(); + } + } + + @Override + public boolean offer(E o) + { + try + { + lock.writeLock().lock(); + it = null; + return super.offer(o); + } + finally + { + lock.writeLock().unlock(); + } + } + + @Override + public E peek() + { + try + { + lock.readLock().lock(); + return super.peek(); + } + finally + { + lock.readLock().unlock(); + } + } + + @Override + public E poll() + { + try + { + lock.writeLock().lock(); + it = null; + return super.poll(); + } + finally + { + lock.writeLock().unlock(); + } + } + + @Override + public E remove() + { + try + { + lock.writeLock().lock(); + it = null; + return super.remove(); + } + finally + { + lock.writeLock().unlock(); + } + } + + @Override + public E remove(int index) + { + try + { + lock.writeLock().lock(); + it = null; + return super.remove(index); + } + finally + { + lock.writeLock().unlock(); + } + } + + @Override + public boolean remove(Object o) + { + try + { + lock.writeLock().lock(); + it = null; + return super.remove(o); + } + finally + { + lock.writeLock().unlock(); + } + } + + @Override + public boolean removeAll(Collection<?> c) + { + try + { + lock.writeLock().lock(); + it = null; + return super.removeAll(c); + } + finally + { + lock.writeLock().unlock(); + } + } + + @Override + public E removeFirst() + { + try + { + lock.writeLock().lock(); + it = null; + return super.removeFirst(); + } + finally + { + lock.writeLock().unlock(); + } + } + + @Override + public E removeLast() + { + try + { + lock.writeLock().lock(); + it = null; + return super.removeLast(); + } + finally + { + lock.writeLock().unlock(); + } + } + + @Override + public boolean retainAll(Collection<?> c) + { + try + { + lock.writeLock().lock(); + it = null; + return super.retainAll(c); + } + finally + { + lock.writeLock().unlock(); + } + } + + @Override + public E set(int index, E element) + { + try + { + lock.writeLock().lock(); + it = null; + return super.set(index, element); + } + finally + { + lock.writeLock().unlock(); + } + } + + @Override + public List<E> subList(int fromIndex, int toIndex) + { + try + { + lock.readLock().lock(); + return super.subList(fromIndex, toIndex); + } + finally + { + lock.readLock().unlock(); + } + } + + @Override + public Object[] toArray() + { + try + { + lock.readLock().lock(); + return super.toArray(); + } + finally + { + lock.readLock().unlock(); + } + } + + @Override + public <T> T[] toArray(T[] a) + { + try + { + lock.readLock().lock(); + return super.toArray(a); + } + finally + { + lock.readLock().unlock(); + } + } +}
\ No newline at end of file diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/concurrent/SynchronizingCorrelator.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/concurrent/SynchronizingCorrelator.java index 760df73f2c..239695a512 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/concurrent/SynchronizingCorrelator.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/concurrent/SynchronizingCorrelator.java @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004-2007 Eike Stepper, Germany. + * Copyright (c) 2004 - 2007 Eike Stepper, Germany. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/concurrent/SynchronousWorkSerializer.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/concurrent/SynchronousWorkSerializer.java index f385f7824d..f1b692d4bd 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/concurrent/SynchronousWorkSerializer.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/concurrent/SynchronousWorkSerializer.java @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004-2007 Eike Stepper, Germany. + * Copyright (c) 2004 - 2007 Eike Stepper, Germany. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/container/ContainerDelta.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/container/ContainerDelta.java index 46d18b2158..e8c7b0f67f 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/container/ContainerDelta.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/container/ContainerDelta.java @@ -1,3 +1,13 @@ +/*************************************************************************** + * Copyright (c) 2004 - 2007 Eike Stepper, Germany. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Eike Stepper - initial API and implementation + **************************************************************************/ package org.eclipse.internal.net4j.util.container; import org.eclipse.net4j.util.container.IContainerDelta; diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/container/ContainerEvent.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/container/ContainerEvent.java index 9465c15a15..e07194256d 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/container/ContainerEvent.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/container/ContainerEvent.java @@ -1,3 +1,13 @@ +/*************************************************************************** + * Copyright (c) 2004 - 2007 Eike Stepper, Germany. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Eike Stepper - initial API and implementation + **************************************************************************/ package org.eclipse.internal.net4j.util.container; import org.eclipse.net4j.util.container.IContainer; diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/container/ContainerEventAdapter.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/container/ContainerEventAdapter.java index ef59fdebe0..5ee460d3ed 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/container/ContainerEventAdapter.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/container/ContainerEventAdapter.java @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004-2007 Eike Stepper, Germany. + * Copyright (c) 2004 - 2007 Eike Stepper, Germany. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/container/LifecycleEventConverter.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/container/LifecycleEventConverter.java index 6948952ca5..751103ac7a 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/container/LifecycleEventConverter.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/container/LifecycleEventConverter.java @@ -1,3 +1,13 @@ +/*************************************************************************** + * Copyright (c) 2004 - 2007 Eike Stepper, Germany. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Eike Stepper - initial API and implementation + **************************************************************************/ package org.eclipse.internal.net4j.util.container; import org.eclipse.net4j.transport.IChannel; diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/container/ManagedContainer.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/container/ManagedContainer.java index 73a27ca8d7..8507761628 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/container/ManagedContainer.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/container/ManagedContainer.java @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004-2007 Eike Stepper, Germany. + * Copyright (c) 2004 - 2007 Eike Stepper, Germany. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/container/PluginElementProcessorList.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/container/PluginElementProcessorList.java index 4f0f55ed93..8359e01c67 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/container/PluginElementProcessorList.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/container/PluginElementProcessorList.java @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004, 2005, 2006 Eike Stepper, Germany. + * Copyright (c) 2004 - 2007 Eike Stepper, Germany. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/container/SingleDeltaContainerEvent.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/container/SingleDeltaContainerEvent.java index e20a730f14..b00b059f3a 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/container/SingleDeltaContainerEvent.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/container/SingleDeltaContainerEvent.java @@ -1,3 +1,13 @@ +/*************************************************************************** + * Copyright (c) 2004 - 2007 Eike Stepper, Germany. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Eike Stepper - initial API and implementation + **************************************************************************/ package org.eclipse.internal.net4j.util.container; import org.eclipse.net4j.util.container.IContainer; diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/container/delegate/AbstractDelegator.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/container/delegate/AbstractDelegator.java index 87f7a51a09..d14b68168c 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/container/delegate/AbstractDelegator.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/container/delegate/AbstractDelegator.java @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004-2007 Eike Stepper, Germany. + * Copyright (c) 2004 - 2007 Eike Stepper, Germany. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/container/delegate/ContainerBlockingQueue.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/container/delegate/ContainerBlockingQueue.java index c883a5b86c..8d2264e67b 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/container/delegate/ContainerBlockingQueue.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/container/delegate/ContainerBlockingQueue.java @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004-2007 Eike Stepper, Germany. + * Copyright (c) 2004 - 2007 Eike Stepper, Germany. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/container/delegate/ContainerCollection.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/container/delegate/ContainerCollection.java index 3f86c860fb..3666b774c3 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/container/delegate/ContainerCollection.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/container/delegate/ContainerCollection.java @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004-2007 Eike Stepper, Germany. + * Copyright (c) 2004 - 2007 Eike Stepper, Germany. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/container/delegate/ContainerList.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/container/delegate/ContainerList.java index d98aa3cec5..1371d98b54 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/container/delegate/ContainerList.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/container/delegate/ContainerList.java @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004-2007 Eike Stepper, Germany. + * Copyright (c) 2004 - 2007 Eike Stepper, Germany. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/container/delegate/ContainerMap.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/container/delegate/ContainerMap.java index 6dbb423ac6..c5c7e03294 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/container/delegate/ContainerMap.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/container/delegate/ContainerMap.java @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004-2007 Eike Stepper, Germany. + * Copyright (c) 2004 - 2007 Eike Stepper, Germany. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/container/delegate/ContainerQueue.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/container/delegate/ContainerQueue.java index ef660fe172..5a9bc0c9b9 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/container/delegate/ContainerQueue.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/container/delegate/ContainerQueue.java @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004-2007 Eike Stepper, Germany. + * Copyright (c) 2004 - 2007 Eike Stepper, Germany. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/container/delegate/ContainerSet.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/container/delegate/ContainerSet.java index f7ad84a337..375cfa27cb 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/container/delegate/ContainerSet.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/container/delegate/ContainerSet.java @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004-2007 Eike Stepper, Germany. + * Copyright (c) 2004 - 2007 Eike Stepper, Germany. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/container/delegate/ContainerSortedSet.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/container/delegate/ContainerSortedSet.java index 55e82abd77..af8b4e27da 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/container/delegate/ContainerSortedSet.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/container/delegate/ContainerSortedSet.java @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004-2007 Eike Stepper, Germany. + * Copyright (c) 2004 - 2007 Eike Stepper, Germany. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/event/Event.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/event/Event.java index b945a53d67..de3aad6315 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/event/Event.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/event/Event.java @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004-2007 Eike Stepper, Germany. + * Copyright (c) 2004 - 2007 Eike Stepper, Germany. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/event/Notifier.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/event/Notifier.java index 44dad12c53..5e33f4b233 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/event/Notifier.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/event/Notifier.java @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004-2007 Eike Stepper, Germany. + * Copyright (c) 2004 - 2007 Eike Stepper, Germany. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/factory/Factory.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/factory/Factory.java index 9ba58f29cb..02c7ce3041 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/factory/Factory.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/factory/Factory.java @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004-2007 Eike Stepper, Germany. + * Copyright (c) 2004 - 2007 Eike Stepper, Germany. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/factory/FactoryCreationException.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/factory/FactoryCreationException.java index 135f80892a..edbf9c6f50 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/factory/FactoryCreationException.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/factory/FactoryCreationException.java @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004, 2005, 2006 Eike Stepper, Germany. + * Copyright (c) 2004 - 2007 Eike Stepper, Germany. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/factory/FactoryDescriptor.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/factory/FactoryDescriptor.java index 71e988a54d..a149261889 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/factory/FactoryDescriptor.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/factory/FactoryDescriptor.java @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004, 2005, 2006 Eike Stepper, Germany. + * Copyright (c) 2004 - 2007 Eike Stepper, Germany. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/factory/FactoryKey.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/factory/FactoryKey.java index a305494362..f0247aeac7 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/factory/FactoryKey.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/factory/FactoryKey.java @@ -1,3 +1,13 @@ +/*************************************************************************** + * Copyright (c) 2004 - 2007 Eike Stepper, Germany. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Eike Stepper - initial API and implementation + **************************************************************************/ package org.eclipse.internal.net4j.util.factory; import org.eclipse.net4j.util.ObjectUtil; diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/factory/PluginFactoryRegistry.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/factory/PluginFactoryRegistry.java index 6910337236..3de63b5ec6 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/factory/PluginFactoryRegistry.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/factory/PluginFactoryRegistry.java @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004, 2005, 2006 Eike Stepper, Germany. + * Copyright (c) 2004 - 2007 Eike Stepper, Germany. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/lifecycle/Lifecycle.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/lifecycle/Lifecycle.java index 8cdd862db9..2f9f28ebe9 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/lifecycle/Lifecycle.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/lifecycle/Lifecycle.java @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004-2007 Eike Stepper, Germany. + * Copyright (c) 2004 - 2007 Eike Stepper, Germany. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/lifecycle/LifecycleEvent.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/lifecycle/LifecycleEvent.java index a59d808ec1..626ca8c6d2 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/lifecycle/LifecycleEvent.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/lifecycle/LifecycleEvent.java @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004-2007 Eike Stepper, Germany. + * Copyright (c) 2004 - 2007 Eike Stepper, Germany. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/lifecycle/LifecycleEventAdapter.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/lifecycle/LifecycleEventAdapter.java index c2b92a08d5..58354e10a9 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/lifecycle/LifecycleEventAdapter.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/lifecycle/LifecycleEventAdapter.java @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004-2007 Eike Stepper, Germany. + * Copyright (c) 2004 - 2007 Eike Stepper, Germany. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/lifecycle/QueueWorker.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/lifecycle/QueueWorker.java new file mode 100644 index 0000000000..5fbe04eb4f --- /dev/null +++ b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/lifecycle/QueueWorker.java @@ -0,0 +1,85 @@ +/*************************************************************************** + * Copyright (c) 2004 - 2007 Eike Stepper, Germany. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Eike Stepper - initial API and implementation + **************************************************************************/ +package org.eclipse.internal.net4j.util.lifecycle; + +import java.util.concurrent.BlockingQueue; +import java.util.concurrent.LinkedBlockingQueue; +import java.util.concurrent.TimeUnit; + +/** + * @author Eike Stepper + */ +public abstract class QueueWorker<E> extends Worker +{ + private BlockingQueue<E> queue; + + private long pollMillis; + + public QueueWorker() + { + setPollMillis(100); + } + + public long getPollMillis() + { + return pollMillis; + } + + public void setPollMillis(long pollMillis) + { + this.pollMillis = pollMillis; + setJoinMillis(2 * pollMillis); + } + + public boolean addWork(E element) + { + if (queue != null) + { + return queue.offer(element); + } + else + { + return false; + } + } + + @Override + protected final void work(WorkContext context) throws Exception + { + E element = queue.poll(pollMillis, TimeUnit.MILLISECONDS); + if (element != null) + { + work(context, element); + } + } + + protected abstract void work(WorkContext context, E element); + + protected BlockingQueue<E> createQueue() + { + return new LinkedBlockingQueue(); + } + + @Override + protected void doActivate() throws Exception + { + queue = createQueue(); + super.doActivate(); + } + + @Override + protected void doDeactivate() throws Exception + { + super.doDeactivate(); + queue.clear(); + queue = null; + } +} diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/lifecycle/Worker.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/lifecycle/Worker.java new file mode 100644 index 0000000000..9fcfd44586 --- /dev/null +++ b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/lifecycle/Worker.java @@ -0,0 +1,212 @@ +/*************************************************************************** + * Copyright (c) 2004 - 2007 Eike Stepper, Germany. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Eike Stepper - initial API and implementation + **************************************************************************/ +package org.eclipse.internal.net4j.util.lifecycle; + +import org.eclipse.internal.net4j.bundle.Net4j; + +/** + * @author Eike Stepper + */ +public abstract class Worker extends Lifecycle +{ + private boolean daemon; + + private long joinMillis; + + private transient WorkerThread workerThread; + + public Worker() + { + } + + public boolean isDaemon() + { + return daemon; + } + + public void setDaemon(boolean daemon) + { + this.daemon = daemon; + } + + public long getJoinMillis() + { + return joinMillis; + } + + public void setJoinMillis(long joinMillis) + { + this.joinMillis = joinMillis; + } + + @Override + protected void doActivate() throws Exception + { + super.doActivate(); + workerThread = new WorkerThread(); + workerThread.start(); + } + + @Override + protected void doDeactivate() throws Exception + { + try + { + workerThread.stopRunning(); + workerThread.interrupt(); + workerThread.join(joinMillis); + } + catch (Exception ignore) + { + } + + super.doDeactivate(); + } + + protected abstract void work(WorkContext context) throws Exception; + + /** + * @author Eike Stepper + */ + private final class WorkerThread extends Thread + { + private boolean running = true; + + public WorkerThread() + { + setDaemon(daemon); + } + + public void stopRunning() + { + running = false; + } + + @Override + public void run() + { + WorkContext context = new WorkContext(); + while (running && !isInterrupted()) + { + try + { + context.increaseCount(); + work(context); + } + catch (NextWork nextWork) + { + nextWork.pause(); + } + catch (Terminate terminate) + { + break; + } + catch (InterruptedException ex) + { + break; + } + catch (Exception ex) + { + Net4j.LOG.error(ex); + break; + } + } + + deactivate(); + } + } + + /** + * @author Eike Stepper + */ + public final class WorkContext + { + private long count; + + public WorkContext() + { + } + + public long getCount() + { + return count; + } + + public void nextWork() + { + throw new NextWork(); + } + + public void nextWork(long pauseMillis) + { + throw new NextWork(pauseMillis); + } + + public void terminate() + { + throw new Terminate(); + } + + private void increaseCount() + { + ++count; + } + } + + /** + * @author Eike Stepper + */ + private static final class NextWork extends RuntimeException + { + private static final long serialVersionUID = 1L; + + private long pauseMillis; + + public NextWork() + { + } + + public NextWork(long pauseMillis) + { + this.pauseMillis = pauseMillis; + } + + public boolean pause() + { + if (pauseMillis <= 0) + { + return true; + } + + try + { + Thread.sleep(pauseMillis); + return true; + } + catch (InterruptedException ex) + { + return false; + } + } + } + + /** + * @author Eike Stepper + */ + private static final class Terminate extends RuntimeException + { + private static final long serialVersionUID = 1L; + + public Terminate() + { + } + } +} diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/om/OSGiActivator.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/om/OSGiActivator.java index 0ac7598ce7..2d5d2b3fc8 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/om/OSGiActivator.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/om/OSGiActivator.java @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004-2007 Eike Stepper, Germany. + * Copyright (c) 2004 - 2007 Eike Stepper, Germany. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/registry/DelegatingRegistry.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/registry/DelegatingRegistry.java index 794224134b..0ae78c87f8 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/registry/DelegatingRegistry.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/registry/DelegatingRegistry.java @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004-2007 Eike Stepper, Germany. + * Copyright (c) 2004 - 2007 Eike Stepper, Germany. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/registry/HashMapDelegatingRegistry.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/registry/HashMapDelegatingRegistry.java index 8ed5eb36b1..7f73cc0a3a 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/registry/HashMapDelegatingRegistry.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/registry/HashMapDelegatingRegistry.java @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004-2007 Eike Stepper, Germany. + * Copyright (c) 2004 - 2007 Eike Stepper, Germany. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/registry/HashMapRegistry.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/registry/HashMapRegistry.java index ee0536179c..fb9a194dfd 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/registry/HashMapRegistry.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/registry/HashMapRegistry.java @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004-2007 Eike Stepper, Germany. + * Copyright (c) 2004 - 2007 Eike Stepper, Germany. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/registry/Registry.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/registry/Registry.java index bb22b62ba9..e616f51c35 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/registry/Registry.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/registry/Registry.java @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004-2007 Eike Stepper, Germany. + * Copyright (c) 2004 - 2007 Eike Stepper, Germany. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/registry/RegistryEvent.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/registry/RegistryEvent.java index a866c15b1c..6c2e957514 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/registry/RegistryEvent.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/registry/RegistryEvent.java @@ -1,3 +1,13 @@ +/*************************************************************************** + * Copyright (c) 2004 - 2007 Eike Stepper, Germany. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Eike Stepper - initial API and implementation + **************************************************************************/ package org.eclipse.internal.net4j.util.registry; import org.eclipse.net4j.util.registry.IRegistry; diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/registry/RegistryEventAdapter.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/registry/RegistryEventAdapter.java index c348a04e7d..f24d2218bc 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/registry/RegistryEventAdapter.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/registry/RegistryEventAdapter.java @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004-2007 Eike Stepper, Germany. + * Copyright (c) 2004 - 2007 Eike Stepper, Germany. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/registry/UnmodifiableRegistry.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/registry/UnmodifiableRegistry.java index e97c23ca99..0636d129f7 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/registry/UnmodifiableRegistry.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/util/registry/UnmodifiableRegistry.java @@ -1,3 +1,13 @@ +/*************************************************************************** + * Copyright (c) 2004 - 2007 Eike Stepper, Germany. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Eike Stepper - initial API and implementation + **************************************************************************/ package org.eclipse.internal.net4j.util.registry; import org.eclipse.net4j.util.event.IListener; diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/message/IMessageDeserializer.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/message/IMessageDeserializer.java index 12ab457dc2..63b59d962b 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/message/IMessageDeserializer.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/message/IMessageDeserializer.java @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004-2007 Eike Stepper, Germany. + * Copyright (c) 2004 - 2007 Eike Stepper, Germany. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/message/IMessageSerializer.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/message/IMessageSerializer.java index 4156412061..b1b89525f2 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/message/IMessageSerializer.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/message/IMessageSerializer.java @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004-2007 Eike Stepper, Germany. + * Copyright (c) 2004 - 2007 Eike Stepper, Germany. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/message/package.html b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/message/package.html index e6f0b943d4..daa5fa3de1 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/message/package.html +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/message/package.html @@ -3,7 +3,7 @@ <head> <!-- - Copyright (c) 2004, 2005, 2006 Eike Stepper, Germany. + Copyright (c) 2004 - 2007 Eike Stepper, Germany. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/package.html b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/package.html index ab7a22ee71..1e12bd6f2c 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/package.html +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/package.html @@ -4,7 +4,7 @@ <title>Package Description</title> <!-- - Copyright (c) 2004, 2005, 2006 Eike Stepper, Germany. + Copyright (c) 2004 - 2007 Eike Stepper, Germany. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/remote/.package.html b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/remote/.package.html index 9d1693d5e5..7d44710d9d 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/remote/.package.html +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/remote/.package.html @@ -4,7 +4,7 @@ <title>Package Description</title> <!-- - Copyright (c) 2004, 2005, 2006 Eike Stepper, Germany. + Copyright (c) 2004 - 2007 Eike Stepper, Germany. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/remote/IServiceExporter.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/remote/IServiceExporter.java index d0b18e2861..1eb61b66a0 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/remote/IServiceExporter.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/remote/IServiceExporter.java @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004-2007 Eike Stepper, Germany. + * Copyright (c) 2004 - 2007 Eike Stepper, Germany. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/remote/IServiceImporter.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/remote/IServiceImporter.java index 8af7c7c4e8..fd247c4a59 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/remote/IServiceImporter.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/remote/IServiceImporter.java @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004-2007 Eike Stepper, Germany. + * Copyright (c) 2004 - 2007 Eike Stepper, Germany. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/remote/package.html b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/remote/package.html index 9d1693d5e5..7d44710d9d 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/remote/package.html +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/remote/package.html @@ -4,7 +4,7 @@ <title>Package Description</title> <!-- - Copyright (c) 2004, 2005, 2006 Eike Stepper, Germany. + Copyright (c) 2004 - 2007 Eike Stepper, Germany. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/Indication.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/Indication.java index c957aede76..a5e90e8b3b 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/Indication.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/Indication.java @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004-2007 Eike Stepper, Germany. + * Copyright (c) 2004 - 2007 Eike Stepper, Germany. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/IndicationWithResponse.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/IndicationWithResponse.java index f41560c227..0ce90b3ed5 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/IndicationWithResponse.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/IndicationWithResponse.java @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004-2007 Eike Stepper, Germany. + * Copyright (c) 2004 - 2007 Eike Stepper, Germany. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/Request.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/Request.java index dafeb4558c..2ab2579290 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/Request.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/Request.java @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004-2007 Eike Stepper, Germany. + * Copyright (c) 2004 - 2007 Eike Stepper, Germany. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/RequestWithConfirmation.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/RequestWithConfirmation.java index 5ebf159f02..bb54fd8309 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/RequestWithConfirmation.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/RequestWithConfirmation.java @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004-2007 Eike Stepper, Germany. + * Copyright (c) 2004 - 2007 Eike Stepper, Germany. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/Signal.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/Signal.java index 5e0f21bd67..898771fa1d 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/Signal.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/Signal.java @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004-2007 Eike Stepper, Germany. + * Copyright (c) 2004 - 2007 Eike Stepper, Germany. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -16,6 +16,9 @@ import org.eclipse.net4j.util.om.trace.ContextTracer; import org.eclipse.internal.net4j.bundle.Net4j; +import java.io.EOFException; +import java.util.concurrent.TimeoutException; + /** * @author Eike Stepper */ @@ -77,6 +80,10 @@ public abstract class Signal implements Runnable { execute(inputStream, outputStream); } + catch (EOFException ex) + { + throw new TimeoutException("Timeout"); + } finally { getProtocol().stopSignal(this); diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/SignalActor.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/SignalActor.java index 74f7750e98..3869c45372 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/SignalActor.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/SignalActor.java @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004-2007 Eike Stepper, Germany. + * Copyright (c) 2004 - 2007 Eike Stepper, Germany. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/SignalProtocol.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/SignalProtocol.java index 5d0c85aa82..13059d492e 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/SignalProtocol.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/SignalProtocol.java @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004-2007 Eike Stepper, Germany. + * Copyright (c) 2004 - 2007 Eike Stepper, Germany. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -121,7 +121,11 @@ public abstract class SignalProtocol extends Protocol } } - signal.getInputStream().handleBuffer(buffer); + if (signal != null) // Can be null after timeout + { + BufferInputStream inputStream = signal.getInputStream(); + inputStream.handleBuffer(buffer); + } } public long getInputStreamTimeout() diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/SignalReactor.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/SignalReactor.java index d24785c7f8..20b234c2b7 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/SignalReactor.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/SignalReactor.java @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004-2007 Eike Stepper, Germany. + * Copyright (c) 2004 - 2007 Eike Stepper, Germany. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/package.html b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/package.html index decd655c10..ea8fdce5da 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/package.html +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/package.html @@ -3,7 +3,7 @@ <head> <!-- - Copyright (c) 2004, 2005, 2006 Eike Stepper, Germany. + Copyright (c) 2004 - 2007 Eike Stepper, Germany. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/stream/BufferInputStream.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/stream/BufferInputStream.java index 3210e6e3da..41bdf26e7e 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/stream/BufferInputStream.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/stream/BufferInputStream.java @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004-2007 Eike Stepper, Germany. + * Copyright (c) 2004 - 2007 Eike Stepper, Germany. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -69,7 +69,7 @@ public class BufferInputStream extends InputStream implements IBufferHandler final int result = currentBuffer.getByteBuffer().get() & 0xff; if (TRACER.isEnabled()) { - TRACER.trace("<-- " + HexUtil.toHex(result) //$NON-NLS-1$ + TRACER.trace("<-- " + HexUtil.formatByte(result) //$NON-NLS-1$ + (result >= 32 ? " " + Character.toString((char)result) : "")); //$NON-NLS-1$ //$NON-NLS-2$ } diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/stream/BufferOutputStream.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/stream/BufferOutputStream.java index 4c97c36fcf..4c69182917 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/stream/BufferOutputStream.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/stream/BufferOutputStream.java @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004-2007 Eike Stepper, Germany. + * Copyright (c) 2004 - 2007 Eike Stepper, Germany. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -68,7 +68,7 @@ public class BufferOutputStream extends OutputStream ensureBuffer(); if (TRACER.isEnabled()) { - TRACER.trace("--> " + HexUtil.toHex(b) //$NON-NLS-1$ + TRACER.trace("--> " + HexUtil.formatByte(b) //$NON-NLS-1$ + (b >= 32 ? " " + Character.toString((char)b) : "")); //$NON-NLS-1$ //$NON-NLS-2$ } diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/stream/ChannelInputStream.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/stream/ChannelInputStream.java index 7baaeaaa78..0f2a4a8225 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/stream/ChannelInputStream.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/stream/ChannelInputStream.java @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004-2007 Eike Stepper, Germany. + * Copyright (c) 2004 - 2007 Eike Stepper, Germany. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/stream/ChannelOutputStream.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/stream/ChannelOutputStream.java index 108378877c..4d7a81c297 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/stream/ChannelOutputStream.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/stream/ChannelOutputStream.java @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004-2007 Eike Stepper, Germany. + * Copyright (c) 2004 - 2007 Eike Stepper, Germany. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/stream/package.html b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/stream/package.html index 30a386344f..427c4f1817 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/stream/package.html +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/stream/package.html @@ -3,7 +3,7 @@ <head> <!-- - Copyright (c) 2004, 2005, 2006 Eike Stepper, Germany. + Copyright (c) 2004 - 2007 Eike Stepper, Germany. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/BufferState.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/BufferState.java index 123b67a66f..e4f3898d81 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/BufferState.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/BufferState.java @@ -1,3 +1,13 @@ +/*************************************************************************** + * Copyright (c) 2004 - 2007 Eike Stepper, Germany. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Eike Stepper - initial API and implementation + **************************************************************************/ package org.eclipse.net4j.transport; import java.nio.ByteBuffer; diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/ConnectorException.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/ConnectorException.java index 135a9eefee..e974519b8b 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/ConnectorException.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/ConnectorException.java @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004-2007 Eike Stepper, Germany. + * Copyright (c) 2004 - 2007 Eike Stepper, Germany. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/ConnectorLocation.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/ConnectorLocation.java index 9682faea65..3904985194 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/ConnectorLocation.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/ConnectorLocation.java @@ -1,3 +1,13 @@ +/*************************************************************************** + * Copyright (c) 2004 - 2007 Eike Stepper, Germany. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Eike Stepper - initial API and implementation + **************************************************************************/ package org.eclipse.net4j.transport; /** diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/ConnectorState.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/ConnectorState.java index b91d919ebf..9493acfa57 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/ConnectorState.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/ConnectorState.java @@ -1,3 +1,13 @@ +/*************************************************************************** + * Copyright (c) 2004 - 2007 Eike Stepper, Germany. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Eike Stepper - initial API and implementation + **************************************************************************/ package org.eclipse.net4j.transport; import org.eclipse.net4j.util.lifecycle.ILifecycle; diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/IAcceptor.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/IAcceptor.java index 0da0f54427..460cd26ffc 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/IAcceptor.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/IAcceptor.java @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004-2007 Eike Stepper, Germany. + * Copyright (c) 2004 - 2007 Eike Stepper, Germany. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/IAcceptorEvent.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/IAcceptorEvent.java index b7545b5a41..fe4650069d 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/IAcceptorEvent.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/IAcceptorEvent.java @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004-2007 Eike Stepper, Germany. + * Copyright (c) 2004 - 2007 Eike Stepper, Germany. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/IBuffer.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/IBuffer.java index dff690552d..bcb7e2dd2d 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/IBuffer.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/IBuffer.java @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004-2007 Eike Stepper, Germany. + * Copyright (c) 2004 - 2007 Eike Stepper, Germany. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/IBufferHandler.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/IBufferHandler.java index 097c65ae7e..21dc33a99e 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/IBufferHandler.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/IBufferHandler.java @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004-2007 Eike Stepper, Germany. + * Copyright (c) 2004 - 2007 Eike Stepper, Germany. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/IBufferPool.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/IBufferPool.java index 1c79c4ea5b..3c72b9066c 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/IBufferPool.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/IBufferPool.java @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004-2007 Eike Stepper, Germany. + * Copyright (c) 2004 - 2007 Eike Stepper, Germany. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/IBufferProvider.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/IBufferProvider.java index b1d0449126..f8e3ad823e 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/IBufferProvider.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/IBufferProvider.java @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004-2007 Eike Stepper, Germany. + * Copyright (c) 2004 - 2007 Eike Stepper, Germany. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/IChannel.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/IChannel.java index e0d2ae14e0..6ec4a07260 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/IChannel.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/IChannel.java @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004-2007 Eike Stepper, Germany. + * Copyright (c) 2004 - 2007 Eike Stepper, Germany. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -10,6 +10,8 @@ **************************************************************************/ package org.eclipse.net4j.transport; +import org.eclipse.net4j.util.event.INotifier; + /** * A bidirectional communications channel for the asynchronous exchange of * {@link IBuffer}s. A channel is lightweight and virtual in the sense that it @@ -89,7 +91,7 @@ package org.eclipse.net4j.transport; * @author Eike Stepper * @since 0.8.0 */ -public interface IChannel extends IBufferHandler +public interface IChannel extends IBufferHandler, INotifier { /** * Returns an identifier of this channel that is unique among all channels of diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/IChannelID.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/IChannelID.java index 9b7ee41f3c..339a27f5b8 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/IChannelID.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/IChannelID.java @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004-2007 Eike Stepper, Germany. + * Copyright (c) 2004 - 2007 Eike Stepper, Germany. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/IConnector.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/IConnector.java index 83960b429a..cd19a7063c 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/IConnector.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/IConnector.java @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004-2007 Eike Stepper, Germany. + * Copyright (c) 2004 - 2007 Eike Stepper, Germany. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/IConnectorChannelsEvent.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/IConnectorChannelsEvent.java index f9c5c5c4c6..95e0b58045 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/IConnectorChannelsEvent.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/IConnectorChannelsEvent.java @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004-2007 Eike Stepper, Germany. + * Copyright (c) 2004 - 2007 Eike Stepper, Germany. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/IConnectorCredentials.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/IConnectorCredentials.java index 1095535e8b..d6ec1d7b9d 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/IConnectorCredentials.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/IConnectorCredentials.java @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004-2007 Eike Stepper, Germany. + * Copyright (c) 2004 - 2007 Eike Stepper, Germany. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/IConnectorNegotiator.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/IConnectorNegotiator.java index 6b7f8d95aa..6f49695b19 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/IConnectorNegotiator.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/IConnectorNegotiator.java @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004-2007 Eike Stepper, Germany. + * Copyright (c) 2004 - 2007 Eike Stepper, Germany. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/IConnectorStateEvent.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/IConnectorStateEvent.java index dd6c6c8e75..024f2fa069 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/IConnectorStateEvent.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/IConnectorStateEvent.java @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004-2007 Eike Stepper, Germany. + * Copyright (c) 2004 - 2007 Eike Stepper, Germany. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/IPluginTransportContainer.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/IPluginTransportContainer.java index 1ee9754bda..dbc849d8a7 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/IPluginTransportContainer.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/IPluginTransportContainer.java @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004, 2005, 2006 Eike Stepper, Germany. + * Copyright (c) 2004 - 2007 Eike Stepper, Germany. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/IProtocol.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/IProtocol.java index 9b5c409f5d..439bed21a5 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/IProtocol.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/IProtocol.java @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004-2007 Eike Stepper, Germany. + * Copyright (c) 2004 - 2007 Eike Stepper, Germany. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/ITransportContainer.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/ITransportContainer.java index ceeefa5173..255f8a6f82 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/ITransportContainer.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/ITransportContainer.java @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004, 2005, 2006 Eike Stepper, Germany. + * Copyright (c) 2004 - 2007 Eike Stepper, Germany. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/TransportUtil.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/TransportUtil.java index dacdf43d80..e37f9d878b 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/TransportUtil.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/TransportUtil.java @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004-2007 Eike Stepper, Germany. + * Copyright (c) 2004 - 2007 Eike Stepper, Germany. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/package.html b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/package.html index f85f714205..14b586ea86 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/package.html +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/transport/package.html @@ -3,7 +3,7 @@ <head> <!-- - Copyright (c) 2004, 2005, 2006 Eike Stepper, Germany. + Copyright (c) 2004 - 2007 Eike Stepper, Germany. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/user/Credentials.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/user/Credentials.java index fbde0eb3ae..d3e589b172 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/user/Credentials.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/user/Credentials.java @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004-2007 Eike Stepper, Germany. + * Copyright (c) 2004 - 2007 Eike Stepper, Germany. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/user/User.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/user/User.java index af1595fd24..8e08335ad3 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/user/User.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/user/User.java @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004-2007 Eike Stepper, Germany. + * Copyright (c) 2004 - 2007 Eike Stepper, Germany. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/HexUtil.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/HexUtil.java index 239ed0542e..cac31b33b2 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/HexUtil.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/HexUtil.java @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004-2007 Eike Stepper, Germany. + * Copyright (c) 2004 - 2007 Eike Stepper, Germany. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -21,7 +21,18 @@ public final class HexUtil { } - public static String toHex(int b) + public static String formatLong(long v) + { + final String hex = Long.toHexString(v); + if (hex.length() < 8) + { + return "00000000".substring(hex.length()) + hex; + } + + return hex; + } + + public static String formatByte(int b) { assertByte(b); return "" + DIGITS[b >> 4] + DIGITS[b & 0xf]; //$NON-NLS-1$ diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/IOUtil.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/IOUtil.java index 696a551bd8..3bcb136ee9 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/IOUtil.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/IOUtil.java @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004-2007 Eike Stepper, Germany. + * Copyright (c) 2004 - 2007 Eike Stepper, Germany. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/ObjectUtil.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/ObjectUtil.java index 250c430701..0875d85678 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/ObjectUtil.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/ObjectUtil.java @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004-2007 Eike Stepper, Germany. + * Copyright (c) 2004 - 2007 Eike Stepper, Germany. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/ReflectUtil.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/ReflectUtil.java index e16f31bb96..64ba04c23a 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/ReflectUtil.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/ReflectUtil.java @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004-2007 Eike Stepper, Germany. + * Copyright (c) 2004 - 2007 Eike Stepper, Germany. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/StringUtil.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/StringUtil.java index 864ab279cb..34199b79ed 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/StringUtil.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/StringUtil.java @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004-2007 Eike Stepper, Germany. + * Copyright (c) 2004 - 2007 Eike Stepper, Germany. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/concurrent/ICorrelator.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/concurrent/ICorrelator.java index a0d1fad932..10cfd60e0f 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/concurrent/ICorrelator.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/concurrent/ICorrelator.java @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004-2007 Eike Stepper, Germany. + * Copyright (c) 2004 - 2007 Eike Stepper, Germany. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/concurrent/ISynchronizer.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/concurrent/ISynchronizer.java index bdf405245d..8a12bd8516 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/concurrent/ISynchronizer.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/concurrent/ISynchronizer.java @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004-2007 Eike Stepper, Germany. + * Copyright (c) 2004 - 2007 Eike Stepper, Germany. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/concurrent/IWorkSerializer.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/concurrent/IWorkSerializer.java index 5206bbdeab..4cbeff2b8f 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/concurrent/IWorkSerializer.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/concurrent/IWorkSerializer.java @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004-2007 Eike Stepper, Germany. + * Copyright (c) 2004 - 2007 Eike Stepper, Germany. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/concurrent/NonBlockingLongCounter.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/concurrent/NonBlockingLongCounter.java new file mode 100644 index 0000000000..1f58036730 --- /dev/null +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/concurrent/NonBlockingLongCounter.java @@ -0,0 +1,47 @@ +/*************************************************************************** + * Copyright (c) 2004 - 2007 Eike Stepper, Germany. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Eike Stepper - initial API and implementation + **************************************************************************/ +package org.eclipse.net4j.util.concurrent; + +import java.util.concurrent.atomic.AtomicLong; + +/** + * @author Eike Stepper + */ +public final class NonBlockingLongCounter +{ + private AtomicLong value; + + public NonBlockingLongCounter() + { + this(0L); + } + + public NonBlockingLongCounter(long initialValue) + { + value = new AtomicLong(initialValue); + } + + public long getValue() + { + return value.get(); + } + + public long increment() + { + long v; + do + { + v = value.get(); + } while (!value.compareAndSet(v, v + 1)); + + return v + 1; + } +} diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/concurrent/package.html b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/concurrent/package.html index 8ec217eeb9..6c40a57b61 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/concurrent/package.html +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/concurrent/package.html @@ -3,7 +3,7 @@ <head> <!-- - Copyright (c) 2004, 2005, 2006 Eike Stepper, Germany. + Copyright (c) 2004 - 2007 Eike Stepper, Germany. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/container/ContainerUtil.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/container/ContainerUtil.java index 7f5b5e2b7a..60010f23db 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/container/ContainerUtil.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/container/ContainerUtil.java @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004-2007 Eike Stepper, Germany. + * Copyright (c) 2004 - 2007 Eike Stepper, Germany. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/container/IContainer.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/container/IContainer.java index 758b7d5857..f7f5b494ea 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/container/IContainer.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/container/IContainer.java @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004-2007 Eike Stepper, Germany. + * Copyright (c) 2004 - 2007 Eike Stepper, Germany. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/container/IContainerDelta.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/container/IContainerDelta.java index 672ac795d9..01498fb0b8 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/container/IContainerDelta.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/container/IContainerDelta.java @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004-2007 Eike Stepper, Germany. + * Copyright (c) 2004 - 2007 Eike Stepper, Germany. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/container/IContainerEvent.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/container/IContainerEvent.java index 74889fa094..00db4fe335 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/container/IContainerEvent.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/container/IContainerEvent.java @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004-2007 Eike Stepper, Germany. + * Copyright (c) 2004 - 2007 Eike Stepper, Germany. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/container/IContainerEventVisitor.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/container/IContainerEventVisitor.java index a147215484..613b483302 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/container/IContainerEventVisitor.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/container/IContainerEventVisitor.java @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004-2007 Eike Stepper, Germany. + * Copyright (c) 2004 - 2007 Eike Stepper, Germany. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/container/IElementProcessor.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/container/IElementProcessor.java index ae70097406..5afd965ba6 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/container/IElementProcessor.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/container/IElementProcessor.java @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004, 2005, 2006 Eike Stepper, Germany. + * Copyright (c) 2004 - 2007 Eike Stepper, Germany. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/container/IManagedContainer.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/container/IManagedContainer.java index 7ce904163c..54c55505f5 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/container/IManagedContainer.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/container/IManagedContainer.java @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004-2007 Eike Stepper, Germany. + * Copyright (c) 2004 - 2007 Eike Stepper, Germany. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/container/delegate/IContainerBlockingQueue.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/container/delegate/IContainerBlockingQueue.java index ad5dab92fe..dbdca37541 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/container/delegate/IContainerBlockingQueue.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/container/delegate/IContainerBlockingQueue.java @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004-2007 Eike Stepper, Germany. + * Copyright (c) 2004 - 2007 Eike Stepper, Germany. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/container/delegate/IContainerCollection.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/container/delegate/IContainerCollection.java index 1a488e8aa9..a0c1a6db2f 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/container/delegate/IContainerCollection.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/container/delegate/IContainerCollection.java @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004-2007 Eike Stepper, Germany. + * Copyright (c) 2004 - 2007 Eike Stepper, Germany. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/container/delegate/IContainerList.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/container/delegate/IContainerList.java index 796e325729..b1bb757393 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/container/delegate/IContainerList.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/container/delegate/IContainerList.java @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004-2007 Eike Stepper, Germany. + * Copyright (c) 2004 - 2007 Eike Stepper, Germany. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/container/delegate/IContainerMap.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/container/delegate/IContainerMap.java index 5fc89c94d7..95a4142280 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/container/delegate/IContainerMap.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/container/delegate/IContainerMap.java @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004-2007 Eike Stepper, Germany. + * Copyright (c) 2004 - 2007 Eike Stepper, Germany. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/container/delegate/IContainerQueue.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/container/delegate/IContainerQueue.java index 8f5c607834..8bfbfd5b2a 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/container/delegate/IContainerQueue.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/container/delegate/IContainerQueue.java @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004-2007 Eike Stepper, Germany. + * Copyright (c) 2004 - 2007 Eike Stepper, Germany. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/container/delegate/IContainerSet.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/container/delegate/IContainerSet.java index 3fe603c799..cdbc220e27 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/container/delegate/IContainerSet.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/container/delegate/IContainerSet.java @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004-2007 Eike Stepper, Germany. + * Copyright (c) 2004 - 2007 Eike Stepper, Germany. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/container/delegate/IContainerSortedSet.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/container/delegate/IContainerSortedSet.java index 3b05d67ab6..f5ec69cd89 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/container/delegate/IContainerSortedSet.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/container/delegate/IContainerSortedSet.java @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004-2007 Eike Stepper, Germany. + * Copyright (c) 2004 - 2007 Eike Stepper, Germany. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/event/EventUtil.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/event/EventUtil.java index 13e5d0e948..83f42a2896 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/event/EventUtil.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/event/EventUtil.java @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004-2007 Eike Stepper, Germany. + * Copyright (c) 2004 - 2007 Eike Stepper, Germany. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/event/IEvent.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/event/IEvent.java index 661e344537..35e93df6bb 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/event/IEvent.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/event/IEvent.java @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004-2007 Eike Stepper, Germany. + * Copyright (c) 2004 - 2007 Eike Stepper, Germany. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/event/IListener.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/event/IListener.java index ed4d12250a..55a979d49d 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/event/IListener.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/event/IListener.java @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004-2007 Eike Stepper, Germany. + * Copyright (c) 2004 - 2007 Eike Stepper, Germany. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/event/INotifier.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/event/INotifier.java index aed2d2eb6e..d45dcb9f19 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/event/INotifier.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/event/INotifier.java @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004-2007 Eike Stepper, Germany. + * Copyright (c) 2004 - 2007 Eike Stepper, Germany. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/factory/IFactory.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/factory/IFactory.java index add5be74c4..24f564e6e3 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/factory/IFactory.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/factory/IFactory.java @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004-2007 Eike Stepper, Germany. + * Copyright (c) 2004 - 2007 Eike Stepper, Germany. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/factory/IFactoryKey.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/factory/IFactoryKey.java index 4862e8f586..f47b8b83c1 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/factory/IFactoryKey.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/factory/IFactoryKey.java @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004, 2005, 2006 Eike Stepper, Germany. + * Copyright (c) 2004 - 2007 Eike Stepper, Germany. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/factory/ProductCreationException.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/factory/ProductCreationException.java index c2bba42c07..51ab7b10cb 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/factory/ProductCreationException.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/factory/ProductCreationException.java @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004, 2005, 2006 Eike Stepper, Germany. + * Copyright (c) 2004 - 2007 Eike Stepper, Germany. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/lifecycle/ILifecycle.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/lifecycle/ILifecycle.java index a03dfd6542..677b292059 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/lifecycle/ILifecycle.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/lifecycle/ILifecycle.java @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004-2007 Eike Stepper, Germany. + * Copyright (c) 2004 - 2007 Eike Stepper, Germany. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/lifecycle/ILifecycleEvent.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/lifecycle/ILifecycleEvent.java index 03056037f2..918f1a5a13 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/lifecycle/ILifecycleEvent.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/lifecycle/ILifecycleEvent.java @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004-2007 Eike Stepper, Germany. + * Copyright (c) 2004 - 2007 Eike Stepper, Germany. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/lifecycle/LifecycleException.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/lifecycle/LifecycleException.java index e0ead1dfd5..693a65cb8c 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/lifecycle/LifecycleException.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/lifecycle/LifecycleException.java @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004-2007 Eike Stepper, Germany. + * Copyright (c) 2004 - 2007 Eike Stepper, Germany. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/lifecycle/LifecycleUtil.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/lifecycle/LifecycleUtil.java index 2d284616c4..fcda37275d 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/lifecycle/LifecycleUtil.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/lifecycle/LifecycleUtil.java @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004-2007 Eike Stepper, Germany. + * Copyright (c) 2004 - 2007 Eike Stepper, Germany. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/lifecycle/package.html b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/lifecycle/package.html index 78d64e7ae3..06815b380a 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/lifecycle/package.html +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/lifecycle/package.html @@ -3,7 +3,7 @@ <head> <!-- - Copyright (c) 2004, 2005, 2006 Eike Stepper, Germany. + Copyright (c) 2004 - 2007 Eike Stepper, Germany. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/om/OMBundle.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/om/OMBundle.java index 89c5706520..367d7627ea 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/om/OMBundle.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/om/OMBundle.java @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004-2007 Eike Stepper, Germany. + * Copyright (c) 2004 - 2007 Eike Stepper, Germany. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/om/OMLogHandler.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/om/OMLogHandler.java index 5094c246c1..452643ff39 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/om/OMLogHandler.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/om/OMLogHandler.java @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004-2007 Eike Stepper, Germany. + * Copyright (c) 2004 - 2007 Eike Stepper, Germany. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/om/OMLogger.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/om/OMLogger.java index 68a247b49f..7453263321 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/om/OMLogger.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/om/OMLogger.java @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004-2007 Eike Stepper, Germany. + * Copyright (c) 2004 - 2007 Eike Stepper, Germany. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/om/OMPlatform.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/om/OMPlatform.java index f8870628b0..eaa2120b9d 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/om/OMPlatform.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/om/OMPlatform.java @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004-2007 Eike Stepper, Germany. + * Copyright (c) 2004 - 2007 Eike Stepper, Germany. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/om/OMTraceHandler.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/om/OMTraceHandler.java index 02f92754c3..5d61774488 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/om/OMTraceHandler.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/om/OMTraceHandler.java @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004-2007 Eike Stepper, Germany. + * Copyright (c) 2004 - 2007 Eike Stepper, Germany. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/om/OMTracer.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/om/OMTracer.java index 8d0361fdf9..1b5a7ae7d0 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/om/OMTracer.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/om/OMTracer.java @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004-2007 Eike Stepper, Germany. + * Copyright (c) 2004 - 2007 Eike Stepper, Germany. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/om/log/EclipseLoggingBridge.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/om/log/EclipseLoggingBridge.java index d65c2d9651..a499a609f5 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/om/log/EclipseLoggingBridge.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/om/log/EclipseLoggingBridge.java @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004-2007 Eike Stepper, Germany. + * Copyright (c) 2004 - 2007 Eike Stepper, Germany. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/om/log/OSGiLoggingBridge.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/om/log/OSGiLoggingBridge.java index e539a00553..e080f8a818 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/om/log/OSGiLoggingBridge.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/om/log/OSGiLoggingBridge.java @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004-2007 Eike Stepper, Germany. + * Copyright (c) 2004 - 2007 Eike Stepper, Germany. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/om/log/PrintLogHandler.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/om/log/PrintLogHandler.java index ebc7ccee28..6387ea4b96 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/om/log/PrintLogHandler.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/om/log/PrintLogHandler.java @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004-2007 Eike Stepper, Germany. + * Copyright (c) 2004 - 2007 Eike Stepper, Germany. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/om/package.html b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/om/package.html index 58201c5d65..8ce0bef978 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/om/package.html +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/om/package.html @@ -3,7 +3,7 @@ <head> <!-- - Copyright (c) 2004, 2005, 2006 Eike Stepper, Germany. + Copyright (c) 2004 - 2007 Eike Stepper, Germany. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/om/trace/ContextTracer.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/om/trace/ContextTracer.java index cce0b73a6a..7f9b9e2649 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/om/trace/ContextTracer.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/om/trace/ContextTracer.java @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004-2007 Eike Stepper, Germany. + * Copyright (c) 2004 - 2007 Eike Stepper, Germany. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/om/trace/PrintTraceHandler.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/om/trace/PrintTraceHandler.java index f8dc1a50c0..93daa0238a 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/om/trace/PrintTraceHandler.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/om/trace/PrintTraceHandler.java @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004-2007 Eike Stepper, Germany. + * Copyright (c) 2004 - 2007 Eike Stepper, Germany. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/om/trace/RemoteTraceHandler.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/om/trace/RemoteTraceHandler.java index d38b73046c..3246eb5e0b 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/om/trace/RemoteTraceHandler.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/om/trace/RemoteTraceHandler.java @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004-2007 Eike Stepper, Germany. + * Copyright (c) 2004 - 2007 Eike Stepper, Germany. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/om/trace/RemoteTraceServer.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/om/trace/RemoteTraceServer.java index 41b5f2fa49..095aa6e5e7 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/om/trace/RemoteTraceServer.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/om/trace/RemoteTraceServer.java @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004-2007 Eike Stepper, Germany. + * Copyright (c) 2004 - 2007 Eike Stepper, Germany. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/package.html b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/package.html index 85b48bb685..019886f757 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/package.html +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/package.html @@ -3,7 +3,7 @@ <head> <!-- - Copyright (c) 2004, 2005, 2006 Eike Stepper, Germany. + Copyright (c) 2004 - 2007 Eike Stepper, Germany. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/registry/IRegistry.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/registry/IRegistry.java index 9f7371f078..6466d8ec3c 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/registry/IRegistry.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/registry/IRegistry.java @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004-2007 Eike Stepper, Germany. + * Copyright (c) 2004 - 2007 Eike Stepper, Germany. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/registry/IRegistryEvent.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/registry/IRegistryEvent.java index 36dfa15763..8ca5d023b9 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/registry/IRegistryEvent.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/registry/IRegistryEvent.java @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004-2007 Eike Stepper, Germany. + * Copyright (c) 2004 - 2007 Eike Stepper, Germany. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/registry/RegistryUtil.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/registry/RegistryUtil.java index 7831bdf598..17dd73ec7f 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/registry/RegistryUtil.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/registry/RegistryUtil.java @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004-2007 Eike Stepper, Germany. + * Copyright (c) 2004 - 2007 Eike Stepper, Germany. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/registry/package.html b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/registry/package.html index d2c033f7ef..6ae2c99b32 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/registry/package.html +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/registry/package.html @@ -3,7 +3,7 @@ <head> <!-- - Copyright (c) 2004, 2005, 2006 Eike Stepper, Germany. + Copyright (c) 2004 - 2007 Eike Stepper, Germany. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/stream/ExtendedDataInput.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/stream/ExtendedDataInput.java index 0adb6f6592..0756e82224 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/stream/ExtendedDataInput.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/stream/ExtendedDataInput.java @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004-2007 Eike Stepper, Germany. + * Copyright (c) 2004 - 2007 Eike Stepper, Germany. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/stream/ExtendedDataInputStream.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/stream/ExtendedDataInputStream.java index d758d7ad5e..1e581ce8db 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/stream/ExtendedDataInputStream.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/stream/ExtendedDataInputStream.java @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004-2007 Eike Stepper, Germany. + * Copyright (c) 2004 - 2007 Eike Stepper, Germany. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/stream/ExtendedDataOutput.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/stream/ExtendedDataOutput.java index 3093f8ceca..b310e09a11 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/stream/ExtendedDataOutput.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/stream/ExtendedDataOutput.java @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004-2007 Eike Stepper, Germany. + * Copyright (c) 2004 - 2007 Eike Stepper, Germany. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/stream/ExtendedDataOutputStream.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/stream/ExtendedDataOutputStream.java index b8b39263e5..bca0b17a14 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/stream/ExtendedDataOutputStream.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/stream/ExtendedDataOutputStream.java @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (c) 2004-2007 Eike Stepper, Germany. + * Copyright (c) 2004 - 2007 Eike Stepper, Germany. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/stream/package.html b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/stream/package.html index aed355c26b..fa9ab6f46e 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/stream/package.html +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/util/stream/package.html @@ -3,7 +3,7 @@ <head> <!-- - Copyright (c) 2004, 2005, 2006 Eike Stepper, Germany. + Copyright (c) 2004 - 2007 Eike Stepper, Germany. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at |