From 1b2495f23e8539d8ba2525a1ce6a41937f21280f Mon Sep 17 00:00:00 2001 From: bancika Date: Sun, 16 Jan 2011 13:28:34 +0000 Subject: [PATCH] fixed save and save as to update the title bar --- .../DIYLC/src/org/diylc/gui/MainFrame.java | 8 ++-- .../org/diylc/plugins/file/FileManager.java | 47 ++++--------------- 2 files changed, 14 insertions(+), 41 deletions(-) diff --git a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/gui/MainFrame.java b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/gui/MainFrame.java index c3d83273..4c681e59 100644 --- a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/gui/MainFrame.java +++ b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/gui/MainFrame.java @@ -243,9 +243,11 @@ public class MainFrame extends JFrame implements IView { @Override public void processMessage(EventType eventType, Object... params) { if (eventType == EventType.FILE_STATUS_CHANGED) { - String fileName = plugInPort.getCurrentFileName() == null ? "Untitled" : plugInPort - .getCurrentFileName(); - String modified = plugInPort.isProjectModified() ? " (modified)" : ""; + String fileName = (String) params[0]; + if (fileName == null) { + fileName = "Untitled"; + } + String modified = (Boolean) params[1] ? " (modified)" : ""; setTitle(String.format("DIYLC %s alpha - %s %s", plugInPort.getCurrentVersionNumber(), fileName, modified)); } diff --git a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/plugins/file/FileManager.java b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/plugins/file/FileManager.java index d2e64348..908e57be 100644 --- a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/plugins/file/FileManager.java +++ b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/plugins/file/FileManager.java @@ -2,15 +2,11 @@ package org.diylc.plugins.file; import java.awt.event.ActionEvent; import java.io.File; -import java.io.FileNotFoundException; -import java.io.FileOutputStream; -import java.io.IOException; import java.util.EnumSet; import java.util.List; import javax.swing.AbstractAction; -import org.apache.log4j.Logger; import org.diylc.common.EventType; import org.diylc.common.IPlugIn; import org.diylc.common.IPlugInPort; @@ -19,8 +15,6 @@ import org.diylc.images.IconLoader; import com.diyfever.gui.IDrawingProvider; import com.diyfever.gui.export.DrawingExporter; -import com.thoughtworks.xstream.XStream; -import com.thoughtworks.xstream.io.xml.DomDriver; /** * Entry point class for File management utilities. @@ -29,8 +23,6 @@ import com.thoughtworks.xstream.io.xml.DomDriver; */ public class FileManager implements IPlugIn { - private static final Logger LOG = Logger.getLogger(FileManager.class); - private static final String FILE_TITLE = "File"; private static final String TRACE_MASK_TITLE = "Trace Mask"; @@ -38,8 +30,6 @@ public class FileManager implements IPlugIn { private ProjectDrawingProvider drawingProvider; private TraceMaskDrawingProvider traceMaskDrawingProvider; - private XStream xStream = new XStream(new DomDriver()); - @Override public void connect(IPlugInPort plugInPort) { this.plugInPort = plugInPort; @@ -119,22 +109,15 @@ public class FileManager implements IPlugIn { @Override public void actionPerformed(ActionEvent e) { - File file = DialogFactory.getInstance().showSaveDialog(FileFilterEnum.DIY.getFilter(), - null, FileFilterEnum.DIY.getExtensions()[0], new ProjectPreview()); - if (file != null) { - LOG.info("Saving project to file."); - FileOutputStream fos; - try { - fos = new FileOutputStream(file); - xStream.toXML(plugInPort.getCurrentProject(), fos); - fos.close(); - } catch (FileNotFoundException ex) { - // TODO Auto-generated catch block - ex.printStackTrace(); - } catch (IOException ex) { - // TODO Auto-generated catch block - ex.printStackTrace(); + if (plugInPort.getCurrentFileName() == null) { + File file = DialogFactory.getInstance().showSaveDialog( + FileFilterEnum.DIY.getFilter(), null, + FileFilterEnum.DIY.getExtensions()[0], new ProjectPreview()); + if (file != null) { + plugInPort.saveProjectToFile(file.getAbsolutePath()); } + } else { + plugInPort.saveProjectToFile(plugInPort.getCurrentFileName()); } } } @@ -154,19 +137,7 @@ public class FileManager implements IPlugIn { File file = DialogFactory.getInstance().showSaveDialog(FileFilterEnum.DIY.getFilter(), null, FileFilterEnum.DIY.getExtensions()[0], new ProjectPreview()); if (file != null) { - LOG.info("Saving project to file."); - FileOutputStream fos; - try { - fos = new FileOutputStream(file); - xStream.toXML(plugInPort.getCurrentProject(), fos); - fos.close(); - } catch (FileNotFoundException ex) { - // TODO Auto-generated catch block - ex.printStackTrace(); - } catch (IOException ex) { - // TODO Auto-generated catch block - ex.printStackTrace(); - } + plugInPort.saveProjectToFile(file.getAbsolutePath()); } } }