Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kurtakov2019-04-17 08:59:47 +0000
committerAlexander Kurtakov2019-04-17 09:37:04 +0000
commit13e262c90c87ff0d0261ab9706b151e915cb0b11 (patch)
treefbfd9a3bbf8504048a0cd5c96c133c35a92b32fc /examples
parent24d8de28c7f995ee0aa29f50d07a8b38cb5cf1c6 (diff)
downloadeclipse.platform.team-13e262c90c87ff0d0261ab9706b151e915cb0b11.tar.gz
eclipse.platform.team-13e262c90c87ff0d0261ab9706b151e915cb0b11.tar.xz
eclipse.platform.team-13e262c90c87ff0d0261ab9706b151e915cb0b11.zip
Remove useless non-javadoc/@see comments. (take 3)
Put @Override instead where needed. Change-Id: I7ccbb74b2ab634fe2440728fbe79712e7cba765d Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
Diffstat (limited to 'examples')
-rw-r--r--examples/org.eclipse.team.examples.filesystem/META-INF/MANIFEST.MF2
-rw-r--r--examples/org.eclipse.team.examples.filesystem/pom.xml2
-rw-r--r--examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/FileSystemProvider.java16
-rw-r--r--examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/FileSystemProviderType.java4
-rw-r--r--examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/subscriber/FileSystemMergeContext.java24
-rw-r--r--examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/subscriber/FileSystemRemoteTree.java8
-rw-r--r--examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/subscriber/FileSystemResourceVariant.java28
-rw-r--r--examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/subscriber/FileSystemSyncInfo.java8
-rw-r--r--examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/FileSystemSynchronizeParticipant.java77
-rw-r--r--examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/GetOperation.java24
-rw-r--r--examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/NonSyncModelMergeOperation.java17
-rw-r--r--examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/PutOperation.java24
-rw-r--r--examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/ReplaceAction.java4
-rw-r--r--examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/SyncDialogModelMergeOperation.java4
-rw-r--r--examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/SynchronizeWizard.java16
-rw-r--r--examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/model/ModelNature.java52
-rw-r--r--examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/model/mapping/ModelContainerResourceMapping.java8
-rw-r--r--examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/model/mapping/ModelMerger.java6
-rw-r--r--examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/model/mapping/ModelResourceMapping.java17
-rw-r--r--examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/model/mapping/MoeResourceMapping.java8
-rw-r--r--examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/model/ui/ModelNavigatorLabelProvider.java16
-rw-r--r--examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/model/ui/ModelWorkbenchAdapter.java27
-rw-r--r--examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/model/ui/mapping/ModelSyncActionProvider.java4
-rw-r--r--examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/model/ui/mapping/ModelSyncLabelProvider.java31
24 files changed, 154 insertions, 273 deletions
diff --git a/examples/org.eclipse.team.examples.filesystem/META-INF/MANIFEST.MF b/examples/org.eclipse.team.examples.filesystem/META-INF/MANIFEST.MF
index 632eda215..3a169357c 100644
--- a/examples/org.eclipse.team.examples.filesystem/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.team.examples.filesystem/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.team.examples.filesystem; singleton:=true
-Bundle-Version: 3.5.300.qualifier
+Bundle-Version: 3.5.400.qualifier
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Export-Package: org.eclipse.team.examples.filesystem,
diff --git a/examples/org.eclipse.team.examples.filesystem/pom.xml b/examples/org.eclipse.team.examples.filesystem/pom.xml
index 48e60b4e7..01fb30f1b 100644
--- a/examples/org.eclipse.team.examples.filesystem/pom.xml
+++ b/examples/org.eclipse.team.examples.filesystem/pom.xml
@@ -19,6 +19,6 @@
</parent>
<groupId>org.eclipse.team</groupId>
<artifactId>org.eclipse.team.examples.filesystem</artifactId>
- <version>3.5.300-SNAPSHOT</version>
+ <version>3.5.400-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/FileSystemProvider.java b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/FileSystemProvider.java
index 35a598dfb..a15f0446a 100644
--- a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/FileSystemProvider.java
+++ b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/FileSystemProvider.java
@@ -91,6 +91,7 @@ public class FileSystemProvider extends RepositoryProvider {
*
* @see org.eclipse.team.core.RepositoryProvider#configureProject()
*/
+ @Override
public void configureProject() {
FileSystemSubscriber.getInstance().handleRootChanged(getProject(), true /* added */);
}
@@ -101,6 +102,7 @@ public class FileSystemProvider extends RepositoryProvider {
*
* @see org.eclipse.core.resources.IProjectNature#deconfigure()
*/
+ @Override
public void deconfigure() throws CoreException {
// Clear the persistant property containing the location
getProject().setPersistentProperty(FILESYSTEM_REPO_LOC, null);
@@ -112,6 +114,7 @@ public class FileSystemProvider extends RepositoryProvider {
*
* @see RepositoryProvider#getID()
*/
+ @Override
public String getID() {
return FileSystemPlugin.PROVIDER_ID;
}
@@ -175,16 +178,12 @@ public class FileSystemProvider extends RepositoryProvider {
return new FileSystemOperations(this);
}
- /* (non-Javadoc)
- * @see org.eclipse.team.core.RepositoryProvider#getFileModificationValidator()
- */
+ @Override
public IFileModificationValidator getFileModificationValidator() {
return getFileModificationValidator2();
}
- /* (non-Javadoc)
- * @see org.eclipse.team.core.RepositoryProvider#getFileModificationValidator2()
- */
+ @Override
public FileModificationValidator getFileModificationValidator2() {
return new org.eclipse.team.examples.filesystem.FileModificationValidator(this);
}
@@ -229,13 +228,12 @@ public class FileSystemProvider extends RepositoryProvider {
return null;
}
- /* (non-Javadoc)
- * @see org.eclipse.team.core.RepositoryProvider#getRuleFactory()
- */
+ @Override
public IResourceRuleFactory getRuleFactory() {
return RESOURCE_RULE_FACTORY;
}
+ @Override
public IFileHistoryProvider getFileHistoryProvider() {
if (FileSystemProvider.fileHistoryProvider == null) {
FileSystemProvider.fileHistoryProvider = new FileSystemHistoryProvider();
diff --git a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/FileSystemProviderType.java b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/FileSystemProviderType.java
index f4fb25a8c..0f518fb6c 100644
--- a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/FileSystemProviderType.java
+++ b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/FileSystemProviderType.java
@@ -21,9 +21,7 @@ import org.eclipse.team.core.RepositoryProviderType;
*/
public class FileSystemProviderType extends RepositoryProviderType {
- /* (non-Javadoc)
- * @see org.eclipse.team.core.RepositoryProviderType#getProjectSetCapability()
- */
+ @Override
public ProjectSetCapability getProjectSetCapability() {
// Create an empty project set capability to test backwards compatibility
return new ProjectSetCapability() {};
diff --git a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/subscriber/FileSystemMergeContext.java b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/subscriber/FileSystemMergeContext.java
index 29e35ae73..2e8d003ed 100644
--- a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/subscriber/FileSystemMergeContext.java
+++ b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/subscriber/FileSystemMergeContext.java
@@ -15,7 +15,9 @@ package org.eclipse.team.examples.filesystem.subscriber;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.*;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.jobs.ISchedulingRule;
import org.eclipse.team.core.diff.IDiff;
import org.eclipse.team.core.diff.IThreeWayDiff;
@@ -39,18 +41,14 @@ public class FileSystemMergeContext extends SubscriberMergeContext {
initialize();
}
- /* (non-Javadoc)
- * @see org.eclipse.team.core.mapping.provider.MergeContext#makeInSync(org.eclipse.team.core.diff.IDiff, org.eclipse.core.runtime.IProgressMonitor)
- */
+ @Override
protected void makeInSync(IDiff diff, IProgressMonitor monitor)
throws CoreException {
IResource resource = ResourceDiffTree.getResourceFor(diff);
FileSystemSubscriber.getInstance().makeInSync(resource);
}
- /* (non-Javadoc)
- * @see org.eclipse.team.core.mapping.IMergeContext#markAsMerged(org.eclipse.team.core.diff.IDiff, boolean, org.eclipse.core.runtime.IProgressMonitor)
- */
+ @Override
public void markAsMerged(IDiff diff, boolean inSyncHint,
IProgressMonitor monitor) throws CoreException {
// TODO if inSyncHint is true, we should test to see if the contents match
@@ -58,24 +56,18 @@ public class FileSystemMergeContext extends SubscriberMergeContext {
FileSystemSubscriber.getInstance().markAsMerged(resource, monitor);
}
- /* (non-Javadoc)
- * @see org.eclipse.team.core.mapping.IMergeContext#reject(org.eclipse.team.core.diff.IDiff, org.eclipse.core.runtime.IProgressMonitor)
- */
+ @Override
public void reject(IDiff diff, IProgressMonitor monitor)
throws CoreException {
markAsMerged(diff, false, monitor);
}
- /* (non-Javadoc)
- * @see org.eclipse.team.core.mapping.provider.MergeContext#getMergeRule(org.eclipse.team.core.diff.IDiff)
- */
+ @Override
public ISchedulingRule getMergeRule(IDiff node) {
return ResourceDiffTree.getResourceFor(node).getProject();
}
- /* (non-Javadoc)
- * @see org.eclipse.team.core.mapping.provider.MergeContext#merge(org.eclipse.team.core.diff.IDiff, boolean, org.eclipse.core.runtime.IProgressMonitor)
- */
+ @Override
public IStatus merge(IDiff diff, boolean ignoreLocalChanges, IProgressMonitor monitor) throws CoreException {
// Only attempt the merge for non-conflicts. The reason we do this
// is because the file system provider doesn't really have the proper base
diff --git a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/subscriber/FileSystemRemoteTree.java b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/subscriber/FileSystemRemoteTree.java
index 7465fbbe5..a6dd1acce 100644
--- a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/subscriber/FileSystemRemoteTree.java
+++ b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/subscriber/FileSystemRemoteTree.java
@@ -35,16 +35,12 @@ public class FileSystemRemoteTree extends ThreeWayRemoteTree {
super(subscriber);
}
- /* (non-Javadoc)
- * @see org.eclipse.team.core.variants.AbstractResourceVariantTree#fetchMembers(org.eclipse.team.core.variants.IResourceVariant, org.eclipse.core.runtime.IProgressMonitor)
- */
+ @Override
protected IResourceVariant[] fetchMembers(IResourceVariant variant, IProgressMonitor progress) {
return ((FileSystemResourceVariant)variant).members();
}
- /* (non-Javadoc)
- * @see org.eclipse.team.core.variants.AbstractResourceVariantTree#fetchVariant(org.eclipse.core.resources.IResource, int, org.eclipse.core.runtime.IProgressMonitor)
- */
+ @Override
protected IResourceVariant fetchVariant(IResource resource, int depth, IProgressMonitor monitor) {
RepositoryProvider provider = RepositoryProvider.getProvider(resource.getProject(), FileSystemPlugin.PROVIDER_ID);
if (provider != null) {
diff --git a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/subscriber/FileSystemResourceVariant.java b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/subscriber/FileSystemResourceVariant.java
index 1c500c21f..f52203578 100644
--- a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/subscriber/FileSystemResourceVariant.java
+++ b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/subscriber/FileSystemResourceVariant.java
@@ -56,16 +56,12 @@ public class FileSystemResourceVariant extends CachedResourceVariant {
this.bytes = bytes;
}
- /* (non-Javadoc)
- * @see org.eclipse.team.core.variants.CachedResourceVariant#fetchContents(org.eclipse.core.runtime.IProgressMonitor)
- */
+ @Override
protected void fetchContents(IProgressMonitor monitor) throws TeamException {
setContents(getContents(), monitor);
}
- /* (non-Javadoc)
- * @see org.eclipse.team.core.variants.CachedResourceVariant#getCachePath()
- */
+ @Override
protected String getCachePath() {
// append the timestamp to the file path to give each variant a unique path
return getFilePath() + " " + ioFile.lastModified(); //$NON-NLS-1$
@@ -82,38 +78,28 @@ public class FileSystemResourceVariant extends CachedResourceVariant {
}
}
- /* (non-Javadoc)
- * @see org.eclipse.team.core.variants.CachedResourceVariant#getCacheId()
- */
+ @Override
protected String getCacheId() {
return FileSystemPlugin.ID;
}
- /* (non-Javadoc)
- * @see org.eclipse.team.core.variants.IResourceVariant#getName()
- */
+ @Override
public String getName() {
return ioFile.getName();
}
- /* (non-Javadoc)
- * @see org.eclipse.team.core.variants.IResourceVariant#isContainer()
- */
+ @Override
public boolean isContainer() {
return ioFile.isDirectory();
}
- /* (non-Javadoc)
- * @see org.eclipse.team.core.variants.IResourceVariant#getContentIdentifier()
- */
+ @Override
public String getContentIdentifier() {
// Use the modification timestamp as the content identifier
return new Date(ioFile.lastModified()).toString();
}
- /* (non-Javadoc)
- * @see org.eclipse.team.core.variants.IResourceVariant#asBytes()
- */
+ @Override
public byte[] asBytes() {
if (bytes == null) {
// For simplicity, convert the timestamp to it's string representation.
diff --git a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/subscriber/FileSystemSyncInfo.java b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/subscriber/FileSystemSyncInfo.java
index c0f97c503..6dfe3e7fa 100644
--- a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/subscriber/FileSystemSyncInfo.java
+++ b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/subscriber/FileSystemSyncInfo.java
@@ -30,9 +30,7 @@ public class FileSystemSyncInfo extends SyncInfo {
super(local, base, remote, comparator);
}
- /* (non-Javadoc)
- * @see org.eclipse.team.core.subscribers.SyncInfo#calculateKind(org.eclipse.core.runtime.IProgressMonitor)
- */
+ @Override
protected int calculateKind() throws TeamException {
if (getLocal().getType() != IResource.FILE) {
if (getLocal().exists() && getRemote() != null) {
@@ -42,9 +40,7 @@ public class FileSystemSyncInfo extends SyncInfo {
return super.calculateKind();
}
- /* (non-Javadoc)
- * @see org.eclipse.team.core.synchronize.SyncInfo#getBase()
- */
+ @Override
public IResourceVariant getBase() {
// If the kind has been set and there is an incoming change
// return null as the base since the server does not keep the
diff --git a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/FileSystemSynchronizeParticipant.java b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/FileSystemSynchronizeParticipant.java
index 8b9363eef..6c6478f8f 100644
--- a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/FileSystemSynchronizeParticipant.java
+++ b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/FileSystemSynchronizeParticipant.java
@@ -16,7 +16,9 @@ package org.eclipse.team.examples.filesystem.ui;
import org.eclipse.core.resources.IResource;
import org.eclipse.core.resources.mapping.ResourceMapping;
import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jface.action.*;
+import org.eclipse.jface.action.Action;
+import org.eclipse.jface.action.IContributionItem;
+import org.eclipse.jface.action.IMenuManager;
import org.eclipse.jface.viewers.ILabelDecorator;
import org.eclipse.jface.viewers.LabelProvider;
import org.eclipse.swt.graphics.Image;
@@ -32,48 +34,48 @@ import org.eclipse.team.examples.filesystem.subscriber.FileSystemSubscriber;
import org.eclipse.team.internal.ui.TeamUIPlugin;
import org.eclipse.team.ui.TeamUI;
import org.eclipse.team.ui.mapping.SynchronizationActionProvider;
-import org.eclipse.team.ui.synchronize.*;
+import org.eclipse.team.ui.synchronize.ISynchronizeModelElement;
+import org.eclipse.team.ui.synchronize.ISynchronizePageConfiguration;
+import org.eclipse.team.ui.synchronize.ModelSynchronizeParticipant;
+import org.eclipse.team.ui.synchronize.ModelSynchronizeParticipantActionGroup;
/**
* This is an example synchronize participant for the file system provider. It will allow
* showing synchronization state for local resources mapped to a remote file system
* location.
- *
+ *
* @since 3.0
*/
public class FileSystemSynchronizeParticipant extends ModelSynchronizeParticipant {
-
+
/**
* The participant id for the org.eclipse.team.ui.synchronizeParticipant extension point.
*/
public static final String ID = "org.eclipse.team.examples.filesystem.participant"; //$NON-NLS-1$
-
+
/**
* The viewer id for the org.eclipse.ui.navigator.viewer extension point.
*/
public static final String VIEWER_ID = "org.eclipse.team.examples.filesystem.syncViewer"; //$NON-NLS-1$
-
+
/**
* Custom menu groups included in the viewer definition in the plugin.xml.
*/
public static final String CONTEXT_MENU_PUT_GROUP_1 = "put"; //$NON-NLS-1$
public static final String CONTEXT_MENU_OVERWRITE_GROUP_1 = "overwrite"; //$NON-NLS-1$
-
+
/**
* A custom label decorator that will show the remote mapped path for each
* file.
*/
public class FileSystemParticipantLabelDecorator extends LabelProvider implements ILabelDecorator {
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.ILabelDecorator#decorateImage(org.eclipse.swt.graphics.Image, java.lang.Object)
- */
+ @Override
public Image decorateImage(Image image, Object element) {
return image;
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.ILabelDecorator#decorateText(java.lang.String, java.lang.Object)
- */
+
+ @Override
public String decorateText(String text, Object element) {
try {
if (element instanceof ISynchronizeModelElement) {
@@ -92,26 +94,22 @@ public class FileSystemSynchronizeParticipant extends ModelSynchronizeParticipan
return null;
}
}
-
+
/**
- * Action group that contributes the get an put menus to the context menu
+ * Action group that contributes the get an put menus to the context menu
* in the synchronize view
*/
public class FileSystemParticipantActionGroup extends ModelSynchronizeParticipantActionGroup {
- /* (non-Javadoc)
- * @see org.eclipse.team.ui.synchronize.SynchronizePageActionGroup#initialize(org.eclipse.team.ui.synchronize.ISynchronizePageConfiguration)
- */
+ @Override
public void initialize(ISynchronizePageConfiguration configuration) {
super.initialize(configuration);
appendToGroup(
- ISynchronizePageConfiguration.P_CONTEXT_MENU,
+ ISynchronizePageConfiguration.P_CONTEXT_MENU,
CONTEXT_MENU_PUT_GROUP_1,
new ModelPutAction("Put", configuration));
}
-
- /* (non-Javadoc)
- * @see org.eclipse.team.ui.operations.MergeActionGroup#configureMergeAction(java.lang.String, org.eclipse.jface.action.Action)
- */
+
+ @Override
protected void configureMergeAction(String mergeActionId, Action action) {
if (mergeActionId == SynchronizationActionProvider.MERGE_ACTION_ID) {
// Custom label for overwrite
@@ -123,7 +121,8 @@ public class FileSystemSynchronizeParticipant extends ModelSynchronizeParticipan
super.configureMergeAction(mergeActionId, action);
}
}
-
+
+ @Override
protected void addToContextMenu(String mergeActionId, Action action, IMenuManager manager) {
IContributionItem group = null;
if (mergeActionId == SynchronizationActionProvider.MERGE_ACTION_ID) {
@@ -147,7 +146,7 @@ public class FileSystemSynchronizeParticipant extends ModelSynchronizeParticipan
}
}
-
+
/**
* Create a file system participant. This method is invoked by the
* Synchronize view when a persisted participant is being restored.
@@ -160,7 +159,7 @@ public class FileSystemSynchronizeParticipant extends ModelSynchronizeParticipan
public FileSystemSynchronizeParticipant() {
super();
}
-
+
/**
* Create the participant for the given context. This method is used
* by the file system plugin to create a participant and then add it to
@@ -176,35 +175,27 @@ public class FileSystemSynchronizeParticipant extends ModelSynchronizeParticipan
}
setSecondaryId(Long.toString(System.currentTimeMillis()));
}
-
- /* (non-Javadoc)
- * @see org.eclipse.team.ui.synchronize.subscribers.SubscriberParticipant#initializeConfiguration(org.eclipse.team.ui.synchronize.ISynchronizePageConfiguration)
- */
+
+ @Override
protected void initializeConfiguration(ISynchronizePageConfiguration configuration) {
super.initializeConfiguration(configuration);
configuration.setProperty(ISynchronizePageConfiguration.P_VIEWER_ID, VIEWER_ID);
-
+
// Add the label decorator
configuration.addLabelDecorator(new FileSystemParticipantLabelDecorator());
}
-
- /* (non-Javadoc)
- * @see org.eclipse.team.ui.synchronize.ModelSynchronizeParticipant#createMergeActionGroup()
- */
+
+ @Override
protected ModelSynchronizeParticipantActionGroup createMergeActionGroup() {
return new FileSystemParticipantActionGroup();
}
-
- /* (non-Javadoc)
- * @see org.eclipse.team.ui.synchronize.ModelSynchronizeParticipant#restoreContext(org.eclipse.team.core.mapping.ISynchronizationScopeManager)
- */
+
+ @Override
protected MergeContext restoreContext(ISynchronizationScopeManager manager) {
return new FileSystemMergeContext(manager);
}
-
- /* (non-Javadoc)
- * @see org.eclipse.team.ui.synchronize.ModelSynchronizeParticipant#createScopeManager(org.eclipse.core.resources.mapping.ResourceMapping[])
- */
+
+ @Override
protected ISynchronizationScopeManager createScopeManager(ResourceMapping[] mappings) {
return FileSystemOperation.createScopeManager(getName(), mappings);
}
diff --git a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/GetOperation.java b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/GetOperation.java
index b3b1541df..b22573688 100644
--- a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/GetOperation.java
+++ b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/GetOperation.java
@@ -17,7 +17,7 @@ import org.eclipse.core.resources.mapping.ResourceTraversal;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.team.core.TeamException;
-import org.eclipse.team.core.diff.*;
+import org.eclipse.team.core.diff.IThreeWayDiff;
import org.eclipse.team.core.subscribers.SubscriberScopeManager;
import org.eclipse.team.examples.filesystem.FileSystemProvider;
import org.eclipse.team.examples.filesystem.Policy;
@@ -35,9 +35,7 @@ public class GetOperation extends FileSystemOperation {
super(part, manager);
}
- /* (non-Javadoc)
- * @see org.eclipse.team.examples.filesystem.ui.FileSystemOperation#execute(org.eclipse.team.examples.filesystem.FileSystemProvider, org.eclipse.core.resources.mapping.ResourceTraversal[], org.eclipse.core.runtime.SubProgressMonitor)
- */
+ @Override
protected void execute(FileSystemProvider provider,
ResourceTraversal[] traversals, IProgressMonitor monitor)
throws CoreException {
@@ -51,16 +49,14 @@ public class GetOperation extends FileSystemOperation {
private boolean hasIncomingChanges(ResourceTraversal[] traversals) throws CoreException {
final RuntimeException found = new RuntimeException();
try {
- FileSystemSubscriber.getInstance().accept(traversals, new IDiffVisitor() {
- public boolean visit(IDiff diff) {
- if (diff instanceof IThreeWayDiff) {
- IThreeWayDiff twd = (IThreeWayDiff) diff;
- if (twd.getDirection() == IThreeWayDiff.INCOMING || twd.getDirection() == IThreeWayDiff.CONFLICTING) {
- throw found;
- }
+ FileSystemSubscriber.getInstance().accept(traversals, diff -> {
+ if (diff instanceof IThreeWayDiff) {
+ IThreeWayDiff twd = (IThreeWayDiff) diff;
+ if (twd.getDirection() == IThreeWayDiff.INCOMING || twd.getDirection() == IThreeWayDiff.CONFLICTING) {
+ throw found;
}
- return false;
}
+ return false;
});
} catch (RuntimeException e) {
if (e == found)
@@ -87,9 +83,7 @@ public class GetOperation extends FileSystemOperation {
this.overwriteOutgoing = overwriteOutgoing;
}
- /* (non-Javadoc)
- * @see org.eclipse.team.examples.filesystem.ui.FileSystemOperation#getTaskName()
- */
+ @Override
protected String getTaskName() {
return Policy.bind("GetAction.working"); //$NON-NLS-1$
}
diff --git a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/NonSyncModelMergeOperation.java b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/NonSyncModelMergeOperation.java
index 32c0d8cf9..a2453c77d 100644
--- a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/NonSyncModelMergeOperation.java
+++ b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/NonSyncModelMergeOperation.java
@@ -14,7 +14,9 @@
package org.eclipse.team.examples.filesystem.ui;
import org.eclipse.core.resources.mapping.RemoteResourceMappingContext;
-import org.eclipse.core.runtime.*;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.SubMonitor;
import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Shell;
@@ -55,9 +57,7 @@ public class NonSyncModelMergeOperation extends ModelMergeOperation {
super(part, manager);
}
- /* (non-Javadoc)
- * @see org.eclipse.team.ui.synchronize.ModelMergeOperation#initializeContext(org.eclipse.core.runtime.IProgressMonitor)
- */
+ @Override
protected void initializeContext(IProgressMonitor monitor) throws CoreException {
try {
monitor.beginTask(null, 100);
@@ -77,9 +77,7 @@ public class NonSyncModelMergeOperation extends ModelMergeOperation {
}
}
- /* (non-Javadoc)
- * @see org.eclipse.team.ui.synchronize.ModelOperation#getContext()
- */
+ @Override
protected ISynchronizationContext getContext() {
return context;
}
@@ -89,15 +87,14 @@ public class NonSyncModelMergeOperation extends ModelMergeOperation {
* any changes.
* @see org.eclipse.team.ui.synchronize.ModelMergeOperation#handlePreviewRequest()
*/
+ @Override
protected void handlePreviewRequest() {
// We perform a syncExec so that the job will dispose of the scope manager
// after the dialog closes
Display.getDefault().syncExec(() -> NonSyncMergeDialog.openFor(NonSyncModelMergeOperation.this));
}
- /* (non-Javadoc)
- * @see org.eclipse.team.ui.TeamOperation#getShell()
- */
+ @Override
public Shell getShell() {
// Change method to public
return super.getShell();
diff --git a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/PutOperation.java b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/PutOperation.java
index d2d5630ef..e4fc8e9b7 100644
--- a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/PutOperation.java
+++ b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/PutOperation.java
@@ -17,7 +17,7 @@ import org.eclipse.core.resources.mapping.ResourceTraversal;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.team.core.TeamException;
-import org.eclipse.team.core.diff.*;
+import org.eclipse.team.core.diff.IThreeWayDiff;
import org.eclipse.team.core.subscribers.SubscriberScopeManager;
import org.eclipse.team.examples.filesystem.FileSystemProvider;
import org.eclipse.team.examples.filesystem.Policy;
@@ -40,9 +40,7 @@ public class PutOperation extends FileSystemOperation {
super(part, manager);
}
- /* (non-Javadoc)
- * @see org.eclipse.team.examples.filesystem.ui.FileSystemOperation#execute(org.eclipse.team.examples.filesystem.FileSystemProvider, org.eclipse.core.resources.mapping.ResourceTraversal[], org.eclipse.core.runtime.SubProgressMonitor)
- */
+ @Override
protected void execute(FileSystemProvider provider,
ResourceTraversal[] traversals, IProgressMonitor monitor)
throws CoreException {
@@ -56,16 +54,14 @@ public class PutOperation extends FileSystemOperation {
private boolean hasOutgoingChanges(ResourceTraversal[] traversals) throws CoreException {
final RuntimeException found = new RuntimeException();
try {
- FileSystemSubscriber.getInstance().accept(traversals, new IDiffVisitor() {
- public boolean visit(IDiff diff) {
- if (diff instanceof IThreeWayDiff) {
- IThreeWayDiff twd = (IThreeWayDiff) diff;
- if (twd.getDirection() == IThreeWayDiff.OUTGOING || twd.getDirection() == IThreeWayDiff.CONFLICTING) {
- throw found;
- }
+ FileSystemSubscriber.getInstance().accept(traversals, diff -> {
+ if (diff instanceof IThreeWayDiff) {
+ IThreeWayDiff twd = (IThreeWayDiff) diff;
+ if (twd.getDirection() == IThreeWayDiff.OUTGOING || twd.getDirection() == IThreeWayDiff.CONFLICTING) {
+ throw found;
}
- return false;
}
+ return false;
});
} catch (RuntimeException e) {
if (e == found)
@@ -75,9 +71,7 @@ public class PutOperation extends FileSystemOperation {
return false;
}
- /* (non-Javadoc)
- * @see org.eclipse.team.examples.filesystem.ui.FileSystemOperation#getTaskName()
- */
+ @Override
protected String getTaskName() {
return Policy.bind("PutAction.working"); //$NON-NLS-1$
}
diff --git a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/ReplaceAction.java b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/ReplaceAction.java
index 62dc3183b..5a068bbf4 100644
--- a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/ReplaceAction.java
+++ b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/ReplaceAction.java
@@ -19,9 +19,7 @@ package org.eclipse.team.examples.filesystem.ui;
*/
public class ReplaceAction extends GetAction {
- /* (non-Javadoc)
- * @see org.eclipse.team.examples.filesystem.ui.GetAction#isOverwriteOutgoing()
- */
+ @Override
protected boolean isOverwriteOutgoing() {
return true;
}
diff --git a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/SyncDialogModelMergeOperation.java b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/SyncDialogModelMergeOperation.java
index d9469cd89..b034b920a 100644
--- a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/SyncDialogModelMergeOperation.java
+++ b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/SyncDialogModelMergeOperation.java
@@ -30,9 +30,7 @@ public class SyncDialogModelMergeOperation extends
super(part, manager);
}
- /* (non-Javadoc)
- * @see org.eclipse.team.ui.synchronize.ModelParticipantMergeOperation#createMergeContext()
- */
+ @Override
protected SynchronizationContext createMergeContext() {
return new FileSystemMergeContext(getScopeManager());
}
diff --git a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/SynchronizeWizard.java b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/SynchronizeWizard.java
index 84679d382..fab46cd5a 100644
--- a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/SynchronizeWizard.java
+++ b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/SynchronizeWizard.java
@@ -35,9 +35,7 @@ public class SynchronizeWizard extends ModelParticipantWizard {
super();
}
- /* (non-Javadoc)
- * @see org.eclipse.team.ui.synchronize.ModelParticipantWizard#createParticipant(org.eclipse.core.resources.mapping.ResourceMapping[])
- */
+ @Override
protected ISynchronizeParticipant createParticipant(ResourceMapping[] selectedMappings) {
SubscriberScopeManager manager = FileSystemOperation.createScopeManager(FileSystemSubscriber.getInstance().getName(), selectedMappings);
FileSystemMergeContext context = new FileSystemMergeContext(manager);
@@ -45,9 +43,7 @@ public class SynchronizeWizard extends ModelParticipantWizard {
return participant;
}
- /* (non-Javadoc)
- * @see org.eclipse.team.ui.synchronize.ParticipantSynchronizeWizard#getImportWizard()
- */
+ @Override
protected IWizard getImportWizard() {
// We don't have an import wizard for the file system example but
// if we did, we could return it here and it would be used if the
@@ -55,16 +51,12 @@ public class SynchronizeWizard extends ModelParticipantWizard {
return importWizard;
}
- /* (non-Javadoc)
- * @see org.eclipse.team.ui.synchronize.ParticipantSynchronizeWizard#getPageTitle()
- */
+ @Override
protected String getPageTitle() {
return "Synchronize File System Example";
}
- /* (non-Javadoc)
- * @see org.eclipse.team.ui.synchronize.ParticipantSynchronizeWizard#getRootResources()
- */
+ @Override
protected IResource[] getRootResources() {
return FileSystemSubscriber.getInstance().roots();
}
diff --git a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/model/ModelNature.java b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/model/ModelNature.java
index bfe32b83c..092278a59 100644
--- a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/model/ModelNature.java
+++ b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/model/ModelNature.java
@@ -22,35 +22,27 @@ import org.eclipse.core.resources.IProjectNature;
public class ModelNature implements IProjectNature {
public static final String NATURE_ID = "org.eclipse.team.examples.filesystem.modelNature";
-
- private IProject project;
-
- /* (non-Javadoc)
- * @see org.eclipse.core.resources.IProjectNature#configure()
- */
- public void configure() {
- // Nothing to do
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.core.resources.IProjectNature#deconfigure()
- */
- public void deconfigure() {
- // Nothing to do
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.core.resources.IProjectNature#getProject()
- */
- public IProject getProject() {
- return project;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.core.resources.IProjectNature#setProject(org.eclipse.core.resources.IProject)
- */
- public void setProject(IProject project) {
- this.project = project;
- }
+
+ private IProject project;
+
+ @Override
+ public void configure() {
+ // Nothing to do
+ }
+
+ @Override
+ public void deconfigure() {
+ // Nothing to do
+ }
+
+ @Override
+ public IProject getProject() {
+ return project;
+ }
+
+ @Override
+ public void setProject(IProject project) {
+ this.project = project;
+ }
}
diff --git a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/model/mapping/ModelContainerResourceMapping.java b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/model/mapping/ModelContainerResourceMapping.java
index afb877682..29e096830 100644
--- a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/model/mapping/ModelContainerResourceMapping.java
+++ b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/model/mapping/ModelContainerResourceMapping.java
@@ -28,9 +28,7 @@ public class ModelContainerResourceMapping extends ModelResourceMapping {
super(container);
}
- /* (non-Javadoc)
- * @see org.eclipse.core.resources.mapping.ResourceMapping#getTraversals(org.eclipse.core.resources.mapping.ResourceMappingContext, org.eclipse.core.runtime.IProgressMonitor)
- */
+ @Override
public ResourceTraversal[] getTraversals(ResourceMappingContext context,
IProgressMonitor monitor) {
return new ResourceTraversal[] {
@@ -44,9 +42,7 @@ public class ModelContainerResourceMapping extends ModelResourceMapping {
return ((ModelContainer)getModelObject()).getResource();
}
- /* (non-Javadoc)
- * @see org.eclipse.core.resources.mapping.ResourceMapping#contains(org.eclipse.core.resources.mapping.ResourceMapping)
- */
+ @Override
public boolean contains(ResourceMapping mapping) {
if (mapping instanceof ModelResourceMapping) {
ModelObject object = (ModelObject)mapping.getModelObject();
diff --git a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/model/mapping/ModelMerger.java b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/model/mapping/ModelMerger.java
index 7ddbe9a34..6dc403b0e 100644
--- a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/model/mapping/ModelMerger.java
+++ b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/model/mapping/ModelMerger.java
@@ -57,17 +57,11 @@ public class ModelMerger extends ResourceMappingMerger {
this.provider = provider;
}
- /* (non-Javadoc)
- * @see org.eclipse.team.core.mapping.ResourceMappingMerger#getModelProvider()
- */
@Override
protected org.eclipse.core.resources.mapping.ModelProvider getModelProvider() {
return provider;
}
- /* (non-Javadoc)
- * @see org.eclipse.team.core.mapping.ResourceMappingMerger#merge(org.eclipse.team.core.mapping.IMergeContext, org.eclipse.core.runtime.IProgressMonitor)
- */
@Override
public IStatus merge(IMergeContext mergeContext, IProgressMonitor monitor) throws CoreException {
try {
diff --git a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/model/mapping/ModelResourceMapping.java b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/model/mapping/ModelResourceMapping.java
index 17894f809..c5177587b 100644
--- a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/model/mapping/ModelResourceMapping.java
+++ b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/model/mapping/ModelResourceMapping.java
@@ -15,7 +15,10 @@ package org.eclipse.team.examples.model.mapping;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.mapping.ResourceMapping;
-import org.eclipse.team.examples.model.*;
+import org.eclipse.team.examples.model.ModelContainer;
+import org.eclipse.team.examples.model.ModelObject;
+import org.eclipse.team.examples.model.ModelObjectDefinitionFile;
+import org.eclipse.team.examples.model.ModelObjectElementFile;
public abstract class ModelResourceMapping extends ResourceMapping {
@@ -38,23 +41,17 @@ public abstract class ModelResourceMapping extends ResourceMapping {
this.object = object;
}
- /* (non-Javadoc)
- * @see org.eclipse.core.resources.mapping.ResourceMapping#getModelObject()
- */
+ @Override
public Object getModelObject() {
return object;
}
- /* (non-Javadoc)
- * @see org.eclipse.core.resources.mapping.ResourceMapping#getModelProviderId()
- */
+ @Override
public String getModelProviderId() {
return ExampleModelProvider.ID;
}
- /* (non-Javadoc)
- * @see org.eclipse.core.resources.mapping.ResourceMapping#getProjects()
- */
+ @Override
public IProject[] getProjects() {
return new IProject[] { (IProject)object.getProject().getResource() };
}
diff --git a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/model/mapping/MoeResourceMapping.java b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/model/mapping/MoeResourceMapping.java
index bb3062f2a..0c515c4a6 100644
--- a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/model/mapping/MoeResourceMapping.java
+++ b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/model/mapping/MoeResourceMapping.java
@@ -27,9 +27,7 @@ public class MoeResourceMapping extends ModelResourceMapping {
super(file);
}
- /* (non-Javadoc)
- * @see org.eclipse.core.resources.mapping.ResourceMapping#getTraversals(org.eclipse.core.resources.mapping.ResourceMappingContext, org.eclipse.core.runtime.IProgressMonitor)
- */
+ @Override
public ResourceTraversal[] getTraversals(ResourceMappingContext context,
IProgressMonitor monitor) {
return new ResourceTraversal[] {
@@ -43,9 +41,7 @@ public class MoeResourceMapping extends ModelResourceMapping {
return ((ModelResource)getModelObject()).getResource();
}
- /* (non-Javadoc)
- * @see org.eclipse.core.resources.mapping.ResourceMapping#contains(org.eclipse.core.resources.mapping.ResourceMapping)
- */
+ @Override
public boolean contains(ResourceMapping mapping) {
if (mapping.equals(this))
return true;
diff --git a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/model/ui/ModelNavigatorLabelProvider.java b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/model/ui/ModelNavigatorLabelProvider.java
index 9b10e86a4..7768114e1 100644
--- a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/model/ui/ModelNavigatorLabelProvider.java
+++ b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/model/ui/ModelNavigatorLabelProvider.java
@@ -29,30 +29,22 @@ public class ModelNavigatorLabelProvider extends WorkbenchLabelProvider implemen
private ICommonContentExtensionSite extensionSite;
- /* (non-Javadoc)
- * @see org.eclipse.ui.navigator.ICommonLabelProvider#init(org.eclipse.ui.navigator.ICommonContentExtensionSite)
- */
+ @Override
public void init(ICommonContentExtensionSite aConfig) {
extensionSite = aConfig;
}
- /* (non-Javadoc)
- * @see org.eclipse.ui.navigator.IMementoAware#restoreState(org.eclipse.ui.IMemento)
- */
+ @Override
public void restoreState(IMemento aMemento) {
// Nothing to do
}
- /* (non-Javadoc)
- * @see org.eclipse.ui.navigator.IMementoAware#saveState(org.eclipse.ui.IMemento)
- */
+ @Override
public void saveState(IMemento aMemento) {
// Nothing to do
}
- /* (non-Javadoc)
- * @see org.eclipse.ui.navigator.IDescriptionProvider#getDescription(java.lang.Object)
- */
+ @Override
public String getDescription(Object anElement) {
if (anElement instanceof ModelObject) {
return ((ModelObject) anElement).getPath();
diff --git a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/model/ui/ModelWorkbenchAdapter.java b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/model/ui/ModelWorkbenchAdapter.java
index 650be58a9..8f4d7587b 100644
--- a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/model/ui/ModelWorkbenchAdapter.java
+++ b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/model/ui/ModelWorkbenchAdapter.java
@@ -15,10 +15,17 @@ package org.eclipse.team.examples.model.ui;
import java.net.URL;
-import org.eclipse.core.runtime.*;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.FileLocator;
+import org.eclipse.core.runtime.Path;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.team.examples.filesystem.FileSystemPlugin;
-import org.eclipse.team.examples.model.*;
+import org.eclipse.team.examples.model.ModelFolder;
+import org.eclipse.team.examples.model.ModelObject;
+import org.eclipse.team.examples.model.ModelObjectDefinitionFile;
+import org.eclipse.team.examples.model.ModelObjectElementFile;
+import org.eclipse.team.examples.model.ModelProject;
+import org.eclipse.team.examples.model.ModelWorkspace;
import org.eclipse.ui.model.IWorkbenchAdapter;
/**
@@ -29,9 +36,7 @@ public class ModelWorkbenchAdapter implements IWorkbenchAdapter {
// image path
private static final String ICON_PATH = "$nl$/icons/full/"; //$NON-NLS-1$
- /* (non-Javadoc)
- * @see org.eclipse.ui.model.IWorkbenchAdapter#getChildren(java.lang.Object)
- */
+ @Override
public Object[] getChildren(Object o) {
if (o instanceof ModelObject) {
ModelObject mo = (ModelObject) o;
@@ -44,9 +49,7 @@ public class ModelWorkbenchAdapter implements IWorkbenchAdapter {
return new Object[0];
}
- /* (non-Javadoc)
- * @see org.eclipse.ui.model.IWorkbenchAdapter#getImageDescriptor(java.lang.Object)
- */
+ @Override
public ImageDescriptor getImageDescriptor(Object object) {
if (object instanceof ModelProject) {
return createImageDescriptor("obj/prj_obj.gif");
@@ -66,9 +69,7 @@ public class ModelWorkbenchAdapter implements IWorkbenchAdapter {
return null;
}
- /* (non-Javadoc)
- * @see org.eclipse.ui.model.IWorkbenchAdapter#getLabel(java.lang.Object)
- */
+ @Override
public String getLabel(Object o) {
if (o instanceof ModelObject) {
ModelObject mo = (ModelObject) o;
@@ -77,9 +78,7 @@ public class ModelWorkbenchAdapter implements IWorkbenchAdapter {
return null;
}
- /* (non-Javadoc)
- * @see org.eclipse.ui.model.IWorkbenchAdapter#getParent(java.lang.Object)
- */
+ @Override
public Object getParent(Object o) {
if (o instanceof ModelObject) {
ModelObject mo = (ModelObject) o;
diff --git a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/model/ui/mapping/ModelSyncActionProvider.java b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/model/ui/mapping/ModelSyncActionProvider.java
index 61848cb25..2ae215a22 100644
--- a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/model/ui/mapping/ModelSyncActionProvider.java
+++ b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/model/ui/mapping/ModelSyncActionProvider.java
@@ -25,9 +25,7 @@ public class ModelSyncActionProvider extends SynchronizationActionProvider {
super();
}
- /* (non-Javadoc)
- * @see org.eclipse.team.ui.mapping.SynchronizationActionProvider#initialize()
- */
+ @Override
protected void initialize() {
super.initialize();
final ISynchronizePageConfiguration configuration= getSynchronizePageConfiguration();
diff --git a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/model/ui/mapping/ModelSyncLabelProvider.java b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/model/ui/mapping/ModelSyncLabelProvider.java
index a99922f15..53cf0ecde 100644
--- a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/model/ui/mapping/ModelSyncLabelProvider.java
+++ b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/model/ui/mapping/ModelSyncLabelProvider.java
@@ -38,34 +38,26 @@ public class ModelSyncLabelProvider extends SynchronizationLabelProvider {
super();
}
- /* (non-Javadoc)
- * @see org.eclipse.team.ui.mapping.SynchronizationLabelProvider#init(org.eclipse.ui.navigator.ICommonContentExtensionSite)
- */
+ @Override
public void init(ICommonContentExtensionSite site) {
super.init(site);
delegate = new ModelNavigatorLabelProvider();
delegate.init(site);
}
- /* (non-Javadoc)
- * @see org.eclipse.team.ui.synchronize.AbstractSynchronizeLabelProvider#dispose()
- */
+ @Override
public void dispose() {
super.dispose();
if (delegate != null)
delegate.dispose();
}
- /* (non-Javadoc)
- * @see org.eclipse.team.ui.synchronize.AbstractSynchronizeLabelProvider#getDelegateLabelProvider()
- */
+ @Override
protected ILabelProvider getDelegateLabelProvider() {
return delegate;
}
- /* (non-Javadoc)
- * @see org.eclipse.team.ui.synchronize.AbstractSynchronizeLabelProvider#getDiff(java.lang.Object)
- */
+ @Override
protected IDiff getDiff(Object element) {
if (element instanceof ModelResource) {
ModelResource mr = (ModelResource) element;
@@ -74,16 +66,12 @@ public class ModelSyncLabelProvider extends SynchronizationLabelProvider {
return super.getDiff(element);
}
- /* (non-Javadoc)
- * @see org.eclipse.team.ui.synchronize.AbstractSynchronizeLabelProvider#isIncludeOverlays()
- */
+ @Override
protected boolean isIncludeOverlays() {
return true;
}
- /* (non-Javadoc)
- * @see org.eclipse.team.ui.synchronize.AbstractSynchronizeLabelProvider#isBusy(java.lang.Object)
- */
+ @Override
protected boolean isBusy(Object element) {
if (element instanceof ModelResource) {
ModelResource mr = (ModelResource) element;
@@ -92,8 +80,7 @@ public class ModelSyncLabelProvider extends SynchronizationLabelProvider {
ModelObjectDefinitionFile modFile = (ModelObjectDefinitionFile) mr;
try {
ModelObjectElementFile[] children = modFile.getModelObjectElementFiles();
- for (int i = 0; i < children.length; i++) {
- ModelObjectElementFile file = children[i];
+ for (ModelObjectElementFile file : children) {
busy = getContext().getDiffTree().getProperty(file.getResource().getFullPath(), IDiffTree.P_BUSY_HINT);
if (busy)
break;
@@ -107,6 +94,7 @@ public class ModelSyncLabelProvider extends SynchronizationLabelProvider {
return super.isBusy(element);
}
+ @Override
protected boolean hasDecendantConflicts(Object element) {
if (element instanceof ModelResource) {
ModelResource mr = (ModelResource) element;
@@ -115,8 +103,7 @@ public class ModelSyncLabelProvider extends SynchronizationLabelProvider {
ModelObjectDefinitionFile modFile = (ModelObjectDefinitionFile) mr;
try {
ModelObjectElementFile[] children = modFile.getModelObjectElementFiles();
- for (int i = 0; i < children.length; i++) {
- ModelObjectElementFile file = children[i];
+ for (ModelObjectElementFile file : children) {
conflict = getContext().getDiffTree().getProperty(file.getResource().getFullPath(), IDiffTree.P_HAS_DESCENDANT_CONFLICTS);
if (conflict)
break;

Back to the top