X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Fjvcard%2FCard.java;h=2622266c259a43c328178ae08c0a68b97c45e27a;hb=26d2bd0591901a8d52bd24802a8d6827d0e9b833;hp=65ab6fa5225b91fdacdd3430fdc52abdbb317395;hpb=0b0b2b0ff1f5e21f7b0feb955b4b54855fb3d508;p=jvcard.git

diff --git a/src/be/nikiroo/jvcard/Card.java b/src/be/nikiroo/jvcard/Card.java
index 65ab6fa..2622266 100644
--- a/src/be/nikiroo/jvcard/Card.java
+++ b/src/be/nikiroo/jvcard/Card.java
@@ -3,10 +3,11 @@ package be.nikiroo.jvcard;
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
 import java.io.File;
-import java.io.FileReader;
+import java.io.FileInputStream;
 import java.io.FileWriter;
 import java.io.IOException;
-import java.util.Arrays;
+import java.io.InputStreamReader;
+import java.security.InvalidParameterException;
 import java.util.LinkedList;
 import java.util.List;
 
@@ -20,34 +21,48 @@ import be.nikiroo.jvcard.parsers.Parser;
  * @author niki
  * 
  */
-public class Card {
-	private List<Contact> contacts;
+public class Card extends BaseClass<Contact> {
 	private File file;
-	private boolean dirty;
 	private String name;
+	private Format format;
 
+	/**
+	 * Create a new {@link Card} from the given {@link File} and {@link Format}.
+	 * 
+	 * @param file
+	 *            the file containing the {@link Card} data, must not be NULL
+	 * @param format
+	 *            the {@link Format} to use to parse it
+	 * 
+	 * @throws IOException
+	 *             in case of IO error
+	 * @throws NullPointerException
+	 *             if file is NULL
+	 * @throws InvalidParameterException
+	 *             if format is NULL
+	 */
 	public Card(File file, Format format) throws IOException {
-		this.file = file;
-
-		if (file != null) {
-			name = file.getName();
-		}
+		super(load(file, format));
 
-		BufferedReader buffer = new BufferedReader(new FileReader(file));
-		List<String> lines = new LinkedList<String>();
-		for (String line = buffer.readLine(); line != null; line = buffer
-				.readLine()) {
-			lines.add(line);
-		}
-
-		load(lines, format);
-		dirty = false; // initial load, so no change yet
-	}
-
-	public List<Contact> getContacts() {
-		return contacts;
+		this.file = file;
+		this.format = format;
+		this.name = file.getName();
 	}
 
+	/**
+	 * Save the {@link Card} to the given {@link File} with the given
+	 * {@link Format}.
+	 * 
+	 * @param file
+	 *            the {@link File} to save to
+	 * @param format
+	 *            the {@link Format} to use
+	 * 
+	 * @return TRUE if it was saved
+	 * 
+	 * @throws IOException
+	 *             in case of IO errors
+	 */
 	public boolean saveAs(File file, Format format) throws IOException {
 		if (file == null)
 			return false;
@@ -57,45 +72,40 @@ public class Card {
 		writer.close();
 
 		if (file.equals(this.file)) {
-			dirty = false;
+			setPristine();
 		}
 
 		return true;
 	}
 
-	public boolean save(Format format, boolean bKeys) throws IOException {
+	/**
+	 * Save the {@link Card} to the original {@link File} it was open from.
+	 * 
+	 * @return TRUE if it was saved
+	 * 
+	 * @throws IOException
+	 *             in case of IO errors
+	 */
+	public boolean save() throws IOException {
 		return saveAs(file, format);
 	}
 
+	/**
+	 * Return a {@link String} representation of this {@link Card} in the given
+	 * {@link Format}.
+	 * 
+	 * @param format
+	 *            the {@link Format} to use
+	 * 
+	 * @return the {@link String}
+	 */
 	public String toString(Format format) {
 		return Parser.toString(this, format);
 	}
 
-	public String toString() {
-		return toString(Format.VCard21);
-	}
-
-	protected void load(String serializedContent, Format format) {
-		// note: fixed size array
-		List<String> lines = Arrays.asList(serializedContent.split("\n"));
-		load(lines, format);
-	}
-
-	protected void load(List<String> lines, Format format) {
-		this.contacts = Parser.parse(lines, format);
-		setDirty();
-
-		for (Contact contact : contacts) {
-			contact.setParent(this);
-		}
-	}
-
-	public boolean isDirty() {
-		return dirty;
-	}
-
 	/**
-	 * Return the name of this card.
+	 * Return the name of this card (the name of the {@link File} which it was
+	 * opened from).
 	 * 
 	 * @return the name
 	 */
@@ -103,10 +113,34 @@ public class Card {
 		return name;
 	}
 
+	@Override
+	public String toString() {
+		return toString(Format.VCard21);
+	}
+
 	/**
-	 * Notify that this element has unsaved changes.
+	 * Load the data from the given {@link File} under the given {@link Format}.
+	 * 
+	 * @param file
+	 *            the {@link File} to load from
+	 * @param format
+	 *            the {@link Format} to load as
+	 * 
+	 * @return the list of elements
+	 * @throws IOException
+	 *             in case of IO error
 	 */
-	void setDirty() {
-		dirty = true;
+	static private List<Contact> load(File file, Format format)
+			throws IOException {
+		BufferedReader buffer = new BufferedReader(new InputStreamReader(
+				new FileInputStream(file), "UTF-8"));
+		List<String> lines = new LinkedList<String>();
+		for (String line = buffer.readLine(); line != null; line = buffer
+				.readLine()) {
+			lines.add(line);
+		}
+		buffer.close();
+
+		return Parser.parse(lines, format);
 	}
 }