Spreading the script core

luwrain · Jan 10, 2021 · 91ce131 · 91ce131
1 parent bc1ad2c
commit 91ce131
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 7 deletions.
diff --git a/src/main/java/org/luwrain/app/studio/App.java b/src/main/java/org/luwrain/app/studio/App.java
@@ -30,6 +30,8 @@
 
 public final class App extends AppBase<Strings>
 {
+ static public final String LOG_COMPONENT = "studio";
+
  private final String arg;
  private Conversations conv = null;
  private ProjectBaseLayout projectBaseLayout = null;
@@ -73,6 +75,12 @@ private void loadScriptCore() throws IOException
  final File[] scripts = scriptsDir.listFiles();
  if (scripts == null)
  return;
+ for(File f: scripts)
+ if (f != null)
+ {
+ Log.debug(LOG_COMPONENT, "loading " + f.getAbsolutePath());
+ scriptCore.load(f);
+ }
  }
 
  /*
@@ -143,6 +151,10 @@ private boolean runForeground(RunControl runControl)
  IDE getIde()
  {
  return new IDE(){
+ @Override public ScriptCore getScriptCore()
+ {
+ return scriptCore;
+ }
  @Override public void onFoldersUpdate()
  {
  }
@@ -266,6 +278,13 @@ Conversations conv()
  return projectBaseLayout.getLayout();
  }
 
+ @Override public boolean onEscape(InputEvent event)
+ {
+ NullCheck.notNull(event, "event");
+ closeApp();
+ return true;
+ }
+
  @Override public void closeApp()
  {
  if (proj != null)

diff --git a/src/main/java/org/luwrain/studio/ProjectFactory.java b/src/main/java/org/luwrain/studio/ProjectFactory.java
@@ -20,8 +20,8 @@
 import java.io.*;
 
 import org.luwrain.core.*;
-import org.luwrain.script.*;
-import org.luwrain.script.hooks.*;
+import org.luwrain.script2.*;
+import org.luwrain.script2.hooks.*;
 import org.luwrain.util.*;
 
 import org.luwrain.studio.backends.java.JavaProjectLoader;
@@ -89,7 +89,7 @@ public Project create(String projType, File destDir) throws IOException
  NullCheck.notNull(destDir, "destDir");
  final Object res;
  try {
- res = new ProviderHook(luwrain).run(CREATE_HOOK, new Object[]{projType, destDir.getAbsolutePath()});
+ res = new ProviderHook(ide.getScriptCore()).run(CREATE_HOOK, new Object[]{projType, destDir.getAbsolutePath()});
  }
  catch(RuntimeException e)
  {
@@ -110,7 +110,7 @@ public ProjectType[] getNewProjectTypes()
  {
  final Object[] objs;
  try {
- objs = new CollectorHook(luwrain).runForArrays(TYPES_LIST_HOOK, new Object[0]);
+ objs = new CollectorHook(ide.getScriptCore()).runForArrays(TYPES_LIST_HOOK, new Object[0]);
  }
  catch(RuntimeException e)
  {
@@ -126,9 +126,9 @@ public ProjectType[] getNewProjectTypes()
  final Object titleObj = ScriptUtils.getMember(o, "title");
  if (idObj == null || titleObj == null || orderIndexObj == null)
  continue;
- final String id = ScriptUtils.getStringValue(idObj);
- final Integer orderIndex = ScriptUtils.getIntegerValue(orderIndexObj);
- final String title = ScriptUtils.getStringValue(titleObj);
+ final String id = ScriptUtils.asString(idObj);
+ final Integer orderIndex = ScriptUtils.asInt(orderIndexObj);
+ final String title = ScriptUtils.asString(titleObj);
  if (id == null || id.isEmpty() ||
  orderIndex == null || orderIndex.intValue() < 0 ||
  title == null || title.isEmpty())