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

Disable obsolete workaround for bug 186344

Browse source
This commit is contained in:
Anton Leherbauer 2007-12-13 11:38:06 +00:00
parent 3094503910
commit 6911115a53
1 changed files with 24 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -29,6 +29,8 @@ 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.IViewPart;
import org.eclipse.ui.IWorkbenchPage;
import org.eclipse.ui.IWorkbenchWindow;
import org.eclipse.ui.PlatformUI; import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.navigator.CommonNavigator; import org.eclipse.ui.navigator.CommonNavigator;
import org.eclipse.ui.navigator.ICommonContentExtensionSite; import org.eclipse.ui.navigator.ICommonContentExtensionSite;
@ -65,7 +67,7 @@ public class CNavigatorContentProvider extends CViewContentProvider implements I
/** /**
* Flag set in {@link #restoreState(IMemento) restoreState}, * Flag set in {@link #restoreState(IMemento) restoreState},
* indicating whether link-with-editor should be enabled delayed * indicating whether link-with-editor should be enabled delayed
* as a workaround for * as a (old) workaround for
* <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=186344">bug 186344</a> * <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=186344">bug 186344</a>
*/ */
private boolean fLinkingEnabledDelayed; private boolean fLinkingEnabledDelayed;
@ -129,7 +131,7 @@ 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 // old workaround for https://bugs.eclipse.org/bugs/show_bug.cgi?id=186344
Integer value= memento.getInteger(LINKING_ENABLED_DELAYED); Integer value= memento.getInteger(LINKING_ENABLED_DELAYED);
fLinkingEnabledDelayed= value != null && value.intValue() != 0; fLinkingEnabledDelayed= value != null && value.intValue() != 0;
} }
@ -145,17 +147,10 @@ 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 // clear obsolete flag
// 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); memento.putInteger(LINKING_ENABLED_DELAYED, 0);
} }
} }
}
/* /*
* @see org.eclipse.cdt.ui.CElementContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object) * @see org.eclipse.cdt.ui.CElementContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object)
@ -168,14 +163,19 @@ public class CNavigatorContentProvider extends CViewContentProvider implements I
} }
/** /**
* Workaround for * Old workaround for
* <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=186344">bug 186344</a> * <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=186344">bug 186344</a>.
* Kept for backword compatibility.
*/ */
private void workaroundForBug186344() { private void workaroundForBug186344() {
if (fLinkingEnabledDelayed) { if (fLinkingEnabledDelayed) {
// enable linking delayed // enable linking delayed
fLinkingEnabledDelayed= false; fLinkingEnabledDelayed= false;
IViewPart viewPart= PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().findView(PROJECT_EXPLORER_ID); final IWorkbenchWindow window= PlatformUI.getWorkbench().getActiveWorkbenchWindow();
if (window != null) {
final IWorkbenchPage page = window.getActivePage();
if (page != null) {
IViewPart viewPart= page.findView(PROJECT_EXPLORER_ID);
if (viewPart instanceof CommonNavigator) { if (viewPart instanceof CommonNavigator) {
final CommonNavigator cn= ((CommonNavigator)viewPart); final CommonNavigator cn= ((CommonNavigator)viewPart);
viewPart.getSite().getShell().getDisplay().asyncExec( viewPart.getSite().getShell().getDisplay().asyncExec(
@ -187,6 +187,8 @@ public class CNavigatorContentProvider extends CViewContentProvider implements I
} }
} }
} }
}
}
private Object findInputElement(Object newInput) { private Object findInputElement(Object newInput) {
if (newInput instanceof IWorkspaceRoot) { if (newInput instanceof IWorkspaceRoot) {