Attachment 28682 Details for Bug 110635 – incremental patch for org.eclipse.gmf.runtime.diagram.ui

[patch] incremental patch for org.eclipse.gmf.runtime.diagram.ui

org.eclipse.gmf.runtime.diagram.ui-patch.txt (text/plain), 2.34 KB, created by Keith W. Campbell

on 2005-10-24 09:53:24 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Keith W. Campbell

Created: 2005-10-24 09:53:24 EDT

Size: 2.34 KB

patch

obsolete

>Index: src/org/eclipse/gmf/runtime/diagram/ui/DiagramUIPlugin.java
>===================================================================
>RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/DiagramUIPlugin.java,v
>retrieving revision 1.3
>diff -u -r1.3 DiagramUIPlugin.java
>--- src/org/eclipse/gmf/runtime/diagram/ui/DiagramUIPlugin.java	4 Oct 2005 20:30:48 -0000	1.3
>+++ src/org/eclipse/gmf/runtime/diagram/ui/DiagramUIPlugin.java	24 Oct 2005 13:48:34 -0000
>@@ -11,10 +11,8 @@
> 
> package org.eclipse.gmf.runtime.diagram.ui;
> 
>-import org.eclipse.core.runtime.Plugin;
> import org.eclipse.gmf.runtime.common.core.l10n.AbstractResourceManager;
> import org.eclipse.gmf.runtime.common.ui.plugin.XToolsUIPlugin;
>-import org.eclipse.gmf.runtime.diagram.core.listener.PresentationListener;
> import org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint;
> import org.eclipse.gmf.runtime.diagram.ui.preferences.AppearancePreferencePage;
> import org.eclipse.gmf.runtime.diagram.ui.preferences.ConnectorsPreferencePage;
>@@ -36,7 +34,7 @@
> 	/**
> 	 * the plugin singleton
> 	 */
>-	private static Plugin singleton;
>+	private static DiagramUIPlugin singleton;
> 
> 	/**
> 	 * gets the plugin singleton
>@@ -44,7 +42,7 @@
> 	 * @return the plugin singleton
> 	 */
> 	public static XToolsUIPlugin getInstance() {
>-		return (XToolsUIPlugin) singleton;
>+		return singleton;
> 	}
> 
> 	/**
>@@ -53,7 +51,7 @@
> 	 * @return A non-empty string and is unique within the plug-in registry.
> 	 */
> 	public static String getPluginId() {
>-		return getInstance().getBundle().getSymbolicName();
>+		return getInstance().getSymbolicName();
> 	}
> 
> 	/**
>@@ -74,8 +72,6 @@
> 	protected void doStartup() {
> 		super.doStartup();
> 
>-		PresentationListener.getInstance().startListening();
>-		
> 		initializeDefaultDiagramPreferenceStore();
> 		
> 		// TODO: Move to Modeler/Visualizer plug-in.
>@@ -84,14 +80,6 @@
> 	}
> 
> 	/* (non-Javadoc)
>-	 * @see org.eclipse.gmf.runtime.common.ui.plugin.XToolsUIPlugin#doShutdown()
>-	 */
>-	protected void doShutdown() {
>-		PresentationListener.getInstance().stopListening();
>-		super.doShutdown();
>-	}
>-
>-	/* (non-Javadoc)
> 	 * @see org.eclipse.gmf.runtime.common.ui.plugin.XToolsUIPlugin#getResourceManager()
> 	 */
> 	public AbstractResourceManager getResourceManager() {

Actions: View | Diff

Attachments on bug 110635: 27522 | 27523 | 27524 | 27525 | 27526 | 27527 | 27528 | 27529 | 28681 | 28682