Attachment 28681 Details for Bug 110635 – additional patch for org.eclipse.gmf.runtime.diagram.core

[patch] additional patch for org.eclipse.gmf.runtime.diagram.core

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

on 2005-10-24 09:52:02 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Keith W. Campbell

Created: 2005-10-24 09:52:02 EDT

Size: 4.62 KB

patch

obsolete

>Index: src/org/eclipse/gmf/runtime/diagram/core/internal/DiagramPlugin.java
>===================================================================
>RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/internal/DiagramPlugin.java,v
>retrieving revision 1.3
>diff -u -r1.3 DiagramPlugin.java
>--- src/org/eclipse/gmf/runtime/diagram/core/internal/DiagramPlugin.java	4 Oct 2005 20:30:46 -0000	1.3
>+++ src/org/eclipse/gmf/runtime/diagram/core/internal/DiagramPlugin.java	24 Oct 2005 13:40:50 -0000
>@@ -14,6 +14,7 @@
> import org.eclipse.gmf.runtime.common.core.l10n.AbstractResourceManager;
> import org.eclipse.gmf.runtime.common.core.plugin.XToolsPlugin;
> import org.eclipse.gmf.runtime.diagram.core.internal.l10n.DiagramResourceManager;
>+import org.eclipse.gmf.runtime.diagram.core.listener.PresentationListener;
> 
> /**
>  * The main plugin class to be used in the desktop.
>@@ -50,6 +51,14 @@
> 		return getInstance().getSymbolicName();
> 	}
> 
>+	/* (non-Javadoc)
>+	 * @see org.eclipse.gmf.runtime.common.ui.plugin.XToolsUIPlugin#doShutdown()
>+	 */
>+	protected void doShutdown() {
>+		PresentationListener.getInstance().stopListening();
>+		super.doShutdown();
>+	}
>+
> 	/**
> 	 * Retrieves the resource manager for this plug-in.
> 	 * 
>Index: src/org/eclipse/gmf/runtime/diagram/core/listener/PresentationListener.java
>===================================================================
>RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.runtime.diagram.core/src/org/eclipse/gmf/runtime/diagram/core/listener/PresentationListener.java,v
>retrieving revision 1.5
>diff -u -r1.5 PresentationListener.java
>--- src/org/eclipse/gmf/runtime/diagram/core/listener/PresentationListener.java	22 Sep 2005 15:42:32 -0000	1.5
>+++ src/org/eclipse/gmf/runtime/diagram/core/listener/PresentationListener.java	24 Oct 2005 13:40:51 -0000
>@@ -1,18 +1,17 @@
> /******************************************************************************
>- * Copyright (c) 2002, 2003 IBM Corporation and others.
>+ * Copyright (c) 2002, 2005 IBM Corporation and others.
>  * All rights reserved. This program and the accompanying materials
>  * are made available under the terms of the Eclipse Public License v1.0
>  * which accompanies this distribution, and is available at
>  * http://www.eclipse.org/legal/epl-v10.html
>  *
>  * Contributors:
>- *    IBM Corporation - initial API and implementation 
>+ *    IBM Corporation - initial API and implementation
>  ****************************************************************************/
> 
> package org.eclipse.gmf.runtime.diagram.core.listener;
> 
> import java.util.Collection;
>-import java.util.Iterator;
> import java.util.Set;
> 
> import org.eclipse.emf.common.notify.Notification;
>@@ -27,24 +26,25 @@
> /**
>  * A model server listener that broadcast EObject events to
>  * all registered listeners.
>- * 
>+ *
>  * @author melaasar, mmostafa
>  */
>-public class PresentationListener extends ModelServerListener {
>+public final class PresentationListener extends ModelServerListener {
> 	/** The PresentationListener singleton */
>-	private static PresentationListener instance;
>+	private static final PresentationListener instance = new PresentationListener();
> 
> 	/**
> 	 * gives access to the <code>PresentationListener</code> singleton
> 	 * @return the <code>PresentationListener</code> singleton
> 	 */
> 	public static PresentationListener getInstance() {
>-		if ( instance == null ) {
>-			instance = new PresentationListener();
>-		}
> 		return instance;
> 	}
>-	
>+
>+	private PresentationListener() {
>+		super();
>+		startListening();
>+	}
> 
> 	/**
> 	 * gets a subset of all the registered listeners who are interested
>@@ -75,26 +75,18 @@
> 	private void addListenersOfNotifier(Set listenerSet, EObject notifier,Notification event) {
> 		if (notifier != null) {
> 			Collection c = getNotificationListeners(notifier, event.getFeature());
>-			if (c != null) {
>-				if (listenerSet.isEmpty())
>-					listenerSet.addAll(c);
>-				else {
>-					Iterator i = c.iterator();
>-					while (i.hasNext()) {
>-						Object o = i.next();
>-						listenerSet.add(o);
>-					}
>-				}
>+			if (c != null && !c.isEmpty()) {
>+				listenerSet.addAll(c);
> 			}
> 		}
> 	}
>-	
>+
>     /**
>      * Forwards the event to all interested  listeners.
>      * @param event the event to handle
> 	 */
> 	protected void handleElementEvent(Notification event) {
>-		MEditingDomain doamin = null;
>+		MEditingDomain doamin;
> 		if (!event.isTouch()
> 			&& !(doamin = MEditingDomainGetter.getMEditingDomain(event))
> 				.isUndoNotification(event) && !doamin.isRedoNotification(event)) {

Actions: View | Diff

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