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

file deletion now works

Browse Source
This commit is contained in:
Maxmtg
2013-06-03 22:51:29 +00:00
parent 6418060d5f
commit 1bca2ac7ac
1 changed files with 26 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5,6 +5,7 @@ import java.io.File;
import java.io.FileInputStream; import java.io.FileInputStream;
import java.io.FileNotFoundException; import java.io.FileNotFoundException;
import java.io.FileOutputStream; import java.io.FileOutputStream;
import java.io.IOException;
import java.util.Collection; import java.util.Collection;
import java.util.Iterator; import java.util.Iterator;
import java.util.List; import java.util.List;
@@ -154,19 +155,36 @@ public final class SLayoutIO {
fis = new FileInputStream(file.defaultLoc); fis = new FileInputStream(file.defaultLoc);
} }
} }
} catch (FileNotFoundException e) {
throw new RuntimeException(e);
}
XMLEventReader xer = null;
try { try {
model = readLayout(inputFactory.createXMLEventReader(fis)); xer = inputFactory.createXMLEventReader(fis);
model = readLayout(xer);
} catch (final XMLStreamException e) { } catch (final XMLStreamException e) {
try {
if ( xer != null ) xer.close();
} catch (final XMLStreamException x) {
e.printStackTrace();
}
e.printStackTrace();
if ( usedCustomPrefsFile ) // the one we can safely delete if ( usedCustomPrefsFile ) // the one we can safely delete
throw new InvalidLayoutFileException(); throw new InvalidLayoutFileException();
else else
throw new RuntimeException(e); throw new RuntimeException(e);
} }
} catch (FileNotFoundException e) {
throw new RuntimeException(e);
} finally {
if ( fis != null )
try {
fis.close();
} catch (IOException e) {
e.printStackTrace();
}
}
// Apply new layout // Apply new layout
DragCell cell = null; DragCell cell = null;
for(Entry<RectangleOfDouble, Collection<EDocID>> kv : model.entrySet()) { for(Entry<RectangleOfDouble, Collection<EDocID>> kv : model.entrySet()) {