summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2007-12-28 08:32:12 (EST)
committerEike Stepper2007-12-28 08:32:12 (EST)
commit73e4304bba061db3bd3794e249b39bcf55f03afe (patch)
treed6021d34c2361da16e02c7a2427b0c73920e1957
parentff9809d5da275f9f95530cf5be53cccfc253ccc4 (diff)
downloadcdo-73e4304bba061db3bd3794e249b39bcf55f03afe.zip
cdo-73e4304bba061db3bd3794e249b39bcf55f03afe.tar.gz
cdo-73e4304bba061db3bd3794e249b39bcf55f03afe.tar.bz2
Code Cleanup
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/RegisterFilesystemPackagesAction.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/RegisterGeneratedPackagesAction.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/RollbackTransactionAction.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/bundle/OM.java12
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/editor/CDOActionBarContributor.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/editor/CDOEditor.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/preferences/CDOPreferencePage.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOEventHandler.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOItemProvider.java4
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/CDOResourceImpl.java2
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/EresourceFactoryImpl.java2
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/util/CDOUtil.java6
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOStateMachine.java4
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOViewImpl.java2
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/bundle/OM.java14
15 files changed, 31 insertions, 31 deletions
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/RegisterFilesystemPackagesAction.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/RegisterFilesystemPackagesAction.java
index 056ba8f..235b646 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/RegisterFilesystemPackagesAction.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/RegisterFilesystemPackagesAction.java
@@ -37,7 +37,7 @@ public class RegisterFilesystemPackagesAction extends RegisterPackagesAction
private static final String TOOL_TIP = "Register dynamic packages from the filesystem";
private static final String[] FILTER_NAMES = { "Ecore models (*.ecore)", "XMI files (*.xmi)", "XML files (*.xml)",
- "All files (*.*)" };
+ "All files (*.*)" };
private static final String[] FILTER_EXTENSIONS = { "ecore", "xmi", "xml", null };
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/RegisterGeneratedPackagesAction.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/RegisterGeneratedPackagesAction.java
index 9aed0b0..1d847f1 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/RegisterGeneratedPackagesAction.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/RegisterGeneratedPackagesAction.java
@@ -46,7 +46,7 @@ public class RegisterGeneratedPackagesAction extends RegisterPackagesAction
Shell shell = page.getWorkbenchWindow().getShell();
SelectPackageDialog dialog = new SelectPackageDialog(shell, "Generated Packages",
"Select one or more packages for registration with the CDO package registry", session.getPackageRegistry()
- .keySet());
+ .keySet());
if (dialog.open() == SelectPackageDialog.OK)
{
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 c1c135e..54f49e5 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
@@ -50,7 +50,7 @@ public final class RollbackTransactionAction extends ViewAction
break;
default:
cancel();
- break;
+ break;
}
}
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/bundle/OM.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/bundle/OM.java
index ec2c737..43386c9 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/bundle/OM.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/bundle/OM.java
@@ -43,20 +43,20 @@ public abstract class OM
public static final OMPreferences PREFS = BUNDLE.preferences();
- public static final OMPreference<String> PREF_LABEL_DECORATION = //
- PREFS.init("PREF_LABEL_DECORATION", CDOLabelProvider.DEFAULT_DECORATION); //$NON-NLS-1$
+ public static final OMPreference<String> PREF_LABEL_DECORATION = //
+ PREFS.init("PREF_LABEL_DECORATION", CDOLabelProvider.DEFAULT_DECORATION); //$NON-NLS-1$
public static final OMPreference<String[]> PREF_HISTORY_SELECT_PACKAGES = //
- PREFS.initArray("PREF_HISTORY_SELECT_PACKAGES"); //$NON-NLS-1$
+ PREFS.initArray("PREF_HISTORY_SELECT_PACKAGES"); //$NON-NLS-1$
public static final OMPreference<String[]> PREF_HISTORY_CONNECTORS = //
- PREFS.initArray("PREF_HISTORY_CONNECTORS"); //$NON-NLS-1$
+ PREFS.initArray("PREF_HISTORY_CONNECTORS"); //$NON-NLS-1$
public static final OMPreference<String[]> PREF_HISTORY_REPOSITORIES = //
- PREFS.initArray("PREF_HISTORY_REPOSITORIES"); //$NON-NLS-1$
+ PREFS.initArray("PREF_HISTORY_REPOSITORIES"); //$NON-NLS-1$
public static final OMPreference<Boolean> PREF_LEGACY_SUPPORT = //
- PREFS.init("PREF_LEGACY_SUPPORT", true); //$NON-NLS-1$
+ PREFS.init("PREF_LEGACY_SUPPORT", true); //$NON-NLS-1$
static void start()
{
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 aa6f5ed..acefb00 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
@@ -216,7 +216,7 @@ public class CDOActionBarContributor extends EditingDomainActionBarContributor i
super.contributeToMenu(menuManager);
IMenuManager submenuManager = new MenuManager(PluginDelegator.INSTANCE.getString("_UI_CDOEditor_menu"),
- "org.eclipse.emf.cdo.internal.ui.editorMenuID");
+ "org.eclipse.emf.cdo.internal.ui.editorMenuID");
menuManager.insertAfter("additions", submenuManager);
submenuManager.add(new Separator("settings"));
submenuManager.add(new Separator("actions"));
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 d63e4f5..ad465d9 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
@@ -156,7 +156,7 @@ import java.util.Map;
* @generated
*/
public class CDOEditor extends MultiPageEditorPart implements IEditingDomainProvider, ISelectionProvider,
- IMenuListener, IViewerProvider, IGotoMarker
+IMenuListener, IViewerProvider, IGotoMarker
{
/**
* @ADDED
@@ -1710,7 +1710,7 @@ public class CDOEditor extends MultiPageEditorPart implements IEditingDomainProv
setPartName(editorInput.getName());
IProgressMonitor progressMonitor = getActionBars().getStatusLineManager() != null ? getActionBars()
.getStatusLineManager().getProgressMonitor() : new NullProgressMonitor();
- doSave(progressMonitor);
+ doSave(progressMonitor);
}
/**
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 e681096..ab6a405 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
@@ -124,7 +124,7 @@ public class CDOPreferencePage extends OMPreferencePage
preloadChunkSize.setValue(String
.valueOf(org.eclipse.emf.internal.cdo.bundle.OM.PREF_LOAD_REVISION_COLLECTION_CHUNK_SIZE.getValue()));
invalidationNotifications
- .setSelection(org.eclipse.emf.internal.cdo.bundle.OM.PREF_ENABLE_INVALIDATION_NOTIFICATIONS.getValue());
+ .setSelection(org.eclipse.emf.internal.cdo.bundle.OM.PREF_ENABLE_INVALIDATION_NOTIFICATIONS.getValue());
commitTimeout.setValue(String
.valueOf(org.eclipse.emf.internal.cdo.bundle.OM.PREF_DEFAULT_COMMIT_TIMEOUT.getValue()));
}
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOEventHandler.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOEventHandler.java
index 5bd42d4..06c9b7d 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOEventHandler.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOEventHandler.java
@@ -156,7 +156,7 @@ public class CDOEventHandler
public void setViewer(TreeViewer viewer)
{
- this.treeViewer = viewer;
+ treeViewer = viewer;
}
protected void sessionInvalidated(Set<CDOID> dirtyOIDs)
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOItemProvider.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOItemProvider.java
index 60063ef..77fd4c5 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOItemProvider.java
@@ -318,12 +318,12 @@ public class CDOItemProvider extends ContainerItemProvider<IContainer<Object>>
Set<Map.Entry<String, CDOPackageType>> entrySet = CDOUtil.getPackageTypes().entrySet();
List<Map.Entry<String, CDOPackageType>> entryList = new ArrayList<Map.Entry<String, CDOPackageType>>(entrySet);
Collections.sort(entryList, new Comparator<Map.Entry<String, CDOPackageType>>()
- {
+ {
public int compare(Map.Entry<String, CDOPackageType> e1, Map.Entry<String, CDOPackageType> e2)
{
return e1.getKey().compareTo(e2.getKey());
}
- });
+ });
Set<String> registeredURIs = new HashSet<String>(session.getPackageRegistry().keySet());
boolean added = false;
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 7987fa5..36c35ee 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
@@ -554,7 +554,7 @@ public class CDOResourceImpl extends CDOObjectImpl implements CDOResource
* @author Eike Stepper
*/
protected class TransientContents<E extends Object & EObject> extends NotifyingListImpl<E> implements
- InternalEList<E>
+ InternalEList<E>
{
private static final long serialVersionUID = 1L;
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 e36d510..c8fc2eb 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
@@ -39,7 +39,7 @@ public class EresourceFactoryImpl extends EFactoryImpl implements EresourceFacto
try
{
EresourceFactory theEresourceFactory = (EresourceFactory)EPackage.Registry.INSTANCE
- .getEFactory("http://www.eclipse.org/emf/CDO/resource/1.0.0");
+ .getEFactory("http://www.eclipse.org/emf/CDO/resource/1.0.0");
if (theEresourceFactory != null)
{
return theEresourceFactory;
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 2df8cb7..973d116 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
@@ -136,7 +136,7 @@ public final class CDOUtil
public static CDOSession openSession(IConnector connector, String repositoryName, boolean disableLegacyObjects,
EPackage.Registry delegate, IFailOverStrategy failOverStrategy) throws ConnectorException
- {
+ {
CDOSessionImpl session = new CDOSessionImpl(delegate);
session.setFailOverStrategy(failOverStrategy);
session.setConnector(connector);
@@ -144,10 +144,10 @@ public final class CDOUtil
session.setDisableLegacyObjects(disableLegacyObjects);
LifecycleUtil.activate(session);
return session;
- }
+ }
public static CDOSession openSession(IConnector connector, String repositoryName, boolean disableLegacyObjects)
- throws ConnectorException
+ throws ConnectorException
{
return openSession(connector, repositoryName, disableLegacyObjects, null, null);
}
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOStateMachine.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOStateMachine.java
index 2b86ecb..1b8d263 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOStateMachine.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOStateMachine.java
@@ -370,7 +370,7 @@ public final class CDOStateMachine extends FiniteStateMachine<CDOState, CDOEvent
* @author Eike Stepper
*/
private final class CommitTransition implements
- ITransition<CDOState, CDOEvent, InternalCDOObject, CommitTransactionResult>
+ ITransition<CDOState, CDOEvent, InternalCDOObject, CommitTransactionResult>
{
public void execute(InternalCDOObject object, CDOState state, CDOEvent event, CommitTransactionResult data)
{
@@ -539,7 +539,7 @@ public final class CDOStateMachine extends FiniteStateMachine<CDOState, CDOEvent
* @author Eike Stepper
*/
private final class LoadResourceTransition implements
- ITransition<CDOState, CDOEvent, InternalCDOObject, ResourceAndView>
+ ITransition<CDOState, CDOEvent, InternalCDOObject, ResourceAndView>
{
public void execute(InternalCDOObject object, CDOState state, CDOEvent event, ResourceAndView data)
{
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 bd237fb..1631b7e 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
@@ -68,7 +68,7 @@ import java.util.concurrent.ConcurrentMap;
* @author Eike Stepper
*/
public class CDOViewImpl extends org.eclipse.net4j.internal.util.event.Notifier implements CDOView, CDOIDProvider,
- Adapter.Internal
+Adapter.Internal
{
private static final ContextTracer TRACER = new ContextTracer(OM.DEBUG_VIEW, CDOViewImpl.class);
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/bundle/OM.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/bundle/OM.java
index 587e754..d925aef 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/bundle/OM.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/bundle/OM.java
@@ -63,23 +63,23 @@ public abstract class OM
public static final OMPreferences PREFS = BUNDLE.preferences();
public static final OMPreference<String> PREF_REPOSITORY_NAME = //
- PREFS.initString("PREF_REPOSITORY_NAME"); //$NON-NLS-1$
+ PREFS.initString("PREF_REPOSITORY_NAME"); //$NON-NLS-1$
public static final OMPreference<String> PREF_USER_NAME = //
- PREFS.initString("PREF_USER_NAME"); //$NON-NLS-1$
+ PREFS.initString("PREF_USER_NAME"); //$NON-NLS-1$
public static final OMPreference<String> PREF_CONNECTOR_DESCRIPTION = //
- PREFS.initString("PREF_CONNECTOR_DESCRIPTION"); //$NON-NLS-1$
+ PREFS.initString("PREF_CONNECTOR_DESCRIPTION"); //$NON-NLS-1$
public static final OMPreference<Integer> PREF_REFERENCE_CHUNK_SIZE = //
- PREFS.init("PREF_REFERENCE_CHUNK_SIZE", CDORevision.UNCHUNKED); //$NON-NLS-1$
+ PREFS.init("PREF_REFERENCE_CHUNK_SIZE", CDORevision.UNCHUNKED); //$NON-NLS-1$
public static final OMPreference<Boolean> PREF_ENABLE_INVALIDATION_NOTIFICATIONS = //
- PREFS.init("PREF_ENABLE_INVALIDATION_NOTIFICATIONS", false); //$NON-NLS-1$
+ PREFS.init("PREF_ENABLE_INVALIDATION_NOTIFICATIONS", false); //$NON-NLS-1$
public static final OMPreference<Integer> PREF_LOAD_REVISION_COLLECTION_CHUNK_SIZE = //
- PREFS.init("PREF_LOAD_REVISION_COLLECTION_CHUNK_SIZE", CDOView.NO_PRELOAD); //$NON-NLS-1$
+ PREFS.init("PREF_LOAD_REVISION_COLLECTION_CHUNK_SIZE", CDOView.NO_PRELOAD); //$NON-NLS-1$
public static final OMPreference<Long> PREF_DEFAULT_COMMIT_TIMEOUT = //
- PREFS.init("PREF_DEFAULT_COMMIT_TIMEOUT", CDOTransaction.DEFAULT_COMMIT_TIMEOUT); //$NON-NLS-1$
+ PREFS.init("PREF_DEFAULT_COMMIT_TIMEOUT", CDOTransaction.DEFAULT_COMMIT_TIMEOUT); //$NON-NLS-1$
}