Menu
▾
▴
[Cdk-commits] SF.net SVN: cdk:[14740] jchempaint/trunk/src/main/org/openscience/ jchempaint/action/OpenAction.java
|
From: <mar...@us...> - 2009-08-18 15:30:16
|
Revision: 14740
http://cdk.svn.sourceforge.net/cdk/?rev=14740&view=rev
Author: mark_rynbeek
Date: 2009-08-18 15:30:08 +0000 (Tue, 18 Aug 2009)
Log Message:
-----------
source format with Eclipse
Modified Paths:
--------------
jchempaint/trunk/src/main/org/openscience/jchempaint/action/OpenAction.java
Modified: jchempaint/trunk/src/main/org/openscience/jchempaint/action/OpenAction.java
===================================================================
--- jchempaint/trunk/src/main/org/openscience/jchempaint/action/OpenAction.java 2009-08-18 14:46:45 UTC (rev 14739)
+++ jchempaint/trunk/src/main/org/openscience/jchempaint/action/OpenAction.java 2009-08-18 15:30:08 UTC (rev 14740)
@@ -49,87 +49,111 @@
/**
* Shows the open dialog
- *
+ *
*/
public class OpenAction extends JCPAction {
- private static final long serialVersionUID = 1030940425527065876L;
+ private static final long serialVersionUID = 1030940425527065876L;
- private FileFilter currentFilter = null;
+ private FileFilter currentFilter = null;
- /**
- * Opens an empty JChemPaint frame.
- *
- * @param e Description of the Parameter
- */
- public void actionPerformed(ActionEvent e) {
+ /**
+ * Opens an empty JChemPaint frame.
+ *
+ * @param e
+ * Description of the Parameter
+ */
+ public void actionPerformed(ActionEvent e) {
-
- JFileChooser chooser = new JFileChooser();
- chooser.setCurrentDirectory(jcpPanel.getCurrentWorkDirectory());
- JCPFileFilter.addChoosableFileFilters(chooser);
- if (jcpPanel.getCurrentOpenFileFilter() != null) {
- chooser.setFileFilter(jcpPanel.getCurrentOpenFileFilter());
- }
- if (jcpPanel.getLastOpenedFile() != null) {
- chooser.setSelectedFile(jcpPanel.getLastOpenedFile());
- }
- if (currentFilter != null) {
- chooser.setFileFilter(currentFilter);
- }
- chooser.setFileView(new JCPFileView());
+ JFileChooser chooser = new JFileChooser();
+ chooser.setCurrentDirectory(jcpPanel.getCurrentWorkDirectory());
+ JCPFileFilter.addChoosableFileFilters(chooser);
+ if (jcpPanel.getCurrentOpenFileFilter() != null) {
+ chooser.setFileFilter(jcpPanel.getCurrentOpenFileFilter());
+ }
+ if (jcpPanel.getLastOpenedFile() != null) {
+ chooser.setSelectedFile(jcpPanel.getLastOpenedFile());
+ }
+ if (currentFilter != null) {
+ chooser.setFileFilter(currentFilter);
+ }
+ chooser.setFileView(new JCPFileView());
- int returnVal = chooser.showOpenDialog(jcpPanel);
+ int returnVal = chooser.showOpenDialog(jcpPanel);
- currentFilter = chooser.getFileFilter();
+ currentFilter = chooser.getFileFilter();
- if (returnVal == JFileChooser.APPROVE_OPTION) {
- jcpPanel.setCurrentWorkDirectory(chooser.getCurrentDirectory());
- jcpPanel.setCurrentOpenFileFilter(chooser.getFileFilter());
+ if (returnVal == JFileChooser.APPROVE_OPTION) {
+ jcpPanel.setCurrentWorkDirectory(chooser.getCurrentDirectory());
+ jcpPanel.setCurrentOpenFileFilter(chooser.getFileFilter());
- javax.swing.filechooser.FileFilter ff = chooser.getFileFilter();
- if (ff instanceof JCPFileFilter) {
- type = ((JCPFileFilter) ff).getType();
-
- }
- if(jcpPanel.getGuistring().equals(JChemPaintEditorApplet.GUI_APPLET)){
- int clear=jcpPanel.showWarning();
- if(clear==JOptionPane.YES_OPTION){
- try {
- IChemModel chemModel=null;
- try {
- chemModel = JChemPaint.readFromFileReader(chooser.getSelectedFile().toURI().toURL(), chooser.getSelectedFile().toURI().toString(), type);
- } catch (MalformedURLException e1) {
- // TODO Auto-generated catch block
- e1.printStackTrace();
- }
- if(jcpPanel.get2DHub().getUndoRedoFactory()!=null && jcpPanel.get2DHub().getUndoRedoHandler()!=null){
- IUndoRedoable undoredo = jcpPanel.get2DHub().getUndoRedoFactory().getLoadNewModelEdit(jcpPanel.getChemModel(), jcpPanel.getChemModel().getMoleculeSet(), jcpPanel.getChemModel().getReactionSet(), chemModel.getMoleculeSet(), chemModel.getReactionSet(), "Load "+chooser.getSelectedFile().getName());
- jcpPanel.get2DHub().getUndoRedoHandler().postEdit(undoredo);
- }
- jcpPanel.getChemModel().setMoleculeSet(chemModel.getMoleculeSet());
- //jcpPanel.getChemModel().setReactionSet(chemModel.getReactionSet());
- jcpPanel.getRenderPanel().getRenderer().getRenderer2DModel().setSelection(
- new LogicalSelection(LogicalSelection.Type.NONE));
-
- // the newly opened file should be set to zoom factor one
- jcpPanel.getRenderPanel().getRenderer().getRenderer2DModel().setZoomFactor(1);
-
- // quick fix upside down mol files
- //jcpPanel.get2DHub().flip(true);
+ javax.swing.filechooser.FileFilter ff = chooser.getFileFilter();
+ if (ff instanceof JCPFileFilter) {
+ type = ((JCPFileFilter) ff).getType();
- //jcpPanel.get2DHub().updateView();
- jcpPanel.getRenderPanel().update(jcpPanel.getRenderPanel().getGraphics());
+ }
+ if (jcpPanel.getGuistring().equals(
+ JChemPaintEditorApplet.GUI_APPLET)) {
+ int clear = jcpPanel.showWarning();
+ if (clear == JOptionPane.YES_OPTION) {
+ try {
+ IChemModel chemModel = null;
+ try {
+ chemModel = JChemPaint
+ .readFromFileReader(chooser
+ .getSelectedFile().toURI().toURL(),
+ chooser.getSelectedFile().toURI()
+ .toString(), type);
+ } catch (MalformedURLException e1) {
+ // TODO Auto-generated catch block
+ e1.printStackTrace();
+ }
+ if (jcpPanel.get2DHub().getUndoRedoFactory() != null
+ && jcpPanel.get2DHub().getUndoRedoHandler() != null) {
+ IUndoRedoable undoredo = jcpPanel.get2DHub()
+ .getUndoRedoFactory().getLoadNewModelEdit(
+ jcpPanel.getChemModel(),
+ jcpPanel.getChemModel()
+ .getMoleculeSet(),
+ jcpPanel.getChemModel()
+ .getReactionSet(),
+ chemModel.getMoleculeSet(),
+ chemModel.getReactionSet(),
+ "Load "
+ + chooser.getSelectedFile()
+ .getName());
+ jcpPanel.get2DHub().getUndoRedoHandler().postEdit(
+ undoredo);
+ }
+ jcpPanel.getChemModel().setMoleculeSet(
+ chemModel.getMoleculeSet());
+ // jcpPanel.getChemModel().setReactionSet(chemModel.getReactionSet());
+ jcpPanel.getRenderPanel().getRenderer()
+ .getRenderer2DModel().setSelection(
+ new LogicalSelection(
+ LogicalSelection.Type.NONE));
- } catch (CDKException e1) {
- // TODO Auto-generated catch block
- e1.printStackTrace();
- }
- }
- }else{
- JChemPaint.showInstance(chooser.getSelectedFile(),type, jcpPanel, jcpPanel.isDebug());
- }
- }
- }
+ // the newly opened file should be set to zoom factor
+ // one
+ jcpPanel.getRenderPanel().getRenderer()
+ .getRenderer2DModel().setZoomFactor(1);
+
+ // quick fix upside down mol files
+ // jcpPanel.get2DHub().flip(true);
+
+ // jcpPanel.get2DHub().updateView();
+ jcpPanel.getRenderPanel().update(
+ jcpPanel.getRenderPanel().getGraphics());
+
+ } catch (CDKException e1) {
+ // TODO Auto-generated catch block
+ e1.printStackTrace();
+ }
+ }
+ } else {
+ JChemPaint.showInstance(chooser.getSelectedFile(), type,
+ jcpPanel, jcpPanel.isDebug());
+ }
+ }
+ }
}
-
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|