From 9f967afb72e96a7b3067262c9a086e3716d76ac2 Mon Sep 17 00:00:00 2001 From: Benjamin Barth Date: Thu, 24 Sep 2015 11:01:01 +0200 Subject: [PATCH] Refactoring - Moved desktop LongNamesUtil into respective package and removed unsued methods --- .../desktop/partials/event/EventTeaser.java | 2 +- .../partials/mainmedia/MainMediaVideo.java | 2 +- .../utils}/LongNamesUtil.java | 28 +------------------ 3 files changed, 3 insertions(+), 29 deletions(-) rename java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/{client/shared => desktop/utils}/LongNamesUtil.java (50%) diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/event/EventTeaser.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/event/EventTeaser.java index 6e6d7f8aab7..1b4beabe795 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/event/EventTeaser.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/event/EventTeaser.java @@ -13,7 +13,7 @@ import com.google.gwt.user.client.EventListener; import com.google.gwt.user.client.ui.Composite; import com.google.gwt.user.client.ui.Widget; import com.sap.sailing.gwt.common.client.LinkUtil; -import com.sap.sailing.gwt.home.client.shared.LongNamesUtil; +import com.sap.sailing.gwt.home.desktop.utils.LongNamesUtil; import com.sap.sailing.gwt.home.shared.app.PlaceNavigation; import com.sap.sailing.gwt.home.shared.utils.EventDatesFormatterUtil; import com.sap.sailing.gwt.home.shared.utils.LabelTypeUtil; diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/mainmedia/MainMediaVideo.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/mainmedia/MainMediaVideo.java index e686d9a28b7..c58d256cb6e 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/mainmedia/MainMediaVideo.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/mainmedia/MainMediaVideo.java @@ -9,7 +9,7 @@ import com.google.gwt.uibinder.client.UiField; import com.google.gwt.user.client.ui.Composite; import com.google.gwt.user.client.ui.SimplePanel; import com.google.gwt.user.client.ui.Widget; -import com.sap.sailing.gwt.home.client.shared.LongNamesUtil; +import com.sap.sailing.gwt.home.desktop.utils.LongNamesUtil; import com.sap.sailing.gwt.home.shared.partials.videoplayer.VideoPlayer; import com.sap.sailing.gwt.ui.shared.media.SailingVideoDTO; diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/shared/LongNamesUtil.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/utils/LongNamesUtil.java similarity index 50% rename from java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/shared/LongNamesUtil.java rename to java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/utils/LongNamesUtil.java index 03a7eb6a7cb..0ab327ca86b 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/shared/LongNamesUtil.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/utils/LongNamesUtil.java @@ -1,4 +1,4 @@ -package com.sap.sailing.gwt.home.client.shared; +package com.sap.sailing.gwt.home.desktop.utils; import com.google.gwt.safehtml.shared.SafeHtml; import com.google.gwt.safehtml.shared.SafeHtmlBuilder; @@ -6,19 +6,10 @@ import com.google.gwt.safehtml.shared.SafeHtmlBuilder; /** * A utility class for handling long names * @author Frank - * */ public class LongNamesUtil { private static String NAME_SPLIT_RULE1 = " - "; - public static String shortenLongName(String name, int maxLength) { - String result = name; - if (name.length() > maxLength) { - name = name.substring(0, maxLength - 3) + "..."; - } - return result; - } - public static SafeHtml breakLongName(String name) { SafeHtmlBuilder builder = new SafeHtmlBuilder(); if(name != null) { @@ -39,21 +30,4 @@ public class LongNamesUtil { return builder.toSafeHtml(); } - /** - * Temp -> remove as soon as we have a display name for a leaderboardGroup - */ - public static String shortenLeaderboardGroupName(String eventName, String leaderboardGroupName) { - String result = leaderboardGroupName; - if (result.startsWith(eventName) && !eventName.equals(leaderboardGroupName)) { - result = result.substring(eventName.length(), result.length()); - result = result.trim(); - - if (result.startsWith("-") || result.startsWith("/")) { - result = result.substring(1, result.length()); - result = result.trim(); - } - } - return result; - } - }