diff --git a/java/com.sap.sailing.expeditionconnector/src/com/sap/sailing/expeditionconnector/impl/Activator.java b/java/com.sap.sailing.expeditionconnector/src/com/sap/sailing/expeditionconnector/impl/Activator.java index b1e18a7b580..e9b702a3927 100755 --- a/java/com.sap.sailing.expeditionconnector/src/com/sap/sailing/expeditionconnector/impl/Activator.java +++ b/java/com.sap.sailing.expeditionconnector/src/com/sap/sailing/expeditionconnector/impl/Activator.java @@ -94,7 +94,7 @@ public class Activator implements BundleActivator { securityService .assumeOwnershipMigrated(SecuredDomainType.EXPEDITION_DEVICE_CONFIGURATION.getName()); } catch (Exception e) { - logger.log(Level.SEVERE, "Exception trying to migrate IgtimiAccounts implementation", e); + logger.log(Level.SEVERE, "Exception trying to migrate Expedition Devices implementation", e); } }, getClass().getName() + " registering connectivity handler").start(); diff --git a/java/com.sap.sailing.gwt.ui/.settings/org.eclipse.core.resources.prefs b/java/com.sap.sailing.gwt.ui/.settings/org.eclipse.core.resources.prefs index 772cc9ec010..a6e40d55870 100755 --- a/java/com.sap.sailing.gwt.ui/.settings/org.eclipse.core.resources.prefs +++ b/java/com.sap.sailing.gwt.ui/.settings/org.eclipse.core.resources.prefs @@ -5,7 +5,7 @@ encoding//src/main/java/com/sap/sailing/gwt/regattaoverview/client/RegattaRaceSt encoding//src/main/java/com/sap/sailing/gwt/server/HomeServiceUtil.java=utf-8 encoding//src/main/java/com/sap/sailing/gwt/ui/adminconsole/EventDetailsComposite.java=utf-8 encoding//src/main/java/com/sap/sailing/gwt/ui/adminconsole/ExpeditionDeviceConfigurationsPanel.java=utf-8 -encoding//src/main/java/com/sap/sailing/gwt/ui/adminconsole/IgtimiAccountsPanel.java=utf-8 +encoding//src/main/java/com/sap/sailing/gwt/ui/adminconsole/IgtimiDevicesPanel.java=utf-8 encoding//src/main/java/com/sap/sailing/gwt/ui/adminconsole/LeaderboardConfigPanel.java=utf-8 encoding//src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties=UTF-8 encoding//src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_cs.properties=UTF-8 diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/AdminConsolePlaceHistoryMapper.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/AdminConsolePlaceHistoryMapper.java index 815283cfb50..4493471358d 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/AdminConsolePlaceHistoryMapper.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/AdminConsolePlaceHistoryMapper.java @@ -11,7 +11,7 @@ import com.sap.sailing.gwt.ui.adminconsole.places.advanced.RolesPlace; import com.sap.sailing.gwt.ui.adminconsole.places.advanced.UserGroupManagementPlace; import com.sap.sailing.gwt.ui.adminconsole.places.advanced.UserManagementPlace; import com.sap.sailing.gwt.ui.adminconsole.places.connectors.ExpeditionDeviceConfigurationsPlace; -import com.sap.sailing.gwt.ui.adminconsole.places.connectors.IgtimiAccountsPlace; +import com.sap.sailing.gwt.ui.adminconsole.places.connectors.IgtimiDevicesPlace; import com.sap.sailing.gwt.ui.adminconsole.places.connectors.Manage2SailRegattaStructureImportPlace; import com.sap.sailing.gwt.ui.adminconsole.places.connectors.ResultImportUrlsPlace; import com.sap.sailing.gwt.ui.adminconsole.places.connectors.SmartphoneTrackingPlace; @@ -40,7 +40,7 @@ import com.sap.sailing.landscape.ui.client.LandscapeManagementPlace; LeaderboardsPlace.Tokenizer.class, LeaderboardGroupsPlace.Tokenizer.class, TrackedRacesPlace.Tokenizer.class, CompetitorsPlace.Tokenizer.class, BoatsPlace.Tokenizer.class, CourseLayoutPlace.Tokenizer.class, WindPlace.Tokenizer.class, AudioAndVideoPlace.Tokenizer.class, TracTracEventsPlace.Tokenizer.class, YellowBrickEventsPlace.Tokenizer.class, SwissTimingArchivedEventsPlace.Tokenizer.class, SwissTimingEventsPlace.Tokenizer.class, - SmartphoneTrackingPlace.Tokenizer.class, IgtimiAccountsPlace.Tokenizer.class, ExpeditionDeviceConfigurationsPlace.Tokenizer.class, + SmartphoneTrackingPlace.Tokenizer.class, IgtimiDevicesPlace.Tokenizer.class, ExpeditionDeviceConfigurationsPlace.Tokenizer.class, ResultImportUrlsPlace.Tokenizer.class, Manage2SailRegattaStructureImportPlace.Tokenizer.class, DeviceConfigurationPlace.Tokenizer.class, ReplicationPlace.Tokenizer.class, MasterDataImportPlace.Tokenizer.class, RemoteServerInstancesPlace.Tokenizer.class, LocalServerPlace.Tokenizer.class, UserManagementPlace.Tokenizer.class, RolesPlace.Tokenizer.class, UserGroupManagementPlace.Tokenizer.class, FileStoragePlace.Tokenizer.class, diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/IgtimiAccountsPanel.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/IgtimiDevicesPanel.java similarity index 97% rename from java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/IgtimiAccountsPanel.java rename to java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/IgtimiDevicesPanel.java index f626f2e7383..1a6b9d0feb1 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/IgtimiAccountsPanel.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/IgtimiDevicesPanel.java @@ -67,7 +67,7 @@ import com.sap.sse.security.ui.client.component.EditOwnershipDialog.DialogConfig import com.sap.sse.security.ui.client.component.SecuredDTOOwnerColumn; import com.sap.sse.security.ui.client.component.editacl.EditACLDialog; -public class IgtimiAccountsPanel extends FlowPanel implements FilterablePanelProvider { +public class IgtimiDevicesPanel extends FlowPanel implements FilterablePanelProvider { private final StringMessages stringMessages; private final SailingServiceWriteAsync sailingServiceWrite; @@ -97,7 +97,7 @@ public class IgtimiAccountsPanel extends FlowPanel implements FilterablePanelPro } @SuppressWarnings("unchecked") - public IgtimiAccountsPanel(final Presenter presenter, + public IgtimiDevicesPanel(final Presenter presenter, final StringMessages stringMessages) { this.sailingServiceWrite = presenter.getSailingService(); this.errorReporter = presenter.getErrorReporter(); @@ -110,7 +110,7 @@ public class IgtimiAccountsPanel extends FlowPanel implements FilterablePanelPro tableRes); final ListDataProvider filteredAccounts = new ListDataProvider<>(); filterAccountsPanel = new LabeledAbstractFilterablePanel( - new Label(stringMessages.igtimiAccounts()), Collections.emptyList(), filteredAccounts, stringMessages) { + new Label(stringMessages.igtimiDevices()), Collections.emptyList(), filteredAccounts, stringMessages) { @Override public Iterable getSearchableStrings(IgtimiDeviceWithSecurityDTO t) { Set strings = Collections.singleton(t.getEmail()); @@ -167,7 +167,7 @@ public class IgtimiAccountsPanel extends FlowPanel implements FilterablePanelPro @Override public void onFailure(Throwable caught) { errorReporter.reportError( - IgtimiAccountsPanel.this.stringMessages.errorGettingIgtimiAuthorizationUrl(caught.getMessage()), + IgtimiDevicesPanel.this.stringMessages.errorGettingIgtimiAuthorizationUrl(caught.getMessage()), /* silentMode */ true); } @@ -267,7 +267,7 @@ public class IgtimiAccountsPanel extends FlowPanel implements FilterablePanelPro @Override public void onFailure(Throwable caught) { - errorReporter.reportError(stringMessages.errorFetchingIgtimiAccounts(caught.getMessage())); + errorReporter.reportError(stringMessages.errorFetchingIgtimiDevices(caught.getMessage())); } }); } diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/IgtimiAccountsPanelSupplier.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/IgtimiDevicesPanelSupplier.java similarity index 71% rename from java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/IgtimiAccountsPanelSupplier.java rename to java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/IgtimiDevicesPanelSupplier.java index 36c427fd039..1e00d61f508 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/IgtimiAccountsPanelSupplier.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/IgtimiDevicesPanelSupplier.java @@ -6,21 +6,21 @@ import com.sap.sailing.gwt.ui.adminconsole.places.AdminConsoleView.Presenter; import com.sap.sailing.gwt.ui.client.StringMessages; import com.sap.sse.gwt.adminconsole.AdminConsolePanelSupplier; -public class IgtimiAccountsPanelSupplier extends AdminConsolePanelSupplier { +public class IgtimiDevicesPanelSupplier extends AdminConsolePanelSupplier { private final StringMessages stringMessages; private final Presenter presenter; - public IgtimiAccountsPanelSupplier(final StringMessages stringMessages, final Presenter presenter) { + public IgtimiDevicesPanelSupplier(final StringMessages stringMessages, final Presenter presenter) { super(); this.stringMessages = stringMessages; this.presenter = presenter; } @Override - public IgtimiAccountsPanel init() { - IgtimiAccountsPanel igtimiAccountsPanel = new IgtimiAccountsPanel(presenter, stringMessages); - igtimiAccountsPanel.ensureDebugId("IgtimiAccounts"); + public IgtimiDevicesPanel init() { + IgtimiDevicesPanel igtimiAccountsPanel = new IgtimiDevicesPanel(presenter, stringMessages); + igtimiAccountsPanel.ensureDebugId("IgtimiDevices"); igtimiAccountsPanel.refresh(); return igtimiAccountsPanel; } diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/places/AdminConsoleViewImpl.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/places/AdminConsoleViewImpl.java index 15379de3d2f..d7bb8388fd3 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/places/AdminConsoleViewImpl.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/places/AdminConsoleViewImpl.java @@ -23,8 +23,8 @@ import com.sap.sailing.gwt.ui.adminconsole.EventManagementPanelSupplier; import com.sap.sailing.gwt.ui.adminconsole.ExpeditionDeviceConfigurationsPanel; import com.sap.sailing.gwt.ui.adminconsole.ExpeditionDeviceConfigurationsPanelSupplier; import com.sap.sailing.gwt.ui.adminconsole.FileStoragePanelSupplier; -import com.sap.sailing.gwt.ui.adminconsole.IgtimiAccountsPanel; -import com.sap.sailing.gwt.ui.adminconsole.IgtimiAccountsPanelSupplier; +import com.sap.sailing.gwt.ui.adminconsole.IgtimiDevicesPanel; +import com.sap.sailing.gwt.ui.adminconsole.IgtimiDevicesPanelSupplier; import com.sap.sailing.gwt.ui.adminconsole.LeaderboardConfigPanel; import com.sap.sailing.gwt.ui.adminconsole.LeaderboardConfigPanelSupplier; import com.sap.sailing.gwt.ui.adminconsole.LeaderboardGroupConfigPanel; @@ -78,7 +78,7 @@ import com.sap.sailing.gwt.ui.adminconsole.places.advanced.RolesPlace; import com.sap.sailing.gwt.ui.adminconsole.places.advanced.UserGroupManagementPlace; import com.sap.sailing.gwt.ui.adminconsole.places.advanced.UserManagementPlace; import com.sap.sailing.gwt.ui.adminconsole.places.connectors.ExpeditionDeviceConfigurationsPlace; -import com.sap.sailing.gwt.ui.adminconsole.places.connectors.IgtimiAccountsPlace; +import com.sap.sailing.gwt.ui.adminconsole.places.connectors.IgtimiDevicesPlace; import com.sap.sailing.gwt.ui.adminconsole.places.connectors.Manage2SailRegattaStructureImportPlace; import com.sap.sailing.gwt.ui.adminconsole.places.connectors.ResultImportUrlsPlace; import com.sap.sailing.gwt.ui.adminconsole.places.connectors.SmartphoneTrackingPlace; @@ -363,16 +363,16 @@ public class AdminConsoleViewImpl extends Composite implements AdminConsoleView }, stringMessages.smartphoneTracking(), new SmartphoneTrackingPlace((String) null /* no place token */), SecuredDomainType.LEADERBOARD.getPermission(DefaultActions.UPDATE, DefaultActions.DELETE)); /* Igtimi Accounts */ - final IgtimiAccountsPanelSupplier accountsPanelSupplier = new IgtimiAccountsPanelSupplier(stringMessages, presenter); + final IgtimiDevicesPanelSupplier accountsPanelSupplier = new IgtimiDevicesPanelSupplier(stringMessages, presenter); adminConsolePanel.addToTabPanel(connectorsTabPanel, - new DefaultRefreshableAdminConsolePanel(accountsPanelSupplier) { + new DefaultRefreshableAdminConsolePanel(accountsPanelSupplier) { @Override public void refreshAfterBecomingVisible() { if (getWidget() != null) { getWidget().refresh(); } } - }, stringMessages.igtimiAccounts(), new IgtimiAccountsPlace((String) null /* no place token */), + }, stringMessages.igtimiDevices(), new IgtimiDevicesPlace((String) null /* no place token */), SecuredDomainType.IGTIMI_ACCOUNT.getPermission(DefaultActions.values())); /* Expedition Device Configurations */ final ExpeditionDeviceConfigurationsPanelSupplier expeditionDeviceConfigurationsPanelSupplier = diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/places/connectors/IgtimiAccountsPlace.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/places/connectors/IgtimiDevicesPlace.java similarity index 53% rename from java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/places/connectors/IgtimiAccountsPlace.java rename to java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/places/connectors/IgtimiDevicesPlace.java index a7147273b19..6b3b411be93 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/places/connectors/IgtimiAccountsPlace.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/places/connectors/IgtimiDevicesPlace.java @@ -4,17 +4,17 @@ import java.util.function.Function; import com.sap.sse.gwt.adminconsole.AbstractFilterablePlace; -public class IgtimiAccountsPlace extends AbstractFilterablePlace { +public class IgtimiDevicesPlace extends AbstractFilterablePlace { - public IgtimiAccountsPlace(String token) { + public IgtimiDevicesPlace(String token) { super(token); } - public static class Tokenizer extends TablePlaceTokenizer { + public static class Tokenizer extends TablePlaceTokenizer { @Override - protected Function getPlaceFactory() { - return IgtimiAccountsPlace::new; + protected Function getPlaceFactory() { + return IgtimiDevicesPlace::new; } } } diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.java index 3dd84eeeac1..15af9c70227 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.java @@ -1000,9 +1000,8 @@ public interface StringMessages extends com.sap.sse.gwt.client.StringMessages, String hasAdditionalGolfDownTime(); String additionalGolfDownTimeHelpText(); String invalidColor(String message); - String igtimiAccounts(); - String errorFetchingIgtimiAccounts(String message); - String addIgtimiAccount(); + String igtimiDevices(); + String errorFetchingIgtimiDevices(String message); String errorAuthorizingAccessToIgtimiUser(String text, String message); String successfullyAuthorizedAccessToIgtimiUser(String username); String couldNotAuthorizedAccessToIgtimiUser(String text); diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties index e52c2e1d2b9..2a965828e17 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties @@ -1005,9 +1005,8 @@ setTrackingTimesDescription=Set the start and end of tracking for the race. hasAdditionalGolfDownTime=Activate additional golf down time additionalGolfDownTimeHelpText=Activate additional golf down time invalidColor=Invalid color: {0} -igtimiAccounts=Igtimi Accounts -errorFetchingIgtimiAccounts=Error fetching all Igtimi accounts: {0} -addIgtimiAccount=Add Igtimi Account +igtimiAccounts=Igtimi Devices +errorFetchingIgtimiAccounts=Error fetching all Igtimi devices: {0} errorAuthorizingAccessToIgtimiUser=Error authorizing access to Igtimi user {0}: {1} successfullyAuthorizedAccessToIgtimiUser=Successfully authorized access to Igtimi user {0} couldNotAuthorizedAccessToIgtimiUser=Could not authorize user {0}; invalid user name or password diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_cs.properties b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_cs.properties index 7c28eef92ac..55c1a18b6c7 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_cs.properties +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_cs.properties @@ -999,9 +999,6 @@ setTrackingTimesDescription=Nastavte pro rozjížďku začátek a konec trasová hasAdditionalGolfDownTime=Aktivovat dobu stažení vlajky G na půl žerdi additionalGolfDownTimeHelpText=Aktivovat dobu stažení vlajky G na půl žerdi invalidColor=Neplatná barva: {0} -igtimiAccounts=Účty Igtimi -errorFetchingIgtimiAccounts=Chyba při načítání všech účtů Igtimi: {0} -addIgtimiAccount=Přidat účet Igtimi errorAuthorizingAccessToIgtimiUser=Chyba při autorizování přístupu uživateli Igtimi {0}: {1} successfullyAuthorizedAccessToIgtimiUser=Chyba při autorizování přístupu uživateli Igtimi {0} couldNotAuthorizedAccessToIgtimiUser=Nepodařilo se autorizovat uživatele {0}; neplatné uživatelské jméno nebo heslo diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_da.properties b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_da.properties index 765156a688a..7c939b21629 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_da.properties +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_da.properties @@ -999,10 +999,6 @@ setTrackingTimesDescription=Indstil start og slut på sporing for kapsejladsen. hasAdditionalGolfDownTime=Aktiver yderligere golfnedetid additionalGolfDownTimeHelpText=Aktiver yderligere golfnedetid invalidColor=Ugyldig farve: {0} -igtimiAccounts=Igtimi-konti -errorFetchingIgtimiAccounts=Fejl ved hentning af alle Igtimi-konti: {0} -addIgtimiAccount=Tilføj Igtimi-konto -errorAuthorizingAccessToIgtimiUser=Fejl ved godkendelse af adgang til Igtimi-bruger {0}: {1} successfullyAuthorizedAccessToIgtimiUser=Adgang til Igtimi-bruger blev godkendt: {0} couldNotAuthorizedAccessToIgtimiUser=Bruger {0} kunne ikke godkendes. Ugyldigt brugernavn eller adgangskode errorGettingIgtimiAuthorizationUrl=Fejl ved hentning af URL til Igtimi-godkendelse: {0} diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_de.properties b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_de.properties index 39e5e513b14..e2516d31401 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_de.properties +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_de.properties @@ -987,9 +987,8 @@ setStartTimeDescription=Wähle eine Startzeit für das Rennen aus hasAdditionalGolfDownTime=Aktiviere Golf-Flaggen Zusatzzeit additionalGolfDownTimeHelpText=Aktiviere Golf-Flaggen Zusatzzeit invalidColor=Ungültige Farbangabe: {0} -igtimiAccounts=Igtimi-Konten -errorFetchingIgtimiAccounts=Fehler beim Laden aller Igtimi-Konten: {0} -addIgtimiAccount=Igtimi-Konto hinzufügen +igtimiDevices=Igtimi-Geräte +errorFetchingIgtimiDevices=Fehler beim Laden aller Igtimi-Geräte: {0} errorAuthorizingAccessToIgtimiUser=Fehler beim autorisieren des Benutzers mit der e-Mail-Adresse {0}: {1} successfullyAuthorizedAccessToIgtimiUser=Zugriff auf Daten von Benutzer {0} erfolgreich authorisiert couldNotAuthorizedAccessToIgtimiUser=Benutzer {0} konnte nicht authentifiziert werden; ungültiger Benutzername oder falsches Passwort diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_es.properties b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_es.properties index e092b95e2bc..5e5530e25b6 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_es.properties +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_es.properties @@ -999,9 +999,6 @@ setTrackingTimesDescription=Defina la salida y la llegada del rastreo para la pr hasAdditionalGolfDownTime=Activar tiempo de descanso de golf adicional additionalGolfDownTimeHelpText=Activar tiempo de descanso de golf adicional invalidColor=Color no válido: {0} -igtimiAccounts=Cuentas Igtimi -errorFetchingIgtimiAccounts=Error al obtener todas las cuentas Igtimi: {0} -addIgtimiAccount=Añadir cuenta Igtimi errorAuthorizingAccessToIgtimiUser=Error al autorizar acceso al usuario de Igtimi {0}: {1} successfullyAuthorizedAccessToIgtimiUser=Acceso autorizado correctamente al usuario de Igtimi : {0} couldNotAuthorizedAccessToIgtimiUser=No se ha podido autorizar al usuario {0}; nombre de usuario o contraseña no válido diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_fr.properties b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_fr.properties index f2f6ef296d4..50a01d8adf5 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_fr.properties +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_fr.properties @@ -999,9 +999,6 @@ setTrackingTimesDescription=Définissez le début et la fin du suivi pour la cou hasAdditionalGolfDownTime=Activer temps d''arrêt supplémentaire additionalGolfDownTimeHelpText=Activer temps d''arrêt supplémentaire invalidColor=Couleur non valide : {0} -igtimiAccounts=Comptes Igtimi -errorFetchingIgtimiAccounts=Erreur lors de l''accès à tous les comptes Igtimi : {0} -addIgtimiAccount=Ajouter compte Igtimi errorAuthorizingAccessToIgtimiUser=Erreur lors de l''autorisation d''accès pour l''utilisateur {0} : {1} successfullyAuthorizedAccessToIgtimiUser=Autorisation d''accès réussie pour l''utilisateur : {0} couldNotAuthorizedAccessToIgtimiUser=Autorisation pour l''utilisateur {0} échouée : mot de passe ou nom d''utilisateur non valide. diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_it.properties b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_it.properties index 7e3cac73317..49a8901ffb4 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_it.properties +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_it.properties @@ -999,9 +999,6 @@ setTrackingTimesDescription=Imposta l’inizio e la fine del tracciamento per la hasAdditionalGolfDownTime=Attiva ulteriore tempo bandiera Golf additionalGolfDownTimeHelpText=Attiva ulteriore tempo bandiera Golf invalidColor=Colore non valido: {0} -igtimiAccounts=Account Igtimi -errorFetchingIgtimiAccounts=Errore nella chiamata di tutti gli account Igtimi: {0} -addIgtimiAccount=Aggiungi account Igtimi errorAuthorizingAccessToIgtimiUser=Errore nell’autorizzazione accesso a utente Igtimi {0}: {1} successfullyAuthorizedAccessToIgtimiUser=Autorizzazione accesso corretta a utente Igtimi : {0} couldNotAuthorizedAccessToIgtimiUser=Impossibile autorizzare utente {0}; nome utente o password non validi diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_ja.properties b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_ja.properties index f5fe64b9aaa..0bd65b7d284 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_ja.properties +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_ja.properties @@ -999,9 +999,6 @@ setTrackingTimesDescription=レース追跡の開始および終了を設定し hasAdditionalGolfDownTime=追加ゴルフダウンタイムの有効化 additionalGolfDownTimeHelpText=追加ゴルフダウンタイムの有効化 invalidColor=無効な色: {0} -igtimiAccounts=Igtimi アカウント -errorFetchingIgtimiAccounts=全 Igtimi アカウントの取込でエラー発生: {0} -addIgtimiAccount=Igtimi アカウント追加 errorAuthorizingAccessToIgtimiUser=Igtimi ユーザ {0} へのアクセス権限付与でエラー発生: {1} successfullyAuthorizedAccessToIgtimiUser=Igtimi ユーザ {0} へのアクセス権限が付与されました couldNotAuthorizedAccessToIgtimiUser=ユーザ {0} への権限付与ができませんでした (ユーザ名またはパスワードが無効) diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_pt.properties b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_pt.properties index ba46505e008..d340dcddeb2 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_pt.properties +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_pt.properties @@ -999,9 +999,6 @@ setTrackingTimesDescription=Definir o início e o fim do rastreamento para a cor hasAdditionalGolfDownTime=Ativar pausa Golf adicional additionalGolfDownTimeHelpText=Ativar pausa Golf adicional invalidColor=Cor inválida: {0} -igtimiAccounts=Contas de Igtimi -errorFetchingIgtimiAccounts=Erro ao chamar todas as contas de Igtimi: {0} -addIgtimiAccount=Adicionar conta de Igtimi errorAuthorizingAccessToIgtimiUser=Erro ao autorizar o acesso ao usuário de Igtimi {0}: {1} successfullyAuthorizedAccessToIgtimiUser=Acesso autorizado com êxito ao usuário de Igtimi : {0} couldNotAuthorizedAccessToIgtimiUser=Não foi possível autorizar o usuário {0}; nome de usuário ou senha inválidos diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_ru.properties b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_ru.properties index d78aedba775..fb35f51a27f 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_ru.properties +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_ru.properties @@ -999,9 +999,6 @@ setTrackingTimesDescription=Установка времени начала и о hasAdditionalGolfDownTime=Активировать дополнительное время additionalGolfDownTimeHelpText=Активировать дополнительное время invalidColor=Недопустимый цвет: {0} -igtimiAccounts=Учетные записи Igtimi -errorFetchingIgtimiAccounts=Ошибка при извлечении всех учетных записей Igtimi: {0} -addIgtimiAccount=Добавить учетную запись Igtimi errorAuthorizingAccessToIgtimiUser=Ошибка при авторизации доступа к пользователю Igtimi {0}: {1} successfullyAuthorizedAccessToIgtimiUser=Успешно авторизован доступа к пользователю Igtimi: {0} couldNotAuthorizedAccessToIgtimiUser=Не удалось авторизовать пользователя {0}; недействительное имя пользователя и пароль diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_sl.properties b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_sl.properties index 45415f8ab88..8d850e2f911 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_sl.properties +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_sl.properties @@ -999,9 +999,6 @@ setTrackingTimesDescription=Nastavite začetek in konec sledenja za plov. hasAdditionalGolfDownTime=Aktiviraj dodaten čas napol spuščene zastave G additionalGolfDownTimeHelpText=Aktiviraj dodaten čas napol spuščene zastave G invalidColor=Neveljavna barva: {0} -igtimiAccounts=Računi Igtimi -errorFetchingIgtimiAccounts=Napaka pri priklicu vseh računov Igtimi: {0} -addIgtimiAccount=Dodaj račun Igtimi errorAuthorizingAccessToIgtimiUser=Napaka pri avtorizaciji dostopa do uporabnika Igtimi {0}: {1} successfullyAuthorizedAccessToIgtimiUser=Avtorizacija dostopa do uporabnika Igtimi {0} je uspela couldNotAuthorizedAccessToIgtimiUser=Avtorizacija uporabnika {0} ni mogoča; neveljavno uporabniško ime ali geslo diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_zh.properties b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_zh.properties index 1304414f87b..584f33a238e 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_zh.properties +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_zh.properties @@ -999,9 +999,6 @@ setTrackingTimesDescription=设置比赛轮次跟踪的开始和结束。 hasAdditionalGolfDownTime=激活附加高尔夫故障时间 additionalGolfDownTimeHelpText=激活附加高尔夫故障时间 invalidColor=颜色无效： {0} -igtimiAccounts=Igtimi 账户 -errorFetchingIgtimiAccounts=获取所有 Igtimi 账户出错： {0} -addIgtimiAccount=添加 Igtimi 账户 errorAuthorizingAccessToIgtimiUser=授予 Igtimi 用户{0}权限出错： {1} successfullyAuthorizedAccessToIgtimiUser=已成功授予 Igtimi 用户{0}权限 couldNotAuthorizedAccessToIgtimiUser=无法授予用户{0}权限；用户名或密码无效 diff --git a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/adminconsole/AdminConsolePage.java b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/adminconsole/AdminConsolePage.java index 63803c707bf..f5329e82ccd 100755 --- a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/adminconsole/AdminConsolePage.java +++ b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/adminconsole/AdminConsolePage.java @@ -19,7 +19,7 @@ import com.sap.sailing.selenium.pages.adminconsole.connectors.ResultImportUrlsPa import com.sap.sailing.selenium.pages.adminconsole.connectors.ExpeditionDeviceConfigurationsPanelPO; import com.sap.sailing.selenium.pages.adminconsole.connectors.SmartphoneTrackingEventManagementPanelPO; import com.sap.sailing.selenium.pages.adminconsole.event.EventConfigurationPanelPO; -import com.sap.sailing.selenium.pages.adminconsole.igtimi.IgtimiAccountsManagementPanelPO; +import com.sap.sailing.selenium.pages.adminconsole.igtimi.IgtimiDevicesManagementPanelPO; import com.sap.sailing.selenium.pages.adminconsole.leaderboard.LeaderboardConfigurationPanelPO; import com.sap.sailing.selenium.pages.adminconsole.leaderboard.LeaderboardGroupConfigurationPanelPO; import com.sap.sailing.selenium.pages.adminconsole.racemanagementapp.RaceManagementAppPanelPO; @@ -62,8 +62,8 @@ public class AdminConsolePage extends HostPageWithAuthentication { private static final String TRACTRAC_EVENTS_TAB_LABEL = "TracTrac Events"; //$NON-NLS-1$ private static final String TRACTRAC_EVENTS_TAB_IDENTIFIER = "TracTracEventManagement"; //$NON-NLS-1$ - private static final String IGTIMI_ACCOUNTS_TAB_LABEL = "Igtimi Accounts"; //$NON-NLS-1$ - private static final String IGTIMI_ACCOUNTS_TAB_IDENTIFIER = "IgtimiAccounts"; //$NON-NLS-1$ + private static final String IGTIMI_DEVICES_TAB_LABEL = "Igtimi Devices"; //$NON-NLS-1$ + private static final String IGTIMI_DEVICES_TAB_IDENTIFIER = "IgtimiDevices"; //$NON-NLS-1$ private static final String TRACKED_RACES_TAB_PARENT_LABEL = "Tracked races"; //$NON-NLS-1$ private static final String TRACKED_RACES_TAB_PARENT_IDENTIFIER = "RacesPanel"; //$NON-NLS-1$ @@ -204,10 +204,10 @@ public class AdminConsolePage extends HostPageWithAuthentication { TRACTRAC_EVENTS_TAB_IDENTIFIER, false)); } - public IgtimiAccountsManagementPanelPO goToIgtimi() { + public IgtimiDevicesManagementPanelPO goToIgtimi() { goToTab(TRACTRAC_EVENTS_TAB_PARENT_LABEL, TRACTRAC_EVENTS_TAB_PARENT_IDENTIFIER, true); - return new IgtimiAccountsManagementPanelPO(this.driver, goToTab(IGTIMI_ACCOUNTS_TAB_LABEL, - IGTIMI_ACCOUNTS_TAB_IDENTIFIER, false)); + return new IgtimiDevicesManagementPanelPO(this.driver, goToTab(IGTIMI_DEVICES_TAB_LABEL, + IGTIMI_DEVICES_TAB_IDENTIFIER, false)); } public TrackedRacesManagementPanelPO goToTrackedRaces() { diff --git a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/adminconsole/igtimi/IgtimiAccountsManagementPanelPO.java b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/adminconsole/igtimi/IgtimiDevicesManagementPanelPO.java similarity index 89% rename from java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/adminconsole/igtimi/IgtimiAccountsManagementPanelPO.java rename to java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/adminconsole/igtimi/IgtimiDevicesManagementPanelPO.java index a560c72b046..c111defdd06 100644 --- a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/adminconsole/igtimi/IgtimiAccountsManagementPanelPO.java +++ b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/adminconsole/igtimi/IgtimiDevicesManagementPanelPO.java @@ -13,7 +13,7 @@ import com.sap.sailing.selenium.pages.PageArea; * @author * D049941 */ -public class IgtimiAccountsManagementPanelPO extends PageArea { +public class IgtimiDevicesManagementPanelPO extends PageArea { @FindBy(how = BySeleniumId.class, using = "addIgtimiAccount") private WebElement addIgtimiAccount; @@ -26,7 +26,7 @@ public class IgtimiAccountsManagementPanelPO extends PageArea { * @param element * */ - public IgtimiAccountsManagementPanelPO(WebDriver driver, WebElement element) { + public IgtimiDevicesManagementPanelPO(WebDriver driver, WebElement element) { super(driver, element); } diff --git a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/raceboard/SimulatorOverlayTest.java b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/raceboard/SimulatorOverlayTest.java index 1f80e267ed5..da1aff4b3d2 100644 --- a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/raceboard/SimulatorOverlayTest.java +++ b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/raceboard/SimulatorOverlayTest.java @@ -16,7 +16,7 @@ import org.junit.Test; import com.sap.sailing.selenium.pages.adminconsole.AdminConsolePage; import com.sap.sailing.selenium.pages.adminconsole.event.EventConfigurationPanelPO; -import com.sap.sailing.selenium.pages.adminconsole.igtimi.IgtimiAccountsManagementPanelPO; +import com.sap.sailing.selenium.pages.adminconsole.igtimi.IgtimiDevicesManagementPanelPO; import com.sap.sailing.selenium.pages.adminconsole.leaderboard.LeaderboardConfigurationPanelPO; import com.sap.sailing.selenium.pages.adminconsole.leaderboard.LeaderboardDetailsPanelPO; import com.sap.sailing.selenium.pages.adminconsole.leaderboard.LeaderboardDetailsPanelPO.RaceDescriptor; @@ -112,8 +112,8 @@ public class SimulatorOverlayTest extends AbstractSeleniumTest { } { final AdminConsolePage adminConsole = AdminConsolePage.goToPage(getWebDriver(), getContextRoot()); - IgtimiAccountsManagementPanelPO igtimiAccountsManagementPanel = adminConsole.goToIgtimi(); - igtimiAccountsManagementPanel.addAccount(getIgtimiAccountUser(), getIgtimiAccountPassword()); + IgtimiDevicesManagementPanelPO igtimiDevicesManagementPanel = adminConsole.goToIgtimi(); + igtimiDevicesManagementPanel.addAccount(getIgtimiAccountUser(), getIgtimiAccountPassword()); WindPanelPO windPanel = adminConsole.goToWind(); windPanel.importWindFromIgtimi(/* waiting up to 10 min */ 15 * 60); }