mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-29 19:45:01 +02:00
Code Issues Wiki Activity

Workaround for platform bug 186344: [CommonNavigator] Project Explorer duplicates Working Set actions

Browse source
This commit is contained in:
Anton Leherbauer 2007-06-21 09:06:14 +00:00
parent 2e379ec743
commit 9a1533f7ae
1 changed files with 53 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorContentProvider.java
View file

@ -28,6 +28,9 @@ import org.eclipse.jface.util.IPropertyChangeListener;
import org.eclipse.jface.util.PropertyChangeEvent; import org.eclipse.jface.util.PropertyChangeEvent;
import org.eclipse.jface.viewers.Viewer; import org.eclipse.jface.viewers.Viewer;
import org.eclipse.ui.IMemento; import org.eclipse.ui.IMemento;
import org.eclipse.ui.IViewPart;
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.navigator.CommonNavigator;
import org.eclipse.ui.navigator.ICommonContentExtensionSite; import org.eclipse.ui.navigator.ICommonContentExtensionSite;
import org.eclipse.ui.navigator.IPipelinedTreeContentProvider; import org.eclipse.ui.navigator.IPipelinedTreeContentProvider;
import org.eclipse.ui.navigator.PipelinedShapeModification; import org.eclipse.ui.navigator.PipelinedShapeModification;
@ -48,9 +51,24 @@ import org.eclipse.cdt.internal.ui.cview.CViewContentProvider;
*/ */
public class CNavigatorContentProvider extends CViewContentProvider implements IPipelinedTreeContentProvider { public class CNavigatorContentProvider extends CViewContentProvider implements IPipelinedTreeContentProvider {
/** Project Explorer view id */
private static final String PROJECT_EXPLORER_ID = "org.eclipse.ui.navigator.ProjectExplorer"; //$NON-NLS-1$
/** Cloned memento key from {@link CommonNavigator}. */
private static String LINKING_ENABLED = "CommonNavigator.LINKING_ENABLED"; //$NON-NLS-1$
/** Memento key for delayed enablement of link-with-editor */
static String LINKING_ENABLED_DELAYED = LINKING_ENABLED + ".delayed"; //$NON-NLS-1$
/** The input object as supplied in the call to {@link #inputChanged()} */ /** The input object as supplied in the call to {@link #inputChanged()} */
private Object fRealInput; private Object fRealInput;
private IPropertyChangeListener fPropertyChangeListener; private IPropertyChangeListener fPropertyChangeListener;
/**
* Flag set in {@link #restoreState(IMemento) restoreState},
* indicating whether link-with-editor should be enabled delayed
* as a workaround for
* <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=186344">bug 186344</a>
*/
private boolean fLinkingEnabledDelayed;
/* /*
* @see org.eclipse.ui.navigator.ICommonContentProvider#init(org.eclipse.ui.navigator.ICommonContentExtensionSite) * @see org.eclipse.ui.navigator.ICommonContentProvider#init(org.eclipse.ui.navigator.ICommonContentExtensionSite)
@ -111,6 +129,9 @@ public class CNavigatorContentProvider extends CViewContentProvider implements I
if (mementoValue != null) { if (mementoValue != null) {
groupIncludes= Boolean.valueOf(mementoValue).booleanValue(); groupIncludes= Boolean.valueOf(mementoValue).booleanValue();
} }
// workaround for https://bugs.eclipse.org/bugs/show_bug.cgi?id=186344
Integer value= memento.getInteger(LINKING_ENABLED_DELAYED);
fLinkingEnabledDelayed= value != null && value.intValue() != 0;
} }
setProvideMembers(showCUChildren); setProvideMembers(showCUChildren);
setIncludesGrouping(groupIncludes); setIncludesGrouping(groupIncludes);
@ -124,6 +145,15 @@ public class CNavigatorContentProvider extends CViewContentProvider implements I
if (memento != null) { if (memento != null) {
memento.putString(PreferenceConstants.PREF_SHOW_CU_CHILDREN, String.valueOf(getProvideMembers())); memento.putString(PreferenceConstants.PREF_SHOW_CU_CHILDREN, String.valueOf(getProvideMembers()));
memento.putString(PreferenceConstants.CVIEW_GROUP_INCLUDES, String.valueOf(areIncludesGroup())); memento.putString(PreferenceConstants.CVIEW_GROUP_INCLUDES, String.valueOf(areIncludesGroup()));
// disable linking enabled on next startup
// workaround for https://bugs.eclipse.org/bugs/show_bug.cgi?id=186344
Integer linkingEnabled= memento.getInteger(LINKING_ENABLED);
if (linkingEnabled != null && linkingEnabled.intValue() != 0) {
memento.putInteger(LINKING_ENABLED, 0);
memento.putInteger(LINKING_ENABLED_DELAYED, linkingEnabled.intValue());
} else {
memento.putInteger(LINKING_ENABLED_DELAYED, 0);
}
} }
} }
@ -133,6 +163,29 @@ public class CNavigatorContentProvider extends CViewContentProvider implements I
public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
fRealInput= newInput; fRealInput= newInput;
super.inputChanged(viewer, oldInput, findInputElement(newInput)); super.inputChanged(viewer, oldInput, findInputElement(newInput));
workaroundForBug186344();
}
/**
* Workaround for
* <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=186344">bug 186344</a>
*/
private void workaroundForBug186344() {
if (fLinkingEnabledDelayed) {
// enable linking delayed
fLinkingEnabledDelayed= false;
IViewPart viewPart= PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().findView(PROJECT_EXPLORER_ID);
if (viewPart instanceof CommonNavigator) {
final CommonNavigator cn= ((CommonNavigator)viewPart);
viewPart.getSite().getShell().getDisplay().asyncExec(
new Runnable() {
public void run() {
cn.setLinkingEnabled(true);
}
});
}
}
} }
private Object findInputElement(Object newInput) { private Object findInputElement(Object newInput) {