Make shutdown protected, refs #289

sarxos · sarxos · commit 7c673a8956b6 · 2015-01-12T16:58:31.000+01:00
diff --git a/webcam-capture-examples/webcam-capture-applet/src/main/java/WebcamAppletExample.java b/webcam-capture-examples/webcam-capture-applet/src/main/java/WebcamAppletExample.java
@@ -2,6 +2,7 @@
 
 import javax.swing.JApplet;
 
+import com.github.sarxos.webcam.WebcamCaptureFrameworkDestroyer;
 import com.github.sarxos.webcam.Webcam;
 import com.github.sarxos.webcam.WebcamPanel;
 import com.github.sarxos.webcam.WebcamResolution;
@@ -61,7 +62,7 @@ public void start() {
 	public void destroy() {
 		System.out.println("Destroy");
 		webcam.close();
-		Webcam.shutdown();
+		WebcamCaptureFrameworkDestroyer.destroy();
 		System.out.println("Destroyed");
 	}
 
diff --git a/webcam-capture-examples/webcam-capture-applet/src/main/java/com/github/sarxos/webcam/WebcamCaptureFrameworkDestroyer.java b/webcam-capture-examples/webcam-capture-applet/src/main/java/com/github/sarxos/webcam/WebcamCaptureFrameworkDestroyer.java
@@ -0,0 +1,14 @@
+package com.github.sarxos.webcam;
+
+/**
+ * IMPORTANT! This approach should be used only in case of Applets (due to its non standard
+ * lifecycle).
+ *
+ * @author Bartosz Firyn (sarxos)
+ */
+public class WebcamCaptureFrameworkDestroyer {
+
+	public static final void destroy() {
+		Webcam.shutdown();
+	}
+}
diff --git a/webcam-capture-examples/webcam-capture-javafx-fxml/src/main/java/WebCamPreviewController.java b/webcam-capture-examples/webcam-capture-javafx-fxml/src/main/java/WebCamPreviewController.java
@@ -222,7 +222,6 @@ public void startCamera(ActionEvent event) {
 	public void disposeCamera(ActionEvent event) {
 		stopCamera = true;
 		closeCamera();
-		Webcam.shutdown();
 		btnStopCamera.setDisable(true);
 		btnStartCamera.setDisable(true);
 	}
diff --git a/webcam-capture-examples/webcam-capture-javafx/src/main/java/WebCamAppLauncher.java b/webcam-capture-examples/webcam-capture-javafx/src/main/java/WebCamAppLauncher.java
@@ -271,7 +271,6 @@ public void handle(ActionEvent arg0) {
 	protected void disposeWebCamCamera() {
 		stopCamera = true;
 		webCam.close();
-		Webcam.shutdown();
 		btnCamreaStart.setDisable(true);
 		btnCamreaStop.setDisable(true);
 	}
diff --git a/webcam-capture/src/main/java/com/github/sarxos/webcam/Webcam.java b/webcam-capture/src/main/java/com/github/sarxos/webcam/Webcam.java
@@ -1205,9 +1205,11 @@ public WebcamLock getLock() {
 	}
 
 	/**
-	 * Shutdown webcam framework.
+	 * Shutdown webcam framework. This method should be used <b>ONLY</b> when you
+	 * are exiting JVM, but please <b>do not invoke it</b> if you really don't
+	 * need to.
 	 */
-	public static void shutdown() {
+	protected static void shutdown() {
 
 		// stop discovery service
 		WebcamDiscoveryService discovery = getDiscoveryServiceRef();

Original file line number	Diff line number	Diff line change
`@@ -222,7 +222,6 @@ public void startCamera(ActionEvent event) {`
`222`	`222`	`public void disposeCamera(ActionEvent event) {`
`223`	`223`	`stopCamera = true;`
`224`	`224`	`closeCamera();`
`225`		`- Webcam.shutdown();`
`226`	`225`	`btnStopCamera.setDisable(true);`
`227`	`226`	`btnStartCamera.setDisable(true);`
`228`	`227`	`}`
Original file line number	Diff line number	Diff line change
`@@ -271,7 +271,6 @@ public void handle(ActionEvent arg0) {`
`271`	`271`	`protected void disposeWebCamCamera() {`
`272`	`272`	`stopCamera = true;`
`273`	`273`	`webCam.close();`
`274`		`- Webcam.shutdown();`
`275`	`274`	`btnCamreaStart.setDisable(true);`
`276`	`275`	`btnCamreaStop.setDisable(true);`
`277`	`276`	`}`