summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2007-09-01 04:37:25 (EDT)
committerEike Stepper2007-09-01 04:37:25 (EDT)
commitdad2faac6bc7c7f8096787b2ad852e085eeb8e04 (patch)
tree3f7638334e714b4d1dbad3c362d4ac3c6e8d9f1d
parent612533ee51bb0fc3c7bc9d8d62096215886b7d15 (diff)
downloadcdo-dad2faac6bc7c7f8096787b2ad852e085eeb8e04.zip
cdo-dad2faac6bc7c7f8096787b2ad852e085eeb8e04.tar.gz
cdo-dad2faac6bc7c7f8096787b2ad852e085eeb8e04.tar.bz2
[201977] Fix raw type warnings
https://bugs.eclipse.org/bugs/show_bug.cgi?id=201977
-rw-r--r--plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DBStoreAccessor.java6
-rw-r--r--plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/FeatureServerInfo.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/HorizontalMappingStrategy.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/Mapping.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/MappingStrategy.java6
-rw-r--r--plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/ValueMapping.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/VerticalMapping.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.server/.options1
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/Repository.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/RepositoryConfigurator.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/RepositoryConfiguratorNew.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/ResourceManager.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/Session.java4
-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/StoreUtil.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/TypeManager.java9
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/bundle/OM.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/CDOServerProtocol.java3
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/CDOServerProtocolFactory.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/CommitTransactionIndication.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/OpenSessionIndication.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/.cvsignore2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/CDO2 AllTests.launch2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/TDD.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/CDO UI.launch146
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ImportRootsAction.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/RegisterFilesystemPackagesAction.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/RegisterGeneratedPackagesAction.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/RegisterWorkspacePackagesAction.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/PackageManagerDialog.java10
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/SelectPackageDialog.java8
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/views/CDOEventHandler.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/views/CDOItemProvider.java5
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/views/CDOSessionsView.java3
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/views/CDOViewHistory.java10
-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/CDOUtil.java2
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/util/EMFUtil.java4
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOCallbackImpl.java8
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOLegacyImpl.java12
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOSessionFactory.java2
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOSessionImpl.java8
-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/CDOTransactionImpl.java9
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/CDOClientProtocol.java4
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/CDOClientProtocolFactory.java2
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/CDOClientRequest.java2
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/CommitTransactionRequest.java4
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/CommitTransactionResult.java2
-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/LoadPackageRequest.java2
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/OpenSessionResult.java2
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/FSMUtil.java4
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/PackageClosure.java6
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/ProxyResolverURIResourceMap.java3
-rw-r--r--plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/db/DBSelect.java6
-rw-r--r--plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/DBAdapterRegistry.java2
-rw-r--r--plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/DBSchema.java2
-rw-r--r--plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/DBTable.java4
-rw-r--r--plugins/org.eclipse.net4j.debug/src/org/eclipse/net4j/internal/debug/RemoteTraceManager.java2
-rw-r--r--plugins/org.eclipse.net4j.debug/src/org/eclipse/net4j/internal/debug/views/IntrospectorView.java16
-rw-r--r--plugins/org.eclipse.net4j.jms.admin/src/org/eclipse/net4j/jms/internal/admin/protocol/JMSAdminProtocol.java3
-rw-r--r--plugins/org.eclipse.net4j.jms.admin/src/org/eclipse/net4j/jms/internal/admin/protocol/JMSAdminProtocolFactory.java2
-rw-r--r--plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/Server.java6
-rw-r--r--plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/ServerConnection.java4
-rw-r--r--plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/ServerConsumer.java2
-rw-r--r--plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/ServerDestination.java2
-rw-r--r--plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/ServerSession.java2
-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.java2
-rw-r--r--plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSCommitIndication.java2
-rw-r--r--plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSOpenSessionIndication.java2
-rw-r--r--plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSRecoverIndication.java2
-rw-r--r--plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSRegisterConsumerIndication.java2
-rw-r--r--plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSRollbackIndication.java2
-rw-r--r--plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSServerProtocol.java4
-rw-r--r--plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSServerProtocolFactory.java2
-rw-r--r--plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/admin/JMSAdminServerProtocolFactory.java2
-rw-r--r--plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/ConnectionImpl.java11
-rw-r--r--plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/ConnectionMetaDataImpl.java2
-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/MessageConsumerImpl.java2
-rw-r--r--plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/MessageImpl.java34
-rw-r--r--plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/QueueBrowserImpl.java2
-rw-r--r--plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/SessionImpl.java6
-rw-r--r--plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSClientProtocol.java4
-rw-r--r--plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSClientProtocolFactory.java2
-rw-r--r--plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSRecoverRequest.java2
-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/util/TypeUtil.java2
-rw-r--r--plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/internal/jvm/JVMAcceptorFactory.java11
-rw-r--r--plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/internal/jvm/JVMAcceptorManager.java2
-rw-r--r--plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/internal/jvm/JVMConnectorFactory.java11
-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/TCPAcceptorFactory.java13
-rw-r--r--plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPConnectorFactory.java30
-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/TCPSelectorFactory.java2
-rw-r--r--plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/ServerTestProtocolFactory.java2
-rw-r--r--plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/TCPTransportTest.java5
-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/TestProtocol.java6
-rw-r--r--plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/TestSignalServerProtocolFactory.java2
-rw-r--r--plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/SynchronizingCorrelatorTest.java8
-rw-r--r--plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/views/AcceptorsView.java3
-rw-r--r--plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/views/ConnectorsView.java3
-rw-r--r--plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/views/Net4jItemProvider.java3
-rw-r--r--plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/internal/ui/views/Net4jContainerView.java3
-rw-r--r--plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/internal/ui/views/Net4jItemProvider.java5
-rw-r--r--plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/StaticContentProvider.java8
-rw-r--r--plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/views/ContainerItemProvider.java22
-rw-r--r--plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/views/ContainerView.java7
-rw-r--r--plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/views/ItemProvider.java2
-rw-r--r--plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/widgets/LogDialog.java5
-rw-r--r--plugins/org.eclipse.net4j.util/.settings/org.eclipse.jdt.core.prefs3
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/bundle/AbstractBundle.java16
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/bundle/AbstractPlatform.java10
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/collection/HashBag.java8
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/collection/History.java5
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/collection/HistoryElement.java4
-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/concurrent/CompletionWorkSerializer.java13
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/concurrent/RoundRobinList.java2
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/concurrent/SynchronizingCorrelator.java3
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/container/Container.java10
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/container/ContainerEvent.java6
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/container/ContainerEventAdapter.java2
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/container/ManagedContainer.java56
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/container/PluginElementProcessorList.java2
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/container/SingleDeltaContainerEvent.java4
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/container/delegate/AbstractDelegator.java12
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/container/delegate/ContainerBlockingQueue.java4
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/container/delegate/ContainerCollection.java14
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/container/delegate/ContainerList.java6
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/container/delegate/ContainerMap.java28
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/event/Notifier.java2
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/factory/Factory.java4
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/factory/FactoryKey.java18
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/lifecycle/QueueWorker.java2
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/LegacyBundle.java4
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/LegacyPlatform.java4
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/OSGiBundle.java2
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/OSGiPlatform.java2
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/monitor/MON.java2
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/pref/Preferences.java6
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/trace/ContextTracer.java4
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/trace/PrintTraceHandler.java4
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/trace/RemoteTraceServer.java2
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/trace/TraceHandlerEvent.java6
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/trace/Tracer.java10
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/registry/HashMapDelegatingRegistry.java8
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/registry/HashMapRegistry.java8
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/transaction/Transaction.java10
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/ReflectUtil.java16
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/collection/HistoryUtil.java2
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/collection/IHistoryElement.java2
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/ContainerUtil.java4
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/IManagedContainer.java5
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/factory/IFactory.java6
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/fsm/FiniteStateMachine.java35
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/fsm/ITransition.java2
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/CachedFileMap.java4
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/DelegatingStreamWrapper.java19
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/GZIPStreamWrapper.java8
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/IOUtil.java4
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/IStreamWrapper.java10
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/SortedFileMap.java4
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/StreamWrapperChain.java17
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/XORStreamWrapper.java6
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/lifecycle/LifecycleUtil.java4
-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/trace/OMTraceHandlerEvent.java2
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/trace/OMTracer.java10
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/registry/RegistryUtil.java2
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/transaction/TX.java77
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/transaction/TransactionUtil.java2
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/Acceptor.java10
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/AcceptorFactory.java3
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/BufferProviderFactory.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/ClientProtocolFactory.java3
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/Connector.java19
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/ConnectorFactory.java3
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/ExecutorServiceFactory.java2
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/Protocol.java9
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/ServerProtocolFactory.java3
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/net4j/IProtocol.java6
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/Request.java2
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/SignalProtocol.java6
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/net4j/stream/BufferInputStream.java2
190 files changed, 614 insertions, 669 deletions
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DBStoreAccessor.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DBStoreAccessor.java
index 0c32fa8..881258d 100644
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DBStoreAccessor.java
+++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DBStoreAccessor.java
@@ -250,7 +250,7 @@ public class DBStoreAccessor implements IDBStoreAccessor
public Collection<CDOPackageInfo> readPackageInfos()
{
- final Collection<CDOPackageInfo> result = new ArrayList(0);
+ final Collection<CDOPackageInfo> result = new ArrayList<CDOPackageInfo>(0);
IDBRowHandler rowHandler = new IDBRowHandler()
{
public boolean handle(int row, final Object... values)
@@ -490,7 +490,7 @@ public class DBStoreAccessor implements IDBStoreAccessor
protected Set<IDBTable> mapPackages(CDOPackageImpl... cdoPackages)
{
- Set<IDBTable> affectedTables = new HashSet();
+ Set<IDBTable> affectedTables = new HashSet<IDBTable>();
if (cdoPackages != null && cdoPackages.length != 0)
{
for (CDOPackageImpl cdoPackage : cdoPackages)
@@ -505,7 +505,7 @@ public class DBStoreAccessor implements IDBStoreAccessor
protected Set<IDBTable> mapClasses(CDOClassImpl... cdoClasses)
{
- Set<IDBTable> affectedTables = new HashSet();
+ Set<IDBTable> affectedTables = new HashSet<IDBTable>();
if (cdoClasses != null && cdoClasses.length != 0)
{
IMappingStrategy mappingStrategy = store.getMappingStrategy();
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/FeatureServerInfo.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/FeatureServerInfo.java
index e9c01b5..251de39 100644
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/FeatureServerInfo.java
+++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/FeatureServerInfo.java
@@ -47,7 +47,7 @@ public final class FeatureServerInfo extends ServerInfo
{
if (fields == null)
{
- fields = new HashMap();
+ fields = new HashMap<Object, IDBField>();
}
else
{
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/HorizontalMappingStrategy.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/HorizontalMappingStrategy.java
index ac1300e..b417496 100644
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/HorizontalMappingStrategy.java
+++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/HorizontalMappingStrategy.java
@@ -51,7 +51,7 @@ public class HorizontalMappingStrategy extends MappingStrategy
@Override
protected List<CDOClass> getClassesWithObjectInfo()
{
- List<CDOClass> result = new ArrayList();
+ List<CDOClass> result = new ArrayList<CDOClass>();
IPackageManager packageManager = getStore().getRepository().getPackageManager();
for (CDOPackage cdoPackage : packageManager.getPackages())
{
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/Mapping.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/Mapping.java
index 593049c..567156a 100644
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/Mapping.java
+++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/Mapping.java
@@ -61,7 +61,7 @@ public abstract class Mapping implements IMapping
private IDBTable table;
- private Set<IDBTable> affectedTables = new HashSet();
+ private Set<IDBTable> affectedTables = new HashSet<IDBTable>();
public Mapping(MappingStrategy mappingStrategy, CDOClass cdoClass)
{
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/MappingStrategy.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/MappingStrategy.java
index e8fde26..fad44e2 100644
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/MappingStrategy.java
+++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/MappingStrategy.java
@@ -50,9 +50,9 @@ public abstract class MappingStrategy implements IMappingStrategy
private ToOne toOne;
- private Map<Object, IDBTable> referenceTables = new HashMap();
+ private Map<Object, IDBTable> referenceTables = new HashMap<Object, IDBTable>();
- private Map<Integer, CDOClassRef> classRefs = new HashMap();
+ private Map<Integer, CDOClassRef> classRefs = new HashMap<Integer, CDOClassRef>();
public MappingStrategy()
{
@@ -72,7 +72,7 @@ public abstract class MappingStrategy implements IMappingStrategy
{
if (properties == null)
{
- properties = new HashMap();
+ properties = new HashMap<String, String>();
}
return properties;
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/ValueMapping.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/ValueMapping.java
index bc05452..a43b6bf 100644
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/ValueMapping.java
+++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/ValueMapping.java
@@ -163,7 +163,7 @@ public abstract class ValueMapping extends Mapping
protected List<IAttributeMapping> createAttributeMappings(CDOFeature[] features)
{
- List<IAttributeMapping> attributeMappings = new ArrayList();
+ List<IAttributeMapping> attributeMappings = new ArrayList<IAttributeMapping>();
for (CDOFeature feature : features)
{
if (feature.isReference())
@@ -184,7 +184,7 @@ public abstract class ValueMapping extends Mapping
protected List<IReferenceMapping> createReferenceMappings(CDOFeature[] features)
{
- List<IReferenceMapping> referenceMappings = new ArrayList();
+ List<IReferenceMapping> referenceMappings = new ArrayList<IReferenceMapping>();
for (CDOFeature feature : features)
{
if (feature.isReference() && feature.isMany())
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/VerticalMapping.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/VerticalMapping.java
index a91a59b..8f92f88 100644
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/VerticalMapping.java
+++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/VerticalMapping.java
@@ -35,7 +35,7 @@ public class VerticalMapping extends ValueMapping
{
if (superMappings == null)
{
- superMappings = new ArrayList(0);
+ superMappings = new ArrayList<IMapping>(0);
}
superMappings.add(superMapping);
diff --git a/plugins/org.eclipse.emf.cdo.server/.options b/plugins/org.eclipse.emf.cdo.server/.options
index 42a3559..4a89306 100644
--- a/plugins/org.eclipse.emf.cdo.server/.options
+++ b/plugins/org.eclipse.emf.cdo.server/.options
@@ -5,3 +5,4 @@ org.eclipse.emf.cdo.server/debug.session = true
org.eclipse.emf.cdo.server/debug.revision = true
org.eclipse.emf.cdo.server/debug.resource = true
org.eclipse.emf.cdo.server/debug.store = true
+org.eclipse.emf.cdo.server/debug.types = true
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 818e997..195f3e8 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
@@ -109,7 +109,7 @@ public class Repository extends Container<IRepositoryElement> implements IReposi
{
if (properties == null)
{
- properties = new HashMap();
+ properties = new HashMap<String, String>();
}
return properties;
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/RepositoryConfigurator.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/RepositoryConfigurator.java
index 2e27ba7..f094f24 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/RepositoryConfigurator.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/RepositoryConfigurator.java
@@ -71,7 +71,7 @@ public class RepositoryConfigurator
TRACER.trace("Configuring repositories from " + configFile.getAbsolutePath());
}
- List<IRepository> repositories = new ArrayList();
+ List<IRepository> repositories = new ArrayList<IRepository>();
Document document = getDocument(configFile);
NodeList elements = document.getElementsByTagName("repository");
for (int i = 0; i < elements.getLength(); i++)
@@ -176,7 +176,7 @@ public class RepositoryConfigurator
public static Map<String, String> getProperties(Element element, int levels)
{
- Map<String, String> properties = new HashMap();
+ Map<String, String> properties = new HashMap<String, String>();
collectProperties(element, "", properties, levels);
return properties;
}
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/RepositoryConfiguratorNew.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/RepositoryConfiguratorNew.java
index 3d19915..504d3e9 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/RepositoryConfiguratorNew.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/RepositoryConfiguratorNew.java
@@ -166,7 +166,7 @@ public class RepositoryConfiguratorNew implements IElementProcessor
public static Map<String, String> getProperties(Element element, int levels)
{
- Map<String, String> properties = new HashMap();
+ Map<String, String> properties = new HashMap<String, String>();
collectProperties(element, "", properties, levels);
return properties;
}
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 9308793..f46afe5 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
@@ -30,9 +30,9 @@ public class ResourceManager extends Lifecycle implements IResourceManager
private Repository repository;
- private Map<CDOID, String> idToPathMap = new HashMap();
+ private Map<CDOID, String> idToPathMap = new HashMap<CDOID, String>();
- private Map<String, CDOID> pathToIDMap = new HashMap();
+ private Map<String, CDOID> pathToIDMap = new HashMap<String, CDOID>();
public ResourceManager(Repository repository)
{
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/Session.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/Session.java
index a0ab9da..572a8cc 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/Session.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/Session.java
@@ -47,9 +47,9 @@ public class Session extends Container<IView> implements ISession, CDOIDProvider
private int sessionID;
- private ConcurrentMap<Integer, View> views = new ConcurrentHashMap();
+ private ConcurrentMap<Integer, View> views = new ConcurrentHashMap<Integer, View>();
- private Set<CDOID> knownObjects = new HashSet();
+ private Set<CDOID> knownObjects = new HashSet<CDOID>();
private IListener protocolListener = new LifecycleEventAdapter()
{
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 38128a5..2a58d73 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
@@ -32,7 +32,7 @@ public class SessionManager extends Container<ISession> implements ISessionManag
private Repository repository;
- private Map<Integer, Session> sessions = new HashMap();
+ private Map<Integer, Session> sessions = new HashMap<Integer, Session>();
private int lastSessionID;
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/StoreUtil.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/StoreUtil.java
index ba60eb8..d9a2187 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/StoreUtil.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/StoreUtil.java
@@ -17,7 +17,7 @@ import org.eclipse.emf.cdo.server.IStoreReader;
*/
public final class StoreUtil
{
- private static final ThreadLocal<IStoreReader> THREAD_LOCAL = new InheritableThreadLocal();
+ private static final ThreadLocal<IStoreReader> THREAD_LOCAL = new InheritableThreadLocal<IStoreReader>();
private StoreUtil()
{
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/TypeManager.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/TypeManager.java
index 8e9f8b6..ae3b81d 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/TypeManager.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/TypeManager.java
@@ -19,6 +19,7 @@ import org.eclipse.emf.cdo.server.IStoreReader;
import org.eclipse.emf.cdo.server.ITypeManager;
import org.eclipse.net4j.internal.util.lifecycle.QueueWorker;
+import org.eclipse.net4j.internal.util.om.trace.ContextTracer;
import org.eclipse.net4j.util.ImplementationError;
import org.eclipse.net4j.util.io.CachedFileMap;
import org.eclipse.net4j.util.io.ExtendedDataInput;
@@ -37,11 +38,13 @@ import java.util.concurrent.ConcurrentMap;
*/
public class TypeManager extends QueueWorker<ObjectEntry> implements ITypeManager
{
+ private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG_TYPES, TypeManager.class);
+
private Repository repository;
private boolean persistent;
- private ConcurrentMap<CDOID, CDOClassRef> objectTypes = new ConcurrentHashMap();
+ private ConcurrentMap<CDOID, CDOClassRef> objectTypes = new ConcurrentHashMap<CDOID, CDOClassRef>();
private PackageURIMap packageURIMap;
@@ -170,6 +173,10 @@ public class TypeManager extends QueueWorker<ObjectEntry> implements ITypeManage
File stateFolder = new File(OM.BUNDLE.getStateLocation());
File repositoryFolder = new File(stateFolder, repository.getUUID());
IOUtil.mkdirs(repositoryFolder);
+ if (TRACER.isEnabled())
+ {
+ TRACER.format("Repository state location: {0}", repositoryFolder.getAbsolutePath());
+ }
packageURIMap = new PackageURIMap(new File(repositoryFolder, "package.uris"));
packageIDMap = new PackageIDMap(new File(repositoryFolder, "package.ids"));
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 acee317..541ce5b 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
@@ -42,6 +42,8 @@ public abstract class OM
public static final OMTracer DEBUG_STORE = DEBUG.tracer("store"); //$NON-NLS-1$
+ public static final OMTracer DEBUG_TYPES = DEBUG.tracer("types"); //$NON-NLS-1$
+
public static final OMLogger LOG = BUNDLE.logger();
static void start() throws Exception
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/CDOServerProtocol.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/CDOServerProtocol.java
index 81d4744..e7a968c 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/CDOServerProtocol.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/CDOServerProtocol.java
@@ -12,7 +12,6 @@ package org.eclipse.emf.cdo.internal.server.protocol;
import org.eclipse.emf.cdo.internal.server.Session;
import org.eclipse.emf.cdo.protocol.CDOProtocolConstants;
-import org.eclipse.emf.cdo.server.IRepositoryProvider;
import org.eclipse.net4j.signal.SignalProtocol;
import org.eclipse.net4j.signal.SignalReactor;
@@ -20,7 +19,7 @@ import org.eclipse.net4j.signal.SignalReactor;
/**
* @author Eike Stepper
*/
-public class CDOServerProtocol extends SignalProtocol<IRepositoryProvider>
+public class CDOServerProtocol extends SignalProtocol
{
private Session session;
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/CDOServerProtocolFactory.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/CDOServerProtocolFactory.java
index 1ee7a21..0733dd3 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/CDOServerProtocolFactory.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/CDOServerProtocolFactory.java
@@ -10,7 +10,7 @@ import org.eclipse.internal.net4j.ServerProtocolFactory;
/**
* @author Eike Stepper
*/
-public class CDOServerProtocolFactory extends ServerProtocolFactory<CDOServerProtocol>
+public class CDOServerProtocolFactory extends ServerProtocolFactory
{
public static final String TYPE = CDOProtocolConstants.PROTOCOL_NAME;
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 212bafe..2fc4840 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
@@ -62,7 +62,7 @@ public class CommitTransactionIndication extends CDOServerIndication
private CDORevisionImpl[] dirtyObjects;
- private Map<CDOID, CDOID> idMappings = new HashMap();
+ private Map<CDOID, CDOID> idMappings = new HashMap<CDOID, CDOID>();
private long timeStamp;
@@ -102,7 +102,7 @@ public class CommitTransactionIndication extends CDOServerIndication
newObjects = readNewObjects(in);
dirtyObjects = readDirtyObjects(in);
- ITransaction<IStoreWriter> storeTransaction = new Transaction(storeWriter);
+ ITransaction<IStoreWriter> storeTransaction = new Transaction<IStoreWriter>(storeWriter);
addPackages(storeTransaction, newPackages);
addRevisions(storeTransaction, newResources);
addRevisions(storeTransaction, newObjects);
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 7f553fb..3bda346 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
@@ -102,7 +102,7 @@ public class OpenSessionIndication extends IndicationWithResponse
try
{
CDOServerProtocol protocol = (CDOServerProtocol)getProtocol();
- IRepositoryProvider repositoryProvider = protocol.getInfraStructure();
+ IRepositoryProvider repositoryProvider = (IRepositoryProvider)protocol.getInfraStructure();
return (Repository)repositoryProvider.getRepository(repositoryName);
}
catch (RuntimeException ex)
diff --git a/plugins/org.eclipse.emf.cdo.tests/.cvsignore b/plugins/org.eclipse.emf.cdo.tests/.cvsignore
index f43b387..ef2fbf6 100644
--- a/plugins/org.eclipse.emf.cdo.tests/.cvsignore
+++ b/plugins/org.eclipse.emf.cdo.tests/.cvsignore
@@ -1,3 +1,5 @@
bin
doc
model1X.ecore
+state
+*.log
diff --git a/plugins/org.eclipse.emf.cdo.tests/CDO2 AllTests.launch b/plugins/org.eclipse.emf.cdo.tests/CDO2 AllTests.launch
index d13c4a9..2ac9300 100644
--- a/plugins/org.eclipse.emf.cdo.tests/CDO2 AllTests.launch
+++ b/plugins/org.eclipse.emf.cdo.tests/CDO2 AllTests.launch
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<launchConfiguration type="org.eclipse.jdt.junit.launchconfig">
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/tdd/AllTests.java"/>
+<listEntry value="/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AllTests.java"/>
</listAttribute>
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
<listEntry value="1"/>
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/TDD.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/TDD.java
index 4787a8f..a1f5e63 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/TDD.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/TDD.java
@@ -68,7 +68,7 @@ public class TDD
}
}
- private static Throwable filterException(Throwable t, Class entry)
+ private static Throwable filterException(Throwable t, Class<? extends Object> entry)
{
StackTraceElement[] stackTrace = t.getStackTrace();
int len;
diff --git a/plugins/org.eclipse.emf.cdo.ui/CDO UI.launch b/plugins/org.eclipse.emf.cdo.ui/CDO UI.launch
index 8ca3217..92493c5 100644
--- a/plugins/org.eclipse.emf.cdo.ui/CDO UI.launch
+++ b/plugins/org.eclipse.emf.cdo.ui/CDO UI.launch
@@ -38,22 +38,22 @@
<mapEntry key="org.eclipse.ui/trace/contexts" value="false"/>
<mapEntry key="org.eclipse.wst.common.environment/trace/error" value="true"/>
<mapEntry key="org.eclipse.debug.ui/debug/viewers/updateSequence" value="false"/>
-<mapEntry key="org.eclipse.wst.common.environment/trace/warning" value="true"/>
<mapEntry key="org.eclipse.emf.validation/debug/exceptions/throwing" value="false"/>
+<mapEntry key="org.eclipse.wst.common.environment/trace/warning" value="true"/>
<mapEntry key="org.eclipse.osgi/trace/filename" value="runtime.traces"/>
<mapEntry key="org.eclipse.wst.sse.ui/extendededitoractionbuilder" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug" value="true"/>
-<mapEntry key="org.eclipse.wst.sse.ui/actioncontributor/debugstatusfields" value="true"/>
<mapEntry key="org.eclipse.debug.ui/debug/contextlaunching" value="false"/>
+<mapEntry key="org.eclipse.wst.sse.ui/actioncontributor/debugstatusfields" value="true"/>
+<mapEntry key="org.eclipse.jdt.core/debug" value="true"/>
<mapEntry key="org.eclipse.osgi/eclipseadaptor/debug" value="false"/>
<mapEntry key="org.eclipse.net4j.tcp/debug" value="true"/>
<mapEntry key="org.eclipse.team.cvs.core/dirtycaching" value="false"/>
<mapEntry key="org.eclipse.emf.cdo.server/debug.repository" value="true"/>
<mapEntry key="org.eclipse.jdt.core/debug/javamodel" value="false"/>
-<mapEntry key="org.eclipse.wst.sse.ui/contentOutline" value="false"/>
<mapEntry key="org.eclipse.emf.ocl/debug/exceptions/throwing" value="false"/>
-<mapEntry key="org.eclipse.wst.sse.ui/preferences-properties" value="false"/>
+<mapEntry key="org.eclipse.wst.sse.ui/contentOutline" value="false"/>
<mapEntry key="org.eclipse.wtp.common/debug/logtrace" value="false"/>
+<mapEntry key="org.eclipse.wst.sse.ui/preferences-properties" value="false"/>
<mapEntry key="org.eclipse.ui.intro/trace/printHTML" value="false"/>
<mapEntry key="org.eclipse.emf.query.ocl/debug" value="true"/>
<mapEntry key="org.eclipse.ltk.core.refactoring/perf/participants/createChanges" value="300"/>
@@ -61,39 +61,39 @@
<mapEntry key="org.eclipse.net4j.util/debug.lifecycle.dump" value="true"/>
<mapEntry key="org.eclipse.ui/listeners/IWorkbenchWindow.IPerspectiveListener" value="false"/>
<mapEntry key="org.eclipse.emf.cdo/debug.util" value="true"/>
-<mapEntry key="org.eclipse.osgi/resolver/debug" value="false"/>
<mapEntry key="org.eclipse.wst.sse.ui/propertySheet" value="false"/>
+<mapEntry key="org.eclipse.osgi/resolver/debug" value="false"/>
<mapEntry key="org.eclipse.team.core/refreshjob" value="false"/>
-<mapEntry key="org.eclipse.ui/debug" value="false"/>
<mapEntry key="org.eclipse.update.core/debug/installhandler" value="false"/>
+<mapEntry key="org.eclipse.ui/debug" value="false"/>
<mapEntry key="org.eclipse.wtp.common/debug/loglevel" value="WARNING"/>
<mapEntry key="org.eclipse.help.ui/debug/infopop" value="false"/>
<mapEntry key="org.eclipse.pde.core/classpath" value="false"/>
<mapEntry key="org.eclipse.team.cvs.core/threading" value="false"/>
<mapEntry key="org.eclipse.equinox.preferences/general" value="false"/>
<mapEntry key="org.eclipse.net4j.jms.server/debug.store" value="true"/>
-<mapEntry key="org.eclipse.ui/trace/handlers.performance" value="false"/>
<mapEntry key="org.eclipse.wst.sse.core/format" value="false"/>
+<mapEntry key="org.eclipse.ui/trace/handlers.performance" value="false"/>
<mapEntry key="org.eclipse.ocl/debug/evaluation" value="false"/>
<mapEntry key="org.eclipse.ui/trace/operations.verbose" value="false"/>
<mapEntry key="org.eclipse.emf.validation/debug/constraints" value="false"/>
<mapEntry key="org.eclipse.osgi/trace/activation" value="false"/>
-<mapEntry key="org.eclipse.ocl/debug/exceptions/catching" value="false"/>
<mapEntry key="com.ibm.datatools.core.ui/modelExplorer/trace" value="true"/>
+<mapEntry key="org.eclipse.ocl/debug/exceptions/catching" value="false"/>
<mapEntry key="org.eclipse.debug.core/debug/commands" value="false"/>
-<mapEntry key="org.eclipse.ui/perf/workbench.restore" value="30000"/>
<mapEntry key="org.eclipse.team.core/threading" value="false"/>
+<mapEntry key="org.eclipse.ui/perf/workbench.restore" value="30000"/>
<mapEntry key="org.eclipse.wst.sse.core/structureddocument" value="false"/>
<mapEntry key="org.eclipse.emf.transaction/debug/methods/exiting" value="false"/>
<mapEntry key="org.eclipse.update.core/debug/parsing" value="false"/>
-<mapEntry key="org.eclipse.emf.cdo.protocol/debug.protocol" value="true"/>
<mapEntry key="org.eclipse.jdt.core/debug/postaction" value="false"/>
+<mapEntry key="org.eclipse.emf.cdo.protocol/debug.protocol" value="true"/>
<mapEntry key="org.eclipse.ocl/debug" value="true"/>
<mapEntry key="org.eclipse.ui/trace/graphics" value="false"/>
<mapEntry key="org.eclipse.osgi/defaultprofile/logsynchronously" value="false"/>
<mapEntry key="org.eclipse.net4j.db/debug" value="true"/>
-<mapEntry key="org.eclipse.emf.query/debug/exceptions/throwing" value="false"/>
<mapEntry key="org.eclipse.wst.common.environment/trace/ws_dt_cmd_engine" value="true"/>
+<mapEntry key="org.eclipse.emf.query/debug/exceptions/throwing" value="false"/>
<mapEntry key="org.eclipse.osgi/monitor/activation" value="false"/>
<mapEntry key="org.eclipse.net4j.jms/debug.protocol" value="true"/>
<mapEntry key="org.eclipse.wst.sse.ui/gotoNextAnnotation" value="false"/>
@@ -101,8 +101,8 @@
<mapEntry key="org.eclipse.debug.ui/debug" value="false"/>
<mapEntry key="org.eclipse.jdt.core/debug/buffermanager" value="false"/>
<mapEntry key="org.eclipse.help.base/debug/search" value="false"/>
-<mapEntry key="org.eclipse.jface.text/debug/ContentAssistSubjectAdapters" value="false"/>
<mapEntry key="org.eclipse.pde.build/debug" value="false"/>
+<mapEntry key="org.eclipse.jface.text/debug/ContentAssistSubjectAdapters" value="false"/>
<mapEntry key="org.eclipse.wst.common.environment/trace/ws_ant" value="true"/>
<mapEntry key="org.eclipse.jdt.ui/perf/search/participants" value="300"/>
<mapEntry key="org.eclipse.emf.validation/debug/parsers" value="false"/>
@@ -111,14 +111,14 @@
<mapEntry key="org.eclipse.ui/perf/perspective.create" value="800"/>
<mapEntry key="org.eclipse.update.core/debug/type" value="false"/>
<mapEntry key="org.eclipse.osgi/eclipseadaptor/debug/platformadmin" value="false"/>
-<mapEntry key="org.eclipse.emf.workspace/debug/methods/exiting" value="false"/>
-<mapEntry key="org.eclipse.ui/listeners/IWorkbenchPage.IPropertyChangeListener" value="false"/>
<mapEntry key="org.eclipse.osgi/resolver/generics" value="false"/>
+<mapEntry key="org.eclipse.ui/listeners/IWorkbenchPage.IPropertyChangeListener" value="false"/>
+<mapEntry key="org.eclipse.emf.workspace/debug/methods/exiting" value="false"/>
<mapEntry key="org.eclipse.wst.common.project.facet.core/actionSorting" value="false"/>
-<mapEntry key="com.ibm.datatools.core.ui/modelExplorerDecoration/trace" value="true"/>
<mapEntry key="org.eclipse.osgi/resolver/requires" value="false"/>
-<mapEntry key="org.eclipse.emf.workspace/debug/exceptions/throwing" value="false"/>
+<mapEntry key="com.ibm.datatools.core.ui/modelExplorerDecoration/trace" value="true"/>
<mapEntry key="org.eclipse.core.resources/refresh" value="false"/>
+<mapEntry key="org.eclipse.emf.workspace/debug/exceptions/throwing" value="false"/>
<mapEntry key="org.eclipse.jdt.core/perf/containerinitializer" value="5000"/>
<mapEntry key="org.eclipse.osgi/profile/benchmark" value="false"/>
<mapEntry key="org.eclipse.jet/debug/builder" value="false"/>
@@ -130,18 +130,18 @@
<mapEntry key="org.eclipse.ui/trace/handlers" value="false"/>
<mapEntry key="org.eclipse.ui/trace/contexts.performance" value="false"/>
<mapEntry key="org.eclipse.jem.util/debug/logtrace" value="false"/>
-<mapEntry key="org.eclipse.team.cvs.core/metafiles" value="false"/>
<mapEntry key="org.eclipse.jdt.core/perf/completion" value="300"/>
+<mapEntry key="org.eclipse.team.cvs.core/metafiles" value="false"/>
<mapEntry key="org.eclipse.osgi/profile/startup" value="false"/>
<mapEntry key="org.eclipse.core.jobs/jobs" value="false"/>
<mapEntry key="org.eclipse.wst.sse.ui/debug" value="true"/>
-<mapEntry key="org.eclipse.core.resources/perf/save.participants" value="500"/>
-<mapEntry key="org.eclipse.emf.query.ocl/debug/exceptions/throwing" value="false"/>
<mapEntry key="org.eclipse.wst.common.environment/trace/info" value="true"/>
+<mapEntry key="org.eclipse.emf.query.ocl/debug/exceptions/throwing" value="false"/>
+<mapEntry key="org.eclipse.core.resources/perf/save.participants" value="500"/>
<mapEntry key="org.eclipse.net4j/perf" value="false"/>
<mapEntry key="org.eclipse.help.base/debug" value="true"/>
-<mapEntry key="org.eclipse.jet/debug/projectBundleLoading" value="false"/>
<mapEntry key="org.eclipse.net4j/debug" value="true"/>
+<mapEntry key="org.eclipse.jet/debug/projectBundleLoading" value="false"/>
<mapEntry key="org.eclipse.net4j/debug.signal" value="true"/>
<mapEntry key="org.eclipse.emf.query/debug/methods/entering" value="false"/>
<mapEntry key="org.eclipse.wst.sse.core/structuredmodel/modelmanager" value="false"/>
@@ -151,18 +151,18 @@
<mapEntry key="org.eclipse.wst.sse.ui/extendededitoractionbuilder/debugmenu" value="false"/>
<mapEntry key="org.eclipse.wst.sse.ui/filemodelprovider/modelstatelistener" value="false"/>
<mapEntry key="org.eclipse.ui/listeners/IWorkbenchWindow.IPageListener" value="false"/>
-<mapEntry key="org.eclipse.datatools.connectivity.sqm.core/debug" value="false"/>
<mapEntry key="org.eclipse.wst.sse.core/structuredmodel/lifecycle" value="false"/>
+<mapEntry key="org.eclipse.datatools.connectivity.sqm.core/debug" value="false"/>
<mapEntry key="org.eclipse.wst.sse.core/tasks/job" value="false"/>
<mapEntry key="org.eclipse.net4j/debug.buffer" value="false"/>
<mapEntry key="org.eclipse.core.resources/contenttype/cache" value="false"/>
<mapEntry key="org.eclipse.emf.cdo/debug.repository" value="true"/>
<mapEntry key="org.eclipse.wst.sse.ui/extendedconfigurationbuilder" value="false"/>
-<mapEntry key="org.eclipse.update.core/debug/configuration" value="false"/>
<mapEntry key="org.eclipse.core.jobs/jobs/locks" value="false"/>
+<mapEntry key="org.eclipse.update.core/debug/configuration" value="false"/>
<mapEntry key="org.eclipse.wst.xml.core/debug/cmdocumentmanager" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/handlers.verbose.commandId" value=""/>
<mapEntry key="org.eclipse.core.runtime/url/debug/connect" value="false"/>
+<mapEntry key="org.eclipse.ui/trace/handlers.verbose.commandId" value=""/>
<mapEntry key="org.eclipse.ui.ide/debug" value="false"/>
<mapEntry key="org.eclipse.osgi/profile/debug" value="false"/>
<mapEntry key="org.eclipse.pde.core/debug" value="true"/>
@@ -172,17 +172,17 @@
<mapEntry key="org.eclipse.net4j.util/debug.registry" value="true"/>
<mapEntry key="org.eclipse.jdt.ui/perf/explorer/createPartControl" value="1300"/>
<mapEntry key="org.eclipse.jdt.core/debug/hierarchy" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/perf/variableinitializer" value="5000"/>
-<mapEntry key="org.eclipse.emf.cdo/debug.object" value="false"/>
<mapEntry key="org.eclipse.ui.ide/debug/internalerror/openDialog" value="false"/>
+<mapEntry key="org.eclipse.emf.cdo/debug.object" value="false"/>
+<mapEntry key="org.eclipse.jdt.core/perf/variableinitializer" value="5000"/>
<mapEntry key="org.eclipse.emf.cdo.server/debug.revision" value="false"/>
<mapEntry key="org.eclipse.core.resources/strings" value="false"/>
<mapEntry key="org.eclipse.jdt.core/debug/sourcemapper" value="false"/>
<mapEntry key="org.eclipse.core.resources/save/mastertable" value="false"/>
<mapEntry key="org.eclipse.core.expressions/tracePropertyResolving" value="false"/>
-<mapEntry key="org.eclipse.core.resources/preferences" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/javadelta" value="false"/>
<mapEntry key="org.eclipse.ui/perf/showHeapStatus" value="true"/>
+<mapEntry key="org.eclipse.jdt.core/debug/javadelta" value="false"/>
+<mapEntry key="org.eclipse.core.resources/preferences" value="false"/>
<mapEntry key="org.eclipse.jdt.core/debug/selection" value="false"/>
<mapEntry key="org.eclipse.emf.workspace/debug" value="true"/>
<mapEntry key="org.eclipse.jdt.ui/perf/content_assist_sorters/extensions" value=""/>
@@ -196,34 +196,34 @@
<mapEntry key="org.eclipse.emf.transaction/debug/transactions" value="false"/>
<mapEntry key="org.eclipse.ocl/debug/parsing" value="false"/>
<mapEntry key="org.eclipse.update.core/debug" value="true"/>
-<mapEntry key="org.eclipse.osgi/debug/security" value="false"/>
<mapEntry key="org.eclipse.wst.sse.core/tasks/preferences" value="false"/>
-<mapEntry key="org.eclipse.core.resources/restore/metainfo" value="false"/>
+<mapEntry key="org.eclipse.osgi/debug/security" value="false"/>
<mapEntry key="org.eclipse.core.resources/build/needbuild" value="false"/>
+<mapEntry key="org.eclipse.core.resources/restore/metainfo" value="false"/>
<mapEntry key="org.eclipse.core.resources/perf/builders" value="10000"/>
-<mapEntry key="org.eclipse.ui/perf/perspective.listeners" value="200"/>
<mapEntry key="org.eclipse.net4j.jms.admin/debug.protocol" value="true"/>
-<mapEntry key="com.ibm.datatools.core.ui/debug" value="true"/>
+<mapEntry key="org.eclipse.ui/perf/perspective.listeners" value="200"/>
<mapEntry key="org.eclipse.ui/debug/showAllJobs" value="false"/>
-<mapEntry key="org.eclipse.core.resources/history" value="false"/>
+<mapEntry key="com.ibm.datatools.core.ui/debug" value="true"/>
<mapEntry key="org.eclipse.emf.cdo.server/debug.store" value="true"/>
+<mapEntry key="org.eclipse.core.resources/history" value="false"/>
<mapEntry key="org.eclipse.wst.sse.ui/propertyChangeUpdateActionContributionItem" value="false"/>
<mapEntry key="org.eclipse.ui/listeners/IWorkbenchPage.IPartListener" value="false"/>
<mapEntry key="org.eclipse.jdt.core/debug/search" value="false"/>
-<mapEntry key="org.eclipse.team.cvs.core/cvsprotocol" value="true"/>
<mapEntry key="org.eclipse.pde.core/validation" value="false"/>
+<mapEntry key="org.eclipse.team.cvs.core/cvsprotocol" value="true"/>
<mapEntry key="org.eclipse.wst.sse.ui/extendededitoractionbuilder/readtime" value="false"/>
<mapEntry key="org.eclipse.jface.text/debug/AnnotationPainter" value="false"/>
<mapEntry key="org.eclipse.core.resources/restore/mastertable" value="false"/>
-<mapEntry key="org.eclipse.wst.sse.core/tasks" value="false"/>
<mapEntry key="org.eclipse.core.runtime/debug" value="false"/>
+<mapEntry key="org.eclipse.wst.sse.core/tasks" value="false"/>
<mapEntry key="org.eclipse.equinox.preferences/set" value="false"/>
<mapEntry key="org.eclipse.core.resources/restore/snapshots" value="false"/>
<mapEntry key="org.eclipse.ui/perf/perspective.switch" value="800"/>
<mapEntry key="org.eclipse.jet/debug/pluginBundleLoading" value="false"/>
<mapEntry key="org.eclipse.wst.xml.core/debug/tracefilter" value=""/>
-<mapEntry key="org.eclipse.help.webapp/debug/workingsets" value="false"/>
<mapEntry key="org.eclipse.emf.cdo/debug.protocol" value="true"/>
+<mapEntry key="org.eclipse.help.webapp/debug/workingsets" value="false"/>
<mapEntry key="org.eclipse.osgi/debug/bundleTime" value="false"/>
<mapEntry key="org.eclipse.core.resources/restore/markers" value="false"/>
<mapEntry key="org.eclipse.emf.validation/debug/listeners" value="false"/>
@@ -231,8 +231,8 @@
<mapEntry key="org.eclipse.core.runtime/url/debug/cachecopy" value="false"/>
<mapEntry key="org.eclipse.core.runtime/perf/success" value="false"/>
<mapEntry key="org.eclipse.net4j/debug.connector" value="true"/>
-<mapEntry key="org.eclipse.wst.dtd.ui/projectionperf" value="false"/>
<mapEntry key="org.eclipse.jdt.core/perf/selection" value="300"/>
+<mapEntry key="org.eclipse.wst.dtd.ui/projectionperf" value="false"/>
<mapEntry key="org.eclipse.osgi/debug/startlevel" value="false"/>
<mapEntry key="org.eclipse.ocl/debug/methods/entering" value="false"/>
<mapEntry key="org.eclipse.core.resources/restore" value="false"/>
@@ -240,8 +240,8 @@
<mapEntry key="org.eclipse.osgi/resolver/wiring" value="false"/>
<mapEntry key="org.eclipse.core.resources/perf/snapshot" value="1000"/>
<mapEntry key="org.eclipse.ui.intro/trace/logPerformance" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/contexts.verbose" value="false"/>
<mapEntry key="org.eclipse.osgi/debug/loader" value="false"/>
+<mapEntry key="org.eclipse.ui/trace/contexts.verbose" value="false"/>
<mapEntry key="org.eclipse.osgi/resolver/grouping" value="false"/>
<mapEntry key="org.eclipse.wst.sse.ui/debug/reconcilerjob" value="false"/>
<mapEntry key="org.eclipse.jdt.ui/perf/explorer/makeActions" value="1000"/>
@@ -257,11 +257,11 @@
<mapEntry key="org.eclipse.emf.validation/debug/cache" value="false"/>
<mapEntry key="org.eclipse.update.core/debug/install" value="false"/>
<mapEntry key="org.eclipse.equinox.registry/debug/events" value="false"/>
-<mapEntry key="org.eclipse.help/debug/protocols" value="false"/>
<mapEntry key="org.eclipse.core.resources/save/metainfo" value="false"/>
+<mapEntry key="org.eclipse.help/debug/protocols" value="false"/>
<mapEntry key="org.eclipse.net4j.util/debug.lifecycle" value="true"/>
-<mapEntry key="org.eclipse.emf.validation/debug/methods/entering" value="false"/>
<mapEntry key="org.eclipse.ui/perf/contentTypes" value="200"/>
+<mapEntry key="org.eclipse.emf.validation/debug/methods/entering" value="false"/>
<mapEntry key="org.eclipse.help.ui/debug/embeddedBrowser/inprocess" value="false"/>
<mapEntry key="org.eclipse.jdt.core/perf/javadeltalistener" value="500"/>
<mapEntry key="org.eclipse.core.resources/perf/listeners" value="500"/>
@@ -275,10 +275,10 @@
<mapEntry key="org.eclipse.help/debug/context" value="false"/>
<mapEntry key="org.eclipse.wst.sse.ui/debug/reconcilerValidators" value="false"/>
<mapEntry key="org.eclipse.emf.validation/debug/xml" value="false"/>
-<mapEntry key="org.eclipse.osgi/debug/manifest" value="false"/>
<mapEntry key="org.eclipse.jet/debug/bundleLoading" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/multipageeditor" value="false"/>
+<mapEntry key="org.eclipse.osgi/debug/manifest" value="false"/>
<mapEntry key="org.eclipse.emf.cdo/debug" value="true"/>
+<mapEntry key="org.eclipse.ui/trace/multipageeditor" value="false"/>
<mapEntry key="org.eclipse.emf.cdo.ui/debug" value="true"/>
<mapEntry key="org.eclipse.emf.workspace/debug/exceptions/catching" value="false"/>
<mapEntry key="org.eclipse.core.resources/build/needbuildstack" value="false"/>
@@ -289,29 +289,29 @@
<mapEntry key="org.eclipse.emf.ocl/debug/methods/exiting" value="false"/>
<mapEntry key="org.eclipse.team.cvs.ssh/debug" value="false"/>
<mapEntry key="org.eclipse.core.resources/build/failure" value="false"/>
-<mapEntry key="org.eclipse.team.core/debug" value="false"/>
<mapEntry key="org.eclipse.jet/debug" value="false"/>
+<mapEntry key="org.eclipse.team.core/debug" value="false"/>
<mapEntry key="org.eclipse.jdt.core/debug/builder" value="false"/>
<mapEntry key="org.eclipse.osgi/trace/classLoading" value="false"/>
<mapEntry key="org.eclipse.net4j.jms.server.jdbc/debug" value="true"/>
<mapEntry key="org.eclipse.wst.xml.ui/projectionperf" value="false"/>
-<mapEntry key="org.eclipse.core.jobs/jobs/errorondeadlock" value="false"/>
<mapEntry key="org.eclipse.core.resources/save" value="false"/>
+<mapEntry key="org.eclipse.core.jobs/jobs/errorondeadlock" value="false"/>
<mapEntry key="org.eclipse.emf.transaction/debug/exceptions/throwing" value="false"/>
<mapEntry key="org.eclipse.core.resources/contenttype" value="false"/>
-<mapEntry key="org.eclipse.jem.util/debug/loglevel" value="WARNING"/>
<mapEntry key="org.eclipse.jface.text/debug/FastPartitioner/PositionCache" value="false"/>
+<mapEntry key="org.eclipse.jem.util/debug/loglevel" value="WARNING"/>
<mapEntry key="org.eclipse.emf.validation/debug/exceptions/catching" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/compiler" value="false"/>
<mapEntry key="org.eclipse.emf.cdo.server/debug" value="true"/>
+<mapEntry key="org.eclipse.jdt.core/debug/compiler" value="false"/>
<mapEntry key="org.eclipse.osgi/debug/events" value="false"/>
<mapEntry key="org.eclipse.ui/trace/commands" value="false"/>
<mapEntry key="org.eclipse.equinox.preferences/get" value="false"/>
<mapEntry key="org.eclipse.wst.sse.ui/filemodelprovider/operations" value="false"/>
<mapEntry key="org.eclipse.jdt.ui/debug/ResultCollector" value="false"/>
<mapEntry key="org.eclipse.debug.ui/debug/launchhistory" value="false"/>
-<mapEntry key="org.eclipse.net4j.util/debug.om" value="true"/>
<mapEntry key="org.eclipse.wst.sse.ui/extendededitoractionbuilder/contributetime" value="false"/>
+<mapEntry key="org.eclipse.net4j.util/debug.om" value="true"/>
<mapEntry key="org.eclipse.net4j.jms.server/debug" value="true"/>
<mapEntry key="org.eclipse.emf.workspace/debug/methods/entering" value="false"/>
<mapEntry key="org.eclipse.emf.query.ocl/debug/methods/entering" value="false"/>
@@ -323,8 +323,8 @@
<mapEntry key="org.eclipse.ui.intro/debug" value="true"/>
<mapEntry key="org.eclipse.emf.transaction/debug/locking" value="false"/>
<mapEntry key="org.eclipse.jdt.core/debug/cpresolution/advanced" value="false"/>
-<mapEntry key="org.eclipse.net4j.jms/debug" value="true"/>
<mapEntry key="org.eclipse.emf.validation/debug/providers" value="false"/>
+<mapEntry key="org.eclipse.net4j.jms/debug" value="true"/>
<mapEntry key="org.eclipse.osgi/eclipseadaptor/converter/debug" value="false"/>
<mapEntry key="org.eclipse.emf.cdo.server/debug.resource" value="true"/>
<mapEntry key="com.ibm.datatools.core.ui/plugin/log" value="true"/>
@@ -333,19 +333,19 @@
<mapEntry key="org.eclipse.wst.sse.ui/extendedconfigurationbuilder/time" value="false"/>
<mapEntry key="org.eclipse.wst.sse.core/tasks/time" value="false"/>
<mapEntry key="org.eclipse.emf.cdo/debug.transaction" value="true"/>
-<mapEntry key="org.eclipse.wst.sse.ui/filemodelprovider/lifecyclelistener" value="false"/>
<mapEntry key="org.eclipse.emf.query/debug/methods/exiting" value="false"/>
+<mapEntry key="org.eclipse.wst.sse.ui/filemodelprovider/lifecyclelistener" value="false"/>
<mapEntry key="org.eclipse.emf.cdo.server.db/debug" value="true"/>
-<mapEntry key="org.eclipse.debug.core/debug/events" value="false"/>
<mapEntry key="org.eclipse.net4j/debug.selector" value="true"/>
+<mapEntry key="org.eclipse.debug.core/debug/events" value="false"/>
<mapEntry key="org.eclipse.jdt.ui/debug" value="true"/>
-<mapEntry key="org.eclipse.net4j.db/debug.sql" value="true"/>
-<mapEntry key="org.eclipse.wst.sse.core/filebuffers/modelmanagement" value="false"/>
<mapEntry key="org.eclipse.osgi/monitor/classes" value="false"/>
-<mapEntry key="org.eclipse.ui/perf/part.input" value="200"/>
+<mapEntry key="org.eclipse.wst.sse.core/filebuffers/modelmanagement" value="false"/>
+<mapEntry key="org.eclipse.net4j.db/debug.sql" value="true"/>
<mapEntry key="org.eclipse.wst.sse.ui/debug/tracefilter" value=""/>
-<mapEntry key="org.eclipse.wtp.common/debug/logtracefile" value="false"/>
+<mapEntry key="org.eclipse.ui/perf/part.input" value="200"/>
<mapEntry key="org.eclipse.jet/debug/ext/xpathFunctions" value="false"/>
+<mapEntry key="org.eclipse.wtp.common/debug/logtracefile" value="false"/>
<mapEntry key="org.eclipse.emf.query/debug" value="true"/>
<mapEntry key="org.eclipse.ui.intro.universal/debug" value="true"/>
<mapEntry key="org.eclipse.jdt.ui/debug/TypeConstraints" value="false"/>
@@ -361,23 +361,23 @@
<mapEntry key="org.eclipse.net4j.jms.admin/debug" value="true"/>
<mapEntry key="org.eclipse.emf.cdo/debug.model" value="false"/>
<mapEntry key="org.eclipse.jdt.core/debug/cpresolution" value="false"/>
-<mapEntry key="org.eclipse.wst.common.project.facet.core/activation" value="false"/>
<mapEntry key="org.eclipse.help.ui/debug/embeddedBrowser" value="false"/>
+<mapEntry key="org.eclipse.wst.common.project.facet.core/activation" value="false"/>
<mapEntry key="org.eclipse.team.cvs.ssh/ssh_protocol" value="false"/>
-<mapEntry key="org.eclipse.core.resources/build/stacktrace" value="false"/>
<mapEntry key="org.eclipse.ui/perf/part.create" value="800"/>
+<mapEntry key="org.eclipse.core.resources/build/stacktrace" value="false"/>
<mapEntry key="org.eclipse.ui.intro/trace/logInfo" value="true"/>
<mapEntry key="org.eclipse.team.core/streams" value="false"/>
<mapEntry key="org.eclipse.ui.ide/debug/undomonitor" value="false"/>
-<mapEntry key="org.eclipse.jdt.ui/perf/explorer/RefactorActionGroup" value="150"/>
<mapEntry key="org.eclipse.net4j.ui/debug" value="true"/>
+<mapEntry key="org.eclipse.jdt.ui/perf/explorer/RefactorActionGroup" value="150"/>
<mapEntry key="org.eclipse.ui/experimental/menus" value="false"/>
<mapEntry key="org.eclipse.core.jobs/jobs/shutdown" value="false"/>
<mapEntry key="org.eclipse.osgi/debug/packageadmin" value="false"/>
<mapEntry key="org.eclipse.emf.cdo/debug.session" value="true"/>
<mapEntry key="org.eclipse.core.runtime/compatibility/debug" value="false"/>
-<mapEntry key="org.eclipse.emf.cdo/debug.adapter" value="true"/>
<mapEntry key="org.eclipse.wst.sse.ui/storagemodelprovider/operations" value="false"/>
+<mapEntry key="org.eclipse.emf.cdo/debug.adapter" value="true"/>
<mapEntry key="org.eclipse.ui/debug/declaredImages" value="false"/>
<mapEntry key="org.eclipse.update.core/debug/reconciler" value="false"/>
<mapEntry key="org.eclipse.ui.ide/debug/gc" value="false"/>
@@ -385,51 +385,51 @@
<mapEntry key="org.eclipse.emf.transaction/debug" value="true"/>
<mapEntry key="org.eclipse.osgi/debug/services" value="false"/>
<mapEntry key="org.eclipse.net4j.db.mysql/debug.sql" value="true"/>
-<mapEntry key="org.eclipse.datatools.connectivity/connectionprofileextension" value="false"/>
<mapEntry key="org.eclipse.net4j.util.ui/debug" value="true"/>
+<mapEntry key="org.eclipse.datatools.connectivity/connectionprofileextension" value="false"/>
<mapEntry key="org.eclipse.ui.workbench/debug" value="false"/>
<mapEntry key="org.eclipse.jdt.ui/perf/content_assist/extensions" value="1000"/>
-<mapEntry key="org.eclipse.osgi/debug/filter" value="false"/>
<mapEntry key="org.eclipse.emf.cdo.protocol/debug.model" value="false"/>
+<mapEntry key="org.eclipse.osgi/debug/filter" value="false"/>
<mapEntry key="org.eclipse.debug.core/debug" value="false"/>
<mapEntry key="org.eclipse.core.resources/debug" value="false"/>
<mapEntry key="org.eclipse.jdt.core/debug/zipaccess" value="false"/>
<mapEntry key="org.eclipse.jem.util/debug/logtracefile" value="false"/>
-<mapEntry key="org.eclipse.ui.browser/debug" value="false"/>
<mapEntry key="org.eclipse.emf.cdo.server/debug.protocol" value="true"/>
+<mapEntry key="org.eclipse.ui.browser/debug" value="false"/>
<mapEntry key="org.eclipse.osgi/profile/impl" value="org.eclipse.osgi.internal.profile.DefaultProfileLogger"/>
-<mapEntry key="org.eclipse.net4j.jms.server/debug.protocol" value="true"/>
<mapEntry key="org.eclipse.update.core/debug/web" value="false"/>
+<mapEntry key="org.eclipse.net4j.jms.server/debug.protocol" value="true"/>
<mapEntry key="org.eclipse.team.cvs.core/debug" value="false"/>
<mapEntry key="org.eclipse.help/debug" value="true"/>
<mapEntry key="org.eclipse.core.runtime/perf" value="false"/>
<mapEntry key="org.eclipse.osgi/trace/filters" value="trace.properties"/>
-<mapEntry key="org.eclipse.emf.ocl/debug/methods/entering" value="false"/>
<mapEntry key="org.eclipse.wst.sse.core/dom/adapter/notification/time" value="false"/>
+<mapEntry key="org.eclipse.emf.ocl/debug/methods/entering" value="false"/>
<mapEntry key="org.eclipse.net4j/debug.channel" value="true"/>
<mapEntry key="org.eclipse.emf.cdo/debug.revision" value="true"/>
<mapEntry key="org.eclipse.emf.cdo/debug.view" value="true"/>
<mapEntry key="org.eclipse.ui/perf/part.listeners" value="200"/>
<mapEntry key="org.eclipse.debug.ui/debug/viewers/viewer" value="false"/>
-<mapEntry key="org.eclipse.wst.sse.core/dom/adapter/notification/time/criteria" value="10"/>
<mapEntry key="org.eclipse.ui/trace/keyBindings.verbose" value="false"/>
+<mapEntry key="org.eclipse.wst.sse.core/dom/adapter/notification/time/criteria" value="10"/>
<mapEntry key="org.eclipse.wst.common.environment/trace/data" value="true"/>
-<mapEntry key="org.eclipse.osgi/defaultprofile/buffersize" value="256"/>
<mapEntry key="org.eclipse.core.resources/restore/syncinfo" value="false"/>
-<mapEntry key="org.eclipse.team.cvs.core/syncchangeevents" value="false"/>
+<mapEntry key="org.eclipse.osgi/defaultprofile/buffersize" value="256"/>
<mapEntry key="org.eclipse.ui/perf/page.listeners" value="200"/>
-<mapEntry key="org.eclipse.ocl/debug/exceptions/throwing" value="false"/>
+<mapEntry key="org.eclipse.team.cvs.core/syncchangeevents" value="false"/>
<mapEntry key="org.eclipse.emf.cdo.protocol/debug" value="true"/>
-<mapEntry key="org.eclipse.datatools.connectivity/debug" value="true"/>
+<mapEntry key="org.eclipse.ocl/debug/exceptions/throwing" value="false"/>
<mapEntry key="org.eclipse.emf.cdo/debug.resource" value="true"/>
+<mapEntry key="org.eclipse.datatools.connectivity/debug" value="true"/>
<mapEntry key="org.eclipse.jet/debug/modelLoaderExtensions" value="false"/>
<mapEntry key="org.eclipse.wst.sse.core/debug" value="true"/>
<mapEntry key="org.eclipse.ui/trace/handlers.verbose" value="false"/>
<mapEntry key="org.eclipse.emf.validation/debug" value="true"/>
<mapEntry key="org.eclipse.wst.sse.ui/storagemodelprovider/elementstatelistener" value="false"/>
<mapEntry key="org.eclipse.osgi/monitor/resources" value="false"/>
-<mapEntry key="com.ibm.datatools.core.ui/editor/log" value="true"/>
<mapEntry key="org.eclipse.emf.validation/debug/constraints/evaluation" value="false"/>
+<mapEntry key="com.ibm.datatools.core.ui/editor/log" value="true"/>
<mapEntry key="org.eclipse.jet/debug/xpath/compilations" value="false"/>
<mapEntry key="org.eclipse.ui/perf/part.control" value="800"/>
<mapEntry key="org.eclipse.net4j/debug.buffer.stream" value="false"/>
@@ -437,23 +437,23 @@
<mapEntry key="org.eclipse.core.runtime/url/debug/cachelookup" value="false"/>
<mapEntry key="org.eclipse.ui/listeners/IWorkbenchWindow.IPartListener2" value="false"/>
<mapEntry key="org.eclipse.core.resources/build/delta" value="false"/>
-<mapEntry key="org.eclipse.core.resources/build/interrupt" value="false"/>
<mapEntry key="org.eclipse.jet/debug/pluginProjectMonitor" value="false"/>
+<mapEntry key="org.eclipse.core.resources/build/interrupt" value="false"/>
<mapEntry key="org.eclipse.emf.validation/debug/methods/exiting" value="false"/>
<mapEntry key="org.eclipse.core.runtime/preferences/plugin" value="false"/>
<mapEntry key="org.eclipse.core.runtime/url/debug" value="false"/>
<mapEntry key="org.eclipse.osgi/resolver/cycles" value="false"/>
<mapEntry key="org.eclipse.ui/listeners/IWorkbenchWindow.IPartListener" value="false"/>
-<mapEntry key="org.eclipse.wst.sse.core/filebuffers/lifecycle" value="false"/>
<mapEntry key="org.eclipse.wst.sse.core/structuredmodel/locks" value="true"/>
+<mapEntry key="org.eclipse.wst.sse.core/filebuffers/lifecycle" value="false"/>
<mapEntry key="org.eclipse.jdt.core/debug/resolution" value="false"/>
<mapEntry key="org.eclipse.wst.common.environment/debug" value="true"/>
<mapEntry key="org.eclipse.update.configurator/debug" value="false"/>
-<mapEntry key="org.eclipse.help.ui/debug" value="true"/>
<mapEntry key="org.eclipse.debug.ui/debug/viewers/deltas" value="false"/>
+<mapEntry key="org.eclipse.help.ui/debug" value="true"/>
<mapEntry key="org.eclipse.emf.query.ocl/debug/methods/exiting" value="false"/>
-<mapEntry key="org.eclipse.osgi/eclipseadaptor/debug/location" value="false"/>
<mapEntry key="org.eclipse.ocl/debug/methods/exiting" value="false"/>
+<mapEntry key="org.eclipse.osgi/eclipseadaptor/debug/location" value="false"/>
<mapEntry key="org.eclipse.wst.sse.ui/debug/reconcilerSpelling" value="false"/>
<mapEntry key="org.eclipse.emf.transaction/debug/methods/entering" value="false"/>
<mapEntry key="org.eclipse.ui.intro.universal/trace/logInfo" value="true"/>
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ImportRootsAction.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ImportRootsAction.java
index 6219f44..e0538a0 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ImportRootsAction.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ImportRootsAction.java
@@ -79,7 +79,7 @@ public class ImportRootsAction extends EditingDomainAction
List<Resource> resources = getSourceResources();
for (Resource resource : resources)
{
- List<EObject> contents = new ArrayList(resource.getContents());
+ List<EObject> contents = new ArrayList<EObject>(resource.getContents());
for (EObject root : contents)
{
targetContents.add(root);
@@ -90,7 +90,7 @@ public class ImportRootsAction extends EditingDomainAction
protected List<Resource> getSourceResources()
{
ResourceSetImpl resourceSet = createSourceResourceSet();
- List<Resource> resources = new ArrayList(uris.size());
+ List<Resource> resources = new ArrayList<Resource>(uris.size());
for (URI uri : uris)
{
Resource resource = resourceSet.getResource(uri, true);
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/RegisterFilesystemPackagesAction.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/RegisterFilesystemPackagesAction.java
index 15a545b..4c6301d 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/RegisterFilesystemPackagesAction.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/RegisterFilesystemPackagesAction.java
@@ -59,7 +59,7 @@ public class RegisterFilesystemPackagesAction extends RegisterPackagesAction
if (fileNames != null && fileNames.length != 0)
{
ResourceSet resourceSet = EMFUtil.newEcoreResourceSet();
- List<EPackage> ePackages = new ArrayList(fileNames.length);
+ List<EPackage> ePackages = new ArrayList<EPackage>(fileNames.length);
for (String fileName : fileNames)
{
String path = filterPath + File.separator + fileName;
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/RegisterGeneratedPackagesAction.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/RegisterGeneratedPackagesAction.java
index 2578152..1a8bf7a 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/RegisterGeneratedPackagesAction.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/RegisterGeneratedPackagesAction.java
@@ -48,7 +48,7 @@ public class RegisterGeneratedPackagesAction extends RegisterPackagesAction
if (dialog.open() == SelectPackageDialog.OK)
{
Set<String> checkedURIs = dialog.getCheckedURIs();
- List<EPackage> ePackages = new ArrayList(checkedURIs.size());
+ List<EPackage> ePackages = new ArrayList<EPackage>(checkedURIs.size());
for (String uri : checkedURIs)
{
EPackage ePackage = registry.getEPackage(uri);
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/RegisterWorkspacePackagesAction.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/RegisterWorkspacePackagesAction.java
index 9370999..321beac 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/RegisterWorkspacePackagesAction.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/RegisterWorkspacePackagesAction.java
@@ -49,7 +49,7 @@ public class RegisterWorkspacePackagesAction extends RegisterPackagesAction
if (result != null && result.length != 0)
{
ResourceSet resourceSet = EMFUtil.newEcoreResourceSet();
- List<EPackage> ePackages = new ArrayList(result.length);
+ List<EPackage> ePackages = new ArrayList<EPackage>(result.length);
for (Object object : result)
{
if (object instanceof IFile)
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/PackageManagerDialog.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/PackageManagerDialog.java
index f03f969..fffa5b3 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/PackageManagerDialog.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/PackageManagerDialog.java
@@ -306,7 +306,7 @@ public class PackageManagerDialog extends TitleAreaDialog
return NO_ELEMENTS;
}
- Map<String, Content> map = new HashMap();
+ Map<String, Content> map = new HashMap<String, Content>();
for (Entry<String, Object> entry : session.getPackageRegistry().entrySet())
{
String packageURI = entry.getKey();
@@ -328,7 +328,7 @@ public class PackageManagerDialog extends TitleAreaDialog
content.setCDOPackage(cdoPackage);
}
- ArrayList<Content> list = new ArrayList(map.values());
+ ArrayList<Content> list = new ArrayList<Content>(map.values());
Collections.sort(list);
return list.toArray(new Content[list.size()]);
}
@@ -337,7 +337,7 @@ public class PackageManagerDialog extends TitleAreaDialog
/**
* @author Eike Stepper
*/
- public static final class Content implements Comparable
+ public static final class Content implements Comparable<Content>
{
private String packageURI;
@@ -375,9 +375,9 @@ public class PackageManagerDialog extends TitleAreaDialog
this.cdoPackage = cdoPackage;
}
- public int compareTo(Object obj)
+ public int compareTo(Content content)
{
- return packageURI.compareTo(((Content)obj).packageURI);
+ return packageURI.compareTo(content.packageURI);
}
@Override
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/SelectPackageDialog.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/SelectPackageDialog.java
index b0cd95c..8975a51 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/SelectPackageDialog.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/SelectPackageDialog.java
@@ -49,9 +49,9 @@ public class SelectPackageDialog extends BaseDialog<CheckboxTableViewer>
private Map<String, CDOPackageType> packageTypes = CDOUtil.getPackageTypes();
- private Set<String> excludedURIs = new HashSet();
+ private Set<String> excludedURIs = new HashSet<String>();
- private Set<String> checkedURIs = new HashSet();
+ private Set<String> checkedURIs = new HashSet<String>();
public SelectPackageDialog(Shell shell, String title, String message, Set<String> excludedURIs)
{
@@ -119,10 +119,10 @@ public class SelectPackageDialog extends BaseDialog<CheckboxTableViewer>
public Object[] getElements(Object inputElement)
{
- Set<String> uris = new HashSet(packageTypes.keySet());
+ Set<String> uris = new HashSet<String>(packageTypes.keySet());
uris.removeAll(excludedURIs);
- List<String> elements = new ArrayList(uris);
+ List<String> elements = new ArrayList<String>(uris);
Collections.sort(elements);
return elements.toArray();
}
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/views/CDOEventHandler.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/views/CDOEventHandler.java
index ce455e2..d3bf99d 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/views/CDOEventHandler.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/views/CDOEventHandler.java
@@ -54,7 +54,7 @@ public class CDOEventHandler
}
else if (event instanceof IContainerEvent)
{
- IContainerEvent e = (IContainerEvent)event;
+ IContainerEvent<?> e = (IContainerEvent<?>)event;
if (e.getDeltaElement() == view && e.getDeltaKind() == IContainerDelta.Kind.REMOVED)
{
viewClosed();
@@ -78,7 +78,7 @@ public class CDOEventHandler
if (event instanceof CDOTransactionCommittedEvent)
{
Map<CDOID, CDOID> idMappings = ((CDOTransactionCommittedEvent)event).getIDMappings();
- HashSet newOIDs = new HashSet(idMappings.values());
+ HashSet<CDOID> newOIDs = new HashSet<CDOID>(idMappings.values());
new ItemsProcessor(view)
{
@Override
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/views/CDOItemProvider.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/views/CDOItemProvider.java
index 0f0b4a4..563e499 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/views/CDOItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/views/CDOItemProvider.java
@@ -30,6 +30,7 @@ import org.eclipse.emf.cdo.internal.ui.actions.OpenViewEditorAction;
import org.eclipse.emf.cdo.internal.ui.views.CDOViewHistory.Entry;
import org.eclipse.net4j.IConnector;
+import org.eclipse.net4j.util.container.IContainer;
import org.eclipse.net4j.util.event.IEvent;
import org.eclipse.net4j.util.event.IListener;
import org.eclipse.net4j.util.ui.views.ContainerItemProvider;
@@ -48,11 +49,11 @@ import java.util.Map;
/**
* @author Eike Stepper
*/
-public class CDOItemProvider extends ContainerItemProvider
+public class CDOItemProvider extends ContainerItemProvider<IContainer<Object>>
{
private IWorkbenchPage page;
- private Map<CDOView, CDOViewHistory> viewHistories = new HashMap();
+ private Map<CDOView, CDOViewHistory> viewHistories = new HashMap<CDOView, CDOViewHistory>();
private IListener viewListener = new IListener()
{
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/views/CDOSessionsView.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/views/CDOSessionsView.java
index 19113ae..e3fb0b7 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/views/CDOSessionsView.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/views/CDOSessionsView.java
@@ -5,6 +5,7 @@ import org.eclipse.emf.cdo.CDOView;
import org.eclipse.emf.cdo.internal.ui.editor.CDOEditor;
import org.eclipse.emf.cdo.protocol.CDOProtocolConstants;
+import org.eclipse.net4j.util.container.IContainer;
import org.eclipse.net4j.util.container.IManagedContainer;
import org.eclipse.net4j.util.container.IPluginContainer;
import org.eclipse.net4j.util.ui.actions.LongRunningAction;
@@ -35,7 +36,7 @@ public class CDOSessionsView extends ContainerView
}
@Override
- protected ContainerItemProvider createContainerItemProvider()
+ protected ContainerItemProvider<IContainer<Object>> createContainerItemProvider()
{
return new CDOItemProvider(getSite().getPage(), new IElementFilter()
{
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/views/CDOViewHistory.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/views/CDOViewHistory.java
index 12c711e..84fbed4 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/views/CDOViewHistory.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/views/CDOViewHistory.java
@@ -30,7 +30,7 @@ public final class CDOViewHistory extends Notifier
{
private CDOView view;
- private Set<Entry> entries = new HashSet();
+ private Set<Entry> entries = new HashSet<Entry>();
private IListener viewListener = new IListener()
{
@@ -82,7 +82,7 @@ public final class CDOViewHistory extends Notifier
public void reset()
{
- Set<Entry> openResources = new HashSet();
+ Set<Entry> openResources = new HashSet<Entry>();
for (Resource resource : view.getResourceSet().getResources())
{
if (resource instanceof CDOResource)
@@ -148,7 +148,7 @@ public final class CDOViewHistory extends Notifier
/**
* @author Eike Stepper
*/
- public final class Entry implements Comparable
+ public final class Entry implements Comparable<Entry>
{
private String resourcePath;
@@ -172,9 +172,9 @@ public final class CDOViewHistory extends Notifier
return resourcePath;
}
- public int compareTo(Object o)
+ public int compareTo(Entry entry)
{
- return resourcePath.compareTo(((Entry)o).resourcePath);
+ return resourcePath.compareTo(entry.resourcePath);
}
@Override
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 6d99c97..817190c 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
@@ -169,7 +169,7 @@ public class CDOResourceImpl extends CDOObjectImpl implements CDOResource
EList<EObject> transientContents = (EList<EObject>)eSettings[EresourcePackage.CDO_RESOURCE__CONTENTS];
if (transientContents == null)
{
- transientContents = new TransientContents();
+ transientContents = new TransientContents<EObject>();
eSettings[EresourcePackage.CDO_RESOURCE__CONTENTS] = transientContents;
}
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 c7cf550..22b6df2 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
@@ -82,7 +82,7 @@ public final class CDOUtil
{
if (packageTypes == null)
{
- packageTypes = new HashMap();
+ packageTypes = new HashMap<String, CDOPackageType>();
IExtensionRegistry registry = Platform.getExtensionRegistry();
// Collect native packages
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/util/EMFUtil.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/util/EMFUtil.java
index 9579c18..9a5c93e 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/util/EMFUtil.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/util/EMFUtil.java
@@ -156,7 +156,7 @@ public final class EMFUtil
public static List<EClass> getPersistentClasses(EPackage ePackage)
{
- List<EClass> result = new ArrayList();
+ List<EClass> result = new ArrayList<EClass>();
for (EClassifier classifier : ePackage.getEClassifiers())
{
if (classifier instanceof EClass)
@@ -170,7 +170,7 @@ public final class EMFUtil
public static List<EStructuralFeature> getPersistentFeatures(EList<EStructuralFeature> eFeatures)
{
- List<EStructuralFeature> result = new ArrayList();
+ List<EStructuralFeature> result = new ArrayList<EStructuralFeature>();
for (EStructuralFeature feature : eFeatures)
{
if (feature.isTransient())
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOCallbackImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOCallbackImpl.java
index 603c784..da76a3a 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOCallbackImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOCallbackImpl.java
@@ -94,8 +94,8 @@ public class CDOCallbackImpl extends CDOAdapterImpl implements CDOCallback
private void notifyAddMany(Notification msg)
{
- List newValues = (List)msg.getNewValue();
- List oldValues = (List)msg.getOldValue();
+ List<?> newValues = (List<?>)msg.getNewValue();
+ List<?> oldValues = (List<?>)msg.getOldValue();
for (Object newValue : newValues)
{
if (!oldValues.contains(newValue))
@@ -119,8 +119,8 @@ public class CDOCallbackImpl extends CDOAdapterImpl implements CDOCallback
private void notifyRemoveMany(Notification msg)
{
- List newValues = (List)msg.getNewValue();
- List oldValues = (List)msg.getOldValue();
+ List<?> newValues = (List<?>)msg.getNewValue();
+ List<?> oldValues = (List<?>)msg.getOldValue();
for (Object oldValue : oldValues)
{
if (!newValues.contains(oldValue))
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOLegacyImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOLegacyImpl.java
index a59306f..abe5d10 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOLegacyImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOLegacyImpl.java
@@ -217,17 +217,17 @@ public abstract class CDOLegacyImpl extends CDOWrapperImpl
Object instanceValue = getInstanceValue(instance, feature);
if (feature.isMany())
{
- List revisionList = revision.getList(feature); // TODO lazy?
+ List<Object> revisionList = revision.getList(feature); // TODO lazy?
revisionList.clear();
if (instanceValue != null)
{
if (instanceValue instanceof InternalEList)
{
- InternalEList instanceList = (InternalEList)instanceValue;
+ InternalEList<?> instanceList = (InternalEList<?>)instanceValue;
if (instanceList != null)
{
- for (Iterator it = instanceList.basicIterator(); it.hasNext();)
+ for (Iterator<?> it = instanceList.basicIterator(); it.hasNext();)
{
Object instanceElement = it.next();
if (instanceElement != null && feature.isReference())
@@ -342,11 +342,11 @@ public abstract class CDOLegacyImpl extends CDOWrapperImpl
Object value = revision.getValue(feature);
if (feature.isMany())
{
- InternalEList instanceList = (InternalEList)getInstanceValue(instance, feature);
+ InternalEList<Object> instanceList = (InternalEList<Object>)getInstanceValue(instance, feature);
if (instanceList != null)
{
clearEList(instanceList);
- List revisionList = (List)value;
+ List<?> revisionList = (List<?>)value;
for (Object element : revisionList)
{
if (feature.isReference())
@@ -497,7 +497,7 @@ public abstract class CDOLegacyImpl extends CDOWrapperImpl
}
}
- protected void clearEList(InternalEList list)
+ protected void clearEList(InternalEList<Object> list)
{
while (!list.isEmpty())
{
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOSessionFactory.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOSessionFactory.java
index b58c1f5..62f57a9 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOSessionFactory.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOSessionFactory.java
@@ -24,7 +24,7 @@ import org.eclipse.core.runtime.Path;
/**
* @author Eike Stepper
*/
-public class CDOSessionFactory extends Factory<CDOSession>
+public class CDOSessionFactory extends Factory
{
public static final String PRODUCT_GROUP = "org.eclipse.emf.cdo.sessions";
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 67d6902..4fbedf9 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
@@ -106,13 +106,13 @@ public class CDOSessionImpl extends Container<CDOView> implements CDOSession
private CDORevisionManagerImpl revisionManager;
- private Map<CDOID, InternalEObject> idToMetaInstanceMap = new HashMap();
+ private Map<CDOID, InternalEObject> idToMetaInstanceMap = new HashMap<CDOID, InternalEObject>();
- private Map<InternalEObject, CDOID> metaInstanceToIDMap = new HashMap();
+ private Map<InternalEObject, CDOID> metaInstanceToIDMap = new HashMap<InternalEObject, CDOID>();
- private ConcurrentMap<CDOID, CDOClassImpl> types = new ConcurrentHashMap();
+ private ConcurrentMap<CDOID, CDOClassImpl> types = new ConcurrentHashMap<CDOID, CDOClassImpl>();
- private Map<ResourceSet, CDOViewImpl> views = new HashMap();
+ private Map<ResourceSet, CDOViewImpl> views = new HashMap<ResourceSet, CDOViewImpl>();
private transient int lastViewID = 0;
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 ca8daea..a644143 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
@@ -244,7 +244,7 @@ public final class CDOStateMachine extends FiniteStateMachine<CDOState, CDOEvent
object.cdoInternalSetState(CDOState.NEW);
// Finalize content tree
- for (Iterator it = FSMUtil.iterator(object.eContents(), transaction); it.hasNext();)
+ for (Iterator<?> it = FSMUtil.iterator(object.eContents(), transaction); it.hasNext();)
{
InternalCDOObject content = (InternalCDOObject)it.next();
INSTANCE.process(content, CDOEvent.FINALIZE_ATTACH, data);
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 423c25d..da91f91 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
@@ -47,11 +47,11 @@ public class CDOTransactionImpl extends CDOViewImpl implements CDOTransaction
private List<CDOPackageImpl> newPackages;
- private Map<CDOID, CDOResourceImpl> newResources = new HashMap();
+ private Map<CDOID, CDOResourceImpl> newResources = new HashMap<CDOID, CDOResourceImpl>();
- private Map<CDOID, InternalCDOObject> newObjects = new HashMap();
+ private Map<CDOID, InternalCDOObject> newObjects = new HashMap<CDOID, InternalCDOObject>();
- private Map<CDOID, InternalCDOObject> dirtyObjects = new HashMap();
+ private Map<CDOID, InternalCDOObject> dirtyObjects = new HashMap<CDOID, InternalCDOObject>();
private boolean dirty;
@@ -217,6 +217,7 @@ public class CDOTransactionImpl extends CDOViewImpl implements CDOTransaction
register(dirtyObjects, object);
}
+ @SuppressWarnings("unchecked")
private void register(Map map, InternalCDOObject object)
{
Object old = map.put(object.cdoID(), object);
@@ -232,6 +233,7 @@ public class CDOTransactionImpl extends CDOViewImpl implements CDOTransaction
}
}
+ @SuppressWarnings("unchecked")
private void preCommit(Map objects)
{
if (!objects.isEmpty())
@@ -243,6 +245,7 @@ public class CDOTransactionImpl extends CDOViewImpl implements CDOTransaction
}
}
+ @SuppressWarnings("unchecked")
private void postCommit(Map objects, CommitTransactionResult result)
{
if (!objects.isEmpty())
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/CDOClientProtocol.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/CDOClientProtocol.java
index 26c84ff..9b534f6 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/CDOClientProtocol.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/CDOClientProtocol.java
@@ -15,12 +15,10 @@ import org.eclipse.emf.cdo.protocol.CDOProtocolConstants;
import org.eclipse.net4j.signal.SignalProtocol;
import org.eclipse.net4j.signal.SignalReactor;
-import org.eclipse.emf.internal.cdo.CDOSessionImpl;
-
/**
* @author Eike Stepper
*/
-public class CDOClientProtocol extends SignalProtocol<CDOSessionImpl>
+public class CDOClientProtocol extends SignalProtocol
{
public CDOClientProtocol()
{
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/CDOClientProtocolFactory.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/CDOClientProtocolFactory.java
index ab0fc43..fa56586 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/CDOClientProtocolFactory.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/CDOClientProtocolFactory.java
@@ -9,7 +9,7 @@ import org.eclipse.internal.net4j.ClientProtocolFactory;
/**
* @author Eike Stepper
*/
-public final class CDOClientProtocolFactory extends ClientProtocolFactory<CDOClientProtocol>
+public final class CDOClientProtocolFactory extends ClientProtocolFactory
{
public static final String TYPE = CDOProtocolConstants.PROTOCOL_NAME;
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/CDOClientRequest.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/CDOClientRequest.java
index f60ad81..1f73a7d 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/CDOClientRequest.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/CDOClientRequest.java
@@ -43,7 +43,7 @@ public abstract class CDOClientRequest<RESULT> extends RequestWithConfirmation<R
protected CDOSessionImpl getSession()
{
- return getProtocol().getInfraStructure();
+ return (CDOSessionImpl)getProtocol().getInfraStructure();
}
@Override
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 ebce70f..ac7a3d6 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
@@ -106,10 +106,10 @@ public class CommitTransactionRequest extends CDOClientRequest<CommitTransaction
writeRevisions(out, dirtyObjects);
}
- private void writeRevisions(ExtendedDataOutputStream out, Collection objects) throws IOException
+ private void writeRevisions(ExtendedDataOutputStream out, Collection<?> objects) throws IOException
{
out.writeInt(objects.size());
- for (Iterator it = objects.iterator(); it.hasNext();)
+ for (Iterator<?> it = objects.iterator(); it.hasNext();)
{
InternalCDOObject object = (InternalCDOObject)it.next();
CDORevisionImpl revision = (CDORevisionImpl)object.cdoRevision();
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/CommitTransactionResult.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/CommitTransactionResult.java
index eca706c..cd9bf95 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/CommitTransactionResult.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/CommitTransactionResult.java
@@ -22,7 +22,7 @@ public final class CommitTransactionResult
{
private long timeStamp;
- private Map<CDOID, CDOID> idMappings = new HashMap();
+ private Map<CDOID, CDOID> idMappings = new HashMap<CDOID, CDOID>();
public CommitTransactionResult(long timeStamp)
{
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 bd434a2..3b9cecd 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
@@ -57,7 +57,7 @@ public class InvalidationIndication extends Indication
PROTOCOL.format("Reading {0} IDs", size);
}
- Set<CDOID> dirtyOIDs = new HashSet();
+ Set<CDOID> dirtyOIDs = new HashSet<CDOID>();
for (int i = 0; i < size; i++)
{
CDOID dirtyOID = CDOIDImpl.read(in);
@@ -69,7 +69,7 @@ public class InvalidationIndication extends Indication
protected CDOSessionImpl getSession()
{
- return getProtocol().getInfraStructure();
+ return (CDOSessionImpl)getProtocol().getInfraStructure();
}
@Override
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/LoadPackageRequest.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/LoadPackageRequest.java
index 7cddb45..ac2c0a1 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/LoadPackageRequest.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/LoadPackageRequest.java
@@ -22,7 +22,7 @@ import java.io.IOException;
/**
* @author Eike Stepper
*/
-public class LoadPackageRequest extends CDOClientRequest
+public class LoadPackageRequest extends CDOClientRequest<Object>
{
private CDOPackageImpl cdoPackage;
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/OpenSessionResult.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/OpenSessionResult.java
index 908e141..4003dae 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/OpenSessionResult.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/OpenSessionResult.java
@@ -25,7 +25,7 @@ public final class OpenSessionResult
private String repositoryUUID;
- private List<CDOPackageInfo> packageInfos = new ArrayList();
+ private List<CDOPackageInfo> packageInfos = new ArrayList<CDOPackageInfo>();
public OpenSessionResult(int sessionID, String repositoryUUID)
{
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/FSMUtil.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/FSMUtil.java
index a14c051..44eb106 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/FSMUtil.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/FSMUtil.java
@@ -128,9 +128,9 @@ public final class FSMUtil
return null;
}
- public static Iterator<InternalCDOObject> iterator(Collection instances, final CDOViewImpl view)
+ public static Iterator<InternalCDOObject> iterator(Collection<?> instances, final CDOViewImpl view)
{
- final Iterator delegate = instances.iterator();
+ final Iterator<?> delegate = instances.iterator();
return new Iterator<InternalCDOObject>()
{
private Object next;
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 c0f065f..8ca2a81 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
@@ -56,7 +56,7 @@ public final class PackageClosure
}
// Handle >1 packages
- Set<EPackage> result = new HashSet();
+ Set<EPackage> result = new HashSet<EPackage>();
for (EPackage ePackage : ePackages)
{
Set<EPackage> packages = calculate(ePackage);
@@ -76,7 +76,7 @@ public final class PackageClosure
TRACER.trace("Package closure for " + ePackage.getNsURI());
}
- Set<EClass> visited = new HashSet();
+ Set<EClass> visited = new HashSet<EClass>();
List<EClassifier> classifiers = ePackage.getEClassifiers();
for (EClassifier classifier : classifiers)
@@ -84,7 +84,7 @@ public final class PackageClosure
handleEClassifier(classifier, visited);
}
- Set<EPackage> result = new HashSet();
+ Set<EPackage> result = new HashSet<EPackage>();
for (EClass eClass : visited)
{
final EPackage p = eClass.getEPackage();
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/ProxyResolverURIResourceMap.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/ProxyResolverURIResourceMap.java
index f51179d..76b9301 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/ProxyResolverURIResourceMap.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/ProxyResolverURIResourceMap.java
@@ -22,7 +22,8 @@ public final class ProxyResolverURIResourceMap implements Map<URI, Resource>
{
if (delegate == null)
{
- delegate = new HashMap(); // TODO Cleanup of this lookup cache?
+ delegate = new HashMap<URI, Resource>(); // TODO Cleanup of this lookup
+ // cache?
}
this.delegate = delegate;
diff --git a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/db/DBSelect.java b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/db/DBSelect.java
index 4ac4460..b96c6e1 100644
--- a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/db/DBSelect.java
+++ b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/db/DBSelect.java
@@ -21,9 +21,9 @@ import java.util.List;
*/
public abstract class DBSelect implements IDBRowHandler
{
- private List<IDBField> fields = new ArrayList(0);
+ private List<IDBField> fields = new ArrayList<IDBField>(0);
- private List<Pair<IDBField, Boolean>> orders = new ArrayList(0);
+ private List<Pair<IDBField, Boolean>> orders = new ArrayList<Pair<IDBField, Boolean>>(0);
private String where;
@@ -40,7 +40,7 @@ public abstract class DBSelect implements IDBRowHandler
public DBSelect order(IDBField field, boolean asc)
{
- orders.add(new Pair(field, asc));
+ orders.add(new Pair<IDBField, Boolean>(field, asc));
return this;
}
diff --git a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/DBAdapterRegistry.java b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/DBAdapterRegistry.java
index 5bb1b26..bd9bff8 100644
--- a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/DBAdapterRegistry.java
+++ b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/DBAdapterRegistry.java
@@ -24,7 +24,7 @@ public class DBAdapterRegistry extends HashMapRegistry<String, IDBAdapter> imple
{
public static final DBAdapterRegistry INSTANCE = new DBAdapterRegistry();
- private Map<String, DBAdapterDescriptor> descriptors = new HashMap();
+ private Map<String, DBAdapterDescriptor> descriptors = new HashMap<String, DBAdapterDescriptor>();
public DBAdapterRegistry()
{
diff --git a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/DBSchema.java b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/DBSchema.java
index f0f9d8b..8c7778a 100644
--- a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/DBSchema.java
+++ b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/DBSchema.java
@@ -29,7 +29,7 @@ public class DBSchema extends DBElement implements IDBSchema
{
private String name;
- private Map<String, DBTable> tables = new HashMap();
+ private Map<String, DBTable> tables = new HashMap<String, DBTable>();
private boolean locked;
diff --git a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/DBTable.java b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/DBTable.java
index b658ce6..bf1d1e8 100644
--- a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/DBTable.java
+++ b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/DBTable.java
@@ -30,9 +30,9 @@ public class DBTable extends DBElement implements IDBTable
private String name;
- private List<DBField> fields = new ArrayList();
+ private List<DBField> fields = new ArrayList<DBField>();
- private List<DBIndex> indices = new ArrayList();
+ private List<DBIndex> indices = new ArrayList<DBIndex>();
public DBTable(DBSchema schema, String name)
{
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 7b16e0e..0f3d599 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
@@ -29,7 +29,7 @@ public class RemoteTraceManager extends Lifecycle implements Listener
private RemoteTraceServer server;
- private List<Event> events = new ArrayList();
+ private List<Event> events = new ArrayList<Event>();
public RemoteTraceManager()
{
diff --git a/plugins/org.eclipse.net4j.debug/src/org/eclipse/net4j/internal/debug/views/IntrospectorView.java b/plugins/org.eclipse.net4j.debug/src/org/eclipse/net4j/internal/debug/views/IntrospectorView.java
index 71801f5..d9e1711 100644
--- a/plugins/org.eclipse.net4j.debug/src/org/eclipse/net4j/internal/debug/views/IntrospectorView.java
+++ b/plugins/org.eclipse.net4j.debug/src/org/eclipse/net4j/internal/debug/views/IntrospectorView.java
@@ -69,7 +69,7 @@ public class IntrospectorView extends ViewPart implements ISelectionListener, ID
private TableViewer mapViewer;
- private Stack elements = new Stack();
+ private Stack<Object> elements = new Stack<Object>();
private Text classLabel;
@@ -216,7 +216,7 @@ public class IntrospectorView extends ViewPart implements ISelectionListener, ID
Object element = ssel.getFirstElement();
if (currentViewer == objectViewer && element instanceof Pair)
{
- Pair<Field, Object> pair = (Pair)element;
+ Pair<Field, Object> pair = (Pair<Field, Object>)element;
Field field = pair.getElement1();
if (!field.getType().isPrimitive())
{
@@ -225,7 +225,7 @@ public class IntrospectorView extends ViewPart implements ISelectionListener, ID
}
else if (currentViewer == mapViewer && element instanceof Map.Entry)
{
- Map.Entry entry = (Map.Entry)element;
+ Map.Entry<?, ?> entry = (Map.Entry<?, ?>)element;
setObject(entry.getValue());
}
else if (currentViewer == iterableViewer)
@@ -475,7 +475,7 @@ public class IntrospectorView extends ViewPart implements ISelectionListener, ID
{
try
{
- Pair<Field, Object> pair = (Pair)obj;
+ Pair<Field, Object> pair = (Pair<Field, Object>)obj;
Field field = pair.getElement1();
Object value = pair.getElement2();
switch (index)
@@ -512,8 +512,8 @@ public class IntrospectorView extends ViewPart implements ISelectionListener, ID
Object element = elements.peek();
if (element instanceof Iterable)
{
- List result = new ArrayList();
- for (Object object : (Iterable)element)
+ List<Object> result = new ArrayList<Object>();
+ for (Object object : (Iterable<Object>)element)
{
result.add(object);
}
@@ -557,7 +557,7 @@ public class IntrospectorView extends ViewPart implements ISelectionListener, ID
Object element = elements.peek();
if (element instanceof Map)
{
- return ((Map)element).entrySet().toArray();
+ return ((Map<?, ?>)element).entrySet().toArray();
}
}
@@ -574,7 +574,7 @@ public class IntrospectorView extends ViewPart implements ISelectionListener, ID
{
if (obj instanceof Map.Entry)
{
- Map.Entry entry = (Map.Entry)obj;
+ Map.Entry<?, ?> entry = (Map.Entry<?, ?>)obj;
Object key = entry.getKey();
Object value = entry.getValue();
switch (index)
diff --git a/plugins/org.eclipse.net4j.jms.admin/src/org/eclipse/net4j/jms/internal/admin/protocol/JMSAdminProtocol.java b/plugins/org.eclipse.net4j.jms.admin/src/org/eclipse/net4j/jms/internal/admin/protocol/JMSAdminProtocol.java
index a7ecbe5..77dc0be 100644
--- a/plugins/org.eclipse.net4j.jms.admin/src/org/eclipse/net4j/jms/internal/admin/protocol/JMSAdminProtocol.java
+++ b/plugins/org.eclipse.net4j.jms.admin/src/org/eclipse/net4j/jms/internal/admin/protocol/JMSAdminProtocol.java
@@ -11,14 +11,13 @@
package org.eclipse.net4j.jms.internal.admin.protocol;
import org.eclipse.net4j.jms.JMSAdminProtocolConstants;
-import org.eclipse.net4j.jms.internal.admin.JMSAdmin;
import org.eclipse.net4j.signal.SignalProtocol;
import org.eclipse.net4j.signal.SignalReactor;
/**
* @author Eike Stepper
*/
-public class JMSAdminProtocol extends SignalProtocol<JMSAdmin>
+public class JMSAdminProtocol extends SignalProtocol
{
public JMSAdminProtocol()
{
diff --git a/plugins/org.eclipse.net4j.jms.admin/src/org/eclipse/net4j/jms/internal/admin/protocol/JMSAdminProtocolFactory.java b/plugins/org.eclipse.net4j.jms.admin/src/org/eclipse/net4j/jms/internal/admin/protocol/JMSAdminProtocolFactory.java
index bc22131..bf749d7 100644
--- a/plugins/org.eclipse.net4j.jms.admin/src/org/eclipse/net4j/jms/internal/admin/protocol/JMSAdminProtocolFactory.java
+++ b/plugins/org.eclipse.net4j.jms.admin/src/org/eclipse/net4j/jms/internal/admin/protocol/JMSAdminProtocolFactory.java
@@ -18,7 +18,7 @@ import org.eclipse.internal.net4j.ClientProtocolFactory;
/**
* @author Eike Stepper
*/
-public final class JMSAdminProtocolFactory extends ClientProtocolFactory<JMSAdminProtocol>
+public final class JMSAdminProtocolFactory extends ClientProtocolFactory
{
public static final String TYPE = JMSAdminProtocolConstants.PROTOCOL_NAME;
diff --git a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/Server.java b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/Server.java
index 16bfdff..ec251f7 100644
--- a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/Server.java
+++ b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/Server.java
@@ -49,11 +49,11 @@ public class Server extends QueueWorker<MessageImpl> implements IServer
private Context jndiContext;
- private ConcurrentMap<String, ServerDestination> destinations = new ConcurrentHashMap();
+ private ConcurrentMap<String, ServerDestination> destinations = new ConcurrentHashMap<String, ServerDestination>();
- private Set<ServerConnection> connections = new HashSet();
+ private Set<ServerConnection> connections = new HashSet<ServerConnection>();
- private ConcurrentMap<Long, ServerConsumer> consumers = new ConcurrentHashMap();
+ private ConcurrentMap<Long, ServerConsumer> consumers = new ConcurrentHashMap<Long, ServerConsumer>();
public Server()
{
diff --git a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/ServerConnection.java b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/ServerConnection.java
index 77c0ab0..92ee57f 100644
--- a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/ServerConnection.java
+++ b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/ServerConnection.java
@@ -25,7 +25,7 @@ public class ServerConnection implements IConnection
private String userName;
- private List<ServerSession> sessions = new ArrayList(0);
+ private List<ServerSession> sessions = new ArrayList<ServerSession>(0);
private JMSServerProtocol protocol;
@@ -78,7 +78,7 @@ public class ServerConnection implements IConnection
public ServerSession[] getSessions()
{
- List<ServerSession> result = new ArrayList(sessions.size());
+ List<ServerSession> result = new ArrayList<ServerSession>(sessions.size());
synchronized (sessions)
{
for (ServerSession session : sessions)
diff --git a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/ServerConsumer.java b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/ServerConsumer.java
index ae91c91..68df669 100644
--- a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/ServerConsumer.java
+++ b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/ServerConsumer.java
@@ -36,7 +36,7 @@ public class ServerConsumer
private boolean durable;
- private ConcurrentMap<String, MessageImpl> messages = new ConcurrentHashMap();
+ private ConcurrentMap<String, MessageImpl> messages = new ConcurrentHashMap<String, MessageImpl>();
public ServerConsumer(long id, ServerDestination destination, String messageSelector, boolean noLocal, boolean durable)
{
diff --git a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/ServerDestination.java b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/ServerDestination.java
index f14461e..f3ba8db 100644
--- a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/ServerDestination.java
+++ b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/ServerDestination.java
@@ -33,7 +33,7 @@ public class ServerDestination implements IDestination
private Type type;
- private RoundRobinList<ServerConsumer> consumers = new RoundRobinList();
+ private RoundRobinList<ServerConsumer> consumers = new RoundRobinList<ServerConsumer>();
public ServerDestination(String name, Type type)
{
diff --git a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/ServerSession.java b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/ServerSession.java
index 5a1cf37..0b53a4c 100644
--- a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/ServerSession.java
+++ b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/ServerSession.java
@@ -31,7 +31,7 @@ public class ServerSession extends Lifecycle implements ISession
private int id;
- private ConcurrentMap<Long, ServerConsumer> consumers = new ConcurrentHashMap();
+ private ConcurrentMap<Long, ServerConsumer> consumers = new ConcurrentHashMap<Long, ServerConsumer>();
public ServerSession(ServerConnection connection, int id)
{
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 de57a2d..e33f4e5 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
@@ -40,7 +40,7 @@ public class JMSAcknowledgeIndication extends Indication
int sessionID = in.readInt();
JMSServerProtocol protocol = (JMSServerProtocol)getProtocol();
- ServerConnection connection = protocol.getInfraStructure();
+ ServerConnection connection = (ServerConnection)protocol.getInfraStructure();
ServerSession session = connection.getSession(sessionID);
if (session == null)
{
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 b5875cd..cc178b1 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
@@ -43,7 +43,7 @@ public class JMSClientMessageIndication extends IndicationWithResponse
{
MessageImpl[] messages = { MessageUtil.read(in) };
JMSServerProtocol protocol = (JMSServerProtocol)getProtocol();
- ServerConnection connection = protocol.getInfraStructure();
+ ServerConnection connection = (ServerConnection)protocol.getInfraStructure();
Server server = connection.getServer();
String[] ids = server.handleClientMessages(messages);
if (ids != null && ids.length != 0)
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 b69cfe2..ad4a839 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
@@ -51,7 +51,7 @@ public class JMSCommitIndication extends IndicationWithResponse
}
JMSServerProtocol protocol = (JMSServerProtocol)getProtocol();
- ServerConnection connection = protocol.getInfraStructure();
+ ServerConnection connection = (ServerConnection)protocol.getInfraStructure();
ServerSession session = connection.getSession(sessionID);
if (session == null)
{
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 13ebc35..87f5c12 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
@@ -41,7 +41,7 @@ public class JMSOpenSessionIndication extends IndicationWithResponse
{
int sessionID = in.readInt();
JMSServerProtocol protocol = (JMSServerProtocol)getProtocol();
- ServerConnection connection = protocol.getInfraStructure();
+ ServerConnection connection = (ServerConnection)protocol.getInfraStructure();
ServerSession session = connection.openSession(sessionID);
if (session != null)
{
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 39662be..9d99581 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
@@ -40,7 +40,7 @@ public class JMSRecoverIndication extends IndicationWithResponse
{
int sessionID = in.readInt();
JMSServerProtocol protocol = (JMSServerProtocol)getProtocol();
- ServerConnection connection = protocol.getInfraStructure();
+ ServerConnection connection = (ServerConnection)protocol.getInfraStructure();
ServerSession session = connection.getSession(sessionID);
if (session == null)
{
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 4a67b87..7d30483 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
@@ -47,7 +47,7 @@ public class JMSRegisterConsumerIndication extends IndicationWithResponse
boolean noLocal = in.readBoolean();
boolean durable = in.readBoolean();
JMSServerProtocol protocol = (JMSServerProtocol)getProtocol();
- ServerConnection connection = protocol.getInfraStructure();
+ ServerConnection connection = (ServerConnection)protocol.getInfraStructure();
ServerSession session = connection.getSession(sessionID);
consumerID = session.registerConsumer(destination, messageSelector, noLocal, durable);
}
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 fec3dc0..5d1de67 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
@@ -40,7 +40,7 @@ public class JMSRollbackIndication extends IndicationWithResponse
{
int sessionID = in.readInt();
JMSServerProtocol protocol = (JMSServerProtocol)getProtocol();
- ServerConnection connection = protocol.getInfraStructure();
+ ServerConnection connection = (ServerConnection)protocol.getInfraStructure();
ServerSession session = connection.getSession(sessionID);
if (session == null)
{
diff --git a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSServerProtocol.java b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSServerProtocol.java
index 4e8e58f..9423aba 100644
--- a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSServerProtocol.java
+++ b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSServerProtocol.java
@@ -11,16 +11,14 @@
package org.eclipse.net4j.jms.internal.server.protocol;
import org.eclipse.net4j.jms.JMSProtocolConstants;
-import org.eclipse.net4j.jms.internal.server.ServerConnection;
import org.eclipse.net4j.signal.SignalProtocol;
import org.eclipse.net4j.signal.SignalReactor;
/**
* @author Eike Stepper
*/
-public class JMSServerProtocol extends SignalProtocol<ServerConnection>
+public class JMSServerProtocol extends SignalProtocol
{
-
public JMSServerProtocol()
{
}
diff --git a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSServerProtocolFactory.java b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSServerProtocolFactory.java
index f8ef5d0..b5c0ad1 100644
--- a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSServerProtocolFactory.java
+++ b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSServerProtocolFactory.java
@@ -18,7 +18,7 @@ import org.eclipse.internal.net4j.ServerProtocolFactory;
/**
* @author Eike Stepper
*/
-public final class JMSServerProtocolFactory extends ServerProtocolFactory<JMSServerProtocol>
+public final class JMSServerProtocolFactory extends ServerProtocolFactory
{
public static final String TYPE = JMSProtocolConstants.PROTOCOL_NAME;
diff --git a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/admin/JMSAdminServerProtocolFactory.java b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/admin/JMSAdminServerProtocolFactory.java
index 2ebb074..e6ba71b 100644
--- a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/admin/JMSAdminServerProtocolFactory.java
+++ b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/admin/JMSAdminServerProtocolFactory.java
@@ -18,7 +18,7 @@ import org.eclipse.internal.net4j.ServerProtocolFactory;
/**
* @author Eike Stepper
*/
-public final class JMSAdminServerProtocolFactory extends ServerProtocolFactory<JMSAdminServerProtocol>
+public final class JMSAdminServerProtocolFactory extends ServerProtocolFactory
{
public static final String TYPE = JMSAdminProtocolConstants.PROTOCOL_NAME;
diff --git a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/ConnectionImpl.java b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/ConnectionImpl.java
index 6947449..57eecfc 100644
--- a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/ConnectionImpl.java
+++ b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/ConnectionImpl.java
@@ -65,19 +65,20 @@ public class ConnectionImpl extends Container<Session> implements Connection
private IChannel channel;
- private List<SessionImpl> sessions = new ArrayList(0);
+ private List<SessionImpl> sessions = new ArrayList<SessionImpl>(0);
- private transient IListener sessionListener = new LifecycleEventConverter(this)
+ private transient IListener sessionListener = new LifecycleEventConverter<Session>(this)
{
+
@Override
- protected IContainerEvent createContainerEvent(IContainer container, Object element, Kind kind)
+ protected IContainerEvent<Session> createContainerEvent(IContainer<Session> container, Session element, Kind kind)
{
if (kind == IContainerDelta.Kind.REMOVED)
{
removeSession((SessionImpl)element);
}
- return new SingleDeltaContainerEvent(container, element, kind);
+ return new SingleDeltaContainerEvent<Session>(container, element, kind);
}
};
@@ -316,7 +317,7 @@ public class ConnectionImpl extends Container<Session> implements Connection
public SessionImpl[] getSessions()
{
- List<SessionImpl> result = new ArrayList(sessions.size());
+ List<SessionImpl> result = new ArrayList<SessionImpl>(sessions.size());
synchronized (sessions)
{
for (SessionImpl session : sessions)
diff --git a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/ConnectionMetaDataImpl.java b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/ConnectionMetaDataImpl.java
index 4843bb7..0a8bbe0 100644
--- a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/ConnectionMetaDataImpl.java
+++ b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/ConnectionMetaDataImpl.java
@@ -64,7 +64,7 @@ public class ConnectionMetaDataImpl implements ConnectionMetaData
return "0.8.0";
}
- public Enumeration getJMSXPropertyNames()
+ public Enumeration<?> getJMSXPropertyNames()
{
return new StringTokenizer("");
}
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 3e02f66..dfdee8c 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
@@ -62,7 +62,7 @@ public class MapMessageImpl extends MessageImpl implements MapMessage
throw new NotYetImplementedException();
}
- public Enumeration getMapNames()
+ public Enumeration<?> getMapNames()
{
throw new NotYetImplementedException();
}
@@ -152,7 +152,7 @@ public class MapMessageImpl extends MessageImpl implements MapMessage
{
super.populate(source);
MapMessage map = (MapMessage)source;
- Enumeration e = map.getMapNames();
+ Enumeration<?> e = map.getMapNames();
while (e.hasMoreElements())
{
String name = (String)e.nextElement();
diff --git a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/MessageConsumerImpl.java b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/MessageConsumerImpl.java
index dd5aa14..1939a20 100644
--- a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/MessageConsumerImpl.java
+++ b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/MessageConsumerImpl.java
@@ -40,7 +40,7 @@ public class MessageConsumerImpl extends Lifecycle implements MessageConsumer
/**
* Incoming messages
*/
- private BlockingQueue<MessageImpl> messages = new LinkedBlockingQueue();
+ private BlockingQueue<MessageImpl> messages = new LinkedBlockingQueue<MessageImpl>();
public MessageConsumerImpl(SessionImpl session, long consumerID, DestinationImpl destination, String messageSelector)
{
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 3fd77fb..5ee4643 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
@@ -28,12 +28,12 @@ import java.util.HashMap;
import java.util.Map;
import java.util.Map.Entry;
-public class MessageImpl implements Message, Comparable
+public class MessageImpl implements Message, Comparable<MessageImpl>
{
private static final String[] KEYWORDS = { "and", "between", "escape", "in", "is", "like", "false", "null", "or",
"not", "true" };
- private Map<String, Object> properties = new HashMap();
+ private Map<String, Object> properties = new HashMap<String, Object>();
private byte[] correlationID;
@@ -253,7 +253,7 @@ public class MessageImpl implements Message, Comparable
return properties.get(name);
}
- public Enumeration getPropertyNames()
+ public Enumeration<String> getPropertyNames()
{
return Collections.enumeration(properties.keySet());
}
@@ -302,7 +302,7 @@ public class MessageImpl implements Message, Comparable
{
if (value instanceof Boolean || value instanceof Byte || value instanceof Short || value instanceof Integer
|| value instanceof Long || value instanceof Float || value instanceof Double || value instanceof String
- || (value == null))
+ || value == null)
{
setProperty(name, value);
}
@@ -379,25 +379,19 @@ public class MessageImpl implements Message, Comparable
throw new NotYetImplementedException();
}
- public int compareTo(Object o)
+ public int compareTo(MessageImpl obj)
{
- if (o instanceof MessageImpl)
+ if (priority < obj.priority)
{
- MessageImpl that = (MessageImpl)o;
- if (priority < that.priority)
- {
- return -1;
- }
-
- if (priority > that.priority)
- {
- return 1;
- }
+ return -1;
+ }
- return 0;
+ if (priority > obj.priority)
+ {
+ return 1;
}
- throw new IllegalArgumentException("Invalid compare operand: " + o);
+ return 0;
}
public void populate(Message source) throws JMSException
@@ -412,10 +406,10 @@ public class MessageImpl implements Message, Comparable
setJMSType(source.getJMSType());
setJMSReplyTo(source.getJMSReplyTo());
- Enumeration e = source.getPropertyNames();
+ Enumeration<String> e = source.getPropertyNames();
while (e.hasMoreElements())
{
- String name = (String)e.nextElement();
+ String name = e.nextElement();
Object value = source.getObjectProperty(name);
setObjectProperty(name, value);
}
diff --git a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/QueueBrowserImpl.java b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/QueueBrowserImpl.java
index 4e198c6..f96f02f 100644
--- a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/QueueBrowserImpl.java
+++ b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/QueueBrowserImpl.java
@@ -47,7 +47,7 @@ public class QueueBrowserImpl implements QueueBrowser
throw new NotYetImplementedException();
}
- public Enumeration getEnumeration()
+ public Enumeration<?> getEnumeration()
{
throw new NotYetImplementedException();
}
diff --git a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/SessionImpl.java b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/SessionImpl.java
index 4fb5928..f77ccb9 100644
--- a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/SessionImpl.java
+++ b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/SessionImpl.java
@@ -60,14 +60,14 @@ public class SessionImpl extends QueueWorker<MessageConsumerImpl> implements Ses
private int acknowledgeMode;
- private Map<Long, MessageConsumerImpl> consumers = new HashMap();
+ private Map<Long, MessageConsumerImpl> consumers = new HashMap<Long, MessageConsumerImpl>();
/**
* Outgoing transacted messages
*/
- private List<MessageImpl> messages = new ArrayList();
+ private List<MessageImpl> messages = new ArrayList<MessageImpl>();
- private Set<MessageProducerImpl> producers = new HashSet();
+ private Set<MessageProducerImpl> producers = new HashSet<MessageProducerImpl>();
public SessionImpl(ConnectionImpl connection, int id, boolean transacted, int acknowledgeMode) throws JMSException
{
diff --git a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSClientProtocol.java b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSClientProtocol.java
index 68c8a57..6460191 100644
--- a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSClientProtocol.java
+++ b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSClientProtocol.java
@@ -10,7 +10,6 @@
**************************************************************************/
package org.eclipse.net4j.internal.jms.protocol;
-import org.eclipse.net4j.internal.jms.ConnectionImpl;
import org.eclipse.net4j.jms.JMSProtocolConstants;
import org.eclipse.net4j.signal.SignalProtocol;
import org.eclipse.net4j.signal.SignalReactor;
@@ -18,9 +17,8 @@ import org.eclipse.net4j.signal.SignalReactor;
/**
* @author Eike Stepper
*/
-public class JMSClientProtocol extends SignalProtocol<ConnectionImpl>
+public class JMSClientProtocol extends SignalProtocol
{
-
public JMSClientProtocol()
{
}
diff --git a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSClientProtocolFactory.java b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSClientProtocolFactory.java
index 29d88cf..d162a69 100644
--- a/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSClientProtocolFactory.java
+++ b/plugins/org.eclipse.net4j.jms/src/org/eclipse/net4j/internal/jms/protocol/JMSClientProtocolFactory.java
@@ -18,7 +18,7 @@ import org.eclipse.internal.net4j.ClientProtocolFactory;
/**
* @author Eike Stepper
*/
-public final class JMSClientProtocolFactory extends ClientProtocolFactory<JMSClientProtocol>
+public final class JMSClientProtocolFactory extends ClientProtocolFactory
{
public static final String TYPE = JMSProtocolConstants.PROTOCOL_NAME;
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 792d394..b9c7a0f 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
@@ -21,7 +21,7 @@ import java.io.IOException;
/**
* @author Eike Stepper
*/
-public class JMSRecoverRequest extends RequestWithConfirmation
+public class JMSRecoverRequest extends RequestWithConfirmation<Object>
{
private int sessionID;
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 065fd8a..29808d5 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
@@ -41,7 +41,7 @@ public class JMSServerMessageIndication extends Indication
long consumerID = in.readLong();
MessageImpl message = MessageUtil.read(in);
JMSClientProtocol protocol = (JMSClientProtocol)getProtocol();
- ConnectionImpl connection = protocol.getInfraStructure();
+ ConnectionImpl connection = (ConnectionImpl)protocol.getInfraStructure();
connection.handleMessageFromSignal(sessionID, consumerID, message);
}
}
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 4c93f0e..0e8c8f0 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
@@ -294,7 +294,7 @@ public final class TypeUtil
throw new IOException("Invalid type: " + type);
}
- private static String conversionProblem(Class type, Object value)
+ private static String conversionProblem(Class<?> type, Object value)
{
return "Cannot convert values of type " + value.getClass().getName() + " to " + type.getName();
}
diff --git a/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/internal/jvm/JVMAcceptorFactory.java b/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/internal/jvm/JVMAcceptorFactory.java
index cf454f5..ed2cf2a 100644
--- a/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/internal/jvm/JVMAcceptorFactory.java
+++ b/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/internal/jvm/JVMAcceptorFactory.java
@@ -18,7 +18,7 @@ import org.eclipse.internal.net4j.AcceptorFactory;
/**
* @author Eike Stepper
*/
-public class JVMAcceptorFactory extends AcceptorFactory<JVMAcceptor>
+public class JVMAcceptorFactory extends AcceptorFactory
{
public static final String TYPE = "jvm";
@@ -35,9 +35,14 @@ public class JVMAcceptorFactory extends AcceptorFactory<JVMAcceptor>
}
@Override
- public String getDescriptionFor(JVMAcceptor acceptor)
+ public String getDescriptionFor(Object acceptor)
{
- return acceptor.getName();
+ if (acceptor instanceof JVMAcceptor)
+ {
+ return ((JVMAcceptor)acceptor).getName();
+ }
+
+ return null;
}
public static JVMAcceptor get(IManagedContainer container, String description)
diff --git a/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/internal/jvm/JVMAcceptorManager.java b/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/internal/jvm/JVMAcceptorManager.java
index 80a7737..47e48e5 100644
--- a/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/internal/jvm/JVMAcceptorManager.java
+++ b/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/internal/jvm/JVMAcceptorManager.java
@@ -23,7 +23,7 @@ public class JVMAcceptorManager implements IJVMAcceptorManager
// @Singleton
public static final JVMAcceptorManager INSTANCE = new JVMAcceptorManager();
- private IRegistry<String, IJVMAcceptor> acceptorRegistry = new HashMapRegistry();
+ private IRegistry<String, IJVMAcceptor> acceptorRegistry = new HashMapRegistry<String, IJVMAcceptor>();
public IRegistry<String, IJVMAcceptor> getAcceptorRegistry()
{
diff --git a/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/internal/jvm/JVMConnectorFactory.java b/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/internal/jvm/JVMConnectorFactory.java
index 035539c..555b43f 100644
--- a/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/internal/jvm/JVMConnectorFactory.java
+++ b/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/internal/jvm/JVMConnectorFactory.java
@@ -18,7 +18,7 @@ import org.eclipse.internal.net4j.ConnectorFactory;
/**
* @author Eike Stepper
*/
-public class JVMConnectorFactory extends ConnectorFactory<JVMClientConnector>
+public class JVMConnectorFactory extends ConnectorFactory
{
public static final String TYPE = "jvm";
@@ -35,9 +35,14 @@ public class JVMConnectorFactory extends ConnectorFactory<JVMClientConnector>
}
@Override
- public String getDescriptionFor(JVMClientConnector connector)
+ public String getDescriptionFor(Object connector)
{
- return connector.getName();
+ if (connector instanceof JVMClientConnector)
+ {
+ return ((JVMClientConnector)connector).getName();
+ }
+
+ return null;
}
public static JVMClientConnector get(IManagedContainer container, String description)
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 d8060c5..76b879d 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
@@ -43,7 +43,7 @@ public final class ControlChannel extends Channel
private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG, ControlChannel.class);
- private SynchronizingCorrelator<Short, Boolean> registrations = new SynchronizingCorrelator();
+ private SynchronizingCorrelator<Short, Boolean> registrations = new SynchronizingCorrelator<Short, Boolean>();
public ControlChannel(TCPConnector connector)
{
diff --git a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPAcceptorFactory.java b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPAcceptorFactory.java
index 017ad6e..093c93e 100644
--- a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPAcceptorFactory.java
+++ b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPAcceptorFactory.java
@@ -18,7 +18,7 @@ import org.eclipse.internal.net4j.AcceptorFactory;
/**
* @author Eike Stepper
*/
-public class TCPAcceptorFactory extends AcceptorFactory<TCPAcceptor>
+public class TCPAcceptorFactory extends AcceptorFactory
{
public static final String TYPE = "tcp";
@@ -59,9 +59,16 @@ public class TCPAcceptorFactory extends AcceptorFactory<TCPAcceptor>
}
@Override
- public String getDescriptionFor(TCPAcceptor acceptor)
+ public String getDescriptionFor(Object object)
{
- return acceptor.getAddress() + SEPARATOR + acceptor.getPort();
+ if (object instanceof TCPAcceptor)
+ {
+ TCPAcceptor acceptor = (TCPAcceptor)object;
+ return acceptor.getAddress() + SEPARATOR + acceptor.getPort();
+ }
+
+ return null;
+
}
public static TCPAcceptor get(IManagedContainer container, String description)
diff --git a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPConnectorFactory.java b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPConnectorFactory.java
index 8c00c15..c2bc82b 100644
--- a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPConnectorFactory.java
+++ b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPConnectorFactory.java
@@ -22,7 +22,7 @@ import java.net.URL;
/**
* @author Eike Stepper
*/
-public class TCPConnectorFactory extends ConnectorFactory<TCPClientConnector>
+public class TCPConnectorFactory extends ConnectorFactory
{
public static final String TYPE = "tcp";
@@ -62,22 +62,28 @@ public class TCPConnectorFactory extends ConnectorFactory<TCPClientConnector>
}
@Override
- public String getDescriptionFor(TCPClientConnector connector)
+ public String getDescriptionFor(Object object)
{
- String description = connector.getHost();
- String userID = connector.getUserID();
- if (!StringUtil.isEmpty(userID))
+ if (object instanceof TCPClientConnector)
{
- description = userID + "@" + description;
- }
+ TCPClientConnector connector = (TCPClientConnector)object;
+ String description = connector.getHost();
+ String userID = connector.getUserID();
+ if (!StringUtil.isEmpty(userID))
+ {
+ description = userID + "@" + description;
+ }
- int port = connector.getPort();
- if (port != DEFAULT_PORT)
- {
- description = description + ":" + port;
+ int port = connector.getPort();
+ if (port != DEFAULT_PORT)
+ {
+ description = description + ":" + port;
+ }
+
+ return description;
}
- return description;
+ return null;
}
public static TCPClientConnector get(IManagedContainer container, String description)
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 e9425d3..b879091 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
@@ -40,7 +40,7 @@ public class TCPSelector extends Lifecycle implements ITCPSelector, Runnable
private Selector selector;
- private transient Queue<Runnable> pendingOperations = new ConcurrentLinkedQueue();
+ private transient Queue<Runnable> pendingOperations = new ConcurrentLinkedQueue<Runnable>();
private transient Thread thread;
diff --git a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPSelectorFactory.java b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPSelectorFactory.java
index a9e2ac6..cd4ca80 100644
--- a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPSelectorFactory.java
+++ b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPSelectorFactory.java
@@ -16,7 +16,7 @@ import org.eclipse.net4j.util.container.IManagedContainer;
/**
* @author Eike Stepper
*/
-public class TCPSelectorFactory extends Factory<TCPSelector>
+public class TCPSelectorFactory extends Factory
{
public static final String PRODUCT_GROUP = "org.eclipse.net4j.selectors";
diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/ServerTestProtocolFactory.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/ServerTestProtocolFactory.java
index d6281ae..6b52b99 100644
--- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/ServerTestProtocolFactory.java
+++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/ServerTestProtocolFactory.java
@@ -19,7 +19,7 @@ import java.util.concurrent.CountDownLatch;
/**
* @author Eike Stepper
*/
-public class ServerTestProtocolFactory extends ServerProtocolFactory<TestProtocol>
+public class ServerTestProtocolFactory extends ServerProtocolFactory
{
public static final String TYPE = "test.protocol";
diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/TCPTransportTest.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/TCPTransportTest.java
index a659bf5..5c53698 100644
--- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/TCPTransportTest.java
+++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/TCPTransportTest.java
@@ -15,6 +15,7 @@ import org.eclipse.net4j.IBufferProvider;
import org.eclipse.net4j.IChannel;
import org.eclipse.net4j.IConnector;
import org.eclipse.net4j.Net4jUtil;
+import org.eclipse.net4j.internal.util.container.ManagedContainer;
import org.eclipse.net4j.stream.ChannelInputStream;
import org.eclipse.net4j.stream.ChannelOutputStream;
import org.eclipse.net4j.tests.signal.TestSignalServerProtocolFactory;
@@ -38,12 +39,13 @@ import java.util.concurrent.TimeUnit;
/**
* @author Eike Stepper
*/
+@SuppressWarnings("unchecked")
public class TCPTransportTest extends AbstractTransportTest
{
@Override
protected IManagedContainer createContainer()
{
- IManagedContainer container = super.createContainer();
+ IManagedContainer container = new ManagedContainer();
container.registerFactory(new TestSignalServerProtocolFactory());
return container;
}
@@ -157,6 +159,7 @@ public class TCPTransportTest extends AbstractTransportTest
getAcceptor().addListener(new IListener()
{
+ @SuppressWarnings("unchecked")
public void notifyEvent(IEvent event)
{
if (event instanceof IContainerEvent)
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 eecc207..04f9974 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
@@ -28,7 +28,7 @@ public class TestBufferPool
{
private static IBufferPool bufferPool = Net4jUtil.createBufferPool();
- private static Collection memory = new ArrayList();
+ private static Collection<byte[]> memory = new ArrayList<byte[]>();
public static void main(String[] args) throws InterruptedException
{
diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/TestProtocol.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/TestProtocol.java
index e47de39..b81b125 100644
--- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/TestProtocol.java
+++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/TestProtocol.java
@@ -9,7 +9,7 @@ import java.util.concurrent.CountDownLatch;
/**
* @author Eike Stepper
*/
-public final class TestProtocol extends Protocol<CountDownLatch>
+public final class TestProtocol extends Protocol
{
public TestProtocol(CountDownLatch counter)
{
@@ -25,9 +25,9 @@ public final class TestProtocol extends Protocol<CountDownLatch>
{
System.out.println("BUFFER ARRIVED");
buffer.release();
- if (getInfraStructure() != null)
+ if (getInfraStructure() instanceof CountDownLatch)
{
- getInfraStructure().countDown();
+ ((CountDownLatch)getInfraStructure()).countDown();
}
}
} \ No newline at end of file
diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/TestSignalServerProtocolFactory.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/TestSignalServerProtocolFactory.java
index 9e048a7..0e47974 100644
--- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/TestSignalServerProtocolFactory.java
+++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/TestSignalServerProtocolFactory.java
@@ -7,7 +7,7 @@ import org.eclipse.internal.net4j.ServerProtocolFactory;
/**
* @author Eike Stepper
*/
-public class TestSignalServerProtocolFactory extends ServerProtocolFactory<TestSignalProtocol>
+public class TestSignalServerProtocolFactory extends ServerProtocolFactory
{
public static final String TYPE = TestSignalProtocol.PROTOCOL_NAME;
diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/SynchronizingCorrelatorTest.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/SynchronizingCorrelatorTest.java
index c842e3c..229dabd 100644
--- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/SynchronizingCorrelatorTest.java
+++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/SynchronizingCorrelatorTest.java
@@ -21,7 +21,7 @@ public class SynchronizingCorrelatorTest extends AbstractOMTest
public void testPutConsumerFirst() throws Exception
{
final Boolean[] result = { false };
- final SynchronizingCorrelator<String, Boolean> correlator = new SynchronizingCorrelator();
+ final SynchronizingCorrelator<String, Boolean> correlator = new SynchronizingCorrelator<String, Boolean>();
final Thread consumer = new Thread()
{
@Override
@@ -52,7 +52,7 @@ public class SynchronizingCorrelatorTest extends AbstractOMTest
public void testBlockingPutConsumerFirst() throws Exception
{
final Boolean[] result = { false };
- final SynchronizingCorrelator<String, Boolean> correlator = new SynchronizingCorrelator();
+ final SynchronizingCorrelator<String, Boolean> correlator = new SynchronizingCorrelator<String, Boolean>();
final Thread consumer = new Thread()
{
@Override
@@ -86,7 +86,7 @@ public class SynchronizingCorrelatorTest extends AbstractOMTest
public void testPutProducerFirst() throws Exception
{
final Boolean[] result = { false };
- final SynchronizingCorrelator<String, Boolean> correlator = new SynchronizingCorrelator();
+ final SynchronizingCorrelator<String, Boolean> correlator = new SynchronizingCorrelator<String, Boolean>();
correlator.put("eike", true);
final Thread consumer = new Thread()
@@ -118,7 +118,7 @@ public class SynchronizingCorrelatorTest extends AbstractOMTest
public void testBlockingPutProducerFirst() throws Exception
{
final Boolean[] result = { false };
- final SynchronizingCorrelator<String, Boolean> correlator = new SynchronizingCorrelator();
+ final SynchronizingCorrelator<String, Boolean> correlator = new SynchronizingCorrelator<String, Boolean>();
boolean consumed = correlator.put("eike", true, 50);
System.out.println("Consumed: " + consumed);
assertFalse(consumed);
diff --git a/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/views/AcceptorsView.java b/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/views/AcceptorsView.java
index f58f240..479004e 100644
--- a/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/views/AcceptorsView.java
+++ b/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/views/AcceptorsView.java
@@ -2,6 +2,7 @@ package org.eclipse.net4j.internal.ui.views;
import org.eclipse.net4j.IAcceptor;
import org.eclipse.net4j.Net4jUtil;
+import org.eclipse.net4j.util.container.IContainer;
import org.eclipse.net4j.util.container.IManagedContainer;
import org.eclipse.net4j.util.container.IPluginContainer;
import org.eclipse.net4j.util.ui.actions.SafeAction;
@@ -45,7 +46,7 @@ public class AcceptorsView extends ContainerView
}
@Override
- protected ContainerItemProvider createContainerItemProvider()
+ protected ContainerItemProvider<IContainer<Object>> createContainerItemProvider()
{
return new Net4jItemProvider(new IElementFilter()
{
diff --git a/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/views/ConnectorsView.java b/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/views/ConnectorsView.java
index f47f867..5da15fb 100644
--- a/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/views/ConnectorsView.java
+++ b/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/views/ConnectorsView.java
@@ -2,6 +2,7 @@ package org.eclipse.net4j.internal.ui.views;
import org.eclipse.net4j.IConnector;
import org.eclipse.net4j.Net4jUtil;
+import org.eclipse.net4j.util.container.IContainer;
import org.eclipse.net4j.util.container.IManagedContainer;
import org.eclipse.net4j.util.container.IPluginContainer;
import org.eclipse.net4j.util.ui.actions.SafeAction;
@@ -34,7 +35,7 @@ public class ConnectorsView extends ContainerView
}
@Override
- protected ContainerItemProvider createContainerItemProvider()
+ protected ContainerItemProvider<IContainer<Object>> createContainerItemProvider()
{
return new Net4jItemProvider(new IElementFilter()
{
diff --git a/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/views/Net4jItemProvider.java b/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/views/Net4jItemProvider.java
index b922f55..f17871a 100644
--- a/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/views/Net4jItemProvider.java
+++ b/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/views/Net4jItemProvider.java
@@ -14,6 +14,7 @@ import org.eclipse.net4j.IAcceptor;
import org.eclipse.net4j.IChannel;
import org.eclipse.net4j.IConnector;
import org.eclipse.net4j.internal.ui.SharedIcons;
+import org.eclipse.net4j.util.container.IContainer;
import org.eclipse.net4j.util.lifecycle.LifecycleUtil;
import org.eclipse.net4j.util.ui.actions.LongRunningAction;
import org.eclipse.net4j.util.ui.views.ContainerItemProvider;
@@ -28,7 +29,7 @@ import org.eclipse.swt.graphics.Image;
/**
* @author Eike Stepper
*/
-public class Net4jItemProvider extends ContainerItemProvider
+public class Net4jItemProvider extends ContainerItemProvider<IContainer<Object>>
{
public Net4jItemProvider()
{
diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/internal/ui/views/Net4jContainerView.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/internal/ui/views/Net4jContainerView.java
index 819d087..71b6c53 100644
--- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/internal/ui/views/Net4jContainerView.java
+++ b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/internal/ui/views/Net4jContainerView.java
@@ -1,5 +1,6 @@
package org.eclipse.net4j.util.internal.ui.views;
+import org.eclipse.net4j.util.container.IContainer;
import org.eclipse.net4j.util.container.IManagedContainer;
import org.eclipse.net4j.util.container.IPluginContainer;
import org.eclipse.net4j.util.ui.views.ContainerItemProvider;
@@ -12,7 +13,7 @@ public class Net4jContainerView extends ContainerView
}
@Override
- protected ContainerItemProvider createContainerItemProvider()
+ protected ContainerItemProvider<IContainer<Object>> createContainerItemProvider()
{
return new Net4jItemProvider();
}
diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/internal/ui/views/Net4jItemProvider.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/internal/ui/views/Net4jItemProvider.java
index e0c2e0e..097f63d 100644
--- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/internal/ui/views/Net4jItemProvider.java
+++ b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/internal/ui/views/Net4jItemProvider.java
@@ -10,6 +10,7 @@
**************************************************************************/
package org.eclipse.net4j.util.internal.ui.views;
+import org.eclipse.net4j.util.container.IContainer;
import org.eclipse.net4j.util.internal.ui.SharedIcons;
import org.eclipse.net4j.util.lifecycle.LifecycleUtil;
import org.eclipse.net4j.util.ui.actions.LongRunningAction;
@@ -27,7 +28,7 @@ import java.util.Iterator;
/**
* @author Eike Stepper
*/
-public class Net4jItemProvider extends ContainerItemProvider
+public class Net4jItemProvider extends ContainerItemProvider<IContainer<Object>>
{
public Net4jItemProvider()
{
@@ -66,7 +67,7 @@ public class Net4jItemProvider extends ContainerItemProvider
@Override
protected void doRun(IProgressMonitor monitor) throws Exception
{
- for (Iterator it = selection.iterator(); it.hasNext();)
+ for (Iterator<?> it = selection.iterator(); it.hasNext();)
{
Object object = it.next();
LifecycleUtil.deactivate(object);
diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/StaticContentProvider.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/StaticContentProvider.java
index 54c04b0..a59ff67 100644
--- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/StaticContentProvider.java
+++ b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/StaticContentProvider.java
@@ -15,7 +15,7 @@ import java.util.Collection;
/**
* @author Eike Stepper
*/
-public class StaticContentProvider extends StructuredContentProvider
+public class StaticContentProvider extends StructuredContentProvider<Object>
{
private Object[] elements;
@@ -24,12 +24,12 @@ public class StaticContentProvider extends StructuredContentProvider
this.elements = elements;
}
- public StaticContentProvider(Collection elements)
+ public StaticContentProvider(Collection<?> elements)
{
this(elements.toArray());
}
- public StaticContentProvider(Class enumClass)
+ public StaticContentProvider(Class<Object> enumClass)
{
this(createElements(enumClass));
}
@@ -39,7 +39,7 @@ public class StaticContentProvider extends StructuredContentProvider
return elements;
}
- private static Object[] createElements(Class enumClass)
+ private static Object[] createElements(Class<Object> enumClass)
{
Object[] enumConstants = enumClass.getEnumConstants();
if (enumConstants == null)
diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/views/ContainerItemProvider.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/views/ContainerItemProvider.java
index 92052b2..94d5f67 100644
--- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/views/ContainerItemProvider.java
+++ b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/views/ContainerItemProvider.java
@@ -27,9 +27,9 @@ import java.util.Map;
/**
* @author Eike Stepper
*/
-public class ContainerItemProvider<CONTAINER extends IContainer> extends ItemProvider<CONTAINER>
+public class ContainerItemProvider<CONTAINER extends IContainer<Object>> extends ItemProvider<CONTAINER>
{
- private Map<Object, Node> nodes = new HashMap();
+ private Map<Object, Node> nodes = new HashMap<Object, Node>();
private ContainerNode root;
@@ -69,7 +69,7 @@ public class ContainerItemProvider<CONTAINER extends IContainer> extends ItemPro
{
Node node = getNode(element);
List<Node> children = node.getChildren();
- for (Iterator it = children.iterator(); it.hasNext();)
+ for (Iterator<Node> it = children.iterator(); it.hasNext();)
{
Object child = it.next();
if (!LifecycleUtil.isActive(child))
@@ -159,7 +159,7 @@ public class ContainerItemProvider<CONTAINER extends IContainer> extends ItemPro
{
if (element instanceof IContainer)
{
- return new ContainerNode(parent, (IContainer)element);
+ return new ContainerNode(parent, (IContainer<Object>)element);
}
return new LeafNode(parent, element);
@@ -247,12 +247,12 @@ public class ContainerItemProvider<CONTAINER extends IContainer> extends ItemPro
*/
public class ContainerNode extends AbstractNode
{
- private IContainer container;
+ private IContainer<Object> container;
- private IListener containerListener = new ContainerEventAdapter()
+ private IListener containerListener = new ContainerEventAdapter<Object>()
{
@Override
- protected void onAdded(IContainer container, Object element)
+ protected void onAdded(IContainer<Object> container, Object element)
{
if (container == ContainerNode.this.container)
{
@@ -267,7 +267,7 @@ public class ContainerItemProvider<CONTAINER extends IContainer> extends ItemPro
}
@Override
- protected void onRemoved(IContainer container, Object element)
+ protected void onRemoved(IContainer<Object> container, Object element)
{
if (container == ContainerNode.this.container)
{
@@ -289,7 +289,7 @@ public class ContainerItemProvider<CONTAINER extends IContainer> extends ItemPro
}
};
- public ContainerNode(Node parent, IContainer container)
+ public ContainerNode(Node parent, IContainer<Object> container)
{
super(parent);
this.container = container;
@@ -303,7 +303,7 @@ public class ContainerItemProvider<CONTAINER extends IContainer> extends ItemPro
super.dispose();
}
- public IContainer getContainer()
+ public IContainer<Object> getContainer()
{
return container;
}
@@ -323,7 +323,7 @@ public class ContainerItemProvider<CONTAINER extends IContainer> extends ItemPro
protected List<Node> createChildren()
{
Object[] elements = container.getElements();
- List<Node> children = new ArrayList(elements.length);
+ List<Node> children = new ArrayList<Node>(elements.length);
for (int i = 0; i < elements.length; i++)
{
Object element = elements[i];
diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/views/ContainerView.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/views/ContainerView.java
index b9467b6..0acfb38 100644
--- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/views/ContainerView.java
+++ b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/views/ContainerView.java
@@ -1,5 +1,6 @@
package org.eclipse.net4j.util.ui.views;
+import org.eclipse.net4j.util.container.IContainer;
import org.eclipse.net4j.util.container.IManagedContainer;
import org.eclipse.net4j.util.internal.ui.SharedIcons;
import org.eclipse.net4j.util.ui.actions.SafeAction;
@@ -30,7 +31,7 @@ import org.eclipse.ui.part.ViewPart;
public abstract class ContainerView extends ViewPart implements ISetSelectionTarget
{
- private ContainerItemProvider itemProvider;
+ private ContainerItemProvider<IContainer<Object>> itemProvider;
private TreeViewer viewer;
@@ -78,9 +79,9 @@ public abstract class ContainerView extends ViewPart implements ISetSelectionTar
contributeToActionBars();
}
- protected ContainerItemProvider createContainerItemProvider()
+ protected ContainerItemProvider<IContainer<Object>> createContainerItemProvider()
{
- return new ContainerItemProvider(getRootElementFilter())
+ return new ContainerItemProvider<IContainer<Object>>(getRootElementFilter())
{
@Override
public Image getImage(Object obj)
diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/views/ItemProvider.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/views/ItemProvider.java
index 8023159..de8442c 100644
--- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/views/ItemProvider.java
+++ b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/views/ItemProvider.java
@@ -31,7 +31,7 @@ public abstract class ItemProvider<INPUT> extends StructuredContentProvider<INPU
{
public static final Object[] NO_ELEMENTS = {};
- private List<ILabelProviderListener> listeners = new ArrayList(0);
+ private List<ILabelProviderListener> listeners = new ArrayList<ILabelProviderListener>(0);
public ItemProvider()
{
diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/widgets/LogDialog.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/widgets/LogDialog.java
index d754326..a00943d 100644
--- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/widgets/LogDialog.java
+++ b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/widgets/LogDialog.java
@@ -14,6 +14,7 @@ import org.eclipse.net4j.util.io.IORuntimeException;
import org.eclipse.jface.dialogs.IDialogConstants;
import org.eclipse.jface.dialogs.IDialogSettings;
+import org.eclipse.jface.viewers.Viewer;
import org.eclipse.swt.SWT;
import org.eclipse.swt.custom.StyleRange;
import org.eclipse.swt.custom.StyledText;
@@ -33,7 +34,7 @@ import java.util.List;
/**
* @author Eike Stepper
*/
-public class LogDialog extends BaseDialog
+public class LogDialog extends BaseDialog<Viewer>
{
private StringBuilder log = new StringBuilder();
@@ -41,7 +42,7 @@ public class LogDialog extends BaseDialog
private TextStyle textStyle;
- private List<StyleRange> styleRanges = new ArrayList();
+ private List<StyleRange> styleRanges = new ArrayList<StyleRange>();
private StyleRange currentStyleRange = new StyleRange();
diff --git a/plugins/org.eclipse.net4j.util/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.net4j.util/.settings/org.eclipse.jdt.core.prefs
index 375c1ce..7b99516 100644
--- a/plugins/org.eclipse.net4j.util/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.net4j.util/.settings/org.eclipse.jdt.core.prefs
@@ -1,5 +1,6 @@
-#Mon May 21 12:12:04 CEST 2007
+#Fri Aug 31 19:38:17 CEST 2007
eclipse.preferences.version=1
+instance/org.eclipse.core.net/org.eclipse.core.net.hasMigrated=true
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
org.eclipse.jdt.core.compiler.compliance=1.5
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/bundle/AbstractBundle.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/bundle/AbstractBundle.java
index 343105e..e22f493 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/bundle/AbstractBundle.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/bundle/AbstractBundle.java
@@ -44,7 +44,7 @@ public abstract class AbstractBundle implements OMBundle
private String bundleID;
- private Class accessor;
+ private Class<?> accessor;
private Object bundleContext;
@@ -52,7 +52,7 @@ public abstract class AbstractBundle implements OMBundle
private boolean debuggingInitialized;
- private Map<String, Tracer> tracers = new ConcurrentHashMap(0);
+ private Map<String, Tracer> tracers = new ConcurrentHashMap<String, Tracer>(0);
private OMLogger logger;
@@ -62,13 +62,13 @@ public abstract class AbstractBundle implements OMBundle
private ResourceBundle untranslatedResourceBundle;
- private Map<String, String> strings = new HashMap(0);
+ private Map<String, String> strings = new HashMap<String, String>(0);
- private Map<String, String> untranslatedStrings = new HashMap(0);
+ private Map<String, String> untranslatedStrings = new HashMap<String, String>(0);
private boolean shouldTranslate = true;
- public AbstractBundle(AbstractPlatform platform, String bundleID, Class accessor)
+ public AbstractBundle(AbstractPlatform platform, String bundleID, Class<?> accessor)
{
this.platform = platform;
this.bundleID = bundleID;
@@ -85,7 +85,7 @@ public abstract class AbstractBundle implements OMBundle
return bundleID;
}
- public Class getAccessor()
+ public Class<?> getAccessor()
{
return accessor;
}
@@ -225,8 +225,8 @@ public abstract class AbstractBundle implements OMBundle
public String getString(String key, boolean translate)
{
- Map stringMap = translate ? strings : untranslatedStrings;
- String result = (String)stringMap.get(key);
+ Map<String, String> stringMap = translate ? strings : untranslatedStrings;
+ String result = stringMap.get(key);
if (result == null)
{
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/bundle/AbstractPlatform.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/bundle/AbstractPlatform.java
index 37798ae..6e79803 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/bundle/AbstractPlatform.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/bundle/AbstractPlatform.java
@@ -46,11 +46,11 @@ public abstract class AbstractPlatform implements OMPlatform
private static ContextTracer __TRACER__;
- private Map<String, AbstractBundle> bundles = new ConcurrentHashMap(0);
+ private Map<String, AbstractBundle> bundles = new ConcurrentHashMap<String, AbstractBundle>(0);
- private Queue<OMLogHandler> logHandlers = new ConcurrentLinkedQueue();
+ private Queue<OMLogHandler> logHandlers = new ConcurrentLinkedQueue<OMLogHandler>();
- private Queue<OMTraceHandler> traceHandlers = new ConcurrentLinkedQueue();
+ private Queue<OMTraceHandler> traceHandlers = new ConcurrentLinkedQueue<OMTraceHandler>();
private boolean debugging;
@@ -59,7 +59,7 @@ public abstract class AbstractPlatform implements OMPlatform
debugging = Boolean.parseBoolean(System.getProperty("debug", "false")); //$NON-NLS-1$ //$NON-NLS-2$
}
- public synchronized OMBundle bundle(String bundleID, Class accessor)
+ public synchronized OMBundle bundle(String bundleID, Class<?> accessor)
{
OMBundle bundle = bundles.get(bundleID);
if (bundle == null)
@@ -242,7 +242,7 @@ public abstract class AbstractPlatform implements OMPlatform
return bundles;
}
- protected abstract OMBundle createBundle(String bundleID, Class accessor);
+ 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/collection/HashBag.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/collection/HashBag.java
index 4647c6b..9a7297f 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/collection/HashBag.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/collection/HashBag.java
@@ -25,22 +25,22 @@ public final class HashBag<T> implements Set<T>
public HashBag()
{
- map = new HashMap();
+ map = new HashMap<T, Counter>();
}
public HashBag(int initialCapacity, float loadFactor)
{
- map = new HashMap(initialCapacity, loadFactor);
+ map = new HashMap<T, Counter>(initialCapacity, loadFactor);
}
public HashBag(int initialCapacity)
{
- map = new HashMap(initialCapacity);
+ map = new HashMap<T, Counter>(initialCapacity);
}
public HashBag(Map<? extends T, ? extends HashBag.Counter> m)
{
- map = new HashMap(m);
+ map = new HashMap<T, Counter>(m);
}
public boolean add(T o)
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/collection/History.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/collection/History.java
index b2aa700..8ddba32 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/collection/History.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/collection/History.java
@@ -25,7 +25,7 @@ import java.util.List;
*/
public class History<T> extends Notifier implements IHistory<T>
{
- private List<IHistoryElement<T>> elements = new ArrayList(0);
+ private List<IHistoryElement<T>> elements = new ArrayList<IHistoryElement<T>>(0);
private boolean loaded;
@@ -43,7 +43,7 @@ public class History<T> extends Notifier implements IHistory<T>
{
if (newElements == null)
{
- newElements = new ArrayList(0);
+ newElements = new ArrayList<IHistoryElement<T>>(0);
}
if (!elements.equals(newElements))
@@ -162,6 +162,7 @@ public class History<T> extends Notifier implements IHistory<T>
return elements.iterator();
}
+ @SuppressWarnings("unchecked")
protected IHistoryElement<T> createElement(T data)
{
return new HistoryElement(this, data);
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/collection/HistoryElement.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/collection/HistoryElement.java
index 268cb8c..cafccb5 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/collection/HistoryElement.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/collection/HistoryElement.java
@@ -28,7 +28,7 @@ public class HistoryElement<T> implements IHistoryElement<T>
this.data = data;
}
- public IHistory getHistory()
+ public IHistory<IHistoryElement<T>> getHistory()
{
return history;
}
@@ -48,7 +48,7 @@ public class HistoryElement<T> implements IHistoryElement<T>
{
if (obj instanceof HistoryElement)
{
- HistoryElement that = (HistoryElement)obj;
+ HistoryElement<T> that = (HistoryElement<T>)obj;
return this.history.equals(that.history) && this.data.equals(that.data);
}
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 3b177cf..0c10e8f 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
@@ -46,7 +46,7 @@ public class AsynchronousWorkSerializer implements IWorkSerializer, Runnable
public AsynchronousWorkSerializer(ExecutorService executorService)
{
- this(executorService, new ConcurrentLinkedQueue());
+ this(executorService, new ConcurrentLinkedQueue<Runnable>());
}
public ExecutorService getExecutorService()
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/concurrent/CompletionWorkSerializer.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/concurrent/CompletionWorkSerializer.java
index b499b34..5a0e2b5 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/concurrent/CompletionWorkSerializer.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/concurrent/CompletionWorkSerializer.java
@@ -16,27 +16,28 @@ import java.util.concurrent.BlockingQueue;
import java.util.concurrent.CompletionService;
import java.util.concurrent.Executor;
import java.util.concurrent.ExecutorCompletionService;
+import java.util.concurrent.Future;
/**
* @author Eike Stepper
*/
public class CompletionWorkSerializer implements IWorkSerializer
{
- private CompletionService completionService;
+ private CompletionService<Object> completionService;
- public CompletionWorkSerializer(CompletionService completionService)
+ public CompletionWorkSerializer(CompletionService<Object> completionService)
{
this.completionService = completionService;
}
- public CompletionWorkSerializer(Executor executor, BlockingQueue completionQueue)
+ public CompletionWorkSerializer(Executor executor, BlockingQueue<Future<Object>> completionQueue)
{
- this(new ExecutorCompletionService(executor, completionQueue));
+ this(new ExecutorCompletionService<Object>(executor, completionQueue));
}
public CompletionWorkSerializer(Executor executor)
{
- this(new ExecutorCompletionService(executor));
+ this(new ExecutorCompletionService<Object>(executor));
}
public CompletionWorkSerializer()
@@ -44,7 +45,7 @@ public class CompletionWorkSerializer implements IWorkSerializer
this(new OnePendingExecutor());
}
- public CompletionService getCompletionService()
+ public CompletionService<Object> getCompletionService()
{
return completionService;
}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/concurrent/RoundRobinList.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/concurrent/RoundRobinList.java
index 354b985..9c54cc1 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/concurrent/RoundRobinList.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/concurrent/RoundRobinList.java
@@ -22,7 +22,7 @@ public final class RoundRobinList<E> extends LinkedList<E>
{
}
- public RoundRobinList(Collection c)
+ public RoundRobinList(Collection<? extends E> c)
{
super(c);
}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/concurrent/SynchronizingCorrelator.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/concurrent/SynchronizingCorrelator.java
index ce109f6..4a3b385 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/concurrent/SynchronizingCorrelator.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/concurrent/SynchronizingCorrelator.java
@@ -21,7 +21,8 @@ import java.util.concurrent.ConcurrentMap;
*/
public class SynchronizingCorrelator<CORRELATION, RESULT> implements ICorrelator<CORRELATION, ISynchronizer<RESULT>>
{
- private ConcurrentMap<CORRELATION, ISynchronizer<RESULT>> map = new ConcurrentHashMap(0);
+ private ConcurrentMap<CORRELATION, ISynchronizer<RESULT>> map = new ConcurrentHashMap<CORRELATION, ISynchronizer<RESULT>>(
+ 0);
public boolean isCorrelated(CORRELATION correlation)
{
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/container/Container.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/container/Container.java
index b873058..dbb5c4a 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/container/Container.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/container/Container.java
@@ -49,16 +49,16 @@ public abstract class Container<E> extends Lifecycle implements IContainer<E>
public void fireContainerEvent(List<IContainerDelta<E>> deltas)
{
- fireEvent(new ContainerEvent(this, deltas));
+ fireEvent(new ContainerEvent<E>(this, deltas));
}
- protected SingleDeltaContainerEvent newContainerEvent(E element, Kind kind)
+ protected SingleDeltaContainerEvent<E> newContainerEvent(E element, Kind kind)
{
- return new SingleDeltaContainerEvent(this, element, kind);
+ return new SingleDeltaContainerEvent<E>(this, element, kind);
}
- protected ContainerEvent newContainerEvent()
+ protected ContainerEvent<E> newContainerEvent()
{
- return new ContainerEvent(this);
+ return new ContainerEvent<E>(this);
}
}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/container/ContainerEvent.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/container/ContainerEvent.java
index 1066016..ff31659 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/container/ContainerEvent.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/container/ContainerEvent.java
@@ -33,7 +33,7 @@ public class ContainerEvent<E> extends Event implements IContainerEvent<E>
public ContainerEvent(IContainer<E> container)
{
super(container);
- deltas = new ArrayList();
+ deltas = new ArrayList<IContainerDelta<E>>();
}
public ContainerEvent(IContainer<E> container, List<IContainerDelta<E>> deltas)
@@ -79,7 +79,7 @@ public class ContainerEvent<E> extends Event implements IContainerEvent<E>
public void addDelta(E element, Kind kind)
{
- addDelta(new ContainerDelta(element, kind));
+ addDelta(new ContainerDelta<E>(element, kind));
}
public void addDelta(IContainerDelta<E> delta)
@@ -96,7 +96,7 @@ public class ContainerEvent<E> extends Event implements IContainerEvent<E>
boolean filtered = true;
if (visitor instanceof Filtered)
{
- filtered = ((Filtered)visitor).filter(element);
+ filtered = ((Filtered<E>)visitor).filter(element);
}
if (filtered)
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/container/ContainerEventAdapter.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/container/ContainerEventAdapter.java
index 024e4ee..e8797d8 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/container/ContainerEventAdapter.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/container/ContainerEventAdapter.java
@@ -29,7 +29,7 @@ public class ContainerEventAdapter<E> implements IListener
{
if (event instanceof IContainerEvent)
{
- IContainerEvent e = (IContainerEvent)event;
+ IContainerEvent<E> e = (IContainerEvent<E>)event;
notifyContainerEvent(e);
}
else
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/container/ManagedContainer.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/container/ManagedContainer.java
index cf68113..dd1234e 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/container/ManagedContainer.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/container/ManagedContainer.java
@@ -55,7 +55,7 @@ public class ManagedContainer extends Lifecycle implements IManagedContainer
private List<IElementProcessor> postProcessors;
- private IRegistry<ElementKey, Object> elementRegistry = new HashMapRegistry();
+ private IRegistry<ElementKey, Object> elementRegistry = new HashMapRegistry<ElementKey, Object>();
private long maxElementID;
@@ -109,7 +109,7 @@ public class ManagedContainer extends Lifecycle implements IManagedContainer
{
if (processExistingElements)
{
- ContainerEvent event = new ContainerEvent(this);
+ ContainerEvent<Object> event = new ContainerEvent<Object>(this);
for (Entry<ElementKey, Object> entry : elementRegistry.entrySet())
{
ElementKey key = entry.getKey();
@@ -145,7 +145,7 @@ public class ManagedContainer extends Lifecycle implements IManagedContainer
public Set<String> getProductGroups()
{
- Set<String> result = new HashSet();
+ Set<String> result = new HashSet<String>();
for (IFactoryKey key : factoryRegistry.keySet())
{
result.add(key.getProductGroup());
@@ -161,7 +161,7 @@ public class ManagedContainer extends Lifecycle implements IManagedContainer
public Set<String> getFactoryTypes(String productGroup)
{
- Set<String> result = new HashSet();
+ Set<String> result = new HashSet<String>();
for (IFactoryKey key : factoryRegistry.keySet())
{
if (ObjectUtil.equals(key.getProductGroup(), productGroup))
@@ -220,7 +220,7 @@ public class ManagedContainer extends Lifecycle implements IManagedContainer
public Object[] getElements(String productGroup)
{
- List result = new ArrayList();
+ List<Object> result = new ArrayList<Object>();
for (Entry<ElementKey, Object> entry : elementRegistry.entrySet())
{
ElementKey key = entry.getKey();
@@ -235,7 +235,7 @@ public class ManagedContainer extends Lifecycle implements IManagedContainer
public Object[] getElements(String productGroup, String factoryType)
{
- List result = new ArrayList();
+ List<Object> result = new ArrayList<Object>();
for (Entry<ElementKey, Object> entry : elementRegistry.entrySet())
{
ElementKey key = entry.getKey();
@@ -261,7 +261,7 @@ public class ManagedContainer extends Lifecycle implements IManagedContainer
EventUtil.addListener(element, elementListener);
key.setID(++maxElementID);
elementRegistry.put(key, element);
- fireEvent(new SingleDeltaContainerEvent(this, element, IContainerDelta.Kind.ADDED));
+ fireEvent(new SingleDeltaContainerEvent<Object>(this, element, IContainerDelta.Kind.ADDED));
}
return element;
@@ -269,7 +269,7 @@ public class ManagedContainer extends Lifecycle implements IManagedContainer
public Object putElement(String productGroup, String factoryType, String description, Object element)
{
- ContainerEvent event = new ContainerEvent(this);
+ ContainerEvent<Object> event = new ContainerEvent<Object>(this);
ElementKey key = new ElementKey(productGroup, factoryType, description);
key.setID(++maxElementID);
Object oldElement = elementRegistry.put(key, element);
@@ -293,7 +293,7 @@ public class ManagedContainer extends Lifecycle implements IManagedContainer
{
if (!elementRegistry.isEmpty())
{
- ContainerEvent event = new ContainerEvent(this);
+ ContainerEvent<Object> event = new ContainerEvent<Object>(this);
for (Object element : elementRegistry.values())
{
event.addDelta(element, IContainerDelta.Kind.REMOVED);
@@ -333,7 +333,7 @@ public class ManagedContainer extends Lifecycle implements IManagedContainer
public void saveElements(OutputStream stream) throws IOException
{
ObjectOutputStream oos = new ObjectOutputStream(stream);
- List<Entry<ElementKey, Object>> entries = new ArrayList(elementRegistry.entrySet());
+ List<Entry<ElementKey, Object>> entries = new ArrayList<Entry<ElementKey, Object>>(elementRegistry.entrySet());
Collections.sort(entries, new EntryComparator());
oos.writeInt(entries.size());
@@ -349,7 +349,7 @@ public class ManagedContainer extends Lifecycle implements IManagedContainer
{
if (event instanceof IContainerEvent)
{
- IContainerEvent containerEvent = (IContainerEvent)event;
+ IContainerEvent<Object> containerEvent = (IContainerEvent<Object>)event;
if (containerEvent.isEmpty())
{
return;
@@ -367,12 +367,12 @@ public class ManagedContainer extends Lifecycle implements IManagedContainer
protected IRegistry<IFactoryKey, IFactory> createFactoryRegistry()
{
- return new HashMapRegistry();
+ return new HashMapRegistry<IFactoryKey, IFactory>();
}
protected List<IElementProcessor> createPostProcessors()
{
- return new ArrayList();
+ return new ArrayList<IElementProcessor>();
}
protected Object createElement(String productGroup, String factoryType, String description)
@@ -397,7 +397,7 @@ public class ManagedContainer extends Lifecycle implements IManagedContainer
if (element != null)
{
EventUtil.removeListener(element, elementListener);
- fireEvent(new SingleDeltaContainerEvent(this, element, IContainerDelta.Kind.REMOVED));
+ fireEvent(new SingleDeltaContainerEvent<Object>(this, element, IContainerDelta.Kind.REMOVED));
}
return element;
@@ -448,7 +448,7 @@ public class ManagedContainer extends Lifecycle implements IManagedContainer
/**
* @author Eike Stepper
*/
- private static final class ElementKey implements Serializable, Comparable
+ private static final class ElementKey implements Serializable, Comparable<ElementKey>
{
private static final long serialVersionUID = 1L;
@@ -517,22 +517,16 @@ public class ManagedContainer extends Lifecycle implements IManagedContainer
return MessageFormat.format("{0}[{1}, {2}]", productGroup, factoryType, description);
}
- public int compareTo(Object o)
+ public int compareTo(ElementKey key)
{
- if (o instanceof ElementKey)
+ if (id < key.id)
{
- ElementKey key = (ElementKey)o;
- if (id < key.id)
- {
- return -1;
- }
-
- if (id > key.id)
- {
- return 1;
- }
+ return -1;
+ }
- return 0;
+ if (id > key.id)
+ {
+ return 1;
}
return 0;
@@ -542,12 +536,10 @@ public class ManagedContainer extends Lifecycle implements IManagedContainer
/**
* @author Eike Stepper
*/
- private static final class EntryComparator implements Comparator
+ private static final class EntryComparator implements Comparator<Entry<ElementKey, Object>>
{
- public int compare(Object o1, Object o2)
+ public int compare(Entry<ElementKey, Object> entry1, Entry<ElementKey, Object> entry2)
{
- Entry<ElementKey, Object> entry1 = (Entry<ElementKey, Object>)o1;
- Entry<ElementKey, Object> entry2 = (Entry<ElementKey, Object>)o2;
return entry1.getKey().compareTo(entry2.getKey());
}
}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/container/PluginElementProcessorList.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/container/PluginElementProcessorList.java
index d3a973a..c0a749a 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/container/PluginElementProcessorList.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/container/PluginElementProcessorList.java
@@ -38,7 +38,7 @@ public class PluginElementProcessorList extends Lifecycle implements List<IEleme
public static final String EXT_POINT = "elementProcessors";
- private List<IElementProcessor> processors = new ArrayList();
+ private List<IElementProcessor> processors = new ArrayList<IElementProcessor>();
private IRegistryChangeListener extensionRegistryListener = new IRegistryChangeListener()
{
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/container/SingleDeltaContainerEvent.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/container/SingleDeltaContainerEvent.java
index 25e9a3b..fd33b07 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/container/SingleDeltaContainerEvent.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/container/SingleDeltaContainerEvent.java
@@ -30,7 +30,7 @@ public class SingleDeltaContainerEvent<E> extends Event implements IContainerEve
public SingleDeltaContainerEvent(IContainer<E> container, E element, Kind kind)
{
super(container);
- deltas = new IContainerDelta[] { new ContainerDelta(element, kind) };
+ deltas = new IContainerDelta[] { new ContainerDelta<E>(element, kind) };
}
public IContainer<E> getContainer()
@@ -70,7 +70,7 @@ public class SingleDeltaContainerEvent<E> extends Event implements IContainerEve
boolean filtered = true;
if (visitor instanceof Filtered)
{
- filtered = ((Filtered)visitor).filter(element);
+ filtered = ((Filtered<E>)visitor).filter(element);
}
if (filtered)
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/container/delegate/AbstractDelegator.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/container/delegate/AbstractDelegator.java
index ecd4023..1739994 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/container/delegate/AbstractDelegator.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/container/delegate/AbstractDelegator.java
@@ -31,26 +31,26 @@ public abstract class AbstractDelegator<E> extends Notifier implements IContaine
protected void fireAddedEvent(E o)
{
- fireEvent(new SingleDeltaContainerEvent(this, o, IContainerDelta.Kind.ADDED));
+ fireEvent(new SingleDeltaContainerEvent<E>(this, o, IContainerDelta.Kind.ADDED));
}
protected void fireRemovedEvent(Object o)
{
- fireEvent(new SingleDeltaContainerEvent(this, o, IContainerDelta.Kind.REMOVED));
+ fireEvent(new SingleDeltaContainerEvent<E>(this, (E)o, IContainerDelta.Kind.REMOVED));
}
- protected ContainerEvent createEvent(Collection c, Kind kind)
+ protected ContainerEvent<E> createEvent(Collection<? super E> c, Kind kind)
{
- ContainerEvent event = new ContainerEvent(this);
+ ContainerEvent<E> event = new ContainerEvent<E>(this);
for (Object o : c)
{
- event.addDelta(o, kind);
+ event.addDelta((E)o, kind);
}
return event;
}
- protected boolean dispatchEvent(ContainerEvent event)
+ protected boolean dispatchEvent(ContainerEvent<E> event)
{
if (event.isEmpty())
{
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/container/delegate/ContainerBlockingQueue.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/container/delegate/ContainerBlockingQueue.java
index 4b185c4..d41666a 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/container/delegate/ContainerBlockingQueue.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/container/delegate/ContainerBlockingQueue.java
@@ -40,7 +40,7 @@ public class ContainerBlockingQueue<E> extends ContainerQueue<E> implements ICon
public int drainTo(Collection<? super E> c)
{
int drainTo = getDelegate().drainTo(c);
- ContainerEvent event = createEvent(c, IContainerDelta.Kind.REMOVED);
+ ContainerEvent<E> event = createEvent(c, IContainerDelta.Kind.REMOVED);
fireEvent(event);
return drainTo;
}
@@ -51,7 +51,7 @@ public class ContainerBlockingQueue<E> extends ContainerQueue<E> implements ICon
public int drainTo(Collection<? super E> c, int maxElements)
{
int drainTo = getDelegate().drainTo(c, maxElements);
- ContainerEvent event = createEvent(c, IContainerDelta.Kind.REMOVED);
+ ContainerEvent<E> event = createEvent(c, IContainerDelta.Kind.REMOVED);
fireEvent(event);
return drainTo;
}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/container/delegate/ContainerCollection.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/container/delegate/ContainerCollection.java
index c06461b..8b3cfbf 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/container/delegate/ContainerCollection.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/container/delegate/ContainerCollection.java
@@ -58,7 +58,7 @@ public class ContainerCollection<E> extends AbstractDelegator<E> implements ICon
*/
public boolean addAll(Collection<? extends E> c)
{
- ContainerEvent event = new ContainerEvent(this);
+ ContainerEvent<E> event = new ContainerEvent<E>(this);
for (E e : c)
{
boolean modified = getDelegate().add(e);
@@ -78,7 +78,7 @@ public class ContainerCollection<E> extends AbstractDelegator<E> implements ICon
{
if (!isEmpty())
{
- ContainerEvent event = createEvent(getDelegate(), IContainerDelta.Kind.REMOVED);
+ ContainerEvent<E> event = createEvent(getDelegate(), IContainerDelta.Kind.REMOVED);
getDelegate().clear();
fireEvent(event);
}
@@ -103,13 +103,13 @@ public class ContainerCollection<E> extends AbstractDelegator<E> implements ICon
*/
public boolean removeAll(Collection<?> c)
{
- ContainerEvent event = new ContainerEvent(this);
+ ContainerEvent<E> event = new ContainerEvent<E>(this);
for (Object o : c)
{
boolean modified = getDelegate().remove(o);
if (modified)
{
- event.addDelta(o, IContainerDelta.Kind.REMOVED);
+ event.addDelta((E)o, IContainerDelta.Kind.REMOVED);
}
}
@@ -121,13 +121,13 @@ public class ContainerCollection<E> extends AbstractDelegator<E> implements ICon
*/
public boolean retainAll(Collection<?> c)
{
- ContainerEvent event = new ContainerEvent(this);
+ ContainerEvent<E> event = new ContainerEvent<E>(this);
for (Object o : getDelegate())
{
if (!c.contains(o))
{
getDelegate().remove(o);
- event.addDelta(o, IContainerDelta.Kind.REMOVED);
+ event.addDelta((E)o, IContainerDelta.Kind.REMOVED);
}
}
@@ -153,6 +153,7 @@ public class ContainerCollection<E> extends AbstractDelegator<E> implements ICon
/**
* @category READ
*/
+ @Override
public boolean equals(Object o)
{
return getDelegate().equals(o);
@@ -161,6 +162,7 @@ public class ContainerCollection<E> extends AbstractDelegator<E> implements ICon
/**
* @category READ
*/
+ @Override
public int hashCode()
{
return getDelegate().hashCode();
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/container/delegate/ContainerList.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/container/delegate/ContainerList.java
index 6953264..0a77a7c 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/container/delegate/ContainerList.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/container/delegate/ContainerList.java
@@ -48,7 +48,7 @@ public class ContainerList<E> extends ContainerCollection<E> implements IContain
*/
public boolean addAll(int index, Collection<? extends E> c)
{
- ContainerEvent event = createEvent(getDelegate(), IContainerDelta.Kind.ADDED);
+ ContainerEvent<E> event = createEvent(getDelegate(), IContainerDelta.Kind.ADDED);
getDelegate().addAll(index, c);
return dispatchEvent(event);
}
@@ -113,7 +113,7 @@ public class ContainerList<E> extends ContainerCollection<E> implements IContain
public E set(int index, E element)
{
E removed = getDelegate().set(index, element);
- ContainerEvent event = new ContainerEvent(ContainerList.this);
+ ContainerEvent<E> event = new ContainerEvent<E>(ContainerList.this);
event.addDelta(removed, IContainerDelta.Kind.REMOVED);
event.addDelta(element, IContainerDelta.Kind.ADDED);
fireEvent(event);
@@ -160,7 +160,7 @@ public class ContainerList<E> extends ContainerCollection<E> implements IContain
public void set(E o)
{
getDelegate().set(o);
- ContainerEvent event = new ContainerEvent(ContainerList.this);
+ ContainerEvent<E> event = new ContainerEvent<E>(ContainerList.this);
event.addDelta(last, IContainerDelta.Kind.REMOVED);
event.addDelta(o, IContainerDelta.Kind.ADDED);
fireEvent(event);
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/container/delegate/ContainerMap.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/container/delegate/ContainerMap.java
index a9601af..dffc19f 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/container/delegate/ContainerMap.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/container/delegate/ContainerMap.java
@@ -43,7 +43,7 @@ public class ContainerMap<K, V> extends AbstractDelegator<Map.Entry<K, V>> imple
{
if (!isEmpty())
{
- ContainerEvent event = createEvent(getDelegate().entrySet(), IContainerDelta.Kind.REMOVED);
+ ContainerEvent<Map.Entry<K, V>> event = createEvent(getDelegate().entrySet(), IContainerDelta.Kind.REMOVED);
getDelegate().clear();
fireEvent(event);
}
@@ -78,14 +78,14 @@ public class ContainerMap<K, V> extends AbstractDelegator<Map.Entry<K, V>> imple
*/
public V put(K key, V value)
{
- ContainerEvent event = new ContainerEvent(this);
+ ContainerEvent<Map.Entry<K, V>> event = new ContainerEvent<Map.Entry<K, V>>(this);
V removed = getDelegate().put(key, value);
if (removed != null)
{
- event.addDelta(new MapEntry(key, removed), IContainerDelta.Kind.REMOVED);
+ event.addDelta(new MapEntry<K, V>(key, removed), IContainerDelta.Kind.REMOVED);
}
- event.addDelta(new MapEntry(key, value), IContainerDelta.Kind.ADDED);
+ event.addDelta(new MapEntry<K, V>(key, value), IContainerDelta.Kind.ADDED);
fireEvent(event);
return removed;
}
@@ -95,20 +95,20 @@ public class ContainerMap<K, V> extends AbstractDelegator<Map.Entry<K, V>> imple
*/
public void putAll(Map<? extends K, ? extends V> t)
{
- ContainerEvent event = new ContainerEvent(this);
+ ContainerEvent<Map.Entry<K, V>> event = new ContainerEvent<Map.Entry<K, V>>(this);
Iterator<? extends Entry<? extends K, ? extends V>> i = t.entrySet().iterator();
while (i.hasNext())
{
- Entry<? extends K, ? extends V> e = i.next();
- K key = e.getKey();
- V value = e.getValue();
+ Entry<? extends K, ? extends V> entry = i.next();
+ K key = entry.getKey();
+ V value = entry.getValue();
V removed = getDelegate().put(key, value);
if (removed != null)
{
- event.addDelta(new MapEntry(key, removed), IContainerDelta.Kind.REMOVED);
+ event.addDelta(new MapEntry<K, V>(key, removed), IContainerDelta.Kind.REMOVED);
}
- event.addDelta(e, IContainerDelta.Kind.ADDED);
+ event.addDelta(new MapEntry<K, V>(key, value), IContainerDelta.Kind.ADDED);
}
dispatchEvent(event);
@@ -122,7 +122,7 @@ public class ContainerMap<K, V> extends AbstractDelegator<Map.Entry<K, V>> imple
V removed = getDelegate().remove(key);
if (removed != null)
{
- fireRemovedEvent(new MapEntry(key, removed));
+ fireRemovedEvent(new MapEntry<Object, V>(key, removed));
}
return removed;
@@ -157,7 +157,7 @@ public class ContainerMap<K, V> extends AbstractDelegator<Map.Entry<K, V>> imple
*/
public Set<Map.Entry<K, V>> entrySet()
{
- return new ContainerSet(getDelegate().entrySet());
+ return new ContainerSet<Map.Entry<K, V>>(getDelegate().entrySet());
}
/**
@@ -165,7 +165,7 @@ public class ContainerMap<K, V> extends AbstractDelegator<Map.Entry<K, V>> imple
*/
public Set<K> keySet()
{
- return new ContainerSet(getDelegate().keySet());
+ return new ContainerSet<K>(getDelegate().keySet());
}
/**
@@ -173,7 +173,7 @@ public class ContainerMap<K, V> extends AbstractDelegator<Map.Entry<K, V>> imple
*/
public Collection<V> values()
{
- return new ContainerCollection(getDelegate().values());
+ return new ContainerCollection<V>(getDelegate().values());
}
/**
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/event/Notifier.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/event/Notifier.java
index f375ad0..c6bb4fa 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/event/Notifier.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/event/Notifier.java
@@ -23,7 +23,7 @@ import java.util.List;
*/
public class Notifier implements INotifier.Introspection
{
- private List<IListener> listeners = new ArrayList(0);
+ private List<IListener> listeners = new ArrayList<IListener>(0);
public Notifier()
{
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/factory/Factory.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/factory/Factory.java
index ba43b17..736221e 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/factory/Factory.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/factory/Factory.java
@@ -17,7 +17,7 @@ import java.text.MessageFormat;
/**
* @author Eike Stepper
*/
-public abstract class Factory<PRODUCT> implements IFactory<PRODUCT>
+public abstract class Factory implements IFactory
{
private FactoryKey key;
@@ -46,7 +46,7 @@ public abstract class Factory<PRODUCT> implements IFactory<PRODUCT>
return key.getType();
}
- public String getDescriptionFor(PRODUCT product)
+ public String getDescriptionFor(Object product)
{
return null;
}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/factory/FactoryKey.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/factory/FactoryKey.java
index 75fe02c..c803199 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/factory/FactoryKey.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/factory/FactoryKey.java
@@ -20,7 +20,7 @@ import java.text.MessageFormat;
/**
* @author Eike Stepper
*/
-public final class FactoryKey implements IFactoryKey, Serializable, Comparable
+public final class FactoryKey implements IFactoryKey, Serializable, Comparable<FactoryKey>
{
private static final long serialVersionUID = 1L;
@@ -68,20 +68,14 @@ public final class FactoryKey implements IFactoryKey, Serializable, Comparable
return MessageFormat.format("{0}[{1}]", productGroup, type);
}
- public int compareTo(Object o)
+ public int compareTo(FactoryKey key)
{
- if (o instanceof FactoryKey)
+ int result = StringUtil.compare(productGroup, key.productGroup);
+ if (result == 0)
{
- FactoryKey key = (FactoryKey)o;
- int result = StringUtil.compare(productGroup, key.productGroup);
- if (result == 0)
- {
- result = StringUtil.compare(type, key.type);
- }
-
- return result;
+ result = StringUtil.compare(type, key.type);
}
- return 0;
+ return result;
}
} \ No newline at end of file
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/lifecycle/QueueWorker.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/lifecycle/QueueWorker.java
index 1652318..f66b909 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/lifecycle/QueueWorker.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/lifecycle/QueueWorker.java
@@ -64,7 +64,7 @@ public abstract class QueueWorker<E> extends Worker
protected BlockingQueue<E> createQueue()
{
- return new LinkedBlockingQueue();
+ return new LinkedBlockingQueue<E>();
}
@Override
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/LegacyBundle.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/LegacyBundle.java
index 07b4de0..5918b04 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/LegacyBundle.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/LegacyBundle.java
@@ -32,7 +32,7 @@ public class LegacyBundle extends AbstractBundle
{
private URL baseURL;
- public LegacyBundle(AbstractPlatform platform, String bundleID, Class accessor)
+ public LegacyBundle(AbstractPlatform platform, String bundleID, Class<?> accessor)
{
super(platform, bundleID, accessor);
@@ -97,7 +97,7 @@ public class LegacyBundle extends AbstractBundle
}
}
- private void computeBaseURL(Class accessor) throws MalformedURLException
+ private void computeBaseURL(Class<?> accessor) throws MalformedURLException
{
// Determine the URL for the class itself. The URL will be of one of the
// following forms, so there are a few good places to consider looking for
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/LegacyPlatform.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/LegacyPlatform.java
index cf90340..fe688b8 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/LegacyPlatform.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/LegacyPlatform.java
@@ -21,14 +21,14 @@ import java.util.concurrent.ConcurrentHashMap;
*/
public class LegacyPlatform extends AbstractPlatform
{
- private Map<String, String> debugOptions = new ConcurrentHashMap(0);
+ private Map<String, String> debugOptions = new ConcurrentHashMap<String, String>(0);
public LegacyPlatform()
{
}
@Override
- protected OMBundle createBundle(String bundleID, Class accessor)
+ protected OMBundle createBundle(String bundleID, Class<?> accessor)
{
return new LegacyBundle(this, bundleID, accessor);
}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/OSGiBundle.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/OSGiBundle.java
index 2f03ff8..beb31a6 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/OSGiBundle.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/OSGiBundle.java
@@ -28,7 +28,7 @@ import java.net.URL;
*/
public class OSGiBundle extends AbstractBundle
{
- public OSGiBundle(AbstractPlatform platform, String bundleID, Class accessor)
+ public OSGiBundle(AbstractPlatform platform, String bundleID, Class<?> accessor)
{
super(platform, bundleID, accessor);
}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/OSGiPlatform.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/OSGiPlatform.java
index 22bb95f..6a0b63d 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/OSGiPlatform.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/OSGiPlatform.java
@@ -41,7 +41,7 @@ public class OSGiPlatform extends AbstractPlatform
}
@Override
- protected OMBundle createBundle(String bundleID, Class accessor)
+ protected OMBundle createBundle(String bundleID, Class<?> accessor)
{
return new OSGiBundle(this, bundleID, accessor);
}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/monitor/MON.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/monitor/MON.java
index 7fddaf2..a726632 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/monitor/MON.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/monitor/MON.java
@@ -23,7 +23,7 @@ public final class MON
{
public static final int UNKNOWN = -1;
- private static final ThreadLocal<Monitor> CURRENT = new ThreadLocal();
+ private static final ThreadLocal<Monitor> CURRENT = new ThreadLocal<Monitor>();
private MON()
{
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
index 5517b1b..b200573 100644
--- 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
@@ -33,7 +33,7 @@ public class Preferences extends Notifier implements OMPreferences
{
private AbstractBundle bundle;
- private Map<String, Preference> prefs = new HashMap();
+ private Map<String, Preference<?>> prefs = new HashMap<String, Preference<?>>();
private boolean loaded;
@@ -68,7 +68,7 @@ public class Preferences extends Notifier implements OMPreferences
});
}
- for (Preference preference : prefs.values())
+ for (Preference<?> preference : prefs.values())
{
String name = preference.getName();
String value = properties.getProperty(name);
@@ -82,7 +82,7 @@ public class Preferences extends Notifier implements OMPreferences
if (dirty)
{
final Properties properties = new Properties();
- for (Preference preference : prefs.values())
+ for (Preference<?> preference : prefs.values())
{
if (preference.isSet())
{
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/trace/ContextTracer.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/trace/ContextTracer.java
index 7a35272..af9c658 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/trace/ContextTracer.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/trace/ContextTracer.java
@@ -20,9 +20,9 @@ public class ContextTracer
{
private OMTracer delegate;
- private Class context;
+ private Class<?> context;
- public ContextTracer(OMTracer delegate, Class context)
+ public ContextTracer(OMTracer delegate, Class<?> context)
{
this.delegate = delegate;
this.context = context;
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/trace/PrintTraceHandler.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/trace/PrintTraceHandler.java
index 3b30400..f3b761d 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/trace/PrintTraceHandler.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/trace/PrintTraceHandler.java
@@ -89,7 +89,7 @@ public class PrintTraceHandler implements OMTraceHandler
public static String format(boolean shortContext, OMTraceHandlerEvent event)
{
- Class context = event.getContext();
+ Class<?> context = event.getContext();
String contextName = shortContext ? context.getSimpleName() : context.getName();
return Thread.currentThread().getName() + " [" + contextName + "] " + event.getMessage();
}
@@ -116,7 +116,7 @@ public class PrintTraceHandler implements OMTraceHandler
final String tracerName = tracer.getFullName();
final String tracerShort = tracer.getName();
- final Class context = event.getContext();
+ final Class<?> context = event.getContext();
final String contextName = context.getName();
final String contextShort = context.getName();
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/trace/RemoteTraceServer.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/trace/RemoteTraceServer.java
index f7ae4d3..d939a22 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/trace/RemoteTraceServer.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/trace/RemoteTraceServer.java
@@ -43,7 +43,7 @@ public class RemoteTraceServer
private ServerSocket serverSocket;
- private Queue<Listener> listeners = new ConcurrentLinkedQueue();
+ private Queue<Listener> listeners = new ConcurrentLinkedQueue<Listener>();
public RemoteTraceServer() throws IOException
{
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/trace/TraceHandlerEvent.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/trace/TraceHandlerEvent.java
index 83b2c45..85ad4a9 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/trace/TraceHandlerEvent.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/trace/TraceHandlerEvent.java
@@ -26,13 +26,13 @@ public class TraceHandlerEvent implements OMTraceHandlerEvent, Serializable
protected OMTracer tracer;
- protected Class context;
+ protected Class<?> context;
protected String message;
protected Throwable throwable;
- public TraceHandlerEvent(OMTracer tracer, Class context, String message, Throwable throwable)
+ public TraceHandlerEvent(OMTracer tracer, Class<?> context, String message, Throwable throwable)
{
if (tracer == null)
{
@@ -61,7 +61,7 @@ public class TraceHandlerEvent implements OMTraceHandlerEvent, Serializable
return tracer;
}
- public Class getContext()
+ public Class<?> getContext()
{
return context;
}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/trace/Tracer.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/trace/Tracer.java
index 9f20a8c..9399a9f 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/trace/Tracer.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/trace/Tracer.java
@@ -80,30 +80,30 @@ public class Tracer implements OMTracer
((AbstractPlatform)bundle.getPlatform()).trace(event);
}
- public OMTraceHandlerEvent trace(Class context, String msg, Throwable t)
+ public OMTraceHandlerEvent trace(Class<?> context, String msg, Throwable t)
{
OMTraceHandlerEvent event = new TraceHandlerEvent(this, context, msg, t);
trace(event);
return event;
}
- public OMTraceHandlerEvent 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 OMTraceHandlerEvent format(Class context, String pattern, Object... args)
+ public OMTraceHandlerEvent format(Class<?> context, String pattern, Object... args)
{
return format(context, pattern, (Throwable)null, args);
}
- public OMTraceHandlerEvent trace(Class context, String msg)
+ public OMTraceHandlerEvent trace(Class<?> context, String msg)
{
return trace(context, msg, (Throwable)null);
}
- public OMTraceHandlerEvent trace(Class context, Throwable t)
+ public OMTraceHandlerEvent trace(Class<?> context, Throwable t)
{
return trace(context, (String)null, t);
}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/registry/HashMapDelegatingRegistry.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/registry/HashMapDelegatingRegistry.java
index e8c8968..779fef0 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/registry/HashMapDelegatingRegistry.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/registry/HashMapDelegatingRegistry.java
@@ -25,25 +25,25 @@ public class HashMapDelegatingRegistry<K, V> extends DelegatingRegistry<K, V>
public HashMapDelegatingRegistry(IRegistry<K, V> delegate)
{
super(delegate);
- map = new HashMap();
+ map = new HashMap<K, V>();
}
public HashMapDelegatingRegistry(IRegistry<K, V> delegate, int initialCapacity)
{
super(delegate);
- map = new HashMap(initialCapacity);
+ map = new HashMap<K, V>(initialCapacity);
}
public HashMapDelegatingRegistry(IRegistry<K, V> delegate, int initialCapacity, float loadFactor)
{
super(delegate);
- map = new HashMap(initialCapacity, loadFactor);
+ map = new HashMap<K, V>(initialCapacity, loadFactor);
}
public HashMapDelegatingRegistry(IRegistry<K, V> delegate, Map<? extends K, ? extends V> m)
{
super(delegate);
- map = new HashMap(m);
+ map = new HashMap<K, V>(m);
}
@Override
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/registry/HashMapRegistry.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/registry/HashMapRegistry.java
index 22aca73..05d3475 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/registry/HashMapRegistry.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/registry/HashMapRegistry.java
@@ -22,22 +22,22 @@ public class HashMapRegistry<K, V> extends Registry<K, V>
public HashMapRegistry()
{
- map = new HashMap();
+ map = new HashMap<K, V>();
}
public HashMapRegistry(int initialCapacity)
{
- map = new HashMap(initialCapacity);
+ map = new HashMap<K, V>(initialCapacity);
}
public HashMapRegistry(int initialCapacity, float loadFactor)
{
- map = new HashMap(initialCapacity, loadFactor);
+ map = new HashMap<K, V>(initialCapacity, loadFactor);
}
public HashMapRegistry(Map<? extends K, ? extends V> m)
{
- map = new HashMap(m);
+ map = new HashMap<K, V>(m);
}
@Override
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/transaction/Transaction.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/transaction/Transaction.java
index e8a7c62..8205477 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/transaction/Transaction.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/transaction/Transaction.java
@@ -22,7 +22,7 @@ import java.util.List;
*/
public class Transaction<CONTEXT> implements ITransaction<CONTEXT>
{
- private List<ITransactionalOperation> operations = new ArrayList();
+ private List<ITransactionalOperation<CONTEXT>> operations = new ArrayList<ITransactionalOperation<CONTEXT>>();
private CONTEXT context;
@@ -67,7 +67,7 @@ public class Transaction<CONTEXT> implements ITransaction<CONTEXT>
public void commit()
{
- for (ITransactionalOperation operation : end())
+ for (ITransactionalOperation<CONTEXT> operation : end())
{
operation.phase2(context);
}
@@ -75,15 +75,15 @@ public class Transaction<CONTEXT> implements ITransaction<CONTEXT>
public void rollback()
{
- for (ITransactionalOperation operation : end())
+ for (ITransactionalOperation<CONTEXT> operation : end())
{
operation.undoPhase1(context);
}
}
- private List<ITransactionalOperation> end()
+ private List<ITransactionalOperation<CONTEXT>> end()
{
- List<ITransactionalOperation> tmp = operations;
+ List<ITransactionalOperation<CONTEXT>> tmp = operations;
operations = null;
return tmp;
}
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 4ff6036..37f459f 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
@@ -41,7 +41,7 @@ public final class ReflectUtil
public static final Class<Object> ROOT_CLASS = Object.class;
- public static final Class[] NO_PARAMETERS = null;
+ public static final Class<?>[] NO_PARAMETERS = null;
public static final Object[] NO_ARGUMENTS = null;
@@ -49,7 +49,7 @@ public final class ReflectUtil
private static final Method HASH_CODE_METHOD = lookupHashCodeMethod();
- private static final Map<Object, Long> ids = new WeakHashMap();
+ private static final Map<Object, Long> ids = new WeakHashMap<Object, Long>();
public static boolean DUMP_STATICS = false;
@@ -59,7 +59,7 @@ public final class ReflectUtil
{
}
- public static Method getMethod(Class<?> c, String methodName, Class... parameterTypes)
+ public static Method getMethod(Class<?> c, String methodName, Class<?>... parameterTypes)
{
try
{
@@ -340,14 +340,14 @@ public final class ReflectUtil
public static Pair<Field, Object>[] dumpToArray(Object object)
{
- List<Field> fields = new ArrayList();
+ List<Field> fields = new ArrayList<Field>();
collectFields(object.getClass(), fields);
Pair<Field, Object>[] result = new Pair[fields.size()];
int i = 0;
for (Field field : fields)
{
Object value = getValue(field, object);
- result[i++] = new Pair(field, value);
+ result[i++] = new Pair<Field, Object>(field, value);
}
return result;
@@ -370,7 +370,7 @@ public final class ReflectUtil
}
String className = null;
- Map<String, Object> values = new HashMap();
+ Map<String, Object> values = new HashMap<String, Object>();
for (Entry<Object, Object> entry : properties.entrySet())
{
if (entry.getKey() instanceof String)
@@ -541,13 +541,13 @@ public final class ReflectUtil
Object value = getValue(field, object);
if (value instanceof Map)
{
- value = ((Map)value).entrySet();
+ value = ((Map<?, ?>)value).entrySet();
}
if (value instanceof Collection)
{
builder.append(NL);
- for (Object element : (Collection)value)
+ for (Object element : (Collection<?>)value)
{
builder.append(" ");
builder.append(element);
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/collection/HistoryUtil.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/collection/HistoryUtil.java
index 8b6d8e5..9586efb 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/collection/HistoryUtil.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/collection/HistoryUtil.java
@@ -25,7 +25,7 @@ public final class HistoryUtil
public static IHistory<String> createHistory()
{
- return new History();
+ return new History<String>();
}
public static IHistory<String> createPreferenceHistory(OMPreference<String[]> preference)
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/collection/IHistoryElement.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/collection/IHistoryElement.java
index a27af18..14e3f7f 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/collection/IHistoryElement.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/collection/IHistoryElement.java
@@ -15,7 +15,7 @@ package org.eclipse.net4j.util.collection;
*/
public interface IHistoryElement<T>
{
- public IHistory getHistory();
+ public IHistory<IHistoryElement<T>> getHistory();
public T getData();
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/ContainerUtil.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/ContainerUtil.java
index e9b6ee9..d5300e0 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/ContainerUtil.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/ContainerUtil.java
@@ -25,7 +25,7 @@ public final class ContainerUtil
{
if (container instanceof IContainer)
{
- return ((IContainer)container).isEmpty();
+ return ((IContainer<?>)container).isEmpty();
}
return true;
@@ -35,7 +35,7 @@ public final class ContainerUtil
{
if (container instanceof IContainer)
{
- return ((IContainer)container).getElements();
+ return ((IContainer<?>)container).getElements();
}
return NO_ELEMENTS;
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/IManagedContainer.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/IManagedContainer.java
index 9983f4a..9f57bd5 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/IManagedContainer.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/container/IManagedContainer.java
@@ -10,7 +10,6 @@
**************************************************************************/
package org.eclipse.net4j.util.container;
-import org.eclipse.net4j.internal.util.container.ManagedContainer;
import org.eclipse.net4j.util.factory.IFactory;
import org.eclipse.net4j.util.factory.IFactoryKey;
import org.eclipse.net4j.util.registry.IRegistry;
@@ -24,11 +23,11 @@ import java.util.Set;
/**
* @author Eike Stepper
*/
-public interface IManagedContainer extends IContainer
+public interface IManagedContainer extends IContainer<Object>
{
public IRegistry<IFactoryKey, IFactory> getFactoryRegistry();
- public ManagedContainer registerFactory(IFactory factory);
+ public IManagedContainer registerFactory(IFactory factory);
public List<IElementProcessor> getPostProcessors();
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/factory/IFactory.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/factory/IFactory.java
index 24f564e..22e59b7 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/factory/IFactory.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/factory/IFactory.java
@@ -13,11 +13,11 @@ package org.eclipse.net4j.util.factory;
/**
* @author Eike Stepper
*/
-public interface IFactory<PRODUCT>
+public interface IFactory
{
public IFactoryKey getKey();
- public PRODUCT create(String description) throws ProductCreationException;
+ public Object create(String description) throws ProductCreationException;
- public String getDescriptionFor(PRODUCT product);
+ public String getDescriptionFor(Object product);
}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/fsm/FiniteStateMachine.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/fsm/FiniteStateMachine.java
index 3afa87a..d406080 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/fsm/FiniteStateMachine.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/fsm/FiniteStateMachine.java
@@ -8,10 +8,12 @@ import java.text.MessageFormat;
/**
* @author Eike Stepper
*/
-public abstract class FiniteStateMachine<STATE extends Enum, EVENT extends Enum, SUBJECT>
+public abstract class FiniteStateMachine<STATE extends Enum<?>, EVENT extends Enum<?>, SUBJECT>
{
+ @SuppressWarnings("unchecked")
public static final ITransition IGNORE = new IgnoreTransition();
+ @SuppressWarnings("unchecked")
public static final ITransition FAIL = new FailTransition();
private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG, FiniteStateMachine.class);
@@ -26,9 +28,10 @@ public abstract class FiniteStateMachine<STATE extends Enum, EVENT extends Enum,
private EVENT[] events;
- private ITransition[][] transitions;
+ private ITransition<STATE, EVENT, SUBJECT, ?>[][] transitions;
- public FiniteStateMachine(Class<STATE> stateEnum, Class<EVENT> eventEnum, ITransition defaultTransition)
+ public FiniteStateMachine(Class<STATE> stateEnum, Class<EVENT> eventEnum,
+ ITransition<STATE, EVENT, SUBJECT, ?> defaultTransition)
{
states = stateEnum.getEnumConstants();
events = eventEnum.getEnumConstants();
@@ -51,14 +54,14 @@ public abstract class FiniteStateMachine<STATE extends Enum, EVENT extends Enum,
return events;
}
- public final ITransition getTransition(STATE state, EVENT event)
+ public final ITransition<STATE, EVENT, SUBJECT, ?> getTransition(STATE state, EVENT event)
{
int s = state.ordinal();
int e = event.ordinal();
return transitions[s][e];
}
- public final void transit(STATE state, EVENT event, ITransition transition)
+ public final void transit(STATE state, EVENT event, ITransition<STATE, EVENT, SUBJECT, ?> transition)
{
checkTransition(transition);
int s = state.ordinal();
@@ -66,7 +69,7 @@ public abstract class FiniteStateMachine<STATE extends Enum, EVENT extends Enum,
transitions[s][e] = transition;
}
- public final void transitEvents(STATE state, ITransition transition)
+ public final void transitEvents(STATE state, ITransition<STATE, EVENT, SUBJECT, ?> transition)
{
checkTransition(transition);
int s = state.ordinal();
@@ -76,7 +79,7 @@ public abstract class FiniteStateMachine<STATE extends Enum, EVENT extends Enum,
}
}
- public final void transitStates(EVENT event, ITransition transition)
+ public final void transitStates(EVENT event, ITransition<STATE, EVENT, SUBJECT, ?> transition)
{
checkTransition(transition);
int e = event.ordinal();
@@ -86,7 +89,7 @@ public abstract class FiniteStateMachine<STATE extends Enum, EVENT extends Enum,
}
}
- public final void transitAll(ITransition transition)
+ public final void transitAll(ITransition<STATE, EVENT, SUBJECT, ?> transition)
{
checkTransition(transition);
for (int s = 0; s < states.length; s++)
@@ -103,7 +106,7 @@ public abstract class FiniteStateMachine<STATE extends Enum, EVENT extends Enum,
STATE state = getState(subject);
int s = state.ordinal();
int e = event.ordinal();
- ITransition transition = transitions[s][e];
+ ITransition<STATE, EVENT, SUBJECT, DATA> transition = (ITransition<STATE, EVENT, SUBJECT, DATA>)transitions[s][e];
if (transition == IGNORE)
{
// TODO if (TRACER.isEnabled())
@@ -126,12 +129,12 @@ public abstract class FiniteStateMachine<STATE extends Enum, EVENT extends Enum,
}
}
- protected ITransition createIgnoreTransition(STATE state, EVENT event)
+ protected ITransition<STATE, EVENT, SUBJECT, ?> createIgnoreTransition(STATE state, EVENT event)
{
return IGNORE;
}
- protected ITransition createFailTransition(STATE state, EVENT event)
+ protected ITransition<STATE, EVENT, SUBJECT, ?> createFailTransition(STATE state, EVENT event)
{
return FAIL;
}
@@ -153,7 +156,7 @@ public abstract class FiniteStateMachine<STATE extends Enum, EVENT extends Enum,
protected abstract STATE getState(SUBJECT subject);
- private void checkTransition(ITransition transition)
+ private void checkTransition(ITransition<STATE, EVENT, SUBJECT, ?> transition)
{
if (transition == null)
{
@@ -164,9 +167,9 @@ public abstract class FiniteStateMachine<STATE extends Enum, EVENT extends Enum,
/**
* @author Eike Stepper
*/
- public static class IgnoreTransition implements ITransition
+ public static class IgnoreTransition implements ITransition<Enum<?>, Enum<?>, Object, Object>
{
- public void execute(Object subject, Enum state, Enum event, Object data)
+ public void execute(Object subject, Enum<?> state, Enum<?> event, Object data)
{
// Do nothing
}
@@ -181,9 +184,9 @@ public abstract class FiniteStateMachine<STATE extends Enum, EVENT extends Enum,
/**
* @author Eike Stepper
*/
- public static class FailTransition implements ITransition
+ public static class FailTransition implements ITransition<Enum<?>, Enum<?>, Object, Object>
{
- public void execute(Object subject, Enum state, Enum event, Object data)
+ public void execute(Object subject, Enum<?> state, Enum<?> event, Object data)
{
// Do nothing
}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/fsm/ITransition.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/fsm/ITransition.java
index 059337b..1ea6d8e 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/fsm/ITransition.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/fsm/ITransition.java
@@ -13,7 +13,7 @@ package org.eclipse.net4j.util.fsm;
/**
* @author Eike Stepper
*/
-public interface ITransition<STATE extends Enum, EVENT extends Enum, SUBJECT, DATA>
+public interface ITransition<STATE extends Enum<?>, EVENT extends Enum<?>, SUBJECT, DATA>
{
public void execute(SUBJECT subject, STATE state, EVENT event, DATA data);
}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/CachedFileMap.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/CachedFileMap.java
index 496f48c..5882f3b 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/CachedFileMap.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/CachedFileMap.java
@@ -7,9 +7,9 @@ import java.util.Map;
/**
* @author Eike Stepper
*/
-public abstract class CachedFileMap<K extends Comparable, V> extends SortedFileMap<K, V>
+public abstract class CachedFileMap<K extends Comparable<K>, V> extends SortedFileMap<K, V>
{
- private Map<K, V> cache = new HashMap();
+ private Map<K, V> cache = new HashMap<K, V>();
public CachedFileMap(File file, String mode)
{
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/DelegatingStreamWrapper.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/DelegatingStreamWrapper.java
index 415c3ca..ea1757e 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/DelegatingStreamWrapper.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/DelegatingStreamWrapper.java
@@ -17,8 +17,7 @@ import java.io.OutputStream;
/**
* @author Eike Stepper
*/
-public abstract class DelegatingStreamWrapper<IN extends InputStream, OUT extends OutputStream> implements
- IStreamWrapper<IN, OUT>
+public abstract class DelegatingStreamWrapper implements IStreamWrapper
{
private IStreamWrapper delegate;
@@ -32,33 +31,33 @@ public abstract class DelegatingStreamWrapper<IN extends InputStream, OUT extend
return delegate;
}
- public IN wrapInputStream(InputStream in) throws IOException
+ public InputStream wrapInputStream(InputStream in) throws IOException
{
return doWrapInputStream(delegate.wrapInputStream(in));
}
- public OUT wrapOutputStream(OutputStream out) throws IOException
+ public OutputStream wrapOutputStream(OutputStream out) throws IOException
{
return doWrapOutputStream(delegate.wrapOutputStream(out));
}
- public void finishInputStream(IN in) throws IOException
+ public void finishInputStream(InputStream in) throws IOException
{
delegate.finishInputStream(in);
doFinishInputStream(in);
}
- public void finishOutputStream(OUT out) throws IOException
+ public void finishOutputStream(OutputStream out) throws IOException
{
delegate.finishOutputStream(out);
doFinishOutputStream(out);
}
- protected abstract IN doWrapInputStream(InputStream in) throws IOException;
+ protected abstract InputStream doWrapInputStream(InputStream in) throws IOException;
- protected abstract OUT doWrapOutputStream(OutputStream out) throws IOException;
+ protected abstract OutputStream doWrapOutputStream(OutputStream out) throws IOException;
- protected abstract void doFinishInputStream(IN in) throws IOException;
+ protected abstract void doFinishInputStream(InputStream in) throws IOException;
- protected abstract void doFinishOutputStream(OUT out) throws IOException;
+ protected abstract void doFinishOutputStream(OutputStream out) throws IOException;
}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/GZIPStreamWrapper.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/GZIPStreamWrapper.java
index 981edda..3be4cda 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/GZIPStreamWrapper.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/GZIPStreamWrapper.java
@@ -23,7 +23,7 @@ import java.util.zip.GZIPOutputStream;
/**
* @author Eike Stepper
*/
-public class GZIPStreamWrapper implements IStreamWrapper<GZIPInputStream, GZIPOutputStream>
+public class GZIPStreamWrapper implements IStreamWrapper
{
public GZIPStreamWrapper()
{
@@ -49,13 +49,13 @@ public class GZIPStreamWrapper implements IStreamWrapper<GZIPInputStream, GZIPOu
return new GZIPOutputStream(out);
}
- public void finishInputStream(GZIPInputStream in) throws IOException
+ public void finishInputStream(InputStream in) throws IOException
{
}
- public void finishOutputStream(GZIPOutputStream out) throws IOException
+ public void finishOutputStream(OutputStream out) throws IOException
{
- out.finish();
+ ((GZIPOutputStream)out).finish();
}
public static void main(String[] args) throws Exception
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
index 3cb1224..76a2930 100644
--- 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
@@ -404,7 +404,7 @@ public final class IOUtil
}
}
- public static void safeRun(Closeable io, IORunnable runnable) throws IORuntimeException
+ public static <IO extends Closeable> void safeRun(IO io, IORunnable<IO> runnable) throws IORuntimeException
{
try
{
@@ -498,7 +498,7 @@ public final class IOUtil
*/
public static class FileCollector implements IOVisitor
{
- private List<File> files = new ArrayList();
+ private List<File> files = new ArrayList<File>();
public FileCollector()
{
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/IStreamWrapper.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/IStreamWrapper.java
index 9c01c19..dbb0a6a 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/IStreamWrapper.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/IStreamWrapper.java
@@ -17,13 +17,13 @@ import java.io.OutputStream;
/**
* @author Eike Stepper
*/
-public interface IStreamWrapper<IN extends InputStream, OUT extends OutputStream>
+public interface IStreamWrapper
{
- public IN wrapInputStream(InputStream in) throws IOException;
+ public InputStream wrapInputStream(InputStream in) throws IOException;
- public OUT wrapOutputStream(OutputStream out) throws IOException;
+ public OutputStream wrapOutputStream(OutputStream out) throws IOException;
- public void finishInputStream(IN in) throws IOException;
+ public void finishInputStream(InputStream in) throws IOException;
- public void finishOutputStream(OUT out) throws IOException;
+ public void finishOutputStream(OutputStream out) throws IOException;
}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/SortedFileMap.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/SortedFileMap.java
index 30f532a..77f20bf 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/SortedFileMap.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/SortedFileMap.java
@@ -18,7 +18,7 @@ import java.io.RandomAccessFile;
/**
* @author Eike Stepper
*/
-public abstract class SortedFileMap<K extends Comparable, V> implements Closeable
+public abstract class SortedFileMap<K extends Comparable<K>, V> implements Closeable
{
private File file;
@@ -198,7 +198,7 @@ public abstract class SortedFileMap<K extends Comparable, V> implements Closeabl
{
long mid = low + high >> 1;
randomAccessFile.seek(getPosition(mid));
- Comparable midVal = readKey(input);
+ Comparable<K> midVal = readKey(input);
int cmp = midVal.compareTo(key);
if (cmp < 0)
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/StreamWrapperChain.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/StreamWrapperChain.java
index 5db5432..8da93e7 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/StreamWrapperChain.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/StreamWrapperChain.java
@@ -17,42 +17,41 @@ import java.io.OutputStream;
/**
* @author Eike Stepper
*/
-public class StreamWrapperChain<IN extends InputStream, OUT extends OutputStream> extends
- DelegatingStreamWrapper<IN, OUT>
+public class StreamWrapperChain extends DelegatingStreamWrapper
{
- private IStreamWrapper<IN, OUT> head;
+ private IStreamWrapper head;
- public StreamWrapperChain(IStreamWrapper<IN, OUT> head, IStreamWrapper delegate)
+ public StreamWrapperChain(IStreamWrapper head, IStreamWrapper delegate)
{
super(delegate);
this.head = head;
}
- public IStreamWrapper<IN, OUT> getHead()
+ public IStreamWrapper getHead()
{
return head;
}
@Override
- protected IN doWrapInputStream(InputStream in) throws IOException
+ protected InputStream doWrapInputStream(InputStream in) throws IOException
{
return head.wrapInputStream(in);
}
@Override
- protected OUT doWrapOutputStream(OutputStream out) throws IOException
+ protected OutputStream doWrapOutputStream(OutputStream out) throws IOException
{
return head.wrapOutputStream(out);
}
@Override
- protected void doFinishInputStream(IN in) throws IOException
+ protected void doFinishInputStream(InputStream in) throws IOException
{
head.finishInputStream(in);
}
@Override
- protected void doFinishOutputStream(OUT out) throws IOException
+ protected void doFinishOutputStream(OutputStream out) throws IOException
{
head.finishOutputStream(out);
}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/XORStreamWrapper.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/XORStreamWrapper.java
index c7454d4..e00e33f 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/XORStreamWrapper.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/XORStreamWrapper.java
@@ -17,7 +17,7 @@ import java.io.OutputStream;
/**
* @author Eike Stepper
*/
-public class XORStreamWrapper implements IStreamWrapper<XORInputStream, XOROutputStream>
+public class XORStreamWrapper implements IStreamWrapper
{
private int[] key;
@@ -51,11 +51,11 @@ public class XORStreamWrapper implements IStreamWrapper<XORInputStream, XOROutpu
return new XOROutputStream(out, key);
}
- public void finishInputStream(XORInputStream in) throws IOException
+ public void finishInputStream(InputStream in) throws IOException
{
}
- public void finishOutputStream(XOROutputStream out) throws IOException
+ public void finishOutputStream(OutputStream out) throws IOException
{
}
}
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 c0f3e96..e4297cb 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
@@ -199,9 +199,9 @@ public final class LifecycleUtil
}
}
- private static void invokeAnnotation(Object object, Class annotationClass)
+ private static <T extends Annotation> void invokeAnnotation(Object object, Class<T> annotationClass)
{
- Class c = object.getClass();
+ Class<?> c = object.getClass();
while (c != Object.class)
{
final Method[] methods = c.getDeclaredMethods();
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 2a3e9d3..490ec9d 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
@@ -25,7 +25,7 @@ public interface OMPlatform
// @Singleton
public static final OMPlatform INSTANCE = AbstractPlatform.createPlatform();
- public OMBundle bundle(String bundleID, Class accessor);
+ public OMBundle bundle(String bundleID, Class<?> accessor);
public boolean isDebugging();
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
index addd1ac..dbc7ac6 100644
--- 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
@@ -9,7 +9,7 @@ public interface OMTraceHandlerEvent
public OMTracer getTracer();
- public Class getContext();
+ public Class<?> getContext();
public String getMessage();
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/trace/OMTracer.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/trace/OMTracer.java
index bf2bfb4..c361b5e 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/trace/OMTracer.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/trace/OMTracer.java
@@ -31,15 +31,15 @@ public interface OMTracer
public void trace(OMTraceHandlerEvent traceRecord);
- public OMTraceHandlerEvent format(Class context, String pattern, Object... args);
+ public OMTraceHandlerEvent format(Class<?> context, String pattern, Object... args);
- public OMTraceHandlerEvent format(Class context, String pattern, Throwable t, Object... args);
+ public OMTraceHandlerEvent format(Class<?> context, String pattern, Throwable t, Object... args);
- public OMTraceHandlerEvent trace(Class context, String msg, Throwable t);
+ public OMTraceHandlerEvent trace(Class<?> context, String msg, Throwable t);
- public OMTraceHandlerEvent trace(Class context, String msg);
+ public OMTraceHandlerEvent trace(Class<?> context, String msg);
- public OMTraceHandlerEvent 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.util/src/org/eclipse/net4j/util/registry/RegistryUtil.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/registry/RegistryUtil.java
index 19db421..a25ef29 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/registry/RegistryUtil.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/registry/RegistryUtil.java
@@ -28,6 +28,6 @@ public final class RegistryUtil
return registry;
}
- return new UnmodifiableRegistry(registry);
+ return new UnmodifiableRegistry<K, V>(registry);
}
}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/transaction/TX.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/transaction/TX.java
deleted file mode 100644
index fde1b50..0000000
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/transaction/TX.java
+++ /dev/null
@@ -1,77 +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.transaction;
-
-/**
- * @author Eike Stepper
- */
-public final class TX
-{
- private static ThreadLocal<ITransaction> tx = new InheritableThreadLocal();
-
- private TX()
- {
- }
-
- public static void execute(ITransactionalOperation<ITransaction> operation)
- {
- ITransaction transaction = get();
- transaction.execute(operation);
- }
-
- public static void begin(ITransaction transaction)
- {
- ITransaction existingTransaction = tx.get();
- if (existingTransaction != null)
- {
- throw new IllegalStateException("Transaction already ongoing");
- }
-
- tx.set(transaction);
- }
-
- public static void commit()
- {
- ITransaction transaction = get();
- try
- {
- transaction.commit();
- }
- finally
- {
- tx.set(null);
- }
- }
-
- public static void rollback()
- {
- ITransaction transaction = get();
- try
- {
- transaction.rollback();
- }
- finally
- {
- tx.set(null);
- }
- }
-
- private static ITransaction get()
- {
- ITransaction transaction = tx.get();
- if (transaction == null)
- {
- throw new IllegalStateException("No transaction ongoing");
- }
-
- return transaction;
- }
-}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/transaction/TransactionUtil.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/transaction/TransactionUtil.java
index 5f1ad9d..e10a3a1 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/transaction/TransactionUtil.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/transaction/TransactionUtil.java
@@ -23,6 +23,6 @@ public final class TransactionUtil
public static <CONTEXT> ITransaction<CONTEXT> createTransaction(CONTEXT context)
{
- return new Transaction(context);
+ return new Transaction<CONTEXT>(context);
}
}
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 7c6920b..52261e5 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
@@ -50,18 +50,18 @@ public abstract class Acceptor extends Container<IConnector> implements IAccepto
/**
* Is registered with each {@link IConnector} of this {@link IAcceptor}.
- * <p>
*/
- private transient IListener lifecycleEventConverter = new LifecycleEventConverter(this)
+ private transient IListener lifecycleEventConverter = new LifecycleEventConverter<IConnector>(this)
{
@Override
- protected IContainerEvent createContainerEvent(IContainer container, Object element, Kind kind)
+ protected IContainerEvent<IConnector> createContainerEvent(IContainer<IConnector> container, IConnector element,
+ Kind kind)
{
- return newContainerEvent((IConnector)element, kind);
+ return newContainerEvent(element, kind);
}
};
- private Set<IConnector> acceptedConnectors = new HashSet(0);
+ private Set<IConnector> acceptedConnectors = new HashSet<IConnector>(0);
public Acceptor()
{
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/AcceptorFactory.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/AcceptorFactory.java
index 61ea43f..09a15bb 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/AcceptorFactory.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/AcceptorFactory.java
@@ -10,13 +10,12 @@
**************************************************************************/
package org.eclipse.internal.net4j;
-import org.eclipse.net4j.IAcceptor;
import org.eclipse.net4j.internal.util.factory.Factory;
/**
* @author Eike Stepper
*/
-public abstract class AcceptorFactory<PRODUCT extends IAcceptor> extends Factory<PRODUCT>
+public abstract class AcceptorFactory extends Factory
{
public static final String PRODUCT_GROUP = "org.eclipse.net4j.acceptors";
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/BufferProviderFactory.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/BufferProviderFactory.java
index 23d5df0..e6dc33e 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/BufferProviderFactory.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/BufferProviderFactory.java
@@ -18,7 +18,7 @@ import org.eclipse.net4j.util.container.IManagedContainer;
/**
* @author Eike Stepper
*/
-public class BufferProviderFactory extends Factory<IBufferProvider>
+public class BufferProviderFactory extends Factory
{
public static final String PRODUCT_GROUP = "org.eclipse.net4j.bufferProviders";
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 93262e3..adef9f0 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
@@ -214,7 +214,7 @@ public class Channel extends Lifecycle implements IChannel, IBufferProvider
protected void doActivate() throws Exception
{
super.doActivate();
- sendQueue = new ConcurrentLinkedQueue();
+ sendQueue = new ConcurrentLinkedQueue<IBuffer>();
if (receiveExecutor == null)
{
receiveSerializer = new SynchronousWorkSerializer();
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/ClientProtocolFactory.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/ClientProtocolFactory.java
index b8c95fb..c5b5bfc 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/ClientProtocolFactory.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/ClientProtocolFactory.java
@@ -10,13 +10,12 @@
**************************************************************************/
package org.eclipse.internal.net4j;
-import org.eclipse.net4j.IProtocol;
import org.eclipse.net4j.internal.util.factory.Factory;
/**
* @author Eike Stepper
*/
-public abstract class ClientProtocolFactory<PRODUCT extends IProtocol> extends Factory<PRODUCT>
+public abstract class ClientProtocolFactory extends Factory
{
public static final String PRODUCT_GROUP = "org.eclipse.net4j.clientProtocols";
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 4a4d2a1..4bb195e 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
@@ -75,7 +75,7 @@ public abstract class Connector extends Container<IChannel> implements IConnecto
*/
private ExecutorService receiveExecutor;
- private List<Channel> channels = new ArrayList(0);
+ private List<Channel> channels = new ArrayList<Channel>(0);
private RWLock channelsLock = new RWLock(2500);
@@ -83,14 +83,13 @@ public abstract class Connector extends Container<IChannel> implements IConnecto
/**
* Is registered with each {@link IChannel} of this {@link IConnector}.
- * <p>
*/
- private transient IListener channelListener = new LifecycleEventConverter(this)
+ private transient IListener channelListener = new LifecycleEventConverter<IChannel>(this)
{
@Override
- protected IContainerEvent createContainerEvent(IContainer container, Object element, Kind kind)
+ protected IContainerEvent<IChannel> createContainerEvent(IContainer<IChannel> container, IChannel element, Kind kind)
{
- return newContainerEvent((IChannel)element, kind);
+ return newContainerEvent(element, kind);
}
};
@@ -304,7 +303,7 @@ public abstract class Connector extends Container<IChannel> implements IConnecto
public IChannel[] getChannels()
{
- final List<IChannel> result = new ArrayList(0);
+ final List<IChannel> result = new ArrayList<IChannel>(0);
channelsLock.read(new Runnable()
{
public void run()
@@ -420,7 +419,7 @@ public abstract class Connector extends Container<IChannel> implements IConnecto
protected List<Queue<IBuffer>> getChannelBufferQueues()
{
- final List<Queue<IBuffer>> result = new ArrayList(channels.size());
+ final List<Queue<IBuffer>> result = new ArrayList<Queue<IBuffer>>(channels.size());
channelsLock.read(new Runnable()
{
public void run()
@@ -568,8 +567,6 @@ public abstract class Connector extends Container<IChannel> implements IConnecto
* so that the post processors can reach them. The protocol description can be
* used to store unique protocol IDs so that always new protocols are created
* in the container.
- *
- * @param infraStructure
*/
protected IProtocol createProtocol(String type, Object infraStructure)
{
@@ -581,7 +578,7 @@ public abstract class Connector extends Container<IChannel> implements IConnecto
// Get protocol factory
IFactoryKey key = createProtocolFactoryKey(type);
- IFactory<IProtocol> factory = registry.get(key);
+ IFactory factory = registry.get(key);
if (factory == null)
{
if (TRACER.isEnabled())
@@ -594,7 +591,7 @@ public abstract class Connector extends Container<IChannel> implements IConnecto
// Create protocol
String description = null;
- IProtocol protocol = factory.create(description);
+ IProtocol protocol = (IProtocol)factory.create(description);
if (infraStructure != null)
{
protocol.setInfraStructure(infraStructure);
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/ConnectorFactory.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/ConnectorFactory.java
index 03bdddf..d20e666 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/ConnectorFactory.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/ConnectorFactory.java
@@ -10,13 +10,12 @@
**************************************************************************/
package org.eclipse.internal.net4j;
-import org.eclipse.net4j.IConnector;
import org.eclipse.net4j.internal.util.factory.Factory;
/**
* @author Eike Stepper
*/
-public abstract class ConnectorFactory<PRODUCT extends IConnector> extends Factory<PRODUCT>
+public abstract class ConnectorFactory extends Factory
{
public static final String PRODUCT_GROUP = "org.eclipse.net4j.connectors";
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/ExecutorServiceFactory.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/ExecutorServiceFactory.java
index 1c377ba..1523c79 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/ExecutorServiceFactory.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/ExecutorServiceFactory.java
@@ -19,7 +19,7 @@ import java.util.concurrent.ExecutorService;
/**
* @author Eike Stepper
*/
-public class ExecutorServiceFactory extends Factory<ExecutorService>
+public class ExecutorServiceFactory extends Factory
{
public static final String PRODUCT_GROUP = "org.eclipse.net4j.executorServices";
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/Protocol.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/Protocol.java
index f3c5c4c..2064039 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/Protocol.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/Protocol.java
@@ -20,12 +20,11 @@ import org.eclipse.net4j.internal.util.lifecycle.Lifecycle;
/**
* @author Eike Stepper
*/
-public abstract class Protocol<INFRA_STRUCTURE> extends Lifecycle implements IProtocol<INFRA_STRUCTURE>,
- IBufferProvider
+public abstract class Protocol extends Lifecycle implements IProtocol, IBufferProvider
{
private Channel channel;
- private INFRA_STRUCTURE infraStructure;
+ private Object infraStructure;
public Protocol()
{
@@ -41,12 +40,12 @@ public abstract class Protocol<INFRA_STRUCTURE> extends Lifecycle implements IPr
this.channel = (Channel)channel;
}
- public INFRA_STRUCTURE getInfraStructure()
+ public Object getInfraStructure()
{
return infraStructure;
}
- public void setInfraStructure(INFRA_STRUCTURE infraStructure)
+ public void setInfraStructure(Object infraStructure)
{
this.infraStructure = infraStructure;
}
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/ServerProtocolFactory.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/ServerProtocolFactory.java
index a648d78..6c704e8 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/ServerProtocolFactory.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/ServerProtocolFactory.java
@@ -10,13 +10,12 @@
**************************************************************************/
package org.eclipse.internal.net4j;
-import org.eclipse.net4j.IProtocol;
import org.eclipse.net4j.internal.util.factory.Factory;
/**
* @author Eike Stepper
*/
-public abstract class ServerProtocolFactory<PRODUCT extends IProtocol> extends Factory<PRODUCT>
+public abstract class ServerProtocolFactory extends Factory
{
public static final String PRODUCT_GROUP = "org.eclipse.net4j.serverProtocols";
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/IProtocol.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/IProtocol.java
index be7b3c8..bdb381b 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/IProtocol.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/IProtocol.java
@@ -14,7 +14,7 @@ package org.eclipse.net4j;
* @author Eike Stepper
* @since 0.8.0
*/
-public interface IProtocol<INFRA_STRUCTURE> extends IBufferHandler
+public interface IProtocol extends IBufferHandler
{
public String getType();
@@ -22,7 +22,7 @@ public interface IProtocol<INFRA_STRUCTURE> extends IBufferHandler
public void setChannel(IChannel channel);
- public INFRA_STRUCTURE getInfraStructure();
+ public Object getInfraStructure();
- public void setInfraStructure(INFRA_STRUCTURE infraStructure);
+ public void setInfraStructure(Object infraStructure);
}
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 9207489..c23de65 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
@@ -25,7 +25,7 @@ import java.io.OutputStream;
/**
* @author Eike Stepper
*/
-public abstract class Request extends SignalActor
+public abstract class Request extends SignalActor<Object>
{
private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG_SIGNAL, Request.class);
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 c0a7499..0c92948 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
@@ -33,7 +33,7 @@ import java.util.concurrent.ExecutorService;
/**
* @author Eike Stepper
*/
-public abstract class SignalProtocol<INFRA_STRUCTURE> extends Protocol<INFRA_STRUCTURE> implements IStreamWrapper
+public abstract class SignalProtocol extends Protocol
{
public static final long NO_TIMEOUT = BufferInputStream.NO_TIMEOUT;
@@ -47,7 +47,7 @@ public abstract class SignalProtocol<INFRA_STRUCTURE> extends Protocol<INFRA_STR
private IStreamWrapper streamWrapper;
- private Map<Integer, Signal> signals = new ConcurrentHashMap(0);
+ private Map<Integer, Signal> signals = new ConcurrentHashMap<Integer, Signal>(0);
private int nextCorrelationID = MIN_CORRELATION_ID;
@@ -216,7 +216,7 @@ public abstract class SignalProtocol<INFRA_STRUCTURE> extends Protocol<INFRA_STR
protected abstract SignalReactor doCreateSignalReactor(short signalID);
- void startSignal(SignalActor signalActor, long timeout) throws Exception
+ void startSignal(SignalActor<?> signalActor, long timeout) throws Exception
{
if (signalActor.getProtocol() != this)
{
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 9dc57c0..db2787b 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
@@ -36,7 +36,7 @@ public class BufferInputStream extends InputStream implements IBufferHandler
private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG_BUFFER_STREAM, BufferInputStream.class);
- private BlockingQueue<IBuffer> buffers = new LinkedBlockingQueue();
+ private BlockingQueue<IBuffer> buffers = new LinkedBlockingQueue<IBuffer>();
private IBuffer currentBuffer;