X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fde%2Ftodesbaum%2Fjsite%2Fmain%2FConfiguration.java;h=a4e7f293b294a68039d4372ac6be6dccb3e4a351;hb=e47e15fdbb7515f5a3757c3f5df8c1d0950aee8e;hp=1eb4b92fe7242cfb114bdf36056cc1c5836a2f62;hpb=a3561508e6b6ab321df336c32e94ea25a1c2983e;p=jSite.git diff --git a/src/de/todesbaum/jsite/main/Configuration.java b/src/de/todesbaum/jsite/main/Configuration.java index 1eb4b92..a4e7f29 100644 --- a/src/de/todesbaum/jsite/main/Configuration.java +++ b/src/de/todesbaum/jsite/main/Configuration.java @@ -1,5 +1,5 @@ /* - * jSite - Configuration.java - Copyright © 2006–2011 David Roden + * jSite - Configuration.java - Copyright © 2006–2012 David Roden * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -337,17 +337,20 @@ public class Configuration { } /* load last insert hashes. */ + Map fileOptions = new HashMap(); SimpleXML lastInsertHashesNode = projectNode.getNode("last-insert-hashes"); if (lastInsertHashesNode != null) { for (SimpleXML fileNode : lastInsertHashesNode.getNodes("file")) { String filename = fileNode.getNode("filename").getValue(); String lastInsertHash = fileNode.getNode("last-insert-hash").getValue(); - project.getFileOption(filename).setLastInsertHash(lastInsertHash); + int lastInsertEdition = Integer.valueOf(fileNode.getNode("last-insert-edition").getValue()); + FileOption fileOption = project.getFileOption(filename); + fileOption.setLastInsertHash(lastInsertHash).setLastInsertEdition(lastInsertEdition); + fileOptions.put(filename, fileOption); } } SimpleXML fileOptionsNode = projectNode.getNode("file-options"); - Map fileOptions = new HashMap(); if (fileOptionsNode != null) { SimpleXML[] fileOptionNodes = fileOptionsNode.getNodes("file-option"); for (SimpleXML fileOptionNode : fileOptionNodes) { @@ -404,6 +407,7 @@ public class Configuration { SimpleXML fileNode = lastInsertHashesNode.append("file"); fileNode.append("filename", fileOption.getKey()); fileNode.append("last-insert-hash", fileOption.getValue().getLastInsertHash()); + fileNode.append("last-insert-edition", String.valueOf(fileOption.getValue().getLastInsertEdition())); } SimpleXML fileOptionsNode = projectNode.append("file-options");