Improve error message if string table is unavailable

And move "No such index" string to a constant.

Author: Argent77

src/org/infinity/gui/ResourceTree.java

@@ -70,6 +70,7 @@
 import org.infinity.util.IconCache;
 import org.infinity.util.Logger;
 import org.infinity.util.Operation;
+import org.infinity.util.StringTable;
 import org.infinity.util.Weidu;
 import org.infinity.util.io.FileEx;
 import org.infinity.util.io.FileManager;
@@ -862,7 +863,7 @@ public Component getTreeCellRendererComponent(JTree tree, Object o, boolean sel,
           // TODO: refactor code and remove "No such index" comparison
           // Now getSearchString returns that string when StringRef index not found
           // in the talk table
-          final boolean hasTitle = title != null && !title.isEmpty() && !"No such index".equals(title);
+          final boolean hasTitle = title != null && !title.isEmpty() && !StringTable.DEFAULT_STRING.equals(title);
           setText(hasTitle ? name + " - " + title : name);
         }
         setIcon(icon);

src/org/infinity/resource/itm/ItmResource.java

@@ -188,7 +188,7 @@ public static String getSearchString(InputStream is) throws IOException {
     is.skip(8);
     String defName = StringTable.getStringRef(StreamUtils.readInt(is)).trim();
     String name = StringTable.getStringRef(StreamUtils.readInt(is)).trim();
-    if (name.isEmpty() || name.equalsIgnoreCase("No such index")) {
+    if (name.isEmpty() || name.equalsIgnoreCase(StringTable.DEFAULT_STRING)) {
       return defName;
     } else {
       return name;

src/org/infinity/util/StringTable.java

@@ -86,6 +86,9 @@ public String format(String text, int strRef) {
   /** Strref start index for virtual strings referenced by ENGINEST.2DA (EE only) */
   public static final int STRREF_VIRTUAL = 0xf00000;
 
+  /** Default string returned if a requested string is unavailable. */
+  public static final String DEFAULT_STRING = "No such index";
+
   private static final EnumMap<Type, StringTable> TLK_TABLE = new EnumMap<>(Type.class);
 
   private static Charset charset = null;
@@ -326,7 +329,7 @@ public static String getStringRef(Type type, int index) throws IndexOutOfBoundsE
     try {
       return instance(type)._getStringRef(index, getDisplayFormat());
     } catch (StringTableUnavailableException e) {
-      throw new IndexOutOfBoundsException(index + " >= 0");
+      throw new IndexOutOfBoundsException("String table does not exist");
     }
   }
 
@@ -349,7 +352,7 @@ public static String getStringRef(Type type, int index, Format fmt) throws Index
     try {
       return instance(type)._getStringRef(index, fmt);
     } catch (StringTableUnavailableException e) {
-      throw new IndexOutOfBoundsException(index + " >= 0");
+      throw new IndexOutOfBoundsException("String table does not exist");
     }
   }
 
@@ -394,7 +397,7 @@ public static void setStringRef(Type type, int index, String text) throws IndexO
     try {
       instance(type)._setStringRef(index, text);
     } catch (StringTableUnavailableException e) {
-      throw new IndexOutOfBoundsException(index + " >= 0");
+      throw new IndexOutOfBoundsException("String table does not exist");
     }
   }
 
@@ -418,7 +421,7 @@ public static String getSoundResource(Type type, int index) throws IndexOutOfBou
     try {
       return instance(type)._getSoundResource(index);
     } catch (StringTableUnavailableException e) {
-      throw new IndexOutOfBoundsException(index + " >= 0");
+      throw new IndexOutOfBoundsException("String table does not exist");
     }
   }
 
@@ -444,7 +447,7 @@ public static void setSoundResource(Type type, int index, String resRef) throws
     try {
       instance(type)._setSoundResource(index, resRef);
     } catch (StringTableUnavailableException e) {
-      throw new IndexOutOfBoundsException(index + " >= 0");
+      throw new IndexOutOfBoundsException("String table does not exist");
     }
   }
 
