deleted %NBStudio.Routine.cls

some fixes

Author: daimor

NBStudio.xml

@@ -16,7 +16,7 @@
 public class CacheFile {
 
     static String name;
-    static Database db;
+    public static Database db;
 
     public CacheFile(Database db, String name) {
         this.name = name;

NBStudioCore/src/org/nbstudio/core/CacheFile.java

@@ -8,15 +8,18 @@
 import com.intersys.objects.CacheDatabase;
 import com.intersys.objects.CacheException;
 import com.intersys.objects.Database;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.PrintStream;
 import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.List;
+import org.openide.windows.IOProvider;
+import org.openide.windows.OutputWriter;
 
 /**
  *
  * @author daimor
  */
-public class Connection implements Serializable {
+public final class Connection implements Serializable {
 
     private static final long serialVersionUID = 1L;
     public String name;
@@ -33,6 +36,8 @@ public Connection(String name, String address, int port, String namespace) {
         }
         this.port = port;
         this.namespace = namespace;
+
+//        this.connection = getAssociatedConnection();
     }
 
     public Database getAssociatedConnection() {
@@ -42,6 +47,27 @@ public Database getAssociatedConnection() {
                 String connString = "jdbc:Cache://" + this.address + ":" + this.port + "/" + this.namespace;
                 Logger.Log("Try to connect to " + connString);
                 this.connection = CacheDatabase.getDatabase(connString, "_SYSTEM", "SYS");
+
+                OutputStream out = new OutputStream() {
+                    private OutputWriter out = IOProvider.getDefault().getIO("Task", false).getOut();
+
+                    @Override
+                    public void write(int i) throws IOException {
+                        out.print(String.valueOf((char) i));
+                    }
+
+                    @Override
+                    public void write(byte[] bytes) throws IOException {
+                        out.print(new String(bytes));
+                    }
+
+                    @Override
+                    public void write(byte[] bytes, int off, int len) throws IOException {
+                        out.print(new String(bytes, off, len));
+                    }
+                };
+                PrintStream cacheOutput = new PrintStream(out, true);
+                this.connection.setConsoleOutput(cacheOutput);
             } catch (CacheException ce) {
                 ce.printStackTrace();
             }

NBStudioCore/src/org/nbstudio/core/CacheRoutine.java

@@ -0,0 +1,50 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package org.nbstudio.core;
+
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.io.File;
+import org.openide.awt.ActionID;
+import org.openide.awt.ActionReference;
+import org.openide.awt.ActionRegistration;
+import org.openide.cookies.OpenCookie;
+import org.openide.filesystems.FileChooserBuilder;
+import org.openide.filesystems.FileUtil;
+import org.openide.loaders.DataObject;
+import org.openide.loaders.DataObjectNotFoundException;
+import org.openide.util.Exceptions;
+import org.openide.util.NbBundle.Messages;
+
+/**
+ *
+ * @author daimor
+ */
+@ActionID(category = "File", id = "org.mycore.OpenFileAction")
+@ActionRegistration(displayName = "#CTL_OpenFileAction")
+@ActionReference(path = "Menu/File", position = 10)
+@Messages("CTL_OpenFileAction=Open File")
+public class OpenFileAction implements ActionListener {
+
+    @Override
+    public void actionPerformed(ActionEvent e) {
+        //The default dir to use if no value is stored
+        File home = new File(System.getProperty("user.home"));
+        //Now build a file chooser and invoke the dialog in one line of code
+        //"user-dir" is our unique key
+        File toAdd = new FileChooserBuilder("user-dir").setTitle("Open File").
+                setDefaultWorkingDirectory(home).setApproveText("Open").showOpenDialog();
+        //Result will be null if the user clicked cancel or closed the dialog w/o OK
+        if (toAdd != null) {
+            try {
+                DataObject.find(FileUtil.toFileObject(toAdd)).
+                        getLookup().lookup(OpenCookie.class).open();
+            } catch (DataObjectNotFoundException ex) {
+                Exceptions.printStackTrace(ex);
+            }
+        }
+    }
+    
+}

NBStudioCore/src/org/nbstudio/core/Connection.java

@@ -42,8 +42,11 @@ public class clsFile extends CacheFile {
 
     public clsFile(Database db, String name) throws CacheException {
         super(db, name);
-        if(ClassDefinition._existsId(db, new Id(name))) {
-            cls = (ClassDefinition) ClassDefinition._open(db, new Id(name));
+        try {
+            if (ClassDefinition._existsId(db, new Id(name))) {
+                cls = (ClassDefinition) ClassDefinition._open(db, new Id(name));
+            }
+        } catch (Exception ex) {
         }
     }
 
@@ -74,6 +77,9 @@ public InputStream open() {
     final class ClassText extends ByteArrayOutputStream {
 
         public ClassText() throws CacheException {
+            if (cls == null) {
+                return;
+            }
             cls._reload();
             writeParensValue("Include %s\n\n", cls.getIncludeCode());
             writeDescription(cls.getDescription());