Snapshot 0b0329a61f47b6070bb9084be8e176635a16fa5c from master branch of git://git.jetbrains.org/idea/community.git

Change-Id: I2e8857776f197bed2d768ea37c67d2e2a1e97952

6 files changed, 19 insertions, 17 deletions

diff --git a/tools/launcher-generator/.idea/ant.xml b/tools/launcher-generator/.idea/ant.xml
index 2581ca3fe84c..f6e673adc243 100644
--- a/tools/launcher-generator/.idea/ant.xml
+++ b/tools/launcher-generator/.idea/ant.xml
@@ -1,7 +1,3 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="AntConfiguration">
-    <defaultAnt bundledAnt="true" />
-  </component>
-</project>
+<project version="4" />
 
diff --git a/tools/launcher-generator/.idea/artifacts/launcher_generator_jar.xml b/tools/launcher-generator/.idea/artifacts/launcher_generator_jar.xml
index e738633e26bb..5765a9f3665a 100644
--- a/tools/launcher-generator/.idea/artifacts/launcher_generator_jar.xml
+++ b/tools/launcher-generator/.idea/artifacts/launcher_generator_jar.xml
@@ -9,7 +9,7 @@
         <element id="module-output" name="launcher-generator" />
       </element>
       <element id="library" level="project" name="sanselan-0.98-snapshot" />
-      <element id="library" level="project" name="guava-12.0" />
+      <element id="library" level="project" name="guava" />
       <element id="library" level="project" name="jdom" />
     </root>
   </artifact>
diff --git a/tools/launcher-generator/.idea/libraries/guava.xml b/tools/launcher-generator/.idea/libraries/guava.xml
new file mode 100644
index 000000000000..3383a0eb8540
--- /dev/null
+++ b/tools/launcher-generator/.idea/libraries/guava.xml
@@ -0,0 +1,9 @@
+<component name="libraryTable">
+  <library name="guava">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/../../lib/guava-14.0.1.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+  </library>
+</component>
\ No newline at end of file
diff --git a/tools/launcher-generator/.idea/libraries/guava_12_0.xml b/tools/launcher-generator/.idea/libraries/guava_12_0.xml
deleted file mode 100644
index 3ccd7bb7e2f7..000000000000
--- a/tools/launcher-generator/.idea/libraries/guava_12_0.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<component name="libraryTable">
-  <library name="guava-12.0">
-    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/../../lib/guava-12.0.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
\ No newline at end of file
diff --git a/tools/launcher-generator/launcher-generator.iml b/tools/launcher-generator/launcher-generator.iml
index 37938cabae08..1767e2dd63d0 100644
--- a/tools/launcher-generator/launcher-generator.iml
+++ b/tools/launcher-generator/launcher-generator.iml
@@ -11,7 +11,7 @@
     <orderEntry type="library" name="jdom" level="project" />
     <orderEntry type="library" name="sanselan-0.98-snapshot" level="project" />
     <orderEntry type="module" module-name="icons" />
-    <orderEntry type="library" name="guava-12.0" level="project" />
+    <orderEntry type="library" name="guava" level="project" />
   </component>
 </module>
 
diff --git a/tools/launcher-generator/src/com/pme/exe/res/StringTableDirectory.java b/tools/launcher-generator/src/com/pme/exe/res/StringTableDirectory.java
index b54a7201b72b..c1cea6e5ee5b 100644
--- a/tools/launcher-generator/src/com/pme/exe/res/StringTableDirectory.java
+++ b/tools/launcher-generator/src/com/pme/exe/res/StringTableDirectory.java
@@ -44,11 +44,17 @@ public class StringTableDirectory {
   }
 
   public void setString(int id, String value) {
+    boolean found = false;
     for (Entry entry : myEntries) {
-      if (entry.startID == (id / 16)-1) {
+      if (entry.startID == (id / 16)+1) {
         entry.table.setString(id % 16, value);
+        found = true;
+        break;
       }
     }
+    if (!found) {
+      throw new IllegalArgumentException("Cannot find string entry with ID " + id);
+    }
   }
 
   public void save() throws IOException {