From 251e6bbf1c12dc601bbef404c724d08698ee2b3b Mon Sep 17 00:00:00 2001 From: donald.g.dunne Date: Tue, 13 Nov 2018 13:15:17 -0700 Subject: feature: Improve error text in WorldLabelProvider Change-Id: Ibac878709b3c757bbf555a107377c3d1ca5abc12 --- .../src/org/eclipse/osee/ats/world/WorldLabelProvider.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldLabelProvider.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldLabelProvider.java index 98f89043a60..92df24d797a 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldLabelProvider.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldLabelProvider.java @@ -15,6 +15,7 @@ import org.eclipse.jface.viewers.ILabelProviderListener; import org.eclipse.nebula.widgets.xviewer.XViewerLabelProvider; import org.eclipse.nebula.widgets.xviewer.core.model.XViewerColumn; import org.eclipse.osee.ats.api.IAtsWorkItem; +import org.eclipse.osee.ats.api.workdef.IAtsStateDefinition; import org.eclipse.osee.ats.core.client.workflow.AbstractWorkflowArtifact; import org.eclipse.osee.ats.core.column.AtsColumnId; import org.eclipse.osee.ats.core.column.AtsColumnToken; @@ -75,8 +76,13 @@ public class WorldLabelProvider extends XViewerLabelProvider { } if (element instanceof IAtsWorkItem) { if (xCol.getId().equals(AtsColumnId.State.getId())) { - return Displays.getSystemColor( - StateColorToSwtColor.convert(((AbstractWorkflowArtifact) element).getStateDefinition().getColor())); + IAtsStateDefinition state = ((AbstractWorkflowArtifact) element).getStateDefinition(); + if (state == null) { + OseeLog.logf(Activator.class, Level.SEVERE, "State null for %s", + ((IAtsWorkItem) element).toStringWithId()); + } else { + return Displays.getSystemColor(StateColorToSwtColor.convert(state.getColor())); + } } } -- cgit v1.2.3