Remove unreachable catch block and generify.
Change-Id: I18b0ff6c62ff4534c9d0d95d328532d18bc214f2
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
diff --git a/core/plugins/org.eclipse.dltk.ui/src/org/eclipse/dltk/ui/browsing/ProjectAndSourceFolderContentProvider.java b/core/plugins/org.eclipse.dltk.ui/src/org/eclipse/dltk/ui/browsing/ProjectAndSourceFolderContentProvider.java
index 68f507c..c0f4ff5 100644
--- a/core/plugins/org.eclipse.dltk.ui/src/org/eclipse/dltk/ui/browsing/ProjectAndSourceFolderContentProvider.java
+++ b/core/plugins/org.eclipse.dltk.ui/src/org/eclipse/dltk/ui/browsing/ProjectAndSourceFolderContentProvider.java
@@ -15,8 +15,6 @@
import java.util.List;
import org.eclipse.core.runtime.Assert;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.dltk.core.DLTKCore;
import org.eclipse.dltk.core.DLTKLanguageManager;
import org.eclipse.dltk.core.IDLTKLanguageToolkit;
import org.eclipse.dltk.core.IModelElement;
@@ -28,8 +26,8 @@
/**
* @since 2.0
*/
-public class ProjectAndSourceFolderContentProvider extends
- ScriptBrowsingContentProvider {
+public class ProjectAndSourceFolderContentProvider
+ extends ScriptBrowsingContentProvider {
public ProjectAndSourceFolderContentProvider(
ScriptBrowsingPart browsingPart,
@@ -47,8 +45,8 @@
if (element instanceof IStructuredSelection) {
Assert.isLegal(false);
Object[] result = new Object[0];
- Class clazz = null;
- Iterator iter = ((IStructuredSelection) element).iterator();
+ Class<?> clazz = null;
+ Iterator<?> iter = ((IStructuredSelection) element).iterator();
while (iter.hasNext()) {
Object item = iter.next();
if (clazz == null)
@@ -63,7 +61,7 @@
if (element instanceof IStructuredSelection) {
Assert.isLegal(false);
Object[] result = new Object[0];
- Iterator iter = ((IStructuredSelection) element).iterator();
+ Iterator<?> iter = ((IStructuredSelection) element).iterator();
while (iter.hasNext())
result = concatenate(result, getChildren(iter.next()));
return result;
@@ -76,7 +74,7 @@
Object[] children = super.getChildren(element);
// We need to filter all elements with different nature
- List newObjs = new ArrayList();
+ List<Object> newObjs = new ArrayList<>();
for (int i = 0; i < children.length; i++) {
if (children[i] instanceof IModelElement) {
IDLTKLanguageToolkit languageToolkit = DLTKLanguageManager
@@ -84,19 +82,13 @@
if (getToolkit().equals(languageToolkit)) {
newObjs.add(children[i]);
}
- }
- else {
+ } else {
newObjs.add(children[i]);
}
}
return newObjs.toArray();
} catch (ModelException e) {
return NO_CHILDREN;
- } catch (CoreException e) {
- if (DLTKCore.DEBUG) {
- e.printStackTrace();
- }
- return NO_CHILDREN;
} finally {
finishedReadInDisplayThread();
}
@@ -109,7 +101,7 @@
return NO_CHILDREN;
IProjectFragment[] roots = project.getProjectFragments();
- List list = new ArrayList(roots.length);
+ List<IProjectFragment> list = new ArrayList<>(roots.length);
// filter out package fragments that correspond to projects and
// replace them with the package fragments directly
for (int i = 0; i < roots.length; i++) {
