diff options
| author | pfullbright | 2011-02-18 22:26:24 +0000 |
|---|---|---|
| committer | pfullbright | 2011-02-18 22:26:24 +0000 |
| commit | dcfce2fc1e577baf98117868d830be5d49451dd0 (patch) | |
| tree | 8971ead33d3aadb189e30d1d0adb43e0d877990e /jaxb/plugins | |
| parent | 4c9f1a42fd8517d85f7088bfecbccdfe3d542699 (diff) | |
| download | webtools.dali-dcfce2fc1e577baf98117868d830be5d49451dd0.tar.gz webtools.dali-dcfce2fc1e577baf98117868d830be5d49451dd0.tar.xz webtools.dali-dcfce2fc1e577baf98117868d830be5d49451dd0.zip | |
fixed a couple problems with jaxb platform uis extension point
Diffstat (limited to 'jaxb/plugins')
4 files changed, 4 insertions, 4 deletions
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/plugin.xml b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/plugin.xml index 01e1c1522f..eed93c7c17 100644 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/plugin.xml +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/plugin.xml @@ -137,7 +137,7 @@ </adapt> </and> </or> - </triggerPoints> + </triggerPoints>x <possibleChildren> <instanceof diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/JptJaxbUiPlugin.java b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/JptJaxbUiPlugin.java index 709d829083..824a4d7507 100644 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/JptJaxbUiPlugin.java +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/JptJaxbUiPlugin.java @@ -35,6 +35,7 @@ public class JptJaxbUiPlugin extends AbstractUIPlugin { // The plug-in ID public static final String PLUGIN_ID = "org.eclipse.jpt.jaxb.ui"; + public static final String PLUGIN_ID_ = PLUGIN_ID + '.'; public static final String USER_CATALOG_ID = XMLCorePlugin.USER_CATALOG_ID; //$NON-NLS-1$ public static final String DEFAULT_CATALOG_ID = XMLCorePlugin.DEFAULT_CATALOG_ID; //$NON-NLS-1$ diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/platform/JaxbPlatformUiConfig.java b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/platform/JaxbPlatformUiConfig.java index 632aed48bc..3f2ec53b12 100644 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/platform/JaxbPlatformUiConfig.java +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/platform/JaxbPlatformUiConfig.java @@ -11,7 +11,6 @@ package org.eclipse.jpt.jaxb.ui.internal.platform; import org.eclipse.jpt.common.core.internal.XPointUtil; import org.eclipse.jpt.jaxb.core.platform.JaxbPlatformDescription; -import org.eclipse.jpt.jaxb.ui.JptJaxbUiPlugin; import org.eclipse.jpt.jaxb.ui.platform.JaxbPlatformUi; public class JaxbPlatformUiConfig { @@ -63,7 +62,7 @@ public class JaxbPlatformUiConfig { public JaxbPlatformUi getPlatformUi() { if (this.platformUi == null) { this.platformUi = XPointUtil.instantiate( - JptJaxbUiPlugin.PLUGIN_ID, JaxbPlatformUiManagerImpl.QUALIFIED_EXTENSION_POINT_ID, + this.pluginId, JaxbPlatformUiManagerImpl.QUALIFIED_EXTENSION_POINT_ID, this.className, JaxbPlatformUi.class); } return this.platformUi; diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/platform/JaxbPlatformUiManagerImpl.java b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/platform/JaxbPlatformUiManagerImpl.java index d643dbddc1..fe7e65a75b 100644 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/platform/JaxbPlatformUiManagerImpl.java +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/platform/JaxbPlatformUiManagerImpl.java @@ -28,7 +28,7 @@ public class JaxbPlatformUiManagerImpl implements JaxbPlatformUiManager { static final String EXTENSION_POINT_ID = "jaxbPlatformUis"; //$NON-NLS-1$ - static final String QUALIFIED_EXTENSION_POINT_ID = JptJaxbCorePlugin.PLUGIN_ID_ + EXTENSION_POINT_ID; //$NON-NLS-1$ + static final String QUALIFIED_EXTENSION_POINT_ID = JptJaxbUiPlugin.PLUGIN_ID_ + EXTENSION_POINT_ID; //$NON-NLS-1$ static final String PLATFORM_UI_ELEMENT = "jaxbPlatformUi"; //$NON-NLS-1$ static final String ID_ATTRIBUTE = "id"; //$NON-NLS-1$ static final String PLATFORM_ATTRIBUTE = "jaxbPlatform"; //$NON-NLS-1$ |