WIP 1.9.13

Author: DevKevYT

changelog.txt

@@ -1,10 +1,5 @@
 /// Change log of the DevScript jar file ///
 
-NOTICE:
-	the boolean "useCache" (constructor) is still useless, the command cache will be added in future updates to make the script even faster.
-	Another future plan: Command: "include <abs|rel> <pathToFile>" a command to include external compiled libraries "plug in style".
-	Added in 1.8.0 with the command: import "path_to_jar";
-
 1.9.13:
 	- The "import" command got very few love the last updates:
 		- The class of the imported .jar file only has to extend the "Library" class and does not need to be named "CustomLibrary"
@@ -17,8 +12,9 @@ NOTICE:
 		- gui.clear
 		- gui.setSize [sizeX] [sizeY]
 		- gui.fullscreen [true/false]
-		(The command "clearConsole" is still available but will be removed in future releases by the "window.clear" command)
-
+		(The command "clearConsole" is still available but will be removed in future releases by the "gui.clear" command)
+	- Started to make some plans to implement a simple graphics library to control java awt elements.
+	
 1.9.12:
 	- DevScript can now property handle the null variable $null. (="undefined")
 	- Added an explanation for the "wait" command

src/com/devkev/devscript/raw/Process.java

@@ -650,7 +650,6 @@ public synchronized void kill(Block block, String errorMessage) {
 
 		if(block == null) {
 			error("A java error happened outside of the devscript environment: " + errorMessage);
-			kill(main, "Unknown Java Exception");
 			return;
 		} else {
 			//Check block and parent blocks. Also, maybe create a stacktrace?

src/com/devkev/gui/Console.java

@@ -16,6 +16,9 @@
 import java.awt.event.ActionEvent;
 import javax.swing.JTextArea;
 import javax.swing.ImageIcon;
+import javax.swing.border.LineBorder;
+import java.awt.Color;
+import javax.swing.JLabel;
 
 public class Console extends JFrame {
 
@@ -24,46 +27,86 @@ public class Console extends JFrame {
 	private com.devkev.devscript.raw.Process p;
 	private Window parent;
 
+	JTextArea consoleText;
+	JScrollPane consolePane;
+	JLabel consoleStatus;
+	
 	volatile boolean waitForEnter = false;
 	volatile int inputStart = 0;
 
 	public Console(com.devkev.devscript.raw.Process p, Window parent) {
+		setTitle("DevScript Console");
 		this.p = p;
 		this.parent = parent;
 		init();
 	}
 
 	private void init() {
 		setFont(new Font("Consolas", Font.PLAIN, 12));
-		setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
 		setBounds(100, 100, 500, 239);
+		setFocusableWindowState(true);
+		setEnabled(true);
 
 		contentPane = new JPanel();
 		contentPane.setBorder(new EmptyBorder(5, 5, 5, 5));
-
+		
 		setContentPane(contentPane);
 		contentPane.setLayout(null);
 
 		JButton terminate = new JButton("");
-		terminate.setIcon(new ImageIcon("C:\\Users\\Philipp\\Desktop\\terminate-active.png"));
+		terminate.setToolTipText("Terminate");
+		terminate.setBorder(new LineBorder(new Color(0, 0, 0)));
+		terminate.setIcon(new ImageIcon(Console.class.getResource("/icon/terminate-active.png")));
 		terminate.addActionListener(new ActionListener() {
 			public void actionPerformed(ActionEvent arg0) {
 			}
 		});
-		terminate.setBounds(451, 166, 23, 23);
+		terminate.setBounds(456, 5, 23, 23);
+		terminate.addActionListener(new ActionListener() {
+			@Override
+			public void actionPerformed(ActionEvent e) {
+				if(parent.p.isRunning()) {
+					parent.p.kill(parent.p.getMain(), "Terminated by DevScript Console");
+					consolePane.getVerticalScrollBar().setValue(consolePane.getVerticalScrollBar().getMaximum());
+				}
+			}
+		});
+		
 		contentPane.add(terminate);
 
 		JButton rerun = new JButton("");
-		rerun.setIcon(new ImageIcon("C:\\Users\\Philipp\\Desktop\\rerun-active.png"));
-		rerun.setBounds(418, 166, 23, 23);
+		rerun.setToolTipText("Rerun Script");
+		rerun.setBorder(new LineBorder(new Color(0, 0, 0)));
+		rerun.setIcon(new ImageIcon(Console.class.getResource("/icon/rerun-active.png")));
+		rerun.setBounds(429, 5, 23, 23);
+		rerun.addActionListener(new ActionListener() {
+			@Override
+			public void actionPerformed(ActionEvent e) {
+				if(p.isRunning()) return;
+				
+				consoleText.setText("");
+				toFront();
+				setEnabled(true);
+				consoleStatus.setText("Running ...");
+				setVisible(true);	
+				//window.setEnabled(false);
+				
+				p.execute(parent.textArea.getText(), true);
+				p.setVariable("keyCode", "", false, true);
+			}
+		});
 		contentPane.add(rerun);
 
-		JScrollPane scrollPane = new JScrollPane();
-		scrollPane.setBounds(10, 11, 464, 144);
-		contentPane.add(scrollPane);
+		consolePane = new JScrollPane();
+		consolePane.setBounds(5, 35, 474, 159);
+		contentPane.add(consolePane);
+		
+		consoleText = new JTextArea();
+		consolePane.setViewportView(consoleText);
 
-		JTextArea console = new JTextArea();
-		scrollPane.setViewportView(console);
+		consoleStatus = new JLabel("");
+		consoleStatus.setBounds(5, 5, 414, 23);
+		contentPane.add(consoleStatus);
 
 		addKeyListener(new KeyListener() {
 
@@ -101,16 +144,18 @@ public void windowClosing(WindowEvent arg0) {
 				parent.window.setEnabled(true);
 				inputStart = 0;
 				parent.input.flush(null);
-				console.setText("");
+				consoleText.setText("");
 			}
 			public void windowActivated(WindowEvent arg0) {}
 		});
 
 		addComponentListener(new ComponentListener() {
 			@Override
 			public void componentResized(ComponentEvent e) {
-				console.setSize(parent.window.getRootPane().getWidth() - 10, parent.window.getRootPane().getHeight()-parent.bar.getHeight() - 10);
-				console.updateUI();
+				consolePane.setSize(getRootPane().getWidth() - 10, getRootPane().getHeight()-parent.bar.getHeight() - 20);
+				terminate.setLocation(getRootPane().getWidth() - 28, 5);
+				rerun.setLocation(getRootPane().getWidth() - 58, 5);
+				consolePane.updateUI();
 			}
 			public void componentShown(ComponentEvent e) {}
 			public void componentMoved(ComponentEvent e) {}