diff options
132 files changed, 217 insertions, 187 deletions
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/bundle/CDOServerApplication.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/bundle/CDOServerApplication.java index 280f7d3d8e..6d69817de8 100644 --- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/bundle/CDOServerApplication.java +++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/bundle/CDOServerApplication.java @@ -13,7 +13,7 @@ package org.eclipse.emf.cdo.internal.server.bundle; import org.eclipse.emf.cdo.internal.server.RepositoryConfigurator; import org.eclipse.emf.cdo.server.IRepository; -import org.eclipse.net4j.IAcceptor; +import org.eclipse.net4j.acceptor.IAcceptor; import org.eclipse.net4j.util.container.IPluginContainer; import org.eclipse.net4j.util.lifecycle.LifecycleUtil; import org.eclipse.net4j.util.om.OMPlatform; diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/InvalidationNotification.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/InvalidationNotification.java index f710961afa..e566609196 100644 --- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/InvalidationNotification.java +++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/InvalidationNotification.java @@ -16,7 +16,7 @@ import org.eclipse.emf.cdo.internal.server.bundle.OM; import org.eclipse.emf.cdo.protocol.CDOID; import org.eclipse.emf.cdo.protocol.CDOProtocolConstants; -import org.eclipse.net4j.IChannel; +import org.eclipse.net4j.channel.IChannel; import org.eclipse.net4j.internal.util.om.trace.ContextTracer; import org.eclipse.net4j.signal.Request; import org.eclipse.net4j.util.io.ExtendedDataOutputStream; diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/InitialTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/InitialTest.java index b401af6d98..5defa98b8f 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/InitialTest.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/InitialTest.java @@ -19,8 +19,8 @@ import org.eclipse.emf.cdo.tests.model1.PurchaseOrder; import org.eclipse.emf.cdo.tests.model1.Supplier; import org.eclipse.emf.cdo.util.CDOUtil; -import org.eclipse.net4j.IBufferHandler; -import org.eclipse.net4j.IChannel; +import org.eclipse.net4j.buffer.IBufferHandler; +import org.eclipse.net4j.channel.IChannel; import org.eclipse.emf.common.util.EList; import org.eclipse.emf.common.util.URI; diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/editor/CDOEditorInput.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/editor/CDOEditorInput.java index f3568292dc..bc48e747f2 100644 --- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/editor/CDOEditorInput.java +++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/editor/CDOEditorInput.java @@ -15,7 +15,7 @@ import org.eclipse.emf.cdo.CDOSession; import org.eclipse.emf.cdo.CDOView; import org.eclipse.emf.cdo.internal.ui.SharedIcons; -import org.eclipse.net4j.IConnector; +import org.eclipse.net4j.connector.IConnector; import org.eclipse.core.runtime.Path; import org.eclipse.core.runtime.PlatformObject; diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOItemProvider.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOItemProvider.java index 4329d39918..3644db77a5 100644 --- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOItemProvider.java +++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOItemProvider.java @@ -39,7 +39,7 @@ import org.eclipse.emf.cdo.internal.ui.views.CDOViewHistory.Entry; import org.eclipse.emf.cdo.util.CDOPackageType; import org.eclipse.emf.cdo.util.CDOUtil; -import org.eclipse.net4j.IConnector; +import org.eclipse.net4j.connector.IConnector; import org.eclipse.net4j.util.container.IContainer; import org.eclipse.net4j.util.event.IEvent; import org.eclipse.net4j.util.event.IListener; diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOSession.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOSession.java index cd05769bbe..4091a79cf9 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOSession.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOSession.java @@ -13,8 +13,8 @@ package org.eclipse.emf.cdo; import org.eclipse.emf.cdo.protocol.model.CDOPackageManager; import org.eclipse.emf.cdo.util.CDOPackageRegistry; -import org.eclipse.net4j.IChannel; -import org.eclipse.net4j.IConnector; +import org.eclipse.net4j.channel.IChannel; +import org.eclipse.net4j.connector.IConnector; import org.eclipse.net4j.signal.failover.IFailOverStrategy; import org.eclipse.net4j.util.container.IContainer; diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/util/CDOUtil.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/util/CDOUtil.java index 22be39a09d..28d5b2a62d 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/util/CDOUtil.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/util/CDOUtil.java @@ -27,8 +27,8 @@ import org.eclipse.emf.internal.cdo.LegacyObjectDisabler; import org.eclipse.emf.internal.cdo.protocol.CDOClientProtocolFactory; import org.eclipse.emf.internal.cdo.util.FSMUtil; -import org.eclipse.net4j.ConnectorException; -import org.eclipse.net4j.IConnector; +import org.eclipse.net4j.connector.ConnectorException; +import org.eclipse.net4j.connector.IConnector; import org.eclipse.net4j.signal.failover.IFailOverStrategy; import org.eclipse.net4j.util.StringUtil; import org.eclipse.net4j.util.container.IManagedContainer; diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDORevisionManagerImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDORevisionManagerImpl.java index 4108da27e0..eccf56cadf 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDORevisionManagerImpl.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDORevisionManagerImpl.java @@ -27,7 +27,7 @@ import org.eclipse.emf.internal.cdo.protocol.LoadRevisionByTimeRequest; import org.eclipse.emf.internal.cdo.protocol.LoadRevisionByVersionRequest; import org.eclipse.emf.internal.cdo.protocol.LoadRevisionRequest; -import org.eclipse.net4j.IChannel; +import org.eclipse.net4j.channel.IChannel; import org.eclipse.net4j.internal.util.om.trace.PerfTracer; import org.eclipse.net4j.signal.failover.IFailOverStrategy; diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOSessionImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOSessionImpl.java index e671b0beec..23d62fe729 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOSessionImpl.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOSessionImpl.java @@ -33,8 +33,8 @@ import org.eclipse.emf.internal.cdo.protocol.ViewsChangedRequest; import org.eclipse.emf.internal.cdo.util.ModelUtil; import org.eclipse.emf.internal.cdo.util.ProxyResolverURIResourceMap; -import org.eclipse.net4j.IChannel; -import org.eclipse.net4j.IConnector; +import org.eclipse.net4j.channel.IChannel; +import org.eclipse.net4j.connector.IConnector; import org.eclipse.net4j.internal.util.container.Container; import org.eclipse.net4j.internal.util.event.Event; import org.eclipse.net4j.internal.util.lifecycle.LifecycleEventAdapter; diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOStateMachine.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOStateMachine.java index 15a967a747..a802698343 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOStateMachine.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOStateMachine.java @@ -30,7 +30,7 @@ import org.eclipse.emf.internal.cdo.protocol.ResourceIDRequest; import org.eclipse.emf.internal.cdo.protocol.VerifyRevisionRequest; import org.eclipse.emf.internal.cdo.util.FSMUtil; -import org.eclipse.net4j.IChannel; +import org.eclipse.net4j.channel.IChannel; import org.eclipse.net4j.internal.util.om.trace.ContextTracer; import org.eclipse.net4j.signal.failover.IFailOverStrategy; import org.eclipse.net4j.util.fsm.FiniteStateMachine; diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOTransactionImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOTransactionImpl.java index ead86358ee..0ee665af8f 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOTransactionImpl.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOTransactionImpl.java @@ -33,7 +33,7 @@ import org.eclipse.emf.internal.cdo.protocol.CommitTransactionRequest; import org.eclipse.emf.internal.cdo.protocol.CommitTransactionResult; import org.eclipse.emf.internal.cdo.util.ModelUtil; -import org.eclipse.net4j.IChannel; +import org.eclipse.net4j.channel.IChannel; import org.eclipse.net4j.internal.util.event.Notifier; import org.eclipse.net4j.internal.util.om.trace.ContextTracer; import org.eclipse.net4j.signal.failover.IFailOverStrategy; diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/CDOClientRequest.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/CDOClientRequest.java index e045c4a399..18ab382e7e 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/CDOClientRequest.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/CDOClientRequest.java @@ -14,7 +14,7 @@ import org.eclipse.emf.cdo.internal.protocol.revision.CDORevisionResolverImpl; import org.eclipse.emf.internal.cdo.CDOSessionImpl; -import org.eclipse.net4j.IChannel; +import org.eclipse.net4j.channel.IChannel; import org.eclipse.net4j.signal.RequestWithConfirmation; /** diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/CommitTransactionRequest.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/CommitTransactionRequest.java index 229feff1a3..efb0d71694 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/CommitTransactionRequest.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/CommitTransactionRequest.java @@ -29,7 +29,7 @@ import org.eclipse.emf.internal.cdo.CDOTransactionImpl; import org.eclipse.emf.internal.cdo.InternalCDOObject; import org.eclipse.emf.internal.cdo.bundle.OM; -import org.eclipse.net4j.IChannel; +import org.eclipse.net4j.channel.IChannel; import org.eclipse.net4j.internal.util.om.trace.ContextTracer; import org.eclipse.net4j.util.io.ExtendedDataInputStream; import org.eclipse.net4j.util.io.ExtendedDataOutputStream; diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/LoadChunkRequest.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/LoadChunkRequest.java index 8c497d558f..b35bf6abf7 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/LoadChunkRequest.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/LoadChunkRequest.java @@ -20,7 +20,7 @@ import org.eclipse.emf.cdo.protocol.model.CDOFeature; import org.eclipse.emf.internal.cdo.bundle.OM; -import org.eclipse.net4j.IChannel; +import org.eclipse.net4j.channel.IChannel; import org.eclipse.net4j.internal.util.om.trace.ContextTracer; import org.eclipse.net4j.util.io.ExtendedDataInputStream; import org.eclipse.net4j.util.io.ExtendedDataOutputStream; diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/LoadPackageRequest.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/LoadPackageRequest.java index 7486a0ddfe..3c59130d40 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/LoadPackageRequest.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/LoadPackageRequest.java @@ -13,7 +13,7 @@ package org.eclipse.emf.internal.cdo.protocol; import org.eclipse.emf.cdo.internal.protocol.model.CDOPackageImpl; import org.eclipse.emf.cdo.protocol.CDOProtocolConstants; -import org.eclipse.net4j.IChannel; +import org.eclipse.net4j.channel.IChannel; import org.eclipse.net4j.util.io.ExtendedDataInputStream; import org.eclipse.net4j.util.io.ExtendedDataOutputStream; diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/LoadRevisionByTimeRequest.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/LoadRevisionByTimeRequest.java index f826a1387b..7e764c89bd 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/LoadRevisionByTimeRequest.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/LoadRevisionByTimeRequest.java @@ -15,7 +15,7 @@ import org.eclipse.emf.cdo.protocol.CDOProtocolConstants; import org.eclipse.emf.internal.cdo.bundle.OM; -import org.eclipse.net4j.IChannel; +import org.eclipse.net4j.channel.IChannel; import org.eclipse.net4j.internal.util.om.trace.ContextTracer; import org.eclipse.net4j.util.io.ExtendedDataOutputStream; diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/LoadRevisionByVersionRequest.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/LoadRevisionByVersionRequest.java index 994be18972..3c64b08075 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/LoadRevisionByVersionRequest.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/LoadRevisionByVersionRequest.java @@ -15,7 +15,7 @@ import org.eclipse.emf.cdo.protocol.CDOProtocolConstants; import org.eclipse.emf.internal.cdo.bundle.OM; -import org.eclipse.net4j.IChannel; +import org.eclipse.net4j.channel.IChannel; import org.eclipse.net4j.internal.util.om.trace.ContextTracer; import org.eclipse.net4j.util.io.ExtendedDataOutputStream; diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/LoadRevisionRequest.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/LoadRevisionRequest.java index 78811ea95a..3cb981a307 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/LoadRevisionRequest.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/LoadRevisionRequest.java @@ -23,7 +23,7 @@ import org.eclipse.emf.internal.cdo.CDOSessionImpl; import org.eclipse.emf.internal.cdo.CDOSessionPackageManager; import org.eclipse.emf.internal.cdo.bundle.OM; -import org.eclipse.net4j.IChannel; +import org.eclipse.net4j.channel.IChannel; import org.eclipse.net4j.internal.util.om.trace.ContextTracer; import org.eclipse.net4j.util.io.ExtendedDataInputStream; import org.eclipse.net4j.util.io.ExtendedDataOutputStream; diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/OpenSessionRequest.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/OpenSessionRequest.java index 2fb68e08d6..b2deed68ee 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/OpenSessionRequest.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/OpenSessionRequest.java @@ -17,7 +17,7 @@ import org.eclipse.emf.cdo.util.ServerException; import org.eclipse.emf.internal.cdo.bundle.OM; -import org.eclipse.net4j.IChannel; +import org.eclipse.net4j.channel.IChannel; import org.eclipse.net4j.internal.util.om.trace.ContextTracer; import org.eclipse.net4j.signal.RequestWithConfirmation; import org.eclipse.net4j.util.io.ExtendedDataInputStream; diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/QueryObjectTypesRequest.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/QueryObjectTypesRequest.java index 97b5465332..e74217df77 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/QueryObjectTypesRequest.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/QueryObjectTypesRequest.java @@ -18,7 +18,7 @@ import org.eclipse.emf.cdo.protocol.model.CDOClassRef; import org.eclipse.emf.internal.cdo.bundle.OM; -import org.eclipse.net4j.IChannel; +import org.eclipse.net4j.channel.IChannel; import org.eclipse.net4j.internal.util.om.trace.ContextTracer; import org.eclipse.net4j.util.io.ExtendedDataInputStream; import org.eclipse.net4j.util.io.ExtendedDataOutputStream; diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/ResourceIDRequest.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/ResourceIDRequest.java index fc4e47fdad..a30da06889 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/ResourceIDRequest.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/ResourceIDRequest.java @@ -16,7 +16,7 @@ import org.eclipse.emf.cdo.protocol.CDOProtocolConstants; import org.eclipse.emf.internal.cdo.bundle.OM; -import org.eclipse.net4j.IChannel; +import org.eclipse.net4j.channel.IChannel; import org.eclipse.net4j.internal.util.om.trace.ContextTracer; import org.eclipse.net4j.util.io.ExtendedDataInputStream; import org.eclipse.net4j.util.io.ExtendedDataOutputStream; diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/ResourcePathRequest.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/ResourcePathRequest.java index e72cc08450..38df1f487e 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/ResourcePathRequest.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/ResourcePathRequest.java @@ -16,7 +16,7 @@ import org.eclipse.emf.cdo.protocol.CDOProtocolConstants; import org.eclipse.emf.internal.cdo.bundle.OM; -import org.eclipse.net4j.IChannel; +import org.eclipse.net4j.channel.IChannel; import org.eclipse.net4j.internal.util.om.trace.ContextTracer; import org.eclipse.net4j.util.io.ExtendedDataInputStream; import org.eclipse.net4j.util.io.ExtendedDataOutputStream; diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/VerifyRevisionRequest.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/VerifyRevisionRequest.java index 40638a22c5..ec61ab694d 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/VerifyRevisionRequest.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/VerifyRevisionRequest.java @@ -18,7 +18,7 @@ import org.eclipse.emf.cdo.protocol.revision.CDORevision; import org.eclipse.emf.internal.cdo.bundle.OM; -import org.eclipse.net4j.IChannel; +import org.eclipse.net4j.channel.IChannel; import org.eclipse.net4j.internal.util.om.trace.ContextTracer; import org.eclipse.net4j.util.io.ExtendedDataInputStream; import org.eclipse.net4j.util.io.ExtendedDataOutputStream; diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/ViewsChangedRequest.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/ViewsChangedRequest.java index e76906ba62..d62fbe9aed 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/ViewsChangedRequest.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/ViewsChangedRequest.java @@ -12,7 +12,7 @@ package org.eclipse.emf.internal.cdo.protocol; import org.eclipse.emf.cdo.protocol.CDOProtocolConstants; -import org.eclipse.net4j.IChannel; +import org.eclipse.net4j.channel.IChannel; import org.eclipse.net4j.util.io.ExtendedDataInputStream; import org.eclipse.net4j.util.io.ExtendedDataOutputStream; diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/ChannelInjector.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/ChannelInjector.java index 6b22f9bf36..8af4f751c1 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/ChannelInjector.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/ChannelInjector.java @@ -12,7 +12,7 @@ package org.eclipse.emf.internal.cdo.util; import org.eclipse.emf.internal.cdo.CDOSessionImpl; -import org.eclipse.net4j.IConnector; +import org.eclipse.net4j.connector.IConnector; import org.eclipse.net4j.util.StringUtil; import org.eclipse.net4j.util.container.IElementProcessor; import org.eclipse.net4j.util.container.IManagedContainer; diff --git a/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/BuddyAdmin.java b/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/BuddyAdmin.java index d63a92ca68..432599996e 100644 --- a/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/BuddyAdmin.java +++ b/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/BuddyAdmin.java @@ -10,8 +10,6 @@ **************************************************************************/ package org.eclipse.net4j.buddies.internal.server; -import org.eclipse.net4j.IChannel; -import org.eclipse.net4j.IProtocol; import org.eclipse.net4j.buddies.internal.protocol.Account; import org.eclipse.net4j.buddies.internal.protocol.Buddy; import org.eclipse.net4j.buddies.internal.protocol.BuddyStateNotification; @@ -28,7 +26,9 @@ import org.eclipse.net4j.buddies.protocol.IBuddyStateEvent; import org.eclipse.net4j.buddies.protocol.ICollaboration; import org.eclipse.net4j.buddies.protocol.ISession; import org.eclipse.net4j.buddies.server.IBuddyAdmin; +import org.eclipse.net4j.channel.IChannel; import org.eclipse.net4j.internal.util.om.trace.ContextTracer; +import org.eclipse.net4j.protocol.IProtocol; import org.eclipse.net4j.util.ObjectUtil; import org.eclipse.net4j.util.container.IPluginContainer; import org.eclipse.net4j.util.event.IEvent; diff --git a/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/ServerSession.java b/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/ServerSession.java index e5ad2b65b7..e78e06a8a9 100644 --- a/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/ServerSession.java +++ b/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/ServerSession.java @@ -10,9 +10,9 @@ **************************************************************************/ package org.eclipse.net4j.buddies.internal.server; -import org.eclipse.net4j.IChannel; import org.eclipse.net4j.buddies.protocol.IBuddy; import org.eclipse.net4j.buddies.protocol.ISession; +import org.eclipse.net4j.channel.IChannel; import org.eclipse.net4j.internal.util.lifecycle.Lifecycle; import org.eclipse.net4j.util.event.IEvent; import org.eclipse.net4j.util.event.IListener; diff --git a/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/BuddyAddedNotification.java b/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/BuddyAddedNotification.java index e38b5ece02..a31196ed83 100644 --- a/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/BuddyAddedNotification.java +++ b/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/BuddyAddedNotification.java @@ -10,8 +10,8 @@ **************************************************************************/ package org.eclipse.net4j.buddies.internal.server.protocol; -import org.eclipse.net4j.IChannel; import org.eclipse.net4j.buddies.internal.protocol.ProtocolConstants; +import org.eclipse.net4j.channel.IChannel; import org.eclipse.net4j.signal.Request; import org.eclipse.net4j.util.io.ExtendedDataOutputStream; diff --git a/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/BuddyRemovedNotification.java b/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/BuddyRemovedNotification.java index 3cbb1908df..7a0ec52048 100644 --- a/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/BuddyRemovedNotification.java +++ b/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/BuddyRemovedNotification.java @@ -10,8 +10,8 @@ **************************************************************************/ package org.eclipse.net4j.buddies.internal.server.protocol; -import org.eclipse.net4j.IChannel; import org.eclipse.net4j.buddies.internal.protocol.ProtocolConstants; +import org.eclipse.net4j.channel.IChannel; import org.eclipse.net4j.signal.Request; import org.eclipse.net4j.util.io.ExtendedDataOutputStream; diff --git a/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/CollaborationInitiatedNotification.java b/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/CollaborationInitiatedNotification.java index ccd4369cff..b0ac8fb83f 100644 --- a/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/CollaborationInitiatedNotification.java +++ b/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/CollaborationInitiatedNotification.java @@ -10,10 +10,10 @@ **************************************************************************/ package org.eclipse.net4j.buddies.internal.server.protocol; -import org.eclipse.net4j.IChannel; import org.eclipse.net4j.buddies.internal.protocol.ProtocolConstants; import org.eclipse.net4j.buddies.protocol.IBuddy; import org.eclipse.net4j.buddies.protocol.ProtocolUtil; +import org.eclipse.net4j.channel.IChannel; import org.eclipse.net4j.signal.Request; import org.eclipse.net4j.util.io.ExtendedDataOutputStream; diff --git a/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/FacilityInstalledNotification.java b/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/FacilityInstalledNotification.java index 0c7684b317..deab325c73 100644 --- a/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/FacilityInstalledNotification.java +++ b/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/FacilityInstalledNotification.java @@ -10,8 +10,8 @@ **************************************************************************/ package org.eclipse.net4j.buddies.internal.server.protocol; -import org.eclipse.net4j.IChannel; import org.eclipse.net4j.buddies.internal.protocol.ProtocolConstants; +import org.eclipse.net4j.channel.IChannel; import org.eclipse.net4j.signal.Request; import org.eclipse.net4j.util.io.ExtendedDataOutputStream; diff --git a/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/InstallFacilityIndication.java b/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/InstallFacilityIndication.java index 2525ed6ec2..61b37480a7 100644 --- a/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/InstallFacilityIndication.java +++ b/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/InstallFacilityIndication.java @@ -10,7 +10,6 @@ **************************************************************************/ package org.eclipse.net4j.buddies.internal.server.protocol; -import org.eclipse.net4j.IChannel; import org.eclipse.net4j.buddies.internal.protocol.Collaboration; import org.eclipse.net4j.buddies.internal.protocol.ProtocolConstants; import org.eclipse.net4j.buddies.internal.protocol.ServerFacilityFactory; @@ -19,6 +18,7 @@ import org.eclipse.net4j.buddies.internal.server.bundle.OM; import org.eclipse.net4j.buddies.protocol.IBuddy; import org.eclipse.net4j.buddies.protocol.IFacility; import org.eclipse.net4j.buddies.protocol.ISession; +import org.eclipse.net4j.channel.IChannel; import org.eclipse.net4j.signal.IndicationWithResponse; import org.eclipse.net4j.util.container.IPluginContainer; import org.eclipse.net4j.util.io.ExtendedDataInputStream; diff --git a/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/InviteBuddiesIndication.java b/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/InviteBuddiesIndication.java index a938400dc1..aa68225e04 100644 --- a/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/InviteBuddiesIndication.java +++ b/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/InviteBuddiesIndication.java @@ -10,13 +10,13 @@ **************************************************************************/ package org.eclipse.net4j.buddies.internal.server.protocol; -import org.eclipse.net4j.IChannel; import org.eclipse.net4j.buddies.internal.protocol.Collaboration; import org.eclipse.net4j.buddies.internal.protocol.Membership; import org.eclipse.net4j.buddies.internal.protocol.ProtocolConstants; import org.eclipse.net4j.buddies.internal.server.BuddyAdmin; import org.eclipse.net4j.buddies.protocol.IBuddy; import org.eclipse.net4j.buddies.protocol.ProtocolUtil; +import org.eclipse.net4j.channel.IChannel; import org.eclipse.net4j.signal.Indication; import org.eclipse.net4j.util.WrappedException; import org.eclipse.net4j.util.io.ExtendedDataInputStream; diff --git a/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/OpenSessionIndication.java b/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/OpenSessionIndication.java index be1fb01a98..75212ed67a 100644 --- a/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/OpenSessionIndication.java +++ b/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/OpenSessionIndication.java @@ -10,7 +10,6 @@ **************************************************************************/ package org.eclipse.net4j.buddies.internal.server.protocol; -import org.eclipse.net4j.IChannel; import org.eclipse.net4j.buddies.internal.protocol.ProtocolConstants; import org.eclipse.net4j.buddies.internal.server.bundle.OM; import org.eclipse.net4j.buddies.protocol.IAccount; @@ -18,6 +17,7 @@ import org.eclipse.net4j.buddies.protocol.IBuddy; import org.eclipse.net4j.buddies.protocol.ISession; import org.eclipse.net4j.buddies.protocol.ProtocolUtil; import org.eclipse.net4j.buddies.server.IBuddyAdmin; +import org.eclipse.net4j.channel.IChannel; import org.eclipse.net4j.signal.IndicationWithResponse; import org.eclipse.net4j.util.io.ExtendedDataInputStream; import org.eclipse.net4j.util.io.ExtendedDataOutputStream; diff --git a/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/ServerCollaborationLeftIndication.java b/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/ServerCollaborationLeftIndication.java index 64183594e9..fd97b2d99e 100644 --- a/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/ServerCollaborationLeftIndication.java +++ b/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/ServerCollaborationLeftIndication.java @@ -10,7 +10,6 @@ **************************************************************************/ package org.eclipse.net4j.buddies.internal.server.protocol; -import org.eclipse.net4j.IChannel; import org.eclipse.net4j.buddies.internal.protocol.Buddy; import org.eclipse.net4j.buddies.internal.protocol.Collaboration; import org.eclipse.net4j.buddies.internal.protocol.CollaborationLeftIndication; @@ -19,6 +18,7 @@ import org.eclipse.net4j.buddies.internal.server.BuddyAdmin; import org.eclipse.net4j.buddies.protocol.IBuddy; import org.eclipse.net4j.buddies.protocol.IMembership; import org.eclipse.net4j.buddies.server.IBuddyAdmin; +import org.eclipse.net4j.channel.IChannel; import org.eclipse.net4j.util.WrappedException; /** diff --git a/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/server/IBuddyAdmin.java b/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/server/IBuddyAdmin.java index c2c0f772e3..a078a459eb 100644 --- a/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/server/IBuddyAdmin.java +++ b/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/server/IBuddyAdmin.java @@ -10,7 +10,6 @@ **************************************************************************/ package org.eclipse.net4j.buddies.server; -import org.eclipse.net4j.IChannel; import org.eclipse.net4j.buddies.internal.server.BuddyAdmin; import org.eclipse.net4j.buddies.protocol.IAccount; import org.eclipse.net4j.buddies.protocol.IBuddy; @@ -19,6 +18,7 @@ import org.eclipse.net4j.buddies.protocol.ICollaboration; import org.eclipse.net4j.buddies.protocol.ICollaborationContainer; import org.eclipse.net4j.buddies.protocol.ISession; import org.eclipse.net4j.buddies.protocol.ISessionProvider; +import org.eclipse.net4j.channel.IChannel; import java.util.Map; diff --git a/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/SessionManager.java b/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/SessionManager.java index 8c51268873..ad549e03b1 100644 --- a/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/SessionManager.java +++ b/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/SessionManager.java @@ -10,7 +10,6 @@ **************************************************************************/ package org.eclipse.net4j.buddies.internal.ui; -import org.eclipse.net4j.IConnector; import org.eclipse.net4j.Net4jUtil; import org.eclipse.net4j.buddies.BuddiesUtil; import org.eclipse.net4j.buddies.IBuddySession; @@ -18,6 +17,7 @@ import org.eclipse.net4j.buddies.internal.ui.bundle.OM; import org.eclipse.net4j.buddies.protocol.IBuddy; import org.eclipse.net4j.buddies.ui.ISessionManager; import org.eclipse.net4j.buddies.ui.ISessionManagerEvent; +import org.eclipse.net4j.connector.IConnector; import org.eclipse.net4j.internal.buddies.Self; import org.eclipse.net4j.internal.util.event.Event; import org.eclipse.net4j.internal.util.lifecycle.Lifecycle; diff --git a/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/buddies/BuddiesUtil.java b/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/buddies/BuddiesUtil.java index beab06c36d..6faae33375 100644 --- a/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/buddies/BuddiesUtil.java +++ b/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/buddies/BuddiesUtil.java @@ -10,10 +10,10 @@ **************************************************************************/ package org.eclipse.net4j.buddies; -import org.eclipse.net4j.IChannel; -import org.eclipse.net4j.IConnector; import org.eclipse.net4j.buddies.internal.protocol.ClientFacilityFactory; import org.eclipse.net4j.buddies.internal.protocol.ProtocolConstants; +import org.eclipse.net4j.channel.IChannel; +import org.eclipse.net4j.connector.IConnector; import org.eclipse.net4j.internal.buddies.protocol.OpenSessionRequest; import org.eclipse.net4j.signal.SignalActor; import org.eclipse.net4j.util.WrappedException; diff --git a/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/buddies/IBuddySession.java b/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/buddies/IBuddySession.java index b3dbd0dc85..3d24d9ce80 100644 --- a/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/buddies/IBuddySession.java +++ b/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/buddies/IBuddySession.java @@ -10,10 +10,10 @@ **************************************************************************/ package org.eclipse.net4j.buddies; -import org.eclipse.net4j.IChannel; import org.eclipse.net4j.buddies.protocol.IBuddy; import org.eclipse.net4j.buddies.protocol.IBuddyContainer; import org.eclipse.net4j.buddies.protocol.ISession; +import org.eclipse.net4j.channel.IChannel; /** * @author Eike Stepper diff --git a/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/BuddyCollaboration.java b/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/BuddyCollaboration.java index 665497746a..629ff3fae4 100644 --- a/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/BuddyCollaboration.java +++ b/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/BuddyCollaboration.java @@ -10,7 +10,6 @@ **************************************************************************/ package org.eclipse.net4j.internal.buddies; -import org.eclipse.net4j.IChannel; import org.eclipse.net4j.buddies.IBuddyCollaboration; import org.eclipse.net4j.buddies.IBuddySession; import org.eclipse.net4j.buddies.internal.protocol.ClientFacilityFactory; @@ -22,6 +21,7 @@ import org.eclipse.net4j.buddies.internal.protocol.ProtocolConstants; import org.eclipse.net4j.buddies.protocol.IBuddy; import org.eclipse.net4j.buddies.protocol.IFacility; import org.eclipse.net4j.buddies.protocol.IMessage; +import org.eclipse.net4j.channel.IChannel; import org.eclipse.net4j.internal.buddies.protocol.InstallFacilityRequest; import org.eclipse.net4j.internal.buddies.protocol.InviteBuddiesNotification; import org.eclipse.net4j.util.WrappedException; diff --git a/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/ClientSession.java b/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/ClientSession.java index 5d3c495c85..65e9eb3a52 100644 --- a/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/ClientSession.java +++ b/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/ClientSession.java @@ -10,7 +10,6 @@ **************************************************************************/ package org.eclipse.net4j.internal.buddies; -import org.eclipse.net4j.IChannel; import org.eclipse.net4j.buddies.IBuddySession; import org.eclipse.net4j.buddies.internal.protocol.BuddyContainer; import org.eclipse.net4j.buddies.internal.protocol.BuddyStateNotification; @@ -19,6 +18,7 @@ import org.eclipse.net4j.buddies.protocol.IAccount; import org.eclipse.net4j.buddies.protocol.IBuddy; import org.eclipse.net4j.buddies.protocol.IBuddyStateEvent; import org.eclipse.net4j.buddies.protocol.IMembership; +import org.eclipse.net4j.channel.IChannel; import org.eclipse.net4j.internal.buddies.bundle.OM; import org.eclipse.net4j.util.event.IEvent; import org.eclipse.net4j.util.event.IListener; diff --git a/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/Self.java b/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/Self.java index 2d259571ef..8116f87392 100644 --- a/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/Self.java +++ b/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/Self.java @@ -10,13 +10,13 @@ **************************************************************************/ package org.eclipse.net4j.internal.buddies; -import org.eclipse.net4j.IChannel; import org.eclipse.net4j.buddies.internal.protocol.Buddy; import org.eclipse.net4j.buddies.internal.protocol.Membership; import org.eclipse.net4j.buddies.internal.protocol.ProtocolConstants; import org.eclipse.net4j.buddies.protocol.IAccount; import org.eclipse.net4j.buddies.protocol.IBuddy; import org.eclipse.net4j.buddies.protocol.IMembership; +import org.eclipse.net4j.channel.IChannel; import org.eclipse.net4j.internal.buddies.protocol.InitiateCollaborationRequest; import org.eclipse.net4j.util.WrappedException; import org.eclipse.net4j.util.lifecycle.LifecycleUtil; diff --git a/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/InitiateCollaborationRequest.java b/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/InitiateCollaborationRequest.java index 614bc447f4..a0ea41447e 100644 --- a/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/InitiateCollaborationRequest.java +++ b/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/InitiateCollaborationRequest.java @@ -10,10 +10,10 @@ **************************************************************************/ package org.eclipse.net4j.internal.buddies.protocol; -import org.eclipse.net4j.IChannel; import org.eclipse.net4j.buddies.internal.protocol.ProtocolConstants; import org.eclipse.net4j.buddies.protocol.IBuddy; import org.eclipse.net4j.buddies.protocol.ProtocolUtil; +import org.eclipse.net4j.channel.IChannel; import org.eclipse.net4j.signal.RequestWithConfirmation; import org.eclipse.net4j.util.io.ExtendedDataInputStream; import org.eclipse.net4j.util.io.ExtendedDataOutputStream; diff --git a/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/InstallFacilityRequest.java b/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/InstallFacilityRequest.java index 451972a24e..145f6aa895 100644 --- a/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/InstallFacilityRequest.java +++ b/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/InstallFacilityRequest.java @@ -10,8 +10,8 @@ **************************************************************************/ package org.eclipse.net4j.internal.buddies.protocol; -import org.eclipse.net4j.IChannel; import org.eclipse.net4j.buddies.internal.protocol.ProtocolConstants; +import org.eclipse.net4j.channel.IChannel; import org.eclipse.net4j.signal.RequestWithConfirmation; import org.eclipse.net4j.util.io.ExtendedDataInputStream; import org.eclipse.net4j.util.io.ExtendedDataOutputStream; diff --git a/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/InviteBuddiesNotification.java b/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/InviteBuddiesNotification.java index f54472f7e2..08d2fd5ce9 100644 --- a/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/InviteBuddiesNotification.java +++ b/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/InviteBuddiesNotification.java @@ -10,10 +10,10 @@ **************************************************************************/ package org.eclipse.net4j.internal.buddies.protocol; -import org.eclipse.net4j.IChannel; import org.eclipse.net4j.buddies.internal.protocol.ProtocolConstants; import org.eclipse.net4j.buddies.protocol.IBuddy; import org.eclipse.net4j.buddies.protocol.ProtocolUtil; +import org.eclipse.net4j.channel.IChannel; import org.eclipse.net4j.signal.Request; import org.eclipse.net4j.util.io.ExtendedDataOutputStream; diff --git a/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/LoadAccountRequest.java b/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/LoadAccountRequest.java index fc9e835715..8bb97b81aa 100644 --- a/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/LoadAccountRequest.java +++ b/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/LoadAccountRequest.java @@ -10,10 +10,10 @@ **************************************************************************/ package org.eclipse.net4j.internal.buddies.protocol; -import org.eclipse.net4j.IChannel; import org.eclipse.net4j.buddies.internal.protocol.ProtocolConstants; import org.eclipse.net4j.buddies.protocol.IAccount; import org.eclipse.net4j.buddies.protocol.ProtocolUtil; +import org.eclipse.net4j.channel.IChannel; import org.eclipse.net4j.signal.RequestWithConfirmation; import org.eclipse.net4j.util.io.ExtendedDataInputStream; import org.eclipse.net4j.util.io.ExtendedDataOutputStream; diff --git a/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/OpenSessionRequest.java b/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/OpenSessionRequest.java index 96a8e5eb95..bb985344e8 100644 --- a/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/OpenSessionRequest.java +++ b/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/OpenSessionRequest.java @@ -10,11 +10,11 @@ **************************************************************************/ package org.eclipse.net4j.internal.buddies.protocol; -import org.eclipse.net4j.IChannel; import org.eclipse.net4j.buddies.IBuddySession; import org.eclipse.net4j.buddies.internal.protocol.ProtocolConstants; import org.eclipse.net4j.buddies.protocol.IAccount; import org.eclipse.net4j.buddies.protocol.ProtocolUtil; +import org.eclipse.net4j.channel.IChannel; import org.eclipse.net4j.internal.buddies.ClientSession; import org.eclipse.net4j.signal.RequestWithConfirmation; import org.eclipse.net4j.util.io.ExtendedDataInputStream; diff --git a/plugins/org.eclipse.net4j.jms.admin/src/org/eclipse/net4j/jms/admin/JMSAdminUtil.java b/plugins/org.eclipse.net4j.jms.admin/src/org/eclipse/net4j/jms/admin/JMSAdminUtil.java index de913b85b8..abf70a787f 100644 --- a/plugins/org.eclipse.net4j.jms.admin/src/org/eclipse/net4j/jms/admin/JMSAdminUtil.java +++ b/plugins/org.eclipse.net4j.jms.admin/src/org/eclipse/net4j/jms/admin/JMSAdminUtil.java @@ -10,7 +10,7 @@ **************************************************************************/ package org.eclipse.net4j.jms.admin; -import org.eclipse.net4j.IConnector; +import org.eclipse.net4j.connector.IConnector; import org.eclipse.net4j.jms.internal.admin.JMSAdmin; import org.eclipse.net4j.jms.internal.admin.protocol.JMSAdminProtocolFactory; import org.eclipse.net4j.util.container.IManagedContainer; diff --git a/plugins/org.eclipse.net4j.jms.admin/src/org/eclipse/net4j/jms/internal/admin/JMSAdmin.java b/plugins/org.eclipse.net4j.jms.admin/src/org/eclipse/net4j/jms/internal/admin/JMSAdmin.java index 2db6bfe45b..4b7dbe4522 100644 --- a/plugins/org.eclipse.net4j.jms.admin/src/org/eclipse/net4j/jms/internal/admin/JMSAdmin.java +++ b/plugins/org.eclipse.net4j.jms.admin/src/org/eclipse/net4j/jms/internal/admin/JMSAdmin.java @@ -10,8 +10,8 @@ **************************************************************************/ package org.eclipse.net4j.jms.internal.admin; -import org.eclipse.net4j.IChannel; -import org.eclipse.net4j.IConnector; +import org.eclipse.net4j.channel.IChannel; +import org.eclipse.net4j.connector.IConnector; import org.eclipse.net4j.jms.JMSAdminProtocolConstants; import org.eclipse.net4j.jms.admin.IJMSAdmin; import org.eclipse.net4j.jms.internal.admin.bundle.OM; diff --git a/plugins/org.eclipse.net4j.jms.admin/src/org/eclipse/net4j/jms/internal/admin/protocol/JMSCreateDestinationRequest.java b/plugins/org.eclipse.net4j.jms.admin/src/org/eclipse/net4j/jms/internal/admin/protocol/JMSCreateDestinationRequest.java index f39a3af8b1..513cbe58ee 100644 --- a/plugins/org.eclipse.net4j.jms.admin/src/org/eclipse/net4j/jms/internal/admin/protocol/JMSCreateDestinationRequest.java +++ b/plugins/org.eclipse.net4j.jms.admin/src/org/eclipse/net4j/jms/internal/admin/protocol/JMSCreateDestinationRequest.java @@ -10,7 +10,7 @@ **************************************************************************/ package org.eclipse.net4j.jms.internal.admin.protocol; -import org.eclipse.net4j.IChannel; +import org.eclipse.net4j.channel.IChannel; import org.eclipse.net4j.jms.JMSAdminProtocolConstants; import org.eclipse.net4j.signal.RequestWithConfirmation; import org.eclipse.net4j.util.io.ExtendedDataInputStream; diff --git a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/ServerConsumer.java b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/ServerConsumer.java index 3b131a1b8c..f7d71e0d78 100644 --- a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/ServerConsumer.java +++ b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/ServerConsumer.java @@ -10,7 +10,7 @@ **************************************************************************/ package org.eclipse.net4j.jms.internal.server; -import org.eclipse.net4j.IChannel; +import org.eclipse.net4j.channel.IChannel; import org.eclipse.net4j.internal.jms.MessageImpl; import org.eclipse.net4j.jms.internal.server.bundle.OM; import org.eclipse.net4j.jms.internal.server.protocol.JMSServerMessageRequest; diff --git a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSServerMessageRequest.java b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSServerMessageRequest.java index 4ac0e81be0..6df0efbb37 100644 --- a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSServerMessageRequest.java +++ b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSServerMessageRequest.java @@ -10,7 +10,7 @@ **************************************************************************/ package org.eclipse.net4j.jms.internal.server.protocol; -import org.eclipse.net4j.IChannel; +import org.eclipse.net4j.channel.IChannel; import org.eclipse.net4j.internal.jms.MessageImpl; import org.eclipse.net4j.internal.jms.util.MessageUtil; import org.eclipse.net4j.jms.JMSProtocolConstants; diff --git a/plugins/org.eclipse.net4j.jms.tests/src/org/eclipse/net4j/jms/tests/JMSSeparatedTest.java b/plugins/org.eclipse.net4j.jms.tests/src/org/eclipse/net4j/jms/tests/JMSSeparatedTest.java index b91a1546b7..c7ccaace41 100644 --- a/plugins/org.eclipse.net4j.jms.tests/src/org/eclipse/net4j/jms/tests/JMSSeparatedTest.java +++ b/plugins/org.eclipse.net4j.jms.tests/src/org/eclipse/net4j/jms/tests/JMSSeparatedTest.java @@ -10,8 +10,8 @@ **************************************************************************/ package org.eclipse.net4j.jms.tests; -import org.eclipse.net4j.IConnector; import org.eclipse.net4j.Net4jUtil; +import org.eclipse.net4j.connector.IConnector; import org.eclipse.net4j.db.IDBAdapter; import org.eclipse.net4j.db.internal.derby.DerbyAdapter; import org.eclipse.net4j.internal.util.container.ManagedContainer; diff --git a/plugins/org.eclipse.net4j.jms.tests/src/org/eclipse/net4j/jms/tests/JMSTest.java b/plugins/org.eclipse.net4j.jms.tests/src/org/eclipse/net4j/jms/tests/JMSTest.java index 4055c78119..8d5893ef44 100644 --- a/plugins/org.eclipse.net4j.jms.tests/src/org/eclipse/net4j/jms/tests/JMSTest.java +++ b/plugins/org.eclipse.net4j.jms.tests/src/org/eclipse/net4j/jms/tests/JMSTest.java @@ -10,8 +10,8 @@ **************************************************************************/ package org.eclipse.net4j.jms.tests; -import org.eclipse.net4j.IConnector; import org.eclipse.net4j.Net4jUtil; +import org.eclipse.net4j.connector.IConnector; import org.eclipse.net4j.db.IDBAdapter; import org.eclipse.net4j.db.internal.derby.DerbyAdapter; import org.eclipse.net4j.internal.util.container.ManagedContainer; diff --git a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/ConnectionImpl.java b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/ConnectionImpl.java index 8951b4f246..435040e92d 100644 --- a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/ConnectionImpl.java +++ b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/ConnectionImpl.java @@ -10,9 +10,9 @@ **************************************************************************/ package org.eclipse.net4j.internal.jms; -import org.eclipse.net4j.IChannel; -import org.eclipse.net4j.IConnector; import org.eclipse.net4j.Net4jUtil; +import org.eclipse.net4j.channel.IChannel; +import org.eclipse.net4j.connector.IConnector; import org.eclipse.net4j.internal.jms.bundle.OM; import org.eclipse.net4j.internal.jms.protocol.JMSClientProtocol; import org.eclipse.net4j.internal.jms.protocol.JMSLogonRequest; diff --git a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSAcknowledgeRequest.java b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSAcknowledgeRequest.java index a0856bf8b3..90c24240ea 100644 --- a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSAcknowledgeRequest.java +++ b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSAcknowledgeRequest.java @@ -10,7 +10,7 @@ **************************************************************************/ package org.eclipse.net4j.internal.jms.protocol; -import org.eclipse.net4j.IChannel; +import org.eclipse.net4j.channel.IChannel; import org.eclipse.net4j.jms.JMSProtocolConstants; import org.eclipse.net4j.signal.Request; import org.eclipse.net4j.util.io.ExtendedDataOutputStream; diff --git a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSClientMessageRequest.java b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSClientMessageRequest.java index 92deca824d..3220abfc1e 100644 --- a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSClientMessageRequest.java +++ b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSClientMessageRequest.java @@ -10,7 +10,7 @@ **************************************************************************/ package org.eclipse.net4j.internal.jms.protocol; -import org.eclipse.net4j.IChannel; +import org.eclipse.net4j.channel.IChannel; import org.eclipse.net4j.internal.jms.MessageImpl; import org.eclipse.net4j.internal.jms.util.MessageUtil; import org.eclipse.net4j.jms.JMSProtocolConstants; diff --git a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSCloseSessionRequest.java b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSCloseSessionRequest.java index ba16351d4f..6545bd4425 100644 --- a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSCloseSessionRequest.java +++ b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSCloseSessionRequest.java @@ -10,7 +10,7 @@ **************************************************************************/ package org.eclipse.net4j.internal.jms.protocol; -import org.eclipse.net4j.IChannel; +import org.eclipse.net4j.channel.IChannel; import org.eclipse.net4j.jms.JMSProtocolConstants; import org.eclipse.net4j.signal.RequestWithConfirmation; import org.eclipse.net4j.util.io.ExtendedDataInputStream; diff --git a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSCommitRequest.java b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSCommitRequest.java index 123c0c538c..aca1200758 100644 --- a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSCommitRequest.java +++ b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSCommitRequest.java @@ -10,7 +10,7 @@ **************************************************************************/ package org.eclipse.net4j.internal.jms.protocol; -import org.eclipse.net4j.IChannel; +import org.eclipse.net4j.channel.IChannel; import org.eclipse.net4j.internal.jms.MessageImpl; import org.eclipse.net4j.internal.jms.util.MessageUtil; import org.eclipse.net4j.jms.JMSProtocolConstants; diff --git a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSDeregisterConsumerRequest.java b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSDeregisterConsumerRequest.java index 88a7336e70..d81a0aaa68 100644 --- a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSDeregisterConsumerRequest.java +++ b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSDeregisterConsumerRequest.java @@ -10,7 +10,7 @@ **************************************************************************/ package org.eclipse.net4j.internal.jms.protocol; -import org.eclipse.net4j.IChannel; +import org.eclipse.net4j.channel.IChannel; import org.eclipse.net4j.jms.JMSProtocolConstants; import org.eclipse.net4j.signal.RequestWithConfirmation; import org.eclipse.net4j.util.io.ExtendedDataInputStream; diff --git a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSLogoffRequest.java b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSLogoffRequest.java index 6e63dde7fb..80b63e31cd 100644 --- a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSLogoffRequest.java +++ b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSLogoffRequest.java @@ -10,7 +10,7 @@ **************************************************************************/ package org.eclipse.net4j.internal.jms.protocol; -import org.eclipse.net4j.IChannel; +import org.eclipse.net4j.channel.IChannel; import org.eclipse.net4j.jms.JMSProtocolConstants; import org.eclipse.net4j.signal.Request; import org.eclipse.net4j.util.io.ExtendedDataOutputStream; diff --git a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSLogonRequest.java b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSLogonRequest.java index 3c943c4744..e5649fb72f 100644 --- a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSLogonRequest.java +++ b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSLogonRequest.java @@ -10,7 +10,7 @@ **************************************************************************/ package org.eclipse.net4j.internal.jms.protocol; -import org.eclipse.net4j.IChannel; +import org.eclipse.net4j.channel.IChannel; import org.eclipse.net4j.jms.JMSProtocolConstants; import org.eclipse.net4j.signal.RequestWithConfirmation; import org.eclipse.net4j.util.io.ExtendedDataInputStream; diff --git a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSOpenSessionRequest.java b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSOpenSessionRequest.java index 34faa02dc9..ec829f5b74 100644 --- a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSOpenSessionRequest.java +++ b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSOpenSessionRequest.java @@ -10,7 +10,7 @@ **************************************************************************/ package org.eclipse.net4j.internal.jms.protocol; -import org.eclipse.net4j.IChannel; +import org.eclipse.net4j.channel.IChannel; import org.eclipse.net4j.jms.JMSProtocolConstants; import org.eclipse.net4j.signal.RequestWithConfirmation; import org.eclipse.net4j.util.io.ExtendedDataInputStream; diff --git a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSRecoverRequest.java b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSRecoverRequest.java index 8cd906c2e5..2842eb32d2 100644 --- a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSRecoverRequest.java +++ b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSRecoverRequest.java @@ -10,7 +10,7 @@ **************************************************************************/ package org.eclipse.net4j.internal.jms.protocol; -import org.eclipse.net4j.IChannel; +import org.eclipse.net4j.channel.IChannel; import org.eclipse.net4j.jms.JMSProtocolConstants; import org.eclipse.net4j.signal.RequestWithConfirmation; import org.eclipse.net4j.util.io.ExtendedDataInputStream; diff --git a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSRegisterConsumerRequest.java b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSRegisterConsumerRequest.java index 2c9d4d7a49..0ee1a451af 100644 --- a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSRegisterConsumerRequest.java +++ b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSRegisterConsumerRequest.java @@ -10,7 +10,7 @@ **************************************************************************/ package org.eclipse.net4j.internal.jms.protocol; -import org.eclipse.net4j.IChannel; +import org.eclipse.net4j.channel.IChannel; import org.eclipse.net4j.internal.jms.DestinationImpl; import org.eclipse.net4j.internal.jms.util.DestinationUtil; import org.eclipse.net4j.jms.JMSProtocolConstants; diff --git a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSRollbackRequest.java b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSRollbackRequest.java index aea51ea197..c4db85ca0d 100644 --- a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSRollbackRequest.java +++ b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSRollbackRequest.java @@ -10,7 +10,7 @@ **************************************************************************/ package org.eclipse.net4j.internal.jms.protocol; -import org.eclipse.net4j.IChannel; +import org.eclipse.net4j.channel.IChannel; import org.eclipse.net4j.jms.JMSProtocolConstants; import org.eclipse.net4j.signal.RequestWithConfirmation; import org.eclipse.net4j.util.io.ExtendedDataInputStream; diff --git a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSSyncRequest.java b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSSyncRequest.java index a1fbfb57c6..e6601a5255 100644 --- a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSSyncRequest.java +++ b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSSyncRequest.java @@ -10,7 +10,7 @@ **************************************************************************/ package org.eclipse.net4j.internal.jms.protocol; -import org.eclipse.net4j.IChannel; +import org.eclipse.net4j.channel.IChannel; import org.eclipse.net4j.jms.JMSProtocolConstants; import org.eclipse.net4j.signal.RequestWithConfirmation; import org.eclipse.net4j.util.io.ExtendedDataInputStream; diff --git a/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/internal/jvm/JVMClientConnector.java b/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/internal/jvm/JVMClientConnector.java index 53d0dc0af5..90902c41c8 100644 --- a/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/internal/jvm/JVMClientConnector.java +++ b/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/internal/jvm/JVMClientConnector.java @@ -10,7 +10,7 @@ **************************************************************************/ package org.eclipse.net4j.internal.jvm; -import org.eclipse.net4j.ConnectorLocation; +import org.eclipse.net4j.connector.ConnectorLocation; import org.eclipse.net4j.internal.util.lifecycle.LifecycleEventAdapter; import org.eclipse.net4j.util.event.IListener; import org.eclipse.net4j.util.lifecycle.ILifecycle; diff --git a/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/internal/jvm/JVMConnector.java b/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/internal/jvm/JVMConnector.java index 5164792450..63527ad5e5 100644 --- a/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/internal/jvm/JVMConnector.java +++ b/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/internal/jvm/JVMConnector.java @@ -10,10 +10,10 @@ **************************************************************************/ package org.eclipse.net4j.internal.jvm; -import org.eclipse.net4j.ConnectorException; -import org.eclipse.net4j.IBuffer; -import org.eclipse.net4j.IChannel; -import org.eclipse.net4j.IProtocol; +import org.eclipse.net4j.buffer.IBuffer; +import org.eclipse.net4j.channel.IChannel; +import org.eclipse.net4j.connector.ConnectorException; +import org.eclipse.net4j.protocol.IProtocol; import org.eclipse.net4j.util.security.INegotiationContext; import org.eclipse.internal.net4j.Channel; diff --git a/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/internal/jvm/JVMServerConnector.java b/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/internal/jvm/JVMServerConnector.java index 3ef8c1aba7..3e86e9e488 100644 --- a/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/internal/jvm/JVMServerConnector.java +++ b/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/internal/jvm/JVMServerConnector.java @@ -10,7 +10,7 @@ **************************************************************************/ package org.eclipse.net4j.internal.jvm; -import org.eclipse.net4j.ConnectorLocation; +import org.eclipse.net4j.connector.ConnectorLocation; import org.eclipse.net4j.util.lifecycle.LifecycleUtil; /** diff --git a/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/jvm/IJVMAcceptor.java b/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/jvm/IJVMAcceptor.java index 24d3c310d5..0e00d519de 100644 --- a/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/jvm/IJVMAcceptor.java +++ b/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/jvm/IJVMAcceptor.java @@ -10,7 +10,7 @@ **************************************************************************/ package org.eclipse.net4j.jvm; -import org.eclipse.net4j.IAcceptor; +import org.eclipse.net4j.acceptor.IAcceptor; /** * @author Eike Stepper diff --git a/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/jvm/IJVMConnector.java b/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/jvm/IJVMConnector.java index 6b34d35e70..877c88c5e1 100644 --- a/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/jvm/IJVMConnector.java +++ b/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/jvm/IJVMConnector.java @@ -10,7 +10,7 @@ **************************************************************************/ package org.eclipse.net4j.jvm; -import org.eclipse.net4j.IConnector; +import org.eclipse.net4j.connector.IConnector; /** * @author Eike Stepper diff --git a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/ControlChannel.java b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/ControlChannel.java index b7703e7856..16649c2146 100644 --- a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/ControlChannel.java +++ b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/ControlChannel.java @@ -10,11 +10,11 @@ **************************************************************************/ package org.eclipse.net4j.internal.tcp; -import org.eclipse.net4j.IBuffer; -import org.eclipse.net4j.IProtocol; +import org.eclipse.net4j.buffer.IBuffer; import org.eclipse.net4j.internal.tcp.bundle.OM; import org.eclipse.net4j.internal.util.concurrent.SynchronizingCorrelator; import org.eclipse.net4j.internal.util.om.trace.ContextTracer; +import org.eclipse.net4j.protocol.IProtocol; import org.eclipse.net4j.util.concurrent.ConcurrencyUtil; import org.eclipse.net4j.util.concurrent.ISynchronizer; import org.eclipse.net4j.util.concurrent.TimeoutRuntimeException; diff --git a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPClientConnector.java b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPClientConnector.java index 9728dc5d79..c6fae7f1fe 100644 --- a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPClientConnector.java +++ b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPClientConnector.java @@ -10,7 +10,7 @@ **************************************************************************/ package org.eclipse.net4j.internal.tcp; -import org.eclipse.net4j.ConnectorLocation; +import org.eclipse.net4j.connector.ConnectorLocation; import org.eclipse.net4j.internal.tcp.bundle.OM; import java.io.IOException; diff --git a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPConnector.java b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPConnector.java index f9d2547376..f51fcf2d47 100644 --- a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPConnector.java +++ b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPConnector.java @@ -10,14 +10,14 @@ **************************************************************************/ package org.eclipse.net4j.internal.tcp; -import org.eclipse.net4j.ConnectorException; -import org.eclipse.net4j.ConnectorState; -import org.eclipse.net4j.IBuffer; -import org.eclipse.net4j.IChannel; -import org.eclipse.net4j.IProtocol; +import org.eclipse.net4j.buffer.IBuffer; +import org.eclipse.net4j.channel.IChannel; +import org.eclipse.net4j.connector.ConnectorException; +import org.eclipse.net4j.connector.ConnectorState; import org.eclipse.net4j.internal.tcp.bundle.OM; import org.eclipse.net4j.internal.util.om.trace.ContextTracer; import org.eclipse.net4j.internal.util.security.NegotiationContext; +import org.eclipse.net4j.protocol.IProtocol; import org.eclipse.net4j.tcp.ITCPConnector; import org.eclipse.net4j.tcp.ITCPSelector; import org.eclipse.net4j.tcp.ITCPSelectorListener; diff --git a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPServerConnector.java b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPServerConnector.java index baedd9cace..439941c98f 100644 --- a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPServerConnector.java +++ b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPServerConnector.java @@ -10,9 +10,9 @@ **************************************************************************/ package org.eclipse.net4j.internal.tcp; -import org.eclipse.net4j.ConnectorException; -import org.eclipse.net4j.ConnectorLocation; -import org.eclipse.net4j.ConnectorState; +import org.eclipse.net4j.connector.ConnectorException; +import org.eclipse.net4j.connector.ConnectorLocation; +import org.eclipse.net4j.connector.ConnectorState; import java.nio.channels.SelectionKey; import java.text.MessageFormat; diff --git a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/tcp/ITCPAcceptor.java b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/tcp/ITCPAcceptor.java index 711621a396..bb965573d8 100644 --- a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/tcp/ITCPAcceptor.java +++ b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/tcp/ITCPAcceptor.java @@ -10,7 +10,7 @@ **************************************************************************/ package org.eclipse.net4j.tcp; -import org.eclipse.net4j.IAcceptor; +import org.eclipse.net4j.acceptor.IAcceptor; /** * @author Eike Stepper diff --git a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/tcp/ITCPConnector.java b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/tcp/ITCPConnector.java index fbfc189a14..91c7c4f843 100644 --- a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/tcp/ITCPConnector.java +++ b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/tcp/ITCPConnector.java @@ -10,7 +10,7 @@ **************************************************************************/ package org.eclipse.net4j.tcp; -import org.eclipse.net4j.IConnector; +import org.eclipse.net4j.connector.IConnector; /** * @author Eike Stepper diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/BufferPoolTest.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/BufferPoolTest.java index d09f1fb364..2bc848e01e 100644 --- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/BufferPoolTest.java +++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/BufferPoolTest.java @@ -10,9 +10,9 @@ **************************************************************************/ package org.eclipse.net4j.tests; -import org.eclipse.net4j.IBuffer; -import org.eclipse.net4j.IBufferPool; import org.eclipse.net4j.Net4jUtil; +import org.eclipse.net4j.buffer.IBuffer; +import org.eclipse.net4j.buffer.IBufferPool; import org.eclipse.net4j.util.ReflectUtil; import org.eclipse.net4j.util.io.IOUtil; import org.eclipse.net4j.util.lifecycle.LifecycleUtil; diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/ConnectorTest.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/ConnectorTest.java index 2c7cc0b01f..b012edcc68 100644 --- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/ConnectorTest.java +++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/ConnectorTest.java @@ -10,8 +10,8 @@ **************************************************************************/ package org.eclipse.net4j.tests; -import org.eclipse.net4j.IBufferPool; import org.eclipse.net4j.Net4jUtil; +import org.eclipse.net4j.buffer.IBufferPool; import org.eclipse.net4j.internal.tcp.TCPAcceptor; import org.eclipse.net4j.internal.tcp.TCPClientConnector; import org.eclipse.net4j.internal.tcp.TCPSelector; diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/FailOverTest.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/FailOverTest.java index e88aa66cab..215fde7ed4 100644 --- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/FailOverTest.java +++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/FailOverTest.java @@ -10,7 +10,7 @@ **************************************************************************/ package org.eclipse.net4j.tests; -import org.eclipse.net4j.IChannel; +import org.eclipse.net4j.channel.IChannel; import org.eclipse.net4j.signal.failover.IFailOverStrategy; import org.eclipse.net4j.signal.failover.RetryFailOverStrategy; import org.eclipse.net4j.tests.signal.IntFailRequest; diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/SignalTest.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/SignalTest.java index 4dc00f9d3f..a6976c9283 100644 --- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/SignalTest.java +++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/SignalTest.java @@ -10,7 +10,7 @@ **************************************************************************/ package org.eclipse.net4j.tests; -import org.eclipse.net4j.IChannel; +import org.eclipse.net4j.channel.IChannel; import org.eclipse.net4j.tests.signal.ArrayRequest; import org.eclipse.net4j.tests.signal.AsyncRequest; import org.eclipse.net4j.tests.signal.IntRequest; diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/TCPTransportTest.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/TCPTransportTest.java index 1d6ce2386b..580fa81b69 100644 --- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/TCPTransportTest.java +++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/TCPTransportTest.java @@ -10,11 +10,11 @@ **************************************************************************/ package org.eclipse.net4j.tests; -import org.eclipse.net4j.IBuffer; -import org.eclipse.net4j.IBufferProvider; -import org.eclipse.net4j.IChannel; -import org.eclipse.net4j.IConnector; import org.eclipse.net4j.Net4jUtil; +import org.eclipse.net4j.buffer.IBuffer; +import org.eclipse.net4j.buffer.IBufferProvider; +import org.eclipse.net4j.channel.IChannel; +import org.eclipse.net4j.connector.IConnector; import org.eclipse.net4j.internal.util.container.ManagedContainer; import org.eclipse.net4j.stream.ChannelInputStream; import org.eclipse.net4j.stream.ChannelOutputStream; diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/TestProtocol.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/TestProtocol.java index 5465822c7c..0975c64065 100644 --- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/TestProtocol.java +++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/TestProtocol.java @@ -10,7 +10,7 @@ **************************************************************************/ package org.eclipse.net4j.tests; -import org.eclipse.net4j.IBuffer; +import org.eclipse.net4j.buffer.IBuffer; import org.eclipse.net4j.util.io.IOUtil; import org.eclipse.internal.net4j.Protocol; diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/ArrayRequest.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/ArrayRequest.java index 5a263329ce..826e5df5ca 100644 --- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/ArrayRequest.java +++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/ArrayRequest.java @@ -10,7 +10,7 @@ **************************************************************************/ package org.eclipse.net4j.tests.signal; -import org.eclipse.net4j.IChannel; +import org.eclipse.net4j.channel.IChannel; import org.eclipse.net4j.signal.RequestWithConfirmation; import org.eclipse.net4j.util.io.ExtendedDataInputStream; import org.eclipse.net4j.util.io.ExtendedDataOutputStream; diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/AsyncRequest.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/AsyncRequest.java index b7415fc150..5b9bada13a 100644 --- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/AsyncRequest.java +++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/AsyncRequest.java @@ -10,7 +10,7 @@ **************************************************************************/ package org.eclipse.net4j.tests.signal; -import org.eclipse.net4j.IChannel; +import org.eclipse.net4j.channel.IChannel; import org.eclipse.net4j.signal.Request; import org.eclipse.net4j.util.io.ExtendedDataOutputStream; diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/IntFailRequest.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/IntFailRequest.java index fb1b7297a9..f06def6211 100644 --- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/IntFailRequest.java +++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/IntFailRequest.java @@ -10,7 +10,7 @@ **************************************************************************/ package org.eclipse.net4j.tests.signal; -import org.eclipse.net4j.IChannel; +import org.eclipse.net4j.channel.IChannel; import org.eclipse.net4j.signal.RequestWithConfirmation; import org.eclipse.net4j.util.io.ExtendedDataInputStream; import org.eclipse.net4j.util.io.ExtendedDataOutputStream; diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/IntRequest.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/IntRequest.java index 3303a00c94..c79435b544 100644 --- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/IntRequest.java +++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/IntRequest.java @@ -10,7 +10,7 @@ **************************************************************************/ package org.eclipse.net4j.tests.signal; -import org.eclipse.net4j.IChannel; +import org.eclipse.net4j.channel.IChannel; import org.eclipse.net4j.signal.RequestWithConfirmation; import org.eclipse.net4j.util.io.ExtendedDataInputStream; import org.eclipse.net4j.util.io.ExtendedDataOutputStream; diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/StringRequest.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/StringRequest.java index 005fd4d6bb..2b98f93818 100644 --- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/StringRequest.java +++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/StringRequest.java @@ -10,7 +10,7 @@ **************************************************************************/ package org.eclipse.net4j.tests.signal; -import org.eclipse.net4j.IChannel; +import org.eclipse.net4j.channel.IChannel; import org.eclipse.net4j.signal.RequestWithConfirmation; import org.eclipse.net4j.util.io.ExtendedDataInputStream; import org.eclipse.net4j.util.io.ExtendedDataOutputStream; diff --git a/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/views/AcceptorsView.java b/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/views/AcceptorsView.java index 05b41c241f..14684dab19 100644 --- a/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/views/AcceptorsView.java +++ b/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/views/AcceptorsView.java @@ -10,8 +10,8 @@ **************************************************************************/ package org.eclipse.net4j.internal.ui.views; -import org.eclipse.net4j.IAcceptor; import org.eclipse.net4j.Net4jUtil; +import org.eclipse.net4j.acceptor.IAcceptor; import org.eclipse.net4j.util.container.IContainer; import org.eclipse.net4j.util.container.IManagedContainer; import org.eclipse.net4j.util.container.IPluginContainer; diff --git a/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/views/ConnectorsView.java b/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/views/ConnectorsView.java index e5612565db..3268fcb80b 100644 --- a/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/views/ConnectorsView.java +++ b/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/views/ConnectorsView.java @@ -10,7 +10,7 @@ **************************************************************************/ package org.eclipse.net4j.internal.ui.views; -import org.eclipse.net4j.IConnector; +import org.eclipse.net4j.connector.IConnector; import org.eclipse.net4j.util.container.IContainer; import org.eclipse.net4j.util.container.IManagedContainer; import org.eclipse.net4j.util.container.IPluginContainer; diff --git a/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/views/Net4jItemProvider.java b/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/views/Net4jItemProvider.java index 855c9dd6b2..31705f95b0 100644 --- a/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/views/Net4jItemProvider.java +++ b/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/views/Net4jItemProvider.java @@ -10,9 +10,9 @@ **************************************************************************/ package org.eclipse.net4j.internal.ui.views; -import org.eclipse.net4j.IAcceptor; -import org.eclipse.net4j.IChannel; -import org.eclipse.net4j.IConnector; +import org.eclipse.net4j.acceptor.IAcceptor; +import org.eclipse.net4j.channel.IChannel; +import org.eclipse.net4j.connector.IConnector; import org.eclipse.net4j.internal.ui.SharedIcons; import org.eclipse.net4j.util.container.IContainer; import org.eclipse.net4j.util.lifecycle.LifecycleUtil; diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/ReflectUtil.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/ReflectUtil.java index 44ed4b73f9..8662557fcf 100644 --- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/ReflectUtil.java +++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/ReflectUtil.java @@ -318,7 +318,7 @@ public final class ReflectUtil return null; } - return getSimpleClassName(object) + "@" + getID(object); //$NON-NLS-1$ + return object.getClass().getSimpleName() + "@" + getID(object); //$NON-NLS-1$ } public static void dump(Object object) diff --git a/plugins/org.eclipse.net4j/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j/META-INF/MANIFEST.MF index 1b750569ed..582b536443 100644 --- a/plugins/org.eclipse.net4j/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.net4j/META-INF/MANIFEST.MF @@ -12,6 +12,11 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.3.0,4.0.0)";resoluti org.eclipse.net4j.util;bundle-version="[0.8.0,0.9.0)";visibility:=reexport Export-Package: org.eclipse.internal.net4j;version="0.8.0", org.eclipse.net4j;version="0.8.0", + org.eclipse.net4j.acceptor;version="0.8.0", + org.eclipse.net4j.buffer;version="0.8.0", + org.eclipse.net4j.channel;version="0.8.0", + org.eclipse.net4j.connector;version="0.8.0", + org.eclipse.net4j.protocol;version="0.8.0", org.eclipse.net4j.signal;version="0.8.0", org.eclipse.net4j.signal.failover;version="0.8.0", org.eclipse.net4j.signal.wrapping;version="0.8.0", diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/Acceptor.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/Acceptor.java index 5d52c056e8..8c58597f6d 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/Acceptor.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/Acceptor.java @@ -10,9 +10,9 @@ **************************************************************************/ package org.eclipse.internal.net4j; -import org.eclipse.net4j.IAcceptor; -import org.eclipse.net4j.IBufferProvider; -import org.eclipse.net4j.IConnector; +import org.eclipse.net4j.acceptor.IAcceptor; +import org.eclipse.net4j.buffer.IBufferProvider; +import org.eclipse.net4j.connector.IConnector; import org.eclipse.net4j.internal.util.container.Container; import org.eclipse.net4j.internal.util.container.LifecycleEventConverter; import org.eclipse.net4j.internal.util.om.trace.ContextTracer; diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/Buffer.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/Buffer.java index 0719450113..385470d051 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/Buffer.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/Buffer.java @@ -10,9 +10,9 @@ **************************************************************************/ package org.eclipse.internal.net4j; -import org.eclipse.net4j.BufferState; -import org.eclipse.net4j.IBuffer; -import org.eclipse.net4j.IBufferProvider; +import org.eclipse.net4j.buffer.BufferState; +import org.eclipse.net4j.buffer.IBuffer; +import org.eclipse.net4j.buffer.IBufferProvider; import org.eclipse.net4j.internal.util.om.trace.ContextTracer; import org.eclipse.net4j.util.HexUtil; import org.eclipse.net4j.util.ReflectUtil; diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/BufferFactory.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/BufferFactory.java index 06433cde29..9e87cb34f0 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/BufferFactory.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/BufferFactory.java @@ -10,7 +10,7 @@ **************************************************************************/ package org.eclipse.internal.net4j; -import org.eclipse.net4j.IBuffer; +import org.eclipse.net4j.buffer.IBuffer; import org.eclipse.net4j.internal.util.om.trace.ContextTracer; import org.eclipse.internal.net4j.bundle.OM; diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/BufferPool.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/BufferPool.java index eb66bab0e9..ec39b94ffb 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/BufferPool.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/BufferPool.java @@ -10,9 +10,9 @@ **************************************************************************/ package org.eclipse.internal.net4j; -import org.eclipse.net4j.IBuffer; -import org.eclipse.net4j.IBufferPool; -import org.eclipse.net4j.IBufferProvider; +import org.eclipse.net4j.buffer.IBuffer; +import org.eclipse.net4j.buffer.IBufferPool; +import org.eclipse.net4j.buffer.IBufferProvider; import org.eclipse.net4j.internal.util.om.trace.ContextTracer; import org.eclipse.net4j.util.ReflectUtil.ExcludeFromDump; diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/BufferProvider.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/BufferProvider.java index 4e6753dc61..51a9bef1d2 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/BufferProvider.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/BufferProvider.java @@ -10,8 +10,8 @@ **************************************************************************/ package org.eclipse.internal.net4j; -import org.eclipse.net4j.IBuffer; -import org.eclipse.net4j.IBufferProvider; +import org.eclipse.net4j.buffer.IBuffer; +import org.eclipse.net4j.buffer.IBufferProvider; import org.eclipse.net4j.internal.util.lifecycle.Lifecycle; /** diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/BufferProviderFactory.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/BufferProviderFactory.java index 50a5770db8..d24fe3fd18 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/BufferProviderFactory.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/BufferProviderFactory.java @@ -10,8 +10,8 @@ **************************************************************************/ package org.eclipse.internal.net4j; -import org.eclipse.net4j.IBufferProvider; import org.eclipse.net4j.Net4jUtil; +import org.eclipse.net4j.buffer.IBufferProvider; import org.eclipse.net4j.internal.util.factory.Factory; import org.eclipse.net4j.util.container.IManagedContainer; diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/Channel.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/Channel.java index 698b62e430..96472cfdb6 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/Channel.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/Channel.java @@ -10,12 +10,12 @@ **************************************************************************/ package org.eclipse.internal.net4j; -import org.eclipse.net4j.BufferState; -import org.eclipse.net4j.IBuffer; -import org.eclipse.net4j.IBufferHandler; -import org.eclipse.net4j.IBufferProvider; -import org.eclipse.net4j.IChannel; -import org.eclipse.net4j.IChannelMultiplexer; +import org.eclipse.net4j.buffer.BufferState; +import org.eclipse.net4j.buffer.IBuffer; +import org.eclipse.net4j.buffer.IBufferHandler; +import org.eclipse.net4j.buffer.IBufferProvider; +import org.eclipse.net4j.channel.IChannel; +import org.eclipse.net4j.channel.IChannelMultiplexer; import org.eclipse.net4j.internal.util.concurrent.QueueWorkerWorkSerializer; import org.eclipse.net4j.internal.util.concurrent.SynchronousWorkSerializer; import org.eclipse.net4j.internal.util.lifecycle.Lifecycle; diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/Connector.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/Connector.java index d4c1f0dbd9..7e9f589e7a 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/Connector.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/Connector.java @@ -10,21 +10,21 @@ **************************************************************************/ package org.eclipse.internal.net4j; -import org.eclipse.net4j.ConnectorException; -import org.eclipse.net4j.ConnectorLocation; -import org.eclipse.net4j.ConnectorState; -import org.eclipse.net4j.IBuffer; -import org.eclipse.net4j.IBufferProvider; -import org.eclipse.net4j.IChannel; -import org.eclipse.net4j.IChannelMultiplexer; -import org.eclipse.net4j.IConnector; -import org.eclipse.net4j.IConnectorStateEvent; -import org.eclipse.net4j.IProtocol; +import org.eclipse.net4j.buffer.IBuffer; +import org.eclipse.net4j.buffer.IBufferProvider; +import org.eclipse.net4j.channel.IChannel; +import org.eclipse.net4j.channel.IChannelMultiplexer; +import org.eclipse.net4j.connector.ConnectorException; +import org.eclipse.net4j.connector.ConnectorLocation; +import org.eclipse.net4j.connector.ConnectorState; +import org.eclipse.net4j.connector.IConnector; +import org.eclipse.net4j.connector.IConnectorStateEvent; import org.eclipse.net4j.internal.util.container.Container; import org.eclipse.net4j.internal.util.container.LifecycleEventConverter; import org.eclipse.net4j.internal.util.event.Event; import org.eclipse.net4j.internal.util.factory.FactoryKey; import org.eclipse.net4j.internal.util.om.trace.ContextTracer; +import org.eclipse.net4j.protocol.IProtocol; import org.eclipse.net4j.util.StringUtil; import org.eclipse.net4j.util.WrappedException; import org.eclipse.net4j.util.concurrent.RWLock; diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/Net4jConfigurator.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/Net4jConfigurator.java index c6dd45f983..5f1abdb31c 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/Net4jConfigurator.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/Net4jConfigurator.java @@ -10,7 +10,7 @@ **************************************************************************/ package org.eclipse.internal.net4j; -import org.eclipse.net4j.IAcceptor; +import org.eclipse.net4j.acceptor.IAcceptor; import org.eclipse.net4j.internal.util.om.trace.ContextTracer; import org.eclipse.net4j.internal.util.security.NegotiatorFactory; import org.eclipse.net4j.util.container.IManagedContainer; diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/Protocol.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/Protocol.java index b33d304a1e..94acf5eea4 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/Protocol.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/Protocol.java @@ -10,12 +10,12 @@ **************************************************************************/ package org.eclipse.internal.net4j; -import org.eclipse.net4j.IBuffer; -import org.eclipse.net4j.IBufferProvider; -import org.eclipse.net4j.IChannel; -import org.eclipse.net4j.IProtocol; import org.eclipse.net4j.Net4jUtil; +import org.eclipse.net4j.buffer.IBuffer; +import org.eclipse.net4j.buffer.IBufferProvider; +import org.eclipse.net4j.channel.IChannel; import org.eclipse.net4j.internal.util.lifecycle.Lifecycle; +import org.eclipse.net4j.protocol.IProtocol; /** * @author Eike Stepper diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/Net4jUtil.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/Net4jUtil.java index 8391730cb7..4489a7df0e 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/Net4jUtil.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/Net4jUtil.java @@ -10,6 +10,10 @@ **************************************************************************/ package org.eclipse.net4j; +import org.eclipse.net4j.acceptor.IAcceptor; +import org.eclipse.net4j.buffer.IBufferPool; +import org.eclipse.net4j.buffer.IBufferProvider; +import org.eclipse.net4j.connector.IConnector; import org.eclipse.net4j.internal.util.security.RandomizerFactory; import org.eclipse.net4j.util.StringUtil; import org.eclipse.net4j.util.container.IManagedContainer; diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/IAcceptor.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/acceptor/IAcceptor.java index 63e20ba1c0..f42827a823 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/IAcceptor.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/acceptor/IAcceptor.java @@ -8,8 +8,10 @@ * Contributors: * Eike Stepper - initial API and implementation **************************************************************************/ -package org.eclipse.net4j; +package org.eclipse.net4j.acceptor; +import org.eclipse.net4j.connector.ConnectorLocation; +import org.eclipse.net4j.connector.IConnector; import org.eclipse.net4j.util.container.IContainer; import org.eclipse.net4j.util.container.IElementProcessor; import org.eclipse.net4j.util.factory.IFactory; diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/BufferState.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/buffer/BufferState.java index 120f9539da..d01c7daa8a 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/BufferState.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/buffer/BufferState.java @@ -8,7 +8,7 @@ * Contributors: * Eike Stepper - initial API and implementation **************************************************************************/ -package org.eclipse.net4j; +package org.eclipse.net4j.buffer; import java.nio.ByteBuffer; import java.nio.channels.SocketChannel; diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/IBuffer.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/buffer/IBuffer.java index 955e5e83e0..9034639f23 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/IBuffer.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/buffer/IBuffer.java @@ -8,7 +8,9 @@ * Contributors: * Eike Stepper - initial API and implementation **************************************************************************/ -package org.eclipse.net4j; +package org.eclipse.net4j.buffer; + +import org.eclipse.net4j.channel.IChannel; import org.eclipse.internal.net4j.Buffer; diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/IBufferHandler.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/buffer/IBufferHandler.java index 8c5adbfca1..db4c76a4a5 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/IBufferHandler.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/buffer/IBufferHandler.java @@ -8,7 +8,7 @@ * Contributors: * Eike Stepper - initial API and implementation **************************************************************************/ -package org.eclipse.net4j; +package org.eclipse.net4j.buffer; /** * Provides clients with the ability to pass {@link IBuffer}s in for further buffer handling. diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/IBufferPool.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/buffer/IBufferPool.java index a4ef58f0ab..b830fffcf3 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/IBufferPool.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/buffer/IBufferPool.java @@ -8,7 +8,7 @@ * Contributors: * Eike Stepper - initial API and implementation **************************************************************************/ -package org.eclipse.net4j; +package org.eclipse.net4j.buffer; /** * Provides clients with the ability to obtain and retain pooled {@link IBuffer}s. diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/IBufferProvider.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/buffer/IBufferProvider.java index 589b2cddfe..cc5f4de542 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/IBufferProvider.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/buffer/IBufferProvider.java @@ -8,7 +8,7 @@ * Contributors: * Eike Stepper - initial API and implementation **************************************************************************/ -package org.eclipse.net4j; +package org.eclipse.net4j.buffer; /** * Provides clients with the ability to obtain and retain {@link IBuffer}s. diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/IChannel.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/channel/IChannel.java index 0bb2737a95..0c06d40aed 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/IChannel.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/channel/IChannel.java @@ -8,8 +8,11 @@ * Contributors: * Eike Stepper - initial API and implementation **************************************************************************/ -package org.eclipse.net4j; +package org.eclipse.net4j.channel; +import org.eclipse.net4j.buffer.IBuffer; +import org.eclipse.net4j.buffer.IBufferHandler; +import org.eclipse.net4j.connector.IConnector; import org.eclipse.net4j.util.event.INotifier; /** diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/IChannelMultiplexer.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/channel/IChannelMultiplexer.java index d224d97d44..f6c30fc3d9 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/IChannelMultiplexer.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/channel/IChannelMultiplexer.java @@ -8,7 +8,7 @@ * Contributors: * Eike Stepper - initial API and implementation **************************************************************************/ -package org.eclipse.net4j; +package org.eclipse.net4j.channel; /** * @author Eike Stepper diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/ConnectorException.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/connector/ConnectorException.java index 34c54edb3a..2819854169 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/ConnectorException.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/connector/ConnectorException.java @@ -8,7 +8,7 @@ * Contributors: * Eike Stepper - initial API and implementation **************************************************************************/ -package org.eclipse.net4j; +package org.eclipse.net4j.connector; /** * Thrown by an {@link IConnector} to indicate connection problems. diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/ConnectorLocation.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/connector/ConnectorLocation.java index 816d7b2aa3..e2f8139eea 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/ConnectorLocation.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/connector/ConnectorLocation.java @@ -8,7 +8,12 @@ * Contributors: * Eike Stepper - initial API and implementation **************************************************************************/ -package org.eclipse.net4j; +package org.eclipse.net4j.connector; + +import org.eclipse.net4j.acceptor.IAcceptor; +import org.eclipse.net4j.buffer.IBuffer; +import org.eclipse.net4j.channel.IChannel; +import org.eclipse.net4j.protocol.IProtocol; /** * Enumerates the roles that an {@link IConnector} can play during the establishment of a physical connection. diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/ConnectorState.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/connector/ConnectorState.java index 88d34e0ab5..59b9b70760 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/ConnectorState.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/connector/ConnectorState.java @@ -8,7 +8,7 @@ * Contributors: * Eike Stepper - initial API and implementation **************************************************************************/ -package org.eclipse.net4j; +package org.eclipse.net4j.connector; import org.eclipse.net4j.util.lifecycle.ILifecycle; import org.eclipse.net4j.util.lifecycle.LifecycleUtil; diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/IConnector.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/connector/IConnector.java index da82498156..b5af42f832 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/IConnector.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/connector/IConnector.java @@ -8,8 +8,12 @@ * Contributors: * Eike Stepper - initial API and implementation **************************************************************************/ -package org.eclipse.net4j; +package org.eclipse.net4j.connector; +import org.eclipse.net4j.buffer.IBuffer; +import org.eclipse.net4j.buffer.IBufferHandler; +import org.eclipse.net4j.channel.IChannel; +import org.eclipse.net4j.protocol.IProtocol; import org.eclipse.net4j.util.container.IContainer; import org.eclipse.net4j.util.container.IElementProcessor; import org.eclipse.net4j.util.event.IListener; diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/IConnectorEvent.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/connector/IConnectorEvent.java index dcce06c3fa..1a85215a0c 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/IConnectorEvent.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/connector/IConnectorEvent.java @@ -8,7 +8,7 @@ * Contributors: * Eike Stepper - initial API and implementation **************************************************************************/ -package org.eclipse.net4j; +package org.eclipse.net4j.connector; import org.eclipse.net4j.util.container.IContainerEvent; import org.eclipse.net4j.util.event.IEvent; diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/IConnectorStateEvent.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/connector/IConnectorStateEvent.java index 0bdb945710..4dc5699eae 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/IConnectorStateEvent.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/connector/IConnectorStateEvent.java @@ -8,7 +8,7 @@ * Contributors: * Eike Stepper - initial API and implementation **************************************************************************/ -package org.eclipse.net4j; +package org.eclipse.net4j.connector; /** * An event that is fired by an {@link IConnector} to indicate that its state has changed. diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/IProtocol.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/protocol/IProtocol.java index e08eacee2f..843b491cb8 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/IProtocol.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/protocol/IProtocol.java @@ -8,7 +8,10 @@ * Contributors: * Eike Stepper - initial API and implementation **************************************************************************/ -package org.eclipse.net4j; +package org.eclipse.net4j.protocol; + +import org.eclipse.net4j.buffer.IBufferHandler; +import org.eclipse.net4j.channel.IChannel; /** * @author Eike Stepper diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/IProtocolProvider.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/protocol/IProtocolProvider.java index bc1e819cca..149e673bfd 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/IProtocolProvider.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/protocol/IProtocolProvider.java @@ -8,7 +8,9 @@ * Contributors: * Eike Stepper - initial API and implementation **************************************************************************/ -package org.eclipse.net4j; +package org.eclipse.net4j.protocol; + +import org.eclipse.net4j.channel.IChannel; /** * @author Eike Stepper 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 11b6d0034d..992ed653cb 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 @@ -10,7 +10,7 @@ **************************************************************************/ package org.eclipse.net4j.signal; -import org.eclipse.net4j.IChannel; +import org.eclipse.net4j.channel.IChannel; import org.eclipse.net4j.internal.util.om.trace.ContextTracer; import org.eclipse.net4j.stream.BufferInputStream; import org.eclipse.net4j.stream.BufferOutputStream; 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 e749f13425..556eb7d2ea 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 @@ -10,7 +10,7 @@ **************************************************************************/ package org.eclipse.net4j.signal; -import org.eclipse.net4j.IChannel; +import org.eclipse.net4j.channel.IChannel; import org.eclipse.net4j.internal.util.om.trace.ContextTracer; import org.eclipse.net4j.stream.BufferInputStream; import org.eclipse.net4j.stream.BufferOutputStream; 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 d5e2b4dbcb..cbdf49bb99 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 @@ -10,8 +10,8 @@ **************************************************************************/ package org.eclipse.net4j.signal; -import org.eclipse.net4j.IBufferHandler; -import org.eclipse.net4j.IChannel; +import org.eclipse.net4j.buffer.IBufferHandler; +import org.eclipse.net4j.channel.IChannel; import org.eclipse.net4j.stream.BufferInputStream; import org.eclipse.net4j.util.ReflectUtil; 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 57a4fe727f..d7e7e563d0 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 @@ -10,8 +10,8 @@ **************************************************************************/ package org.eclipse.net4j.signal; -import org.eclipse.net4j.IBuffer; -import org.eclipse.net4j.IBufferProvider; +import org.eclipse.net4j.buffer.IBuffer; +import org.eclipse.net4j.buffer.IBufferProvider; import org.eclipse.net4j.internal.util.om.trace.ContextTracer; import org.eclipse.net4j.stream.BufferInputStream; import org.eclipse.net4j.stream.ChannelOutputStream; diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/failover/FailOverStrategy.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/failover/FailOverStrategy.java index 773268e224..39304305f4 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/failover/FailOverStrategy.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/failover/FailOverStrategy.java @@ -10,8 +10,8 @@ **************************************************************************/ package org.eclipse.net4j.signal.failover; -import org.eclipse.net4j.IChannel; -import org.eclipse.net4j.IConnector; +import org.eclipse.net4j.channel.IChannel; +import org.eclipse.net4j.connector.IConnector; import org.eclipse.net4j.internal.util.event.Notifier; import org.eclipse.net4j.signal.RequestWithConfirmation; import org.eclipse.net4j.signal.SignalActor; diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/failover/IFailOverEvent.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/failover/IFailOverEvent.java index cd0d5bf7e7..dfd174a8ff 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/failover/IFailOverEvent.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/failover/IFailOverEvent.java @@ -10,8 +10,8 @@ **************************************************************************/ package org.eclipse.net4j.signal.failover; -import org.eclipse.net4j.IChannel; -import org.eclipse.net4j.IConnector; +import org.eclipse.net4j.channel.IChannel; +import org.eclipse.net4j.connector.IConnector; import org.eclipse.net4j.util.event.IEvent; /** diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/failover/RetryFailOverStrategy.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/failover/RetryFailOverStrategy.java index b9d7e412bf..5c5bb56e3c 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/failover/RetryFailOverStrategy.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/failover/RetryFailOverStrategy.java @@ -10,8 +10,8 @@ **************************************************************************/ package org.eclipse.net4j.signal.failover; -import org.eclipse.net4j.IChannel; -import org.eclipse.net4j.IConnector; +import org.eclipse.net4j.channel.IChannel; +import org.eclipse.net4j.connector.IConnector; /** * @author Eike Stepper 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 14003802d3..d3937be1e8 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 @@ -10,8 +10,8 @@ **************************************************************************/ package org.eclipse.net4j.stream; -import org.eclipse.net4j.IBuffer; -import org.eclipse.net4j.IBufferHandler; +import org.eclipse.net4j.buffer.IBuffer; +import org.eclipse.net4j.buffer.IBufferHandler; import org.eclipse.net4j.internal.util.om.trace.ContextTracer; import org.eclipse.net4j.util.HexUtil; 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 2693b8db08..2f23733130 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 @@ -10,9 +10,9 @@ **************************************************************************/ package org.eclipse.net4j.stream; -import org.eclipse.net4j.IBuffer; -import org.eclipse.net4j.IBufferHandler; -import org.eclipse.net4j.IBufferProvider; +import org.eclipse.net4j.buffer.IBuffer; +import org.eclipse.net4j.buffer.IBufferHandler; +import org.eclipse.net4j.buffer.IBufferProvider; import org.eclipse.net4j.internal.util.om.trace.ContextTracer; import org.eclipse.net4j.util.HexUtil; import org.eclipse.net4j.util.lifecycle.LifecycleUtil; 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 cd8acddc3a..de085f56ad 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 @@ -10,7 +10,7 @@ **************************************************************************/ package org.eclipse.net4j.stream; -import org.eclipse.net4j.IChannel; +import org.eclipse.net4j.channel.IChannel; /** * @author Eike Stepper 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 5f62e4254a..d6e4e12010 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 @@ -10,8 +10,8 @@ **************************************************************************/ package org.eclipse.net4j.stream; -import org.eclipse.net4j.IBufferProvider; -import org.eclipse.net4j.IChannel; +import org.eclipse.net4j.buffer.IBufferProvider; +import org.eclipse.net4j.channel.IChannel; /** * @author Eike Stepper |