diff options
author | Carsten Hammer | 2020-05-17 15:42:04 +0000 |
---|---|---|
committer | Karsten Thoms | 2020-06-11 18:12:59 +0000 |
commit | 0a66c984bca3664deb0092d0f55877cf61f49ca9 (patch) | |
tree | 6a6b8ed908ccb78ab51cc723b5378dee1a4619bb | |
parent | 6cdb003031eb739be2a7f0baaebdda3257b75893 (diff) | |
download | eclipse.platform.team-0a66c984bca3664deb0092d0f55877cf61f49ca9.tar.gz eclipse.platform.team-0a66c984bca3664deb0092d0f55877cf61f49ca9.tar.xz eclipse.platform.team-0a66c984bca3664deb0092d0f55877cf61f49ca9.zip |
Add missing overrideI20200612-0400I20200611-1800
Change-Id: I4fdb013bcd1a1693ba91895412bcac118fc16e6b
Signed-off-by: Carsten Hammer <carsten.hammer@t-online.de>
32 files changed, 130 insertions, 0 deletions
diff --git a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/FileSystemPlugin.java b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/FileSystemPlugin.java index e45c39034..df44644ac 100644 --- a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/FileSystemPlugin.java +++ b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/FileSystemPlugin.java @@ -118,6 +118,7 @@ public class FileSystemPlugin extends AbstractUIPlugin { return display; } + @Override public void start(BundleContext context) throws Exception { super.start(context); //Call startup on the Pessimistic Plugin @@ -126,6 +127,7 @@ public class FileSystemPlugin extends AbstractUIPlugin { tracker.start(); } + @Override public void stop(BundleContext context) throws Exception { try { if (pessPlugin != null) diff --git a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/history/FileSystemFileRevision.java b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/history/FileSystemFileRevision.java index 50dbe8b35..dde68d250 100644 --- a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/history/FileSystemFileRevision.java +++ b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/history/FileSystemFileRevision.java @@ -32,17 +32,21 @@ public class FileSystemFileRevision extends FileRevision { this.remoteFile = file; } + @Override public String getName() { return remoteFile.getName(); } + @Override public long getTimestamp() { return remoteFile.lastModified(); } + @Override public IStorage getStorage(IProgressMonitor monitor) { return new IStorage() { + @Override public InputStream getContents() { try { return new FileInputStream(remoteFile); @@ -53,18 +57,22 @@ public class FileSystemFileRevision extends FileRevision { return null; } + @Override public IPath getFullPath() { return new Path(remoteFile.getAbsolutePath()); } + @Override public String getName() { return remoteFile.getName(); } + @Override public boolean isReadOnly() { return true; } + @Override public <T> T getAdapter(Class<T> adapter) { return null; } @@ -72,14 +80,17 @@ public class FileSystemFileRevision extends FileRevision { }; } + @Override public boolean isPropertyMissing() { return false; } + @Override public IFileRevision withAllProperties(IProgressMonitor monitor) { return null; } + @Override public String getContentIdentifier() { return "[File System Revision]"; //$NON-NLS-1$ } diff --git a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/history/FileSystemHistory.java b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/history/FileSystemHistory.java index 2ff916cc1..47906f937 100644 --- a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/history/FileSystemHistory.java +++ b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/history/FileSystemHistory.java @@ -35,18 +35,22 @@ public class FileSystemHistory extends FileHistory { this.file = file; } + @Override public IFileRevision[] getContributors(IFileRevision revision) { return null; } + @Override public IFileRevision getFileRevision(String id) { return null; } + @Override public IFileRevision[] getFileRevisions() { return revisions; } + @Override public IFileRevision[] getTargets(IFileRevision revision) { return null; } diff --git a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/history/FileSystemHistoryProvider.java b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/history/FileSystemHistoryProvider.java index 69a08b8a4..ac0379d2e 100644 --- a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/history/FileSystemHistoryProvider.java +++ b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/history/FileSystemHistoryProvider.java @@ -22,14 +22,17 @@ import org.eclipse.team.core.history.provider.FileHistoryProvider; public class FileSystemHistoryProvider extends FileHistoryProvider { + @Override public IFileHistory getFileHistoryFor(IResource resource, int flags, IProgressMonitor monitor) { return null; } + @Override public IFileHistory getFileHistoryFor(IFileStore store, int flags, IProgressMonitor monitor) { return null; } + @Override public IFileRevision getWorkspaceFileRevision(IResource resource) { return null; } diff --git a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/ConfigurationWizard.java b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/ConfigurationWizard.java index fe445995c..1ecefd95b 100644 --- a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/ConfigurationWizard.java +++ b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/ConfigurationWizard.java @@ -54,10 +54,12 @@ public class ConfigurationWizard extends Wizard implements IConfigurationWizard, * * @see org.eclipse.team.ui.IConfigurationWizard#init(IWorkbench, IProject) */ + @Override public void init(IWorkbench workbench, IProject project) { setProjects(new IProject[] { project } ); } + @Override public void addPages() { mainPage = new FileSystemMainPage( "FileSystemMainPage", //$NON-NLS-1$ @@ -71,6 +73,7 @@ public class ConfigurationWizard extends Wizard implements IConfigurationWizard, * Using the information entered in the main page set the provider for * the given project. */ + @Override public boolean performFinish() { mainPage.finish(null); try { @@ -98,6 +101,7 @@ public class ConfigurationWizard extends Wizard implements IConfigurationWizard, return true; } + @Override public <T> T getAdapter(Class<T> adapter) { if (adapter == IConfigurationWizardExtension.class) { return adapter.cast((IConfigurationWizardExtension) (workbench, projects) -> setProjects(projects)); diff --git a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/FileSystemHistoryPage.java b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/FileSystemHistoryPage.java index 56befec75..8d72fd443 100644 --- a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/FileSystemHistoryPage.java +++ b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/FileSystemHistoryPage.java @@ -72,6 +72,7 @@ public class FileSystemHistoryPage extends HistoryPage { this.fileHistory = fileHistory; } + @Override public IStatus run(IProgressMonitor monitor) { IStatus status = Status.OK_STATUS; @@ -87,6 +88,7 @@ public class FileSystemHistoryPage extends HistoryPage { } } + @Override public boolean inputSet() { IFile tempFile = getFile(); this.file = tempFile; @@ -118,6 +120,7 @@ public class FileSystemHistoryPage extends HistoryPage { return null; } + @Override public void createControl(Composite parent) { localComposite = new Composite(parent, SWT.NONE); @@ -138,6 +141,7 @@ public class FileSystemHistoryPage extends HistoryPage { private void contributeActions() { openAction = new OpenFileSystemRevisionAction("Open"); //$NON-NLS-1$ tableViewer.getTable().addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { openAction.selectionChanged(tableViewer.getStructuredSelection()); } @@ -159,6 +163,7 @@ public class FileSystemHistoryPage extends HistoryPage { TableViewer viewer = fileSystemTableProvider.createTable(parent); viewer.setContentProvider(new IStructuredContentProvider() { + @Override public Object[] getElements(Object inputElement) { // The entries of already been fetch so return them if (entries != null) @@ -170,11 +175,13 @@ public class FileSystemHistoryPage extends HistoryPage { return entries; } + @Override public void dispose() { // TODO Auto-generated method stub } + @Override public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { entries = null; } @@ -183,14 +190,17 @@ public class FileSystemHistoryPage extends HistoryPage { return viewer; } + @Override public Control getControl() { return localComposite; } + @Override public void setFocus() { localComposite.setFocus(); } + @Override public String getDescription() { if (file != null) return file.getFullPath().toString(); @@ -198,6 +208,7 @@ public class FileSystemHistoryPage extends HistoryPage { return null; } + @Override public String getName() { if (file != null) return file.getName(); @@ -205,6 +216,7 @@ public class FileSystemHistoryPage extends HistoryPage { return ""; //$NON-NLS-1$ } + @Override public boolean isValidInput(Object object) { if (object instanceof IResource && ((IResource) object).getType() == IResource.FILE) { @@ -216,6 +228,7 @@ public class FileSystemHistoryPage extends HistoryPage { return false; } + @Override public void refresh() { refreshHistory(); } @@ -233,6 +246,7 @@ public class FileSystemHistoryPage extends HistoryPage { Utils.schedule(refreshFileHistoryJob, getWorkbenchSite(parentSite)); } + @Override public <T> T getAdapter(Class<T> adapter) { return null; } diff --git a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/FileSystemHistoryPageSource.java b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/FileSystemHistoryPageSource.java index cf3b73d0b..3089d0afa 100644 --- a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/FileSystemHistoryPageSource.java +++ b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/FileSystemHistoryPageSource.java @@ -22,6 +22,7 @@ import org.eclipse.ui.part.Page; public class FileSystemHistoryPageSource extends HistoryPageSource { + @Override public boolean canShowHistoryFor(Object object) { if (object instanceof IResource && ((IResource) object).getType() == IResource.FILE) { RepositoryProvider provider = RepositoryProvider.getProvider(((IFile) object).getProject()); @@ -32,6 +33,7 @@ public class FileSystemHistoryPageSource extends HistoryPageSource { return false; } + @Override public Page createPage(Object object) { FileSystemHistoryPage page = new FileSystemHistoryPage(); return page; diff --git a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/FileSystemRevisionEditorInput.java b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/FileSystemRevisionEditorInput.java index f2170e894..64f1140d8 100644 --- a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/FileSystemRevisionEditorInput.java +++ b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/FileSystemRevisionEditorInput.java @@ -41,14 +41,17 @@ public class FileSystemRevisionEditorInput extends PlatformObject implements IWo } } + @Override public Object[] getChildren(Object o) { return new Object[0]; } + @Override public ImageDescriptor getImageDescriptor(Object object) { return null; } + @Override public String getLabel(Object o) { if (storage != null) { return storage.getName(); @@ -56,22 +59,27 @@ public class FileSystemRevisionEditorInput extends PlatformObject implements IWo return ""; //$NON-NLS-1$ } + @Override public Object getParent(Object o) { return null; } + @Override public IStorage getStorage() { return storage; } + @Override public boolean exists() { return true; } + @Override public ImageDescriptor getImageDescriptor() { return null; } + @Override public String getName() { if (fileRevision != null) return fileRevision.getName() + " " + fileRevision.getContentIdentifier(); //$NON-NLS-1$ @@ -82,10 +90,12 @@ public class FileSystemRevisionEditorInput extends PlatformObject implements IWo return ""; //$NON-NLS-1$ } + @Override public IPersistableElement getPersistable() { return null; } + @Override public String getToolTipText() { if (fileRevision != null) return getStorage().getFullPath().toString(); @@ -96,6 +106,7 @@ public class FileSystemRevisionEditorInput extends PlatformObject implements IWo return ""; //$NON-NLS-1$ } + @Override public <T> T getAdapter(Class<T> adapter) { if (adapter == IWorkbenchAdapter.class) { return adapter.cast(this); diff --git a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/FileSystemTableProvider.java b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/FileSystemTableProvider.java index 18fe42a7b..595d61d95 100644 --- a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/FileSystemTableProvider.java +++ b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/FileSystemTableProvider.java @@ -93,10 +93,12 @@ public class FileSystemTableProvider { class HistoryLabelProvider extends LabelProvider implements ITableLabelProvider, IColorProvider, IFontProvider { + @Override public Image getColumnImage(Object element, int columnIndex) { return null; } + @Override public String getColumnText(Object element, int columnIndex) { IFileRevision entry = adaptToFileRevision(element); if (entry == null) @@ -115,14 +117,17 @@ public class FileSystemTableProvider { return ""; //$NON-NLS-1$ } + @Override public Color getBackground(Object element) { return null; } + @Override public Color getForeground(Object element) { return null; } + @Override public Font getFont(Object element) { return null; } @@ -152,6 +157,7 @@ public class FileSystemTableProvider { * Compares two log entries, sorting first by the main column of this sorter, * then by subsequent columns, depending on the column sort order. */ + @Override public int compare(Viewer compareViewer, Object o1, Object o2) { /*if (o1 instanceof AbstractCVSHistoryCategory || o2 instanceof AbstractCVSHistoryCategory) return 0;*/ @@ -250,6 +256,7 @@ public class FileSystemTableProvider { * presses on the same column header will * toggle sorting order (ascending/descending). */ + @Override public void widgetSelected(SelectionEvent e) { // column selected - need to sort int column = tableViewer.getTable().indexOf((TableColumn) e.widget); diff --git a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/GetAction.java b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/GetAction.java index 859e57085..9a00e7d48 100644 --- a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/GetAction.java +++ b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/GetAction.java @@ -23,6 +23,7 @@ import org.eclipse.team.examples.filesystem.Policy; */ public class GetAction extends FileSystemAction { + @Override protected void execute(IAction action) { try { GetOperation operation = new GetOperation(getTargetPart(), diff --git a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/MergeAction.java b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/MergeAction.java index 6f3c51e49..52eb9689d 100644 --- a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/MergeAction.java +++ b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/MergeAction.java @@ -27,6 +27,7 @@ import org.eclipse.team.ui.synchronize.ModelMergeOperation; */ public class MergeAction extends FileSystemAction { + @Override protected void execute(IAction action) { try { ModelMergeOperation operation; diff --git a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/NonSyncMergeDialog.java b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/NonSyncMergeDialog.java index d267ad1e3..005f98483 100644 --- a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/NonSyncMergeDialog.java +++ b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/NonSyncMergeDialog.java @@ -41,6 +41,7 @@ public class NonSyncMergeDialog extends SaveablePartDialog { super(shell, input); } + @Override protected void buttonPressed(int buttonId) { if (buttonId == OK) { NonSyncMergePart part = (NonSyncMergePart)getInput(); @@ -57,6 +58,7 @@ public class NonSyncMergeDialog extends SaveablePartDialog { return context.getDiffTree().hasMatchingDiffs( ResourcesPlugin.getWorkspace().getRoot().getFullPath(), new FastDiffFilter() { + @Override public boolean select(IDiff diff) { if (diff instanceof IThreeWayDiff) { IThreeWayDiff twd = (IThreeWayDiff) diff; diff --git a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/NonSyncMergePart.java b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/NonSyncMergePart.java index 2f21a6425..5738d2cae 100644 --- a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/NonSyncMergePart.java +++ b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/NonSyncMergePart.java @@ -47,15 +47,18 @@ public class NonSyncMergePart extends PageSaveablePart { this.page = page; } + @Override protected Control createPage(Composite parent, ToolBarManager toolBarManager) { page.createControl(parent); return page.getControl(); } + @Override protected ISelectionProvider getSelectionProvider() { return page.getViewer(); } + @Override protected ICompareInput getCompareInput(ISelection selection) { ICompareInput compareInput = super.getCompareInput(selection); if (compareInput != null) @@ -83,6 +86,7 @@ public class NonSyncMergePart extends PageSaveablePart { return null; } + @Override protected void prepareInput(ICompareInput input, CompareConfiguration configuration, IProgressMonitor monitor) throws InvocationTargetException { @@ -103,15 +107,18 @@ public class NonSyncMergePart extends PageSaveablePart { return Adapters.adapt(input, ISynchronizationCompareInput.class); } + @Override public void contentChanged(IContentChangeNotifier source) { // TODO Auto-generated method stub } + @Override public String getTitle() { return "File System Provider Merge"; } + @Override public Image getTitleImage() { return null; } diff --git a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/PutAction.java b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/PutAction.java index 8d412b2fb..6820a1dbe 100644 --- a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/PutAction.java +++ b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/PutAction.java @@ -23,6 +23,7 @@ import org.eclipse.team.examples.filesystem.Policy; */ public class PutAction extends FileSystemAction { + @Override protected void execute(IAction action) { try { PutOperation operation = new PutOperation(getTargetPart(), diff --git a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/ShowHistoryAction.java b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/ShowHistoryAction.java index bc320a60a..fe8419bcb 100644 --- a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/ShowHistoryAction.java +++ b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/ShowHistoryAction.java @@ -33,6 +33,7 @@ public class ShowHistoryAction extends ActionDelegate implements IObjectActionDe IStructuredSelection fSelection; + @Override public void run(IAction action) { final Shell shell = Display.getDefault().getActiveShell(); try { @@ -49,12 +50,14 @@ public class ShowHistoryAction extends ActionDelegate implements IObjectActionDe } } + @Override public void selectionChanged(IAction action, ISelection sel) { if (sel instanceof IStructuredSelection) { fSelection = (IStructuredSelection) sel; } } + @Override public void setActivePart(IAction action, IWorkbenchPart targetPart) { // do nothing } diff --git a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/SynchronizeAction.java b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/SynchronizeAction.java index 95b9b214d..a52ba0af2 100644 --- a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/SynchronizeAction.java +++ b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/SynchronizeAction.java @@ -27,6 +27,7 @@ import org.eclipse.team.ui.synchronize.ISynchronizeParticipant; */ public class SynchronizeAction extends FileSystemAction { + @Override protected void execute(IAction action) { ResourceMapping[] mappings = getSelectedMappings(); if (mappings.length == 0) diff --git a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/localhistory/LocalHistoryParticipant.java b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/localhistory/LocalHistoryParticipant.java index 33a92331c..3bd216458 100644 --- a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/localhistory/LocalHistoryParticipant.java +++ b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/localhistory/LocalHistoryParticipant.java @@ -41,11 +41,13 @@ public class LocalHistoryParticipant extends SubscriberParticipant { public static final String CONTEXT_MENU_CONTRIBUTION_GROUP = "context_group_1"; //$NON-NLS-1$ private class LocalHistoryActionContribution extends SynchronizePageActionGroup { + @Override public void initialize(ISynchronizePageConfiguration configuration) { super.initialize(configuration); appendToGroup( ISynchronizePageConfiguration.P_CONTEXT_MENU, CONTEXT_MENU_CONTRIBUTION_GROUP, new SynchronizeModelAction("Revert to latest in local history", configuration) { //$NON-NLS-1$ + @Override protected SynchronizeModelOperation getSubscriberOperation(ISynchronizePageConfiguration configuration, IDiffElement[] elements) { return new RevertAllOperation(configuration, elements); } @@ -54,6 +56,7 @@ public class LocalHistoryParticipant extends SubscriberParticipant { } private class LocalHistoryDecorator extends LabelProvider implements ILabelDecorator { + @Override public String decorateText(String text, Object element) { if(element instanceof ISynchronizeModelElement) { ISynchronizeModelElement node = (ISynchronizeModelElement)element; @@ -68,6 +71,7 @@ public class LocalHistoryParticipant extends SubscriberParticipant { return text; } + @Override public Image decorateImage(Image image, Object element) { return null; } @@ -77,6 +81,7 @@ public class LocalHistoryParticipant extends SubscriberParticipant { setSubscriber(new LocalHistorySubscriber()); } + @Override protected void setSubscriber(Subscriber subscriber) { super.setSubscriber(subscriber); try { @@ -88,6 +93,7 @@ public class LocalHistoryParticipant extends SubscriberParticipant { } } + @Override protected void initializeConfiguration(ISynchronizePageConfiguration configuration) { super.initializeConfiguration(configuration); configuration.addMenuGroup( @@ -104,6 +110,7 @@ public class LocalHistoryParticipant extends SubscriberParticipant { return null; } + @Override public void prepareCompareInput(ISynchronizeModelElement element, CompareConfiguration config, IProgressMonitor monitor) throws TeamException { diff --git a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/localhistory/LocalHistorySyncInfo.java b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/localhistory/LocalHistorySyncInfo.java index a48ffae1c..130f9eb36 100644 --- a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/localhistory/LocalHistorySyncInfo.java +++ b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/localhistory/LocalHistorySyncInfo.java @@ -25,6 +25,7 @@ public class LocalHistorySyncInfo extends SyncInfo { super(local, null, remote, comparator); } + @Override protected int calculateKind() throws TeamException { if (getRemote() == null) return IN_SYNC; diff --git a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/localhistory/LocalHistorySynchronizeWizard.java b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/localhistory/LocalHistorySynchronizeWizard.java index 8ccd50c17..faf121e4d 100644 --- a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/localhistory/LocalHistorySynchronizeWizard.java +++ b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/localhistory/LocalHistorySynchronizeWizard.java @@ -36,6 +36,7 @@ public class LocalHistorySynchronizeWizard extends Wizard { super(pageName, title, titleImage); } + @Override public void createControl(Composite parent) { Composite top = new Composite(parent, SWT.NONE); top.setLayout(new GridLayout()); @@ -51,10 +52,12 @@ public class LocalHistorySynchronizeWizard extends Wizard { super(); } + @Override public void addPages() { addPage(new MessagePage("Local History", "Create a local history synchronization", TeamImages.getImageDescriptor(ITeamUIImages.IMG_WIZBAN_SHARE))); //$NON-NLS-1$//$NON-NLS-2$ } + @Override public boolean performFinish() { LocalHistoryParticipant participant = new LocalHistoryParticipant(); ISynchronizeManager manager = TeamUI.getSynchronizeManager(); diff --git a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/localhistory/LocalHistoryVariant.java b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/localhistory/LocalHistoryVariant.java index f0fda34d3..8b8a63dd2 100644 --- a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/localhistory/LocalHistoryVariant.java +++ b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/localhistory/LocalHistoryVariant.java @@ -29,22 +29,27 @@ public class LocalHistoryVariant implements IResourceVariant { this.state = state; } + @Override public String getName() { return state.getName(); } + @Override public boolean isContainer() { return false; } + @Override public IStorage getStorage(IProgressMonitor monitor) { return state; } + @Override public String getContentIdentifier() { return DateFormat.getDateTimeInstance().format(new Date(state.getModificationTime())); } + @Override public byte[] asBytes() { return null; } diff --git a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/localhistory/LocalHistoryVariantComparator.java b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/localhistory/LocalHistoryVariantComparator.java index 2780f5adb..700d3bcec 100644 --- a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/localhistory/LocalHistoryVariantComparator.java +++ b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/localhistory/LocalHistoryVariantComparator.java @@ -18,14 +18,17 @@ import org.eclipse.team.core.variants.IResourceVariant; import org.eclipse.team.core.variants.IResourceVariantComparator; public class LocalHistoryVariantComparator implements IResourceVariantComparator { + @Override public boolean compare(IResource local, IResourceVariant remote) { return false; } + @Override public boolean compare(IResourceVariant base, IResourceVariant remote) { return false; } + @Override public boolean isThreeWay() { return false; } diff --git a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/localhistory/RevertAllOperation.java b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/localhistory/RevertAllOperation.java index d7faed24a..e650304cc 100644 --- a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/localhistory/RevertAllOperation.java +++ b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/localhistory/RevertAllOperation.java @@ -28,15 +28,18 @@ public class RevertAllOperation extends SynchronizeModelOperation { super(configuration, elements); } + @Override protected boolean canRunAsJob() { return true; } + @Override public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException { final SyncInfo infos[] = getSyncInfoSet().getSyncInfos(); if(infos.length == 0) return; WorkspaceModifyOperation operation= new WorkspaceModifyOperation() { + @Override public void execute(IProgressMonitor pm) throws InvocationTargetException { try { pm.beginTask("Reverting from local history", 100 * infos.length); //$NON-NLS-1$ diff --git a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/model/ModelFile.java b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/model/ModelFile.java index b8e444c96..0aac29aae 100644 --- a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/model/ModelFile.java +++ b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/model/ModelFile.java @@ -21,6 +21,7 @@ public abstract class ModelFile extends ModelResource { super(file); } + @Override public String getName() { String name = super.getName(); int index = name.lastIndexOf("."); diff --git a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/model/ModelObjectElementFile.java b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/model/ModelObjectElementFile.java index fab575f3f..8dd497f0b 100644 --- a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/model/ModelObjectElementFile.java +++ b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/model/ModelObjectElementFile.java @@ -32,14 +32,17 @@ public class ModelObjectElementFile extends ModelFile { this.parent = parent; } + @Override public ModelObject[] getChildren() { return new ModelObject[0]; } + @Override public ModelObject getParent() { return parent; } + @Override public void delete() throws CoreException { parent.remove(this); super.delete(); diff --git a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/model/ModelWorkspace.java b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/model/ModelWorkspace.java index 2af814d62..1e772005b 100644 --- a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/model/ModelWorkspace.java +++ b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/model/ModelWorkspace.java @@ -21,10 +21,12 @@ public class ModelWorkspace extends ModelContainer { super(ResourcesPlugin.getWorkspace().getRoot()); } + @Override public String getName() { return "Model Root"; } + @Override public ModelObject getParent() { return null; } diff --git a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/model/ui/AdapterFactory.java b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/model/ui/AdapterFactory.java index 8d683d375..05f5923c1 100644 --- a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/model/ui/AdapterFactory.java +++ b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/model/ui/AdapterFactory.java @@ -33,6 +33,7 @@ public class AdapterFactory implements IAdapterFactory { private CompareAdapter compareAdapter; private static Object historyPageSource = new FileSystemHistoryPageSource(); + @Override public <T> T getAdapter(Object adaptableObject, Class<T> adapterType) { if (adapterType == IWorkbenchAdapter.class && adaptableObject instanceof ModelObject) return adapterType.cast(modelAdapter); @@ -58,6 +59,7 @@ public class AdapterFactory implements IAdapterFactory { return null; } + @Override public Class<?>[] getAdapterList() { return new Class[] { IWorkbenchAdapter.class, ResourceMapping.class, IResourceMappingMerger.class, ISynchronizationCompareAdapter.class }; } diff --git a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/model/ui/ModelNavigatorActionProvider.java b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/model/ui/ModelNavigatorActionProvider.java index d255cc2d7..0ed08bc66 100644 --- a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/model/ui/ModelNavigatorActionProvider.java +++ b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/model/ui/ModelNavigatorActionProvider.java @@ -49,6 +49,7 @@ public class ModelNavigatorActionProvider extends CommonActionProvider { super(); } + @Override public void init(ICommonActionExtensionSite aSite) { super.init(aSite); createActions(); @@ -56,6 +57,7 @@ public class ModelNavigatorActionProvider extends CommonActionProvider { private void createActions() { deleteAction = new Action("Delete") { + @Override public void run() { IStructuredSelection selection = (IStructuredSelection)getContext().getSelection(); try { @@ -72,6 +74,7 @@ public class ModelNavigatorActionProvider extends CommonActionProvider { } }; newFolderAction = new Action("Create Folder") { + @Override public void run() { IContainer container = getSelectedContainer(); if (container != null) { @@ -97,6 +100,7 @@ public class ModelNavigatorActionProvider extends CommonActionProvider { } }; newModAction = new Action("Create MOD File") { + @Override public void run() { IContainer container = getSelectedContainer(); if (container != null) { @@ -124,6 +128,7 @@ public class ModelNavigatorActionProvider extends CommonActionProvider { } }; newMoeAction = new Action("Create MOE File") { + @Override public void run() { ModelObjectDefinitionFile modFile = getSelectedModFile(); if (modFile != null) { @@ -153,6 +158,7 @@ public class ModelNavigatorActionProvider extends CommonActionProvider { } }; makeDirty = new Action("Make Dirty") { + @Override public void run() { IStructuredSelection selection = (IStructuredSelection)getContext().getSelection(); for (Iterator iter = selection.iterator(); iter.hasNext();) { @@ -176,6 +182,7 @@ public class ModelNavigatorActionProvider extends CommonActionProvider { return getActionSite().getViewSite().getShell(); } + @Override public void fillContextMenu(IMenuManager menu) { super.fillContextMenu(menu); menu.add(deleteAction); diff --git a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/model/ui/ModelSaveable.java b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/model/ui/ModelSaveable.java index 6ed7280b9..286115dcb 100644 --- a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/model/ui/ModelSaveable.java +++ b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/model/ui/ModelSaveable.java @@ -35,6 +35,7 @@ public class ModelSaveable extends Saveable { modelObject = mo; } + @Override public boolean equals(Object object) { if (object instanceof ModelSaveable) { ModelSaveable other = (ModelSaveable) object; @@ -47,26 +48,32 @@ public class ModelSaveable extends Saveable { return modelObject; } + @Override public ImageDescriptor getImageDescriptor() { return ModelWorkbenchAdapter.createImageDescriptor("obj/mod_obj.gif"); } + @Override public String getName() { return modelObject.getName(); } + @Override public String getToolTipText() { return "Saveable for " + getName(); } + @Override public int hashCode() { return modelObject.hashCode(); } + @Override public boolean isDirty() { return dirty; } + @Override public void doSave(IProgressMonitor monitor) { dirty = false; modelSaveablesProvider.saved(this); @@ -76,6 +83,7 @@ public class ModelSaveable extends Saveable { dirty = true; } + @Override public <T> T getAdapter(Class<T> adapter) { if (adapter == ResourceMapping.class) { return Adapters.adapt(getModelObject(), adapter); diff --git a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/model/ui/NewModelProjectWizard.java b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/model/ui/NewModelProjectWizard.java index 808d08435..ea5267f40 100644 --- a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/model/ui/NewModelProjectWizard.java +++ b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/model/ui/NewModelProjectWizard.java @@ -37,6 +37,7 @@ public class NewModelProjectWizard extends Wizard implements INewWizard { super(); } + @Override public void addPages() { super.addPages(); @@ -46,6 +47,7 @@ public class NewModelProjectWizard extends Wizard implements INewWizard { this.addPage(mainPage); } + @Override public boolean performFinish() { // get a project handle final IProject newProjectHandle = mainPage.getProjectHandle(); @@ -64,6 +66,7 @@ public class NewModelProjectWizard extends Wizard implements INewWizard { // create the new project operation WorkspaceModifyOperation op = new WorkspaceModifyOperation() { + @Override protected void execute(IProgressMonitor monitor) throws CoreException { createProject(description, newProjectHandle, monitor); @@ -128,6 +131,7 @@ public class NewModelProjectWizard extends Wizard implements INewWizard { } } + @Override public void init(IWorkbench workbench, IStructuredSelection selection) { // Nothing to do } diff --git a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/pessimistic/ui/BlankPage.java b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/pessimistic/ui/BlankPage.java index 3b3ab5a61..2233f2c13 100644 --- a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/pessimistic/ui/BlankPage.java +++ b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/pessimistic/ui/BlankPage.java @@ -36,6 +36,7 @@ public class BlankPage extends WizardPage { /** * Creates an empty control. */ + @Override public void createControl(Composite parent) { Composite client = new Composite(parent, SWT.NULL); GridLayout layout = new GridLayout(); diff --git a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/pessimistic/ui/PessimisticDecorator.java b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/pessimistic/ui/PessimisticDecorator.java index 463fe03bd..a6355314a 100644 --- a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/pessimistic/ui/PessimisticDecorator.java +++ b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/pessimistic/ui/PessimisticDecorator.java @@ -35,6 +35,7 @@ public class PessimisticDecorator extends LabelProvider implements ILabelDecorat PessimisticFilesystemProviderPlugin.getInstance().addProviderListener(this); } + @Override public String decorateText(String text, Object element) { IResource resource= getResource(element); if (resource == null) @@ -55,6 +56,7 @@ public class PessimisticDecorator extends LabelProvider implements ILabelDecorat return "(not controlled) " + text; } + @Override public Image decorateImage(Image image, Object element) { return image; } @@ -96,11 +98,13 @@ public class PessimisticDecorator extends LabelProvider implements ILabelDecorat } } + @Override public void dispose() { PessimisticFilesystemProviderPlugin.getInstance().removeProviderListener(this); super.dispose(); } + @Override public void stateChanged(IResource[] resources) { if (resources.length > 0) { LabelProviderChangedEvent[] events= new LabelProviderChangedEvent[resources.length]; diff --git a/tests/org.eclipse.core.tests.net/src/org/eclipse/core/tests/net/Activator.java b/tests/org.eclipse.core.tests.net/src/org/eclipse/core/tests/net/Activator.java index 34028c072..ec1dfa677 100644 --- a/tests/org.eclipse.core.tests.net/src/org/eclipse/core/tests/net/Activator.java +++ b/tests/org.eclipse.core.tests.net/src/org/eclipse/core/tests/net/Activator.java @@ -35,11 +35,13 @@ public class Activator extends Plugin { public Activator() { } + @Override public void start(BundleContext context) throws Exception { super.start(context); plugin = this; } + @Override public void stop(BundleContext context) throws Exception { plugin = null; super.stop(context); |