diff options
| author | Simon Kaegi | 2009-03-28 19:06:27 +0000 |
|---|---|---|
| committer | Simon Kaegi | 2009-03-28 19:06:27 +0000 |
| commit | c486e771c93b3a811d318066f049dd92a659b849 (patch) | |
| tree | fd04b58428916cb3348b4e8bd7e77552a636ba78 /bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src | |
| parent | 2e4a3600befa09abe88bb2744133cef4f8c92fc2 (diff) | |
| download | rt.equinox.p2-c486e771c93b3a811d318066f049dd92a659b849.tar.gz rt.equinox.p2-c486e771c93b3a811d318066f049dd92a659b849.tar.xz rt.equinox.p2-c486e771c93b3a811d318066f049dd92a659b849.zip | |
Bug 241477 [eclipse] better support for framework extensions via eclipse touchpoint
Diffstat (limited to 'bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src')
3 files changed, 3 insertions, 3 deletions
diff --git a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/Util.java b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/Util.java index cab713288..b3773e667 100644 --- a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/Util.java +++ b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/Util.java @@ -185,7 +185,7 @@ public class Util { String fragmentHost = (String) headers.get(Constants.FRAGMENT_HOST); if (fragmentHost != null) - bundleInfo.setFragment(true); + bundleInfo.setFragmentHost(fragmentHost.trim()); } catch (BundleException e) { // unexpected diff --git a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/MarkStartedAction.java b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/MarkStartedAction.java index f963255a3..83b2db076 100644 --- a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/MarkStartedAction.java +++ b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/MarkStartedAction.java @@ -50,7 +50,7 @@ public class MarkStartedAction extends ProvisioningAction { if (bundleInfo == null) return Util.createError(NLS.bind(Messages.failed_bundleinfo, iu)); - if (bundleInfo.isFragment()) + if (bundleInfo.getFragmentHost() != null) return Status.OK_STATUS; BundleInfo[] bundles = manipulator.getConfigData().getBundles(); diff --git a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/SetStartLevelAction.java b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/SetStartLevelAction.java index 8a877802a..7922ab440 100644 --- a/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/SetStartLevelAction.java +++ b/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/SetStartLevelAction.java @@ -49,7 +49,7 @@ public class SetStartLevelAction extends ProvisioningAction { if (bundleInfo == null) return Util.createError(NLS.bind(Messages.failed_bundleinfo, iu)); - if (bundleInfo.isFragment()) + if (bundleInfo.getFragmentHost() != null) return Status.OK_STATUS; BundleInfo[] bundles = manipulator.getConfigData().getBundles(); |