From 8477b443b0c1ee834527d9788cceb4e3dc3b4862 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ozan=20E=C4=9Fitmen?= Date: Sun, 22 Nov 2015 00:17:13 +0200 Subject: [PATCH 1/3] Update README.md --- gui/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gui/README.md b/gui/README.md index c3ad0f7..f44b2ba 100644 --- a/gui/README.md +++ b/gui/README.md @@ -1,4 +1,4 @@ -ASL GUI version +ASL GUI 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. From 1c67be7d2e204342afad82096f0e0ab2d5ccbff6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ozan=20E=C4=9Fitmen?= Date: Mon, 23 Nov 2015 16:19:11 +0200 Subject: [PATCH 2/3] Release Version --- gui/ASL GUI.exe | Bin 46366 -> 45890 bytes gui/README.md | 8 ++- gui/src/asl/gui/DlgError.java | 5 +- gui/src/asl/gui/Main.java | 112 ++++++++++++---------------------- 4 files changed, 47 insertions(+), 78 deletions(-) diff --git a/gui/ASL GUI.exe b/gui/ASL GUI.exe index 5a72cddde0ad46f1d0e3961ca5bba265b8d51bae..2e26d2ecd1469bfd4c6403c9e08badd86ba74f12 100644 GIT binary patch delta 12412 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 pYvy132+M;rcWA{{Zi3vnK!m delta 12888 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 c`QJ(Y_fK*#F!X +ASL GUI 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. Maintained by yours truly: [654wak654](https://github.com/654wak654/) -**Version 0.3.0:** +**Version 1.0.0.0** + +More style changes and bug fixes, marked ready for release. + +**Version 0.3.0.0:** Fixed some possible bugs, did some style fixes and other code adjustments. It's now is readable without getting cataracts. Mostly anyway... diff --git a/gui/src/asl/gui/DlgError.java b/gui/src/asl/gui/DlgError.java index 906b7a0..f0a6c22 100644 --- a/gui/src/asl/gui/DlgError.java +++ b/gui/src/asl/gui/DlgError.java @@ -25,6 +25,8 @@ package asl.gui; public class DlgError extends javax.swing.JDialog { + boolean isAbort = true; + public DlgError(java.awt.Frame parent, boolean modal, String errorMessage) { super(parent, modal); initComponents(); @@ -32,6 +34,7 @@ public class DlgError extends javax.swing.JDialog { } private void initComponents() { + lblError = new javax.swing.JLabel(); lblTitle = new javax.swing.JLabel(); @@ -59,8 +62,6 @@ public class DlgError extends javax.swing.JDialog { pack(); } - // Variables declaration - do not modify private javax.swing.JLabel lblError; private javax.swing.JLabel lblTitle; - // End of variables declaration } \ No newline at end of file diff --git a/gui/src/asl/gui/Main.java b/gui/src/asl/gui/Main.java index 36356d6..2fcb42a 100644 --- a/gui/src/asl/gui/Main.java +++ b/gui/src/asl/gui/Main.java @@ -46,7 +46,7 @@ import javax.swing.plaf.ColorUIResource; public class Main extends javax.swing.JFrame { Preferences prefs = Preferences.userRoot().node(this.getClass().getName()); - boolean aslFix, outputDirFix, gaveError = false; + boolean inputError = false, outputError = false, aslError = false; public Main() { initComponents(); @@ -70,14 +70,26 @@ public class Main extends javax.swing.JFrame { chooser.setFileSelectionMode(fileType); chooser.setDialogTitle(title); String selectedPath = ""; - if (chooser.showOpenDialog(null) == 0) { + if (chooser.showOpenDialog(null) == 0) selectedPath = chooser.getSelectedFile().toString(); - } else { + else chooser.cancelSelection(); - } return selectedPath; } + private void setErrorCondition(int i, boolean j) { + if (i == 0) { + lblASLError.setText(j ? "asl.exe isn't in this location! You can click this message to download it." : " "); + aslError = j; + } else if (i == 1) { + lblInputError.setText(j ? "This folder doesn't exist!" : " "); + inputError = j; + } else { + lblOutputError.setText(j ? "Output folder doesn't exsist! Click this message to create it." : " "); + outputError = j; + } + } + private void initComponents() { lblInput = new javax.swing.JLabel(); @@ -160,7 +172,7 @@ public class Main extends javax.swing.JFrame { lblInputSmall.setOpaque(true); 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); cbCompileAll.setFont(new java.awt.Font("Microsoft YaHei UI", 0, 11)); @@ -215,8 +227,8 @@ public class Main extends javax.swing.JFrame { javax.swing.GroupLayout layout = new javax.swing.GroupLayout(getContentPane()); getContentPane().setLayout(layout); - 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.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))); + 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).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.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))).addComponent(btnCompile, javax.swing.GroupLayout.PREFERRED_SIZE, 373, javax.swing.GroupLayout.PREFERRED_SIZE)).addGap(20, 20, 20))); + 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(); setLocationRelativeTo(null); @@ -229,9 +241,8 @@ public class Main extends javax.swing.JFrame { if (inputDir.exists()) { prefs.put("inputDir", path); txtInputDir.setText(path); - } - if (gaveError) { - + if (inputError) + setErrorCondition(1, false); } } } @@ -243,9 +254,8 @@ public class Main extends javax.swing.JFrame { if (outputDir.exists()) { prefs.put("outputDir", path); txtOutputDir.setText(path); - if (outputDirFix) { - lblOutputError.setText(" "); - } + if (outputError) + setErrorCondition(2, false); } } } @@ -257,81 +267,39 @@ public class Main extends javax.swing.JFrame { if (asl.exists()) { prefs.put("aslDir", path); txtASLDir.setText(path); + if (aslError) + setErrorCondition(0, false); } } } private void btnCompileMouseClicked(java.awt.event.MouseEvent evt) { if (SwingUtilities.isLeftMouseButton(evt)) { - if (!new File(txtASLDir.getText()).exists()) { - lblASLError.setText("asl.exe isn't in this location! You can click this message to download it."); - return; - } JTextField[] dirFields = {txtASLDir, txtInputDir, txtOutputDir}; for (byte i = 0; i < 3; i++) { File bleh = new File(dirFields[i].getText()); - if (!bleh.exists()) { - gaveError = true; - switch (i) { - case 0: - lblASLError.setText("asl.exe isn't in this location! You can click this message to download it."); - aslFix = true; - break; - case 1: - lblInputError.setText("This folder doesn't exist!"); - break; - case 2: - lblOutputError.setText("Output folder doesn't exsist! Click this message to create it."); - outputDirFix = true; - break; - } - return; - } else if (gaveError) { - switch (i) { - case 0: - lblASLError.setText(" "); - break; - case 1: - lblInputError.setText(" "); - break; - case 2: - lblOutputError.setText(" "); - outputDirFix = false; - break; - } - } + setErrorCondition(i, !bleh.exists()); } - if (gaveError) { + if (aslError || inputError || outputError) return; - } - //Rapid String declarations - String prettyPrinting = cbPrettyPrinting.isSelected() ? "-pretty" : "", - compileAll = cbCompileAll.isSelected() ? "-r" : "", - asl = txtASLDir.getText(), - input = txtInputDir.getText(), - output = txtOutputDir.getText(), - aslError = " "; + String prettyPrinting = cbPrettyPrinting.isSelected() ? "-pretty" : "", compileAll = cbCompileAll.isSelected() ? "-r" : "", asl = txtASLDir.getText(), input = txtInputDir.getText(), output = txtOutputDir.getText(), error = " "; try { Process aslProcess = new ProcessBuilder(asl, compileAll, prettyPrinting, input, output).start(); BufferedReader br = new BufferedReader(new InputStreamReader(aslProcess.getInputStream())); String line; while ((line = br.readLine()) != null) { - if (line.contains("Error")) { - aslError = line; + if (line.toLowerCase().contains("error")) { + error = line; } } 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(" ")) { - DlgError error = new DlgError(this, true, aslError); - error.setLocationRelativeTo(this); - error.setVisible(true); + if (!error.equals(" ")) { + DlgError showError = new DlgError(this, true, error); + showError.setLocationRelativeTo(this); + showError.setVisible(true); } } } @@ -345,23 +313,21 @@ public class Main extends javax.swing.JFrame { } private void lblOutputErrorMouseClicked(java.awt.event.MouseEvent evt) { - if (SwingUtilities.isLeftMouseButton(evt) && outputDirFix) { + if (SwingUtilities.isLeftMouseButton(evt) && outputError) { new File(txtOutputDir.getText()).mkdirs(); - outputDirFix = false; - lblOutputError.setText(" "); + setErrorCondition(2, false); } } private void lblASLErrorMouseClicked(java.awt.event.MouseEvent evt) { - if (SwingUtilities.isLeftMouseButton(evt) && aslFix) { + if (SwingUtilities.isLeftMouseButton(evt) && aslError) { try { URI github = new URI("https://github.com/DeKugelschieber/asl/releases"); java.awt.Desktop.getDesktop().browse(github); } catch (URISyntaxException | IOException ex) { Logger.getLogger(Main.class.getName()).log(Level.SEVERE, null, ex); } - aslFix = false; - lblASLError.setText(" "); + setErrorCondition(0, false); } } @@ -382,7 +348,6 @@ public class Main extends javax.swing.JFrame { }); } - // Variables declaration - do not modify private javax.swing.JButton btnASL; private javax.swing.JButton btnCompile; private javax.swing.JButton btnInput; @@ -402,5 +367,4 @@ public class Main extends javax.swing.JFrame { private javax.swing.JTextField txtASLDir; private javax.swing.JTextField txtInputDir; private javax.swing.JTextField txtOutputDir; - // End of variables declaration } \ No newline at end of file From df79809cdde25065504c571cc50d1eeed4880222 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ozan=20E=C4=9Fitmen?= Date: Mon, 23 Nov 2015 17:09:08 +0200 Subject: [PATCH 3/3] Changed error keyword from `error` to `panic` --- gui/src/asl/gui/Main.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gui/src/asl/gui/Main.java b/gui/src/asl/gui/Main.java index 2fcb42a..abefe59 100644 --- a/gui/src/asl/gui/Main.java +++ b/gui/src/asl/gui/Main.java @@ -288,7 +288,7 @@ public class Main extends javax.swing.JFrame { BufferedReader br = new BufferedReader(new InputStreamReader(aslProcess.getInputStream())); String line; while ((line = br.readLine()) != null) { - if (line.toLowerCase().contains("error")) { + if (line.toLowerCase().contains("panic")) { error = line; } } @@ -367,4 +367,4 @@ public class Main extends javax.swing.JFrame { private javax.swing.JTextField txtASLDir; private javax.swing.JTextField txtInputDir; private javax.swing.JTextField txtOutputDir; -} \ No newline at end of file +}