WIP 1.9.13

Author: Philipp

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

@@ -104,6 +104,16 @@ public boolean repeated() {
     	return repeated;
     }
 
+    /**True, if the argument is a integer and not a float*/
+    public boolean isInteger(String argument) {
+    	return ProcessUtils.testForWholeNumber(argument);
+    }
+    
+    /**True, if the argument is a float or integer*/
+    public boolean isFloat(String argument) {
+    	return ProcessUtils.testForFloat(argument);
+    }
+    
     public static String prepare(String arguments) {
     	StringBuilder prepArgs = new StringBuilder();
     	for(int i = 0; i < arguments.length(); i++) {

src/com/devkev/gui/Console.java

@@ -98,7 +98,7 @@ public void actionPerformed(ActionEvent e) {
 		contentPane.add(rerun);
 
 		consolePane = new JScrollPane();
-		consolePane.setBounds(5, 35, 474, 159);
+		consolePane.setBounds(0, 35, 484, 165);
 		contentPane.add(consolePane);
 
 		consoleText = new JTextArea();
@@ -152,7 +152,7 @@ public void windowActivated(WindowEvent arg0) {}
 		addComponentListener(new ComponentListener() {
 			@Override
 			public void componentResized(ComponentEvent e) {
-				consolePane.setSize(getRootPane().getWidth() - 10, getRootPane().getHeight()-parent.bar.getHeight() - 20);
+				consolePane.setSize(getRootPane().getWidth(), getRootPane().getHeight()-parent.bar.getHeight() - 10);
 				terminate.setLocation(getRootPane().getWidth() - 28, 5);
 				rerun.setLocation(getRootPane().getWidth() - 58, 5);
 				consolePane.updateUI();

src/com/devkev/gui/Window.java

@@ -17,8 +17,6 @@
 import java.awt.event.ComponentListener;
 import java.awt.event.KeyEvent;
 import java.awt.event.KeyListener;
-import java.awt.event.WindowEvent;
-import java.awt.event.WindowListener;
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
 import java.io.File;
@@ -158,21 +156,37 @@ public void scriptExit(Process process, int exitCode, String errorMessage) {}
 			@Override
 			public Command[] createLib() {
 				return new Command[] {
-					new Command("clearConsole", "", "Clears the console") {
+					new Command("clearConsole", "", "Deprecated since 1.9.13 and removed in future releases. Please use 'gui.clear'") {
 						@Override
 						public Object execute(Object[] args, Process application, Block block) throws Exception {
 							console.consoleText.setText("");
 							return null;
 						}
 					},
+					
+					new Command("gui.clear", "", "Clears the console") {
+						@Override
+						public Object execute(Object[] args, Process application, Block block) throws Exception {
+							console.consoleText.setText("");
+							return null;
+						}
+					},
+					
+					new Command("gui.size", "string string", "Sets the console window size in pixels") {
+						@Override
+						public Object execute(Object[] args, Process application, Block block) throws Exception {
+							if(isInteger(args[0].toString()) && isInteger(args[1].toString())) {
+								console.setSize(Integer.valueOf(args[0].toString()), Integer.valueOf(args[1].toString()));
+							} else application.kill(block, "Argument 1 and 2 need to be positive integers");
+							return null;
+						}
+					}
 				};
 			}
 		});
 		p.setApplicationListener(new ApplicationListener() {
 			public void done(int exitCode) {
 				console.consoleStatus.setText("Finished with Exit Code " + exitCode);
-				//window.setEnabled(true);
-				//console.setEnabled(false);
 			}
 		});
 
@@ -326,7 +340,7 @@ public void actionPerformed(ActionEvent e) {
 				console.consoleText.setText("");
 				console.toFront();
 				console.setVisible(true);
-				p.execute("help", false);
+				p.execute("gui.size 1000 400;help", false);
 			}});
 		m4.add(commandCC);
 		m4.addSeparator();