Attachment 102339 Details for Bug 162558 – Patch to fix missing initialization

[patch] Patch to fix missing initialization

fix_cdt_mylyn_30.txt (text/plain), 3.66 KB, created by Anton Leherbauer

on 2008-05-28 07:13:06 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Anton Leherbauer

Created: 2008-05-28 07:13:06 EDT

Size: 3.66 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.cdt.mylyn.ui
>Index: src/org/eclipse/cdt/mylyn/internal/ui/CDTUIBridgePlugin.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.cdt/mylyn/org.eclipse.cdt.mylyn.ui/src/org/eclipse/cdt/mylyn/internal/ui/CDTUIBridgePlugin.java,v
>retrieving revision 1.2
>diff -u -r1.2 CDTUIBridgePlugin.java
>--- src/org/eclipse/cdt/mylyn/internal/ui/CDTUIBridgePlugin.java	27 May 2008 17:31:39 -0000	1.2
>+++ src/org/eclipse/cdt/mylyn/internal/ui/CDTUIBridgePlugin.java	28 May 2008 11:04:27 -0000
>@@ -19,6 +19,7 @@
> import org.eclipse.cdt.mylyn.internal.ui.editor.ActiveFoldingListener;
> import org.eclipse.cdt.ui.CUIPlugin;
> import org.eclipse.jface.resource.ImageDescriptor;
>+import org.eclipse.mylyn.context.ui.IContextUiStartup;
> import org.eclipse.mylyn.internal.context.core.ContextCorePlugin;
> import org.eclipse.mylyn.internal.monitor.ui.MonitorUiPlugin;
> import org.eclipse.ui.IEditorPart;
>@@ -36,11 +37,11 @@
>  */
> public class CDTUIBridgePlugin extends AbstractUIPlugin {
> 
>-	public static final String PLUGIN_ID = "org.eclipse.cdt.mylyn.ui"; // $NON-NLS-1$
>+	public static final String PLUGIN_ID = "org.eclipse.cdt.mylyn.ui"; //$NON-NLS-1$
> 	
>-	public static final String AUTO_FOLDING_ENABLED = "org.eclipse.mylyn.context.ui.editor.folding.enabled"; // $NON-NLS-1$
>+	public static final String AUTO_FOLDING_ENABLED = "org.eclipse.mylyn.context.ui.editor.folding.enabled"; //$NON-NLS-1$
> 
>-	private static final String MYLYN_FIRST_RUN = "org.eclipse.mylyn.ui.first.run.0_4_9";
>+	private static final String MYLYN_FIRST_RUN = "org.eclipse.mylyn.ui.first.run.0_4_9"; //$NON-NLS-1$
> 
> 	public static final int	START_ACTIVATION_POLICY	= 0x00000002;
> 	
>@@ -113,11 +114,12 @@
> 		ContextCorePlugin.getContextManager().removeListener(landmarkMarkerManager);
> 		MonitorUiPlugin.getDefault().getSelectionMonitors().remove(cEditingMonitor);
> 		CoreModel.getDefault().removeElementChangedListener(cElementChangeListener);
>-		// TODO: uninstall editor tracker
> 	}
> 
> 	@Override
> 	public void stop(BundleContext context) throws Exception {
>+		lazyStop();
>+
> 		super.stop(context);
> 		INSTANCE = null;
> 		resourceBundle = null;
>@@ -178,7 +180,7 @@
> 	public ResourceBundle getResourceBundle() {
> 		try {
> 			if (resourceBundle == null)
>-				resourceBundle = ResourceBundle.getBundle("org.eclipse.cdt.mylyn.internal.ui.PluginResources"); // $NON-NLS-1$
>+				resourceBundle = ResourceBundle.getBundle("org.eclipse.cdt.mylyn.internal.ui.PluginResources"); //$NON-NLS-1$
> 		} catch (MissingResourceException x) {
> 			resourceBundle = null;
> 		}
>@@ -215,4 +217,16 @@
> 		return editorTracker;
> 	}
> 
>+
>+	/**
>+	 * Lazy startup. See extension point "org.eclipse.mylyn.context.ui.startup".
>+	 */
>+	public static class CDTUIBridgeStartup implements IContextUiStartup {
>+
>+		public void lazyStartup() {
>+			CDTUIBridgePlugin.getDefault().lazyStart();
>+		}
>+
>+	}
>+
> }
>Index: plugin.xml
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.cdt/mylyn/org.eclipse.cdt.mylyn.ui/plugin.xml,v
>retrieving revision 1.3
>diff -u -r1.3 plugin.xml
>--- plugin.xml	7 May 2008 09:35:11 -0000	1.3
>+++ plugin.xml	28 May 2008 11:04:27 -0000
>@@ -27,6 +27,12 @@
>       </preservedFilters>
>    </extension>
>    <extension
>+       point="org.eclipse.mylyn.context.ui.startup">
>+      <startup
>+          class="org.eclipse.cdt.mylyn.internal.ui.CDTUIBridgePlugin$CDTUIBridgeStartup">
>+    </startup>
>+   </extension>
>+   <extension
>          point="org.eclipse.ui.viewActions">
>       <viewContribution
>             id="org.eclipse.cdt.mylyn.ui.cview.contribution"

Flags:

bjorn.freeman-benson: iplog+

Actions: View | Diff

Attachments on bug 162558: 63562 | 87836 | 91683 | 91692 | 92233 | 92367 | 92508 | 92752 | 95302 | 95303 | 102054 | 102056 | 102057 | 102058 | 102060 | 102339