From ad19e1843992541da78dc19f5da2eaf1aebd000a Mon Sep 17 00:00:00 2001 From: Tuukka Lehtonen Date: Thu, 13 Dec 2018 13:43:35 +0200 Subject: [PATCH] Revert "Fixed PropertyPageView to publish its selection to the workbench" This reverts commit 5675f72f9664c8ff275614d1ebe8a5a5d3014a98. --- .../META-INF/MANIFEST.MF | 3 +-- .../browsing/ui/platform/PropertyPageView.java | 12 +++++------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/bundles/org.simantics.browsing.ui.platform/META-INF/MANIFEST.MF b/bundles/org.simantics.browsing.ui.platform/META-INF/MANIFEST.MF index d95fd417d..f70303d53 100644 --- a/bundles/org.simantics.browsing.ui.platform/META-INF/MANIFEST.MF +++ b/bundles/org.simantics.browsing.ui.platform/META-INF/MANIFEST.MF @@ -13,8 +13,7 @@ Require-Bundle: org.eclipse.ui, org.simantics.views.swt;bundle-version="1.0.0", org.simantics.selectionview;bundle-version="1.0.0", org.simantics.utils.thread.swt;bundle-version="1.1.0", - org.eclipse.e4.core.contexts;bundle-version="1.1.0", - org.slf4j.api;bundle-version="1.7.25" + org.eclipse.e4.core.contexts;bundle-version="1.1.0" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Export-Package: org.simantics.browsing.ui.platform diff --git a/bundles/org.simantics.browsing.ui.platform/src/org/simantics/browsing/ui/platform/PropertyPageView.java b/bundles/org.simantics.browsing.ui.platform/src/org/simantics/browsing/ui/platform/PropertyPageView.java index ed78ebc33..05109c813 100644 --- a/bundles/org.simantics.browsing.ui.platform/src/org/simantics/browsing/ui/platform/PropertyPageView.java +++ b/bundles/org.simantics.browsing.ui.platform/src/org/simantics/browsing/ui/platform/PropertyPageView.java @@ -43,8 +43,6 @@ import org.simantics.ui.workbench.IPropertyPage; import org.simantics.ui.workbench.ResourceInput; import org.simantics.utils.ui.BundleUtils; import org.simantics.utils.ui.SWTUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** * This is a version of the standard eclipse PropertySheet view a @@ -85,8 +83,6 @@ import org.slf4j.LoggerFactory; */ public class PropertyPageView extends PageBookView implements IContributedContentsView { - private static final Logger LOGGER = LoggerFactory.getLogger(PropertyPageView.class); - private static final String PROPERTY_VIEW_CONTEXT = "org.simantics.modeling.ui.properties"; private static final String PROP_PINNED = "pinned"; @@ -196,6 +192,11 @@ public class PropertyPageView extends PageBookView implements IContributedConten //System.out.println("PPV init: " + this); super.init(site); + // This prevents the Properties view from providing a selection to other + // workbench parts, thus making them lose their selections which is not + // desirable. + site.setSelectionProvider(null); + contextProvider = Simantics.getSessionContextProvider(); if (!bootstrapOnly) { @@ -385,8 +386,6 @@ public class PropertyPageView extends PageBookView implements IContributedConten * false otherwise */ boolean doSelectionChanged(IWorkbenchPart part, ISelection sel) { - LOGGER.trace("doSelectionChanged({}): incoming selection {}", part, sel); - // we ignore our own selection or null selection if (isPropertyView(part) || sel == null) { return false; @@ -425,7 +424,6 @@ public class PropertyPageView extends PageBookView implements IContributedConten } if (!sameSelection) { - LOGGER.trace("doSelectionChanged({}): updating page input selection to {}", part, sel); updatePartName(ppage, sel); ppage.selectionChanged(part, sel); return true; -- 2.43.2