- ScriptEngine update

- GUI update
- Bug fixes

ZeroLuck

git-svn-id: http://svn.code.sf.net/p/jblocks/code-0/trunk@119 9daefd43-015a-43da-9b33-cb4dc19dcf47

Author: McMurat

org/jblocks/JBlocks.java

@@ -4,8 +4,6 @@
 import java.awt.Component;
 import java.awt.Container;
 import java.awt.Dimension;
-import java.awt.Image;
-import java.awt.Toolkit;
 import java.awt.image.BufferedImage;
 import java.io.IOException;
 import java.io.InputStream;
@@ -37,6 +35,7 @@
 import org.jblocks.scriptengine.IScriptEngine.ScriptEngineListener;
 import org.jblocks.scriptengine.IScriptThread;
 import org.jblocks.scriptengine.NativeBlock;
+import org.jblocks.scriptengine.Parameters;
 import org.jblocks.stage.ImageSprite;
 import org.jblocks.stage.SpriteData;
 
@@ -58,6 +57,7 @@
 public final class JBlocks {
 
     private static final int GREEN_FLAG_PRESSED_ID = 200 + 1;
+    private static final int CHANGE_VARIABLE_BY_ID = 200 + 2;
     private final JBlocksPane gui;
     private final JDragPane drag;
     private final Map<Long, BlockModel> blockLib;
@@ -192,6 +192,25 @@ public Object evaluate(Object ctx, Object... param) {
         installBlock(BlockModel.createModel("boolean", "Operators", "not%{b}",
                 scriptEngine.getDefaultBlock(Default.NOT)));
         installBlock(BlockModel.createModel("reporter", "Operators", "script%{s}", scriptEngine.getDefaultBlock(Default.THE_SCRIPT)));
+
+        installBlock(BlockModel.createModel("command", "Variables", "change %{v} by %{t}", new NativeBlock(2, CHANGE_VARIABLE_BY_ID) {
+
+            @Override
+            public Object evaluate(Object ctx, Object... param) {
+                Map vars = Parameters.getVariablesForContext(ctx);
+                Object val = vars.get(param[0]);
+                Object add = param[1];
+                
+                if (val != null && add != null) {
+                    if (val instanceof Integer && add instanceof Integer) {
+                        vars.put(param[0], (Integer) val + (Integer) add);
+                    } else {
+                        vars.put(param[0], Parameters.asDouble(val) + Parameters.asDouble(add));
+                    }
+                }
+                return null;
+            }
+        }));
     }
 
     /**

org/jblocks/JBlocksLauncher.java

@@ -18,7 +18,7 @@
  */
 public class JBlocksLauncher implements Runnable {
 
-    private static final String VERSION = "0.5.105";
+    private static final String VERSION = "0.5.118";
 
     /**
      * This is the standalone main method
@@ -36,7 +36,6 @@ public void run() {
         splash.setTitle("JBlocks is loading...");
         splash.setAlwaysOnTop(true);
         splash.setText("JBlocks " + VERSION + " is starting...");
-        splash.setVisible(true);
 
         JBlocksPane.setLaF();
 

org/jblocks/editor/AbstrBlock.java

@@ -423,7 +423,7 @@ public boolean isDraggable() {
      */
     public void tryToExecute() {
         JBlocks context = JBlocks.getContextForComponent(this);
-        if (context != null) {
+        if (context != null && model != null && model.getCode() != null) {
             try {
                 IScriptEngine eng = context.getScriptEngine();
                 if (!(this instanceof Puzzle)) {

org/jblocks/editor/JPopupBlockMenu.java

@@ -35,6 +35,7 @@
 import org.jblocks.gui.JDragPane;
 import org.jblocks.scriptengine.Block;
 import org.jblocks.scriptengine.ByobBlock;
+import org.jblocks.scriptengine.CodeIO;
 import org.jblocks.scriptengine.NativeBlock;
 import org.jblocks.scriptengine.StorableNativeBlock;
 import org.jblocks.scriptengine.js.impl.JsBeautifier;
@@ -100,6 +101,7 @@ public JPopupBlockMenu(AbstrBlock b) {
             if (code instanceof ByobBlock || code instanceof StorableNativeBlock) {
                 this.addSeparator();
                 this.add("edit").addActionListener(this);
+                this.add("save block").addActionListener(this);
             }
         }
     }
@@ -304,8 +306,8 @@ public void actionPerformed(ActionEvent ae) {
 
     private void saveScript() {
         final JBlocks ctx = JBlocks.getContextForComponent(parent);
-        final JFileChooser ch = showFileChooser("Save script");
-        ch.setFileFilter(SwingUtils.createFilter(new String[]{"jbs"}, "JBlocks script files (JBS)"));
+        final JFileChooser ch = showFileChooser("Save script...");
+        ch.setFileFilter(SwingUtils.createFilter(new String[]{"jbs"}, "JBlocks script files (.jbs)"));
         ch.addActionListener(new ActionListener() {
 
             @Override
@@ -327,14 +329,39 @@ public void actionPerformed(ActionEvent ae) {
             }
         });
     }
-    
+
+    private void saveBlock() {
+        final JBlocks ctx = JBlocks.getContextForComponent(parent);
+        final JFileChooser ch = showFileChooser("Save block...");
+        ch.setFileFilter(SwingUtils.createFilter(new String[]{"jbb"}, "JBlocks block files (.jbb)"));
+        ch.addActionListener(new ActionListener() {
+
+            @Override
+            public void actionPerformed(ActionEvent ae) {
+                if (SwingUtils.isApproveSelection(ae)) {
+                    File f = ch.getSelectedFile();
+                    if (f != null) {
+                        try {
+                            CodeIO.writeBlock(ctx, new FileOutputStream(
+                                    StreamUtils.addFileExtension(f.getAbsolutePath(), "jbb")),
+                                    parent.getModel());
+                        } catch (Exception io) {
+                            JOptionPane.showInternalMessageDialog(ctx.getDesktop(),
+                                    "Error: Can't save the block!\n" + io, "Error",
+                                    JOptionPane.ERROR_MESSAGE);
+                        }
+                    }
+                }
+            }
+        });
+    }
+
     private void editBlock() {
         BlockModel model = parent.getModel();
         Block code = model.getCode();
         JDesktopPane desktop = JBlocks.getContextForComponent(parent).getDesktop();
-        
+
         if (code instanceof ByobBlock) {
-            
         } else if (code instanceof StorableNativeBlock) {
             StorableNativeBlock st = (StorableNativeBlock) code;
             JCyobEditor edt = JCyobEditor.createEditEditor(model.getSyntax(), st);
@@ -363,6 +390,8 @@ public void actionPerformed(ActionEvent evt) {
             viewJavaScript();
         } else if (command.equals("edit")) {
             editBlock();
+        } else if (command.equals("save block")) {
+            saveBlock();
         }
     }
 }