Merge pull request #10 from fvogler/develop

Bugfixes and update tool versions

codedefects.core/src/org/nbheaven/sqe/codedefects/core/spi/AbstractQualityProvider.java

@@ -33,13 +33,26 @@
  */
 public abstract class AbstractQualityProvider implements QualityProvider {
 
-    private static final SessionEventProxyImpl globalSessionEventProxy = new SessionEventProxyImpl();
-    private final SessionEventProxyImpl sessionEventProxy = new SessionEventProxyImpl();
+    private static final SessionEventProxyImpl globalSessionEventProxy = new SessionEventProxyImpl("GLOBAL");
+    private final SessionEventProxyImpl sessionEventProxy;
+    private final String id;
 
     /**
      * Creates a new instance of AbstractQualityProvider
      */
-    protected AbstractQualityProvider() {
+    protected AbstractQualityProvider(String id) {
+        this.id = id;
+        sessionEventProxy = new SessionEventProxyImpl(id);
+    }
+
+    @Override
+    public final String getId() {
+        return id;
+    }
+
+    @Override
+    public String getDisplayName() {
+        return getId();
     }
 
     <T> void fireSessionPropertyChange(AbstractQualitySession<?, ?> session, String propertyName, T oldValue, T newValue) {
@@ -80,6 +93,11 @@ public int hashCode() {
     private static final class SessionEventProxyImpl implements SessionEventProxy {
 
         private final PropertyChangeSupport propertyChangeSupport = new PropertyChangeSupport(this);
+        private final String name;
+
+        public SessionEventProxyImpl(String name) {
+            this.name = name;
+        }
 
         public void firePropertyChange(PropertyChangeEvent event) {
             propertyChangeSupport.firePropertyChange(event);
@@ -109,14 +127,14 @@ public void removePropertyChangeListener(String propertyName, PropertyChangeList
         public PropertyChangeListener addWeakPropertyChangeListener(PropertyChangeListener listener) {
             PropertyChangeListener weakListener = WeakListeners.propertyChange(listener, this);
             addPropertyChangeListener(weakListener);
-            return weakListener;
+            return listener;
         }
 
         @Override
         public PropertyChangeListener addWeakPropertyChangeListener(String propertyName, PropertyChangeListener listener) {
             PropertyChangeListener weakListener = WeakListeners.propertyChange(listener, propertyName, this);
             addPropertyChangeListener(propertyName, weakListener);
-            return weakListener;
+            return listener;
         }
 
     }

codedefects.ui/src/org/nbheaven/sqe/codedefects/ui/actions/AbstractEnableBackgroundScanningAction.java

@@ -19,11 +19,12 @@
 
 import java.awt.Component;
 import java.awt.event.ActionEvent;
+import javax.swing.JCheckBoxMenuItem;
+import javax.swing.JMenuItem;
 import javax.swing.JToggleButton;
 import org.nbheaven.sqe.codedefects.core.api.QualityProvider;
 import org.nbheaven.sqe.codedefects.core.api.QualitySession;
 import org.nbheaven.sqe.codedefects.core.util.SQECodedefectSupport;
-import org.nbheaven.sqe.codedefects.ui.actions.AbstractQualitySessionAwareAction;
 import org.netbeans.api.project.Project;
 import org.openide.util.Lookup;
 import org.openide.util.actions.Presenter;
@@ -33,7 +34,8 @@
  *
  * @author Florian Vogler
  */
-public abstract class AbstractEnableBackgroundScanningAction extends AbstractQualitySessionAwareAction implements Presenter.Toolbar {
+public abstract class AbstractEnableBackgroundScanningAction extends AbstractQualitySessionAwareAction
+        implements Presenter.Toolbar, Presenter.Popup, Presenter.Menu {
 
     private final QualityProvider provider;
 
@@ -72,4 +74,15 @@ public Component getToolbarPresenter() {
         return button;
     }
 
+    @Override
+    public JMenuItem getPopupPresenter() {
+        JCheckBoxMenuItem item = new JCheckBoxMenuItem(this);
+        return item;
+    }
+
+    @Override
+    public JMenuItem getMenuPresenter() {
+        JCheckBoxMenuItem item = new JCheckBoxMenuItem(this);
+        return item;
+    }
 }

codedefects.ui/src/org/nbheaven/sqe/codedefects/ui/actions/AbstractShowProjectResultAnnotationsAction.java

@@ -19,6 +19,8 @@
 
 import java.awt.Component;
 import java.awt.event.ActionEvent;
+import javax.swing.JCheckBoxMenuItem;
+import javax.swing.JMenuItem;
 import javax.swing.JToggleButton;
 import org.nbheaven.sqe.codedefects.core.api.QualityProvider;
 import org.nbheaven.sqe.codedefects.core.api.QualitySession;
@@ -32,7 +34,8 @@
  *
  * @author Florian Vogler
  */
-public abstract class AbstractShowProjectResultAnnotationsAction extends AbstractQualitySessionAwareAction implements Presenter.Toolbar {
+public abstract class AbstractShowProjectResultAnnotationsAction extends AbstractQualitySessionAwareAction
+        implements Presenter.Toolbar, Presenter.Popup, Presenter.Menu {
 
     private final QualityProvider provider;
 
@@ -71,4 +74,15 @@ public Component getToolbarPresenter() {
         return button;
     }
 
+    @Override
+    public JMenuItem getPopupPresenter() {
+        JCheckBoxMenuItem item = new JCheckBoxMenuItem(this);
+        return item;
+    }
+
+    @Override
+    public JMenuItem getMenuPresenter() {
+        JCheckBoxMenuItem item = new JCheckBoxMenuItem(this);
+        return item;
+    }
 }

codedefects.ui/src/org/nbheaven/sqe/codedefects/ui/actions/QualityProvidersToolbarDropdownAction.java

@@ -37,7 +37,7 @@
  *
  * @author Florian Vogler
  */
-public class QualityProvidersToolbarDropdownAction implements Action, Presenter.Toolbar, ContextAwareAction {
+public final class QualityProvidersToolbarDropdownAction implements Action, Presenter.Toolbar, ContextAwareAction {
 
     private List<? extends Action> actions;
     private final Action defaultAction;