fix checkFile errors, add unit tests for previously commited bug fixe…

…s: crossjoin sort, except and compound filter

git-svn-id: https://olap4j.svn.sourceforge.net/svnroot/olap4j/trunk@356 c6a108a4-781c-0410-a6c6-c2d559e19af0

src/org/olap4j/mdx/CallNode.java

@@ -188,7 +188,7 @@ public CallNode deepCopy() {
  this.syntax,
  MdxUtil.deepCopyList(argList));
  }
- 
+
  @Override
  public int hashCode() {
  final int prime = 31;
@@ -201,28 +201,37 @@ public int hashCode() {
 
  @Override
  public boolean equals(Object obj) {
- if (this == obj)
+ if (this == obj) {
  return true;
- if (obj == null)
+ }
+ if (obj == null) {
  return false;
- if (getClass() != obj.getClass())
+ }
+ if (getClass() != obj.getClass()) {
  return false;
+ }
  CallNode other = (CallNode) obj;
  if (argList == null) {
- if (other.argList != null)
+ if (other.argList != null) {
  return false;
- } else if (!argList.equals(other.argList))
+ }
+ } else if (!argList.equals(other.argList)) {
  return false;
+ }
  if (name == null) {
- if (other.name != null)
+ if (other.name != null) {
  return false;
- } else if (!name.equals(other.name))
+ }
+ } else if (!name.equals(other.name)) {
  return false;
+ }
  if (syntax == null) {
- if (other.syntax != null)
+ if (other.syntax != null) {
  return false;
- } else if (!syntax.equals(other.syntax))
+ }
+ } else if (!syntax.equals(other.syntax)) {
  return false;
+ }
  return true;
  }
 }

src/org/olap4j/query/Olap4jNodeConverter.java

@@ -224,7 +224,8 @@ private static void generateUnionsRecursively(
  if (!found) {
  // add the first selection of the dimension
  if (dimension.getInclusions().size() > 0) {
- sels.add(toOlap4j(dimension.getInclusions().get(0)));
+ sels.add(toOlap4j(
+ dimension.getInclusions().get(0)));
  }
  }
  }