- Timestamp:
- 06/30/13 12:48:20 (11 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
java/main/src/main/java/com/framsticks/leftovers/FavouritesXMLFactory.java
r87 r88 3 3 import java.io.BufferedWriter; 4 4 import java.io.File; 5 import java.io.FileInputStream; 6 import java.io.FileNotFoundException; 5 7 import java.io.FileOutputStream; 6 8 import java.io.IOException; 9 import java.io.InputStream; 7 10 import java.io.OutputStreamWriter; 8 11 import java.nio.file.Files; … … 26 29 import org.xml.sax.SAXException; 27 30 31 import com.framsticks.util.FramsticksException; 28 32 import com.framsticks.util.io.Encoding; 29 33 … … 36 40 private static final String TYPE_MARK = "type"; 37 41 38 protected Node readDocument(String filename) { 42 public static Node readDocument(InputStream stream) { 43 DocumentBuilderFactory docBuilderFactory = DocumentBuilderFactory.newInstance(); 44 try { 45 DocumentBuilder docBuilder = docBuilderFactory.newDocumentBuilder(); 46 Document doc = docBuilder.parse(stream); 47 doc.getDocumentElement().normalize(); 48 return doc.getFirstChild(); 49 } catch (ParserConfigurationException | SAXException | IOException e) { 50 throw new FramsticksException().cause(e); 51 } 52 } 53 54 public static Node readDocument(String filename) { 39 55 File file = new File(filename); 40 56 if (!file.exists()) { 41 return null; 42 } 43 DocumentBuilderFactory docBuilderFactory = DocumentBuilderFactory 44 .newInstance(); 57 throw new FramsticksException().msg("file does not exist"); 58 } 45 59 try { 46 DocumentBuilder docBuilder = docBuilderFactory.newDocumentBuilder(); 47 Document doc = docBuilder.parse(file); 48 doc.getDocumentElement().normalize(); 49 return doc.getFirstChild(); 50 51 } catch (ParserConfigurationException | SAXException | IOException e) { 52 log.error(e); 53 return null; 60 return readDocument(new FileInputStream(file)); 61 } catch (FileNotFoundException e) { 62 throw new FramsticksException().cause(e); 54 63 } 55 64 }
Note: See TracChangeset
for help on using the changeset viewer.