[519967] - clean up unnecessary casts Signed-off-by: Rob Stryker <stryker@redhat.com>
diff --git a/features/org.eclipse.jst.enterprise_sdk.feature/feature.xml b/features/org.eclipse.jst.enterprise_sdk.feature/feature.xml index 26118d4..b94b1cc 100644 --- a/features/org.eclipse.jst.enterprise_sdk.feature/feature.xml +++ b/features/org.eclipse.jst.enterprise_sdk.feature/feature.xml
@@ -2,7 +2,7 @@ <feature id="org.eclipse.jst.enterprise_sdk.feature" label="%featureName" - version="3.8.0.qualifier" + version="3.8.1.qualifier" provider-name="%providerName" license-feature="org.eclipse.license" license-feature-version="1.0.1.qualifier">
diff --git a/features/org.eclipse.jst.enterprise_sdk.feature/pom.xml b/features/org.eclipse.jst.enterprise_sdk.feature/pom.xml index 3c296c9..297dbfa 100644 --- a/features/org.eclipse.jst.enterprise_sdk.feature/pom.xml +++ b/features/org.eclipse.jst.enterprise_sdk.feature/pom.xml
@@ -22,6 +22,6 @@ <groupId>org.eclipse.webtools.javaee</groupId> <artifactId>org.eclipse.jst.enterprise_sdk.feature</artifactId> - <version>3.8.0-SNAPSHOT</version> + <version>3.8.1-SNAPSHOT</version> <packaging>eclipse-feature</packaging> </project>
diff --git a/features/org.eclipse.jst.enterprise_ui.feature/feature.xml b/features/org.eclipse.jst.enterprise_ui.feature/feature.xml index 21a9c14..e5fdfe7 100644 --- a/features/org.eclipse.jst.enterprise_ui.feature/feature.xml +++ b/features/org.eclipse.jst.enterprise_ui.feature/feature.xml
@@ -2,7 +2,7 @@ <feature id="org.eclipse.jst.enterprise_ui.feature" label="%featureName" - version="3.9.0.qualifier" + version="3.9.1.qualifier" provider-name="%providerName" plugin="org.eclipse.jst.jee.ui" license-feature="org.eclipse.license"
diff --git a/features/org.eclipse.jst.enterprise_ui.feature/pom.xml b/features/org.eclipse.jst.enterprise_ui.feature/pom.xml index 407ec9e..de019b0 100644 --- a/features/org.eclipse.jst.enterprise_ui.feature/pom.xml +++ b/features/org.eclipse.jst.enterprise_ui.feature/pom.xml
@@ -22,7 +22,7 @@ <groupId>org.eclipse.webtools.javaee</groupId> <artifactId>org.eclipse.jst.enterprise_ui.feature</artifactId> - <version>3.9.0-SNAPSHOT</version> + <version>3.9.1-SNAPSHOT</version> <packaging>eclipse-feature</packaging> <build>
diff --git a/plugins/org.eclipse.jst.j2ee.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.j2ee.ui/META-INF/MANIFEST.MF index 03c8062..19c46a8 100644 --- a/plugins/org.eclipse.jst.j2ee.ui/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.jst.j2ee.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name.0 Bundle-SymbolicName: org.eclipse.jst.j2ee.ui; singleton:=true -Bundle-Version: 1.1.910.qualifier +Bundle-Version: 1.1.920.qualifier Bundle-Activator: org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin Bundle-Vendor: %Bundle-Vendor.0 Bundle-Localization: plugin
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/AvailableJ2EEComponentsForEARContentProvider.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/AvailableJ2EEComponentsForEARContentProvider.java index f1f648d..d17c416 100644 --- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/AvailableJ2EEComponentsForEARContentProvider.java +++ b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/AvailableJ2EEComponentsForEARContentProvider.java
@@ -157,7 +157,7 @@ if (!component.isBinary()) return true; - IFile workspaceFile = (IFile)component.getAdapter(IFile.class); + IFile workspaceFile = component.getAdapter(IFile.class); if( workspaceFile == null ) return true; if( workspaceFile.getFullPath().segment(0).equals(earComponent.getName()))
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/J2EEComponentProjectMigrator.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/J2EEComponentProjectMigrator.java index 0b72e01..ca39e5e 100644 --- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/J2EEComponentProjectMigrator.java +++ b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/J2EEComponentProjectMigrator.java
@@ -146,8 +146,8 @@ if (view == null) return; - INavigatorContentService contentService = (INavigatorContentService) view.getAdapter(INavigatorContentService.class); - CommonViewer viewer = (CommonViewer) view.getAdapter(CommonViewer.class); + INavigatorContentService contentService = view.getAdapter(INavigatorContentService.class); + CommonViewer viewer = view.getAdapter(CommonViewer.class); // Set the J2EE content extensions as enabled now that we have set the J2EE facets if (contentService != null)
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/plugin/BinaryEditorUtilities.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/plugin/BinaryEditorUtilities.java index cc9eca4..084bb00 100644 --- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/plugin/BinaryEditorUtilities.java +++ b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/plugin/BinaryEditorUtilities.java
@@ -197,7 +197,7 @@ } public static IEditorInput getBinaryEditorInput(IVirtualComponent component, String archiveRelativePath) { - File f = (File)component.getAdapter(File.class); + File f = component.getAdapter(File.class); return getBinaryEditorInput(f.getAbsolutePath(), archiveRelativePath); }
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/plugin/J2EEEditorUtility.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/plugin/J2EEEditorUtility.java index 6fce02a..d31f730 100644 --- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/plugin/J2EEEditorUtility.java +++ b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/plugin/J2EEEditorUtility.java
@@ -95,7 +95,7 @@ IEditorInput input = null; input = EditorUtility.getEditorInput(comp); if (input != null) { - return (IFile) input.getAdapter(IFile.class); + return input.getAdapter(IFile.class); } return null; }
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/plugin/UIProjectUtilities.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/plugin/UIProjectUtilities.java index deb4f97..ea1daa6 100644 --- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/plugin/UIProjectUtilities.java +++ b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/plugin/UIProjectUtilities.java
@@ -111,10 +111,10 @@ if (obj instanceof IProject) project = (IProject) obj; else if (obj instanceof IAdaptable) { - project = (IProject) ((IAdaptable) obj).getAdapter(IProject.class); + project = ((IAdaptable) obj).getAdapter(IProject.class); if (project == null) { //Check for IJavaElements. - IJavaElement javaElement = (IJavaElement) ((IAdaptable) obj).getAdapter(IJavaElement.class); + IJavaElement javaElement = ((IAdaptable) obj).getAdapter(IJavaElement.class); if (javaElement != null) { project = javaElement.getJavaProject().getProject(); }
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/provider/J2EEUtilityJarItemProvider.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/provider/J2EEUtilityJarItemProvider.java index 583452f..e786615 100644 --- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/provider/J2EEUtilityJarItemProvider.java +++ b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/provider/J2EEUtilityJarItemProvider.java
@@ -113,11 +113,11 @@ for (int i = 0; i < modules.length; i++) { IVirtualComponent module = modules[i].getReferencedComponent(); if (module.isBinary()) { - IFile utilityJar = (IFile)module.getAdapter(IFile.class); + IFile utilityJar = module.getAdapter(IFile.class); if (utilityJar != null) children.add(utilityJar); else { - java.io.File diskFile = (java.io.File)module.getAdapter(java.io.File.class); + java.io.File diskFile = module.getAdapter(java.io.File.class); if (diskFile.exists()) children.add(diskFile); }
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ui/refactoring/RenameContextRootWizard.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ui/refactoring/RenameContextRootWizard.java index 2919f8d..5f51ec3 100644 --- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ui/refactoring/RenameContextRootWizard.java +++ b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ui/refactoring/RenameContextRootWizard.java
@@ -31,7 +31,7 @@ protected void addUserInputPages() { if (prompt) { addPage(new ContextRootInputPage("", //$NON-NLS-1$ - (RenameContextRootRefactoringProcessor) getRefactoring().getAdapter( + getRefactoring().getAdapter( RenameContextRootRefactoringProcessor.class))); } }
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/NewJavaClassWizardPage.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/NewJavaClassWizardPage.java index 0945397..7306733 100644 --- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/NewJavaClassWizardPage.java +++ b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/NewJavaClassWizardPage.java
@@ -669,7 +669,7 @@ if (resource != null && resource.getType() != IResource.ROOT) { while (jelem == null && resource.getType() != IResource.PROJECT) { resource = resource.getParent(); - jelem = (IJavaElement) resource.getAdapter(IJavaElement.class); + jelem = resource.getAdapter(IJavaElement.class); } if (jelem == null) { jelem = JavaCore.create(resource); // java project @@ -728,9 +728,9 @@ return (IJavaElement) obj; if (obj instanceof IAdaptable) - return (IJavaElement) ((IAdaptable) obj).getAdapter(IJavaElement.class); + return ((IAdaptable) obj).getAdapter(IJavaElement.class); - return (IJavaElement) Platform.getAdapterManager().getAdapter(obj, IJavaElement.class); + return Platform.getAdapterManager().getAdapter(obj, IJavaElement.class); } protected IResource getResource(Object obj) { @@ -741,8 +741,8 @@ return (IResource) obj; if (obj instanceof IAdaptable) - return (IResource) ((IAdaptable) obj).getAdapter(IResource.class); + return ((IAdaptable) obj).getAdapter(IResource.class); - return (IResource) Platform.getAdapterManager().getAdapter(obj, IResource.class); + return Platform.getAdapterManager().getAdapter(obj, IResource.class); } }
diff --git a/plugins/org.eclipse.jst.j2ee.ui/pom.xml b/plugins/org.eclipse.jst.j2ee.ui/pom.xml index a308fbf..f56bf90 100644 --- a/plugins/org.eclipse.jst.j2ee.ui/pom.xml +++ b/plugins/org.eclipse.jst.j2ee.ui/pom.xml
@@ -22,6 +22,6 @@ <groupId>org.eclipse.webtools.javaee</groupId> <artifactId>org.eclipse.jst.j2ee.ui</artifactId> - <version>1.1.910-SNAPSHOT</version> + <version>1.1.920-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project>