Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/GetOperation.java')
-rw-r--r--examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/GetOperation.java24
1 files changed, 9 insertions, 15 deletions
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$
}

Back to the top