Migrate to git, fix formatting

.gitignore

@@ -0,0 +1,3 @@
+.classpath
+.settings
+target

src/main/java/org/shredzone/pdbconverter/CalendarFactory.java

@@ -27,9 +27,8 @@
  * {@link TimeZone}.
  * <p>
  * Instances are thread local, so different threads may have different time zone settings.
- * 
+ *
  * @author Richard "Shred" Körber
- * @version $Revision: 524 $
  */
 public class CalendarFactory {
 
@@ -51,13 +50,13 @@ protected CalendarFactory initialValue() {
      * Gets the singleton instance of the factory. The returned singleton is thread local
      * and can only be used by the invoking thread. On the other hand, multiple threads
      * can have individual time zone settings.
-     * 
+     *
      * @return {@link CalendarFactory} instance
      */
     public static CalendarFactory getInstance() {
         return INSTANCES.get();
     }
-    
+
     /**
      * The {@link TimeZone} to be used. Defaults to the system's time zone.
      */
@@ -66,7 +65,7 @@ public static CalendarFactory getInstance() {
 
     /**
      * Creates a new {@link Calendar} instance with the current time zone.
-     * 
+     *
      * @return {@link Calendar}
      */
     public Calendar create() {
@@ -75,7 +74,7 @@ public Calendar create() {
 
     /**
      * Creates a new {@link Calendar} instance with the given time zone.
-     * 
+     *
      * @param tz
      *            {@link TimeZone} to be used
      * @return {@link Calendar}
@@ -86,7 +85,7 @@ public Calendar createWithTimeZone(TimeZone tz) {
 
     /**
      * Creates a {@link Calendar} that is set to the PalmOS epoch.
-     * 
+     *
      * @return {@link Calendar} set to the PalmOS epoch.
      */
     public Calendar createPalmEpoch() {

src/main/java/org/shredzone/pdbconverter/ConverterRegister.java

@@ -33,10 +33,9 @@
  * A register of all available {@link ExportHandler}.
  *
  * @author Richard "Shred" Körber
- * @version $Revision: 575 $
  */
 public final class ConverterRegister {
-    
+
     private static final ExportHandler[] HANDLERS = {
         new AddressXmlHandler(),
         new ICalendarHandler(),
@@ -47,24 +46,24 @@ public final class ConverterRegister {
         new VCardHandler(),
         new ZipHandler(),
     };
-    
+
     /**
      * Utility class cannot be constructed.
      */
     private ConverterRegister() {}
 
     /**
      * Gets all registered {@link ExportHandler}.
-     * 
+     *
      * @return Array of {@link ExportHandler}
      */
     public static ExportHandler[] getHandlers() {
         return HANDLERS;
     }
-    
+
     /**
      * Finds the {@link ExportHandler} for the given converter name.
-     * 
+     *
      * @param name
      *            Converter name
      * @return {@link ExportHandler} or {@code null} if there is none.

src/main/java/org/shredzone/pdbconverter/PdbConverter.java

@@ -40,16 +40,15 @@
  * PdbConverter's main class.
  *
  * @author Richard "Shred" Körber
- * @version $Revision: 524 $
  */
 @SuppressWarnings("static-access")
 public class PdbConverter {
-    
+
     private static final String OPT_CATEGORY = "category";
     private static final String OPT_SPLIT = "split";
     private static final String OPT_FROM = "from";
     private static final String OPT_UNTIL = "until";
-    
+
     private static final DateFormat yearDateFmt = new SimpleDateFormat("yyyy");
     private static final DateFormat monthDateFmt = new SimpleDateFormat("yyyy-MM");
     private static final DateFormat dayDateFmt = new SimpleDateFormat("yyyy-MM-dd");
@@ -58,7 +57,7 @@ public class PdbConverter {
         monthDateFmt.setLenient(true);
         dayDateFmt.setLenient(true);
     }
-    
+
     private static final Options CLI_OPTIONS = new Options();
     static {
         CLI_OPTIONS.addOption(OptionBuilder
@@ -74,7 +73,7 @@ public class PdbConverter {
                 .withDescription("converted output file")
                 .isRequired().hasArg()
                 .create("o"));
-        
+
         CLI_OPTIONS.addOption(OptionBuilder
                 .withArgName("converter")
                 .withLongOpt("converter")
@@ -88,7 +87,7 @@ public class PdbConverter {
                 .withDescription("only output records of this category")
                 .hasArg()
                 .create("t"));
-        
+
         CLI_OPTIONS.addOption(OptionBuilder
                 .withArgName(OPT_SPLIT)
                 .withLongOpt("split")
@@ -127,7 +126,7 @@ public static void main(String[] args) {
         try {
             CommandLineParser parser = new GnuParser();
             CommandLine cmd = parser.parse(GUI_CLI_OPTIONS, args);
-            
+
             if (cmd.hasOption("gui")) {
                 new PdbConverterGui();
                 return;
@@ -139,34 +138,34 @@ public static void main(String[] args) {
         try {
             CommandLineParser parser = new GnuParser();
             CommandLine cmd = parser.parse(CLI_OPTIONS, args);
-            
+
             if (cmd.hasOption("gui")) {
                 new PdbConverterGui();
                 return;
             }
-            
+
             String infile = cmd.getOptionValue("input");
             String outfile = cmd.getOptionValue("output");
             String converter = cmd.getOptionValue("converter", "zip");
-            
+
             ExportHandler handler = ConverterRegister.findHandler(converter);
             if (handler == null) {
                 System.err.println("Unknown converter: " + converter);
                 printHelp();
                 System.exit(1);
             }
-            
+
             File in = new File(infile);
             File out = new File(outfile);
-            
+
             ExportOptions options = new ExportOptions();
             options.setSplit(cmd.hasOption(OPT_SPLIT));
             options.setCategory(cmd.getOptionValue(OPT_CATEGORY));
             options.setFrom(parseDate(cmd.getOptionValue(OPT_FROM)));
             options.setUntil(parseDate(cmd.getOptionValue(OPT_UNTIL)));
-            
+
             handler.export(in, out, options);
-            
+
         } catch (IOException ex) {
             System.err.println("Could not convert: " + ex.getMessage());
 
@@ -178,7 +177,7 @@ public static void main(String[] args) {
 
     /**
      * Parses a date string.
-     * 
+     *
      * @param str
      *            Date string to be parsed. May be {@code null}.
      * @return {@link Calendar} object, or {@code null} if a null was passed in.
@@ -202,12 +201,12 @@ private static Calendar parseDate(String str) throws ParseException {
                 }
             }
         }
-        
+
         Calendar cal = CalendarFactory.getInstance().create();
         cal.setTime(result);
         return cal;
     }
-    
+
     /**
      * Outputs a help page.
      */

src/main/java/org/shredzone/pdbconverter/PdbConverterGui.java

@@ -30,7 +30,6 @@
  * A very simple Swing application for GUI based file conversion.
  *
  * @author Richard "Shred" Körber
- * @version $Revision: 523 $
  */
 public class PdbConverterGui extends JFrame {
     private static final long serialVersionUID = -3167361308090208721L;
@@ -56,4 +55,5 @@ public void run() {
     public static void main(String[] args) {
         new PdbConverterGui();
     }
+
 }

src/main/java/org/shredzone/pdbconverter/export/AbstractExporter.java

@@ -27,10 +27,9 @@
  * An abstract implementation of {@link Exporter} that handles filtering.
  *
  * @author Richard "Shred" Körber
- * @version $Revision: 399 $
  */
 public abstract class AbstractExporter<T extends Record, U extends AppInfo> implements Exporter<T, U> {
-    
+
     private ExportFilter<T> filter;
 
     @Override
@@ -40,13 +39,13 @@ public void setFilter(ExportFilter<T> filter) {
 
     /**
      * Checks if the current filter accepts the given record.
-     * 
+     *
      * @param record
      *            {@link Record} to test
      * @return {@code true} if the record is accepted
      */
     protected boolean isAccepted(T record) {
         return (filter == null || filter.accepts(record));
     }
-    
+
 }

src/main/java/org/shredzone/pdbconverter/export/AddressXmlExporter.java

@@ -33,13 +33,12 @@
  * Writes a {@link AddressRecord} database as a single XML file.
  *
  * @author Richard "Shred" Körber
- * @version $Revision: 490 $
  */
 public class AddressXmlExporter extends AbstractExporter<AddressRecord, AddressAppInfo> {
 
     /**
      * Writes the {@link AddressRecord} database XML to the given {@link OutputStream}.
-     * 
+     *
      * @param database
      *            {@link AddressRecord} {@link PdbDatabase} to write
      * @param out
@@ -50,11 +49,11 @@ public void export(PdbDatabase<AddressRecord, AddressAppInfo> database, OutputSt
     throws IOException {
         XmlHelper xh = new XmlHelper();
         xh.openXmlWriter(out, "addressdb");
-        
+
         xh.writeDatabase(database);
         xh.writeValue("country", database.getAppInfo().getCountry());
         xh.writeCategories(database);
-        
+
         writeLabelNames(database.getAppInfo(), xh);
 
         xh.startElement("addresses");
@@ -72,33 +71,33 @@ public void export(PdbDatabase<AddressRecord, AddressAppInfo> database, OutputSt
             }
         }
         xh.endElement();
-        
+
         xh.closeXmlWriter();
     }
 
     /**
      * Writes an {@link AddressRecord}.
-     * 
+     *
      * @param address
      *            {@link AddressRecord} to be written
      * @param xh
      *            {@link XmlHelper} for the output
      */
     private void writeAddress(AddressRecord address, XmlHelper xh) throws IOException {
         int pref = address.getDisplayPhone();
-        
+
         for (Field field : Field.values()) {
             String value = address.getField(field);
             Label label = address.getLabel(field);
-            
+
             boolean preferred = false;
             if (   label == Label.PHONE1 || label == Label.PHONE2 || label == Label.PHONE3
                 || label == Label.PHONE4 || label == Label.PHONE5 || label == Label.PHONE6
                 || label == Label.PHONE7 || label == Label.PHONE8) {
                 preferred = (pref == 0);
                 pref--;
             }
-            
+
             if (value != null) {
                 if (preferred) {
                     xh.startElement(
@@ -123,7 +122,7 @@ private void writeAddress(AddressRecord address, XmlHelper xh) throws IOExceptio
 
     /**
      * Writes the label names.
-     * 
+     *
      * @param appinfo
      *            {@link AddressAppInfo} with the label definitions
      * @param xh
@@ -138,5 +137,5 @@ private void writeLabelNames(AddressAppInfo appinfo, XmlHelper xh) throws IOExce
         }
         xh.endElement();
     }
-    
+
 }

src/main/java/org/shredzone/pdbconverter/export/Exporter.java

@@ -31,20 +31,19 @@
  * Generic interface for a database exporter.
  *
  * @author Richard "Shred" Körber
- * @version $Revision: 399 $
  */
 public interface Exporter<T extends Record, U extends AppInfo> {
-    
+
     /**
      * Sets a filter to only export certain records.
-     * 
+     *
      * @param filter ExportFilter to be used. {@code null} means to use no filter.
      */
     void setFilter(ExportFilter<T> filter);
 
     /**
      * Exports the database to the given stream.
-     * 
+     *
      * @param database
      *            {@link PdbDatabase} to be exported
      * @param out