Merge remote-tracking branch 'origin/master' into 3541

org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/service/IMarkerService.java

@@ -25,6 +25,9 @@ import org.fortiss.tooling.kernel.extension.data.IConstraintViolation.ESeverity;
 import org.fortiss.tooling.kernel.extension.data.ITopLevelElement;
 import org.fortiss.tooling.kernel.service.IConstraintCheckerService;
 import org.fortiss.tooling.kernel.ui.internal.MarkerService;
+import org.fortiss.tooling.kernel.ui.internal.views.fx.ErrorViewFXViewPart;
+
+import javafx.scene.image.ImageView;
 
 /**
  * The marker service manages model element specific markers. It uses the
@@ -36,7 +39,7 @@ import org.fortiss.tooling.kernel.ui.internal.MarkerService;
 public interface IMarkerService {
 
 	/** Returns view id of the marker view. */
-	public static final String MARKER_VIEW = "org.fortiss.tooling.kernel.model.marker";
+	public static final String MARKER_VIEW = ErrorViewFXViewPart.ID;
 
 	/** Returns the service instance. */
 	public static IMarkerService getInstance() {
@@ -68,6 +71,9 @@ public interface IMarkerService {
 	 */
 	ImageDescriptor getImageFor(ESeverity severity, boolean smallDecoration);
 
+	/** Similar to {@link #getImageFor(ESeverity, boolean)} but for Java FX. */
+	ImageView getFXImageFor(ESeverity severity, boolean smallDecoration);
+
 	/**
 	 * <p>
 	 * Returns a shared icon appropriate for the severity. Flag indicates small sized image.