MONDRIAN: Integrate cosmetic changes @14310, @14315 to lagunitas branch.

[git-p4: depot-paths = "//open/mondrian-release/lagunitas/": change = 14318]
pentaho · May 24, 2011 · 7edaf45 · 7edaf45
1 parent 804d24c
commit 7edaf45
Show file tree

Hide file tree

Showing 162 changed files with 1,120 additions and 1,033 deletions.
diff --git a/src/main/mondrian/calc/impl/AbstractExpCompiler.java b/src/main/mondrian/calc/impl/AbstractExpCompiler.java
@@ -575,7 +575,7 @@ public Hierarchy evaluateHierarchy(Evaluator evaluator) {
             throw FunUtil.newEvalException(
                 MondrianResource.instance()
                     .CannotImplicitlyConvertDimensionToHierarchy.ex(
-                    dimension.getName()));
+                        dimension.getName()));
         }
     }
 }

diff --git a/src/main/mondrian/gui/JdbcMetaData.java b/src/main/mondrian/gui/JdbcMetaData.java
@@ -3,7 +3,7 @@
 // This software is subject to the terms of the Eclipse Public License v1.0
 // Agreement, available at the following URL:
 // http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2006-2009 Julian Hyde and others
+// Copyright (C) 2006-2011 Julian Hyde and others
 // Copyright (C) 2006-2007 Cincom Systems, Inc.
 // Copyright (C) 2006-2007 JasperSoft
 // All Rights Reserved.
@@ -973,9 +973,11 @@ private List<String> getAllColumns(String sname, String tableName) {
                         if (t.schemaName != null && !duplicate) {
                             sb.append(t.schemaName).append(LEVEL_SEPARATOR);
                         }
-                        sb.append(t.name).append(LEVEL_SEPARATOR)
-                            .append(c.getKey()).append(" - ").append(
-                            c.getValue().displayType());
+                        sb.append(t.name)
+                            .append(LEVEL_SEPARATOR)
+                            .append(c.getKey())
+                            .append(" - ")
+                            .append(c.getValue().displayType());
 
                         f.add(sb.toString());
                     }

diff --git a/src/main/mondrian/gui/ListRenderer.java b/src/main/mondrian/gui/ListRenderer.java
@@ -3,7 +3,7 @@
 // This software is subject to the terms of the Eclipse Public License v1.0
 // Agreement, available at the following URL:
 // http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2002-2007 Julian Hyde and others
+// Copyright (C) 2002-2011 Julian Hyde and others
 // All Rights Reserved.
 // You must accept the terms of that agreement to use this software.
 */
@@ -24,7 +24,7 @@ class ListRenderer implements ListCellRenderer {
     public ListRenderer(ListCellRenderer override) {
         if (override == null) {
             throw new NullPointerException(
-                    "ListRenderer constructor: default renderer is null");
+                "ListRenderer constructor: default renderer is null");
         }
         std = override;
     }

diff --git a/src/main/mondrian/gui/PreferencesSchemasDialog.java b/src/main/mondrian/gui/PreferencesSchemasDialog.java
@@ -3,7 +3,7 @@
 // This software is subject to the terms of the Eclipse Public License v1.0
 // Agreement, available at the following URL:
 // http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2009-2009 Julian Hyde and others
+// Copyright (C) 2009-2011 Julian Hyde and others
 // All Rights Reserved.
 // You must accept the terms of that agreement to use this software.
 */
