Merge pull request #82 from Gaming32/groovy-scripting

here we go
Gaming32 · Apr 4, 2022 · 57bb8e3 · 57bb8e3
2 parents 8e50158 + bd9ee6b
commit 57bb8e3
Show file tree

Hide file tree

Showing 53 changed files with 1,954 additions and 2,465 deletions.
diff --git a/.gitignore b/.gitignore
@@ -7,3 +7,4 @@ network_*.svg
 sorting_networks
 /stats-config.txt
 dependency-reduced-pom.xml
+/scripts
diff --git a/monthly-scripts/Apr2021sorts.txt b/monthly-scripts/Apr2021sorts.txt
diff --git a/monthly-scripts/Feb2021sorts.txt b/monthly-scripts/Feb2021sorts.txt
diff --git a/monthly-scripts/Jan2021sorts.txt b/monthly-scripts/Jan2021sorts.txt
diff --git a/monthly-scripts/Mar2021sorts.txt b/monthly-scripts/Mar2021sorts.txt
diff --git a/monthly-scripts/May2021sorts.txt b/monthly-scripts/May2021sorts.txt
diff --git a/pom.xml b/pom.xml
@@ -24,6 +24,11 @@
       <artifactId>classgraph</artifactId>
       <version>4.8.139</version>
     </dependency>
+    <dependency>
+      <groupId>org.apache.groovy</groupId>
+      <artifactId>groovy</artifactId>
+      <version>4.0.1</version>
+    </dependency>
   </dependencies>
 
   <licenses>
@@ -95,6 +100,32 @@
           </execution>
         </executions>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-javadoc-plugin</artifactId>
+        <version>3.3.2</version>
+        <configuration>
+          <sourceFileIncludes>
+            <include>io/github/arrayv/groovyapi/**/*.java</include>
+            <include>io/github/arrayv/main/**/*.java</include>
+            <include>io/github/arrayv/sortdata/**/*.java</include>
+            <include>io/github/arrayv/sorts/templates/Sort.java</include>
+            <include>io/github/arrayv/utils/**/*.java</include>
+          </sourceFileIncludes>
+          <links>
+            <link>https://javadoc.io/doc/io.github.classgraph/classgraph/4.8.139</link>
+            <link>https://docs.groovy-lang.org/4.0.0/html/api</link>
+          </links>
+        </configuration>
+        <executions>
+          <execution>
+            <id>attach-javadocs</id>
+            <goals>
+              <goal>jar</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-shade-plugin</artifactId>

diff --git a/src/main/java/io/github/arrayv/dialogs/RunScriptDialog.java b/src/main/java/io/github/arrayv/dialogs/RunScriptDialog.java
@@ -1,5 +1,7 @@
 package io.github.arrayv.dialogs;
 
