From 002bc800c75c5ae1ff451ba94e1c64255053a7ec Mon Sep 17 00:00:00 2001 From: Murray Cumming Date: Fri, 4 May 2012 11:26:08 +0200 Subject: [PATCH] Remove use of unsupported features from client code. * src/main/java/org/glom/web/client/StringUtils.java: Add equals(). * src/main/java/org/glom/web/shared/libglom/layout/UsesRelationshipImpl.java: * src/main/java/org/glom/web/shared/libglom/layout/reportparts/LayoutItemGroupBy.java: Use our client version of StringUtils instead of the apache commons one. However, the GWT Javascript compliation still fails. --- ChangeLog | 11 +++++++++++ src/main/java/org/glom/web/client/StringUtils.java | 19 +++++++++++++++++++ .../shared/libglom/layout/UsesRelationshipImpl.java | 2 +- .../libglom/layout/reportparts/LayoutItemGroupBy.java | 2 +- 4 files changed, 32 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 81de03d..e57c595 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2012-05-04 Murray Cumming + + Remove use of unsupported features from client code. + + * src/main/java/org/glom/web/client/StringUtils.java: Add equals(). + * src/main/java/org/glom/web/shared/libglom/layout/UsesRelationshipImpl.java: + * src/main/java/org/glom/web/shared/libglom/layout/reportparts/LayoutItemGroupBy.java: + Use our client version of StringUtils instead of the apache commons one. + + However, the GWT Javascript compliation still fails. + 2012-04-25 Murray Cumming Add a Field class and implement some loading of it in Document. diff --git a/src/main/java/org/glom/web/client/StringUtils.java b/src/main/java/org/glom/web/client/StringUtils.java index 02aa251..580ad4f 100644 --- a/src/main/java/org/glom/web/client/StringUtils.java +++ b/src/main/java/org/glom/web/client/StringUtils.java @@ -27,4 +27,23 @@ public class StringUtils { return (str == null) || (str.isEmpty()); } + /** + * @param aName + * @param bName + * @return + */ + public static boolean equals(String a, String b) { + if(a == null) { + if(b == null) { + return true; + } + } + + if(b == null) { + return false; //aName was already checked for null. + } + + return a.equals(b); + } + } diff --git a/src/main/java/org/glom/web/shared/libglom/layout/UsesRelationshipImpl.java b/src/main/java/org/glom/web/shared/libglom/layout/UsesRelationshipImpl.java index 3a0b471..46bc179 100644 --- a/src/main/java/org/glom/web/shared/libglom/layout/UsesRelationshipImpl.java +++ b/src/main/java/org/glom/web/shared/libglom/layout/UsesRelationshipImpl.java @@ -1,6 +1,6 @@ package org.glom.web.shared.libglom.layout; -import org.apache.commons.lang3.StringUtils; +import org.glom.web.client.StringUtils; import org.glom.web.shared.libglom.Relationship; public class UsesRelationshipImpl implements UsesRelationship { diff --git a/src/main/java/org/glom/web/shared/libglom/layout/reportparts/LayoutItemGroupBy.java b/src/main/java/org/glom/web/shared/libglom/layout/reportparts/LayoutItemGroupBy.java index bf439a1..e9bfd8d 100644 --- a/src/main/java/org/glom/web/shared/libglom/layout/reportparts/LayoutItemGroupBy.java +++ b/src/main/java/org/glom/web/shared/libglom/layout/reportparts/LayoutItemGroupBy.java @@ -1,6 +1,6 @@ package org.glom.web.shared.libglom.layout.reportparts; -import org.apache.commons.lang3.StringUtils; +import org.glom.web.client.StringUtils; import org.glom.web.shared.libglom.layout.LayoutGroup; import org.glom.web.shared.libglom.layout.LayoutItemField; -- 2.1.4