Merge pull request #48 from cm090/builder-tool-improvements

Builder tool improvements
cm090 · Dec 6, 2024 · d935c36 · d935c36
2 parents 711cacb + 64c7bee
commit d935c36
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 6 deletions.
diff --git a/builder/src/main/java/rhit/domain/BuilderData.java b/builder/src/main/java/rhit/domain/BuilderData.java
@@ -64,4 +64,13 @@ public static void parseConfigFile() {
   public static Set<String> getTemplateFiles() {
     return new HashSet<>(templateFiles);
   }
+
+  public static void clear() {
+    templateFiles.clear();
+    templateDir = null;
+    outputDir = null;
+    starterCodeDir = null;
+    templateType = TemplateType.AUTO;
+    configOptions = null;
+  }
 }
diff --git a/builder/src/main/java/rhit/presentation/AutograderBuilder.java b/builder/src/main/java/rhit/presentation/AutograderBuilder.java
@@ -5,6 +5,10 @@
 
 public class AutograderBuilder {
   public static void main(String[] args) {
+    new AutograderBuilder().initialize();
+  }
+
+  public void initialize() {
     JFrame frame = new JFrame(PropertiesLoader.get("windowTitle"));
     frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
     InterfaceUtils.setFrame(frame);

diff --git a/builder/src/main/java/rhit/presentation/BuildProgress.java b/builder/src/main/java/rhit/presentation/BuildProgress.java
@@ -1,16 +1,22 @@
 package rhit.presentation;
 
 import java.awt.BorderLayout;
+import java.awt.EventQueue;
+import java.awt.GridLayout;
 import javax.swing.JButton;
 import javax.swing.JFrame;
+import javax.swing.JPanel;
 import javax.swing.JScrollPane;
 import javax.swing.JTextArea;
 import rhit.domain.BuildRunner;
+import rhit.domain.BuilderData;
 import rhit.domain.PropertiesLoader;
 
 public class BuildProgress extends SwingGui {
   private static final int FRAME_WIDTH = 300;
   private static final int FRAME_HEIGHT = 300;
+  private static final int NUM_ROWS = 1;
+  private static final int NUM_COLS = 2;
 
   private final JFrame frame;
 
@@ -29,13 +35,19 @@ void show() {
     scrollPane.setVerticalScrollBarPolicy(JScrollPane.VERTICAL_SCROLLBAR_ALWAYS);
     scrollPane.setHorizontalScrollBarPolicy(JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED);
 
-    JButton continueButton = new JButton(PropertiesLoader.get("continueButton"));
+    JButton continueButton = new JButton(PropertiesLoader.get("regenerateButton"));
     continueButton.addActionListener(e -> handleContinue());
 
+    JButton closeButton = new JButton(PropertiesLoader.get("closeButton"));
+    closeButton.addActionListener(e -> frame.dispose());
+
     frame.setLayout(new BorderLayout());
     frame.add(scrollPane, BorderLayout.CENTER);
-    frame.add(continueButton, BorderLayout.SOUTH);
 
+    JPanel buttonPanel = new JPanel(new GridLayout(NUM_ROWS, NUM_COLS));
+    buttonPanel.add(continueButton);
+    buttonPanel.add(closeButton);
+    frame.add(buttonPanel, BorderLayout.SOUTH);
 
     frame.setSize(FRAME_WIDTH, FRAME_HEIGHT);
     frame.setLocationRelativeTo(null);
@@ -47,5 +59,7 @@ void show() {
 
   protected void handleContinue() {
     frame.dispose();
+    BuilderData.clear();
+    EventQueue.invokeLater(() -> new AutograderBuilder().initialize());
   }
 }
diff --git a/builder/src/main/java/rhit/presentation/DirectorySelector.java b/builder/src/main/java/rhit/presentation/DirectorySelector.java
@@ -82,7 +82,7 @@ private void handleSelectTemplate() {
       startDir = new File(".");
     }
     fileChooser.setCurrentDirectory(startDir);
-    fileChooser.setDialogTitle(PropertiesLoader.get("selectButtonHint"));
+    fileChooser.setDialogTitle(PropertiesLoader.get("templateDirPrompt"));
     fileChooser.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY);
     fileChooser.setAcceptAllFileFilterUsed(false);
     if (fileChooser.showOpenDialog(frame) == JFileChooser.APPROVE_OPTION) {
@@ -105,7 +105,7 @@ private void handleSelectOutput() {
     InterfaceUtils.hideFrame(panel);
     JFileChooser fileChooser = new JFileChooser();
     fileChooser.setCurrentDirectory(new File("."));
-    fileChooser.setDialogTitle(String.format("%s (%s)", PropertiesLoader.get("selectButtonHint"),
+    fileChooser.setDialogTitle(String.format("%s (%s)", PropertiesLoader.get("outputDirPrompt"),
         String.format(PropertiesLoader.get("outputDirHint"),
             PropertiesLoader.get("outputActualDir"))));
     fileChooser.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY);

diff --git a/builder/src/main/java/rhit/presentation/FileTreeSelector.java b/builder/src/main/java/rhit/presentation/FileTreeSelector.java
@@ -72,7 +72,7 @@ private void handleSelectStartingDirectory() {
       startDir = new File(".");
     }
     fileChooser.setCurrentDirectory(startDir);
-    fileChooser.setDialogTitle(PropertiesLoader.get("selectButtonHint"));
+    fileChooser.setDialogTitle(PropertiesLoader.get("starterCodeDirPrompt"));
     fileChooser.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY);
     fileChooser.setAcceptAllFileFilterUsed(false);
     if (fileChooser.showOpenDialog(frame) == JFileChooser.APPROVE_OPTION) {

diff --git a/builder/src/main/resources/Strings.properties b/builder/src/main/resources/Strings.properties
@@ -44,4 +44,6 @@ configUpdated=Updated config file
 compressionError=Error compressing output: %s
 compressionSuccess=Compressed output to %s
 closeWindowReminder=You may now close this window
-maxDepthExceededError=Maximum directory depth exceeded for this operation
+maxDepthExceededError=Maximum directory depth exceeded for this operation
+regenerateButton=Start Over
+closeButton=Close