marvin/asl
1
0
Fork 0
mirror of https://github.com/Kugelschieber/asl.git synced 2026-01-18 12:00:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #26 from 654wak654/master

Browse Source 
ASL GUI Beta 2
This commit is contained in:
Marvin Blum
2015-11-15 22:03:32 +01:00
parent aa83a9a093 07ce5e7a0b
commit 511ceb128f
4 changed files with 93 additions and 194 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
gui/ASL GUI.exe
View File

Binary file not shown.

8
gui/README.md
View File

@@ -1,6 +1,10 @@
ASL GUI <img src="https://img.shields.io/badge/version-0.2.0-lightgrey.svg?style=plastic" alt="version"> ASL GUI <img src="https://img.shields.io/badge/version-0.3.0-lightgrey.svg?style=plastic" alt="version">
=========== =========
An optional Java interface to make the compile procces of ASL faster and more user-friendly. It's released under the MIT licence just like the core project. An optional Java interface to make the compile procces of ASL faster and more user-friendly. It's released under the MIT licence just like the core project.
Maintained by yours truly: [654wak654](https://github.com/654wak654/) Maintained by yours truly: [654wak654](https://github.com/654wak654/)
**Version 0.3.0:**
Fixed some possible bugs, did some style fixes and other code adjustments. It's now is readable without getting cataracts. Mostly anyway...

31
gui/src/asl/gui/DlgError.java
View File

@@ -25,18 +25,13 @@ package asl.gui;
public class DlgError extends javax.swing.JDialog { public class DlgError extends javax.swing.JDialog {
boolean isAbort = true;
public DlgError(java.awt.Frame parent, boolean modal, String errorMessage) { public DlgError(java.awt.Frame parent, boolean modal, String errorMessage) {
super(parent, modal); super(parent, modal);
initComponents(); initComponents();
lblError.setText(errorMessage); lblError.setText(errorMessage);
} }
@SuppressWarnings("unchecked")
// <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
private void initComponents() { private void initComponents() {
lblError = new javax.swing.JLabel(); lblError = new javax.swing.JLabel();
lblTitle = new javax.swing.JLabel(); lblTitle = new javax.swing.JLabel();
@@ -47,37 +42,25 @@ public class DlgError extends javax.swing.JDialog {
setResizable(false); setResizable(false);
setType(java.awt.Window.Type.POPUP); setType(java.awt.Window.Type.POPUP);
lblError.setFont(new java.awt.Font("Segoe UI Light", 0, 16)); // NOI18N lblError.setFont(new java.awt.Font("Segoe UI Light", 0, 16));
lblError.setHorizontalAlignment(javax.swing.SwingConstants.CENTER); lblError.setHorizontalAlignment(javax.swing.SwingConstants.CENTER);
lblError.setText("Some error"); lblError.setText("Some error");
lblTitle.setFont(new java.awt.Font("Segoe UI Light", 0, 16)); // NOI18N lblTitle.setFont(new java.awt.Font("Segoe UI Light", 0, 16));
lblTitle.setHorizontalAlignment(javax.swing.SwingConstants.CENTER); lblTitle.setHorizontalAlignment(javax.swing.SwingConstants.CENTER);
lblTitle.setText("asl.exe has encountered an error:"); lblTitle.setText("asl.exe has encountered an error:");
lblTitle.setToolTipText(""); lblTitle.setToolTipText("");
javax.swing.GroupLayout layout = new javax.swing.GroupLayout(getContentPane()); javax.swing.GroupLayout layout = new javax.swing.GroupLayout(getContentPane());
getContentPane().setLayout(layout); getContentPane().setLayout(layout);
layout.setHorizontalGroup( layout.setHorizontalGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING).addComponent(lblTitle, javax.swing.GroupLayout.DEFAULT_SIZE, 380, Short.MAX_VALUE).addComponent(lblError, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE));
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) layout.setVerticalGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING).addGroup(layout.createSequentialGroup().addContainerGap().addComponent(lblTitle).addGap(18, 18, 18).addComponent(lblError).addGap(27, 27, 27)));
.addComponent(lblTitle, javax.swing.GroupLayout.DEFAULT_SIZE, 380, Short.MAX_VALUE)
.addComponent(lblError, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
);
layout.setVerticalGroup(
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(layout.createSequentialGroup()
.addContainerGap()
.addComponent(lblTitle)
.addGap(18, 18, 18)
.addComponent(lblError)
.addGap(27, 27, 27))
);
pack(); pack();
}// </editor-fold>//GEN-END:initComponents }
// Variables declaration - do not modify//GEN-BEGIN:variables // Variables declaration - do not modify
private javax.swing.JLabel lblError; private javax.swing.JLabel lblError;
private javax.swing.JLabel lblTitle; private javax.swing.JLabel lblTitle;
// End of variables declaration//GEN-END:variables // End of variables declaration
} }

