diff options
author | Alexander Kurtakov | 2016-06-28 06:39:16 +0000 |
---|---|---|
committer | Alexander Kurtakov | 2016-06-28 06:39:16 +0000 |
commit | 30efbb124f709648585612e5dd65ed492f3830ba (patch) | |
tree | 69500fd304b623e29f1035325fd12ef0cb6698b8 /org.eclipse.help.ui | |
parent | b059b0d4fc5b66933c03763b0b0a63be2a6c29d4 (diff) | |
download | eclipse.platform.ua-30efbb124f709648585612e5dd65ed492f3830ba.tar.gz eclipse.platform.ua-30efbb124f709648585612e5dd65ed492f3830ba.tar.xz eclipse.platform.ua-30efbb124f709648585612e5dd65ed492f3830ba.zip |
Bug 496890 - Update o.e.help.ui to Java 8
Enable redundant types and superinterface warnings and fix them.
Change-Id: I1b18c0ffbd57f5a602a0f766fb4aa2ae374fca10
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
Diffstat (limited to 'org.eclipse.help.ui')
5 files changed, 24 insertions, 15 deletions
diff --git a/org.eclipse.help.ui/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.help.ui/.settings/org.eclipse.jdt.core.prefs index 36762e1e7..ea255e86c 100644 --- a/org.eclipse.help.ui/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.help.ui/.settings/org.eclipse.jdt.core.prefs @@ -67,8 +67,8 @@ org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore -org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore -org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore +org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=warning +org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled diff --git a/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/preferences/ICDialog.java b/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/preferences/ICDialog.java index 7198cfcba..1d860c711 100644 --- a/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/preferences/ICDialog.java +++ b/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/preferences/ICDialog.java @@ -1,5 +1,5 @@ /*******************************************************************************
- * Copyright (c) 2011, 2014 IBM Corporation and others.
+ * Copyright (c) 2011, 2016 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -22,7 +22,6 @@ import org.eclipse.help.ui.internal.Messages; import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.jface.dialogs.IDialogConstants;
import org.eclipse.jface.dialogs.StatusDialog;
-import org.eclipse.jface.window.IShellProvider;
import org.eclipse.osgi.util.NLS;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.SelectionEvent;
@@ -41,7 +40,7 @@ import org.eclipse.swt.widgets.Text; import org.eclipse.ui.PlatformUI;
-public class ICDialog extends StatusDialog implements IShellProvider, Listener, SelectionListener {
+public class ICDialog extends StatusDialog implements Listener, SelectionListener {
private IC ic = null;
diff --git a/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/views/AllTopicsPart.java b/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/views/AllTopicsPart.java index e0ebb12e8..299de303d 100644 --- a/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/views/AllTopicsPart.java +++ b/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/views/AllTopicsPart.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2011 IBM Corporation and others. + * Copyright (c) 2000, 2016 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -34,7 +34,7 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.ui.IMemento; import org.eclipse.ui.forms.widgets.FormToolkit; -public class AllTopicsPart extends HyperlinkTreePart implements IHelpPart { +public class AllTopicsPart extends HyperlinkTreePart { private Image containerWithTopicImage; diff --git a/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/views/BookmarksPart.java b/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/views/BookmarksPart.java index c564e6900..aac248c78 100644 --- a/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/views/BookmarksPart.java +++ b/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/views/BookmarksPart.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2006 IBM Corporation and others. + * Copyright (c) 2000, 2016 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -14,11 +14,22 @@ import java.util.Observable; import java.util.Observer; import org.eclipse.help.IHelpResource; -import org.eclipse.help.internal.base.*; -import org.eclipse.help.ui.internal.*; -import org.eclipse.jface.action.*; +import org.eclipse.help.internal.base.BaseHelpSystem; +import org.eclipse.help.internal.base.BookmarkManager; +import org.eclipse.help.ui.internal.HelpUIResources; +import org.eclipse.help.ui.internal.IHelpUIConstants; +import org.eclipse.help.ui.internal.Messages; +import org.eclipse.jface.action.Action; +import org.eclipse.jface.action.IAction; +import org.eclipse.jface.action.IMenuManager; import org.eclipse.jface.action.IToolBarManager; -import org.eclipse.jface.viewers.*; +import org.eclipse.jface.action.Separator; +import org.eclipse.jface.viewers.ISelection; +import org.eclipse.jface.viewers.IStructuredSelection; +import org.eclipse.jface.viewers.ITreeContentProvider; +import org.eclipse.jface.viewers.LabelProvider; +import org.eclipse.jface.viewers.TreeViewer; +import org.eclipse.jface.viewers.Viewer; import org.eclipse.swt.custom.BusyIndicator; import org.eclipse.swt.graphics.Image; import org.eclipse.swt.widgets.Composite; @@ -26,8 +37,7 @@ import org.eclipse.ui.IMemento; import org.eclipse.ui.actions.ActionFactory; import org.eclipse.ui.forms.widgets.FormToolkit; -public class BookmarksPart extends HyperlinkTreePart implements IHelpPart, - Observer { +public class BookmarksPart extends HyperlinkTreePart implements Observer { private Action deleteAction; class BookmarksProvider implements ITreeContentProvider { diff --git a/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/views/SearchPart.java b/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/views/SearchPart.java index 109d22a53..916346d31 100644 --- a/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/views/SearchPart.java +++ b/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/views/SearchPart.java @@ -525,7 +525,7 @@ public class SearchPart extends AbstractFormPart implements IHelpPart, IHelpUICo // https://bugs.eclipse.org/bugs/show_bug.cgi?id=95479 ScopeSet[] sets = scopeSetManager.getScopeSets(true); ArrayList<String> items = new ArrayList<>(); - ArrayList<HistoryScopeSet> toDelete = new ArrayList<HistoryScopeSet>(); + ArrayList<HistoryScopeSet> toDelete = new ArrayList<>(); // if (current!=null) // items.add(current.getExpression()); for (int i = sets.length - 1; i >= 0; i--) { |