X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Fjvcard%2FCard.java;h=7939263bfc60b3201458810a735c3690df041077;hb=6a77f2ed5996a89e82edd6552942bf23123c205f;hp=de5ab67a604207f0d294f3d9a7652a460c4754a3;hpb=1c03abafc3987d93fa682e7b8758e51bed8a4faf;p=jvcard.git

diff --git a/src/be/nikiroo/jvcard/Card.java b/src/be/nikiroo/jvcard/Card.java
index de5ab67..7939263 100644
--- a/src/be/nikiroo/jvcard/Card.java
+++ b/src/be/nikiroo/jvcard/Card.java
@@ -40,12 +40,10 @@ public class Card extends BaseClass<Contact> {
 	 *             if format is NULL
 	 */
 	public Card(File file, Format format) throws IOException {
-		this(Parser.parse(file, format));
+		this(Parser.parseContact(file, format));
 
-		if (file != null) {
-			if (file.exists()) {
-				lastModified = file.lastModified();
-			}
+		if (file != null && file.exists()) {
+			lastModified = file.lastModified();
 		}
 
 		this.format = format;
@@ -105,6 +103,7 @@ public class Card extends BaseClass<Contact> {
 
 		if (this.file != null
 				&& file.getCanonicalPath().equals(this.file.getCanonicalPath())) {
+			lastModified = file.lastModified();
 			setPristine();
 		}
 
@@ -135,8 +134,10 @@ public class Card extends BaseClass<Contact> {
 		if (file == null)
 			return false;
 
-		this.replaceListContent(Parser.parse(file, format));
+		this.replaceListContent(Parser.parseContact(file, format));
+		lastModified = file.lastModified();
 		setPristine();
+
 		return true;
 	}
 
@@ -150,7 +151,12 @@ public class Card extends BaseClass<Contact> {
 	 * @return the {@link String}
 	 */
 	public String toString(Format format) {
-		return Parser.toString(this, format);
+		StringBuilder builder = new StringBuilder();
+		for (String line : Parser.toStrings(this, format)) {
+			builder.append(line);
+			builder.append("\r\n");
+		}
+		return builder.toString();
 	}
 
 	/**