From 7ef7daacfcde7be0495bc98504a91acce5e46b3d Mon Sep 17 00:00:00 2001 From: Alexander Diewald <diewald@fortiss.org> Date: Tue, 13 Nov 2018 17:10:58 +0100 Subject: [PATCH] LoggingService: YELLOW Issue-Ref: 3574 Issue-Url: https://af3-developer.fortiss.org/issues/3574 Signed-off-by: Alexander Diewald <diewald@fortiss.org> --- .../tooling/kernel/ui/extension/base/.ratings | 2 +- .../ui/extension/base/DialogMessageHandler.java | 7 ++----- .../org/fortiss/tooling/kernel/ui/util/.ratings | 2 +- .../kernel/ui/util/MessageUtilsExtended.java | 15 ++++++++------- 4 files changed, 12 insertions(+), 14 deletions(-) diff --git a/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/extension/base/.ratings b/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/extension/base/.ratings index 215d97ccf..718a94e3c 100644 --- a/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/extension/base/.ratings +++ b/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/extension/base/.ratings @@ -1,6 +1,6 @@ ConstraintUIBases.java 3676a600e0866091db9798763c6eee97eec5b55b GREEN ContextMenuSubMenuContributorBase.java 6275d96fe8690d9d4744bcbaef3c7d14ba8e30ff GREEN -DialogMessageHandler.java 173625e14ace15c4bfc32aa338e1da7247d7081c YELLOW +DialogMessageHandler.java 8714da09a777c8557de0a5c48ff68c340f9fa91d YELLOW EObjectActionBase.java 4ef9f8be59e64d4838acc9e268d418ba5d94fa1a GREEN EReferencePropertySectionBase.java 3347e99b2fc135dd4b3117407179900ef757092c GREEN EditorBase.java 9c09fff92945256bb8680992ae7bb2c78f47b150 GREEN diff --git a/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/extension/base/DialogMessageHandler.java b/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/extension/base/DialogMessageHandler.java index 3d533cd9b..8714da09a 100644 --- a/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/extension/base/DialogMessageHandler.java +++ b/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/extension/base/DialogMessageHandler.java @@ -24,11 +24,8 @@ import org.fortiss.tooling.kernel.extension.base.DialogMessage; import org.fortiss.tooling.kernel.extension.data.ILogMessageContext; /** - * {@link ILogMessageHandler} that displays warning dialogs of - * TODO(HP): 1 - * {@link ModelElementWithRefCopyMessage} - * s which are emitted when a user copies elements which reference - * {@link IModelElementSpecification}s. + * {@link ILogMessageHandler} that displays messages to a user in a dialog. It is used by backend + * plugins that may not have dependencies on UI plugins. * * @author diewald */ diff --git a/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/util/.ratings b/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/util/.ratings index 2768af3f5..d9fbaee91 100644 --- a/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/util/.ratings +++ b/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/util/.ratings @@ -6,7 +6,7 @@ DragAndDropUtils.java 7aab91518aa12d76533a345bf6ed0be9ac7ff0e5 GREEN EObjectSelectionUtils.java 128cf8f96c6b9478171dff3deda662d5934f5f44 GREEN HierarchicalNameViewerComparator.java 199d82e392d4e437810cc65c0fc521dab52038e0 GREEN KernelUIUtils.java 46d3279ef3523b104f89a6c526109f72d36f72f2 GREEN -MessageUtilsExtended.java fa3202e682a4573275fbb9c0db887ec701eeade3 YELLOW +MessageUtilsExtended.java 67693ff5473d0b85081d273fc5f00612fdc8bfee YELLOW ObservableUtils.java 34abfd1dfaf9c0acbb31caf1f525e7b39416c116 GREEN PropertiesConstantUtils.java 59b1a1e4d594bb98db3aa396f2ff6474ba405920 GREEN SelectionUtils.java 33aec7cccccb28e5568140cf8e5443ce0f9f59f7 GREEN diff --git a/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/util/MessageUtilsExtended.java b/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/util/MessageUtilsExtended.java index dd46b1c45..67693ff54 100644 --- a/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/util/MessageUtilsExtended.java +++ b/org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/util/MessageUtilsExtended.java @@ -15,6 +15,10 @@ +--------------------------------------------------------------------------*/ package org.fortiss.tooling.kernel.ui.util; +import static org.conqat.ide.commons.ui.dialog.MessageUtils.showError; +import static org.conqat.ide.commons.ui.dialog.MessageUtils.showInfo; +import static org.conqat.ide.commons.ui.dialog.MessageUtils.showWarning; + import org.conqat.ide.commons.ui.dialog.MessageUtils; import org.eclipse.swt.widgets.Display; @@ -33,7 +37,7 @@ public class MessageUtilsExtended { syncExec(new Runnable() { @Override public void run() { - tempQuestionResult = MessageUtils.askQuestion(title, message); + tempQuestionResult = askQuestion(title, message); } }); return tempQuestionResult; @@ -41,20 +45,17 @@ public class MessageUtilsExtended { /** Opens a error dialog in the UI thread. */ public static void showErrorInUIThread(final String title, final String message) { - // TODO(HP): 5.6 - syncExec(() -> MessageUtils.showError(title, message)); + syncExec(() -> showError(title, message)); } /** Opens a warning dialog in the UI thread. */ public static void showWarningInUIThread(final String title, final String message) { - // TODO(HP): 5.6 - syncExec(() -> MessageUtils.showWarning(title, message)); + syncExec(() -> showWarning(title, message)); } /** Opens an info dialog in the UI thread. */ public static void showInfoInUIThread(final String title, final String message) { - // TODO(HP): 5.6 - syncExec(() -> MessageUtils.showInfo(title, message)); + syncExec(() -> showInfo(title, message)); } /** Execute runnable in the UI thread */ -- GitLab