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 170520 Details for
Bug 314959
IObjectActionDelegate use is problemmatic across multiple workbenches
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
Log In
[x]
|
Terms of Use
|
Copyright Agent
Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read
this important communication.
[patch]
Proposed fix
ContributorManagerSingletons.diff (text/plain), 3.76 KB, created by
Ralf Sternberg
on 2010-05-31 09:17:42 EDT
(
hide
)
Description:
Proposed fix
Filename:
MIME Type:
Creator:
Ralf Sternberg
Created:
2010-05-31 09:17:42 EDT
Size:
3.76 KB
patch
obsolete
>### Eclipse Workspace Patch 1.0 >#P org.eclipse.rap.ui.workbench >Index: Eclipse UI/org/eclipse/ui/internal/ObjectActionContributorManager.java >=================================================================== >RCS file: /cvsroot/rt/org.eclipse.rap/runtime.ui/org.eclipse.rap.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ObjectActionContributorManager.java,v >retrieving revision 1.1 >diff -u -r1.1 ObjectActionContributorManager.java >--- Eclipse UI/org/eclipse/ui/internal/ObjectActionContributorManager.java 17 Apr 2008 12:03:48 -0000 1.1 >+++ Eclipse UI/org/eclipse/ui/internal/ObjectActionContributorManager.java 31 May 2010 12:56:08 -0000 >@@ -21,6 +21,7 @@ > import org.eclipse.jface.viewers.ISelection; > import org.eclipse.jface.viewers.ISelectionProvider; > import org.eclipse.jface.viewers.IStructuredSelection; >+import org.eclipse.rwt.SessionSingletonBase; > import org.eclipse.ui.IWorkbenchPart; > > /** >@@ -28,7 +29,8 @@ > * for a given type. > */ > public class ObjectActionContributorManager extends ObjectContributorManager { >- private static ObjectActionContributorManager sharedInstance; >+// RAP [rst] >+// private static ObjectActionContributorManager sharedInstance; > > /** > * PopupMenuManager constructor. >@@ -106,10 +108,12 @@ > * @return the shared instance of this manager > */ > public static ObjectActionContributorManager getManager() { >- if (sharedInstance == null) { >- sharedInstance = new ObjectActionContributorManager(); >- } >- return sharedInstance; >+// RAP [rst] singleton >+// if (sharedInstance == null) { >+// sharedInstance = new ObjectActionContributorManager(); >+// } >+// return sharedInstance; >+ return ( ObjectActionContributorManager )SessionSingletonBase.getInstance( ObjectActionContributorManager.class ); > } > > /** >Index: Eclipse UI/org/eclipse/ui/internal/dialogs/PropertyPageContributorManager.java >=================================================================== >RCS file: /cvsroot/rt/org.eclipse.rap/runtime.ui/org.eclipse.rap.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/PropertyPageContributorManager.java,v >retrieving revision 1.1 >diff -u -r1.1 PropertyPageContributorManager.java >--- Eclipse UI/org/eclipse/ui/internal/dialogs/PropertyPageContributorManager.java 17 Apr 2008 12:03:57 -0000 1.1 >+++ Eclipse UI/org/eclipse/ui/internal/dialogs/PropertyPageContributorManager.java 31 May 2010 12:56:08 -0000 >@@ -24,6 +24,7 @@ > 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; >@@ -34,7 +35,8 @@ > */ > > public class PropertyPageContributorManager extends ObjectContributorManager { >- private static PropertyPageContributorManager sharedInstance = null; >+// RAP [rst] >+// private static PropertyPageContributorManager sharedInstance = null; > > private class CategorizedPageNode { > RegistryPageContributor contributor; >@@ -180,10 +182,14 @@ > * @return PropertyPageContributorManager > */ > public static PropertyPageContributorManager getManager() { >- if (sharedInstance == null) { >- sharedInstance = new PropertyPageContributorManager(); >- } >- return sharedInstance; >+// RAP [rst] singleton >+// if (sharedInstance == null) { >+// sharedInstance = new PropertyPageContributorManager(); >+// } >+// return sharedInstance; >+ Class type = PropertyPageContributorManager.class; >+ Object instance = SessionSingletonBase.getInstance( type ); >+ return ( PropertyPageContributorManager )instance; > } > > /**
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
Flags:
ruediger.herrmann
:
review+
Actions:
View
|
Diff
Attachments on
bug 314959
: 170520 |
170521