You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by an...@apache.org on 2013/01/21 17:10:36 UTC
svn commit: r1436445 - in
/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins:
memory/EmptyPropertyState.java value/ValueImpl.java
Author: angela
Date: Mon Jan 21 16:10:36 2013
New Revision: 1436445
URL: http://svn.apache.org/viewvc?rev=1436445&view=rev
Log:
fix indention, remove unused logger in valueimpl
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/memory/EmptyPropertyState.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/value/ValueImpl.java
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/memory/EmptyPropertyState.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/memory/EmptyPropertyState.java?rev=1436445&r1=1436444&r2=1436445&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/memory/EmptyPropertyState.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/memory/EmptyPropertyState.java Mon Jan 21 16:10:36 2013
@@ -142,8 +142,7 @@ public abstract class EmptyPropertyState
public boolean equals(Object other) {
if (this == other) {
return true;
- }
- else if (other instanceof PropertyState) {
+ } else if (other instanceof PropertyState) {
PropertyState that = (PropertyState) other;
if (!getName().equals(that.getName())) {
return false;
@@ -154,13 +153,11 @@ public abstract class EmptyPropertyState
if (getType().tag() == PropertyType.BINARY) {
return Iterables.elementsEqual(
getValue(BINARIES), that.getValue(BINARIES));
- }
- else {
+ } else {
return Iterables.elementsEqual(
getValue(STRINGS), that.getValue(STRINGS));
}
- }
- else {
+ } else {
return false;
}
}
@@ -183,8 +180,7 @@ public abstract class EmptyPropertyState
public String toString() {
if (isArray()) {
return getName() + '=' + getValue(STRINGS);
- }
- else {
+ } else {
return getName() + '=' + getValue(STRING);
}
}
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/value/ValueImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/value/ValueImpl.java?rev=1436445&r1=1436444&r2=1436445&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/value/ValueImpl.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/value/ValueImpl.java Mon Jan 21 16:10:36 2013
@@ -19,7 +19,6 @@ package org.apache.jackrabbit.oak.plugin
import java.io.InputStream;
import java.math.BigDecimal;
import java.util.Calendar;
-
import javax.jcr.Binary;
import javax.jcr.PropertyType;
import javax.jcr.RepositoryException;
@@ -29,8 +28,6 @@ import javax.jcr.ValueFormatException;
import org.apache.jackrabbit.oak.api.PropertyState;
import org.apache.jackrabbit.oak.api.Type;
import org.apache.jackrabbit.oak.namepath.NamePathMapper;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkState;
@@ -39,7 +36,6 @@ import static com.google.common.base.Pre
* Implementation of {@link Value} based on {@code PropertyState}.
*/
public class ValueImpl implements Value {
- private static final Logger log = LoggerFactory.getLogger(ValueImpl.class);
private final PropertyState propertyState;
private final int index;
@@ -280,8 +276,7 @@ public class ValueImpl implements Value
public int hashCode() {
if (getType() == PropertyType.BINARY) {
return propertyState.getValue(Type.BINARY, index).hashCode();
- }
- else {
+ } else {
return getOakString().hashCode();
}
}