+import javax.swing.filechooser.FileNameExtensionFilter;
+
 /*
 MIT License
 
@@ -29,6 +31,9 @@ public RunScriptDialog() {
         super();
 
         fileDialog.setDialogTitle("Choose a script file...");
+        FileNameExtensionFilter groovyFiles = new FileNameExtensionFilter("Groovy Script Files (.groovy)", "groovy");
+        this.removeAllFilesOption();
+        fileDialog.addChoosableFileFilter(groovyFiles);
 
         fileDialog.showDialog(null, "Select");
         this.file = fileDialog.getSelectedFile();

diff --git a/src/main/java/io/github/arrayv/frames/ArrayFrame.java b/src/main/java/io/github/arrayv/frames/ArrayFrame.java
@@ -72,7 +72,12 @@ public ArrayFrame(int[] array, ArrayVisualizer arrayVisualizer) {
 
         setUndecorated(true);
         initComponents();
-        setLocation(Math.min((int) Toolkit.getDefaultToolkit().getScreenSize().getWidth() - getWidth(), frame.getX() + frame.getWidth()), frame.getY() + 29);
+        setBounds(
+            Math.min((int) Toolkit.getDefaultToolkit().getScreenSize().getWidth() - getWidth(), frame.getX() + frame.getWidth()),
+            frame.getY() + 29,
+            getWidth(),
+            arrayVisualizer.getUtilFrame().getHeight()
+        );
         setAlwaysOnTop(false);
         setVisible(true);
     }

diff --git a/src/main/java/io/github/arrayv/frames/UtilFrame.java b/src/main/java/io/github/arrayv/frames/UtilFrame.java
@@ -1,13 +1,18 @@
 package io.github.arrayv.frames;
 
 import java.awt.Toolkit;
+import java.io.File;
+import java.io.IOException;
 
 import javax.swing.DefaultComboBoxModel;
+import javax.swing.JButton;
 import javax.swing.JFrame;
 import javax.swing.JOptionPane;
 
+import io.github.arrayv.dialogs.RunScriptDialog;
 import io.github.arrayv.main.ArrayManager;
 import io.github.arrayv.main.ArrayVisualizer;
+import io.github.arrayv.panes.JErrorPane;
 import io.github.arrayv.prompts.ShufflePrompt;
 import io.github.arrayv.prompts.SortPrompt;
 import io.github.arrayv.prompts.ViewPrompt;
@@ -50,14 +55,15 @@ public final class UtilFrame extends javax.swing.JFrame {
 
     private int[] array;
 
-    private ArrayManager arrayManager;
-    private ArrayVisualizer arrayVisualizer;
-    private Delays Delays;
+    private final ArrayManager arrayManager;
+    private final ArrayVisualizer arrayVisualizer;
+    private final Delays Delays;
+    private final Highlights Highlights;
+    private final JFrame frame;
+    private final Timer Timer;
+    private final Sounds Sounds;
+
     private AppFrame abstractFrame;
-    private Highlights Highlights;
-    private JFrame frame;
-    private Timer Timer;
-    private Sounds Sounds;
 
     public UtilFrame(int[] array, ArrayVisualizer arrayVisualizer) {
         this.array = array;
@@ -266,6 +272,17 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
             jComboBox1.removeItem("Stability Check");
         }
 
+        JButton runScriptButton = new JButton("Run Script");
+        runScriptButton.addActionListener(e -> {
+            File scriptFile = new RunScriptDialog().getFile();
+            if (scriptFile == null) return;
+            try {
+                arrayVisualizer.getScriptManager().runInThread(scriptFile);
+            } catch (IOException e1) {
+                JErrorPane.invokeErrorMessage(e1, "Run Script");
+            }
+        });
+
         javax.swing.GroupLayout layout = new javax.swing.GroupLayout(getContentPane());
         getContentPane().setLayout(layout);
         layout.setHorizontalGroup(
@@ -293,8 +310,9 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
                                     .addComponent(this.jButton3, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
                                     .addComponent(this.jButton2, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
                                     .addComponent(this.jButton1, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+                                    .addComponent(runScriptButton, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
                                     .addComponent(this.jComboBox1, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)))))
-                    .addGap(0, 10, Short.MAX_VALUE))
+                .addGap(0, 10, Short.MAX_VALUE))
         );
         layout.setVerticalGroup(
             layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, true)
@@ -333,7 +351,10 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
                     .addComponent(this.jButton5)
                     .addGap(5, 5, 5)
                     .addComponent(this.jCheckBox6)
-                    .addComponent(this.jCheckBox4))
+                    .addComponent(this.jCheckBox4)
+                    .addGap(5, 5, 5)
+                    .addComponent(runScriptButton)
+                    .addGap(8, 8, 8))
         );
 
         pack();
@@ -453,9 +474,9 @@ private void jButton5ActionPerformed() {//GEN-FIRST:event_jButton4ActionPerforme
 
     private void jCheckBox5ActionPerformed() {//GEN-FIRST:event_jButton4ActionPerformed
         if (jCheckBox5.isSelected()) {
-            Sounds.toggleSofterSounds(true);
+            Sounds.setSofterSounds(true);
         } else {
-            Sounds.toggleSofterSounds(false);
+            Sounds.setSofterSounds(false);
         }
     }//GEN-LAST:event_jCheckBox5ActionPerformed