[Rubyeclipse-commit] SF.net SVN: rubyeclipse: [3097] trunk/org.rubypeople.rdt.ui

[<caw...@us...>]

Revision: 3097
          http://rubyeclipse.svn.sourceforge.net/rubyeclipse/?rev=3097&view=rev
Author:   cawilliams
Date:     2007-09-06 09:01:12 -0700 (Thu, 06 Sep 2007)

Log Message:
-----------
enable showing error markers

Modified Paths:
--------------
    trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/viewsupport/DecoratingRubyLabelProvider.java
    trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/viewsupport/RubyElementImageProvider.java

Added Paths:
-----------
    trunk/org.rubypeople.rdt.ui/icons/full/ovr16/error_co.gif
    trunk/org.rubypeople.rdt.ui/icons/full/ovr16/warning_co.gif

Added: trunk/org.rubypeople.rdt.ui/icons/full/ovr16/error_co.gif
===================================================================
(Binary files differ)


Property changes on: trunk/org.rubypeople.rdt.ui/icons/full/ovr16/error_co.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/org.rubypeople.rdt.ui/icons/full/ovr16/warning_co.gif
===================================================================
(Binary files differ)


Property changes on: trunk/org.rubypeople.rdt.ui/icons/full/ovr16/warning_co.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/viewsupport/DecoratingRubyLabelProvider.java
===================================================================
--- trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/viewsupport/DecoratingRubyLabelProvider.java	2007-09-06 15:44:39 UTC (rev 3096)
+++ trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/viewsupport/DecoratingRubyLabelProvider.java	2007-09-06 16:01:12 UTC (rev 3097)
@@ -10,12 +10,11 @@
  *******************************************************************************/
 package org.rubypeople.rdt.internal.ui.viewsupport;
 
-import org.eclipse.swt.graphics.Color;
-
 import org.eclipse.jface.viewers.DecoratingLabelProvider;
 import org.eclipse.jface.viewers.IColorProvider;
-
+import org.eclipse.swt.graphics.Color;
 import org.eclipse.ui.PlatformUI;
+import org.rubypeople.rdt.ui.ProblemsLabelDecorator;
 
 public class DecoratingRubyLabelProvider extends DecoratingLabelProvider implements IColorProvider {
     
@@ -36,8 +35,7 @@
     public DecoratingRubyLabelProvider(RubyUILabelProvider labelProvider, boolean errorTick) {
         super(labelProvider, PlatformUI.getWorkbench().getDecoratorManager().getLabelDecorator());
         if (errorTick) {
-            // TODO Uncomment when we have a ProblemsLabelDecorator
-            //labelProvider.addLabelDecorator(new ProblemsLabelDecorator(null));
+            labelProvider.addLabelDecorator(new ProblemsLabelDecorator(null));
         }
     }
 

Modified: trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/viewsupport/RubyElementImageProvider.java
===================================================================
--- trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/viewsupport/RubyElementImageProvider.java	2007-09-06 15:44:39 UTC (rev 3096)
+++ trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/viewsupport/RubyElementImageProvider.java	2007-09-06 16:01:12 UTC (rev 3097)
@@ -101,14 +101,16 @@
     private ImageDescriptor computeDescriptor(Object element, int flags) {
         if (element instanceof IRubyElement) {
             return getRubyImageDescriptor((IRubyElement) element, flags);
+        } else if (element instanceof IAdaptable) { 
+        	return getWorkbenchImageDescriptor((IAdaptable) element, flags); 
         } else if (element instanceof IFile) {
             IFile file = (IFile) element;
-            if (RubyCore.isRubyLikeFileName(file.getName())) { return getCUResourceImageDescriptor(
-                    file, flags); // image for a CU not on the build path
+            if (RubyCore.isRubyLikeFileName(file.getName())) { 
+            	return getCUResourceImageDescriptor(
+                    file, flags); // image for a ruby script not on the build path
             }
             return getWorkbenchImageDescriptor(file, flags);
-        } else if (element instanceof IAdaptable) { return getWorkbenchImageDescriptor(
-                (IAdaptable) element, flags); }
+        } 
         return null;
     }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.