Fix to the commander file types on Windows

luwrain · Jun 21, 2022 · d96c85f · d96c85f
1 parent 4ede84d
commit d96c85f
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 6 deletions.
diff --git a/src/main/java/org/luwrain/controls/EditSpellChecking.java b/src/main/java/org/luwrain/controls/EditSpellChecking.java
@@ -103,4 +103,9 @@ private void setResult(EditArea editArea, SortedMap<Integer, String> text, List<
  return false;
  });
  }
+
+ public SpellChecker getSpellChecker()
+ {
+ return checker;
+ }
 }
diff --git a/src/main/java/org/luwrain/io/CommanderUtilsVfs.java b/src/main/java/org/luwrain/io/CommanderUtilsVfs.java
@@ -1,5 +1,5 @@
 /*
- Copyright 2012-2021 Michael Pozhidaev <[email protected]>
+ Copyright 2012-2022 Michael Pozhidaev <[email protected]>
 
  This file is part of LUWRAIN.
 
@@ -30,7 +30,8 @@
 
 public final class CommanderUtilsVfs
 {
- static private final String LOG_COMPONENT = "commander-vfs";
+ static private final String
+ LOG_COMPONENT = "commander-vfs";
 
  static public class Model implements CommanderArea.Model<FileObject>
  {
@@ -52,7 +53,7 @@ public FileSystemManager getFileSystemManager()
  return EntryType.PARENT;
  if (entry instanceof org.apache.commons.vfs2.provider.local.LocalFile)
  {
- final Path path = Paths.get(entry.getName().getPath());
+ final Path path = entry.getPath();
  if (Files.isSymbolicLink(path))
  return Files.isDirectory(path)?EntryType.SYMLINK_DIR:EntryType.SYMLINK;
  if (Files.isDirectory(path, LinkOption._LINKS))

diff --git a/src/main/java/org/luwrain/nlp/ru/spell/RuSpellChecker.java b/src/main/java/org/luwrain/nlp/ru/spell/RuSpellChecker.java
@@ -37,8 +37,8 @@ public RuSpellChecker(Luwrain luwrain)
  this.langTool = new JLanguageTool(new Russian());
  final File
  hunspellDataDir = new File(luwrain.getFileProperty(Luwrain.PROP_DIR_DATA), "hunspell"),
- dictFile = new File(hunspellDataDir, "ru.dict"),
- affFile = new File(hunspellDataDir, "ru.aff");
+ dictFile = new File(hunspellDataDir, "ru_RU.dic"),
+ affFile = new File(hunspellDataDir, "ru_RU.aff");
  this.hunspell = new Hunspell(dictFile.getAbsolutePath(), affFile.getAbsolutePath());
  }
 
@@ -66,7 +66,9 @@ public RuSpellChecker(Luwrain luwrain)
 
  @Override public List<String> suggestCorrections(String word)
  {
- return null;
+ if (hunspell == null)
+ throw new IllegalStateException("Hunspell not initialized");
+return hunspell.suggest(word);
  }