From 405262d805f68979c8aa4c1dc25614d7bf9e80cf Mon Sep 17 00:00:00 2001
From: Artur Signell <artur@vaadin.com>
Date: Mon, 8 Dec 2014 20:13:20 +0200
Subject: Split and capitalize header captions by default

Only done on the server side where we have property ids to generate the default
headers from. On the client side you must always specify the header.

Change-Id: Ic743fb3f52517116193b022cfdd2df7dea8dd487
---
 server/src/com/vaadin/ui/DefaultFieldFactory.java | 38 ++---------------------
 server/src/com/vaadin/ui/Grid.java                |  4 ++-
 2 files changed, 5 insertions(+), 37 deletions(-)

(limited to 'server/src/com')

diff --git a/server/src/com/vaadin/ui/DefaultFieldFactory.java b/server/src/com/vaadin/ui/DefaultFieldFactory.java
index ad6461686c..535943bcd5 100644
--- a/server/src/com/vaadin/ui/DefaultFieldFactory.java
+++ b/server/src/com/vaadin/ui/DefaultFieldFactory.java
@@ -20,6 +20,7 @@ import java.util.Date;
 import com.vaadin.data.Container;
 import com.vaadin.data.Item;
 import com.vaadin.data.Property;
+import com.vaadin.shared.util.SharedUtil;
 
 /**
  * This class contains a basic implementation for both {@link FormFieldFactory}
@@ -75,42 +76,7 @@ public class DefaultFieldFactory implements FormFieldFactory, TableFieldFactory
      * @return the formatted caption string
      */
     public static String createCaptionByPropertyId(Object propertyId) {
-        String name = propertyId.toString();
-        if (name.length() > 0) {
-
-            int dotLocation = name.lastIndexOf('.');
-            if (dotLocation > 0 && dotLocation < name.length() - 1) {
-                name = name.substring(dotLocation + 1);
-            }
-            if (name.indexOf(' ') < 0
-                    && name.charAt(0) == Character.toLowerCase(name.charAt(0))
-                    && name.charAt(0) != Character.toUpperCase(name.charAt(0))) {
-                StringBuffer out = new StringBuffer();
-                out.append(Character.toUpperCase(name.charAt(0)));
-                int i = 1;
-
-                while (i < name.length()) {
-                    int j = i;
-                    for (; j < name.length(); j++) {
-                        char c = name.charAt(j);
-                        if (Character.toLowerCase(c) != c
-                                && Character.toUpperCase(c) == c) {
-                            break;
-                        }
-                    }
-                    if (j == name.length()) {
-                        out.append(name.substring(i));
-                    } else {
-                        out.append(name.substring(i, j));
-                        out.append(" " + name.charAt(j));
-                    }
-                    i = j + 1;
-                }
-
-                name = out.toString();
-            }
-        }
-        return name;
+        return SharedUtil.propertyIdToHumanFriendly(propertyId);
     }
 
     /**
diff --git a/server/src/com/vaadin/ui/Grid.java b/server/src/com/vaadin/ui/Grid.java
index b9f0ec86aa..b8330e5efc 100644
--- a/server/src/com/vaadin/ui/Grid.java
+++ b/server/src/com/vaadin/ui/Grid.java
@@ -76,6 +76,7 @@ import com.vaadin.shared.ui.grid.HeightMode;
 import com.vaadin.shared.ui.grid.ScrollDestination;
 import com.vaadin.shared.ui.grid.SortDirection;
 import com.vaadin.shared.ui.grid.SortEventOriginator;
+import com.vaadin.shared.util.SharedUtil;
 import com.vaadin.ui.components.grid.Renderer;
 import com.vaadin.ui.components.grid.SortOrderChangeEvent;
 import com.vaadin.ui.components.grid.SortOrderChangeListener;
@@ -2119,7 +2120,8 @@ public class Grid extends AbstractComponent implements SelectionChangeNotifier,
         header.addColumn(datasourcePropertyId);
         footer.addColumn(datasourcePropertyId);
 
-        column.setHeaderCaption(String.valueOf(datasourcePropertyId));
+        column.setHeaderCaption(SharedUtil.camelCaseToHumanFriendly(String
+                .valueOf(datasourcePropertyId)));
 
         return column;
     }
-- 
cgit v1.2.3