Attachment #170520 for bug #314959

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

View | Details | Raw Unified | Return to bug 314959
Collapse All | Expand All

Lines 21-26 Link Here

(-)Eclipse UI/org/eclipse/ui/internal/ObjectActionContributorManager.java (-5 / +9 lines)
21	import org.eclipse.jface.viewers.ISelection;	21	import org.eclipse.jface.viewers.ISelection;
22	import org.eclipse.jface.viewers.ISelectionProvider;	22	import org.eclipse.jface.viewers.ISelectionProvider;
23	import org.eclipse.jface.viewers.IStructuredSelection;	23	import org.eclipse.jface.viewers.IStructuredSelection;
		24	import org.eclipse.rwt.SessionSingletonBase;
24	import org.eclipse.ui.IWorkbenchPart;	25	import org.eclipse.ui.IWorkbenchPart;
25		26
26	/**	27	/**
Lines 28-34 Link Here
28	* for a given type.	29	* for a given type.
29	*/	30	*/
30	public class ObjectActionContributorManager extends ObjectContributorManager {	31	public class ObjectActionContributorManager extends ObjectContributorManager {
31	private static ObjectActionContributorManager sharedInstance;	32	// RAP [rst]
		33	// private static ObjectActionContributorManager sharedInstance;
32		34
33	/**	35	/**
34	* PopupMenuManager constructor.	36	* PopupMenuManager constructor.
Lines 106-115 Link Here
106	* @return the shared instance of this manager	108	* @return the shared instance of this manager
107	*/	109	*/
108	public static ObjectActionContributorManager getManager() {	110	public static ObjectActionContributorManager getManager() {
109	if (sharedInstance == null) {	111	// RAP [rst] singleton
110	sharedInstance = new ObjectActionContributorManager();	112	// if (sharedInstance == null) {
111	}	113	// sharedInstance = new ObjectActionContributorManager();
112	return sharedInstance;	114	// }
		115	// return sharedInstance;
		116	return ( ObjectActionContributorManager )SessionSingletonBase.getInstance( ObjectActionContributorManager.class );
113	}	117	}
114		118
115	/**	119	/**




import org.eclipse.core.runtime.Platform;
import org.eclipse.core.runtime.dynamichelpers.IExtensionTracker;
import org.eclipse.jface.preference.PreferenceNode;
import org.eclipse.rwt.SessionSingletonBase;
import org.eclipse.ui.internal.ObjectContributorManager;
import org.eclipse.ui.internal.WorkbenchPlugin;
import org.eclipse.ui.internal.registry.PropertyPagesRegistryReader;

 */

public class PropertyPageContributorManager extends ObjectContributorManager {
// RAP [rst]
//    private static PropertyPageContributorManager sharedInstance = null;

	private class CategorizedPageNode {
		RegistryPageContributor contributor;

	 * @return PropertyPageContributorManager
	 */
	public static PropertyPageContributorManager getManager() {
// RAP [rst] singleton
//        if (sharedInstance == null) {
//            sharedInstance = new PropertyPageContributorManager();
//        }
//        return sharedInstance;
      Class type = PropertyPageContributorManager.class;
      Object instance = SessionSingletonBase.getInstance( type );
      return ( PropertyPageContributorManager )instance;
	}

	/**

Return to bug 314959

Lines 24-29 Link Here

(-)Eclipse UI/org/eclipse/ui/internal/dialogs/PropertyPageContributorManager.java (-5 / +11 lines)
24	import org.eclipse.core.runtime.Platform;	24	import org.eclipse.core.runtime.Platform;
25	import org.eclipse.core.runtime.dynamichelpers.IExtensionTracker;	25	import org.eclipse.core.runtime.dynamichelpers.IExtensionTracker;
26	import org.eclipse.jface.preference.PreferenceNode;	26	import org.eclipse.jface.preference.PreferenceNode;
		27	import org.eclipse.rwt.SessionSingletonBase;
27	import org.eclipse.ui.internal.ObjectContributorManager;	28	import org.eclipse.ui.internal.ObjectContributorManager;
28	import org.eclipse.ui.internal.WorkbenchPlugin;	29	import org.eclipse.ui.internal.WorkbenchPlugin;
29	import org.eclipse.ui.internal.registry.PropertyPagesRegistryReader;	30	import org.eclipse.ui.internal.registry.PropertyPagesRegistryReader;
Lines 34-40 Link Here
34	*/	35	*/
35		36
36	public class PropertyPageContributorManager extends ObjectContributorManager {	37	public class PropertyPageContributorManager extends ObjectContributorManager {
37	private static PropertyPageContributorManager sharedInstance = null;	38	// RAP [rst]
		39	// private static PropertyPageContributorManager sharedInstance = null;
38		40
39	private class CategorizedPageNode {	41	private class CategorizedPageNode {
40	RegistryPageContributor contributor;	42	RegistryPageContributor contributor;
Lines 180-189 Link Here
180	* @return PropertyPageContributorManager	182	* @return PropertyPageContributorManager
181	*/	183	*/
182	public static PropertyPageContributorManager getManager() {	184	public static PropertyPageContributorManager getManager() {
183	if (sharedInstance == null) {	185	// RAP [rst] singleton
184	sharedInstance = new PropertyPageContributorManager();	186	// if (sharedInstance == null) {
185	}	187	// sharedInstance = new PropertyPageContributorManager();
186	return sharedInstance;	188	// }
		189	// return sharedInstance;
		190	Class type = PropertyPageContributorManager.class;
		191	Object instance = SessionSingletonBase.getInstance( type );
		192	return ( PropertyPageContributorManager )instance;
187	}	193	}
188		194
189	/**	195	/**