Code formatting standards, in argument/parameter lists split over sev…

…eral lines.

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

src/org/olap4j/driver/xmla/XmlaOlap4jConnection.java

@@ -831,8 +831,9 @@ public void handle(
  }
 
  static class CubeHandler extends HandlerImpl<XmlaOlap4jCube> {
-
- public void handle(Element row, Context context,
+ public void handle(
+ Element row,
+ Context context,
  List<XmlaOlap4jCube> list)
  throws OlapException
  {

src/org/olap4j/driver/xmla/XmlaOlap4jDriver.java

@@ -254,7 +254,7 @@ public static Future<byte[]> getFuture(
  final String request)
  {
  return executor.submit(
- new Callable<byte[] >() {
+ new Callable<byte[]>() {
  public byte[] call() throws Exception {
  return proxy.get(url, request);
  }

src/org/olap4j/driver/xmla/XmlaOlap4jUtil.java

@@ -101,7 +101,8 @@ static DOMParser getParser(
  parser.setFeature(VALIDATION_FEATURE_ID, doingValidation);
 
  if (schemaLocationPropertyValue != null) {
- parser.setProperty(SCHEMA_LOCATION,
+ parser.setProperty(
+ SCHEMA_LOCATION,
  schemaLocationPropertyValue.replace('\\', '/'));
  }
 

src/org/olap4j/driver/xmla/proxy/XmlaOlap4jCookieManager.java

@@ -128,16 +128,23 @@ public void storeCookies(URLConnection conn) {
 
  while (st.hasMoreTokens()) {
  String token = st.nextToken();
- cookie.put(token.substring(0,
+ cookie.put(
+ token.substring(
+ 0,
  token.indexOf(NAME_VALUE_SEPARATOR)).toLowerCase(),
  token.substring(
-  token.indexOf(NAME_VALUE_SEPARATOR) + 1,
-  token.length()));
+ token.indexOf(NAME_VALUE_SEPARATOR) + 1,
+ token.length()));
 
- if (this.debug == true) {
- System.out.println("Saving cookie : " + token.substring(0,
- token.indexOf(NAME_VALUE_SEPARATOR)).toLowerCase() + "="
- + token.substring(
+ if (this.debug) {
+ System.out.println(
+ "Saving cookie : "
+ + token.substring(
+ 0,
+ token.indexOf(
+ NAME_VALUE_SEPARATOR)).toLowerCase()
+ + "="
+ + token.substring(
  token.indexOf(NAME_VALUE_SEPARATOR) + 1,
  token.length()));
  }

src/org/olap4j/transform/DrillReplaceTransform.java

@@ -68,8 +68,8 @@ public DrillReplaceTransform(
  // Position positionToDrill =
  // TransformUtil.getPositionFromCellSet(axis, positionOrdinalInAxis,
  // cellSet);
- memberToDrill = TransformUtil.getMemberFromCellSet(axis,
-   positionOrdinalInAxis, memberOrdinalInPosition, cellSet);
+ memberToDrill = TransformUtil.getMemberFromCellSet(
+ axis, positionOrdinalInAxis, memberOrdinalInPosition, cellSet);
  // pathToMember = getPathToMember(positionToDrill,
  // memberOrdinalInPosition);
  }

src/org/olap4j/transform/MdxHelper.java

@@ -34,8 +34,10 @@ public static MemberNode makeMemberNode(Member m) {
  return new MemberNode(null, m);
  }
 
- private static CallNode _makePropCallNode(ParseTreeNode node,
- String funcName) {
+ private static CallNode _makePropCallNode(
+ ParseTreeNode node,
+ String funcName)
+ {
  List<ParseTreeNode> callArgs = new ArrayList<ParseTreeNode>();
  callArgs.add(node);
  return new CallNode(null, funcName, Syntax.Property, callArgs);

src/org/olap4j/transform/RollUpLevelTransform.java

@@ -66,8 +66,8 @@ public RollUpLevelTransform(
  // Position positionToDrill =
  // TransformUtil.getPositionFromCellSet(axis, positionOrdinalInAxis,
  // cellSet);
- memberToDrill = TransformUtil.getMemberFromCellSet(axis,
-   positionOrdinalInAxis, memberOrdinalInPosition, cellSet);
+ memberToDrill = TransformUtil.getMemberFromCellSet(
+ axis, positionOrdinalInAxis, memberOrdinalInPosition, cellSet);
  // pathToMember = getPathToMember(positionToDrill,
  // memberOrdinalInPosition);
  }

testsrc/org/olap4j/ConnectionTest.java

@@ -960,7 +960,8 @@ public void testCell() throws Exception {
  assertEquals(5, cell.getOrdinal());
 
  assertEquals(Arrays.asList(1, 2), cell.getCoordinateList());
- assertEquals("#,###.00",
+ assertEquals(
+ "#,###.00",
  cell.getPropertyValue(Property.StandardCellProperty.FORMAT_STRING));
  assertFalse(cell.isEmpty());
  assertFalse(cell.isError());
@@ -1655,10 +1656,12 @@ public void testMetadata() throws Exception {
  assertNotNull(member);
  Member member2 = cube.lookupMember("Product", "All Products", "Food");
  assertEquals(member, member2);
- assertEquals("[Product].[All Products].[Food]",
+ assertEquals(
+ "[Product].[All Products].[Food]",
  member.getUniqueName());
  assertEquals("Food", member.getName());
- assertEquals("[Product].[Product Family]",
+ assertEquals(
+ "[Product].[Product Family]",
  member.getLevel().getUniqueName());
  assertEquals(Member.Type.REGULAR, member.getMemberType());
 
@@ -1693,7 +1696,8 @@ public void testMetadata() throws Exception {
 
  // All member
  final Member allProductsMember = member.getParentMember();
- assertEquals("[Product].[All Products]",
+ assertEquals(
+ "[Product].[All Products]",
  allProductsMember.getUniqueName());
  assertEquals("(All)", allProductsMember.getLevel().getName());
  assertEquals("[Product].[(All)]", allProductsMember.getLevel().getUniqueName());

testsrc/org/olap4j/MetadataTest.java

@@ -436,7 +436,9 @@ public void testDatabaseMetaDataGetMembers() throws SQLException {
  catalogName, "FoodMart", "Sales", null, null, null,
  "[Time].[1997].[Q2].[4]", null),
  MEMBERS_COLUMN_NAMES);
- assertEquals(TestContext.fold("CATALOG_NAME=" + catalogName + ", SCHEMA_NAME=FoodMart, CUBE_NAME=Sales, DIMENSION_UNIQUE_NAME=[Time], HIERARCHY_UNIQUE_NAME=[Time], LEVEL_UNIQUE_NAME=[Time].[Month], LEVEL_NUMBER=2, MEMBER_ORDINAL=6, MEMBER_NAME=4, MEMBER_UNIQUE_NAME=[Time].[1997].[Q2].[4], MEMBER_TYPE=1, MEMBER_GUID=null, MEMBER_CAPTION=4, CHILDREN_CARDINALITY=0, PARENT_LEVEL=1, PARENT_UNIQUE_NAME=[Time].[1997].[Q2], PARENT_COUNT=1, TREE_OP=null, DEPTH=2\n"),
+ assertEquals(
+ TestContext.fold(
+ "CATALOG_NAME=" + catalogName + ", SCHEMA_NAME=FoodMart, CUBE_NAME=Sales, DIMENSION_UNIQUE_NAME=[Time], HIERARCHY_UNIQUE_NAME=[Time], LEVEL_UNIQUE_NAME=[Time].[Month], LEVEL_NUMBER=2, MEMBER_ORDINAL=6, MEMBER_NAME=4, MEMBER_UNIQUE_NAME=[Time].[1997].[Q2].[4], MEMBER_TYPE=1, MEMBER_GUID=null, MEMBER_CAPTION=4, CHILDREN_CARDINALITY=0, PARENT_LEVEL=1, PARENT_UNIQUE_NAME=[Time].[1997].[Q2], PARENT_COUNT=1, TREE_OP=null, DEPTH=2\n"),
  s);
 
  // with treeop

testsrc/org/olap4j/OlapTest.java

@@ -308,15 +308,17 @@ public void testSelectionModes() {
  QueryDimension productDimension = query.getDimension("Product");
  Member drinkMember = cube.lookupMember("Product", "Drink");
  Selection drinkSelection =
- productDimension.createSelection(drinkMember,
- Selection.Operator.CHILDREN);
+ productDimension.createSelection(
+ drinkMember,
+ Selection.Operator.CHILDREN);
  productDimension.getSelections().add(drinkSelection);
 
  QueryDimension measuresDimension = query.getDimension("Measures");
  Member storeSalesMember = cube.lookupMember("Measures", "Store Sales");
  Selection storeSalesSelection =
- measuresDimension.createSelection(storeSalesMember,
- Selection.Operator.MEMBER);
+ measuresDimension.createSelection(
+ storeSalesMember,
+ Selection.Operator.MEMBER);
  measuresDimension.getSelections().add(storeSalesSelection);
 
  query.getAxes().get(Axis.ROWS).getDimensions()
@@ -339,8 +341,9 @@ public void testSelectionModes() {
 
  productDimension.getSelections().clear();
  drinkSelection =
- productDimension.createSelection(drinkMember,
- Selection.Operator.ANCESTORS);
+ productDimension.createSelection(
+ drinkMember,
+ Selection.Operator.ANCESTORS);
  productDimension.getSelections().add(drinkSelection);
 
  query.validate();
@@ -358,8 +361,9 @@ public void testSelectionModes() {
 
  productDimension.getSelections().clear();
  drinkSelection =
- productDimension.createSelection(drinkMember,
- Selection.Operator.DESCENDANTS);
+ productDimension.createSelection(
+ drinkMember,
+ Selection.Operator.DESCENDANTS);
  productDimension.getSelections().add(drinkSelection);
 
  query.validate();
@@ -377,8 +381,9 @@ public void testSelectionModes() {
 
  productDimension.getSelections().clear();
  drinkSelection =
- productDimension.createSelection(drinkMember,
- Selection.Operator.INCLUDE_CHILDREN);
+ productDimension.createSelection(
+ drinkMember,
+ Selection.Operator.INCLUDE_CHILDREN);
  productDimension.getSelections().add(drinkSelection);
 
  query.validate();
@@ -396,8 +401,9 @@ public void testSelectionModes() {
 
  productDimension.getSelections().clear();
  drinkSelection =
- productDimension.createSelection(drinkMember,
- Selection.Operator.SIBLINGS);
+ productDimension.createSelection(
+ drinkMember,
+ Selection.Operator.SIBLINGS);
  productDimension.getSelections().add(drinkSelection);
 
  query.validate();
@@ -429,29 +435,33 @@ public void testMultipleDimensionSelections() {
  QueryDimension productDimension = query.getDimension("Product");
  Member drinkMember = cube.lookupMember("Product", "Drink");
  Selection drinkSelection =
- productDimension.createSelection(drinkMember,
- Selection.Operator.CHILDREN);
+ productDimension.createSelection(
+ drinkMember,
+ Selection.Operator.CHILDREN);
  productDimension.getSelections().add(drinkSelection);
 
  QueryDimension storeDimension = query.getDimension("Store");
  Member usaMember = cube.lookupMember("Store", "USA");
  Selection usaSelection =
- storeDimension.createSelection(usaMember,
- Selection.Operator.INCLUDE_CHILDREN);
+ storeDimension.createSelection(
+ usaMember,
+ Selection.Operator.INCLUDE_CHILDREN);
  storeDimension.getSelections().add(usaSelection);
 
  QueryDimension timeDimension = query.getDimension("Time");
  Member year1997Member = cube.lookupMember("Time", "1997");
  Selection year1997Selection =
- timeDimension.createSelection(year1997Member,
- Selection.Operator.CHILDREN);
+ timeDimension.createSelection(
+ year1997Member,
+ Selection.Operator.CHILDREN);
  timeDimension.getSelections().add(year1997Selection);
 
  QueryDimension measuresDimension = query.getDimension("Measures");
  Member storeSalesMember = cube.lookupMember("Measures", "Store Sales");
  Selection storeSalesSelection =
- measuresDimension.createSelection(storeSalesMember,
- Selection.Operator.MEMBER);
+ measuresDimension.createSelection(
+ storeSalesMember,
+ Selection.Operator.MEMBER);
  measuresDimension.getSelections().add(storeSalesSelection);
 
  query.getAxes().get(Axis.ROWS).getDimensions()
@@ -493,16 +503,18 @@ public void testSwapAxes() {
  QueryDimension productDimension = query.getDimension("Product");
  Member drinkMember = cube.lookupMember("Product", "Drink");
  Selection drinkSelection =
- productDimension.createSelection(drinkMember,
- Selection.Operator.CHILDREN);
+ productDimension.createSelection(
+ drinkMember,
+ Selection.Operator.CHILDREN);
  productDimension.getSelections().add(drinkSelection);
 
  QueryDimension measuresDimension = query.getDimension("Measures");
  Member storeSalesMember =
  cube.lookupMember("Measures", "Store Sales");
  Selection storeSalesSelection =
- measuresDimension.createSelection(storeSalesMember,
- Selection.Operator.MEMBER);
+ measuresDimension.createSelection(
+ storeSalesMember,
+ Selection.Operator.MEMBER);
  measuresDimension.getSelections().add(storeSalesSelection);
 
  query.getAxes().get(Axis.ROWS).getDimensions()

testsrc/org/olap4j/impl/ConnectStringParserTest.java

@@ -252,8 +252,9 @@ public void testBufReplace() {
  checkReplace("cacab", "cab", "bb", "cabb");
 
  // Seek string does not exist.
- checkReplace("the quick brown fox", "coyote", "wolf",
- "the quick brown fox");
+ checkReplace(
+ "the quick brown fox", "coyote", "wolf",
+ "the quick brown fox");
 
  // Empty buffer.
  checkReplace("", "coyote", "wolf", "");