eclipse-sailing-analytics/sailing-analytics
1
0
Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-09-17 11:19:15 +00:00
Code Activity

Bug 4147: further refactor and cleanup of dialogs

Browse Source
This commit is contained in:
Steffen Jacobs
2018-10-31 15:44:00 +01:00
parent 323f35866f
commit 3b80a73ca0
4 changed files with 51 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/partials/dialog/DialogFactory.java
+39
View File
@@ -0,0 +1,39 @@
package com.sap.sailing.gwt.home.shared.partials.dialog;
import com.google.gwt.event.dom.client.ClickEvent;
import com.google.gwt.user.client.Event;
import com.google.gwt.user.client.ui.PopupPanel;
import com.sap.sse.gwt.client.dialog.DataEntryDialog.DialogCallback;
/** Factory class to create generic dialogs. */
public final class DialogFactory {
/** Create a generic dialog with a title, a message and two buttons. */
public static PopupPanel createDialog(final String message, final String title,
final boolean firstActionDestructive, final String firstButtonName, final String secondButtonName,
final DialogCallback<Void> callback) {
DialogResources.INSTANCE.css().ensureInjected();
PopupPanel dialog = new PopupPanel();
// create the dialog panel
TwoOptionsDialogPanel dialogPanel = new TwoOptionsDialogPanel(message, title, callback, dialog);
dialogPanel.addStyleName(DialogResources.INSTANCE.css().dialog());
dialogPanel.setButtonLabels(firstButtonName, secondButtonName);
if (firstActionDestructive) {
dialogPanel.setFirstButtonDestructive();
}
dialog.setWidget(dialogPanel);
dialog.addStyleName(DialogResources.INSTANCE.css().backgroundPanel());
// close the dialog if the user clicks outside it
dialog.addDomHandler(e -> {
dialog.hide();
callback.cancel();
}, ClickEvent.getType());
dialog.sinkEvents(Event.ONCLICK | Event.ONTOUCHEND);
return dialog;
}
}
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/partials/dialog/confirm/ConfirmDialogFactory.java
+3 -19
View File
@@ -1,9 +1,7 @@
package com.sap.sailing.gwt.home.shared.partials.dialog.confirm;
import com.google.gwt.event.dom.client.ClickEvent;
import com.google.gwt.user.client.Event;
import com.google.gwt.user.client.ui.PopupPanel;
import com.sap.sailing.gwt.home.shared.partials.dialog.DialogResources;
import com.sap.sailing.gwt.home.shared.partials.dialog.DialogFactory;
import com.sap.sailing.gwt.home.shared.partials.dialog.TwoOptionsDialogPanel;
import com.sap.sailing.gwt.ui.client.StringMessages;
import com.sap.sse.gwt.client.dialog.DataEntryDialog.DialogCallback;
@@ -17,23 +15,9 @@ public final class ConfirmDialogFactory {
*/
public static void showConfirmDialog(final String message, final String title,
final DialogCallback<Void> callback) {
DialogResources.INSTANCE.css().ensureInjected();
PopupPanel dialog = new PopupPanel();
TwoOptionsDialogPanel dialogPanel = new TwoOptionsDialogPanel(message, title, callback, dialog);
dialogPanel.addStyleName(DialogResources.INSTANCE.css().dialog());
dialogPanel.setButtonLabels(StringMessages.INSTANCE.yes(), StringMessages.INSTANCE.no());
dialogPanel.setFirstButtonDestructive();
dialog.setWidget(dialogPanel);
dialog.addStyleName(DialogResources.INSTANCE.css().backgroundPanel());
PopupPanel dialog = DialogFactory.createDialog(message, title, true, StringMessages.INSTANCE.yes(),
StringMessages.INSTANCE.no(), callback);
dialog.show();
dialog.addDomHandler(e -> {
dialog.hide();
callback.cancel();
}, ClickEvent.getType());
dialog.sinkEvents(Event.ONCLICK | Event.ONTOUCHEND);
}
}
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/partials/dialog/whatsnew/WhatsNewDialogFactory.java
+8 -19
View File
@@ -3,16 +3,13 @@ package com.sap.sailing.gwt.home.shared.partials.dialog.whatsnew;
import java.util.logging.Level;
import java.util.logging.Logger;
import com.google.gwt.event.dom.client.ClickEvent;
import com.google.gwt.place.shared.PlaceController;
import com.google.gwt.user.client.Event;
import com.google.gwt.user.client.rpc.AsyncCallback;
import com.google.gwt.user.client.ui.PopupPanel;
import com.sap.sailing.gwt.home.desktop.places.whatsnew.WhatsNewPlace;
import com.sap.sailing.gwt.home.desktop.places.whatsnew.WhatsNewPlace.WhatsNewNavigationTabs;
import com.sap.sailing.gwt.home.desktop.places.whatsnew.WhatsNewResources;
import com.sap.sailing.gwt.home.shared.partials.dialog.DialogResources;
import com.sap.sailing.gwt.home.shared.partials.dialog.TwoOptionsDialogPanel;
import com.sap.sailing.gwt.home.shared.partials.dialog.DialogFactory;
import com.sap.sse.gwt.client.dialog.DataEntryDialog.DialogCallback;
import com.sap.sse.gwt.settings.SettingsToJsonSerializerGWT;
import com.sap.sse.security.ui.client.UserService;
@@ -34,13 +31,13 @@ public final class WhatsNewDialogFactory {
public static void registerWithUserService(UserService userService, PlaceController placeController) {
userService.addUserStatusEventHandler((userDTO, b) -> {
if (userDTO != null) {
showWhatsNewDialogIfNecessary(userService, placeController);
showWhatsNewDialogIfNecessaryAndUpdatePreference(userService, placeController);
}
}, false);
}
/** Shows a What's New Dialog. */
private static void showWhatsNewDialog(PlaceController placeController) {
DialogResources.INSTANCE.css().ensureInjected();
DialogCallback<Void> dialogCallback = new DialogCallback<Void>() {
@Override
public void ok(Void editedObject) {
@@ -52,26 +49,18 @@ public final class WhatsNewDialogFactory {
}
};
PopupPanel dialog = new PopupPanel();
TwoOptionsDialogPanel dialogPanel = new TwoOptionsDialogPanel(StringMessages.INSTANCE.whatsNewDialogMessage(),
StringMessages.INSTANCE.whatsNewDialogTitle(), dialogCallback, dialog);
dialogPanel.addStyleName(DialogResources.INSTANCE.css().dialog());
dialogPanel.setButtonLabels(StringMessages.INSTANCE.showChangelog(), StringMessages.INSTANCE.cancel());
dialog.setWidget(dialogPanel);
dialog.addStyleName(DialogResources.INSTANCE.css().backgroundPanel());
PopupPanel dialog = DialogFactory.createDialog(StringMessages.INSTANCE.whatsNewDialogMessage(),
StringMessages.INSTANCE.whatsNewDialogTitle(), false, StringMessages.INSTANCE.showChangelog(),
StringMessages.INSTANCE.cancel(), dialogCallback);
dialog.show();
dialog.addDomHandler(e -> dialog.hide(), ClickEvent.getType());
dialog.sinkEvents(Event.ONCLICK | Event.ONTOUCHEND);
}
/**
* Shows a dialog, if the changelog changed for more than {@link #THRESHOLD_WHATS_NEW} characters since the last
* login of the current user.
*/
private static void showWhatsNewDialogIfNecessary(UserService userService, PlaceController placeController) {
private static void showWhatsNewDialogIfNecessaryAndUpdatePreference(UserService userService,
PlaceController placeController) {
final long linesInWhatsChangedDocument = WhatsNewResources.INSTANCE.getSailingAnalyticsNotesHtml().getText()
.length();
userService.getPreference(WhatsNewSettings.PREF_NAME, new AsyncCallback<String>() {
java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/StringMessages.properties
+1 -1
View File
@@ -77,4 +77,4 @@ dataMiningStoredQueryRemovedFailed=Could not remove of Stored Query ''{0}''.
loadOrSaveQueries=Load or save query:
whatsNewDialogTitle=What''s New?
whatsNewDialogMessage=We added some features for you. If you are interested, click below to see what''s new.
showChangelog=Show Changelog
showChangelog=View Changelog