Attachment 27528 Details for Bug 110635 – org.eclipse.gmf.runtime.emf.core-patch.txt

[patch] org.eclipse.gmf.runtime.emf.core-patch.txt

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

on 2005-09-26 12:53:12 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Keith W. Campbell

Created: 2005-09-26 12:53:12 EDT

Size: 6.96 KB

patch

obsolete

>Index: src/org/eclipse/gmf/runtime/emf/core/internal/plugin/MSLPlugin.java
>===================================================================
>RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.runtime.emf.core/src/org/eclipse/gmf/runtime/emf/core/internal/plugin/MSLPlugin.java,v
>retrieving revision 1.2
>diff -u -r1.2 MSLPlugin.java
>--- src/org/eclipse/gmf/runtime/emf/core/internal/plugin/MSLPlugin.java	12 Sep 2005 21:25:13 -0000	1.2
>+++ src/org/eclipse/gmf/runtime/emf/core/internal/plugin/MSLPlugin.java	26 Sep 2005 16:30:00 -0000
>@@ -11,14 +11,10 @@
> 
> package org.eclipse.gmf.runtime.emf.core.internal.plugin;
> 
>-import org.eclipse.core.runtime.Platform;
>-
> import org.eclipse.gmf.runtime.common.core.l10n.AbstractResourceManager;
> import org.eclipse.gmf.runtime.common.core.plugin.XToolsPlugin;
> import org.eclipse.gmf.runtime.common.core.util.Trace;
> import org.eclipse.gmf.runtime.emf.core.internal.l10n.ResourceManager;
>-import org.eclipse.gmf.runtime.emf.core.internal.resources.MSLPathmap;
>-import org.eclipse.gmf.runtime.emf.core.internal.services.metamodel.MetamodelSupportService;
> import org.eclipse.gmf.runtime.emf.core.internal.util.MSLAdapterFactoryManager;
> 
> /**
>@@ -30,17 +26,11 @@
> 	extends XToolsPlugin {
> 
> 	private static MSLPlugin plugin;
>-
>-	// extension points.
>-	protected static final String METAMODEL_PROVIDERS_EXT_P_NAME = "MetaModelProviders"; //$NON-NLS-1$
>-
>-	protected static final String PATHMAPS_EXT_P_NAME = "Pathmaps"; //$NON-NLS-1$
> 		
> 	/**
> 	 * Constructor.
> 	 */
> 	public MSLPlugin() {
>-
> 		super();
> 		plugin = this;
> 	}
>@@ -56,7 +46,7 @@
> 	 * Get plugin ID.
> 	 */
> 	public static String getPluginId() {
>-		return getDefault().getBundle().getSymbolicName();
>+		return getDefault().getSymbolicName();
> 	}
> 
> 	/**
>@@ -70,15 +60,8 @@
> 	 * @see org.eclipse.gmf.runtime.common.core.plugin.XToolsPlugin#doStartup()
> 	 */
> 	protected void doStartup() {
>-		MetamodelSupportService.configure(Platform.getExtensionRegistry()
>-			.getExtensionPoint(getPluginId(), METAMODEL_PROVIDERS_EXT_P_NAME)
>-			.getConfigurationElements());
>-
>-		MSLPathmap.configure(Platform.getExtensionRegistry().getExtensionPoint(
>-			getPluginId(), PATHMAPS_EXT_P_NAME).getConfigurationElements());
>-		
> 		MSLAdapterFactoryManager.init();
>-		
>+
> 		// This event listener must be registered _after_ all of the rest of
> 		//  the MSL stuff is initialized. Otherwise, strange problems occur when
> 		//  tracing is turned on.
>Index: src/org/eclipse/gmf/runtime/emf/core/internal/resources/MSLPathmap.java
>===================================================================
>RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.runtime.emf.core/src/org/eclipse/gmf/runtime/emf/core/internal/resources/MSLPathmap.java,v
>retrieving revision 1.2
>diff -u -r1.2 MSLPathmap.java
>--- src/org/eclipse/gmf/runtime/emf/core/internal/resources/MSLPathmap.java	12 Sep 2005 21:25:12 -0000	1.2
>+++ src/org/eclipse/gmf/runtime/emf/core/internal/resources/MSLPathmap.java	26 Sep 2005 16:30:00 -0000
>@@ -1,5 +1,5 @@
> /******************************************************************************
>- * Copyright (c) 2002, 2004 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
>@@ -54,9 +54,9 @@
> 	private static final String PATH = "path"; //$NON-NLS-1$
> 
> 	// The path map as defined by the extensions
>-	private static final Map PATH_MAP = Collections.synchronizedMap(new HashMap());
>+	private static final Map PATH_MAP = Collections.synchronizedMap(configure());
> 
>-	private MSLEditingDomain domain = null;
>+	private final MSLEditingDomain domain;
> 
> 	/**
> 	 * Constructor.
>@@ -153,7 +153,13 @@
> 	/**
> 	 * Configure the Pathmaps extension point.
> 	 */
>-	public static void configure(IConfigurationElement[] configs) {
>+	private static Map configure() {
>+		Map paths = new HashMap();
>+		
>+		IConfigurationElement[] configs = Platform.getExtensionRegistry()
>+				.getExtensionPoint(MSLPlugin.getPluginId(), "Pathmaps") //$NON-NLS-1$
>+				.getConfigurationElements();
>+
> 		for (int i = 0; i < configs.length; ++i) {
> 
> 			IConfigurationElement element = configs[i];
>@@ -190,7 +196,7 @@
> 				if (url == null)
> 					continue;
> 
>-				PATH_MAP.put(var, url.toString());
>+				paths.put(var, url.toString());
> 
> 			} catch (IOException e) {
> 
>@@ -199,6 +205,8 @@
> 					"configure", e); //$NON-NLS-1$
> 			}
> 		}
>+
>+		return paths;
> 	}
> 
> 	/**
>Index: src/org/eclipse/gmf/runtime/emf/core/internal/services/metamodel/MetamodelSupportService.java
>===================================================================
>RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.runtime.emf.core/src/org/eclipse/gmf/runtime/emf/core/internal/services/metamodel/MetamodelSupportService.java,v
>retrieving revision 1.2
>diff -u -r1.2 MetamodelSupportService.java
>--- src/org/eclipse/gmf/runtime/emf/core/internal/services/metamodel/MetamodelSupportService.java	12 Sep 2005 21:25:12 -0000	1.2
>+++ src/org/eclipse/gmf/runtime/emf/core/internal/services/metamodel/MetamodelSupportService.java	26 Sep 2005 16:30:00 -0000
>@@ -1,5 +1,5 @@
> /******************************************************************************
>- * Copyright (c) 2004 IBM Corporation and others.
>+ * Copyright (c) 2004, 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
>@@ -17,10 +17,10 @@
> 
> import org.eclipse.core.runtime.IConfigurationElement;
> import org.eclipse.emf.ecore.EPackage;
>-
> import org.eclipse.gmf.runtime.common.core.service.ExecutionStrategy;
> import org.eclipse.gmf.runtime.common.core.service.IOperation;
> import org.eclipse.gmf.runtime.common.core.service.Service;
>+import org.eclipse.gmf.runtime.emf.core.internal.plugin.MSLPlugin;
> import org.eclipse.gmf.runtime.emf.core.services.metamodel.GetMetamodelSupportOperation;
> import org.eclipse.gmf.runtime.emf.core.services.metamodel.IMetamodelSupport;
> import org.eclipse.gmf.runtime.emf.core.services.metamodel.IMetamodelSupportProvider;
>@@ -37,6 +37,10 @@
> 	// the one instance of the service.
> 	public final static MetamodelSupportService instance = new MetamodelSupportService(
> 		true);
>+	
>+	static {
>+		 instance.configureProviders(MSLPlugin.getPluginId(), "MetaModelProviders"); //$NON-NLS-1$
>+	}
> 
> 	// cache the operations.
> 	public final static Map operations = new HashMap();
>@@ -72,13 +76,6 @@
> 	}
> 
> 	/**
>-	 * Configures the meta-model service.
>-	 */
>-	public static void configure(IConfigurationElement[] elements) {
>-		instance.configureProviders(elements);
>-	}
>-
>-	/**
> 	 * Executes a service request.
> 	 */
> 	private Object execute(IOperation operation) {

Actions: View | Diff

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