Revision: 20727
http://sourceforge.net/p/jmol/code/20727
Author: hansonr
Date: 2015-08-23 03:20:13 +0000 (Sun, 23 Aug 2015)
Log Message:
-----------
Jmol-NBO clean-up
Modified Paths:
--------------
trunk/Jmol/src/org/openscience/jmol/app/nbo/NBODialog.java
trunk/Jmol/src/org/openscience/jmol/app/nbo/NBODialogConfig.java
trunk/Jmol/src/org/openscience/jmol/app/nbo/NBODialogSearch.java
Modified: trunk/Jmol/src/org/openscience/jmol/app/nbo/NBODialog.java
===================================================================
--- trunk/Jmol/src/org/openscience/jmol/app/nbo/NBODialog.java 2015-08-23
03:09:57 UTC (rev 20726)
+++ trunk/Jmol/src/org/openscience/jmol/app/nbo/NBODialog.java 2015-08-23
03:20:13 UTC (rev 20727)
@@ -211,12 +211,13 @@
}
protected void close() {
- this.dispose();
+ saveHistory();
nboService.closeProcess();
nboResetV();
nboService.runScriptQueued("mo delete; nbo delete; select off");
+ dispose();
}
-
+
private boolean checkEnabled() {
haveService = (nboService.serverPath.length() > 0);
boolean enabled = (haveService && nboService.restartIfNecessary());
@@ -430,5 +431,7 @@
public void setStatus(String statusInfo) {
statusLab.setText(statusInfo);
}
+
+
}
Modified: trunk/Jmol/src/org/openscience/jmol/app/nbo/NBODialogConfig.java
===================================================================
--- trunk/Jmol/src/org/openscience/jmol/app/nbo/NBODialogConfig.java
2015-08-23 03:09:57 UTC (rev 20726)
+++ trunk/Jmol/src/org/openscience/jmol/app/nbo/NBODialogConfig.java
2015-08-23 03:20:13 UTC (rev 20727)
@@ -275,22 +275,7 @@
});
}
-//
-// protected void clearPressed() {
-// nboReport(null);
-// }
-
/**
- * Responds to cancel being press- or equivalent eg window closed.
- */
- void closePressed() {
- nboService.closeProcess();
- saveHistory();
- setVisible(false);
- dispose();
- }
-
- /**
* Just saves the path settings from this session.
*/
protected void saveHistory() {
@@ -314,7 +299,7 @@
/**
* Show a file selector when the savePath button is pressed.
*/
- void showNBOPathDialog() {
+ protected void showNBOPathDialog() {
JFileChooser myChooser = new JFileChooser();
String fname = serverPathLabel.getText();
myChooser.setSelectedFile(new File(fname));
Modified: trunk/Jmol/src/org/openscience/jmol/app/nbo/NBODialogSearch.java
===================================================================
--- trunk/Jmol/src/org/openscience/jmol/app/nbo/NBODialogSearch.java
2015-08-23 03:09:57 UTC (rev 20726)
+++ trunk/Jmol/src/org/openscience/jmol/app/nbo/NBODialogSearch.java
2015-08-23 03:20:13 UTC (rev 20727)
@@ -105,7 +105,7 @@
"<OPBAS> Matrix elements of chosen operator in chosen basis set",
"<BAS1BAS2> Transformation matrix between chosen basis sets" };
- String[] npa = {"NPA Atomic Properties:",
+ protected String[] npa = {"NPA Atomic Properties:",
" (1) NPA atomic charge",
" (2) NPA atomic spin density",
" (3) NEC atomic electron configuration",
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
