git://git.nikiroo.be
/
jvcard.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix inclusion of lanterna's resources + fix warning
[jvcard.git]
/
src
/
be
/
nikiroo
/
jvcard
/
parsers
/
Parser.java
diff --git
a/src/be/nikiroo/jvcard/parsers/Parser.java
b/src/be/nikiroo/jvcard/parsers/Parser.java
index 1fa7c5749805746d58e41f9fae52e575e2cb529d..040cd3e113ab9862b15ace9c3967bfca4610878b 100644
(file)
--- a/
src/be/nikiroo/jvcard/parsers/Parser.java
+++ b/
src/be/nikiroo/jvcard/parsers/Parser.java
@@
-28,7
+28,7
@@
public class Parser {
* @throws IOException
* in case of IO error
*/
* @throws IOException
* in case of IO error
*/
- public static List<Contact> parse(File file, Format format)
+ public static List<Contact> parse
Contact
(File file, Format format)
throws IOException {
List<String> lines = null;
throws IOException {
List<String> lines = null;
@@
-46,7
+46,7
@@
public class Parser {
if (lines == null)
return new LinkedList<Contact>();
if (lines == null)
return new LinkedList<Contact>();
- return parse(lines, format);
+ return parse
Contact
(lines, format);
}
/**
}
/**
@@
-59,12
+59,12
@@
public class Parser {
*
* @return the list of elements
*/
*
* @return the list of elements
*/
- public static List<Contact> parse(List<String> lines, Format format) {
+ public static List<Contact> parse
Contact
(List<String> lines, Format format) {
switch (format) {
case VCard21:
switch (format) {
case VCard21:
- return Vcard21Parser.parse(lines);
+ return Vcard21Parser.parse
Contact
(lines);
case Abook:
case Abook:
- return AbookParser.parse(lines);
+ return AbookParser.parse
Contact
(lines);
default:
throw new InvalidParameterException("Unknown format: "
default:
throw new InvalidParameterException("Unknown format: "
@@
-73,28
+73,27
@@
public class Parser {
}
/**
}
/**
- * Return a {@link String} representation of the given {@link Card}, line by
- * line.
+ * Write the given {@link Card} in the {@link Appendable}.
*
*
+ * @param writer
+ * the {@link Appendable}
* @param card
* @param card
- * the card to convert
- *
- * @param startingBKey
- * the starting BKey number (all the other will follow) or -1 for
- * no BKey
- *
+ * the {@link Card} to write
* @param format
* @param format
- * the
output {@link Format} to use
+ * the
{@link Format} to export to
*
*
- * @return the {@link String} representation
+ * @throws IOException
+ * in case of IO error
*/
*/
- public static List<String> toStrings(Card card, Format format) {
+ public static void write(Appendable writer, Format format, Card card)
+ throws IOException {
switch (format) {
case VCard21:
switch (format) {
case VCard21:
- return Vcard21Parser.toStrings(card);
+ Vcard21Parser.write(writer, card);
+ break;
case Abook:
case Abook:
-
return AbookParser.toStrings(
card);
-
+
AbookParser.write(writer,
card);
+ break;
default:
throw new InvalidParameterException("Unknown format: "
+ format.toString());
default:
throw new InvalidParameterException("Unknown format: "
+ format.toString());
@@
-102,29
+101,30
@@
public class Parser {
}
/**
}
/**
- * Return a {@link String} representation of the given {@link Card}, line by
- * line.
- *
- * @param card
- * the card to convert
+ * Write the given {@link Contact} in the {@link Appendable}.
*
*
+ * @param writer
+ * the {@link Appendable}
+ * @param contact
+ * the {@link Contact} to write
* @param startingBKey
* the starting BKey number (all the other will follow) or -1 for
* no BKey
* @param startingBKey
* the starting BKey number (all the other will follow) or -1 for
* no BKey
- *
* @param format
* @param format
- * the
output {@link Format} to use
+ * the
{@link Format} to export to
*
*
- * @return the {@link String} representation
+ * @throws IOException
+ * in case of IO error
*/
*/
- public static
List<String> toStrings(
Contact contact, Format format,
- int startingBKey) {
+ public static
void write(Appendable writer,
Contact contact, Format format,
+ int startingBKey)
throws IOException
{
switch (format) {
case VCard21:
switch (format) {
case VCard21:
- return Vcard21Parser.toStrings(contact, startingBKey);
+ Vcard21Parser.write(writer, contact, startingBKey);
+ break;
case Abook:
case Abook:
-
return AbookParser.toStrings(
contact, startingBKey);
-
+
AbookParser.write(writer,
contact, startingBKey);
+ break;
default:
throw new InvalidParameterException("Unknown format: "
+ format.toString());
default:
throw new InvalidParameterException("Unknown format: "
+ format.toString());