Removing nashorn dependencies

luwrain · Jun 13, 2022 · 015eedc · 015eedc
1 parent cfce4d4
commit 015eedc
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 20 deletions.
diff --git a/src/main/java/org/luwrain/controls/EditSpellChecking.java b/src/main/java/org/luwrain/controls/EditSpellChecking.java
@@ -24,6 +24,9 @@
 
 public class EditSpellChecking implements EditArea.ChangeListener
 {
+static private final String
+ LOG_COMPONENT = "spelling";
+
  private final Luwrain luwrain;
  private final SpellChecker checker = new SpellCheckerFactory().newChecker("ru");
  public EditSpellChecking(Luwrain luwrain )
@@ -42,6 +45,7 @@ public EditSpellChecking(Luwrain luwrain )
 
  private void check(EditArea editArea, SortedMap<Integer, String> text)
 {
+ Log.debug(LOG_COMPONENT, "Checking lines: " + text.size());
  final List<String> textLines = new ArrayList<>();
  for(Map.Entry<Integer, String> e: text.entrySet())
  textLines.add(e.getValue());
@@ -58,7 +62,11 @@ private void setResult(EditArea editArea, SortedMap<Integer, String> text, List<
  {
  final int lineIndex = e.getKey().intValue();
  lines.setLineMarks(lineIndex, new DefaultLineMarks.Builder(lines.getLineMarks(lineIndex)).addAll(marks.get(index)).build());
- index++;
+
+ Log.debug(LOG_COMPONENT, "Result for line " + lineIndex + ", " + String.valueOf(marks.get(index).size()) + " marks");
+ for(LineMarks.Mark m: marks.get(index))
+ Log.debug(LOG_COMPONENT, m.getMarkObject().toString());
+ index++;
  }
  return false;
  });

diff --git a/src/main/java/org/luwrain/io/WebCommand.java b/src/main/java/org/luwrain/io/WebCommand.java
@@ -21,7 +21,7 @@
 import org.luwrain.core.*;
 import org.luwrain.popups.*;
 import static org.luwrain.script.Hooks.*;
-import static org.luwrain.script2.ScriptUtils.*;
+import static org.luwrain.script.ScriptUtils.*;
 
 public final class WebCommand implements Command
 {

diff --git a/src/main/java/org/luwrain/io/WebSearch.java b/src/main/java/org/luwrain/io/WebSearch.java
@@ -22,7 +22,7 @@
 import org.luwrain.core.*;
 import org.luwrain.popups.*;
 import static org.luwrain.script.Hooks.*;
-import static org.luwrain.script2.ScriptUtils.*;
+import static org.luwrain.script.ScriptUtils.*;
 
 public final class WebSearch 
 {

diff --git a/src/main/java/org/luwrain/io/WebSearchResult.java b/src/main/java/org/luwrain/io/WebSearchResult.java
@@ -19,7 +19,7 @@
 import java.util.*;
 
 import org.luwrain.core.*;
-import static org.luwrain.script2.ScriptUtils.*;
+import static org.luwrain.script.ScriptUtils.*;
 
 public final class WebSearchResult
 {

diff --git a/src/main/java/org/luwrain/nlp/SpellText.java b/src/main/java/org/luwrain/nlp/SpellText.java
@@ -25,6 +25,9 @@
 
 public class SpellText
 {
+static public final String
+ LOG_COMPONENT = "spelling";
+
  final String text;
  final List<Fragment> fragments = new ArrayList<>();
  final List<SpellProblem> problems;
@@ -41,6 +44,7 @@ public SpellText(String[] text, SpellChecker checker)
  {
  this.text = text[0];
  fragments.add(new Fragment(0, text[0].length()));
+ Log.debug(LOG_COMPONENT, "Checking '" + this.text + "'");
  this.problems = checker.check(this.text);
  return;
  }
@@ -55,6 +59,7 @@ public SpellText(String[] text, SpellChecker checker)
  this.text = new String(b);
  if (fragments.size() != text.length)
  throw new IllegalStateException("the fragments and text arrays have different length");
+ Log.debug(LOG_COMPONENT, "Checking '" + this.text + "'");
  this.problems = checker.check(this.text);
  }
 

diff --git a/src/main/java/org/luwrain/nlp/ru/Token.java b/src/main/java/org/luwrain/nlp/ru/Token.java
@@ -17,9 +17,8 @@
 package org.luwrain.nlp.ru;
 
 import org.luwrain.core.*;
-import org.luwrain.script.*;
 
-public final class Token extends EmptyHookObject
+public final class Token
 {
  public enum Type {NUM, LATIN, CYRIL, SPACE, PUNC};
 
@@ -48,18 +47,4 @@ public String getText(String text)
  {
  return text;
  }
-
- @Override public Object getMember(String name)
- {
- NullCheck.notNull(name, "name");
- switch(name)
- {
- case "type":
- return type.toString().toLowerCase();
- case "text":
- return text;
- default:
- return super.getMember(name);
- }
- }
 }