summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2007-07-14 16:02:41 (EDT)
committerEike Stepper2007-07-14 16:02:41 (EDT)
commitd9e8ce53d8412059ce5b82e432bf8f7eb1933349 (patch)
tree493ccbdb6d35658f7d74fa58134bfe5ba5c14740
parent17b0ea6fdee533a99bc5278fb0c5048d3a4f6fc4 (diff)
downloadcdo-d9e8ce53d8412059ce5b82e432bf8f7eb1933349.zip
cdo-d9e8ce53d8412059ce5b82e432bf8f7eb1933349.tar.gz
cdo-d9e8ce53d8412059ce5b82e432bf8f7eb1933349.tar.bz2
*** empty log message ***
-rw-r--r--plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/bundle/OM.java6
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/Repository.java7
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/RepositoryPackageManager.java38
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/ResourceManager.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/SessionManager.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/bundle/OM.java6
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/CommitTransactionIndication.java6
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/InvalidationRequest.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/LoadObjectIndication.java6
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/OpenSessionIndication.java6
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/RegisterPackagesIndication.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/ResourceIDIndication.java6
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/ResourcePathIndication.java6
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/bundle/OM.java6
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/CDOResourceImpl.java2
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/util/CDOFactoryImpl.java25
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/util/CDOUtil.java53
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOObjectImpl.java2
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOSessionImpl.java11
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOSessionPackageManager.java38
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOStateMachine.java2
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOStore.java2
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOTransactionImpl.java2
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOViewImpl.java2
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/bundle/Activator.java64
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/bundle/CDO.java4
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/CommitTransactionRequest.java6
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/InvalidationIndication.java4
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/LoadObjectRequest.java6
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/OpenSessionRequest.java6
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/RegisterPackagesRequest.java4
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/ResourceIDRequest.java6
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/ResourcePathRequest.java6
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/EMFUtil.java4
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/PackageClosure.java2
-rw-r--r--plugins/org.eclipse.net4j.db.derby/src/org/eclipse/net4j/db/internal/mysql/bundle/OM.java6
-rw-r--r--plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/bundle/OM.java6
-rw-r--r--plugins/org.eclipse.net4j.debug/src/org/eclipse/net4j/internal/debug/RemoteTraceManager.java6
-rw-r--r--plugins/org.eclipse.net4j.debug/src/org/eclipse/net4j/internal/debug/views/RemoteTraceView.java2
-rw-r--r--plugins/org.eclipse.net4j.jms.admin/src/org/eclipse/net4j/jms/internal/admin/bundle/OM.java6
-rw-r--r--plugins/org.eclipse.net4j.jms.admin/src/org/eclipse/net4j/jms/internal/admin/protocol/JMSCreateDestinationRequest.java4
-rw-r--r--plugins/org.eclipse.net4j.jms.server.jdbc/src/org/eclipse/net4j/jms/server/internal/jdbc/bundle/OM.java6
-rw-r--r--plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/bundle/OM.java6
-rw-r--r--plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSAcknowledgeIndication.java2
-rw-r--r--plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSClientMessageIndication.java4
-rw-r--r--plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSCommitIndication.java4
-rw-r--r--plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSLogonIndication.java4
-rw-r--r--plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSOpenSessionIndication.java4
-rw-r--r--plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSRecoverIndication.java4
-rw-r--r--plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSRegisterConsumerIndication.java4
-rw-r--r--plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSRollbackIndication.java4
-rw-r--r--plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSServerMessageRequest.java2
-rw-r--r--plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSSyncIndication.java4
-rw-r--r--plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/admin/JMSCreateDestinationIndication.java4
-rw-r--r--plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/store/AbstractTransaction.java2
-rw-r--r--plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/BytesMessageImpl.java4
-rw-r--r--plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/MapMessageImpl.java4
-rw-r--r--plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/MessageImpl.java4
-rw-r--r--plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/ObjectMessageImpl.java4
-rw-r--r--plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/StreamMessageImpl.java4
-rw-r--r--plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/TextMessageImpl.java4
-rw-r--r--plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/bundle/OM.java6
-rw-r--r--plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSAcknowledgeRequest.java2
-rw-r--r--plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSClientMessageRequest.java4
-rw-r--r--plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSCloseSessionRequest.java4
-rw-r--r--plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSCommitRequest.java4
-rw-r--r--plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSDeregisterConsumerRequest.java4
-rw-r--r--plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSLogoffRequest.java2
-rw-r--r--plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSLogonRequest.java4
-rw-r--r--plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSOpenSessionRequest.java4
-rw-r--r--plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSRecoverRequest.java4
-rw-r--r--plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSRegisterConsumerRequest.java4
-rw-r--r--plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSRollbackRequest.java4
-rw-r--r--plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSServerMessageIndication.java2
-rw-r--r--plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSSyncRequest.java4
-rw-r--r--plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/util/DestinationUtil.java4
-rw-r--r--plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/util/MessageUtil.java6
-rw-r--r--plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/util/TypeUtil.java4
-rw-r--r--plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/internal/jvm/bundle/JVM.java6
-rw-r--r--plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/ControlChannel.java2
-rw-r--r--plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/SelectorUtil.java2
-rw-r--r--plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPAcceptor.java2
-rw-r--r--plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPConnector.java2
-rw-r--r--plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPSelector.java2
-rw-r--r--plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/bundle/TCP.java6
-rw-r--r--plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/AbstractOMTest.java4
-rw-r--r--plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/TestBufferPool.java2
-rw-r--r--plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/Indication1.java4
-rw-r--r--plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/Indication2.java4
-rw-r--r--plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/Request1.java4
-rw-r--r--plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/Request2.java4
-rw-r--r--plugins/org.eclipse.net4j.ui/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/bundle/OM.java (renamed from plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/bundle/Net4jUI.java)18
-rw-r--r--plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/bundle/SharedIcons.java2
-rw-r--r--plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/ui/actions/SafeAction.java4
-rw-r--r--plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/ui/views/ItemProvider.java4
-rw-r--r--plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/ui/widgets/HistoryText.java1001
-rw-r--r--plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/ui/wizards/SteppingWizard.java4
-rw-r--r--plugins/org.eclipse.net4j.util/META-INF/MANIFEST.MF9
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/bundle/AbstractOMBundle.java37
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/bundle/AbstractOMPlatform.java23
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/bundle/LegacyBundle.java2
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/bundle/LegacyPlatform.java21
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/bundle/OM.java12
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/bundle/OSGiBundle.java2
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/bundle/OSGiPlatform.java2
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/concurrent/AsynchronousWorkSerializer.java2
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/lifecycle/Lifecycle.java2
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/log/EclipseLoggingBridge.java (renamed from plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/log/EclipseLoggingBridge.java)10
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/log/Logger.java (renamed from plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/bundle/OMLoggerImpl.java)9
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/log/OSGiLoggingBridge.java (renamed from plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/log/OSGiLoggingBridge.java)10
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/log/PrintLogHandler.java (renamed from plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/log/PrintLogHandler.java)10
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/pref/BooleanPreference.java41
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/pref/DoublePreference.java41
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/pref/FloatPreference.java41
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/pref/IntegerPreference.java41
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/pref/LongPreference.java41
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/pref/Preference.java114
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/pref/Preferences.java223
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/pref/PreferencesChangeEvent.java47
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/pref/StringPreference.java41
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/trace/ContextTracer.java (renamed from plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/trace/ContextTracer.java)4
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/trace/PrintTraceHandler.java (renamed from plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/trace/PrintTraceHandler.java)15
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/trace/RemoteTraceHandler.java (renamed from plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/trace/RemoteTraceHandler.java)9
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/trace/RemoteTraceServer.java (renamed from plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/trace/RemoteTraceServer.java)4
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/trace/TraceHandlerEvent.java (renamed from plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/bundle/OMTraceHandlerEventImpl.java)10
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/trace/Tracer.java (renamed from plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/bundle/OMTracerImpl.java)31
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/IOUtil.java73
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/ReflectUtil.java1
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/ExtendedDataInput.java (renamed from plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/stream/ExtendedDataInput.java)2
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/ExtendedDataInputStream.java (renamed from plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/stream/ExtendedDataInputStream.java)2
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/ExtendedDataOutput.java (renamed from plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/stream/ExtendedDataOutput.java)2
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/ExtendedDataOutputStream.java (renamed from plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/stream/ExtendedDataOutputStream.java)2
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/IORunnable.java12
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/IORuntimeException.java28
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/IOUtil.java162
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/package.html (renamed from plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/stream/package.html)0
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/lifecycle/LifecycleUtil.java2
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/LegacyUtil.java35
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/OMBundle.java6
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/OMPlatform.java2
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/OSGiActivator.java (renamed from plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/OSGiActivator.java)3
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/log/OMLogHandler.java (renamed from plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/OMLogHandler.java)4
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/log/OMLogger.java (renamed from plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/OMLogger.java)4
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/pref/OMPreference.java41
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/pref/OMPreferences.java50
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/pref/OMPreferencesChangeEvent.java15
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/trace/OMTraceHandler.java (renamed from plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/OMTraceHandler.java)20
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/trace/OMTraceHandlerEvent.java17
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/trace/OMTracer.java (renamed from plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/OMTracer.java)17
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/Acceptor.java2
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/Buffer.java2
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/BufferFactory.java2
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/BufferPool.java2
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/Channel.java2
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/Connector.java2
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/bundle/OM.java6
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/Indication.java4
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/IndicationWithResponse.java6
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/Request.java4
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/RequestWithConfirmation.java6
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/Signal.java2
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/SignalProtocol.java2
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/net4j/stream/BufferInputStream.java2
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/net4j/stream/BufferOutputStream.java2
165 files changed, 2557 insertions, 452 deletions
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/bundle/OM.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/bundle/OM.java
index fb77f3d..e224aa9 100644
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/bundle/OM.java
+++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/bundle/OM.java
@@ -10,11 +10,11 @@
**************************************************************************/
package org.eclipse.emf.cdo.server.internal.db.bundle;
-import org.eclipse.net4j.internal.util.om.OSGiActivator;
import org.eclipse.net4j.util.om.OMBundle;
-import org.eclipse.net4j.util.om.OMLogger;
import org.eclipse.net4j.util.om.OMPlatform;
-import org.eclipse.net4j.util.om.OMTracer;
+import org.eclipse.net4j.util.om.OSGiActivator;
+import org.eclipse.net4j.util.om.log.OMLogger;
+import org.eclipse.net4j.util.om.trace.OMTracer;
/**
* @author Eike Stepper
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/Repository.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/Repository.java
index a19e1a3..39c411f 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/Repository.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/Repository.java
@@ -11,7 +11,6 @@
package org.eclipse.emf.cdo.internal.server;
import org.eclipse.emf.cdo.internal.protocol.CDOIDImpl;
-import org.eclipse.emf.cdo.internal.protocol.model.CDOPackageManagerImpl;
import org.eclipse.emf.cdo.protocol.CDOID;
import org.eclipse.emf.cdo.server.IRepository;
import org.eclipse.emf.cdo.server.IStore;
@@ -33,7 +32,7 @@ public class Repository extends Lifecycle implements IRepository
private String uuid;
- private CDOPackageManagerImpl packageManager;
+ private RepositoryPackageManager packageManager;
private SessionManager sessionManager;
@@ -48,7 +47,7 @@ public class Repository extends Lifecycle implements IRepository
this.name = name;
this.store = store;
this.uuid = UUID.randomUUID().toString();
- packageManager = new CDOPackageManagerImpl();
+ packageManager = new RepositoryPackageManager(this);
sessionManager = new SessionManager(this);
resourceManager = new ResourceManager(this);
revisionManager = new RevisionManager(this);
@@ -69,7 +68,7 @@ public class Repository extends Lifecycle implements IRepository
return uuid;
}
- public CDOPackageManagerImpl getPackageManager()
+ public RepositoryPackageManager getPackageManager()
{
return packageManager;
}
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/RepositoryPackageManager.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/RepositoryPackageManager.java
new file mode 100644
index 0000000..dfae613
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/RepositoryPackageManager.java
@@ -0,0 +1,38 @@
+/***************************************************************************
+ * Copyright (c) 2004 - 2007 Eike Stepper, Germany.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Eike Stepper - initial API and implementation
+ **************************************************************************/
+package org.eclipse.emf.cdo.internal.server;
+
+import org.eclipse.emf.cdo.internal.protocol.model.CDOPackageImpl;
+import org.eclipse.emf.cdo.internal.protocol.model.CDOPackageManagerImpl;
+
+/**
+ * @author Eike Stepper
+ */
+public class RepositoryPackageManager extends CDOPackageManagerImpl
+{
+ private Repository repository;
+
+ public RepositoryPackageManager(Repository repository)
+ {
+ this.repository = repository;
+ }
+
+ public Repository getRepository()
+ {
+ return repository;
+ }
+
+ @Override
+ protected CDOPackageImpl resolve(String packageURI)
+ {
+ return null;
+ }
+}
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/ResourceManager.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/ResourceManager.java
index 696ae3b..616632b 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/ResourceManager.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/ResourceManager.java
@@ -14,7 +14,7 @@ import org.eclipse.emf.cdo.internal.server.bundle.OM;
import org.eclipse.emf.cdo.protocol.CDOID;
import org.eclipse.emf.cdo.server.IResourceManager;
-import org.eclipse.net4j.util.om.trace.ContextTracer;
+import org.eclipse.net4j.internal.util.om.trace.ContextTracer;
import java.util.HashMap;
import java.util.Map;
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/SessionManager.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/SessionManager.java
index a54fc69..e612d8b 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/SessionManager.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/SessionManager.java
@@ -15,7 +15,7 @@ import org.eclipse.emf.cdo.internal.server.bundle.OM;
import org.eclipse.emf.cdo.internal.server.protocol.CDOServerProtocol;
import org.eclipse.emf.cdo.server.ISessionManager;
-import org.eclipse.net4j.util.om.trace.ContextTracer;
+import org.eclipse.net4j.internal.util.om.trace.ContextTracer;
import java.util.HashMap;
import java.util.Map;
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/bundle/OM.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/bundle/OM.java
index faf7ecc..691dede 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/bundle/OM.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/bundle/OM.java
@@ -12,11 +12,11 @@ package org.eclipse.emf.cdo.internal.server.bundle;
import org.eclipse.emf.cdo.internal.server.RepositoryManager;
-import org.eclipse.net4j.internal.util.om.OSGiActivator;
import org.eclipse.net4j.util.om.OMBundle;
-import org.eclipse.net4j.util.om.OMLogger;
import org.eclipse.net4j.util.om.OMPlatform;
-import org.eclipse.net4j.util.om.OMTracer;
+import org.eclipse.net4j.util.om.OSGiActivator;
+import org.eclipse.net4j.util.om.log.OMLogger;
+import org.eclipse.net4j.util.om.trace.OMTracer;
/**
* @author Eike Stepper
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/CommitTransactionIndication.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/CommitTransactionIndication.java
index aa68500..38d4d25 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/CommitTransactionIndication.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/CommitTransactionIndication.java
@@ -18,9 +18,9 @@ import org.eclipse.emf.cdo.internal.server.RevisionManager;
import org.eclipse.emf.cdo.protocol.CDOID;
import org.eclipse.emf.cdo.protocol.CDOProtocolConstants;
-import org.eclipse.net4j.util.om.trace.ContextTracer;
-import org.eclipse.net4j.util.stream.ExtendedDataInputStream;
-import org.eclipse.net4j.util.stream.ExtendedDataOutputStream;
+import org.eclipse.net4j.internal.util.om.trace.ContextTracer;
+import org.eclipse.net4j.util.io.ExtendedDataInputStream;
+import org.eclipse.net4j.util.io.ExtendedDataOutputStream;
import java.io.IOException;
import java.util.HashMap;
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/InvalidationRequest.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/InvalidationRequest.java
index 2e82ec4..3ad1dbc 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/InvalidationRequest.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/InvalidationRequest.java
@@ -16,9 +16,9 @@ import org.eclipse.emf.cdo.internal.protocol.revision.CDORevisionImpl;
import org.eclipse.emf.cdo.protocol.CDOProtocolConstants;
import org.eclipse.net4j.IChannel;
+import org.eclipse.net4j.internal.util.om.trace.ContextTracer;
import org.eclipse.net4j.signal.Request;
-import org.eclipse.net4j.util.om.trace.ContextTracer;
-import org.eclipse.net4j.util.stream.ExtendedDataOutputStream;
+import org.eclipse.net4j.util.io.ExtendedDataOutputStream;
import java.io.IOException;
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/LoadObjectIndication.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/LoadObjectIndication.java
index c5277b6..aaf8cb7 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/LoadObjectIndication.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/LoadObjectIndication.java
@@ -17,9 +17,9 @@ import org.eclipse.emf.cdo.internal.server.RevisionManager;
import org.eclipse.emf.cdo.protocol.CDOID;
import org.eclipse.emf.cdo.protocol.CDOProtocolConstants;
-import org.eclipse.net4j.util.om.trace.ContextTracer;
-import org.eclipse.net4j.util.stream.ExtendedDataInputStream;
-import org.eclipse.net4j.util.stream.ExtendedDataOutputStream;
+import org.eclipse.net4j.internal.util.om.trace.ContextTracer;
+import org.eclipse.net4j.util.io.ExtendedDataInputStream;
+import org.eclipse.net4j.util.io.ExtendedDataOutputStream;
import java.io.IOException;
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/OpenSessionIndication.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/OpenSessionIndication.java
index a988696..f03c4b6 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/OpenSessionIndication.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/OpenSessionIndication.java
@@ -21,10 +21,10 @@ import org.eclipse.emf.cdo.protocol.model.CDOPackageManager;
import org.eclipse.emf.cdo.server.IRepository;
import org.eclipse.emf.cdo.server.ISession;
+import org.eclipse.net4j.internal.util.om.trace.ContextTracer;
import org.eclipse.net4j.signal.IndicationWithResponse;
-import org.eclipse.net4j.util.om.trace.ContextTracer;
-import org.eclipse.net4j.util.stream.ExtendedDataInputStream;
-import org.eclipse.net4j.util.stream.ExtendedDataOutputStream;
+import org.eclipse.net4j.util.io.ExtendedDataInputStream;
+import org.eclipse.net4j.util.io.ExtendedDataOutputStream;
import java.io.IOException;
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/RegisterPackagesIndication.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/RegisterPackagesIndication.java
index 1d1ceb4..e819e63 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/RegisterPackagesIndication.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/RegisterPackagesIndication.java
@@ -14,8 +14,8 @@ import org.eclipse.emf.cdo.internal.protocol.model.CDOPackageImpl;
import org.eclipse.emf.cdo.internal.protocol.model.CDOPackageManagerImpl;
import org.eclipse.emf.cdo.protocol.CDOProtocolConstants;
-import org.eclipse.net4j.util.stream.ExtendedDataInputStream;
-import org.eclipse.net4j.util.stream.ExtendedDataOutputStream;
+import org.eclipse.net4j.util.io.ExtendedDataInputStream;
+import org.eclipse.net4j.util.io.ExtendedDataOutputStream;
import java.io.IOException;
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/ResourceIDIndication.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/ResourceIDIndication.java
index c8fa00b..f7ef6ef 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/ResourceIDIndication.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/ResourceIDIndication.java
@@ -16,9 +16,9 @@ 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.util.om.trace.ContextTracer;
-import org.eclipse.net4j.util.stream.ExtendedDataInputStream;
-import org.eclipse.net4j.util.stream.ExtendedDataOutputStream;
+import org.eclipse.net4j.internal.util.om.trace.ContextTracer;
+import org.eclipse.net4j.util.io.ExtendedDataInputStream;
+import org.eclipse.net4j.util.io.ExtendedDataOutputStream;
import java.io.IOException;
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/ResourcePathIndication.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/ResourcePathIndication.java
index 557ee75..034c470 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/ResourcePathIndication.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/ResourcePathIndication.java
@@ -15,9 +15,9 @@ import org.eclipse.emf.cdo.internal.protocol.bundle.CDOProtocol;
import org.eclipse.emf.cdo.protocol.CDOID;
import org.eclipse.emf.cdo.protocol.CDOProtocolConstants;
-import org.eclipse.net4j.util.om.trace.ContextTracer;
-import org.eclipse.net4j.util.stream.ExtendedDataInputStream;
-import org.eclipse.net4j.util.stream.ExtendedDataOutputStream;
+import org.eclipse.net4j.internal.util.om.trace.ContextTracer;
+import org.eclipse.net4j.util.io.ExtendedDataInputStream;
+import org.eclipse.net4j.util.io.ExtendedDataOutputStream;
import java.io.IOException;
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/bundle/OM.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/bundle/OM.java
index 59117c3..c1258c3 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/bundle/OM.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/bundle/OM.java
@@ -13,11 +13,11 @@ package org.eclipse.emf.cdo.internal.ui.bundle;
import org.eclipse.emf.cdo.internal.server.store.NOOPStore;
import org.eclipse.emf.cdo.server.IRepositoryManager;
-import org.eclipse.net4j.internal.util.om.OSGiActivator;
import org.eclipse.net4j.util.om.OMBundle;
-import org.eclipse.net4j.util.om.OMLogger;
import org.eclipse.net4j.util.om.OMPlatform;
-import org.eclipse.net4j.util.om.OMTracer;
+import org.eclipse.net4j.util.om.OSGiActivator;
+import org.eclipse.net4j.util.om.log.OMLogger;
+import org.eclipse.net4j.util.om.trace.OMTracer;
/**
* @author Eike Stepper
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/CDOResourceImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/CDOResourceImpl.java
index 59e4bd2..fa73a18 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/CDOResourceImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/CDOResourceImpl.java
@@ -11,7 +11,7 @@ import org.eclipse.emf.cdo.eresource.CDOResource;
import org.eclipse.emf.cdo.eresource.EresourcePackage;
import org.eclipse.emf.cdo.util.CDOUtil;
-import org.eclipse.net4j.util.om.trace.ContextTracer;
+import org.eclipse.net4j.internal.util.om.trace.ContextTracer;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.common.notify.NotificationChain;
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/util/CDOFactoryImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/util/CDOFactoryImpl.java
new file mode 100644
index 0000000..b06f5e2
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/util/CDOFactoryImpl.java
@@ -0,0 +1,25 @@
+/***************************************************************************
+ * Copyright (c) 2004 - 2007 Eike Stepper, Germany.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Eike Stepper - initial API and implementation
+ **************************************************************************/
+package org.eclipse.emf.cdo.util;
+
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.impl.EFactoryImpl;
+
+/**
+ * @author Eike Stepper
+ */
+public class CDOFactoryImpl extends EFactoryImpl
+{
+ public CDOFactoryImpl(EPackage ePackage)
+ {
+ this.ePackage = ePackage;
+ }
+}
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 3df3681..7069515 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
@@ -18,7 +18,6 @@ import org.eclipse.emf.cdo.internal.protocol.CDOIDImpl;
import org.eclipse.emf.cdo.protocol.CDOID;
import org.eclipse.emf.cdo.protocol.CDOProtocolConstants;
import org.eclipse.emf.cdo.protocol.model.CDOClass;
-import org.eclipse.emf.cdo.protocol.model.CDOPackageManager;
import org.eclipse.net4j.ConnectorException;
import org.eclipse.net4j.IConnector;
@@ -27,8 +26,12 @@ import org.eclipse.net4j.util.lifecycle.LifecycleUtil;
import org.eclipse.emf.common.notify.Adapter;
import org.eclipse.emf.common.util.EList;
import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.EAttribute;
import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EClassifier;
import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.EReference;
+import org.eclipse.emf.ecore.EcoreFactory;
import org.eclipse.emf.ecore.resource.ResourceSet;
import org.eclipse.emf.ecore.resource.Resource.Factory.Registry;
import org.eclipse.emf.ecore.util.EcoreUtil;
@@ -42,8 +45,6 @@ import java.util.Map;
*/
public final class CDOUtil
{
- public static final CDOPackageManager PACKAGE_MANAGER = EMFUtil.PACKAGE_MANAGER;
-
private CDOUtil()
{
}
@@ -155,4 +156,50 @@ public final class CDOUtil
EClass eClass = EMFUtil.getEClass(cdoClass);
return (CDOObject)EcoreUtil.create(eClass);
}
+
+ public static void prepareEPackage(EPackage ePackage)
+ {
+ ePackage.setEFactoryInstance(new CDOFactoryImpl(ePackage));
+ }
+
+ public static EPackage createEPackage(String name, String nsPrefix, String nsURI)
+ {
+ EPackage ePackage = EcoreFactory.eINSTANCE.createEPackage();
+ ePackage.setName(name);
+ ePackage.setNsPrefix(nsPrefix);
+ ePackage.setNsURI(nsURI);
+ prepareEPackage(ePackage);
+ return ePackage;
+ }
+
+ public static EClass createEClass(EPackage ePackage, String name, boolean isAbstract, boolean isInterface)
+ {
+ EClass eClass = EcoreFactory.eINSTANCE.createEClass();
+ eClass.setName(name);
+ eClass.setAbstract(isAbstract);
+ eClass.setInterface(isInterface);
+ ePackage.getEClassifiers().add(eClass);
+ return eClass;
+ }
+
+ public static EAttribute createEAttribute(EClass eClass, String name, EClassifier type)
+ {
+ EAttribute eAttribute = EcoreFactory.eINSTANCE.createEAttribute();
+ eAttribute.setName(name);
+ eAttribute.setEType(type);
+ eClass.getEStructuralFeatures().add(eAttribute);
+ return eAttribute;
+ }
+
+ public static EReference createEReference(EClass eClass, String name, EClassifier type, boolean isRequired,
+ boolean isMany)
+ {
+ EReference eReference = EcoreFactory.eINSTANCE.createEReference();
+ eReference.setName(name);
+ eReference.setEType(type);
+ eReference.setLowerBound(isRequired ? 1 : 0);
+ eReference.setUpperBound(isMany ? -1 : 0);
+ eClass.getEStructuralFeatures().add(eReference);
+ return eReference;
+ }
}
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOObjectImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOObjectImpl.java
index 87b83be..4555172 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOObjectImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOObjectImpl.java
@@ -20,7 +20,7 @@ import org.eclipse.emf.cdo.internal.protocol.revision.CDORevisionImpl;
import org.eclipse.emf.cdo.protocol.CDOID;
import org.eclipse.emf.cdo.protocol.util.ImplementationError;
-import org.eclipse.net4j.util.om.trace.ContextTracer;
+import org.eclipse.net4j.internal.util.om.trace.ContextTracer;
import org.eclipse.emf.common.util.EList;
import org.eclipse.emf.ecore.EReference;
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 178307d..3b6a487 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
@@ -14,7 +14,6 @@ import org.eclipse.emf.cdo.CDOSession;
import org.eclipse.emf.cdo.CDOSessionInvalidationEvent;
import org.eclipse.emf.cdo.CDOSessionViewsEvent;
import org.eclipse.emf.cdo.CDOView;
-import org.eclipse.emf.cdo.internal.protocol.model.CDOPackageManagerImpl;
import org.eclipse.emf.cdo.protocol.CDOID;
import org.eclipse.emf.cdo.util.CDOUtil;
@@ -25,12 +24,12 @@ import org.eclipse.net4j.internal.util.container.SingleDeltaContainerEvent;
import org.eclipse.net4j.internal.util.event.Event;
import org.eclipse.net4j.internal.util.lifecycle.Lifecycle;
import org.eclipse.net4j.internal.util.lifecycle.LifecycleEventAdapter;
+import org.eclipse.net4j.internal.util.om.trace.ContextTracer;
import org.eclipse.net4j.util.container.IContainerDelta;
import org.eclipse.net4j.util.container.IContainerDelta.Kind;
import org.eclipse.net4j.util.event.EventUtil;
import org.eclipse.net4j.util.event.IListener;
import org.eclipse.net4j.util.lifecycle.ILifecycle;
-import org.eclipse.net4j.util.om.trace.ContextTracer;
import org.eclipse.emf.ecore.EPackage;
import org.eclipse.emf.ecore.impl.EPackageRegistryImpl;
@@ -40,7 +39,6 @@ import org.eclipse.emf.internal.cdo.bundle.CDO;
import org.eclipse.emf.internal.cdo.protocol.CDOClientProtocol;
import org.eclipse.emf.internal.cdo.protocol.OpenSessionRequest;
import org.eclipse.emf.internal.cdo.protocol.OpenSessionResult;
-import org.eclipse.emf.internal.cdo.util.EMFUtil;
import java.text.MessageFormat;
import java.util.Collection;
@@ -69,7 +67,7 @@ public class CDOSessionImpl extends Lifecycle implements CDOSession
private EPackage.Registry ePackageRegistry;
- private CDOPackageManagerImpl packageManager;
+ private CDOSessionPackageManager packageManager;
private CDORevisionManagerImpl revisionManager;
@@ -91,14 +89,13 @@ public class CDOSessionImpl extends Lifecycle implements CDOSession
if (ePackageRegistry == null)
{
ePackageRegistry = EPackage.Registry.INSTANCE;
- packageManager = EMFUtil.PACKAGE_MANAGER;
}
else
{
this.ePackageRegistry = ePackageRegistry;
- packageManager = new CDOPackageManagerImpl();
}
+ packageManager = new CDOSessionPackageManager(this);
revisionManager = new CDORevisionManagerImpl(this);
}
@@ -170,7 +167,7 @@ public class CDOSessionImpl extends Lifecycle implements CDOSession
return ePackageRegistry;
}
- public CDOPackageManagerImpl getPackageManager()
+ public CDOSessionPackageManager getPackageManager()
{
return packageManager;
}
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOSessionPackageManager.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOSessionPackageManager.java
new file mode 100644
index 0000000..ee4aa11
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOSessionPackageManager.java
@@ -0,0 +1,38 @@
+/***************************************************************************
+ * Copyright (c) 2004 - 2007 Eike Stepper, Germany.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Eike Stepper - initial API and implementation
+ **************************************************************************/
+package org.eclipse.emf.internal.cdo;
+
+import org.eclipse.emf.cdo.internal.protocol.model.CDOPackageImpl;
+import org.eclipse.emf.cdo.internal.protocol.model.CDOPackageManagerImpl;
+
+/**
+ * @author Eike Stepper
+ */
+public class CDOSessionPackageManager extends CDOPackageManagerImpl
+{
+ private CDOSessionImpl session;
+
+ public CDOSessionPackageManager(CDOSessionImpl session)
+ {
+ this.session = session;
+ }
+
+ public CDOSessionImpl getSession()
+ {
+ return session;
+ }
+
+ @Override
+ protected CDOPackageImpl resolve(String packageURI)
+ {
+ return null;
+ }
+}
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 3e3a8d9..c0b2780 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
@@ -9,7 +9,7 @@ import org.eclipse.emf.cdo.protocol.util.TransportException;
import org.eclipse.emf.cdo.util.CDOUtil;
import org.eclipse.emf.cdo.util.ServerException;
-import org.eclipse.net4j.util.om.trace.ContextTracer;
+import org.eclipse.net4j.internal.util.om.trace.ContextTracer;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.internal.cdo.bundle.CDO;
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOStore.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOStore.java
index 2e094c3..1ed7cab 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOStore.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOStore.java
@@ -18,7 +18,7 @@ import org.eclipse.emf.cdo.internal.protocol.revision.CDORevisionImpl;
import org.eclipse.emf.cdo.protocol.CDOID;
import org.eclipse.emf.cdo.protocol.util.ImplementationError;
-import org.eclipse.net4j.util.om.trace.ContextTracer;
+import org.eclipse.net4j.internal.util.om.trace.ContextTracer;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EObject;
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 8d47e61..87bd7e6 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
@@ -19,7 +19,7 @@ import org.eclipse.emf.cdo.protocol.CDOID;
import org.eclipse.emf.cdo.protocol.util.ImplementationError;
import org.eclipse.net4j.IChannel;
-import org.eclipse.net4j.util.om.trace.ContextTracer;
+import org.eclipse.net4j.internal.util.om.trace.ContextTracer;
import org.eclipse.emf.ecore.EPackage;
import org.eclipse.emf.internal.cdo.bundle.CDO;
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOViewImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOViewImpl.java
index 53c4192..90fddca 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOViewImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOViewImpl.java
@@ -28,7 +28,7 @@ import org.eclipse.emf.cdo.protocol.util.ImplementationError;
import org.eclipse.emf.cdo.protocol.util.TransportException;
import org.eclipse.emf.cdo.util.CDOUtil;
-import org.eclipse.net4j.util.om.trace.ContextTracer;
+import org.eclipse.net4j.internal.util.om.trace.ContextTracer;
import org.eclipse.emf.common.notify.Adapter;
import org.eclipse.emf.common.notify.Notification;
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/bundle/Activator.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/bundle/Activator.java
index 757e635..b961395 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/bundle/Activator.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/bundle/Activator.java
@@ -2,14 +2,6 @@ package org.eclipse.emf.internal.cdo.bundle;
import org.eclipse.emf.common.EMFPlugin;
import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.internal.cdo.util.EMFUtil;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.IRegistryChangeEvent;
-import org.eclipse.core.runtime.IRegistryChangeListener;
-import org.eclipse.core.runtime.Platform;
import org.osgi.framework.BundleContext;
@@ -36,7 +28,8 @@ public final class Activator extends EMFPlugin
return plugin;
}
- public static class Implementation extends EclipsePlugin implements IRegistryChangeListener
+ public static class Implementation extends EclipsePlugin // implements
+ // IRegistryChangeListener
{
public Implementation()
{
@@ -48,41 +41,42 @@ public final class Activator extends EMFPlugin
{
super.start(context);
CDO.BUNDLE.setBundleContext(context);
- EMFUtil.addModelInfos(EMFUtil.PACKAGE_MANAGER);
- IExtensionRegistry registry = Platform.getExtensionRegistry();
- IConfigurationElement[] elements = registry.getConfigurationElementsFor(CDO.BUNDLE_ID,
- CDO.PERSISTENT_PACKAGE_EXT_POINT);
- for (IConfigurationElement element : elements)
- {
- String uri = element.getAttribute("uri");
- // TODO Don't load EPackages eagerly
- EPackage ePackage = EPackage.Registry.INSTANCE.getEPackage(uri);
- if (ePackage != null)
- {
- EMFUtil.getCDOPackage(ePackage, EMFUtil.PACKAGE_MANAGER);
- }
- else
- {
- CDO.LOG.warn("Ecore package not found: " + uri);
- }
- }
-
- registry.addRegistryChangeListener(this, CDO.BUNDLE_ID);
+ // EMFUtil.addModelInfos(EMFUtil.PACKAGE_MANAGER);
+ // IExtensionRegistry registry = Platform.getExtensionRegistry();
+ // IConfigurationElement[] elements =
+ // registry.getConfigurationElementsFor(CDO.BUNDLE_ID,
+ // CDO.PERSISTENT_PACKAGE_EXT_POINT);
+ // for (IConfigurationElement element : elements)
+ // {
+ // String uri = element.getAttribute("uri");
+ // // TODO Don't load EPackages eagerly
+ // EPackage ePackage = EPackage.Registry.INSTANCE.getEPackage(uri);
+ // if (ePackage != null)
+ // {
+ // EMFUtil.getCDOPackage(ePackage, EMFUtil.PACKAGE_MANAGER);
+ // }
+ // else
+ // {
+ // CDO.LOG.warn("Ecore package not found: " + uri);
+ // }
+ // }
+ //
+ // registry.addRegistryChangeListener(this, CDO.BUNDLE_ID);
}
@Override
public void stop(BundleContext context) throws Exception
{
- IExtensionRegistry registry = Platform.getExtensionRegistry();
- registry.removeRegistryChangeListener(this);
- EMFUtil.removeModelInfos(EMFUtil.PACKAGE_MANAGER);
+ // IExtensionRegistry registry = Platform.getExtensionRegistry();
+ // registry.removeRegistryChangeListener(this);
+ // EMFUtil.removeModelInfos(EMFUtil.PACKAGE_MANAGER);
plugin = null;
CDO.BUNDLE.setBundleContext(null);
super.stop(context);
}
- public void registryChanged(IRegistryChangeEvent event)
- {
- }
+ // public void registryChanged(IRegistryChangeEvent event)
+ // {
+ // }
}
}
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/bundle/CDO.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/bundle/CDO.java
index 24c1c7e..d85ad54 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/bundle/CDO.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/bundle/CDO.java
@@ -11,9 +11,9 @@
package org.eclipse.emf.internal.cdo.bundle;
import org.eclipse.net4j.util.om.OMBundle;
-import org.eclipse.net4j.util.om.OMLogger;
import org.eclipse.net4j.util.om.OMPlatform;
-import org.eclipse.net4j.util.om.OMTracer;
+import org.eclipse.net4j.util.om.log.OMLogger;
+import org.eclipse.net4j.util.om.trace.OMTracer;
/**
* @author Eike Stepper
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 3554af5..bda1163 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
@@ -18,9 +18,9 @@ import org.eclipse.emf.cdo.protocol.CDOID;
import org.eclipse.emf.cdo.protocol.CDOProtocolConstants;
import org.eclipse.net4j.IChannel;
-import org.eclipse.net4j.util.om.trace.ContextTracer;
-import org.eclipse.net4j.util.stream.ExtendedDataInputStream;
-import org.eclipse.net4j.util.stream.ExtendedDataOutputStream;
+import org.eclipse.net4j.internal.util.om.trace.ContextTracer;
+import org.eclipse.net4j.util.io.ExtendedDataInputStream;
+import org.eclipse.net4j.util.io.ExtendedDataOutputStream;
import org.eclipse.emf.internal.cdo.CDOObjectImpl;
import org.eclipse.emf.internal.cdo.CDOStore;
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/InvalidationIndication.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/InvalidationIndication.java
index d586bb5..61bfe85 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/InvalidationIndication.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/InvalidationIndication.java
@@ -15,9 +15,9 @@ import org.eclipse.emf.cdo.internal.protocol.bundle.CDOProtocol;
import org.eclipse.emf.cdo.protocol.CDOID;
import org.eclipse.emf.cdo.protocol.CDOProtocolConstants;
+import org.eclipse.net4j.internal.util.om.trace.ContextTracer;
import org.eclipse.net4j.signal.Indication;
-import org.eclipse.net4j.util.om.trace.ContextTracer;
-import org.eclipse.net4j.util.stream.ExtendedDataInputStream;
+import org.eclipse.net4j.util.io.ExtendedDataInputStream;
import org.eclipse.emf.internal.cdo.CDOSessionImpl;
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/LoadObjectRequest.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/LoadObjectRequest.java
index d60cc9b..622d3ad 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/LoadObjectRequest.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/LoadObjectRequest.java
@@ -17,9 +17,9 @@ import org.eclipse.emf.cdo.protocol.CDOID;
import org.eclipse.emf.cdo.protocol.CDOProtocolConstants;
import org.eclipse.net4j.IChannel;
-import org.eclipse.net4j.util.om.trace.ContextTracer;
-import org.eclipse.net4j.util.stream.ExtendedDataInputStream;
-import org.eclipse.net4j.util.stream.ExtendedDataOutputStream;
+import org.eclipse.net4j.internal.util.om.trace.ContextTracer;
+import org.eclipse.net4j.util.io.ExtendedDataInputStream;
+import org.eclipse.net4j.util.io.ExtendedDataOutputStream;
import java.io.IOException;
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 c7db1f0..07831f3 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
@@ -15,10 +15,10 @@ import org.eclipse.emf.cdo.protocol.CDOProtocolConstants;
import org.eclipse.emf.cdo.util.ServerException;
import org.eclipse.net4j.IChannel;
+import org.eclipse.net4j.internal.util.om.trace.ContextTracer;
import org.eclipse.net4j.signal.RequestWithConfirmation;
-import org.eclipse.net4j.util.om.trace.ContextTracer;
-import org.eclipse.net4j.util.stream.ExtendedDataInputStream;
-import org.eclipse.net4j.util.stream.ExtendedDataOutputStream;
+import org.eclipse.net4j.util.io.ExtendedDataInputStream;
+import org.eclipse.net4j.util.io.ExtendedDataOutputStream;
import java.io.IOException;
import java.text.MessageFormat;
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/RegisterPackagesRequest.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/RegisterPackagesRequest.java
index 84f7abb..0d397b8 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/RegisterPackagesRequest.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/RegisterPackagesRequest.java
@@ -14,8 +14,8 @@ 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.util.stream.ExtendedDataInputStream;
-import org.eclipse.net4j.util.stream.ExtendedDataOutputStream;
+import org.eclipse.net4j.util.io.ExtendedDataInputStream;
+import org.eclipse.net4j.util.io.ExtendedDataOutputStream;
import java.io.IOException;
import java.util.Collection;
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 0177389..9184cb6 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,9 +16,9 @@ import org.eclipse.emf.cdo.protocol.CDOID;
import org.eclipse.emf.cdo.protocol.CDOProtocolConstants;
import org.eclipse.net4j.IChannel;
-import org.eclipse.net4j.util.om.trace.ContextTracer;
-import org.eclipse.net4j.util.stream.ExtendedDataInputStream;
-import org.eclipse.net4j.util.stream.ExtendedDataOutputStream;
+import org.eclipse.net4j.internal.util.om.trace.ContextTracer;
+import org.eclipse.net4j.util.io.ExtendedDataInputStream;
+import org.eclipse.net4j.util.io.ExtendedDataOutputStream;
import java.io.IOException;
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 9793fe9..d34a4c0 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,9 +16,9 @@ import org.eclipse.emf.cdo.protocol.CDOID;
import org.eclipse.emf.cdo.protocol.CDOProtocolConstants;
import org.eclipse.net4j.IChannel;
-import org.eclipse.net4j.util.om.trace.ContextTracer;
-import org.eclipse.net4j.util.stream.ExtendedDataInputStream;
-import org.eclipse.net4j.util.stream.ExtendedDataOutputStream;
+import org.eclipse.net4j.internal.util.om.trace.ContextTracer;
+import org.eclipse.net4j.util.io.ExtendedDataInputStream;
+import org.eclipse.net4j.util.io.ExtendedDataOutputStream;
import java.io.IOException;
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/EMFUtil.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/EMFUtil.java
index bcf882c..e97180e 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/EMFUtil.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/EMFUtil.java
@@ -27,7 +27,7 @@ import org.eclipse.emf.cdo.protocol.model.CDOFeature;
import org.eclipse.emf.cdo.protocol.model.CDOPackage;
import org.eclipse.emf.cdo.protocol.util.ImplementationError;
-import org.eclipse.net4j.util.om.trace.ContextTracer;
+import org.eclipse.net4j.internal.util.om.trace.ContextTracer;
import org.eclipse.emf.common.util.EList;
import org.eclipse.emf.ecore.EClass;
@@ -45,8 +45,6 @@ import java.util.List;
*/
public final class EMFUtil
{
- public static final CDOPackageManagerImpl PACKAGE_MANAGER = new CDOPackageManagerImpl();
-
@SuppressWarnings("unused")
private static final ContextTracer TRACER = new ContextTracer(CDOProtocol.DEBUG_MODEL, EMFUtil.class);
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/PackageClosure.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/PackageClosure.java
index d433e42..f122c8e 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/PackageClosure.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/PackageClosure.java
@@ -12,7 +12,7 @@ package org.eclipse.emf.internal.cdo.util;
import org.eclipse.emf.cdo.internal.protocol.bundle.CDOProtocol;
-import org.eclipse.net4j.util.om.trace.ContextTracer;
+import org.eclipse.net4j.internal.util.om.trace.ContextTracer;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EClassifier;
diff --git a/plugins/org.eclipse.net4j.db.derby/src/org/eclipse/net4j/db/internal/mysql/bundle/OM.java b/plugins/org.eclipse.net4j.db.derby/src/org/eclipse/net4j/db/internal/mysql/bundle/OM.java
index 0b236d0..1a5be1e 100644
--- a/plugins/org.eclipse.net4j.db.derby/src/org/eclipse/net4j/db/internal/mysql/bundle/OM.java
+++ b/plugins/org.eclipse.net4j.db.derby/src/org/eclipse/net4j/db/internal/mysql/bundle/OM.java
@@ -10,11 +10,11 @@
**************************************************************************/
package org.eclipse.net4j.db.internal.mysql.bundle;
-import org.eclipse.net4j.internal.util.om.OSGiActivator;
import org.eclipse.net4j.util.om.OMBundle;
-import org.eclipse.net4j.util.om.OMLogger;
import org.eclipse.net4j.util.om.OMPlatform;
-import org.eclipse.net4j.util.om.OMTracer;
+import org.eclipse.net4j.util.om.OSGiActivator;
+import org.eclipse.net4j.util.om.log.OMLogger;
+import org.eclipse.net4j.util.om.trace.OMTracer;
/**
* @author Eike Stepper
diff --git a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/bundle/OM.java b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/bundle/OM.java
index 97ce7f3..c50eac2 100644
--- a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/bundle/OM.java
+++ b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/bundle/OM.java
@@ -13,11 +13,11 @@ package org.eclipse.net4j.internal.db.bundle;
import org.eclipse.net4j.db.IDBAdapter;
import org.eclipse.net4j.internal.db.DBAdapterDescriptor;
import org.eclipse.net4j.internal.db.DBAdapterRegistry;
-import org.eclipse.net4j.internal.util.om.OSGiActivator;
import org.eclipse.net4j.util.om.OMBundle;
-import org.eclipse.net4j.util.om.OMLogger;
import org.eclipse.net4j.util.om.OMPlatform;
-import org.eclipse.net4j.util.om.OMTracer;
+import org.eclipse.net4j.util.om.OSGiActivator;
+import org.eclipse.net4j.util.om.log.OMLogger;
+import org.eclipse.net4j.util.om.trace.OMTracer;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IConfigurationElement;
diff --git a/plugins/org.eclipse.net4j.debug/src/org/eclipse/net4j/internal/debug/RemoteTraceManager.java b/plugins/org.eclipse.net4j.debug/src/org/eclipse/net4j/internal/debug/RemoteTraceManager.java
index b58011e..7b16e0e 100644
--- a/plugins/org.eclipse.net4j.debug/src/org/eclipse/net4j/internal/debug/RemoteTraceManager.java
+++ b/plugins/org.eclipse.net4j.debug/src/org/eclipse/net4j/internal/debug/RemoteTraceManager.java
@@ -12,9 +12,9 @@ package org.eclipse.net4j.internal.debug;
import org.eclipse.net4j.internal.debug.views.RemoteTraceView;
import org.eclipse.net4j.internal.util.lifecycle.Lifecycle;
-import org.eclipse.net4j.util.om.trace.RemoteTraceServer;
-import org.eclipse.net4j.util.om.trace.RemoteTraceServer.Event;
-import org.eclipse.net4j.util.om.trace.RemoteTraceServer.Listener;
+import org.eclipse.net4j.internal.util.om.trace.RemoteTraceServer;
+import org.eclipse.net4j.internal.util.om.trace.RemoteTraceServer.Event;
+import org.eclipse.net4j.internal.util.om.trace.RemoteTraceServer.Listener;
import java.util.ArrayList;
import java.util.List;
diff --git a/plugins/org.eclipse.net4j.debug/src/org/eclipse/net4j/internal/debug/views/RemoteTraceView.java b/plugins/org.eclipse.net4j.debug/src/org/eclipse/net4j/internal/debug/views/RemoteTraceView.java
index 6154f66..90088cf 100644
--- a/plugins/org.eclipse.net4j.debug/src/org/eclipse/net4j/internal/debug/views/RemoteTraceView.java
+++ b/plugins/org.eclipse.net4j.debug/src/org/eclipse/net4j/internal/debug/views/RemoteTraceView.java
@@ -11,9 +11,9 @@
package org.eclipse.net4j.internal.debug.views;
import org.eclipse.net4j.internal.debug.RemoteTraceManager;
+import org.eclipse.net4j.internal.util.om.trace.RemoteTraceServer.Event;
import org.eclipse.net4j.util.ObjectUtil;
import org.eclipse.net4j.util.ReflectUtil;
-import org.eclipse.net4j.util.om.trace.RemoteTraceServer.Event;
import org.eclipse.jface.action.Action;
import org.eclipse.jface.action.IMenuListener;
diff --git a/plugins/org.eclipse.net4j.jms.admin/src/org/eclipse/net4j/jms/internal/admin/bundle/OM.java b/plugins/org.eclipse.net4j.jms.admin/src/org/eclipse/net4j/jms/internal/admin/bundle/OM.java
index 0552161..d0a6ee2 100644
--- a/plugins/org.eclipse.net4j.jms.admin/src/org/eclipse/net4j/jms/internal/admin/bundle/OM.java
+++ b/plugins/org.eclipse.net4j.jms.admin/src/org/eclipse/net4j/jms/internal/admin/bundle/OM.java
@@ -10,11 +10,11 @@
**************************************************************************/
package org.eclipse.net4j.jms.internal.admin.bundle;
-import org.eclipse.net4j.internal.util.om.OSGiActivator;
import org.eclipse.net4j.util.om.OMBundle;
-import org.eclipse.net4j.util.om.OMLogger;
import org.eclipse.net4j.util.om.OMPlatform;
-import org.eclipse.net4j.util.om.OMTracer;
+import org.eclipse.net4j.util.om.OSGiActivator;
+import org.eclipse.net4j.util.om.log.OMLogger;
+import org.eclipse.net4j.util.om.trace.OMTracer;
/**
* @author Eike Stepper
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 d85d36a..9426c9a 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
@@ -13,8 +13,8 @@ package org.eclipse.net4j.jms.internal.admin.protocol;
import org.eclipse.net4j.IChannel;
import org.eclipse.net4j.jms.JMSAdminProtocolConstants;
import org.eclipse.net4j.signal.RequestWithConfirmation;
-import org.eclipse.net4j.util.stream.ExtendedDataInputStream;
-import org.eclipse.net4j.util.stream.ExtendedDataOutputStream;
+import org.eclipse.net4j.util.io.ExtendedDataInputStream;
+import org.eclipse.net4j.util.io.ExtendedDataOutputStream;
import java.io.IOException;
diff --git a/plugins/org.eclipse.net4j.jms.server.jdbc/src/org/eclipse/net4j/jms/server/internal/jdbc/bundle/OM.java b/plugins/org.eclipse.net4j.jms.server.jdbc/src/org/eclipse/net4j/jms/server/internal/jdbc/bundle/OM.java
index 7c529c1..8053d54 100644
--- a/plugins/org.eclipse.net4j.jms.server.jdbc/src/org/eclipse/net4j/jms/server/internal/jdbc/bundle/OM.java
+++ b/plugins/org.eclipse.net4j.jms.server.jdbc/src/org/eclipse/net4j/jms/server/internal/jdbc/bundle/OM.java
@@ -10,11 +10,11 @@
**************************************************************************/
package org.eclipse.net4j.jms.server.internal.jdbc.bundle;
-import org.eclipse.net4j.internal.util.om.OSGiActivator;
import org.eclipse.net4j.util.om.OMBundle;
-import org.eclipse.net4j.util.om.OMLogger;
import org.eclipse.net4j.util.om.OMPlatform;
-import org.eclipse.net4j.util.om.OMTracer;
+import org.eclipse.net4j.util.om.OSGiActivator;
+import org.eclipse.net4j.util.om.log.OMLogger;
+import org.eclipse.net4j.util.om.trace.OMTracer;
/**
* @author Eike Stepper
diff --git a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/bundle/OM.java b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/bundle/OM.java
index e0672e4..cf8a1b0 100644
--- a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/bundle/OM.java
+++ b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/bundle/OM.java
@@ -10,12 +10,12 @@
**************************************************************************/
package org.eclipse.net4j.jms.internal.server.bundle;
-import org.eclipse.net4j.internal.util.om.OSGiActivator;
import org.eclipse.net4j.jms.internal.server.Server;
import org.eclipse.net4j.util.om.OMBundle;
-import org.eclipse.net4j.util.om.OMLogger;
import org.eclipse.net4j.util.om.OMPlatform;
-import org.eclipse.net4j.util.om.OMTracer;
+import org.eclipse.net4j.util.om.OSGiActivator;
+import org.eclipse.net4j.util.om.log.OMLogger;
+import org.eclipse.net4j.util.om.trace.OMTracer;
/**
* @author Eike Stepper
diff --git a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSAcknowledgeIndication.java b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSAcknowledgeIndication.java
index 2db3a77..eb40d13 100644
--- a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSAcknowledgeIndication.java
+++ b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSAcknowledgeIndication.java
@@ -15,7 +15,7 @@ import org.eclipse.net4j.jms.internal.server.ServerConnection;
import org.eclipse.net4j.jms.internal.server.ServerSession;
import org.eclipse.net4j.jms.internal.server.bundle.OM;
import org.eclipse.net4j.signal.Indication;
-import org.eclipse.net4j.util.stream.ExtendedDataInputStream;
+import org.eclipse.net4j.util.io.ExtendedDataInputStream;
import java.io.IOException;
diff --git a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSClientMessageIndication.java b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSClientMessageIndication.java
index 13b77bb..21bbb5a 100644
--- a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSClientMessageIndication.java
+++ b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSClientMessageIndication.java
@@ -16,8 +16,8 @@ import org.eclipse.net4j.jms.JMSProtocolConstants;
import org.eclipse.net4j.jms.internal.server.Server;
import org.eclipse.net4j.jms.internal.server.ServerConnection;
import org.eclipse.net4j.signal.IndicationWithResponse;
-import org.eclipse.net4j.util.stream.ExtendedDataInputStream;
-import org.eclipse.net4j.util.stream.ExtendedDataOutputStream;
+import org.eclipse.net4j.util.io.ExtendedDataInputStream;
+import org.eclipse.net4j.util.io.ExtendedDataOutputStream;
import java.io.IOException;
diff --git a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSCommitIndication.java b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSCommitIndication.java
index 8e2ec5c..6b7f803 100644
--- a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSCommitIndication.java
+++ b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSCommitIndication.java
@@ -17,8 +17,8 @@ import org.eclipse.net4j.jms.JMSProtocolConstants;
import org.eclipse.net4j.jms.internal.server.ServerConnection;
import org.eclipse.net4j.jms.internal.server.ServerSession;
import org.eclipse.net4j.signal.IndicationWithResponse;
-import org.eclipse.net4j.util.stream.ExtendedDataInputStream;
-import org.eclipse.net4j.util.stream.ExtendedDataOutputStream;
+import org.eclipse.net4j.util.io.ExtendedDataInputStream;
+import org.eclipse.net4j.util.io.ExtendedDataOutputStream;
import java.io.IOException;
diff --git a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSLogonIndication.java b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSLogonIndication.java
index 7973bb7..92c32eb 100644
--- a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSLogonIndication.java
+++ b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSLogonIndication.java
@@ -15,8 +15,8 @@ import org.eclipse.net4j.jms.internal.server.Server;
import org.eclipse.net4j.jms.internal.server.ServerConnection;
import org.eclipse.net4j.jms.internal.server.bundle.OM;
import org.eclipse.net4j.signal.IndicationWithResponse;
-import org.eclipse.net4j.util.stream.ExtendedDataInputStream;
-import org.eclipse.net4j.util.stream.ExtendedDataOutputStream;
+import org.eclipse.net4j.util.io.ExtendedDataInputStream;
+import org.eclipse.net4j.util.io.ExtendedDataOutputStream;
import java.io.IOException;
diff --git a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSOpenSessionIndication.java b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSOpenSessionIndication.java
index 521a4a3..afb19df 100644
--- a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSOpenSessionIndication.java
+++ b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSOpenSessionIndication.java
@@ -14,8 +14,8 @@ import org.eclipse.net4j.jms.JMSProtocolConstants;
import org.eclipse.net4j.jms.internal.server.ServerConnection;
import org.eclipse.net4j.jms.internal.server.ServerSession;
import org.eclipse.net4j.signal.IndicationWithResponse;
-import org.eclipse.net4j.util.stream.ExtendedDataInputStream;
-import org.eclipse.net4j.util.stream.ExtendedDataOutputStream;
+import org.eclipse.net4j.util.io.ExtendedDataInputStream;
+import org.eclipse.net4j.util.io.ExtendedDataOutputStream;
import java.io.IOException;
diff --git a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSRecoverIndication.java b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSRecoverIndication.java
index 1a7c08a..771b324 100644
--- a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSRecoverIndication.java
+++ b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSRecoverIndication.java
@@ -15,8 +15,8 @@ import org.eclipse.net4j.jms.JMSProtocolConstants;
import org.eclipse.net4j.jms.internal.server.ServerConnection;
import org.eclipse.net4j.jms.internal.server.ServerSession;
import org.eclipse.net4j.signal.IndicationWithResponse;
-import org.eclipse.net4j.util.stream.ExtendedDataInputStream;
-import org.eclipse.net4j.util.stream.ExtendedDataOutputStream;
+import org.eclipse.net4j.util.io.ExtendedDataInputStream;
+import org.eclipse.net4j.util.io.ExtendedDataOutputStream;
import java.io.IOException;
diff --git a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSRegisterConsumerIndication.java b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSRegisterConsumerIndication.java
index 4c90552..d8458a8 100644
--- a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSRegisterConsumerIndication.java
+++ b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSRegisterConsumerIndication.java
@@ -16,8 +16,8 @@ import org.eclipse.net4j.jms.JMSProtocolConstants;
import org.eclipse.net4j.jms.internal.server.ServerConnection;
import org.eclipse.net4j.jms.internal.server.ServerSession;
import org.eclipse.net4j.signal.IndicationWithResponse;
-import org.eclipse.net4j.util.stream.ExtendedDataInputStream;
-import org.eclipse.net4j.util.stream.ExtendedDataOutputStream;
+import org.eclipse.net4j.util.io.ExtendedDataInputStream;
+import org.eclipse.net4j.util.io.ExtendedDataOutputStream;
import java.io.IOException;
diff --git a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSRollbackIndication.java b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSRollbackIndication.java
index 3404eee..2fe3ecc 100644
--- a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSRollbackIndication.java
+++ b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSRollbackIndication.java
@@ -15,8 +15,8 @@ import org.eclipse.net4j.jms.JMSProtocolConstants;
import org.eclipse.net4j.jms.internal.server.ServerConnection;
import org.eclipse.net4j.jms.internal.server.ServerSession;
import org.eclipse.net4j.signal.IndicationWithResponse;
-import org.eclipse.net4j.util.stream.ExtendedDataInputStream;
-import org.eclipse.net4j.util.stream.ExtendedDataOutputStream;
+import org.eclipse.net4j.util.io.ExtendedDataInputStream;
+import org.eclipse.net4j.util.io.ExtendedDataOutputStream;
import java.io.IOException;
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 c865de7..cb4d5f2 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
@@ -15,7 +15,7 @@ import org.eclipse.net4j.internal.jms.MessageImpl;
import org.eclipse.net4j.internal.jms.util.MessageUtil;
import org.eclipse.net4j.jms.JMSProtocolConstants;
import org.eclipse.net4j.signal.Request;
-import org.eclipse.net4j.util.stream.ExtendedDataOutputStream;
+import org.eclipse.net4j.util.io.ExtendedDataOutputStream;
import java.io.IOException;
diff --git a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSSyncIndication.java b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSSyncIndication.java
index ed2a07b..4702add 100644
--- a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSSyncIndication.java
+++ b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSSyncIndication.java
@@ -12,8 +12,8 @@ package org.eclipse.net4j.jms.internal.server.protocol;
import org.eclipse.net4j.jms.JMSProtocolConstants;
import org.eclipse.net4j.signal.IndicationWithResponse;
-import org.eclipse.net4j.util.stream.ExtendedDataInputStream;
-import org.eclipse.net4j.util.stream.ExtendedDataOutputStream;
+import org.eclipse.net4j.util.io.ExtendedDataInputStream;
+import org.eclipse.net4j.util.io.ExtendedDataOutputStream;
import java.io.IOException;
diff --git a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/admin/JMSCreateDestinationIndication.java b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/admin/JMSCreateDestinationIndication.java
index c5b4839..556cb81 100644
--- a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/admin/JMSCreateDestinationIndication.java
+++ b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/admin/JMSCreateDestinationIndication.java
@@ -15,8 +15,8 @@ import org.eclipse.net4j.jms.server.IDestination;
import org.eclipse.net4j.jms.server.IServer;
import org.eclipse.net4j.jms.server.IDestination.Type;
import org.eclipse.net4j.signal.IndicationWithResponse;
-import org.eclipse.net4j.util.stream.ExtendedDataInputStream;
-import org.eclipse.net4j.util.stream.ExtendedDataOutputStream;
+import org.eclipse.net4j.util.io.ExtendedDataInputStream;
+import org.eclipse.net4j.util.io.ExtendedDataOutputStream;
import java.io.IOException;
diff --git a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/store/AbstractTransaction.java b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/store/AbstractTransaction.java
index 741b6b8..0a2b4a5 100644
--- a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/store/AbstractTransaction.java
+++ b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/store/AbstractTransaction.java
@@ -11,11 +11,11 @@
package org.eclipse.net4j.jms.internal.server.store;
import org.eclipse.net4j.internal.jms.MessageImpl;
+import org.eclipse.net4j.internal.util.om.trace.ContextTracer;
import org.eclipse.net4j.jms.internal.server.ServerConsumer;
import org.eclipse.net4j.jms.internal.server.ServerDestination;
import org.eclipse.net4j.jms.internal.server.bundle.OM;
import org.eclipse.net4j.jms.server.IStoreTransaction;
-import org.eclipse.net4j.util.om.trace.ContextTracer;
/**
* @author Eike Stepper
diff --git a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/BytesMessageImpl.java b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/BytesMessageImpl.java
index 264b50e..4c1186d 100644
--- a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/BytesMessageImpl.java
+++ b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/BytesMessageImpl.java
@@ -10,8 +10,8 @@
**************************************************************************/
package org.eclipse.net4j.internal.jms;
-import org.eclipse.net4j.util.stream.ExtendedDataInputStream;
-import org.eclipse.net4j.util.stream.ExtendedDataOutputStream;
+import org.eclipse.net4j.util.io.ExtendedDataInputStream;
+import org.eclipse.net4j.util.io.ExtendedDataOutputStream;
import javax.jms.BytesMessage;
import javax.jms.JMSException;
diff --git a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/MapMessageImpl.java b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/MapMessageImpl.java
index 14478f5..3e02f66 100644
--- a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/MapMessageImpl.java
+++ b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/MapMessageImpl.java
@@ -10,8 +10,8 @@
**************************************************************************/
package org.eclipse.net4j.internal.jms;
-import org.eclipse.net4j.util.stream.ExtendedDataInputStream;
-import org.eclipse.net4j.util.stream.ExtendedDataOutputStream;
+import org.eclipse.net4j.util.io.ExtendedDataInputStream;
+import org.eclipse.net4j.util.io.ExtendedDataOutputStream;
import javax.jms.JMSException;
import javax.jms.MapMessage;
diff --git a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/MessageImpl.java b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/MessageImpl.java
index 4b5e5d7..3fd77fb 100644
--- a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/MessageImpl.java
+++ b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/MessageImpl.java
@@ -12,8 +12,8 @@ package org.eclipse.net4j.internal.jms;
import org.eclipse.net4j.internal.jms.util.DestinationUtil;
import org.eclipse.net4j.internal.jms.util.TypeUtil;
-import org.eclipse.net4j.util.stream.ExtendedDataInputStream;
-import org.eclipse.net4j.util.stream.ExtendedDataOutputStream;
+import org.eclipse.net4j.util.io.ExtendedDataInputStream;
+import org.eclipse.net4j.util.io.ExtendedDataOutputStream;
import javax.jms.Destination;
import javax.jms.JMSException;
diff --git a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/ObjectMessageImpl.java b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/ObjectMessageImpl.java
index 8e4b962..bb86543 100644
--- a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/ObjectMessageImpl.java
+++ b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/ObjectMessageImpl.java
@@ -11,8 +11,8 @@
package org.eclipse.net4j.internal.jms;
import org.eclipse.net4j.internal.jms.bundle.OM;
-import org.eclipse.net4j.util.stream.ExtendedDataInputStream;
-import org.eclipse.net4j.util.stream.ExtendedDataOutputStream;
+import org.eclipse.net4j.util.io.ExtendedDataInputStream;
+import org.eclipse.net4j.util.io.ExtendedDataOutputStream;
import javax.jms.JMSException;
import javax.jms.Message;
diff --git a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/StreamMessageImpl.java b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/StreamMessageImpl.java
index e24f099..6cea44b 100644
--- a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/StreamMessageImpl.java
+++ b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/StreamMessageImpl.java
@@ -10,8 +10,8 @@
**************************************************************************/
package org.eclipse.net4j.internal.jms;
-import org.eclipse.net4j.util.stream.ExtendedDataInputStream;
-import org.eclipse.net4j.util.stream.ExtendedDataOutputStream;
+import org.eclipse.net4j.util.io.ExtendedDataInputStream;
+import org.eclipse.net4j.util.io.ExtendedDataOutputStream;
import javax.jms.JMSException;
import javax.jms.Message;
diff --git a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/TextMessageImpl.java b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/TextMessageImpl.java
index 7458b05..5dcd06c 100644
--- a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/TextMessageImpl.java
+++ b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/TextMessageImpl.java
@@ -10,8 +10,8 @@
**************************************************************************/
package org.eclipse.net4j.internal.jms;
-import org.eclipse.net4j.util.stream.ExtendedDataInputStream;
-import org.eclipse.net4j.util.stream.ExtendedDataOutputStream;
+import org.eclipse.net4j.util.io.ExtendedDataInputStream;
+import org.eclipse.net4j.util.io.ExtendedDataOutputStream;
import javax.jms.JMSException;
import javax.jms.Message;
diff --git a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/bundle/OM.java b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/bundle/OM.java
index b7ad5d4..265e904 100644
--- a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/bundle/OM.java
+++ b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/bundle/OM.java
@@ -11,12 +11,12 @@
package org.eclipse.net4j.internal.jms.bundle;
import org.eclipse.net4j.IPluginTransportContainer;
-import org.eclipse.net4j.internal.util.om.OSGiActivator;
import org.eclipse.net4j.jms.JMSUtil;
import org.eclipse.net4j.util.om.OMBundle;
-import org.eclipse.net4j.util.om.OMLogger;
import org.eclipse.net4j.util.om.OMPlatform;
-import org.eclipse.net4j.util.om.OMTracer;
+import org.eclipse.net4j.util.om.OSGiActivator;
+import org.eclipse.net4j.util.om.log.OMLogger;
+import org.eclipse.net4j.util.om.trace.OMTracer;
/**
* @author Eike Stepper
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 f68b433..c16082b 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
@@ -13,7 +13,7 @@ package org.eclipse.net4j.internal.jms.protocol;
import org.eclipse.net4j.IChannel;
import org.eclipse.net4j.jms.JMSProtocolConstants;
import org.eclipse.net4j.signal.Request;
-import org.eclipse.net4j.util.stream.ExtendedDataOutputStream;
+import org.eclipse.net4j.util.io.ExtendedDataOutputStream;
import java.io.IOException;
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 8d652cc..9e2f160 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
@@ -15,8 +15,8 @@ import org.eclipse.net4j.internal.jms.MessageImpl;
import org.eclipse.net4j.internal.jms.util.MessageUtil;
import org.eclipse.net4j.jms.JMSProtocolConstants;
import org.eclipse.net4j.signal.RequestWithConfirmation;
-import org.eclipse.net4j.util.stream.ExtendedDataInputStream;
-import org.eclipse.net4j.util.stream.ExtendedDataOutputStream;
+import org.eclipse.net4j.util.io.ExtendedDataInputStream;
+import org.eclipse.net4j.util.io.ExtendedDataOutputStream;
import java.io.IOException;
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 cca7de5..fa5a917 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
@@ -13,8 +13,8 @@ package org.eclipse.net4j.internal.jms.protocol;
import org.eclipse.net4j.IChannel;
import org.eclipse.net4j.jms.JMSProtocolConstants;
import org.eclipse.net4j.signal.RequestWithConfirmation;
-import org.eclipse.net4j.util.stream.ExtendedDataInputStream;
-import org.eclipse.net4j.util.stream.ExtendedDataOutputStream;
+import org.eclipse.net4j.util.io.ExtendedDataInputStream;
+import org.eclipse.net4j.util.io.ExtendedDataOutputStream;
import java.io.IOException;
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 c142c6c..92f891a 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
@@ -15,8 +15,8 @@ import org.eclipse.net4j.internal.jms.MessageImpl;
import org.eclipse.net4j.internal.jms.util.MessageUtil;
import org.eclipse.net4j.jms.JMSProtocolConstants;
import org.eclipse.net4j.signal.RequestWithConfirmation;
-import org.eclipse.net4j.util.stream.ExtendedDataInputStream;
-import org.eclipse.net4j.util.stream.ExtendedDataOutputStream;
+import org.eclipse.net4j.util.io.ExtendedDataInputStream;
+import org.eclipse.net4j.util.io.ExtendedDataOutputStream;
import java.io.IOException;
import java.util.List;
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 0706165..81923d9 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
@@ -13,8 +13,8 @@ package org.eclipse.net4j.internal.jms.protocol;
import org.eclipse.net4j.IChannel;
import org.eclipse.net4j.jms.JMSProtocolConstants;
import org.eclipse.net4j.signal.RequestWithConfirmation;
-import org.eclipse.net4j.util.stream.ExtendedDataInputStream;
-import org.eclipse.net4j.util.stream.ExtendedDataOutputStream;
+import org.eclipse.net4j.util.io.ExtendedDataInputStream;
+import org.eclipse.net4j.util.io.ExtendedDataOutputStream;
import java.io.IOException;
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 70f0e22..e4aa866 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
@@ -13,7 +13,7 @@ package org.eclipse.net4j.internal.jms.protocol;
import org.eclipse.net4j.IChannel;
import org.eclipse.net4j.jms.JMSProtocolConstants;
import org.eclipse.net4j.signal.Request;
-import org.eclipse.net4j.util.stream.ExtendedDataOutputStream;
+import org.eclipse.net4j.util.io.ExtendedDataOutputStream;
import java.io.IOException;
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 8a4a349..d304262 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
@@ -13,8 +13,8 @@ package org.eclipse.net4j.internal.jms.protocol;
import org.eclipse.net4j.IChannel;
import org.eclipse.net4j.jms.JMSProtocolConstants;
import org.eclipse.net4j.signal.RequestWithConfirmation;
-import org.eclipse.net4j.util.stream.ExtendedDataInputStream;
-import org.eclipse.net4j.util.stream.ExtendedDataOutputStream;
+import org.eclipse.net4j.util.io.ExtendedDataInputStream;
+import org.eclipse.net4j.util.io.ExtendedDataOutputStream;
import java.io.IOException;
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 730d99b..fdb0df6 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
@@ -13,8 +13,8 @@ package org.eclipse.net4j.internal.jms.protocol;
import org.eclipse.net4j.IChannel;
import org.eclipse.net4j.jms.JMSProtocolConstants;
import org.eclipse.net4j.signal.RequestWithConfirmation;
-import org.eclipse.net4j.util.stream.ExtendedDataInputStream;
-import org.eclipse.net4j.util.stream.ExtendedDataOutputStream;
+import org.eclipse.net4j.util.io.ExtendedDataInputStream;
+import org.eclipse.net4j.util.io.ExtendedDataOutputStream;
import java.io.IOException;
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 e446630..792d394 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
@@ -13,8 +13,8 @@ package org.eclipse.net4j.internal.jms.protocol;
import org.eclipse.net4j.IChannel;
import org.eclipse.net4j.jms.JMSProtocolConstants;
import org.eclipse.net4j.signal.RequestWithConfirmation;
-import org.eclipse.net4j.util.stream.ExtendedDataInputStream;
-import org.eclipse.net4j.util.stream.ExtendedDataOutputStream;
+import org.eclipse.net4j.util.io.ExtendedDataInputStream;
+import org.eclipse.net4j.util.io.ExtendedDataOutputStream;
import java.io.IOException;
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 e08ace7..2ac11b5 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
@@ -15,8 +15,8 @@ import org.eclipse.net4j.internal.jms.DestinationImpl;
import org.eclipse.net4j.internal.jms.util.DestinationUtil;
import org.eclipse.net4j.jms.JMSProtocolConstants;
import org.eclipse.net4j.signal.RequestWithConfirmation;
-import org.eclipse.net4j.util.stream.ExtendedDataInputStream;
-import org.eclipse.net4j.util.stream.ExtendedDataOutputStream;
+import org.eclipse.net4j.util.io.ExtendedDataInputStream;
+import org.eclipse.net4j.util.io.ExtendedDataOutputStream;
import java.io.IOException;
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 c41a872..6b07e2e 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
@@ -13,8 +13,8 @@ package org.eclipse.net4j.internal.jms.protocol;
import org.eclipse.net4j.IChannel;
import org.eclipse.net4j.jms.JMSProtocolConstants;
import org.eclipse.net4j.signal.RequestWithConfirmation;
-import org.eclipse.net4j.util.stream.ExtendedDataInputStream;
-import org.eclipse.net4j.util.stream.ExtendedDataOutputStream;
+import org.eclipse.net4j.util.io.ExtendedDataInputStream;
+import org.eclipse.net4j.util.io.ExtendedDataOutputStream;
import java.io.IOException;
diff --git a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSServerMessageIndication.java b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSServerMessageIndication.java
index 48f1979..6187c53 100644
--- a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSServerMessageIndication.java
+++ b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSServerMessageIndication.java
@@ -15,7 +15,7 @@ import org.eclipse.net4j.internal.jms.MessageImpl;
import org.eclipse.net4j.internal.jms.util.MessageUtil;
import org.eclipse.net4j.jms.JMSProtocolConstants;
import org.eclipse.net4j.signal.Indication;
-import org.eclipse.net4j.util.stream.ExtendedDataInputStream;
+import org.eclipse.net4j.util.io.ExtendedDataInputStream;
import java.io.IOException;
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 9bde75a..e18d6cd 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
@@ -13,8 +13,8 @@ package org.eclipse.net4j.internal.jms.protocol;
import org.eclipse.net4j.IChannel;
import org.eclipse.net4j.jms.JMSProtocolConstants;
import org.eclipse.net4j.signal.RequestWithConfirmation;
-import org.eclipse.net4j.util.stream.ExtendedDataInputStream;
-import org.eclipse.net4j.util.stream.ExtendedDataOutputStream;
+import org.eclipse.net4j.util.io.ExtendedDataInputStream;
+import org.eclipse.net4j.util.io.ExtendedDataOutputStream;
import java.io.IOException;
diff --git a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/util/DestinationUtil.java b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/util/DestinationUtil.java
index 0d41c3b..d03603d 100644
--- a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/util/DestinationUtil.java
+++ b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/util/DestinationUtil.java
@@ -14,8 +14,8 @@ import org.eclipse.net4j.internal.jms.DestinationImpl;
import org.eclipse.net4j.internal.jms.QueueImpl;
import org.eclipse.net4j.internal.jms.TopicImpl;
import org.eclipse.net4j.jms.JMSProtocolConstants;
-import org.eclipse.net4j.util.stream.ExtendedDataInputStream;
-import org.eclipse.net4j.util.stream.ExtendedDataOutputStream;
+import org.eclipse.net4j.util.io.ExtendedDataInputStream;
+import org.eclipse.net4j.util.io.ExtendedDataOutputStream;
import javax.jms.Destination;
import javax.jms.JMSException;
diff --git a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/util/MessageUtil.java b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/util/MessageUtil.java
index 3ea979a..cd38f33 100644
--- a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/util/MessageUtil.java
+++ b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/util/MessageUtil.java
@@ -17,10 +17,10 @@ import org.eclipse.net4j.internal.jms.ObjectMessageImpl;
import org.eclipse.net4j.internal.jms.StreamMessageImpl;
import org.eclipse.net4j.internal.jms.TextMessageImpl;
import org.eclipse.net4j.internal.jms.bundle.OM;
+import org.eclipse.net4j.internal.util.om.trace.ContextTracer;
import org.eclipse.net4j.jms.JMSProtocolConstants;
-import org.eclipse.net4j.util.om.trace.ContextTracer;
-import org.eclipse.net4j.util.stream.ExtendedDataInputStream;
-import org.eclipse.net4j.util.stream.ExtendedDataOutputStream;
+import org.eclipse.net4j.util.io.ExtendedDataInputStream;
+import org.eclipse.net4j.util.io.ExtendedDataOutputStream;
import javax.jms.BytesMessage;
import javax.jms.JMSException;
diff --git a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/util/TypeUtil.java b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/util/TypeUtil.java
index 2948323..4c93f0e 100644
--- a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/util/TypeUtil.java
+++ b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/util/TypeUtil.java
@@ -11,8 +11,8 @@
package org.eclipse.net4j.internal.jms.util;
import org.eclipse.net4j.jms.JMSProtocolConstants;
-import org.eclipse.net4j.util.stream.ExtendedDataInputStream;
-import org.eclipse.net4j.util.stream.ExtendedDataOutputStream;
+import org.eclipse.net4j.util.io.ExtendedDataInputStream;
+import org.eclipse.net4j.util.io.ExtendedDataOutputStream;
import javax.jms.MessageFormatException;
diff --git a/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/internal/jvm/bundle/JVM.java b/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/internal/jvm/bundle/JVM.java
index f82e185..d061240 100644
--- a/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/internal/jvm/bundle/JVM.java
+++ b/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/internal/jvm/bundle/JVM.java
@@ -10,11 +10,11 @@
**************************************************************************/
package org.eclipse.net4j.internal.jvm.bundle;
-import org.eclipse.net4j.internal.util.om.OSGiActivator;
import org.eclipse.net4j.util.om.OMBundle;
-import org.eclipse.net4j.util.om.OMLogger;
import org.eclipse.net4j.util.om.OMPlatform;
-import org.eclipse.net4j.util.om.OMTracer;
+import org.eclipse.net4j.util.om.OSGiActivator;
+import org.eclipse.net4j.util.om.log.OMLogger;
+import org.eclipse.net4j.util.om.trace.OMTracer;
/**
* @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 4107dc5..44b7502 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
@@ -13,8 +13,8 @@ package org.eclipse.net4j.internal.tcp;
import org.eclipse.net4j.IBuffer;
import org.eclipse.net4j.IProtocol;
import org.eclipse.net4j.internal.util.concurrent.SynchronizingCorrelator;
+import org.eclipse.net4j.internal.util.om.trace.ContextTracer;
import org.eclipse.net4j.util.concurrent.ISynchronizer;
-import org.eclipse.net4j.util.om.trace.ContextTracer;
import org.eclipse.internal.net4j.BufferUtil;
import org.eclipse.internal.net4j.Channel;
diff --git a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/SelectorUtil.java b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/SelectorUtil.java
index 9360209..521a5d6 100644
--- a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/SelectorUtil.java
+++ b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/SelectorUtil.java
@@ -10,7 +10,7 @@
**************************************************************************/
package org.eclipse.net4j.internal.tcp;
-import org.eclipse.net4j.util.om.trace.ContextTracer;
+import org.eclipse.net4j.internal.util.om.trace.ContextTracer;
import org.eclipse.internal.net4j.bundle.OM;
diff --git a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPAcceptor.java b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPAcceptor.java
index abb86fb..08be346 100644
--- a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPAcceptor.java
+++ b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPAcceptor.java
@@ -10,11 +10,11 @@
**************************************************************************/
package org.eclipse.net4j.internal.tcp;
+import org.eclipse.net4j.internal.util.om.trace.ContextTracer;
import org.eclipse.net4j.tcp.ITCPAcceptor;
import org.eclipse.net4j.tcp.ITCPSelector;
import org.eclipse.net4j.tcp.ITCPSelectorListener;
import org.eclipse.net4j.util.StringUtil;
-import org.eclipse.net4j.util.om.trace.ContextTracer;
import org.eclipse.internal.net4j.Acceptor;
import org.eclipse.internal.net4j.bundle.OM;
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 7bfa7d4..9bd5ee9 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
@@ -15,11 +15,11 @@ import org.eclipse.net4j.ConnectorState;
import org.eclipse.net4j.IBuffer;
import org.eclipse.net4j.IChannel;
import org.eclipse.net4j.IProtocol;
+import org.eclipse.net4j.internal.util.om.trace.ContextTracer;
import org.eclipse.net4j.tcp.ITCPConnector;
import org.eclipse.net4j.tcp.ITCPConstants;
import org.eclipse.net4j.tcp.ITCPSelector;
import org.eclipse.net4j.tcp.ITCPSelectorListener;
-import org.eclipse.net4j.util.om.trace.ContextTracer;
import org.eclipse.internal.net4j.Channel;
import org.eclipse.internal.net4j.Connector;
diff --git a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPSelector.java b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPSelector.java
index e337a51..34600e5 100644
--- a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPSelector.java
+++ b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPSelector.java
@@ -11,11 +11,11 @@
package org.eclipse.net4j.internal.tcp;
import org.eclipse.net4j.internal.util.lifecycle.Lifecycle;
+import org.eclipse.net4j.internal.util.om.trace.ContextTracer;
import org.eclipse.net4j.tcp.ITCPSelector;
import org.eclipse.net4j.tcp.ITCPSelectorListener;
import org.eclipse.net4j.tcp.ITCPSelectorListener.Active;
import org.eclipse.net4j.tcp.ITCPSelectorListener.Passive;
-import org.eclipse.net4j.util.om.trace.ContextTracer;
import org.eclipse.internal.net4j.bundle.OM;
diff --git a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/bundle/TCP.java b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/bundle/TCP.java
index ce0b008..81337a0 100644
--- a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/bundle/TCP.java
+++ b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/bundle/TCP.java
@@ -10,11 +10,11 @@
**************************************************************************/
package org.eclipse.net4j.internal.tcp.bundle;
-import org.eclipse.net4j.internal.util.om.OSGiActivator;
import org.eclipse.net4j.util.om.OMBundle;
-import org.eclipse.net4j.util.om.OMLogger;
import org.eclipse.net4j.util.om.OMPlatform;
-import org.eclipse.net4j.util.om.OMTracer;
+import org.eclipse.net4j.util.om.OSGiActivator;
+import org.eclipse.net4j.util.om.log.OMLogger;
+import org.eclipse.net4j.util.om.trace.OMTracer;
/**
* @author Eike Stepper
diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/AbstractOMTest.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/AbstractOMTest.java
index d6cb364..cfcdb79 100644
--- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/AbstractOMTest.java
+++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/AbstractOMTest.java
@@ -10,9 +10,9 @@
**************************************************************************/
package org.eclipse.net4j.tests;
+import org.eclipse.net4j.internal.util.om.log.PrintLogHandler;
+import org.eclipse.net4j.internal.util.om.trace.PrintTraceHandler;
import org.eclipse.net4j.util.om.OMPlatform;
-import org.eclipse.net4j.util.om.log.PrintLogHandler;
-import org.eclipse.net4j.util.om.trace.PrintTraceHandler;
import junit.framework.TestCase;
diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/TestBufferPool.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/TestBufferPool.java
index ac26500..c54f135 100644
--- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/TestBufferPool.java
+++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/TestBufferPool.java
@@ -13,10 +13,10 @@ package org.eclipse.net4j.tests;
import org.eclipse.net4j.IBuffer;
import org.eclipse.net4j.IBufferPool;
import org.eclipse.net4j.BufferUtil;
+import org.eclipse.net4j.internal.util.om.trace.PrintTraceHandler;
import org.eclipse.net4j.util.ReflectUtil;
import org.eclipse.net4j.util.lifecycle.LifecycleUtil;
import org.eclipse.net4j.util.om.OMPlatform;
-import org.eclipse.net4j.util.om.trace.PrintTraceHandler;
import java.util.ArrayList;
import java.util.Collection;
diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/Indication1.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/Indication1.java
index 4d0680d..6c8d784 100644
--- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/Indication1.java
+++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/Indication1.java
@@ -11,8 +11,8 @@
package org.eclipse.net4j.tests.signal;
import org.eclipse.net4j.signal.IndicationWithResponse;
-import org.eclipse.net4j.util.stream.ExtendedDataInputStream;
-import org.eclipse.net4j.util.stream.ExtendedDataOutputStream;
+import org.eclipse.net4j.util.io.ExtendedDataInputStream;
+import org.eclipse.net4j.util.io.ExtendedDataOutputStream;
import java.io.IOException;
diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/Indication2.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/Indication2.java
index 770718c..6d644c9 100644
--- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/Indication2.java
+++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/Indication2.java
@@ -11,8 +11,8 @@
package org.eclipse.net4j.tests.signal;
import org.eclipse.net4j.signal.IndicationWithResponse;
-import org.eclipse.net4j.util.stream.ExtendedDataInputStream;
-import org.eclipse.net4j.util.stream.ExtendedDataOutputStream;
+import org.eclipse.net4j.util.io.ExtendedDataInputStream;
+import org.eclipse.net4j.util.io.ExtendedDataOutputStream;
import java.io.IOException;
diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/Request1.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/Request1.java
index 8634393..45a7ab2 100644
--- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/Request1.java
+++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/Request1.java
@@ -12,8 +12,8 @@ package org.eclipse.net4j.tests.signal;
import org.eclipse.net4j.IChannel;
import org.eclipse.net4j.signal.RequestWithConfirmation;
-import org.eclipse.net4j.util.stream.ExtendedDataInputStream;
-import org.eclipse.net4j.util.stream.ExtendedDataOutputStream;
+import org.eclipse.net4j.util.io.ExtendedDataInputStream;
+import org.eclipse.net4j.util.io.ExtendedDataOutputStream;
import java.io.IOException;
diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/Request2.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/Request2.java
index ef4b955..4dbfb29 100644
--- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/Request2.java
+++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/Request2.java
@@ -12,8 +12,8 @@ package org.eclipse.net4j.tests.signal;
import org.eclipse.net4j.IChannel;
import org.eclipse.net4j.signal.RequestWithConfirmation;
-import org.eclipse.net4j.util.stream.ExtendedDataInputStream;
-import org.eclipse.net4j.util.stream.ExtendedDataOutputStream;
+import org.eclipse.net4j.util.io.ExtendedDataInputStream;
+import org.eclipse.net4j.util.io.ExtendedDataOutputStream;
import java.io.IOException;
diff --git a/plugins/org.eclipse.net4j.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.ui/META-INF/MANIFEST.MF
index cefb553..cc5f0ff 100644
--- a/plugins/org.eclipse.net4j.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.net4j.ui/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.net4j.ui;singleton:=true
Bundle-Version: 0.8.0.qualifier
-Bundle-Activator: org.eclipse.net4j.internal.ui.bundle.Net4jUI$Activator
+Bundle-Activator: org.eclipse.net4j.internal.ui.bundle.OM$Activator
Bundle-Vendor: %providerName
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.ui;visibility:=reexport,
diff --git a/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/bundle/Net4jUI.java b/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/bundle/OM.java
index c12030e..75da8c9 100644
--- a/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/bundle/Net4jUI.java
+++ b/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/bundle/OM.java
@@ -10,26 +10,32 @@
**************************************************************************/
package org.eclipse.net4j.internal.ui.bundle;
-import org.eclipse.net4j.internal.util.om.OSGiActivator;
import org.eclipse.net4j.util.om.OMBundle;
-import org.eclipse.net4j.util.om.OMLogger;
import org.eclipse.net4j.util.om.OMPlatform;
-import org.eclipse.net4j.util.om.OMTracer;
+import org.eclipse.net4j.util.om.OSGiActivator;
+import org.eclipse.net4j.util.om.log.OMLogger;
+import org.eclipse.net4j.util.om.pref.OMPreference;
+import org.eclipse.net4j.util.om.pref.OMPreferences;
+import org.eclipse.net4j.util.om.trace.OMTracer;
/**
* @author Eike Stepper
*/
-public final class Net4jUI
+public final class OM
{
public static final String BUNDLE_ID = "org.eclipse.net4j.ui"; //$NON-NLS-1$
- public static final OMBundle BUNDLE = OMPlatform.INSTANCE.bundle(BUNDLE_ID, Net4jUI.class);
+ public static final OMBundle BUNDLE = OMPlatform.INSTANCE.bundle(BUNDLE_ID, OM.class);
public static final OMTracer DEBUG = BUNDLE.tracer("debug"); //$NON-NLS-1$
public static final OMLogger LOG = BUNDLE.logger();
- private Net4jUI()
+ public static final OMPreferences PREFS = BUNDLE.preferences();
+
+ public static final OMPreference<Boolean> PREF_ACTIVE = PREFS.init("active", false);
+
+ private OM()
{
}
diff --git a/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/bundle/SharedIcons.java b/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/bundle/SharedIcons.java
index caa24de..e415071 100644
--- a/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/bundle/SharedIcons.java
+++ b/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/bundle/SharedIcons.java
@@ -76,7 +76,7 @@ public class SharedIcons
private static ImageDescriptor createDescriptor(String key)
{
- ImageDescriptor descriptor = AbstractUIPlugin.imageDescriptorFromPlugin(Net4jUI.BUNDLE_ID, key);
+ ImageDescriptor descriptor = AbstractUIPlugin.imageDescriptorFromPlugin(OM.BUNDLE_ID, key);
if (descriptor != null)
{
REGISTRY.put(key, descriptor);
diff --git a/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/ui/actions/SafeAction.java b/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/ui/actions/SafeAction.java
index fac5da1..35bcdbf 100644
--- a/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/ui/actions/SafeAction.java
+++ b/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/ui/actions/SafeAction.java
@@ -1,6 +1,6 @@
package org.eclipse.net4j.ui.actions;
-import org.eclipse.net4j.internal.ui.bundle.Net4jUI;
+import org.eclipse.net4j.internal.ui.bundle.OM;
import org.eclipse.jface.action.Action;
import org.eclipse.jface.resource.ImageDescriptor;
@@ -50,7 +50,7 @@ public abstract class SafeAction extends Action
}
catch (Exception ex)
{
- Net4jUI.LOG.error(ex);
+ OM.LOG.error(ex);
}
}
diff --git a/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/ui/views/ItemProvider.java b/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/ui/views/ItemProvider.java
index 9a5fec7..dd0d88c 100644
--- a/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/ui/views/ItemProvider.java
+++ b/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/ui/views/ItemProvider.java
@@ -10,7 +10,7 @@
**************************************************************************/
package org.eclipse.net4j.ui.views;
-import org.eclipse.net4j.internal.ui.bundle.Net4jUI;
+import org.eclipse.net4j.internal.ui.bundle.OM;
import org.eclipse.net4j.ui.StructuredContentProvider;
import org.eclipse.jface.action.IMenuManager;
@@ -124,7 +124,7 @@ public abstract class ItemProvider<INPUT> extends StructuredContentProvider<INPU
}
catch (Exception ex)
{
- Net4jUI.LOG.error(ex);
+ OM.LOG.error(ex);
}
}
}
diff --git a/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/ui/widgets/HistoryText.java b/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/ui/widgets/HistoryText.java
new file mode 100644
index 0000000..92b1017
--- /dev/null
+++ b/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/ui/widgets/HistoryText.java
@@ -0,0 +1,1001 @@
+/***************************************************************************
+ * Copyright (c) 2004 - 2007 Eike Stepper, Germany.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Eike Stepper - initial API and implementation
+ **************************************************************************/
+package org.eclipse.net4j.ui.widgets;
+
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.accessibility.Accessible;
+import org.eclipse.swt.custom.CCombo;
+import org.eclipse.swt.events.ControlListener;
+import org.eclipse.swt.events.DisposeListener;
+import org.eclipse.swt.events.DragDetectListener;
+import org.eclipse.swt.events.FocusListener;
+import org.eclipse.swt.events.HelpListener;
+import org.eclipse.swt.events.KeyListener;
+import org.eclipse.swt.events.MenuDetectListener;
+import org.eclipse.swt.events.ModifyListener;
+import org.eclipse.swt.events.MouseEvent;
+import org.eclipse.swt.events.MouseListener;
+import org.eclipse.swt.events.MouseMoveListener;
+import org.eclipse.swt.events.MouseTrackListener;
+import org.eclipse.swt.events.MouseWheelListener;
+import org.eclipse.swt.events.PaintListener;
+import org.eclipse.swt.events.SelectionListener;
+import org.eclipse.swt.events.TraverseListener;
+import org.eclipse.swt.events.VerifyListener;
+import org.eclipse.swt.graphics.Color;
+import org.eclipse.swt.graphics.Cursor;
+import org.eclipse.swt.graphics.Font;
+import org.eclipse.swt.graphics.GCData;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.graphics.Point;
+import org.eclipse.swt.graphics.Rectangle;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Event;
+import org.eclipse.swt.widgets.Layout;
+import org.eclipse.swt.widgets.Listener;
+import org.eclipse.swt.widgets.Menu;
+import org.eclipse.swt.widgets.Monitor;
+import org.eclipse.swt.widgets.ScrollBar;
+import org.eclipse.swt.widgets.Shell;
+
+/**
+ * @author Eike Stepper
+ */
+public class HistoryText extends Composite
+{
+ private CCombo combo;
+
+ public HistoryText(Composite parent, int style)
+ {
+ super(parent, SWT.NONE);
+ combo = new CCombo(this, style);
+ }
+
+ public CCombo getCombo()
+ {
+ return combo;
+ }
+
+ public void add(String string, int index)
+ {
+ combo.add(string, index);
+ }
+
+ public void add(String string)
+ {
+ combo.add(string);
+ }
+
+ @Override
+ public void addControlListener(ControlListener listener)
+ {
+ combo.addControlListener(listener);
+ }
+
+ @Override
+ public void addDisposeListener(DisposeListener listener)
+ {
+ combo.addDisposeListener(listener);
+ }
+
+ @Override
+ public void addDragDetectListener(DragDetectListener listener)
+ {
+ combo.addDragDetectListener(listener);
+ }
+
+ @Override
+ public void addFocusListener(FocusListener listener)
+ {
+ combo.addFocusListener(listener);
+ }
+
+ @Override
+ public void addHelpListener(HelpListener listener)
+ {
+ combo.addHelpListener(listener);
+ }
+
+ @Override
+ public void addKeyListener(KeyListener listener)
+ {
+ combo.addKeyListener(listener);
+ }
+
+ @Override
+ public void addListener(int eventType, Listener listener)
+ {
+ combo.addListener(eventType, listener);
+ }
+
+ @Override
+ public void addMenuDetectListener(MenuDetectListener listener)
+ {
+ combo.addMenuDetectListener(listener);
+ }
+
+ public void addModifyListener(ModifyListener listener)
+ {
+ combo.addModifyListener(listener);
+ }
+
+ @Override
+ public void addMouseListener(MouseListener listener)
+ {
+ combo.addMouseListener(listener);
+ }
+
+ @Override
+ public void addMouseMoveListener(MouseMoveListener listener)
+ {
+ combo.addMouseMoveListener(listener);
+ }
+
+ @Override
+ public void addMouseTrackListener(MouseTrackListener listener)
+ {
+ combo.addMouseTrackListener(listener);
+ }
+
+ @Override
+ public void addMouseWheelListener(MouseWheelListener listener)
+ {
+ combo.addMouseWheelListener(listener);
+ }
+
+ @Override
+ public void addPaintListener(PaintListener listener)
+ {
+ combo.addPaintListener(listener);
+ }
+
+ public void addSelectionListener(SelectionListener listener)
+ {
+ combo.addSelectionListener(listener);
+ }
+
+ @Override
+ public void addTraverseListener(TraverseListener listener)
+ {
+ combo.addTraverseListener(listener);
+ }
+
+ public void addVerifyListener(VerifyListener listener)
+ {
+ combo.addVerifyListener(listener);
+ }
+
+ @Override
+ public void changed(Control[] changed)
+ {
+ combo.changed(changed);
+ }
+
+ public void clearSelection()
+ {
+ combo.clearSelection();
+ }
+
+ @Override
+ public Point computeSize(int hint, int hint2, boolean changed)
+ {
+ return combo.computeSize(hint, hint2, changed);
+ }
+
+ @Override
+ public Point computeSize(int hint, int hint2)
+ {
+ return combo.computeSize(hint, hint2);
+ }
+
+ @Override
+ public Rectangle computeTrim(int x, int y, int width, int height)
+ {
+ return combo.computeTrim(x, y, width, height);
+ }
+
+ public void copy()
+ {
+ combo.copy();
+ }
+
+ public void cut()
+ {
+ combo.cut();
+ }
+
+ public void deselect(int index)
+ {
+ combo.deselect(index);
+ }
+
+ public void deselectAll()
+ {
+ combo.deselectAll();
+ }
+
+ @Override
+ public void dispose()
+ {
+ combo.dispose();
+ }
+
+ @Override
+ public boolean dragDetect(Event event)
+ {
+ return combo.dragDetect(event);
+ }
+
+ @Override
+ public boolean dragDetect(MouseEvent event)
+ {
+ return combo.dragDetect(event);
+ }
+
+ @Override
+ public boolean equals(Object obj)
+ {
+ return combo.equals(obj);
+ }
+
+ @Override
+ public boolean forceFocus()
+ {
+ return combo.forceFocus();
+ }
+
+ @Override
+ public Accessible getAccessible()
+ {
+ return combo.getAccessible();
+ }
+
+ @Override
+ public Color getBackground()
+ {
+ return combo.getBackground();
+ }
+
+ @Override
+ public Image getBackgroundImage()
+ {
+ return combo.getBackgroundImage();
+ }
+
+ @Override
+ public int getBackgroundMode()
+ {
+ return combo.getBackgroundMode();
+ }
+
+ @Override
+ public int getBorderWidth()
+ {
+ return combo.getBorderWidth();
+ }
+
+ @Override
+ public Rectangle getBounds()
+ {
+ return combo.getBounds();
+ }
+
+ @Override
+ public Control[] getChildren()
+ {
+ return combo.getChildren();
+ }
+
+ @Override
+ public Rectangle getClientArea()
+ {
+ return combo.getClientArea();
+ }
+
+ @Override
+ public Cursor getCursor()
+ {
+ return combo.getCursor();
+ }
+
+ @Override
+ public Object getData()
+ {
+ return combo.getData();
+ }
+
+ @Override
+ public Object getData(String key)
+ {
+ return combo.getData(key);
+ }
+
+ @Override
+ public Display getDisplay()
+ {
+ return combo.getDisplay();
+ }
+
+ @Override
+ public boolean getDragDetect()
+ {
+ return combo.getDragDetect();
+ }
+
+ public boolean getEditable()
+ {
+ return combo.getEditable();
+ }
+
+ @Override
+ public boolean getEnabled()
+ {
+ return combo.getEnabled();
+ }
+
+ @Override
+ public Font getFont()
+ {
+ return combo.getFont();
+ }
+
+ @Override
+ public Color getForeground()
+ {
+ return combo.getForeground();
+ }
+
+ @Override
+ public ScrollBar getHorizontalBar()
+ {
+ return combo.getHorizontalBar();
+ }
+
+ public String getItem(int index)
+ {
+ return combo.getItem(index);
+ }
+
+ public int getItemCount()
+ {
+ return combo.getItemCount();
+ }
+
+ public int getItemHeight()
+ {
+ return combo.getItemHeight();
+ }
+
+ public String[] getItems()
+ {
+ return combo.getItems();
+ }
+
+ @Override
+ public Layout getLayout()
+ {
+ return combo.getLayout();
+ }
+
+ @Override
+ public Object getLayoutData()
+ {
+ return combo.getLayoutData();
+ }
+
+ @Override
+ public boolean getLayoutDeferred()
+ {
+ return combo.getLayoutDeferred();
+ }
+
+ @Override
+ public Point getLocation()
+ {
+ return combo.getLocation();
+ }
+
+ @Override
+ public Menu getMenu()
+ {
+ return combo.getMenu();
+ }
+
+ @Override
+ public Monitor getMonitor()
+ {
+ return combo.getMonitor();
+ }
+
+ @Override
+ public Composite getParent()
+ {
+ return combo.getParent();
+ }
+
+ public Point getSelection()
+ {
+ return combo.getSelection();
+ }
+
+ public int getSelectionIndex()
+ {
+ return combo.getSelectionIndex();
+ }
+
+ @Override
+ public Shell getShell()
+ {
+ return combo.getShell();
+ }
+
+ @Override
+ public Point getSize()
+ {
+ return combo.getSize();
+ }
+
+ @Override
+ public int getStyle()
+ {
+ return combo.getStyle();
+ }
+
+ @Override
+ public Control[] getTabList()
+ {
+ return combo.getTabList();
+ }
+
+ public String getText()
+ {
+ return combo.getText();
+ }
+
+ public int getTextHeight()
+ {
+ return combo.getTextHeight();
+ }
+
+ public int getTextLimit()
+ {
+ return combo.getTextLimit();
+ }
+
+ @Override
+ public String getToolTipText()
+ {
+ return combo.getToolTipText();
+ }
+
+ @Override
+ public ScrollBar getVerticalBar()
+ {
+ return combo.getVerticalBar();
+ }
+
+ @Override
+ public boolean getVisible()
+ {
+ return combo.getVisible();
+ }
+
+ public int getVisibleItemCount()
+ {
+ return combo.getVisibleItemCount();
+ }
+
+ @Override
+ public int hashCode()
+ {
+ return combo.hashCode();
+ }
+
+ public int indexOf(String string, int start)
+ {
+ return combo.indexOf(string, start);
+ }
+
+ public int indexOf(String string)
+ {
+ return combo.indexOf(string);
+ }
+
+ @Override
+ public void internal_dispose_GC(int hdc, GCData data)
+ {
+ combo.internal_dispose_GC(hdc, data);
+ }
+
+ @Override
+ public int internal_new_GC(GCData data)
+ {
+ return combo.internal_new_GC(data);
+ }
+
+ @Override
+ public boolean isDisposed()
+ {
+ return combo.isDisposed();
+ }
+
+ @Override
+ public boolean isEnabled()
+ {
+ return combo.isEnabled();
+ }
+
+ @Override
+ public boolean isFocusControl()
+ {
+ return combo.isFocusControl();
+ }
+
+ @Override
+ public boolean isLayoutDeferred()
+ {
+ return combo.isLayoutDeferred();
+ }
+
+ @Override
+ public boolean isListening(int eventType)
+ {
+ return combo.isListening(eventType);
+ }
+
+ @Override
+ public boolean isReparentable()
+ {
+ return combo.isReparentable();
+ }
+
+ @Override
+ public boolean isVisible()
+ {
+ return combo.isVisible();
+ }
+
+ @Override
+ public void layout()
+ {
+ combo.layout();
+ }
+
+ @Override
+ public void layout(boolean changed, boolean all)
+ {
+ combo.layout(changed, all);
+ }
+
+ @Override
+ public void layout(boolean changed)
+ {
+ combo.layout(changed);
+ }
+
+ @Override
+ public void layout(Control[] changed)
+ {
+ combo.layout(changed);
+ }
+
+ @Override
+ public void moveAbove(Control control)
+ {
+ combo.moveAbove(control);
+ }
+
+ @Override
+ public void moveBelow(Control control)
+ {
+ combo.moveBelow(control);
+ }
+
+ @Override
+ public void notifyListeners(int eventType, Event event)
+ {
+ combo.notifyListeners(eventType, event);
+ }
+
+ @Override
+ public void pack()
+ {
+ combo.pack();
+ }
+
+ @Override
+ public void pack(boolean changed)
+ {
+ combo.pack(changed);
+ }
+
+ public void paste()
+ {
+ combo.paste();
+ }
+
+ @Override
+ public void redraw()
+ {
+ combo.redraw();
+ }
+
+ @Override
+ public void redraw(int x, int y, int width, int height, boolean all)
+ {
+ combo.redraw(x, y, width, height, all);
+ }
+
+ public void remove(int start, int end)
+ {
+ combo.remove(start, end);
+ }
+
+ public void remove(int index)
+ {
+ combo.remove(index);
+ }
+
+ public void remove(String string)
+ {
+ combo.remove(string);
+ }
+
+ public void removeAll()
+ {
+ combo.removeAll();
+ }
+
+ @Override
+ public void removeControlListener(ControlListener listener)
+ {
+ combo.removeControlListener(listener);
+ }
+
+ @Override
+ public void removeDisposeListener(DisposeListener listener)
+ {
+ combo.removeDisposeListener(listener);
+ }
+
+ @Override
+ public void removeDragDetectListener(DragDetectListener listener)
+ {
+ combo.removeDragDetectListener(listener);
+ }
+
+ @Override
+ public void removeFocusListener(FocusListener listener)
+ {
+ combo.removeFocusListener(listener);
+ }
+
+ @Override
+ public void removeHelpListener(HelpListener listener)
+ {
+ combo.removeHelpListener(listener);
+ }
+
+ @Override
+ public void removeKeyListener(KeyListener listener)
+ {
+ combo.removeKeyListener(listener);
+ }
+
+ @Override
+ public void removeListener(int eventType, Listener listener)
+ {
+ combo.removeListener(eventType, listener);
+ }
+
+ @Override
+ public void removeMenuDetectListener(MenuDetectListener listener)
+ {
+ combo.removeMenuDetectListener(listener);
+ }
+
+ public void removeModifyListener(ModifyListener listener)
+ {
+ combo.removeModifyListener(listener);
+ }
+
+ @Override
+ public void removeMouseListener(MouseListener listener)
+ {
+ combo.removeMouseListener(listener);
+ }
+
+ @Override
+ public void removeMouseMoveListener(MouseMoveListener listener)
+ {
+ combo.removeMouseMoveListener(listener);
+ }
+
+ @Override
+ public void removeMouseTrackListener(MouseTrackListener listener)
+ {
+ combo.removeMouseTrackListener(listener);
+ }
+
+ @Override
+ public void removeMouseWheelListener(MouseWheelListener listener)
+ {
+ combo.removeMouseWheelListener(listener);
+ }
+
+ @Override
+ public void removePaintListener(PaintListener listener)
+ {
+ combo.removePaintListener(listener);
+ }
+
+ public void removeSelectionListener(SelectionListener listener)
+ {
+ combo.removeSelectionListener(listener);
+ }
+
+ @Override
+ public void removeTraverseListener(TraverseListener listener)
+ {
+ combo.removeTraverseListener(listener);
+ }
+
+ public void removeVerifyListener(VerifyListener listener)
+ {
+ combo.removeVerifyListener(listener);
+ }
+
+ public void select(int index)
+ {
+ combo.select(index);
+ }
+
+ @Override
+ public void setBackground(Color color)
+ {
+ combo.setBackground(color);
+ }
+
+ @Override
+ public void setBackgroundImage(Image image)
+ {
+ combo.setBackgroundImage(image);
+ }
+
+ @Override
+ public void setBackgroundMode(int mode)
+ {
+ combo.setBackgroundMode(mode);
+ }
+
+ @Override
+ public void setBounds(int x, int y, int width, int height)
+ {
+ combo.setBounds(x, y, width, height);
+ }
+
+ @Override
+ public void setBounds(Rectangle rect)
+ {
+ combo.setBounds(rect);
+ }
+
+ @Override
+ public void setCapture(boolean capture)
+ {
+ combo.setCapture(capture);
+ }
+
+ @Override
+ public void setCursor(Cursor cursor)
+ {
+ combo.setCursor(cursor);
+ }
+
+ @Override
+ public void setData(Object data)
+ {
+ combo.setData(data);
+ }
+
+ @Override
+ public void setData(String key, Object value)
+ {
+ combo.setData(key, value);
+ }
+
+ @Override
+ public void setDragDetect(boolean dragDetect)
+ {
+ combo.setDragDetect(dragDetect);
+ }
+
+ public void setEditable(boolean editable)
+ {
+ combo.setEditable(editable);
+ }
+
+ @Override
+ public void setEnabled(boolean enabled)
+ {
+ combo.setEnabled(enabled);
+ }
+
+ @Override
+ public boolean setFocus()
+ {
+ return combo.setFocus();
+ }
+
+ @Override
+ public void setFont(Font font)
+ {
+ combo.setFont(font);
+ }
+
+ @Override
+ public void setForeground(Color color)
+ {
+ combo.setForeground(color);
+ }
+
+ public void setItem(int index, String string)
+ {
+ combo.setItem(index, string);
+ }
+
+ public void setItems(String[] items)
+ {
+ combo.setItems(items);
+ }
+
+ @Override
+ public void setLayout(Layout layout)
+ {
+ combo.setLayout(layout);
+ }
+
+ @Override
+ public void setLayoutData(Object layoutData)
+ {
+ combo.setLayoutData(layoutData);
+ }
+
+ @Override
+ public void setLayoutDeferred(boolean defer)
+ {
+ combo.setLayoutDeferred(defer);
+ }
+
+ @Override
+ public void setLocation(int x, int y)
+ {
+ combo.setLocation(x, y);
+ }
+
+ @Override
+ public void setLocation(Point location)
+ {
+ combo.setLocation(location);
+ }
+
+ @Override
+ public void setMenu(Menu menu)
+ {
+ combo.setMenu(menu);
+ }
+
+ @Override
+ public boolean setParent(Composite parent)
+ {
+ return combo.setParent(parent);
+ }
+
+ @Override
+ public void setRedraw(boolean redraw)
+ {
+ combo.setRedraw(redraw);
+ }
+
+ public void setSelection(Point selection)
+ {
+ combo.setSelection(selection);
+ }
+
+ @Override
+ public void setSize(int width, int height)
+ {
+ combo.setSize(width, height);
+ }
+
+ @Override
+ public void setSize(Point size)
+ {
+ combo.setSize(size);
+ }
+
+ @Override
+ public void setTabList(Control[] tabList)
+ {
+ combo.setTabList(tabList);
+ }
+
+ public void setText(String string)
+ {
+ combo.setText(string);
+ }
+
+ public void setTextLimit(int limit)
+ {
+ combo.setTextLimit(limit);
+ }
+
+ @Override
+ public void setToolTipText(String string)
+ {
+ combo.setToolTipText(string);
+ }
+
+ @Override
+ public void setVisible(boolean visible)
+ {
+ combo.setVisible(visible);
+ }
+
+ public void setVisibleItemCount(int count)
+ {
+ combo.setVisibleItemCount(count);
+ }
+
+ @Override
+ public Point toControl(int x, int y)
+ {
+ return combo.toControl(x, y);
+ }
+
+ @Override
+ public Point toControl(Point point)
+ {
+ return combo.toControl(point);
+ }
+
+ @Override
+ public Point toDisplay(int x, int y)
+ {
+ return combo.toDisplay(x, y);
+ }
+
+ @Override
+ public Point toDisplay(Point point)
+ {
+ return combo.toDisplay(point);
+ }
+
+ @Override
+ public String toString()
+ {
+ return combo.toString();
+ }
+
+ @Override
+ public boolean traverse(int traversal)
+ {
+ return combo.traverse(traversal);
+ }
+
+ @Override
+ public void update()
+ {
+ combo.update();
+ }
+}
diff --git a/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/ui/wizards/SteppingWizard.java b/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/ui/wizards/SteppingWizard.java
index 70919a0..bdea960 100644
--- a/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/ui/wizards/SteppingWizard.java
+++ b/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/ui/wizards/SteppingWizard.java
@@ -10,7 +10,7 @@
**************************************************************************/
package org.eclipse.net4j.ui.wizards;
-import org.eclipse.net4j.internal.ui.bundle.Net4jUI;
+import org.eclipse.net4j.internal.ui.bundle.OM;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
@@ -199,7 +199,7 @@ public abstract class SteppingWizard extends Wizard
private void handleFinishException(Exception ex)
{
- Net4jUI.LOG.error(ex);
+ OM.LOG.error(ex);
MessageDialog.openError(getShell(), getWindowTitle(), ex.getMessage());
}
}
diff --git a/plugins/org.eclipse.net4j.util/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.util/META-INF/MANIFEST.MF
index 83a4374..c69d2b1 100644
--- a/plugins/org.eclipse.net4j.util/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.net4j.util/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@ Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-Activator: org.eclipse.net4j.internal.util.bundle.OM$Activator
Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Require-Bundle: org.eclipse.core.runtime
+Require-Bundle: org.eclipse.core.runtime;bundle-version="3.3.0";resolution:=optional
Import-Package: org.eclipse.osgi.service.debug;version="1.0.0";resolution:=optional,
org.osgi.framework;version="1.3.0";resolution:=optional,
org.osgi.service.log;version="1.3.0";resolution:=optional,
@@ -19,7 +19,9 @@ Export-Package: org.eclipse.net4j.internal.util;version="0.8.0",
org.eclipse.net4j.internal.util.event;version="0.8.0",
org.eclipse.net4j.internal.util.factory;version="0.8.0",
org.eclipse.net4j.internal.util.lifecycle;version="0.8.0",
- org.eclipse.net4j.internal.util.om;version="0.8.0",
+ org.eclipse.net4j.internal.util.om.log;version="0.8.0",
+ org.eclipse.net4j.internal.util.om.pref;version="0.8.0",
+ org.eclipse.net4j.internal.util.om.trace;version="0.8.0",
org.eclipse.net4j.internal.util.registry;version="0.8.0",
org.eclipse.net4j.internal.util.transaction;version="0.8.0",
org.eclipse.net4j.util;version="0.8.0",
@@ -28,11 +30,12 @@ Export-Package: org.eclipse.net4j.internal.util;version="0.8.0",
org.eclipse.net4j.util.container.delegate;version="0.8.0",
org.eclipse.net4j.util.event;version="0.8.0",
org.eclipse.net4j.util.factory;version="0.8.0",
+ org.eclipse.net4j.util.io;version="0.8.0",
org.eclipse.net4j.util.lifecycle;version="0.8.0",
org.eclipse.net4j.util.om;version="0.8.0",
org.eclipse.net4j.util.om.log;version="0.8.0",
+ org.eclipse.net4j.util.om.pref;version="0.8.0",
org.eclipse.net4j.util.om.trace;version="0.8.0",
org.eclipse.net4j.util.registry;version="0.8.0",
- org.eclipse.net4j.util.stream;version="0.8.0",
org.eclipse.net4j.util.transaction;version="0.8.0"
Eclipse-LazyStart: true
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/bundle/AbstractOMBundle.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/bundle/AbstractOMBundle.java
index 8d25960..61b8d30 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/bundle/AbstractOMBundle.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/bundle/AbstractOMBundle.java
@@ -10,12 +10,15 @@
**************************************************************************/
package org.eclipse.net4j.internal.util.bundle;
-import org.eclipse.net4j.util.IOUtil;
+import org.eclipse.net4j.internal.util.om.log.Logger;
+import org.eclipse.net4j.internal.util.om.pref.Preferences;
+import org.eclipse.net4j.internal.util.om.trace.Tracer;
import org.eclipse.net4j.util.ReflectUtil;
+import org.eclipse.net4j.util.io.IOUtil;
import org.eclipse.net4j.util.om.OMBundle;
-import org.eclipse.net4j.util.om.OMLogger;
import org.eclipse.net4j.util.om.OMPlatform;
-import org.eclipse.net4j.util.om.OMTracer;
+import org.eclipse.net4j.util.om.log.OMLogger;
+import org.eclipse.net4j.util.om.trace.OMTracer;
import java.io.File;
import java.io.IOException;
@@ -47,19 +50,21 @@ public abstract class AbstractOMBundle implements OMBundle
private boolean debuggingInitialized;
- private Map<String, OMTracerImpl> tracers = new ConcurrentHashMap(0);
+ private Map<String, Tracer> tracers = new ConcurrentHashMap(0);
private OMLogger logger;
- public ResourceBundle resourceBundle;
+ private Preferences preferences;
- public ResourceBundle untranslatedResourceBundle;
+ private ResourceBundle resourceBundle;
- public Map<String, String> strings = new HashMap(0);
+ private ResourceBundle untranslatedResourceBundle;
- public Map<String, String> untranslatedStrings = new HashMap(0);
+ private Map<String, String> strings = new HashMap(0);
- public boolean shouldTranslate = true;
+ private Map<String, String> untranslatedStrings = new HashMap(0);
+
+ private boolean shouldTranslate = true;
public AbstractOMBundle(AbstractOMPlatform platform, String bundleID, Class accessor)
{
@@ -190,6 +195,16 @@ public abstract class AbstractOMBundle implements OMBundle
return platform.getConfigProperties(getConfigFileName());
}
+ public synchronized Preferences preferences()
+ {
+ if (preferences == null)
+ {
+ preferences = new Preferences(this);
+ }
+
+ return preferences;
+ }
+
public InputStream getInputStream(String path) throws IOException
{
URL url = new URL(getBaseURL().toString() + ".options"); //$NON-NLS-1$
@@ -297,12 +312,12 @@ public abstract class AbstractOMBundle implements OMBundle
protected OMTracer createTracer(String name)
{
- return new OMTracerImpl(this, name);
+ return new Tracer(this, name);
}
protected OMLogger createLogger()
{
- return new OMLoggerImpl(this);
+ return new Logger(this);
}
protected String getConfigFileName()
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/bundle/AbstractOMPlatform.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/bundle/AbstractOMPlatform.java
index ed471ee..d0f71e2 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/bundle/AbstractOMPlatform.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/bundle/AbstractOMPlatform.java
@@ -10,15 +10,15 @@
**************************************************************************/
package org.eclipse.net4j.internal.util.bundle;
-import org.eclipse.net4j.util.IOUtil;
+import org.eclipse.net4j.internal.util.om.trace.ContextTracer;
+import org.eclipse.net4j.util.io.IOUtil;
import org.eclipse.net4j.util.om.OMBundle;
-import org.eclipse.net4j.util.om.OMLogHandler;
-import org.eclipse.net4j.util.om.OMLogger;
import org.eclipse.net4j.util.om.OMPlatform;
-import org.eclipse.net4j.util.om.OMTraceHandler;
-import org.eclipse.net4j.util.om.OMLogger.Level;
-import org.eclipse.net4j.util.om.OMTraceHandler.Event;
-import org.eclipse.net4j.util.om.trace.ContextTracer;
+import org.eclipse.net4j.util.om.log.OMLogHandler;
+import org.eclipse.net4j.util.om.log.OMLogger;
+import org.eclipse.net4j.util.om.log.OMLogger.Level;
+import org.eclipse.net4j.util.om.trace.OMTraceHandler;
+import org.eclipse.net4j.util.om.trace.OMTraceHandlerEvent;
import java.io.File;
import java.io.FileInputStream;
@@ -160,7 +160,7 @@ public abstract class AbstractOMPlatform implements OMPlatform
}
}
- protected void log(OMLogger logger, Level level, String msg, Throwable t)
+ public void log(OMLogger logger, Level level, String msg, Throwable t)
{
for (OMLogHandler logHandler : logHandlers)
{
@@ -178,7 +178,7 @@ public abstract class AbstractOMPlatform implements OMPlatform
}
}
- protected void trace(Event event)
+ public void trace(OMTraceHandlerEvent event)
{
for (OMTraceHandler traceHandler : traceHandlers)
{
@@ -196,6 +196,11 @@ public abstract class AbstractOMPlatform implements OMPlatform
}
}
+ protected Map<String, AbstractOMBundle> getBundles()
+ {
+ return bundles;
+ }
+
protected abstract OMBundle createBundle(String bundleID, Class accessor);
protected abstract String getDebugOption(String bundleID, String option);
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/bundle/LegacyBundle.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/bundle/LegacyBundle.java
index 3a1c676..c0487c0 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/bundle/LegacyBundle.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/bundle/LegacyBundle.java
@@ -10,9 +10,9 @@
**************************************************************************/
package org.eclipse.net4j.internal.util.bundle;
-import org.eclipse.net4j.util.IOUtil;
import org.eclipse.net4j.util.ReflectUtil;
import org.eclipse.net4j.util.StringUtil;
+import org.eclipse.net4j.util.io.IOUtil;
import java.io.IOException;
import java.io.InputStream;
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/bundle/LegacyPlatform.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/bundle/LegacyPlatform.java
index a442b8a..d3f1ab2 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/bundle/LegacyPlatform.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/bundle/LegacyPlatform.java
@@ -10,6 +10,7 @@
**************************************************************************/
package org.eclipse.net4j.internal.util.bundle;
+import org.eclipse.net4j.internal.util.om.pref.Preferences;
import org.eclipse.net4j.util.om.OMBundle;
import java.util.Map;
@@ -26,6 +27,26 @@ public class LegacyPlatform extends AbstractOMPlatform
{
}
+ public synchronized void start()
+ {
+ }
+
+ public synchronized void stop()
+ {
+ for (AbstractOMBundle bundle : getBundles().values())
+ {
+ try
+ {
+ Preferences preferences = bundle.preferences();
+ preferences.save();
+ }
+ catch (RuntimeException ex)
+ {
+ OM.LOG.error(ex);
+ }
+ }
+ }
+
@Override
protected OMBundle createBundle(String bundleID, Class accessor)
{
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/bundle/OM.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/bundle/OM.java
index 349a173..c4d859d 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/bundle/OM.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/bundle/OM.java
@@ -10,14 +10,14 @@
**************************************************************************/
package org.eclipse.net4j.internal.util.bundle;
+import org.eclipse.net4j.internal.util.om.log.EclipseLoggingBridge;
+import org.eclipse.net4j.internal.util.om.log.PrintLogHandler;
+import org.eclipse.net4j.internal.util.om.trace.ContextTracer;
+import org.eclipse.net4j.internal.util.om.trace.PrintTraceHandler;
import org.eclipse.net4j.util.om.OMBundle;
-import org.eclipse.net4j.util.om.OMLogger;
import org.eclipse.net4j.util.om.OMPlatform;
-import org.eclipse.net4j.util.om.OMTracer;
-import org.eclipse.net4j.util.om.log.EclipseLoggingBridge;
-import org.eclipse.net4j.util.om.log.PrintLogHandler;
-import org.eclipse.net4j.util.om.trace.ContextTracer;
-import org.eclipse.net4j.util.om.trace.PrintTraceHandler;
+import org.eclipse.net4j.util.om.log.OMLogger;
+import org.eclipse.net4j.util.om.trace.OMTracer;
import org.osgi.framework.BundleActivator;
import org.osgi.framework.BundleContext;
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/bundle/OSGiBundle.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/bundle/OSGiBundle.java
index 29c0c91..f1d16e1 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/bundle/OSGiBundle.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/bundle/OSGiBundle.java
@@ -10,7 +10,7 @@
**************************************************************************/
package org.eclipse.net4j.internal.util.bundle;
-import org.eclipse.net4j.util.IOUtil;
+import org.eclipse.net4j.util.io.IOUtil;
import org.eclipse.core.runtime.FileLocator;
import org.eclipse.core.runtime.Platform;
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/bundle/OSGiPlatform.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/bundle/OSGiPlatform.java
index 97ee122..b8de43c 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/bundle/OSGiPlatform.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/bundle/OSGiPlatform.java
@@ -45,6 +45,7 @@ public class OSGiPlatform extends AbstractOMPlatform
return new OSGiBundle(this, bundleID, accessor);
}
+ @Override
protected String getDebugOption(String bundleID, String option)
{
try
@@ -58,6 +59,7 @@ public class OSGiPlatform extends AbstractOMPlatform
}
}
+ @Override
protected void setDebugOption(String bundleID, String option, String value)
{
try
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/concurrent/AsynchronousWorkSerializer.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/concurrent/AsynchronousWorkSerializer.java
index f0f4f86..b08087a 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/concurrent/AsynchronousWorkSerializer.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/concurrent/AsynchronousWorkSerializer.java
@@ -11,8 +11,8 @@
package org.eclipse.net4j.internal.util.concurrent;
import org.eclipse.net4j.internal.util.bundle.OM;
+import org.eclipse.net4j.internal.util.om.trace.ContextTracer;
import org.eclipse.net4j.util.concurrent.IWorkSerializer;
-import org.eclipse.net4j.util.om.trace.ContextTracer;
import java.util.Queue;
import java.util.concurrent.ConcurrentLinkedQueue;
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/lifecycle/Lifecycle.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/lifecycle/Lifecycle.java
index 8638db1..66f1b7f 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/lifecycle/Lifecycle.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/lifecycle/Lifecycle.java
@@ -12,10 +12,10 @@ package org.eclipse.net4j.internal.util.lifecycle;
import org.eclipse.net4j.internal.util.bundle.OM;
import org.eclipse.net4j.internal.util.event.Notifier;
+import org.eclipse.net4j.internal.util.om.trace.ContextTracer;
import org.eclipse.net4j.util.ReflectUtil;
import org.eclipse.net4j.util.lifecycle.ILifecycle;
import org.eclipse.net4j.util.lifecycle.ILifecycleEvent;
-import org.eclipse.net4j.util.om.trace.ContextTracer;
/**
* @author Eike Stepper
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/log/EclipseLoggingBridge.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/log/EclipseLoggingBridge.java
index aa7aca3..c2f069d 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/log/EclipseLoggingBridge.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/log/EclipseLoggingBridge.java
@@ -8,14 +8,14 @@
* Contributors:
* Eike Stepper - initial API and implementation
**************************************************************************/
-package org.eclipse.net4j.util.om.log;
+package org.eclipse.net4j.internal.util.om.log;
import org.eclipse.net4j.internal.util.bundle.OM;
import org.eclipse.net4j.internal.util.bundle.OSGiBundle;
-import org.eclipse.net4j.util.om.OMLogHandler;
-import org.eclipse.net4j.util.om.OMLogger;
-import org.eclipse.net4j.util.om.OMLogger.Level;
-import org.eclipse.net4j.util.om.trace.ContextTracer;
+import org.eclipse.net4j.internal.util.om.trace.ContextTracer;
+import org.eclipse.net4j.util.om.log.OMLogHandler;
+import org.eclipse.net4j.util.om.log.OMLogger;
+import org.eclipse.net4j.util.om.log.OMLogger.Level;
import org.eclipse.core.runtime.ILog;
import org.eclipse.core.runtime.IStatus;
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/bundle/OMLoggerImpl.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/log/Logger.java
index 4fdde35..014c1ba 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/bundle/OMLoggerImpl.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/log/Logger.java
@@ -8,19 +8,20 @@
* Contributors:
* Eike Stepper - initial API and implementation
**************************************************************************/
-package org.eclipse.net4j.internal.util.bundle;
+package org.eclipse.net4j.internal.util.om.log;
+import org.eclipse.net4j.internal.util.bundle.AbstractOMPlatform;
import org.eclipse.net4j.util.om.OMBundle;
-import org.eclipse.net4j.util.om.OMLogger;
+import org.eclipse.net4j.util.om.log.OMLogger;
/**
* @author Eike Stepper
*/
-public class OMLoggerImpl implements OMLogger
+public class Logger implements OMLogger
{
private OMBundle bundle;
- public OMLoggerImpl(OMBundle bundle)
+ public Logger(OMBundle bundle)
{
this.bundle = bundle;
}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/log/OSGiLoggingBridge.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/log/OSGiLoggingBridge.java
index 4b5a669..5d49acc 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/log/OSGiLoggingBridge.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/log/OSGiLoggingBridge.java
@@ -8,14 +8,14 @@
* Contributors:
* Eike Stepper - initial API and implementation
**************************************************************************/
-package org.eclipse.net4j.util.om.log;
+package org.eclipse.net4j.internal.util.om.log;
import org.eclipse.net4j.internal.util.bundle.OM;
import org.eclipse.net4j.internal.util.bundle.OSGiBundle;
-import org.eclipse.net4j.util.om.OMLogHandler;
-import org.eclipse.net4j.util.om.OMLogger;
-import org.eclipse.net4j.util.om.OMLogger.Level;
-import org.eclipse.net4j.util.om.trace.ContextTracer;
+import org.eclipse.net4j.internal.util.om.trace.ContextTracer;
+import org.eclipse.net4j.util.om.log.OMLogHandler;
+import org.eclipse.net4j.util.om.log.OMLogger;
+import org.eclipse.net4j.util.om.log.OMLogger.Level;
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceReference;
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/log/PrintLogHandler.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/log/PrintLogHandler.java
index 6387ea4..0c14ed8 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/log/PrintLogHandler.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/log/PrintLogHandler.java
@@ -8,12 +8,12 @@
* Contributors:
* Eike Stepper - initial API and implementation
**************************************************************************/
-package org.eclipse.net4j.util.om.log;
+package org.eclipse.net4j.internal.util.om.log;
-import org.eclipse.net4j.util.IOUtil;
-import org.eclipse.net4j.util.om.OMLogHandler;
-import org.eclipse.net4j.util.om.OMLogger;
-import org.eclipse.net4j.util.om.OMLogger.Level;
+import org.eclipse.net4j.util.io.IOUtil;
+import org.eclipse.net4j.util.om.log.OMLogHandler;
+import org.eclipse.net4j.util.om.log.OMLogger;
+import org.eclipse.net4j.util.om.log.OMLogger.Level;
import java.io.PrintStream;
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/pref/BooleanPreference.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/pref/BooleanPreference.java
new file mode 100644
index 0000000..7aa3769
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/pref/BooleanPreference.java
@@ -0,0 +1,41 @@
+/***************************************************************************
+ * Copyright (c) 2004 - 2007 Eike Stepper, Germany.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Eike Stepper - initial API and implementation
+ **************************************************************************/
+package org.eclipse.net4j.internal.util.om.pref;
+
+import org.eclipse.net4j.util.om.pref.OMPreference;
+
+/**
+ * @author Eike Stepper
+ */
+public final class BooleanPreference extends Preference<Boolean> implements OMPreference<Boolean>
+{
+ public BooleanPreference(Preferences preferences, String name, Boolean defaultValue)
+ {
+ super(preferences, name, defaultValue);
+ }
+
+ @Override
+ protected String getString()
+ {
+ return Boolean.toString(getValue());
+ }
+
+ @Override
+ protected Boolean convert(String value)
+ {
+ return Boolean.parseBoolean(value);
+ }
+
+ public Type getType()
+ {
+ return Type.BOOLEAN;
+ }
+}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/pref/DoublePreference.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/pref/DoublePreference.java
new file mode 100644
index 0000000..c9d3526
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/pref/DoublePreference.java
@@ -0,0 +1,41 @@
+/***************************************************************************
+ * Copyright (c) 2004 - 2007 Eike Stepper, Germany.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Eike Stepper - initial API and implementation
+ **************************************************************************/
+package org.eclipse.net4j.internal.util.om.pref;
+
+import org.eclipse.net4j.util.om.pref.OMPreference;
+
+/**
+ * @author Eike Stepper
+ */
+public final class DoublePreference extends Preference<Double> implements OMPreference<Double>
+{
+ public DoublePreference(Preferences preferences, String name, Double defaultValue)
+ {
+ super(preferences, name, defaultValue);
+ }
+
+ @Override
+ protected String getString()
+ {
+ return Double.toString(getValue());
+ }
+
+ @Override
+ protected Double convert(String value)
+ {
+ return Double.parseDouble(value);
+ }
+
+ public Type getType()
+ {
+ return Type.DOUBLE;
+ }
+}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/pref/FloatPreference.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/pref/FloatPreference.java
new file mode 100644
index 0000000..dabea4d
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/pref/FloatPreference.java
@@ -0,0 +1,41 @@
+/***************************************************************************
+ * Copyright (c) 2004 - 2007 Eike Stepper, Germany.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Eike Stepper - initial API and implementation
+ **************************************************************************/
+package org.eclipse.net4j.internal.util.om.pref;
+
+import org.eclipse.net4j.util.om.pref.OMPreference;
+
+/**
+ * @author Eike Stepper
+ */
+public final class FloatPreference extends Preference<Float> implements OMPreference<Float>
+{
+ public FloatPreference(Preferences preferences, String name, Float defaultValue)
+ {
+ super(preferences, name, defaultValue);
+ }
+
+ @Override
+ protected String getString()
+ {
+ return Float.toString(getValue());
+ }
+
+ @Override
+ protected Float convert(String value)
+ {
+ return Float.parseFloat(value);
+ }
+
+ public Type getType()
+ {
+ return Type.FLOAT;
+ }
+}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/pref/IntegerPreference.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/pref/IntegerPreference.java
new file mode 100644
index 0000000..b7f7228
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/pref/IntegerPreference.java
@@ -0,0 +1,41 @@
+/***************************************************************************
+ * Copyright (c) 2004 - 2007 Eike Stepper, Germany.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Eike Stepper - initial API and implementation
+ **************************************************************************/
+package org.eclipse.net4j.internal.util.om.pref;
+
+import org.eclipse.net4j.util.om.pref.OMPreference;
+
+/**
+ * @author Eike Stepper
+ */
+public final class IntegerPreference extends Preference<Integer> implements OMPreference<Integer>
+{
+ public IntegerPreference(Preferences preferences, String name, Integer defaultValue)
+ {
+ super(preferences, name, defaultValue);
+ }
+
+ @Override
+ protected String getString()
+ {
+ return Integer.toString(getValue());
+ }
+
+ @Override
+ protected Integer convert(String value)
+ {
+ return Integer.parseInt(value);
+ }
+
+ public Type getType()
+ {
+ return Type.INTEGER;
+ }
+}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/pref/LongPreference.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/pref/LongPreference.java
new file mode 100644
index 0000000..97bc83c
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/pref/LongPreference.java
@@ -0,0 +1,41 @@
+/***************************************************************************
+ * Copyright (c) 2004 - 2007 Eike Stepper, Germany.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Eike Stepper - initial API and implementation
+ **************************************************************************/
+package org.eclipse.net4j.internal.util.om.pref;
+
+import org.eclipse.net4j.util.om.pref.OMPreference;
+
+/**
+ * @author Eike Stepper
+ */
+public final class LongPreference extends Preference<Long> implements OMPreference<Long>
+{
+ public LongPreference(Preferences preferences, String name, Long defaultValue)
+ {
+ super(preferences, name, defaultValue);
+ }
+
+ @Override
+ protected String getString()
+ {
+ return Long.toString(getValue());
+ }
+
+ @Override
+ protected Long convert(String value)
+ {
+ return Long.parseLong(value);
+ }
+
+ public Type getType()
+ {
+ return Type.LONG;
+ }
+}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/pref/Preference.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/pref/Preference.java
new file mode 100644
index 0000000..411e66d
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/pref/Preference.java
@@ -0,0 +1,114 @@
+/***************************************************************************
+ * Copyright (c) 2004 - 2007 Eike Stepper, Germany.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Eike Stepper - initial API and implementation
+ **************************************************************************/
+package org.eclipse.net4j.internal.util.om.pref;
+
+import org.eclipse.net4j.util.ObjectUtil;
+import org.eclipse.net4j.util.om.pref.OMPreference;
+
+/**
+ * @author Eike Stepper
+ */
+public abstract class Preference<T> implements OMPreference<T>
+{
+ private Preferences preferences;
+
+ private String name;
+
+ private T defaultValue;
+
+ private T value;
+
+ public Preference(Preferences preferences, String name, T defaultValue)
+ {
+ if (defaultValue == null)
+ {
+ throw new IllegalArgumentException("defaultValue == null");
+ }
+
+ this.preferences = preferences;
+ this.name = name;
+ this.defaultValue = defaultValue;
+ }
+
+ public Preferences getPreferences()
+ {
+ return preferences;
+ }
+
+ public String getName()
+ {
+ return name;
+ }
+
+ public T getDefaultValue()
+ {
+ return defaultValue;
+ }
+
+ public T getValue()
+ {
+ load();
+ return value;
+ }
+
+ public T setValue(T value)
+ {
+ if (value == null)
+ {
+ throw new IllegalArgumentException("value == null");
+ }
+
+ load();
+ T oldValue = this.value;
+ if (!equals(oldValue, value))
+ {
+ if (equals(defaultValue, value))
+ {
+ value = defaultValue;
+ }
+
+ this.value = value;
+ preferences.fireChangeEvent(this, oldValue, value);
+ return oldValue;
+ }
+
+ return null;
+ }
+
+ public boolean isSet()
+ {
+ return !equals(defaultValue, value);
+ }
+
+ public T unSet()
+ {
+ return setValue(defaultValue);
+ }
+
+ protected boolean equals(T v1, T v2)
+ {
+ return ObjectUtil.equals(v1, v2);
+ }
+
+ protected void init(String value)
+ {
+ this.value = convert(value);
+ }
+
+ protected abstract T convert(String value);
+
+ protected abstract String getString();
+
+ private void load()
+ {
+ preferences.load();
+ }
+}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/pref/Preferences.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/pref/Preferences.java
new file mode 100644
index 0000000..1781aff
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/pref/Preferences.java
@@ -0,0 +1,223 @@
+/***************************************************************************
+ * Copyright (c) 2004 - 2007 Eike Stepper, Germany.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Eike Stepper - initial API and implementation
+ **************************************************************************/
+package org.eclipse.net4j.internal.util.om.pref;
+
+import org.eclipse.net4j.internal.util.bundle.AbstractOMBundle;
+import org.eclipse.net4j.internal.util.event.Notifier;
+import org.eclipse.net4j.util.io.IORunnable;
+import org.eclipse.net4j.util.io.IORuntimeException;
+import org.eclipse.net4j.util.io.IOUtil;
+import org.eclipse.net4j.util.om.pref.OMPreference;
+import org.eclipse.net4j.util.om.pref.OMPreferences;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Properties;
+
+/**
+ * @author Eike Stepper
+ */
+public class Preferences extends Notifier implements OMPreferences
+{
+ public static final boolean DEFAULT_BOOLEAN = false;
+
+ public static final int DEFAULT_INTEGER = 0;
+
+ public static final long DEFAULT_LONG = 0L;
+
+ public static final float DEFAULT_FLOAT = 0.0f;
+
+ public static final double DEFAULT_DOUBLE = 0.0d;
+
+ public static final String DEFAULT_STRING = "";
+
+ private AbstractOMBundle bundle;
+
+ private Map<String, Preference> prefs = new HashMap();
+
+ private boolean loaded;
+
+ private boolean dirty;
+
+ public Preferences(AbstractOMBundle bundle)
+ {
+ this.bundle = bundle;
+ load();
+ }
+
+ public AbstractOMBundle getBundle()
+ {
+ return bundle;
+ }
+
+ public synchronized void load()
+ {
+ if (!loaded)
+ {
+ loaded = true;
+ File file = getFile();
+ if (file.exists())
+ {
+ final Properties properties = new Properties();
+ IOUtil.input(file, new IORunnable<FileInputStream>()
+ {
+ public void run(FileInputStream io) throws IOException
+ {
+ properties.load(io);
+ }
+ });
+
+ for (Preference preference : prefs.values())
+ {
+ String name = preference.getName();
+ String property = properties.getProperty(name);
+ if (property != null)
+ {
+ preference.init(property);
+ }
+ }
+ }
+ }
+ }
+
+ public synchronized void save()
+ {
+ if (dirty)
+ {
+ final Properties properties = new Properties();
+ File file = getFile();
+ IOUtil.output(file, new IORunnable<FileOutputStream>()
+ {
+ public void run(FileOutputStream io) throws IOException
+ {
+ properties.store(io, "Preferences of " + bundle.getBundleID());
+ }
+ });
+
+ dirty = false;
+ }
+ }
+
+ public boolean isDirty()
+ {
+ return dirty;
+ }
+
+ public OMPreference<Boolean> init(String name, boolean defaultValue)
+ {
+ return new BooleanPreference(this, name, defaultValue);
+ }
+
+ public OMPreference<Integer> init(String name, int defaultValue)
+ {
+ return new IntegerPreference(this, name, defaultValue);
+ }
+
+ public OMPreference<Long> init(String name, long defaultValue)
+ {
+ return new LongPreference(this, name, defaultValue);
+ }
+
+ public OMPreference<Float> init(String name, float defaultValue)
+ {
+ return new FloatPreference(this, name, defaultValue);
+ }
+
+ public OMPreference<Double> init(String name, double defaultValue)
+ {
+ return new DoublePreference(this, name, defaultValue);
+ }
+
+ public OMPreference<String> init(String name, String defaultValue)
+ {
+ return new StringPreference(this, name, defaultValue);
+ }
+
+ public OMPreference<Boolean> initBoolean(String name)
+ {
+ return new BooleanPreference(this, name, DEFAULT_BOOLEAN);
+ }
+
+ public OMPreference<Integer> initInteger(String name)
+ {
+ return new IntegerPreference(this, name, DEFAULT_INTEGER);
+ }
+
+ public OMPreference<Long> initLong(String name)
+ {
+ return new LongPreference(this, name, DEFAULT_LONG);
+ }
+
+ public OMPreference<Float> initFloat(String name)
+ {
+ return new FloatPreference(this, name, DEFAULT_FLOAT);
+ }
+
+ public OMPreference<Double> initDouble(String name)
+ {
+ return new DoublePreference(this, name, DEFAULT_DOUBLE);
+ }
+
+ public OMPreference<String> initString(String name)
+ {
+ return new StringPreference(this, name, DEFAULT_STRING);
+ }
+
+ public OMPreference<Boolean> getBoolean(String name)
+ {
+ return null;
+ }
+
+ public OMPreference<Integer> getInteger(String name)
+ {
+ return null;
+ }
+
+ public OMPreference<Long> getLong(String name)
+ {
+ return null;
+ }
+
+ public OMPreference<Float> getFloat(String name)
+ {
+ return null;
+ }
+
+ public OMPreference<Double> getDouble(String name)
+ {
+ return null;
+ }
+
+ public OMPreference<String> getString(String name)
+ {
+ return null;
+ }
+
+ public <T> void fireChangeEvent(Preference<T> preference, T oldValue, T newValue)
+ {
+ fireEvent(new PreferencesChangeEvent<T>(preference, oldValue, newValue));
+ }
+
+ private File getFile()
+ {
+ File file = new File(bundle.getStateLocation(), ".prefs");
+ if (!file.isFile())
+ {
+ throw new IORuntimeException("Not a file: " + file.getAbsolutePath());
+ }
+
+ return file;
+ }
+}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/pref/PreferencesChangeEvent.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/pref/PreferencesChangeEvent.java
new file mode 100644
index 0000000..db2c6ec
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/pref/PreferencesChangeEvent.java
@@ -0,0 +1,47 @@
+package org.eclipse.net4j.internal.util.om.pref;
+
+import org.eclipse.net4j.internal.util.event.Event;
+import org.eclipse.net4j.util.om.pref.OMPreferencesChangeEvent;
+
+/**
+ * @author Eike Stepper
+ */
+public final class PreferencesChangeEvent<T> extends Event implements OMPreferencesChangeEvent<T>
+{
+ private static final long serialVersionUID = 1L;
+
+ private Preference<T> preference;
+
+ private T oldValue;
+
+ private T newValue;
+
+ public PreferencesChangeEvent(Preference<T> preference, T oldValue, T newValue)
+ {
+ super(preference.getPreferences());
+ this.preference = preference;
+ this.oldValue = oldValue;
+ this.newValue = newValue;
+ }
+
+ @Override
+ public Preferences getSource()
+ {
+ return (Preferences)super.getSource();
+ }
+
+ public Preference<T> getPreference()
+ {
+ return preference;
+ }
+
+ public T getOldValue()
+ {
+ return oldValue;
+ }
+
+ public T getNewValue()
+ {
+ return newValue;
+ }
+} \ No newline at end of file
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/pref/StringPreference.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/pref/StringPreference.java
new file mode 100644
index 0000000..4d86a1f
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/pref/StringPreference.java
@@ -0,0 +1,41 @@
+/***************************************************************************
+ * Copyright (c) 2004 - 2007 Eike Stepper, Germany.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Eike Stepper - initial API and implementation
+ **************************************************************************/
+package org.eclipse.net4j.internal.util.om.pref;
+
+import org.eclipse.net4j.util.om.pref.OMPreference;
+
+/**
+ * @author Eike Stepper
+ */
+public final class StringPreference extends Preference<String> implements OMPreference<String>
+{
+ public StringPreference(Preferences preferences, String name, String defaultValue)
+ {
+ super(preferences, name, defaultValue);
+ }
+
+ @Override
+ protected String getString()
+ {
+ return getValue();
+ }
+
+ @Override
+ protected String convert(String value)
+ {
+ return value;
+ }
+
+ public Type getType()
+ {
+ return Type.STRING;
+ }
+}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/trace/ContextTracer.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/trace/ContextTracer.java
index 7f9b9e2..7a35272 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/trace/ContextTracer.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/trace/ContextTracer.java
@@ -8,10 +8,10 @@
* Contributors:
* Eike Stepper - initial API and implementation
**************************************************************************/
-package org.eclipse.net4j.util.om.trace;
+package org.eclipse.net4j.internal.util.om.trace;
import org.eclipse.net4j.util.om.OMBundle;
-import org.eclipse.net4j.util.om.OMTracer;
+import org.eclipse.net4j.util.om.trace.OMTracer;
/**
* @author Eike Stepper
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/trace/PrintTraceHandler.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/trace/PrintTraceHandler.java
index 93daa02..3b30400 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/trace/PrintTraceHandler.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/trace/PrintTraceHandler.java
@@ -8,11 +8,12 @@
* Contributors:
* Eike Stepper - initial API and implementation
**************************************************************************/
-package org.eclipse.net4j.util.om.trace;
+package org.eclipse.net4j.internal.util.om.trace;
-import org.eclipse.net4j.util.IOUtil;
-import org.eclipse.net4j.util.om.OMTraceHandler;
-import org.eclipse.net4j.util.om.OMTracer;
+import org.eclipse.net4j.util.io.IOUtil;
+import org.eclipse.net4j.util.om.trace.OMTraceHandler;
+import org.eclipse.net4j.util.om.trace.OMTraceHandlerEvent;
+import org.eclipse.net4j.util.om.trace.OMTracer;
import java.io.PrintStream;
import java.text.MessageFormat;
@@ -76,7 +77,7 @@ public class PrintTraceHandler implements OMTraceHandler
this.shortContext = shortContext;
}
- public void traced(Event event)
+ public void traced(OMTraceHandlerEvent event)
{
String line = pattern == null ? format(shortContext, event) : format(pattern, event);
stream.println(line);
@@ -86,7 +87,7 @@ public class PrintTraceHandler implements OMTraceHandler
}
}
- public static String format(boolean shortContext, Event event)
+ public static String format(boolean shortContext, OMTraceHandlerEvent event)
{
Class context = event.getContext();
String contextName = shortContext ? context.getSimpleName() : context.getName();
@@ -109,7 +110,7 @@ public class PrintTraceHandler implements OMTraceHandler
* <li>{9} --> Thread.State <b>threadState</b><br>
* </ul>
*/
- public static String format(String pattern, Event event)
+ public static String format(String pattern, OMTraceHandlerEvent event)
{
final OMTracer tracer = event.getTracer();
final String tracerName = tracer.getFullName();
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/trace/RemoteTraceHandler.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/trace/RemoteTraceHandler.java
index 3246eb5..76c4843 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/trace/RemoteTraceHandler.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/trace/RemoteTraceHandler.java
@@ -8,10 +8,11 @@
* Contributors:
* Eike Stepper - initial API and implementation
**************************************************************************/
-package org.eclipse.net4j.util.om.trace;
+package org.eclipse.net4j.internal.util.om.trace;
-import org.eclipse.net4j.util.IOUtil;
-import org.eclipse.net4j.util.om.OMTraceHandler;
+import org.eclipse.net4j.util.io.IOUtil;
+import org.eclipse.net4j.util.om.trace.OMTraceHandler;
+import org.eclipse.net4j.util.om.trace.OMTraceHandlerEvent;
import java.io.DataOutputStream;
import java.io.IOException;
@@ -75,7 +76,7 @@ public class RemoteTraceHandler implements OMTraceHandler
}
}
- public void traced(Event event)
+ public void traced(OMTraceHandlerEvent event)
{
try
{
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/trace/RemoteTraceServer.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/trace/RemoteTraceServer.java
index 095aa6e..e506e99 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/trace/RemoteTraceServer.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/trace/RemoteTraceServer.java
@@ -8,9 +8,9 @@
* Contributors:
* Eike Stepper - initial API and implementation
**************************************************************************/
-package org.eclipse.net4j.util.om.trace;
+package org.eclipse.net4j.internal.util.om.trace;
-import org.eclipse.net4j.util.IOUtil;
+import org.eclipse.net4j.util.io.IOUtil;
import java.io.DataInputStream;
import java.io.IOException;
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/bundle/OMTraceHandlerEventImpl.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/trace/TraceHandlerEvent.java
index 6eae514..83b2c45 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/bundle/OMTraceHandlerEventImpl.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/trace/TraceHandlerEvent.java
@@ -8,17 +8,17 @@
* Contributors:
* Eike Stepper - initial API and implementation
**************************************************************************/
-package org.eclipse.net4j.internal.util.bundle;
+package org.eclipse.net4j.internal.util.om.trace;
-import org.eclipse.net4j.util.om.OMTraceHandler;
-import org.eclipse.net4j.util.om.OMTracer;
+import org.eclipse.net4j.util.om.trace.OMTraceHandlerEvent;
+import org.eclipse.net4j.util.om.trace.OMTracer;
import java.io.Serializable;
/**
* @author Eike Stepper
*/
-public class OMTraceHandlerEventImpl implements OMTraceHandler.Event, Serializable
+public class TraceHandlerEvent implements OMTraceHandlerEvent, Serializable
{
private static final long serialVersionUID = 1L;
@@ -32,7 +32,7 @@ public class OMTraceHandlerEventImpl implements OMTraceHandler.Event, Serializab
protected Throwable throwable;
- public OMTraceHandlerEventImpl(OMTracer tracer, Class context, String message, Throwable throwable)
+ public TraceHandlerEvent(OMTracer tracer, Class context, String message, Throwable throwable)
{
if (tracer == null)
{
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/bundle/OMTracerImpl.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/trace/Tracer.java
index c5c29f2..d3ec1c9 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/bundle/OMTracerImpl.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/trace/Tracer.java
@@ -8,35 +8,36 @@
* Contributors:
* Eike Stepper - initial API and implementation
**************************************************************************/
-package org.eclipse.net4j.internal.util.bundle;
+package org.eclipse.net4j.internal.util.om.trace;
+import org.eclipse.net4j.internal.util.bundle.AbstractOMPlatform;
import org.eclipse.net4j.util.om.OMBundle;
-import org.eclipse.net4j.util.om.OMTracer;
-import org.eclipse.net4j.util.om.OMTraceHandler.Event;
+import org.eclipse.net4j.util.om.trace.OMTraceHandlerEvent;
+import org.eclipse.net4j.util.om.trace.OMTracer;
import java.text.MessageFormat;
/**
* @author Eike Stepper
*/
-public class OMTracerImpl implements OMTracer
+public class Tracer implements OMTracer
{
private OMBundle bundle;
- private OMTracerImpl parent;
+ private Tracer parent;
private String name;
private String fullName;
- public OMTracerImpl(OMBundle bundle, String name)
+ public Tracer(OMBundle bundle, String name)
{
this.bundle = bundle;
this.name = name;
fullName = name;
}
- private OMTracerImpl(OMTracerImpl parent, String name)
+ private Tracer(Tracer parent, String name)
{
this.bundle = parent.getBundle();
this.parent = parent;
@@ -74,41 +75,41 @@ public class OMTracerImpl implements OMTracer
bundle.setDebugOption(fullName, enabled);
}
- public void trace(Event event)
+ public void trace(OMTraceHandlerEvent event)
{
((AbstractOMPlatform)bundle.getPlatform()).trace(event);
}
- public Event trace(Class context, String msg, Throwable t)
+ public OMTraceHandlerEvent trace(Class context, String msg, Throwable t)
{
- Event event = new OMTraceHandlerEventImpl(this, context, msg, t);
+ OMTraceHandlerEvent event = new TraceHandlerEvent(this, context, msg, t);
trace(event);
return event;
}
- public Event format(Class context, String pattern, Throwable t, Object... args)
+ public OMTraceHandlerEvent format(Class context, String pattern, Throwable t, Object... args)
{
String msg = MessageFormat.format(pattern, args);
return trace(context, msg, t);
}
- public Event format(Class context, String pattern, Object... args)
+ public OMTraceHandlerEvent format(Class context, String pattern, Object... args)
{
return format(context, pattern, (Throwable)null, args);
}
- public Event trace(Class context, String msg)
+ public OMTraceHandlerEvent trace(Class context, String msg)
{
return trace(context, msg, (Throwable)null);
}
- public Event trace(Class context, Throwable t)
+ public OMTraceHandlerEvent trace(Class context, Throwable t)
{
return trace(context, (String)null, t);
}
public OMTracer tracer(String name)
{
- return new OMTracerImpl(this, name);
+ return new Tracer(this, name);
}
}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/IOUtil.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/IOUtil.java
deleted file mode 100644
index 13f2f28..0000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/IOUtil.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2007 Eike Stepper, Germany.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Eike Stepper - initial API and implementation
- **************************************************************************/
-package org.eclipse.net4j.util;
-
-import java.io.Closeable;
-import java.io.InputStream;
-import java.io.PrintStream;
-
-/**
- * @author Eike Stepper
- */
-public final class IOUtil
-{
- private static final InputStream IN = System.in;
-
- private static final PrintStream OUT = System.out;
-
- private static final PrintStream ERR = System.err;
-
- private IOUtil()
- {
- }
-
- public static InputStream IN()
- {
- return IN;
- }
-
- public static PrintStream OUT()
- {
- return OUT;
- }
-
- public static PrintStream ERR()
- {
- return ERR;
- }
-
- public static void print(Throwable t, PrintStream stream)
- {
- t.printStackTrace(stream);
- }
-
- public static void print(Throwable t)
- {
- print(t, ERR);
- }
-
- public static Exception closeSilent(Closeable closeable)
- {
- try
- {
- if (closeable != null)
- {
- closeable.close();
- }
-
- return null;
- }
- catch (Exception ex)
- {
- return ex;
- }
- }
-}
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 20efea2..e4a52f8 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
@@ -12,6 +12,7 @@ package org.eclipse.net4j.util;
import org.eclipse.net4j.internal.util.bundle.OM;
import org.eclipse.net4j.internal.util.lifecycle.Lifecycle;
+import org.eclipse.net4j.util.io.IOUtil;
import java.io.PrintStream;
import java.lang.annotation.ElementType;
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/stream/ExtendedDataInput.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/ExtendedDataInput.java
index 0756e82..9761694 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/stream/ExtendedDataInput.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/ExtendedDataInput.java
@@ -8,7 +8,7 @@
* Contributors:
* Eike Stepper - initial API and implementation
**************************************************************************/
-package org.eclipse.net4j.util.stream;
+package org.eclipse.net4j.util.io;
import java.io.DataInput;
import java.io.IOException;
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/stream/ExtendedDataInputStream.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/ExtendedDataInputStream.java
index 1e581ce..16ee7d3 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/stream/ExtendedDataInputStream.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/ExtendedDataInputStream.java
@@ -8,7 +8,7 @@
* Contributors:
* Eike Stepper - initial API and implementation
**************************************************************************/
-package org.eclipse.net4j.util.stream;
+package org.eclipse.net4j.util.io;
import java.io.DataInputStream;
import java.io.IOException;
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/stream/ExtendedDataOutput.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/ExtendedDataOutput.java
index b310e09..5adac4e 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/stream/ExtendedDataOutput.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/ExtendedDataOutput.java
@@ -8,7 +8,7 @@
* Contributors:
* Eike Stepper - initial API and implementation
**************************************************************************/
-package org.eclipse.net4j.util.stream;
+package org.eclipse.net4j.util.io;
import java.io.DataOutput;
import java.io.IOException;
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/stream/ExtendedDataOutputStream.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/ExtendedDataOutputStream.java
index bca0b17..5ea1abc 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/stream/ExtendedDataOutputStream.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/ExtendedDataOutputStream.java
@@ -8,7 +8,7 @@
* Contributors:
* Eike Stepper - initial API and implementation
**************************************************************************/
-package org.eclipse.net4j.util.stream;
+package org.eclipse.net4j.util.io;
import java.io.DataOutputStream;
import java.io.IOException;
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/IORunnable.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/IORunnable.java
new file mode 100644
index 0000000..960ba92
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/IORunnable.java
@@ -0,0 +1,12 @@
+package org.eclipse.net4j.util.io;
+
+import java.io.Closeable;
+import java.io.IOException;
+
+/**
+ * @author Eike Stepper
+ */
+public interface IORunnable<IO extends Closeable>
+{
+ public void run(IO io) throws IOException;
+} \ No newline at end of file
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/IORuntimeException.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/IORuntimeException.java
new file mode 100644
index 0000000..b047fa8
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/IORuntimeException.java
@@ -0,0 +1,28 @@
+package org.eclipse.net4j.util.io;
+
+/**
+ * @author Eike Stepper
+ */
+public class IORuntimeException extends RuntimeException
+{
+ private static final long serialVersionUID = 1L;
+
+ public IORuntimeException()
+ {
+ }
+
+ public IORuntimeException(String message)
+ {
+ super(message);
+ }
+
+ public IORuntimeException(Throwable cause)
+ {
+ super(cause);
+ }
+
+ public IORuntimeException(String message, Throwable cause)
+ {
+ super(message, cause);
+ }
+} \ No newline at end of file
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/IOUtil.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/IOUtil.java
new file mode 100644
index 0000000..e9f3785
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/IOUtil.java
@@ -0,0 +1,162 @@
+/***************************************************************************
+ * Copyright (c) 2004 - 2007 Eike Stepper, Germany.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Eike Stepper - initial API and implementation
+ **************************************************************************/
+package org.eclipse.net4j.util.io;
+
+import java.io.Closeable;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.FileReader;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.PrintStream;
+
+/**
+ * @author Eike Stepper
+ */
+public final class IOUtil
+{
+ private static final InputStream IN = System.in;
+
+ private static final PrintStream OUT = System.out;
+
+ private static final PrintStream ERR = System.err;
+
+ private IOUtil()
+ {
+ }
+
+ public static InputStream IN()
+ {
+ return IN;
+ }
+
+ public static PrintStream OUT()
+ {
+ return OUT;
+ }
+
+ public static PrintStream ERR()
+ {
+ return ERR;
+ }
+
+ public static void print(Throwable t, PrintStream stream)
+ {
+ t.printStackTrace(stream);
+ }
+
+ public static void print(Throwable t)
+ {
+ print(t, ERR);
+ }
+
+ public static IOException closeSilent(Closeable closeable)
+ {
+ try
+ {
+ if (closeable != null)
+ {
+ closeable.close();
+ }
+
+ return null;
+ }
+ catch (IOException ex)
+ {
+ return ex;
+ }
+ }
+
+ public static void close(Closeable closeable) throws IORuntimeException
+ {
+ try
+ {
+ if (closeable != null)
+ {
+ closeable.close();
+ }
+ }
+ catch (IOException ex)
+ {
+ throw new IORuntimeException(ex);
+ }
+ }
+
+ public static void run(Closeable io, IORunnable runnable) throws IORuntimeException
+ {
+ try
+ {
+ runnable.run(io);
+ }
+ catch (IOException ex)
+ {
+ throw new IORuntimeException(ex);
+ }
+ finally
+ {
+ close(io);
+ }
+ }
+
+ public static void read(File file, IORunnable<FileReader> runnable) throws IORuntimeException
+ {
+ try
+ {
+ FileReader io = new FileReader(file);
+ run(io, runnable);
+ }
+ catch (IOException ex)
+ {
+ throw new IORuntimeException(ex);
+ }
+ }
+
+ public static void write(File file, IORunnable<FileWriter> runnable) throws IORuntimeException
+ {
+ try
+ {
+ FileWriter io = new FileWriter(file);
+ run(io, runnable);
+ }
+ catch (IOException ex)
+ {
+ throw new IORuntimeException(ex);
+ }
+ }
+
+ public static void input(File file, IORunnable<FileInputStream> runnable) throws IORuntimeException
+ {
+ try
+ {
+ FileInputStream io = new FileInputStream(file);
+ run(io, runnable);
+ }
+ catch (IOException ex)
+ {
+ throw new IORuntimeException(ex);
+ }
+ }
+
+ public static void output(File file, IORunnable<FileOutputStream> runnable) throws IORuntimeException
+ {
+ try
+ {
+ FileOutputStream io = new FileOutputStream(file);
+ run(io, runnable);
+ }
+ catch (IOException ex)
+ {
+ throw new IORuntimeException(ex);
+ }
+ }
+}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/stream/package.html b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/package.html
index fa9ab6f..fa9ab6f 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/stream/package.html
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/package.html
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/lifecycle/LifecycleUtil.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/lifecycle/LifecycleUtil.java
index ca53837..ed0d540 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/lifecycle/LifecycleUtil.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/lifecycle/LifecycleUtil.java
@@ -12,7 +12,7 @@ package org.eclipse.net4j.util.lifecycle;
import org.eclipse.net4j.internal.util.bundle.OM;
import org.eclipse.net4j.internal.util.lifecycle.Lifecycle;
-import org.eclipse.net4j.util.om.trace.ContextTracer;
+import org.eclipse.net4j.internal.util.om.trace.ContextTracer;
import java.lang.annotation.Annotation;
import java.lang.annotation.ElementType;
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/LegacyUtil.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/LegacyUtil.java
new file mode 100644
index 0000000..27f32f4
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/LegacyUtil.java
@@ -0,0 +1,35 @@
+/***************************************************************************
+ * Copyright (c) 2004 - 2007 Eike Stepper, Germany.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Eike Stepper - initial API and implementation
+ **************************************************************************/
+package org.eclipse.net4j.util.om;
+
+import org.eclipse.net4j.internal.util.bundle.LegacyPlatform;
+
+/**
+ * @author Eike Stepper
+ */
+public final class LegacyUtil
+{
+ private LegacyUtil()
+ {
+ }
+
+ public static void startPlatform()
+ {
+ LegacyPlatform platform = (LegacyPlatform)OMPlatform.INSTANCE;
+ platform.start();
+ }
+
+ public static void stopPlatform()
+ {
+ LegacyPlatform platform = (LegacyPlatform)OMPlatform.INSTANCE;
+ platform.stop();
+ }
+}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/OMBundle.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/OMBundle.java
index 12501ba..07d6632 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/OMBundle.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/OMBundle.java
@@ -10,6 +10,10 @@
**************************************************************************/
package org.eclipse.net4j.util.om;
+import org.eclipse.net4j.util.om.log.OMLogger;
+import org.eclipse.net4j.util.om.pref.OMPreferences;
+import org.eclipse.net4j.util.om.trace.OMTracer;
+
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
@@ -57,6 +61,8 @@ public interface OMBundle
public String getStateLocation();
+ public OMPreferences preferences();
+
public InputStream getInputStream(String path) throws IOException;
/**
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/OMPlatform.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/OMPlatform.java
index 021e96f..412f61d 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/OMPlatform.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/OMPlatform.java
@@ -11,6 +11,8 @@
package org.eclipse.net4j.util.om;
import org.eclipse.net4j.internal.util.bundle.AbstractOMPlatform;
+import org.eclipse.net4j.util.om.log.OMLogHandler;
+import org.eclipse.net4j.util.om.trace.OMTraceHandler;
import java.io.File;
import java.util.Properties;
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/OSGiActivator.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/OSGiActivator.java
index bdd44af..ec5f051 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/OSGiActivator.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/OSGiActivator.java
@@ -8,10 +8,9 @@
* Contributors:
* Eike Stepper - initial API and implementation
**************************************************************************/
-package org.eclipse.net4j.internal.util.om;
+package org.eclipse.net4j.util.om;
import org.eclipse.net4j.internal.util.bundle.OM;
-import org.eclipse.net4j.util.om.OMBundle;
import org.osgi.framework.BundleActivator;
import org.osgi.framework.BundleContext;
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/OMLogHandler.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/log/OMLogHandler.java
index 452643f..75b2665 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/OMLogHandler.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/log/OMLogHandler.java
@@ -8,9 +8,9 @@
* Contributors:
* Eike Stepper - initial API and implementation
**************************************************************************/
-package org.eclipse.net4j.util.om;
+package org.eclipse.net4j.util.om.log;
-import org.eclipse.net4j.util.om.OMLogger.Level;
+import org.eclipse.net4j.util.om.log.OMLogger.Level;
/**
* @author Eike Stepper
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/OMLogger.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/log/OMLogger.java
index 7453263..1f1b873 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/OMLogger.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/log/OMLogger.java
@@ -8,7 +8,9 @@
* Contributors:
* Eike Stepper - initial API and implementation
**************************************************************************/
-package org.eclipse.net4j.util.om;
+package org.eclipse.net4j.util.om.log;
+
+import org.eclipse.net4j.util.om.OMBundle;
/**
* @author Eike Stepper
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/pref/OMPreference.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/pref/OMPreference.java
new file mode 100644
index 0000000..8ed80a2
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/pref/OMPreference.java
@@ -0,0 +1,41 @@
+/***************************************************************************
+ * Copyright (c) 2004 - 2007 Eike Stepper, Germany.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Eike Stepper - initial API and implementation
+ **************************************************************************/
+package org.eclipse.net4j.util.om.pref;
+
+/**
+ * @author Eike Stepper
+ */
+public interface OMPreference<T>
+{
+ public OMPreferences getPreferences();
+
+ public String getName();
+
+ public Type getType();
+
+ public T getDefaultValue();
+
+ public T getValue();
+
+ public T setValue(T value);
+
+ public T unSet();
+
+ public boolean isSet();
+
+ /**
+ * @author Eike Stepper
+ */
+ public enum Type
+ {
+ BOOLEAN, INTEGER, LONG, FLOAT, DOUBLE, STRING
+ }
+}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/pref/OMPreferences.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/pref/OMPreferences.java
new file mode 100644
index 0000000..5d9c8b6
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/pref/OMPreferences.java
@@ -0,0 +1,50 @@
+/***************************************************************************
+ * Copyright (c) 2004 - 2007 Eike Stepper, Germany.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Eike Stepper - initial API and implementation
+ **************************************************************************/
+package org.eclipse.net4j.util.om.pref;
+
+import org.eclipse.net4j.util.event.INotifier;
+import org.eclipse.net4j.util.om.OMBundle;
+
+/**
+ * @author Eike Stepper
+ */
+public interface OMPreferences extends INotifier
+{
+ public OMBundle getBundle();
+
+ public boolean isDirty();
+
+ public void save();
+
+ public OMPreference<Boolean> init(String name, boolean defaultValue);
+
+ public OMPreference<Integer> init(String name, int defaultValue);
+
+ public OMPreference<Long> init(String name, long defaultValue);
+
+ public OMPreference<Float> init(String name, float defaultValue);
+
+ public OMPreference<Double> init(String name, double defaultValue);
+
+ public OMPreference<String> init(String name, String defaultValue);
+
+ public OMPreference<Boolean> getBoolean(String name);
+
+ public OMPreference<Integer> getInteger(String name);
+
+ public OMPreference<Long> getLong(String name);
+
+ public OMPreference<Float> getFloat(String name);
+
+ public OMPreference<Double> getDouble(String name);
+
+ public OMPreference<String> getString(String name);
+}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/pref/OMPreferencesChangeEvent.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/pref/OMPreferencesChangeEvent.java
new file mode 100644
index 0000000..2d8bada
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/pref/OMPreferencesChangeEvent.java
@@ -0,0 +1,15 @@
+package org.eclipse.net4j.util.om.pref;
+
+import org.eclipse.net4j.util.event.IEvent;
+
+/**
+ * @author Eike Stepper
+ */
+public interface OMPreferencesChangeEvent<T> extends IEvent
+{
+ public OMPreference<T> getPreference();
+
+ public T getOldValue();
+
+ public T getNewValue();
+} \ No newline at end of file
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/OMTraceHandler.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/trace/OMTraceHandler.java
index 5d61774..305a93f 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/OMTraceHandler.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/trace/OMTraceHandler.java
@@ -8,28 +8,12 @@
* Contributors:
* Eike Stepper - initial API and implementation
**************************************************************************/
-package org.eclipse.net4j.util.om;
+package org.eclipse.net4j.util.om.trace;
/**
* @author Eike Stepper
*/
public interface OMTraceHandler
{
- public void traced(Event event);
-
- /**
- * @author Eike Stepper
- */
- public interface Event
- {
- public long getTimeStamp();
-
- public OMTracer getTracer();
-
- public Class getContext();
-
- public String getMessage();
-
- public Throwable getThrowable();
- }
+ public void traced(OMTraceHandlerEvent event);
}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/trace/OMTraceHandlerEvent.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/trace/OMTraceHandlerEvent.java
new file mode 100644
index 0000000..addd1ac
--- /dev/null
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/trace/OMTraceHandlerEvent.java
@@ -0,0 +1,17 @@
+package org.eclipse.net4j.util.om.trace;
+
+/**
+ * @author Eike Stepper
+ */
+public interface OMTraceHandlerEvent
+{
+ public long getTimeStamp();
+
+ public OMTracer getTracer();
+
+ public Class getContext();
+
+ public String getMessage();
+
+ public Throwable getThrowable();
+} \ No newline at end of file
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/OMTracer.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/trace/OMTracer.java
index 1b5a7ae..ac0a944 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/OMTracer.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/trace/OMTracer.java
@@ -8,9 +8,10 @@
* Contributors:
* Eike Stepper - initial API and implementation
**************************************************************************/
-package org.eclipse.net4j.util.om;
+package org.eclipse.net4j.util.om.trace;
+
+import org.eclipse.net4j.util.om.OMBundle;
-import org.eclipse.net4j.util.om.OMTraceHandler.Event;
/**
* @author Eike Stepper
@@ -29,17 +30,17 @@ public interface OMTracer
public void setEnabled(boolean enabled);
- public void trace(Event traceRecord);
+ public void trace(OMTraceHandlerEvent traceRecord);
- public Event format(Class context, String pattern, Object... args);
+ public OMTraceHandlerEvent format(Class context, String pattern, Object... args);
- public Event format(Class context, String pattern, Throwable t, Object... args);
+ public OMTraceHandlerEvent format(Class context, String pattern, Throwable t, Object... args);
- public Event trace(Class context, String msg, Throwable t);
+ public OMTraceHandlerEvent trace(Class context, String msg, Throwable t);
- public Event trace(Class context, String msg);
+ public OMTraceHandlerEvent trace(Class context, String msg);
- public Event trace(Class context, Throwable t);
+ public OMTraceHandlerEvent trace(Class context, Throwable t);
public OMTracer tracer(String name);
} \ No newline at end of file
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 89bf2c5..402586b 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
@@ -17,6 +17,7 @@ import org.eclipse.net4j.IConnector;
import org.eclipse.net4j.internal.util.container.LifecycleEventConverter;
import org.eclipse.net4j.internal.util.container.SingleDeltaContainerEvent;
import org.eclipse.net4j.internal.util.lifecycle.Lifecycle;
+import org.eclipse.net4j.internal.util.om.trace.ContextTracer;
import org.eclipse.net4j.util.container.IContainer;
import org.eclipse.net4j.util.container.IContainerDelta;
import org.eclipse.net4j.util.container.IContainerEvent;
@@ -25,7 +26,6 @@ import org.eclipse.net4j.util.event.IListener;
import org.eclipse.net4j.util.factory.IFactory;
import org.eclipse.net4j.util.factory.IFactoryKey;
import org.eclipse.net4j.util.lifecycle.LifecycleUtil;
-import org.eclipse.net4j.util.om.trace.ContextTracer;
import org.eclipse.net4j.util.registry.IRegistry;
import org.eclipse.internal.net4j.bundle.OM;
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 183fc1d..7670809 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
@@ -13,9 +13,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.internal.util.om.trace.ContextTracer;
import org.eclipse.net4j.util.HexUtil;
import org.eclipse.net4j.util.ReflectUtil;
-import org.eclipse.net4j.util.om.trace.ContextTracer;
import org.eclipse.internal.net4j.bundle.OM;
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 d12963b..ef83616 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
@@ -11,7 +11,7 @@
package org.eclipse.internal.net4j;
import org.eclipse.net4j.IBuffer;
-import org.eclipse.net4j.util.om.trace.ContextTracer;
+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 6c2cbad..486e877 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
@@ -13,8 +13,8 @@ package org.eclipse.internal.net4j;
import org.eclipse.net4j.IBuffer;
import org.eclipse.net4j.IBufferPool;
import org.eclipse.net4j.IBufferProvider;
+import org.eclipse.net4j.internal.util.om.trace.ContextTracer;
import org.eclipse.net4j.util.ReflectUtil.ExcludeFromDump;
-import org.eclipse.net4j.util.om.trace.ContextTracer;
import org.eclipse.internal.net4j.bundle.OM;
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 6162467..967f301 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
@@ -21,9 +21,9 @@ import org.eclipse.net4j.internal.util.Value;
import org.eclipse.net4j.internal.util.concurrent.AsynchronousWorkSerializer;
import org.eclipse.net4j.internal.util.concurrent.SynchronousWorkSerializer;
import org.eclipse.net4j.internal.util.lifecycle.Lifecycle;
+import org.eclipse.net4j.internal.util.om.trace.ContextTracer;
import org.eclipse.net4j.util.ObjectUtil;
import org.eclipse.net4j.util.concurrent.IWorkSerializer;
-import org.eclipse.net4j.util.om.trace.ContextTracer;
import org.eclipse.internal.net4j.bundle.OM;
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 8a3e8e5..42073ba 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
@@ -26,6 +26,7 @@ import org.eclipse.net4j.internal.util.container.SingleDeltaContainerEvent;
import org.eclipse.net4j.internal.util.event.Event;
import org.eclipse.net4j.internal.util.factory.FactoryKey;
import org.eclipse.net4j.internal.util.lifecycle.Lifecycle;
+import org.eclipse.net4j.internal.util.om.trace.ContextTracer;
import org.eclipse.net4j.util.StringUtil;
import org.eclipse.net4j.util.container.IContainer;
import org.eclipse.net4j.util.container.IContainerDelta;
@@ -36,7 +37,6 @@ import org.eclipse.net4j.util.event.INotifier;
import org.eclipse.net4j.util.factory.IFactory;
import org.eclipse.net4j.util.factory.IFactoryKey;
import org.eclipse.net4j.util.lifecycle.LifecycleUtil;
-import org.eclipse.net4j.util.om.trace.ContextTracer;
import org.eclipse.net4j.util.registry.IRegistry;
import org.eclipse.internal.net4j.bundle.OM;
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/bundle/OM.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/bundle/OM.java
index 2b5a5bb..f1d966f 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/bundle/OM.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/bundle/OM.java
@@ -10,11 +10,11 @@
**************************************************************************/
package org.eclipse.internal.net4j.bundle;
-import org.eclipse.net4j.internal.util.om.OSGiActivator;
import org.eclipse.net4j.util.om.OMBundle;
-import org.eclipse.net4j.util.om.OMLogger;
import org.eclipse.net4j.util.om.OMPlatform;
-import org.eclipse.net4j.util.om.OMTracer;
+import org.eclipse.net4j.util.om.OSGiActivator;
+import org.eclipse.net4j.util.om.log.OMLogger;
+import org.eclipse.net4j.util.om.trace.OMTracer;
/**
* @author Eike Stepper
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/Indication.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/Indication.java
index 347b425..ca6cf3a 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/Indication.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/Indication.java
@@ -10,11 +10,11 @@
**************************************************************************/
package org.eclipse.net4j.signal;
+import org.eclipse.net4j.internal.util.om.trace.ContextTracer;
import org.eclipse.net4j.stream.BufferInputStream;
import org.eclipse.net4j.stream.BufferOutputStream;
import org.eclipse.net4j.util.ReflectUtil;
-import org.eclipse.net4j.util.om.trace.ContextTracer;
-import org.eclipse.net4j.util.stream.ExtendedDataInputStream;
+import org.eclipse.net4j.util.io.ExtendedDataInputStream;
import org.eclipse.internal.net4j.bundle.OM;
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/IndicationWithResponse.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/IndicationWithResponse.java
index e1bdf6b..d678726 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/IndicationWithResponse.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/IndicationWithResponse.java
@@ -10,12 +10,12 @@
**************************************************************************/
package org.eclipse.net4j.signal;
+import org.eclipse.net4j.internal.util.om.trace.ContextTracer;
import org.eclipse.net4j.stream.BufferInputStream;
import org.eclipse.net4j.stream.BufferOutputStream;
import org.eclipse.net4j.util.ReflectUtil;
-import org.eclipse.net4j.util.om.trace.ContextTracer;
-import org.eclipse.net4j.util.stream.ExtendedDataInputStream;
-import org.eclipse.net4j.util.stream.ExtendedDataOutputStream;
+import org.eclipse.net4j.util.io.ExtendedDataInputStream;
+import org.eclipse.net4j.util.io.ExtendedDataOutputStream;
import org.eclipse.internal.net4j.bundle.OM;
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 5afd73b..6d4dd27 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
@@ -11,11 +11,11 @@
package org.eclipse.net4j.signal;
import org.eclipse.net4j.IChannel;
+import org.eclipse.net4j.internal.util.om.trace.ContextTracer;
import org.eclipse.net4j.stream.BufferInputStream;
import org.eclipse.net4j.stream.BufferOutputStream;
import org.eclipse.net4j.util.ReflectUtil;
-import org.eclipse.net4j.util.om.trace.ContextTracer;
-import org.eclipse.net4j.util.stream.ExtendedDataOutputStream;
+import org.eclipse.net4j.util.io.ExtendedDataOutputStream;
import org.eclipse.internal.net4j.bundle.OM;
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 db71b50..fee5017 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
@@ -11,12 +11,12 @@
package org.eclipse.net4j.signal;
import org.eclipse.net4j.IChannel;
+import org.eclipse.net4j.internal.util.om.trace.ContextTracer;
import org.eclipse.net4j.stream.BufferInputStream;
import org.eclipse.net4j.stream.BufferOutputStream;
import org.eclipse.net4j.util.ReflectUtil;
-import org.eclipse.net4j.util.om.trace.ContextTracer;
-import org.eclipse.net4j.util.stream.ExtendedDataInputStream;
-import org.eclipse.net4j.util.stream.ExtendedDataOutputStream;
+import org.eclipse.net4j.util.io.ExtendedDataInputStream;
+import org.eclipse.net4j.util.io.ExtendedDataOutputStream;
import org.eclipse.internal.net4j.bundle.OM;
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/Signal.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/Signal.java
index 415abe6..98d56cf 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/Signal.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/Signal.java
@@ -10,9 +10,9 @@
**************************************************************************/
package org.eclipse.net4j.signal;
+import org.eclipse.net4j.internal.util.om.trace.ContextTracer;
import org.eclipse.net4j.stream.BufferInputStream;
import org.eclipse.net4j.stream.BufferOutputStream;
-import org.eclipse.net4j.util.om.trace.ContextTracer;
import org.eclipse.internal.net4j.bundle.OM;
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 4d5eb8a..70452ce 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
@@ -12,9 +12,9 @@ package org.eclipse.net4j.signal;
import org.eclipse.net4j.IBuffer;
import org.eclipse.net4j.IBufferProvider;
+import org.eclipse.net4j.internal.util.om.trace.ContextTracer;
import org.eclipse.net4j.stream.BufferInputStream;
import org.eclipse.net4j.stream.ChannelOutputStream;
-import org.eclipse.net4j.util.om.trace.ContextTracer;
import org.eclipse.internal.net4j.BufferUtil;
import org.eclipse.internal.net4j.Protocol;
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 83c4038..1af344a 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
@@ -12,8 +12,8 @@ package org.eclipse.net4j.stream;
import org.eclipse.net4j.IBuffer;
import org.eclipse.net4j.IBufferHandler;
+import org.eclipse.net4j.internal.util.om.trace.ContextTracer;
import org.eclipse.net4j.util.HexUtil;
-import org.eclipse.net4j.util.om.trace.ContextTracer;
import org.eclipse.internal.net4j.bundle.OM;
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 a43c635..6c0a916 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
@@ -13,9 +13,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.internal.util.om.trace.ContextTracer;
import org.eclipse.net4j.util.HexUtil;
import org.eclipse.net4j.util.lifecycle.LifecycleUtil;
-import org.eclipse.net4j.util.om.trace.ContextTracer;
import org.eclipse.internal.net4j.bundle.OM;