From 8f22ada6cbb6e67bb489fbabe2d5be6b05a4c1a0 Mon Sep 17 00:00:00 2001
From: Chris Weisiger <cweisiger@msg.ucsf.edu>
Date: Thu, 27 Aug 2015 13:42:15 -0700
Subject: [PATCH] [Plugins] Restore the pgFocus plugin.

Completely untested, as it appears to require components that I don't have
access too, but the conversion was straightforward so I doubt anything broke.
---
 plugins/Makefile.am                           |  1 +
 .../pgFocus/{build.xml-broken => build.xml}   |  2 -
 .../java/edu/umassmed/pgFocus/pgFocus.java    | 40 +++++++++++--------
 3 files changed, 24 insertions(+), 19 deletions(-)
 rename plugins/pgFocus/{build.xml-broken => build.xml} (78%)

diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index 772eed6daf..16151072dd 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -10,6 +10,7 @@ nobase_mmplugin_DATA = \
 	MMTracker.jar \
 	MultiChannelShading.jar \
 	PatternOverlay.jar \
+	pgFocus.jar \
 	PixelCalibrator.jar \
 	Projector.jar \
 	Recall.jar \
diff --git a/plugins/pgFocus/build.xml-broken b/plugins/pgFocus/build.xml
similarity index 78%
rename from plugins/pgFocus/build.xml-broken
rename to plugins/pgFocus/build.xml
index c5f030b7f1..4822cef69e 100644
--- a/plugins/pgFocus/build.xml-broken
+++ b/plugins/pgFocus/build.xml
@@ -1,6 +1,4 @@
 <project name="pgFocus" default="jar">
-	<property name="plugin.path" value="Device_Control"/>
-
 	<import file="../javapluginbuild.xml"/>
 
 	<target name="copy-files" depends="mm.javabuild.copy-files">
diff --git a/plugins/pgFocus/src/main/java/edu/umassmed/pgFocus/pgFocus.java b/plugins/pgFocus/src/main/java/edu/umassmed/pgFocus/pgFocus.java
index 08d9c0f02d..4d519fc127 100644
--- a/plugins/pgFocus/src/main/java/edu/umassmed/pgFocus/pgFocus.java
+++ b/plugins/pgFocus/src/main/java/edu/umassmed/pgFocus/pgFocus.java
@@ -1,11 +1,14 @@
 package edu.umassmed.pgfocus;
 
 import mmcorej.CMMCore;
-import org.micromanager.MMPlugin;
+import org.micromanager.MenuPlugin;
 import org.micromanager.Studio;
 
 import org.jfree.ui.RefineryUtilities;
 
+import org.scijava.plugin.Plugin;
+import org.scijava.plugin.SciJavaPlugin;
+
 /**
  *
  * @author Karl Bellve
@@ -15,7 +18,8 @@
  * 
  */
 
-public class pgFocus implements MMPlugin {
+@Plugin(type = MenuPlugin.class)
+public class pgFocus implements MenuPlugin, SciJavaPlugin {
    public static final String menuName = "pgFocus";
    public static final String tooltipDescription =
       "Control the pgFocus open-source software and open hardware " +
@@ -25,10 +29,14 @@ public class pgFocus implements MMPlugin {
    private Studio gui_;
    private pgFocusFrame myFrame_;
 
-    @Override
-   public void setApp(Studio app) {
+   @Override
+   public void setContext(Studio app) {
       gui_ = app;
       setCore_(app.getCMMCore());
+   }
+
+   @Override
+   public void onPluginSelected() {
       if (myFrame_ == null) {
          try {
             myFrame_ = new pgFocusFrame(gui_);
@@ -42,25 +50,23 @@ public void setApp(Studio app) {
       myFrame_.setVisible(true);
    }
    
-
-    @Override
-   public void dispose() {
-      if (myFrame_ != null)
-    	  myFrame_.safePrefs();
+   @Override
+   public String getName() {
+      return menuName;
    }
 
-    @Override
-   public void show() {
-  //       String ig = "pgFocus focus stabilization";
+   @Override
+   public String getSubMenu() {
+      return "Device Control";
    }
 
-    @Override
-   public String getInfo () {
-      return "pgFocus Plugin";
+   public void dispose() {
+      if (myFrame_ != null)
+    	  myFrame_.safePrefs();
    }
 
-    @Override
-   public String getDescription() {
+   @Override
+   public String getHelpText() {
       return tooltipDescription;
    }