diff options
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse')
15 files changed, 61 insertions, 12 deletions
diff --git a/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/editor/AbstractDetailsPage.java b/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/editor/AbstractDetailsPage.java index 099bebe269..e0650f7279 100644 --- a/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/editor/AbstractDetailsPage.java +++ b/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/editor/AbstractDetailsPage.java @@ -356,6 +356,7 @@ public abstract class AbstractDetailsPage<T extends EObject> extends AbstractSec hideRunnable = new Runnable() { + @Override public void run() { if (hideRunnable == this) diff --git a/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/editor/CDOSecurityFormActionBarContributor.java b/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/editor/CDOSecurityFormActionBarContributor.java index e089d2c834..b8c1507217 100644 --- a/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/editor/CDOSecurityFormActionBarContributor.java +++ b/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/editor/CDOSecurityFormActionBarContributor.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Eike Stepper (Loehne, Germany) and others. + * Copyright (c) 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 @@ -118,6 +118,7 @@ public class CDOSecurityFormActionBarContributor extends EditorActionBarContribu } } + @Override public void propertyChanged(Object source, int propId) { update(); diff --git a/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/editor/CDOSecurityFormEditor.java b/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/editor/CDOSecurityFormEditor.java index b3c6c01ac0..9f3024f029 100644 --- a/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/editor/CDOSecurityFormEditor.java +++ b/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/editor/CDOSecurityFormEditor.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2015, 2016 Eike Stepper (Loehne, Germany) and others. + * Copyright (c) 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 @@ -127,6 +127,7 @@ public class CDOSecurityFormEditor extends FormEditor implements IEditingDomainP { display.asyncExec(new Runnable() { + @Override public void run() { fireDirtyStateChanged(); @@ -188,6 +189,7 @@ public class CDOSecurityFormEditor extends FormEditor implements IEditingDomainP view = resource.cdoView(); dirtyStackListener = new CommandStackListener() { + @Override public void commandStackChanged(final EventObject event) { fireDirtyStateChanged(); @@ -245,6 +247,7 @@ public class CDOSecurityFormEditor extends FormEditor implements IEditingDomainP return adapterFactory; } + @Override public EditingDomain getEditingDomain() { return editingDomain; diff --git a/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/editor/CDOSecurityPage.java b/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/editor/CDOSecurityPage.java index fc49fa52e3..8ce50938fe 100644 --- a/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/editor/CDOSecurityPage.java +++ b/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/editor/CDOSecurityPage.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2015, 2016 Eike Stepper (Loehne, Germany) and others. + * Copyright (c) 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 @@ -117,6 +117,7 @@ public class CDOSecurityPage extends FormPage { private DetailsPart details; + @Override public void selectionChanged(IFormPart part, ISelection selection) { if (selection.isEmpty() && details != null) @@ -197,6 +198,7 @@ public class CDOSecurityPage extends FormPage // ensure the heading's summary of problems is up-to-date Display.getCurrent().asyncExec(new Runnable() { + @Override public void run() { getManagedForm().getMessageManager().update(); @@ -251,6 +253,7 @@ public class CDOSecurityPage extends FormPage { protected CDOID inputID; + @Override public void notifyEvent(IEvent event) { if (event instanceof CDOViewTargetChangedEvent) @@ -258,6 +261,7 @@ public class CDOSecurityPage extends FormPage final CDOViewTargetChangedEvent e = (CDOViewTargetChangedEvent)event; getSite().getShell().getDisplay().asyncExec(new Runnable() { + @Override public void run() { Object input = getManagedForm().getInput(); @@ -307,6 +311,7 @@ public class CDOSecurityPage extends FormPage { getSite().getShell().getDisplay().asyncExec(new Runnable() { + @Override public void run() { try diff --git a/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/editor/EClassDetailsPageProvider.java b/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/editor/EClassDetailsPageProvider.java index 1d087d1910..2b674c343e 100644 --- a/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/editor/EClassDetailsPageProvider.java +++ b/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/editor/EClassDetailsPageProvider.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Eike Stepper (Loehne, Germany) and others. + * Copyright (c) 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 @@ -40,11 +40,13 @@ public class EClassDetailsPageProvider implements IDetailsPageProvider return new Builder(editorActionBars); } + @Override public Object getPageKey(Object object) { return object instanceof EObject ? ((EObject)object).eClass() : null; } + @Override public IDetailsPage getPage(Object key) { return pages.get(key); diff --git a/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/editor/EmptyDetailsPage.java b/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/editor/EmptyDetailsPage.java index bf4b59c512..71666b5a92 100644 --- a/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/editor/EmptyDetailsPage.java +++ b/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/editor/EmptyDetailsPage.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Eike Stepper (Loehne, Germany) and others. + * Copyright (c) 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 @@ -34,6 +34,7 @@ public class EmptyDetailsPage extends AbstractFormPart implements IDetailsPage { } + @Override public void createContents(Composite parent) { parent.setLayout(new TableWrapLayout()); @@ -47,6 +48,7 @@ public class EmptyDetailsPage extends AbstractFormPart implements IDetailsPage section.setClient(label); } + @Override public void selectionChanged(IFormPart part, ISelection selection) { // Pass diff --git a/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/editor/RoleDetailsPage.java b/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/editor/RoleDetailsPage.java index 7bef43dac8..27a726b083 100644 --- a/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/editor/RoleDetailsPage.java +++ b/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/editor/RoleDetailsPage.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2015, 2016 Eike Stepper (Loehne, Germany) and others. + * Copyright (c) 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 @@ -93,6 +93,7 @@ public class RoleDetailsPage extends AbstractDetailsPage<Role> return new INewObjectConfigurator() { + @Override public Command createConfigureCommand(Object newObject) { ResourceFilter filter = SecurityFactory.eINSTANCE.createResourceFilter("/home/${user}", PatternStyle.TREE); //$NON-NLS-1$ @@ -118,11 +119,13 @@ public class RoleDetailsPage extends AbstractDetailsPage<Role> private final CellEditor[] cellEditors = new CellEditor[3]; + @Override public String[] getColumnTitles() { return columnTitles; } + @Override public int getColumnWeight(int index) { switch (index) @@ -138,6 +141,7 @@ public class RoleDetailsPage extends AbstractDetailsPage<Role> } } + @Override public int getColumnMinimumSize(int index) { switch (index) @@ -153,6 +157,7 @@ public class RoleDetailsPage extends AbstractDetailsPage<Role> } } + @Override public boolean isColumnResizable(int index) { switch (index) @@ -168,6 +173,7 @@ public class RoleDetailsPage extends AbstractDetailsPage<Role> } } + @Override public CellLabelProvider getLabelProvider(TableViewer viewer, final int columnIndex) { return new ColumnLabelProvider() @@ -210,11 +216,13 @@ public class RoleDetailsPage extends AbstractDetailsPage<Role> }; } + @Override public boolean canEdit(TableViewer viewer, Object element, int columnIndex) { return true; } + @Override public void setValue(TableViewer viewer, Object element, int columnIndex, Object value) { final FilterPermission perm = (FilterPermission)element; @@ -248,6 +256,7 @@ public class RoleDetailsPage extends AbstractDetailsPage<Role> } } + @Override public Object getValue(TableViewer viewer, Object element, int columnIndex) { final FilterPermission perm = (FilterPermission)element; @@ -266,6 +275,7 @@ public class RoleDetailsPage extends AbstractDetailsPage<Role> } } + @Override public CellEditor getCellEditor(final TableViewer viewer, int columnIndex) { CellEditor result = cellEditors[columnIndex]; diff --git a/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/editor/TableSection.java b/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/editor/TableSection.java index 05a4f140f0..ffd96273c8 100644 --- a/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/editor/TableSection.java +++ b/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/editor/TableSection.java @@ -208,6 +208,7 @@ public abstract class TableSection<T extends EObject> extends AbstractSectionPar getEditingDomain().getCommandStack().execute(command); viewer.getControl().getDisplay().asyncExec(new Runnable() { + @Override public void run() { viewer.getControl().setFocus(); @@ -272,6 +273,7 @@ public abstract class TableSection<T extends EObject> extends AbstractSectionPar { viewer.addSelectionChangedListener(new ISelectionChangedListener() { + @Override public void selectionChanged(SelectionChangedEvent event) { IManagedForm form = getManagedForm(); diff --git a/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/handlers/ManageSecurityHandler.java b/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/handlers/ManageSecurityHandler.java index bcf6dc48e2..193c6e9637 100644 --- a/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/handlers/ManageSecurityHandler.java +++ b/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/handlers/ManageSecurityHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2015, 2016 Eike Stepper (Loehne, Germany) and others. + * Copyright (c) 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 @@ -138,6 +138,7 @@ public class ManageSecurityHandler extends LongRunningHandler UIUtil.getDisplay().syncExec(new Runnable() { + @Override public void run() { IEditorInput input = CDOEditorUtil.createCDOEditorInput(view[0], resource.getPath(), false); @@ -173,6 +174,7 @@ public class ManageSecurityHandler extends LongRunningHandler UIUtil.getDisplay().syncExec(new Runnable() { + @Override public void run() { MessageDialog.openWarning(part.getSite().getShell(), title, message); @@ -236,6 +238,7 @@ public class ManageSecurityHandler extends LongRunningHandler openEditors.add(editor); } + @Override public void partClosed(IWorkbenchPart part) { openEditors.remove(part); @@ -247,6 +250,7 @@ public class ManageSecurityHandler extends LongRunningHandler } } + @Override public void partOpened(IWorkbenchPart part) { if (part instanceof IEditorPart) @@ -260,16 +264,19 @@ public class ManageSecurityHandler extends LongRunningHandler } } + @Override public void partDeactivated(IWorkbenchPart part) { // Pass } + @Override public void partBroughtToTop(IWorkbenchPart part) { // Pass } + @Override public void partActivated(IWorkbenchPart part) { // Pass @@ -287,6 +294,7 @@ public class ManageSecurityHandler extends LongRunningHandler { private static final AtomicInteger NEXT_SESSION_NUMBER = new AtomicInteger(); + @Override public void prepare(CDONet4jSessionConfiguration configuration) { IPasswordCredentialsProvider credentialsProvider = getCredentialsProvider(); diff --git a/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/util/ActionBarsHelper.java b/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/util/ActionBarsHelper.java index a7574ae3e8..ece05885d7 100644 --- a/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/util/ActionBarsHelper.java +++ b/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/util/ActionBarsHelper.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Eike Stepper (Loehne, Germany) and others. + * Copyright (c) 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 @@ -63,12 +63,14 @@ public class ActionBarsHelper { control.addFocusListener(new FocusListener() { + @Override public void focusLost(FocusEvent e) { unsetGlobalActions(); bars.updateActionBars(); } + @Override public void focusGained(FocusEvent e) { updateActions(); @@ -100,6 +102,7 @@ public class ActionBarsHelper control.addDisposeListener(new DisposeListener() { + @Override public void widgetDisposed(DisposeEvent e) { globalActions.clear(); diff --git a/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/util/ObjectExistsConverter.java b/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/util/ObjectExistsConverter.java index 76f38de7b7..a64b691984 100644 --- a/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/util/ObjectExistsConverter.java +++ b/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/util/ObjectExistsConverter.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2018 Eike Stepper (Loehne, Germany) and others. + * Copyright (c) 2013, 2018, 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 @@ -30,6 +30,7 @@ public class ObjectExistsConverter extends Converter super(Object.class, Boolean.class); } + @Override public Object convert(Object fromObject) { return doConvert(fromObject); diff --git a/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/util/OneToManyBlock.java b/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/util/OneToManyBlock.java index 1822202132..8d58f422aa 100644 --- a/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/util/OneToManyBlock.java +++ b/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/util/OneToManyBlock.java @@ -536,6 +536,7 @@ public class OneToManyBlock { observableList.addChangeListener(new IChangeListener() { + @Override public void handleChange(ChangeEvent event) { checkUnsupportedModelContent((IObservableList<Object>)event.getObservable()); @@ -616,21 +617,25 @@ public class OneToManyBlock this.filter = filter; } + @Override public IManagedForm getManagedForm() { return managedForm; } + @Override public EReference getModelReference() { return reference; } + @Override public EClass getItemType() { return itemType; } + @Override public IFilter getItemFilter() { return filter; diff --git a/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/util/ResourceBasedPermissionFilter.java b/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/util/ResourceBasedPermissionFilter.java index baa74e2811..f5e5b0f8db 100644 --- a/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/util/ResourceBasedPermissionFilter.java +++ b/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/util/ResourceBasedPermissionFilter.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Eike Stepper (Loehne, Germany) and others. + * Copyright (c) 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 @@ -29,6 +29,7 @@ public class ResourceBasedPermissionFilter implements IFilter { } + @Override public boolean select(Object element) { if (!(element instanceof FilterPermission)) diff --git a/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/util/SecurityUIUtil.java b/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/util/SecurityUIUtil.java index 491e39985b..5eac646bb1 100644 --- a/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/util/SecurityUIUtil.java +++ b/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/util/SecurityUIUtil.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Eike Stepper (Loehne, Germany) and others. + * Copyright (c) 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 @@ -115,6 +115,7 @@ public final class SecurityUIUtil return filters.length == 0 ? null : new IFilter() { + @Override public boolean select(Object toTest) { for (int i = 0; i < filters.length; i++) @@ -167,6 +168,7 @@ public final class SecurityUIUtil { return new IFilter() { + @Override public boolean select(Object toTest) { return itemType.isInstance(toTest); diff --git a/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/ui/ISecurityManagementContext.java b/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/ui/ISecurityManagementContext.java index 63cd494f10..29243cceba 100644 --- a/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/ui/ISecurityManagementContext.java +++ b/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/ui/ISecurityManagementContext.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2014 Eike Stepper (Loehne, Germany) and others. + * Copyright (c) 2013, 2014, 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 @@ -67,6 +67,7 @@ public interface ISecurityManagementContext */ public static class Default implements ISecurityManagementContext { + @Override public CDOView connect(CDOSession session) { if (session.isClosed()) @@ -82,11 +83,13 @@ public interface ISecurityManagementContext return session.openView(); } + @Override public void disconnect(CDOView view) { view.close(); } + @Override public CDOResource getSecurityResource(CDOView view) { CDOResource result = null; |