Revision: 21483
http://sourceforge.net/p/jmol/code/21483
Author: hansonr
Date: 2017-04-04 23:24:43 +0000 (Tue, 04 Apr 2017)
Log Message:
-----------
Jmol.___JmolVersion="14.11.2" // 2017-04-04
bug fix: NBO fixes
bug fix: backboneSteps moved to cartoonSteps
// order of checking for TRUE is:
// cartoonBlocks, cartoonBaseEdges, cartoonSteps, cartoonLadders,
cartoonRibose
Modified Paths:
--------------
trunk/Jmol/src/org/gennbo/NBOSearch.java
Modified: trunk/Jmol/src/org/gennbo/NBOSearch.java
===================================================================
--- trunk/Jmol/src/org/gennbo/NBOSearch.java 2017-04-04 23:09:31 UTC (rev
21482)
+++ trunk/Jmol/src/org/gennbo/NBOSearch.java 2017-04-04 23:24:43 UTC (rev
21483)
@@ -1089,12 +1089,16 @@
break;
}
- boolean isOK = (orb1 == null || orb1.getSelectedIndex() > 0)
- && (orb2 == null || orb2.getSelectedIndex() > 0)
- && (atom1 == null || atom1.getSelectedIndex() > 0)
- && (atom2 == null || atom2.getSelectedIndex() > 0);
- if (!isOK)
+ JComboBox<String> cb = null;
+ boolean isOK = (
+ (atom1 == null || (cb = atom1).getSelectedIndex() > 0)
+ && (atom2 == null || (cb = atom2).getSelectedIndex() > 0)
+ && (orb1 == null || (cb = orb1).getSelectedIndex() > 0)
+ && (orb2 == null || (cb = orb2).getSelectedIndex() > 0));
+ if (!isOK) {
+ dialog.logError(cb.getItemAt(0));
return;
+ }
if (orb1 != null)
NBOUtil.postAddGlobalI(sb, labelOrb1, offset1, orb1);
if (orb2 != null)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
Jmol-commits mailing list
Jmol-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jmol-commits
