diff options
| author | Eike Stepper | 2019-12-13 19:06:44 +0000 |
|---|---|---|
| committer | Eike Stepper | 2019-12-13 19:56:07 +0000 |
| commit | 3057ec447b4764b8a6a9cc535e5bcc37c3e01479 (patch) | |
| tree | 8859f70412e9dbc754294ec157b8c6a9f81dc40c /plugins/org.eclipse.emf.cdo.ui/src | |
| parent | 3960a2be32acacca909cdc5868d1a0f018c15827 (diff) | |
| download | cdo-3057ec447b4764b8a6a9cc535e5bcc37c3e01479.tar.gz cdo-3057ec447b4764b8a6a9cc535e5bcc37c3e01479.tar.xz cdo-3057ec447b4764b8a6a9cc535e5bcc37c3e01479.zip | |
[558310] [Releng] Update Bundle-RequiredExecutionEnvironment to JavaSE-1.8
https://bugs.eclipse.org/bugs/show_bug.cgi?id=558310
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.ui/src')
51 files changed, 283 insertions, 50 deletions
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/AsyncContentProvider.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/AsyncContentProvider.java index beca990113..9c0947ded3 100644 --- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/AsyncContentProvider.java +++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/AsyncContentProvider.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 Eike Stepper (Loehne, Germany) and others. + * Copyright (c) 2010-2012, 2019 Eike Stepper (Loehne, 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 @@ -39,21 +39,25 @@ public class AsyncContentProvider implements ITreeContentProvider this.delegate = delegate; } + @Override public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { delegate.inputChanged(viewer, oldInput, newInput); } + @Override public void dispose() { delegate.dispose(); } + @Override public final Object[] getElements(Object inputElement) { return getChildren(inputElement); } + @Override public Object[] getChildren(Object parentElement) { if (parentElement instanceof LoadJob) @@ -74,6 +78,7 @@ public class AsyncContentProvider implements ITreeContentProvider return delegate.getChildren(parentElement); } + @Override public boolean hasChildren(Object parentElement) { if (parentElement instanceof LoadJob) @@ -94,6 +99,7 @@ public class AsyncContentProvider implements ITreeContentProvider return delegate.hasChildren(parentElement); } + @Override public Object getParent(Object element) { if (element instanceof LoadJob) @@ -160,6 +166,7 @@ public class AsyncContentProvider implements ITreeContentProvider return false; } + @Override public void run() { } diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/CDOEditorInputImpl.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/CDOEditorInputImpl.java index 35b4faf0a1..3a544ba284 100644 --- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/CDOEditorInputImpl.java +++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/CDOEditorInputImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012, 2016 Eike Stepper (Loehne, Germany) and others. + * Copyright (c) 2009-2012, 2016, 2019 Eike Stepper (Loehne, 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 @@ -52,41 +52,49 @@ public class CDOEditorInputImpl extends PlatformObject implements CDOEditorInput this.resourcePath = resourcePath; } + @Override public CDOView getView() { return view; } + @Override public boolean isViewOwned() { return viewOwned; } + @Override public String getResourcePath() { return resourcePath; } + @Override public CDOID getObjectID() { return objectID; } + @Override public void setObjectID(CDOID objectID) { this.objectID = objectID; } + @Override public boolean exists() { return true; } + @Override public ImageDescriptor getImageDescriptor() { return CDOItemProvider.getViewImageDescriptor(view); } + @Override public String getName() { if (resourcePath != null) @@ -97,11 +105,13 @@ public class CDOEditorInputImpl extends PlatformObject implements CDOEditorInput return view.getSession().getRepositoryInfo().getName(); } + @Override public IPersistableElement getPersistable() { return null; } + @Override public String getToolTipText() { if (view.isClosed()) diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/CDOLobEditorInput.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/CDOLobEditorInput.java index aefef1b091..517b8f7831 100644 --- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/CDOLobEditorInput.java +++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/CDOLobEditorInput.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2015 Eike Stepper (Loehne, Germany) and others. + * Copyright (c) 2012, 2015, 2019 Eike Stepper (Loehne, 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 @@ -49,26 +49,31 @@ public class CDOLobEditorInput extends PlatformObject implements IEditorInput return commitOnSave; } + @Override public boolean exists() { return true; } + @Override public ImageDescriptor getImageDescriptor() { return null; } + @Override public String getName() { return resource.getName(); } + @Override public IPersistableElement getPersistable() { return null; } + @Override public String getToolTipText() { return resource.getURI().toString(); diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/InteractiveConflictHandlerSelector.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/InteractiveConflictHandlerSelector.java index 26b24a0f84..9e700e9b35 100644 --- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/InteractiveConflictHandlerSelector.java +++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/InteractiveConflictHandlerSelector.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015 Eike Stepper (Loehne, Germany) and others. + * Copyright (c) 2015, 2019 Eike Stepper (Loehne, 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 @@ -38,12 +38,14 @@ public class InteractiveConflictHandlerSelector implements ConflictHandlerSelect { } + @Override public ConflictHandler selectConflictHandler(final CDOTransaction transaction, final List<ConflictHandler> choices) { final ConflictHandler[] result = { null }; UIUtil.getDisplay().syncExec(new Runnable() { + @Override public void run() { IWorkbenchPage workbenchPage = UIUtil.getActiveWorkbenchPage(); 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 6913c2ff7c..41472d8216 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 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007-2012, 2015 Eike Stepper (Loehne, Germany) and others. + * Copyright (c) 2007-2012, 2015, 2019 Eike Stepper (Loehne, 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 @@ -50,6 +50,7 @@ public abstract class ItemsProcessor { viewer.getControl().getDisplay().asyncExec(new Runnable() { + @Override public void run() { try diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/SupportPropertyTester.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/SupportPropertyTester.java index 9b710ada5f..dd2eb18802 100644 --- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/SupportPropertyTester.java +++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/SupportPropertyTester.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015 Eike Stepper (Loehne, Germany) and others. + * Copyright (c) 2015, 2019 Eike Stepper (Loehne, 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 @@ -23,6 +23,7 @@ public class SupportPropertyTester extends PropertyTester { } + @Override public boolean test(Object receiver, String property, Object[] args, Object expectedValue) { if (expectedValue == null) 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 4b94e1545e..bfed46a09d 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 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008-2012, 2015, 2016 Eike Stepper (Loehne, Germany) and others. + * Copyright (c) 2008-2012, 2015, 2016, 2019 Eike Stepper (Loehne, 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 @@ -90,6 +90,7 @@ public abstract class AbstractLockObjectsAction extends EditingDomainAction { getDisplay().syncExec(new Runnable() { + @Override public void run() { MessageDialog.openError(getShell(), Messages.getString("AbstractLockObjectsAction.0"), //$NON-NLS-1$ 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 8ff651c180..f9f5302d8f 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 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2011, 2012, 2015, 2016 Eike Stepper (Loehne, Germany) and others. + * Copyright (c) 2009, 2011, 2012, 2015, 2016, 2019 Eike Stepper (Loehne, 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 @@ -37,6 +37,7 @@ public class ChangePassiveUpdateAction extends EditingDomainAction private IListener passiveUpdateListener = new IListener() { + @Override public void notifyEvent(IEvent event) { if (session != null) 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 9f8e7d97d2..1f07e346f8 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 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2013, 2015, 2016 Eike Stepper (Loehne, Germany) and others. + * Copyright (c) 2011-2013, 2015, 2016, 2019 Eike Stepper (Loehne, 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 @@ -43,6 +43,7 @@ public final class EnableViewDurabilityAction extends AbstractViewAction final Display display = getDisplay(); display.syncExec(new Runnable() { + @Override public void run() { UIUtil.copyToClipboard(display, durableLockingID); 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 60f640152a..12b0d90632 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 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007-2009, 2011-2013, 2015 Eike Stepper (Loehne, Germany) and others. + * Copyright (c) 2007-2009, 2011-2013, 2015, 2019 Eike Stepper (Loehne, 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 @@ -102,6 +102,7 @@ public class ImportResourceAction extends AbstractViewAction getDisplay().asyncExec(new Runnable() { + @Override public void run() { CDOEditorUtil.openEditor(getPage(), getView(), targetPath); 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 7a8c0f9486..0a17d2c21b 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 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007-2013, 2015, 2016 Eike Stepper (Loehne, Germany) and others. + * Copyright (c) 2007-2013, 2015, 2016, 2019 Eike Stepper (Loehne, 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 @@ -60,6 +60,7 @@ public final class OpenResourceEditorAction extends ResourceNodeAction Display display = page.getWorkbenchWindow().getShell().getDisplay(); display.asyncExec(new Runnable() { + @Override public void run() { try diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/OpenSessionAction.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/OpenSessionAction.java index 89bf8ff8a4..9a35beee5d 100644 --- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/OpenSessionAction.java +++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/OpenSessionAction.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007-2013 Eike Stepper (Loehne, Germany) and others. + * Copyright (c) 2007-2013, 2019 Eike Stepper (Loehne, 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 @@ -113,6 +113,7 @@ public final class OpenSessionAction extends LongRunningAction OM.LOG.error(ex); getDisplay().asyncExec(new Runnable() { + @Override public void run() { MessageDialog.openError(getShell(), getText(), Messages.getString("OpenSessionAction.3") //$NON-NLS-1$ 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 e9fb2edee3..d642259c84 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 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007-2012, 2015, 2016 Eike Stepper (Loehne, Germany) and others. + * Copyright (c) 2007-2012, 2015, 2016, 2019 Eike Stepper (Loehne, 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 @@ -79,6 +79,7 @@ public class RegisterGeneratedPackagesAction extends RegisterPackagesAction */ public class EPackageFactoryValidator implements IInputValidator { + @Override public String isValid(String uri) { if (uri == null || uri.length() == 0) 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 cd3e0d50ee..2908ea5e4a 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 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007-2009, 2011, 2012, 2015, 2016 Eike Stepper (Loehne, Germany) and others. + * Copyright (c) 2007-2009, 2011, 2012, 2015, 2016, 2019 Eike Stepper (Loehne, 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 @@ -90,6 +90,7 @@ public abstract class RegisterPackagesAction extends SessionAction : MessageFormat.format(Messages.getString("RegisterPackagesAction.2"), errors); //$NON-NLS-1$ getDisplay().asyncExec(new Runnable() { + @Override public void run() { Shell shell = getShell(); 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 60d6b788e2..21eff0fa99 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 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012, 2015, 2016 Eike Stepper (Loehne, Germany) and others. + * Copyright (c) 2010-2012, 2015, 2016, 2019 Eike Stepper (Loehne, 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 @@ -35,6 +35,7 @@ public class ResourceNodeNameInputValidator implements IInputValidator isFolder = node instanceof CDOResourceFolder; } + @Override public String isValid(String newText) { // Do not allow empty names 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 d47736a39e..f592eadbec 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 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2016 Eike Stepper (Loehne, Germany) and others. + * Copyright (c) 2015, 2016, 2019 Eike Stepper (Loehne, 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 @@ -57,16 +57,19 @@ public class RemoveResourceActionDelegate implements IObjectActionDelegate { } + @Override public void setActivePart(IAction action, IWorkbenchPart targetPart) { shell = targetPart.getSite().getShell(); } + @Override public void selectionChanged(IAction action, ISelection selection) { nodes = UIUtil.getElements(selection, CDOResourceNode.class); } + @Override public void run(IAction action) { if (MessageDialog.openConfirm(shell, Messages.getString("RemoveResourceAction_1"), MessageFormat.format( //$NON-NLS-1$ 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 e930bd24ef..d3afdc6b5e 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 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2016 Eike Stepper (Loehne, Germany) and others. + * Copyright (c) 2015, 2016, 2019 Eike Stepper (Loehne, 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 @@ -47,6 +47,7 @@ public abstract class TransactionalBackgroundActionDelegate extends LongRunningA this.text = text; } + @Override public void setActivePart(IAction action, IWorkbenchPart targetPart) { this.targetPart = targetPart; diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/BulkAddDialog.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/BulkAddDialog.java index 04721f9899..4a446058f4 100644 --- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/BulkAddDialog.java +++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/BulkAddDialog.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2009, 2011, 2012, 2015 Eike Stepper (Loehne, Germany) and others. + * Copyright (c) 2007, 2009, 2011, 2012, 2015, 2019 Eike Stepper (Loehne, 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 @@ -112,6 +112,7 @@ public class BulkAddDialog extends TitleAreaDialog featureViewer.setInput(features); featureViewer.addSelectionChangedListener(new ISelectionChangedListener() { + @Override public void selectionChanged(SelectionChangedEvent event) { IStructuredSelection selection = (IStructuredSelection)featureViewer.getSelection(); @@ -126,6 +127,7 @@ public class BulkAddDialog extends TitleAreaDialog instancesText.setText(String.valueOf(instances)); instancesText.addModifyListener(new ModifyListener() { + @Override public void modifyText(ModifyEvent e) { try diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/CreateBranchDialog.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/CreateBranchDialog.java index ab1d415d8a..8c5ab382f6 100644 --- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/CreateBranchDialog.java +++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/CreateBranchDialog.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2015 Eike Stepper (Loehne, Germany) and others. + * Copyright (c) 2012, 2015, 2019 Eike Stepper (Loehne, 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 @@ -75,6 +75,7 @@ public class CreateBranchDialog extends AbstractBranchPointDialog nameText.setFocus(); nameText.addModifyListener(new ModifyListener() { + @Override public void modifyText(ModifyEvent e) { name = nameText.getText(); 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 2b04e2d2ed..5124f05567 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 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2009, 2011, 2012, 2015 Eike Stepper (Loehne, Germany) and others. + * Copyright (c) 2008, 2009, 2011, 2012, 2015, 2019 Eike Stepper (Loehne, 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 @@ -84,6 +84,7 @@ public class ExportResourceDialog extends ResourceDialog targetText.setText(targetPath); targetText.addModifyListener(new ModifyListener() { + @Override public void modifyText(ModifyEvent e) { targetPath = targetText.getText(); diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/ImportResourceDialog.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/ImportResourceDialog.java index 9586e22d4f..a8b939132e 100644 --- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/ImportResourceDialog.java +++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/ImportResourceDialog.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2009, 2011, 2012 Eike Stepper (Loehne, Germany) and others. + * Copyright (c) 2008, 2009, 2011, 2012, 2019 Eike Stepper (Loehne, 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 @@ -87,6 +87,7 @@ public class ImportResourceDialog extends ResourceDialog targetText.setText(targetPath); targetText.addModifyListener(new ModifyListener() { + @Override public void modifyText(ModifyEvent e) { targetPath = targetText.getText(); @@ -105,6 +106,7 @@ public class ImportResourceDialog extends ResourceDialog uriField.addModifyListener(new ModifyListener() { + @Override public void modifyText(ModifyEvent e) { List<URI> uris = getURIs(); 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 b72c599293..2f281da286 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 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012, 2015 Eike Stepper (Loehne, Germany) and others. + * Copyright (c) 2009-2012, 2015, 2019 Eike Stepper (Loehne, 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 @@ -199,6 +199,7 @@ public class PackageRegistryDialog extends TitleAreaDialog { page.getWorkbenchWindow().getShell().getDisplay().asyncExec(new Runnable() { + @Override public void run() { try @@ -221,6 +222,7 @@ public class PackageRegistryDialog extends TitleAreaDialog { } + @Override public String getColumnText(Object element, int columnIndex) { @SuppressWarnings("unchecked") @@ -259,6 +261,7 @@ public class PackageRegistryDialog extends TitleAreaDialog } } + @Override public Image getColumnImage(Object element, int columnIndex) { if (columnIndex == 0) @@ -287,11 +290,13 @@ public class PackageRegistryDialog extends TitleAreaDialog return null; } + @Override public Color getBackground(Object element) { return null; } + @Override public Color getForeground(Object element) { @SuppressWarnings("unchecked") @@ -319,10 +324,12 @@ public class PackageRegistryDialog extends TitleAreaDialog { } + @Override public void dispose() { } + @Override public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { if (newInput instanceof CDOSession) @@ -334,6 +341,7 @@ public class PackageRegistryDialog extends TitleAreaDialog } } + @Override public Object[] getElements(Object inputElement) { if (inputElement != session) diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/SelectClassDialog.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/SelectClassDialog.java index 9311bdc99a..2effdb9b77 100644 --- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/SelectClassDialog.java +++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/SelectClassDialog.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015 Eike Stepper (Loehne, Germany) and others. + * Copyright (c) 2015, 2019 Eike Stepper (Loehne, 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 @@ -156,6 +156,7 @@ public class SelectClassDialog extends TitleAreaDialog packageViewer.setInput(registry); packageViewer.addSelectionChangedListener(new ISelectionChangedListener() { + @Override public void selectionChanged(SelectionChangedEvent event) { IStructuredSelection selection = (IStructuredSelection)event.getSelection(); @@ -200,6 +201,7 @@ public class SelectClassDialog extends TitleAreaDialog classViewer.setLabelProvider(new ClassLabelProvider()); classViewer.addSelectionChangedListener(new ISelectionChangedListener() { + @Override public void selectionChanged(SelectionChangedEvent event) { IStructuredSelection selection = (IStructuredSelection)event.getSelection(); @@ -211,6 +213,7 @@ public class SelectClassDialog extends TitleAreaDialog classViewer.addDoubleClickListener(new IDoubleClickListener() { + @Override public void doubleClick(DoubleClickEvent event) { okPressed(); @@ -250,6 +253,7 @@ public class SelectClassDialog extends TitleAreaDialog private String[] elements; + @Override public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { this.viewer = viewer; @@ -257,6 +261,7 @@ public class SelectClassDialog extends TitleAreaDialog computeElements(); } + @Override public void handleFilter(String filter) { this.filter = filter == null ? null : filter.toLowerCase(); @@ -264,11 +269,13 @@ public class SelectClassDialog extends TitleAreaDialog viewer.refresh(); } + @Override public Object[] getElements(Object inputElement) { return elements; } + @Override public void dispose() { elements = null; @@ -348,6 +355,7 @@ public class SelectClassDialog extends TitleAreaDialog private EClass[] elements; + @Override public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { this.viewer = viewer; @@ -355,6 +363,7 @@ public class SelectClassDialog extends TitleAreaDialog computeElements(); } + @Override public void handleFilter(String filter) { this.filter = filter == null ? null : filter.toLowerCase(); @@ -362,11 +371,13 @@ public class SelectClassDialog extends TitleAreaDialog viewer.refresh(); } + @Override public Object[] getElements(Object inputElement) { return elements; } + @Override public void dispose() { elements = null; @@ -397,6 +408,7 @@ public class SelectClassDialog extends TitleAreaDialog elements = eClasses.toArray(new EClass[eClasses.size()]); Arrays.sort(elements, new Comparator<EClass>() { + @Override public int compare(EClass c1, EClass c2) { return StringUtil.safe(c1.getName()).compareTo(StringUtil.safe(c2.getName())); diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/SelectCommitDialog.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/SelectCommitDialog.java index 16d7378b39..4e4f6efd66 100644 --- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/SelectCommitDialog.java +++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/dialogs/SelectCommitDialog.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015 Eike Stepper (Loehne, Germany) and others. + * Copyright (c) 2015, 2019 Eike Stepper (Loehne, 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 @@ -114,6 +114,7 @@ public class SelectCommitDialog extends TitleAreaDialog { private long end = System.currentTimeMillis() + 5000L; + @Override public void run() { if (!commitHistoryComposite.isDisposed()) 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 1ca0d06c02..fee2e3fed6 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 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007-2012, 2015, 2016 Eike Stepper (Loehne, Germany) and others. + * Copyright (c) 2007-2012, 2015, 2016, 2019 Eike Stepper (Loehne, 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 @@ -108,14 +108,17 @@ public class SelectPackageDialog extends BaseDialog<CheckboxTableViewer> { } + @Override public void dispose() { } + @Override public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { } + @Override public Object[] getElements(Object inputElement) { Set<String> uris = new HashSet<String>(EPackage.Registry.INSTANCE.keySet()); @@ -169,21 +172,25 @@ public class SelectPackageDialog extends BaseDialog<CheckboxTableViewer> return null; } + @Override public String getColumnText(Object element, int columnIndex) { return getText(element); } + @Override public Image getColumnImage(Object element, int columnIndex) { return getImage(element); } + @Override public Color getBackground(Object element, int columnIndex) { return null; } + @Override public Color getForeground(Object element, int columnIndex) { if (EcorePackage.eINSTANCE.getNsURI().equals(element)) 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 bea030a375..7ce7ccc142 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 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007-2013, 2015, 2016 Eike Stepper (Loehne, Germany) and others. + * Copyright (c) 2007-2013, 2015, 2016, 2019 Eike Stepper (Loehne, 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 @@ -231,6 +231,7 @@ public class CDOActionBarContributor extends EditingDomainActionBarContributor i // submenuManager.addMenuListener(new IMenuListener() { + @Override public void menuAboutToShow(IMenuManager menuManager) { menuManager.updateAll(true); @@ -332,6 +333,7 @@ public class CDOActionBarContributor extends EditingDomainActionBarContributor i /** * @ADDED */ + @Override public void selectionChanged(SelectionChangedEvent event) { // Remove any menu items for old selection. 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 73e9ec4b05..3049f14b97 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 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007-2016 Eike Stepper (Loehne, Germany) and others. + * Copyright (c) 2007-2016, 2019 Eike Stepper (Loehne, 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 @@ -247,6 +247,7 @@ public class CDOEditor extends MultiPageEditorPart implements IEditingDomainProv */ protected CDOObjectHandler objectHandler = new CDOObjectHandler() { + @Override public void objectStateChanged(CDOView view, CDOObject object, CDOState oldState, CDOState newState) { if (object == viewerInput && newState == CDOState.INVALID) @@ -344,6 +345,7 @@ public class CDOEditor extends MultiPageEditorPart implements IEditingDomainProv */ protected IPartListener partListener = new IPartListener() { + @Override public void partActivated(IWorkbenchPart p) { if (p instanceof ContentOutline) @@ -369,21 +371,25 @@ public class CDOEditor extends MultiPageEditorPart implements IEditingDomainProv } } + @Override public void partBroughtToTop(IWorkbenchPart p) { // Ignore. } + @Override public void partClosed(IWorkbenchPart p) { // Ignore. } + @Override public void partDeactivated(IWorkbenchPart p) { // Ignore. } + @Override public void partOpened(IWorkbenchPart p) { // Ignore. @@ -459,6 +465,7 @@ public class CDOEditor extends MultiPageEditorPart implements IEditingDomainProv { getSite().getShell().getDisplay().asyncExec(new Runnable() { + @Override public void run() { updateProblemIndication(); @@ -490,6 +497,7 @@ public class CDOEditor extends MultiPageEditorPart implements IEditingDomainProv { getSite().getShell().getDisplay().asyncExec(new Runnable() { + @Override public void run() { updateProblemIndication(); @@ -685,10 +693,12 @@ public class CDOEditor extends MultiPageEditorPart implements IEditingDomainProv // commandStack.addCommandStackListener(new CommandStackListener() { + @Override public void commandStackChanged(final EventObject event) { getContainer().getDisplay().asyncExec(new Runnable() { + @Override public void run() { firePropertyChange(IEditorPart.PROP_DIRTY); @@ -755,6 +765,7 @@ public class CDOEditor extends MultiPageEditorPart implements IEditingDomainProv { Runnable runnable = new Runnable() { + @Override public void run() { // Try to select the items in the current content viewer of the editor. @@ -776,6 +787,7 @@ public class CDOEditor extends MultiPageEditorPart implements IEditingDomainProv * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ + @Override public EditingDomain getEditingDomain() { return editingDomain; @@ -860,6 +872,7 @@ public class CDOEditor extends MultiPageEditorPart implements IEditingDomainProv { // This just notifies those things that are affected by the section. // + @Override public void selectionChanged(SelectionChangedEvent selectionChangedEvent) { setSelection(selectionChangedEvent.getSelection()); @@ -897,6 +910,7 @@ public class CDOEditor extends MultiPageEditorPart implements IEditingDomainProv * end-user-doc --> * @generated */ + @Override public Viewer getViewer() { return currentViewer; @@ -1021,6 +1035,7 @@ public class CDOEditor extends MultiPageEditorPart implements IEditingDomainProv commandStack.addCommandStackListener(new CommandStackListener() { + @Override public void commandStackChanged(final EventObject event) { Composite container = getContainer(); @@ -1028,6 +1043,7 @@ public class CDOEditor extends MultiPageEditorPart implements IEditingDomainProv { container.getDisplay().asyncExec(new Runnable() { + @Override public void run() { firePropertyChange(IEditorPart.PROP_DIRTY); @@ -1167,6 +1183,7 @@ public class CDOEditor extends MultiPageEditorPart implements IEditingDomainProv getSite().getShell().getDisplay().asyncExec(new Runnable() { + @Override public void run() { setActivePage(0); @@ -1195,6 +1212,7 @@ public class CDOEditor extends MultiPageEditorPart implements IEditingDomainProv getSite().getShell().getDisplay().asyncExec(new Runnable() { + @Override public void run() { updateProblemIndication(); @@ -1223,6 +1241,7 @@ public class CDOEditor extends MultiPageEditorPart implements IEditingDomainProv getSite().getShell().getDisplay().asyncExec(new Runnable() { + @Override public void run() { try @@ -1376,6 +1395,7 @@ public class CDOEditor extends MultiPageEditorPart implements IEditingDomainProv getViewer().getControl().addMouseListener(new MouseListener() { + @Override public void mouseDoubleClick(MouseEvent e) { try @@ -1388,11 +1408,13 @@ public class CDOEditor extends MultiPageEditorPart implements IEditingDomainProv } } + @Override public void mouseDown(MouseEvent e) { // do nothing } + @Override public void mouseUp(MouseEvent e) { // do nothing @@ -1704,6 +1726,7 @@ public class CDOEditor extends MultiPageEditorPart implements IEditingDomainProv { // This ensures that we handle selections correctly. // + @Override public void selectionChanged(SelectionChangedEvent event) { handleContentOutlineSelection(event.getSelection()); @@ -1864,6 +1887,7 @@ public class CDOEditor extends MultiPageEditorPart implements IEditingDomainProv { // This is the method that gets invoked when the operation runs. // + @Override public void run(IProgressMonitor monitor) { // Save the resources to the file system. @@ -1928,6 +1952,7 @@ public class CDOEditor extends MultiPageEditorPart implements IEditingDomainProv IRunnableWithProgress operation = new IRunnableWithProgress() { + @Override public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException { boolean first = true; @@ -1976,6 +2001,7 @@ public class CDOEditor extends MultiPageEditorPart implements IEditingDomainProv final Shell shell = getSite().getShell(); shell.getDisplay().syncExec(new Runnable() { + @Override public void run() { String title = Messages.getString("CDOEditor.17"); //$NON-NLS-1$ @@ -2144,6 +2170,7 @@ public class CDOEditor extends MultiPageEditorPart implements IEditingDomainProv * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ + @Override public void addSelectionChangedListener(ISelectionChangedListener listener) { selectionChangedListeners.add(listener); @@ -2154,6 +2181,7 @@ public class CDOEditor extends MultiPageEditorPart implements IEditingDomainProv * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ + @Override public void removeSelectionChangedListener(ISelectionChangedListener listener) { selectionChangedListeners.remove(listener); @@ -2164,6 +2192,7 @@ public class CDOEditor extends MultiPageEditorPart implements IEditingDomainProv * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ + @Override public ISelection getSelection() { return editorSelection; @@ -2175,6 +2204,7 @@ public class CDOEditor extends MultiPageEditorPart implements IEditingDomainProv * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated NOT */ + @Override public void setSelection(ISelection selection) { editorSelection = selection; @@ -2287,6 +2317,7 @@ public class CDOEditor extends MultiPageEditorPart implements IEditingDomainProv /** * @ADDED */ + @Override public void menuAboutToShow(IMenuManager menuManager) { menuAboutToShowGen(menuManager); @@ -2564,6 +2595,7 @@ public class CDOEditor extends MultiPageEditorPart implements IEditingDomainProv { getSite().getShell().getDisplay().asyncExec(new Runnable() { + @Override public void run() { try @@ -2590,6 +2622,7 @@ public class CDOEditor extends MultiPageEditorPart implements IEditingDomainProv { getSite().getShell().getDisplay().asyncExec(new Runnable() { + @Override public void run() { try @@ -2619,6 +2652,7 @@ public class CDOEditor extends MultiPageEditorPart implements IEditingDomainProv { selectionViewer.getControl().getDisplay().asyncExec(new Runnable() { + @Override public void run() { try @@ -2910,6 +2944,7 @@ public class CDOEditor extends MultiPageEditorPart implements IEditingDomainProv submenuManager.addMenuListener(new IMenuListener() { + @Override public void menuAboutToShow(IMenuManager manager) { String nsURI = submenuManager.getMenuText(); @@ -2948,6 +2983,7 @@ public class CDOEditor extends MultiPageEditorPart implements IEditingDomainProv { Collections.sort(objects, new Comparator<EObject>() { + @Override public int compare(EObject o1, EObject o2) { return o1.eClass().getName().compareTo(o2.eClass().getName()); @@ -3004,25 +3040,30 @@ public class CDOEditor extends MultiPageEditorPart implements IEditingDomainProv */ protected class EditingDomainProviderAdapter implements Adapter, IEditingDomainProvider { + @Override public boolean isAdapterForType(Object type) { return type == IEditingDomainProvider.class; } + @Override public EditingDomain getEditingDomain() { return editingDomain; } + @Override public Notifier getTarget() { return null; } + @Override public void notifyChanged(Notification notification) { } + @Override public void setTarget(Notifier newTarget) { } 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 43df6fa92d..b138d97d90 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 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2015, 2016 Eike Stepper (Loehne, Germany) and others. + * Copyright (c) 2012, 2015, 2016, 2019 Eike Stepper (Loehne, 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 @@ -106,6 +106,7 @@ public final class EditorEditorAdvisor extends WorkbenchAdvisor * <!-- end-user-doc --> * @generated NOT */ + @Override public Object start(IApplicationContext context) throws Exception { WorkbenchAdvisor workbenchAdvisor = new EditorEditorAdvisor(); @@ -132,6 +133,7 @@ public final class EditorEditorAdvisor extends WorkbenchAdvisor * <!-- end-user-doc --> * @generated */ + @Override public void stop() { // Do nothing. @@ -160,6 +162,7 @@ public final class EditorEditorAdvisor extends WorkbenchAdvisor * <!-- end-user-doc --> * @generated */ + @Override public void createInitialLayout(IPageLayout layout) { layout.setEditorAreaVisible(true); @@ -383,6 +386,7 @@ public final class EditorEditorAdvisor extends WorkbenchAdvisor * <!-- end-user-doc --> * @generated */ + @Override public void run(IAction action) { MessageDialog.openInformation(getWindow().getShell(), getString("_UI_About_title"), getString("_UI_About_text")); @@ -403,6 +407,7 @@ public final class EditorEditorAdvisor extends WorkbenchAdvisor * <!-- end-user-doc --> * @generated */ + @Override public void run(IAction action) { String[] filePaths = openFilePathDialog(getWindow().getShell(), SWT.OPEN, null); @@ -427,6 +432,7 @@ public final class EditorEditorAdvisor extends WorkbenchAdvisor * <!-- end-user-doc --> * @generated */ + @Override public void run(IAction action) { LoadResourceAction.LoadResourceDialog loadResourceDialog = new LoadResourceAction.LoadResourceDialog(getWindow().getShell()); diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/history/NetRenderer.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/history/NetRenderer.java index 65aefb143a..c7f7667b00 100644 --- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/history/NetRenderer.java +++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/history/NetRenderer.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2016 Eike Stepper (Loehne, Germany) and others. + * Copyright (c) 2012, 2016, 2019 Eike Stepper (Loehne, 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 @@ -133,6 +133,7 @@ public final class NetRenderer implements Listener } } + @Override public void handleEvent(Event event) { switch (event.type) diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/perspectives/CDOPerspective.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/perspectives/CDOPerspective.java index 0d1666f00b..bae1cffd42 100644 --- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/perspectives/CDOPerspective.java +++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/perspectives/CDOPerspective.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2016 Eike Stepper (Loehne, Germany) and others. + * Copyright (c) 2013, 2016, 2019 Eike Stepper (Loehne, 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 @@ -38,6 +38,7 @@ public class CDOPerspective implements IPerspectiveFactory return pageLayout; } + @Override public void createInitialLayout(IPageLayout pageLayout) { this.pageLayout = pageLayout; diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/transfer/RepositoryPluginDropAdapter.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/transfer/RepositoryPluginDropAdapter.java index dd5ee78d19..72807f63a0 100644 --- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/transfer/RepositoryPluginDropAdapter.java +++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/transfer/RepositoryPluginDropAdapter.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2013, 2015, 2017 Eike Stepper (Loehne, Germany) and others. + * Copyright (c) 2012, 2013, 2015, 2017, 2019 Eike Stepper (Loehne, 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 @@ -59,6 +59,7 @@ public class RepositoryPluginDropAdapter implements IDropActionDelegate return Factory.getAll(getContainer()); } + @Override public boolean run(Object source, Object target) { List<CDOResourceNode> nodes = getResourceNodes(source); diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/transfer/RepositoryUIProvider.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/transfer/RepositoryUIProvider.java index 0005c7101a..b93cb7aee3 100644 --- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/transfer/RepositoryUIProvider.java +++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/transfer/RepositoryUIProvider.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2015 Eike Stepper (Loehne, Germany) and others. + * Copyright (c) 2012, 2015, 2019 Eike Stepper (Loehne, 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 @@ -43,23 +43,27 @@ public class RepositoryUIProvider implements TransferUIProvider INSTANCE = this; } + @Override public ILabelProvider createLabelProvider(CDOTransferSystem system) { ILabelProvider delegate = new CDOItemProvider(null); return new NativeObjectLabelProvider(delegate); } + @Override public void addSupportedTransfers(List<Transfer> transfers) { // TODO: implement RepositoryUIProvider.addSupportedTransfers(transfers) } + @Override public List<CDOTransferElement> convertTransferData(Object data) { // TODO: implement RepositoryUIProvider.convertTransferData(data) return null; } + @Override public CDOTransferElement convertTransferTarget(Object target) { if (target instanceof CDOTransaction) @@ -81,6 +85,7 @@ public class RepositoryUIProvider implements TransferUIProvider return null; } + @Override public Object convertSelection(IStructuredSelection selection) { List<CDOResourceNode> result = new ArrayList<CDOResourceNode>(); 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 b898e77b45..754ec51973 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 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012, 2015, 2016 Eike Stepper (Loehne, Germany) and others. + * Copyright (c) 2009-2012, 2015, 2016, 2019 Eike Stepper (Loehne, 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 @@ -44,6 +44,7 @@ public class CDORemoteSessionsView extends ContainerView.Default<CDORemoteSessio private ISelectionListener selectionListener = new ISelectionListener() { + @Override public void selectionChanged(IWorkbenchPart part, ISelection selection) { if (part != CDORemoteSessionsView.this) @@ -87,6 +88,7 @@ public class CDORemoteSessionsView extends ContainerView.Default<CDORemoteSessio { getDisplay().asyncExec(new Runnable() { + @Override public void run() { try diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/views/CDOSessionsView.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/views/CDOSessionsView.java index 43a147544e..fde2910c99 100644 --- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/views/CDOSessionsView.java +++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/views/CDOSessionsView.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007-2013, 2015, 2016 Eike Stepper (Loehne, Germany) and others. + * Copyright (c) 2007-2013, 2015, 2016, 2019 Eike Stepper (Loehne, 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 @@ -88,6 +88,7 @@ public class CDOSessionsView extends ContainerView { return new CDOItemProvider(getSite().getPage(), new IElementFilter() { + @Override public boolean filter(Object element) { return element instanceof CDOSession; diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/views/CDOTimeMachineView.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/views/CDOTimeMachineView.java index f50a537572..f6cc3be3d2 100644 --- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/views/CDOTimeMachineView.java +++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/views/CDOTimeMachineView.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2016 Eike Stepper (Loehne, Germany) and others. + * Copyright (c) 2015, 2016, 2019 Eike Stepper (Loehne, 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 @@ -68,6 +68,7 @@ public class CDOTimeMachineView extends ViewPart implements ISelectionListener timeSlider.setFocus(); } + @Override public void selectionChanged(IWorkbenchPart part, ISelection selection) { CDOView view = getView(selection); 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 e8e9a9cc4b..54c1f1f7a3 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 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012, 2015, 2016 Eike Stepper (Loehne, Germany) and others. + * Copyright (c) 2009-2012, 2015, 2016, 2019 Eike Stepper (Loehne, 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 @@ -147,6 +147,7 @@ public class CDOWatchListView extends ViewPart implements ISelectionProvider // This listener always refreshes viewer upon notification IListener refreshListener = new IListener() { + @Override public void notifyEvent(IEvent event) { UIUtil.refreshViewer(viewer); @@ -209,6 +210,7 @@ public class CDOWatchListView extends ViewPart implements ISelectionProvider menuMgr.setRemoveAllWhenShown(true); menuMgr.addMenuListener(new IMenuListener() { + @Override public void menuAboutToShow(IMenuManager m) { CDOWatchListView.this.fillContextMenu(m); @@ -256,6 +258,7 @@ public class CDOWatchListView extends ViewPart implements ISelectionProvider viewer.getControl().setFocus(); } + @Override public ISelection getSelection() { if (viewer != null) @@ -266,11 +269,13 @@ public class CDOWatchListView extends ViewPart implements ISelectionProvider return StructuredSelection.EMPTY; } + @Override public void setSelection(ISelection selection) { // Doesn't need to set viewer.setSelection(). Already done with user event. } + @Override public void addSelectionChangedListener(ISelectionChangedListener listener) { if (viewer != null) @@ -279,6 +284,7 @@ public class CDOWatchListView extends ViewPart implements ISelectionProvider } } + @Override public void removeSelectionChangedListener(ISelectionChangedListener listener) { if (viewer != null) @@ -388,6 +394,7 @@ public class CDOWatchListView extends ViewPart implements ISelectionProvider } } + @Override public boolean isValid(EObject object, Adapter adapter) { return adapter instanceof CDOSubscriptionAdapter; @@ -413,6 +420,7 @@ public class CDOWatchListView extends ViewPart implements ISelectionProvider { } + @Override public CDOObject[] getElements() { return watchedObjects.toArray(new CDOObject[watchedObjects.size()]); @@ -427,6 +435,7 @@ public class CDOWatchListView extends ViewPart implements ISelectionProvider /** * @returns true if the element was added successfully to the container */ + @Override public boolean addElement(CDOObject element) { if (watchedObjects.add(element)) @@ -442,6 +451,7 @@ public class CDOWatchListView extends ViewPart implements ISelectionProvider /** * @returns true if the element was removed successfully from the container */ + @Override public boolean removeElement(CDOObject element) { if (watchedObjects.remove(element)) @@ -457,6 +467,7 @@ public class CDOWatchListView extends ViewPart implements ISelectionProvider /** * @returns true if at least one element was added. False otherwise. */ + @Override public boolean addAllElements(Collection<CDOObject> elements) { ArrayList<CDOObject> addedElements = new ArrayList<CDOObject>(); @@ -481,6 +492,7 @@ public class CDOWatchListView extends ViewPart implements ISelectionProvider /** * @returns true if at least one element was removed. False otherwise. */ + @Override public boolean removeAllElements(Collection<CDOObject> elements) { ArrayList<CDOObject> removedElements = new ArrayList<CDOObject>(); @@ -554,6 +566,7 @@ public class CDOWatchListView extends ViewPart implements ISelectionProvider */ private final class ViewDeactivationListener implements IListener { + @Override public void notifyEvent(IEvent event) { if (event instanceof ILifecycleEvent) @@ -649,6 +662,7 @@ public class CDOWatchListView extends ViewPart implements ISelectionProvider private final IEvent dataRegistryEvent = new IEvent() { + @Override public INotifier getSource() { return WatchedObjectsDataRegistry.this; @@ -715,6 +729,7 @@ public class CDOWatchListView extends ViewPart implements ISelectionProvider return getData(object).getNotification(); } + @Override public void notifyEvent(IEvent event) { if (event instanceof ContainerEvent<?>) @@ -779,6 +794,7 @@ public class CDOWatchListView extends ViewPart implements ISelectionProvider this.adapterFactory = adapterFactory; } + @Override public Image getColumnImage(Object object, int columnIndex) { // In case an invalid object arrives (i.e., detached), return CDOState @@ -800,6 +816,7 @@ public class CDOWatchListView extends ViewPart implements ISelectionProvider return null; } + @Override public String getColumnText(Object element, int columnIndex) { CDOObject object = CDOUtil.getCDOObject((EObject)element); @@ -845,6 +862,7 @@ public class CDOWatchListView extends ViewPart implements ISelectionProvider return element.toString(); } + @Override public Color getBackground(Object element) { if (element instanceof CDOObject) @@ -858,6 +876,7 @@ public class CDOWatchListView extends ViewPart implements ISelectionProvider return null; } + @Override public Color getForeground(Object element) { return null; @@ -894,17 +913,20 @@ public class CDOWatchListView extends ViewPart implements ISelectionProvider { } + @Override @SuppressWarnings("unchecked") public Object[] getElements(Object object) { return ((IContainer<Object>)object).getElements(); } + @Override public void dispose() { // do nothing } + @Override public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { // do nothing diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOEditorOpener.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOEditorOpener.java index 1d34be17b9..e5ac760fac 100644 --- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOEditorOpener.java +++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOEditorOpener.java @@ -106,31 +106,37 @@ public interface CDOEditorOpener this.priority = priority; } + @Override public String getID() { return id; } + @Override public String getName() { return name; } + @Override public ImageDescriptor getIcon() { return icon; } + @Override public final int getPriority() { return priority; } + @Override public final String getRegex() { return regex; } + @Override public final boolean matchesRegex(URI uri) { synchronized (regex) @@ -145,6 +151,7 @@ public interface CDOEditorOpener return matcher.matches(); } + @Override public IEditorPart openEditor(final IWorkbenchPage page, URI uri) { final Set<IEditorPart> editors = new HashSet<IEditorPart>(); @@ -152,6 +159,7 @@ public interface CDOEditorOpener IPartListener partListener = new IPartListener() { + @Override public void partClosed(IWorkbenchPart part) { if (part == editor[0]) @@ -171,21 +179,25 @@ public interface CDOEditorOpener } } + @Override public void partOpened(IWorkbenchPart part) { // Do nothing. } + @Override public void partDeactivated(IWorkbenchPart part) { // Do nothing. } + @Override public void partBroughtToTop(IWorkbenchPart part) { // Do nothing. } + @Override public void partActivated(IWorkbenchPart part) { // Do nothing. @@ -276,6 +288,7 @@ public interface CDOEditorOpener // Sort highest priority first Collections.sort(result, new Comparator<CDOEditorOpener>() { + @Override public int compare(CDOEditorOpener o1, CDOEditorOpener o2) { return -Integer.valueOf(o1.getPriority()).compareTo(o2.getPriority()); @@ -319,6 +332,7 @@ public interface CDOEditorOpener } } + @Override public CDOEditorOpener[] getElements() { synchronized (editorOpeners) diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOEditorUtil.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOEditorUtil.java index 3990f5b0cb..b9a37bb0d5 100644 --- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOEditorUtil.java +++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOEditorUtil.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2013, 2015, 2016 Eike Stepper (Loehne, Germany) and others. + * Copyright (c) 2009-2013, 2015, 2016, 2019 Eike Stepper (Loehne, 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 @@ -137,6 +137,7 @@ public final class CDOEditorUtil this.editingDomain = editingDomain; } + @Override public EditingDomain getEditingDomain() { return editingDomain; @@ -173,6 +174,7 @@ public final class CDOEditorUtil Display display = page.getWorkbenchWindow().getShell().getDisplay(); display.asyncExec(new Runnable() { + @Override public void run() { try @@ -384,6 +386,7 @@ public final class CDOEditorUtil Display display = page.getWorkbenchWindow().getShell().getDisplay(); display.asyncExec(new Runnable() { + @Override public void run() { try 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 ec175ea527..d997a6ae8c 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 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007-2012, 2014, 2015 Eike Stepper (Loehne, Germany) and others. + * Copyright (c) 2007-2012, 2014, 2015, 2019 Eike Stepper (Loehne, 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 @@ -61,6 +61,7 @@ public class CDOEventHandler private IListener sessionListener = new IListener() { + @Override public void notifyEvent(IEvent event) { if (event instanceof IContainerEvent<?>) @@ -84,6 +85,7 @@ public class CDOEventHandler private IListener viewListener = new IListener() { + @Override public void notifyEvent(IEvent event) { if (event instanceof CDOViewInvalidationEvent) @@ -139,6 +141,7 @@ public class CDOEventHandler private CDOObjectHandler objectHandler = new CDOObjectHandler() { + @Override public void objectStateChanged(CDOView view, CDOObject object, CDOState oldState, CDOState newState) { CDOEventHandler.this.objectStateChanged(object); @@ -147,6 +150,7 @@ public class CDOEventHandler private IListener preferenceListener = new IListener() { + @Override public void notifyEvent(IEvent event) { @SuppressWarnings("unchecked") @@ -165,6 +169,7 @@ public class CDOEventHandler { treeViewer.getControl().getDisplay().asyncExec(new Runnable() { + @Override public void run() { try @@ -188,6 +193,7 @@ public class CDOEventHandler { UIUtil.getDisplay().asyncExec(new Runnable() { + @Override public void run() { try @@ -276,6 +282,7 @@ public class CDOEventHandler { control.getDisplay().asyncExec(new Runnable() { + @Override public void run() { try 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 5b790de007..1b6a492f9d 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 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2012, 2015, 2016 Eike Stepper (Loehne, Germany) and others. + * Copyright (c) 2009-2012, 2015, 2016, 2019 Eike Stepper (Loehne, 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 @@ -51,11 +51,13 @@ public class CDOInteractiveExceptionHandler implements CDOSession.ExceptionHandl /** * @since 4.0 */ + @Override public void handleException(final CDOSession session, final int attempt, Exception exception) throws Exception { final Exception[] result = { exception }; Runnable runnable = new Runnable() { + @Override public void run() { Dialog dialog = createDialog(session, attempt, result[0]); @@ -86,6 +88,7 @@ public class CDOInteractiveExceptionHandler implements CDOSession.ExceptionHandl } } + @Override public Object process(IManagedContainer container, String productGroup, String factoryType, String description, Object element) { if (element instanceof InternalCDOSession) diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOInvalidRootAgent.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOInvalidRootAgent.java index 3e5b89b984..226e628a33 100644 --- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOInvalidRootAgent.java +++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOInvalidRootAgent.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015 Eike Stepper (Loehne, Germany) and others. + * Copyright (c) 2015, 2019 Eike Stepper (Loehne, 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 @@ -41,6 +41,7 @@ public abstract class CDOInvalidRootAgent implements IListener view.addListener(this); } + @Override public void notifyEvent(IEvent event) { if (event instanceof CDOViewTargetChangedEvent) @@ -48,6 +49,7 @@ public abstract class CDOInvalidRootAgent implements IListener final CDOViewTargetChangedEvent e = (CDOViewTargetChangedEvent)event; UIUtil.getDisplay().asyncExec(new Runnable() { + @Override public void run() { Object input = getRootFromUI(); 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 a8ca8e16c6..5c4384c437 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 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007-2013, 2015, 2016 Eike Stepper (Loehne, Germany) and others. + * Copyright (c) 2007-2013, 2015, 2016, 2019 Eike Stepper (Loehne, 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 @@ -622,6 +622,7 @@ public class CDOItemProvider extends ContainerItemProvider<IContainer<Object>> List<String> registeredURIs = new ArrayList<String>(EPackage.Registry.INSTANCE.keySet()); Collections.sort(registeredURIs, new Comparator<String>() { + @Override public int compare(String o1, String o2) { return o1.compareTo(o2); @@ -882,6 +883,7 @@ public class CDOItemProvider extends ContainerItemProvider<IContainer<Object>> return itemProvider; } + @Override public void propertyChanged(Object source, int propId) { if (propId == IEditorRegistry.PROP_CONTENTS) @@ -963,6 +965,7 @@ public class CDOItemProvider extends ContainerItemProvider<IContainer<Object>> } } + @Override public void notifyEvent(IEvent event) { if (event instanceof ILifecycleEvent) @@ -1015,6 +1018,7 @@ public class CDOItemProvider extends ContainerItemProvider<IContainer<Object>> } } + @Override public void objectStateChanged(CDOView view, CDOObject object, CDOState oldState, CDOState newState) { updateLabels(object); 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 4e8f6347cb..ad6ddb290b 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 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008-2012, 2015 Eike Stepper (Loehne, Germany) and others. + * Copyright (c) 2008-2012, 2015, 2019 Eike Stepper (Loehne, 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 @@ -66,6 +66,7 @@ public class CDOLabelDecorator implements ILabelDecorator private IListener preferenceListener = new IListener() { + @Override public void notifyEvent(IEvent event) { @SuppressWarnings("unchecked") @@ -88,6 +89,7 @@ public class CDOLabelDecorator implements ILabelDecorator this.pattern = pattern; } + @Override public void dispose() { OM.PREFS.removeListener(preferenceListener); @@ -103,6 +105,7 @@ public class CDOLabelDecorator implements ILabelDecorator return StringUtil.replace(unparsedPattern, DECORATION_PROPOSALS, DECORATION_ARGS); } + @Override public Image decorateImage(Image image, Object element) { try @@ -116,6 +119,7 @@ public class CDOLabelDecorator implements ILabelDecorator return image; } + @Override public String decorateText(String text, Object element) { try @@ -152,16 +156,19 @@ public class CDOLabelDecorator implements ILabelDecorator return text; } + @Override public boolean isLabelProperty(Object element, String property) { return false; } + @Override public void addListener(ILabelProviderListener listener) { // Ignore listeners, DecoratorManager handles them. } + @Override public void removeListener(ILabelProviderListener listener) { // Ignore listeners, DecoratorManager handles them. diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOLabelProvider.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOLabelProvider.java index 9bf692ace8..f95cea7f0a 100644 --- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOLabelProvider.java +++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOLabelProvider.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007-2013, 2015, 2016 Eike Stepper (Loehne, Germany) and others. + * Copyright (c) 2007-2013, 2015, 2016, 2019 Eike Stepper (Loehne, 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 @@ -102,6 +102,7 @@ public class CDOLabelProvider extends AdapterFactoryLabelProvider implements ICo { viewer.getControl().getDisplay().asyncExec(new Runnable() { + @Override public void run() { try diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOTreeExpansionAgent.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOTreeExpansionAgent.java index e5e06cd82e..159c1a797a 100644 --- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOTreeExpansionAgent.java +++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOTreeExpansionAgent.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015 Eike Stepper (Loehne, Germany) and others. + * Copyright (c) 2015, 2019 Eike Stepper (Loehne, 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 @@ -65,6 +65,7 @@ public class CDOTreeExpansionAgent { tree.getDisplay().syncExec(new Runnable() { + @Override public void run() { for (Object element : viewer.getExpandedElements()) @@ -139,6 +140,7 @@ public class CDOTreeExpansionAgent { tree.getDisplay().syncExec(new Runnable() { + @Override public void run() { tree.removeDisposeListener(listener); @@ -220,6 +222,7 @@ public class CDOTreeExpansionAgent */ private final class Listener implements IListener, ITreeViewerListener, DisposeListener { + @Override public void notifyEvent(IEvent event) { if (event instanceof CDOViewTargetChangedEvent) @@ -229,6 +232,7 @@ public class CDOTreeExpansionAgent { tree.getDisplay().asyncExec(new Runnable() { + @Override public void run() { if (!tree.isDisposed() && !view.isClosed()) @@ -249,18 +253,21 @@ public class CDOTreeExpansionAgent } } + @Override public void treeExpanded(TreeExpansionEvent event) { Object element = event.getElement(); addExpandedElement(element); } + @Override public void treeCollapsed(TreeExpansionEvent event) { Object element = event.getElement(); removeExpandedElement(element); } + @Override public void widgetDisposed(DisposeEvent e) { dispose(); diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/widgets/CommitHistoryComposite.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/widgets/CommitHistoryComposite.java index 455f27b825..15954f9cf7 100644 --- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/widgets/CommitHistoryComposite.java +++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/widgets/CommitHistoryComposite.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2013, 2015, 2016 Eike Stepper (Loehne, Germany) and others. + * Copyright (c) 2012, 2013, 2015, 2016, 2019 Eike Stepper (Loehne, 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 @@ -84,10 +84,12 @@ public class CommitHistoryComposite extends Composite private CDOCommitInfoHandler revealElementHandler = new CDOCommitInfoHandler() { + @Override public void handleCommitInfo(final CDOCommitInfo commitInfo) { getDisplay().asyncExec(new Runnable() { + @Override public void run() { tableViewer.reveal(commitInfo); @@ -118,6 +120,7 @@ public class CommitHistoryComposite extends Composite tableViewer.addSelectionChangedListener(new ISelectionChangedListener() { + @Override public void selectionChanged(SelectionChangedEvent event) { IStructuredSelection selection = (IStructuredSelection)tableViewer.getSelection(); @@ -131,6 +134,7 @@ public class CommitHistoryComposite extends Composite tableViewer.addOpenListener(new IOpenListener() { + @Override public void open(OpenEvent event) { doubleClicked(); @@ -309,6 +313,7 @@ public class CommitHistoryComposite extends Composite { private IListener lifecycleListener = new IListener() { + @Override public void notifyEvent(IEvent event) { if (event instanceof ILifecycleEvent) @@ -493,23 +498,27 @@ public class CommitHistoryComposite extends Composite return string; } + @Override public void activate() throws LifecycleException { EventUtil.addListener(getLifecycle(), lifecycleListener); } + @Override public Exception deactivate() { EventUtil.removeListener(getLifecycle(), lifecycleListener); return null; } + @Override public LifecycleState getLifecycleState() { Object object = getLifecycle(); return LifecycleUtil.getLifecycleState(object); } + @Override public boolean isActive() { Object object = getLifecycle(); @@ -559,6 +568,7 @@ public class CommitHistoryComposite extends Composite */ public static class ContentProvider extends StructuredContentProvider<CDOCommitHistory> { + @Override public Object[] getElements(Object inputElement) { return ((CDOCommitHistory)inputElement).getElements(); diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/widgets/ComposeBranchPointComposite.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/widgets/ComposeBranchPointComposite.java index 320295fd15..2701ffc4a1 100644 --- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/widgets/ComposeBranchPointComposite.java +++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/widgets/ComposeBranchPointComposite.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2012, 2015, 2016 Eike Stepper (Loehne, Germany) and others. + * Copyright (c) 2011, 2012, 2015, 2016, 2019 Eike Stepper (Loehne, 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 @@ -133,6 +133,7 @@ public class ComposeBranchPointComposite extends Composite getDisplay().asyncExec(new Runnable() { + @Override public void run() { branchViewer.setSelection(new StructuredSelection(branch)); @@ -187,6 +188,7 @@ public class ComposeBranchPointComposite extends Composite branchViewer = createBranchViewer(); branchViewer.addSelectionChangedListener(new ISelectionChangedListener() { + @Override public void selectionChanged(SelectionChangedEvent event) { IStructuredSelection selection = (IStructuredSelection)event.getSelection(); @@ -235,6 +237,7 @@ public class ComposeBranchPointComposite extends Composite branchViewer.addDoubleClickListener(new IDoubleClickListener() { + @Override public void doubleClick(DoubleClickEvent event) { doubleClicked(); @@ -275,6 +278,7 @@ public class ComposeBranchPointComposite extends Composite timeStampComposite.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false)); timeStampComposite.setValidationContext(new ValidationContext() { + @Override public void setValidationError(Object source, String message) { timeStampError(message); diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/widgets/SelectBranchComposite.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/widgets/SelectBranchComposite.java index c2da225d8a..943a33e4fb 100644 --- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/widgets/SelectBranchComposite.java +++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/widgets/SelectBranchComposite.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2012, 2015 Eike Stepper (Loehne, Germany) and others. + * Copyright (c) 2011, 2012, 2015, 2019 Eike Stepper (Loehne, 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 @@ -93,6 +93,7 @@ public class SelectBranchComposite extends Composite implements ValidationPartic branchText.getCombo().setLayoutData(new GridData(SWT.FILL, SWT.BEGINNING, true, false)); branchText.getCombo().addModifyListener(new ModifyListener() { + @Override public void modifyText(ModifyEvent e) { setBranchFromPath(); @@ -108,6 +109,7 @@ public class SelectBranchComposite extends Composite implements ValidationPartic branchViewer.setInput(session.getBranchManager()); branchViewer.addSelectionChangedListener(new ISelectionChangedListener() { + @Override public void selectionChanged(SelectionChangedEvent event) { setBranchFromViewer(); @@ -129,11 +131,13 @@ public class SelectBranchComposite extends Composite implements ValidationPartic return branchViewer.getTree().setFocus(); } + @Override public ValidationContext getValidationContext() { return validationContext; } + @Override public void setValidationContext(ValidationContext validationContext) { this.validationContext = validationContext; 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 62b49d7431..cbf18117c3 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 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2012, 2015, 2016 Eike Stepper (Loehne, Germany) and others. + * Copyright (c) 2011, 2012, 2015, 2016, 2019 Eike Stepper (Loehne, 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 @@ -127,6 +127,7 @@ public class SelectTimeStampComposite extends Composite implements ValidationPar timeText.setText(CDOCommonUtil.formatTimeStamp(timeStamp > CDOBranchPoint.UNSPECIFIED_DATE ? timeStamp : System.currentTimeMillis())); timeText.addModifyListener(new ModifyListener() { + @Override public void modifyText(ModifyEvent e) { parseTime(); @@ -179,11 +180,13 @@ public class SelectTimeStampComposite extends Composite implements ValidationPar setBranch(branch); } + @Override public ValidationContext getValidationContext() { return validationContext; } + @Override public void setValidationContext(ValidationContext validationContext) { this.validationContext = validationContext; diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/widgets/SessionComposite.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/widgets/SessionComposite.java index 2d3d78bab4..5bee44eea9 100644 --- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/widgets/SessionComposite.java +++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/widgets/SessionComposite.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2013, 2016 Eike Stepper (Loehne, Germany) and others. + * Copyright (c) 2009-2013, 2016, 2019 Eike Stepper (Loehne, 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 @@ -75,6 +75,7 @@ public class SessionComposite extends Composite connectorText.getCombo().setLayoutData(new GridData(SWT.FILL, SWT.BEGINNING, true, false)); connectorText.getCombo().addModifyListener(new ModifyListener() { + @Override public void modifyText(ModifyEvent e) { connectorDescription = connectorText.getText(); @@ -94,6 +95,7 @@ public class SessionComposite extends Composite repositoryText.getCombo().setLayoutData(new GridData(150, SWT.DEFAULT)); repositoryText.getCombo().addModifyListener(new ModifyListener() { + @Override public void modifyText(ModifyEvent e) { repositoryName = repositoryText.getText(); @@ -115,6 +117,7 @@ public class SessionComposite extends Composite connectorText.setFocus(); connectorText.getCombo().addFocusListener(new FocusListener() { + @Override public void focusGained(FocusEvent e) { if (exampleLabel != null) @@ -123,6 +126,7 @@ public class SessionComposite extends Composite } } + @Override public void focusLost(FocusEvent e) { if (exampleLabel != null) diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/widgets/TimeSlider.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/widgets/TimeSlider.java index 92652837d2..893f4b69e0 100644 --- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/widgets/TimeSlider.java +++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/widgets/TimeSlider.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015 Eike Stepper (Loehne, Germany) and others. + * Copyright (c) 2015, 2019 Eike Stepper (Loehne, 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 @@ -150,6 +150,7 @@ public class TimeSlider extends Scale implements IListener, ITreeViewerListener { display.asyncExec(new Runnable() { + @Override public void run() { if (getSelection() != newSelection) @@ -257,6 +258,7 @@ public class TimeSlider extends Scale implements IListener, ITreeViewerListener } } + @Override public void notifyEvent(IEvent event) { if (event instanceof CDOViewTargetChangedEvent) @@ -274,6 +276,7 @@ public class TimeSlider extends Scale implements IListener, ITreeViewerListener } } + @Override public void treeExpanded(TreeExpansionEvent event) { CDOID id = getID(event.getElement()); @@ -283,6 +286,7 @@ public class TimeSlider extends Scale implements IListener, ITreeViewerListener } } + @Override public void treeCollapsed(TreeExpansionEvent event) { CDOID id = getID(event.getElement()); |