Cleanup removal of adapter workaround

- remove unnecessary casts
- remove unnecessary type checks since they are already done by
Adapters.adapt()

Change-Id: I7ce38e96a9ce21977958f27b12810732fddf24c5
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>

3 files changed, 29 insertions, 37 deletions

diff --git a/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/storage/GitFileHistory.java b/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/storage/GitFileHistory.java
index 0cf29b4b1f..842a2f3ca8 100644
--- a/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/storage/GitFileHistory.java
+++ b/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/storage/GitFileHistory.java
@@ -211,35 +211,35 @@ class GitFileHistory extends FileHistory implements IAdaptable {
 	}
 
 	private String getGitPath(IFileRevision revision) {
-		if (revision instanceof CommitFileRevision)
+		if (revision instanceof CommitFileRevision) {
 			return ((CommitFileRevision) revision).getGitPath();
-		else if (revision instanceof IAdaptable) {
-			IResourceVariant variant = Adapters.adapt(((IAdaptable) revision),
-					IResourceVariant.class);
-
-			if (variant instanceof GitRemoteResource)
-				return ((GitRemoteResource) variant).getPath();
 		}
+		IResourceVariant variant = Adapters.adapt(revision,
+				IResourceVariant.class);
 
+		if (variant instanceof GitRemoteResource) {
+			return ((GitRemoteResource) variant).getPath();
+		}
 		return null;
 	}
 
 	private RevCommit getRevCommit(IFileRevision revision) {
-		if (revision instanceof CommitFileRevision)
+		if (revision instanceof CommitFileRevision) {
 			return ((CommitFileRevision) revision).getRevCommit();
-		else if (revision instanceof IAdaptable) {
-			IResourceVariant variant = Adapters.adapt(((IAdaptable) revision),
-					IResourceVariant.class);
-			if (variant instanceof GitRemoteResource) {
-				final RevCommit commit = ((GitRemoteResource) variant)
-						.getCommitId();
-				try {
-					return walk.parseCommit(commit);
-				} catch (IOException e) {
-					Activator.logError(NLS.bind(
-							CoreText.GitFileHistory_invalidCommit,
-							commit.getName(), resource.getName()), e);
-				}
+		}
+		IResourceVariant variant = Adapters.adapt(revision,
+				IResourceVariant.class);
+		if (variant instanceof GitRemoteResource) {
+			final RevCommit commit = ((GitRemoteResource) variant)
+					.getCommitId();
+			try {
+				return walk.parseCommit(commit);
+			} catch (IOException e) {
+				Activator
+						.logError(
+								NLS.bind(CoreText.GitFileHistory_invalidCommit,
+										commit.getName(), resource.getName()),
+								e);
 			}
 		}
 
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/operations/GitScopeUtil.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/operations/GitScopeUtil.java
index 02034d5813..d72302598a 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/operations/GitScopeUtil.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/operations/GitScopeUtil.java
@@ -114,13 +114,11 @@ public class GitScopeUtil {
 		if (mapping != null) {
 			return mapping;
 		}
-		if (o instanceof IAdaptable) {
-			IContributorResourceAdapter adapted = Adapters.adapt(o,
-					IContributorResourceAdapter.class);
-			if (adapted instanceof IContributorResourceAdapter2) {
-				IContributorResourceAdapter2 cra = (IContributorResourceAdapter2) adapted;
-				return cra.getAdaptedResourceMapping((IAdaptable) o);
-			}
+		IContributorResourceAdapter adapted = Adapters.adapt(o,
+				IContributorResourceAdapter.class);
+		if (adapted instanceof IContributorResourceAdapter2) {
+			IContributorResourceAdapter2 cra = (IContributorResourceAdapter2) adapted;
+			return cra.getAdaptedResourceMapping((IAdaptable) o);
 		}
 		return null;
 	}
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/preferences/GitProjectPropertyPage.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/preferences/GitProjectPropertyPage.java
index 0a08cc512a..2ca03deb81 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/preferences/GitProjectPropertyPage.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/preferences/GitProjectPropertyPage.java
@@ -18,7 +18,6 @@ import java.io.IOException;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.runtime.Adapters;
-import org.eclipse.core.runtime.IAdaptable;
 import org.eclipse.egit.core.project.RepositoryMapping;
 import org.eclipse.egit.ui.Activator;
 import org.eclipse.egit.ui.UIUtils;
@@ -83,14 +82,9 @@ public class GitProjectPropertyPage extends PropertyPage {
 
 		// Get the project that is the source of this property page
 		IProject project = null;
-		final IAdaptable element = getElement();
-		if (element instanceof IResource) {
-			project = ((IResource) element).getProject();
-		} else {
-			IResource adapter = Adapters.adapt(element, IResource.class);
-			if (adapter != null) {
-				project = adapter.getProject();
-			}
+		IResource resource = Adapters.adapt(getElement(), IResource.class);
+		if (resource != null) {
+			project = resource.getProject();
 		}
 
 		RepositoryMapping mapping = RepositoryMapping.getMapping(project);