@@ -466,7 +469,7 @@ public static short getFlags(Type type, int index) throws IndexOutOfBoundsExcept
     try {
       return instance(type)._getFlags(index);
     } catch (StringTableUnavailableException e) {
-      throw new IndexOutOfBoundsException(index + " >= 0");
+      throw new IndexOutOfBoundsException("String table does not exist");
     }
   }
 
@@ -492,7 +495,7 @@ public static void setFlags(Type type, int index, short value) throws IndexOutOf
     try {
       instance(type)._setFlags(index, value);
     } catch (StringTableUnavailableException e) {
-      throw new IndexOutOfBoundsException(index + " >= 0");
+      throw new IndexOutOfBoundsException("String table does not exist");
     }
   }
 
@@ -514,7 +517,7 @@ public static int getVolume(Type type, int index) throws IndexOutOfBoundsExcepti
     try {
       return instance(type)._getVolume(index);
     } catch (StringTableUnavailableException e) {
-      throw new IndexOutOfBoundsException(index + " >= 0");
+      throw new IndexOutOfBoundsException("String table does not exist");
     }
   }
 
@@ -540,7 +543,7 @@ public static void setVolume(Type type, int index, int value) throws IndexOutOfB
     try {
       instance(type)._setVolume(index, value);
     } catch (StringTableUnavailableException e) {
-      throw new IndexOutOfBoundsException(index + " >= 0");
+      throw new IndexOutOfBoundsException("String table does not exist");
     }
   }
 
@@ -562,7 +565,7 @@ public static int getPitch(Type type, int index) throws IndexOutOfBoundsExceptio
     try {
       return instance(type)._getPitch(index);
     } catch (StringTableUnavailableException e) {
-      throw new IndexOutOfBoundsException(index + " >= 0");
+      throw new IndexOutOfBoundsException("String table does not exist");
     }
   }
 
@@ -588,7 +591,7 @@ public static void setPitch(Type type, int index, int value) throws IndexOutOfBo
     try {
       instance(type)._setPitch(index, value);
     } catch (StringTableUnavailableException e) {
-      throw new IndexOutOfBoundsException(index + " >= 0");
+      throw new IndexOutOfBoundsException("String table does not exist");
     }
   }
 
@@ -602,7 +605,7 @@ public static StringEntry getStringEntry(Type type, int index) throws IndexOutOf
     try {
       return instance(type)._getEntry(index);
     } catch (StringTableUnavailableException e) {
-      throw new IndexOutOfBoundsException(index + " >= 0");
+      throw new IndexOutOfBoundsException("String table does not exist");
     }
   }
 
@@ -721,7 +724,7 @@ public static int insertEntry(Type type, int index) throws IndexOutOfBoundsExcep
     try {
       return instance(type)._insertEntry(index);
     } catch (StringTableUnavailableException e) {
-      throw new IndexOutOfBoundsException(index + " >= 0");
+      throw new IndexOutOfBoundsException("String table does not exist");
     }
   }
 
@@ -757,7 +760,7 @@ public static int insertEntry(Type type, int index, StringEntry newEntry) throws
     try {
       return instance(type)._insertEntry(index, newEntry);
     } catch (StringTableUnavailableException e) {
-      throw new IndexOutOfBoundsException(index + " >= 0");
+      throw new IndexOutOfBoundsException("String table does not exist");
     }
   }
 
@@ -786,7 +789,7 @@ public static void removeEntry(Type type, int index) throws IndexOutOfBoundsExce
     try {
       instance(type)._removeEntry(index);
     } catch (StringTableUnavailableException e) {
-      throw new IndexOutOfBoundsException(index + " >= 0");
+      throw new IndexOutOfBoundsException("String table does not exist");
     }
   }
 
@@ -1608,7 +1611,7 @@ private void _exportText(Path outFile, ProgressCallback callback) throws IOExcep
   // Manages a single string entry
   public static class StringEntry extends AbstractStruct {
     // Default entry for non-existing indices
-    private static final StringEntry INVALID = new StringEntry(null, FLAGS_HAS_TEXT, "", 0, 0, "No such index", null);
+    private static final StringEntry INVALID = new StringEntry(null, FLAGS_HAS_TEXT, "", 0, 0, StringTable.DEFAULT_STRING, null);
 
     private StringTable parent;
     private short flags;