diff options
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.ui/src/org')
60 files changed, 205 insertions, 206 deletions
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/CDOPropertyAdapterFactory.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/CDOPropertyAdapterFactory.java index 79389f2a12..c763f1487e 100644 --- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/CDOPropertyAdapterFactory.java +++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/CDOPropertyAdapterFactory.java @@ -115,8 +115,8 @@ public class CDOPropertyAdapterFactory extends AbstractPropertyAdapterFactory { adapterFactory = CDOEditor.createAdapterFactory(false); - IItemPropertySource propertySource = (IItemPropertySource)adapterFactory.adapt( - cdoObject.cdoInternalInstance(), IItemPropertySource.class); + IItemPropertySource propertySource = (IItemPropertySource)adapterFactory + .adapt(cdoObject.cdoInternalInstance(), IItemPropertySource.class); if (propertySource != null) { List<IItemPropertyDescriptor> propertyDescriptors = propertySource.getPropertyDescriptors(cdoObject); diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/ItemsProcessor.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/ItemsProcessor.java index 373041ed8e..38b5404cdd 100644 --- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/ItemsProcessor.java +++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/ItemsProcessor.java @@ -4,7 +4,7 @@ * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Eike Stepper - initial API and implementation * Simon McDuff - maintenance diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/AbstractContainerAction.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/AbstractContainerAction.java index 4948c1071f..938cc3eec7 100644 --- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/AbstractContainerAction.java +++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/AbstractContainerAction.java @@ -4,7 +4,7 @@ * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Victor Roldan Betancort - initial API and implementation * Eike Stepper - maintenance 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 9abe01fce7..d3e4515703 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 @@ -4,7 +4,7 @@ * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Simon McDuff - initial API and implementation * Eike Stepper - maintenance @@ -90,9 +90,8 @@ 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"), //$NON-NLS-1$ + Messages.getString("AbstractLockObjectsAction.1")); //$NON-NLS-1$ } }); } diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/AbstractViewAction.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/AbstractViewAction.java index 254eecb26d..9dad68ecd4 100644 --- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/AbstractViewAction.java +++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/AbstractViewAction.java @@ -4,7 +4,7 @@ * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Eike Stepper - initial API and implementation */ diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ChangePassiveUpdateAction.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ChangePassiveUpdateAction.java index 14daed4b1c..efad62938b 100644 --- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ChangePassiveUpdateAction.java +++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ChangePassiveUpdateAction.java @@ -22,7 +22,7 @@ import org.eclipse.core.runtime.IProgressMonitor; /** * Changes the state of the {@link Options#isPassiveUpdateEnabled() passive update} option for a given * {@link CDOSession session}. - * + * * @author Victor Roldan Betancort */ public class ChangePassiveUpdateAction extends EditingDomainAction diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ChangePasswordAction.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ChangePasswordAction.java index b6d5b69c46..4d12153148 100644 --- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ChangePasswordAction.java +++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ChangePasswordAction.java @@ -18,7 +18,7 @@ import org.eclipse.ui.IWorkbenchPage; /** * The "change password" action. - * + * * @author Christian W. Damus (CEA LIST) */ public final class ChangePasswordAction extends SessionAction 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 dfb190f52f..70c1ccf36c 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 @@ -39,9 +39,10 @@ public final class CloseSessionAction extends SessionAction { if (CDOUtil.isSessionDirty(getSession())) { - 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); + MessageDialog dialog = new MessageDialog(getShell(), TITLE, null, Messages.getString("CloseSessionAction.2"), //$NON-NLS-1$ + MessageDialog.QUESTION, new String[] { + 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 0e653d8f8d..fa88d1e25b 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 @@ -38,9 +38,10 @@ public final class CloseViewAction extends AbstractViewAction { if (getView().isDirty()) { - 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); + MessageDialog dialog = new MessageDialog(getShell(), TITLE, null, Messages.getString("CloseViewAction.2"), //$NON-NLS-1$ + MessageDialog.QUESTION, new String[] { + 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/DisableViewDurabilityAction.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/DisableViewDurabilityAction.java index f826ddfc3e..6f120fbf66 100644 --- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/DisableViewDurabilityAction.java +++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/DisableViewDurabilityAction.java @@ -4,7 +4,7 @@ * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Eike Stepper - initial API and implementation * Victor Roldan Betancort - maintenance 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 8c626c5aec..c8b6776873 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 @@ -4,7 +4,7 @@ * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Eike Stepper - initial API and implementation */ @@ -64,8 +64,8 @@ public abstract class EditingDomainAction extends LongRunningAction public void setActiveWorkbenchPart(IWorkbenchPart workbenchPart) { setPage(workbenchPart == null ? null : workbenchPart.getSite().getPage()); - setEditingDomain(workbenchPart instanceof IEditingDomainProvider ? ((IEditingDomainProvider)workbenchPart) - .getEditingDomain() : null); + setEditingDomain(workbenchPart instanceof IEditingDomainProvider + ? ((IEditingDomainProvider)workbenchPart).getEditingDomain() : null); } public void update() diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/EnableViewDurabilityAction.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/EnableViewDurabilityAction.java index 4c38fc5132..6aa9de88b6 100644 --- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/EnableViewDurabilityAction.java +++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/EnableViewDurabilityAction.java @@ -4,7 +4,7 @@ * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Eike Stepper - initial API and implementation * Victor Roldan Betancort - maintenance @@ -46,8 +46,8 @@ public final class EnableViewDurabilityAction extends AbstractViewAction public void run() { UIUtil.copyToClipboard(display, durableLockingID); - MessageDialog.openInformation(getShell(), TITLE, "The following area ID has been copied to the clipboard:\n" - + durableLockingID); + MessageDialog.openInformation(getShell(), TITLE, + "The following area ID has been copied to the clipboard:\n" + durableLockingID); } }); } 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 349db4012b..ab27beaa63 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 @@ -47,8 +47,8 @@ public class ExportResourceAction extends AbstractViewAction public ExportResourceAction(IWorkbenchPage page, CDOView view) { - super(page, TITLE + INTERACTIVE, - Messages.getString("ExportResourceAction.2"), SharedIcons.getDescriptor(SharedIcons.ETOOL_EXPORT), view); //$NON-NLS-1$ + super(page, TITLE + INTERACTIVE, Messages.getString("ExportResourceAction.2"), //$NON-NLS-1$ + SharedIcons.getDescriptor(SharedIcons.ETOOL_EXPORT), view); setId(ID); } @@ -95,8 +95,8 @@ public class ExportResourceAction extends AbstractViewAction { // Target Resource ResourceSet resourceSet = new ResourceSetImpl(); - resourceSet.getResourceFactoryRegistry().getExtensionToFactoryMap() - .put(Resource.Factory.Registry.DEFAULT_EXTENSION, new XMIResourceFactoryImpl()); + resourceSet.getResourceFactoryRegistry().getExtensionToFactoryMap().put(Resource.Factory.Registry.DEFAULT_EXTENSION, + new XMIResourceFactoryImpl()); Resource resource = resourceSet.createResource(sourceURI); Collection<EObject> copiedRoots = EcoreUtil.copyAll(sourceContents); 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 6b1eecb5b9..70fda7b058 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 @@ -48,8 +48,8 @@ public class ImportResourceAction extends AbstractViewAction public ImportResourceAction(IWorkbenchPage page, CDOView view) { - super(page, TITLE + INTERACTIVE, - Messages.getString("ImportResourceAction.2"), SharedIcons.getDescriptor(SharedIcons.ETOOL_IMPORT), view); //$NON-NLS-1$ + super(page, TITLE + INTERACTIVE, Messages.getString("ImportResourceAction.2"), //$NON-NLS-1$ + SharedIcons.getDescriptor(SharedIcons.ETOOL_IMPORT), view); setId(ID); } 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 24646513cd..a77517155f 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 @@ -4,7 +4,7 @@ * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Eike Stepper - initial API and implementation * Victor Roldan Betancort - maintenance 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 002b201cd1..e816e191e9 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 @@ -4,7 +4,7 @@ * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Eike Stepper - initial API and implementation * Victor Roldan Betancort - maintenance 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 54d10bc742..6bdea6bd71 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 @@ -4,7 +4,7 @@ * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Eike Stepper - initial API and implementation * Victor Roldan Betancort - maintenance diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/MergeConflictsAction.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/MergeConflictsAction.java index 88132c4f33..4f5c7dc5e3 100644 --- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/MergeConflictsAction.java +++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/MergeConflictsAction.java @@ -4,7 +4,7 @@ * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Eike Stepper - initial API and implementation */ diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/NewTopLevelResourceNodeAction.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/NewTopLevelResourceNodeAction.java index beef49f580..ecb00f9167 100644 --- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/NewTopLevelResourceNodeAction.java +++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/NewTopLevelResourceNodeAction.java @@ -143,17 +143,17 @@ public class NewTopLevelResourceNodeAction extends AbstractViewAction */ public static enum Type { - FOLDER(Messages.getString("Title.Folder"), Messages.getString("Tooltip.Folder"), SharedIcons - .getDescriptor(SharedIcons.ETOOL_NEW_RESOURCE_FOLDER)), + FOLDER(Messages.getString("Title.Folder"), Messages.getString("Tooltip.Folder"), + SharedIcons.getDescriptor(SharedIcons.ETOOL_NEW_RESOURCE_FOLDER)), - MODEL(Messages.getString("Title.Model"), Messages.getString("Tooltip.Model"), SharedIcons - .getDescriptor(SharedIcons.ETOOL_NEW_RESOURCE)), + MODEL(Messages.getString("Title.Model"), Messages.getString("Tooltip.Model"), + SharedIcons.getDescriptor(SharedIcons.ETOOL_NEW_RESOURCE)), - TEXT(Messages.getString("Title.Text"), Messages.getString("Tooltip.Text"), SharedIcons - .getDescriptor(SharedIcons.ETOOL_NEW_TEXT_RESOURCE)), + TEXT(Messages.getString("Title.Text"), Messages.getString("Tooltip.Text"), + SharedIcons.getDescriptor(SharedIcons.ETOOL_NEW_TEXT_RESOURCE)), - BINARY(Messages.getString("Title.Binary"), Messages.getString("Tooltip.Binary"), SharedIcons - .getDescriptor(SharedIcons.ETOOL_NEW_BINARY_RESOURCE)); + BINARY(Messages.getString("Title.Binary"), Messages.getString("Tooltip.Binary"), + SharedIcons.getDescriptor(SharedIcons.ETOOL_NEW_BINARY_RESOURCE)); private String title; 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 4b54f56fe7..98fb5655e4 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 @@ -15,9 +15,9 @@ import org.eclipse.emf.cdo.eresource.CDOFileResource; import org.eclipse.emf.cdo.eresource.CDOResource; import org.eclipse.emf.cdo.eresource.CDOResourceLeaf; import org.eclipse.emf.cdo.internal.ui.CDOLobEditorInput; -import org.eclipse.emf.cdo.ui.CDOEditorUtil; import org.eclipse.emf.cdo.internal.ui.bundle.OM; import org.eclipse.emf.cdo.internal.ui.messages.Messages; +import org.eclipse.emf.cdo.ui.CDOEditorUtil; import org.eclipse.emf.cdo.view.CDOView; import org.eclipse.core.runtime.IProgressMonitor; @@ -40,8 +40,8 @@ public final class OpenResourceEditorAction extends ResourceNodeAction public OpenResourceEditorAction(IWorkbenchPage page, CDOResourceLeaf resource) { - super(page, resource instanceof CDOResource ? TITLE : FILE_TITLE, resource instanceof CDOResource ? TOOL_TIP - : FILE_TOOL_TIP, null, resource); + super(page, resource instanceof CDOResource ? TITLE : FILE_TITLE, + resource instanceof CDOResource ? TOOL_TIP : FILE_TOOL_TIP, null, resource); } @Override diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ReadLockObjectsAction.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ReadLockObjectsAction.java index 55740fd6de..326fb1e140 100644 --- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ReadLockObjectsAction.java +++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ReadLockObjectsAction.java @@ -4,7 +4,7 @@ * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Simon McDuff - initial API and implementation * Eike Stepper - maintenance 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 80af988197..fac1b929ea 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 @@ -4,7 +4,7 @@ * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Eike Stepper - initial API and implementation * Victor Roldan Betancort - maintenance @@ -38,9 +38,10 @@ public class RegisterFilesystemPackagesAction extends RegisterPackagesAction private static final String TOOL_TIP = Messages.getString("RegisterFilesystemPackagesAction.1"); //$NON-NLS-1$ - private static final String[] FILTER_NAMES = { - Messages.getString("RegisterFilesystemPackagesAction.2"), Messages.getString("RegisterFilesystemPackagesAction.3"), Messages.getString("RegisterFilesystemPackagesAction.4"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - Messages.getString("RegisterFilesystemPackagesAction.5") }; //$NON-NLS-1$ + private static final String[] FILTER_NAMES = { Messages.getString("RegisterFilesystemPackagesAction.2"), //$NON-NLS-1$ + Messages.getString("RegisterFilesystemPackagesAction.3"), //$NON-NLS-1$ + Messages.getString("RegisterFilesystemPackagesAction.4"), //$NON-NLS-1$ + Messages.getString("RegisterFilesystemPackagesAction.5") }; //$NON-NLS-1$ private static final String[] FILTER_EXTENSIONS = { "ecore", "xmi", "xml", null }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ 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 24d465f1bd..e5b39fb8f0 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 @@ -47,10 +47,9 @@ public class RegisterGeneratedPackagesAction extends RegisterPackagesAction protected List<EPackage> getEPackages(IWorkbenchPage page, CDOSession session) { Shell shell = page.getWorkbenchWindow().getShell(); - SelectPackageDialog dialog = new SelectPackageDialog(shell, - Messages.getString("RegisterGeneratedPackagesAction.2"), //$NON-NLS-1$ + SelectPackageDialog dialog = new SelectPackageDialog(shell, Messages.getString("RegisterGeneratedPackagesAction.2"), //$NON-NLS-1$ Messages.getString("RegisterGeneratedPackagesAction.3"), session.getPackageRegistry() //$NON-NLS-1$ - .keySet()); + .keySet()); if (dialog.open() == SelectPackageDialog.OK) { @@ -87,8 +86,8 @@ public class RegisterGeneratedPackagesAction extends RegisterPackagesAction return ""; //$NON-NLS-1$ } - return registry.containsKey(uri) ? null : MessageFormat.format( - Messages.getString("RegisterGeneratedPackagesAction.5"), uri); //$NON-NLS-1$ + return registry.containsKey(uri) ? null + : MessageFormat.format(Messages.getString("RegisterGeneratedPackagesAction.5"), uri); //$NON-NLS-1$ } } } 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 105c2ae5b2..c9453f073f 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 @@ -4,7 +4,7 @@ * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Eike Stepper - initial API and implementation * Victor Roldan Betancort - maintenance @@ -87,7 +87,8 @@ public abstract class RegisterPackagesAction extends SessionAction postRegistration(ePackages); if (errors != 0) { - final String label = errors == 1 ? MessageFormat.format(Messages.getString("RegisterPackagesAction.1"), errors) : MessageFormat.format(Messages.getString("RegisterPackagesAction.2"), errors); //$NON-NLS-1$ //$NON-NLS-2$ + final String label = errors == 1 ? MessageFormat.format(Messages.getString("RegisterPackagesAction.1"), errors) //$NON-NLS-1$ + : MessageFormat.format(Messages.getString("RegisterPackagesAction.2"), errors); //$NON-NLS-1$ getDisplay().asyncExec(new Runnable() { public void run() 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 226c9a615b..8557311221 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 @@ -4,7 +4,7 @@ * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Eike Stepper - initial API and implementation * Victor Roldan Betancort - maintenance @@ -36,8 +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), //$NON-NLS-1$ + session); this.packageURI = packageURI; } diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/RemoveAllContainerItemAction.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/RemoveAllContainerItemAction.java index bb21265f22..0f864659d3 100644 --- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/RemoveAllContainerItemAction.java +++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/RemoveAllContainerItemAction.java @@ -4,7 +4,7 @@ * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Eike Stepper - initial API and implementation */ diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/RemoveContainerItemAction.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/RemoveContainerItemAction.java index 05e26b1c29..964333b669 100644 --- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/RemoveContainerItemAction.java +++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/RemoveContainerItemAction.java @@ -4,7 +4,7 @@ * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Victor Roldan Betancort - initial API and implementation * Eike Stepper - maintenance diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ResourceNodeAction.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ResourceNodeAction.java index b77fff2507..2c5a90ff90 100644 --- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ResourceNodeAction.java +++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ResourceNodeAction.java @@ -4,7 +4,7 @@ * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Eike Stepper - initial API and implementation */ diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ResourceNodeNameInputValidator.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ResourceNodeNameInputValidator.java index c06c4c004e..0b9b75da9f 100644 --- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ResourceNodeNameInputValidator.java +++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/ResourceNodeNameInputValidator.java @@ -60,7 +60,8 @@ public class ResourceNodeNameInputValidator implements IInputValidator if (child.getName().equals(newText)) { - return isFolder ? Messages.getString("NewResourceNodeAction.5") + " " + newText : Messages.getString("NewResourceNodeAction.6") //$NON-NLS-1$ //$NON-NLS-2$ + return isFolder ? Messages.getString("NewResourceNodeAction.5") + " " + newText //$NON-NLS-1$ //$NON-NLS-2$ + : Messages.getString("NewResourceNodeAction.6") + " " + newText; } } 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 d7b4ec2397..c2901fdd0d 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 @@ -4,7 +4,7 @@ * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Eike Stepper - initial API and implementation * Victor Roldan Betancort - maintenance 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 7bac527007..3e0eee34ec 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 @@ -4,7 +4,7 @@ * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Eike Stepper - initial API and implementation */ diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/WriteLockObjectsAction.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/WriteLockObjectsAction.java index e0c25e2816..3b6d8cdff4 100644 --- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/WriteLockObjectsAction.java +++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/WriteLockObjectsAction.java @@ -4,7 +4,7 @@ * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Simon McDuff - initial API and implementation * Eike Stepper - maintenance diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/delegates/ExportResourceActionDelegate.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/delegates/ExportResourceActionDelegate.java index d4eb247b60..6af97d46f8 100644 --- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/delegates/ExportResourceActionDelegate.java +++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/delegates/ExportResourceActionDelegate.java @@ -55,8 +55,8 @@ public class ExportResourceActionDelegate extends TransactionalBackgroundActionD @Override protected final CDOObject preRun(CDOObject object) { - ResourceDialog dialog = new ResourceDialog(new Shell(), - Messages.getString("ExportSelectedResourceAction_1"), SWT.SAVE); //$NON-NLS-1$ + ResourceDialog dialog = new ResourceDialog(new Shell(), Messages.getString("ExportSelectedResourceAction_1"), //$NON-NLS-1$ + SWT.SAVE); if (dialog.open() == ImportResourceDialog.OK) { List<URI> uris = dialog.getURIs(); @@ -95,8 +95,8 @@ public class ExportResourceActionDelegate extends TransactionalBackgroundActionD { // Target Resource ResourceSet resourceSet = new ResourceSetImpl(); - resourceSet.getResourceFactoryRegistry().getExtensionToFactoryMap() - .put(Resource.Factory.Registry.DEFAULT_EXTENSION, new XMIResourceFactoryImpl()); + resourceSet.getResourceFactoryRegistry().getExtensionToFactoryMap().put(Resource.Factory.Registry.DEFAULT_EXTENSION, + new XMIResourceFactoryImpl()); Resource resource = resourceSet.createResource(targetURI); Collection<EObject> copiedRoots = EcoreUtil.copyAll(sourceContents); diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/delegates/NewResourceNodeActionDelegate.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/delegates/NewResourceNodeActionDelegate.java index 3daa305827..e97607a99f 100644 --- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/delegates/NewResourceNodeActionDelegate.java +++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/delegates/NewResourceNodeActionDelegate.java @@ -38,10 +38,9 @@ public abstract class NewResourceNodeActionDelegate extends TransactionalBackgro @Override protected CDOObject preRun(CDOObject object) { - InputDialog dialog = new InputDialog( - getTargetPart().getSite().getShell(), - getText(), - Messages.getString("NewResourceNodeAction_0"), null, new ResourceNodeNameInputValidator((CDOResourceNode)object)); //$NON-NLS-1$ + InputDialog dialog = new InputDialog(getTargetPart().getSite().getShell(), getText(), + Messages.getString("NewResourceNodeAction_0"), null, //$NON-NLS-1$ + new ResourceNodeNameInputValidator((CDOResourceNode)object)); if (dialog.open() == Dialog.OK) { setNewResourceNode(createNewResourceNode()); diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/delegates/RemoveResourceActionDelegate.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/delegates/RemoveResourceActionDelegate.java index 9823785330..eb1ad21c3d 100644 --- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/delegates/RemoveResourceActionDelegate.java +++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/delegates/RemoveResourceActionDelegate.java @@ -73,7 +73,7 @@ public class RemoveResourceActionDelegate implements IObjectActionDelegate Messages.getString("RemoveResourceAction_2"), nodes.size()))) //$NON-NLS-1$ { Job job = new Job(Messages.getString("RemoveResourceAction_3")) //$NON-NLS-1$ - { + { @Override protected IStatus run(IProgressMonitor monitor) { @@ -114,8 +114,8 @@ public class RemoveResourceActionDelegate 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"), //$NON-NLS-1$ + this.getClass().getName().toString()), ex); } finally { @@ -124,12 +124,13 @@ public class RemoveResourceActionDelegate implements IObjectActionDelegate } // UIUtil.setStatusBarMessage( - // MessageFormat.format(Messages.getString("RemoveResourceAction_5"), nodes.size()), getDeleteIcon()); //$NON-NLS-1$ + // MessageFormat.format(Messages.getString("RemoveResourceAction_5"), nodes.size()), getDeleteIcon()); + // //$NON-NLS-1$ return Status.OK_STATUS; } - }; + }; - job.schedule(); + job.schedule(); } } } diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/delegates/RenameResourceActionDelegate.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/delegates/RenameResourceActionDelegate.java index f80b461883..d479f0d188 100644 --- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/delegates/RenameResourceActionDelegate.java +++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/delegates/RenameResourceActionDelegate.java @@ -37,10 +37,9 @@ public class RenameResourceActionDelegate extends TransactionalBackgroundActionD @Override protected CDOObject preRun(CDOObject object) { - InputDialog dialog = new InputDialog( - getTargetPart().getSite().getShell(), - getText(), - Messages.getString("NewResourceNodeAction_0"), null, new ResourceNodeNameInputValidator((CDOResourceNode)object)); //$NON-NLS-1$ + InputDialog dialog = new InputDialog(getTargetPart().getSite().getShell(), getText(), + Messages.getString("NewResourceNodeAction_0"), null, //$NON-NLS-1$ + new ResourceNodeNameInputValidator((CDOResourceNode)object)); if (dialog.open() == Dialog.OK) { setNewResourceName(dialog.getValue()); diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/delegates/TransactionalBackgroundActionDelegate.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/delegates/TransactionalBackgroundActionDelegate.java index 771710b132..f98316cc85 100644 --- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/delegates/TransactionalBackgroundActionDelegate.java +++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/delegates/TransactionalBackgroundActionDelegate.java @@ -34,8 +34,8 @@ import java.text.MessageFormat; * @author Victor Roldan Betancort */ @Deprecated -public abstract class TransactionalBackgroundActionDelegate extends LongRunningActionDelegate implements - IObjectActionDelegate +public abstract class TransactionalBackgroundActionDelegate extends LongRunningActionDelegate + implements IObjectActionDelegate { private IWorkbenchPart targetPart; @@ -83,8 +83,8 @@ public abstract class TransactionalBackgroundActionDelegate extends LongRunningA CDOView view = transactionalObject.cdoView(); if (view.isReadOnly()) { - 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/bundle/OM.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/bundle/OM.java index da92a4ca0b..4c8e745c1d 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 @@ -49,25 +49,25 @@ public abstract class OM public static final OMPreferences PREFS = BUNDLE.preferences(); public static final OMPreference<String> PREF_LABEL_DECORATION = // - PREFS.init("PREF_LABEL_DECORATION", CDOLabelDecorator.DEFAULT_DECORATION); //$NON-NLS-1$ + PREFS.init("PREF_LABEL_DECORATION", CDOLabelDecorator.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.init("PREF_HISTORY_CONNECTORS", new String[] { "tcp://localhost" }); //$NON-NLS-1$ + PREFS.init("PREF_HISTORY_CONNECTORS", new String[] { "tcp://localhost" }); //$NON-NLS-1$ public static final OMPreference<String[]> PREF_HISTORY_REPOSITORIES = // - PREFS.init("PREF_HISTORY_REPOSITORIES", new String[] { "repo1" }); //$NON-NLS-1$ + PREFS.init("PREF_HISTORY_REPOSITORIES", new String[] { "repo1" }); //$NON-NLS-1$ public static final OMPreference<Boolean> PREF_AUTOMATIC_PACKAGE_REGISTRY = // - PREFS.init("PREF_AUTOMATIC_PACKAGE_REGISTRY", true); //$NON-NLS-1$ + PREFS.init("PREF_AUTOMATIC_PACKAGE_REGISTRY", true); //$NON-NLS-1$ public static final OMPreference<Boolean> PREF_LEGACY_MODE_DEFAULT = // - PREFS.init("PREF_LEGACY_MODE_DEFAULT", true); //$NON-NLS-1$ + PREFS.init("PREF_LEGACY_MODE_DEFAULT", true); //$NON-NLS-1$ public static final OMPreference<Boolean> PREF_EDITOR_AUTO_RELOAD = // - PREFS.init("PREF_EDITOR_AUTO_RELOAD", true); //$NON-NLS-1$ + PREFS.init("PREF_EDITOR_AUTO_RELOAD", true); //$NON-NLS-1$ public static Image getOverlayImage(Object image, Object overlayImage, int x, int y) { diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/EditObjectDialog.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/EditObjectDialog.java index 210246107e..e085aac328 100644 --- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/EditObjectDialog.java +++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/EditObjectDialog.java @@ -69,8 +69,8 @@ public class EditObjectDialog extends TitleAreaDialog try { - ViewModelContext viewModelContext = ViewModelContextFactory.INSTANCE.createViewModelContext( - ViewProviderHelper.getView(eObject, null), eObject, new DefaultReferenceService()); + ViewModelContext viewModelContext = ViewModelContextFactory.INSTANCE + .createViewModelContext(ViewProviderHelper.getView(eObject, null), eObject, new DefaultReferenceService()); ECPSWTViewRenderer.INSTANCE.render(container, viewModelContext); } diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/ExportResourceDialog.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/ExportResourceDialog.java index bb9e061f6c..0a04660943 100644 --- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/ExportResourceDialog.java +++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/ExportResourceDialog.java @@ -4,7 +4,7 @@ * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Eike Stepper - initial API and implementation * Victor Roldan Betancort - bug 244801 diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/PackageRegistryDialog.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/PackageRegistryDialog.java index e47c966ef2..14d3fd5338 100644 --- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/PackageRegistryDialog.java +++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/PackageRegistryDialog.java @@ -147,21 +147,21 @@ public class PackageRegistryDialog extends TitleAreaDialog }); createButton(parent, -1, Messages.getString("PackageRegistryDialog.7"), false) //$NON-NLS-1$ - .addSelectionListener(new SelectionAdapter() + .addSelectionListener(new SelectionAdapter() + { + @Override + public void widgetSelected(SelectionEvent e) + { + new RegisterFilesystemPackagesAction(page, session) { @Override - public void widgetSelected(SelectionEvent e) + protected void postRegistration(List<EPackage> ePackages) { - new RegisterFilesystemPackagesAction(page, session) - { - @Override - protected void postRegistration(List<EPackage> ePackages) - { - refreshViewer(); - } - }.run(); + refreshViewer(); } - }); + }.run(); + } + }); CustomizeableComposite.customize(parent, IPluginContainer.INSTANCE, PRODUCT_GROUP, this); diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/RollbackTransactionDialog.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/RollbackTransactionDialog.java index 7f19286889..568872acbc 100644 --- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/RollbackTransactionDialog.java +++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/RollbackTransactionDialog.java @@ -77,12 +77,12 @@ public class RollbackTransactionDialog extends TitleAreaDialog StringBuilder builder = new StringBuilder(); builder.append(Messages.getString("RollbackTransactionDialog.0")); //$NON-NLS-1$ - append(builder, transaction.getNewObjects().size(), - Messages.getString("RollbackTransactionDialog.4"), Messages.getString("RollbackTransactionDialog.5")); //$NON-NLS-1$ //$NON-NLS-2$ - append(builder, transaction.getDirtyObjects().size(), - Messages.getString("RollbackTransactionDialog.6"), Messages.getString("RollbackTransactionDialog.7")); //$NON-NLS-1$ //$NON-NLS-2$ - append(builder, transaction.getDetachedObjects().size(), - Messages.getString("RollbackTransactionDialog.8"), Messages.getString("RollbackTransactionDialog.9")); //$NON-NLS-1$ //$NON-NLS-2$ + append(builder, transaction.getNewObjects().size(), Messages.getString("RollbackTransactionDialog.4"), //$NON-NLS-1$ + Messages.getString("RollbackTransactionDialog.5")); //$NON-NLS-1$ + append(builder, transaction.getDirtyObjects().size(), Messages.getString("RollbackTransactionDialog.6"), //$NON-NLS-1$ + Messages.getString("RollbackTransactionDialog.7")); //$NON-NLS-1$ + append(builder, transaction.getDetachedObjects().size(), Messages.getString("RollbackTransactionDialog.8"), //$NON-NLS-1$ + Messages.getString("RollbackTransactionDialog.9")); //$NON-NLS-1$ builder.append("\n\n"); //$NON-NLS-1$ builder.append(Messages.getString("RollbackTransactionDialog.11")); //$NON-NLS-1$ 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 0c74e4612d..35fed30e7f 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 @@ -4,7 +4,7 @@ * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Eike Stepper - initial API and implementation * Victor Roldan Betancort - maintenance @@ -54,7 +54,8 @@ public class SelectPackageDialog extends BaseDialog<CheckboxTableViewer> public SelectPackageDialog(Shell shell, String title, String message, Set<String> excludedURIs) { - super(shell, DEFAULT_SHELL_STYLE | SWT.APPLICATION_MODAL, title, message, OM.Activator.INSTANCE.getDialogSettings()); + super(shell, DEFAULT_SHELL_STYLE | SWT.APPLICATION_MODAL, title, message, + OM.Activator.INSTANCE.getDialogSettings()); this.excludedURIs = excludedURIs; } 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 c0f1b11584..5164423573 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 @@ -163,7 +163,7 @@ public class CDOActionBarContributor extends EditingDomainActionBarContributor i /** * This is the menu manager into which menu contribution items should be added for CreateChild actions. <!-- * begin-user-doc --> <!-- end-user-doc --> - * + * * @generated */ protected IMenuManager createChildMenuManager; @@ -179,14 +179,14 @@ public class CDOActionBarContributor extends EditingDomainActionBarContributor i /** * This is the menu manager into which menu contribution items should be added for CreateSibling actions. <!-- * begin-user-doc --> <!-- end-user-doc --> - * + * * @generated */ protected IMenuManager createSiblingMenuManager; /** * This creates an instance of the contributor. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * * @generated NOT */ public CDOActionBarContributor() @@ -264,7 +264,7 @@ public class CDOActionBarContributor extends EditingDomainActionBarContributor i /** * When the active editor changes, this remembers the change and registers with it as a selection provider. <!-- * begin-user-doc --> <!-- end-user-doc --> - * + * * @generated */ @Override @@ -430,7 +430,7 @@ public class CDOActionBarContributor extends EditingDomainActionBarContributor i * This generates a {@link org.eclipse.emf.edit.ui.action.CreateChildAction} for each object in * <code>descriptors</code>, and returns the collection of these actions. <!-- begin-user-doc --> <!-- end-user-doc * --> - * + * * @generated */ protected Collection<IAction> generateCreateChildActions(Collection<?> descriptors, ISelection selection) @@ -450,7 +450,7 @@ public class CDOActionBarContributor extends EditingDomainActionBarContributor i * This generates a {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction} for each object in * <code>descriptors</code>, and returns the collection of these actions. <!-- begin-user-doc --> <!-- end-user-doc * --> - * + * * @generated */ protected Collection<IAction> generateCreateSiblingActions(Collection<?> descriptors, ISelection selection) @@ -497,7 +497,7 @@ public class CDOActionBarContributor extends EditingDomainActionBarContributor i * This removes from the specified <code>manager</code> all {@link org.eclipse.jface.action.ActionContributionItem}s * based on the {@link org.eclipse.jface.action.IAction}s contained in the <code>actions</code> collection. <!-- * begin-user-doc --> <!-- end-user-doc --> - * + * * @generated */ protected void depopulateManager(IContributionManager manager, Collection<? extends IAction> 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 f948d06d7f..aee38dbee4 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 @@ -179,8 +179,8 @@ import java.util.Map; * @author Eike Stepper * @generated */ -public class CDOEditor extends MultiPageEditorPart implements IEditingDomainProvider, ISelectionProvider, - IMenuListener, IViewerProvider +public class CDOEditor extends MultiPageEditorPart + implements IEditingDomainProvider, ISelectionProvider, IMenuListener, IViewerProvider { /** * The filters for file extensions supported by the editor. @@ -1101,16 +1101,16 @@ public class CDOEditor extends MultiPageEditorPart implements IEditingDomainProv { if (!resource.getErrors().isEmpty() || !resource.getWarnings().isEmpty()) { - BasicDiagnostic basicDiagnostic = new BasicDiagnostic(Diagnostic.ERROR, "org.eclipse.emf.cdo.ui", 0, getString( - "_UI_CreateModelError_message", resource.getURI()), new Object[] { exception == null ? (Object)resource - : exception }); + BasicDiagnostic basicDiagnostic = new BasicDiagnostic(Diagnostic.ERROR, "org.eclipse.emf.cdo.ui", 0, + getString("_UI_CreateModelError_message", resource.getURI()), + new Object[] { exception == null ? (Object)resource : exception }); basicDiagnostic.merge(EcoreUtil.computeDiagnostic(resource, true)); return basicDiagnostic; } else if (exception != null) { - return new BasicDiagnostic(Diagnostic.ERROR, "org.eclipse.emf.cdo.ui", 0, getString( - "_UI_CreateModelError_message", resource.getURI()), new Object[] { exception }); + return new BasicDiagnostic(Diagnostic.ERROR, "org.eclipse.emf.cdo.ui", 0, + getString("_UI_CreateModelError_message", resource.getURI()), new Object[] { exception }); } else { @@ -2098,8 +2098,8 @@ public class CDOEditor extends MultiPageEditorPart implements IEditingDomainProv */ public void setStatusLineManager(ISelection selection) { - IStatusLineManager statusLineManager = currentViewer != null && currentViewer == contentOutlineViewer ? contentOutlineStatusLineManager - : getActionBars().getStatusLineManager(); + IStatusLineManager statusLineManager = currentViewer != null && currentViewer == contentOutlineViewer + ? contentOutlineStatusLineManager : getActionBars().getStatusLineManager(); if (statusLineManager != null) { @@ -2184,8 +2184,8 @@ public class CDOEditor extends MultiPageEditorPart implements IEditingDomainProv if (!features.isEmpty()) { final IWorkbenchPage page = getSite().getPage(); - menuManager.insertBefore( - "edit", new LongRunningAction(page, Messages.getString("CDOEditor.26") + SafeAction.INTERACTIVE) //$NON-NLS-1$ //$NON-NLS-2$ + menuManager.insertBefore("edit", //$NON-NLS-1$ + new LongRunningAction(page, Messages.getString("CDOEditor.26") + SafeAction.INTERACTIVE) //$NON-NLS-1$ { protected EReference feature; @@ -2599,8 +2599,8 @@ public class CDOEditor extends MultiPageEditorPart implements IEditingDomainProv final MenuManager submenuManager = new MenuManager(nsURI, imageDescriptor, nsURI); submenuManager.setRemoveAllWhenShown(true); submenuManager.add(new Action(Messages.getString("CDOEditor.27")) //$NON-NLS-1$ - { - }); + { + }); submenuManager.addMenuListener(new IMenuListener() { @@ -2669,8 +2669,8 @@ public class CDOEditor extends MultiPageEditorPart implements IEditingDomainProv protected CreateRootAction(EObject object) { - super(getEditorSite().getPage(), object.eClass().getName(), ExtendedImageRegistry.getInstance() - .getImageDescriptor(getLabelImage(adapterFactory, object))); + super(getEditorSite().getPage(), object.eClass().getName(), + ExtendedImageRegistry.getInstance().getImageDescriptor(getLabelImage(adapterFactory, object))); this.object = object; } diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/editor/EditorEditorAdvisor.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/editor/EditorEditorAdvisor.java index f5b76663c6..bda7fd45bf 100644 --- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/editor/EditorEditorAdvisor.java +++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/editor/EditorEditorAdvisor.java @@ -429,8 +429,8 @@ public final class EditorEditorAdvisor extends WorkbenchAdvisor */ public void run(IAction action) { - LoadResourceAction.LoadResourceDialog loadResourceDialog = new LoadResourceAction.LoadResourceDialog(getWindow() - .getShell()); + LoadResourceAction.LoadResourceDialog loadResourceDialog = new LoadResourceAction.LoadResourceDialog( + getWindow().getShell()); if (Window.OK == loadResourceDialog.open()) { for (URI uri : loadResourceDialog.getURIs()) diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/editor/PluginDelegator.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/editor/PluginDelegator.java index 15ad3d00c7..dc645b9e32 100644 --- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/editor/PluginDelegator.java +++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/editor/PluginDelegator.java @@ -4,7 +4,7 @@ * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Eike Stepper - initial API and implementation */ diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/history/Net.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/history/Net.java index fb8e1b2fbf..c1975c1560 100644 --- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/history/Net.java +++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/history/Net.java @@ -29,12 +29,12 @@ import java.util.WeakHashMap; public class Net { private static final RGB[] RGBS = new RGB[] { new RGB(133, 166, 214), new RGB(221, 205, 93), new RGB(199, 134, 57), - new RGB(131, 150, 98), new RGB(197, 123, 127), new RGB(139, 136, 140), new RGB(48, 135, 144), - new RGB(190, 93, 66), new RGB(143, 163, 54), new RGB(180, 148, 74), new RGB(101, 101, 217), - new RGB(72, 153, 119), new RGB(23, 101, 160), new RGB(132, 164, 118), new RGB(255, 230, 59), - new RGB(136, 176, 70), new RGB(255, 138, 1), new RGB(123, 187, 95), new RGB(233, 88, 98), new RGB(93, 158, 254), - new RGB(175, 215, 0), new RGB(140, 134, 142), new RGB(232, 168, 21), new RGB(0, 172, 191), new RGB(251, 58, 4), - new RGB(63, 64, 255), new RGB(27, 194, 130), new RGB(0, 104, 183) }; + new RGB(131, 150, 98), new RGB(197, 123, 127), new RGB(139, 136, 140), new RGB(48, 135, 144), + new RGB(190, 93, 66), new RGB(143, 163, 54), new RGB(180, 148, 74), new RGB(101, 101, 217), new RGB(72, 153, 119), + new RGB(23, 101, 160), new RGB(132, 164, 118), new RGB(255, 230, 59), new RGB(136, 176, 70), new RGB(255, 138, 1), + new RGB(123, 187, 95), new RGB(233, 88, 98), new RGB(93, 158, 254), new RGB(175, 215, 0), new RGB(140, 134, 142), + new RGB(232, 168, 21), new RGB(0, 172, 191), new RGB(251, 58, 4), new RGB(63, 64, 255), new RGB(27, 194, 130), + new RGB(0, 104, 183) }; private static final Segment[] NO_SEGMENTS = {}; diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/messages/Messages.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/messages/Messages.java index 9b00a51456..2b95832ba1 100644 --- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/messages/Messages.java +++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/messages/Messages.java @@ -4,7 +4,7 @@ * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Victor Roldan Betancort - initial API and implementation * Eike Stepper - maintenance 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 8ac97d14e2..ecff261cf3 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 @@ -101,12 +101,12 @@ public class CDOPreferencePage extends OMPreferencePage repositoryName.setText(org.eclipse.emf.internal.cdo.bundle.OM.PREF_REPOSITORY_NAME.getValue()); userName.setText(org.eclipse.emf.internal.cdo.bundle.OM.PREF_USER_NAME.getValue()); connectorDescription.setText(org.eclipse.emf.internal.cdo.bundle.OM.PREF_CONNECTOR_DESCRIPTION.getValue()); - referenceChunkSize.setValue(String - .valueOf(org.eclipse.emf.internal.cdo.bundle.OM.PREF_COLLECTION_LOADING_CHUNK_SIZE.getValue())); - preloadChunkSize.setValue(String.valueOf(org.eclipse.emf.internal.cdo.bundle.OM.PREF_REVISION_LOADING_CHUNK_SIZE - .getValue())); - invalidationNotifications.setSelection(org.eclipse.emf.internal.cdo.bundle.OM.PREF_ENABLE_INVALIDATION_NOTIFICATION - .getValue()); + referenceChunkSize + .setValue(String.valueOf(org.eclipse.emf.internal.cdo.bundle.OM.PREF_COLLECTION_LOADING_CHUNK_SIZE.getValue())); + preloadChunkSize + .setValue(String.valueOf(org.eclipse.emf.internal.cdo.bundle.OM.PREF_REVISION_LOADING_CHUNK_SIZE.getValue())); + invalidationNotifications + .setSelection(org.eclipse.emf.internal.cdo.bundle.OM.PREF_ENABLE_INVALIDATION_NOTIFICATION.getValue()); } @Override @@ -116,12 +116,12 @@ public class CDOPreferencePage extends OMPreferencePage org.eclipse.emf.internal.cdo.bundle.OM.PREF_REPOSITORY_NAME.setValue(repositoryName.getText()); org.eclipse.emf.internal.cdo.bundle.OM.PREF_USER_NAME.setValue(userName.getText()); org.eclipse.emf.internal.cdo.bundle.OM.PREF_CONNECTOR_DESCRIPTION.setValue(connectorDescription.getText()); - org.eclipse.emf.internal.cdo.bundle.OM.PREF_COLLECTION_LOADING_CHUNK_SIZE.setValue(Integer - .parseInt(referenceChunkSize.getValue())); - org.eclipse.emf.internal.cdo.bundle.OM.PREF_REVISION_LOADING_CHUNK_SIZE.setValue(Integer.parseInt(preloadChunkSize - .getValue())); - org.eclipse.emf.internal.cdo.bundle.OM.PREF_ENABLE_INVALIDATION_NOTIFICATION.setValue(invalidationNotifications - .getSelection()); + org.eclipse.emf.internal.cdo.bundle.OM.PREF_COLLECTION_LOADING_CHUNK_SIZE + .setValue(Integer.parseInt(referenceChunkSize.getValue())); + org.eclipse.emf.internal.cdo.bundle.OM.PREF_REVISION_LOADING_CHUNK_SIZE + .setValue(Integer.parseInt(preloadChunkSize.getValue())); + org.eclipse.emf.internal.cdo.bundle.OM.PREF_ENABLE_INVALIDATION_NOTIFICATION + .setValue(invalidationNotifications.getSelection()); return super.performOk(); } } diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/views/CDORemoteSessionsView.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/views/CDORemoteSessionsView.java index 897e414ee7..d6c4d4289b 100644 --- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/views/CDORemoteSessionsView.java +++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/views/CDORemoteSessionsView.java @@ -159,8 +159,8 @@ public class CDORemoteSessionsView extends ContainerView.Default<CDORemoteSessio CDORemoteSession remoteSession = (CDORemoteSession)element; if (remoteSession.isSubscribed()) { - InputDialog dlg = new InputDialog(getShell(), MessageFormat.format( - Messages.getString("CDORemoteSessionsView_1"), remoteSession), //$NON-NLS-1$ + InputDialog dlg = new InputDialog(getShell(), + MessageFormat.format(Messages.getString("CDORemoteSessionsView_1"), remoteSession), //$NON-NLS-1$ Messages.getString("CDORemoteSessionsView_2"), "", null); //$NON-NLS-1$ //$NON-NLS-2$ if (dlg.open() == InputDialog.OK) { diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/views/CDOWatchListView.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/views/CDOWatchListView.java index f8183d5bf9..fe88701d6d 100644 --- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/views/CDOWatchListView.java +++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/views/CDOWatchListView.java @@ -94,8 +94,9 @@ import java.util.concurrent.atomic.AtomicLong; */ public class CDOWatchListView extends ViewPart implements ISelectionProvider { - private static final String[] columnNames = { - Messages.getString("CDOWatchListView.0"), Messages.getString("CDOWatchListView.1"), Messages.getString("CDOWatchListView.2"), Messages.getString("CDOWatchListView.3") }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ + private static final String[] columnNames = { Messages.getString("CDOWatchListView.0"), //$NON-NLS-1$ + Messages.getString("CDOWatchListView.1"), Messages.getString("CDOWatchListView.2"), //$NON-NLS-1$ //$NON-NLS-2$ + Messages.getString("CDOWatchListView.3") }; //$NON-NLS-1$ private static final int[] columnWidths = { 110, 280, 170, 230 }; @@ -181,15 +182,15 @@ public class CDOWatchListView extends ViewPart implements ISelectionProvider resetNotificationAction = new ResetNotificationAction(); resetNotificationAction.setText(Messages.getString("CDOWatchListView.8")); //$NON-NLS-1$ resetNotificationAction.setImageDescriptor(platformImages.getImageDescriptor(ISharedImages.IMG_TOOL_UNDO)); - resetNotificationAction.setDisabledImageDescriptor(platformImages - .getImageDescriptor(ISharedImages.IMG_TOOL_UNDO_DISABLED)); + resetNotificationAction + .setDisabledImageDescriptor(platformImages.getImageDescriptor(ISharedImages.IMG_TOOL_UNDO_DISABLED)); resetNotificationAction.setToolTipText(Messages.getString("CDOWatchListView.9")); //$NON-NLS-1$ resetAllNotificationAction = new ResetAllNotificationAction(); resetAllNotificationAction.setText(Messages.getString("CDOWatchListView.10")); //$NON-NLS-1$ resetAllNotificationAction.setImageDescriptor(platformImages.getImageDescriptor(ISharedImages.IMG_TOOL_UNDO)); - resetAllNotificationAction.setDisabledImageDescriptor(platformImages - .getImageDescriptor(ISharedImages.IMG_TOOL_UNDO_DISABLED)); + resetAllNotificationAction + .setDisabledImageDescriptor(platformImages.getImageDescriptor(ISharedImages.IMG_TOOL_UNDO_DISABLED)); resetAllNotificationAction.setToolTipText(Messages.getString("CDOWatchListView.11")); //$NON-NLS-1$ } @@ -398,7 +399,7 @@ public class CDOWatchListView extends ViewPart implements ISelectionProvider /** * @author Victor Roldan Betancort */ - private final class CDOObjectContainer extends Container<CDOObject> implements IContainer.Modifiable<CDOObject> + private final class CDOObjectContainer extends Container<CDOObject>implements IContainer.Modifiable<CDOObject> { private Set<CDOObject> watchedObjects = new HashSet<CDOObject>(); @@ -762,13 +763,16 @@ public class CDOWatchListView extends ViewPart implements ISelectionProvider /** * @author Victor Roldan Betancort */ - private final class CDOSubscriptionViewLabelProvider extends LabelProvider implements ITableLabelProvider, - IColorProvider + private final class CDOSubscriptionViewLabelProvider extends LabelProvider + implements ITableLabelProvider, IColorProvider { private final Color YELLOW = UIUtil.getDisplay().getSystemColor(SWT.COLOR_YELLOW); - private final String[] eventTypes = { - Messages.getString("CDOWatchListView.12"), Messages.getString("CDOWatchListView.25"), Messages.getString("CDOWatchListView.26"), Messages.getString("CDOWatchListView.27"), Messages.getString("CDOWatchListView.28"), Messages.getString("CDOWatchListView.29"), Messages.getString("CDOWatchListView.30"), Messages.getString("CDOWatchListView.31"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ + private final String[] eventTypes = { Messages.getString("CDOWatchListView.12"), //$NON-NLS-1$ + Messages.getString("CDOWatchListView.25"), Messages.getString("CDOWatchListView.26"), //$NON-NLS-1$ //$NON-NLS-2$ + Messages.getString("CDOWatchListView.27"), Messages.getString("CDOWatchListView.28"), //$NON-NLS-1$ //$NON-NLS-2$ + Messages.getString("CDOWatchListView.29"), Messages.getString("CDOWatchListView.30"), //$NON-NLS-1$ //$NON-NLS-2$ + Messages.getString("CDOWatchListView.31"), //$NON-NLS-1$ Messages.getString("CDOWatchListView.32"), Messages.getString("CDOWatchListView.33") }; //$NON-NLS-1$ //$NON-NLS-2$ private AdapterFactory adapterFactory; diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOEditorInput.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOEditorInput.java index 2828d4b680..3d100f7852 100644 --- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOEditorInput.java +++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOEditorInput.java @@ -4,7 +4,7 @@ * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Victor Roldan Betancort - initial API and implementation * Eike Stepper - maintenance @@ -22,7 +22,7 @@ import org.eclipse.ui.IEditorInput; * <p> * For related operations, see * {@link org.eclipse.emf.cdo.ui.CDOEditorUtil#createCDOEditorInput(CDOView, String, boolean) CDOEditorUtil} - * + * * @author Victor Roldan Betancort * @since 2.0 * @see org.eclipse.ui.IEditorInput diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOInteractiveExceptionHandler.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOInteractiveExceptionHandler.java index 0c89c0a17b..dda01f7bb7 100644 --- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOInteractiveExceptionHandler.java +++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOInteractiveExceptionHandler.java @@ -152,9 +152,10 @@ public class CDOInteractiveExceptionHandler implements CDOSession.ExceptionHandl { getShell().setText(TITLE); - String attemptsStr = attempt == 1 ? Messages.getString("CDOInteractiveExceptionHandler.1") : Messages.getString("CDOInteractiveExceptionHandler.2"); //$NON-NLS-1$ //$NON-NLS-2$ - setTitle(MessageFormat.format( - Messages.getString("CDOInteractiveExceptionHandler.3"), session, attempt, attemptsStr));//$NON-NLS-1$ + String attemptsStr = attempt == 1 ? Messages.getString("CDOInteractiveExceptionHandler.1") //$NON-NLS-1$ + : Messages.getString("CDOInteractiveExceptionHandler.2"); //$NON-NLS-1$ + setTitle( + MessageFormat.format(Messages.getString("CDOInteractiveExceptionHandler.3"), session, attempt, attemptsStr));//$NON-NLS-1$ setTitleImage(SharedIcons.getImage(SharedIcons.WIZBAN_PROTOCOL_PROBLEM)); GridLayout layout = UIUtil.createGridLayout(1); 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 4b7f49b780..4895656745 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 @@ -668,8 +668,8 @@ public class CDOItemProvider extends ContainerItemProvider<IContainer<Object>> NewTopLevelResourceNodeAction.Type.FOLDER)); manager.add(new NewTopLevelResourceNodeAction(this, page, view, rootResource, NewTopLevelResourceNodeAction.Type.MODEL)); - manager.add(new NewTopLevelResourceNodeAction(this, page, view, rootResource, - NewTopLevelResourceNodeAction.Type.TEXT)); + manager.add( + new NewTopLevelResourceNodeAction(this, page, view, rootResource, NewTopLevelResourceNodeAction.Type.TEXT)); manager.add(new NewTopLevelResourceNodeAction(this, page, view, rootResource, NewTopLevelResourceNodeAction.Type.BINARY)); } diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOLabelDecorator.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOLabelDecorator.java index 9d5d737cc7..78cab685e4 100644 --- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOLabelDecorator.java +++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOLabelDecorator.java @@ -55,8 +55,8 @@ public class CDOLabelDecorator implements ILabelDecorator public static final String NO_DECORATION = DECORATION_PROPOSALS[0]; - private static final String[] DECORATION_ARGS = { - "{0}", "{1}", "{2}", "{3,date} {3,time,HH:mm:ss:SSS}", "{4,date} {4,time,HH:mm:ss:SSS}" }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ + private static final String[] DECORATION_ARGS = { "{0}", "{1}", "{2}", "{3,date} {3,time,HH:mm:ss:SSS}", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ + "{4,date} {4,time,HH:mm:ss:SSS}" }; //$NON-NLS-1$ public static final String DECORATOR_ID = "org.eclipse.emf.cdo.ui.CDOLabelDecorator"; //$NON-NLS-1$ @@ -213,7 +213,7 @@ public class CDOLabelDecorator implements ILabelDecorator } } } - + // Use default return image; } diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/package-info.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/package-info.java index 837b55dc09..39c68bfb55 100644 --- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/package-info.java +++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/package-info.java @@ -1,16 +1,11 @@ /* - * Copyright (c) 2011, 2012 Eike Stepper (Berlin, Germany) and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Eike Stepper - initial API and implementation + * Copyright (c) 2011, 2012 Eike Stepper (Berlin, Germany) and others. All rights reserved. This program and the + * accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this + * distribution, and is available at http://www.eclipse.org/legal/epl-v10.html Contributors: Eike Stepper - initial API + * and implementation */ /** * Reusable UI components specific to the CDO Model Repository. */ package org.eclipse.emf.cdo.ui; - diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/widgets/AuditScale.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/widgets/AuditScale.java index ab504118b6..4843fcde8e 100644 --- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/widgets/AuditScale.java +++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/widgets/AuditScale.java @@ -22,7 +22,7 @@ import org.eclipse.swt.widgets.Shell; /** * UI Widget representing all the historical revisions available for a * {@link org.eclipse.emf.cdo.common.branch.CDOBranch branch}. - * + * * @author Eike Stepper * @since 2.0 */ diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/widgets/SelectTimeStampComposite.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/widgets/SelectTimeStampComposite.java index bf4f7dee62..d210d8d21a 100644 --- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/widgets/SelectTimeStampComposite.java +++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/widgets/SelectTimeStampComposite.java @@ -222,8 +222,9 @@ public class SelectTimeStampComposite extends Composite implements ValidationPar else { selectRadio(timeRadio); - String text = CDOCommonUtil.formatTimeStamp(timeStamp == CDOBranchPoint.INVALID_DATE - || timeStamp == CDOBranchPoint.UNSPECIFIED_DATE ? System.currentTimeMillis() : timeStamp); + String text = CDOCommonUtil + .formatTimeStamp(timeStamp == CDOBranchPoint.INVALID_DATE || timeStamp == CDOBranchPoint.UNSPECIFIED_DATE + ? System.currentTimeMillis() : timeStamp); if (!timeText.getText().equals(text)) { timeText.setText(text); diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/widgets/package-info.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/widgets/package-info.java index 63e4aea619..ad5a7d7817 100644 --- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/widgets/package-info.java +++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/widgets/package-info.java @@ -1,16 +1,11 @@ /* - * Copyright (c) 2011, 2012 Eike Stepper (Berlin, Germany) and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Eike Stepper - initial API and implementation + * Copyright (c) 2011, 2012 Eike Stepper (Berlin, Germany) and others. All rights reserved. This program and the + * accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this + * distribution, and is available at http://www.eclipse.org/legal/epl-v10.html Contributors: Eike Stepper - initial API + * and implementation */ /** * A library with reusable widgets. */ package org.eclipse.emf.cdo.ui.widgets; - |