diff options
author | Alexander Fedorov | 2019-07-15 17:35:33 +0000 |
---|---|---|
committer | Alexander Fedorov | 2019-07-15 19:49:14 +0000 |
commit | e051517ec06dd54863cf366ad2f0968c57b7e00e (patch) | |
tree | d86806ac78011a96f2a2f8976224534e7b9097a6 | |
parent | 1922aa82416ef7eaca08bf52b5f65dda92710905 (diff) | |
download | eclipse.platform.releng-e051517ec06dd54863cf366ad2f0968c57b7e00e.tar.gz eclipse.platform.releng-e051517ec06dd54863cf366ad2f0968c57b7e00e.tar.xz eclipse.platform.releng-e051517ec06dd54863cf366ad2f0968c57b7e00e.zip |
Bug 548799 - Replace usage of AbstractUIPlugin#imageDescriptorFromPluginY20190722-0900Y20190718-0905Y20190718-0450Y20190715-2335I20190723-1800I20190722-1800I20190721-1800I20190720-1800I20190719-1800I20190718-1800I20190717-1800I20190716-1800I20190715-1800
Use ResourceLocator#imageDescriptorFromBundle
Change-Id: I70760ef9a8d7146d841c7597161982d90dd60c1d
Signed-off-by: Alexander Fedorov <alexander.fedorov@arsysop.ru>
6 files changed, 14 insertions, 11 deletions
diff --git a/bundles/org.eclipse.releng.tools/META-INF/MANIFEST.MF b/bundles/org.eclipse.releng.tools/META-INF/MANIFEST.MF index 2b15afe4..bb32545c 100644 --- a/bundles/org.eclipse.releng.tools/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.releng.tools/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %PluginName Bundle-SymbolicName: org.eclipse.releng.tools; singleton:=true -Bundle-Version: 4.0.400.qualifier +Bundle-Version: 4.0.500.qualifier Bundle-Activator: org.eclipse.releng.tools.RelEngPlugin Bundle-Vendor: %PluginProvider Bundle-Localization: plugin diff --git a/bundles/org.eclipse.releng.tools/pom.xml b/bundles/org.eclipse.releng.tools/pom.xml index 0ec7ccf2..f93a3345 100644 --- a/bundles/org.eclipse.releng.tools/pom.xml +++ b/bundles/org.eclipse.releng.tools/pom.xml @@ -19,7 +19,7 @@ </parent> <groupId>org.eclipse.releng</groupId> <artifactId>org.eclipse.releng.tools</artifactId> - <version>4.0.400-SNAPSHOT</version> + <version>4.0.500-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> <properties> <defaultSigning-excludeInnerJars>true</defaultSigning-excludeInnerJars> diff --git a/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/RemoveAllConsolesAction.java b/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/RemoveAllConsolesAction.java index 9a0f2eb6..f6df86ad 100644 --- a/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/RemoveAllConsolesAction.java +++ b/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/RemoveAllConsolesAction.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2014, 2016 IBH SYSTEMS GmbH. + * Copyright (c) 2014, 2019 IBH SYSTEMS GmbH. * * This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -10,6 +10,7 @@ * * Contributors: * IBH SYSTEMS GmbH - initial API and implementation + * Alexander Fedorov <alexander.fedorov@arsysop.ru> - Bug 548799 *******************************************************************************/ package org.eclipse.releng.tools; @@ -17,15 +18,15 @@ import java.util.ArrayList; import java.util.List; import org.eclipse.jface.action.Action; +import org.eclipse.jface.resource.ResourceLocator; import org.eclipse.releng.tools.AdvancedFixCopyrightAction.FixConsole; import org.eclipse.ui.console.ConsolePlugin; import org.eclipse.ui.console.IConsole; -import org.eclipse.ui.plugin.AbstractUIPlugin; public class RemoveAllConsolesAction extends Action { public RemoveAllConsolesAction() { - super( - Messages.getString("RemoveAllConsolesAction.Text"), AbstractUIPlugin.imageDescriptorFromPlugin(RelEngPlugin.ID, "icons/full/elcl16/console_remall.png")); //$NON-NLS-1$//$NON-NLS-2$ + super(Messages.getString("RemoveAllConsolesAction.Text")); //$NON-NLS-1$ + ResourceLocator.imageDescriptorFromBundle(RelEngPlugin.ID, "icons/full/elcl16/console_remall.png").ifPresent(d-> setImageDescriptor(d)); //$NON-NLS-1$ } @Override diff --git a/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/RemoveConsoleAction.java b/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/RemoveConsoleAction.java index bca5bb43..7ccf016f 100644 --- a/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/RemoveConsoleAction.java +++ b/bundles/org.eclipse.releng.tools/src/org/eclipse/releng/tools/RemoveConsoleAction.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2014, 2016 IBH SYSTEMS GmbH. + * Copyright (c) 2014, 2019 IBH SYSTEMS GmbH. * * This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -10,20 +10,22 @@ * * Contributors: * IBH SYSTEMS GmbH - initial API and implementation + * Alexander Fedorov <alexander.fedorov@arsysop.ru> - Bug 548799 *******************************************************************************/ package org.eclipse.releng.tools; import org.eclipse.jface.action.Action; +import org.eclipse.jface.resource.ResourceLocator; import org.eclipse.ui.console.ConsolePlugin; import org.eclipse.ui.console.IConsole; -import org.eclipse.ui.plugin.AbstractUIPlugin; public class RemoveConsoleAction extends Action { private final IConsole console; public RemoveConsoleAction(IConsole console) { - super(Messages.getString("RemoveConsoleAction.Text"), AbstractUIPlugin.imageDescriptorFromPlugin(RelEngPlugin.ID, "icons/full/elcl16/console_rem.png")); //$NON-NLS-1$//$NON-NLS-2$ + super(Messages.getString("RemoveConsoleAction.Text")); //$NON-NLS-1$ + ResourceLocator.imageDescriptorFromBundle(RelEngPlugin.ID, "icons/full/elcl16/console_rem.png").ifPresent(d-> setImageDescriptor(d)); //$NON-NLS-1$ this.console = console; } diff --git a/features/org.eclipse.releng.tools/feature.xml b/features/org.eclipse.releng.tools/feature.xml index 15ee2e5d..ea003082 100644 --- a/features/org.eclipse.releng.tools/feature.xml +++ b/features/org.eclipse.releng.tools/feature.xml @@ -2,7 +2,7 @@ <feature id="org.eclipse.releng.tools" label="%featureName" - version="3.10.400.qualifier" + version="3.10.500.qualifier" provider-name="%providerName" image="eclipse_update_120.jpg" license-feature="org.eclipse.license" diff --git a/features/org.eclipse.releng.tools/pom.xml b/features/org.eclipse.releng.tools/pom.xml index 7b44a098..9bdcc81d 100644 --- a/features/org.eclipse.releng.tools/pom.xml +++ b/features/org.eclipse.releng.tools/pom.xml @@ -19,7 +19,7 @@ </parent> <groupId>org.eclipse.releng.feature</groupId> <artifactId>org.eclipse.releng.tools</artifactId> - <version>3.10.400-SNAPSHOT</version> + <version>3.10.500-SNAPSHOT</version> <packaging>eclipse-feature</packaging> <build> <plugins> |