Skip to main content

This CGIT instance is deprecated, and repositories have been moved to Gitlab or Github. See the repository descriptions for specific locations.

aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2009-05-23 17:39:54 +0000
committerEike Stepper2009-05-23 17:39:54 +0000
commit00d16399ecc1c7568484f9b1a77dba22310d6797 (patch)
treeca0cdb2709da145aa8ba75ce281f00d6abc7e182
parent1724469f6fb2c4addf24adc004f9c19c52ba17dc (diff)
downloadcdo-00d16399ecc1c7568484f9b1a77dba22310d6797.tar.gz
cdo-00d16399ecc1c7568484f9b1a77dba22310d6797.tar.xz
cdo-00d16399ecc1c7568484f9b1a77dba22310d6797.zip
formatting
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/io/CDODataOutput.java3
-rw-r--r--plugins/org.eclipse.emf.cdo.migrator/src/org/eclipse/emf/cdo/internal/migrator/wizards/CDOImporterWizard.java11
-rw-r--r--plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/mapping/IListMapping.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DBStore.java7
-rw-r--r--plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDORevisionInstantiator.java3
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.defs/src/org/eclipse/emf/cdo/ui/defs/impl/CDOEditorDefImpl.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.ide/src/org/eclipse/emf/cdo/ui/internal/ide/actions/NewResourceNodeAction.java3
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.ide/src/org/eclipse/emf/cdo/ui/internal/ide/actions/RemoveResourceAction.java7
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.ide/src/org/eclipse/emf/cdo/ui/internal/ide/actions/TransactionalBackgroundAction.java3
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/AbstractLockObjectsAction.java5
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/CloseSessionAction.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/CloseViewAction.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/RegisterSinglePackageAction.java3
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOLegacyWrapper.java88
-rw-r--r--plugins/org.eclipse.net4j.debug/src/org/eclipse/net4j/internal/debug/views/RemoteTraceView.java3
-rw-r--r--plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/ChannelTest.java120
-rw-r--r--plugins/org.eclipse.net4j.ui.defs/src/org/eclipse/net4j/ui/defs/impl/Net4JUIDefsFactoryImpl.java14
-rw-r--r--plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/views/AcceptorsView.java6
-rw-r--r--plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/views/Net4jItemProvider.java3
-rw-r--r--plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/internal/ui/views/Net4jContainerItemProvider.java3
-rw-r--r--plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/internal/ui/views/Net4jIntrospectorView.java12
-rw-r--r--plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/views/MasterDetailsView.java3
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/net4j/buffer/IBuffer.java17
-rw-r--r--plugins/org.eclipse.net4j/src/org/eclipse/net4j/channel/IChannel.java14
24 files changed, 144 insertions, 194 deletions
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/io/CDODataOutput.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/io/CDODataOutput.java
index 76f089076e..f67682be27 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/io/CDODataOutput.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/io/CDODataOutput.java
@@ -71,7 +71,8 @@ public interface CDODataOutput extends ExtendedDataOutput
public void writeCDORevision(CDORevision revision, int referenceChunk) throws IOException;
- public void writeCDOList(EClass owner, EStructuralFeature feature, CDOList list, int referenceChunk) throws IOException;
+ public void writeCDOList(EClass owner, EStructuralFeature feature, CDOList list, int referenceChunk)
+ throws IOException;
public void writeCDOFeatureValue(EStructuralFeature feature, Object value) throws IOException;
diff --git a/plugins/org.eclipse.emf.cdo.migrator/src/org/eclipse/emf/cdo/internal/migrator/wizards/CDOImporterWizard.java b/plugins/org.eclipse.emf.cdo.migrator/src/org/eclipse/emf/cdo/internal/migrator/wizards/CDOImporterWizard.java
index 97936e77cd..3ec94fa372 100644
--- a/plugins/org.eclipse.emf.cdo.migrator/src/org/eclipse/emf/cdo/internal/migrator/wizards/CDOImporterWizard.java
+++ b/plugins/org.eclipse.emf.cdo.migrator/src/org/eclipse/emf/cdo/internal/migrator/wizards/CDOImporterWizard.java
@@ -36,14 +36,15 @@ public class CDOImporterWizard extends ModelImporterWizard
@Override
public void addPages()
{
- ModelImporterDetailPage detailPage = new ModelImporterDetailPage(getModelImporter(), Messages.getString("CDOImporterWizard_0")); //$NON-NLS-1$
+ ModelImporterDetailPage detailPage = new ModelImporterDetailPage(getModelImporter(), Messages
+ .getString("CDOImporterWizard_0")); //$NON-NLS-1$
detailPage.setTitle(Messages.getString("CDOImporterWizard_1")); //$NON-NLS-1$
- detailPage
- .setDescription(detailPage.showGenModel() ? Messages.getString("CDOImporterWizard_2") //$NON-NLS-1$
- : Messages.getString("CDOImporterWizard_3")); //$NON-NLS-1$
+ detailPage.setDescription(detailPage.showGenModel() ? Messages.getString("CDOImporterWizard_2") //$NON-NLS-1$
+ : Messages.getString("CDOImporterWizard_3")); //$NON-NLS-1$
addPage(detailPage);
- ModelImporterPackagePage packagePage = new ModelImporterPackagePage(getModelImporter(), Messages.getString("CDOImporterWizard_4")); //$NON-NLS-1$
+ ModelImporterPackagePage packagePage = new ModelImporterPackagePage(getModelImporter(), Messages
+ .getString("CDOImporterWizard_4")); //$NON-NLS-1$
packagePage.setShowReferencedGenModels(true);
addPage(packagePage);
}
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/mapping/IListMapping.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/mapping/IListMapping.java
index e394d5473e..ab47253d87 100644
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/mapping/IListMapping.java
+++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/mapping/IListMapping.java
@@ -68,8 +68,8 @@ public interface IListMapping
* the revision into which the list values should be read.
* @param listChunk
* indicating the lazy loading behavior: {@link CDORevision#UNCHUNKED} means that the whole list should be
- * read. Else, if <code>listChunk >= 0</code>, the list is filled with
- * {@link InternalCDOList#UNINITIALIZED} and only the first <code>listChunk</code> values are read.
+ * read. Else, if <code>listChunk >= 0</code>, the list is filled with {@link InternalCDOList#UNINITIALIZED}
+ * and only the first <code>listChunk</code> values are read.
*/
public void readValues(IDBStoreAccessor accessor, InternalCDORevision revision, int listChunk);
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DBStore.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DBStore.java
index cb4863fc37..9de67bcd32 100644
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DBStore.java
+++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DBStore.java
@@ -214,8 +214,8 @@ public class DBStore extends LongIDStore implements IDBStore
checkNull(dbAdapter, Messages.getString("DBStore.1")); //$NON-NLS-1$
checkNull(dbConnectionProvider, Messages.getString("DBStore.0")); //$NON-NLS-1$
- checkState(getRevisionTemporality() == RevisionTemporality.AUDITING == mappingStrategy.hasAuditSupport(),
- Messages.getString("DBStore.7")); //$NON-NLS-1$
+ checkState(getRevisionTemporality() == RevisionTemporality.AUDITING == mappingStrategy.hasAuditSupport(), Messages
+ .getString("DBStore.7")); //$NON-NLS-1$
}
@Override
@@ -270,8 +270,7 @@ public class DBStore extends LongIDStore implements IDBStore
OM.LOG.info(Messages.getString("DBStore.9")); //$NON-NLS-1$
lastObjectID = mappingStrategy.repairAfterCrash(dbAdapter, connection);
lastMetaId = DBUtil.selectMaximumLong(connection, CDODBSchema.PACKAGE_INFOS_META_UB);
- OM.LOG.info(MessageFormat
- .format(Messages.getString("DBStore.10"), lastObjectID, lastMetaId)); //$NON-NLS-1$
+ OM.LOG.info(MessageFormat.format(Messages.getString("DBStore.10"), lastObjectID, lastMetaId)); //$NON-NLS-1$
}
setLastMetaID(lastMetaId);
diff --git a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDORevisionInstantiator.java b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDORevisionInstantiator.java
index 97a04e35f8..cc877f8b60 100644
--- a/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDORevisionInstantiator.java
+++ b/plugins/org.eclipse.emf.cdo.server.hibernate/src/org/eclipse/emf/cdo/server/internal/hibernate/tuplizer/CDORevisionInstantiator.java
@@ -43,7 +43,8 @@ public class CDORevisionInstantiator implements Instantiator
public Object instantiate(Serializable id)
{
- return CDORevisionUtil.createRevision(eClass, CDOIDHibernateFactoryImpl.getInstance().createCDOID(id, eClass.getName()));
+ return CDORevisionUtil.createRevision(eClass, CDOIDHibernateFactoryImpl.getInstance().createCDOID(id,
+ eClass.getName()));
}
public boolean isInstance(Object object)
diff --git a/plugins/org.eclipse.emf.cdo.ui.defs/src/org/eclipse/emf/cdo/ui/defs/impl/CDOEditorDefImpl.java b/plugins/org.eclipse.emf.cdo.ui.defs/src/org/eclipse/emf/cdo/ui/defs/impl/CDOEditorDefImpl.java
index 38d1213e0f..b811c0abc3 100644
--- a/plugins/org.eclipse.emf.cdo.ui.defs/src/org/eclipse/emf/cdo/ui/defs/impl/CDOEditorDefImpl.java
+++ b/plugins/org.eclipse.emf.cdo.ui.defs/src/org/eclipse/emf/cdo/ui/defs/impl/CDOEditorDefImpl.java
@@ -353,7 +353,7 @@ public class CDOEditorDefImpl extends EditorDefImpl implements CDOEditorDef
*/
private IEditorPart openCDOEditor(String resourcePath)
{
- // TODO Andre: Why not use CDOEditorUtil.openEditor()?
+ // TODO Andre: Why not use CDOEditorUtil.openEditor()?
IEditorInput input = CDOEditorUtil.createCDOEditorInput((CDOView)getCdoView().getInstance(), resourcePath, false);
IWorkbenchWindow workbenchWindow = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
CheckUtil.checkState(workbenchWindow != null && workbenchWindow.getActivePage() != null,
diff --git a/plugins/org.eclipse.emf.cdo.ui.ide/src/org/eclipse/emf/cdo/ui/internal/ide/actions/NewResourceNodeAction.java b/plugins/org.eclipse.emf.cdo.ui.ide/src/org/eclipse/emf/cdo/ui/internal/ide/actions/NewResourceNodeAction.java
index 772c336c9c..ad29baff42 100644
--- a/plugins/org.eclipse.emf.cdo.ui.ide/src/org/eclipse/emf/cdo/ui/internal/ide/actions/NewResourceNodeAction.java
+++ b/plugins/org.eclipse.emf.cdo.ui.ide/src/org/eclipse/emf/cdo/ui/internal/ide/actions/NewResourceNodeAction.java
@@ -36,7 +36,8 @@ public abstract class NewResourceNodeAction extends TransactionalBackgroundActio
@Override
protected final CDOObject preRun(CDOObject object)
{
- InputDialog dialog = new InputDialog(getTargetPart().getSite().getShell(), getText(), Messages.getString("NewResourceNodeAction_0"), null, null); //$NON-NLS-1$
+ InputDialog dialog = new InputDialog(getTargetPart().getSite().getShell(), getText(), Messages
+ .getString("NewResourceNodeAction_0"), null, null); //$NON-NLS-1$
if (dialog.open() == Dialog.OK)
{
newResourceNode = createNewResourceNode();
diff --git a/plugins/org.eclipse.emf.cdo.ui.ide/src/org/eclipse/emf/cdo/ui/internal/ide/actions/RemoveResourceAction.java b/plugins/org.eclipse.emf.cdo.ui.ide/src/org/eclipse/emf/cdo/ui/internal/ide/actions/RemoveResourceAction.java
index bb8c00878d..dc1a295c4e 100644
--- a/plugins/org.eclipse.emf.cdo.ui.ide/src/org/eclipse/emf/cdo/ui/internal/ide/actions/RemoveResourceAction.java
+++ b/plugins/org.eclipse.emf.cdo.ui.ide/src/org/eclipse/emf/cdo/ui/internal/ide/actions/RemoveResourceAction.java
@@ -112,8 +112,8 @@ public class RemoveResourceAction implements IObjectActionDelegate
}
catch (Exception ex)
{
- OM.LOG
- .error(MessageFormat.format(Messages.getString("RemoveResourceAction_4"), this.getClass().getName().toString()), ex); //$NON-NLS-1$
+ OM.LOG.error(MessageFormat.format(
+ Messages.getString("RemoveResourceAction_4"), this.getClass().getName().toString()), ex); //$NON-NLS-1$
}
finally
{
@@ -121,7 +121,8 @@ public class RemoveResourceAction implements IObjectActionDelegate
}
}
- UIUtil.setStatusBarMessage(MessageFormat.format(Messages.getString("RemoveResourceAction_5"), nodes.size()), removeImage); //$NON-NLS-1$
+ UIUtil.setStatusBarMessage(
+ MessageFormat.format(Messages.getString("RemoveResourceAction_5"), nodes.size()), removeImage); //$NON-NLS-1$
return Status.OK_STATUS;
}
};
diff --git a/plugins/org.eclipse.emf.cdo.ui.ide/src/org/eclipse/emf/cdo/ui/internal/ide/actions/TransactionalBackgroundAction.java b/plugins/org.eclipse.emf.cdo.ui.ide/src/org/eclipse/emf/cdo/ui/internal/ide/actions/TransactionalBackgroundAction.java
index 47d418e62b..8845d22ef3 100644
--- a/plugins/org.eclipse.emf.cdo.ui.ide/src/org/eclipse/emf/cdo/ui/internal/ide/actions/TransactionalBackgroundAction.java
+++ b/plugins/org.eclipse.emf.cdo.ui.ide/src/org/eclipse/emf/cdo/ui/internal/ide/actions/TransactionalBackgroundAction.java
@@ -79,7 +79,8 @@ public abstract class TransactionalBackgroundAction extends LongRunningActionDel
CDOView view = transactionalObject.cdoView();
if (!(view instanceof CDOTransaction))
{
- throw new IllegalStateException(MessageFormat.format(Messages.getString("TransactionalBackgroundAction_0"), transactionalObject)); //$NON-NLS-1$
+ throw new IllegalStateException(MessageFormat.format(
+ Messages.getString("TransactionalBackgroundAction_0"), transactionalObject)); //$NON-NLS-1$
}
// Bypass cancel()
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/AbstractLockObjectsAction.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/AbstractLockObjectsAction.java
index d2f6e6136b..d1facb2209 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/AbstractLockObjectsAction.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/AbstractLockObjectsAction.java
@@ -89,7 +89,10 @@ public abstract class AbstractLockObjectsAction extends EditingDomainAction
{
public void run()
{
- MessageDialog.openError(getShell(), Messages.getString("AbstractLockObjectsAction.0"), Messages.getString("AbstractLockObjectsAction.1")); //$NON-NLS-1$ //$NON-NLS-2$
+ MessageDialog
+ .openError(
+ getShell(),
+ Messages.getString("AbstractLockObjectsAction.0"), Messages.getString("AbstractLockObjectsAction.1")); //$NON-NLS-1$ //$NON-NLS-2$
}
});
}
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 a9badb89f6..c68a466bf8 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
@@ -41,7 +41,7 @@ public final class CloseSessionAction extends SessionAction
{
MessageDialog dialog = new MessageDialog(getShell(), TITLE, null,
Messages.getString("CloseSessionAction.2"), MessageDialog.QUESTION, new String[] { //$NON-NLS-1$
- IDialogConstants.YES_LABEL, IDialogConstants.NO_LABEL, IDialogConstants.CANCEL_LABEL }, 0);
+ IDialogConstants.YES_LABEL, IDialogConstants.NO_LABEL, IDialogConstants.CANCEL_LABEL }, 0);
if (dialog.open() != MessageDialog.OK)
{
cancel();
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 ad0def0f9f..fb50e93e82 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
@@ -40,7 +40,7 @@ public final class CloseViewAction extends ViewAction
{
MessageDialog dialog = new MessageDialog(getShell(), TITLE, null,
Messages.getString("CloseViewAction.2"), MessageDialog.QUESTION, new String[] { //$NON-NLS-1$
- IDialogConstants.YES_LABEL, IDialogConstants.NO_LABEL, IDialogConstants.CANCEL_LABEL }, 0);
+ IDialogConstants.YES_LABEL, IDialogConstants.NO_LABEL, IDialogConstants.CANCEL_LABEL }, 0);
if (dialog.open() != MessageDialog.OK)
{
cancel();
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/RegisterSinglePackageAction.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/RegisterSinglePackageAction.java
index 57ec364b34..fc467db115 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/RegisterSinglePackageAction.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/RegisterSinglePackageAction.java
@@ -36,7 +36,8 @@ public class RegisterSinglePackageAction extends RegisterPackagesAction
public RegisterSinglePackageAction(IWorkbenchPage page, CDOSession session, String packageURI)
{
- super(page, packageURI, Messages.getString("RegisterSinglePackageAction.0") + packageURI, getDescriptor(packageURI), session); //$NON-NLS-1$
+ super(page, packageURI,
+ Messages.getString("RegisterSinglePackageAction.0") + packageURI, getDescriptor(packageURI), session); //$NON-NLS-1$
this.packageURI = packageURI;
}
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOLegacyWrapper.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOLegacyWrapper.java
index c690444632..9fbbb13093 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOLegacyWrapper.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOLegacyWrapper.java
@@ -18,7 +18,6 @@ import org.eclipse.emf.cdo.common.model.CDOPackageRegistry;
import org.eclipse.emf.cdo.common.protocol.CDOProtocolConstants;
import org.eclipse.emf.cdo.common.revision.CDORevision;
import org.eclipse.emf.cdo.eresource.CDOResource;
-import org.eclipse.emf.cdo.internal.common.model.GenUtil;
import org.eclipse.emf.cdo.spi.common.revision.InternalCDORevision;
import org.eclipse.emf.internal.cdo.bundle.OM;
@@ -37,14 +36,7 @@ import org.eclipse.emf.ecore.EClassifier;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EReference;
import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.EcorePackage;
import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.EAttributeImpl;
-import org.eclipse.emf.ecore.impl.EClassImpl;
-import org.eclipse.emf.ecore.impl.EDataTypeImpl;
-import org.eclipse.emf.ecore.impl.EReferenceImpl;
-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.spi.cdo.InternalCDOObject;
@@ -59,10 +51,6 @@ import java.lang.reflect.Proxy;
* @author Eike Stepper
* @since 2.0
*/
-/*
- * IMPORTANT: Compile errors in this class might indicate an old version of EMF. Legacy support is only enabled for EMF
- * with fixed bug #247130. These compile errors do not affect native models!
- */
public abstract class CDOLegacyWrapper extends CDOObjectWrapper
{
private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG_OBJECT, CDOLegacyWrapper.class);
@@ -71,8 +59,6 @@ public abstract class CDOLegacyWrapper extends CDOObjectWrapper
protected InternalCDORevision revision;
- private boolean allProxiesResolved;
-
public CDOLegacyWrapper(InternalEObject instance)
{
this.instance = instance;
@@ -247,7 +233,7 @@ public abstract class CDOLegacyWrapper extends CDOObjectWrapper
{
if (TRACER.isEnabled())
{
- TRACER.format("Transfering revision to instance: {0} --> {1}", revision, instance); //$NON-NLS-1$
+ TRACER.format("Transfering revision to instance: {0} --> {1}", revision, instance);
}
boolean deliver = instance.eDeliver();
@@ -335,74 +321,6 @@ public abstract class CDOLegacyWrapper extends CDOObjectWrapper
}
/**
- * TODO Ed: Help to fix whole mess (avoid inverse updates)
- */
- private void setInstanceValueOLD(InternalEObject instance, EStructuralFeature feature, Object value)
- {
- // TODO Consider EStoreEObjectImpl based objects as well!
- // TODO Don't use Java reflection
- Class<?> instanceClass = instance.getClass();
- String featureName = feature.getName();
- String fieldName = featureName;// TODO safeName()
- Field field = ReflectUtil.getField(instanceClass, fieldName);
- if (field == null && feature.getEType() == EcorePackage.eINSTANCE.getEBoolean())
- {
- if (instanceClass.isAssignableFrom(EAttributeImpl.class) || instanceClass.isAssignableFrom(EClassImpl.class)
- || instanceClass.isAssignableFrom(EDataTypeImpl.class)
- || instanceClass.isAssignableFrom(EReferenceImpl.class)
- || instanceClass.isAssignableFrom(EStructuralFeatureImpl.class)
- || instanceClass.isAssignableFrom(ETypedElementImpl.class))
- {
- // *******************************************
- // ID_EFLAG = 1 << 15;
- // *******************************************
- // ABSTRACT_EFLAG = 1 << 8;
- // INTERFACE_EFLAG = 1 << 9;
- // *******************************************
- // SERIALIZABLE_EFLAG = 1 << 8;
- // *******************************************
- // CONTAINMENT_EFLAG = 1 << 15;
- // RESOLVE_PROXIES_EFLAG = 1 << 16;
- // *******************************************
- // CHANGEABLE_EFLAG = 1 << 10;
- // VOLATILE_EFLAG = 1 << 11;
- // TRANSIENT_EFLAG = 1 << 12;
- // UNSETTABLE_EFLAG = 1 << 13;
- // DERIVED_EFLAG = 1 << 14;
- // *******************************************
- // ORDERED_EFLAG = 1 << 8;
- // UNIQUE_EFLAG = 1 << 9;
- // *******************************************
-
- String flagName = GenUtil.getFeatureUpperName(featureName) + "_EFLAG"; //$NON-NLS-1$
- int flagsMask = getEFlagMask(instanceClass, flagName);
-
- field = ReflectUtil.getField(instanceClass, "eFlags"); //$NON-NLS-1$
- int flags = (Integer)ReflectUtil.getValue(field, instance);
- boolean on = (Boolean)value;
- if (on)
- {
- flags |= flagsMask; // Add EFlag
- }
- else
- {
- flags &= ~flagsMask; // Remove EFlag
- }
-
- ReflectUtil.setValue(field, instance, flags);
- return;
- }
- }
-
- if (field == null)
- {
- throw new ImplementationError("Field not found: " + fieldName); //$NON-NLS-1$
- }
-
- ReflectUtil.setValue(field, instance, value);
- }
-
- /**
* @param feature
* in case that a proxy has to be created the feature that will determine the interface type of the proxy and
* that will be used later to resolve the proxy. <code>null</code> indicates that proxy creation will be
@@ -560,7 +478,7 @@ public abstract class CDOLegacyWrapper extends CDOObjectWrapper
URI uri = URI.createURI(CDOProtocolConstants.PROTOCOL_NAME + ":proxy#" + id); //$NON-NLS-1$
if (TRACER.isEnabled())
{
- TRACER.format("Setting proxyURI {0} for {1}", uri, instance); //$NON-NLS-1$
+ TRACER.format("Setting proxyURI {0} for {1}", uri, instance);
}
instance.eSetProxyURI(uri);
@@ -572,7 +490,7 @@ public abstract class CDOLegacyWrapper extends CDOObjectWrapper
{
if (TRACER.isEnabled())
{
- TRACER.format("Unsetting proxyURI for {0}", instance); //$NON-NLS-1$
+ TRACER.format("Unsetting proxyURI for {0}", instance);
}
instance.eSetProxyURI(null);
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 fcb0839bcc..649c079d61 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
@@ -92,7 +92,8 @@ public class RemoteTraceView extends ViewPart
protected void createColmuns(TableViewer viewer)
{
- final String[] columnNames = { Messages.getString("RemoteTraceView.0"), Messages.getString("RemoteTraceView.1"), Messages.getString("RemoteTraceView.2"), Messages.getString("RemoteTraceView.3"), Messages.getString("RemoteTraceView.4"), Messages.getString("RemoteTraceView.5"), Messages.getString("RemoteTraceView.6"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$
+ final String[] columnNames = {
+ Messages.getString("RemoteTraceView.0"), Messages.getString("RemoteTraceView.1"), Messages.getString("RemoteTraceView.2"), Messages.getString("RemoteTraceView.3"), Messages.getString("RemoteTraceView.4"), Messages.getString("RemoteTraceView.5"), Messages.getString("RemoteTraceView.6"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$
Messages.getString("RemoteTraceView.7") }; //$NON-NLS-1$
final int[] columnWidths = { 60, 170, 80, 160, 120, 120, 400, 200 };
TableColumn[] columns = new TableColumn[columnNames.length];
diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/ChannelTest.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/ChannelTest.java
index a581f68801..f10c819030 100644
--- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/ChannelTest.java
+++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/tests/ChannelTest.java
@@ -131,22 +131,22 @@ public abstract class ChannelTest extends AbstractProtocolTest
for (int i = 0; i < THREADS; i++)
{
threadMonitor.addThread(new MonitoredThread("TEST-THREAD-" + i, threadMonitor) //$NON-NLS-1$
- {
- @Override
- protected void doRun() throws Exception
- {
- for (int i = 0; i < 100; i++)
{
- IOUtil.OUT().println(Thread.currentThread().getName() + ": " + i); //$NON-NLS-1$
- TestSignalProtocol protocol = openTestSignalProtocol();
- assertActive(protocol);
-
- protocol.close();
- assertInactive(protocol);
- heartBeat();
- }
- }
- });
+ @Override
+ protected void doRun() throws Exception
+ {
+ for (int i = 0; i < 100; i++)
+ {
+ IOUtil.OUT().println(Thread.currentThread().getName() + ": " + i); //$NON-NLS-1$
+ TestSignalProtocol protocol = openTestSignalProtocol();
+ assertActive(protocol);
+
+ protocol.close();
+ assertInactive(protocol);
+ heartBeat();
+ }
+ }
+ });
}
disableConsole();
@@ -161,28 +161,28 @@ public abstract class ChannelTest extends AbstractProtocolTest
for (int i = 0; i < THREADS; i++)
{
threadMonitor.addThread(new MonitoredThread("TEST-THREAD-" + i, threadMonitor) //$NON-NLS-1$
- {
- @Override
- protected void doRun() throws Exception
- {
- for (int i = 0; i < 100; i++)
{
- IOUtil.OUT().println(Thread.currentThread().getName() + ": " + i); //$NON-NLS-1$
- TestSignalProtocol protocol = openTestSignalProtocol();
- assertActive(protocol);
- heartBeat();
-
- byte[] data = TinyData.getBytes();
- byte[] result = new ArrayRequest(protocol, data).send();
- assertEquals(true, Arrays.equals(data, result));
- heartBeat();
-
- protocol.close();
- assertInactive(protocol);
- heartBeat();
- }
- }
- });
+ @Override
+ protected void doRun() throws Exception
+ {
+ for (int i = 0; i < 100; i++)
+ {
+ IOUtil.OUT().println(Thread.currentThread().getName() + ": " + i); //$NON-NLS-1$
+ TestSignalProtocol protocol = openTestSignalProtocol();
+ assertActive(protocol);
+ heartBeat();
+
+ byte[] data = TinyData.getBytes();
+ byte[] result = new ArrayRequest(protocol, data).send();
+ assertEquals(true, Arrays.equals(data, result));
+ heartBeat();
+
+ protocol.close();
+ assertInactive(protocol);
+ heartBeat();
+ }
+ }
+ });
}
disableConsole();
@@ -196,33 +196,33 @@ public abstract class ChannelTest extends AbstractProtocolTest
for (int i = 0; i < THREADS; i++)
{
threadMonitor.addThread(new MonitoredThread("TEST-THREAD-" + i, threadMonitor) //$NON-NLS-1$
- {
- @Override
- protected void doRun() throws Exception
- {
- for (int i = 0; i < 10; i++)
{
- long start = System.currentTimeMillis();
- TestSignalProtocol protocol = openTestSignalProtocol();
- assertActive(protocol);
-
- for (int j = 0; j < 50; j++)
+ @Override
+ protected void doRun() throws Exception
{
- byte[] data = TinyData.getBytes();
- byte[] result = new ArrayRequest(protocol, data).send();
- assertEquals(true, Arrays.equals(data, result));
-
- heartBeat();
- ConcurrencyUtil.sleep(10L);
+ for (int i = 0; i < 10; i++)
+ {
+ long start = System.currentTimeMillis();
+ TestSignalProtocol protocol = openTestSignalProtocol();
+ assertActive(protocol);
+
+ for (int j = 0; j < 50; j++)
+ {
+ byte[] data = TinyData.getBytes();
+ byte[] result = new ArrayRequest(protocol, data).send();
+ assertEquals(true, Arrays.equals(data, result));
+
+ heartBeat();
+ ConcurrencyUtil.sleep(10L);
+ }
+
+ protocol.close();
+ assertInactive(protocol);
+ long stop = System.currentTimeMillis();
+ IOUtil.OUT().println(Thread.currentThread().getName() + ": " + i + " (" + (stop - start) + ")"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ }
}
-
- protocol.close();
- assertInactive(protocol);
- long stop = System.currentTimeMillis();
- IOUtil.OUT().println(Thread.currentThread().getName() + ": " + i + " (" + (stop - start) + ")"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- }
- }
- });
+ });
}
disableConsole();
diff --git a/plugins/org.eclipse.net4j.ui.defs/src/org/eclipse/net4j/ui/defs/impl/Net4JUIDefsFactoryImpl.java b/plugins/org.eclipse.net4j.ui.defs/src/org/eclipse/net4j/ui/defs/impl/Net4JUIDefsFactoryImpl.java
index 30a94c5405..892e63ca09 100644
--- a/plugins/org.eclipse.net4j.ui.defs/src/org/eclipse/net4j/ui/defs/impl/Net4JUIDefsFactoryImpl.java
+++ b/plugins/org.eclipse.net4j.ui.defs/src/org/eclipse/net4j/ui/defs/impl/Net4JUIDefsFactoryImpl.java
@@ -23,14 +23,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 Net4JUIDefsFactoryImpl extends EFactoryImpl implements Net4JUIDefsFactory
{
/**
* Creates the default factory implementation. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ *
* @generated
*/
public static Net4JUIDefsFactory init()
@@ -54,7 +54,7 @@ public class Net4JUIDefsFactoryImpl extends EFactoryImpl implements Net4JUIDefsF
/**
* Creates an instance of the factory. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ *
* @generated
*/
public Net4JUIDefsFactoryImpl()
@@ -64,7 +64,7 @@ public class Net4JUIDefsFactoryImpl extends EFactoryImpl implements Net4JUIDefsF
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
@@ -81,7 +81,7 @@ public class Net4JUIDefsFactoryImpl extends EFactoryImpl implements Net4JUIDefsF
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ *
* @generated
*/
public InteractiveCredentialsProviderDef createInteractiveCredentialsProviderDef()
@@ -92,7 +92,7 @@ public class Net4JUIDefsFactoryImpl extends EFactoryImpl implements Net4JUIDefsF
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ *
* @generated
*/
public Net4JUIDefsPackage getNet4JUIDefsPackage()
@@ -102,7 +102,7 @@ public class Net4JUIDefsFactoryImpl extends EFactoryImpl implements Net4JUIDefsF
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ *
* @deprecated
* @generated
*/
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 5a8c597ed0..f5ae9dbd2c 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
@@ -29,7 +29,8 @@ import org.eclipse.jface.action.IToolBarManager;
*/
public class AcceptorsView extends ContainerView
{
- private Action addAcceptorAction2036 = new SafeAction(Messages.getString("AcceptorsView_0"), Messages.getString("AcceptorsView_1"), //$NON-NLS-1$ //$NON-NLS-2$
+ private Action addAcceptorAction2036 = new SafeAction(Messages.getString("AcceptorsView_0"), Messages
+ .getString("AcceptorsView_1"), //$NON-NLS-1$ //$NON-NLS-2$
getAddImageDescriptor())
{
@Override
@@ -39,7 +40,8 @@ public class AcceptorsView extends ContainerView
}
};
- private Action addAcceptorAction2037 = new SafeAction(Messages.getString("AcceptorsView_4"), Messages.getString("AcceptorsView_5"), //$NON-NLS-1$ //$NON-NLS-2$
+ private Action addAcceptorAction2037 = new SafeAction(Messages.getString("AcceptorsView_4"), Messages
+ .getString("AcceptorsView_5"), //$NON-NLS-1$ //$NON-NLS-2$
getAddImageDescriptor())
{
@Override
diff --git a/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/views/Net4jItemProvider.java b/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/views/Net4jItemProvider.java
index d1c02e9d8c..7c27d169dc 100644
--- a/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/views/Net4jItemProvider.java
+++ b/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/views/Net4jItemProvider.java
@@ -84,7 +84,8 @@ public class Net4jItemProvider extends ContainerItemProvider<IContainer<Object>>
public RemoveAction(Object object)
{
- super(Messages.getString("Net4jItemProvider.0"), Messages.getString("Net4jItemProvider.1"), ContainerView.getDeleteImageDescriptor()); //$NON-NLS-1$ //$NON-NLS-2$
+ super(
+ Messages.getString("Net4jItemProvider.0"), Messages.getString("Net4jItemProvider.1"), ContainerView.getDeleteImageDescriptor()); //$NON-NLS-1$ //$NON-NLS-2$
this.object = object;
}
diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/internal/ui/views/Net4jContainerItemProvider.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/internal/ui/views/Net4jContainerItemProvider.java
index eb4aa0b2b9..b8c21fac54 100644
--- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/internal/ui/views/Net4jContainerItemProvider.java
+++ b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/internal/ui/views/Net4jContainerItemProvider.java
@@ -61,7 +61,8 @@ public class Net4jContainerItemProvider extends ContainerItemProvider<IContainer
public RemoveAction(ITreeSelection selection)
{
- super(Messages.getString("Net4jContainerItemProvider_0"), Messages.getString("Net4jContainerItemProvider.1"), ContainerView.getDeleteImageDescriptor()); //$NON-NLS-1$ //$NON-NLS-2$
+ super(
+ Messages.getString("Net4jContainerItemProvider_0"), Messages.getString("Net4jContainerItemProvider.1"), ContainerView.getDeleteImageDescriptor()); //$NON-NLS-1$ //$NON-NLS-2$
this.selection = selection;
}
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 8132a40587..285bf8fb3c 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
@@ -355,7 +355,8 @@ public class Net4jIntrospectorView extends ViewPart implements ISelectionListene
private void createObjectColmuns()
{
Table table = objectViewer.getTable();
- String[] columnNames = { Messages.getString("Net4jIntrospectorView_4"), Messages.getString("Net4jIntrospectorView_5"), Messages.getString("Net4jIntrospectorView_6"), Messages.getString("Net4jIntrospectorView_7") }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+ String[] columnNames = {
+ Messages.getString("Net4jIntrospectorView_4"), Messages.getString("Net4jIntrospectorView_5"), Messages.getString("Net4jIntrospectorView_6"), Messages.getString("Net4jIntrospectorView_7") }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
int[] columnWidths = { 200, 400, 300, 300 };
createColumns(table, columnNames, columnWidths);
}
@@ -363,7 +364,8 @@ public class Net4jIntrospectorView extends ViewPart implements ISelectionListene
private void createMapColmuns()
{
Table table = mapViewer.getTable();
- String[] columnNames = { Messages.getString("Net4jIntrospectorView_8"), Messages.getString("Net4jIntrospectorView_9"), Messages.getString("Net4jIntrospectorView_10") }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ String[] columnNames = {
+ Messages.getString("Net4jIntrospectorView_8"), Messages.getString("Net4jIntrospectorView_9"), Messages.getString("Net4jIntrospectorView_10") }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
int[] columnWidths = { 200, 400, 300 };
createColumns(table, columnNames, columnWidths);
}
@@ -371,7 +373,8 @@ public class Net4jIntrospectorView extends ViewPart implements ISelectionListene
private void createIterableColmuns()
{
Table table = iterableViewer.getTable();
- String[] columnNames = { Messages.getString("Net4jIntrospectorView_11"), Messages.getString("Net4jIntrospectorView_12") }; //$NON-NLS-1$ //$NON-NLS-2$
+ String[] columnNames = {
+ Messages.getString("Net4jIntrospectorView_11"), Messages.getString("Net4jIntrospectorView_12") }; //$NON-NLS-1$ //$NON-NLS-2$
int[] columnWidths = { 400, 300 };
createColumns(table, columnNames, columnWidths);
}
@@ -379,7 +382,8 @@ public class Net4jIntrospectorView extends ViewPart implements ISelectionListene
private void createArrayColmuns()
{
Table table = arrayViewer.getTable();
- String[] columnNames = { Messages.getString("Net4jIntrospectorView_13"), Messages.getString("Net4jIntrospectorView_14"), Messages.getString("Net4jIntrospectorView_15") }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ String[] columnNames = {
+ Messages.getString("Net4jIntrospectorView_13"), Messages.getString("Net4jIntrospectorView_14"), Messages.getString("Net4jIntrospectorView_15") }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
int[] columnWidths = { 50, 400, 300 };
createColumns(table, columnNames, columnWidths);
}
diff --git a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/views/MasterDetailsView.java b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/views/MasterDetailsView.java
index 820813c76f..0b2cce831c 100644
--- a/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/views/MasterDetailsView.java
+++ b/plugins/org.eclipse.net4j.util.ui/src/org/eclipse/net4j/util/ui/views/MasterDetailsView.java
@@ -301,7 +301,8 @@ public abstract class MasterDetailsView extends MultiViewersView
{
public RefreshAction()
{
- super(Messages.getString("MasterDetailsView_2"), Messages.getString("MasterDetailsView_3"), OM.getImageDescriptor("icons/full/etool16/refresh.gif")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ super(
+ Messages.getString("MasterDetailsView_2"), Messages.getString("MasterDetailsView_3"), OM.getImageDescriptor("icons/full/etool16/refresh.gif")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
}
@Override
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/buffer/IBuffer.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/buffer/IBuffer.java
index 65ed3c997f..850e5324cd 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/buffer/IBuffer.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/buffer/IBuffer.java
@@ -51,17 +51,24 @@ import java.nio.channels.SocketChannel;
* <p>
* An example for <b>putting</b> values into a buffer and writing it to a {@link SocketChannel}:
* <p>
- * <pre style="background-color:#ffffc8; border-width:1px; border-style:solid; padding:.5em;"> // Obtain a fresh buffer
+ *
+ * <pre style="background-color:#ffffc8; border-width:1px; border-style:solid; padding:.5em;">
+ * // Obtain a fresh buffer
* Buffer buffer = bufferProvider.getBuffer(); // Start filling the buffer for channelID 4711 ByteBuffer byteBuffer =
* buffer.startPutting(4711); byteBuffer.putDouble(15.47); // Write the contents of the Buffer to a // SocketChannel
- * without blocking while (!buffer.write(socketChannel)) { // Do something else } </pre> An example for reading a buffer
- * from a {@link SocketChannel} and <b>getting</b> values from it:
+ * without blocking while (!buffer.write(socketChannel)) { // Do something else }
+ * </pre>
+ *
+ * An example for reading a buffer from a {@link SocketChannel} and <b>getting</b> values from it:
* <p>
- * <pre style="background-color:#ffffc8; border-width:1px; border-style:solid; padding:.5em;"> // Obtain a fresh buffer
+ *
+ * <pre style="background-color:#ffffc8; border-width:1px; border-style:solid; padding:.5em;">
+ * // Obtain a fresh buffer
* Buffer buffer = bufferProvider.getBuffer(); // Read the contents of the Buffer from a // SocketChannel without
* blocking ByteBuffer byteBuffer; while ((byteBuffer = buffer.startGetting(socketChannel)) == null) { // Do something
* else } // Access the contents of the buffer and // release it to its provider double value = byteBuffer.getDouble();
- * buffer.release(); </pre>
+ * buffer.release();
+ * </pre>
*
* @see IBufferProvider
* @see IChannel#sendBuffer(IBuffer)
diff --git a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/channel/IChannel.java b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/channel/IChannel.java
index 822b5a69be..122ea5ba28 100644
--- a/plugins/org.eclipse.net4j/src/org/eclipse/net4j/channel/IChannel.java
+++ b/plugins/org.eclipse.net4j/src/org/eclipse/net4j/channel/IChannel.java
@@ -42,19 +42,25 @@ import org.eclipse.net4j.util.security.IUserAware;
* <p>
* An example for opening a channel on an {@link IConnector} and sending an {@link IBuffer}:
* <p>
- * <pre style="background-color:#ffffc8; border-width:1px; border-style:solid; padding:.5em;"> // Open a channel
+ *
+ * <pre style="background-color:#ffffc8; border-width:1px; border-style:solid; padding:.5em;">
+ * // Open a channel
* IChannel channel = connector.openChannel(); short channelID = channel.getIndex(); // Fill a buffer Buffer buffer =
* bufferProvider.getBuffer(); ByteBuffer byteBuffer = buffer.startPutting(channelID); byteBuffer.putDouble(15.47); //
- * Let the channel send the buffer without blocking channel.sendBuffer(buffer); </pre>
+ * Let the channel send the buffer without blocking channel.sendBuffer(buffer);
+ * </pre>
* <p>
* An example for receiving {@link IBuffer}s from channels on an {@link IConnector}:
* <p>
- * <pre style="background-color:#ffffc8; border-width:1px; border-style:solid; padding:.5em;"> // Create a receive
+ *
+ * <pre style="background-color:#ffffc8; border-width:1px; border-style:solid; padding:.5em;">
+ * // Create a receive
* handler final IBufferHandler receiveHandler = new IBufferHandler() { public void handleBuffer(IBuffer buffer) {
* ByteBuffer byteBuffer = buffer.getByteBuffer(); IOUtil.OUT().println(&quot;Received &quot; + byteBuffer.getDouble());
* buffer.release(); } }; // Set the receive handler to all new channels connector.addListener(new
* ContainerEventAdapter() { protected void onAdded(IContainer container, Object element) { IChannel channel =
- * (IChannel)element; channel.setReceiveHandler(receiveHandler); } }); </pre>
+ * (IChannel)element; channel.setReceiveHandler(receiveHandler); } });
+ * </pre>
*
* @author Eike Stepper
* @noimplement This interface is <b>not</b> intended to be implemented by clients. Providers of channels (for example

Back to the top