diff options
Diffstat (limited to 'bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RepositoriesView.java')
| -rw-r--r-- | bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RepositoriesView.java | 105 |
1 files changed, 45 insertions, 60 deletions
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RepositoriesView.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RepositoriesView.java index d5ca3c0dc..ecbc6e0ad 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RepositoriesView.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RepositoriesView.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2009 IBM Corporation and others. + * Copyright (c) 2000, 2018 IBM Corporation 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 @@ -17,7 +17,6 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.jface.action.*; import org.eclipse.jface.dialogs.IDialogSettings; import org.eclipse.jface.util.IPropertyChangeListener; -import org.eclipse.jface.util.PropertyChangeEvent; import org.eclipse.jface.viewers.*; import org.eclipse.jface.wizard.WizardDialog; import org.eclipse.osgi.util.NLS; @@ -70,31 +69,28 @@ public class RepositoriesView extends RemoteViewPart { private static final String FILTER_SHOW_MODULES = "filterShowModules"; //$NON-NLS-1$ IRepositoryListener listener = new IRepositoryListener() { + @Override public void repositoryAdded(final ICVSRepositoryLocation root) { - getViewer().getControl().getDisplay().asyncExec(new Runnable() { - public void run() { - refreshViewer(); - getViewer().setSelection(new StructuredSelection(root)); - } + getViewer().getControl().getDisplay().asyncExec(() -> { + refreshViewer(); + getViewer().setSelection(new StructuredSelection(root)); }); } + @Override public void repositoriesChanged(ICVSRepositoryLocation[] roots) { refresh(); } private void refresh() { Display display = getViewer().getControl().getDisplay(); - display.asyncExec(new Runnable() { - public void run() { - RepositoriesView.this.refreshViewer(); - } - }); + display.asyncExec(() -> RepositoriesView.this.refreshViewer()); } }; private static final class RepositoryDragSourceListener implements DragSourceListener { private IStructuredSelection selection; - public void dragStart(DragSourceEvent event) { + @Override + public void dragStart(DragSourceEvent event) { if(selection!=null) { final Object[] array = selection.toArray(); // event.doit = Utils.getResources(array).length > 0; @@ -108,7 +104,8 @@ public class RepositoriesView extends RemoteViewPart { } } - public void dragSetData(DragSourceEvent event) { + @Override + public void dragSetData(DragSourceEvent event) { if (selection!=null && CVSResourceTransfer.getInstance().isSupportedType(event.dataType)) { final Object[] array = selection.toArray(); for (int i = 0; i < array.length; i++) { @@ -129,7 +126,8 @@ public class RepositoriesView extends RemoteViewPart { } } - public void dragFinished( DragSourceEvent event) { + @Override + public void dragFinished( DragSourceEvent event) { } public void updateSelection( IStructuredSelection selection) { @@ -172,6 +170,7 @@ public class RepositoriesView extends RemoteViewPart { /** * Contribute actions to the view */ + @Override protected void contributeActions() { final Shell shell = getShell(); @@ -180,6 +179,7 @@ public class RepositoriesView extends RemoteViewPart { // New Repository (popup) newAction = new Action(CVSUIMessages.RepositoriesView_new, CVSUIPlugin.getPlugin().getImageDescriptor(ICVSUIConstants.IMG_NEWLOCATION)) { + @Override public void run() { NewLocationWizard wizard = new NewLocationWizard(); wizard.setSwitchPerspectives(false); @@ -191,6 +191,7 @@ public class RepositoriesView extends RemoteViewPart { if (includeAnonConnection()) { newAnonAction = new Action(CVSUIMessages.RepositoriesView_newAnonCVS, CVSUIPlugin.getPlugin().getImageDescriptor(ICVSUIConstants.IMG_NEWLOCATION)) { + @Override public void run() { Properties p = new Properties(); p.setProperty("connection", "pserver"); //$NON-NLS-1$ //$NON-NLS-2$ @@ -209,24 +210,23 @@ public class RepositoriesView extends RemoteViewPart { // Properties propertiesAction = new PropertyDialogAction(shell, getViewer()); getViewSite().getActionBars().setGlobalActionHandler(ActionFactory.PROPERTIES.getId(), propertiesAction); - IStructuredSelection selection = (IStructuredSelection)getViewer().getSelection(); + IStructuredSelection selection = getViewer().getStructuredSelection(); if (selection.size() == 1 && selection.getFirstElement() instanceof RepositoryRoot) { propertiesAction.setEnabled(true); } else { propertiesAction.setEnabled(false); } - getViewer().addSelectionChangedListener(new ISelectionChangedListener() { - public void selectionChanged(SelectionChangedEvent event) { - IStructuredSelection ss = (IStructuredSelection)event.getSelection(); - boolean enabled = ss.size() == 1 && ss.getFirstElement() instanceof RepositoryRoot; - propertiesAction.setEnabled(enabled); - } + getViewer().addSelectionChangedListener(event -> { + IStructuredSelection ss = event.getStructuredSelection(); + boolean enabled = ss.size() == 1 && ss.getFirstElement() instanceof RepositoryRoot; + propertiesAction.setEnabled(enabled); }); removeRootAction = new RemoveRootAction(viewer.getControl().getShell(), this); removeRootAction.selectionChanged((IStructuredSelection)null); removeDateTagAction = new RemoveDateTagAction(); removeDateTagAction.selectionChanged( (IStructuredSelection)null); removeAction = new Action(){ + @Override public void run(){ if(removeRootAction.isEnabled()){ removeRootAction.run(); @@ -241,17 +241,15 @@ public class RepositoriesView extends RemoteViewPart { bars.setGlobalActionHandler(ActionFactory.DELETE.getId(), removeAction); // Sort By action group - IPropertyChangeListener comparatorUpdater = new IPropertyChangeListener() { - public void propertyChange(PropertyChangeEvent event) { - String property = event.getProperty(); - if (RepositoriesSortingActionGroup.CHANGE_COMPARATOR - .equals(property)) { - Object newValue = event.getNewValue(); - getViewer().refresh(); - saveSelectedComparator((RepositoryComparator) newValue); - } - } - }; + IPropertyChangeListener comparatorUpdater = event -> { + String property = event.getProperty(); + if (RepositoriesSortingActionGroup.CHANGE_COMPARATOR + .equals(property)) { + Object newValue = event.getNewValue(); + getViewer().refresh(); + saveSelectedComparator((RepositoryComparator) newValue); + } + }; setActionGroup(new RepositoriesSortingActionGroup(shell, comparatorUpdater)); // restore comparator selection @@ -261,6 +259,7 @@ public class RepositoriesView extends RemoteViewPart { super.contributeActions(); toggleFilterAction = new Action(CVSUIMessages.RepositoriesView_NoFilter){ + @Override public void run(){ if (repositoriesFilter != null) getViewer().removeFilter(repositoriesFilter); @@ -320,15 +319,13 @@ public class RepositoriesView extends RemoteViewPart { return System.getProperty("eclipse.cvs.anon") != null; //$NON-NLS-1$ } - /** - * @see org.eclipse.team.internal.ccvs.ui.repo.RemoteViewPart#addWorkbenchActions(org.eclipse.jface.action.IMenuManager) - */ + @Override protected void addWorkbenchActions(IMenuManager manager) { // New actions go next MenuManager sub = new MenuManager(CVSUIMessages.RepositoriesView_newSubmenu, IWorkbenchActionConstants.GROUP_ADD); manager.add(sub); super.addWorkbenchActions(manager); - IStructuredSelection selection = (IStructuredSelection)getViewer().getSelection(); + IStructuredSelection selection = getViewer().getStructuredSelection(); removeRootAction.selectionChanged(selection); removeDateTagAction.selectionChanged(selection); @@ -348,9 +345,7 @@ public class RepositoriesView extends RemoteViewPart { sub.add(new Separator("group1")); //$NON-NLS-1$ } - /* - * @see WorkbenchPart#createPartControl - */ + @Override public void createPartControl(Composite parent) { super.createPartControl(parent); CVSUIPlugin.getPlugin().getRepositoryManager().addRepositoryListener(listener); @@ -362,9 +357,7 @@ public class RepositoriesView extends RemoteViewPart { getRepositoriesSortingActionGroup().fillActionBars(getViewSite().getActionBars()); } - /* - * @see WorkbenchPart#dispose - */ + @Override public void dispose() { if (repositoriesFilter != null) dialogSettings.put(FILTER_SHOW_MODULES, repositoriesFilter.isShowModules()); @@ -384,15 +377,14 @@ public class RepositoriesView extends RemoteViewPart { root = new AllRootsElement(); } + @Override protected void initializeListeners() { super.initializeListeners(); viewer.addSelectionChangedListener(removeRootAction); viewer.addSelectionChangedListener(removeDateTagAction); - viewer.addSelectionChangedListener(new ISelectionChangedListener(){ - public void selectionChanged(SelectionChangedEvent event) { - IStructuredSelection selection = (IStructuredSelection)event.getSelection(); - handleChange(selection); - } + viewer.addSelectionChangedListener(event -> { + IStructuredSelection selection = (IStructuredSelection)event.getSelection(); + handleChange(selection); }); repositoryDragSourceListener = new RepositoryDragSourceListener(); @@ -401,17 +393,13 @@ public class RepositoriesView extends RemoteViewPart { repositoryDragSourceListener); } - /** - * @see org.eclipse.team.internal.ccvs.ui.repo.RemoteViewPart#getTreeInput() - */ + @Override protected Object getTreeInput() { initialize(); return root; } - /** - * @see org.eclipse.ui.ISelectionListener#selectionChanged(org.eclipse.ui.IWorkbenchPart, org.eclipse.jface.viewers.ISelection) - */ + @Override public void selectionChanged(IWorkbenchPart part, ISelection selection) { String msg = getStatusLineMessage(selection); getViewSite().getActionBars().getStatusLineManager().setMessage(msg); @@ -443,18 +431,15 @@ public class RepositoriesView extends RemoteViewPart { return CVSUIMessages.RepositoriesView_OneItemSelected; } - /** - * @see org.eclipse.team.internal.ccvs.ui.repo.RemoteViewPart#getHelpContextId() - */ + @Override protected String getHelpContextId() { return IHelpContextIds.REPOSITORIES_VIEW; } - /** - * @see org.eclipse.team.internal.ccvs.ui.repo.RemoteViewPart#getKeyListener() - */ + @Override protected KeyAdapter getKeyListener() { return new KeyAdapter() { + @Override public void keyPressed(KeyEvent event) { if (event.keyCode == SWT.F5) { if (WorkbenchUserAuthenticator.USE_ALTERNATE_PROMPTER) { |