diff options
199 files changed, 693 insertions, 623 deletions
diff --git a/plugins/org.eclipse.emf.cdo.migrator/src/org/eclipse/emf/cdo/migrator/CDOImporter.java b/plugins/org.eclipse.emf.cdo.migrator/src/org/eclipse/emf/cdo/migrator/CDOImporter.java index b282db68eb..eb02e6c3c0 100644 --- a/plugins/org.eclipse.emf.cdo.migrator/src/org/eclipse/emf/cdo/migrator/CDOImporter.java +++ b/plugins/org.eclipse.emf.cdo.migrator/src/org/eclipse/emf/cdo/migrator/CDOImporter.java @@ -155,4 +155,4 @@ public class CDOImporter extends ModelImporter setModelLocation(text.toString().trim()); } -}
\ No newline at end of file +} diff --git a/plugins/org.eclipse.emf.cdo.migrator/src/org/eclipse/emf/cdo/migrator/CDOMigrator.java b/plugins/org.eclipse.emf.cdo.migrator/src/org/eclipse/emf/cdo/migrator/CDOMigrator.java index 940ce11253..06a2490f58 100644 --- a/plugins/org.eclipse.emf.cdo.migrator/src/org/eclipse/emf/cdo/migrator/CDOMigrator.java +++ b/plugins/org.eclipse.emf.cdo.migrator/src/org/eclipse/emf/cdo/migrator/CDOMigrator.java @@ -109,4 +109,4 @@ public abstract class CDOMigrator return builder.length() == 0 ? null : builder.toString(); } -}
\ No newline at end of file +} diff --git a/plugins/org.eclipse.emf.cdo.migrator/src/org/eclipse/emf/cdo/migrator/wizards/CDOImporterWizard.java b/plugins/org.eclipse.emf.cdo.migrator/src/org/eclipse/emf/cdo/migrator/wizards/CDOImporterWizard.java index dcd2c57f18..7bef613225 100644 --- a/plugins/org.eclipse.emf.cdo.migrator/src/org/eclipse/emf/cdo/migrator/wizards/CDOImporterWizard.java +++ b/plugins/org.eclipse.emf.cdo.migrator/src/org/eclipse/emf/cdo/migrator/wizards/CDOImporterWizard.java @@ -46,4 +46,4 @@ public class CDOImporterWizard extends ModelImporterWizard packagePage.setShowReferencedGenModels(true); addPage(packagePage); } -}
\ No newline at end of file +} diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/AttributeMapping.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/AttributeMapping.java index f794d1cb57..2b677f4a25 100644 --- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/AttributeMapping.java +++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/AttributeMapping.java @@ -272,4 +272,4 @@ public abstract class AttributeMapping extends FeatureMapping implements IAttrib return resultSet.getBoolean(column); } } -}
\ No newline at end of file +} 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 d5d7bf979e..6944fbcd96 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 @@ -431,4 +431,4 @@ public abstract class MappingStrategy implements IMappingStrategy protected abstract IClassMapping createClassMapping(CDOClass cdoClass); protected abstract List<CDOClass> getClassesWithObjectInfo(); -}
\ No newline at end of file +} diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/ReferenceMapping.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/ReferenceMapping.java index 8b5820a90f..7608d465b2 100644 --- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/ReferenceMapping.java +++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/ReferenceMapping.java @@ -286,4 +286,4 @@ public class ReferenceMapping extends FeatureMapping implements IReferenceMappin return table; } -}
\ No newline at end of file +} diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/ContainerRepositoryProvider.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/ContainerRepositoryProvider.java index 60f13d6d50..8725c6a5ab 100644 --- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/ContainerRepositoryProvider.java +++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/ContainerRepositoryProvider.java @@ -36,4 +36,4 @@ public class ContainerRepositoryProvider implements IRepositoryProvider { return RepositoryFactory.get(container, name); } -}
\ No newline at end of file +} diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/PluginRepositoryProvider.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/PluginRepositoryProvider.java index 760540bbfd..5eb5323879 100644 --- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/PluginRepositoryProvider.java +++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/PluginRepositoryProvider.java @@ -23,4 +23,4 @@ public final class PluginRepositoryProvider extends ContainerRepositoryProvider { super(IPluginContainer.INSTANCE); } -}
\ No newline at end of file +} 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 a8beb801a7..a287433987 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 @@ -134,7 +134,7 @@ public class Repository extends Container<IRepositoryElement> implements IReposi String value = getProperties().get(PROP_SUPPORTING_REVISION_DELTAS); supportingRevisionDeltas = value == null ? false : Boolean.valueOf(value); } - + return supportingRevisionDeltas; } @@ -235,10 +235,11 @@ public class Repository extends Container<IRepositoryElement> implements IReposi { return new TypeManager(this) { - @Override - protected String getThreadName() { - return "TypeManager-" + name; - } + @Override + protected String getThreadName() + { + return "TypeManager-" + name; + } }; } 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 e7cdbf5bf4..a75d1b50e7 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 @@ -74,7 +74,7 @@ public class Session extends Container<IView> implements ISession, CDOIDProvider this.sessionID = sessionID; this.disableLegacyObjects = disableLegacyObjects; protocol.addListener(protocolListener); - + try { activate(); diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/CDOPluginProtocolFactory.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/CDOPluginProtocolFactory.java index 6ce94e5e28..2c2b3f8847 100644 --- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/CDOPluginProtocolFactory.java +++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/CDOPluginProtocolFactory.java @@ -21,4 +21,4 @@ public final class CDOPluginProtocolFactory extends CDOServerProtocolFactory { super(PluginRepositoryProvider.INSTANCE); } -}
\ No newline at end of file +} 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 0733dd3b81..d1f6537244 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 @@ -38,4 +38,4 @@ public class CDOServerProtocolFactory extends ServerProtocolFactory { return (CDOServerProtocol)container.getElement(PRODUCT_GROUP, TYPE, description); } -}
\ No newline at end of file +} diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/ViewsChangedIndication.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/ViewsChangedIndication.java index a4dfd0266f..6effb97d85 100644 --- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/ViewsChangedIndication.java +++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/protocol/ViewsChangedIndication.java @@ -10,13 +10,14 @@ **************************************************************************/ package org.eclipse.emf.cdo.internal.server.protocol; -import java.io.IOException; - import org.eclipse.emf.cdo.internal.server.Session; import org.eclipse.emf.cdo.protocol.CDOProtocolConstants; + import org.eclipse.net4j.util.io.ExtendedDataInputStream; import org.eclipse.net4j.util.io.ExtendedDataOutputStream; +import java.io.IOException; + /** * @author Eike Stepper */ @@ -35,16 +36,16 @@ public class ViewsChangedIndication extends CDOServerIndication @Override protected void indicating(ExtendedDataInputStream in) throws IOException { - int viewID = in.readInt(); - byte kind = in.readByte(); - CDOServerProtocol protocol = (CDOServerProtocol)getProtocol(); - Session session = protocol.getSession(); - session.notifyViewsChanged(session, viewID, kind); + int viewID = in.readInt(); + byte kind = in.readByte(); + CDOServerProtocol protocol = (CDOServerProtocol)getProtocol(); + Session session = protocol.getSession(); + session.notifyViewsChanged(session, viewID, kind); } @Override protected void responding(ExtendedDataOutputStream out) throws IOException { - out.writeBoolean(true); + out.writeBoolean(true); } } diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/AddressImpl.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/AddressImpl.java index 71f4801eca..be3af2ef27 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/AddressImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/AddressImpl.java @@ -9,9 +9,10 @@ package org.eclipse.emf.cdo.tests.model1.impl; import org.eclipse.emf.cdo.tests.model1.Address; import org.eclipse.emf.cdo.tests.model1.Model1Package; -import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.internal.cdo.CDOObjectImpl; +import org.eclipse.emf.ecore.EClass; + /** * <!-- begin-user-doc --> An implementation of the model object '<em><b>Address</b></em>'. <!-- end-user-doc --> * <p> diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/CategoryImpl.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/CategoryImpl.java index 8824f1c05e..54eee3fc9a 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/CategoryImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/CategoryImpl.java @@ -10,9 +10,10 @@ import org.eclipse.emf.cdo.tests.model1.Category; import org.eclipse.emf.cdo.tests.model1.Model1Package; import org.eclipse.emf.cdo.tests.model1.Product; +import org.eclipse.emf.internal.cdo.CDOObjectImpl; + import org.eclipse.emf.common.util.EList; import org.eclipse.emf.ecore.EClass; -import org.eclipse.emf.internal.cdo.CDOObjectImpl; /** * <!-- begin-user-doc --> An implementation of the model object '<em><b>Category</b></em>'. <!-- end-user-doc --> diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/OrderDetailImpl.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/OrderDetailImpl.java index 6b8af5f55d..3605a703f9 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/OrderDetailImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/OrderDetailImpl.java @@ -11,9 +11,10 @@ import org.eclipse.emf.cdo.tests.model1.Order; import org.eclipse.emf.cdo.tests.model1.OrderDetail; import org.eclipse.emf.cdo.tests.model1.Product; -import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.internal.cdo.CDOObjectImpl; +import org.eclipse.emf.ecore.EClass; + /** * <!-- begin-user-doc --> An implementation of the model object '<em><b>Order Detail</b></em>'. <!-- end-user-doc * --> diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/OrderImpl.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/OrderImpl.java index 50c6759704..39cd402c22 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/OrderImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/OrderImpl.java @@ -10,9 +10,10 @@ import org.eclipse.emf.cdo.tests.model1.Model1Package; import org.eclipse.emf.cdo.tests.model1.Order; import org.eclipse.emf.cdo.tests.model1.OrderDetail; +import org.eclipse.emf.internal.cdo.CDOObjectImpl; + import org.eclipse.emf.common.util.EList; import org.eclipse.emf.ecore.EClass; -import org.eclipse.emf.internal.cdo.CDOObjectImpl; /** * <!-- begin-user-doc --> An implementation of the model object '<em><b>Order</b></em>'. <!-- end-user-doc --> diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/ProductImpl.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/ProductImpl.java index 70a6545150..3d242a49b2 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/ProductImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/ProductImpl.java @@ -10,9 +10,10 @@ import org.eclipse.emf.cdo.tests.model1.Model1Package; import org.eclipse.emf.cdo.tests.model1.OrderDetail; import org.eclipse.emf.cdo.tests.model1.Product; +import org.eclipse.emf.internal.cdo.CDOObjectImpl; + import org.eclipse.emf.common.util.EList; import org.eclipse.emf.ecore.EClass; -import org.eclipse.emf.internal.cdo.CDOObjectImpl; /** * <!-- begin-user-doc --> An implementation of the model object '<em><b>Product</b></em>'. <!-- end-user-doc --> diff --git a/plugins/org.eclipse.emf.cdo.tests/net4j/org/eclipse/net4j/tests/AbstractOMTest.java b/plugins/org.eclipse.emf.cdo.tests/net4j/org/eclipse/net4j/tests/AbstractOMTest.java index d7bb57e14e..e296c6b00d 100644 --- a/plugins/org.eclipse.emf.cdo.tests/net4j/org/eclipse/net4j/tests/AbstractOMTest.java +++ b/plugins/org.eclipse.emf.cdo.tests/net4j/org/eclipse/net4j/tests/AbstractOMTest.java @@ -118,4 +118,4 @@ public abstract class AbstractOMTest extends TestCase { ConcurrencyUtil.sleep(millis); } -}
\ No newline at end of file +} diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AbstractCDOTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AbstractCDOTest.java index 16fb507513..99f97e9c37 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AbstractCDOTest.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AbstractCDOTest.java @@ -250,4 +250,4 @@ public abstract class AbstractCDOTest extends AbstractTransportTest return !condition.await(millis, TimeUnit.MILLISECONDS); } } -}
\ No newline at end of file +} diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ChunkingTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ChunkingTest.java index 006825e38c..f90c5064bc 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ChunkingTest.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ChunkingTest.java @@ -17,12 +17,12 @@ import org.eclipse.emf.cdo.tests.model1.Customer; import org.eclipse.emf.cdo.tests.model1.Model1Factory; import org.eclipse.emf.cdo.tests.model1.SalesOrder; +import org.eclipse.net4j.util.io.IOUtil; + import org.eclipse.emf.common.util.EList; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl; -import org.eclipse.net4j.util.io.IOUtil; - import java.util.Iterator; /** diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ChunkingWithMEMTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ChunkingWithMEMTest.java index 93f9caea6e..2816e7b240 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ChunkingWithMEMTest.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ChunkingWithMEMTest.java @@ -24,11 +24,11 @@ import org.eclipse.emf.cdo.tests.model1.Customer; import org.eclipse.emf.cdo.tests.model1.Model1Factory; import org.eclipse.emf.cdo.tests.model1.SalesOrder; +import org.eclipse.net4j.util.io.IOUtil; + import org.eclipse.emf.common.util.EList; import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl; -import org.eclipse.net4j.util.io.IOUtil; - import java.util.HashMap; import java.util.Iterator; import java.util.Map; diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ContentAdapterTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ContentAdapterTest.java index 1cf7f7dfe3..45993195db 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ContentAdapterTest.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ContentAdapterTest.java @@ -10,11 +10,6 @@ **************************************************************************/ package org.eclipse.emf.cdo.tests; -import java.util.Collection; -import java.util.HashSet; -import java.util.List; -import java.util.Set; - import org.eclipse.emf.cdo.CDOSession; import org.eclipse.emf.cdo.CDOTransaction; import org.eclipse.emf.cdo.analyzer.CDOFetchRuleManager; @@ -23,13 +18,20 @@ import org.eclipse.emf.cdo.protocol.CDOID; import org.eclipse.emf.cdo.protocol.analyzer.CDOFetchRule; import org.eclipse.emf.cdo.tests.model1.Model1Factory; import org.eclipse.emf.cdo.tests.model1.Supplier; + +import org.eclipse.emf.internal.cdo.CDOSessionImpl; +import org.eclipse.emf.internal.cdo.CDOTransactionImpl; + import org.eclipse.emf.common.notify.Adapter; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.util.EList; import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl; import org.eclipse.emf.ecore.util.EContentAdapter; -import org.eclipse.emf.internal.cdo.CDOSessionImpl; -import org.eclipse.emf.internal.cdo.CDOTransactionImpl; + +import java.util.Collection; +import java.util.HashSet; +import java.util.List; +import java.util.Set; /** * @author Eike Stepper diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/EMFTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/EMFTest.java index b5d6c9f037..9ddee84b1c 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/EMFTest.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/EMFTest.java @@ -12,6 +12,9 @@ package org.eclipse.emf.cdo.tests; import org.eclipse.emf.cdo.util.EMFUtil; +import org.eclipse.net4j.tests.AbstractOMTest; +import org.eclipse.net4j.util.io.IOUtil; + import org.eclipse.emf.common.util.URI; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EObject; @@ -19,9 +22,6 @@ import org.eclipse.emf.ecore.EPackage; import org.eclipse.emf.ecore.EReference; import org.eclipse.emf.ecore.InternalEObject; -import org.eclipse.net4j.tests.AbstractOMTest; -import org.eclipse.net4j.util.io.IOUtil; - /** * @author Eike Stepper */ diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/FetchRuleAnalyzerTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/FetchRuleAnalyzerTest.java index 162947c26b..4f17c02e55 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/FetchRuleAnalyzerTest.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/FetchRuleAnalyzerTest.java @@ -24,14 +24,15 @@ import org.eclipse.emf.cdo.tests.model1.PurchaseOrder; import org.eclipse.emf.cdo.tests.model1.SalesOrder; import org.eclipse.emf.cdo.tests.model1.Supplier; -import org.eclipse.emf.ecore.EClass; -import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl; import org.eclipse.emf.internal.cdo.CDOSessionImpl; import org.eclipse.emf.internal.cdo.CDOTransactionImpl; import org.eclipse.emf.internal.cdo.analyzer.CDOFeatureAnalyzerModelBased; import org.eclipse.emf.internal.cdo.analyzer.CDOFetchRuleManagerThreadLocal; import org.eclipse.emf.internal.cdo.util.ModelUtil; +import org.eclipse.emf.ecore.EClass; +import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl; + import java.util.ArrayList; import java.util.List; diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/InitialTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/InitialTest.java index 4298696cf5..b401af6d98 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/InitialTest.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/InitialTest.java @@ -19,15 +19,15 @@ import org.eclipse.emf.cdo.tests.model1.PurchaseOrder; import org.eclipse.emf.cdo.tests.model1.Supplier; import org.eclipse.emf.cdo.util.CDOUtil; +import org.eclipse.net4j.IBufferHandler; +import org.eclipse.net4j.IChannel; + import org.eclipse.emf.common.util.EList; import org.eclipse.emf.common.util.URI; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.resource.ResourceSet; import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl; -import org.eclipse.net4j.IBufferHandler; -import org.eclipse.net4j.IChannel; - import java.util.Date; /** diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/InvalidationTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/InvalidationTest.java index f5cde39876..e9c95a2286 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/InvalidationTest.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/InvalidationTest.java @@ -19,13 +19,13 @@ import org.eclipse.emf.cdo.tests.model1.Category; import org.eclipse.emf.cdo.tests.model1.Company; import org.eclipse.emf.cdo.tests.model1.Model1Factory; +import org.eclipse.net4j.util.event.IEvent; +import org.eclipse.net4j.util.event.IListener; + import org.eclipse.emf.common.util.EList; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl; -import org.eclipse.net4j.util.event.IEvent; -import org.eclipse.net4j.util.event.IListener; - import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantLock; diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/RandomDeadLockTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/RandomDeadLockTest.java index 8737a37f61..9640d34f09 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/RandomDeadLockTest.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/RandomDeadLockTest.java @@ -16,9 +16,11 @@ import org.eclipse.emf.cdo.CDOTransaction; import org.eclipse.emf.cdo.eresource.CDOResource; import org.eclipse.emf.cdo.tests.model1.Category; import org.eclipse.emf.cdo.tests.model1.Model1Factory; -import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl; + import org.eclipse.net4j.util.om.OMPlatform; +import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl; + /** * @see https://bugs.eclipse.org/bugs/show_bug.cgi?id=201366 * @see https://bugs.eclipse.org/bugs/show_bug.cgi?id=213782 @@ -26,14 +28,14 @@ import org.eclipse.net4j.util.om.OMPlatform; */ public class RandomDeadLockTest extends AbstractCDOTest { - @Override - protected void doSetUp() throws Exception - { - super.doSetUp(); - OMPlatform.INSTANCE.setDebugging(false); - } + @Override + protected void doSetUp() throws Exception + { + super.doSetUp(); + OMPlatform.INSTANCE.setDebugging(false); + } - public void testCreateManySession() throws Exception + public void testCreateManySession() throws Exception { { msg("Opening session"); @@ -47,7 +49,7 @@ public class RandomDeadLockTest extends AbstractCDOTest for (int i = 0; i < 100; i++) { - msg("Session " + i); + msg("Session " + i); CDOSession session = openModel1Session(); CDOTransaction transaction = session.openTransaction(); CDOResource resource = transaction.getResource("/test2"); @@ -58,27 +60,27 @@ public class RandomDeadLockTest extends AbstractCDOTest session.close(); } } - + public void testCreateManyTransaction() throws Exception { - msg("Opening session"); - CDOSession session = openModel1Session(); - CDOTransaction transaction = session.openTransaction(new ResourceSetImpl()); - transaction.createResource("/test2"); + msg("Opening session"); + CDOSession session = openModel1Session(); + CDOTransaction transaction = session.openTransaction(new ResourceSetImpl()); + transaction.createResource("/test2"); + transaction.commit(); + transaction.close(); + + for (int i = 0; i < 1000; i++) + { + msg("Transaction " + i); + transaction = session.openTransaction(new ResourceSetImpl()); + CDOResource resource = transaction.getResource("/test2"); + Category category = Model1Factory.eINSTANCE.createCategory(); + resource.getContents().add(category); transaction.commit(); transaction.close(); - - for (int i =0; i < 1000; i++) - { - msg("Transaction " + i); - transaction = session.openTransaction(new ResourceSetImpl()); - CDOResource resource = transaction.getResource("/test2"); - Category category = Model1Factory.eINSTANCE.createCategory(); - resource.getContents().add(category); - transaction.commit(); - transaction.close(); - } - - session.close(); - } + } + + session.close(); + } } diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/AbstractOpenViewAction.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/AbstractOpenViewAction.java index 5bb3a75dd9..a08c6c709a 100644 --- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/AbstractOpenViewAction.java +++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/AbstractOpenViewAction.java @@ -31,4 +31,4 @@ public abstract class AbstractOpenViewAction extends SessionAction { return !getSession().getPackageRegistry().isEmpty() && super.isEnabled(); } -}
\ No newline at end of file +} diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/CloseSessionAction.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/CloseSessionAction.java index b518b1ae9b..cd120f46da 100644 --- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/CloseSessionAction.java +++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/CloseSessionAction.java @@ -33,4 +33,4 @@ public final class CloseSessionAction extends SessionAction { getSession().close(); } -}
\ No newline at end of file +} diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/CloseViewAction.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/CloseViewAction.java index 8b21e906ff..f4d86dca2e 100644 --- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/CloseViewAction.java +++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/CloseViewAction.java @@ -33,4 +33,4 @@ public final class CloseViewAction extends ViewAction { getView().close(); } -}
\ No newline at end of file +} diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/CommitTransactionAction.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/CommitTransactionAction.java index 8dca5b5886..e960f7da6b 100644 --- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/CommitTransactionAction.java +++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/CommitTransactionAction.java @@ -34,4 +34,4 @@ public final class CommitTransactionAction extends ViewAction { getTransaction().commit(); } -}
\ No newline at end of file +} diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/CreateResourceAction.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/CreateResourceAction.java index 1aff01428d..e99ae6cd39 100644 --- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/CreateResourceAction.java +++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/CreateResourceAction.java @@ -54,4 +54,4 @@ public final class CreateResourceAction extends ViewAction getTransaction().createResource(resourcePath); CDOEditor.open(getPage(), getView(), resourcePath); } -}
\ No newline at end of file +} diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/EditingDomainAction.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/EditingDomainAction.java index 3bd92d33b3..052ff16910 100644 --- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/EditingDomainAction.java +++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/EditingDomainAction.java @@ -10,11 +10,11 @@ **************************************************************************/ package org.eclipse.emf.cdo.internal.ui.actions; +import org.eclipse.net4j.util.ui.actions.LongRunningAction; + import org.eclipse.emf.edit.domain.EditingDomain; import org.eclipse.emf.edit.domain.IEditingDomainProvider; -import org.eclipse.net4j.util.ui.actions.LongRunningAction; - import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.ui.IWorkbenchPart; @@ -72,4 +72,4 @@ public abstract class EditingDomainAction extends LongRunningAction { setEnabled(editingDomain != null); } -}
\ No newline at end of file +} diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/EntryAction.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/EntryAction.java index 0712ce577f..8eb83a1593 100644 --- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/EntryAction.java +++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/EntryAction.java @@ -35,4 +35,4 @@ public abstract class EntryAction extends LongRunningAction { return entry; } -}
\ No newline at end of file +} diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ExportResourceAction.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ExportResourceAction.java index c8d5b189f9..f8ab70255c 100644 --- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ExportResourceAction.java +++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ExportResourceAction.java @@ -30,4 +30,4 @@ public class ExportResourceAction extends EditingDomainAction protected void doRun() throws Exception { } -}
\ No newline at end of file +} diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ImportResourceAction.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ImportResourceAction.java index b4fcbcfc26..b14341e54d 100644 --- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ImportResourceAction.java +++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ImportResourceAction.java @@ -185,4 +185,4 @@ public class ImportResourceAction extends ViewAction return composite; } } -}
\ No newline at end of file +} 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 1571fa2ff0..2481c21c10 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 @@ -122,4 +122,4 @@ public class ImportRootsAction extends EditingDomainAction resourceSet.setPackageRegistry(packageRegistry); return resourceSet; } -}
\ No newline at end of file +} diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/LoadResourceAction.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/LoadResourceAction.java index ca73aa21be..95208cbc87 100644 --- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/LoadResourceAction.java +++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/LoadResourceAction.java @@ -50,4 +50,4 @@ public final class LoadResourceAction extends ViewAction { CDOEditor.open(getPage(), getView(), resourcePath); } -}
\ No newline at end of file +} diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ManagePackagesAction.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ManagePackagesAction.java index 2931ca6e08..c591936c53 100644 --- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ManagePackagesAction.java +++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ManagePackagesAction.java @@ -41,4 +41,4 @@ public class ManagePackagesAction extends SessionAction protected void doRun() throws Exception { } -}
\ No newline at end of file +} diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/OpenAuditAction.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/OpenAuditAction.java index f8a092a21c..9b2a6dad99 100644 --- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/OpenAuditAction.java +++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/OpenAuditAction.java @@ -53,4 +53,4 @@ public final class OpenAuditAction extends AbstractOpenViewAction { getSession().openAudit(new ResourceSetImpl(), timeStamp); } -}
\ No newline at end of file +} diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/OpenResourceEditorAction.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/OpenResourceEditorAction.java index 3da25907b7..0ce2887973 100644 --- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/OpenResourceEditorAction.java +++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/OpenResourceEditorAction.java @@ -39,4 +39,4 @@ public final class OpenResourceEditorAction extends EntryAction String resourcePath = getEntry().getResourcePath(); CDOEditor.open(getPage(), view, resourcePath); } -}
\ No newline at end of file +} diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/OpenSessionAction.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/OpenSessionAction.java index 0446f67fc8..24cf93700e 100644 --- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/OpenSessionAction.java +++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/OpenSessionAction.java @@ -98,4 +98,4 @@ public final class OpenSessionAction extends LongRunningAction } } } -}
\ No newline at end of file +} diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/OpenTransactionAction.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/OpenTransactionAction.java index 1c24142b46..687adc0b51 100644 --- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/OpenTransactionAction.java +++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/OpenTransactionAction.java @@ -36,4 +36,4 @@ public final class OpenTransactionAction extends AbstractOpenViewAction { getSession().openTransaction(new ResourceSetImpl()); } -}
\ No newline at end of file +} diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/OpenViewAction.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/OpenViewAction.java index cecc05a846..1e77c62159 100644 --- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/OpenViewAction.java +++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/OpenViewAction.java @@ -36,4 +36,4 @@ public final class OpenViewAction extends AbstractOpenViewAction { getSession().openView(new ResourceSetImpl()); } -}
\ No newline at end of file +} diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/OpenViewEditorAction.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/OpenViewEditorAction.java index 56421f1fa8..03e7be5e00 100644 --- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/OpenViewEditorAction.java +++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/OpenViewEditorAction.java @@ -34,4 +34,4 @@ public final class OpenViewEditorAction extends ViewAction { CDOEditor.open(getPage(), getView(), null); } -}
\ No newline at end of file +} diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/RegisterPackagesAction.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/RegisterPackagesAction.java index 55c39576e2..f7c7084103 100644 --- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/RegisterPackagesAction.java +++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/RegisterPackagesAction.java @@ -99,4 +99,4 @@ public abstract class RegisterPackagesAction extends SessionAction } protected abstract List<EPackage> getEPackages(IWorkbenchPage page, CDOSession session); -}
\ No newline at end of file +} diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ReloadObjectsAction.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ReloadObjectsAction.java index 9c280247f5..386d7e7c11 100644 --- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ReloadObjectsAction.java +++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ReloadObjectsAction.java @@ -80,4 +80,4 @@ public class ReloadObjectsAction extends EditingDomainAction } } } -}
\ No newline at end of file +} diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ReloadViewAction.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ReloadViewAction.java index b685e3f0e9..ab9c6dff45 100644 --- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ReloadViewAction.java +++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ReloadViewAction.java @@ -37,4 +37,4 @@ public final class ReloadViewAction extends ViewAction CDOEditor.refresh(getPage(), getView()); } } -}
\ No newline at end of file +} diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/RollbackTransactionAction.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/RollbackTransactionAction.java index 3a69013c7d..c1c135ea2a 100644 --- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/RollbackTransactionAction.java +++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/RollbackTransactionAction.java @@ -59,4 +59,4 @@ public final class RollbackTransactionAction extends ViewAction { getTransaction().rollback(remote); } -}
\ No newline at end of file +} diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/SessionAction.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/SessionAction.java index a465474952..99debcf1cf 100644 --- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/SessionAction.java +++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/SessionAction.java @@ -34,4 +34,4 @@ public abstract class SessionAction extends LongRunningAction { return session; } -}
\ No newline at end of file +} diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ViewAction.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ViewAction.java index b4f5e40d4b..926bd4f88e 100644 --- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ViewAction.java +++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ViewAction.java @@ -44,4 +44,4 @@ public abstract class ViewAction extends LongRunningAction { return ((CDOViewImpl)view).toTransaction(); } -}
\ No newline at end of file +} diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/BulkAddDialog.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/BulkAddDialog.java index d68be24b94..807f2bf114 100644 --- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/BulkAddDialog.java +++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/BulkAddDialog.java @@ -10,11 +10,11 @@ **************************************************************************/ package org.eclipse.emf.cdo.internal.ui.dialogs; -import org.eclipse.emf.ecore.EReference; - import org.eclipse.net4j.util.ui.StaticContentProvider; import org.eclipse.net4j.util.ui.UIUtil; +import org.eclipse.emf.ecore.EReference; + import org.eclipse.jface.dialogs.IDialogConstants; import org.eclipse.jface.dialogs.TitleAreaDialog; import org.eclipse.jface.viewers.ISelectionChangedListener; 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 af855e2870..f84a268cc9 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 @@ -20,13 +20,13 @@ import org.eclipse.emf.cdo.ui.CDOItemProvider; import org.eclipse.emf.cdo.util.CDOPackageType; import org.eclipse.emf.cdo.util.CDOUtil; +import org.eclipse.net4j.util.ObjectUtil; +import org.eclipse.net4j.util.ui.UIUtil; + import org.eclipse.emf.ecore.EPackage; import org.eclipse.emf.ecore.EcorePackage; import org.eclipse.emf.ecore.impl.EPackageImpl; -import org.eclipse.net4j.util.ObjectUtil; -import org.eclipse.net4j.util.ui.UIUtil; - import org.eclipse.jface.dialogs.IDialogConstants; import org.eclipse.jface.dialogs.TitleAreaDialog; import org.eclipse.jface.viewers.BaseLabelProvider; 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 61dbe0cfbb..2b5db255d3 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 @@ -15,11 +15,11 @@ import org.eclipse.emf.cdo.internal.ui.bundle.OM; import org.eclipse.emf.cdo.util.CDOPackageType; import org.eclipse.emf.cdo.util.CDOUtil; -import org.eclipse.emf.ecore.EcorePackage; - import org.eclipse.net4j.util.ui.UIUtil; import org.eclipse.net4j.util.ui.widgets.BaseDialog; +import org.eclipse.emf.ecore.EcorePackage; + import org.eclipse.jface.viewers.CheckboxTableViewer; import org.eclipse.jface.viewers.IStructuredContentProvider; import org.eclipse.jface.viewers.ITableColorProvider; diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/editor/CDOActionBarContributor.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/editor/CDOActionBarContributor.java index 9d21483ab5..aa6f5edd18 100644 --- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/editor/CDOActionBarContributor.java +++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/editor/CDOActionBarContributor.java @@ -654,4 +654,4 @@ public class CDOActionBarContributor extends EditingDomainActionBarContributor i reloadObjectsAction.update(); } } -}
\ No newline at end of file +} diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/editor/CDOEditor.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/editor/CDOEditor.java index a65801b46b..d63e4f5311 100644 --- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/editor/CDOEditor.java +++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/editor/CDOEditor.java @@ -24,6 +24,16 @@ import org.eclipse.emf.cdo.ui.CDOEventHandler; import org.eclipse.emf.cdo.ui.CDOLabelProvider; import org.eclipse.emf.cdo.util.CDOUtil; +import org.eclipse.emf.internal.cdo.CDOLegacyImpl; +import org.eclipse.emf.internal.cdo.CDOStateMachine; +import org.eclipse.emf.internal.cdo.CDOTransactionImpl; +import org.eclipse.emf.internal.cdo.InternalCDOObject; + +import org.eclipse.net4j.util.ObjectUtil; +import org.eclipse.net4j.util.transaction.TransactionException; +import org.eclipse.net4j.util.ui.actions.LongRunningAction; +import org.eclipse.net4j.util.ui.actions.SafeAction; + import org.eclipse.emf.common.command.BasicCommandStack; import org.eclipse.emf.common.command.Command; import org.eclipse.emf.common.command.CommandStack; @@ -64,15 +74,6 @@ import org.eclipse.emf.edit.ui.provider.UnwrappingSelectionProvider; import org.eclipse.emf.edit.ui.util.EditUIMarkerHelper; import org.eclipse.emf.edit.ui.util.EditUIUtil; import org.eclipse.emf.edit.ui.view.ExtendedPropertySheetPage; -import org.eclipse.emf.internal.cdo.CDOLegacyImpl; -import org.eclipse.emf.internal.cdo.CDOStateMachine; -import org.eclipse.emf.internal.cdo.CDOTransactionImpl; -import org.eclipse.emf.internal.cdo.InternalCDOObject; - -import org.eclipse.net4j.util.ObjectUtil; -import org.eclipse.net4j.util.transaction.TransactionException; -import org.eclipse.net4j.util.ui.actions.LongRunningAction; -import org.eclipse.net4j.util.ui.actions.SafeAction; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IMarker; diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/preferences/CDOPreferencePage.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/preferences/CDOPreferencePage.java index 03ad9af6ff..e68109643d 100644 --- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/preferences/CDOPreferencePage.java +++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/preferences/CDOPreferencePage.java @@ -145,4 +145,4 @@ public class CDOPreferencePage extends OMPreferencePage .parseLong(commitTimeout.getValue())); return super.performOk(); } -}
\ No newline at end of file +} diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/preferences/CDOUIPreferencePage.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/preferences/CDOUIPreferencePage.java index 88349a936c..ea55fbfe88 100644 --- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/preferences/CDOUIPreferencePage.java +++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/preferences/CDOUIPreferencePage.java @@ -79,4 +79,4 @@ public class CDOUIPreferencePage extends OMPreferencePage OM.PREF_LABEL_DECORATION.setValue(decoration.getValue()); return super.performOk(); } -}
\ No newline at end of file +} 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 ff7cfe0061..7e150a7ee8 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 @@ -84,4 +84,4 @@ public class CDOSessionsView extends ContainerView super.doubleClicked(object); } } -}
\ No newline at end of file +} 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 2898467953..e129a29ecf 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 @@ -15,13 +15,13 @@ import org.eclipse.emf.cdo.CDOViewResourcesEvent; import org.eclipse.emf.cdo.eresource.CDOResource; import org.eclipse.emf.cdo.ui.CDOViewHistoryEvent; -import org.eclipse.emf.ecore.resource.Resource; - import org.eclipse.net4j.internal.util.event.Event; import org.eclipse.net4j.internal.util.event.Notifier; import org.eclipse.net4j.util.event.IEvent; import org.eclipse.net4j.util.event.IListener; +import org.eclipse.emf.ecore.resource.Resource; + import java.text.MessageFormat; import java.util.HashSet; import java.util.Set; diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOLabelProvider.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOLabelProvider.java index 7a389acf80..78d40e557e 100644 --- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOLabelProvider.java +++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOLabelProvider.java @@ -14,9 +14,6 @@ import org.eclipse.emf.cdo.CDOView; import org.eclipse.emf.cdo.internal.ui.bundle.OM; import org.eclipse.emf.cdo.protocol.revision.CDORevision; -import org.eclipse.emf.common.notify.AdapterFactory; -import org.eclipse.emf.common.notify.Notification; -import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider; import org.eclipse.emf.internal.cdo.InternalCDOObject; import org.eclipse.emf.internal.cdo.util.FSMUtil; @@ -24,6 +21,10 @@ import org.eclipse.net4j.util.ObjectUtil; import org.eclipse.net4j.util.StringUtil; import org.eclipse.net4j.util.ui.UIUtil; +import org.eclipse.emf.common.notify.AdapterFactory; +import org.eclipse.emf.common.notify.Notification; +import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider; + import org.eclipse.jface.viewers.IColorProvider; import org.eclipse.jface.viewers.IFontProvider; import org.eclipse.jface.viewers.TreeViewer; @@ -196,4 +197,4 @@ public class CDOLabelProvider extends AdapterFactoryLabelProvider implements ICo return text; } -}
\ No newline at end of file +} diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOSession.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOSession.java index f17013a125..d29c0a2f76 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOSession.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOSession.java @@ -13,12 +13,12 @@ package org.eclipse.emf.cdo; import org.eclipse.emf.cdo.protocol.model.CDOPackageManager; import org.eclipse.emf.cdo.util.CDOPackageRegistry; -import org.eclipse.emf.ecore.resource.ResourceSet; - import org.eclipse.net4j.IChannel; import org.eclipse.net4j.signal.IFailOverStrategy; import org.eclipse.net4j.util.container.IContainer; +import org.eclipse.emf.ecore.resource.ResourceSet; + /** * @author Eike Stepper */ diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOState.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOState.java index e7d7d2790a..7641fbacd6 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOState.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOState.java @@ -16,4 +16,4 @@ package org.eclipse.emf.cdo; public enum CDOState { TRANSIENT, NEW, CLEAN, DIRTY, PROXY, CONFLICT, PREPARED_ATTACH -}
\ No newline at end of file +} diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOTransaction.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOTransaction.java index 26d78faaf3..58c3125d09 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOTransaction.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOTransaction.java @@ -17,12 +17,12 @@ import org.eclipse.emf.cdo.protocol.model.CDOClass; import org.eclipse.emf.cdo.protocol.model.CDOPackage; import org.eclipse.emf.cdo.protocol.revision.delta.CDORevisionDelta; +import org.eclipse.net4j.util.transaction.TransactionException; + import org.eclipse.emf.common.util.URI; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.resource.ResourceSet; -import org.eclipse.net4j.util.transaction.TransactionException; - import java.util.List; import java.util.Map; diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOView.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOView.java index 7129994f5b..e5f77e4bfa 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOView.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOView.java @@ -16,11 +16,11 @@ import org.eclipse.emf.cdo.eresource.CDOResource; import org.eclipse.emf.cdo.protocol.CDOID; import org.eclipse.emf.cdo.protocol.revision.CDORevision; +import org.eclipse.net4j.util.event.INotifier; + import org.eclipse.emf.common.util.URI; import org.eclipse.emf.ecore.resource.ResourceSet; -import org.eclipse.net4j.util.event.INotifier; - /** * @author Eike Stepper */ diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/CDOResourceFactory.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/CDOResourceFactory.java index 768c9db4fa..ced0fe2a99 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/CDOResourceFactory.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/CDOResourceFactory.java @@ -20,4 +20,4 @@ import org.eclipse.emf.ecore.resource.Resource; public interface CDOResourceFactory extends Resource.Factory { public static final CDOResourceFactory INSTANCE = CDOResourceFactoryImpl.INSTANCE; -}
\ No newline at end of file +} 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 ffbb65016a..008f7bfd5f 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 @@ -16,6 +16,17 @@ import org.eclipse.emf.cdo.eresource.CDOResource; import org.eclipse.emf.cdo.eresource.EresourcePackage; import org.eclipse.emf.cdo.util.CDOUtil; +import org.eclipse.emf.internal.cdo.CDOLegacyImpl; +import org.eclipse.emf.internal.cdo.CDOObjectImpl; +import org.eclipse.emf.internal.cdo.CDOStateMachine; +import org.eclipse.emf.internal.cdo.CDOViewImpl; +import org.eclipse.emf.internal.cdo.InternalCDOObject; +import org.eclipse.emf.internal.cdo.bundle.OM; +import org.eclipse.emf.internal.cdo.util.FSMUtil; + +import org.eclipse.net4j.internal.util.om.trace.ContextTracer; +import org.eclipse.net4j.util.ImplementationError; + import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.NotificationChain; import org.eclipse.emf.common.notify.impl.NotificationChainImpl; @@ -32,16 +43,6 @@ import org.eclipse.emf.ecore.resource.Resource; import org.eclipse.emf.ecore.resource.ResourceSet; import org.eclipse.emf.ecore.resource.impl.ResourceImpl; import org.eclipse.emf.ecore.util.InternalEList; -import org.eclipse.emf.internal.cdo.CDOLegacyImpl; -import org.eclipse.emf.internal.cdo.CDOObjectImpl; -import org.eclipse.emf.internal.cdo.CDOStateMachine; -import org.eclipse.emf.internal.cdo.CDOViewImpl; -import org.eclipse.emf.internal.cdo.InternalCDOObject; -import org.eclipse.emf.internal.cdo.bundle.OM; -import org.eclipse.emf.internal.cdo.util.FSMUtil; - -import org.eclipse.net4j.internal.util.om.trace.ContextTracer; -import org.eclipse.net4j.util.ImplementationError; import java.io.IOException; import java.io.InputStream; diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/EresourceFactoryImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/EresourceFactoryImpl.java index fa74b6b340..e36d510f4c 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/EresourceFactoryImpl.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/EresourceFactoryImpl.java @@ -13,6 +13,7 @@ package org.eclipse.emf.cdo.eresource.impl; import org.eclipse.emf.cdo.eresource.CDOResource; import org.eclipse.emf.cdo.eresource.EresourceFactory; import org.eclipse.emf.cdo.eresource.EresourcePackage; + import org.eclipse.emf.common.util.URI; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EDataType; @@ -23,13 +24,14 @@ import org.eclipse.emf.ecore.plugin.EcorePlugin; /** * <!-- begin-user-doc --> An implementation of the model <b>Factory</b>. <!-- end-user-doc --> + * * @generated */ public class EresourceFactoryImpl extends EFactoryImpl implements EresourceFactory { /** - * Creates the default factory implementation. - * <!-- begin-user-doc --> <!-- end-user-doc --> + * Creates the default factory implementation. <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ public static EresourceFactory init() @@ -51,8 +53,8 @@ public class EresourceFactoryImpl extends EFactoryImpl implements EresourceFacto } /** - * Creates an instance of the factory. - * <!-- begin-user-doc --> <!-- end-user-doc --> + * Creates an instance of the factory. <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ public EresourceFactoryImpl() @@ -79,6 +81,7 @@ public class EresourceFactoryImpl extends EFactoryImpl implements EresourceFacto /** * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ @Override @@ -95,6 +98,7 @@ public class EresourceFactoryImpl extends EFactoryImpl implements EresourceFacto /** * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ @Override @@ -111,6 +115,7 @@ public class EresourceFactoryImpl extends EFactoryImpl implements EresourceFacto /** * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ public CDOResource createCDOResource() @@ -141,6 +146,7 @@ public class EresourceFactoryImpl extends EFactoryImpl implements EresourceFacto /** * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ public EresourcePackage getEresourcePackage() @@ -150,6 +156,7 @@ public class EresourceFactoryImpl extends EFactoryImpl implements EresourceFacto /** * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @deprecated * @generated */ diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/EresourcePackageImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/EresourcePackageImpl.java index 58f27a5f29..1d2a89a679 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/EresourcePackageImpl.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/EresourcePackageImpl.java @@ -26,30 +26,35 @@ import org.eclipse.emf.ecore.resource.Resource.Diagnostic; /** * <!-- begin-user-doc --> An implementation of the model <b>Package</b>. <!-- end-user-doc --> + * * @generated */ public class EresourcePackageImpl extends EPackageImpl implements EresourcePackage { /** * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ private EClass cdoResourceEClass = null; /** * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ private EDataType resourceSetEDataType = null; /** * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ private EDataType uriEDataType = null; /** * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ private EDataType diagnosticEDataType = null; @@ -74,27 +79,24 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka /** * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ private static boolean isInited = false; /** - * Creates, registers, and initializes the <b>Package</b> for this - * model, and for any others upon which it depends. Simple - * dependencies are satisfied by calling this method on all - * dependent packages before doing anything else. This method drives - * initialization for interdependent packages directly, in parallel - * with this package, itself. - * <p>Of this package and its interdependencies, all packages which - * have not yet been registered by their URI values are first created - * and registered. The packages are then initialized in two steps: - * meta-model objects for all of the packages are created before any - * are initialized, since one package's meta-model objects may refer to - * those of another. - * <p>Invocation of this method will not affect any packages that have - * already been initialized. - * <!-- begin-user-doc --> + * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends. + * Simple dependencies are satisfied by calling this method on all dependent packages before doing anything else. This + * method drives initialization for interdependent packages directly, in parallel with this package, itself. + * <p> + * Of this package and its interdependencies, all packages which have not yet been registered by their URI values are + * first created and registered. The packages are then initialized in two steps: meta-model objects for all of the + * packages are created before any are initialized, since one package's meta-model objects may refer to those of + * another. + * <p> + * Invocation of this method will not affect any packages that have already been initialized. <!-- begin-user-doc --> * <!-- end-user-doc --> + * * @see #eNS_URI * @see #createPackageContents() * @see #initializePackageContents() @@ -128,6 +130,7 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka /** * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ public EClass getCDOResource() @@ -137,6 +140,7 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka /** * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ public EAttribute getCDOResource_ResourceSet() @@ -146,6 +150,7 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka /** * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ public EAttribute getCDOResource_URI() @@ -155,6 +160,7 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka /** * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ public EReference getCDOResource_Contents() @@ -164,6 +170,7 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka /** * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ public EAttribute getCDOResource_Modified() @@ -173,6 +180,7 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka /** * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ public EAttribute getCDOResource_Loaded() @@ -182,6 +190,7 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka /** * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ public EAttribute getCDOResource_TrackingModification() @@ -191,6 +200,7 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka /** * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ public EAttribute getCDOResource_Errors() @@ -200,6 +210,7 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka /** * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ public EAttribute getCDOResource_Warnings() @@ -208,8 +219,8 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka } /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ public EAttribute getCDOResource_TimeStamp() @@ -219,6 +230,7 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka /** * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ public EAttribute getCDOResource_Path() @@ -228,6 +240,7 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka /** * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ public EDataType getResourceSet() @@ -237,6 +250,7 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka /** * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ public EDataType getURI() @@ -246,6 +260,7 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka /** * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ public EDataType getDiagnostic() @@ -255,6 +270,7 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka /** * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ public EresourceFactory getEresourceFactory() @@ -264,14 +280,15 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka /** * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ private boolean isCreated = false; /** - * Creates the meta-model objects for the package. This method is - * guarded to have no affect on any invocation but its first. - * <!-- begin-user-doc --> <!-- end-user-doc --> + * Creates the meta-model objects for the package. This method is guarded to have no affect on any invocation but its + * first. <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ public void createPackageContents() @@ -300,14 +317,15 @@ public class EresourcePackageImpl extends EPackageImpl implements EresourcePacka /** * <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ private boolean isInitialized = false; /** - * Complete the initialization of the package and its meta-model. This - * method is guarded to have no affect on any invocation but its first. - * <!-- begin-user-doc --> <!-- end-user-doc --> + * Complete the initialization of the package and its meta-model. This method is guarded to have no affect on any + * invocation but its first. <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ public void initializePackageContents() diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/util/EresourceAdapterFactory.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/util/EresourceAdapterFactory.java index 9b86abdcb7..65ee0e6692 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/util/EresourceAdapterFactory.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/util/EresourceAdapterFactory.java @@ -12,6 +12,7 @@ package org.eclipse.emf.cdo.eresource.util; import org.eclipse.emf.cdo.eresource.CDOResource; import org.eclipse.emf.cdo.eresource.EresourcePackage; + import org.eclipse.emf.common.notify.Adapter; import org.eclipse.emf.common.notify.Notifier; import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl; @@ -20,21 +21,22 @@ import org.eclipse.emf.ecore.EObject; /** * <!-- begin-user-doc --> The <b>Adapter Factory</b> for the model. It provides an adapter <code>createXXX</code> * method for each class of the model. <!-- end-user-doc --> + * * @see org.eclipse.emf.cdo.eresource.EresourcePackage * @generated */ public class EresourceAdapterFactory extends AdapterFactoryImpl { /** - * The cached model package. - * <!-- begin-user-doc --> <!-- end-user-doc --> + * The cached model package. <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ protected static EresourcePackage modelPackage; /** - * Creates an instance of the adapter factory. - * <!-- begin-user-doc --> <!-- end-user-doc --> + * Creates an instance of the adapter factory. <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ public EresourceAdapterFactory() @@ -46,10 +48,10 @@ public class EresourceAdapterFactory extends AdapterFactoryImpl } /** - * Returns whether this factory is applicable for the type of the object. - * <!-- begin-user-doc --> This implementation + * Returns whether this factory is applicable for the type of the object. <!-- begin-user-doc --> This implementation * returns <code>true</code> if the object is either the model's package or is an instance object of the model. <!-- * end-user-doc --> + * * @return whether this factory is applicable for the type of the object. * @generated */ @@ -68,8 +70,8 @@ public class EresourceAdapterFactory extends AdapterFactoryImpl } /** - * The switch that delegates to the <code>createXXX</code> methods. - * <!-- begin-user-doc --> <!-- end-user-doc --> + * The switch that delegates to the <code>createXXX</code> methods. <!-- begin-user-doc --> <!-- end-user-doc --> + * * @generated */ protected EresourceSwitch<Adapter> modelSwitch = new EresourceSwitch<Adapter>() @@ -88,9 +90,10 @@ public class EresourceAdapterFactory extends AdapterFactoryImpl }; /** - * Creates an adapter for the <code>target</code>. - * <!-- begin-user-doc --> <!-- end-user-doc --> - * @param target the object to adapt. + * Creates an adapter for the <code>target</code>. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @param target + * the object to adapt. * @return the adapter for the <code>target</code>. * @generated */ @@ -104,6 +107,7 @@ public class EresourceAdapterFactory extends AdapterFactoryImpl * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.eresource.CDOResource <em>CDO Resource</em>}'. * <!-- begin-user-doc --> This default implementation returns null so that we can easily ignore cases; it's useful to * ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc --> + * * @return the new adapter. * @see org.eclipse.emf.cdo.eresource.CDOResource * @generated @@ -114,9 +118,9 @@ public class EresourceAdapterFactory extends AdapterFactoryImpl } /** - * Creates a new adapter for the default case. - * <!-- begin-user-doc --> This default implementation returns null. <!-- + * Creates a new adapter for the default case. <!-- begin-user-doc --> This default implementation returns null. <!-- * end-user-doc --> + * * @return the new adapter. * @generated */ 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 bb426c8921..2df8cb779a 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/util/CDOUtil.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/util/CDOUtil.java @@ -18,21 +18,6 @@ import org.eclipse.emf.cdo.internal.protocol.CDOIDImpl; import org.eclipse.emf.cdo.protocol.CDOID; import org.eclipse.emf.cdo.protocol.CDOProtocolConstants; -import org.eclipse.emf.common.notify.Adapter; -import org.eclipse.emf.common.util.EList; -import org.eclipse.emf.common.util.URI; -import org.eclipse.emf.ecore.EAttribute; -import org.eclipse.emf.ecore.EClass; -import org.eclipse.emf.ecore.EClassifier; -import org.eclipse.emf.ecore.EObject; -import org.eclipse.emf.ecore.EPackage; -import org.eclipse.emf.ecore.EReference; -import org.eclipse.emf.ecore.EcoreFactory; -import org.eclipse.emf.ecore.plugin.EcorePlugin; -import org.eclipse.emf.ecore.resource.ResourceSet; -import org.eclipse.emf.ecore.resource.Resource.Factory.Registry; -import org.eclipse.emf.ecore.util.EcoreUtil; -import org.eclipse.emf.ecore.util.EcoreUtil.Copier; import org.eclipse.emf.internal.cdo.CDOSessionFactory; import org.eclipse.emf.internal.cdo.CDOSessionImpl; import org.eclipse.emf.internal.cdo.CDOStateMachine; @@ -49,6 +34,22 @@ import org.eclipse.net4j.util.StringUtil; import org.eclipse.net4j.util.container.IManagedContainer; import org.eclipse.net4j.util.lifecycle.LifecycleUtil; +import org.eclipse.emf.common.notify.Adapter; +import org.eclipse.emf.common.util.EList; +import org.eclipse.emf.common.util.URI; +import org.eclipse.emf.ecore.EAttribute; +import org.eclipse.emf.ecore.EClass; +import org.eclipse.emf.ecore.EClassifier; +import org.eclipse.emf.ecore.EObject; +import org.eclipse.emf.ecore.EPackage; +import org.eclipse.emf.ecore.EReference; +import org.eclipse.emf.ecore.EcoreFactory; +import org.eclipse.emf.ecore.plugin.EcorePlugin; +import org.eclipse.emf.ecore.resource.ResourceSet; +import org.eclipse.emf.ecore.resource.Resource.Factory.Registry; +import org.eclipse.emf.ecore.util.EcoreUtil; +import org.eclipse.emf.ecore.util.EcoreUtil.Copier; + import org.eclipse.core.runtime.IConfigurationElement; import org.eclipse.core.runtime.IExtensionRegistry; import org.eclipse.core.runtime.Platform; 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 efe59fbc94..599d481915 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 @@ -10,6 +10,8 @@ **************************************************************************/ package org.eclipse.emf.cdo.util; +import org.eclipse.net4j.util.io.IORuntimeException; + import org.eclipse.emf.common.util.EList; import org.eclipse.emf.common.util.TreeIterator; import org.eclipse.emf.common.util.URI; @@ -34,8 +36,6 @@ import org.eclipse.emf.ecore.xmi.impl.EcoreResourceFactoryImpl; import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl; import org.eclipse.emf.ecore.xmi.impl.XMIResourceImpl; -import org.eclipse.net4j.util.io.IORuntimeException; - import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOAdapterImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOAdapterImpl.java index d4a7a81848..0fe204ed93 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOAdapterImpl.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOAdapterImpl.java @@ -10,9 +10,10 @@ **************************************************************************/ package org.eclipse.emf.internal.cdo; -import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.internal.cdo.bundle.OM; +import org.eclipse.emf.common.notify.Notification; + /** * @author Eike Stepper */ 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 4f1403dd7d..fde647e4f6 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 @@ -12,6 +12,9 @@ package org.eclipse.emf.internal.cdo; import org.eclipse.emf.cdo.CDOView; +import org.eclipse.emf.internal.cdo.bundle.OM; +import org.eclipse.emf.internal.cdo.util.FSMUtil; + import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.ecore.EReference; import org.eclipse.emf.ecore.InternalEObject; @@ -19,8 +22,6 @@ import org.eclipse.emf.ecore.impl.CDOAware; import org.eclipse.emf.ecore.impl.CDOCallback; import org.eclipse.emf.ecore.impl.EObjectImpl; import org.eclipse.emf.ecore.util.EcoreUtil; -import org.eclipse.emf.internal.cdo.bundle.OM; -import org.eclipse.emf.internal.cdo.util.FSMUtil; import java.util.List; 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 e0e70006ba..8b4250a754 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 @@ -22,6 +22,15 @@ import org.eclipse.emf.cdo.protocol.CDOProtocolConstants; import org.eclipse.emf.cdo.protocol.model.CDOType; import org.eclipse.emf.cdo.protocol.revision.CDORevision; +import org.eclipse.emf.internal.cdo.bundle.OM; +import org.eclipse.emf.internal.cdo.util.GenUtil; +import org.eclipse.emf.internal.cdo.util.ModelUtil; + +import org.eclipse.net4j.internal.util.om.trace.ContextTracer; +import org.eclipse.net4j.util.ImplementationError; +import org.eclipse.net4j.util.ReflectUtil; +import org.eclipse.net4j.util.WrappedException; + import org.eclipse.emf.common.notify.Adapter; import org.eclipse.emf.common.notify.Notifier; import org.eclipse.emf.common.util.URI; @@ -37,14 +46,6 @@ import org.eclipse.emf.ecore.impl.EStructuralFeatureImpl; import org.eclipse.emf.ecore.impl.ETypedElementImpl; import org.eclipse.emf.ecore.resource.Resource; import org.eclipse.emf.ecore.util.InternalEList; -import org.eclipse.emf.internal.cdo.bundle.OM; -import org.eclipse.emf.internal.cdo.util.GenUtil; -import org.eclipse.emf.internal.cdo.util.ModelUtil; - -import org.eclipse.net4j.internal.util.om.trace.ContextTracer; -import org.eclipse.net4j.util.ImplementationError; -import org.eclipse.net4j.util.ReflectUtil; -import org.eclipse.net4j.util.WrappedException; import java.lang.reflect.Field; import java.lang.reflect.InvocationTargetException; diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOObjectImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOObjectImpl.java index cc8e41db5d..e5b1158a98 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOObjectImpl.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOObjectImpl.java @@ -20,6 +20,13 @@ import org.eclipse.emf.cdo.internal.protocol.revision.CDORevisionImpl; import org.eclipse.emf.cdo.protocol.CDOID; import org.eclipse.emf.cdo.protocol.revision.CDORevision; +import org.eclipse.emf.internal.cdo.bundle.OM; +import org.eclipse.emf.internal.cdo.util.FSMUtil; +import org.eclipse.emf.internal.cdo.util.ModelUtil; + +import org.eclipse.net4j.internal.util.om.trace.ContextTracer; +import org.eclipse.net4j.util.ImplementationError; + import org.eclipse.emf.common.util.BasicEMap; import org.eclipse.emf.common.util.ECollections; import org.eclipse.emf.common.util.EList; @@ -36,12 +43,6 @@ import org.eclipse.emf.ecore.util.DelegatingFeatureMap; import org.eclipse.emf.ecore.util.EcoreEList; import org.eclipse.emf.ecore.util.EcoreEMap; import org.eclipse.emf.ecore.util.FeatureMap; -import org.eclipse.emf.internal.cdo.bundle.OM; -import org.eclipse.emf.internal.cdo.util.FSMUtil; -import org.eclipse.emf.internal.cdo.util.ModelUtil; - -import org.eclipse.net4j.internal.util.om.trace.ContextTracer; -import org.eclipse.net4j.util.ImplementationError; import java.util.Collection; import java.util.Iterator; diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOPackageRegistryImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOPackageRegistryImpl.java index b4650c6acc..6b90c4625c 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOPackageRegistryImpl.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOPackageRegistryImpl.java @@ -14,12 +14,13 @@ import org.eclipse.emf.cdo.internal.protocol.model.CDOPackageImpl; import org.eclipse.emf.cdo.util.CDOPackageRegistry; import org.eclipse.emf.cdo.util.EMFUtil; +import org.eclipse.emf.internal.cdo.util.ModelUtil; + import org.eclipse.emf.ecore.EFactory; import org.eclipse.emf.ecore.EPackage; import org.eclipse.emf.ecore.EPackage.Registry; import org.eclipse.emf.ecore.impl.EPackageImpl; import org.eclipse.emf.ecore.impl.EPackageRegistryImpl; -import org.eclipse.emf.internal.cdo.util.ModelUtil; import java.text.MessageFormat; import java.util.Map; 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 f54232cf27..8942f08d27 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 @@ -12,12 +12,12 @@ package org.eclipse.emf.internal.cdo; import org.eclipse.emf.cdo.CDOSession; -import org.eclipse.emf.common.util.URI; -import org.eclipse.emf.ecore.EPackage; - import org.eclipse.net4j.internal.util.factory.Factory; import org.eclipse.net4j.util.container.IManagedContainer; +import org.eclipse.emf.common.util.URI; +import org.eclipse.emf.ecore.EPackage; + import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.Path; 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 4a9723b20d..c38201a23b 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 @@ -25,14 +25,6 @@ import org.eclipse.emf.cdo.protocol.revision.CDORevision; import org.eclipse.emf.cdo.protocol.util.TransportException; import org.eclipse.emf.cdo.util.CDOUtil; -import org.eclipse.emf.common.util.URI; -import org.eclipse.emf.ecore.EObject; -import org.eclipse.emf.ecore.EPackage; -import org.eclipse.emf.ecore.InternalEObject; -import org.eclipse.emf.ecore.impl.EPackageRegistryImpl; -import org.eclipse.emf.ecore.resource.Resource; -import org.eclipse.emf.ecore.resource.ResourceSet; -import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl; import org.eclipse.emf.internal.cdo.bundle.OM; import org.eclipse.emf.internal.cdo.protocol.OpenSessionRequest; import org.eclipse.emf.internal.cdo.protocol.OpenSessionResult; @@ -56,6 +48,15 @@ import org.eclipse.net4j.util.event.IEvent; import org.eclipse.net4j.util.event.IListener; import org.eclipse.net4j.util.lifecycle.ILifecycle; +import org.eclipse.emf.common.util.URI; +import org.eclipse.emf.ecore.EObject; +import org.eclipse.emf.ecore.EPackage; +import org.eclipse.emf.ecore.InternalEObject; +import org.eclipse.emf.ecore.impl.EPackageRegistryImpl; +import org.eclipse.emf.ecore.resource.Resource; +import org.eclipse.emf.ecore.resource.ResourceSet; +import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl; + import java.text.MessageFormat; import java.util.Collection; import java.util.Collections; diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOSessionPackageManager.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOSessionPackageManager.java index 7a99e2521d..16ff25b803 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOSessionPackageManager.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOSessionPackageManager.java @@ -17,13 +17,14 @@ import org.eclipse.emf.cdo.protocol.model.CDOPackageInfo; import org.eclipse.emf.cdo.protocol.util.TransportException; import org.eclipse.emf.cdo.util.EMFUtil; -import org.eclipse.emf.ecore.EPackage; import org.eclipse.emf.internal.cdo.bundle.OM; import org.eclipse.emf.internal.cdo.protocol.LoadPackageRequest; import org.eclipse.emf.internal.cdo.util.ModelUtil; import org.eclipse.net4j.signal.IFailOverStrategy; +import org.eclipse.emf.ecore.EPackage; + import java.util.Collection; /** diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOStore.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOStore.java index a4a9a47942..737a14c871 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOStore.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOStore.java @@ -26,17 +26,18 @@ import org.eclipse.emf.cdo.protocol.model.CDOFeature; import org.eclipse.emf.cdo.protocol.revision.CDOReferenceProxy; import org.eclipse.emf.cdo.protocol.revision.delta.CDOFeatureDelta; -import org.eclipse.emf.ecore.EClass; -import org.eclipse.emf.ecore.EObject; -import org.eclipse.emf.ecore.EStructuralFeature; -import org.eclipse.emf.ecore.InternalEObject; -import org.eclipse.emf.ecore.InternalEObject.EStore; import org.eclipse.emf.internal.cdo.bundle.OM; import org.eclipse.emf.internal.cdo.util.FSMUtil; import org.eclipse.emf.internal.cdo.util.ModelUtil; import org.eclipse.net4j.internal.util.om.trace.ContextTracer; +import org.eclipse.emf.ecore.EClass; +import org.eclipse.emf.ecore.EObject; +import org.eclipse.emf.ecore.EStructuralFeature; +import org.eclipse.emf.ecore.InternalEObject; +import org.eclipse.emf.ecore.InternalEObject.EStore; + import java.text.MessageFormat; import java.util.HashSet; import java.util.Set; 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 af55b0781a..c2b8ed1650 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 @@ -28,9 +28,6 @@ import org.eclipse.emf.cdo.protocol.revision.delta.CDOFeatureDelta; import org.eclipse.emf.cdo.protocol.revision.delta.CDORevisionDelta; import org.eclipse.emf.cdo.util.CDOUtil; -import org.eclipse.emf.common.util.URI; -import org.eclipse.emf.ecore.EClass; -import org.eclipse.emf.ecore.EPackage; import org.eclipse.emf.internal.cdo.bundle.OM; import org.eclipse.emf.internal.cdo.protocol.CommitTransactionRequest; import org.eclipse.emf.internal.cdo.protocol.CommitTransactionResult; @@ -43,6 +40,10 @@ import org.eclipse.net4j.signal.IFailOverStrategy; import org.eclipse.net4j.util.ImplementationError; import org.eclipse.net4j.util.transaction.TransactionException; +import org.eclipse.emf.common.util.URI; +import org.eclipse.emf.ecore.EClass; +import org.eclipse.emf.ecore.EPackage; + import java.text.MessageFormat; import java.util.ArrayList; import java.util.Collections; diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOViewImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOViewImpl.java index adf837e98c..0dc412afaf 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOViewImpl.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOViewImpl.java @@ -35,6 +35,16 @@ import org.eclipse.emf.cdo.protocol.util.TransportException; import org.eclipse.emf.cdo.util.CDOUtil; import org.eclipse.emf.cdo.util.ReadOnlyException; +import org.eclipse.emf.internal.cdo.bundle.OM; +import org.eclipse.emf.internal.cdo.protocol.ResourcePathRequest; +import org.eclipse.emf.internal.cdo.util.FSMUtil; +import org.eclipse.emf.internal.cdo.util.ModelUtil; + +import org.eclipse.net4j.internal.util.om.trace.ContextTracer; +import org.eclipse.net4j.signal.IFailOverStrategy; +import org.eclipse.net4j.util.ImplementationError; +import org.eclipse.net4j.util.ref.ReferenceValueMap; + import org.eclipse.emf.common.notify.Adapter; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.Notifier; @@ -46,15 +56,6 @@ import org.eclipse.emf.ecore.InternalEObject; import org.eclipse.emf.ecore.resource.Resource; import org.eclipse.emf.ecore.resource.ResourceSet; import org.eclipse.emf.ecore.util.EcoreUtil; -import org.eclipse.emf.internal.cdo.bundle.OM; -import org.eclipse.emf.internal.cdo.protocol.ResourcePathRequest; -import org.eclipse.emf.internal.cdo.util.FSMUtil; -import org.eclipse.emf.internal.cdo.util.ModelUtil; - -import org.eclipse.net4j.internal.util.om.trace.ContextTracer; -import org.eclipse.net4j.signal.IFailOverStrategy; -import org.eclipse.net4j.util.ImplementationError; -import org.eclipse.net4j.util.ref.ReferenceValueMap; import java.text.MessageFormat; import java.util.ArrayList; diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOWrapperImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOWrapperImpl.java index 7d21dd9679..82068e1093 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOWrapperImpl.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOWrapperImpl.java @@ -13,6 +13,10 @@ package org.eclipse.emf.internal.cdo; import org.eclipse.emf.cdo.CDOView; import org.eclipse.emf.cdo.protocol.CDOID; +import org.eclipse.emf.internal.cdo.bundle.OM; + +import org.eclipse.net4j.internal.util.om.trace.ContextTracer; + import org.eclipse.emf.common.notify.Adapter; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.NotificationChain; @@ -26,9 +30,6 @@ import org.eclipse.emf.ecore.EStructuralFeature; import org.eclipse.emf.ecore.InternalEObject; import org.eclipse.emf.ecore.EStructuralFeature.Setting; import org.eclipse.emf.ecore.resource.Resource; -import org.eclipse.emf.internal.cdo.bundle.OM; - -import org.eclipse.net4j.internal.util.om.trace.ContextTracer; /** * @author Eike Stepper @@ -317,4 +318,4 @@ public abstract class CDOWrapperImpl implements InternalCDOObject return instance.eURIFragmentSegment(feature, object); } -}
\ No newline at end of file +} diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/bundle/Activator.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/bundle/Activator.java index b17d070af7..f5e80c4cab 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/bundle/Activator.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/bundle/Activator.java @@ -10,12 +10,12 @@ **************************************************************************/ package org.eclipse.emf.internal.cdo.bundle; -import org.eclipse.emf.common.EMFPlugin; -import org.eclipse.emf.common.util.ResourceLocator; - import org.eclipse.net4j.internal.util.om.OSGiBundle; import org.eclipse.net4j.util.om.OSGiActivator; +import org.eclipse.emf.common.EMFPlugin; +import org.eclipse.emf.common.util.ResourceLocator; + import org.osgi.framework.BundleContext; /** 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 7bc587ef37..d0b68bd4b0 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 @@ -37,4 +37,4 @@ public final class CDOClientProtocolFactory extends ClientProtocolFactory { return (CDOClientProtocol)container.getElement(PRODUCT_GROUP, TYPE, description); } -}
\ No newline at end of file +} diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/ViewsChangedRequest.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/ViewsChangedRequest.java index 621287c56f..e76906ba62 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/ViewsChangedRequest.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/ViewsChangedRequest.java @@ -10,13 +10,14 @@ **************************************************************************/ package org.eclipse.emf.internal.cdo.protocol; -import java.io.IOException; - import org.eclipse.emf.cdo.protocol.CDOProtocolConstants; + import org.eclipse.net4j.IChannel; import org.eclipse.net4j.util.io.ExtendedDataInputStream; import org.eclipse.net4j.util.io.ExtendedDataOutputStream; +import java.io.IOException; + /** * @author Eike Stepper */ @@ -42,13 +43,13 @@ public class ViewsChangedRequest extends CDOClientRequest<Boolean> @Override protected void requesting(ExtendedDataOutputStream out) throws IOException { - out.writeInt(viewID); - out.writeByte(kind); + out.writeInt(viewID); + out.writeByte(kind); } @Override protected Boolean confirming(ExtendedDataInputStream in) throws IOException { - return in.readBoolean(); + return in.readBoolean(); } } diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/ChannelInjector.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/ChannelInjector.java index d603bacb00..6b22f9bf36 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/ChannelInjector.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/ChannelInjector.java @@ -10,7 +10,6 @@ **************************************************************************/ package org.eclipse.emf.internal.cdo.util; -import org.eclipse.emf.common.util.URI; import org.eclipse.emf.internal.cdo.CDOSessionImpl; import org.eclipse.net4j.IConnector; @@ -20,6 +19,8 @@ import org.eclipse.net4j.util.container.IManagedContainer; import org.eclipse.internal.net4j.ConnectorFactory; +import org.eclipse.emf.common.util.URI; + /** * @author Eike Stepper */ diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/CompletePackageClosure.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/CompletePackageClosure.java index 3618e4e77f..1bd5b6694a 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/CompletePackageClosure.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/CompletePackageClosure.java @@ -10,6 +10,10 @@ **************************************************************************/ package org.eclipse.emf.internal.cdo.util; +import org.eclipse.emf.internal.cdo.bundle.OM; + +import org.eclipse.net4j.internal.util.om.trace.ContextTracer; + import org.eclipse.emf.common.util.EList; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EClassifier; @@ -19,9 +23,6 @@ import org.eclipse.emf.ecore.EPackage; import org.eclipse.emf.ecore.EParameter; import org.eclipse.emf.ecore.EStructuralFeature; import org.eclipse.emf.ecore.ETypeParameter; -import org.eclipse.emf.internal.cdo.bundle.OM; - -import org.eclipse.net4j.internal.util.om.trace.ContextTracer; import java.util.HashSet; import java.util.List; 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 e664516c22..0100f1a969 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 @@ -15,17 +15,18 @@ import org.eclipse.emf.cdo.CDOState; import org.eclipse.emf.cdo.CDOView; import org.eclipse.emf.cdo.protocol.CDOID; +import org.eclipse.emf.internal.cdo.CDOAdapterImpl; +import org.eclipse.emf.internal.cdo.CDOMetaImpl; +import org.eclipse.emf.internal.cdo.CDOViewImpl; +import org.eclipse.emf.internal.cdo.InternalCDOObject; +import org.eclipse.emf.internal.cdo.bundle.OM; + import org.eclipse.emf.common.notify.Adapter; import org.eclipse.emf.common.util.EList; import org.eclipse.emf.ecore.EGenericType; import org.eclipse.emf.ecore.EModelElement; import org.eclipse.emf.ecore.InternalEObject; import org.eclipse.emf.ecore.util.EcoreUtil; -import org.eclipse.emf.internal.cdo.CDOAdapterImpl; -import org.eclipse.emf.internal.cdo.CDOMetaImpl; -import org.eclipse.emf.internal.cdo.CDOViewImpl; -import org.eclipse.emf.internal.cdo.InternalCDOObject; -import org.eclipse.emf.internal.cdo.bundle.OM; import java.lang.reflect.Method; import java.util.Collection; diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/InstancePackageClosure.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/InstancePackageClosure.java index 146d7b036a..3f5e4671a4 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/InstancePackageClosure.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/InstancePackageClosure.java @@ -10,6 +10,10 @@ **************************************************************************/ package org.eclipse.emf.internal.cdo.util; +import org.eclipse.emf.internal.cdo.bundle.OM; + +import org.eclipse.net4j.internal.util.om.trace.ContextTracer; + import org.eclipse.emf.common.util.EList; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EClassifier; @@ -19,9 +23,6 @@ import org.eclipse.emf.ecore.EPackage; import org.eclipse.emf.ecore.EParameter; import org.eclipse.emf.ecore.EStructuralFeature; import org.eclipse.emf.ecore.ETypeParameter; -import org.eclipse.emf.internal.cdo.bundle.OM; - -import org.eclipse.net4j.internal.util.om.trace.ContextTracer; import java.util.HashSet; import java.util.List; diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/ModelUtil.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/ModelUtil.java index 176ddf3b20..e96845462f 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/ModelUtil.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/ModelUtil.java @@ -24,6 +24,14 @@ import org.eclipse.emf.cdo.protocol.CDOIDRange; import org.eclipse.emf.cdo.protocol.model.CDOPackageManager; import org.eclipse.emf.cdo.util.EMFUtil; +import org.eclipse.emf.internal.cdo.CDOFactoryImpl; +import org.eclipse.emf.internal.cdo.CDOPackageRegistryImpl; +import org.eclipse.emf.internal.cdo.CDOSessionPackageManager; +import org.eclipse.emf.internal.cdo.bundle.OM; + +import org.eclipse.net4j.internal.util.om.trace.ContextTracer; +import org.eclipse.net4j.util.ImplementationError; + import org.eclipse.emf.ecore.EAttribute; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EClassifier; @@ -32,13 +40,6 @@ import org.eclipse.emf.ecore.EReference; import org.eclipse.emf.ecore.EStructuralFeature; import org.eclipse.emf.ecore.EcorePackage; import org.eclipse.emf.ecore.impl.EPackageImpl; -import org.eclipse.emf.internal.cdo.CDOFactoryImpl; -import org.eclipse.emf.internal.cdo.CDOPackageRegistryImpl; -import org.eclipse.emf.internal.cdo.CDOSessionPackageManager; -import org.eclipse.emf.internal.cdo.bundle.OM; - -import org.eclipse.net4j.internal.util.om.trace.ContextTracer; -import org.eclipse.net4j.util.ImplementationError; /** * @author Eike Stepper 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 eae649605e..95e815b084 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 @@ -10,11 +10,12 @@ **************************************************************************/ package org.eclipse.emf.internal.cdo.util; -import org.eclipse.emf.ecore.EPackage; import org.eclipse.emf.internal.cdo.bundle.OM; import org.eclipse.net4j.internal.util.om.trace.ContextTracer; +import org.eclipse.emf.ecore.EPackage; + import java.util.Collection; import java.util.HashSet; import java.util.Set; diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/ProxyResolverResource.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/ProxyResolverResource.java index 26feed3fb7..1d7d655060 100644 --- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/ProxyResolverResource.java +++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/ProxyResolverResource.java @@ -14,6 +14,10 @@ import org.eclipse.emf.cdo.CDOState; import org.eclipse.emf.cdo.internal.protocol.CDOIDImpl; import org.eclipse.emf.cdo.protocol.CDOID; +import org.eclipse.emf.internal.cdo.CDOAdapterImpl; +import org.eclipse.emf.internal.cdo.CDOViewImpl; +import org.eclipse.emf.internal.cdo.InternalCDOObject; + import org.eclipse.emf.common.notify.Adapter; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.util.EList; @@ -23,9 +27,6 @@ import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.InternalEObject; import org.eclipse.emf.ecore.resource.Resource; import org.eclipse.emf.ecore.resource.ResourceSet; -import org.eclipse.emf.internal.cdo.CDOAdapterImpl; -import org.eclipse.emf.internal.cdo.CDOViewImpl; -import org.eclipse.emf.internal.cdo.InternalCDOObject; import java.io.IOException; import java.io.InputStream; @@ -190,4 +191,4 @@ final class ProxyResolverResource implements Resource { throw new UnsupportedOperationException(); } -}
\ No newline at end of file +} 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 2978d9f79a..df14a5ede6 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 @@ -10,9 +10,10 @@ **************************************************************************/ package org.eclipse.emf.internal.cdo.util; +import org.eclipse.emf.internal.cdo.CDOViewImpl; + import org.eclipse.emf.common.util.URI; import org.eclipse.emf.ecore.resource.Resource; -import org.eclipse.emf.internal.cdo.CDOViewImpl; import java.util.Collection; import java.util.HashMap; @@ -125,4 +126,4 @@ public final class ProxyResolverURIResourceMap implements Map<URI, Resource> { return delegate.values(); } -}
\ No newline at end of file +} diff --git a/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/LoadAccountIndication.java b/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/LoadAccountIndication.java index c8d944743c..b67a390c69 100644 --- a/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/LoadAccountIndication.java +++ b/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/LoadAccountIndication.java @@ -11,8 +11,8 @@ package org.eclipse.net4j.buddies.internal.server.protocol; import org.eclipse.net4j.buddies.internal.protocol.ProtocolConstants; -import org.eclipse.net4j.buddies.protocol.ProtocolUtil; import org.eclipse.net4j.buddies.protocol.IAccount; +import org.eclipse.net4j.buddies.protocol.ProtocolUtil; import org.eclipse.net4j.buddies.server.IBuddyAdmin; import org.eclipse.net4j.signal.IndicationWithResponse; import org.eclipse.net4j.util.io.ExtendedDataInputStream; diff --git a/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/ServerBuddyStateIndication.java b/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/ServerBuddyStateIndication.java index 0301cd8152..a9b18c5d93 100644 --- a/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/ServerBuddyStateIndication.java +++ b/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/ServerBuddyStateIndication.java @@ -38,4 +38,4 @@ public class ServerBuddyStateIndication extends BuddyStateIndication } } } -}
\ No newline at end of file +} diff --git a/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/ServerCollaborationLeftIndication.java b/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/ServerCollaborationLeftIndication.java index 80668ca703..64183594e9 100644 --- a/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/ServerCollaborationLeftIndication.java +++ b/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/ServerCollaborationLeftIndication.java @@ -57,4 +57,4 @@ public class ServerCollaborationLeftIndication extends CollaborationLeftIndicati BuddyAdmin.INSTANCE.removeCollaboration(collaboration.getID()); } } -}
\ No newline at end of file +} diff --git a/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/ServerProtocolFactory.java b/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/ServerProtocolFactory.java index 60de189051..ca40390d1c 100644 --- a/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/ServerProtocolFactory.java +++ b/plugins/org.eclipse.net4j.buddies.server/src/org/eclipse/net4j/buddies/internal/server/protocol/ServerProtocolFactory.java @@ -34,4 +34,4 @@ public class ServerProtocolFactory extends org.eclipse.internal.net4j.ServerProt { return (ServerProtocol)container.getElement(PRODUCT_GROUP, TYPE, description); } -}
\ No newline at end of file +} diff --git a/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/SessionManager.java b/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/SessionManager.java index d5572e51ad..8c51268873 100644 --- a/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/SessionManager.java +++ b/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/SessionManager.java @@ -280,4 +280,4 @@ public class SessionManager extends Lifecycle implements ISessionManager, IListe getSource(), getOldState(), getNewState(), getSession()); } } -}
\ No newline at end of file +} diff --git a/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/actions/ConnectAction.java b/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/actions/ConnectAction.java index 1d2dd3abe8..cc34609dcc 100644 --- a/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/actions/ConnectAction.java +++ b/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/actions/ConnectAction.java @@ -28,4 +28,4 @@ public final class ConnectAction extends SafeAction { ISessionManager.INSTANCE.connect(); } -}
\ No newline at end of file +} diff --git a/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/actions/DisconnectAction.java b/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/actions/DisconnectAction.java index f7cec1c5d2..359e7f6379 100644 --- a/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/actions/DisconnectAction.java +++ b/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/actions/DisconnectAction.java @@ -28,4 +28,4 @@ public final class DisconnectAction extends SafeAction { ISessionManager.INSTANCE.disconnect(); } -}
\ No newline at end of file +} diff --git a/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/actions/FlashAction.java b/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/actions/FlashAction.java index 00399a52cf..3b35d0a632 100644 --- a/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/actions/FlashAction.java +++ b/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/actions/FlashAction.java @@ -28,4 +28,4 @@ public final class FlashAction extends SafeAction { ISessionManager.INSTANCE.flashMe(); } -}
\ No newline at end of file +} diff --git a/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/actions/ReconnectAction.java b/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/actions/ReconnectAction.java index 46d63be655..7b5bb62280 100644 --- a/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/actions/ReconnectAction.java +++ b/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/actions/ReconnectAction.java @@ -29,4 +29,4 @@ public final class ReconnectAction extends SafeAction ISessionManager.INSTANCE.disconnect(); ISessionManager.INSTANCE.connect(); } -}
\ No newline at end of file +} diff --git a/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/actions/StateAction.java b/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/actions/StateAction.java index 65ec114f59..8e38d9d105 100644 --- a/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/actions/StateAction.java +++ b/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/actions/StateAction.java @@ -185,4 +185,4 @@ public class StateAction extends SafeAction super("Do Not Disturb", State.DO_NOT_DISTURB, SharedIcons.OBJ_BUDDY_DO_NOT_DISTURB); } } -}
\ No newline at end of file +} diff --git a/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/preferences/BuddiesPreferencePage.java b/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/preferences/BuddiesPreferencePage.java index edec4d07d7..76f9650b96 100644 --- a/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/preferences/BuddiesPreferencePage.java +++ b/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/preferences/BuddiesPreferencePage.java @@ -83,4 +83,4 @@ public class BuddiesPreferencePage extends OMPreferencePage OM.PREF_AUTO_CONNECT.setValue(autoConnect.getSelection()); return super.performOk(); } -}
\ No newline at end of file +} diff --git a/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/views/BuddiesDragListener.java b/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/views/BuddiesDragListener.java index 09d5bb24c9..0057bbdc27 100644 --- a/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/views/BuddiesDragListener.java +++ b/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/views/BuddiesDragListener.java @@ -61,4 +61,4 @@ public class BuddiesDragListener extends DNDDragListener<IBuddy[]> { viewer.addDragSupport(DND.DROP_MOVE, TRANSFERS, new BuddiesDragListener(viewer)); } -}
\ No newline at end of file +} diff --git a/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/views/BuddiesDropAdapter.java b/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/views/BuddiesDropAdapter.java index 7a4d2a50bf..bd17f171b6 100644 --- a/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/views/BuddiesDropAdapter.java +++ b/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/views/BuddiesDropAdapter.java @@ -50,4 +50,4 @@ public class BuddiesDropAdapter extends DNDDropAdapter<IBuddy[]> { viewer.addDropSupport(DND.DROP_MOVE, TRANSFERS, new BuddiesDropAdapter(viewer)); } -}
\ No newline at end of file +} diff --git a/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/views/BuddiesView.java b/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/views/BuddiesView.java index 9fb42c73bb..37616666ca 100644 --- a/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/views/BuddiesView.java +++ b/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/views/BuddiesView.java @@ -60,4 +60,4 @@ public class BuddiesView extends SessionManagerView } } } -}
\ No newline at end of file +} diff --git a/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/views/CollaborationsView.java b/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/views/CollaborationsView.java index f0dac5ec82..6960b1291c 100644 --- a/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/views/CollaborationsView.java +++ b/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/views/CollaborationsView.java @@ -216,4 +216,4 @@ public class CollaborationsView extends SessionManagerView collaboration.installFacility(type); } } -}
\ No newline at end of file +} diff --git a/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/views/SessionManagerView.java b/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/views/SessionManagerView.java index c6ff6f1f97..9c7a1762b0 100644 --- a/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/views/SessionManagerView.java +++ b/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/views/SessionManagerView.java @@ -150,4 +150,4 @@ public abstract class SessionManagerView extends ContainerView implements IListe dropDownAction.updateState(); // control.setEnabled(session != null); } -}
\ No newline at end of file +} diff --git a/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/ClientBuddyStateIndication.java b/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/ClientBuddyStateIndication.java index 48dfbad03a..7e2d5b0910 100644 --- a/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/ClientBuddyStateIndication.java +++ b/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/ClientBuddyStateIndication.java @@ -34,4 +34,4 @@ public class ClientBuddyStateIndication extends BuddyStateIndication buddy.setState(state); } } -}
\ No newline at end of file +} diff --git a/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/ClientProtocolFactory.java b/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/ClientProtocolFactory.java index 17a1467991..385753caa3 100644 --- a/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/ClientProtocolFactory.java +++ b/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/ClientProtocolFactory.java @@ -11,7 +11,6 @@ package org.eclipse.net4j.internal.buddies.protocol; import org.eclipse.net4j.buddies.internal.protocol.ProtocolConstants; - import org.eclipse.net4j.util.container.IManagedContainer; /** @@ -35,4 +34,4 @@ public final class ClientProtocolFactory extends org.eclipse.internal.net4j.Clie { return (ClientProtocol)container.getElement(PRODUCT_GROUP, TYPE, description); } -}
\ No newline at end of file +} diff --git a/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/LoadAccountRequest.java b/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/LoadAccountRequest.java index bece952546..fc9e835715 100644 --- a/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/LoadAccountRequest.java +++ b/plugins/org.eclipse.net4j.buddies/src/org/eclipse/net4j/internal/buddies/protocol/LoadAccountRequest.java @@ -12,8 +12,8 @@ package org.eclipse.net4j.internal.buddies.protocol; import org.eclipse.net4j.IChannel; import org.eclipse.net4j.buddies.internal.protocol.ProtocolConstants; -import org.eclipse.net4j.buddies.protocol.ProtocolUtil; import org.eclipse.net4j.buddies.protocol.IAccount; +import org.eclipse.net4j.buddies.protocol.ProtocolUtil; import org.eclipse.net4j.signal.RequestWithConfirmation; import org.eclipse.net4j.util.io.ExtendedDataInputStream; import org.eclipse.net4j.util.io.ExtendedDataOutputStream; diff --git a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/db/DBType.java b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/db/DBType.java index c4798daa05..686db7f100 100644 --- a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/db/DBType.java +++ b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/db/DBType.java @@ -129,4 +129,4 @@ public enum DBType } } } -}
\ No newline at end of file +} diff --git a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/DBAdapterDescriptor.java b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/DBAdapterDescriptor.java index 6e7e370d55..ab75e8fb7f 100644 --- a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/DBAdapterDescriptor.java +++ b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/DBAdapterDescriptor.java @@ -30,4 +30,4 @@ public abstract class DBAdapterDescriptor } public abstract IDBAdapter createDBAdapter(); -}
\ No newline at end of file +} diff --git a/plugins/org.eclipse.net4j.debug/src/org/eclipse/net4j/internal/debug/views/RemoteTraceView.java b/plugins/org.eclipse.net4j.debug/src/org/eclipse/net4j/internal/debug/views/RemoteTraceView.java index c250e922a4..58b32fc03d 100644 --- a/plugins/org.eclipse.net4j.debug/src/org/eclipse/net4j/internal/debug/views/RemoteTraceView.java +++ b/plugins/org.eclipse.net4j.debug/src/org/eclipse/net4j/internal/debug/views/RemoteTraceView.java @@ -459,4 +459,4 @@ public class RemoteTraceView extends ViewPart // shell.setBounds(shellBounds); // } // } -}
\ No newline at end of file +} 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 7e041bf045..6251ff4e8d 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 @@ -36,4 +36,4 @@ public final class JMSAdminProtocolFactory extends ClientProtocolFactory { return (JMSAdminProtocol)container.getElement(PRODUCT_GROUP, TYPE, description); } -}
\ No newline at end of file +} diff --git a/plugins/org.eclipse.net4j.jms.server.jdbc/src/org/eclipse/net4j/jms/server/internal/jdbc/JDBCTransaction.java b/plugins/org.eclipse.net4j.jms.server.jdbc/src/org/eclipse/net4j/jms/server/internal/jdbc/JDBCTransaction.java index c9263d3476..46188d61cf 100644 --- a/plugins/org.eclipse.net4j.jms.server.jdbc/src/org/eclipse/net4j/jms/server/internal/jdbc/JDBCTransaction.java +++ b/plugins/org.eclipse.net4j.jms.server.jdbc/src/org/eclipse/net4j/jms/server/internal/jdbc/JDBCTransaction.java @@ -99,4 +99,4 @@ public class JDBCTransaction extends AbstractTransaction protected void doMessageAcknowledged(MessageImpl message, long consumerID) { } -}
\ No newline at end of file +} 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 3abf5fdb34..bde2566af7 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 @@ -36,4 +36,4 @@ public final class JMSServerProtocolFactory extends ServerProtocolFactory { return (JMSServerProtocol)container.getElement(PRODUCT_GROUP, TYPE, description); } -}
\ No newline at end of file +} 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 517d971468..0eb7d985a9 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 @@ -36,4 +36,4 @@ public final class JMSAdminServerProtocolFactory extends ServerProtocolFactory { return (JMSAdminServerProtocol)container.getElement(PRODUCT_GROUP, TYPE, description); } -}
\ No newline at end of file +} diff --git a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/store/AbstractTransaction.java b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/store/AbstractTransaction.java index 4c486f702c..6deb70ed1c 100644 --- a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/store/AbstractTransaction.java +++ b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/store/AbstractTransaction.java @@ -223,4 +223,4 @@ public abstract class AbstractTransaction implements IStoreTransaction protected abstract void doMessageSent(MessageImpl message, long consumerID); protected abstract void doMessageAcknowledged(MessageImpl message, long consumerID); -}
\ No newline at end of file +} diff --git a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/store/NOOPTransaction.java b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/store/NOOPTransaction.java index fa923454d5..58f93624d4 100644 --- a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/store/NOOPTransaction.java +++ b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/store/NOOPTransaction.java @@ -82,4 +82,4 @@ public class NOOPTransaction extends AbstractTransaction protected void doMessageAcknowledged(MessageImpl message, long consumerID) { } -}
\ No newline at end of file +} 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 8084c80e5f..3c7adb2efa 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 @@ -36,4 +36,4 @@ public final class JMSClientProtocolFactory extends ClientProtocolFactory { return (JMSClientProtocol)container.getElement(PRODUCT_GROUP, TYPE, description); } -}
\ No newline at end of file +} 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 daaf6c37ca..c10c0b3bc9 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 @@ -31,8 +31,8 @@ import java.nio.ByteBuffer; */ public final class ControlChannel extends Channel { - public static final long REGISTRATION_TIMEOUT = OM.PROTOCOL_REGISTRATION_TIMEOUT; - + public static final long REGISTRATION_TIMEOUT = OM.PROTOCOL_REGISTRATION_TIMEOUT; + public static final short CONTROL_CHANNEL_INDEX = -1; public static final byte OPCODE_NEGOTIATION = 1; diff --git a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPAcceptor.java b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPAcceptor.java index 18077b45be..6df68ab1c5 100644 --- a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPAcceptor.java +++ b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPAcceptor.java @@ -175,8 +175,8 @@ public class TCPAcceptor extends Acceptor implements ITCPAcceptor, ITCPSelectorL TRACER.trace("Accepted socketChannel " + socketChannel); //$NON-NLS-1$ } -// socketChannel.socket().setReuseAddress(true); -// socketChannel.socket().setKeepAlive(true); + // socketChannel.socket().setReuseAddress(true); + // socketChannel.socket().setKeepAlive(true); socketChannel.configureBlocking(false); TCPServerConnector connector = new TCPServerConnector(this); diff --git a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPClientConnector.java b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPClientConnector.java index fdc697db85..9728dc5d79 100644 --- a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPClientConnector.java +++ b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/internal/tcp/TCPClientConnector.java @@ -30,8 +30,8 @@ public class TCPClientConnector extends TCPConnector try { SocketChannel socketChannel = SocketChannel.open(); -// socketChannel.socket().setReuseAddress(true); -// socketChannel.socket().setKeepAlive(true); + // socketChannel.socket().setReuseAddress(true); + // socketChannel.socket().setKeepAlive(true); socketChannel.configureBlocking(false); setSocketChannel(socketChannel); } diff --git a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/tcp/ITCPSelectorListener.java b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/tcp/ITCPSelectorListener.java index e2b467918a..26c2d1c414 100644 --- a/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/tcp/ITCPSelectorListener.java +++ b/plugins/org.eclipse.net4j.tcp/src/org/eclipse/net4j/tcp/ITCPSelectorListener.java @@ -40,4 +40,4 @@ public interface ITCPSelectorListener public void handleWrite(ITCPSelector selector, SocketChannel socketChannel); } -}
\ No newline at end of file +} diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/ClientTestProtocolFactory.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/ClientTestProtocolFactory.java index d424cae44c..1815b46d3f 100644 --- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/ClientTestProtocolFactory.java +++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/ClientTestProtocolFactory.java @@ -30,4 +30,4 @@ public class ClientTestProtocolFactory extends ClientProtocolFactory { return new TestProtocol(null); } -}
\ No newline at end of file +} 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 610566cce6..fe2129dee2 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 @@ -35,4 +35,4 @@ public class ServerTestProtocolFactory extends ServerProtocolFactory { return new TestProtocol(counter); } -}
\ No newline at end of file +} 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 c4ff4348fb..5465822c7c 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 @@ -41,4 +41,4 @@ public final class TestProtocol extends Protocol ((CountDownLatch)getInfraStructure()).countDown(); } } -}
\ No newline at end of file +} diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/TestSignalProtocol.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/TestSignalProtocol.java index 2c8f15e4d5..36ad8da0a8 100644 --- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/TestSignalProtocol.java +++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/signal/TestSignalProtocol.java @@ -23,7 +23,7 @@ public class TestSignalProtocol extends SignalProtocol public static final short SIGNAL1 = 1; public static final short SIGNAL2 = 2; - + public static final short SIGNAL3 = 3; public TestSignalProtocol() 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 028e524ba0..b35126c268 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 @@ -30,4 +30,4 @@ public class TestSignalServerProtocolFactory extends ServerProtocolFactory { return new TestSignalProtocol(); } -}
\ No newline at end of file +} diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/AbstractOMTest.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/AbstractOMTest.java index 6da89a2177..266fdd5f2e 100644 --- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/AbstractOMTest.java +++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/AbstractOMTest.java @@ -118,4 +118,4 @@ public abstract class AbstractOMTest extends TestCase { ConcurrencyUtil.sleep(millis); } -}
\ No newline at end of file +} 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 0d09030bf1..05b41c241f 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 @@ -77,4 +77,4 @@ public class AcceptorsView extends ContainerView manager.add(addAcceptorAction2037); super.fillLocalToolBar(manager); } -}
\ No newline at end of file +} 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 0826ccc0da..e5612565db 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 @@ -41,4 +41,4 @@ public class ConnectorsView extends ContainerView } }); } -}
\ No newline at end of file +} diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/internal/ui/actions/IntrospectAction.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/internal/ui/actions/IntrospectAction.java index 80c4665f46..12e70b9f7f 100644 --- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/internal/ui/actions/IntrospectAction.java +++ b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/internal/ui/actions/IntrospectAction.java @@ -32,4 +32,4 @@ public class IntrospectAction extends SafeAction Net4jIntrospectorView introspector = Net4jIntrospectorView.getInstance(true); introspector.setObject(object); } -}
\ No newline at end of file +} 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 24c639f0cf..82b4f3ce91 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 @@ -33,4 +33,4 @@ public class Net4jContainerView extends ContainerView { return IPluginContainer.INSTANCE; } -}
\ No newline at end of file +} diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/internal/ui/views/Net4jIntrospectorView.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/internal/ui/views/Net4jIntrospectorView.java index d09db0dedc..216b150857 100644 --- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/internal/ui/views/Net4jIntrospectorView.java +++ b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/internal/ui/views/Net4jIntrospectorView.java @@ -636,4 +636,4 @@ public class Net4jIntrospectorView extends ViewPart implements ISelectionListene class NameSorter extends ViewerSorter { } -}
\ No newline at end of file +} diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/UIActivator.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/UIActivator.java index 4c69c94bd3..3a1e76da0f 100644 --- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/UIActivator.java +++ b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/UIActivator.java @@ -48,4 +48,4 @@ public class UIActivator extends AbstractUIPlugin super.stop(context); OSGiActivator.stopBundle(context, (OSGiBundle)getOMBundle()); } -}
\ No newline at end of file +} diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/actions/LongRunningAction.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/actions/LongRunningAction.java index 283d7413e5..d213e310d1 100644 --- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/actions/LongRunningAction.java +++ b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/actions/LongRunningAction.java @@ -10,12 +10,13 @@ **************************************************************************/ package org.eclipse.net4j.util.ui.actions; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.OperationCanceledException; -import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.net4j.util.internal.ui.bundle.OM; import org.eclipse.net4j.util.om.monitor.MonitorUtil; import org.eclipse.net4j.util.om.monitor.MonitoredJob; + +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.OperationCanceledException; +import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.swt.widgets.Shell; import org.eclipse.ui.IWorkbenchPage; import org.eclipse.ui.IWorkbenchWindow; diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/actions/LongRunningActionDelegate.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/actions/LongRunningActionDelegate.java index 06f4954092..c90808d42b 100644 --- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/actions/LongRunningActionDelegate.java +++ b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/actions/LongRunningActionDelegate.java @@ -89,4 +89,4 @@ public abstract class LongRunningActionDelegate extends SafeActionDelegate } } -}
\ No newline at end of file +} diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/actions/SafeAction.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/actions/SafeAction.java index 4fce5ee8e2..63f4f1b653 100644 --- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/actions/SafeAction.java +++ b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/actions/SafeAction.java @@ -69,4 +69,4 @@ public abstract class SafeAction extends Action } protected abstract void safeRun() throws Exception; -}
\ No newline at end of file +} diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/actions/SafeActionDelegate.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/actions/SafeActionDelegate.java index 424a1d2fa2..4b807d7e0d 100644 --- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/actions/SafeActionDelegate.java +++ b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/actions/SafeActionDelegate.java @@ -67,4 +67,4 @@ public abstract class SafeActionDelegate implements IActionDelegate { return action == null ? "Error" : action.getText(); } -}
\ No newline at end of file +} diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/actions/SashLayoutAction.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/actions/SashLayoutAction.java index 6372a1f3fd..8c7dc09409 100644 --- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/actions/SashLayoutAction.java +++ b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/actions/SashLayoutAction.java @@ -103,4 +103,4 @@ public abstract class SashLayoutAction extends SafeAction return horizontalAction; } } -}
\ No newline at end of file +} diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/dnd/DNDDragListener.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/dnd/DNDDragListener.java index 6cd623d6bd..76e32d17c1 100644 --- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/dnd/DNDDragListener.java +++ b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/dnd/DNDDragListener.java @@ -59,4 +59,4 @@ public abstract class DNDDragListener<TYPE> extends DragSourceAdapter } protected abstract TYPE getObject(IStructuredSelection selection); -}
\ No newline at end of file +} diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/dnd/DNDDropAdapter.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/dnd/DNDDropAdapter.java index fa0eb89fcb..54586b1151 100644 --- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/dnd/DNDDropAdapter.java +++ b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/dnd/DNDDropAdapter.java @@ -88,4 +88,4 @@ public abstract class DNDDropAdapter<TYPE> extends ViewerDropAdapter protected abstract boolean performDrop(TYPE data, Object target); protected abstract boolean validateTarget(Object target, int operation); -}
\ No newline at end of file +} diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/dnd/DNDTransfer.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/dnd/DNDTransfer.java index 2245abe13c..38b79352c5 100644 --- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/dnd/DNDTransfer.java +++ b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/dnd/DNDTransfer.java @@ -93,4 +93,4 @@ public abstract class DNDTransfer<TYPE> extends ByteArrayTransfer protected abstract void writeObject(ExtendedDataOutputStream out, TYPE object) throws IOException; protected abstract TYPE readObject(ExtendedDataInputStream in) throws IOException; -}
\ No newline at end of file +} diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/prefs/OMPreferencePage.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/prefs/OMPreferencePage.java index 5b25775201..6f1bb97ebf 100644 --- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/prefs/OMPreferencePage.java +++ b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/prefs/OMPreferencePage.java @@ -162,4 +162,4 @@ public abstract class OMPreferencePage extends PreferencePage implements IWorkbe } protected abstract Control createUI(Composite parent); -}
\ No newline at end of file +} diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/proposals/RegExMessages.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/proposals/RegExMessages.java index f9714ed1a1..fdc5b8995e 100644 --- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/proposals/RegExMessages.java +++ b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/proposals/RegExMessages.java @@ -24,308 +24,312 @@ import org.eclipse.osgi.util.NLS; * * @since 3.1 */ -final class RegExMessages extends NLS { +final class RegExMessages extends NLS +{ - private static final String BUNDLE_NAME = RegExMessages.class.getName(); + private static final String BUNDLE_NAME = RegExMessages.class.getName(); - private RegExMessages() { - // Do not instantiate - } + private RegExMessages() + { + // Do not instantiate + } - static { - reloadMessages(); - } + static + { + reloadMessages(); + } - static void reloadMessages() { - NLS.initializeMessages(BUNDLE_NAME, RegExMessages.class); - } + static void reloadMessages() + { + NLS.initializeMessages(BUNDLE_NAME, RegExMessages.class); + } - // characters - public static String displayString_bs_bs; + // characters + public static String displayString_bs_bs; - public static String additionalInfo_bs_bs; + public static String additionalInfo_bs_bs; - public static String displayString_bs_0; + public static String displayString_bs_0; - public static String additionalInfo_bs_0; + public static String additionalInfo_bs_0; - public static String displayString_bs_x; + public static String displayString_bs_x; - public static String additionalInfo_bs_x; + public static String additionalInfo_bs_x; - public static String displayString_bs_u; + public static String displayString_bs_u; - public static String additionalInfo_bs_u; + public static String additionalInfo_bs_u; - public static String displayString_bs_t; + public static String displayString_bs_t; - public static String additionalInfo_bs_t; + public static String additionalInfo_bs_t; - public static String displayString_bs_n; + public static String displayString_bs_n; - public static String additionalInfo_bs_n; + public static String additionalInfo_bs_n; - public static String displayString_bs_r; + public static String displayString_bs_r; - public static String additionalInfo_bs_r; + public static String additionalInfo_bs_r; - public static String displayString_bs_f; + public static String displayString_bs_f; - public static String additionalInfo_bs_f; + public static String additionalInfo_bs_f; - public static String displayString_bs_a; + public static String displayString_bs_a; - public static String additionalInfo_bs_a; + public static String additionalInfo_bs_a; - public static String displayString_bs_e; + public static String displayString_bs_e; - public static String additionalInfo_bs_e; + public static String additionalInfo_bs_e; - public static String displayString_bs_c; + public static String displayString_bs_c; - public static String additionalInfo_bs_c; + public static String additionalInfo_bs_c; - // character classes - public static String displayString_dot; + // character classes + public static String displayString_dot; - public static String additionalInfo_dot; + public static String additionalInfo_dot; - public static String displayString_bs_d; + public static String displayString_bs_d; - public static String additionalInfo_bs_d; + public static String additionalInfo_bs_d; - public static String displayString_bs_D; + public static String displayString_bs_D; - public static String additionalInfo_bs_D; + public static String additionalInfo_bs_D; - public static String displayString_bs_s; + public static String displayString_bs_s; - public static String additionalInfo_bs_s; + public static String additionalInfo_bs_s; - public static String displayString_bs_S; + public static String displayString_bs_S; - public static String additionalInfo_bs_S; + public static String additionalInfo_bs_S; - public static String displayString_bs_w; + public static String displayString_bs_w; - public static String additionalInfo_bs_w; + public static String additionalInfo_bs_w; - public static String displayString_bs_W; + public static String displayString_bs_W; - public static String additionalInfo_bs_W; + public static String additionalInfo_bs_W; - // boundary matchers - public static String displayString_start; + // boundary matchers + public static String displayString_start; - public static String additionalInfo_start; + public static String additionalInfo_start; - public static String displayString_end; + public static String displayString_end; - public static String additionalInfo_end; + public static String additionalInfo_end; - public static String displayString_bs_b; + public static String displayString_bs_b; - public static String additionalInfo_bs_b; + public static String additionalInfo_bs_b; - public static String displayString_bs_B; + public static String displayString_bs_B; - public static String additionalInfo_bs_B; + public static String additionalInfo_bs_B; - public static String displayString_bs_A; + public static String displayString_bs_A; - public static String additionalInfo_bs_A; + public static String additionalInfo_bs_A; - public static String displayString_bs_G; + public static String displayString_bs_G; - public static String additionalInfo_bs_G; + public static String additionalInfo_bs_G; - public static String displayString_bs_Z; + public static String displayString_bs_Z; - public static String additionalInfo_bs_Z; + public static String additionalInfo_bs_Z; - public static String displayString_bs_z; + public static String displayString_bs_z; - public static String additionalInfo_bs_z; + public static String additionalInfo_bs_z; - // greedy quantifiers - public static String displayString_quest; + // greedy quantifiers + public static String displayString_quest; - public static String additionalInfo_quest; + public static String additionalInfo_quest; - public static String displayString_star; + public static String displayString_star; - public static String additionalInfo_star; + public static String additionalInfo_star; - public static String displayString_plus; + public static String displayString_plus; - public static String additionalInfo_plus; + public static String additionalInfo_plus; - public static String displayString_exact; + public static String displayString_exact; - public static String additionalInfo_exact; + public static String additionalInfo_exact; - public static String displayString_least; + public static String displayString_least; - public static String additionalInfo_least; + public static String additionalInfo_least; - public static String displayString_count; + public static String displayString_count; - public static String additionalInfo_count; + public static String additionalInfo_count; - // lazy quantifiers - public static String displayString_questLazy; + // lazy quantifiers + public static String displayString_questLazy; - public static String additionalInfo_questLazy; + public static String additionalInfo_questLazy; - public static String displayString_starLazy; + public static String displayString_starLazy; - public static String additionalInfo_starLazy; + public static String additionalInfo_starLazy; - public static String displayString_plusLazy; + public static String displayString_plusLazy; - public static String additionalInfo_plusLazy; + public static String additionalInfo_plusLazy; - public static String displayString_exactLazy; + public static String displayString_exactLazy; - public static String additionalInfo_exactLazy; + public static String additionalInfo_exactLazy; - public static String displayString_leastLazy; + public static String displayString_leastLazy; - public static String additionalInfo_leastLazy; + public static String additionalInfo_leastLazy; - public static String displayString_countLazy; + public static String displayString_countLazy; - public static String additionalInfo_countLazy; + public static String additionalInfo_countLazy; - // possessive quantifiers - public static String displayString_questPoss; + // possessive quantifiers + public static String displayString_questPoss; - public static String additionalInfo_questPoss; + public static String additionalInfo_questPoss; - public static String displayString_starPoss; + public static String displayString_starPoss; - public static String additionalInfo_starPoss; + public static String additionalInfo_starPoss; - public static String displayString_plusPoss; + public static String displayString_plusPoss; - public static String additionalInfo_plusPoss; + public static String additionalInfo_plusPoss; - public static String displayString_exactPoss; + public static String displayString_exactPoss; - public static String additionalInfo_exactPoss; + public static String additionalInfo_exactPoss; - public static String displayString_leastPoss; + public static String displayString_leastPoss; - public static String additionalInfo_leastPoss; + public static String additionalInfo_leastPoss; - public static String displayString_countPoss; + public static String displayString_countPoss; - public static String additionalInfo_countPoss; + public static String additionalInfo_countPoss; - // alternative - public static String displayString_alt; + // alternative + public static String displayString_alt; - public static String additionalInfo_alt; + public static String additionalInfo_alt; - // capturing groups - public static String displayString_group; + // capturing groups + public static String displayString_group; - public static String additionalInfo_group; + public static String additionalInfo_group; - public static String displayString_bs_i; + public static String displayString_bs_i; - public static String additionalInfo_bs_i; + public static String additionalInfo_bs_i; - // quoting - public static String displayString_bs; + // quoting + public static String displayString_bs; - public static String additionalInfo_bs; + public static String additionalInfo_bs; - public static String displayString_bs_Q; + public static String displayString_bs_Q; - public static String additionalInfo_bs_Q; + public static String additionalInfo_bs_Q; - public static String displayString_bs_E; + public static String displayString_bs_E; - public static String additionalInfo_bs_E; + public static String additionalInfo_bs_E; - // character sets - public static String displayString_set; + // character sets + public static String displayString_set; - public static String additionalInfo_set; + public static String additionalInfo_set; - public static String displayString_setExcl; + public static String displayString_setExcl; - public static String additionalInfo_setExcl; + public static String additionalInfo_setExcl; - public static String displayString_setRange; + public static String displayString_setRange; - public static String additionalInfo_setRange; + public static String additionalInfo_setRange; - public static String displayString_setInter; + public static String displayString_setInter; - public static String additionalInfo_setInter; + public static String additionalInfo_setInter; - public static String displayString_posix; + public static String displayString_posix; - public static String additionalInfo_posix; + public static String additionalInfo_posix; - public static String displayString_posixNot; + public static String displayString_posixNot; - public static String additionalInfo_posixNot; + public static String additionalInfo_posixNot; - public static String displayString_flag; + public static String displayString_flag; - public static String additionalInfo_flag; + public static String additionalInfo_flag; - public static String displayString_flagExpr; + public static String displayString_flagExpr; - public static String additionalInfo_flagExpr; + public static String additionalInfo_flagExpr; - // non-capturing group - public static String displayString_nonCap; + // non-capturing group + public static String displayString_nonCap; - public static String additionalInfo_nonCap; + public static String additionalInfo_nonCap; - public static String displayString_atomicCap; + public static String displayString_atomicCap; - public static String additionalInfo_atomicCap; + public static String additionalInfo_atomicCap; - // look-ahead - public static String displayString_posLookahead; + // look-ahead + public static String displayString_posLookahead; - public static String additionalInfo_posLookahead; + public static String additionalInfo_posLookahead; - public static String displayString_negLookahead; + public static String displayString_negLookahead; - public static String additionalInfo_negLookahead; + public static String additionalInfo_negLookahead; - public static String displayString_posLookbehind; + public static String displayString_posLookbehind; - public static String additionalInfo_posLookbehind; + public static String additionalInfo_posLookbehind; - public static String displayString_negLookbehind; + public static String displayString_negLookbehind; - public static String additionalInfo_negLookbehind; + public static String additionalInfo_negLookbehind; - // replace - public static String displayString_dollar; + // replace + public static String displayString_dollar; - public static String additionalInfo_dollar; + public static String additionalInfo_dollar; - public static String additionalInfo_replace_bs; + public static String additionalInfo_replace_bs; - public static String displayString_replace_bs; + public static String displayString_replace_bs; - public static String displayString_tab; + public static String displayString_tab; - public static String additionalInfo_tab; + public static String additionalInfo_tab; - public static String displayString_nl; + public static String displayString_nl; - public static String additionalInfo_nl; + public static String additionalInfo_nl; - public static String displayString_cr; + public static String displayString_cr; - public static String additionalInfo_cr; + public static String additionalInfo_cr; } diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/views/ContainerNameSorter.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/views/ContainerNameSorter.java index 5401970721..cc21f234c3 100644 --- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/views/ContainerNameSorter.java +++ b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/views/ContainerNameSorter.java @@ -14,4 +14,4 @@ import org.eclipse.jface.viewers.ViewerSorter; public class ContainerNameSorter extends ViewerSorter { -}
\ No newline at end of file +} 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 9b741fcaa5..a9dc8c34e6 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 @@ -455,4 +455,4 @@ public abstract class ContainerView extends ViewPart implements ISetSelectionTar viewer.refresh(false); } } -}
\ No newline at end of file +} 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 d23b4700c0..5a844980d6 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 @@ -154,4 +154,4 @@ public abstract class ItemProvider<INPUT> extends StructuredContentProvider<INPU } } } -}
\ No newline at end of file +} diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/widgets/MonitorLogDialog.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/widgets/MonitorLogDialog.java index 1297afcd8b..2837e5bf11 100644 --- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/widgets/MonitorLogDialog.java +++ b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/widgets/MonitorLogDialog.java @@ -116,4 +116,4 @@ public class MonitorLogDialog extends LogDialog implements OMMonitorHandler setTextStyle(problemStyle); super.append(t); } -}
\ No newline at end of file +} diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/widgets/SashComposite.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/widgets/SashComposite.java index 6feec0874d..b60e63e6ea 100644 --- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/widgets/SashComposite.java +++ b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/widgets/SashComposite.java @@ -199,4 +199,4 @@ public abstract class SashComposite extends Composite } } } -}
\ No newline at end of file +} diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/widgets/TextAndDisable.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/widgets/TextAndDisable.java index 99b0b51ced..0d75ac8874 100644 --- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/widgets/TextAndDisable.java +++ b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/widgets/TextAndDisable.java @@ -122,4 +122,4 @@ public class TextAndDisable extends Composite implements SelectionListener, Modi { return new Button(this, SWT.CHECK); } -}
\ No newline at end of file +} 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 979b6334e2..ad37f33874 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 @@ -390,4 +390,4 @@ public abstract class AbstractBundle implements OMBundle } } } -}
\ No newline at end of file +} 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 1179415c42..172927f6f8 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 @@ -282,4 +282,4 @@ public abstract class AbstractPlatform implements OMPlatform return __TRACER__; } -}
\ No newline at end of file +} 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 403bb1a8af..f541ab5676 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 @@ -169,4 +169,4 @@ public final class HashBag<T> implements Set<T> return --value; } } -}
\ No newline at end of file +} diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/concurrent/OnePendingExecutor.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/concurrent/OnePendingExecutor.java index a79607e8f4..30be501195 100644 --- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/concurrent/OnePendingExecutor.java +++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/concurrent/OnePendingExecutor.java @@ -61,4 +61,4 @@ public class OnePendingExecutor implements Executor thread.start(); } } -}
\ No newline at end of file +} 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 e2e1280de1..cdf7235904 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 @@ -509,4 +509,4 @@ public final class RoundRobinList<E> extends LinkedList<E> lock.readLock().unlock(); } } -}
\ No newline at end of file +} diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/container/LifecycleEventConverter.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/container/LifecycleEventConverter.java index 3c17d68060..57baa4df27 100644 --- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/container/LifecycleEventConverter.java +++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/container/LifecycleEventConverter.java @@ -84,4 +84,4 @@ public class LifecycleEventConverter<E> implements IListener event.addDelta(new ContainerDelta<E>(element, kind)); return event; } -}
\ No newline at end of file +} 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 b04a3376a6..c0feb64f57 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 @@ -83,4 +83,4 @@ public final class FactoryKey implements IFactoryKey, Serializable, Comparable<F return result; } -}
\ No newline at end of file +} diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/monitor/Monitor.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/monitor/Monitor.java index 3a9b9de2a2..f83d3d0564 100644 --- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/monitor/Monitor.java +++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/monitor/Monitor.java @@ -288,4 +288,4 @@ public abstract class Monitor implements OMMonitor, OMSubMonitor } protected abstract Monitor subMonitor(int workFromParent); -}
\ No newline at end of file +} diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/pref/PreferencesChangeEvent.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/pref/PreferencesChangeEvent.java index e0bd4b9c23..d2ae7da465 100644 --- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/pref/PreferencesChangeEvent.java +++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/pref/PreferencesChangeEvent.java @@ -54,4 +54,4 @@ public final class PreferencesChangeEvent<T> extends Event implements OMPreferen { return newValue; } -}
\ No newline at end of file +} diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/security/PasswordCredentialsProvider.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/security/PasswordCredentialsProvider.java index 857b2f4b7a..53d392d369 100644 --- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/security/PasswordCredentialsProvider.java +++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/security/PasswordCredentialsProvider.java @@ -34,4 +34,4 @@ public final class PasswordCredentialsProvider implements IPasswordCredentialsPr { return credentials; } -}
\ No newline at end of file +} diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/StringUtil.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/StringUtil.java index 815651d3cd..1faa1c8eed 100644 --- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/StringUtil.java +++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/StringUtil.java @@ -16,6 +16,7 @@ package org.eclipse.net4j.util; public final class StringUtil { public static final String EMPTY = ""; + public static final String NL = System.getProperty("line.separator"); //$NON-NLS-1$ private StringUtil() @@ -34,12 +35,12 @@ public final class StringUtil { break; } - + end = start + find[i].length(); text = text.substring(0, start) + replace[i] + text.substring(end); } } - + return text; } diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/collection/MapEntry.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/collection/MapEntry.java index da100af3f9..cab706dedc 100644 --- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/collection/MapEntry.java +++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/collection/MapEntry.java @@ -81,4 +81,4 @@ public class MapEntry<K, V> implements Map.Entry<K, V> { return MessageFormat.format("{0}={1}", key, value); } -}
\ No newline at end of file +} 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 1c2540356a..fa543c02f0 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 @@ -312,4 +312,4 @@ public abstract class FiniteStateMachine<STATE extends Enum<?>, EVENT extends En return newState; } } -}
\ No newline at end of file +} diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/IORunnable.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/IORunnable.java index 568127eb88..21603c0e39 100644 --- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/IORunnable.java +++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/IORunnable.java @@ -19,4 +19,4 @@ import java.io.IOException; public interface IORunnable<IO extends Closeable> { public void run(IO io) throws IOException; -}
\ No newline at end of file +} diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/IORuntimeException.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/IORuntimeException.java index 829664f47d..f61011cbc2 100644 --- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/IORuntimeException.java +++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/IORuntimeException.java @@ -35,4 +35,4 @@ public class IORuntimeException extends RuntimeException { super(message, cause); } -}
\ No newline at end of file +} diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/lifecycle/ILifecycleEvent.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/lifecycle/ILifecycleEvent.java index a0992fa3ef..ab3694d2ef 100644 --- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/lifecycle/ILifecycleEvent.java +++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/lifecycle/ILifecycleEvent.java @@ -28,4 +28,4 @@ public interface ILifecycleEvent extends IEvent { ABOUT_TO_ACTIVATE, ACTIVATED, ABOUT_TO_DEACTIVATE, DEACTIVATED } -}
\ No newline at end of file +} diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/lifecycle/ILifecycleState.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/lifecycle/ILifecycleState.java index 0c1034f91e..a581c1907c 100644 --- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/lifecycle/ILifecycleState.java +++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/lifecycle/ILifecycleState.java @@ -16,4 +16,4 @@ package org.eclipse.net4j.util.lifecycle; public enum ILifecycleState { ACTIVATING, ACTIVE, DEACTIVATING, INACTIVE -}
\ No newline at end of file +} diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/OMBundle.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/OMBundle.java index 66eabd3c70..dd472d664f 100644 --- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/OMBundle.java +++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/OMBundle.java @@ -127,4 +127,4 @@ public interface OMBundle * @see java.text.MessageFormat#format(String, Object[]) */ String getString(String key, boolean translate, Object... args); -}
\ No newline at end of file +} 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 03cfbf032d..62fc0f0a90 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 @@ -46,4 +46,4 @@ public interface OMPlatform public File getConfigFile(String name); public Properties getConfigProperties(String name); -}
\ No newline at end of file +} diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/OSGiApplication.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/OSGiApplication.java index 3d38d1a477..08f9037d94 100644 --- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/OSGiApplication.java +++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/OSGiApplication.java @@ -138,4 +138,4 @@ public class OSGiApplication implements IApplication { } } -}
\ No newline at end of file +} diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/pref/OMPreferencesChangeEvent.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/pref/OMPreferencesChangeEvent.java index 55c0ccec66..3eafc6fad9 100644 --- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/pref/OMPreferencesChangeEvent.java +++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/pref/OMPreferencesChangeEvent.java @@ -22,4 +22,4 @@ public interface OMPreferencesChangeEvent<T> extends IEvent public T getOldValue(); public T getNewValue(); -}
\ No newline at end of file +} diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/trace/OMTraceHandlerEvent.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/trace/OMTraceHandlerEvent.java index f332532dc4..348afc6a9a 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 @@ -24,4 +24,4 @@ public interface OMTraceHandlerEvent public String getMessage(); public Throwable getThrowable(); -}
\ No newline at end of file +} diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/trace/OMTracer.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/trace/OMTracer.java index 32264e382e..ea78f467e2 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 @@ -42,4 +42,4 @@ public interface OMTracer 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/ref/KeyedPhantomReference.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/ref/KeyedPhantomReference.java index 26eb6e7db2..65c5acc0d8 100644 --- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/ref/KeyedPhantomReference.java +++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/ref/KeyedPhantomReference.java @@ -42,4 +42,4 @@ public class KeyedPhantomReference<K, T> extends PhantomReference<T> implements { return MessageFormat.format("KeyedPhantomReference[{0} -> {1}]", key, isEnqueued() ? "ENQUEUED" : get()); } -}
\ No newline at end of file +} diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/ref/KeyedReference.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/ref/KeyedReference.java index e56c946008..d91a63d65a 100644 --- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/ref/KeyedReference.java +++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/ref/KeyedReference.java @@ -41,4 +41,4 @@ public interface KeyedReference<K, T> * @see Reference#enqueue() */ public boolean enqueue(); -}
\ No newline at end of file +} diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/ref/KeyedSoftReference.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/ref/KeyedSoftReference.java index ad179c923b..721a83c9a8 100644 --- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/ref/KeyedSoftReference.java +++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/ref/KeyedSoftReference.java @@ -48,4 +48,4 @@ public class KeyedSoftReference<K, T> extends SoftReference<T> implements KeyedR { return MessageFormat.format("KeyedSoftReference[{0} -> {1}]", key, isEnqueued() ? "ENQUEUED" : get()); } -}
\ No newline at end of file +} diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/ref/KeyedStrongReference.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/ref/KeyedStrongReference.java index 1b8886200c..d8c5071e83 100644 --- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/ref/KeyedStrongReference.java +++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/ref/KeyedStrongReference.java @@ -62,4 +62,4 @@ public class KeyedStrongReference<K, T> implements KeyedReference<K, T> { return MessageFormat.format("KeyedStrongReference[{0} -> {1}]", key, ref); } -}
\ No newline at end of file +} diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/ref/KeyedWeakReference.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/ref/KeyedWeakReference.java index 1b2bb13ef3..b20029ded1 100644 --- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/ref/KeyedWeakReference.java +++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/ref/KeyedWeakReference.java @@ -48,4 +48,4 @@ public class KeyedWeakReference<K, T> extends WeakReference<T> implements KeyedR { return MessageFormat.format("KeyedWeakReference[{0} -> {1}]", key, isEnqueued() ? "ENQUEUED" : get()); } -}
\ No newline at end of file +} diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/SecurityUtil.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/SecurityUtil.java index c02aeaf5d1..ddb773711d 100644 --- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/SecurityUtil.java +++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/SecurityUtil.java @@ -24,7 +24,6 @@ import java.security.InvalidKeyException; import java.security.NoSuchAlgorithmException; import java.security.spec.InvalidKeySpecException; - /** * @author Eike Stepper */ @@ -43,22 +42,22 @@ public final class SecurityUtil // Salt final byte[] salt = { (byte)0xc7, (byte)0x73, (byte)0x21, (byte)0x8c, (byte)0x7e, (byte)0xc8, (byte)0xee, (byte)0x99 }; // TODO Make configurable - + // Iteration count final int count = 20; // TODO Make configurable - + // Create PBE parameter set PBEParameterSpec pbeParamSpec = new PBEParameterSpec(salt, count); PBEKeySpec pbeKeySpec = new PBEKeySpec(password); SecretKeyFactory keyFac = SecretKeyFactory.getInstance(algorithmName); SecretKey pbeKey = keyFac.generateSecret(pbeKeySpec); - + // Create PBE Cipher Cipher pbeCipher = Cipher.getInstance(algorithmName); - + // Initialize PBE Cipher with key and parameters pbeCipher.init(Cipher.ENCRYPT_MODE, pbeKey, pbeParamSpec); - + return pbeCipher.doFinal(data); } } 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 e824de467b..f176b60178 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 @@ -230,11 +230,11 @@ public class Channel extends Lifecycle implements IChannel, IBufferProvider // receiveSerializer = new SynchronousWorkSerializer(); receiveSerializer = new QueueWorkerWorkSerializer() { - @Override - protected String getThreadName() - { - return "ReceiveSerializer-"+connector.getLocation() + channelIndex; - } + @Override + protected String getThreadName() + { + return "ReceiveSerializer-" + connector.getLocation() + channelIndex; + } }; } } diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/Net4jConfigurator.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/Net4jConfigurator.java index 5c01b7498a..c6dd45f983 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/Net4jConfigurator.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/Net4jConfigurator.java @@ -16,9 +16,10 @@ import org.eclipse.net4j.internal.util.security.NegotiatorFactory; import org.eclipse.net4j.util.container.IManagedContainer; import org.eclipse.net4j.util.security.INegotiator; -import org.eclipse.core.runtime.CoreException; import org.eclipse.internal.net4j.bundle.OM; +import org.eclipse.core.runtime.CoreException; + import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.Node; @@ -158,4 +159,4 @@ public class Net4jConfigurator } } } -}
\ No newline at end of file +} diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/Net4jTransportInjector.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/Net4jTransportInjector.java index 2262c9492c..c1d87c04c8 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/Net4jTransportInjector.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/Net4jTransportInjector.java @@ -113,4 +113,4 @@ public class Net4jTransportInjector implements IElementProcessor return (ExecutorService)container.getElement(ExecutorServiceFactory.PRODUCT_GROUP, ExecutorServiceFactory.TYPE, null); } -}
\ No newline at end of file +} 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 fbc2072e23..b33d304a1e 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/Protocol.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/Protocol.java @@ -10,11 +10,11 @@ **************************************************************************/ package org.eclipse.internal.net4j; -import org.eclipse.net4j.Net4jUtil; import org.eclipse.net4j.IBuffer; import org.eclipse.net4j.IBufferProvider; import org.eclipse.net4j.IChannel; import org.eclipse.net4j.IProtocol; +import org.eclipse.net4j.Net4jUtil; import org.eclipse.net4j.internal.util.lifecycle.Lifecycle; /** diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/bundle/OM.java b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/bundle/OM.java index 8d8bc32a19..8715cf2bea 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/bundle/OM.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/internal/net4j/bundle/OM.java @@ -40,9 +40,9 @@ public abstract class OM public static final OMTracer DEBUG_CONNECTOR = DEBUG.tracer("connector"); //$NON-NLS-1$ public static final OMTracer DEBUG_SIGNAL = DEBUG.tracer("signal"); //$NON-NLS-1$ - + public static final boolean SET_SIGNAL_THREAD_NAME = BUNDLE.getDebugOption("set.signal.thread.name", false); //$NON-NLS-1$ - + public static final OMLogger LOG = BUNDLE.logger(); /** diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/BufferState.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/BufferState.java index 7294346b1b..120f9539da 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/BufferState.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/BufferState.java @@ -97,4 +97,4 @@ public enum BufferState * <p> */ GETTING -}
\ No newline at end of file +} diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/ConnectorLocation.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/ConnectorLocation.java index 6b51a11198..816d7b2aa3 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/ConnectorLocation.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/ConnectorLocation.java @@ -34,4 +34,4 @@ package org.eclipse.net4j; public enum ConnectorLocation { CLIENT, SERVER -}
\ No newline at end of file +} diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/ConnectorState.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/ConnectorState.java index 15a26e0219..88d34e0ab5 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/ConnectorState.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/ConnectorState.java @@ -87,4 +87,4 @@ public enum ConnectorState * @see ILifecycle.Introspection#isActive() */ CONNECTED -}
\ No newline at end of file +} diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/IBufferHandler.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/IBufferHandler.java index 864471a16a..8c5adbfca1 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/IBufferHandler.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/IBufferHandler.java @@ -26,4 +26,4 @@ public interface IBufferHandler * The buffer to be handled and otionally released. */ public void handleBuffer(IBuffer buffer); -}
\ No newline at end of file +} diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/IBufferPool.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/IBufferPool.java index f81ca88413..a4ef58f0ab 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/IBufferPool.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/IBufferPool.java @@ -44,4 +44,4 @@ public interface IBufferPool extends IBufferProvider */ public int getPooledBuffers(); } -}
\ No newline at end of file +} diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/IBufferProvider.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/IBufferProvider.java index f0d8b64ceb..589b2cddfe 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/IBufferProvider.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/IBufferProvider.java @@ -49,4 +49,4 @@ public interface IBufferProvider */ public long getRetainedBuffers(); } -}
\ No newline at end of file +} diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/Signal.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/Signal.java index 8f878c2618..9344efac52 100644 --- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/Signal.java +++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/signal/Signal.java @@ -112,15 +112,15 @@ public abstract class Signal implements Runnable public final void run() { - String threadName=null; + String threadName = null; try { - if (OM.SET_SIGNAL_THREAD_NAME) - { - threadName = getClass().getSimpleName(); - Thread.currentThread().setName(threadName); - } - + if (OM.SET_SIGNAL_THREAD_NAME) + { + threadName = getClass().getSimpleName(); + Thread.currentThread().setName(threadName); + } + runSync(); } catch (Exception ex) @@ -129,10 +129,10 @@ public abstract class Signal implements Runnable } finally { - if (threadName!=null) - { - Thread.currentThread().setName(threadName+"(FINISHED)"); - } + if (threadName != null) + { + Thread.currentThread().setName(threadName + "(FINISHED)"); + } } } 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 b1062a1f8b..57a4fe727f 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 @@ -150,41 +150,41 @@ public abstract class SignalProtocol extends Protocol Signal signal; synchronized (signals) { - if (correlationID > 0) - { - // Incoming indication - signal = signals.get(-correlationID); - if (signal == null) - { - short signalID = byteBuffer.getShort(); - if (TRACER.isEnabled()) - { - TRACER.trace("Got signal id " + signalID); //$NON-NLS-1$ - } - - signal = createSignalReactor(signalID); - signal.setProtocol(this); - signal.setCorrelationID(-correlationID); - signal.setBufferInputStream(new SignalInputStream(getInputStreamTimeout())); - signal.setBufferOutputStream(new SignalOutputStream(-correlationID, signalID, false)); - signals.put(-correlationID, signal); - getExecutorService().execute(signal); - } - } - else - { - // Incoming confirmation - signal = signals.get(-correlationID); - if (signal == null) - { - if (TRACER.isEnabled()) - { - TRACER.trace("Discarding buffer"); //$NON-NLS-1$ - } - - buffer.release(); - } - } + if (correlationID > 0) + { + // Incoming indication + signal = signals.get(-correlationID); + if (signal == null) + { + short signalID = byteBuffer.getShort(); + if (TRACER.isEnabled()) + { + TRACER.trace("Got signal id " + signalID); //$NON-NLS-1$ + } + + signal = createSignalReactor(signalID); + signal.setProtocol(this); + signal.setCorrelationID(-correlationID); + signal.setBufferInputStream(new SignalInputStream(getInputStreamTimeout())); + signal.setBufferOutputStream(new SignalOutputStream(-correlationID, signalID, false)); + signals.put(-correlationID, signal); + getExecutorService().execute(signal); + } + } + else + { + // Incoming confirmation + signal = signals.get(-correlationID); + if (signal == null) + { + if (TRACER.isEnabled()) + { + TRACER.trace("Discarding buffer"); //$NON-NLS-1$ + } + + buffer.release(); + } + } } if (signal != null) // Can be null after timeout @@ -232,9 +232,9 @@ public abstract class SignalProtocol extends Protocol signalActor.setBufferOutputStream(new SignalOutputStream(correlationID, signalID, true)); synchronized (signals) { - signals.put(correlationID, signalActor); + signals.put(correlationID, signalActor); } - + signalActor.runSync(); } @@ -243,7 +243,7 @@ public abstract class SignalProtocol extends Protocol int correlationID = signal.getCorrelationID(); synchronized (signals) { - signals.remove(correlationID); + signals.remove(correlationID); signals.notifyAll(); } } |