openchemlib 9.21.0 → 9.22.1

package/dist/openchemlib.debug.js

@@ -1298,7 +1298,7 @@ function init(OCL) {
   delete OCL.GenericUIHelper;
 }
 
-// lib/extend/appendChangeCustomLabelPosition.js
+// lib/extend/append_change_custom_label_position.js
 function appendChangeCustomLabelPosition(Molecule2) {
   Molecule2.prototype.changeCustomLabelPosition = function changeCustomLabelPosition(customLabelPosition) {
     switch (customLabelPosition) {
@@ -1341,7 +1341,7 @@ function appendChangeCustomLabelPosition(Molecule2) {
   };
 }
 
-// lib/extend/appendGetNextCustomAtomLabel.js
+// lib/extend/append_get_next_custom_atom_label.js
 function appendGetNextCustomAtomLabel(Molecule2) {
   Molecule2.prototype.getNextCustomAtomLabel = function getNextCustomAtomLabel(label) {
     let nextLabel = label || "1";
@@ -1375,7 +1375,7 @@ function getNextLabel(label) {
   return "1";
 }
 
-// lib/extend/extendFromMolfile.js
+// lib/extend/extend_from_molfile.js
 function extendFromMolfile(Molecule2) {
   const _fromMolfile = Molecule2.fromMolfile;
   Molecule2.fromMolfile = function fromMolfile(molfile, options = {}) {
@@ -1422,7 +1422,7 @@ function extendFromMolfile(Molecule2) {
   };
 }
 
-// lib/extend/extendToMolfile.js
+// lib/extend/extend_to_molfile.js
 var CUSTOM_ATOMS_LABELS_TAGS = [
   "M  STY",
   "M  SLB",
@@ -1478,7 +1478,7 @@ function extendToMolfile(Molecule2) {
   };
 }
 
-// lib/extend/extendToRxn.js
+// lib/extend/extend_to_rxn.js
 function extendToRxn(Reaction2) {
   const _toRxn = Reaction2.prototype.toRxn;
   const _toRxnV3 = Reaction2.prototype.toRxnV3;
@@ -1499,7 +1499,7 @@ function internalToRxn(reaction, rxnFct, options) {
   }
 }
 
-// lib/extend/extendToSVG.js
+// lib/extend/extend_to_svg.js
 function extendToSVG(Molecule2) {
   const _toSVG = Molecule2.prototype.toSVG;
   Molecule2.prototype.toSVG = function toSVG(width, height, id, options) {
@@ -2175,7 +2175,7 @@ function getExports($wnd) {
     RuntimeException_1.call(this, msg);
     this.$init_213();
   }
-  defineClass(154, 22, { 4: 1, 12: 1, 1: 1, 22: 1, 18: 1 }, JsException_0);
+  defineClass(153, 22, { 4: 1, 12: 1, 1: 1, 22: 1, 18: 1 }, JsException_0);
   _.$init_213 = function $init_213() {
     this.backingJsObject_0 = UNINITIALIZED_0;
   };
@@ -2192,7 +2192,7 @@ function getExports($wnd) {
     JsException_0.call(this, e);
     this.$init_214();
   }
-  defineClass(430, 154, { 4: 1, 12: 1, 1: 1, 22: 1, 18: 1 });
+  defineClass(430, 153, { 4: 1, 12: 1, 1: 1, 22: 1, 18: 1 });
   _.$init_214 = function $init_214() {
   };
   function $clinit_JavaScriptException() {
@@ -3853,7 +3853,7 @@ function getExports($wnd) {
     RuntimeException_1.call(this, s);
     this.$init_288();
   }
-  defineClass(141, 22, { 4: 1, 12: 1, 1: 1, 22: 1, 18: 1 }, IllegalStateException, IllegalStateException_0);
+  defineClass(140, 22, { 4: 1, 12: 1, 1: 1, 22: 1, 18: 1 }, IllegalStateException, IllegalStateException_0);
   _.$init_288 = function $init_288() {
   };
   function $clinit_IndexOutOfBoundsException() {
@@ -4061,7 +4061,7 @@ function getExports($wnd) {
     JsException_1.call(this, message);
     this.$init_292();
   }
-  defineClass(75, 154, { 4: 1, 12: 1, 1: 1, 22: 1, 18: 1 }, NullPointerException, NullPointerException_0, NullPointerException_1);
+  defineClass(75, 153, { 4: 1, 12: 1, 1: 1, 22: 1, 18: 1 }, NullPointerException, NullPointerException_0, NullPointerException_1);
   _.$init_292 = function $init_292() {
   };
   _.createError = function createError_0(msg) {
@@ -4807,7 +4807,7 @@ function getExports($wnd) {
     var e, e$iterator, joiner;
     joiner = new StringJoiner(delimiter);
     for (e$iterator = elements.iterator(); e$iterator.hasNext_0(); ) {
-      e = castTo(e$iterator.next_3(), 153);
+      e = castTo(e$iterator.next_3(), 152);
       joiner.add_12(e);
     }
     return joiner.toString_0();
@@ -5024,7 +5024,7 @@ function getExports($wnd) {
     }
     return s;
   }
-  stringCastMap = { 4: 1, 153: 1, 24: 1, 1: 1, 2: 1 };
+  stringCastMap = { 4: 1, 152: 1, 24: 1, 1: 1, 2: 1 };
   var CASE_INSENSITIVE_ORDER;
   function $clinit_Comparator() {
     $clinit_Comparator = emptyMethod;
@@ -5735,7 +5735,7 @@ function getExports($wnd) {
   var Ljava_lang_Throwable_2_classLit = createForClass("java.lang", "Throwable", 18, Ljava_lang_Object_2_classLit);
   var Ljava_lang_Exception_2_classLit = createForClass("java.lang", "Exception", 12, Ljava_lang_Throwable_2_classLit);
   var Ljava_lang_RuntimeException_2_classLit = createForClass("java.lang", "RuntimeException", 22, Ljava_lang_Exception_2_classLit);
-  var Ljava_lang_JsException_2_classLit = createForClass("java.lang", "JsException", 154, Ljava_lang_RuntimeException_2_classLit);
+  var Ljava_lang_JsException_2_classLit = createForClass("java.lang", "JsException", 153, Ljava_lang_RuntimeException_2_classLit);
   var Lcom_google_gwt_core_client_impl_JavaScriptExceptionBase_2_classLit = createForClass("com.google.gwt.core.client.impl", "JavaScriptExceptionBase", 430, Ljava_lang_JsException_2_classLit);
   var Lcom_google_gwt_core_client_JavaScriptException_2_classLit = createForClass("com.google.gwt.core.client", "JavaScriptException", 161, Lcom_google_gwt_core_client_impl_JavaScriptExceptionBase_2_classLit);
   var Lcom_google_gwt_core_client_JavaScriptObject_2_classLit = createForClass("com.google.gwt.core.client", "JavaScriptObject$", 0, Ljava_lang_Object_2_classLit);
@@ -5758,7 +5758,7 @@ function getExports($wnd) {
   var Ljava_lang_ClassCastException_2_classLit = createForClass("java.lang", "ClassCastException", 373, Ljava_lang_RuntimeException_2_classLit);
   var Ljava_lang_Number_2_classLit = createForClass("java.lang", "Number", 19, Ljava_lang_Object_2_classLit);
   var Ljava_lang_Double_2_classLit = createForClass("java.lang", "Double", 370, Ljava_lang_Number_2_classLit);
-  var Ljava_lang_IllegalStateException_2_classLit = createForClass("java.lang", "IllegalStateException", 141, Ljava_lang_RuntimeException_2_classLit);
+  var Ljava_lang_IllegalStateException_2_classLit = createForClass("java.lang", "IllegalStateException", 140, Ljava_lang_RuntimeException_2_classLit);
   var Ljava_lang_IndexOutOfBoundsException_2_classLit = createForClass("java.lang", "IndexOutOfBoundsException", 84, Ljava_lang_RuntimeException_2_classLit);
   var Ljava_lang_Integer_2_classLit = createForClass("java.lang", "Integer", 35, Ljava_lang_Number_2_classLit);
   var Ljava_lang_NullPointerException_2_classLit = createForClass("java.lang", "NullPointerException", 75, Ljava_lang_JsException_2_classLit);
@@ -7124,14 +7124,12 @@ function getExports($wnd) {
       atomStr = atmStart + ("" + this.mMol.getAtomListString_0(atom)) + "]";
       if (length__I__devirtual$_0(atomStr) > 5)
         atomStr = atmStart + this.mMol.getAtomList_0(atom).length + "]";
-      if (neq(and_0(this.mMol.getAtomQueryFeatures(atom), 2048), 0))
-        hydrogensToAdd = -1;
     } else if (neq(and_0(this.mMol.getAtomQueryFeatures(atom), 1), 0)) {
       atomStr = "?";
-      if (neq(and_0(this.mMol.getAtomQueryFeatures(atom), 2048), 0))
-        hydrogensToAdd = -1;
     } else if (this.mMol.getAtomicNo_0(atom) != 6 || jsNotEquals(propStr, null) || jsNotEquals(isoStr, null) && (!isSmallCustomLabelOnly || (this.mDisplayMode & 32768) == 0) || hydrogensToAdd > 0 || !this.mAtomIsConnected[atom])
       atomStr = this.mMol.getAtomLabel_0(atom);
+    if (neq(and_0(this.mMol.getAtomQueryFeatures(atom), 2048), 0) && hydrogensToAdd == 0)
+      isoStr = this.append(isoStr, "!s");
     labelWidth = 0;
     if (!this.mMol.isSelectedAtom_0(atom) & this.mMol.isExcludeGroupAtom(atom))
       this.setColorCode(-8);
@@ -7236,11 +7234,7 @@ function getExports($wnd) {
       hydrogenWidth = this.getStringWidth("H");
       hNoWidth = 0;
       hHeight = this.getTextSize();
-      if (hydrogensToAdd == -1) {
-        hNoStr = "n";
-        this.mpSetSmallLabelSize();
-        hNoWidth = this.getStringWidth(hNoStr);
-      } else if (hydrogensToAdd > 1) {
+      if (hydrogensToAdd > 1) {
         hNoStr = valueOf_18(hydrogensToAdd);
         this.mpSetSmallLabelSize();
         hNoWidth = this.getStringWidth(hNoStr);
@@ -9453,8 +9447,8 @@ function getExports($wnd) {
     }
     return false;
   }
-  defineClass(804, 1, { 1: 1 });
-  var Lcom_actelion_research_chem_AtomFunctionAnalyzer_2_classLit = createForClass("com.actelion.research.chem", "AtomFunctionAnalyzer", 804, Ljava_lang_Object_2_classLit);
+  defineClass(803, 1, { 1: 1 });
+  var Lcom_actelion_research_chem_AtomFunctionAnalyzer_2_classLit = createForClass("com.actelion.research.chem", "AtomFunctionAnalyzer", 803, Ljava_lang_Object_2_classLit);
   function $clinit_AtomTypeCalculator() {
     $clinit_AtomTypeCalculator = emptyMethod;
     $clinit_Object();
@@ -11182,7 +11176,7 @@ function getExports($wnd) {
     var comparator, consolidatedRank, count, i, i0, i1, level, levelOffset, rankObject;
     levelOffset = levelStart[currentLevel];
     count = levelStart[currentLevel + 1] - levelOffset;
-    rankObject = initUnidimensionalArray(Lcom_actelion_research_chem_Canonizer$2RankObject_2_classLit, { 4: 1, 1: 1, 7: 1 }, 157, count, 0, 1);
+    rankObject = initUnidimensionalArray(Lcom_actelion_research_chem_Canonizer$2RankObject_2_classLit, { 4: 1, 1: 1, 7: 1 }, 156, count, 0, 1);
     for (i0 = 0; i0 < count; i0++) {
       setCheck(rankObject, i0, new Canonizer$2RankObject(this));
       rankObject[i0].rank = graphRank[i0 + levelOffset];
@@ -11242,7 +11236,7 @@ function getExports($wnd) {
     var baseIndex, comparator, consolidatedRank, i, level, nextBaseIndex, parent_0, parent0, parentCount, parentIndex, rankObject;
     for (level = currentLevel; level > 1; level--) {
       parentCount = levelStart[level] - levelStart[level - 1];
-      rankObject = initUnidimensionalArray(Lcom_actelion_research_chem_Canonizer$1RankObject_2_classLit, { 4: 1, 1: 1, 7: 1 }, 156, parentCount, 0, 1);
+      rankObject = initUnidimensionalArray(Lcom_actelion_research_chem_Canonizer$1RankObject_2_classLit, { 4: 1, 1: 1, 7: 1 }, 155, parentCount, 0, 1);
       baseIndex = levelStart[level];
       for (parent0 = 0; parent0 < parentCount; parent0++) {
         parentIndex = levelStart[level - 1] + parent0;
@@ -12571,7 +12565,7 @@ function getExports($wnd) {
   _.$init_7 = function $init_7() {
   };
   _.compare_0 = function compare_1(r1, r2) {
-    return this.compare(castTo(r1, 156), castTo(r2, 156));
+    return this.compare(castTo(r1, 155), castTo(r2, 155));
   };
   _.equals_0 = function equals_0(other) {
     return getClassPrototype(1).equals_0.call(this, other);
@@ -12606,13 +12600,13 @@ function getExports($wnd) {
     Object_0.call(this);
     this.$init_8();
   }
-  defineClass(156, 1, { 156: 1, 1: 1 }, Canonizer$1RankObject);
+  defineClass(155, 1, { 155: 1, 1: 1 }, Canonizer$1RankObject);
   _.$init_8 = function $init_8() {
   };
   _.parentHCount = 0;
   _.parentIndex = 0;
   _.parentRank = 0;
-  var Lcom_actelion_research_chem_Canonizer$1RankObject_2_classLit = createForClass("com.actelion.research.chem", "Canonizer/1RankObject", 156, Ljava_lang_Object_2_classLit);
+  var Lcom_actelion_research_chem_Canonizer$1RankObject_2_classLit = createForClass("com.actelion.research.chem", "Canonizer/1RankObject", 155, Ljava_lang_Object_2_classLit);
   function $clinit_Canonizer$2() {
     $clinit_Canonizer$2 = emptyMethod;
     $clinit_Object();
@@ -12628,7 +12622,7 @@ function getExports($wnd) {
   _.$init_9 = function $init_9() {
   };
   _.compare_0 = function compare_3(r1, r2) {
-    return this.compare_1(castTo(r1, 157), castTo(r2, 157));
+    return this.compare_1(castTo(r1, 156), castTo(r2, 156));
   };
   _.equals_0 = function equals_1(other) {
     return getClassPrototype(1).equals_0.call(this, other);
@@ -12649,13 +12643,13 @@ function getExports($wnd) {
     Object_0.call(this);
     this.$init_10();
   }
-  defineClass(157, 1, { 157: 1, 1: 1 }, Canonizer$2RankObject);
+  defineClass(156, 1, { 156: 1, 1: 1 }, Canonizer$2RankObject);
   _.$init_10 = function $init_10() {
   };
   _.index_0 = 0;
   _.parent_0 = 0;
   _.rank = 0;
-  var Lcom_actelion_research_chem_Canonizer$2RankObject_2_classLit = createForClass("com.actelion.research.chem", "Canonizer/2RankObject", 157, Ljava_lang_Object_2_classLit);
+  var Lcom_actelion_research_chem_Canonizer$2RankObject_2_classLit = createForClass("com.actelion.research.chem", "Canonizer/2RankObject", 156, Ljava_lang_Object_2_classLit);
   function $clinit_Canonizer$ESRGroup() {
     $clinit_Canonizer$ESRGroup = emptyMethod;
   }
@@ -13692,14 +13686,14 @@ function getExports($wnd) {
     checkCriticalArgument_1(isNotNull(result), "Enum constant undefined: " + name_0);
     return result;
   }
-  defineClass(48, 1, { 4: 1, 24: 1, 48: 1, 1: 1 });
+  defineClass(47, 1, { 4: 1, 24: 1, 47: 1, 1: 1 });
   _.$init_17 = function $init_17() {
   };
   _.compareTo_1 = function compareTo_4(other) {
-    return this.compareTo(castTo(other, 48));
+    return this.compareTo(castTo(other, 47));
   };
   _.compareTo = function compareTo_3(other) {
-    return this.ordinal_0 - castTo(other, 48).ordinal_0;
+    return this.ordinal_0 - castTo(other, 47).ordinal_0;
   };
   _.equals = function equals_3(other) {
     return maskUndefined(this) === maskUndefined(other);
@@ -13726,7 +13720,7 @@ function getExports($wnd) {
     return this.toString();
   };
   _.ordinal_0 = 0;
-  var Ljava_lang_Enum_2_classLit = createForClass("java.lang", "Enum", 48, Ljava_lang_Object_2_classLit);
+  var Ljava_lang_Enum_2_classLit = createForClass("java.lang", "Enum", 47, Ljava_lang_Object_2_classLit);
   function $clinit_CanonizerUtil$IDCODE_TYPE() {
     $clinit_CanonizerUtil$IDCODE_TYPE = emptyMethod;
     $clinit_Enum();
@@ -13748,7 +13742,7 @@ function getExports($wnd) {
     $clinit_CanonizerUtil$IDCODE_TYPE();
     return stampJavaTypeInfo(getClassLiteralForArray(Lcom_actelion_research_chem_CanonizerUtil$IDCODE_1TYPE_2_classLit, 1), { 4: 1, 1: 1, 7: 1 }, 126, 0, [NORMAL, NOSTEREO, BACKBONE, TAUTOMER, NOSTEREO_TAUTOMER]);
   }
-  defineClass(126, 48, { 126: 1, 4: 1, 24: 1, 48: 1, 1: 1 }, CanonizerUtil$IDCODE_TYPE);
+  defineClass(126, 47, { 126: 1, 4: 1, 24: 1, 47: 1, 1: 1 }, CanonizerUtil$IDCODE_TYPE);
   _.$init_18 = function $init_18() {
   };
   var BACKBONE, NORMAL, NOSTEREO, NOSTEREO_TAUTOMER, TAUTOMER;
@@ -14098,7 +14092,7 @@ function getExports($wnd) {
     Object_0.call(this);
     this.$init_21();
   }
-  defineClass(138, 1, { 1: 1, 30: 1 });
+  defineClass(137, 1, { 1: 1, 30: 1 });
   _.$init_21 = function $init_21() {
   };
   _.forEach = function forEach(action) {
@@ -14220,7 +14214,7 @@ function getExports($wnd) {
     }
     return joiner.toString_0();
   };
-  var Ljava_util_AbstractCollection_2_classLit = createForClass("java.util", "AbstractCollection", 138, Ljava_lang_Object_2_classLit);
+  var Ljava_util_AbstractCollection_2_classLit = createForClass("java.util", "AbstractCollection", 137, Ljava_lang_Object_2_classLit);
   function $clinit_List() {
     $clinit_List = emptyMethod;
   }
@@ -14306,7 +14300,7 @@ function getExports($wnd) {
     AbstractCollection.call(this);
     this.$init_22();
   }
-  defineClass(139, 138, { 1: 1, 30: 1, 56: 1 });
+  defineClass(138, 137, { 1: 1, 30: 1, 56: 1 });
   _.$init_22 = function $init_22() {
   };
   _.replaceAll = function replaceAll(operator) {
@@ -14408,7 +14402,7 @@ function getExports($wnd) {
   _.subList = function subList(fromIndex, toIndex) {
     return new AbstractList$SubList(this, fromIndex, toIndex);
   };
-  var Ljava_util_AbstractList_2_classLit = createForClass("java.util", "AbstractList", 139, Ljava_util_AbstractCollection_2_classLit);
+  var Ljava_util_AbstractList_2_classLit = createForClass("java.util", "AbstractList", 138, Ljava_util_AbstractCollection_2_classLit);
   function $clinit_Cloneable() {
     $clinit_Cloneable = emptyMethod;
   }
@@ -14442,7 +14436,7 @@ function getExports($wnd) {
     this.$init_23();
     checkArgument_0(initialCapacity >= 0, "Initial capacity must not be negative");
   }
-  defineClass(16, 139, { 4: 1, 1: 1, 16: 1, 30: 1, 56: 1, 128: 1 }, ArrayList, ArrayList_0);
+  defineClass(16, 138, { 4: 1, 1: 1, 16: 1, 30: 1, 56: 1, 128: 1 }, ArrayList, ArrayList_0);
   _.$init_23 = function $init_23() {
     this.array = castToArray(initUnidimensionalArray(Ljava_lang_Object_2_classLit, { 4: 1, 1: 1, 7: 1 }, 1, 0, 5, 1));
   };
@@ -14701,7 +14695,7 @@ function getExports($wnd) {
       }
     }
   }
-  defineClass(133, 1, { 1: 1 }, EZHalfParity);
+  defineClass(132, 1, { 1: 1 }, EZHalfParity);
   _.$init_26 = function $init_26() {
   };
   _.getValue = function getValue() {
@@ -14748,7 +14742,7 @@ function getExports($wnd) {
   _.mRemoteAxialAtom = 0;
   _.mStereoBondFound = false;
   _.mValue = 0;
-  var Lcom_actelion_research_chem_EZHalfParity_2_classLit = createForClass("com.actelion.research.chem", "EZHalfParity", 133, Ljava_lang_Object_2_classLit);
+  var Lcom_actelion_research_chem_EZHalfParity_2_classLit = createForClass("com.actelion.research.chem", "EZHalfParity", 132, Ljava_lang_Object_2_classLit);
   function $clinit_Element() {
     $clinit_Element = emptyMethod;
     $clinit_Object();
@@ -15236,7 +15230,7 @@ function getExports($wnd) {
   }
   function copyOf_1(original, newLength) {
     var copy, i;
-    copy = initUnidimensionalArray(Lcom_actelion_research_chem_Coordinates_2_classLit, { 152: 1, 4: 1, 1: 1, 7: 1 }, 33, newLength, 0, 1);
+    copy = initUnidimensionalArray(Lcom_actelion_research_chem_Coordinates_2_classLit, { 151: 1, 4: 1, 1: 1, 7: 1 }, 33, newLength, 0, 1);
     for (i = 0; i < original.length; i++)
       if (isNotNull(original[i]))
         copy[i] = new Coordinates_2(original[i]);
@@ -15710,33 +15704,32 @@ function getExports($wnd) {
     return -$wnd.Math.atan2(v2.getLength() * v1.dot(n2), n1.dot(n2));
   };
   _.changeAtom_0 = function changeAtom(atom, atomicNo, mass, abnormalValence, radical) {
-    var changed;
+    var isAtomicNoChange;
     if ((atomicNo == 1 || atomicNo == 151 || atomicNo == 152) && this.getOccupiedValence_0(atom) > 1)
       return false;
-    changed = this.mIsFragment && neq(and_0(this.mAtomQueryFeatures[atom], not_0(1)), 0);
-    this.mAtomQueryFeatures[atom] = and_0(this.mAtomQueryFeatures[atom], not_0(1));
-    if (jsNotEquals(this.mAtomList, null) && jsNotEquals(this.mAtomList[atom], null)) {
-      this.mAtomList[atom] = null;
-      changed = true;
-    }
-    if (jsNotEquals(this.mAtomCustomLabel, null) && jsNotEquals(this.mAtomCustomLabel[atom], null)) {
-      this.mAtomCustomLabel[atom] = null;
-      changed = true;
-    }
-    if (atomicNo == this.mAtomicNo[atom] && mass == this.mAtomMass[atom] && abnormalValence == this.getAtomAbnormalValence_0(atom) && radical == this.getAtomRadical_0(atom))
-      return changed;
     if (atomicNo == 151 || atomicNo == 152) {
       mass = atomicNo - 149;
       atomicNo = 1;
     }
-    this.mAtomFlags[atom] &= 448 | 512;
-    this.mAtomicNo[atom] = atomicNo;
+    isAtomicNoChange = atomicNo != this.mAtomicNo[atom] && (!this.mIsFragment || eq(and_0(this.mAtomQueryFeatures[atom], 1), 0) && (jsEquals(this.mAtomList, null) || jsEquals(this.mAtomList[atom], null)));
+    if (isAtomicNoChange) {
+      this.mAtomQueryFeatures[atom] = 0;
+      if (jsNotEquals(this.mAtomList, null) && jsNotEquals(this.mAtomList[atom], null))
+        this.mAtomList[atom] = null;
+      if (jsNotEquals(this.mAtomCustomLabel, null) && jsNotEquals(this.mAtomCustomLabel[atom], null))
+        this.mAtomCustomLabel[atom] = null;
+    } else if (mass == this.mAtomMass[atom] && abnormalValence == this.getAtomAbnormalValence_0(atom) && radical == this.getAtomRadical_0(atom)) {
+      return false;
+    }
+    if (isAtomicNoChange) {
+      this.mAtomicNo[atom] = atomicNo;
+      this.mAtomFlags[atom] &= 448 | 512;
+      this.mAtomCharge[atom] = 0;
+      this.removeMappingNo(this.mAtomMapNo[atom]);
+    }
     this.mAtomMass[atom] = mass;
-    this.mAtomCharge[atom] = 0;
-    this.mAtomQueryFeatures[atom] = 0;
     this.setAtomAbnormalValence_0(atom, abnormalValence);
     this.setAtomRadical_0(atom, radical);
-    this.removeMappingNo(this.mAtomMapNo[atom]);
     this.mValidHelperArrays = 0;
     return true;
   };
@@ -16538,7 +16531,7 @@ function getExports($wnd) {
     this.mAtomicNo = initUnidimensionalArray(I_classLit, { 6: 1, 4: 1, 1: 1 }, 5, this.mMaxAtoms, 15, 1);
     this.mAtomCharge = initUnidimensionalArray(I_classLit, { 6: 1, 4: 1, 1: 1 }, 5, this.mMaxAtoms, 15, 1);
     this.mAtomMapNo = initUnidimensionalArray(I_classLit, { 6: 1, 4: 1, 1: 1 }, 5, this.mMaxAtoms, 15, 1);
-    this.mCoordinates = initUnidimensionalArray(Lcom_actelion_research_chem_Coordinates_2_classLit, { 152: 1, 4: 1, 1: 1, 7: 1 }, 33, this.mMaxAtoms, 0, 1);
+    this.mCoordinates = initUnidimensionalArray(Lcom_actelion_research_chem_Coordinates_2_classLit, { 151: 1, 4: 1, 1: 1, 7: 1 }, 33, this.mMaxAtoms, 0, 1);
     for (i = 0; i < this.mMaxAtoms; i++)
       this.mCoordinates[i] = new Coordinates_0();
     this.mAtomMass = initUnidimensionalArray(I_classLit, { 6: 1, 4: 1, 1: 1 }, 5, this.mMaxAtoms, 15, 1);
@@ -17414,7 +17407,7 @@ function getExports($wnd) {
     if (isNotNull(mol))
       mol.copyMolecule_0(this);
   }
-  defineClass(151, 62, { 62: 1, 4: 1, 1: 1 });
+  defineClass(150, 62, { 62: 1, 4: 1, 1: 1 });
   _.$init_30 = function $init_30() {
   };
   _.addFragment_0 = function addFragment(sourceMol, rootAtom, atomMap) {
@@ -18385,17 +18378,27 @@ function getExports($wnd) {
     return implicitHydrogens;
   };
   _.getImplicitHydrogens_1 = function getImplicitHydrogens_0(atom) {
-    var delocalizedBonds, i, i0, maxValence, occupiedValence, valenceList;
+    var delocalizedBonds, i, i0, i1, maxValence, occupiedValence, valenceList;
     if (this.mIsFragment && eq(and_0(this.mAtomQueryFeatures[atom], 2048), 0))
       return 0;
     if (!this.supportsImplicitHydrogen_0(atom))
       return 0;
+    this.ensureHelperArrays_0(1);
+    if (this.mIsFragment) {
+      if (neq(and_0(this.mAtomQueryFeatures[atom], 1), 0))
+        return 0;
+      if (jsNotEquals(this.mAtomList, null) && jsNotEquals(this.mAtomList[atom], null) && this.mAtomList[atom].length > 1)
+        return 0;
+      for (i0 = 0; i0 < this.mAllConnAtoms[atom]; i0++)
+        if (bitCount_1(this.mBondQueryFeatures[this.mConnBond[atom][i0]] & 127) > 1)
+          return 0;
+    }
     if (this.mAtomicNo[atom] == 0 || equals_Ljava_lang_Object__Z__devirtual$_2("*", this.getAtomCustomLabel_0(atom)))
       return this.mAllConnAtoms[atom] == 0 ? 1 : 0;
-    this.ensureHelperArrays_0(1);
     occupiedValence = 0;
-    for (i0 = 0; i0 < this.mAllConnAtoms[atom]; i0++)
-      occupiedValence += this.mConnBondOrder[atom][i0];
+    for (i1 = 0; i1 < this.mAllConnAtoms[atom]; i1++)
+      if (!this.mIsFragment || eq(and_0(this.mAtomQueryFeatures[this.mConnAtom[atom][i1]], 536870912), 0))
+        occupiedValence += this.mConnBondOrder[atom][i1];
     if (this.mIsFragment) {
       delocalizedBonds = 1;
       for (i = 0; i < this.mConnAtoms[atom]; i++)
@@ -19909,7 +19912,7 @@ function getExports($wnd) {
   _.mAtoms = 0;
   _.mBonds = 0;
   var FISCHER_PROJECTION_LIMIT = 0, FISCHER_PROJECTION_RING_LIMIT = 24, cMaxConnAtoms = 16, serialVersionUID_2 = 537316094;
-  var Lcom_actelion_research_chem_ExtendedMolecule_2_classLit = createForClass("com.actelion.research.chem", "ExtendedMolecule", 151, Lcom_actelion_research_chem_Molecule_2_classLit);
+  var Lcom_actelion_research_chem_ExtendedMolecule_2_classLit = createForClass("com.actelion.research.chem", "ExtendedMolecule", 150, Lcom_actelion_research_chem_Molecule_2_classLit);
   function $clinit_IDCodeParserWithoutCoordinateInvention() {
     $clinit_IDCodeParserWithoutCoordinateInvention = emptyMethod;
     $clinit_Object();
@@ -20747,7 +20750,7 @@ function getExports($wnd) {
   };
   _.inventCoordinates_0 = function inventCoordinates_0(mol) {
     var inventor;
-    inventor = new CoordinateInventor_0(this.mCoordinateMode);
+    inventor = new CoordinateInventor(this.mCoordinateMode);
     inventor.setRandomSeed_0(78187493520);
     inventor.invent(mol);
   };
@@ -22104,9 +22107,9 @@ function getExports($wnd) {
     }
     return maxHydrogens;
   }
-  defineClass(797, 1, { 1: 1 });
+  defineClass(796, 1, { 1: 1 });
   var cInitialMultiChargeFragmentMembers = 16;
-  var Lcom_actelion_research_chem_MoleculeNeutralizer_2_classLit = createForClass("com.actelion.research.chem", "MoleculeNeutralizer", 797, Ljava_lang_Object_2_classLit);
+  var Lcom_actelion_research_chem_MoleculeNeutralizer_2_classLit = createForClass("com.actelion.research.chem", "MoleculeNeutralizer", 796, Ljava_lang_Object_2_classLit);
   function $clinit_MolfileCreator() {
     $clinit_MolfileCreator = emptyMethod;
     $clinit_Object();
@@ -22618,7 +22621,7 @@ function getExports($wnd) {
     else if (startsWith_Ljava_lang_String__Z__devirtual$(line, "M  SED"))
       cl.label_0 = trim__Ljava_lang_String___devirtual$(substring_I_Ljava_lang_String___devirtual$(line, 11));
   }
-  defineClass(150, 1, { 1: 1 }, MolfileParser, MolfileParser_0);
+  defineClass(149, 1, { 1: 1 }, MolfileParser, MolfileParser_0);
   _.$init_38 = function $init_38() {
   };
   _.TRACE = function TRACE(s) {
@@ -23685,7 +23688,7 @@ function getExports($wnd) {
   _.mMode = 0;
   _.mTreatAnyAsMetalBond = false;
   var ALLOWED_ATOM_LABELS = 0, ALLOWED_ATOM_LABELS_IN_LIST = 1, FIELD_NAME_CUSTOM_LABEL = "NOSEARCH_OCL_CUSTOM_LABEL", MODE_KEEP_HYDROGEN_MAP = 1, debug = false;
-  var Lcom_actelion_research_chem_MolfileParser_2_classLit = createForClass("com.actelion.research.chem", "MolfileParser", 150, Ljava_lang_Object_2_classLit);
+  var Lcom_actelion_research_chem_MolfileParser_2_classLit = createForClass("com.actelion.research.chem", "MolfileParser", 149, Ljava_lang_Object_2_classLit);
   function $clinit_MolfileParser$CustomLabel() {
     $clinit_MolfileParser$CustomLabel = emptyMethod;
     $clinit_Object();
@@ -27118,14 +27121,14 @@ function getExports($wnd) {
     this.$init_49();
     this.atomicNo = -1;
   }
-  defineClass(468, 1, { 1: 1 }, SmilesAtomParser$AtomLabelInfo);
+  defineClass(480, 1, { 1: 1 }, SmilesAtomParser$AtomLabelInfo);
   _.$init_49 = function $init_49() {
   };
   _.atomicNo = 0;
   _.labelLength = 0;
   _.mayBeAliphatic = false;
   _.mayBeAromatic = false;
-  var Lcom_actelion_research_chem_SmilesAtomParser$AtomLabelInfo_2_classLit = createForClass("com.actelion.research.chem", "SmilesAtomParser/AtomLabelInfo", 468, Ljava_lang_Object_2_classLit);
+  var Lcom_actelion_research_chem_SmilesAtomParser$AtomLabelInfo_2_classLit = createForClass("com.actelion.research.chem", "SmilesAtomParser/AtomLabelInfo", 480, Ljava_lang_Object_2_classLit);
   function $clinit_SmilesAtomParser$SmilesRange() {
     $clinit_SmilesAtomParser$SmilesRange = emptyMethod;
     $clinit_Object();
@@ -27136,7 +27139,7 @@ function getExports($wnd) {
     this.$init_50();
     this.smiles = smiles;
   }
-  defineClass(469, 1, { 1: 1 }, SmilesAtomParser$SmilesRange);
+  defineClass(481, 1, { 1: 1 }, SmilesAtomParser$SmilesRange);
   _.$init_50 = function $init_50() {
   };
   _.isRange = function isRange() {
@@ -27206,7 +27209,7 @@ function getExports($wnd) {
   _.max_0 = 0;
   _.min_0 = 0;
   _.pos = 0;
-  var Lcom_actelion_research_chem_SmilesAtomParser$SmilesRange_2_classLit = createForClass("com.actelion.research.chem", "SmilesAtomParser/SmilesRange", 469, Ljava_lang_Object_2_classLit);
+  var Lcom_actelion_research_chem_SmilesAtomParser$SmilesRange_2_classLit = createForClass("com.actelion.research.chem", "SmilesAtomParser/SmilesRange", 481, Ljava_lang_Object_2_classLit);
   function $clinit_SmilesParser() {
     $clinit_SmilesParser = emptyMethod;
     $clinit_Object();
@@ -27230,7 +27233,7 @@ function getExports($wnd) {
     if (this.mMakeHydrogenExplicit)
       this.mCoordinateMode &= ~2;
   }
-  defineClass(131, 1, { 1: 1 }, SmilesParser2, SmilesParser_0);
+  defineClass(159, 1, { 1: 1 }, SmilesParser2, SmilesParser_0);
   _.$init_51 = function $init_51() {
   };
   _.addConnection = function addConnection(a1, a2, bondType, pos1, pos2) {
@@ -27672,7 +27675,7 @@ function getExports($wnd) {
           atomMass = 0;
         }
         if (readStereoFeatures) {
-          parity = isNull(parityMap) ? null : castTo(parityMap.get(valueOf_12(fromAtom)), 134);
+          parity = isNull(parityMap) ? null : castTo(parityMap.get(valueOf_12(fromAtom)), 133);
           if (isNotNull(parity))
             parity.addNeighbor(atom0, position, atomParser.getAtomicNo_1() == 1 && this.mMol.getAtomMass_0(atom0) == 0);
           if (atomParser.foundParities()) {
@@ -27803,10 +27806,10 @@ function getExports($wnd) {
             if (ringClosureAtom[number] == baseAtom[bracketLevel])
               throw toJs(new Exception_1("SmilesParser: ring closure to same atom"));
             if (readStereoFeatures && isNotNull(parityMap)) {
-              parity = castTo(parityMap.get(valueOf_12(ringClosureAtom[number])), 134);
+              parity = castTo(parityMap.get(valueOf_12(ringClosureAtom[number])), 133);
               if (isNotNull(parity))
                 parity.addNeighbor(baseAtom[bracketLevel], ringClosurePosition[number], false);
-              parity = castTo(parityMap.get(valueOf_12(baseAtom[bracketLevel])), 134);
+              parity = castTo(parityMap.get(valueOf_12(baseAtom[bracketLevel])), 133);
               if (isNotNull(parity))
                 parity.addNeighbor(ringClosureAtom[number], position - 1, false);
             }
@@ -27952,7 +27955,7 @@ function getExports($wnd) {
       this.assignKnownEZBondParities();
       if (isNotNull(parityMap)) {
         for (parity$iterator = parityMap.values().iterator(); parity$iterator.hasNext_0(); ) {
-          parity = castTo(parity$iterator.next_3(), 134);
+          parity = castTo(parity$iterator.next_3(), 133);
           this.mMol.setAtomParity_0(handleHydrogenAtomMap[parity.mCentralAtom], parity.calculateParity(handleHydrogenAtomMap), false);
         }
         this.mMol.setParitiesValid_0(0);
@@ -27960,7 +27963,7 @@ function getExports($wnd) {
     }
     this.mMol.setParitiesValid_0(0);
     if (createCoordinates) {
-      inventor = new CoordinateInventor_0(this.mCoordinateMode);
+      inventor = new CoordinateInventor(this.mCoordinateMode);
       if (neq(this.mRandomSeed, 0))
         inventor.setRandomSeed_0(this.mRandomSeed);
       inventor.invent(this.mMol);
@@ -28160,8 +28163,8 @@ function getExports($wnd) {
   _.mSingleDotSeparator = false;
   _.mSmartsFeatureFound = false;
   _.mSmartsMode = 0;
-  var BRACKET_LEVELS = 32, HYDROGEN_IMPLICIT_ZERO = 9, INITIAL_CONNECTIONS = 16, MAX_AROMATIC_RING_SIZE = 15, MAX_CONNECTIONS = 100, MODE_CREATE_SMARTS_WARNING = 64, MODE_ENUMERATE_SMARTS = 128, MODE_MAKE_HYDROGEN_EXPLICIT = 8, MODE_NO_CACTUS_SYNTAX = 16, MODE_SINGLE_DOT_SEPARATOR = 32, MODE_SKIP_COORDINATE_TEMPLATES = 4, SMARTS_MODE_GUESS = 1, SMARTS_MODE_IS_SMARTS = 2, SMARTS_MODE_IS_SMILES = 0, SMARTS_MODE_MASK = 3;
-  var Lcom_actelion_research_chem_SmilesParser_2_classLit = createForClass("com.actelion.research.chem", "SmilesParser", 131, Ljava_lang_Object_2_classLit);
+  var BRACKET_LEVELS = 32, HYDROGEN_IMPLICIT_ZERO = 9, INITIAL_CONNECTIONS = 16, MAX_AROMATIC_RING_SIZE = 15, MAX_CONNECTIONS = 100, MODE_CREATE_SMARTS_WARNING = 64, MODE_ENUMERATE_SMARTS = 128, MODE_MAKE_HYDROGEN_EXPLICIT = 8, MODE_NO_CACTUS_SYNTAX = 16, MODE_NO_STACKTRACES = 256, MODE_SINGLE_DOT_SEPARATOR = 32, MODE_SKIP_COORDINATE_TEMPLATES = 4, SMARTS_MODE_GUESS = 1, SMARTS_MODE_IS_SMARTS = 2, SMARTS_MODE_IS_SMILES = 0, SMARTS_MODE_MASK = 3;
+  var Lcom_actelion_research_chem_SmilesParser_2_classLit = createForClass("com.actelion.research.chem", "SmilesParser", 159, Ljava_lang_Object_2_classLit);
   function $clinit_SmilesParser$EnumerationPosition() {
     $clinit_SmilesParser$EnumerationPosition = emptyMethod;
     $clinit_Object();
@@ -28212,7 +28215,7 @@ function getExports($wnd) {
         this.addNeighbor(2147483646, centralAtomPosition + 1, false);
     }
   }
-  defineClass(134, 1, { 134: 1, 1: 1 }, SmilesParser$THParity);
+  defineClass(133, 1, { 133: 1, 1: 1 }, SmilesParser$THParity);
   _.$init_53 = function $init_53() {
   };
   _.addNeighbor = function addNeighbor(atom, position, unused) {
@@ -28374,7 +28377,7 @@ function getExports($wnd) {
   _.mError = false;
   _.mIsClockwise = false;
   var PSEUDO_ATOM_HYDROGEN = 0, PSEUDO_ATOM_LONE_PAIR = 2147483647;
-  var Lcom_actelion_research_chem_SmilesParser$THParity_2_classLit = createForClass("com.actelion.research.chem", "SmilesParser/THParity", 134, Ljava_lang_Object_2_classLit);
+  var Lcom_actelion_research_chem_SmilesParser$THParity_2_classLit = createForClass("com.actelion.research.chem", "SmilesParser/THParity", 133, Ljava_lang_Object_2_classLit);
   function $clinit_SmilesParser$THParity$ParityNeighbour() {
     $clinit_SmilesParser$THParity$ParityNeighbour = emptyMethod;
     $clinit_Object();
@@ -28506,7 +28509,7 @@ function getExports($wnd) {
     ExtendedMolecule_1.call(this, mol);
     this.$init_56();
   }
-  defineClass(17, 151, { 62: 1, 17: 1, 4: 1, 1: 1 }, StereoMolecule, StereoMolecule_0, StereoMolecule_1);
+  defineClass(17, 150, { 62: 1, 17: 1, 4: 1, 1: 1 }, StereoMolecule, StereoMolecule_0, StereoMolecule_1);
   _.$init_56 = function $init_56() {
   };
   _.clear_0 = function clear_5() {
@@ -28523,11 +28526,11 @@ function getExports($wnd) {
   };
   _.ensureHelperArrays_0 = function ensureHelperArrays_0(required) {
     var atom, bond, rankBits, rankMode;
-    getClassPrototype(151).ensureHelperArrays_0.call(this, required);
+    getClassPrototype(150).ensureHelperArrays_0.call(this, required);
     if ((required & ~this.mValidHelperArrays) == 0)
       return;
     if ((this.mValidHelperArrays & 15) != 0 && this.mAllAtoms > 1 && this.mCoordinates[0].equals_0(this.mCoordinates[1]))
-      new CoordinateInventor_0(0).invent(this);
+      new CoordinateInventor(0).invent(this);
     if (this.mAssignParitiesToNitrogen)
       required |= 128;
     for (atom = 0; atom < this.getAllAtoms_0(); atom++)
@@ -28754,7 +28757,7 @@ function getExports($wnd) {
   };
   _.validate_0 = function validate_0() {
     var angle, atom, i, i0, j;
-    getClassPrototype(151).validate_0.call(this);
+    getClassPrototype(150).validate_0.call(this);
     this.ensureHelperArrays_0(31);
     for (atom = 0; atom < this.getAtoms_0(); atom++) {
       if ((this.getAtomESRType_0(atom) == 1 || this.getAtomESRType_0(atom) == 2) && (!this.isAtomStereoCenter_0(atom) || this.getAtomParity_0(atom) == 3))
@@ -29040,7 +29043,7 @@ function getExports($wnd) {
     this.addTautomerIfNew(new TautomerHelper$BondOrders(this, this.mOriginalMol));
     tautomer = this.mOriginalMol.getCompactCopy_0();
     while (!this.mBondOrderDeque.isEmpty()) {
-      castTo(this.mBondOrderDeque.poll(), 144).copyToTautomer(tautomer);
+      castTo(this.mBondOrderDeque.poll(), 143).copyToTautomer(tautomer);
       this.addAllTautomers(tautomer);
       if (this.mBondOrderSet.size() >= sMaxTautomers) {
         if (!sSuppressWarning)
@@ -29157,11 +29160,11 @@ function getExports($wnd) {
     for (i = 0; i < this$0.mOriginalMol.getBonds_0(); i++)
       this.encoding[i >> 4] |= $wnd.Math.min(3, mol.getBondOrder_0(i)) << 2 * (i & 15);
   }
-  defineClass(144, 1, { 144: 1, 24: 1, 1: 1 }, TautomerHelper$BondOrders);
+  defineClass(143, 1, { 143: 1, 24: 1, 1: 1 }, TautomerHelper$BondOrders);
   _.$init_58 = function $init_58() {
   };
   _.compareTo_1 = function compareTo_12(o) {
-    return this.compareTo_6(castTo(o, 144));
+    return this.compareTo_6(castTo(o, 143));
   };
   _.compareTo_6 = function compareTo_11(o) {
     return new IntArrayComparator().compare_2(this.encoding, o.encoding);
@@ -29182,7 +29185,7 @@ function getExports($wnd) {
     this.encoding[high] &= ~(3 << shift_0);
     this.encoding[high] |= order << shift_0;
   };
-  var Lcom_actelion_research_chem_TautomerHelper$BondOrders_2_classLit = createForClass("com.actelion.research.chem", "TautomerHelper/BondOrders", 144, Ljava_lang_Object_2_classLit);
+  var Lcom_actelion_research_chem_TautomerHelper$BondOrders_2_classLit = createForClass("com.actelion.research.chem", "TautomerHelper/BondOrders", 143, Ljava_lang_Object_2_classLit);
   function $clinit_TextDrawingObject() {
     $clinit_TextDrawingObject = emptyMethod;
     $clinit_AbstractDrawingObject();
@@ -29386,7 +29389,7 @@ function getExports($wnd) {
       this.mSize = parseFloat_0(value_0);
     } catch ($e0) {
       $e0 = toJava($e0);
-      if (instanceOf($e0, 47)) {
+      if (instanceOf($e0, 46)) {
         nfe = $e0;
       } else
         throw toJs($e0);
@@ -29398,7 +29401,7 @@ function getExports($wnd) {
       this.mStyle = parseInt_2(value_0);
     } catch ($e0) {
       $e0 = toJava($e0);
-      if (instanceOf($e0, 47)) {
+      if (instanceOf($e0, 46)) {
         nfe = $e0;
       } else
         throw toJs($e0);
@@ -29418,7 +29421,7 @@ function getExports($wnd) {
       this.mPoint[0].x_0 = parseFloat_0(value_0);
     } catch ($e0) {
       $e0 = toJava($e0);
-      if (instanceOf($e0, 47)) {
+      if (instanceOf($e0, 46)) {
         nfe = $e0;
       } else
         throw toJs($e0);
@@ -29430,7 +29433,7 @@ function getExports($wnd) {
       this.mPoint[0].y_0 = parseFloat_0(value_0);
     } catch ($e0) {
       $e0 = toJava($e0);
-      if (instanceOf($e0, 47)) {
+      if (instanceOf($e0, 46)) {
         nfe = $e0;
       } else
         throw toJs($e0);
@@ -29960,7 +29963,7 @@ function getExports($wnd) {
                   BOND_COUNT[i] = parseInt_2(item_0[3]);
                 } catch ($e0) {
                   $e0 = toJava($e0);
-                  if (instanceOf($e0, 47)) {
+                  if (instanceOf($e0, 46)) {
                     nfe = $e0;
                     break;
                   } else
@@ -30015,7 +30018,7 @@ function getExports($wnd) {
     Object_0.call(this);
     this.$init_63();
     this.mMol = mol;
-    this.mCoordinates = initUnidimensionalArray(Lcom_actelion_research_chem_Coordinates_2_classLit, { 152: 1, 4: 1, 1: 1, 7: 1 }, 33, mol.getAllAtoms_0(), 0, 1);
+    this.mCoordinates = initUnidimensionalArray(Lcom_actelion_research_chem_Coordinates_2_classLit, { 151: 1, 4: 1, 1: 1, 7: 1 }, 33, mol.getAllAtoms_0(), 0, 1);
     for (atom = 0; atom < mol.getAllAtoms_0(); atom++)
       this.mCoordinates[atom] = new Coordinates_2(mol.getAtomCoordinates_0(atom));
     this.mEnergy = NaN;
@@ -30029,7 +30032,7 @@ function getExports($wnd) {
     Object_0.call(this);
     this.$init_63();
     this.mMol = mol;
-    this.mCoordinates = initUnidimensionalArray(Lcom_actelion_research_chem_Coordinates_2_classLit, { 152: 1, 4: 1, 1: 1, 7: 1 }, 33, c.mCoordinates.length, 0, 1);
+    this.mCoordinates = initUnidimensionalArray(Lcom_actelion_research_chem_Coordinates_2_classLit, { 151: 1, 4: 1, 1: 1, 7: 1 }, 33, c.mCoordinates.length, 0, 1);
     for (i = 0; i < this.mCoordinates.length; i++)
       this.mCoordinates[i] = new Coordinates_2(c.mCoordinates[i]);
     if (jsNotEquals(c.mBondTorsion, null))
@@ -30397,7 +30400,7 @@ function getExports($wnd) {
     }
     return new BufferedReader(new InputStreamReader_0(getResourceAsStream("/resources/" + sDatabase + resourceName), ($clinit_StandardCharsets(), UTF_8)));
   }
-  defineClass(470, 1, { 1: 1 }, TorsionDB);
+  defineClass(468, 1, { 1: 1 }, TorsionDB);
   _.$init_64 = function $init_64() {
   };
   _.getTorsionInfo = function getTorsionInfo(torsionID) {
@@ -30491,7 +30494,7 @@ function getExports($wnd) {
   _.mMergeSpan = 0;
   _.mSupportedModes = 0;
   var DATABASE_COD = "cod/", DATABASE_CSD = "csd/", DEFAULT_MERGE_SPAN = 15, MAX_SP_CHAIN_LENGTH = 15, MODE_ANGLES = 1, MODE_BINS = 2, TORSION_GREEN = 0, TORSION_NOT_FOUND = 0, TORSION_RED = 2, TORSION_YELLOW = 1, cBasePath = "/resources/", cTorsionAngleFile = "torsionAngle.txt", cTorsionBinsFile = "torsionBins.txt", cTorsionFrequencyFile = "torsionFrequency.txt", cTorsionIDFile = "torsionID.txt", cTorsionRangeFile = "torsionRange.txt", sDatabase, sExternalResourcePath, sInstance;
-  var Lcom_actelion_research_chem_conf_TorsionDB_2_classLit = createForClass("com.actelion.research.chem.conf", "TorsionDB", 470, Ljava_lang_Object_2_classLit);
+  var Lcom_actelion_research_chem_conf_TorsionDB_2_classLit = createForClass("com.actelion.research.chem.conf", "TorsionDB", 468, Ljava_lang_Object_2_classLit);
   function $clinit_TorsionDescriptor() {
     $clinit_TorsionDescriptor = emptyMethod;
     $clinit_Object();
@@ -31984,11 +31987,7 @@ function getExports($wnd) {
     MODE_CONSIDER_MARKED_ATOMS = 4 | 8;
     TOTAL_FLIPS = 32 + 64 + 128;
   }
-  function CoordinateInventor() {
-    $clinit_CoordinateInventor();
-    CoordinateInventor_0.call(this, 2);
-  }
-  function CoordinateInventor_0(mode) {
+  function CoordinateInventor(mode) {
     $clinit_CoordinateInventor();
     Object_0.call(this);
     this.$init_70();
@@ -32028,7 +32027,7 @@ function getExports($wnd) {
       return compare_26(c1, c2);
     }
   }
-  defineClass(86, 1, { 1: 1 }, CoordinateInventor, CoordinateInventor_0);
+  defineClass(94, 1, { 1: 1 }, CoordinateInventor);
   _.$init_70 = function $init_70() {
   };
   _.addRingFragment = function addRingFragment(ringAtom, ringBond) {
@@ -33471,7 +33470,7 @@ function getExports($wnd) {
   _.mAbsoluteOrientationTemplateFound = false;
   _.mMode = 0;
   var FLIP_AS_LAST_RESORT = 1, FLIP_POSSIBLE = 2, FLIP_PREFERRED = 3, JOIN_DISTANCE_CHARGED_ATOMS = 1.399999976158142, JOIN_DISTANCE_METAL_BONDS = 1.2000000476837158, JOIN_DISTANCE_UNCHARGED_FRAGMENTS = 1.600000023841858, LAST_RESORT_FLIPS = 128, MODE_CONSIDER_MARKED_ATOMS = 0, MODE_DEFAULT = 2, MODE_KEEP_MARKED_ATOM_COORDS = 4, MODE_PREFER_MARKED_ATOM_COORDS = 8, MODE_REMOVE_HYDROGEN = 2, MODE_SKIP_DEFAULT_TEMPLATES = 1, POSSIBLE_FLIPS = 64, PREFERRED_FLIPS = 32, TOTAL_FLIPS = 0, sDefaultTemplateList;
-  var Lcom_actelion_research_chem_coords_CoordinateInventor_2_classLit = createForClass("com.actelion.research.chem.coords", "CoordinateInventor", 86, Ljava_lang_Object_2_classLit);
+  var Lcom_actelion_research_chem_coords_CoordinateInventor_2_classLit = createForClass("com.actelion.research.chem.coords", "CoordinateInventor", 94, Ljava_lang_Object_2_classLit);
   function $clinit_CoordinateInventor$1() {
     $clinit_CoordinateInventor$1 = emptyMethod;
     $clinit_ArrayList();
@@ -34910,7 +34909,7 @@ function getExports($wnd) {
     this.$init_91();
     this.mHydrogenMap = this.getHandleHydrogenMap_0();
     rings = this.getRingSet_0();
-    this.mRingArom = initUnidimensionalArray(Lcom_actelion_research_chem_forcefield_mmff_RingBoolean_2_classLit, { 4: 1, 1: 1, 7: 1 }, 145, rings.getSize_0(), 0, 1);
+    this.mRingArom = initUnidimensionalArray(Lcom_actelion_research_chem_forcefield_mmff_RingBoolean_2_classLit, { 4: 1, 1: 1, 7: 1 }, 144, rings.getSize_0(), 0, 1);
     fill_2(this.mRingArom, ($clinit_RingBoolean(), NOT_SET));
     allset = false;
     changed = true;
@@ -35098,20 +35097,20 @@ function getExports($wnd) {
   }
   function values_1() {
     $clinit_RingBoolean();
-    return stampJavaTypeInfo(getClassLiteralForArray(Lcom_actelion_research_chem_forcefield_mmff_RingBoolean_2_classLit, 1), { 4: 1, 1: 1, 7: 1 }, 145, 0, [TRUE, FALSE, NOT_SET]);
+    return stampJavaTypeInfo(getClassLiteralForArray(Lcom_actelion_research_chem_forcefield_mmff_RingBoolean_2_classLit, 1), { 4: 1, 1: 1, 7: 1 }, 144, 0, [TRUE, FALSE, NOT_SET]);
   }
-  defineClass(145, 48, { 145: 1, 4: 1, 24: 1, 48: 1, 1: 1 }, RingBoolean);
+  defineClass(144, 47, { 144: 1, 4: 1, 24: 1, 47: 1, 1: 1 }, RingBoolean);
   _.$init_93 = function $init_93() {
   };
   var FALSE, NOT_SET, TRUE;
-  var Lcom_actelion_research_chem_forcefield_mmff_RingBoolean_2_classLit = createForEnum("com.actelion.research.chem.forcefield.mmff", "RingBoolean", 145, Ljava_lang_Enum_2_classLit, values_1, valueOf_1);
+  var Lcom_actelion_research_chem_forcefield_mmff_RingBoolean_2_classLit = createForEnum("com.actelion.research.chem.forcefield.mmff", "RingBoolean", 144, Ljava_lang_Enum_2_classLit, values_1, valueOf_1);
   function $clinit_RingBoolean$Map() {
     $clinit_RingBoolean$Map = emptyMethod;
     $MAP_0 = createValueOfMap(values_1());
   }
-  defineClass(801, 1, { 1: 1 });
+  defineClass(800, 1, { 1: 1 });
   var $MAP_0;
-  var Lcom_actelion_research_chem_forcefield_mmff_RingBoolean$Map_2_classLit = createForClass("com.actelion.research.chem.forcefield.mmff", "RingBoolean/Map", 801, Ljava_lang_Object_2_classLit);
+  var Lcom_actelion_research_chem_forcefield_mmff_RingBoolean$Map_2_classLit = createForClass("com.actelion.research.chem.forcefield.mmff", "RingBoolean/Map", 800, Ljava_lang_Object_2_classLit);
   function $clinit_Search() {
     $clinit_Search = emptyMethod;
     $clinit_Object();
@@ -35233,7 +35232,7 @@ function getExports($wnd) {
     $clinit_Separation$Relation();
     return stampJavaTypeInfo(getClassLiteralForArray(Lcom_actelion_research_chem_forcefield_mmff_Separation$Relation_2_classLit, 1), { 4: 1, 1: 1, 7: 1 }, 113, 0, [ONE_ONE, ONE_TWO, ONE_THREE, ONE_FOUR, ONE_X]);
   }
-  defineClass(113, 48, { 113: 1, 4: 1, 24: 1, 48: 1, 1: 1 }, Separation$Relation);
+  defineClass(113, 47, { 113: 1, 4: 1, 24: 1, 47: 1, 1: 1 }, Separation$Relation);
   _.$init_95 = function $init_95() {
   };
   var ONE_FOUR, ONE_ONE, ONE_THREE, ONE_TWO, ONE_X;
@@ -35256,11 +35255,11 @@ function getExports($wnd) {
     this.a = a > b ? a : b;
     this.b = a > b ? b : a;
   }
-  defineClass(91, 1, { 91: 1, 24: 1, 1: 1 }, SortedPair);
+  defineClass(90, 1, { 90: 1, 24: 1, 1: 1 }, SortedPair);
   _.$init_96 = function $init_96() {
   };
   _.compareTo_1 = function compareTo_18(that) {
-    return this.compareTo_9(castTo(that, 91));
+    return this.compareTo_9(castTo(that, 90));
   };
   _.compareTo_9 = function compareTo_17(that) {
     if (this.a > that.a)
@@ -35277,9 +35276,9 @@ function getExports($wnd) {
     var that;
     if (maskUndefined(obj) === maskUndefined(this))
       return true;
-    if (!instanceOf(obj, 91))
+    if (!instanceOf(obj, 90))
       return false;
-    that = castTo(obj, 91);
+    that = castTo(obj, 90);
     return this.a == that.a && this.b == that.b;
   };
   _.hashCode_1 = function hashCode_3() {
@@ -35290,7 +35289,7 @@ function getExports($wnd) {
   };
   _.a = 0;
   _.b = 0;
-  var Lcom_actelion_research_chem_forcefield_mmff_SortedPair_2_classLit = createForClass("com.actelion.research.chem.forcefield.mmff", "SortedPair", 91, Ljava_lang_Object_2_classLit);
+  var Lcom_actelion_research_chem_forcefield_mmff_SortedPair_2_classLit = createForClass("com.actelion.research.chem.forcefield.mmff", "SortedPair", 90, Ljava_lang_Object_2_classLit);
   function $clinit_StretchBend() {
     $clinit_StretchBend = emptyMethod;
     $clinit_Object();
@@ -35905,7 +35904,7 @@ function getExports($wnd) {
     this.$init_103();
     this.table = readIntsFile(csvpath);
   }
-  defineClass(480, 1, { 1: 1 }, Atom);
+  defineClass(478, 1, { 1: 1 }, Atom);
   _.$init_103 = function $init_103() {
   };
   _.arom = function arom(type_0) {
@@ -35940,7 +35939,7 @@ function getExports($wnd) {
   _.val_0 = function val_0(type_0) {
     return this.table[this.index_2(type_0)][3];
   };
-  var Lcom_actelion_research_chem_forcefield_mmff_table_Atom_2_classLit = createForClass("com.actelion.research.chem.forcefield.mmff.table", "Atom", 480, Ljava_lang_Object_2_classLit);
+  var Lcom_actelion_research_chem_forcefield_mmff_table_Atom_2_classLit = createForClass("com.actelion.research.chem.forcefield.mmff.table", "Atom", 478, Ljava_lang_Object_2_classLit);
   function $clinit_Bndk() {
     $clinit_Bndk = emptyMethod;
     $clinit_Object();
@@ -37448,8 +37447,8 @@ function getExports($wnd) {
     }
     return $clinit_RingBoolean(), TRUE;
   }
-  defineClass(802, 1, { 1: 1 });
-  var Lcom_actelion_research_chem_forcefield_mmff_type_Atom_2_classLit = createForClass("com.actelion.research.chem.forcefield.mmff.type", "Atom", 802, Ljava_lang_Object_2_classLit);
+  defineClass(801, 1, { 1: 1 });
+  var Lcom_actelion_research_chem_forcefield_mmff_type_Atom_2_classLit = createForClass("com.actelion.research.chem.forcefield.mmff.type", "Atom", 801, Ljava_lang_Object_2_classLit);
   function $clinit_Bond_0() {
     $clinit_Bond_0 = emptyMethod;
     $clinit_Object();
@@ -37668,8 +37667,8 @@ function getExports($wnd) {
     }
     return charges;
   }
-  defineClass(803, 1, { 1: 1 });
-  var Lcom_actelion_research_chem_forcefield_mmff_type_Charge_2_classLit = createForClass("com.actelion.research.chem.forcefield.mmff.type", "Charge", 803, Ljava_lang_Object_2_classLit);
+  defineClass(802, 1, { 1: 1 });
+  var Lcom_actelion_research_chem_forcefield_mmff_type_Charge_2_classLit = createForClass("com.actelion.research.chem.forcefield.mmff.type", "Charge", 802, Ljava_lang_Object_2_classLit);
   function $clinit_Torsion_0() {
     $clinit_Torsion_0 = emptyMethod;
     $clinit_Object();
@@ -38598,7 +38597,7 @@ function getExports($wnd) {
     Object_0.call(this);
     this.$init_127();
   }
-  defineClass(159, 1, { 1: 1 }, ParameterizedStringList);
+  defineClass(158, 1, { 1: 1 }, ParameterizedStringList);
   _.$init_127 = function $init_127() {
     this.mList = new ArrayList();
   };
@@ -38615,7 +38614,7 @@ function getExports($wnd) {
     return castTo(this.mList.getAtIndex(i), 181).mType;
   };
   var cStringTypeDouble = 3, cStringTypeIDCode = 1, cStringTypeText = 2;
-  var Lcom_actelion_research_chem_prediction_ParameterizedStringList_2_classLit = createForClass("com.actelion.research.chem.prediction", "ParameterizedStringList", 159, Ljava_lang_Object_2_classLit);
+  var Lcom_actelion_research_chem_prediction_ParameterizedStringList_2_classLit = createForClass("com.actelion.research.chem.prediction", "ParameterizedStringList", 158, Ljava_lang_Object_2_classLit);
   function $clinit_PolarSurfaceAreaPredictor() {
     $clinit_PolarSurfaceAreaPredictor = emptyMethod;
     $clinit_Object();
@@ -39583,7 +39582,7 @@ function getExports($wnd) {
           this.mPoint[0].x_0 = parseFloat_0(value_0);
         } catch ($e0) {
           $e0 = toJava($e0);
-          if (instanceOf($e0, 47)) {
+          if (instanceOf($e0, 46)) {
             nfe = $e0;
           } else
             throw toJs($e0);
@@ -39593,7 +39592,7 @@ function getExports($wnd) {
           this.mPoint[0].y_0 = parseFloat_0(value_0);
         } catch ($e1) {
           $e1 = toJava($e1);
-          if (instanceOf($e1, 47)) {
+          if (instanceOf($e1, 46)) {
             nfe = $e1;
           } else
             throw toJs($e1);
@@ -39603,7 +39602,7 @@ function getExports($wnd) {
           this.mPoint[1].x_0 = parseFloat_0(value_0);
         } catch ($e2) {
           $e2 = toJava($e2);
-          if (instanceOf($e2, 47)) {
+          if (instanceOf($e2, 46)) {
             nfe = $e2;
           } else
             throw toJs($e2);
@@ -39613,7 +39612,7 @@ function getExports($wnd) {
           this.mPoint[1].y_0 = parseFloat_0(value_0);
         } catch ($e3) {
           $e3 = toJava($e3);
-          if (instanceOf($e3, 47)) {
+          if (instanceOf($e3, 46)) {
             nfe = $e3;
           } else
             throw toJs($e3);
@@ -40485,7 +40484,7 @@ function getExports($wnd) {
     new AromaticityResolver(product).locateDelocalizedDoubleBonds(null);
     product.setParitiesValid_0(0);
     mode = 2 | (this.mRetainCoordinates ? 8 : 0);
-    new CoordinateInventor_0(mode).invent(product);
+    new CoordinateInventor(mode).invent(product);
     if (isNotNull(racemicAtomList)) {
       product.ensureHelperArrays_0(15);
       for (atom$iterator = racemicAtomList.iterator(); atom$iterator.hasNext_0(); ) {
@@ -40677,14 +40676,14 @@ function getExports($wnd) {
         rule.finishProductOnly();
         this.mRuleList.add_10(rule);
       } else {
-        castTo(this.mRuleList.get_3(index_0), 88).finishWithProduct(rule);
+        castTo(this.mRuleList.get_3(index_0), 87).finishWithProduct(rule);
       }
     }
     for (i0 = this.mRuleList.size_1() - 1; i0 >= 0; i0--) {
-      rule = castTo(this.mRuleList.get_3(i0), 88);
+      rule = castTo(this.mRuleList.get_3(i0), 87);
       if (!rule.isFinished())
         rule.finishNoProduct();
-      else if (castTo(this.mRuleList.get_3(i0), 88).isNoChange())
+      else if (castTo(this.mRuleList.get_3(i0), 87).isNoChange())
         this.mRuleList.remove_0(i0);
     }
     this.mMinFreeValence = initUnidimensionalArray(I_classLit, { 6: 1, 4: 1, 1: 1 }, 5, reactant.getAtoms_0(), 15, 1);
@@ -40707,7 +40706,7 @@ function getExports($wnd) {
     mol.ensureHelperArrays_0(1);
     matchAtom = castTo(this.mMatchList.getAtIndex(matchNo), 6);
     for (i = 0; i < this.mRuleList.size_1(); i++) {
-      rule = castTo(this.mRuleList.get_3(i), 88);
+      rule = castTo(this.mRuleList.get_3(i), 87);
       rule.adaptBondOrder(mol, matchAtom);
     }
     mol.deleteMarkedAtomsAndBonds_0();
@@ -40772,11 +40771,11 @@ function getExports($wnd) {
       this.mBondQFTypes |= 1;
     this.mType = ($clinit_TransformerRule$TYPE(), UNKNOWN);
   }
-  defineClass(88, 1, { 88: 1, 24: 1, 1: 1 }, TransformerRule);
+  defineClass(87, 1, { 87: 1, 24: 1, 1: 1 }, TransformerRule);
   _.$init_136 = function $init_136() {
   };
   _.compareTo_1 = function compareTo_20(o) {
-    return this.compareTo_10(castTo(o, 88));
+    return this.compareTo_10(castTo(o, 87));
   };
   _.adaptBondOrder = function adaptBondOrder(mol, matchAtom) {
     var atom1, atom2, bond, targetBondOrder;
@@ -40811,7 +40810,7 @@ function getExports($wnd) {
     return 0;
   };
   _.equals_0 = function equals_16(o) {
-    return this.mMapNo1 == castTo(o, 88).mMapNo1 && this.mMapNo2 == castTo(o, 88).mMapNo2;
+    return this.mMapNo1 == castTo(o, 87).mMapNo1 && this.mMapNo2 == castTo(o, 87).mMapNo2;
   };
   _.finishNoProduct = function finishNoProduct() {
     this.mType = ($clinit_TransformerRule$TYPE(), REMOVE);
@@ -40850,7 +40849,7 @@ function getExports($wnd) {
   _.mMapNo2 = 0;
   _.mTargetBondDif = 0;
   _.mTargetBondType = 0;
-  var Lcom_actelion_research_chem_reaction_TransformerRule_2_classLit = createForClass("com.actelion.research.chem.reaction", "TransformerRule", 88, Ljava_lang_Object_2_classLit);
+  var Lcom_actelion_research_chem_reaction_TransformerRule_2_classLit = createForClass("com.actelion.research.chem.reaction", "TransformerRule", 87, Ljava_lang_Object_2_classLit);
   function $clinit_TransformerRule$TYPE() {
     $clinit_TransformerRule$TYPE = emptyMethod;
     $clinit_Enum();
@@ -40873,7 +40872,7 @@ function getExports($wnd) {
     $clinit_TransformerRule$TYPE();
     return stampJavaTypeInfo(getClassLiteralForArray(Lcom_actelion_research_chem_reaction_TransformerRule$TYPE_2_classLit, 1), { 4: 1, 1: 1, 7: 1 }, 114, 0, [CREATE, CHANGE_DIF, CHANGE_ABS, REMOVE, NO_CHANGE, UNKNOWN]);
   }
-  defineClass(114, 48, { 114: 1, 4: 1, 24: 1, 48: 1, 1: 1 }, TransformerRule$TYPE);
+  defineClass(114, 47, { 114: 1, 4: 1, 24: 1, 47: 1, 1: 1 }, TransformerRule$TYPE);
   _.$init_137 = function $init_137() {
   };
   var CHANGE_ABS, CHANGE_DIF, CREATE, NO_CHANGE, REMOVE, UNKNOWN;
@@ -40946,7 +40945,7 @@ function getExports($wnd) {
         }
       }
     }
-    this.mRuleBonds = castTo(bondList.toArray_1(initUnidimensionalArray(Lcom_actelion_research_chem_reaction_mapping_ChemicalRuleBond_2_classLit, { 880: 1, 4: 1, 1: 1, 7: 1 }, 149, 0, 0, 1)), 880);
+    this.mRuleBonds = castTo(bondList.toArray_1(initUnidimensionalArray(Lcom_actelion_research_chem_reaction_mapping_ChemicalRuleBond_2_classLit, { 880: 1, 4: 1, 1: 1, 7: 1 }, 148, 0, 0, 1)), 880);
     count = 0;
     for (atom3 = 0; atom3 < this.mReactant.getAtoms_0(); atom3++)
       if (this.mReactant.getAtomMapNo_0(atom3) == 0 && !this.mReactant.isExcludeGroupAtom(atom3))
@@ -41108,11 +41107,11 @@ function getExports($wnd) {
     }
     this.newBondType = newBondType;
   }
-  defineClass(149, 1, { 149: 1, 24: 1, 1: 1 }, ChemicalRuleBond);
+  defineClass(148, 1, { 148: 1, 24: 1, 1: 1 }, ChemicalRuleBond);
   _.$init_139 = function $init_139() {
   };
   _.compareTo_1 = function compareTo_22(crb) {
-    return this.compareTo_11(castTo(crb, 149));
+    return this.compareTo_11(castTo(crb, 148));
   };
   _.compareTo_11 = function compareTo_21(crb) {
     if (this.mapNo1 < crb.mapNo1)
@@ -41131,7 +41130,7 @@ function getExports($wnd) {
   _.mapNo2 = 0;
   _.newBondType = 0;
   var BOND_TYPE_DELETE = 0, BOND_TYPE_KEEP_UNCHANGED = 0;
-  var Lcom_actelion_research_chem_reaction_mapping_ChemicalRuleBond_2_classLit = createForClass("com.actelion.research.chem.reaction.mapping", "ChemicalRuleBond", 149, Ljava_lang_Object_2_classLit);
+  var Lcom_actelion_research_chem_reaction_mapping_ChemicalRuleBond_2_classLit = createForClass("com.actelion.research.chem.reaction.mapping", "ChemicalRuleBond", 148, Ljava_lang_Object_2_classLit);
   function $clinit_ChemicalRuleEnhancedReactionMapper() {
     $clinit_ChemicalRuleEnhancedReactionMapper = emptyMethod;
     $clinit_Object();
@@ -43486,7 +43485,7 @@ function getExports($wnd) {
         break;
       case 12:
         if (realNeighbours <= 1)
-          queryFeatures = or_0(queryFeatures, or_0(or_0(131072, 1099511627776), 2097152));
+          queryFeatures = or_0(queryFeatures, or_0(or_0(131072, 262144), 2097152));
         else if (realNeighbours <= 3)
           queryFeatures = or_0(queryFeatures, 2097152);
         break;
@@ -44061,7 +44060,7 @@ function getExports($wnd) {
             }
           } catch ($e0) {
             $e0 = toJava($e0);
-            if (instanceOf($e0, 47)) {
+            if (instanceOf($e0, 46)) {
               nfe = $e0;
               this.mDialog.showMessage_0("Your mass is not a number!");
               return;
@@ -44079,7 +44078,7 @@ function getExports($wnd) {
             }
           } catch ($e1) {
             $e1 = toJava($e1);
-            if (instanceOf($e1, 47)) {
+            if (instanceOf($e1, 46)) {
               nfe = $e1;
               this.mDialog.showMessage_0("Your valence is not a number!");
               return;
@@ -44173,7 +44172,7 @@ function getExports($wnd) {
     this.$init_155();
     this.mIsUserChange = isUserChange;
   }
-  defineClass(89, 183, { 89: 1, 1: 1 }, EditorEvent);
+  defineClass(88, 183, { 88: 1, 1: 1 }, EditorEvent);
   _.$init_155 = function $init_155() {
   };
   _.isUserChange = function isUserChange_0() {
@@ -44181,7 +44180,7 @@ function getExports($wnd) {
   };
   _.mIsUserChange = false;
   var WHAT_HILITE_ATOM_CHANGED = 4, WHAT_HILITE_BOND_CHANGED = 8, WHAT_MOLECULE_CHANGED = 1, WHAT_SELECTION_CHANGED = 2, serialVersionUID_7 = 537462289;
-  var Lcom_actelion_research_gui_editor_EditorEvent_2_classLit = createForClass("com.actelion.research.gui.editor", "EditorEvent", 89, Lcom_actelion_research_gui_generic_GenericEvent_2_classLit);
+  var Lcom_actelion_research_gui_editor_EditorEvent_2_classLit = createForClass("com.actelion.research.gui.editor", "EditorEvent", 88, Lcom_actelion_research_gui_generic_GenericEvent_2_classLit);
   function $clinit_GenericEditorArea() {
     $clinit_GenericEditorArea = emptyMethod;
     $clinit_Object();
@@ -44555,7 +44554,7 @@ function getExports($wnd) {
       if (selectedOnly)
         for (atom = 0; atom < this.mMol.getAllAtoms_0(); atom++)
           this.mMol.setAtomMarker_0(atom, !this.mMol.isSelectedAtom_0(atom));
-      new CoordinateInventor_0(selectedOnly ? 4 : 0).invent(this.mMol);
+      new CoordinateInventor(selectedOnly ? 4 : 0).invent(this.mMol);
       if (selectedOnly)
         this.mMol.removeAtomMarkers_0();
     }
@@ -44574,7 +44573,7 @@ function getExports($wnd) {
     boundingRect = initUnidimensionalArray(Lcom_actelion_research_gui_generic_GenericRectangle_2_classLit, { 4: 1, 1: 1, 7: 1 }, 32, this.mFragment.length, 0, 1);
     for (fragment1 = 0; fragment1 < this.mFragment.length; fragment1++) {
       if (this.mUpdateMode == 6) {
-        new CoordinateInventor_0(selectedOnly ? 4 : 0).invent(this.mFragment[fragment1]);
+        new CoordinateInventor(selectedOnly ? 4 : 0).invent(this.mFragment[fragment1]);
         this.mFragment[fragment1].setStereoBondsFromParity_0();
       }
       d = new GenericDepictor(this.mFragment[fragment1]);
@@ -44813,8 +44812,8 @@ function getExports($wnd) {
   _.eventHappened_0 = function eventHappened_6(e) {
     if (instanceOf(e, 81))
       this.eventHappened_1(castTo(e, 81));
-    else if (instanceOf(e, 135))
-      this.eventHappened_2(castTo(e, 135));
+    else if (instanceOf(e, 134))
+      this.eventHappened_2(castTo(e, 134));
     else if (instanceOf(e, 122))
       this.eventHappened_3(castTo(e, 122));
   };
@@ -45165,7 +45164,7 @@ function getExports($wnd) {
       for (atom = 0; atom < fragment.getAllAtoms_0(); atom++)
         fragment.setAtomMarker_0(atom, true);
       fragment.addSubstituent_0(substituent, 0);
-      new CoordinateInventor_0(4).invent(fragment);
+      new CoordinateInventor(4).invent(fragment);
       dx = this.mMol.getAtomX_0(this.mCurrentHiliteAtom) - sourceAVBL * fragment.getAtomX_0(0);
       dy = this.mMol.getAtomY_0(this.mCurrentHiliteAtom) - sourceAVBL * fragment.getAtomY_0(0);
       firstAtomInMol = this.mMol.getAllAtoms_0();
@@ -46908,7 +46907,7 @@ function getExports($wnd) {
     this.what_1 = what_1;
     this.e_2 = e_2;
   }
-  defineClass(352, 1, { 1: 1, 132: 1 }, GenericEditorArea$lambda$6$Type);
+  defineClass(352, 1, { 1: 1, 131: 1 }, GenericEditorArea$lambda$6$Type);
   _.run = function run() {
     this.$$outer_0.lambda$6(this.what_1, this.e_2);
   };
@@ -46970,8 +46969,8 @@ function getExports($wnd) {
   _.eventHappened_0 = function eventHappened_9(e) {
     if (instanceOf(e, 122))
       this.eventHappened_5(castTo(e, 122));
-    else if (instanceOf(e, 135))
-      this.eventHappened_4(castTo(e, 135));
+    else if (instanceOf(e, 134))
+      this.eventHappened_4(castTo(e, 134));
   };
   _.eventHappened_4 = function eventHappened_10(e) {
     var key;
@@ -47245,7 +47244,7 @@ function getExports($wnd) {
         textSize = parseInt_2(this.mComboBoxTextSize.getSelectedItem_0());
       } catch ($e0) {
         $e0 = toJava($e0);
-        if (instanceOf($e0, 47)) {
+        if (instanceOf($e0, 46)) {
           nfe = $e0;
           this.mDialog.showMessage_0("Illegal text size.");
           return;
@@ -47366,22 +47365,22 @@ function getExports($wnd) {
   _.$init_160 = function $init_160() {
   };
   _.drawBlackLine = function drawBlackLine_0(theLine) {
-    castTo(this.mContext, 90).drawLine_1(theLine.x1, theLine.y1, theLine.x2, theLine.y2);
+    castTo(this.mContext, 89).drawLine_1(theLine.x1, theLine.y1, theLine.x2, theLine.y2);
   };
   _.drawDottedLine_0 = function drawDottedLine_0(theLine) {
-    castTo(this.mContext, 90).drawDottedLine_1(theLine.x1, theLine.y1, theLine.x2, theLine.y2);
+    castTo(this.mContext, 89).drawDottedLine_1(theLine.x1, theLine.y1, theLine.x2, theLine.y2);
   };
   _.drawPolygon_0 = function drawPolygon_0(p) {
-    castTo(this.mContext, 90).fillPolygon_0(p);
+    castTo(this.mContext, 89).fillPolygon_0(p);
   };
   _.drawString_0 = function drawString_0(theString, x_0, y_0) {
-    castTo(this.mContext, 90).drawCenteredString_0(x_0, y_0, theString);
+    castTo(this.mContext, 89).drawCenteredString_0(x_0, y_0, theString);
   };
   _.fillCircle_0 = function fillCircle_0(x_0, y_0, d) {
-    castTo(this.mContext, 90).fillCircle_0(x_0, y_0, d);
+    castTo(this.mContext, 89).fillCircle_0(x_0, y_0, d);
   };
   _.getStringWidth = function getStringWidth_0(theString) {
-    return castTo(this.mContext, 90).getBounds_1(theString).getWidth_0();
+    return castTo(this.mContext, 89).getBounds_1(theString).getWidth_0();
   };
   _.getTextSize = function getTextSize_0() {
     return this.mTextSize;
@@ -47430,7 +47429,7 @@ function getExports($wnd) {
         }
       }
     }
-    image = castTo(this.mContext, 90).createARGBImage_0(imageW, imageH);
+    image = castTo(this.mContext, 89).createARGBImage_0(imageW, imageH);
     index_0 = 0;
     for (y_0 = 0; y_0 < imageH; y_0++) {
       for (x_0 = 0; x_0 < imageW; x_0++) {
@@ -47454,7 +47453,7 @@ function getExports($wnd) {
         image.setRGB_1(x_0, y_0, c);
       }
     }
-    castTo(this.mContext, 90).drawImage_0(image, imageX, imageY);
+    castTo(this.mContext, 89).drawImage_0(image, imageX, imageY);
   };
   _.init = function init_6() {
     getClassPrototype(163).init.call(this);
@@ -47481,15 +47480,15 @@ function getExports($wnd) {
   };
   _.setLineWidth_0 = function setLineWidth_0(lineWidth) {
     this.mLineWidth = lineWidth;
-    castTo(this.mContext, 90).setLineWidth_1(this.mLineWidth);
+    castTo(this.mContext, 89).setLineWidth_1(this.mLineWidth);
   };
   _.setRGB_0 = function setRGB_0(rgb) {
-    castTo(this.mContext, 90).setRGB_0(rgb);
+    castTo(this.mContext, 89).setRGB_0(rgb);
   };
   _.setTextSize = function setTextSize_0(theSize) {
     this.mTextSize = theSize;
     if (jsNotEquals(this.mContext, null))
-      castTo(this.mContext, 90).setFont_0(theSize, false, false);
+      castTo(this.mContext, 89).setFont_0(theSize, false, false);
   };
   _.mLineWidth = 0;
   _.mTextSize = 0;
@@ -47563,7 +47562,7 @@ function getExports($wnd) {
     this.mIsShiftDown = isShiftDown;
     this.mIsMenuShortcut = isMenuShortcut;
   }
-  defineClass(135, 183, { 135: 1, 1: 1 }, GenericKeyEvent);
+  defineClass(134, 183, { 134: 1, 1: 1 }, GenericKeyEvent);
   _.$init_162 = function $init_162() {
   };
   _.getKey = function getKey() {
@@ -47584,7 +47583,7 @@ function getExports($wnd) {
   _.mIsShiftDown = false;
   _.mKey = 0;
   var KEY_ALT = 0, KEY_BACK_SPACE = 0, KEY_CTRL = 0, KEY_DELETE = 0, KEY_DOWN = 0, KEY_ENTER = 0, KEY_ESCAPE = 0, KEY_HELP = 0, KEY_LEFT = 0, KEY_PRESSED = 1, KEY_RELEASED = 2, KEY_RIGHT = 0, KEY_SHIFT = 0, KEY_UP = 0;
-  var Lcom_actelion_research_gui_generic_GenericKeyEvent_2_classLit = createForClass("com.actelion.research.gui.generic", "GenericKeyEvent", 135, Lcom_actelion_research_gui_generic_GenericEvent_2_classLit);
+  var Lcom_actelion_research_gui_generic_GenericKeyEvent_2_classLit = createForClass("com.actelion.research.gui.generic", "GenericKeyEvent", 134, Lcom_actelion_research_gui_generic_GenericEvent_2_classLit);
   function $clinit_GenericLabel() {
     $clinit_GenericLabel = emptyMethod;
   }
@@ -47702,7 +47701,7 @@ function getExports($wnd) {
     this.mY = initUnidimensionalArray(D_classLit, { 11: 1, 4: 1, 1: 1 }, 5, size_0, 15, 1);
     this.mIndex = 0;
   }
-  defineClass(136, 1, { 1: 1 }, GenericPolygon, GenericPolygon_0);
+  defineClass(135, 1, { 1: 1 }, GenericPolygon, GenericPolygon_0);
   _.$init_165 = function $init_165() {
   };
   _.addPoint = function addPoint(x_0, y_0) {
@@ -47742,7 +47741,7 @@ function getExports($wnd) {
       this.mIndex--;
   };
   _.mIndex = 0;
-  var Lcom_actelion_research_gui_generic_GenericPolygon_2_classLit = createForClass("com.actelion.research.gui.generic", "GenericPolygon", 136, Ljava_lang_Object_2_classLit);
+  var Lcom_actelion_research_gui_generic_GenericPolygon_2_classLit = createForClass("com.actelion.research.gui.generic", "GenericPolygon", 135, Ljava_lang_Object_2_classLit);
   function $clinit_GenericPopupMenu() {
     $clinit_GenericPopupMenu = emptyMethod;
   }
@@ -48230,16 +48229,8 @@ function getExports($wnd) {
   function fromSmiles(smiles, options) {
     $clinit_JSMolecule();
     options = options || {};
-    var createCoordinates = !options.noCoordinates;
-    var readStereoFeatures = !options.noStereo;
-    return fromSmiles_0(smiles, createCoordinates, readStereoFeatures);
-  }
-  function fromSmiles_0(smiles, createCoordinates, readStereoFeatures) {
-    var mol, parser;
-    parser = new SmilesParser2();
-    mol = new JSMolecule();
-    parser.parse_9(mol.oclMolecule, getBytes___B__devirtual$(smiles), createCoordinates, readStereoFeatures);
-    return mol;
+    var parser = new JSSmilesParser(options);
+    return parser.parseMolecule(smiles, options);
   }
   function getAngle_3(x1, y1, x2, y2) {
     $clinit_JSMolecule();
@@ -48269,7 +48260,7 @@ function getExports($wnd) {
     $clinit_JSMolecule();
     setDefaultAverageBondLength(defaultAVBL);
   }
-  defineClass(46, 1, { 46: 1, 1: 1 }, JSMolecule, JSMolecule_0, JSMolecule_1);
+  defineClass(48, 1, { 48: 1, 1: 1 }, JSMolecule, JSMolecule_0, JSMolecule_1);
   _.$init_174 = function $init_174() {
   };
   _.addAtom = function addAtom_3(atomicNo) {
@@ -48639,7 +48630,7 @@ function getExports($wnd) {
   _.getFragments = function getFragments_2() {
     var fragments, i, newFragments;
     fragments = this.oclMolecule.getFragments_0();
-    newFragments = initUnidimensionalArray(Lcom_actelion_research_gwt_js_api_JSMolecule_2_classLit, { 192: 1, 4: 1, 1: 1, 7: 1 }, 46, fragments.length, 0, 1);
+    newFragments = initUnidimensionalArray(Lcom_actelion_research_gwt_js_api_JSMolecule_2_classLit, { 192: 1, 4: 1, 1: 1, 7: 1 }, 48, fragments.length, 0, 1);
     for (i = 0; i < fragments.length; i++) {
       setCheck(newFragments, i, new JSMolecule_1(fragments[i]));
     }
@@ -48769,13 +48760,29 @@ function getExports($wnd) {
   _.invalidateHelperArrays = function invalidateHelperArrays_0(helperBits) {
     this.oclMolecule.invalidateHelperArrays_0(helperBits);
   };
-  _.inventCoordinates = function inventCoordinates_1() {
+  _.inventCoordinates_1 = function inventCoordinates_1(mode, seed) {
     var inventor;
-    inventor = new CoordinateInventor();
-    inventor.setRandomSeed_0(0);
+    inventor = new CoordinateInventor(mode);
+    if (seed >= 0) {
+      inventor.setRandomSeed_0(fromInt_0(seed));
+    }
     inventor.invent(this.oclMolecule);
     this.oclMolecule.setStereoBondsFromParity_0();
   };
+  _.inventCoordinates = function inventCoordinates_2(options) {
+    options = options || {};
+    var mode = 0;
+    if (options.skipDefaultTemplates)
+      mode |= 1;
+    if (options.keepHydrogens !== true)
+      mode |= 2;
+    if (options.keepMarkedAtomCoordinates)
+      mode |= 4;
+    if (options.preferMarkedAtomCoordinates)
+      mode |= 8;
+    var seed = options.seed || 0;
+    this.inventCoordinates_1(mode, seed);
+  };
   _.is3D = function is3D_0() {
     return this.oclMolecule.is3D_0();
   };
@@ -49142,7 +49149,7 @@ function getExports($wnd) {
     }
     mol = degenerated ? this.oclMolecule.getCompactCopy_0() : this.oclMolecule;
     if (degenerated) {
-      new CoordinateInventor_0(0).invent(mol);
+      new CoordinateInventor(0).invent(mol);
     }
     mol.ensureHelperArrays_0(95);
     viewMode = getDepictorViewMode(options);
@@ -49182,7 +49189,7 @@ function getExports($wnd) {
     this.oclMolecule.zoomAndRotateInit_0(x_0, y_0);
   };
   var CANONIZER_ASSIGN_PARITIES_TO_TETRAHEDRAL_N = 32, CANONIZER_CONSIDER_DIASTEREOTOPICITY = 2, CANONIZER_CONSIDER_ENANTIOTOPICITY = 4, CANONIZER_CONSIDER_STEREOHETEROTOPICITY = 0, CANONIZER_COORDS_ARE_3D = 64, CANONIZER_CREATE_PSEUDO_STEREO_GROUPS = 128, CANONIZER_CREATE_SYMMETRY_RANK = 1, CANONIZER_DISTINGUISH_RACEMIC_OR_GROUPS = 256, CANONIZER_ENCODE_ATOM_CUSTOM_LABELS = 8, CANONIZER_ENCODE_ATOM_CUSTOM_LABELS_WITHOUT_RANKING = 1024, CANONIZER_ENCODE_ATOM_SELECTION = 16, CANONIZER_NEGLECT_ANY_STEREO_INFORMATION = 2048, CANONIZER_TIE_BREAK_FREE_VALENCE_ATOMS = 512, FISCHER_PROJECTION_LIMIT_0 = 0, FISCHER_PROJECTION_RING_LIMIT_0 = 24, STEREO_ANGLE_LIMIT = 0, VALIDATION_ERRORS_STEREO_0, VALIDATION_ERROR_AMBIGUOUS_CONFIGURATION_0 = "Ambiguous configuration at stereo center because of 2 parallel bonds", VALIDATION_ERROR_ESR_CENTER_UNKNOWN_0 = "Members of ESR groups must only be stereo centers with known configuration.", VALIDATION_ERROR_OVER_UNDER_SPECIFIED_0 = "Over- or under-specified stereo feature or more than one racemic type bond", cAtomCIPParityNone_0 = 0, cAtomCIPParityProblem_0 = 3, cAtomCIPParityRorM_0 = 1, cAtomCIPParitySorP_0 = 2, cAtomColorBlue_0 = 64, cAtomColorDarkGreen_0 = 384, cAtomColorDarkRed_0 = 448, cAtomColorGreen_0 = 192, cAtomColorMagenta_0 = 256, cAtomColorNone_0 = 0, cAtomColorOrange_0 = 320, cAtomColorRed_0 = 128, cAtomLabel_0, cAtomParity1_0 = 1, cAtomParity2_0 = 2, cAtomParityIsPseudo_0 = 4, cAtomParityNone_0 = 0, cAtomParityUnknown_0 = 3, cAtomQFAny_0 = 1, cAtomQFAromState_0 = { l: 6, m: 0, h: 4 }, cAtomQFAromStateBits_0 = 2, cAtomQFAromStateShift_0 = 1, cAtomQFAromatic_0 = 2, cAtomQFCharge_0 = 234881024, cAtomQFChargeBits_0 = 3, cAtomQFChargeShift_0 = 25, cAtomQFDepictedFeatures_0 = { l: 4186111, m: 4193407, h: 127 }, cAtomQFENeighbourBits_0 = 5, cAtomQFENeighbourShift_0 = 39, cAtomQFENeighbours_0 = 17042430230528, cAtomQFExcludeGroup_0 = 536870912, cAtomQFFlatNitrogen_0 = 268435456, cAtomQFHeteroAromatic_0 = { l: 0, m: 0, h: 4 }, cAtomQFHydrogen_0 = 1920, cAtomQFHydrogenBits_0 = 4, cAtomQFHydrogenShift_0 = 7, cAtomQFIsNotStereo_0 = { l: 0, m: 0, h: 2 }, cAtomQFIsStereo_0 = { l: 0, m: 0, h: 1 }, cAtomQFMatchStereo_0 = 8192, cAtomQFMoreNeighbours_0 = 4096, cAtomQFNarrowing_0 = { l: 4194302, m: 4193343, h: 7 }, cAtomQFNeighbourBits_0 = 5, cAtomQFNeighbourShift_0 = 17, cAtomQFNeighbours_0 = 4063232, cAtomQFNewRingSize_0 = 545460846592, cAtomQFNewRingSizeBits_0 = 7, cAtomQFNewRingSizeShift_0 = 32, cAtomQFNoMoreNeighbours_0 = 2048, cAtomQFNoOfBits_0 = 46, cAtomQFNot0ENeighbours_0 = 549755813888, cAtomQFNot0Hydrogen_0 = 128, cAtomQFNot0Neighbours_0 = 131072, cAtomQFNot0PiElectrons_0 = 16384, cAtomQFNot1ENeighbour_0 = 1099511627776, cAtomQFNot1Hydrogen_0 = 256, cAtomQFNot1Neighbour_0 = 262144, cAtomQFNot1PiElectron_0 = 32768, cAtomQFNot2ENeighbours_0 = 2199023255552, cAtomQFNot2Hydrogen_0 = 512, cAtomQFNot2Neighbours_0 = 524288, cAtomQFNot2PiElectrons_0 = 65536, cAtomQFNot2RingBonds_0 = 16, cAtomQFNot3ENeighbours_0 = 4398046511104, cAtomQFNot3Hydrogen_0 = 1024, cAtomQFNot3Neighbours_0 = 1048576, cAtomQFNot3RingBonds_0 = 32, cAtomQFNot4ENeighbours_0 = 8796093022208, cAtomQFNot4Neighbours_0 = 2097152, cAtomQFNot4RingBonds_0 = 64, cAtomQFNotAromatic_0 = 4, cAtomQFNotChain_0 = 8, cAtomQFNotCharge0_0 = 67108864, cAtomQFNotChargeNeg_0 = 33554432, cAtomQFNotChargePos_0 = 134217728, cAtomQFPiElectronBits_0 = 3, cAtomQFPiElectronShift_0 = 14, cAtomQFPiElectrons_0 = 114688, cAtomQFRingSize0_0 = 4294967296, cAtomQFRingSize3_0 = 8589934592, cAtomQFRingSize4_0 = 17179869184, cAtomQFRingSize5_0 = 34359738368, cAtomQFRingSize6_0 = 68719476736, cAtomQFRingSize7_0 = 137438953472, cAtomQFRingSizeLarge_0 = 274877906944, cAtomQFRingState_0 = 120, cAtomQFRingStateBits_0 = 4, cAtomQFRingStateShift_0 = 3, cAtomQFRxnParityBits_0 = 2, cAtomQFRxnParityHint_0 = 3221225472, cAtomQFRxnParityInvert_0 = 2147483648, cAtomQFRxnParityRacemize_0 = 3221225472, cAtomQFRxnParityRetain_0 = 1073741824, cAtomQFRxnParityShift_0 = 30, cAtomQFSimpleFeatures_0 = { l: 4179966, m: 4063288, h: 7 }, cAtomQFSmallRingSize_0 = 29360128, cAtomQFSmallRingSizeBits_0 = 3, cAtomQFSmallRingSizeShift_0 = 22, cAtomQFStereoState_0 = { l: 0, m: 0, h: 3 }, cAtomQFStereoStateBits_0 = 2, cAtomQFStereoStateShift_0 = 44, cAtomRadicalState_0 = 48, cAtomRadicalStateD_0 = 32, cAtomRadicalStateNone_0 = 0, cAtomRadicalStateS_0 = 16, cAtomRadicalStateShift_0 = 4, cAtomRadicalStateT_0 = 48, cAtomValence_0, cBondCIPParityEorP_0 = 1, cBondCIPParityNone_0 = 0, cBondCIPParityProblem_0 = 3, cBondCIPParityZorM_0 = 2, cBondFlagsHelper2_0 = 704, cBondFlagsHelper3_0 = 63, cBondParityEor1_0 = 1, cBondParityNone_0 = 0, cBondParityUnknown_0 = 3, cBondParityZor2_0 = 2, cBondQFAllFeatures_0 = 16777215, cBondQFAromState_0 = 6291456, cBondQFAromStateBits_0 = 2, cBondQFAromStateShift_0 = 21, cBondQFAromatic_0 = 2097152, cBondQFBondTypes_0 = 31, cBondQFBondTypesBits_0 = 5, cBondQFBondTypesShift_0 = 0, cBondQFBridge_0 = 130560, cBondQFBridgeBits_0 = 8, cBondQFBridgeMin_0 = 7680, cBondQFBridgeMinBits_0 = 4, cBondQFBridgeMinShift_0 = 9, cBondQFBridgeShift_0 = 9, cBondQFBridgeSpan_0 = 122880, cBondQFBridgeSpanBits_0 = 4, cBondQFBridgeSpanShift_0 = 13, cBondQFDelocalized = 8, cBondQFDepictedFeatures_0 = 8388480, cBondQFDouble = 2, cBondQFMatchFormalOrder_0 = 8388608, cBondQFMatchStereo_0 = 1048576, cBondQFMetalLigand = 16, cBondQFNarrowing_0 = 6291840, cBondQFNoOfBits_0 = 23, cBondQFNotAromatic_0 = 4194304, cBondQFNotRing_0 = 128, cBondQFQuadruple = 32, cBondQFQuintuple = 64, cBondQFRareBondTypes_0 = 96, cBondQFRareBondTypesBits_0 = 2, cBondQFRareBondTypesShift_0 = 5, cBondQFRing_0 = 256, cBondQFRingSize_0 = 917504, cBondQFRingSizeBits_0 = 3, cBondQFRingSizeShift_0 = 17, cBondQFRingState_0 = 384, cBondQFRingStateBits_0 = 2, cBondQFRingStateShift_0 = 7, cBondQFSimpleFeatures_0 = 6291967, cBondQFSingle = 1, cBondQFTriple = 4, cBondTypeCross_0 = 386, cBondTypeDeleted_0 = 512, cBondTypeDelocalized_0 = 8, cBondTypeDouble_0 = 2, cBondTypeDown_0 = 129, cBondTypeIncreaseOrder_0 = 511, cBondTypeMaskSimple_0 = 127, cBondTypeMaskStereo_0 = 384, cBondTypeMetalLigand_0 = 16, cBondTypeQuadruple_0 = 32, cBondTypeQuintuple_0 = 64, cBondTypeSingle_0 = 1, cBondTypeTriple_0 = 4, cBondTypeUp_0 = 257, cChiralityDiastereomers_0 = 458752, cChiralityEpimers_0 = 393216, cChiralityIsomerCountMask_0 = 65535, cChiralityKnownEnantiomer_0 = 262144, cChiralityMeso_0 = 131072, cChiralityNotChiral_0 = 65536, cChiralityRacemic_0 = 196608, cChiralityUnknown_0 = 0, cChiralityUnknownEnantiomer_0 = 327680, cCommonOxidationState_0, cDefaultAVBL_0 = 24, cDefaultAllowedPseudoAtoms_0 = 0, cDefaultAtomValence_0 = 6, cESRGroupBits_0 = 5, cESRMaxGroups_0 = 32, cESRTypeAbs_0 = 0, cESRTypeAnd_0 = 1, cESRTypeOr_0 = 2, cHelperAll_0 = 255, cHelperBitCIP_0 = 16, cHelperBitIncludeNitrogenParities_0 = 128, cHelperBitNeighbours_0 = 1, cHelperBitParities_0 = 8, cHelperBitRings_0 = 4, cHelperBitRingsSimple_0 = 2, cHelperBitSymmetrySimple_0 = 32, cHelperBitSymmetryStereoHeterotopicity_0 = 64, cHelperBitsStereo_0 = 248, cHelperCIP_0 = 0, cHelperNeighbours_0 = 1, cHelperNone_0 = 0, cHelperParities_0 = 0, cHelperRings_0 = 0, cHelperRingsSimple_0 = 0, cHelperSymmetrySimple_0 = 0, cHelperSymmetryStereoHeterotopicity_0 = 0, cMaxAtomicNo_0 = 190, cMaxConnAtoms_0 = 16, cMoleculeColorDefault_0 = 0, cMoleculeColorNeutral_0 = 1, cPseudoAtomA_0 = 16, cPseudoAtomAttachmentPoint_0 = 256, cPseudoAtomPolymer_0 = 128, cPseudoAtomR_0 = 8, cPseudoAtomX_0 = 32, cPseudoAtomsAGroups_0 = 4, cPseudoAtomsAll_0 = 511, cPseudoAtomsAminoAcids_0 = 64, cPseudoAtomsHydrogenIsotops_0 = 1, cPseudoAtomsRGroups_0 = 2, cRoundedMass_0, rectangle;
-  var Lcom_actelion_research_gwt_js_api_JSMolecule_2_classLit = createForClass("com.actelion.research.gwt.js.api", "JSMolecule", 46, Ljava_lang_Object_2_classLit);
+  var Lcom_actelion_research_gwt_js_api_JSMolecule_2_classLit = createForClass("com.actelion.research.gwt.js.api", "JSMolecule", 48, Ljava_lang_Object_2_classLit);
   function $clinit_JSMoleculeProperties() {
     $clinit_JSMoleculeProperties = emptyMethod;
     $clinit_PropertyCalculator();
@@ -49304,7 +49311,7 @@ function getExports($wnd) {
     parser = new RXNFileParser();
     return new JSReaction(parser.getReaction_1(rxn));
   }
-  function fromSmiles_1(smiles) {
+  function fromSmiles_0(smiles) {
     $clinit_JSReaction();
     var reaction;
     reaction = new SmilesParser2().parseReaction_1(getBytes___B__devirtual$(smiles));
@@ -49499,9 +49506,9 @@ function getExports($wnd) {
     var i, j, jsProducts, products;
     products = this.reactor.getProducts_1();
     if (jsEquals(products, null) || products.length == 0) {
-      return initMultidimensionalArray(Lcom_actelion_research_gwt_js_api_JSMolecule_2_classLit, [{ 4: 1, 1: 1, 7: 1 }, { 192: 1, 4: 1, 1: 1, 7: 1 }], [192, 46], 0, [0, 0], 2);
+      return initMultidimensionalArray(Lcom_actelion_research_gwt_js_api_JSMolecule_2_classLit, [{ 4: 1, 1: 1, 7: 1 }, { 192: 1, 4: 1, 1: 1, 7: 1 }], [192, 48], 0, [0, 0], 2);
     }
-    jsProducts = initMultidimensionalArray(Lcom_actelion_research_gwt_js_api_JSMolecule_2_classLit, [{ 4: 1, 1: 1, 7: 1 }, { 192: 1, 4: 1, 1: 1, 7: 1 }], [192, 46], 0, [products.length, products[0].length], 2);
+    jsProducts = initMultidimensionalArray(Lcom_actelion_research_gwt_js_api_JSMolecule_2_classLit, [{ 4: 1, 1: 1, 7: 1 }, { 192: 1, 4: 1, 1: 1, 7: 1 }], [192, 48], 0, [products.length, products[0].length], 2);
     for (i = 0; i < products.length; i++) {
       for (j = 0; j < products[0].length; j++) {
         setCheck(jsProducts[i], j, new JSMolecule_1(products[i][j]));
@@ -50080,7 +50087,7 @@ function getExports($wnd) {
   _.$init_190 = function $init_190() {
   };
   _.eventHappened_0 = function eventHappened_15(e) {
-    this.eventHappened_6(castTo(e, 89));
+    this.eventHappened_6(castTo(e, 88));
   };
   _.eventHappened_6 = function eventHappened_14(e) {
     this.this$01.callJsEventListener(e.getWhat(), e.isUserChange());
@@ -50093,7 +50100,7 @@ function getExports($wnd) {
     $clinit_JSEditorArea$lambda$0$Type();
     this.$$outer_0 = $$outer_0;
   }
-  defineClass(340, 1, { 1: 1, 132: 1 }, JSEditorArea$lambda$0$Type);
+  defineClass(340, 1, { 1: 1, 131: 1 }, JSEditorArea$lambda$0$Type);
   _.run = function run_0() {
     this.$$outer_0.lambda$0_5();
   };
@@ -50183,7 +50190,7 @@ function getExports($wnd) {
     $clinit_JSEditorToolbar$lambda$0$Type();
     this.$$outer_0 = $$outer_0;
   }
-  defineClass(355, 1, { 1: 1, 132: 1 }, JSEditorToolbar$lambda$0$Type);
+  defineClass(355, 1, { 1: 1, 131: 1 }, JSEditorToolbar$lambda$0$Type);
   _.run = function run_1() {
     this.$$outer_0.lambda$0_6();
   };
@@ -50560,7 +50567,7 @@ function getExports($wnd) {
     this.$init_198();
     this.mJsContext = jsContext;
   }
-  defineClass(242, 1, { 90: 1, 1: 1 }, JSDrawContext);
+  defineClass(242, 1, { 89: 1, 1: 1 }, JSDrawContext);
   _.$init_198 = function $init_198() {
   };
   _.clearRect_0 = function clearRect(x_0, y_0, w, h) {
@@ -51571,7 +51578,7 @@ function getExports($wnd) {
     $clinit_CodeDownloadException$Reason();
     return stampJavaTypeInfo(getClassLiteralForArray(Lcom_google_gwt_core_client_CodeDownloadException$Reason_2_classLit, 1), { 4: 1, 1: 1, 7: 1 }, 227, 0, [TERMINATED]);
   }
-  defineClass(227, 48, { 227: 1, 4: 1, 24: 1, 48: 1, 1: 1 }, CodeDownloadException$Reason);
+  defineClass(227, 47, { 227: 1, 4: 1, 24: 1, 47: 1, 1: 1 }, CodeDownloadException$Reason);
   _.$init_211 = function $init_211() {
   };
   var TERMINATED;
@@ -54200,15 +54207,15 @@ function getExports($wnd) {
     Object_0.call(this);
     this.$init_251();
   }
-  defineClass(92, 1, { 92: 1, 1: 1 });
+  defineClass(91, 1, { 91: 1, 1: 1 });
   _.$init_251 = function $init_251() {
   };
   _.equals_0 = function equals_20(obj) {
     var p2d;
     if (maskUndefined(this) === maskUndefined(obj))
       return true;
-    if (instanceOf(obj, 92)) {
-      p2d = castTo(obj, 92);
+    if (instanceOf(obj, 91)) {
+      p2d = castTo(obj, 91);
       return this.getX_2() == p2d.getX_2() && this.getY_2() == p2d.getY_2();
     }
     return getClassPrototype(1).equals_0.call(this, obj);
@@ -54218,7 +54225,7 @@ function getExports($wnd) {
     sum = this.getX_2() + this.getY_2();
     return round_int(sum) * 37;
   };
-  var Ljava_awt_geom_Point2D_2_classLit = createForClass("java.awt.geom", "Point2D", 92, Ljava_lang_Object_2_classLit);
+  var Ljava_awt_geom_Point2D_2_classLit = createForClass("java.awt.geom", "Point2D", 91, Ljava_lang_Object_2_classLit);
   function $clinit_Point() {
     $clinit_Point = emptyMethod;
     $clinit_Point2D();
@@ -54233,7 +54240,7 @@ function getExports($wnd) {
     this.x_0 = x_0;
     this.y_0 = y_0;
   }
-  defineClass(165, 92, { 165: 1, 92: 1, 1: 1 }, Point);
+  defineClass(165, 91, { 165: 1, 91: 1, 1: 1 }, Point);
   _.$init_252 = function $init_252() {
   };
   _.equals_0 = function equals_21(obj) {
@@ -54242,7 +54249,7 @@ function getExports($wnd) {
       pt = castTo(obj, 165);
       return this.x_0 == pt.x_0 && this.y_0 == pt.y_0;
     }
-    return getClassPrototype(92).equals_0.call(this, obj);
+    return getClassPrototype(91).equals_0.call(this, obj);
   };
   _.getX_2 = function getX_5() {
     return this.x_0;
@@ -54286,7 +54293,7 @@ function getExports($wnd) {
     this.x_0 = x_0;
     this.y_0 = y_0;
   }
-  defineClass(177, 92, { 92: 1, 177: 1, 4: 1, 1: 1 }, Point2D$Double, Point2D$Double_0);
+  defineClass(177, 91, { 91: 1, 177: 1, 4: 1, 1: 1 }, Point2D$Double, Point2D$Double_0);
   _.$init_254 = function $init_254() {
   };
   _.getX_2 = function getX_6() {
@@ -54301,7 +54308,7 @@ function getExports($wnd) {
   function $clinit_Point2D$Float() {
     $clinit_Point2D$Float = emptyMethod;
   }
-  defineClass(806, 92, { 92: 1, 1: 1 });
+  defineClass(806, 91, { 91: 1, 1: 1 });
   var Ljava_awt_geom_Point2D$Float_2_classLit = createForClass("java.awt.geom", "Point2D/Float", 806, Ljava_awt_geom_Point2D_2_classLit);
   function $clinit_RectangularShape() {
     $clinit_RectangularShape = emptyMethod;
@@ -54325,7 +54332,7 @@ function getExports($wnd) {
     RectangularShape.call(this);
     this.$init_256();
   }
-  defineClass(147, 484, { 147: 1, 1: 1 });
+  defineClass(146, 484, { 146: 1, 1: 1 });
   _.$init_256 = function $init_256() {
   };
   _.contains_0 = function contains_9(x_0, y_0) {
@@ -54339,8 +54346,8 @@ function getExports($wnd) {
     if (maskUndefined(obj) === maskUndefined(this)) {
       return true;
     }
-    if (instanceOf(obj, 147)) {
-      r2d = castTo(obj, 147);
+    if (instanceOf(obj, 146)) {
+      r2d = castTo(obj, 146);
       return this.getX_2() == r2d.getX_2() && this.getY_2() == r2d.getY_2() && this.getWidth_0() == r2d.getWidth_0() && this.getHeight_0() == r2d.getHeight_0();
     }
     return false;
@@ -54354,7 +54361,7 @@ function getExports($wnd) {
     return toInt_0(bits) ^ toInt_0(shr_0(bits, 32));
   };
   var OUT_BOTTOM = 8, OUT_LEFT = 1, OUT_RIGHT = 4, OUT_TOP = 2;
-  var Ljava_awt_geom_Rectangle2D_2_classLit = createForClass("java.awt.geom", "Rectangle2D", 147, Ljava_awt_geom_RectangularShape_2_classLit);
+  var Ljava_awt_geom_Rectangle2D_2_classLit = createForClass("java.awt.geom", "Rectangle2D", 146, Ljava_awt_geom_RectangularShape_2_classLit);
   function $clinit_Rectangle2D$Double() {
     $clinit_Rectangle2D$Double = emptyMethod;
     $clinit_Rectangle2D();
@@ -54365,7 +54372,7 @@ function getExports($wnd) {
     this.$init_257();
     this.setRect(x_0, y_0, w, h);
   }
-  defineClass(486, 147, { 147: 1, 1: 1 }, Rectangle2D$Double);
+  defineClass(486, 146, { 146: 1, 1: 1 }, Rectangle2D$Double);
   _.$init_257 = function $init_257() {
   };
   _.getHeight_0 = function getHeight_4() {
@@ -54397,7 +54404,7 @@ function getExports($wnd) {
   function $clinit_Rectangle2D$Float() {
     $clinit_Rectangle2D$Float = emptyMethod;
   }
-  defineClass(840, 147, { 147: 1, 1: 1 });
+  defineClass(840, 146, { 146: 1, 1: 1 });
   var Ljava_awt_geom_Rectangle2D$Float_2_classLit = createForClass("java.awt.geom", "Rectangle2D/Float", 840, Ljava_awt_geom_Rectangle2D_2_classLit);
   function $clinit_BufferedImage() {
     $clinit_BufferedImage = emptyMethod;
@@ -55005,7 +55012,7 @@ function getExports($wnd) {
     this.$init_272();
     this.string = string;
   }
-  defineClass(155, 1, { 153: 1, 1: 1 });
+  defineClass(154, 1, { 152: 1, 1: 1 });
   _.$init_272 = function $init_272() {
   };
   _.chars = function chars_0() {
@@ -55069,7 +55076,7 @@ function getExports($wnd) {
   _.toString_0 = function toString_31() {
     return this.string;
   };
-  var Ljava_lang_AbstractStringBuilder_2_classLit = createForClass("java.lang", "AbstractStringBuilder", 155, Ljava_lang_Object_2_classLit);
+  var Ljava_lang_AbstractStringBuilder_2_classLit = createForClass("java.lang", "AbstractStringBuilder", 154, Ljava_lang_Object_2_classLit);
   function $clinit_ArithmeticException() {
     $clinit_ArithmeticException = emptyMethod;
     $clinit_RuntimeException();
@@ -55136,11 +55143,11 @@ function getExports($wnd) {
   function valueOf_7(b) {
     return get_18(b);
   }
-  defineClass(137, 19, { 4: 1, 137: 1, 24: 1, 19: 1, 1: 1 }, Byte);
+  defineClass(136, 19, { 4: 1, 136: 1, 24: 1, 19: 1, 1: 1 }, Byte);
   _.$init_280 = function $init_280() {
   };
   _.compareTo_1 = function compareTo_26(b) {
-    return this.compareTo_13(castTo(b, 137));
+    return this.compareTo_13(castTo(b, 136));
   };
   _.byteValue = function byteValue_0() {
     return this.value_0;
@@ -55152,7 +55159,7 @@ function getExports($wnd) {
     return this.value_0;
   };
   _.equals_0 = function equals_23(o) {
-    return instanceOf(o, 137) && castTo(o, 137).value_0 == this.value_0;
+    return instanceOf(o, 136) && castTo(o, 136).value_0 == this.value_0;
   };
   _.floatValue = function floatValue() {
     return this.value_0;
@@ -55174,11 +55181,11 @@ function getExports($wnd) {
   };
   _.value_0 = 0;
   var BYTES = 0, MAX_VALUE_0 = 0, MIN_VALUE_0 = 0, SIZE = 8, TYPE_0;
-  var Ljava_lang_Byte_2_classLit = createForClass("java.lang", "Byte", 137, Ljava_lang_Number_2_classLit);
+  var Ljava_lang_Byte_2_classLit = createForClass("java.lang", "Byte", 136, Ljava_lang_Number_2_classLit);
   function $clinit_Byte$BoxedValues() {
     $clinit_Byte$BoxedValues = emptyMethod;
     $clinit_Object();
-    boxedValues = initUnidimensionalArray(Ljava_lang_Byte_2_classLit, { 4: 1, 1: 1, 7: 1 }, 137, 256, 0, 1);
+    boxedValues = initUnidimensionalArray(Ljava_lang_Byte_2_classLit, { 4: 1, 1: 1, 7: 1 }, 136, 256, 0, 1);
   }
   function get_18(b) {
     $clinit_Byte$BoxedValues();
@@ -55579,7 +55586,7 @@ function getExports($wnd) {
   function $clinit_Character$CharSequenceAdapter() {
     $clinit_Character$CharSequenceAdapter = emptyMethod;
   }
-  defineClass(649, 1, { 153: 1, 1: 1 });
+  defineClass(649, 1, { 152: 1, 1: 1 });
   var Ljava_lang_Character$CharSequenceAdapter_2_classLit = createForClass("java.lang", "Character/CharSequenceAdapter", 649, Ljava_lang_Object_2_classLit);
   function $clinit_Float() {
     $clinit_Float = emptyMethod;
@@ -55984,10 +55991,10 @@ function getExports($wnd) {
     $clinit_NumberFormatException();
     return new NumberFormatException("radix " + radix + " out of range");
   }
-  defineClass(47, 63, { 4: 1, 12: 1, 47: 1, 1: 1, 22: 1, 18: 1 }, NumberFormatException);
+  defineClass(46, 63, { 4: 1, 12: 1, 46: 1, 1: 1, 22: 1, 18: 1 }, NumberFormatException);
   _.$init_294 = function $init_294() {
   };
-  var Ljava_lang_NumberFormatException_2_classLit = createForClass("java.lang", "NumberFormatException", 47, Ljava_lang_IllegalArgumentException_2_classLit);
+  var Ljava_lang_NumberFormatException_2_classLit = createForClass("java.lang", "NumberFormatException", 46, Ljava_lang_IllegalArgumentException_2_classLit);
   function $clinit_Short() {
     $clinit_Short = emptyMethod;
     $clinit_Number();
@@ -56300,7 +56307,7 @@ function getExports($wnd) {
     AbstractStringBuilder.call(this, "");
     this.$init_301();
   }
-  defineClass(97, 155, { 153: 1, 1: 1 }, StringBuffer, StringBuffer_0);
+  defineClass(97, 154, { 152: 1, 1: 1 }, StringBuffer, StringBuffer_0);
   _.$init_301 = function $init_301() {
   };
   _.append_0 = function append_0(x_0) {
@@ -56339,7 +56346,7 @@ function getExports($wnd) {
     AbstractStringBuilder.call(this, castToString(checkNotNull_0(s)));
     this.$init_302();
   }
-  defineClass(25, 155, { 153: 1, 1: 1 }, StringBuilder, StringBuilder_0, StringBuilder_1);
+  defineClass(25, 154, { 152: 1, 1: 1 }, StringBuilder, StringBuilder_0, StringBuilder_1);
   _.$init_302 = function $init_302() {
   };
   _.append_4 = function append_4(x_0) {
@@ -58217,11 +58224,11 @@ function getExports($wnd) {
     this.precision = precision;
     this.roundingMode = roundingMode;
   }
-  defineClass(94, 1, { 4: 1, 1: 1, 94: 1 }, MathContext, MathContext_0);
+  defineClass(93, 1, { 4: 1, 1: 1, 93: 1 }, MathContext, MathContext_0);
   _.$init_307 = function $init_307() {
   };
   _.equals_0 = function equals_33(x_0) {
-    return instanceOf(x_0, 94) && castTo(x_0, 94).getPrecision() == this.precision && jsEquals(castTo(x_0, 94).getRoundingMode(), this.roundingMode);
+    return instanceOf(x_0, 93) && castTo(x_0, 93).getPrecision() == this.precision && jsEquals(castTo(x_0, 93).getRoundingMode(), this.roundingMode);
   };
   _.getPrecision = function getPrecision() {
     return this.precision;
@@ -58237,7 +58244,7 @@ function getExports($wnd) {
   };
   _.precision = 0;
   var DECIMAL128, DECIMAL32, DECIMAL64, UNLIMITED, serialVersionUID_15 = { l: 3539455, m: 1515645, h: 317170 };
-  var Ljava_math_MathContext_2_classLit = createForClass("java.math", "MathContext", 94, Ljava_lang_Object_2_classLit);
+  var Ljava_math_MathContext_2_classLit = createForClass("java.math", "MathContext", 93, Ljava_lang_Object_2_classLit);
   function $clinit_Multiplication() {
     $clinit_Multiplication = emptyMethod;
     var fivePow, i;
@@ -58480,13 +58487,13 @@ function getExports($wnd) {
   }
   function values_5() {
     $clinit_RoundingMode();
-    return stampJavaTypeInfo(getClassLiteralForArray(Ljava_math_RoundingMode_2_classLit, 1), { 4: 1, 1: 1, 7: 1 }, 93, 0, [UP, DOWN, CEILING, FLOOR, HALF_UP, HALF_DOWN, HALF_EVEN, UNNECESSARY]);
+    return stampJavaTypeInfo(getClassLiteralForArray(Ljava_math_RoundingMode_2_classLit, 1), { 4: 1, 1: 1, 7: 1 }, 92, 0, [UP, DOWN, CEILING, FLOOR, HALF_UP, HALF_DOWN, HALF_EVEN, UNNECESSARY]);
   }
-  defineClass(93, 48, { 4: 1, 24: 1, 48: 1, 1: 1, 93: 1 }, RoundingMode);
+  defineClass(92, 47, { 4: 1, 24: 1, 47: 1, 1: 1, 92: 1 }, RoundingMode);
   _.$init_308 = function $init_308() {
   };
   var CEILING, DOWN, FLOOR, HALF_DOWN, HALF_EVEN, HALF_UP, UNNECESSARY, UP;
-  var Ljava_math_RoundingMode_2_classLit = createForEnum("java.math", "RoundingMode", 93, Ljava_lang_Enum_2_classLit, values_5, valueOf_28);
+  var Ljava_math_RoundingMode_2_classLit = createForEnum("java.math", "RoundingMode", 92, Ljava_lang_Enum_2_classLit, values_5, valueOf_28);
   function $clinit_RoundingMode$Map() {
     $clinit_RoundingMode$Map = emptyMethod;
     $MAP_4 = createValueOfMap(values_5());
@@ -58584,10 +58591,10 @@ function getExports($wnd) {
     Object_0.call(this);
     this.$init_311();
   }
-  defineClass(481, 1, { 1: 1 });
+  defineClass(479, 1, { 1: 1 });
   _.$init_311 = function $init_311() {
   };
-  var Ljava_text_NumberFormat_2_classLit = createForClass("java.text", "NumberFormat", 481, Ljava_lang_Object_2_classLit);
+  var Ljava_text_NumberFormat_2_classLit = createForClass("java.text", "NumberFormat", 479, Ljava_lang_Object_2_classLit);
   function $clinit_DecimalFormat() {
     $clinit_DecimalFormat = emptyMethod;
     $clinit_NumberFormat();
@@ -58602,7 +58609,7 @@ function getExports($wnd) {
     $clinit_DecimalFormat();
     DecimalFormat.call(this, pattern);
   }
-  defineClass(146, 481, { 1: 1 }, DecimalFormat, DecimalFormat_0);
+  defineClass(145, 479, { 1: 1 }, DecimalFormat, DecimalFormat_0);
   _.$init_312 = function $init_312() {
   };
   _.format = function format_0(number) {
@@ -58622,7 +58629,7 @@ function getExports($wnd) {
     return result[1].length;
   };
   _.numDigits = 0;
-  var Ljava_text_DecimalFormat_2_classLit = createForClass("java.text", "DecimalFormat", 146, Ljava_text_NumberFormat_2_classLit);
+  var Ljava_text_DecimalFormat_2_classLit = createForClass("java.text", "DecimalFormat", 145, Ljava_text_NumberFormat_2_classLit);
   function $clinit_DecimalFormatSymbols() {
     $clinit_DecimalFormatSymbols = emptyMethod;
     $clinit_Object();
@@ -58804,7 +58811,7 @@ function getExports($wnd) {
     $clinit_AbstractMap();
     return isNull(entry) ? null : entry.getValue_0();
   }
-  defineClass(140, 1, { 1: 1, 55: 1 });
+  defineClass(139, 1, { 1: 1, 55: 1 });
   _.$init_314 = function $init_314() {
   };
   _.compute = function compute(key, remappingFunction) {
@@ -58952,7 +58959,7 @@ function getExports($wnd) {
   _.values = function values_6() {
     return new AbstractMap$2(this);
   };
-  var Ljava_util_AbstractMap_2_classLit = createForClass("java.util", "AbstractMap", 140, Ljava_lang_Object_2_classLit);
+  var Ljava_util_AbstractMap_2_classLit = createForClass("java.util", "AbstractMap", 139, Ljava_lang_Object_2_classLit);
   function $clinit_AbstractHashMap() {
     $clinit_AbstractHashMap = emptyMethod;
     $clinit_AbstractMap();
@@ -58974,7 +58981,7 @@ function getExports($wnd) {
     checkArgument_0(alsoIgnored >= 0, "Non-positive load factor");
     this.reset_2();
   }
-  defineClass(205, 140, { 1: 1, 55: 1 });
+  defineClass(205, 139, { 1: 1, 55: 1 });
   _.$init_315 = function $init_315() {
   };
   _.clear = function clear_12() {
@@ -59112,7 +59119,7 @@ function getExports($wnd) {
     AbstractCollection.call(this);
     this.$init_316();
   }
-  defineClass(101, 138, { 1: 1, 30: 1, 58: 1 });
+  defineClass(101, 137, { 1: 1, 30: 1, 58: 1 });
   _.$init_316 = function $init_316() {
   };
   _.spliterator_0 = function spliterator_2() {
@@ -59322,7 +59329,7 @@ function getExports($wnd) {
     this.fromIndex = fromIndex;
     this.size_0 = toIndex - fromIndex;
   }
-  defineClass(406, 139, { 1: 1, 30: 1, 56: 1 }, AbstractList$SubList);
+  defineClass(406, 138, { 1: 1, 30: 1, 56: 1 }, AbstractList$SubList);
   _.$init_321 = function $init_321() {
   };
   _.addAtIndex = function add_25(index_0, element) {
@@ -59426,7 +59433,7 @@ function getExports($wnd) {
     AbstractCollection.call(this);
     this.$init_324();
   }
-  defineClass(412, 138, { 1: 1, 30: 1 }, AbstractMap$2);
+  defineClass(412, 137, { 1: 1, 30: 1 }, AbstractMap$2);
   _.$init_324 = function $init_324() {
   };
   _.clear = function clear_15() {
@@ -59562,7 +59569,7 @@ function getExports($wnd) {
     Object_0.call(this);
     this.$init_329();
   }
-  defineClass(476, 1, { 1: 1, 27: 1 });
+  defineClass(474, 1, { 1: 1, 27: 1 });
   _.$init_329 = function $init_329() {
   };
   _.equals_0 = function equals_38(other) {
@@ -59579,7 +59586,7 @@ function getExports($wnd) {
   _.toString_0 = function toString_58() {
     return this.getKey_0() + "=" + this.getValue_0();
   };
-  var Ljava_util_AbstractMapEntry_2_classLit = createForClass("java.util", "AbstractMapEntry", 476, Ljava_lang_Object_2_classLit);
+  var Ljava_util_AbstractMapEntry_2_classLit = createForClass("java.util", "AbstractMapEntry", 474, Ljava_lang_Object_2_classLit);
   function $clinit_SortedMap() {
     $clinit_SortedMap = emptyMethod;
   }
@@ -59601,7 +59608,7 @@ function getExports($wnd) {
   function copyOf_6(entry) {
     return isNull(entry) ? null : new AbstractMap$SimpleImmutableEntry_0(entry);
   }
-  defineClass(443, 140, { 1: 1, 55: 1 });
+  defineClass(443, 139, { 1: 1, 55: 1 });
   _.$init_330 = function $init_330() {
   };
   _.containsEntry = function containsEntry_0(entry) {
@@ -59776,7 +59783,7 @@ function getExports($wnd) {
     AbstractCollection.call(this);
     this.$init_334();
   }
-  defineClass(418, 138, { 1: 1, 30: 1 });
+  defineClass(418, 137, { 1: 1, 30: 1 });
   _.$init_334 = function $init_334() {
   };
   _.add = function add_26(o) {
@@ -59786,7 +59793,7 @@ function getExports($wnd) {
   _.addAll = function addAll_3(c) {
     checkNotNull_0(c);
     checkArgument_0(jsNotEquals(c, this), "Can't add a queue to itself");
-    return getClassPrototype(138).addAll.call(this, c);
+    return getClassPrototype(137).addAll.call(this, c);
   };
   _.clear = function clear_17() {
     while (jsNotEquals(this.poll(), null)) {
@@ -59821,7 +59828,7 @@ function getExports($wnd) {
   function nextPowerOfTwo(num) {
     return highestOneBit(num) << 1;
   }
-  defineClass(510, 138, { 1: 1, 30: 1 }, ArrayDeque);
+  defineClass(510, 137, { 1: 1, 30: 1 }, ArrayDeque);
   _.$init_335 = function $init_335() {
   };
   _.add = function add_27(e) {
@@ -60333,7 +60340,7 @@ function getExports($wnd) {
     checkNotNull_0(array);
     this.array = array;
   }
-  defineClass(429, 139, { 4: 1, 1: 1, 30: 1, 56: 1, 128: 1 }, Arrays$ArrayList);
+  defineClass(429, 138, { 4: 1, 1: 1, 30: 1, 56: 1, 128: 1 }, Arrays$ArrayList);
   _.$init_338 = function $init_338() {
   };
   _.contains = function contains_17(o) {
@@ -60577,8 +60584,8 @@ function getExports($wnd) {
   function $clinit_BitSet$BitSetSpliterator() {
     $clinit_BitSet$BitSetSpliterator = emptyMethod;
   }
-  defineClass(796, 1, { 1: 1, 20: 1, 51: 1 });
-  var Ljava_util_BitSet$BitSetSpliterator_2_classLit = createForClass("java.util", "BitSet/BitSetSpliterator", 796, Ljava_lang_Object_2_classLit);
+  defineClass(804, 1, { 1: 1, 20: 1, 51: 1 });
+  var Ljava_util_BitSet$BitSetSpliterator_2_classLit = createForClass("java.util", "BitSet/BitSetSpliterator", 804, Ljava_lang_Object_2_classLit);
   function $clinit_Collections() {
     $clinit_Collections = emptyMethod;
     $clinit_Object();
@@ -60668,7 +60675,7 @@ function getExports($wnd) {
     AbstractList.call(this);
     this.$init_340();
   }
-  defineClass(419, 139, { 4: 1, 1: 1, 30: 1, 56: 1, 128: 1 }, Collections$EmptyList);
+  defineClass(419, 138, { 4: 1, 1: 1, 30: 1, 56: 1, 128: 1 }, Collections$EmptyList);
   _.$init_340 = function $init_340() {
   };
   _.contains = function contains_18(object) {
@@ -60724,7 +60731,7 @@ function getExports($wnd) {
     AbstractMap.call(this);
     this.$init_342();
   }
-  defineClass(422, 140, { 4: 1, 1: 1, 55: 1 }, Collections$EmptyMap);
+  defineClass(422, 139, { 4: 1, 1: 1, 55: 1 }, Collections$EmptyMap);
   _.$init_342 = function $init_342() {
   };
   _.containsKey = function containsKey_2(key) {
@@ -60789,7 +60796,7 @@ function getExports($wnd) {
   function $clinit_Collections$SingletonList() {
     $clinit_Collections$SingletonList = emptyMethod;
   }
-  defineClass(743, 139, { 4: 1, 1: 1, 30: 1, 56: 1 });
+  defineClass(743, 138, { 4: 1, 1: 1, 30: 1, 56: 1 });
   var Ljava_util_Collections$SingletonList_2_classLit = createForClass("java.util", "Collections/SingletonList", 743, Ljava_util_AbstractList_2_classLit);
   function $clinit_Collections$UnmodifiableCollection() {
     $clinit_Collections$UnmodifiableCollection = emptyMethod;
@@ -61272,9 +61279,9 @@ function getExports($wnd) {
     $clinit_Comparators();
     return isNull(cmp) ? castTo(INTERNAL_NATURAL_ORDER, 36) : cmp;
   }
-  defineClass(798, 1, { 1: 1 });
+  defineClass(797, 1, { 1: 1 });
   var INTERNAL_NATURAL_ORDER, NATURAL_ORDER, REVERSE_NATURAL_ORDER;
-  var Ljava_util_Comparators_2_classLit = createForClass("java.util", "Comparators", 798, Ljava_lang_Object_2_classLit);
+  var Ljava_util_Comparators_2_classLit = createForClass("java.util", "Comparators", 797, Ljava_lang_Object_2_classLit);
   function $clinit_Comparators$NaturalOrderComparator() {
     $clinit_Comparators$NaturalOrderComparator = emptyMethod;
     $clinit_Object();
@@ -61301,8 +61308,8 @@ function getExports($wnd) {
   function $clinit_Comparators$NullComparator() {
     $clinit_Comparators$NullComparator = emptyMethod;
   }
-  defineClass(800, 1, { 4: 1, 1: 1, 36: 1 });
-  var Ljava_util_Comparators$NullComparator_2_classLit = createForClass("java.util", "Comparators/NullComparator", 800, Ljava_lang_Object_2_classLit);
+  defineClass(799, 1, { 4: 1, 1: 1, 36: 1 });
+  var Ljava_util_Comparators$NullComparator_2_classLit = createForClass("java.util", "Comparators/NullComparator", 799, Ljava_lang_Object_2_classLit);
   function $clinit_Comparators$ReverseNaturalOrderComparator() {
     $clinit_Comparators$ReverseNaturalOrderComparator = emptyMethod;
     $clinit_Object();
@@ -61313,7 +61320,7 @@ function getExports($wnd) {
     Object_0.call(this);
     this.$init_355();
   }
-  defineClass(473, 1, { 4: 1, 1: 1, 36: 1 }, Comparators$ReverseNaturalOrderComparator);
+  defineClass(471, 1, { 4: 1, 1: 1, 36: 1 }, Comparators$ReverseNaturalOrderComparator);
   _.$init_355 = function $init_355() {
   };
   _.compare_0 = function compare_38(a, b) {
@@ -61325,12 +61332,12 @@ function getExports($wnd) {
   _.compare_9 = function compare_37(a, b) {
     return compareTo_Ljava_lang_Object__I__devirtual$_0(castTo(checkNotNull_0(b), 24), checkNotNull_0(a));
   };
-  var Ljava_util_Comparators$ReverseNaturalOrderComparator_2_classLit = createForClass("java.util", "Comparators/ReverseNaturalOrderComparator", 473, Ljava_lang_Object_2_classLit);
+  var Ljava_util_Comparators$ReverseNaturalOrderComparator_2_classLit = createForClass("java.util", "Comparators/ReverseNaturalOrderComparator", 471, Ljava_lang_Object_2_classLit);
   function $clinit_Comparators$ReversedComparator() {
     $clinit_Comparators$ReversedComparator = emptyMethod;
   }
-  defineClass(799, 1, { 4: 1, 1: 1, 36: 1 });
-  var Ljava_util_Comparators$ReversedComparator_2_classLit = createForClass("java.util", "Comparators/ReversedComparator", 799, Ljava_lang_Object_2_classLit);
+  defineClass(798, 1, { 4: 1, 1: 1, 36: 1 });
+  var Ljava_util_Comparators$ReversedComparator_2_classLit = createForClass("java.util", "Comparators/ReversedComparator", 798, Ljava_lang_Object_2_classLit);
   function $clinit_ConcurrentModificationException() {
     $clinit_ConcurrentModificationException = emptyMethod;
     $clinit_RuntimeException();
@@ -61435,7 +61442,7 @@ function getExports($wnd) {
     this.$init_359();
     this.host = host;
   }
-  defineClass(478, 1, { 1: 1 }, InternalHashCodeMap);
+  defineClass(476, 1, { 1: 1 }, InternalHashCodeMap);
   _.$init_359 = function $init_359() {
     this.backingMap = new $wnd.Map();
   };
@@ -61514,7 +61521,7 @@ function getExports($wnd) {
     return this.size_0;
   };
   _.size_0 = 0;
-  var Ljava_util_InternalHashCodeMap_2_classLit = createForClass("java.util", "InternalHashCodeMap", 478, Ljava_lang_Object_2_classLit);
+  var Ljava_util_InternalHashCodeMap_2_classLit = createForClass("java.util", "InternalHashCodeMap", 476, Ljava_lang_Object_2_classLit);
   function $clinit_InternalHashCodeMap$1() {
     $clinit_InternalHashCodeMap$1 = emptyMethod;
     $clinit_Object();
@@ -61526,7 +61533,7 @@ function getExports($wnd) {
     Object_0.call(this);
     this.$init_360();
   }
-  defineClass(479, 1, { 1: 1, 39: 1 }, InternalHashCodeMap$1);
+  defineClass(477, 1, { 1: 1, 39: 1 }, InternalHashCodeMap$1);
   _.$init_360 = function $init_360() {
     this.chains = this.this$01.backingMap.entries();
     this.itemIndex = 0;
@@ -61563,7 +61570,7 @@ function getExports($wnd) {
     }
   };
   _.itemIndex = 0;
-  var Ljava_util_InternalHashCodeMap$1_2_classLit = createForClass("java.util", "InternalHashCodeMap/1", 479, Ljava_lang_Object_2_classLit);
+  var Ljava_util_InternalHashCodeMap$1_2_classLit = createForClass("java.util", "InternalHashCodeMap/1", 477, Ljava_lang_Object_2_classLit);
   function $clinit_InternalJsMap() {
     $clinit_InternalJsMap = emptyMethod;
     $clinit_Object();
@@ -61596,7 +61603,7 @@ function getExports($wnd) {
   function toNullIfUndefined(value_0) {
     return isUndefined(value_0) ? null : value_0;
   }
-  defineClass(474, 1, { 1: 1 }, InternalStringMap);
+  defineClass(472, 1, { 1: 1 }, InternalStringMap);
   _.$init_361 = function $init_361() {
     this.backingMap = new $wnd.Map();
   };
@@ -61648,7 +61655,7 @@ function getExports($wnd) {
   };
   _.size_0 = 0;
   _.valueMod = 0;
-  var Ljava_util_InternalStringMap_2_classLit = createForClass("java.util", "InternalStringMap", 474, Ljava_lang_Object_2_classLit);
+  var Ljava_util_InternalStringMap_2_classLit = createForClass("java.util", "InternalStringMap", 472, Ljava_lang_Object_2_classLit);
   function $clinit_InternalStringMap$1() {
     $clinit_InternalStringMap$1 = emptyMethod;
     $clinit_Object();
@@ -61660,7 +61667,7 @@ function getExports($wnd) {
     Object_0.call(this);
     this.$init_362();
   }
-  defineClass(475, 1, { 1: 1, 39: 1 }, InternalStringMap$1);
+  defineClass(473, 1, { 1: 1, 39: 1 }, InternalStringMap$1);
   _.$init_362 = function $init_362() {
     this.entries_0 = this.this$01.backingMap.entries();
     this.current = this.entries_0.next();
@@ -61682,7 +61689,7 @@ function getExports($wnd) {
   _.remove_2 = function remove_38() {
     this.this$01.remove_6($getKey(this.last));
   };
-  var Ljava_util_InternalStringMap$1_2_classLit = createForClass("java.util", "InternalStringMap/1", 475, Ljava_lang_Object_2_classLit);
+  var Ljava_util_InternalStringMap$1_2_classLit = createForClass("java.util", "InternalStringMap/1", 473, Ljava_lang_Object_2_classLit);
   function $clinit_InternalStringMap$2() {
     $clinit_InternalStringMap$2 = emptyMethod;
     $clinit_AbstractMapEntry();
@@ -61695,7 +61702,7 @@ function getExports($wnd) {
     AbstractMapEntry.call(this);
     this.$init_363();
   }
-  defineClass(477, 476, { 1: 1, 27: 1 }, InternalStringMap$2);
+  defineClass(475, 474, { 1: 1, 27: 1 }, InternalStringMap$2);
   _.$init_363 = function $init_363() {
   };
   _.getKey_0 = function getKey_2() {
@@ -61711,7 +61718,7 @@ function getExports($wnd) {
     return this.this$01.put_1($getKey(this.val$entry2), object);
   };
   _.val$lastValueMod3 = 0;
-  var Ljava_util_InternalStringMap$2_2_classLit = createForClass("java.util", "InternalStringMap/2", 477, Ljava_util_AbstractMapEntry_2_classLit);
+  var Ljava_util_InternalStringMap$2_2_classLit = createForClass("java.util", "InternalStringMap/2", 475, Ljava_util_AbstractMapEntry_2_classLit);
   function $clinit_Locale() {
     $clinit_Locale = emptyMethod;
     $clinit_Object();
@@ -62166,7 +62173,7 @@ function getExports($wnd) {
     this.$init_372();
     this.setSeed_0(seed);
   }
-  defineClass(87, 1, { 1: 1 }, Random, Random_0);
+  defineClass(86, 1, { 1: 1 }, Random, Random_0);
   _.$init_372 = function $init_372() {
     this.haveNextNextGaussian = false;
   };
@@ -62222,7 +62229,7 @@ function getExports($wnd) {
   _.seedhi = 0;
   _.seedlo = 0;
   var multiplierHi = 1502, multiplierLo = 15525485, twoToThe24 = 16777216, twoToThe31 = 2147483648, twoToThe32 = 4294967296, twoToTheMinus24 = 5960464477539063e-23, twoToTheMinus26 = 14901161193847656e-24, twoToTheMinus31 = 4656612873077393e-25, twoToTheMinus53 = 11102230246251565e-32, twoToTheXMinus24, twoToTheXMinus48, uniqueSeed = 0;
-  var Ljava_util_Random_2_classLit = createForClass("java.util", "Random", 87, Ljava_lang_Object_2_classLit);
+  var Ljava_util_Random_2_classLit = createForClass("java.util", "Random", 86, Ljava_lang_Object_2_classLit);
   function $clinit_Spliterators$IteratorSpliterator() {
     $clinit_Spliterators$IteratorSpliterator = emptyMethod;
     $clinit_Object();
@@ -62994,12 +63001,12 @@ function getExports($wnd) {
     this.$init_383();
     this.isRed = isRed;
   }
-  defineClass(143, 207, { 1: 1, 27: 1, 143: 1 }, TreeMap$Node);
+  defineClass(142, 207, { 1: 1, 27: 1, 142: 1 }, TreeMap$Node);
   _.$init_383 = function $init_383() {
-    this.child = initUnidimensionalArray(Ljava_util_TreeMap$Node_2_classLit, { 4: 1, 1: 1, 7: 1 }, 143, 2, 0, 1);
+    this.child = initUnidimensionalArray(Ljava_util_TreeMap$Node_2_classLit, { 4: 1, 1: 1, 7: 1 }, 142, 2, 0, 1);
   };
   _.isRed = false;
-  var Ljava_util_TreeMap$Node_2_classLit = createForClass("java.util", "TreeMap/Node", 143, Ljava_util_AbstractMap$SimpleEntry_2_classLit);
+  var Ljava_util_TreeMap$Node_2_classLit = createForClass("java.util", "TreeMap/Node", 142, Ljava_util_AbstractMap$SimpleEntry_2_classLit);
   function $clinit_TreeMap$State() {
     $clinit_TreeMap$State = emptyMethod;
     $clinit_Object();
@@ -63045,7 +63052,7 @@ function getExports($wnd) {
     $clinit_TreeMap$SubMapType();
     return stampJavaTypeInfo(getClassLiteralForArray(Ljava_util_TreeMap$SubMapType_2_classLit, 1), { 4: 1, 1: 1, 7: 1 }, 102, 0, [All, Head, Range_0, Tail]);
   }
-  defineClass(102, 48, { 4: 1, 24: 1, 48: 1, 1: 1, 102: 1 }, TreeMap$SubMapType);
+  defineClass(102, 47, { 4: 1, 24: 1, 47: 1, 1: 1, 102: 1 }, TreeMap$SubMapType);
   _.$init_385 = function $init_385() {
   };
   _.fromKeyValid = function fromKeyValid() {
@@ -63065,7 +63072,7 @@ function getExports($wnd) {
     TreeMap$SubMapType.call(this, enum$name, enum$ordinal);
     this.$init_386();
   }
-  defineClass(445, 102, { 4: 1, 24: 1, 48: 1, 1: 1, 102: 1 }, TreeMap$SubMapType$1);
+  defineClass(445, 102, { 4: 1, 24: 1, 47: 1, 1: 1, 102: 1 }, TreeMap$SubMapType$1);
   _.$init_386 = function $init_386() {
   };
   _.toKeyValid = function toKeyValid_0() {
@@ -63081,7 +63088,7 @@ function getExports($wnd) {
     TreeMap$SubMapType.call(this, enum$name, enum$ordinal);
     this.$init_387();
   }
-  defineClass(446, 102, { 4: 1, 24: 1, 48: 1, 1: 1, 102: 1 }, TreeMap$SubMapType$2);
+  defineClass(446, 102, { 4: 1, 24: 1, 47: 1, 1: 1, 102: 1 }, TreeMap$SubMapType$2);
   _.$init_387 = function $init_387() {
   };
   _.fromKeyValid = function fromKeyValid_0() {
@@ -63100,7 +63107,7 @@ function getExports($wnd) {
     TreeMap$SubMapType.call(this, enum$name, enum$ordinal);
     this.$init_388();
   }
-  defineClass(447, 102, { 4: 1, 24: 1, 48: 1, 1: 1, 102: 1 }, TreeMap$SubMapType$3);
+  defineClass(447, 102, { 4: 1, 24: 1, 47: 1, 1: 1, 102: 1 }, TreeMap$SubMapType$3);
   _.$init_388 = function $init_388() {
   };
   _.fromKeyValid = function fromKeyValid_1() {
@@ -63185,7 +63192,7 @@ function getExports($wnd) {
       throw toJs(new ArrayIndexOutOfBoundsException_0(valueOf_18(index_0)));
     }
   }
-  defineClass(467, 139, { 4: 1, 1: 1, 30: 1, 56: 1, 128: 1 }, Vector);
+  defineClass(467, 138, { 4: 1, 1: 1, 30: 1, 56: 1, 128: 1 }, Vector);
   _.$init_390 = function $init_390() {
   };
   _.addAtIndex = function add_33(index_0, o) {
@@ -63293,7 +63300,7 @@ function getExports($wnd) {
     this.$init_391();
     this.backingMap = new HashMap();
   }
-  defineClass(212, 140, { 1: 1, 55: 1 });
+  defineClass(212, 139, { 1: 1, 55: 1 });
   _.$init_391 = function $init_391() {
   };
   _.contains_3 = function contains_27(value_0) {
@@ -63654,7 +63661,7 @@ function getExports($wnd) {
     $clinit_Collector$Characteristics();
     return stampJavaTypeInfo(getClassLiteralForArray(Ljava_util_stream_Collector$Characteristics_2_classLit, 1), { 4: 1, 1: 1, 7: 1 }, 82, 0, [CONCURRENT_0, IDENTITY_FINISH, UNORDERED]);
   }
-  defineClass(82, 48, { 4: 1, 24: 1, 48: 1, 1: 1, 82: 1 }, Collector$Characteristics);
+  defineClass(82, 47, { 4: 1, 24: 1, 47: 1, 1: 1, 82: 1 }, Collector$Characteristics);
   _.$init_395 = function $init_395() {
   };
   var CONCURRENT_0, IDENTITY_FINISH, UNORDERED;
@@ -64082,7 +64089,7 @@ function getExports($wnd) {
   }
   defineClass(380, 1, { 1: 1 }, Collectors$9methodref$add$Type);
   _.accept_1 = function accept_6(arg0, arg1) {
-    castTo(arg0, 74).add_12(castTo(arg1, 153));
+    castTo(arg0, 74).add_12(castTo(arg1, 152));
   };
   var Ljava_util_stream_Collectors$9methodref$add$Type_2_classLit = createForClass("java.util.stream", "Collectors/9methodref$add$Type", 380, Ljava_lang_Object_2_classLit);
   function $clinit_Collectors$lambda$10$Type() {
@@ -64321,7 +64328,7 @@ function getExports($wnd) {
   function $clinit_IntStream$0methodref$close$Type() {
     $clinit_IntStream$0methodref$close$Type = emptyMethod;
   }
-  defineClass(540, 1, { 1: 1, 132: 1 });
+  defineClass(540, 1, { 1: 1, 131: 1 });
   var Ljava_util_stream_IntStream$0methodref$close$Type_2_classLit = createForClass("java.util.stream", "IntStream/0methodref$close$Type", 540, Ljava_lang_Object_2_classLit);
   function $clinit_IntStream$Builder() {
     $clinit_IntStream$Builder = emptyMethod;
@@ -64335,7 +64342,7 @@ function getExports($wnd) {
   function $clinit_IntStream$1methodref$close$Type() {
     $clinit_IntStream$1methodref$close$Type = emptyMethod;
   }
-  defineClass(541, 1, { 1: 1, 132: 1 });
+  defineClass(541, 1, { 1: 1, 131: 1 });
   var Ljava_util_stream_IntStream$1methodref$close$Type_2_classLit = createForClass("java.util.stream", "IntStream/1methodref$close$Type", 541, Ljava_lang_Object_2_classLit);
   function $clinit_IntStream$2() {
     $clinit_IntStream$2 = emptyMethod;
@@ -64680,7 +64687,7 @@ function getExports($wnd) {
   function $clinit_Stream$0methodref$close$Type() {
     $clinit_Stream$0methodref$close$Type = emptyMethod;
   }
-  defineClass(587, 1, { 1: 1, 132: 1 });
+  defineClass(587, 1, { 1: 1, 131: 1 });
   var Ljava_util_stream_Stream$0methodref$close$Type_2_classLit = createForClass("java.util.stream", "Stream/0methodref$close$Type", 587, Ljava_lang_Object_2_classLit);
   function $clinit_Stream$Builder() {
     $clinit_Stream$Builder = emptyMethod;
@@ -64694,7 +64701,7 @@ function getExports($wnd) {
   function $clinit_Stream$1methodref$close$Type() {
     $clinit_Stream$1methodref$close$Type = emptyMethod;
   }
-  defineClass(588, 1, { 1: 1, 132: 1 });
+  defineClass(588, 1, { 1: 1, 131: 1 });
   var Ljava_util_stream_Stream$1methodref$close$Type_2_classLit = createForClass("java.util.stream", "Stream/1methodref$close$Type", 588, Ljava_lang_Object_2_classLit);
   function $clinit_Stream$2() {
     $clinit_Stream$2 = emptyMethod;
@@ -65258,7 +65265,7 @@ function getExports($wnd) {
   }
   defineClass(439, 1, { 1: 1 }, TerminatableStream$lambda$0$Type);
   _.accept_0 = function accept_14(arg0) {
-    lambda$0_12(this.throwables_0, castTo(arg0, 132));
+    lambda$0_12(this.throwables_0, castTo(arg0, 131));
   };
   var Ljava_util_stream_TerminatableStream$lambda$0$Type_2_classLit = createForClass("java.util.stream", "TerminatableStream/lambda$0$Type", 439, Ljava_lang_Object_2_classLit);
   function $clinit_ArrayHelper$NativeArray() {
@@ -65812,7 +65819,7 @@ function getExports($wnd) {
     fuv = froot.subC(fragment.getExtendedCoordinates(fragmentConformer, fRearAtom)).unit();
     uv = root.subC(this.getCoordinates(rearAtom)).unit();
     alpha_0 = fuv.getAngle_0(uv);
-    fcoords = initUnidimensionalArray(Lcom_actelion_research_chem_Coordinates_2_classLit, { 152: 1, 4: 1, 1: 1, 7: 1 }, 33, fragment.getExtendedSize(), 0, 1);
+    fcoords = initUnidimensionalArray(Lcom_actelion_research_chem_Coordinates_2_classLit, { 151: 1, 4: 1, 1: 1, 7: 1 }, 33, fragment.getExtendedSize(), 0, 1);
     if (alpha_0 < 0.0010000000474974513) {
       for (i0 = 0; i0 < fragment.getExtendedSize(); i0++) {
         atom = fragment.extendedToOriginalAtom(i0);
@@ -66450,7 +66457,7 @@ function getExports($wnd) {
       return true;
     if (!this.locateInitialFragments_0(isRotatableBond))
       return false;
-    this.mRotatableBond = initUnidimensionalArray(Lorg_openmolecules_chem_conf_gen_RotatableBond_2_classLit, { 4: 1, 1: 1, 7: 1 }, 158, count, 0, 1);
+    this.mRotatableBond = initUnidimensionalArray(Lorg_openmolecules_chem_conf_gen_RotatableBond_2_classLit, { 4: 1, 1: 1, 7: 1 }, 157, count, 0, 1);
     rotatableBond = 0;
     for (bond = 0; bond < mol.getBonds_0(); bond++)
       if (isRotatableBond[bond])
@@ -66673,7 +66680,7 @@ function getExports($wnd) {
   }
   defineClass(319, 1, { 1: 1, 36: 1 }, ConformerGenerator$lambda$0$Type);
   _.compare_0 = function compare_39(arg0, arg1) {
-    return lambda$0_16(castTo(arg0, 158), castTo(arg1, 158));
+    return lambda$0_16(castTo(arg0, 157), castTo(arg1, 157));
   };
   _.equals_0 = function equals_50(other) {
     return getClassPrototype(1).equals_0.call(this, other);
@@ -66809,18 +66816,18 @@ function getExports($wnd) {
     return this.get_7(key);
   };
   _.put = function put_6(key, cacheEntry) {
-    return this.put_2(castToString(key), castTo(cacheEntry, 142));
+    return this.put_2(castToString(key), castTo(cacheEntry, 141));
   };
   _.canAddEntry = function canAddEntry() {
     return this.size() < this.mMaxEntryCount;
   };
   _.clear = function clear_28() {
-    getClassPrototype(140).clear.call(this);
+    getClassPrototype(139).clear.call(this);
     this.mDefaultCacheLoaded = false;
   };
   _.get_7 = function get_43(key) {
     var entry;
-    entry = castTo(getClassPrototype(212).get.call(this, key), 142);
+    entry = castTo(getClassPrototype(212).get.call(this, key), 141);
     this.mGetCount++;
     if (isNotNull(entry)) {
       entry.incrementHitCount();
@@ -66832,7 +66839,7 @@ function getExports($wnd) {
     this.mNonCachableCount++;
   };
   _.put_2 = function put_7(key, cacheEntry) {
-    return this.size() < this.mMaxEntryCount ? castTo(getClassPrototype(212).put.call(this, key, cacheEntry), 142) : null;
+    return this.size() < this.mMaxEntryCount ? castTo(getClassPrototype(212).put.call(this, key, cacheEntry), 141) : null;
   };
   _.mDefaultCacheLoaded = false;
   _.mGetCount = 0;
@@ -66852,11 +66859,11 @@ function getExports($wnd) {
     this.coordinates_0 = coordinates;
     this.likelihood = likelihoods;
   }
-  defineClass(142, 1, { 24: 1, 1: 1, 142: 1 }, RigidFragmentCache$CacheEntry);
+  defineClass(141, 1, { 24: 1, 1: 1, 141: 1 }, RigidFragmentCache$CacheEntry);
   _.$init_419 = function $init_419() {
   };
   _.compareTo_1 = function compareTo_43(o) {
-    return this.compareTo_22(castTo(o, 142));
+    return this.compareTo_22(castTo(o, 141));
   };
   _.compareTo_22 = function compareTo_44(o) {
     if (this.hitCount != o.hitCount)
@@ -66867,7 +66874,7 @@ function getExports($wnd) {
     this.hitCount++;
   };
   _.hitCount = 0;
-  var Lorg_openmolecules_chem_conf_gen_RigidFragmentCache$CacheEntry_2_classLit = createForClass("org.openmolecules.chem.conf.gen", "RigidFragmentCache/CacheEntry", 142, Ljava_lang_Object_2_classLit);
+  var Lorg_openmolecules_chem_conf_gen_RigidFragmentCache$CacheEntry_2_classLit = createForClass("org.openmolecules.chem.conf.gen", "RigidFragmentCache/CacheEntry", 141, Ljava_lang_Object_2_classLit);
   function $clinit_RigidFragmentProvider() {
     $clinit_RigidFragmentProvider = emptyMethod;
     $clinit_Object();
@@ -67086,7 +67093,7 @@ function getExports($wnd) {
       }
       if (useCache) {
         graphIndex = canonizer.getGraphIndexes_0();
-        coords = initMultidimensionalArray(Lcom_actelion_research_chem_Coordinates_2_classLit, [{ 4: 1, 1: 1, 7: 1 }, { 152: 1, 4: 1, 1: 1, 7: 1 }], [152, 33], 0, [conformerList.size(), graphIndex.length], 2);
+        coords = initMultidimensionalArray(Lcom_actelion_research_chem_Coordinates_2_classLit, [{ 4: 1, 1: 1, 7: 1 }, { 151: 1, 4: 1, 1: 1, 7: 1 }], [151, 33], 0, [conformerList.size(), graphIndex.length], 2);
         for (i = 0; i < coords.length; i++) {
           for (j = 0; j < graphIndex.length; j++) {
             xyz = castTo(conformerList.getAtIndex(i), 54).getCoordinates(j);
@@ -67182,7 +67189,7 @@ function getExports($wnd) {
     this.removeEquivalentTorsions(mol);
     this.findSmallerSideAtomList(mol, disconnectedFragmentNo, disconnectedFragmentSize);
   }
-  defineClass(158, 1, { 1: 1, 158: 1 }, RotatableBond);
+  defineClass(157, 1, { 1: 1, 157: 1 }, RotatableBond);
   _.$init_421 = function $init_421() {
   };
   _.areBondAtomsInFragmentOrder = function areBondAtomsInFragmentOrder() {
@@ -67396,7 +67403,7 @@ function getExports($wnd) {
   _.mFragmentNo2 = 0;
   _.mRotationCenter = 0;
   var SIXTY_DEGREE_FREQUENCY, SIXTY_DEGREE_RANGE, SIXTY_DEGREE_TORSION;
-  var Lorg_openmolecules_chem_conf_gen_RotatableBond_2_classLit = createForClass("org.openmolecules.chem.conf.gen", "RotatableBond", 158, Ljava_lang_Object_2_classLit);
+  var Lorg_openmolecules_chem_conf_gen_RotatableBond_2_classLit = createForClass("org.openmolecules.chem.conf.gen", "RotatableBond", 157, Ljava_lang_Object_2_classLit);
   function $clinit_TorsionSet() {
     $clinit_TorsionSet = emptyMethod;
     $clinit_Object();
@@ -67517,7 +67524,7 @@ function getExports($wnd) {
     encoder.encodeRule(torsionIndex, rotatableBondIndex, this.mMask, this.mData);
     this.mCollisionIntensity = collisionIntensity;
   }
-  defineClass(148, 1, { 1: 1, 148: 1 }, TorsionSetEliminationRule);
+  defineClass(147, 1, { 1: 1, 147: 1 }, TorsionSetEliminationRule);
   _.$init_423 = function $init_423() {
   };
   _.getCollisionIntensity = function getCollisionIntensity_0() {
@@ -67546,7 +67553,7 @@ function getExports($wnd) {
     return isMoreGeneral;
   };
   _.mCollisionIntensity = 0;
-  var Lorg_openmolecules_chem_conf_gen_TorsionSetEliminationRule_2_classLit = createForClass("org.openmolecules.chem.conf.gen", "TorsionSetEliminationRule", 148, Ljava_lang_Object_2_classLit);
+  var Lorg_openmolecules_chem_conf_gen_TorsionSetEliminationRule_2_classLit = createForClass("org.openmolecules.chem.conf.gen", "TorsionSetEliminationRule", 147, Ljava_lang_Object_2_classLit);
   function $clinit_TorsionSetEncoder() {
     $clinit_TorsionSetEncoder = emptyMethod;
     $clinit_Object();
@@ -67774,7 +67781,7 @@ function getExports($wnd) {
     var er, er$iterator, sum;
     sum = 0;
     for (er$iterator = elimRules.iterator(); er$iterator.hasNext_0(); ) {
-      er = castTo(er$iterator.next_3(), 148);
+      er = castTo(er$iterator.next_3(), 147);
       sum += ts.getCollisionStrainIfMatches(er);
     }
     return sum;
@@ -67802,7 +67809,7 @@ function getExports($wnd) {
     collisionIntensity = initUnidimensionalArray(D_classLit, { 11: 1, 4: 1, 1: 1 }, 5, this.mRotatableBond.length + this.mRigidFragment.length, 15, 1);
     elimRules = this.mConformerGenerator.getBaseConformer(collidingTorsionSet.getConformerIndexes()).getEliminationRules();
     for (er$iterator = elimRules.iterator(); er$iterator.hasNext_0(); ) {
-      er = castTo(er$iterator.next_3(), 148);
+      er = castTo(er$iterator.next_3(), 147);
       if (collidingTorsionSet.getCollisionStrainIfMatches(er) != 0) {
         for (i = 0; i < collisionIntensity.length; i++)
           if (this.mTorsionSetEncoder.isMaskSet(er, i))
@@ -67844,7 +67851,7 @@ function getExports($wnd) {
       this.processCollisions(previousTorsionSet);
       if (isNotNull(diagnostics))
         for (i = elimRuleCount; i < eliminationRules.size(); i++)
-          diagnostics.get_6(previousTorsionSet).addEliminationRule(this.mTorsionSetEncoder.createRuleString(castTo(eliminationRules.getAtIndex(i), 148), baseConformer));
+          diagnostics.get_6(previousTorsionSet).addEliminationRule(this.mTorsionSetEncoder.createRuleString(castTo(eliminationRules.getAtIndex(i), 147), baseConformer));
       if (!previousTorsionSet.isUsed()) {
         if (previousTorsionSet.getCollisionStrainSum() < 6)
           this.mSecondChoiceList.add_10(previousTorsionSet);
@@ -67957,7 +67964,7 @@ function getExports($wnd) {
             obsoleteList = null;
             currentList = this.mConformerGenerator.getBaseConformer(torsionSet.getConformerIndexes()).getEliminationRules();
             for (er$iterator = currentList.iterator(); er$iterator.hasNext_0(); ) {
-              er = castTo(er$iterator.next_3(), 148);
+              er = castTo(er$iterator.next_3(), 147);
               if (er.isCovered(rule)) {
                 isCovered = true;
                 break;
@@ -69869,7 +69876,7 @@ function getExports($wnd) {
       atomList[i] = mol.getConnAtom_0(atomList[i - 1], 0) == atomList[i - 2] ? mol.getConnAtom_0(atomList[i - 1], 1) : mol.getConnAtom_0(atomList[i - 1], 0);
     return atomList;
   }
-  defineClass(471, 40, { 1: 1, 40: 1 }, StraightLineRule);
+  defineClass(469, 40, { 1: 1, 40: 1 }, StraightLineRule);
   _.$init_436 = function $init_436() {
   };
   _.addStrain = function addStrain_2(conformer, atomStrain) {
@@ -69976,7 +69983,7 @@ function getExports($wnd) {
     getClassPrototype(40).addAtomList.call(this, sb);
     return sb.toString_0();
   };
-  var Lorg_openmolecules_chem_conf_so_StraightLineRule_2_classLit = createForClass("org.openmolecules.chem.conf.so", "StraightLineRule", 471, Lorg_openmolecules_chem_conf_so_ConformationRule_2_classLit);
+  var Lorg_openmolecules_chem_conf_so_StraightLineRule_2_classLit = createForClass("org.openmolecules.chem.conf.so", "StraightLineRule", 469, Lorg_openmolecules_chem_conf_so_ConformationRule_2_classLit);
   function $clinit_TetrahedralStereoRule() {
     $clinit_TetrahedralStereoRule = emptyMethod;
     $clinit_ConformationRule();
@@ -70026,7 +70033,7 @@ function getExports($wnd) {
       }
     }
   }
-  defineClass(472, 40, { 1: 1, 40: 1 }, TetrahedralStereoRule);
+  defineClass(470, 40, { 1: 1, 40: 1 }, TetrahedralStereoRule);
   _.$init_437 = function $init_437() {
   };
   _.addStrain = function addStrain_3(conformer, atomStrain) {
@@ -70277,7 +70284,7 @@ function getExports($wnd) {
     }
     return sb.toString_0();
   };
-  var Lorg_openmolecules_chem_conf_so_TetrahedralStereoRule_2_classLit = createForClass("org.openmolecules.chem.conf.so", "TetrahedralStereoRule", 472, Lorg_openmolecules_chem_conf_so_ConformationRule_2_classLit);
+  var Lorg_openmolecules_chem_conf_so_TetrahedralStereoRule_2_classLit = createForClass("org.openmolecules.chem.conf.so", "TetrahedralStereoRule", 470, Lorg_openmolecules_chem_conf_so_ConformationRule_2_classLit);
   function $clinit_TorsionRule() {
     $clinit_TorsionRule = emptyMethod;
     $clinit_ConformationRule();
@@ -70957,7 +70964,7 @@ function getExports($wnd) {
   _.create = create;
   _.fromMolecules = fromMolecules;
   _.fromRxn = fromRxn;
-  _.fromSmiles = fromSmiles_1;
+  _.fromSmiles = fromSmiles_0;
   $clinit_JSReactionEncoder();
   _ = provide("OCL.ReactionEncoder", JSReactionEncoder);
   _.CATALYST_DELIMITER = CATALYST_DELIMITER_0;
@@ -71068,7 +71075,7 @@ function getExports($wnd) {
   $sendStats("moduleStartup", "end");
   $gwt && $gwt.permProps && __gwtModuleFunction.__moduleStartupDone($gwt.permProps);
   const toReturn = $wnd["OCL"];
-  toReturn.version = "9.21.0";
+  toReturn.version = "9.22.1";
   return toReturn;
 }
 var isBrowserWindow = typeof window !== "undefined" && typeof window.document !== "undefined";
@@ -71213,8 +71220,8 @@ export {
 };
 /**
  * openchemlib - Manipulate molecules
- * @version v9.21.0
- * @date 2026-03-11T08:46:30.541Z
+ * @version v9.22.1
+ * @date 2026-05-02T08:37:42.417Z
  * @link https://github.com/cheminfo/openchemlib-js
  * @license BSD-3-Clause
 */