diff options
author | Carl Anderson | 2016-02-16 13:45:00 +0000 |
---|---|---|
committer | Carl Anderson | 2016-02-16 13:45:00 +0000 |
commit | b729a28c8c89b57296925fb1519af3ef40885b3d (patch) | |
tree | c00a53506d8c60e5b861a50bc99267f21adf7b5d | |
parent | a81fe5b6c40f6c7613bf64325451ae025bf0125c (diff) | |
download | webtools.javaee-b729a28c8c89b57296925fb1519af3ef40885b3d.tar.gz webtools.javaee-b729a28c8c89b57296925fb1519af3ef40885b3d.tar.xz webtools.javaee-b729a28c8c89b57296925fb1519af3ef40885b3d.zip |
[487288] J2EE plugins still have calls to API that requires the
compatibility layer
7 files changed, 10 insertions, 8 deletions
diff --git a/plugins/org.eclipse.jst.j2ee.jca/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.j2ee.jca/META-INF/MANIFEST.MF index 7be5cfbbc..5077246a3 100644 --- a/plugins/org.eclipse.jst.j2ee.jca/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.jst.j2ee.jca/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.jst.j2ee.jca; singleton:=true -Bundle-Version: 1.1.700.qualifier +Bundle-Version: 1.1.800.qualifier Bundle-Activator: org.eclipse.jst.j2ee.jca.internal.plugin.JcaPlugin Bundle-Vendor: %pluginVendor Bundle-Localization: plugin diff --git a/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/JcaEditPlugin.java b/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/JcaEditPlugin.java index 872528ebd..b86832168 100644 --- a/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/JcaEditPlugin.java +++ b/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/JcaEditPlugin.java @@ -18,6 +18,7 @@ import java.text.MessageFormat; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IPluginDescriptor; +import org.eclipse.core.runtime.Platform; import org.eclipse.core.runtime.Plugin; import org.eclipse.jst.j2ee.jca.JcaFactory; import org.eclipse.jst.j2ee.jca.JcaPackage; @@ -85,7 +86,7 @@ public class JcaEditPlugin extends Plugin { */ public Object getImage(String key) { try { - return new URL(getDescriptor().getInstallURL(), "icons/" + key + ".gif"); //$NON-NLS-1$ //$NON-NLS-2$ + return new URL(getBundle().getEntry("/"), "icons/" + key + ".gif"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ } catch (MalformedURLException c) { JcaPlugin.logError("Failed to load image for '" + key + "'", c);//$NON-NLS-1$ //$NON-NLS-2$ } @@ -97,7 +98,7 @@ public class JcaEditPlugin extends Plugin { * Get a translated string from the resource bundle. */ public String getString(String key) { - return getDescriptor().getResourceBundle().getString(key); + return Platform.getResourceBundle(getBundle()).getString(key); } /** diff --git a/plugins/org.eclipse.jst.j2ee.jca/pom.xml b/plugins/org.eclipse.jst.j2ee.jca/pom.xml index 8a589defb..27e69d84c 100644 --- a/plugins/org.eclipse.jst.j2ee.jca/pom.xml +++ b/plugins/org.eclipse.jst.j2ee.jca/pom.xml @@ -22,6 +22,6 @@ <groupId>org.eclipse.webtools.javaee</groupId> <artifactId>org.eclipse.jst.j2ee.jca</artifactId> - <version>1.1.700-SNAPSHOT</version> + <version>1.1.800-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project> 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 42afe3cfa..e7ba1eea0 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 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name.0 Bundle-SymbolicName: org.eclipse.jst.j2ee.ui; singleton:=true -Bundle-Version: 1.1.801.qualifier +Bundle-Version: 1.1.900.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/client/actions/ExportApplicationClientAction.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/client/actions/ExportApplicationClientAction.java index 519b60b1e..1b7e5043b 100644 --- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/client/actions/ExportApplicationClientAction.java +++ b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/client/actions/ExportApplicationClientAction.java @@ -16,6 +16,7 @@ */ package org.eclipse.jst.j2ee.internal.client.actions; +import org.eclipse.core.runtime.Platform; import org.eclipse.jface.wizard.WizardDialog; import org.eclipse.jst.j2ee.internal.actions.BaseAction; import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin; @@ -29,7 +30,7 @@ import org.eclipse.swt.widgets.Shell; * To change this generated comment go to Window>Preferences>Java>Code Generation>Code and Comments */ public class ExportApplicationClientAction extends BaseAction { - public static String LABEL = J2EEUIPlugin.getDefault().getDescriptor().getResourceString("%client.export.action.label_ui_"); //$NON-NLS-1$ + public static String LABEL = Platform.getResourceString(J2EEUIPlugin.getDefault().getBundle(), "%client.export.action.label_ui_"); //$NON-NLS-1$ private static final String ICON = "appclient_export_wiz"; //$NON-NLS-1$ public ExportApplicationClientAction() { diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/DefaultJ2EEComponentCreationWizard.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/DefaultJ2EEComponentCreationWizard.java index aa77126e3..740f7f1fb 100644 --- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/DefaultJ2EEComponentCreationWizard.java +++ b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/DefaultJ2EEComponentCreationWizard.java @@ -51,7 +51,7 @@ public class DefaultJ2EEComponentCreationWizard extends DataModelWizard { setWindowTitle(J2EEUIMessages.getResourceString(J2EEUIMessages.DEFAULT_COMPONENT_WIZ_TITLE)); String iconPath = "icons/full/"; //$NON-NLS-1$ try { - URL installURL = IDEWorkbenchPlugin.getDefault().getDescriptor().getInstallURL(); + URL installURL = IDEWorkbenchPlugin.getDefault().getBundle().getEntry("/"); //$NON-NLS-1$ URL url = new URL(installURL, iconPath + "wizban/new_wiz.png"); //$NON-NLS-1$ ImageDescriptor desc = ImageDescriptor.createFromURL(url); setDefaultPageImageDescriptor(desc); diff --git a/plugins/org.eclipse.jst.j2ee.ui/pom.xml b/plugins/org.eclipse.jst.j2ee.ui/pom.xml index 9626ce367..5fc8c0363 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.801-SNAPSHOT</version> + <version>1.1.900-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project> |