Download
Getting Started
Members
Projects
Community
Marketplace
Events
Planet Eclipse
Newsletter
Videos
Participate
Report a Bug
Forums
Mailing Lists
Wiki
IRC
How to Contribute
Working Groups
Automotive
Internet of Things
LocationTech
Long-Term Support
PolarSys
Science
OpenMDM
More
Community
Marketplace
Events
Planet Eclipse
Newsletter
Videos
Participate
Report a Bug
Forums
Mailing Lists
Wiki
IRC
How to Contribute
Working Groups
Automotive
Internet of Things
LocationTech
Long-Term Support
PolarSys
Science
OpenMDM
Toggle navigation
Bugzilla – Attachment 27527 Details for
Bug 110635
Delay configuration of services
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
Log In
[x]
|
Terms of Use
|
Copyright Agent
[patch]
org.eclipse.gmf.runtime.diagram.ui-patch.txt
org.eclipse.gmf.runtime.diagram.ui-patch.txt (text/plain), 15.88 KB, created by
Keith W. Campbell
on 2005-09-26 12:52:53 EDT
(
hide
)
Description:
org.eclipse.gmf.runtime.diagram.ui-patch.txt
Filename:
MIME Type:
Creator:
Keith W. Campbell
Created:
2005-09-26 12:52:53 EDT
Size:
15.88 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.2 >diff -u -r1.2 DiagramUIPlugin.java >--- src/org/eclipse/gmf/runtime/diagram/ui/DiagramUIPlugin.java 12 Sep 2005 21:29:07 -0000 1.2 >+++ src/org/eclipse/gmf/runtime/diagram/ui/DiagramUIPlugin.java 26 Sep 2005 16:26:50 -0000 >@@ -1,5 +1,5 @@ > /****************************************************************************** >- * 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 >@@ -11,25 +11,18 @@ > > package org.eclipse.gmf.runtime.diagram.ui; > >-import org.eclipse.core.runtime.Platform; > import org.eclipse.core.runtime.Plugin; >-import org.eclipse.jface.preference.IPreferenceStore; >-import org.eclipse.jface.preference.PreferenceStore; >- > 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.internal.services.decorator.DecoratorService; >-import org.eclipse.gmf.runtime.diagram.ui.internal.services.editpolicy.EditPolicyService; >-import org.eclipse.gmf.runtime.diagram.ui.internal.services.layout.LayoutService; > import org.eclipse.gmf.runtime.diagram.ui.preferences.AppearancePreferencePage; > import org.eclipse.gmf.runtime.diagram.ui.preferences.ConnectorsPreferencePage; > import org.eclipse.gmf.runtime.diagram.ui.preferences.DiagramsPreferencePage; > import org.eclipse.gmf.runtime.diagram.ui.preferences.PrintingPreferencePage; > import org.eclipse.gmf.runtime.diagram.ui.preferences.RulerGridPreferencePage; >-import org.eclipse.gmf.runtime.diagram.ui.services.editpart.EditPartService; >-import org.eclipse.gmf.runtime.diagram.ui.services.palette.PaletteService; >+import org.eclipse.jface.preference.IPreferenceStore; >+import org.eclipse.jface.preference.PreferenceStore; > > /** > * The DiagramUI plugin defines all the artifacts needed for the >@@ -41,34 +34,6 @@ > extends XToolsUIPlugin { > > /** >- * The layout service extension point id >- */ >- private final static String LAYOUT_SERVICE_EXTENSION_POINT = "layoutProviders"; //$NON-NLS-1$ >- >- /** >- * The editpart service extension point id >- */ >- private final static String EDITPART_SERVICE_EXTENSION_POINT = "editpartProviders"; //$NON-NLS-1$ >- >- >- >- /** >- * The palette service extension point id >- */ >- private final static String PALETTE_SERVICE_EXTENSION_POINT = "paletteProviders"; //$NON-NLS-1$ >- >- >- /** >- * The decoration service extension point id >- */ >- private final static String DECORATOR_SERVICE_EXTENSION_POINT = "decoratorProviders"; //$NON-NLS-1$ >- >- /** >- * The editpolicy service extension point id >- */ >- private final static String EDITPOLICY_SERVICE_EXTENSION_POINT = "editpolicyProviders"; //$NON-NLS-1$ >- >- /** > * the plugin singleton > */ > private static Plugin singleton; >@@ -111,12 +76,6 @@ > > PresentationListener.getInstance().startListening(); > >- configureEditPartProviders(); >- configurePaletteProviders(); >- configureDiagramLayoutProviders(); >- configureDecorationProviders(); >- configureEditPolicyProviders(); >- > initializeDefaultDiagramPreferenceStore(); > > // TODO: Move to Modeler/Visualizer plug-in. >@@ -132,69 +91,12 @@ > super.doShutdown(); > } > >- /** >- * Configures diagram layout providers for the presentation plug-in based on >- * layout provider extension configurations. >- */ >- private void configureDiagramLayoutProviders() { >- LayoutService.getInstance().configureProviders( >- Platform.getExtensionRegistry().getExtensionPoint( >- getPluginId(), LAYOUT_SERVICE_EXTENSION_POINT) >- .getConfigurationElements()); >- } >- >- /** >- * Configures editpart providers for the presentation plug-in based on >- * editpart provider extension configurations. >- */ >- private void configureEditPartProviders() { >- EditPartService.getInstance().configureProviders( >- Platform.getExtensionRegistry().getExtensionPoint(getPluginId(), >- EDITPART_SERVICE_EXTENSION_POINT).getConfigurationElements()); >- } >- >- >- >- /** >- * Configures palette providers for the presentation plug-in based on >- * palette provider extension configurations. >- */ >- private void configurePaletteProviders() { >- PaletteService.getInstance().configureProviders( >- Platform.getExtensionRegistry().getExtensionPoint(getPluginId(), >- PALETTE_SERVICE_EXTENSION_POINT).getConfigurationElements()); >- } >- >- >- >- /** >- * Configures decoration providers for the presentation plug-in based on >- * decoration provider extension configurations. >- */ >- private void configureDecorationProviders() { >- DecoratorService.getInstance().configureProviders( >- Platform.getExtensionRegistry().getExtensionPoint( >- getPluginId(), DECORATOR_SERVICE_EXTENSION_POINT) >- .getConfigurationElements()); >- } >- >- /** >- * Configures editpolicy providers for the presentation plug-in based on >- * editpolicy provider extension configurations. >- */ >- private void configureEditPolicyProviders() { >- EditPolicyService.getInstance().configureProviders( >- Platform.getExtensionRegistry().getExtensionPoint(getPluginId(), >- EDITPOLICY_SERVICE_EXTENSION_POINT).getConfigurationElements()); >- } >- > /* (non-Javadoc) > * @see org.eclipse.gmf.runtime.common.ui.plugin.XToolsUIPlugin#getResourceManager() > */ > public AbstractResourceManager getResourceManager() { > return null; // TBD > } >- > > /** > * Initializes the preference store to be used as default values when a >@@ -213,5 +115,4 @@ > PreferencesHint.registerPreferenceStore( > PreferencesHint.USE_DEFAULTS, defaultStore); > } >- > } >\ No newline at end of file >Index: src/org/eclipse/gmf/runtime/diagram/ui/internal/services/decorator/DecoratorService.java >=================================================================== >RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/services/decorator/DecoratorService.java,v >retrieving revision 1.2 >diff -u -r1.2 DecoratorService.java >--- src/org/eclipse/gmf/runtime/diagram/ui/internal/services/decorator/DecoratorService.java 12 Sep 2005 21:29:09 -0000 1.2 >+++ src/org/eclipse/gmf/runtime/diagram/ui/internal/services/decorator/DecoratorService.java 26 Sep 2005 16:26:50 -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 >@@ -12,12 +12,12 @@ > package org.eclipse.gmf.runtime.diagram.ui.internal.services.decorator; > > import org.eclipse.core.runtime.IConfigurationElement; >-import org.eclipse.jface.util.Assert; >- > 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.diagram.ui.DiagramUIPlugin; > import org.eclipse.gmf.runtime.diagram.ui.services.decorator.CreateDecoratorsOperation; >+import org.eclipse.jface.util.Assert; > > /** > * This service is used to add decorators so that shapes and connectors on a >@@ -91,6 +91,10 @@ > /** The singleton instance of the decorator service. */ > private final static DecoratorService service = new DecoratorService(); > >+ static { >+ service.configureProviders(DiagramUIPlugin.getPluginId(), "decoratorProviders"); //$NON-NLS-1$ >+ } >+ > /** > * Retrieves the singleton instance of the decorator service. > * >Index: src/org/eclipse/gmf/runtime/diagram/ui/internal/services/editpolicy/EditPolicyService.java >=================================================================== >RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/services/editpolicy/EditPolicyService.java,v >retrieving revision 1.3 >diff -u -r1.3 EditPolicyService.java >--- src/org/eclipse/gmf/runtime/diagram/ui/internal/services/editpolicy/EditPolicyService.java 22 Sep 2005 15:42:19 -0000 1.3 >+++ src/org/eclipse/gmf/runtime/diagram/ui/internal/services/editpolicy/EditPolicyService.java 26 Sep 2005 16:26:50 -0000 >@@ -1,5 +1,5 @@ > /****************************************************************************** >- * 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 >@@ -18,6 +18,7 @@ > 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.diagram.ui.DiagramUIPlugin; > import org.eclipse.gmf.runtime.diagram.ui.services.editpolicy.CreateEditPoliciesOperation; > import org.eclipse.gmf.runtime.diagram.ui.services.editpolicy.IEditPolicyProvider; > >@@ -89,11 +90,15 @@ > */ > public String toString() { > return getElement().getAttribute("class"); //$NON-NLS-1$ >- } >+ } > } > > /** The singleton instance of the editpolicy service. */ > private final static EditPolicyService service = new EditPolicyService(); >+ >+ static { >+ service.configureProviders(DiagramUIPlugin.getPluginId(), "editpolicyProviders"); //$NON-NLS-1$ >+ } > > /** > * Retrieves the singleton instance of the editpolicy service. >Index: src/org/eclipse/gmf/runtime/diagram/ui/internal/services/layout/LayoutService.java >=================================================================== >RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/services/layout/LayoutService.java,v >retrieving revision 1.2 >diff -u -r1.2 LayoutService.java >--- src/org/eclipse/gmf/runtime/diagram/ui/internal/services/layout/LayoutService.java 12 Sep 2005 21:29:06 -0000 1.2 >+++ src/org/eclipse/gmf/runtime/diagram/ui/internal/services/layout/LayoutService.java 26 Sep 2005 16:26:50 -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 >@@ -14,13 +14,12 @@ > import java.util.List; > > import org.eclipse.core.runtime.IAdaptable; >-import org.eclipse.jface.util.Assert; >- > import org.eclipse.gmf.runtime.common.core.service.ExecutionStrategy; > import org.eclipse.gmf.runtime.common.core.service.Service; >+import org.eclipse.gmf.runtime.diagram.ui.DiagramUIPlugin; > import org.eclipse.gmf.runtime.diagram.ui.services.layout.ILayoutNodesProvider; > import org.eclipse.gmf.runtime.diagram.ui.services.layout.LayoutNodesOperation; >- >+import org.eclipse.jface.util.Assert; > > /** > * A service that provides for diagram layout. >@@ -31,11 +30,12 @@ > final public class LayoutService > extends Service implements ILayoutNodesProvider { > >- private final static LayoutService instance = >+ private final static LayoutService instance = > new LayoutService(); > >- protected LayoutService() { >+ private LayoutService() { > super(); //no caching for now >+ configureProviders(DiagramUIPlugin.getPluginId(), "layoutProviders"); //$NON-NLS-1$ > } > > public static LayoutService getInstance() { >Index: src/org/eclipse/gmf/runtime/diagram/ui/services/editpart/EditPartService.java >=================================================================== >RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/services/editpart/EditPartService.java,v >retrieving revision 1.5 >diff -u -r1.5 EditPartService.java >--- src/org/eclipse/gmf/runtime/diagram/ui/services/editpart/EditPartService.java 22 Sep 2005 15:42:19 -0000 1.5 >+++ src/org/eclipse/gmf/runtime/diagram/ui/services/editpart/EditPartService.java 26 Sep 2005 16:26:50 -0000 >@@ -1,5 +1,5 @@ > /****************************************************************************** >- * 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 >@@ -25,6 +25,7 @@ > import org.eclipse.gmf.runtime.common.core.service.IOperation; > import org.eclipse.gmf.runtime.common.core.service.Service; > import org.eclipse.gmf.runtime.diagram.core.internal.util.MEditingDomainGetter; >+import org.eclipse.gmf.runtime.diagram.ui.DiagramUIPlugin; > import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart; > import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramRootEditPart; > import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart; >@@ -118,7 +119,6 @@ > public String toString() { > return getElement().getAttribute("class"); //$NON-NLS-1$ > } >- > } > > /** singelton instance. */ >@@ -127,8 +127,9 @@ > /** > * constructor > */ >- protected EditPartService() { >+ private EditPartService() { > super(true, false); >+ configureProviders(DiagramUIPlugin.getPluginId(), "editpartProviders"); //$NON-NLS-1$ > } > > /** >Index: src/org/eclipse/gmf/runtime/diagram/ui/services/palette/PaletteService.java >=================================================================== >RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/services/palette/PaletteService.java,v >retrieving revision 1.3 >diff -u -r1.3 PaletteService.java >--- src/org/eclipse/gmf/runtime/diagram/ui/services/palette/PaletteService.java 12 Sep 2005 21:29:11 -0000 1.3 >+++ src/org/eclipse/gmf/runtime/diagram/ui/services/palette/PaletteService.java 26 Sep 2005 16:26:51 -0000 >@@ -1,5 +1,5 @@ > /****************************************************************************** >- * 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 >@@ -123,12 +123,14 @@ > public void setContributions(IConfigurationElement configElement) { > // > } >- >- >- >+ > /** the singleton instance of the palette service */ > private final static PaletteService instance = new PaletteService(); > >+ static { >+ instance.configureProviders(DiagramUIPlugin.getPluginId(), "paletteProviders"); //$NON-NLS-1$ >+ } >+ > /** the standard group id */ > public final static String GROUP_STANDARD = "standardGroup"; //$NON-NLS-1$ > >@@ -142,7 +144,7 @@ > * Creates a new instance of the Palette Service > */ > protected PaletteService() { >- //empty ctor >+ super(); > } > > /**
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 110635
:
27522
|
27523
|
27524
|
27525
|
27526
| 27527 |
27528
|
27529
|
28681
|
28682