Merge branch 'master' of github.com:Elphel/imagej-elphel

Conflicts:
	src/main/resources/plugins.config

pom.xml

@@ -11,14 +11,18 @@
 		<version>1.135</version>
 		<relativePath />
 	</parent>
-
+<!-- 	
+	<properties>
+		<imagej.app.directory>/data/ImageJ/ImageJ</imagej.app.directory>
+	</properties>
+ -->
 	<groupId>com.elphel</groupId>
  	<artifactId>imagej-elphel</artifactId>
 <!-- 	<artifactId>Aberration_Calibration</artifactId> -->
 	
 	<version>1.0.0</version>
 
- 	<name>plugins/ImageJ_Elphel.jar</name>
+ 	<name>plugins/imagej_elphel.jar</name>
 <!-- 	<name>plugins/Aberration_Calibration.jar</name> -->
     <description>A Maven project implementing imagej-elphel plugin</description>
 

src/main/java/WindowTools.java

@@ -67,7 +67,9 @@ public final class WindowTools {
 
   /* Adds AWT scroll bars to the given container. */
   @SuppressWarnings("serial")
-public static void addScrollBars(Container pane) {
+public static void addScrollBars(GenericDialog gd) {
+    if (!(gd instanceof Container)) return; // headless mode
+    Container pane = (Container) gd;
     GridBagLayout layout = (GridBagLayout) pane.getLayout();
 
     // extract components

src/main/resources/plugins.config

@@ -8,9 +8,9 @@
 #
 # If something like ("<arg>") is appended to the class name, the setup() method
 # will get that as arg parameter; otherwise arg is simply the empty string.
-#Process, "Process Pixels", Process_Pixels
+Process, "Process Pixels", Process_Pixels
 Process, "Aberration Calibration", Aberration_Calibration
-Plugins, "Aberration Calibration", Aberration_Calibration
-Process, "Aberration Correction", Aberration_Correction
+#Plugins, "Aberration Calibration", Aberration_Calibration
+#Process, "Aberration Correction", Aberration_Correction
 Process, "Eyesis Correction", Eyesis_Correction
-Process, "JP46 Reader camera", JP46_Reader_camera
+#Process, "JP46 Reader camera", JP46_Reader_camera