X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=bundles%2Forg.simantics.issues.ui%2Fsrc%2Forg%2Fsimantics%2Fissues%2Fui%2FIssueImageRule.java;h=c845ed08235cdafc51909803c72035277907c194;hb=refs%2Fchanges%2F26%2F2526%2F3;hp=b19a1f711ed507e7099f9258f92bc1f3e6ec2f7d;hpb=0ae2b770234dfc3cbb18bd38f324125cf0faca07;p=simantics%2Fplatform.git

diff --git a/bundles/org.simantics.issues.ui/src/org/simantics/issues/ui/IssueImageRule.java b/bundles/org.simantics.issues.ui/src/org/simantics/issues/ui/IssueImageRule.java
index b19a1f711..c845ed082 100644
--- a/bundles/org.simantics.issues.ui/src/org/simantics/issues/ui/IssueImageRule.java
+++ b/bundles/org.simantics.issues.ui/src/org/simantics/issues/ui/IssueImageRule.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2007, 2011 Association for Decentralized Information Management
+ * Copyright (c) 2007, 2017 Association for Decentralized Information Management
  * in Industry THTH ry.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -8,6 +8,7 @@
  *
  * Contributors:
  *     VTT Technical Research Centre of Finland - initial API and implementation
+ *     Semantum Oy - #6948
  *******************************************************************************/
 package org.simantics.issues.ui;
 
@@ -31,6 +32,25 @@ public class IssueImageRule implements ImageRule {
 
     private final String DESCRIPTION = ColumnKeys.SINGLE;
 
+    private final ImageDescriptor tick;
+    private final ImageDescriptor fatal;
+    private final ImageDescriptor error;
+    private final ImageDescriptor warning;
+    private final ImageDescriptor info;
+    private final ImageDescriptor note;
+    private final ImageDescriptor help;
+
+    public IssueImageRule(ReadGraph graph) throws DatabaseException {
+        SilkResources SILK = SilkResources.getInstance(graph);
+        tick = graph.adapt(SILK.tick, ImageDescriptor.class);
+        fatal = graph.adapt(SILK.bomb, ImageDescriptor.class);
+        error = graph.adapt(SILK.exclamation, ImageDescriptor.class);
+        warning = graph.adapt(SILK.error, ImageDescriptor.class);
+        info = graph.adapt(SILK.information, ImageDescriptor.class);
+        note = graph.adapt(SILK.note, ImageDescriptor.class);
+        help = graph.adapt(SILK.help, ImageDescriptor.class);
+    }
+
     @Override
     public boolean isCompatible(Class<?> contentType) {
         return contentType.equals(Variable.class);
@@ -38,26 +58,32 @@ public class IssueImageRule implements ImageRule {
 
     @Override
     public Map<String, ImageDescriptor> getImage(ReadGraph graph, Object content) throws DatabaseException {
+        Variable issue = (Variable) content;
+        String severity = issue.getPossiblePropertyValue(graph, "severity"); //$NON-NLS-1$
+        if (severity == null)
+            return Collections.emptyMap();
+        boolean resolved = isResolved(graph, issue);
+        return Collections.singletonMap(DESCRIPTION, resolved ? tick : toImageDescriptor(severity));
+    }
 
-        Variable issue = (Variable)content;
-
-        IssueResource ISSUE = IssueResource.getInstance(graph);
-        SilkResources SILK = SilkResources.getInstance(graph);
-        String severity = issue.getPropertyValue(graph, "severity");
-
-        // TODO: now to do this with variables?
+    public boolean isResolved(ReadGraph graph, Variable issue) throws DatabaseException {
         Resource issueResource = issue.getPossibleRepresents(graph);
-        boolean resolved = issueResource != null ? graph.hasStatement(issueResource, ISSUE.Resolved) : false;
-        if (resolved)
-            return Collections.singletonMap(DESCRIPTION, graph.adapt(SILK.tick, ImageDescriptor.class));
+        if (issueResource != null)
+            return graph.hasStatement(issueResource, IssueResource.getInstance(graph).Resolved);
 
-        if("Fatal".equals(severity)) return Collections.singletonMap(DESCRIPTION, graph.adapt(SILK.bomb, ImageDescriptor.class));
-        else if("Error".equals(severity)) return Collections.singletonMap(DESCRIPTION, graph.adapt(SILK.exclamation, ImageDescriptor.class));
-        else if("Warning".equals(severity)) return Collections.singletonMap(DESCRIPTION, graph.adapt(SILK.error, ImageDescriptor.class));
-        else if("Info".equals(severity)) return Collections.singletonMap(DESCRIPTION, graph.adapt(SILK.information, ImageDescriptor.class));
-        else if("Note".equals(severity)) return Collections.singletonMap(DESCRIPTION, graph.adapt(SILK.note, ImageDescriptor.class));
-        else return Collections.singletonMap(DESCRIPTION, graph.adapt(SILK.help, ImageDescriptor.class));
+        Boolean resolved = issue.getPossiblePropertyValue(graph, "resolved"); //$NON-NLS-1$
+        return Boolean.TRUE.equals(resolved);
+    }
 
+    private ImageDescriptor toImageDescriptor(String severity) {
+        switch (severity) {
+        case "Fatal":   return fatal; //$NON-NLS-1$
+        case "Error":   return error; //$NON-NLS-1$
+        case "Warning": return warning; //$NON-NLS-1$
+        case "Info":    return info; //$NON-NLS-1$
+        case "Note":    return note; //$NON-NLS-1$
+        default:        return help;
+        }
     }
 
 }