eclipse-sailing-analytics/sailing-analytics
1
0 Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-11-14 06:18:12 +00:00
Code Activity

Merge branch 'bug4104' of ssh://trac@sapsailing.com/home/trac/git into bug4104

Browse Source
This commit is contained in:
D067890 committed 2018-09-11 10:32:41 +02:00
2 parents 6a353810ea abe6959120
commit a7ef6736c0
27 files changed
+38 -35
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/TagDTO.java → java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/dto/TagDTO.java
+8 -6
View File
@@ -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 <code>true</code> if all parameters match the attributes of {@link TagDTO}, otherwise <code>false</code>
*/
@@ -243,4 +245,4 @@ public class TagDTO implements IsSerializable {
+ ", raceTimepoint=" + raceTimepoint + ", createdAt=" + createdAt + ", isPublic=" + visibleForPublic
+ ", revokedAt=" + revokedAt + "]";
}
}
}
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/SailingService.java
+1 -1
View File
@@ -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;
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/SailingServiceAsync.java
+1 -1
View File
@@ -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;
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/filter/AbstractTagTextFilterUIFactory.java
+1 -1
View File
@@ -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;
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/filter/AbstractTagsFilterSetDialog.java
+1 -1
View File
@@ -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;
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/filter/CreateTagsFilterSetDialog.java
+1 -1
View File
@@ -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;
/**
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/filter/EditTagsFilterSetDialog.java
+1 -1
View File
@@ -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;
/**
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/filter/TagFilterSets.java
+1 -1
View File
@@ -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;
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/filter/TagFilterSetsDialog.java
+1 -1
View File
@@ -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;
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/filter/TagFilterSetsJsonDeSerializer.java
+1 -1
View File
@@ -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;
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/filter/TagFilterWithUIFactory.java
+1 -1
View File
@@ -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<TagDTO> instances
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/filter/TagTagFilter.java
+1 -1
View File
@@ -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;
/**
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/filter/TagTagFilterUIFactory.java
+1 -1
View File
@@ -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;
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/filter/TagUsernameFilter.java
+1 -1
View File
@@ -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;
/**
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/filter/TagUsernameFilterUIFactory.java
+1 -1
View File
@@ -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;
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/filter/TagValueFilterJsonDeSerializerUtil.java
+1 -1
View File
@@ -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;
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/tagging/TagButtonDialog.java
+1 -1
View File
@@ -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());
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/tagging/TagCell.java
+5 -5
View File
@@ -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;
/**
@@ -188,16 +188,16 @@ public class TagCell extends AbstractCell<TagDTO> {
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);
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/tagging/TagDTOJsonDeSerializer.java
+1 -1
View File
@@ -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;
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/tagging/TagFilterLabel.java
+1 -1
View File
@@ -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;
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/tagging/TagFilterPanel.java
+1 -1
View File
@@ -21,7 +21,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;
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/tagging/TagInputPanel.java
+1 -1
View File
@@ -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.
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/tagging/TagListProvider.java
+1 -1
View File
@@ -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;
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/tagging/TagPreviewPanel.java
+1 -1
View File
@@ -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;
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/tagging/TaggingPanel.java
+1 -1
View File
@@ -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;
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
+1 -1
View File
@@ -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;
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/RaceTimesInfoDTO.java
+1
View File
@@ -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 {