eirikbakke commented on a change in pull request #652:
URL: https://github.com/apache/netbeans/pull/652#discussion_r479722727
##########
File path: openide.awt/src/org/openide/awt/ContextAction.java
##########
@@ -181,36 +317,90 @@ public Performer(
ContextActionEnabler<Data> e
) {
Map<Object, Object> map = new HashMap<Object, Object>();
- map.put("delegate", p);
- map.put("enabler", e);
+ map.put("delegate", p); // NOI18N
+ map.put("enabler", e); // NOI18N
this.delegate = map;
}
-
- @SuppressWarnings("unchecked")
- public void actionPerformed(
- ActionEvent ev, List<? extends Data> data, Lookup.Provider
everything
- ) {
- Object obj = delegate.get("delegate"); // NOI18N
- if (obj instanceof ContextActionPerformer) {
- ContextActionPerformer<Data> perf =
(ContextActionPerformer<Data>)obj;
- perf.actionPerformed(ev, data);
- return;
+
+ void clear() {
+ stopListeners();
+ Reference r = instDelegate;
+ instDelegate = null;
+ if (r != null) {
+ Object o = r.get();
+ if (o instanceof Performer) {
+ ((Performer)o).clear();
+ }
}
- if (obj instanceof Performer) {
- Performer<Data> perf = (Performer<Data>)obj;
- perf.actionPerformed(ev, data, everything);
- return;
+ }
+
+ void attach(ContextAction a) {
+ this.owner = new WeakReference<>(a);
+ }
+
+ /**
+ * Creates a delegate.
+ * @param everything
+ * @param data
+ * @return
+ */
+ Object delegate(Lookup.Provider everything, List<?> data) {
+ return delegate0(everything, data, true);
+ }
+
+ private Object delegate0(Lookup.Provider everything, List<?> data,
boolean getAction) {
+ Object d = instDelegate != null ? instDelegate.get() : null;
Review comment:
Actually, I see that NETBEANS-1985 already had its patch merged
(including in the version of the NetBeans Platform I'm using). So this must be
another bug. Will file one on JIRA...
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
