Browse Source

Icon for TimeEvents added to Declaration view

Andreas Mülder 13 years ago
parent
commit
9fbdff50e8

BIN
plugins/org.yakindu.sct.simulation.ui/icons/TimeEvent.gif


+ 2 - 0
plugins/org.yakindu.sct.simulation.ui/src/org/yakindu/sct/simulation/ui/DeclarationImages.java

@@ -12,6 +12,8 @@ import org.eclipse.swt.graphics.Image;
 public enum DeclarationImages {
 
 	EVENT("icons/Event.gif"),
+	
+	TIMEEVENT("icons/TimeEvent.gif"),
 
 	VARIABLE("icons/Variable.gif"),
 	

+ 3 - 1
plugins/org.yakindu.sct.simulation.ui/src/org/yakindu/sct/simulation/ui/view/DeclarationView.java

@@ -103,6 +103,8 @@ public class DeclarationView extends AbstractDebugView implements
 		if ((event.getFlags() & DebugContextEvent.ACTIVATED) > 0) {
 			PlatformObject object = (PlatformObject) ((IStructuredSelection) event
 					.getContext()).getFirstElement();
+			if (object == null)
+				return;
 			SCTDebugTarget debugTarget = (SCTDebugTarget) object
 					.getAdapter(IDebugTarget.class);
 			if (debugTarget != null && !debugTarget.isTerminated())
@@ -141,7 +143,7 @@ public class DeclarationView extends AbstractDebugView implements
 	protected void createActions() {
 		@SuppressWarnings("restriction")
 		IAction action = new CollapseAllAction(viewer);
-		setAction("CollapseAll",action); //$NON-NLS-1$
+		setAction("CollapseAll", action); //$NON-NLS-1$
 	}
 
 	@Override

+ 5 - 2
plugins/org.yakindu.sct.simulation.ui/src/org/yakindu/sct/simulation/ui/view/ExecutionContextLabelProvider.java

@@ -67,7 +67,11 @@ public class ExecutionContextLabelProvider extends StyledCellLabelProvider {
 			style1.foreground = ColorConstants.lightBlue;
 			cell.setText(event.getName());
 			cell.setStyleRanges(new StyleRange[] { style1 });
-			cell.setImage(DeclarationImages.EVENT.image());
+			if (event.getName().contains("time_event")) {
+				cell.setImage(DeclarationImages.TIMEEVENT.image());
+			} else {
+				cell.setImage(DeclarationImages.EVENT.image());
+			}
 		} else if (element instanceof ExecutionVariable) {
 			ExecutionVariable variable = (ExecutionVariable) element;
 			cell.setText(variable.getName());
@@ -77,6 +81,5 @@ public class ExecutionContextLabelProvider extends StyledCellLabelProvider {
 			cell.setImage(DeclarationImages.SCOPE.image());
 		}
 	}
-	
 
 }