@@ -165,7 +165,7 @@ public TableModel getSchemaTableModel() {
                     for (int j = 0; j < allSchemaNames.size(); j++) {
                         String actualSchemaName = allSchemaNames.get(j);
                         if (actualSchemaName.equalsIgnoreCase(
-                            enteredSchemaName))
+                                enteredSchemaName))
                         {
                             selectedSchemas[j] = true;
                             break;

diff --git a/src/main/mondrian/gui/PropertyTableModel.java b/src/main/mondrian/gui/PropertyTableModel.java
@@ -3,7 +3,7 @@
 // This software is subject to the terms of the Eclipse Public License v1.0
 // Agreement, available at the following URL:
 // http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2002-2009 Julian Hyde and others
+// Copyright (C) 2002-2011 Julian Hyde and others
 // Copyright (C) 2006-2007 Cincom Systems, Inc.
 // All Rights Reserved.
 // You must accept the terms of that agreement to use this software.
@@ -291,8 +291,8 @@ public void setValueAt(Object value, int rowIndex, int columnIndex) {
                 if (propertyNames[rowIndex].equals("name")
                     && (!(target instanceof MondrianGuiDef.Table))
                     && (!value.equals(
-                    target.getClass().getField(
-                        propertyNames[rowIndex]).get(target)))
+                        target.getClass().getField(
+                            propertyNames[rowIndex]).get(target)))
                     && duplicateName(value))
                 {
                     setErrorMsg(

diff --git a/src/main/mondrian/gui/QueryPanel.java b/src/main/mondrian/gui/QueryPanel.java
@@ -3,7 +3,7 @@
 // This software is subject to the terms of the Eclipse Public License v1.0
 // Agreement, available at the following URL:
 // http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2002-2009 Julian Hyde and others
+// Copyright (C) 2002-2011 Julian Hyde and others
 // Copyright (C) 2006-2007 Cincom Systems, Inc.
 // All Rights Reserved.
 // You must accept the terms of that agreement to use this software.
@@ -369,7 +369,8 @@ this, getResourceConverter().getString(
                     "Mondrian connection could not be done for - {0}",
                     sfile == null
                         ? getResourceConverter().getString(
-                        "queryPanel.selectedSchema.alert", "selected Schema")
+                            "queryPanel.selectedSchema.alert",
+                            "selected Schema")
                         : sfile.getName()),
                 getResourceConverter().getString(
                     "common.errorDialog.title", "Error"),
@@ -413,4 +414,4 @@ private JInternalFrame lookupFrame(String sfname) {
 
 }
 
-// End QueryPanel.java
+// End QueryPanel.java
diff --git a/src/main/mondrian/gui/SchemaExplorer.java b/src/main/mondrian/gui/SchemaExplorer.java
@@ -3,7 +3,7 @@
 // This software is subject to the terms of the Eclipse Public License v1.0
 // Agreement, available at the following URL:
 // http://www.eclipse.org/legal/epl-v10.html.
-// Copyright (C) 2002-2010 Julian Hyde and others
+// Copyright (C) 2002-2011 Julian Hyde and others
 // Copyright (C) 2006-2007 CINCOM SYSTEMS, INC.
 // All Rights Reserved.
 // You must accept the terms of that agreement to use this software.
@@ -711,9 +711,9 @@ public void actionPerformed(ActionEvent e) {
         };
 
         addCalculatedMemberProperty = new AbstractAction(
-                getResourceConverter().getString(
-                    "schemaExplorer.addCalculatedMemberProperty.title",
-                    "Add Calculated Member Property"))
+            getResourceConverter().getString(
+                "schemaExplorer.addCalculatedMemberProperty.title",
+                "Add Calculated Member Property"))
         {
             public void actionPerformed(ActionEvent e) {
                 addCalculatedMemberProperty(e);
@@ -2229,8 +2229,8 @@ protected void delete(EventObject evt) {
                                 if (eq(matchDim.name, childDim.name)
                                     && eq(matchDim.caption, childDim.caption)
                                     && eq(
-                                    matchDim.foreignKey,
-                                    childDim.foreignKey))
+                                        matchDim.foreignKey,
+                                        childDim.foreignKey))
                                 {
                                     tofind = false;
                                     if (k + 1 < parentArrLen) {
@@ -3110,10 +3110,11 @@ this, getResourceConverter().getString(
             (MondrianGuiDef.Annotations) path;
         MondrianGuiDef.Annotation annotation = new MondrianGuiDef.Annotation();
         annotation.name =
-          getNewName(getResourceConverter().getString(
-                  "schemaExplorer.newAnnotation.title",
-              "New Annotation"),
-                  annotations.array);
+            getNewName(
+                getResourceConverter().getString(
+                    "schemaExplorer.newAnnotation.title",
+                    "New Annotation"),
+                annotations.array);
 
         MondrianGuiDef.Annotation[] temp = annotations.array;
         annotations.array = new MondrianGuiDef.Annotation[temp.length + 1];

diff --git a/src/main/mondrian/gui/Workbench.java b/src/main/mondrian/gui/Workbench.java
@@ -4,7 +4,7 @@
 // Agreement, available at the following URL:
 // http://www.eclipse.org/legal/epl-v10.html.
 // Copyright (C) 1999-2002 Kana Software, Inc.
-// Copyright (C) 2001-2010 Julian Hyde and others
+// Copyright (C) 2001-2011 Julian Hyde and others
 // Copyright (C) 2006-2007 Cincom Systems, Inc.
 // Copyright (C) 2006-2007 JasperSoft
 // All Rights Reserved.
@@ -207,7 +207,7 @@ private void loadWorkbenchProperties() {
         workbenchProperties = new Properties();
         try {
             workbenchResourceBundle = ResourceBundle.getBundle(
-                    WorkbenchInfoResourceName, Locale.getDefault(),
+                WorkbenchInfoResourceName, Locale.getDefault(),
                     myClassLoader);
             File f = new File(WORKBENCH_CONFIG_FILE);
             if (f.exists()) {
@@ -752,10 +752,10 @@ public void actionPerformed(ActionEvent evt) {
         menuBar.add(viewMenu);
 
         toolsMenu.setText(getResourceConverter().getString(
-                "workbench.menu.options", "Options"));
+            "workbench.menu.options", "Options"));
         toolsMenu.setMnemonic(KeyEvent.VK_O);
         preferencesMenuItem.setText(getResourceConverter().getString(
-                "workbench.menu.connection", "Connection"));
+            "workbench.menu.connection", "Connection"));
         preferencesMenuItem.addActionListener(
             new ActionListener() {
                 public void actionPerformed(ActionEvent evt) {
@@ -765,8 +765,8 @@ public void actionPerformed(ActionEvent evt) {
         toolsMenu.add(preferencesMenuItem);
 
         requireSchemaCheckboxMenuItem.setText(
-                getResourceConverter().getString(
-                        "workbench.menu.requireSchema", "Require Schema"));
+            getResourceConverter().getString(
+                "workbench.menu.requireSchema", "Require Schema"));
         requireSchemaCheckboxMenuItem.setSelected(requireSchema);
         requireSchemaCheckboxMenuItem.addActionListener(
             new ActionListener() {
@@ -1219,12 +1219,12 @@ public void internalFrameClosing(InternalFrameEvent e) {
             windowMenu.add(closeAllMenuItem, -1);
         } catch (Exception ex) {
             JOptionPane.showMessageDialog(
-                    this, getResourceConverter()
-                    .getFormattedString(
+                this,
+                getResourceConverter().getFormattedString(
                     "workbench.new.JDBCExplorer.exception",
                     "Database connection not successful.\n{0}",
-                            ex.getLocalizedMessage()), getResourceConverter()
-                    .getString(
+                    ex.getLocalizedMessage()),
+                getResourceConverter().getString(
                     "workbench.new.JDBCExplorer.exception.title",
                     "Database Connection Error"),
                 JOptionPane.ERROR_MESSAGE);
@@ -1244,8 +1244,8 @@ private DatabaseMeta getDbMeta(String xml) {
         try {
             if (!KettleEnvironment.isInitialized()) {
                 System.setProperty(
-                        "KETTLE_PLUGIN_BASE_FOLDERS",
-                        KETTLE_PLUGIN_BASE_FOLDERS);
+                    "KETTLE_PLUGIN_BASE_FOLDERS",
+                    KETTLE_PLUGIN_BASE_FOLDERS);
                 KettleEnvironment.init();
             }
             if (dbMeta != null) {
@@ -1258,10 +1258,10 @@ private DatabaseMeta getDbMeta(String xml) {
             }
         } catch (KettleException e) {
             throw new RuntimeException(
-                    getResourceConverter()
-                    .getFormattedString(
-                            "workbench.new.Kettle.exception",
-                            "Kettle failed to initialize."), e);
+                getResourceConverter().getFormattedString(
+                    "workbench.new.Kettle.exception",
+                    "Kettle failed to initialize."),
+                e);
         }
         return dbMeta;
     }
@@ -1277,8 +1277,8 @@ private void connectionButtonActionPerformed(ActionEvent evt) {
             try {
                 XulLoader loader = new SwingXulLoader();
                 container = loader.loadXul(
-                        DatabaseConnectionDialog.DIALOG_DEFINITION_FILE,
-                        Messages.getBundle());
+                    DatabaseConnectionDialog.DIALOG_DEFINITION_FILE,
+                    Messages.getBundle());
             } catch (XulException e) {
                 throw new RuntimeException("Xul failed to initialize", e);
             }
@@ -2137,15 +2137,15 @@ public static void main(String args[]) {
         } catch (Throwable ex) {
             if (w != null) {
             JOptionPane.showMessageDialog(
-                    w,
-                    w.getResourceConverter().getFormattedString(
-                        "workbench.main.uncoverable_error",
-                        "Pentaho Schema Workbench has encountered an unrecoverable error. \n{0}",
-                        ex.getLocalizedMessage()),
-                    w.getResourceConverter().getString(
-                        "workbench.main.uncoverable_error.title",
-                        "PSW Fatal Error"),
-                    JOptionPane.ERROR_MESSAGE);
+                w,
+                w.getResourceConverter().getFormattedString(
+                    "workbench.main.uncoverable_error",
+                    "Pentaho Schema Workbench has encountered an unrecoverable error. \n{0}",
+                    ex.getLocalizedMessage()),
+                w.getResourceConverter().getString(
+                    "workbench.main.uncoverable_error.title",
+                    "PSW Fatal Error"),
+                JOptionPane.ERROR_MESSAGE);
             }
             LOGGER.error("main", ex);
         }