Skip to content

Commit

Permalink
MONDRIAN: Fix formatting to match latest checkFile.
Browse files Browse the repository at this point in the history 
[git-p4: depot-paths = "//open/mondrian/": change = 11481]
  • Loading branch information
@julianhyde
julianhyde committed Aug 25, 2008
1 parent aa56154 commit 4a6b18f
Show file tree
Hide file tree
Showing 8 changed files with 75 additions and 63 deletions.
29 changes: 14 additions & 15 deletions src/main/mondrian/gui/I18n.java
View file
Expand Up @@ -84,23 +84,22 @@ public static List getListOfAvailableLanguages(Class cl) {
String token = tokenizer.nextToken();

switch (i) {
case 0:
//the word <application>
break;
case 1:
language = token;
break;
case 2:
country = token;
break;
case 3:
variant = token;
break;
default:
//
case 0:
//the word <application>
break;
case 1:
language = token;
break;
case 2:
country = token;
break;
case 3:
variant = token;
break;
default:
//
}
i++;

}

Locale model = new Locale(language, country, variant);
Expand Down
10 changes: 5 additions & 5 deletions src/main/mondrian/gui/SchemaExplorer.java
View file
Expand Up @@ -2708,11 +2708,11 @@ public void valueChanged(TreeSelectionEvent e) {
Object parentJoin = parentTpath.getLastPathComponent();
int indexOfChild = tree.getModel().getIndexOfChild(parentJoin, o);
switch (indexOfChild) {
case 0:
targetLabel.setText(getResourceConverter().getString("common.leftJoin.title","Left : " + LBL_JOIN));
break;
case 1:
targetLabel.setText(getResourceConverter().getString("common.rightJoin.title","Right : " + LBL_JOIN));
case 0:
targetLabel.setText(getResourceConverter().getString("common.leftJoin.title","Left : " + LBL_JOIN));
break;
case 1:
targetLabel.setText(getResourceConverter().getString("common.rightJoin.title","Right : " + LBL_JOIN));
}
} else {
targetLabel.setText(getResourceConverter().getFormattedString("schemaExplorer.generalJoinForElement.title",
Expand Down
6 changes: 4 additions & 2 deletions src/main/mondrian/olap/fun/StrToSetFunDef.java
View file
Expand Up @@ -338,7 +338,8 @@ public Type getResultType(Validator validator, Exp[] args) {
// which doesn't give us any hints about type.
return new SetType(null);

case 2: {
case 2:
{
final Type argType = args[1].getType();
return new SetType(
new MemberType(
Expand All @@ -348,7 +349,8 @@ public Type getResultType(Validator validator, Exp[] args) {
null));
}

default: {
default:
{
// This is a call to Mondrian's extended version of
// StrToSet, of the form
// StrToSet(s, <Hier1>, ... , <HierN>)
Expand Down
12 changes: 7 additions & 5 deletions src/main/mondrian/olap/fun/vba/Vba.java
View file
Expand Up @@ -1711,11 +1711,13 @@ public static String replace(String expression, String find, String replace) {
return _replace(expression, find, replace, 1, -1);
}

private static String _replace(String expression, String find,
String replace, int start /* default 1 */, int count /*
* default
* -1
*/) {
private static String _replace(
String expression,
String find,
String replace,
int start /* default 1 */,
int count /* default -1 */)
{
final StringBuilder buf = new StringBuilder(expression);
int i = 0;
int pos = start - 1;
Expand Down
12 changes: 6 additions & 6 deletions src/main/mondrian/olap/type/TypeUtil.java
View file
Expand Up @@ -379,12 +379,12 @@ public static boolean canConvert(
to == (Category.DateTime | Category.Constant);
case Category.Tuple:
switch (to) {
case Category.Value:
case Category.Numeric:
conversionCount[0]++;
return true;
default:
return false;
case Category.Value:
case Category.Numeric:
conversionCount[0]++;
return true;
default:
return false;
}
case Category.Value:
return false;
Expand Down
6 changes: 4 additions & 2 deletions src/main/mondrian/rolap/RolapMember.java
View file
Expand Up @@ -732,14 +732,16 @@ public boolean isHidden() {
case Never:
return false;

case IfBlankName: {
case IfBlankName:
{
// If the key value in the database is null, then we use
// a special key value whose toString() is "null".
final String name = getName();
return name.equals(RolapUtil.mdxNullLiteral) || name.equals("");
}

case IfParentsName: {
case IfParentsName:
{
final Member parentMember = getParentMember();
if (parentMember == null) {
return false;
Expand Down
18 changes: 12 additions & 6 deletions src/main/mondrian/tui/XmlUtil.java
View file
Expand Up @@ -639,12 +639,14 @@ public static String convertToString(XPathResult xpathResult,
return String.valueOf(b);

case XPathResult.FIRST_ORDERED_NODE_TYPE:
case XPathResult.ANY_UNORDERED_NODE_TYPE: {
case XPathResult.ANY_UNORDERED_NODE_TYPE:
{
Node node = xpathResult.getSingleNodeValue();
return XmlUtil.toString(node, prettyPrint);
}
case XPathResult.ORDERED_NODE_ITERATOR_TYPE:
case XPathResult.UNORDERED_NODE_ITERATOR_TYPE: {
case XPathResult.UNORDERED_NODE_ITERATOR_TYPE:
{
StringBuilder buf = new StringBuilder(512);
Node node = xpathResult.iterateNext();
while (node != null) {
Expand All @@ -654,7 +656,8 @@ public static String convertToString(XPathResult xpathResult,
return buf.toString();
}
case XPathResult.UNORDERED_NODE_SNAPSHOT_TYPE:
case XPathResult.ORDERED_NODE_SNAPSHOT_TYPE: {
case XPathResult.ORDERED_NODE_SNAPSHOT_TYPE:
{
StringBuilder buf = new StringBuilder(512);
int len = xpathResult.getSnapshotLength();
for (int i = 0; i < len; i++) {
Expand Down Expand Up @@ -688,12 +691,14 @@ public static Node[] convertToNodes(XPathResult xpathResult) {
return NULL_NODE_ARRAY;

case XPathResult.FIRST_ORDERED_NODE_TYPE:
case XPathResult.ANY_UNORDERED_NODE_TYPE: {
case XPathResult.ANY_UNORDERED_NODE_TYPE:
{
Node node = xpathResult.getSingleNodeValue();
return new Node[] { node };
}
case XPathResult.ORDERED_NODE_ITERATOR_TYPE:
case XPathResult.UNORDERED_NODE_ITERATOR_TYPE: {
case XPathResult.UNORDERED_NODE_ITERATOR_TYPE:
{
List<Node> list = new ArrayList<Node>();
Node node = xpathResult.iterateNext();
while (node != null) {
Expand All @@ -703,7 +708,8 @@ public static Node[] convertToNodes(XPathResult xpathResult) {
return (Node[]) list.toArray(NULL_NODE_ARRAY);
}
case XPathResult.UNORDERED_NODE_SNAPSHOT_TYPE:
case XPathResult.ORDERED_NODE_SNAPSHOT_TYPE: {
case XPathResult.ORDERED_NODE_SNAPSHOT_TYPE:
{
int len = xpathResult.getSnapshotLength();
Node[] nodes = new Node[len];
for (int i = 0; i < len; i++) {
Expand Down
45 changes: 23 additions & 22 deletions testsrc/main/mondrian/test/comp/ResultComparator.java
View file
Expand Up @@ -121,19 +121,20 @@ private void compareRows() {
NodeList rowList = xmlRoot.getElementsByTagName("rows");

switch (axes.length) {
case 0:
case 1:
Assert.assertTrue("Must be no rows", rowList.getLength() == 0);
break;

case 2:
compareTuples("Row", rowList, axes[1].getPositions());
break;

default:
Assert.fail("Too many axes returned. " +
"Expected 0, 1 or 2 but got " + axes.length);
break;
case 0:
case 1:
Assert.assertTrue("Must be no rows", rowList.getLength() == 0);
break;

case 2:
compareTuples("Row", rowList, axes[1].getPositions());
break;

default:
Assert.fail(
"Too many axes returned. " +
"Expected 0, 1 or 2 but got " + axes.length);
break;
}
}

Expand Down Expand Up @@ -393,17 +394,17 @@ private void compareData() {
int numAxes = axes.length;

switch (numAxes) {
case 0:
compareZeroAxes(expectedRows);
break;
case 0:
compareZeroAxes(expectedRows);
break;

case 1:
compareColumnsOnly(expectedRows, axes);
break;
case 1:
compareColumnsOnly(expectedRows, axes);
break;

case 2:
compareRowsAndColumns(expectedRows, axes);
break;
case 2:
compareRowsAndColumns(expectedRows, axes);
break;
}
}

Expand Down

0 comments on commit 4a6b18f

Please sign in to comment.