From cc790c9c227748bf3034a53a69bfd72b4efe71ac Mon Sep 17 00:00:00 2001 From: Henri Kohlberg Date: Mon, 10 Sep 2018 15:20:12 +0200 Subject: [PATCH 1/3] Bug 4104: Moved TagDTO to be available in upcoming REST Servlet. --- .../com/sap/sailing/domain/common/dto}/TagDTO.java | 14 ++++++++------ .../sap/sailing/gwt/ui/client/SailingService.java | 2 +- .../sailing/gwt/ui/client/SailingServiceAsync.java | 2 +- .../filter/AbstractTagTextFilterUIFactory.java | 2 +- .../shared/filter/AbstractTagsFilterSetDialog.java | 2 +- .../shared/filter/CreateTagsFilterSetDialog.java | 2 +- .../shared/filter/EditTagsFilterSetDialog.java | 2 +- .../gwt/ui/client/shared/filter/TagFilterSets.java | 2 +- .../client/shared/filter/TagFilterSetsDialog.java | 2 +- .../filter/TagFilterSetsJsonDeSerializer.java | 2 +- .../shared/filter/TagFilterWithUIFactory.java | 2 +- .../gwt/ui/client/shared/filter/TagTagFilter.java | 2 +- .../shared/filter/TagTagFilterUIFactory.java | 2 +- .../ui/client/shared/filter/TagUsernameFilter.java | 2 +- .../shared/filter/TagUsernameFilterUIFactory.java | 2 +- .../filter/TagValueFilterJsonDeSerializerUtil.java | 2 +- .../sailing/gwt/ui/raceboard/tagging/TagCell.java | 2 +- .../raceboard/tagging/TagDTOJsonDeSerializer.java | 2 +- .../gwt/ui/raceboard/tagging/TagFilterLabel.java | 2 +- .../gwt/ui/raceboard/tagging/TagFilterPanel.java | 2 +- .../gwt/ui/raceboard/tagging/TagInputPanel.java | 2 +- .../gwt/ui/raceboard/tagging/TagListProvider.java | 2 +- .../gwt/ui/raceboard/tagging/TagPreviewPanel.java | 2 +- .../gwt/ui/raceboard/tagging/TaggingPanel.java | 2 +- .../sailing/gwt/ui/server/SailingServiceImpl.java | 2 +- .../sailing/gwt/ui/shared/RaceTimesInfoDTO.java | 1 + 26 files changed, 33 insertions(+), 30 deletions(-) rename java/{com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared => com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/dto}/TagDTO.java (95%) diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/TagDTO.java b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/dto/TagDTO.java similarity index 95% rename from java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/TagDTO.java rename to java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/dto/TagDTO.java index b7d43db3ccd..a9a0d1d65f3 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/TagDTO.java +++ b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/dto/TagDTO.java @@ -1,14 +1,16 @@ -package com.sap.sailing.gwt.ui.shared; +package com.sap.sailing.domain.common.dto; + +import java.io.Serializable; -import com.google.gwt.user.client.rpc.IsSerializable; -import com.sap.sailing.gwt.ui.raceboard.tagging.TaggingPanel; import com.sap.sse.common.TimePoint; /** * Used to send tags over network. Allows to create tags with all possible combinations of states (private/public and * valid/revoked). */ -public class TagDTO implements IsSerializable { +public class TagDTO implements Serializable { + + private static final long serialVersionUID = 3907411584518452300L; private String tag, comment, imageURL, username; private boolean visibleForPublic; @@ -193,7 +195,7 @@ public class TagDTO implements IsSerializable { } /** - * Compares {@link TagDTO} with given attributes. Used by {@link TaggingPanel} to check if tag already exists. + * Compares {@link TagDTO} with given attributes. * * @return true if all parameters match the attributes of {@link TagDTO}, otherwise false */ @@ -243,4 +245,4 @@ public class TagDTO implements IsSerializable { + ", raceTimepoint=" + raceTimepoint + ", createdAt=" + createdAt + ", isPublic=" + visibleForPublic + ", revokedAt=" + revokedAt + "]"; } -} \ No newline at end of file +} diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/SailingService.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/SailingService.java index 7605cd5db52..f82d13b66ab 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/SailingService.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/SailingService.java @@ -101,7 +101,7 @@ import com.sap.sailing.gwt.ui.shared.SwissTimingConfigurationDTO; import com.sap.sailing.gwt.ui.shared.SwissTimingEventRecordDTO; import com.sap.sailing.gwt.ui.shared.SwissTimingRaceRecordDTO; import com.sap.sailing.gwt.ui.shared.SwissTimingReplayRaceDTO; -import com.sap.sailing.gwt.ui.shared.TagDTO; +import com.sap.sailing.domain.common.dto.TagDTO; import com.sap.sailing.gwt.ui.shared.TracTracConfigurationDTO; import com.sap.sailing.gwt.ui.shared.TracTracRaceRecordDTO; import com.sap.sailing.gwt.ui.shared.TrackFileImportDeviceIdentifierDTO; diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/SailingServiceAsync.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/SailingServiceAsync.java index a309c87e11b..cb4bbc5dcfc 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/SailingServiceAsync.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/SailingServiceAsync.java @@ -91,7 +91,7 @@ import com.sap.sailing.gwt.ui.shared.SwissTimingConfigurationDTO; import com.sap.sailing.gwt.ui.shared.SwissTimingEventRecordDTO; import com.sap.sailing.gwt.ui.shared.SwissTimingRaceRecordDTO; import com.sap.sailing.gwt.ui.shared.SwissTimingReplayRaceDTO; -import com.sap.sailing.gwt.ui.shared.TagDTO; +import com.sap.sailing.domain.common.dto.TagDTO; import com.sap.sailing.gwt.ui.shared.TracTracConfigurationDTO; import com.sap.sailing.gwt.ui.shared.TracTracRaceRecordDTO; import com.sap.sailing.gwt.ui.shared.TrackFileImportDeviceIdentifierDTO; diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/filter/AbstractTagTextFilterUIFactory.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/filter/AbstractTagTextFilterUIFactory.java index f0a7e90a441..856f09b1262 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/filter/AbstractTagTextFilterUIFactory.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/filter/AbstractTagTextFilterUIFactory.java @@ -4,7 +4,7 @@ import java.util.ArrayList; import java.util.List; import com.google.gwt.user.client.ui.ListBox; -import com.sap.sailing.gwt.ui.shared.TagDTO; +import com.sap.sailing.domain.common.dto.TagDTO; import com.sap.sse.common.filter.TextFilter; import com.sap.sse.common.filter.TextOperator; import com.sap.sse.gwt.client.dialog.DataEntryDialog; diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/filter/AbstractTagsFilterSetDialog.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/filter/AbstractTagsFilterSetDialog.java index 7cec10548bc..3a5946a361a 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/filter/AbstractTagsFilterSetDialog.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/filter/AbstractTagsFilterSetDialog.java @@ -18,7 +18,7 @@ import com.google.gwt.user.client.ui.TextBox; import com.google.gwt.user.client.ui.VerticalPanel; import com.google.gwt.user.client.ui.Widget; import com.sap.sailing.gwt.ui.client.StringMessages; -import com.sap.sailing.gwt.ui.shared.TagDTO; +import com.sap.sailing.domain.common.dto.TagDTO; import com.sap.sse.common.filter.Filter; import com.sap.sse.common.filter.FilterSet; import com.sap.sse.gwt.client.dialog.DataEntryDialog; diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/filter/CreateTagsFilterSetDialog.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/filter/CreateTagsFilterSetDialog.java index 11e4147795e..82e26c13ada 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/filter/CreateTagsFilterSetDialog.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/filter/CreateTagsFilterSetDialog.java @@ -3,7 +3,7 @@ package com.sap.sailing.gwt.ui.client.shared.filter; import java.util.List; import com.sap.sailing.gwt.ui.client.StringMessages; -import com.sap.sailing.gwt.ui.shared.TagDTO; +import com.sap.sailing.domain.common.dto.TagDTO; import com.sap.sse.common.filter.FilterSet; public class CreateTagsFilterSetDialog extends AbstractTagsFilterSetDialog { diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/filter/EditTagsFilterSetDialog.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/filter/EditTagsFilterSetDialog.java index 011afc3f622..d93c1a731aa 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/filter/EditTagsFilterSetDialog.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/filter/EditTagsFilterSetDialog.java @@ -3,7 +3,7 @@ package com.sap.sailing.gwt.ui.client.shared.filter; import java.util.List; import com.sap.sailing.gwt.ui.client.StringMessages; -import com.sap.sailing.gwt.ui.shared.TagDTO; +import com.sap.sailing.domain.common.dto.TagDTO; import com.sap.sse.common.filter.FilterSet; public class EditTagsFilterSetDialog extends AbstractTagsFilterSetDialog { diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/filter/TagFilterSets.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/filter/TagFilterSets.java index c105b9b8816..bcf26b5ebfa 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/filter/TagFilterSets.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/filter/TagFilterSets.java @@ -3,7 +3,7 @@ package com.sap.sailing.gwt.ui.client.shared.filter; import java.util.ArrayList; import java.util.List; -import com.sap.sailing.gwt.ui.shared.TagDTO; +import com.sap.sailing.domain.common.dto.TagDTO; import com.sap.sse.common.filter.Filter; import com.sap.sse.common.filter.FilterSet; diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/filter/TagFilterSetsDialog.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/filter/TagFilterSetsDialog.java index 79b00baa624..1ffc0244c91 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/filter/TagFilterSetsDialog.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/filter/TagFilterSetsDialog.java @@ -13,7 +13,7 @@ import com.google.gwt.user.client.ui.RadioButton; import com.google.gwt.user.client.ui.VerticalPanel; import com.google.gwt.user.client.ui.Widget; import com.sap.sailing.gwt.ui.client.StringMessages; -import com.sap.sailing.gwt.ui.shared.TagDTO; +import com.sap.sailing.domain.common.dto.TagDTO; import com.sap.sse.common.filter.FilterSet; import com.sap.sse.gwt.client.dialog.DataEntryDialog; import com.sap.sse.security.ui.client.UserService; diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/filter/TagFilterSetsJsonDeSerializer.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/filter/TagFilterSetsJsonDeSerializer.java index 762e7a05aea..cc3295dfde6 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/filter/TagFilterSetsJsonDeSerializer.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/filter/TagFilterSetsJsonDeSerializer.java @@ -7,7 +7,7 @@ import com.google.gwt.json.client.JSONObject; import com.google.gwt.json.client.JSONString; import com.google.gwt.json.client.JSONValue; import com.sap.sailing.gwt.ui.client.GwtJsonDeSerializer; -import com.sap.sailing.gwt.ui.shared.TagDTO; +import com.sap.sailing.domain.common.dto.TagDTO; import com.sap.sse.common.filter.FilterSet; import com.sap.sse.common.filter.ValueFilter; diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/filter/TagFilterWithUIFactory.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/filter/TagFilterWithUIFactory.java index 769d283c9a3..68b8eb8b8ce 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/filter/TagFilterWithUIFactory.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/filter/TagFilterWithUIFactory.java @@ -1,6 +1,6 @@ package com.sap.sailing.gwt.ui.client.shared.filter; -import com.sap.sailing.gwt.ui.shared.TagDTO; +import com.sap.sailing.domain.common.dto.TagDTO; /** * A factory for FilterWithUI instances diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/filter/TagTagFilter.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/filter/TagTagFilter.java index bb9fd28fe86..f79942e1fc9 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/filter/TagTagFilter.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/filter/TagTagFilter.java @@ -1,7 +1,7 @@ package com.sap.sailing.gwt.ui.client.shared.filter; import com.sap.sailing.gwt.ui.client.StringMessages; -import com.sap.sailing.gwt.ui.shared.TagDTO; +import com.sap.sailing.domain.common.dto.TagDTO; import com.sap.sse.common.filter.AbstractTextFilter; /** diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/filter/TagTagFilterUIFactory.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/filter/TagTagFilterUIFactory.java index f171f48e00d..ca31cb0a30b 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/filter/TagTagFilterUIFactory.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/filter/TagTagFilterUIFactory.java @@ -4,7 +4,7 @@ import com.google.gwt.user.client.ui.HorizontalPanel; import com.google.gwt.user.client.ui.ListBox; import com.google.gwt.user.client.ui.TextBox; import com.google.gwt.user.client.ui.Widget; -import com.sap.sailing.gwt.ui.shared.TagDTO; +import com.sap.sailing.domain.common.dto.TagDTO; import com.sap.sse.common.filter.TextOperator; import com.sap.sse.gwt.client.dialog.DataEntryDialog; diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/filter/TagUsernameFilter.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/filter/TagUsernameFilter.java index 2a2b3f52f30..ce1c008e759 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/filter/TagUsernameFilter.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/filter/TagUsernameFilter.java @@ -1,7 +1,7 @@ package com.sap.sailing.gwt.ui.client.shared.filter; import com.sap.sailing.gwt.ui.client.StringMessages; -import com.sap.sailing.gwt.ui.shared.TagDTO; +import com.sap.sailing.domain.common.dto.TagDTO; import com.sap.sse.common.filter.AbstractTextFilter; /** diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/filter/TagUsernameFilterUIFactory.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/filter/TagUsernameFilterUIFactory.java index 52574732440..5ca8e58e982 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/filter/TagUsernameFilterUIFactory.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/filter/TagUsernameFilterUIFactory.java @@ -4,7 +4,7 @@ import com.google.gwt.user.client.ui.HorizontalPanel; import com.google.gwt.user.client.ui.ListBox; import com.google.gwt.user.client.ui.TextBox; import com.google.gwt.user.client.ui.Widget; -import com.sap.sailing.gwt.ui.shared.TagDTO; +import com.sap.sailing.domain.common.dto.TagDTO; import com.sap.sse.common.filter.TextOperator; import com.sap.sse.gwt.client.dialog.DataEntryDialog; diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/filter/TagValueFilterJsonDeSerializerUtil.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/filter/TagValueFilterJsonDeSerializerUtil.java index f52958d82e1..f8f9bae9118 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/filter/TagValueFilterJsonDeSerializerUtil.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/filter/TagValueFilterJsonDeSerializerUtil.java @@ -2,7 +2,7 @@ package com.sap.sailing.gwt.ui.client.shared.filter; import com.google.gwt.json.client.JSONObject; import com.google.gwt.json.client.JSONString; -import com.sap.sailing.gwt.ui.shared.TagDTO; +import com.sap.sailing.domain.common.dto.TagDTO; import com.sap.sse.common.filter.BinaryOperator; import com.sap.sse.common.filter.NumberFilter; import com.sap.sse.common.filter.TextFilter; diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/tagging/TagCell.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/tagging/TagCell.java index 2dad7578750..3664db26b4c 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/tagging/TagCell.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/tagging/TagCell.java @@ -14,10 +14,10 @@ import com.google.gwt.safehtml.shared.SafeHtmlBuilder; import com.google.gwt.safehtml.shared.SafeHtmlUtils; import com.google.gwt.safehtml.shared.SafeUri; import com.google.gwt.safehtml.shared.UriUtils; +import com.sap.sailing.domain.common.dto.TagDTO; import com.sap.sailing.gwt.ui.client.StringMessages; import com.sap.sailing.gwt.ui.raceboard.tagging.TagPanelResources.TagPanelStyle; import com.sap.sailing.gwt.ui.raceboard.tagging.TaggingPanel.State; -import com.sap.sailing.gwt.ui.shared.TagDTO; import com.sap.sse.security.ui.client.UserService; /** diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/tagging/TagDTOJsonDeSerializer.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/tagging/TagDTOJsonDeSerializer.java index de468875da1..6f031f4c0cb 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/tagging/TagDTOJsonDeSerializer.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/tagging/TagDTOJsonDeSerializer.java @@ -7,7 +7,7 @@ import com.google.gwt.json.client.JSONArray; import com.google.gwt.json.client.JSONBoolean; import com.google.gwt.json.client.JSONObject; import com.google.gwt.json.client.JSONString; -import com.sap.sailing.gwt.ui.shared.TagDTO; +import com.sap.sailing.domain.common.dto.TagDTO; import com.sap.sse.common.TimePoint; import com.sap.sse.common.impl.MillisecondsTimePoint; diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/tagging/TagFilterLabel.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/tagging/TagFilterLabel.java index e79eba47597..90f5b95d6d9 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/tagging/TagFilterLabel.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/tagging/TagFilterLabel.java @@ -3,7 +3,7 @@ package com.sap.sailing.gwt.ui.raceboard.tagging; import com.google.gwt.user.client.ui.Label; import com.sap.sailing.gwt.ui.client.StringMessages; import com.sap.sailing.gwt.ui.raceboard.tagging.TagPanelResources.TagPanelStyle; -import com.sap.sailing.gwt.ui.shared.TagDTO; +import com.sap.sailing.domain.common.dto.TagDTO; import com.sap.sse.common.filter.Filter; import com.sap.sse.common.filter.FilterSet; diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/tagging/TagFilterPanel.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/tagging/TagFilterPanel.java index 9a70d463da8..3385a0f6638 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/tagging/TagFilterPanel.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/tagging/TagFilterPanel.java @@ -22,7 +22,7 @@ import com.sap.sailing.gwt.ui.client.shared.filter.TagFilterSets; import com.sap.sailing.gwt.ui.client.shared.filter.TagFilterSetsDialog; import com.sap.sailing.gwt.ui.client.shared.filter.TagFilterSetsJsonDeSerializer; import com.sap.sailing.gwt.ui.raceboard.tagging.TagPanelResources.TagPanelStyle; -import com.sap.sailing.gwt.ui.shared.TagDTO; +import com.sap.sailing.domain.common.dto.TagDTO; import com.sap.sse.common.Util; import com.sap.sse.common.filter.AbstractListFilter; import com.sap.sse.common.filter.Filter; diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/tagging/TagInputPanel.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/tagging/TagInputPanel.java index 01443cfbba5..55ced3ffaef 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/tagging/TagInputPanel.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/tagging/TagInputPanel.java @@ -5,9 +5,9 @@ import com.google.gwt.user.client.ui.FlowPanel; import com.google.gwt.user.client.ui.SimplePanel; import com.google.gwt.user.client.ui.TextArea; import com.google.gwt.user.client.ui.TextBox; +import com.sap.sailing.domain.common.dto.TagDTO; import com.sap.sailing.gwt.ui.client.StringMessages; import com.sap.sailing.gwt.ui.raceboard.tagging.TagPanelResources.TagPanelStyle; -import com.sap.sailing.gwt.ui.shared.TagDTO; /** * Panel containing input fields for tag/tag button creation and modification. diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/tagging/TagListProvider.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/tagging/TagListProvider.java index 17a7f29a4f4..e57073103d2 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/tagging/TagListProvider.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/tagging/TagListProvider.java @@ -6,7 +6,7 @@ import java.util.Iterator; import java.util.List; import com.google.gwt.view.client.ListDataProvider; -import com.sap.sailing.gwt.ui.shared.TagDTO; +import com.sap.sailing.domain.common.dto.TagDTO; import com.sap.sse.common.filter.Filter; import com.sap.sse.common.filter.FilterSet; diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/tagging/TagPreviewPanel.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/tagging/TagPreviewPanel.java index a173d943a79..b5e3d7705f3 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/tagging/TagPreviewPanel.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/tagging/TagPreviewPanel.java @@ -7,7 +7,7 @@ import com.google.gwt.user.cellview.client.CellList; import com.google.gwt.user.client.ui.FlowPanel; import com.google.gwt.user.client.ui.Label; import com.sap.sailing.gwt.ui.raceboard.tagging.TagPanelResources.TagPanelStyle; -import com.sap.sailing.gwt.ui.shared.TagDTO; +import com.sap.sailing.domain.common.dto.TagDTO; import com.sap.sse.common.impl.MillisecondsTimePoint; import com.sap.sse.security.ui.client.UserService; diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/tagging/TaggingPanel.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/tagging/TaggingPanel.java index bebb928e297..142ecae04b3 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/tagging/TaggingPanel.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/tagging/TaggingPanel.java @@ -29,7 +29,7 @@ import com.sap.sailing.gwt.ui.client.SailingServiceAsync; import com.sap.sailing.gwt.ui.client.StringMessages; import com.sap.sailing.gwt.ui.raceboard.tagging.TagPanelResources.TagPanelStyle; import com.sap.sailing.gwt.ui.shared.RaceTimesInfoDTO; -import com.sap.sailing.gwt.ui.shared.TagDTO; +import com.sap.sailing.domain.common.dto.TagDTO; import com.sap.sse.common.TimePoint; import com.sap.sse.common.impl.MillisecondsTimePoint; import com.sap.sse.gwt.client.Notification; diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java index 7c7033c8670..23f82a7266d 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java @@ -444,7 +444,7 @@ import com.sap.sailing.gwt.ui.shared.SwissTimingConfigurationDTO; import com.sap.sailing.gwt.ui.shared.SwissTimingEventRecordDTO; import com.sap.sailing.gwt.ui.shared.SwissTimingRaceRecordDTO; import com.sap.sailing.gwt.ui.shared.SwissTimingReplayRaceDTO; -import com.sap.sailing.gwt.ui.shared.TagDTO; +import com.sap.sailing.domain.common.dto.TagDTO; import com.sap.sailing.gwt.ui.shared.TracTracConfigurationDTO; import com.sap.sailing.gwt.ui.shared.TracTracRaceRecordDTO; import com.sap.sailing.gwt.ui.shared.TrackFileImportDeviceIdentifierDTO; diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/RaceTimesInfoDTO.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/RaceTimesInfoDTO.java index f5140256444..2bdaab92e0d 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/RaceTimesInfoDTO.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/RaceTimesInfoDTO.java @@ -6,6 +6,7 @@ import java.util.List; import com.google.gwt.user.client.rpc.IsSerializable; import com.sap.sailing.domain.common.RegattaAndRaceIdentifier; +import com.sap.sailing.domain.common.dto.TagDTO; import com.sap.sse.gwt.client.player.Timer; public class RaceTimesInfoDTO implements IsSerializable { From ba2d5e471154c9166541cb892ec9292082727e2f Mon Sep 17 00:00:00 2001 From: Henri Kohlberg Date: Mon, 10 Sep 2018 15:21:06 +0200 Subject: [PATCH 2/3] Bug 4104: Fixed newly created Tag-Buttons which could not create new tags until page was reload --- .../sap/sailing/gwt/ui/raceboard/tagging/TagButtonDialog.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/tagging/TagButtonDialog.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/tagging/TagButtonDialog.java index 4541f768d75..d30b2908a21 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/tagging/TagButtonDialog.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/tagging/TagButtonDialog.java @@ -393,7 +393,7 @@ public class TagButtonDialog extends DialogBox { inputPanel.getComment(), inputPanel.isVisibleForPublic()); inputPanel.clearAllValues(); tagPreviewPanel.renderPreview(inputPanel); - taggingPanel.getTagButtons().add(tagButton); + taggingPanel.addTagButton(tagButton); footerPanel.storeAllTagButtons(); footerPanel.recalculateHeight(); setRowData(tagButtonTable, taggingPanel.getTagButtons()); From abe69591206c127df31c83e4cf65682f53138782 Mon Sep 17 00:00:00 2001 From: Henri Kohlberg Date: Mon, 10 Sep 2018 15:21:25 +0200 Subject: [PATCH 3/3] Bug 4104: Moved comment to correct lines --- .../com/sap/sailing/gwt/ui/raceboard/tagging/TagCell.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/tagging/TagCell.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/tagging/TagCell.java index 3664db26b4c..6aa70d23c69 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/tagging/TagCell.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/tagging/TagCell.java @@ -188,16 +188,16 @@ public class TagCell extends AbstractCell { SafeHtml headingButtons = SafeHtmlUtils.EMPTY_SAFE_HTML; // preview cells do not show buttons if (!isPreviewCell) { - // TODO: As soon as permission-vertical branch got merged into master, apply - // new permission system at this if-statement and remove this old way of - // checking for permissions. (see bug 4104, comment 9) - // functionality: Check if user has the permission to delete or edit this tag. if (userService.getCurrentUser() != null) { // create buttons with icons SafeHtml deleteButton = tagCellTemplate.button(style.tagActionButton() + " " + style.tagDeleteButton(), stringMessages.tagDeleteTag(), tagCellTemplate.icon(resources.deleteIcon().getSafeUri())); SafeHtml editButton = tagCellTemplate.button(style.tagActionButton() + " " + style.tagEditButton(), stringMessages.tagEditTag(), tagCellTemplate.icon(resources.editIcon().getSafeUri())); + // TODO: As soon as permission-vertical branch got merged into master, apply + // new permission system at this if-statement and remove this old way of + // checking for permissions. (see bug 4104, comment 9) + // functionality: Check if user has the permission to delete or edit this tag. if (tag.getUsername().equals(userService.getCurrentUser().getName())) { headingButtons = tagCellTemplate.headerButtonsDeletableAndModifyable(style.tagCellHeadingButtons(), editButton, deleteButton);