svn commit: r1670089 - /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/state/ConflictType.java

[angela]

Author: angela
Date: Mon Mar 30 13:21:10 2015
New Revision: 1670089

URL: http://svn.apache.org/r1670089
Log:
fix indention

Modified:
    
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/state/ConflictType.java

Modified: 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/state/ConflictType.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/state/ConflictType.java?rev=1670089&r1=1670088&r2=1670089&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/state/ConflictType.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/state/ConflictType.java
 Mon Mar 30 13:21:10 2015
@@ -83,13 +83,13 @@ public enum ConflictType {
         return effectsNode;
     }
 
-    public static ConflictType fromName(String name){
-        for(ConflictType t : values()){
-            if(t.getName().equals(name)){
+    public static ConflictType fromName(String name) {
+        for (ConflictType t : values()) {
+            if (t.getName().equals(name)) {
                 return t;
             }
         }
-        throw new IllegalArgumentException("Unrecognized conflictType: "+name);
+        throw new IllegalArgumentException("Unrecognized conflictType: " + 
name);
     }
 
     private final String name;