1 files changed, 23 insertions, 15 deletions

diff --git a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/model/ui/mapping/CompareAdapter.java b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/model/ui/mapping/CompareAdapter.java
index cf266a4bf..7f6d5b2fe 100644
--- a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/model/ui/mapping/CompareAdapter.java
+++ b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/model/ui/mapping/CompareAdapter.java
@@ -17,12 +17,17 @@ import java.util.ArrayList;
 import java.util.List;
 
 import org.eclipse.compare.structuremergeviewer.ICompareInput;
-import org.eclipse.core.resources.*;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.resources.mapping.ModelProvider;
 import org.eclipse.core.resources.mapping.ResourceMapping;
 import org.eclipse.core.runtime.Path;
 import org.eclipse.team.core.mapping.ISynchronizationContext;
-import org.eclipse.team.examples.model.*;
+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.ModelResource;
 import org.eclipse.team.examples.model.mapping.ExampleModelProvider;
 import org.eclipse.team.ui.mapping.SynchronizationCompareAdapter;
 import org.eclipse.ui.IMemento;
@@ -33,13 +38,14 @@ import org.eclipse.ui.IMemento;
 public class CompareAdapter extends SynchronizationCompareAdapter {
 
 	private static final String CTX_MODEL_MAPPINGS = "org.eclipse.team.examples.filesystem.modelMappings";
-	
+
 	private final ExampleModelProvider provider;
 
 	public CompareAdapter(ExampleModelProvider provider) {
 		this.provider = provider;
 	}
-	
+
+	@Override
 	public String getName(ResourceMapping mapping) {
 		Object o = mapping.getModelObject();
 		if (o instanceof ModelObject) {
@@ -47,7 +53,8 @@ public class CompareAdapter extends SynchronizationCompareAdapter {
 		}
 		return super.getName(mapping);
 	}
-	
+
+	@Override
 	public String getPathString(ResourceMapping mapping) {
 		Object o = mapping.getModelObject();
 		if (o instanceof ModelObject) {
@@ -56,6 +63,7 @@ public class CompareAdapter extends SynchronizationCompareAdapter {
 		return super.getPathString(mapping);
 	}
 
+	@Override
 	public ICompareInput asCompareInput(ISynchronizationContext context, Object o) {
 		if (o instanceof ModelObjectElementFile) {
 			ModelObjectElementFile moeFile = (ModelObjectElementFile) o;
@@ -64,29 +72,29 @@ public class CompareAdapter extends SynchronizationCompareAdapter {
 		}
 		return super.asCompareInput(context, o);
 	}
-	
+
+	@Override
 	public ResourceMapping[] restore(IMemento memento) {
-		List result = new ArrayList();
+		List<ResourceMapping> result = new ArrayList<>();
 		IMemento[] children = memento.getChildren(CTX_MODEL_MAPPINGS);
-		for (int i = 0; i < children.length; i++) {
-			IMemento child = children[i];
+		for (IMemento child : children) {
 			ResourceMapping mapping = restoreMapping(child);
 			if (mapping != null)
 				result.add(mapping);
 		}
-		return (ResourceMapping[]) result.toArray(new ResourceMapping[result.size()]);
+		return result.toArray(new ResourceMapping[result.size()]);
 	}
 
+	@Override
 	public void save(ResourceMapping[] mappings, IMemento memento) {
-		for (int i = 0; i < mappings.length; i++) {
-			ResourceMapping mapping = mappings[i];
+		for (ResourceMapping mapping : mappings) {
 			Object o = mapping.getModelObject();
 			if (o instanceof ModelObject) {
 				ModelObject mo = (ModelObject) o;
 				save(mo, memento.createChild(CTX_MODEL_MAPPINGS));
 			}
 		}
-		
+
 	}
 
 	private ResourceMapping restoreMapping(IMemento child) {
@@ -103,10 +111,10 @@ public class CompareAdapter extends SynchronizationCompareAdapter {
 		}
 		return null;
 	}
-	
+
 	private IResource getResource(String path) {
 		Path resourcePath = new Path(path);
-		if (path.endsWith(ModelObjectDefinitionFile.MODEL_OBJECT_DEFINITION_FILE_EXTENSION) 
+		if (path.endsWith(ModelObjectDefinitionFile.MODEL_OBJECT_DEFINITION_FILE_EXTENSION)
 				|| path.endsWith(ModelObjectElementFile.MODEL_OBJECT_ELEMENTFILE_EXTENSION))
 			return ResourcesPlugin.getWorkspace().getRoot().getFile(resourcePath);
 		if (resourcePath.segmentCount() == 1)