228
gui/src/asl/gui/Main.java
View File

@@ -27,7 +27,6 @@ import java.awt.Color;
import java.io.BufferedReader; import java.io.BufferedReader;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader; import java.io.InputStreamReader;
import java.net.URI; import java.net.URI;
import java.net.URISyntaxException; import java.net.URISyntaxException;
@@ -62,15 +61,13 @@ public class Main extends javax.swing.JFrame {
cbPrettyPrinting.setSelected(prefs.getBoolean("prettyPrinting", false)); cbPrettyPrinting.setSelected(prefs.getBoolean("prettyPrinting", false));
} }
private String fileChooser(String title, FileNameExtensionFilter fileType) { private String fileChooser(String title, int fileType) {
JFileChooser chooser = new JFileChooser(); JFileChooser chooser = new JFileChooser();
if (fileType != null) { if (fileType == 0) {
chooser.setFileFilter(fileType); chooser.setFileFilter(new FileNameExtensionFilter("Executable", "exe"));
chooser.setAcceptAllFileFilterUsed(false); chooser.setAcceptAllFileFilterUsed(false);
chooser.setFileSelectionMode(0);
} else {
chooser.setFileSelectionMode(1);
} }
chooser.setFileSelectionMode(fileType);
chooser.setDialogTitle(title); chooser.setDialogTitle(title);
String selectedPath = ""; String selectedPath = "";
if (chooser.showOpenDialog(null) == 0) { if (chooser.showOpenDialog(null) == 0) {
@@ -81,8 +78,6 @@ public class Main extends javax.swing.JFrame {
return selectedPath; return selectedPath;
} }
@SuppressWarnings("unchecked")
// <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
private void initComponents() { private void initComponents() {
lblInput = new javax.swing.JLabel(); lblInput = new javax.swing.JLabel();
@@ -109,17 +104,17 @@ public class Main extends javax.swing.JFrame {
setTitle("ASL GUI"); setTitle("ASL GUI");
setResizable(false); setResizable(false);
lblInput.setFont(new java.awt.Font("Microsoft JhengHei UI Light", 0, 16)); // NOI18N lblInput.setFont(new java.awt.Font("Microsoft JhengHei UI Light", 0, 16));
lblInput.setText("Input Directory:"); lblInput.setText("Input Directory:");
lblInput.setOpaque(true); lblInput.setOpaque(true);
txtInputDir.setFont(new java.awt.Font("Segoe UI Light", 0, 16)); // NOI18N txtInputDir.setFont(new java.awt.Font("Segoe UI Light", 0, 16));
lblOutput.setFont(new java.awt.Font("Microsoft JhengHei UI Light", 0, 16)); // NOI18N lblOutput.setFont(new java.awt.Font("Microsoft JhengHei UI Light", 0, 16));
lblOutput.setText("Output Directory:"); lblOutput.setText("Output Directory:");
lblOutput.setOpaque(true); lblOutput.setOpaque(true);
txtOutputDir.setFont(new java.awt.Font("Segoe UI Light", 0, 16)); // NOI18N txtOutputDir.setFont(new java.awt.Font("Segoe UI Light", 0, 16));
btnInput.setText("..."); btnInput.setText("...");
btnInput.setToolTipText("Opens a dialog to select input file"); btnInput.setToolTipText("Opens a dialog to select input file");
@@ -139,11 +134,11 @@ public class Main extends javax.swing.JFrame {
} }
}); });
lblASL.setFont(new java.awt.Font("Microsoft JhengHei UI Light", 0, 16)); // NOI18N lblASL.setFont(new java.awt.Font("Microsoft JhengHei UI Light", 0, 16));
lblASL.setText("ASL Compiler Directory"); lblASL.setText("ASL Compiler Directory");
lblASL.setOpaque(true); lblASL.setOpaque(true);
txtASLDir.setFont(new java.awt.Font("Segoe UI Light", 0, 16)); // NOI18N txtASLDir.setFont(new java.awt.Font("Segoe UI Light", 0, 16));
btnASL.setText("..."); btnASL.setText("...");
btnASL.setToolTipText("Opens a dialog to select the compiler location"); btnASL.setToolTipText("Opens a dialog to select the compiler location");
@@ -156,20 +151,20 @@ public class Main extends javax.swing.JFrame {
jSeparator.setToolTipText(""); jSeparator.setToolTipText("");
lblASLSmall.setFont(new java.awt.Font("Microsoft YaHei UI", 0, 10)); // NOI18N lblASLSmall.setFont(new java.awt.Font("Microsoft YaHei UI", 0, 10));
lblASLSmall.setText("Location of the asl.exe file."); lblASLSmall.setText("Location of the asl.exe file.");
lblASLSmall.setOpaque(true); lblASLSmall.setOpaque(true);
lblInputSmall.setFont(new java.awt.Font("Microsoft YaHei UI", 0, 10)); // NOI18N lblInputSmall.setFont(new java.awt.Font("Microsoft YaHei UI", 0, 10));
lblInputSmall.setText("Directory of scripts that will be compiled in to the output directory."); lblInputSmall.setText("Directory of scripts that will be compiled in to the output directory.");
lblInputSmall.setOpaque(true); lblInputSmall.setOpaque(true);
lblOutputSmall.setFont(new java.awt.Font("Microsoft YaHei UI", 0, 10)); // NOI18N lblOutputSmall.setFont(new java.awt.Font("Microsoft YaHei UI", 0, 10));
lblOutputSmall.setText("Directory that the compiled.sqf script(s) will be saved in."); lblOutputSmall.setText("Directory that the compiled.sqf script(s) will be saved in.");
lblOutputSmall.setOpaque(true); lblOutputSmall.setOpaque(true);
cbCompileAll.setFont(new java.awt.Font("Microsoft YaHei UI", 0, 11)); // NOI18N cbCompileAll.setFont(new java.awt.Font("Microsoft YaHei UI", 0, 11));
cbCompileAll.setText("Compile all scripts including sub folders."); cbCompileAll.setText("Compile all scripts in subfolders too.");
cbCompileAll.setFocusable(false); cbCompileAll.setFocusable(false);
cbCompileAll.addChangeListener(new javax.swing.event.ChangeListener() { cbCompileAll.addChangeListener(new javax.swing.event.ChangeListener() {
public void stateChanged(javax.swing.event.ChangeEvent evt) { public void stateChanged(javax.swing.event.ChangeEvent evt) {
@@ -177,7 +172,7 @@ public class Main extends javax.swing.JFrame {
} }
}); });
cbPrettyPrinting.setFont(new java.awt.Font("Microsoft YaHei UI", 0, 11)); // NOI18N cbPrettyPrinting.setFont(new java.awt.Font("Microsoft YaHei UI", 0, 11));
cbPrettyPrinting.setText("Activate pretty printing."); cbPrettyPrinting.setText("Activate pretty printing.");
cbPrettyPrinting.setFocusable(false); cbPrettyPrinting.setFocusable(false);
cbPrettyPrinting.addChangeListener(new javax.swing.event.ChangeListener() { cbPrettyPrinting.addChangeListener(new javax.swing.event.ChangeListener() {
@@ -186,7 +181,7 @@ public class Main extends javax.swing.JFrame {
} }
}); });
btnCompile.setFont(new java.awt.Font("Microsoft JhengHei UI Light", 0, 16)); // NOI18N btnCompile.setFont(new java.awt.Font("Microsoft JhengHei UI Light", 0, 16));
btnCompile.setText("Compile"); btnCompile.setText("Compile");
btnCompile.setToolTipText("Opens a dialog to select output directory"); btnCompile.setToolTipText("Opens a dialog to select output directory");
btnCompile.setFocusable(false); btnCompile.setFocusable(false);
@@ -196,7 +191,7 @@ public class Main extends javax.swing.JFrame {
} }
}); });
lblASLError.setFont(new java.awt.Font("Microsoft YaHei UI", 0, 10)); // NOI18N lblASLError.setFont(new java.awt.Font("Microsoft YaHei UI", 0, 10));
lblASLError.setForeground(java.awt.Color.red); lblASLError.setForeground(java.awt.Color.red);
lblASLError.setText("Some error"); lblASLError.setText("Some error");
lblASLError.addMouseListener(new java.awt.event.MouseAdapter() { lblASLError.addMouseListener(new java.awt.event.MouseAdapter() {
@@ -205,11 +200,11 @@ public class Main extends javax.swing.JFrame {
} }
}); });
lblInputError.setFont(new java.awt.Font("Microsoft YaHei UI", 0, 10)); // NOI18N lblInputError.setFont(new java.awt.Font("Microsoft YaHei UI", 0, 10));
lblInputError.setForeground(java.awt.Color.red); lblInputError.setForeground(java.awt.Color.red);
lblInputError.setText("Some error"); lblInputError.setText("Some error");
lblOutputError.setFont(new java.awt.Font("Microsoft YaHei UI", 0, 10)); // NOI18N lblOutputError.setFont(new java.awt.Font("Microsoft YaHei UI", 0, 10));
lblOutputError.setForeground(java.awt.Color.red); lblOutputError.setForeground(java.awt.Color.red);
lblOutputError.setText("Some error"); lblOutputError.setText("Some error");
lblOutputError.addMouseListener(new java.awt.event.MouseAdapter() { lblOutputError.addMouseListener(new java.awt.event.MouseAdapter() {
@@ -220,135 +215,57 @@ public class Main extends javax.swing.JFrame {
javax.swing.GroupLayout layout = new javax.swing.GroupLayout(getContentPane()); javax.swing.GroupLayout layout = new javax.swing.GroupLayout(getContentPane());
getContentPane().setLayout(layout); getContentPane().setLayout(layout);
layout.setHorizontalGroup( layout.setHorizontalGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING).addComponent(jSeparator).addGroup(layout.createSequentialGroup().addGap(15, 15, 15).addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING).addGroup(layout.createSequentialGroup().addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING).addComponent(lblOutputError, javax.swing.GroupLayout.PREFERRED_SIZE, 371, javax.swing.GroupLayout.PREFERRED_SIZE).addComponent(lblInputError, javax.swing.GroupLayout.PREFERRED_SIZE, 371, javax.swing.GroupLayout.PREFERRED_SIZE).addGroup(layout.createSequentialGroup().addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING, false).addComponent(lblASLError, javax.swing.GroupLayout.Alignment.LEADING, javax.swing.GroupLayout.PREFERRED_SIZE, 371, javax.swing.GroupLayout.PREFERRED_SIZE).addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING).addComponent(lblASL).addComponent(lblASLSmall).addGroup(layout.createSequentialGroup().addComponent(txtASLDir, javax.swing.GroupLayout.PREFERRED_SIZE, 320, javax.swing.GroupLayout.PREFERRED_SIZE).addGap(6, 6, 6).addComponent(btnASL)).addGroup(layout.createSequentialGroup().addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING).addComponent(txtOutputDir, javax.swing.GroupLayout.Alignment.LEADING, javax.swing.GroupLayout.PREFERRED_SIZE, 320, javax.swing.GroupLayout.PREFERRED_SIZE).addComponent(lblOutput, javax.swing.GroupLayout.Alignment.LEADING)).addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED).addComponent(btnOutput)).addComponent(lblOutputSmall).addComponent(lblInput).addGroup(layout.createSequentialGroup().addComponent(txtInputDir, javax.swing.GroupLayout.PREFERRED_SIZE, 320, javax.swing.GroupLayout.PREFERRED_SIZE).addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED).addComponent(btnInput)).addComponent(lblInputSmall).addComponent(cbCompileAll).addComponent(cbPrettyPrinting))).addGap(0, 0, Short.MAX_VALUE))).addGap(24, 24, 24)).addGroup(layout.createSequentialGroup().addComponent(btnCompile, javax.swing.GroupLayout.PREFERRED_SIZE, 373, javax.swing.GroupLayout.PREFERRED_SIZE).addGap(22, 22, 22)))));
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) layout.setVerticalGroup( layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING).addGroup(layout.createSequentialGroup().addGap(6, 6, 6).addComponent(lblASL).addGap(3, 3, 3).addComponent(lblASLSmall).addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED).addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING).addComponent(txtASLDir, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE).addComponent(btnASL, javax.swing.GroupLayout.PREFERRED_SIZE, 28, javax.swing.GroupLayout.PREFERRED_SIZE)).addGap(4, 4, 4).addComponent(lblASLError).addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED).addComponent(jSeparator, javax.swing.GroupLayout.PREFERRED_SIZE, 10, javax.swing.GroupLayout.PREFERRED_SIZE).addGap(3, 3, 3).addComponent(lblInput).addGap(3, 3, 3).addComponent(lblInputSmall, javax.swing.GroupLayout.PREFERRED_SIZE, 14, javax.swing.GroupLayout.PREFERRED_SIZE).addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED).addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING).addComponent(txtInputDir, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE).addComponent(btnInput, javax.swing.GroupLayout.PREFERRED_SIZE, 28, javax.swing.GroupLayout.PREFERRED_SIZE)).addGap(4, 4, 4).addComponent(lblInputError).addGap(6, 6, 6).addComponent(lblOutput).addGap(3, 3, 3).addComponent(lblOutputSmall, javax.swing.GroupLayout.PREFERRED_SIZE, 14, javax.swing.GroupLayout.PREFERRED_SIZE).addGap(6, 6, 6).addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING).addComponent(txtOutputDir, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE).addComponent(btnOutput, javax.swing.GroupLayout.PREFERRED_SIZE, 28, javax.swing.GroupLayout.PREFERRED_SIZE)).addGap(4, 4, 4).addComponent(lblOutputError).addGap(6, 6, 6).addComponent(cbCompileAll).addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED).addComponent(cbPrettyPrinting).addGap(11, 11, 11).addComponent(btnCompile, javax.swing.GroupLayout.PREFERRED_SIZE, 41, javax.swing.GroupLayout.PREFERRED_SIZE).addGap(11, 11, 11)));
.addComponent(jSeparator)
.addGroup(layout.createSequentialGroup()
.addGap(15, 15, 15)
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(layout.createSequentialGroup()
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(lblOutputError, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addComponent(lblInputError, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addComponent(lblASLError, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addGroup(layout.createSequentialGroup()
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(lblASL)
.addComponent(lblASLSmall)
.addGroup(layout.createSequentialGroup()
.addComponent(txtASLDir, javax.swing.GroupLayout.PREFERRED_SIZE, 320, javax.swing.GroupLayout.PREFERRED_SIZE)
.addGap(6, 6, 6)
.addComponent(btnASL))
.addGroup(layout.createSequentialGroup()
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
.addComponent(txtOutputDir, javax.swing.GroupLayout.Alignment.LEADING, javax.swing.GroupLayout.PREFERRED_SIZE, 320, javax.swing.GroupLayout.PREFERRED_SIZE)
.addComponent(lblOutput, javax.swing.GroupLayout.Alignment.LEADING))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(btnOutput))
.addComponent(lblOutputSmall)
.addComponent(lblInput)
.addGroup(layout.createSequentialGroup()
.addComponent(txtInputDir, javax.swing.GroupLayout.PREFERRED_SIZE, 320, javax.swing.GroupLayout.PREFERRED_SIZE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(btnInput))
.addComponent(lblInputSmall)
.addComponent(cbCompileAll)
.addComponent(cbPrettyPrinting))
.addGap(0, 0, Short.MAX_VALUE)))
.addGap(24, 24, 24))
.addGroup(layout.createSequentialGroup()
.addComponent(btnCompile, javax.swing.GroupLayout.PREFERRED_SIZE, 373, javax.swing.GroupLayout.PREFERRED_SIZE)
.addGap(22, 22, 22))))
);
layout.setVerticalGroup(
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(layout.createSequentialGroup()
.addGap(6, 6, 6)
.addComponent(lblASL)
.addGap(3, 3, 3)
.addComponent(lblASLSmall)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(txtASLDir, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addComponent(btnASL, javax.swing.GroupLayout.PREFERRED_SIZE, 28, javax.swing.GroupLayout.PREFERRED_SIZE))
.addGap(4, 4, 4)
.addComponent(lblASLError)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(jSeparator, javax.swing.GroupLayout.PREFERRED_SIZE, 10, javax.swing.GroupLayout.PREFERRED_SIZE)
.addGap(3, 3, 3)
.addComponent(lblInput)
.addGap(3, 3, 3)
.addComponent(lblInputSmall, javax.swing.GroupLayout.PREFERRED_SIZE, 14, javax.swing.GroupLayout.PREFERRED_SIZE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(txtInputDir, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addComponent(btnInput, javax.swing.GroupLayout.PREFERRED_SIZE, 28, javax.swing.GroupLayout.PREFERRED_SIZE))
.addGap(4, 4, 4)
.addComponent(lblInputError)
.addGap(6, 6, 6)
.addComponent(lblOutput)
.addGap(3, 3, 3)
.addComponent(lblOutputSmall, javax.swing.GroupLayout.PREFERRED_SIZE, 14, javax.swing.GroupLayout.PREFERRED_SIZE)
.addGap(6, 6, 6)
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(txtOutputDir, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addComponent(btnOutput, javax.swing.GroupLayout.PREFERRED_SIZE, 28, javax.swing.GroupLayout.PREFERRED_SIZE))
.addGap(4, 4, 4)
.addComponent(lblOutputError)
.addGap(6, 6, 6)
.addComponent(cbCompileAll)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
.addComponent(cbPrettyPrinting)
.addGap(11, 11, 11)
.addComponent(btnCompile, javax.swing.GroupLayout.PREFERRED_SIZE, 41, javax.swing.GroupLayout.PREFERRED_SIZE)
.addGap(11, 11, 11))
);
pack(); pack();
setLocationRelativeTo(null); setLocationRelativeTo(null);
}// </editor-fold>//GEN-END:initComponents }
private void btnInputMouseClicked(java.awt.event.MouseEvent evt) {//GEN-FIRST:event_btnInputMouseClicked private void btnInputMouseClicked(java.awt.event.MouseEvent evt) {
if (SwingUtilities.isLeftMouseButton(evt)) { if (SwingUtilities.isLeftMouseButton(evt)) {
String path = fileChooser("Select input directory", null); String path = fileChooser("Select input directory", 1);
File inputDir = new File(path); File inputDir = new File(path);
if (inputDir.exists()) { if (inputDir.exists()) {
prefs.put("inputDir", path); prefs.put("inputDir", path);
txtInputDir.setText(path); txtInputDir.setText(path);
} }
} if (gaveError) {
}//GEN-LAST:event_btnInputMouseClicked
private void btnOutputMouseClicked(java.awt.event.MouseEvent evt) {//GEN-FIRST:event_btnOutputMouseClicked }
}
}
private void btnOutputMouseClicked(java.awt.event.MouseEvent evt) {
if (SwingUtilities.isLeftMouseButton(evt)) { if (SwingUtilities.isLeftMouseButton(evt)) {
String path = fileChooser("Select output directory", null); String path = fileChooser("Select output directory", 1);
File outputDir = new File(path); File outputDir = new File(path);
if (outputDir.exists() && outputDir.isDirectory()) { if (outputDir.exists()) {
prefs.put("outputDir", path); prefs.put("outputDir", path);
txtOutputDir.setText(path); txtOutputDir.setText(path);
} else if (!outputDir.exists()) { if (outputDirFix) {
lblOutputError.setText("Output folder doesn't exsist! Click this message to create it."); lblOutputError.setText(" ");
outputDirFix = true; }
}
} }
} }
}//GEN-LAST:event_btnOutputMouseClicked
private void btnASLMouseClicked(java.awt.event.MouseEvent evt) {//GEN-FIRST:event_btnASLMouseClicked private void btnASLMouseClicked(java.awt.event.MouseEvent evt) {
if (SwingUtilities.isLeftMouseButton(evt)) { if (SwingUtilities.isLeftMouseButton(evt)) {
String path = fileChooser("Select 'asl.exe' location", new FileNameExtensionFilter("Executable", "exe")); String path = fileChooser("Select 'asl.exe' location", 0);
File asl = new File(path); File asl = new File(path);
if (asl.exists()) { if (asl.exists()) {
prefs.put("aslDir", path); prefs.put("aslDir", path);
txtASLDir.setText(path); txtASLDir.setText(path);
} }
} }
}//GEN-LAST:event_btnASLMouseClicked }
private void btnCompileMouseClicked(java.awt.event.MouseEvent evt) {//GEN-FIRST:event_btnCompileMouseClicked private void btnCompileMouseClicked(java.awt.event.MouseEvent evt) {
if (SwingUtilities.isLeftMouseButton(evt)) { if (SwingUtilities.isLeftMouseButton(evt)) {
String sumthin = new File(txtASLDir.getText()).getParent() + "\\asl.exe"; if (!new File(txtASLDir.getText()).exists()) {
if (!new File(sumthin).exists()) {
lblASLError.setText("asl.exe isn't in this location! You can click this message to download it."); lblASLError.setText("asl.exe isn't in this location! You can click this message to download it.");
return;
} }
JTextField[] dirFields = {txtASLDir, txtInputDir, txtOutputDir}; JTextField[] dirFields = {txtASLDir, txtInputDir, txtOutputDir};
for (byte i = 0; i < 3; i++) { for (byte i = 0; i < 3; i++) {
@@ -369,8 +286,7 @@ public class Main extends javax.swing.JFrame {
break; break;
} }
return; return;
} } else if (gaveError) {
if (bleh.exists() && gaveError) {
switch (i) { switch (i) {
case 0: case 0:
lblASLError.setText(" "); lblASLError.setText(" ");
@@ -380,7 +296,7 @@ public class Main extends javax.swing.JFrame {
break; break;
case 2: case 2:
lblOutputError.setText(" "); lblOutputError.setText(" ");
outputDirFix = true; outputDirFix = false;
break; break;
} }
} }
@@ -388,22 +304,16 @@ public class Main extends javax.swing.JFrame {
if (gaveError) { if (gaveError) {
return; return;
} }
String compileAll = "", prettyPrinting = ""; //Rapid String declarations
if (cbCompileAll.isSelected()) { String prettyPrinting = cbPrettyPrinting.isSelected() ? "-pretty" : "",
compileAll = "-r"; compileAll = cbCompileAll.isSelected() ? "-r" : "",
} asl = txtASLDir.getText(),
if (cbPrettyPrinting.isSelected()) { input = txtInputDir.getText(),
prettyPrinting = "-pretty"; output = txtOutputDir.getText(),
} aslError = " ";
String asl = txtASLDir.getText();
String input = txtInputDir.getText();
String output = txtOutputDir.getText();
String aslError = " ";
try { try {
Process aslProcess = new ProcessBuilder(asl, compileAll, prettyPrinting, input, output).start(); Process aslProcess = new ProcessBuilder(asl, compileAll, prettyPrinting, input, output).start();
InputStream is = aslProcess.getInputStream(); BufferedReader br = new BufferedReader(new InputStreamReader(aslProcess.getInputStream()));
InputStreamReader isr = new InputStreamReader(is);
BufferedReader br = new BufferedReader(isr);
String line; String line;
while ((line = br.readLine()) != null) { while ((line = br.readLine()) != null) {
if (line.contains("Error")) { if (line.contains("Error")) {
@@ -411,36 +321,38 @@ public class Main extends javax.swing.JFrame {
} }
} }
aslProcess.waitFor(); aslProcess.waitFor();
/*
Heavily obsolete alternative:
Runtime.getRuntime().exec("cmd /c start \"" + asl + "\" " + compileAll + prettyPrinting + "\"" + input + "\" \"" + output + "\"");
*/
} catch (IOException | InterruptedException ex) {
Logger.getLogger(Main.class.getName()).log(Level.SEVERE, null, ex);
}
if (!aslError.equals(" ")) { if (!aslError.equals(" ")) {
DlgError error = new DlgError(this, true, aslError); DlgError error = new DlgError(this, true, aslError);
error.setLocationRelativeTo(this); error.setLocationRelativeTo(this);
error.setVisible(true); error.setVisible(true);
} }
//Runtime.getRuntime().exec("cmd /c start \"" + asl + "\" " + compileAll + prettyPrinting + "\"" + input + "\" \"" + output + "\"");
//TODO: Start app in command line with parameters
} catch (IOException | InterruptedException ex) {
Logger.getLogger(Main.class.getName()).log(Level.SEVERE, null, ex);
} }
} }
}//GEN-LAST:event_btnCompileMouseClicked
private void cbCompileAllStateChanged(javax.swing.event.ChangeEvent evt) {//GEN-FIRST:event_cbCompileAllStateChanged private void cbCompileAllStateChanged(javax.swing.event.ChangeEvent evt) {
prefs.putBoolean("compileAll", cbCompileAll.isSelected()); prefs.putBoolean("compileAll", cbCompileAll.isSelected());
}//GEN-LAST:event_cbCompileAllStateChanged }
private void cbPrettyPrintingStateChanged(javax.swing.event.ChangeEvent evt) {//GEN-FIRST:event_cbPrettyPrintingStateChanged private void cbPrettyPrintingStateChanged(javax.swing.event.ChangeEvent evt) {
prefs.putBoolean("prettyPrinting", cbPrettyPrinting.isSelected()); prefs.putBoolean("prettyPrinting", cbPrettyPrinting.isSelected());
}//GEN-LAST:event_cbPrettyPrintingStateChanged }
private void lblOutputErrorMouseClicked(java.awt.event.MouseEvent evt) {//GEN-FIRST:event_lblOutputErrorMouseClicked private void lblOutputErrorMouseClicked(java.awt.event.MouseEvent evt) {
if (SwingUtilities.isLeftMouseButton(evt) && outputDirFix) { if (SwingUtilities.isLeftMouseButton(evt) && outputDirFix) {
new File(txtOutputDir.getText()).mkdirs(); new File(txtOutputDir.getText()).mkdirs();
outputDirFix = false; outputDirFix = false;
lblOutputError.setText(" "); lblOutputError.setText(" ");
} }
}//GEN-LAST:event_lblOutputErrorMouseClicked }
private void lblASLErrorMouseClicked(java.awt.event.MouseEvent evt) {//GEN-FIRST:event_lblASLErrorMouseClicked private void lblASLErrorMouseClicked(java.awt.event.MouseEvent evt) {
if (SwingUtilities.isLeftMouseButton(evt) && aslFix) { if (SwingUtilities.isLeftMouseButton(evt) && aslFix) {
try { try {
URI github = new URI("https://github.com/DeKugelschieber/asl/releases"); URI github = new URI("https://github.com/DeKugelschieber/asl/releases");
@@ -451,7 +363,7 @@ public class Main extends javax.swing.JFrame {
aslFix = false; aslFix = false;
lblASLError.setText(" "); lblASLError.setText(" ");
} }
}//GEN-LAST:event_lblASLErrorMouseClicked }
public static void main(String args[]) { public static void main(String args[]) {
try { try {
@@ -470,7 +382,7 @@ public class Main extends javax.swing.JFrame {
}); });
} }
// Variables declaration - do not modify//GEN-BEGIN:variables // Variables declaration - do not modify
private javax.swing.JButton btnASL; private javax.swing.JButton btnASL;
private javax.swing.JButton btnCompile; private javax.swing.JButton btnCompile;
private javax.swing.JButton btnInput; private javax.swing.JButton btnInput;
@@ -490,5 +402,5 @@ public class Main extends javax.swing.JFrame {
private javax.swing.JTextField txtASLDir; private javax.swing.JTextField txtASLDir;
private javax.swing.JTextField txtInputDir; private javax.swing.JTextField txtInputDir;
private javax.swing.JTextField txtOutputDir; private javax.swing.JTextField txtOutputDir;
// End of variables declaration//GEN-END:variables // End of variables declaration
} }