Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaurent Redor2013-11-20 13:41:16 +0000
committerLaurent Redor2013-11-20 14:28:26 +0000
commit898f26ffb25b1a9c40a4ccd6ad2b1859daf39272 (patch)
tree3d31f758d180387042809b37241d52b54efa0594
parent52bccc848f26f8ebe6b440f779ee99eff6a4d78d (diff)
downloadorg.eclipse.sirius-898f26ffb25b1a9c40a4ccd6ad2b1859daf39272.tar.gz
org.eclipse.sirius-898f26ffb25b1a9c40a4ccd6ad2b1859daf39272.tar.xz
org.eclipse.sirius-898f26ffb25b1a9c40a4ccd6ad2b1859daf39272.zip
[test] Complete message of IllegalArgumentException
Some automatic tests fail in the initialisation of TraceabilityMarkerNavigationProvider but the message of IllegalArgumentException is not enough clear. Change-Id: If0e81047f0fff9e6cfee8f630b63a8644726b35a Signed-off-by: Laurent Redor <laurent.redor@obeo.fr>
-rw-r--r--plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/business/api/dialect/marker/TraceabilityMarkerNavigationProvider.java33
1 files changed, 18 insertions, 15 deletions
diff --git a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/business/api/dialect/marker/TraceabilityMarkerNavigationProvider.java b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/business/api/dialect/marker/TraceabilityMarkerNavigationProvider.java
index 502ebde9aa..271ab01913 100644
--- a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/business/api/dialect/marker/TraceabilityMarkerNavigationProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/business/api/dialect/marker/TraceabilityMarkerNavigationProvider.java
@@ -28,23 +28,11 @@ import org.eclipse.emf.edit.domain.EditingDomain;
import org.eclipse.jface.viewers.ITreeContentProvider;
import org.eclipse.jface.viewers.Viewer;
import org.eclipse.jface.window.Window;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IEditorReference;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.dialogs.CheckedTreeSelectionDialog;
-import org.eclipse.ui.ide.IGotoMarker;
-
-import com.google.common.collect.Maps;
-import com.google.common.collect.Sets;
-
+import org.eclipse.sirius.business.api.dialect.DialectManager;
+import org.eclipse.sirius.business.api.session.Session;
import org.eclipse.sirius.common.tools.api.util.Option;
import org.eclipse.sirius.common.tools.api.util.Options;
import org.eclipse.sirius.common.ui.tools.api.util.EclipseUIUtil;
-import org.eclipse.sirius.business.api.dialect.DialectManager;
-import org.eclipse.sirius.business.api.session.Session;
import org.eclipse.sirius.ui.business.api.dialect.DialectEditor;
import org.eclipse.sirius.ui.business.api.dialect.DialectUIManager;
import org.eclipse.sirius.ui.business.api.session.IEditingSession;
@@ -53,6 +41,17 @@ import org.eclipse.sirius.ui.tools.api.views.ViewHelper;
import org.eclipse.sirius.ui.tools.internal.views.common.SessionLabelProvider;
import org.eclipse.sirius.viewpoint.DRepresentation;
import org.eclipse.sirius.viewpoint.DRepresentationElement;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.IEditorReference;
+import org.eclipse.ui.IWorkbenchPage;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.dialogs.CheckedTreeSelectionDialog;
+import org.eclipse.ui.ide.IGotoMarker;
+
+import com.google.common.collect.Maps;
+import com.google.common.collect.Sets;
/**
* <p>
@@ -147,7 +146,11 @@ public class TraceabilityMarkerNavigationProvider implements IGotoMarker {
if (foundSession != null) {
this.currentSession = foundSession;
} else {
- throw new IllegalArgumentException("We can't find a session associated to the given editor");
+ String editorTitle = "";
+ if (currentEditor.some()) {
+ editorTitle = currentEditor.get().getTitle();
+ }
+ throw new IllegalArgumentException("We can't find a session associated to the given editor \"" + editorTitle + "\"");
}
}

Back to the top