jackrabbit-oak-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ang...@apache.org
Subject svn commit: r1421814 - in /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype: NodeDefinitionImpl.java NodeTypeImpl.java PropertyDefinitionImpl.java
Date Fri, 14 Dec 2012 12:24:22 GMT
Author: angela
Date: Fri Dec 14 12:24:21 2012
New Revision: 1421814

URL: http://svn.apache.org/viewvc?rev=1421814&view=rev
Log:
fix indention

Modified:
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/NodeDefinitionImpl.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/NodeTypeImpl.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/PropertyDefinitionImpl.java

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/NodeDefinitionImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/NodeDefinitionImpl.java?rev=1421814&r1=1421813&r2=1421814&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/NodeDefinitionImpl.java
(original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/NodeDefinitionImpl.java
Fri Dec 14 12:24:21 2012
@@ -40,13 +40,11 @@ import org.slf4j.LoggerFactory;
  */
 class NodeDefinitionImpl extends ItemDefinitionImpl implements NodeDefinition {
 
-    private static final Logger log =
-            LoggerFactory.getLogger(NodeDefinitionImpl.class);
+    private static final Logger log = LoggerFactory.getLogger(NodeDefinitionImpl.class);
 
     private final NodeTypeManager manager;
 
-    protected NodeDefinitionImpl(
-            NodeTypeManager manager, NodeType type, NodeUtil node) {
+    protected NodeDefinitionImpl(NodeTypeManager manager, NodeType type, NodeUtil node) {
         super(type, node);
         this.manager = manager;
     }
@@ -64,8 +62,7 @@ class NodeDefinitionImpl extends ItemDef
         for (String name : names) {
             try {
                 types.add(manager.getNodeType(name));
-            }
-            catch (RepositoryException e) {
+            } catch (RepositoryException e) {
                 log.warn("Unable to access required primary type "
                         + name + " of node " + getName(), e);
             }
@@ -96,5 +93,4 @@ class NodeDefinitionImpl extends ItemDef
     public boolean allowsSameNameSiblings() {
         return node.getBoolean(JcrConstants.JCR_SAMENAMESIBLINGS);
     }
-
-}
+}
\ No newline at end of file

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/NodeTypeImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/NodeTypeImpl.java?rev=1421814&r1=1421813&r2=1421814&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/NodeTypeImpl.java
(original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/NodeTypeImpl.java
Fri Dec 14 12:24:21 2012
@@ -423,16 +423,16 @@ class NodeTypeImpl implements NodeType {
                 case PropertyType.NAME: {
                     int type = value.getType();
                     return type != PropertyType.DOUBLE &&
-                           type != PropertyType.LONG &&
-                           type != PropertyType.BOOLEAN &&
-                           JcrNameParser.validate(value.getString());
+                            type != PropertyType.LONG &&
+                            type != PropertyType.BOOLEAN &&
+                            JcrNameParser.validate(value.getString());
                 }
                 case PropertyType.PATH: {
                     int type = value.getType();
                     return type != PropertyType.DOUBLE &&
-                           type != PropertyType.LONG &&
-                           type != PropertyType.BOOLEAN &&
-                           JcrPathParser.validate(value.getString());
+                            type != PropertyType.LONG &&
+                            type != PropertyType.BOOLEAN &&
+                            JcrPathParser.validate(value.getString());
                 }
                 case PropertyType.REFERENCE:
                 case PropertyType.WEAKREFERENCE:
@@ -449,11 +449,9 @@ class NodeTypeImpl implements NodeType {
                     log.warn("Invalid property type value: " + requiredType);
                     return false;
             }
-        }
-        catch (RepositoryException e) {
+        } catch (RepositoryException e) {
             return false;
-        }
-        catch (URISyntaxException e) {
+        } catch (URISyntaxException e) {
             return false;
         }
     }

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/PropertyDefinitionImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/PropertyDefinitionImpl.java?rev=1421814&r1=1421813&r2=1421814&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/PropertyDefinitionImpl.java
(original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/PropertyDefinitionImpl.java
Fri Dec 14 12:24:21 2012
@@ -70,11 +70,9 @@ import static javax.jcr.PropertyType.WEA
  * - jcr:isQueryOrderable (BOOLEAN) protected mandatory
  * </pre>
  */
-class PropertyDefinitionImpl extends ItemDefinitionImpl
-        implements PropertyDefinition {
+class PropertyDefinitionImpl extends ItemDefinitionImpl implements PropertyDefinition {
 
-    private static final Logger log =
-            LoggerFactory.getLogger(PropertyDefinitionImpl.class);
+    private static final Logger log = LoggerFactory.getLogger(PropertyDefinitionImpl.class);
 
     private final ValueFactory factory;
 
@@ -151,8 +149,7 @@ class PropertyDefinitionImpl extends Ite
     public Value[] getDefaultValues() {
         if (factory != null) {
             return node.getValues(JcrConstants.JCR_DEFAULTVALUES, factory);
-        }
-        else {
+        } else {
             log.warn("Cannot create default values: no value factory");
             return null;
         }
@@ -188,5 +185,4 @@ class PropertyDefinitionImpl extends Ite
     public boolean isQueryOrderable() {
         return node.getBoolean(NodeTypeConstants.JCR_IS_QUERY_ORDERABLE);
     }
-
-}
+}
\ No newline at end of file



Mime
View raw message