From 5e1b2a35a5443092fdb7d99ee5c23f5fced216a2 Mon Sep 17 00:00:00 2001
From: Jeffrey Phillips Freeman <jeffrey.freeman@syncleus.com>
Date: Mon, 17 Oct 2016 14:25:54 -0400
Subject: [PATCH] Added progress demos.

---
 src/main/java/com/syncleus/aparapi/examples/All.java |  8 ++++++++
 .../examples}/progress/LongRunningKernel.java        | 12 +++++++++++-
 .../progress/MultiPassKernelSwingWorkerDemo.java     | 12 +++++++++++-
 .../examples}/progress/ProgressAndCancelDemo.java    | 12 +++++++++++-
 4 files changed, 41 insertions(+), 3 deletions(-)
 rename {samples/progress/src/com/amd/aparapi/sample => src/main/java/com/syncleus/aparapi/examples}/progress/LongRunningKernel.java (64%)
 rename {samples/progress/src/com/amd/aparapi/sample => src/main/java/com/syncleus/aparapi/examples}/progress/MultiPassKernelSwingWorkerDemo.java (89%)
 rename {samples/progress/src/com/amd/aparapi/sample => src/main/java/com/syncleus/aparapi/examples}/progress/ProgressAndCancelDemo.java (90%)

diff --git a/src/main/java/com/syncleus/aparapi/examples/All.java b/src/main/java/com/syncleus/aparapi/examples/All.java
index 04cb7b2d..31f2af8b 100644
--- a/src/main/java/com/syncleus/aparapi/examples/All.java
+++ b/src/main/java/com/syncleus/aparapi/examples/All.java
@@ -23,6 +23,8 @@ public class All {
         System.out.println("  6) Convolution (pure Java)");
         System.out.println("  7) Blacksholes");
         System.out.println("  8) Squares");
+        System.out.println("  9) Multipass swing worker");
+        System.out.println("  10) Progress and cancel demo");
         System.out.println();
 
         Scanner in = new Scanner(System.in);
@@ -77,6 +79,12 @@ public class All {
             case "8":
                 com.syncleus.aparapi.examples.squares.Main.main(args);
                 break;
+            case "9":
+                com.syncleus.aparapi.examples.progress.MultiPassKernelSwingWorkerDemo.main(args);
+                break;
+            case "10":
+                com.syncleus.aparapi.examples.progress.ProgressAndCancelDemo.main(args);
+                break;
             default:
                 System.out.println("Invalid selection.");
         }
diff --git a/samples/progress/src/com/amd/aparapi/sample/progress/LongRunningKernel.java b/src/main/java/com/syncleus/aparapi/examples/progress/LongRunningKernel.java
similarity index 64%
rename from samples/progress/src/com/amd/aparapi/sample/progress/LongRunningKernel.java
rename to src/main/java/com/syncleus/aparapi/examples/progress/LongRunningKernel.java
index 856f5b75..e3799f01 100644
--- a/samples/progress/src/com/amd/aparapi/sample/progress/LongRunningKernel.java
+++ b/src/main/java/com/syncleus/aparapi/examples/progress/LongRunningKernel.java
@@ -1,4 +1,14 @@
-package com.syncleus.aparapi.sample.progress;
+/**
+ * This product currently only contains code developed by authors
+ * of specific components, as identified by the source code files.
+ *
+ * Since product implements StAX API, it has dependencies to StAX API
+ * classes.
+ *
+ * For additional credits (generally to people who reported problems)
+ * see CREDITS file.
+ */
+package com.syncleus.aparapi.examples.progress;
 
 import com.syncleus.aparapi.Kernel;
 
diff --git a/samples/progress/src/com/amd/aparapi/sample/progress/MultiPassKernelSwingWorkerDemo.java b/src/main/java/com/syncleus/aparapi/examples/progress/MultiPassKernelSwingWorkerDemo.java
similarity index 89%
rename from samples/progress/src/com/amd/aparapi/sample/progress/MultiPassKernelSwingWorkerDemo.java
rename to src/main/java/com/syncleus/aparapi/examples/progress/MultiPassKernelSwingWorkerDemo.java
index 728e43b7..0cf5ef16 100644
--- a/samples/progress/src/com/amd/aparapi/sample/progress/MultiPassKernelSwingWorkerDemo.java
+++ b/src/main/java/com/syncleus/aparapi/examples/progress/MultiPassKernelSwingWorkerDemo.java
@@ -1,4 +1,14 @@
-package com.syncleus.aparapi.sample.progress;
+/**
+ * This product currently only contains code developed by authors
+ * of specific components, as identified by the source code files.
+ *
+ * Since product implements StAX API, it has dependencies to StAX API
+ * classes.
+ *
+ * For additional credits (generally to people who reported problems)
+ * see CREDITS file.
+ */
+package com.syncleus.aparapi.examples.progress;
 
 import com.syncleus.aparapi.*;
 import com.syncleus.aparapi.internal.kernel.*;
diff --git a/samples/progress/src/com/amd/aparapi/sample/progress/ProgressAndCancelDemo.java b/src/main/java/com/syncleus/aparapi/examples/progress/ProgressAndCancelDemo.java
similarity index 90%
rename from samples/progress/src/com/amd/aparapi/sample/progress/ProgressAndCancelDemo.java
rename to src/main/java/com/syncleus/aparapi/examples/progress/ProgressAndCancelDemo.java
index 8684c00b..c09c510e 100644
--- a/samples/progress/src/com/amd/aparapi/sample/progress/ProgressAndCancelDemo.java
+++ b/src/main/java/com/syncleus/aparapi/examples/progress/ProgressAndCancelDemo.java
@@ -1,4 +1,14 @@
-package com.syncleus.aparapi.sample.progress;
+/**
+ * This product currently only contains code developed by authors
+ * of specific components, as identified by the source code files.
+ *
+ * Since product implements StAX API, it has dependencies to StAX API
+ * classes.
+ *
+ * For additional credits (generally to people who reported problems)
+ * see CREDITS file.
+ */
+package com.syncleus.aparapi.examples.progress;
 
 import com.syncleus.aparapi.internal.kernel.*;
 
-- 
GitLab