Skip to content

Commit

Permalink
6785: Compiler warning cleanup
Browse files Browse the repository at this point in the history
Reviewed-by: hdafgard
  • Loading branch information
thegreystone committed May 18, 2020
1 parent 5825cb4 commit 06b3563
Show file tree
Hide file tree
Showing 53 changed files with 95 additions and 120 deletions.
Expand Up @@ -43,6 +43,7 @@
import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.ui.PlatformUI;
import org.openjdk.jmc.rjmx.IConnectionHandle;
import org.openjdk.jmc.rjmx.triggers.TriggerEvent;
import org.openjdk.jmc.rjmx.triggers.TriggerRule;
Expand Down Expand Up @@ -120,7 +121,7 @@ private void showTrayPopup(AlertObject ao) {
final String title = Messages.AlertPlugin_TRIGGER_ALERT_TEXT;
final int style = SWT.BALLOON | SWT.ICON_WARNING;

DisplayToolkit.safeAsyncExec(getDefault().getWorkbench().getDisplay(), new Runnable() {
DisplayToolkit.safeAsyncExec(PlatformUI.getWorkbench().getDisplay(), new Runnable() {
@Override
public void run() {
UIPlugin.getDefault().getTrayManager().showTooltip(title, message, style);
Expand Down Expand Up @@ -179,10 +180,10 @@ public boolean getPopup() {

public void showDialog(boolean alwaysShow) {
if (getPopup() || alwaysShow || hasDialog()) {
DisplayToolkit.safeAsyncExec(getDefault().getWorkbench().getDisplay(), new Runnable() {
DisplayToolkit.safeAsyncExec(PlatformUI.getWorkbench().getDisplay(), new Runnable() {
@Override
public void run() {
Display display = getDefault().getWorkbench().getDisplay();
Display display = PlatformUI.getWorkbench().getDisplay();
Shell shell = display.getActiveShell();
if (shell != null && !shell.isDisposed()) {
if (!hasDialog()) {
Expand Down Expand Up @@ -212,7 +213,7 @@ public boolean hasDialog() {
}

public static AlertDialog createDialog(Shell shell) {
Display display = getDefault().getWorkbench().getDisplay();
Display display = PlatformUI.getWorkbench().getDisplay();
if (display != null && !display.isDisposed() && display.getActiveShell() != null
&& !display.getActiveShell().isDisposed()) {
return new AlertDialog(display.getActiveShell());
Expand Down
1 change: 1 addition & 0 deletions application/org.openjdk.jmc.browser/build.properties
Expand Up @@ -41,3 +41,4 @@ bin.includes = META-INF/,\
contexts.xml,\
appicons/
pde.match.rule.bundle=compatible
javacDefaultEncoding.. = UTF-8
Expand Up @@ -36,11 +36,9 @@
import java.util.logging.Logger;

import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.ui.plugin.AbstractUIPlugin;
import org.osgi.framework.BundleContext;

import org.openjdk.jmc.console.jconsole.preferences.PreferenceConstants;
import org.osgi.framework.BundleContext;

/**
* The activator class controls the plug-in life cycle
Expand Down Expand Up @@ -80,17 +78,6 @@ public static Activator getDefault() {
return plugin;
}

/**
* Returns an image descriptor for the image file at the given plug-in relative path
*
* @param path
* the path
* @return the image descriptor
*/
public static ImageDescriptor getImageDescriptor(String path) {
return imageDescriptorFromPlugin(PLUGIN_ID, path);
}

/**
* @return the logger used by this plug-in.
*/
Expand Down
Expand Up @@ -41,11 +41,9 @@
import org.eclipse.core.runtime.Status;
import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.osgi.util.NLS;

import org.openjdk.jmc.alert.AlertObject;
import org.openjdk.jmc.alert.AlertPlugin;
import org.openjdk.jmc.alert.NotificationUIToolkit;
import org.openjdk.jmc.common.io.IOToolkit;
import org.openjdk.jmc.common.unit.IQuantity;
import org.openjdk.jmc.common.unit.QuantityConversionException;
import org.openjdk.jmc.common.unit.UnitLookup;
Expand Down
Expand Up @@ -42,11 +42,9 @@
import org.eclipse.core.runtime.Status;
import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.osgi.util.NLS;

import org.openjdk.jmc.alert.AlertObject;
import org.openjdk.jmc.alert.AlertPlugin;
import org.openjdk.jmc.alert.NotificationUIToolkit;
import org.openjdk.jmc.common.io.IOToolkit;
import org.openjdk.jmc.common.unit.IQuantity;
import org.openjdk.jmc.console.ui.notification.NotificationPlugin;
import org.openjdk.jmc.rjmx.RJMXPlugin;
Expand Down
Expand Up @@ -43,19 +43,17 @@
import org.eclipse.core.runtime.Platform;
import org.eclipse.jface.viewers.TreeViewer;
import org.eclipse.osgi.util.NLS;
import org.osgi.framework.Bundle;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;

import org.openjdk.jmc.common.io.IOToolkit;
import org.openjdk.jmc.common.util.XmlToolkit;
import org.openjdk.jmc.console.ui.notification.NotificationPlugin;
import org.openjdk.jmc.rjmx.RJMXPlugin;
import org.openjdk.jmc.rjmx.triggers.TriggerRule;
import org.openjdk.jmc.rjmx.triggers.internal.NotificationRegistry;
import org.openjdk.jmc.ui.common.util.StatusFactory;
import org.osgi.framework.Bundle;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;

/**
* Toolkit for triggers
Expand Down
Expand Up @@ -42,6 +42,7 @@
import org.eclipse.jface.dialogs.IMessageProvider;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.resource.JFaceResources;
import org.eclipse.jface.resource.ResourceLocator;
import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Display;
Expand All @@ -52,15 +53,13 @@
import org.eclipse.ui.forms.IMessageManager;
import org.eclipse.ui.forms.editor.FormPage;
import org.eclipse.ui.forms.widgets.Form;
import org.eclipse.ui.plugin.AbstractUIPlugin;
import org.osgi.service.prefs.Preferences;

import org.openjdk.jmc.console.ui.editor.IConsolePageContainer;
import org.openjdk.jmc.console.ui.editor.IConsolePageStateHandler;
import org.openjdk.jmc.rjmx.IConnectionHandle;
import org.openjdk.jmc.rjmx.RJMXPlugin;
import org.openjdk.jmc.ui.common.util.Environment;
import org.openjdk.jmc.ui.misc.MementoToolkit;
import org.osgi.service.prefs.Preferences;

/**
* Extension point class that console tabs can subclass. The ConsoleTab uses the FormPage .
Expand Down Expand Up @@ -174,7 +173,7 @@ public void setInitializationData(IConfigurationElement config, String propertyN
String iconName = config.getAttribute(ATTRIBUTE_ICON);
if (iconName != null) {
String pluginId = config.getDeclaringExtension().getContributor().getName();
ImageDescriptor iconDesc = AbstractUIPlugin.imageDescriptorFromPlugin(pluginId, iconName);
ImageDescriptor iconDesc = ResourceLocator.imageDescriptorFromBundle(pluginId, iconName).orElse(null);
icon = (Image) JFaceResources.getResources().get(iconDesc);
}
}
Expand Down
Expand Up @@ -37,19 +37,18 @@
import org.eclipse.ui.IEditorInput;
import org.eclipse.ui.IWorkbenchWindow;
import org.eclipse.ui.PartInitException;

import org.eclipse.ui.PlatformUI;
import org.openjdk.jmc.commands.Statement;
import org.openjdk.jmc.console.ui.editor.internal.ConsoleEditorInput;
import org.openjdk.jmc.rjmx.util.internal.RJMXStartCommand;
import org.openjdk.jmc.ui.UIPlugin;

/**
* Command for starting up the JMX Console on a RJMX-descriptor.
*/
public class StartConsole extends RJMXStartCommand {
@Override
public boolean execute(Statement statement, PrintStream out) {
IWorkbenchWindow window = UIPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow();
IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
if (window != null) {
IEditorInput input = new ConsoleEditorInput(createConnectionDescriptor(statement, out));
try {
Expand Down
Expand Up @@ -34,8 +34,6 @@

import org.eclipse.jface.wizard.IWizard;
import org.eclipse.osgi.util.NLS;

import org.openjdk.jmc.common.io.IOToolkit;
import org.openjdk.jmc.flightrecorder.controlpanel.ui.ControlPanel;
import org.openjdk.jmc.flightrecorder.controlpanel.ui.FlightRecorderProvider;
import org.openjdk.jmc.flightrecorder.controlpanel.ui.ImageConstants;
Expand Down
Expand Up @@ -33,8 +33,6 @@
package org.openjdk.jmc.flightrecorder.controlpanel.ui.actions;

import org.eclipse.jface.wizard.IWizard;

import org.openjdk.jmc.common.io.IOToolkit;
import org.openjdk.jmc.flightrecorder.controlpanel.ui.ControlPanel;
import org.openjdk.jmc.flightrecorder.controlpanel.ui.FlightRecorderProvider;
import org.openjdk.jmc.flightrecorder.controlpanel.ui.ImageConstants;
Expand Down
Expand Up @@ -38,7 +38,6 @@
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.osgi.util.NLS;
import org.openjdk.jmc.common.io.IOToolkit;
import org.openjdk.jmc.common.unit.IConstrainedMap;
import org.openjdk.jmc.flightrecorder.configuration.events.EventOptionID;
import org.openjdk.jmc.flightrecorder.controlpanel.ui.ControlPanel;
Expand Down
Expand Up @@ -43,7 +43,6 @@
import java.nio.charset.Charset;
import java.nio.charset.IllegalCharsetNameException;

import org.openjdk.jmc.common.io.IOToolkit;
import org.openjdk.jmc.flightrecorder.configuration.events.IEventConfiguration;
import org.openjdk.jmc.flightrecorder.configuration.spi.IConfigurationStorageDelegate;
import org.openjdk.jmc.flightrecorder.controlpanel.ui.messages.internal.Messages;
Expand Down
Expand Up @@ -38,15 +38,14 @@
import java.util.stream.Stream;

import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.resource.ResourceLocator;
import org.eclipse.swt.SWT;
import org.eclipse.swt.custom.SashForm;
import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.ui.forms.widgets.Form;
import org.eclipse.ui.forms.widgets.FormToolkit;
import org.eclipse.ui.forms.widgets.Section;
import org.eclipse.ui.plugin.AbstractUIPlugin;

import org.openjdk.jmc.common.IState;
import org.openjdk.jmc.common.IWritableState;
import org.openjdk.jmc.common.item.Aggregators;
Expand Down Expand Up @@ -99,8 +98,8 @@ public String getName(IState state) {

@Override
public ImageDescriptor getImageDescriptor(IState state) {
return AbstractUIPlugin.imageDescriptorFromPlugin("org.openjdk.jmc.flightrecorder.ext.jfx", //$NON-NLS-1$
"icons/pulse.png"); //$NON-NLS-1$
return ResourceLocator.imageDescriptorFromBundle("org.openjdk.jmc.flightrecorder.ext.jfx", //$NON-NLS-1$
"icons/pulse.png").orElse(null); //$NON-NLS-1$
}

@Override
Expand Down
Expand Up @@ -33,8 +33,6 @@
*/
package org.openjdk.jmc.flightrecorder.flameview.views;

import static org.openjdk.jmc.flightrecorder.stacktrace.Messages.STACKTRACE_UNCLASSIFIABLE_FRAME;
import static org.openjdk.jmc.flightrecorder.stacktrace.Messages.STACKTRACE_UNCLASSIFIABLE_FRAME_DESC;
import static org.openjdk.jmc.flightrecorder.flameview.Messages.FLAMEVIEW_FLAME_GRAPH;
import static org.openjdk.jmc.flightrecorder.flameview.Messages.FLAMEVIEW_ICICLE_GRAPH;
import static org.openjdk.jmc.flightrecorder.flameview.Messages.FLAMEVIEW_JPEG_IMAGE;
Expand All @@ -44,11 +42,13 @@
import static org.openjdk.jmc.flightrecorder.flameview.Messages.FLAMEVIEW_SAVE_FLAME_GRAPH_AS;
import static org.openjdk.jmc.flightrecorder.flameview.Messages.FLAMEVIEW_SELECT_HTML_TABLE_COUNT;
import static org.openjdk.jmc.flightrecorder.flameview.Messages.FLAMEVIEW_SELECT_HTML_TABLE_EVENT_TYPE;
import static org.openjdk.jmc.flightrecorder.flameview.Messages.FLAMEVIEW_SELECT_HTML_TOOLTIP_DESCRIPTION;
import static org.openjdk.jmc.flightrecorder.flameview.Messages.FLAMEVIEW_SELECT_HTML_TOOLTIP_PACKAGE;
import static org.openjdk.jmc.flightrecorder.flameview.Messages.FLAMEVIEW_SELECT_HTML_TOOLTIP_SAMPLES;
import static org.openjdk.jmc.flightrecorder.flameview.Messages.FLAMEVIEW_SELECT_HTML_TOOLTIP_DESCRIPTION;
import static org.openjdk.jmc.flightrecorder.flameview.MessagesUtils.getFlameviewMessage;
import static org.openjdk.jmc.flightrecorder.flameview.MessagesUtils.getStacktraceMessage;
import static org.openjdk.jmc.flightrecorder.stacktrace.Messages.STACKTRACE_UNCLASSIFIABLE_FRAME;
import static org.openjdk.jmc.flightrecorder.stacktrace.Messages.STACKTRACE_UNCLASSIFIABLE_FRAME_DESC;

import java.io.ByteArrayOutputStream;
import java.io.File;
Expand All @@ -71,6 +71,7 @@
import org.eclipse.jface.action.IToolBarManager;
import org.eclipse.jface.action.Separator;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.resource.ResourceLocator;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.swt.SWT;
Expand All @@ -82,8 +83,8 @@
import org.eclipse.swt.events.MenuDetectEvent;
import org.eclipse.swt.events.MenuDetectListener;
import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.graphics.ImageLoader;
import org.eclipse.swt.graphics.ImageData;
import org.eclipse.swt.graphics.ImageLoader;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.FileDialog;
import org.eclipse.ui.IMemento;
Expand All @@ -94,15 +95,14 @@
import org.eclipse.ui.PartInitException;
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.part.ViewPart;
import org.eclipse.ui.plugin.AbstractUIPlugin;
import org.openjdk.jmc.common.item.IItemCollection;
import org.openjdk.jmc.common.util.StringToolkit;
import org.openjdk.jmc.flightrecorder.flameview.FlameviewImages;
import org.openjdk.jmc.flightrecorder.flameview.tree.TraceNode;
import org.openjdk.jmc.flightrecorder.flameview.tree.TraceTreeUtils;
import org.openjdk.jmc.flightrecorder.stacktrace.FrameSeparator;
import org.openjdk.jmc.flightrecorder.stacktrace.StacktraceModel;
import org.openjdk.jmc.flightrecorder.stacktrace.FrameSeparator.FrameCategorization;
import org.openjdk.jmc.flightrecorder.stacktrace.StacktraceModel;
import org.openjdk.jmc.flightrecorder.ui.FlightRecorderUI;
import org.openjdk.jmc.flightrecorder.ui.common.ImageConstants;
import org.openjdk.jmc.flightrecorder.ui.messages.internal.Messages;
Expand Down Expand Up @@ -529,7 +529,7 @@ private static String fileContent(String fileName) {
}

private static ImageDescriptor flameviewImageDescriptor(String iconName) {
return AbstractUIPlugin.imageDescriptorFromPlugin(PLUGIN_ID, DIR_ICONS + iconName); //$NON-NLS-1$
return ResourceLocator.imageDescriptorFromBundle(PLUGIN_ID, DIR_ICONS + iconName).orElse(null); //$NON-NLS-1$
}

private static String getIconBase64(String iconName) {
Expand Down
Expand Up @@ -39,6 +39,7 @@
import org.eclipse.jface.layout.GridDataFactory;
import org.eclipse.jface.layout.GridLayoutFactory;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.resource.ResourceLocator;
import org.eclipse.jface.viewers.ColumnViewerToolTipSupport;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.TreePath;
Expand All @@ -50,8 +51,6 @@
import org.eclipse.swt.widgets.Text;
import org.eclipse.ui.forms.widgets.Form;
import org.eclipse.ui.forms.widgets.FormToolkit;
import org.eclipse.ui.plugin.AbstractUIPlugin;

import org.openjdk.jmc.common.IState;
import org.openjdk.jmc.common.IWritableState;
import org.openjdk.jmc.common.item.IItemIterable;
Expand Down Expand Up @@ -234,7 +233,7 @@ public String getName(IState state) {

@Override
public ImageDescriptor getImageDescriptor(IState state) {
return AbstractUIPlugin.imageDescriptorFromPlugin(PLUGIN_ID, ICON);
return ResourceLocator.imageDescriptorFromBundle(PLUGIN_ID, ICON).orElse(null);
}

@Override
Expand Down
Expand Up @@ -42,8 +42,7 @@
import org.eclipse.ui.IWorkbench;
import org.eclipse.ui.IWorkbenchPage;
import org.eclipse.ui.IWorkbenchWindow;
import org.osgi.framework.BundleContext;

import org.eclipse.ui.PlatformUI;
import org.openjdk.jmc.common.unit.IQuantity;
import org.openjdk.jmc.common.unit.QuantityConversionException;
import org.openjdk.jmc.common.unit.UnitLookup;
Expand All @@ -52,6 +51,7 @@
import org.openjdk.jmc.flightrecorder.ui.preferences.PreferenceKeys;
import org.openjdk.jmc.ui.MCAbstractUIPlugin;
import org.openjdk.jmc.ui.misc.DisplayToolkit;
import org.osgi.framework.BundleContext;

/**
* The activator class controls the life cycle for the Flight Recording plug-in.
Expand Down Expand Up @@ -202,7 +202,7 @@ public File getTempRecordingsDir() throws IOException {

public PageManager getPageManager() {
if (pageManager == null) {
IWorkbench workbench = getWorkbench();
IWorkbench workbench = PlatformUI.getWorkbench();
Runnable callback = () -> DisplayToolkit.safeAsyncExec(() -> refreshJfrEditors(workbench));
pageManager = new PageManager(getPreferences().get(PAGE_MANAGER_ID, null), callback);
}
Expand Down
Expand Up @@ -550,6 +550,7 @@ private static Stream<IAttribute<?>> commonAttributes(Iterator<? extends IItemIt
return Stream.empty();
} else {
IItemIterable single = iterables.next();
@SuppressWarnings("deprecation")
List<IAttribute<?>> attributes = single.getType().getAttributes();
if (iterables.hasNext()) {
attributes = new ArrayList<>(attributes); // modifiable copy
Expand Down
Expand Up @@ -90,6 +90,7 @@ public Map<String, Image> getImages() {
return imageMap;
}

@SuppressWarnings("deprecation")
protected Stream<IAttribute<?>> getAttributeStream(IType<IItem> type) {
return type.getAttributes().stream();
}
Expand Down

0 comments on commit 06b3563

Please sign in to comment.