Revision: 20605
http://sourceforge.net/p/jmol/code/20605
Author: hansonr
Date: 2015-07-01 05:13:24 +0000 (Wed, 01 Jul 2015)
Log Message:
-----------
Modified Paths:
--------------
branches/nbo/Jmol/src/org/openscience/jmol/app/nbo/NBODialogModel.java
Modified: branches/nbo/Jmol/src/org/openscience/jmol/app/nbo/NBODialogModel.java
===================================================================
--- branches/nbo/Jmol/src/org/openscience/jmol/app/nbo/NBODialogModel.java
2015-07-01 05:08:17 UTC (rev 20604)
+++ branches/nbo/Jmol/src/org/openscience/jmol/app/nbo/NBODialogModel.java
2015-07-01 05:13:24 UTC (rev 20605)
@@ -24,21 +24,17 @@
package org.openscience.jmol.app.nbo;
import java.awt.BorderLayout;
-import java.awt.Color;
import java.awt.Container;
import java.awt.Dimension;
import java.awt.Font;
-import java.awt.Graphics;
import java.awt.GridBagConstraints;
import java.awt.GridBagLayout;
import java.awt.GridLayout;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
-import java.awt.image.BufferedImage;
import java.io.File;
import java.io.IOException;
-import javax.imageio.ImageIO;
import javax.swing.Box;
import javax.swing.BoxLayout;
import javax.swing.JButton;
@@ -58,10 +54,11 @@
import org.jmol.i18n.GT;
import org.openscience.jmol.app.jmolpanel.JmolPanel;
+
/**
* A dialog for interacting with NBO-Server (experimental)
*
- * Originally had various tabs, but this is simpler.
+ * Originally had various tabs, but this is simpler.
*
*/
public abstract class NBODialogModel extends NBODialogConfig {
@@ -71,16 +68,16 @@
private NBOPanel s;
protected JComboBox<String> use = new JComboBox<String>(useOp);
private Box saveBox, editBox;
- protected JButton save,sym,edit;
- protected JTextField tf,tf2,tf3,tf4,txt,nv, folder, name, ext;
- private JTextPane out;
+ protected JButton save, sym, edit;
+ protected JTextField tf, tf2, tf3, tf4, txt, nv, folder, name, ext;
+ protected JTextPane out;
protected JLabel valLab;
- private JTextField folderS,nameS,extS;
-
+ private JTextField folderS, nameS, extS;
+
public NBODialogModel(JFrame f) {
super(f);
}
-
+
protected void buildModel(Container p) {
java.util.Properties props = JmolPanel.historyFile.getProperties();
savePath = (props.getProperty("savePath",
System.getProperty("user.home")));
@@ -90,7 +87,6 @@
GridBagConstraints c = new GridBagConstraints();
c.gridx = 0;
c.gridy = 0;
- JButton b;
JLabel l = new JLabel();
l.setFont(new Font(" Monospaced", Font.PLAIN, 30));
l.setText("Model");
@@ -130,99 +126,116 @@
p.revalidate();
}
- protected void showWorkpathDialogueM(){
+ protected void showWorkpathDialogueM() {
JFileChooser myChooser = new JFileChooser();
- myChooser.setFileFilter(new FileNameExtensionFilter("cfi","cfi","gau"));
+ myChooser.setFileFilter(new FileNameExtensionFilter("cfi", "cfi", "gau"));
myChooser.setFileHidingEnabled(true);
myChooser.setSelectedFile(new File(usePath));
int button = myChooser.showDialog(this, GT._("Select"));
if (button == JFileChooser.APPROVE_OPTION) {
File newFile = myChooser.getSelectedFile();
- loadModel(newFile.getParent(),
+ loadModel(
+ newFile.getParent(),
newFile.getName().substring(0, newFile.getName().lastIndexOf(".")),
-
newFile.getAbsolutePath().substring(newFile.getAbsolutePath().lastIndexOf(".")+1));
- if(newFile.getName().indexOf(".")>0)
- jobStem =
newFile.getName().substring(0,newFile.getName().lastIndexOf("."));
+ newFile.getAbsolutePath().substring(
+ newFile.getAbsolutePath().lastIndexOf(".") + 1));
+ if (newFile.getName().indexOf(".") > 0)
+ jobStem = newFile.getName().substring(0,
+ newFile.getName().lastIndexOf("."));
workPathLabel.setText(jobStem);
generateClicked();
use.setSelectedIndex(0);
folder.setText(newFile.getParent());
name.setText(jobStem);
-
ext.setText(newFile.toString().substring(newFile.toString().lastIndexOf(".")+1));
- usePath=newFile.toString();
+ ext.setText(newFile.toString().substring(
+ newFile.toString().lastIndexOf(".") + 1));
+ usePath = newFile.toString();
saveHistoryM();
pack();
- }else if (button== JFileChooser.CANCEL_OPTION){
+ } else if (button == JFileChooser.CANCEL_OPTION) {
use.setSelectedIndex(0);
}
}
-
- protected void showSaveDialog(){
+
+ protected void showSaveDialog() {
JFileChooser myChooser = new JFileChooser();
- myChooser.setFileFilter(new FileNameExtensionFilter("cfi","cfi","gau"));
+ myChooser.setFileFilter(new FileNameExtensionFilter("cfi", "cfi", "gau"));
myChooser.setFileHidingEnabled(true);
- myChooser.setSelectedFile(new File(new File(savePath).getParent()+"/new"));
+ myChooser
+ .setSelectedFile(new File(new File(savePath).getParent() + "/new"));
int button = myChooser.showSaveDialog(this);
if (button == JFileChooser.APPROVE_OPTION) {
File newFile = myChooser.getSelectedFile();
//generateClicked();
- String ext =
newFile.toString().substring(newFile.toString().lastIndexOf(".")+1);
- if(ext.equals(newFile.toString())) ext="cfi";
- if(ext.equalsIgnoreCase("cfi")
-
||ext.equalsIgnoreCase("gau")||ext.equalsIgnoreCase("vfi")||ext.equalsIgnoreCase("gms")||ext.equalsIgnoreCase("jag")||ext.equalsIgnoreCase("mm")
-
||ext.equalsIgnoreCase("mnd")||ext.equalsIgnoreCase("mp")||ext.equalsIgnoreCase("nw")||ext.equalsIgnoreCase("orc")||ext.equalsIgnoreCase("pqs")
- ||ext.equalsIgnoreCase("qc")){
- if(newFile.getName().indexOf(".")>0)
- jobStem =
newFile.getName().substring(0,newFile.getName().lastIndexOf("."));
- else jobStem = newFile.getName();
- saveModel(newFile.getParent(),jobStem,ext);
+ String ext = newFile.toString().substring(
+ newFile.toString().lastIndexOf(".") + 1);
+ if (ext.equals(newFile.toString()))
+ ext = "cfi";
+ if (ext.equalsIgnoreCase("cfi") || ext.equalsIgnoreCase("gau")
+ || ext.equalsIgnoreCase("vfi") || ext.equalsIgnoreCase("gms")
+ || ext.equalsIgnoreCase("jag") || ext.equalsIgnoreCase("mm")
+ || ext.equalsIgnoreCase("mnd") || ext.equalsIgnoreCase("mp")
+ || ext.equalsIgnoreCase("nw") || ext.equalsIgnoreCase("orc")
+ || ext.equalsIgnoreCase("pqs") || ext.equalsIgnoreCase("qc")) {
+ if (newFile.getName().indexOf(".") > 0)
+ jobStem = newFile.getName().substring(0,
+ newFile.getName().lastIndexOf("."));
+ else
+ jobStem = newFile.getName();
+ saveModel(newFile.getParent(), jobStem, ext);
folderS.setText(newFile.getParent());
nameS.setText(jobStem);
extS.setText(ext);
savePathLabel.setText(newFile.toString());
pack();
savePath = newFile.toString();
- out.setText(out.getText()+"save "+newFile.getName()+"\n--Model
Saved--\n");
+ out.setText(out.getText() + "save " + newFile.getName()
+ + "\n--Model Saved--\n");
saveHistoryM();
- }else savePathLabel.setText("Invalid extension");
+ } else
+ savePathLabel.setText("Invalid extension");
}
}
-
+
/**
* creates the Model edit panel
- * @return box
+ *
*/
- protected void editP(){
+ protected void editP() {
editBox.removeAll();
-
- action.setMaximumSize(new Dimension(450,25));
+
+ action.setMaximumSize(new Dimension(450, 25));
action.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
Object item = action.getSelectedItem().toString().split(" ")[0];
- if(item.equals("-Action_")){
+ if (item.equals("-Action_")) {
editP();
- }else
if(item.equals("clip")||item.equals("fuse")||item.equals("link")||item.equals("switch")){
- clip("Atom 1","Atom 2");
- }else if(item.equals("mutate")){
- clip("Atom","Formula");
- }else if(item.equals("rebond")){
- clip("Atom","Symtype");
- }else if(item.equals("rebond")){
- clip("Atom","Symtype");
- }else if(item.equals("alter")||item.equals("twist")){
+ } else if (item.equals("clip") || item.equals("fuse")
+ || item.equals("link") || item.equals("switch")) {
+ clip("Atom 1", "Atom 2");
+ } else if (item.equals("mutate")) {
+ clip("Atom", "Formula");
+ } else if (item.equals("rebond")) {
+ clip("Atom", "Symtype");
+ } else if (item.equals("rebond")) {
+ clip("Atom", "Symtype");
+ } else if (item.equals("alter") || item.equals("twist")) {
alter(false);
}
- }});
+ }
+ });
sym.setVisible(true);
editBox.setVisible(true);
editBox.add(action);
}
+
/**
* super ugly looking method to make alter panel choices, needs work
+ *
* @param enable
*/
- protected void alter(boolean enable){
+ protected void alter(boolean enable) {
editBox.removeAll();
editBox.add(action);
tf = new JTextField();
@@ -249,19 +262,28 @@
nv.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
- editClicked2();
- }});
- nv.getDocument().addDocumentListener(new DocumentListener(){
+ editClicked2();
+ }
+ });
+ nv.getDocument().addDocumentListener(new DocumentListener() {
@Override
- public void changedUpdate(DocumentEvent arg0){}
+ public void changedUpdate(DocumentEvent arg0) {
+ }
+
@Override
- public void insertUpdate(DocumentEvent arg0){
- if(!tf.getText().equals("") && !nv.getText().equals(""))
edit.setEnabled(true);
- else edit.setEnabled(false);}
+ public void insertUpdate(DocumentEvent arg0) {
+ if (!tf.getText().equals("") && !nv.getText().equals(""))
+ edit.setEnabled(true);
+ else
+ edit.setEnabled(false);
+ }
+
@Override
- public void removeUpdate(DocumentEvent arg0){
- if(!tf.getText().equals("") && !nv.getText().equals(""))
edit.setEnabled(true);
- else edit.setEnabled(false);
+ public void removeUpdate(DocumentEvent arg0) {
+ if (!tf.getText().equals("") && !nv.getText().equals(""))
+ edit.setEnabled(true);
+ else
+ edit.setEnabled(false);
}
});
box = Box.createHorizontalBox();
@@ -271,28 +293,30 @@
edit.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
- editClicked2();
- }});
+ editClicked2();
+ }
+ });
JButton b = new JButton("Clear selected");
box.add(b);
b.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
- tf.setText("");
- tf2.setText("");
- tf3.setText("");
- tf4.setText("");
- valLab.setText("");
- txt.setText("");
- nv.setText("");
- nv.setEnabled(false);
- }});
+ tf.setText("");
+ tf2.setText("");
+ tf3.setText("");
+ tf4.setText("");
+ valLab.setText("");
+ txt.setText("");
+ nv.setText("");
+ nv.setEnabled(false);
+ }
+ });
editBox.add(box);
editBox.repaint();
editBox.revalidate();
}
-
- protected void clip(String st,String st1){
+
+ protected void clip(String st, String st1) {
//s.remove(saveBox);
tf3 = tf4 = null;
editBox.removeAll();
@@ -300,37 +324,47 @@
Box b = Box.createHorizontalBox();
tf = new JTextField();
tf.setEditable(false);
- tf.setMaximumSize(new Dimension(100,50));
+ tf.setMaximumSize(new Dimension(100, 50));
tf.setBorder(new TitledBorder(st));
- b.add(Box.createRigidArea(new Dimension(30,0)));
+ b.add(Box.createRigidArea(new Dimension(30, 0)));
b.add(tf);
- b.add(Box.createRigidArea(new Dimension(20,0)));
+ b.add(Box.createRigidArea(new Dimension(20, 0)));
tf2 = new JTextField();
- tf2.getDocument().addDocumentListener(new DocumentListener(){
+ tf2.getDocument().addDocumentListener(new DocumentListener() {
@Override
- public void changedUpdate(DocumentEvent arg0){
- if(!tf2.getText().equals("")) edit.setEnabled(true);
- else edit.setEnabled(false);
+ public void changedUpdate(DocumentEvent arg0) {
+ if (!tf2.getText().equals(""))
+ edit.setEnabled(true);
+ else
+ edit.setEnabled(false);
}
+
@Override
- public void insertUpdate(DocumentEvent arg0){
- if(!tf2.getText().equals("")) edit.setEnabled(true);
- else edit.setEnabled(false);
+ public void insertUpdate(DocumentEvent arg0) {
+ if (!tf2.getText().equals(""))
+ edit.setEnabled(true);
+ else
+ edit.setEnabled(false);
}
+
@Override
- public void removeUpdate(DocumentEvent arg0){
- if(!tf2.getText().equals("")) edit.setEnabled(true);
- else edit.setEnabled(false);
- }});
- tf2.setMaximumSize(new Dimension(100,50));
- if(!st1.equals("Formula")&&!st1.equals("Symtype"))
+ public void removeUpdate(DocumentEvent arg0) {
+ if (!tf2.getText().equals(""))
+ edit.setEnabled(true);
+ else
+ edit.setEnabled(false);
+ }
+ });
+ tf2.setMaximumSize(new Dimension(100, 50));
+ if (!st1.equals("Formula") && !st1.equals("Symtype"))
tf2.setEditable(false);
else
tf2.addActionListener(new ActionListener() {
- @Override
- public void actionPerformed(ActionEvent e) {
- editClicked();
- }});
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ editClicked();
+ }
+ });
tf2.setBorder(new TitledBorder(st1));
b.add(tf2);
editBox.add(b);
@@ -341,20 +375,23 @@
@Override
public void actionPerformed(ActionEvent e) {
try {
- String cmd =action.getSelectedItem().toString().split(" ")[0]+"
"+tf.getText()+" "+tf2.getText();
- writeToFile("CMD "+cmd,cmdFile);
- out.setText(out.getText()+cmd+"\n");
- } catch (IOException e1) {}
+ String cmd = action.getSelectedItem().toString().split(" ")[0] + " "
+ + tf.getText() + " " + tf2.getText();
+ writeToFile("CMD " + cmd, cmdFile);
+ out.setText(out.getText() + cmd + "\n");
+ } catch (IOException e1) {
+ }
tf.setText("");
tf2.setText("");
rawCmd("<m_test.txt>");
- }});
+ }
+ });
s.repaint();
s.revalidate();
}
-
- protected void folderBox(NBOPanel s){
- JPanel b = new JPanel(new GridLayout(2,3));
+
+ protected void folderBox(NBOPanel s) {
+ JPanel b = new JPanel(new GridLayout(2, 3));
folder = new JTextField();
b.add(folder);
name = new JTextField();
@@ -364,12 +401,12 @@
b.add(new JLabel(" folder"));
b.add(new JLabel(" name"));
b.add(new JLabel(" ext"));
- b.setMaximumSize(new Dimension(400,40));
+ b.setMaximumSize(new Dimension(400, 40));
s.add(b);
}
-
- protected void folderSBox(Container s){
- JPanel b = new JPanel(new GridLayout(2,3));
+
+ protected void folderSBox(Container s) {
+ JPanel b = new JPanel(new GridLayout(2, 3));
folderS = new JTextField();
b.add(folderS);
nameS = new JTextField();
@@ -379,44 +416,53 @@
b.add(new JLabel(" folder"));
b.add(new JLabel(" name"));
b.add(new JLabel(" ext"));
- b.setMaximumSize(new Dimension(400,40));
+ b.setMaximumSize(new Dimension(400, 40));
s.add(b);
}
-
- protected void editClicked2(){
+
+ protected void editClicked2() {
try {
- String cmd = action.getSelectedItem().toString().split(" ")[0]+"
"+tf.getText()+" "+tf2.getText()+" "+tf3.getText()+" "+tf4.getText()+"
"+nv.getText();
- writeToFile("CMD "+cmd,cmdFile);
+ String cmd = action.getSelectedItem().toString().split(" ")[0] + " "
+ + tf.getText() + " " + tf2.getText() + " " + tf3.getText() + " "
+ + tf4.getText() + " " + nv.getText();
+ writeToFile("CMD " + cmd, cmdFile);
rawCmd("<m_test.txt>");
- out.setText(out.getText()+cmd+"\n");
- } catch (IOException e1) {}
+ out.setText(out.getText() + cmd + "\n");
+ } catch (IOException e1) {
+ }
txt.setText(nv.getText());
nv.setText("");
-
+
}
-
- protected void editClicked(){
- try{
- String cmd = "CMD "+action.getSelectedItem().toString().split(" ")[0]+"
"+tf.getText()+" "+tf2.getText();
- writeToFile(cmd,cmdFile);
+
+ protected void editClicked() {
+ try {
+ String cmd = "CMD " + action.getSelectedItem().toString().split(" ")[0]
+ + " " + tf.getText() + " " + tf2.getText();
+ writeToFile(cmd, cmdFile);
tf.setText("");
tf2.setText("");
rawCmd("<m_test.txt>");
- out.setText(out.getText()+cmd+"\n");
- } catch (IOException e1) {}
+ out.setText(out.getText() + cmd + "\n");
+ } catch (IOException e1) {
+ }
}
+
/**
* model selection panel
+ *
* @return model select panel
*/
@Override
protected NBOPanel modelS() {
s = new NBOPanel(this, PANEL_MODEL_SELECT);
s.setLayout(new BoxLayout(s, BoxLayout.Y_AXIS));
-
- String[] actions = {"-Action-","alter - ","clip - ","fuse - ","link -
","mutate - ","rebond - ","switch - ","twist - ","unify - "," 3chb - "};
+
+ String[] actions = { "-Action-", "alter - ", "clip - ", "fuse - ",
+ "link - ", "mutate - ", "rebond - ", "switch - ", "twist - ",
+ "unify - ", " 3chb - " };
action = new JComboBox<String>(actions);
-
+
Box box = Box.createHorizontalBox();
box.add(use);
workPathLabel = new JTextField();
@@ -462,7 +508,7 @@
saveBox.setMaximumSize(new Dimension(400, 40));
editBox = Box.createVerticalBox();
editBox.setBorder(new TitledBorder("Edit Model"));
- editBox.setPreferredSize(new Dimension(570,450));
+ editBox.setPreferredSize(new Dimension(570, 450));
editBox.setVisible(false);
s.add(editBox);
sym = new JButton("Symmety");
@@ -474,10 +520,11 @@
@Override
public void actionPerformed(ActionEvent e) {
try {
- writeToFile("CMD symmetry",cmdFile);
+ writeToFile("CMD symmetry", cmdFile);
rawCmd("<m_test.txt>");
- out.setText(out.getText()+ "Symmetry: ");
- } catch (IOException e1) {}
+ out.setText(out.getText() + "Symmetry: ");
+ } catch (IOException e1) {
+ }
}
});
s.add(saveBox);
@@ -490,8 +537,8 @@
});
return s;
}
-
- protected NBOPanel modelOut(){
+
+ protected NBOPanel modelOut() {
NBOPanel s = new NBOPanel(this, PANEL_VIEW_SELECT);
s.setLayout(new BorderLayout());
JScrollPane p1 = new JScrollPane();
@@ -499,23 +546,25 @@
out.setEditable(false);
out.setFont(nboFont);
p1.getViewport().add(out);
- s.add(p1,BorderLayout.CENTER);
+ s.add(p1, BorderLayout.CENTER);
return s;
}
-
- protected void generateClicked(){
- if(!workPathLabel.getText().equals("")){
+
+ protected void generateClicked() {
+ if (!workPathLabel.getText().equals("")) {
action.setSelectedIndex(0);
Object item = use.getSelectedItem();
// Java 1.6 doesn't allow switch(String)
if (item.equals("Formula")) {
try {
// no toUpperCase() here -- chemical elements include Cl, Na, etc.
- writeToFile("CMD show " + workPathLabel.getText(),cmdFile);
+ writeToFile("CMD show " + workPathLabel.getText(), cmdFile);
rawCmd("<m_test.txt>");
- out.setText(out.getText()+"show " + workPathLabel.getText()+"\n");
- } catch (IOException e1) {}
- } else rawCmd("<m_test.txt>");
+ out.setText(out.getText() + "show " + workPathLabel.getText() +
"\n");
+ } catch (IOException e1) {
+ }
+ } else
+ rawCmd("<m_test.txt>");
editP();
folderS.setText("");
nameS.setText("");
@@ -523,69 +572,73 @@
this.repaint();
this.revalidate();
save.setEnabled(true);
- }else editBox.removeAll();
+ } else
+ editBox.removeAll();
}
-
- protected void symOut(String l){
- if(l.length()>1)
- out.setText(out.getText()+l + "\n");
+
+ protected void symOut(String l) {
+ if (l.length() > 1)
+ out.setText(out.getText() + l + "\n");
}
-
- protected void saveModel(String path, String fname, String ext){
+
+ protected void saveModel(String path, String fname, String ext) {
cmdFile = new File(nboService.serverPath);
- cmdFile = new File(cmdFile.getParent()+"/m_test.txt");
- try{
- writeToFile("GLOBAL C_PATH " + path + sep,cmdFile);
- if(ext.equalsIgnoreCase("gms"))
- appendToFile("GLOBAL C_ESS GAMESS" + sep,cmdFile);
+ cmdFile = new File(cmdFile.getParent() + "/m_test.txt");
+ try {
+ writeToFile("GLOBAL C_PATH " + path + sep, cmdFile);
+ if (ext.equalsIgnoreCase("gms"))
+ appendToFile("GLOBAL C_ESS GAMESS" + sep, cmdFile);
else
- appendToFile("GLOBAL C_ESS " + ext.charAt(0) + sep,cmdFile);
- appendToFile("GLOBAL C_FNAME " + fname + sep,cmdFile);
- appendToFile("GLOBAL C_OUT_EXT " + ext + sep,cmdFile);
- appendToFile("CMD save",cmdFile);
+ appendToFile("GLOBAL C_ESS " + ext.charAt(0) + sep, cmdFile);
+ appendToFile("GLOBAL C_FNAME " + fname + sep, cmdFile);
+ appendToFile("GLOBAL C_OUT_EXT " + ext + sep, cmdFile);
+ appendToFile("CMD save", cmdFile);
rawCmd("<m_test.txt>");
- }catch(IOException e){}
+ } catch (IOException e) {
+ }
}
- protected void loadModel(){
+ protected void loadModel() {
File f = new File(nboService.serverPath);
- f = new File(f.getParent()+"/jmol_outfile.cfi");
+ f = new File(f.getParent() + "/jmol_outfile.cfi");
File f2 = cmdFile;
cmdFile = new File(nboService.serverPath);
- cmdFile = new File(cmdFile.getParent()+"/m_test.txt");
- try{
+ cmdFile = new File(cmdFile.getParent() + "/m_test.txt");
+ try {
fileContents = vwr.runScript("print data({visible},\"cfi\")");
- writeToFile(fileContents,f);
+ writeToFile(fileContents, f);
workPathLabel.setText("From JMOL");
- writeToFile("GLOBAL C_PATH " + f.getParent() + sep,cmdFile);
- appendToFile("GLOBAL C_ESS c" + sep,cmdFile);
- appendToFile("GLOBAL C_FNAME jmol_outFile" + sep,cmdFile);
- appendToFile("GLOBAL C_IN_EXT cfi"+ sep,cmdFile);
- appendToFile("CMD use",cmdFile);
-
+ writeToFile("GLOBAL C_PATH " + f.getParent() + sep, cmdFile);
+ appendToFile("GLOBAL C_ESS c" + sep, cmdFile);
+ appendToFile("GLOBAL C_FNAME jmol_outFile" + sep, cmdFile);
+ appendToFile("GLOBAL C_IN_EXT cfi" + sep, cmdFile);
+ appendToFile("CMD use", cmdFile);
+
rawCmd("<m_test.txt>");
- }catch(IOException e){}
+ } catch (IOException e) {
+ }
cmdFile = f2;
}
-
- protected void loadModel(String path, String fname, String ext){
+
+ protected void loadModel(String path, String fname, String ext) {
cmdFile = new File(nboService.serverPath);
- cmdFile = new File(cmdFile.getParent()+"/m_test.txt");
- try{
- writeToFile("GLOBAL C_PATH " + path + sep,cmdFile);
- appendToFile("GLOBAL C_ESS " + ext.charAt(0) + sep,cmdFile);
- appendToFile("GLOBAL C_FNAME " + fname + sep,cmdFile);
- appendToFile("GLOBAL C_IN_EXT " + ext + sep,cmdFile);
- appendToFile("CMD use",cmdFile);
- out.setText(out.getText()+"use "+fname+"\n");
+ cmdFile = new File(cmdFile.getParent() + "/m_test.txt");
+ try {
+ writeToFile("GLOBAL C_PATH " + path + sep, cmdFile);
+ appendToFile("GLOBAL C_ESS " + ext.charAt(0) + sep, cmdFile);
+ appendToFile("GLOBAL C_FNAME " + fname + sep, cmdFile);
+ appendToFile("GLOBAL C_IN_EXT " + ext + sep, cmdFile);
+ appendToFile("CMD use", cmdFile);
+ out.setText(out.getText() + "use " + fname + "\n");
rawCmd("<m_test.txt>");
- }catch(IOException e){}
+ } catch (IOException e) {
+ }
}
-
- protected void saveHistoryM(){
+
+ protected void saveHistoryM() {
java.util.Properties props = new java.util.Properties();
props.setProperty("savePath", savePath);
props.setProperty("usePath", usePath);
JmolPanel.historyFile.addProperties(props);
}
-}
\ No newline at end of file
+}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Don't Limit Your Business. Reach for the Cloud.
GigeNET's Cloud Solutions provide you with the tools and support that
you need to offload your IT needs and focus on growing your business.
Configured For All Businesses. Start Your Cloud Today.
https://www.gigenetcloud.com/
_______________________________________________
Jmol-commits mailing list
Jmol-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jmol-commits
