openjpa-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mik...@apache.org
Subject svn commit: r765228 - in /openjpa/trunk: openjpa-persistence/src/main/java/org/apache/openjpa/persistence/meta/AnnotationProcessor6.java openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/LogicalPredicate.java pom.xml
Date Wed, 15 Apr 2009 15:06:54 GMT
Author: mikedd
Date: Wed Apr 15 15:06:53 2009
New Revision: 765228

URL: http://svn.apache.org/viewvc?rev=765228&view=rev
Log:
OPENJPA-1040 reset build flag and fix line length problem

Modified:
    openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/meta/AnnotationProcessor6.java
    openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/LogicalPredicate.java
    openjpa/trunk/pom.xml

Modified: openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/meta/AnnotationProcessor6.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/meta/AnnotationProcessor6.java?rev=765228&r1=765227&r2=765228&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/meta/AnnotationProcessor6.java
(original)
+++ openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/meta/AnnotationProcessor6.java
Wed Apr 15 15:06:53 2009
@@ -360,7 +360,8 @@
     /**
      * Collect members for the given type which uses explicit field access.
      */
-     private List<Element> getPropertyAccessPersistentMembers(TypeElement type) { 
 
+     private List<Element> getPropertyAccessPersistentMembers(TypeElement type)
+     {
         List<? extends Element> allMembers = type.getEnclosedElements();
         Set<ExecutableElement> allMethods = (Set<ExecutableElement>) 
             filter(allMembers, methodFilter, nonTransientFilter);
@@ -374,7 +375,7 @@
     }
 
     
-    private List<Element> getDefaultAccessPersistentMembers(TypeElement type) {   
+    private List<Element> getDefaultAccessPersistentMembers(TypeElement type) {
         List<Element> result = new ArrayList<Element>();
         List<? extends Element> allMembers = type.getEnclosedElements();
         Set<VariableElement> allFields = (Set<VariableElement>) 
@@ -632,7 +633,7 @@
                                      .iterator().next().asType();
                 String actualSetterName = setter.getSimpleName().toString();
                 matched = actualSetterName.equals(expectedSetterName)
-                    && typeUtils.isSameType(setterArgType, getterReturnType);   
      
+                    && typeUtils.isSameType(setterArgType, getterReturnType);
                 if (matched)
                     break;
             }

Modified: openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/LogicalPredicate.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/LogicalPredicate.java?rev=765228&r1=765227&r2=765228&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/LogicalPredicate.java
(original)
+++ openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/LogicalPredicate.java
Wed Apr 15 15:06:53 2009
@@ -26,33 +26,33 @@
  */
 public class LogicalPredicate extends AbstractVisitable 
     implements Predicate, Visitable {
-	private final Predicate _p1;
-	private final Predicate _p2;
-	private final ConditionalOperator _op;
-	private final ConditionalOperator _nop;
-	
-	public LogicalPredicate(Predicate p1, ConditionalOperator op, 
-			ConditionalOperator nop, Predicate p2) {
-		_p1  = p1;
-		_p2  = p2;
-		_op  = op;
-		_nop = nop;
-	}
-	
-	public Predicate and(Predicate predicate) {
-		return new AndPredicate(this, predicate);
-	}
+    private final Predicate _p1;
+    private final Predicate _p2;
+    private final ConditionalOperator _op;
+    private final ConditionalOperator _nop;
+    
+    public LogicalPredicate(Predicate p1, ConditionalOperator op, 
+            ConditionalOperator nop, Predicate p2) {
+        _p1  = p1;
+        _p2  = p2;
+        _op  = op;
+        _nop = nop;
+    }
+    
+    public Predicate and(Predicate predicate) {
+        return new AndPredicate(this, predicate);
+    }
 
-	public Predicate or(Predicate predicate) {
-		return new OrPredicate(this, predicate);
-	}
-	
-	public Predicate not() {
-		return new LogicalPredicate(_p1.not(), _nop, _op, _p2.not());
-	}
+    public Predicate or(Predicate predicate) {
+        return new OrPredicate(this, predicate);
+    }
+    
+    public Predicate not() {
+        return new LogicalPredicate(_p1.not(), _nop, _op, _p2.not());
+    }
 
-	public String asExpression(AliasContext ctx) {
-		return OPEN_BRACE + ((Visitable)_p1).asExpression(ctx) + SPACE + _op + 
-			   SPACE + ((Visitable)_p2).asExpression(ctx) + CLOSE_BRACE;
-	}
+    public String asExpression(AliasContext ctx) {
+        return OPEN_BRACE + ((Visitable)_p1).asExpression(ctx) + SPACE + _op +
+               SPACE + ((Visitable)_p2).asExpression(ctx) + CLOSE_BRACE;
+    }
 }

Modified: openjpa/trunk/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/trunk/pom.xml?rev=765228&r1=765227&r2=765228&view=diff
==============================================================================
--- openjpa/trunk/pom.xml (original)
+++ openjpa/trunk/pom.xml Wed Apr 15 15:06:53 2009
@@ -682,7 +682,7 @@
                         </goals>
                         <configuration>
                             <configLocation>${checkstyle.config.location}</configLocation>
-                            <failsOnError>false</failsOnError>
+                            <failsOnError>true</failsOnError>
                             <consoleOutput>true</consoleOutput>
                         </configuration>
                     </execution>



Mime
View raw message