Apache
/
openjpa
mirror of https://github.com/apache/openjpa.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

OPENJPA-1040 reset build flag and fix line length problem 

git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@765228 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Michael Dick 2009-04-15 15:06:53 +00:00
parent 21b41a50fe
commit 9696252e4d
3 changed files with 32 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
openjpa-persistence/src/main/java/org/apache/openjpa/persistence/meta/AnnotationProcessor6.java
View File

@ -360,7 +360,8 @@ public class AnnotationProcessor6 extends AbstractProcessor {
/**
* 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 @@ public class AnnotationProcessor6 extends AbstractProcessor {
}
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 @@ public class AnnotationProcessor6 extends AbstractProcessor {
.iterator().next().asType();
String actualSetterName = setter.getSimpleName().toString();
matched = actualSetterName.equals(expectedSetterName)
&& typeUtils.isSameType(setterArgType, getterReturnType);
&& typeUtils.isSameType(setterArgType, getterReturnType);
if (matched)
break;
}

54
openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/LogicalPredicate.java
View File

@ -26,33 +26,33 @@ package org.apache.openjpa.persistence.query;
*/
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;
}
}

2
pom.xml
View File

@ -682,7 +682,7 @@
</goals>
<configuration>
<configLocation>${checkstyle.config.location}</configLocation>
<failsOnError>false</failsOnError>
<failsOnError>true</failsOnError>
<consoleOutput>true</consoleOutput>
</configuration>
</execution>