diff --git a/org.fortiss.tooling.kernel.ui/trunk/icons/debug.gif b/org.fortiss.tooling.kernel.ui/trunk/icons/debug.gif new file mode 100644 index 0000000000000000000000000000000000000000..ac5431fa311bc030ee3ed411a1d9db9915fe6397 Binary files /dev/null and b/org.fortiss.tooling.kernel.ui/trunk/icons/debug.gif differ diff --git a/org.fortiss.tooling.kernel.ui/trunk/icons/error.gif b/org.fortiss.tooling.kernel.ui/trunk/icons/error.gif new file mode 100644 index 0000000000000000000000000000000000000000..2ff6678993db0882f6a69fec5de642ad523f99a5 Binary files /dev/null and b/org.fortiss.tooling.kernel.ui/trunk/icons/error.gif differ diff --git a/org.fortiss.tooling.kernel.ui/trunk/icons/fatal.gif b/org.fortiss.tooling.kernel.ui/trunk/icons/fatal.gif new file mode 100644 index 0000000000000000000000000000000000000000..486faff8aacdbc43192d92dc975e5ce62c0f26b1 Binary files /dev/null and b/org.fortiss.tooling.kernel.ui/trunk/icons/fatal.gif differ diff --git a/org.fortiss.tooling.kernel.ui/trunk/icons/info.gif b/org.fortiss.tooling.kernel.ui/trunk/icons/info.gif new file mode 100644 index 0000000000000000000000000000000000000000..3679f84ad88360690aeef62e7cebad04805fd795 Binary files /dev/null and b/org.fortiss.tooling.kernel.ui/trunk/icons/info.gif differ diff --git a/org.fortiss.tooling.kernel.ui/trunk/icons/marker_view.gif b/org.fortiss.tooling.kernel.ui/trunk/icons/marker_view.gif new file mode 100644 index 0000000000000000000000000000000000000000..004f4acb6763e9c2d556af75d5b6ffd7531d1bb4 Binary files /dev/null and b/org.fortiss.tooling.kernel.ui/trunk/icons/marker_view.gif differ diff --git a/org.fortiss.tooling.kernel.ui/trunk/icons/navigator.gif b/org.fortiss.tooling.kernel.ui/trunk/icons/navigator.gif new file mode 100644 index 0000000000000000000000000000000000000000..68079f93b4395dcd9da86a7569afdd2b4aa7f5ba Binary files /dev/null and b/org.fortiss.tooling.kernel.ui/trunk/icons/navigator.gif differ diff --git a/org.fortiss.tooling.kernel.ui/trunk/icons/warning.gif b/org.fortiss.tooling.kernel.ui/trunk/icons/warning.gif new file mode 100644 index 0000000000000000000000000000000000000000..2f1c5a8fa7b0daec8a56f57de75efab04032b6ae Binary files /dev/null and b/org.fortiss.tooling.kernel.ui/trunk/icons/warning.gif differ diff --git a/org.fortiss.tooling.kernel.ui/trunk/plugin.xml b/org.fortiss.tooling.kernel.ui/trunk/plugin.xml index e751003d089310851b37eece85a9e7d639a8d138..0a39b9dfe8677486a5149fab012ce2d7852b6f3f 100644 --- a/org.fortiss.tooling.kernel.ui/trunk/plugin.xml +++ b/org.fortiss.tooling.kernel.ui/trunk/plugin.xml @@ -19,14 +19,14 @@ point="org.eclipse.ui.views"> <view class="org.fortiss.tooling.kernel.ui.internal.views.NavigatorViewPart" - icon="icons/tumlogo.png" + icon="icons/navigator.gif" id="org.fortiss.tooling.kernel.model.navigator" name="Model Navigator" restorable="true"> </view> <view class="org.fortiss.tooling.kernel.ui.internal.views.MarkerViewPart" - icon="icons/tumlogo.png" + icon="icons/marker_view.gif" id="org.fortiss.tooling.kernel.model.marker" name="Model Markers" restorable="true"> diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/views/MarkerViewPart.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/views/MarkerViewPart.java index 464c3e921af56393d402bbe603f6666f42dbc285..18d0539f57724c9f22b5740db657e92a7f1a0cd8 100644 --- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/views/MarkerViewPart.java +++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/views/MarkerViewPart.java @@ -37,12 +37,14 @@ import org.eclipse.jface.viewers.ITreeContentProvider; import org.eclipse.jface.viewers.Viewer; import org.eclipse.jface.viewers.ViewerCell; import org.eclipse.swt.SWT; +import org.eclipse.swt.graphics.Image; import org.eclipse.swt.layout.FillLayout; import org.eclipse.swt.widgets.Composite; import org.eclipse.ui.part.ViewPart; import org.fortiss.tooling.kernel.extension.data.IConstraintViolation; import org.fortiss.tooling.kernel.extension.data.IConstraintViolation.ESeverity; import org.fortiss.tooling.kernel.service.IPersistencyService; +import org.fortiss.tooling.kernel.ui.ToolingKernelUIActivator; import org.fortiss.tooling.kernel.ui.extension.IModelElementHandler; import org.fortiss.tooling.kernel.ui.internal.MarkerService; import org.fortiss.tooling.kernel.ui.service.IMarkerService; @@ -136,10 +138,12 @@ public class MarkerViewPart extends ViewPart { public void update(ViewerCell cell) { if (cell.getElement() instanceof ESeverity) { cell.setText(((ESeverity) cell.getElement()).toString()); + cell.setImage(getImageFor((ESeverity) cell.getElement())); } else { cell.setText(""); } } + }); gui.getElementColumn().setLabelProvider(new CellLabelProvider() { @Override @@ -250,4 +254,27 @@ public class MarkerViewPart extends ViewPart { refresh(); } } + + public Image getImageFor(ESeverity severity) { + switch (severity) { + case FATAL: + return ToolingKernelUIActivator.getImageDescriptor( + "icons/fatal.gif").createImage(); + case ERROR: + return ToolingKernelUIActivator.getImageDescriptor( + "icons/error.gif").createImage(); + case WARNING: + return ToolingKernelUIActivator.getImageDescriptor( + "icons/warning.gif").createImage(); + case INFO: + return ToolingKernelUIActivator + .getImageDescriptor("icons/info.gif").createImage(); + case DEBUG: + return ToolingKernelUIActivator.getImageDescriptor( + "icons/debug.gif").createImage(); + + } + + return null; + } }