Revision: 20726
http://sourceforge.net/p/jmol/code/20726
Author: hansonr
Date: 2015-08-23 03:09:57 +0000 (Sun, 23 Aug 2015)
Log Message:
-----------
Jmol-NBO clean-up
Modified Paths:
--------------
branches/nbo/Jmol/src/org/openscience/jmol/app/nbo/NBODialogConfig.java
branches/nbo/Jmol/src/org/openscience/jmol/app/nbo/NBODialogSearch.java
branches/nbo/Jmol/src/org/openscience/jmol/app/nbo/NBODialogView.java
branches/nbo/Jmol/src/org/openscience/jmol/app/nbo/NBOJobQueueManager.java
Modified:
branches/nbo/Jmol/src/org/openscience/jmol/app/nbo/NBODialogConfig.java
===================================================================
--- branches/nbo/Jmol/src/org/openscience/jmol/app/nbo/NBODialogConfig.java
2015-08-23 03:09:54 UTC (rev 20725)
+++ branches/nbo/Jmol/src/org/openscience/jmol/app/nbo/NBODialogConfig.java
2015-08-23 03:09:57 UTC (rev 20726)
@@ -57,8 +57,6 @@
abstract class NBODialogConfig extends JDialog {
- public static final boolean TESTING = true;
-
protected static final String sep = System.getProperty("line.separator");
protected static final String DEFAULT_PARAMS = "PLOT CMO DIPOLE STERIC";
Modified:
branches/nbo/Jmol/src/org/openscience/jmol/app/nbo/NBODialogSearch.java
===================================================================
--- branches/nbo/Jmol/src/org/openscience/jmol/app/nbo/NBODialogSearch.java
2015-08-23 03:09:54 UTC (rev 20725)
+++ branches/nbo/Jmol/src/org/openscience/jmol/app/nbo/NBODialogSearch.java
2015-08-23 03:09:57 UTC (rev 20726)
@@ -57,7 +57,7 @@
abstract class NBODialogSearch extends NBODialogView {
- NBODialogSearch(JFrame f) {
+ protected NBODialogSearch(JFrame f) {
super(f);
lists = new Hashtable<String, String[]>();
}
Modified: branches/nbo/Jmol/src/org/openscience/jmol/app/nbo/NBODialogView.java
===================================================================
--- branches/nbo/Jmol/src/org/openscience/jmol/app/nbo/NBODialogView.java
2015-08-23 03:09:54 UTC (rev 20725)
+++ branches/nbo/Jmol/src/org/openscience/jmol/app/nbo/NBODialogView.java
2015-08-23 03:09:57 UTC (rev 20726)
@@ -165,19 +165,6 @@
"g", "h" // 0 - 7
};
- /**
- * TODO this was sli business. not implemented?
- * @return countouring parameters, I think contour levels
- */
- private String getContourParams() {
- String s = "";
- for (int i = 0; i < contourFields.length; i++)
- s += "GLOBAL CONTOUR_" + contourFieldIDs[i] + " " +
contourFields[i].getText()
- + sep;
- return s;
-
- }
-
protected DefaultListModel<String> model;
protected JList<String> dList;
protected int numStor = 0;
@@ -394,6 +381,19 @@
}
+ /**
+ * TODO this was sli business. not implemented?
+ * @return countouring parameters, I think contour levels
+ */
+ private String getContourParams() {
+ String s = "";
+ for (int i = 0; i < contourFields.length; i++)
+ s += "GLOBAL CONTOUR_" + contourFieldIDs[i] + " " +
contourFields[i].getText()
+ + sep;
+ return s;
+
+ }
+
protected void showSelected(String[] s){
if(!selToggle.isSelected()) return;
nboService.runScriptQueued("select remove {*}");
Modified:
branches/nbo/Jmol/src/org/openscience/jmol/app/nbo/NBOJobQueueManager.java
===================================================================
--- branches/nbo/Jmol/src/org/openscience/jmol/app/nbo/NBOJobQueueManager.java
2015-08-23 03:09:54 UTC (rev 20725)
+++ branches/nbo/Jmol/src/org/openscience/jmol/app/nbo/NBOJobQueueManager.java
2015-08-23 03:09:57 UTC (rev 20726)
@@ -101,7 +101,7 @@
}
}
- public void clearQueue() {
+ void clearQueue() {
list.clear();
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
_______________________________________________
Jmol-commits mailing list
Jmol-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jmol-commits
