Projects >> zanata-api >>add2ab9f15e45701d6b809095e363ba16dc36f23

Chunk
Conflicting content
import java.util.ArrayList;
import java.util.List;

<<<<<<< HEAD
public enum DocumentType
{
   GETTEXT_PORTABLE_OBJECT("po"),
   GETTEXT_PORTABLE_OBJECT_TEMPLATE("pot"),
   PLAIN_TEXT("txt"),
   XML_DOCUMENT_TYPE_DEFINITION("dtd"),

   OPEN_DOCUMENT_TEXT("odt"),
   OPEN_DOCUMENT_TEXT_FLAT("fodt"),
   OPEN_DOCUMENT_PRESENTATION("odp"),
   OPEN_DOCUMENT_PRESENTATION_FLAT("fodp"),
   OPEN_DOCUMENT_SPREADSHEET("ods"),
   OPEN_DOCUMENT_SPREADSHEET_FLAT("fods"),
   OPEN_DOCUMENT_GRAPHICS("odg"),
   OPEN_DOCUMENT_GRAPHICS_FLAT("fodg"),
   OPEN_DOCUMENT_DATABASE("odb"),
   OPEN_DOCUMENT_FORMULA("odf"),

   IDML("idml");

   private static final List allExtensions = buildExtensionsList();

   private static List buildExtensionsList()
   {
      List allExtensions = new ArrayList();
      for (DocumentType type : DocumentType.values())
      {
         allExtensions.add(type.getExtension());
      }
      return unmodifiableList(allExtensions);
   }

   /**
    * 
    * @return a read-only list of file extensions for known file types
    */
   public static List getAllExtensions()
   {
      return allExtensions;
   }

   // FIXME damason: rename typeFor to fromString
   public static DocumentType typeFor(String extension)
   {
      for (DocumentType type : DocumentType.values())
      {
         if (type.getExtension().equals(extension))
         {
            return type;
         }
      }
      // FIXME damason: throw new IllegalArgumentException
      return null;
   }

   private final String extension;

   DocumentType(String extension)
   {
      this.extension = extension;
   }

   // FIXME damason: rename getExtension to toString
   public String getExtension()
   {
      return extension;
   }
=======
public enum DocumentType {
    GETTEXT_PORTABLE_OBJECT("po"), GETTEXT_PORTABLE_OBJECT_TEMPLATE("pot"),
    PLAIN_TEXT("txt"), XML_DOCUMENT_TYPE_DEFINITION("dtd"),

    OPEN_DOCUMENT_TEXT("odt"), OPEN_DOCUMENT_TEXT_FLAT("fodt"),
    OPEN_DOCUMENT_PRESENTATION("odp"), OPEN_DOCUMENT_PRESENTATION_FLAT("fodp"),
    OPEN_DOCUMENT_SPREADSHEET("ods"), OPEN_DOCUMENT_SPREADSHEET_FLAT("fods"),
    OPEN_DOCUMENT_GRAPHICS("odg"), OPEN_DOCUMENT_GRAPHICS_FLAT("fodg"),
    OPEN_DOCUMENT_DATABASE("odb"), OPEN_DOCUMENT_FORMULA("odf"),

    IDML("idml");

    private static List allExtensions = buildExtensionsList();

    private static List buildExtensionsList() {
        List allExtensions = new ArrayList();
        for (DocumentType type : DocumentType.values()) {
            allExtensions.add(type.getExtension());
        }
        return allExtensions;
    }

    /**
     *
     * @return a read-only list of file extensions for known file types
     */
    public static List getAllExtensions() {
        return Collections.unmodifiableList(allExtensions);
    }

    public static DocumentType typeFor(String extension) {
        for (DocumentType type : DocumentType.values()) {
            if (type.getExtension().equals(extension)) {
                return type;
            }
        }
        return null;
    }

    private String extension;

    DocumentType(String extension) {
        this.extension = extension;
    }

    public String getExtension() {
        return extension;
    }
>>>>>>> a9e8630565f04e1c1d9c7f869e72d38d60010c4e

}
Solution content
import java.util.ArrayList;
import java.util.List;

public enum DocumentType {
    GETTEXT_PORTABLE_OBJECT("po"), GETTEXT_PORTABLE_OBJECT_TEMPLATE("pot"),
    PLAIN_TEXT("txt"), XML_DOCUMENT_TYPE_DEFINITION("dtd"),

    OPEN_DOCUMENT_TEXT("odt"), OPEN_DOCUMENT_TEXT_FLAT("fodt"),
    OPEN_DOCUMENT_PRESENTATION("odp"), OPEN_DOCUMENT_PRESENTATION_FLAT("fodp"),
    OPEN_DOCUMENT_SPREADSHEET("ods"), OPEN_DOCUMENT_SPREADSHEET_FLAT("fods"),
    OPEN_DOCUMENT_GRAPHICS("odg"), OPEN_DOCUMENT_GRAPHICS_FLAT("fodg"),
    OPEN_DOCUMENT_DATABASE("odb"), OPEN_DOCUMENT_FORMULA("odf"),

    IDML("idml");

    private static final List allExtensions = buildExtensionsList();

    private static List buildExtensionsList() {
        List allExtensions = new ArrayList();
        for (DocumentType type : DocumentType.values()) {
            allExtensions.add(type.getExtension());
        }
        return unmodifiableList(allExtensions);
    }

    /**
     *
     * @return a read-only list of file extensions for known file types
     */
    public static List getAllExtensions() {
        return allExtensions;
    }

    // FIXME damason: rename typeFor to fromString
    public static DocumentType typeFor(String extension) {
        for (DocumentType type : DocumentType.values()) {
            if (type.getExtension().equals(extension)) {
                return type;
            }
        }
        // FIXME damason: throw new IllegalArgumentException
        return null;
    }

    private final String extension;

    DocumentType(String extension) {
        this.extension = extension;
    }

    // FIXME damason: rename getExtension to toString
    public String getExtension() {
        return extension;
    }

}
File
DocumentType.java
Developer's decision
Version 1
Kind of conflict
Attribute
Comment
Enum signature
Enum value
Method declaration
Method invocation