external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-18 03:38:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

filestreams closed on save too

Browse Source
This commit is contained in:
Maxmtg
2013-06-03 22:59:21 +00:00
parent 1bca2ac7ac
commit 1f28e96583
1 changed files with 43 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
src/main/java/forge/gui/framework/SLayoutIO.java
View File

@@ -70,12 +70,10 @@ public final class SLayoutIO {
throw new IllegalThreadStateException("This operation should be independent of the EDT."); throw new IllegalThreadStateException("This operation should be independent of the EDT.");
} }
try { save(f0); } save(f0);
catch (final Exception e) { e.printStackTrace(); }
} }
private synchronized static void save(final File f0) throws Exception { private synchronized static void save(final File f0) {
final String fWriteTo; final String fWriteTo;
FileLocation file = SLayoutIO.getFileForState(Singletons.getControl().getState()); FileLocation file = SLayoutIO.getFileForState(Singletons.getControl().getState());
@@ -90,38 +88,53 @@ public final class SLayoutIO {
} }
final XMLOutputFactory out = XMLOutputFactory.newInstance(); final XMLOutputFactory out = XMLOutputFactory.newInstance();
final XMLEventWriter writer = out.createXMLEventWriter(new FileOutputStream(fWriteTo)); FileOutputStream fos = null;
final List<DragCell> cells = FView.SINGLETON_INSTANCE.getDragCells(); XMLEventWriter writer = null;
try {
fos = new FileOutputStream(fWriteTo);
writer = out.createXMLEventWriter(fos);
final List<DragCell> cells = FView.SINGLETON_INSTANCE.getDragCells();
writer.add(EF.createStartDocument()); writer.add(EF.createStartDocument());
writer.add(NEWLINE); writer.add(NEWLINE);
writer.add(EF.createStartElement("", "", "layout")); writer.add(EF.createStartElement("", "", "layout"));
writer.add(NEWLINE);
for (final DragCell cell : cells) {
cell.updateRoughBounds();
RectangleOfDouble bounds = cell.getRoughBounds();
writer.add(TAB);
writer.add(EF.createStartElement("", "", "cell"));
writer.add(EF.createAttribute(Property.x.toString(), String.valueOf(Math.rint(bounds.getX() * 100000) / 100000)));
writer.add(EF.createAttribute(Property.y.toString(), String.valueOf(Math.rint(bounds.getY() * 100000) / 100000)));
writer.add(EF.createAttribute(Property.w.toString(), String.valueOf(Math.rint(bounds.getW() * 100000) / 100000)));
writer.add(EF.createAttribute(Property.h.toString(), String.valueOf(Math.rint(bounds.getH() * 100000) / 100000)));
writer.add(NEWLINE); writer.add(NEWLINE);
for (final IVDoc<? extends ICDoc> vDoc : cell.getDocs()) { for (final DragCell cell : cells) {
createNode(writer, Property.doc, vDoc.getDocumentID().toString()); cell.updateRoughBounds();
RectangleOfDouble bounds = cell.getRoughBounds();
writer.add(TAB);
writer.add(EF.createStartElement("", "", "cell"));
writer.add(EF.createAttribute(Property.x.toString(), String.valueOf(Math.rint(bounds.getX() * 100000) / 100000)));
writer.add(EF.createAttribute(Property.y.toString(), String.valueOf(Math.rint(bounds.getY() * 100000) / 100000)));
writer.add(EF.createAttribute(Property.w.toString(), String.valueOf(Math.rint(bounds.getW() * 100000) / 100000)));
writer.add(EF.createAttribute(Property.h.toString(), String.valueOf(Math.rint(bounds.getH() * 100000) / 100000)));
writer.add(NEWLINE);
for (final IVDoc<? extends ICDoc> vDoc : cell.getDocs()) {
createNode(writer, Property.doc, vDoc.getDocumentID().toString());
}
writer.add(TAB);
writer.add(EF.createEndElement("", "", "cell"));
writer.add(NEWLINE);
} }
writer.flush();
writer.add(EF.createEndDocument());
} catch (FileNotFoundException e) {
// TODO Auto-generated catch block ignores the exception, but sends it to System.err and probably forge.log.
e.printStackTrace();
} catch (XMLStreamException e) {
// TODO Auto-generated catch block ignores the exception, but sends it to System.err and probably forge.log.
e.printStackTrace();
} finally {
if ( writer != null )
try { writer.close(); } catch (XMLStreamException e) {}
writer.add(TAB); if ( fos != null )
writer.add(EF.createEndElement("", "", "cell")); try { fos.close(); } catch (IOException e) {}
writer.add(NEWLINE);
} }
writer.add(EF.createEndDocument());
writer.flush();
writer.close();
} }
public static void loadLayout(final File f) { public static void loadLayout(final File f) {