Merge branch 'integration/master' of github.com:zanata/zanata-api int…

…o integration/master Conflicts: zanata-common-api/src/main/java/org/zanata/rest/dto/ProjectType.java
zanata · Jan 22, 2013 · 4682ed0 · 4682ed0
2 parents cdb2728 + 55ca7ba
commit 4682ed0
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/zanata-common-api/src/main/java/org/zanata/rest/dto/ProjectType.java b/zanata-common-api/src/main/java/org/zanata/rest/dto/ProjectType.java
@@ -7,7 +7,7 @@
 @XmlEnum(String.class)
 public enum ProjectType
 {
-   Utf8Properties, Properties, Gettext, Podir, Xliff, Xml, Raw;
+	Utf8Properties, Properties, Gettext, Podir, Xliff, Xml, Raw;
 
    /**
     * @param projectType
@@ -26,6 +26,6 @@ public static ProjectType getValueOf(String projectType) throws Exception
             }
          }
       }
-      throw new Exception("Unsupported project type '" + projectType + "'");
+      throw new Exception("Projec type '" + projectType + "' not supported");
    }
 }