svn commit: r1596669 - in /sling/trunk/tooling/ide/eclipse-ui: icons/ovr16/ src/org/apache/sling/ide/eclipse/ui/internal/ src/org/apache/sling/ide/eclipse/ui/nav/model/

[rombert]

Author: rombert
Date: Wed May 21 20:15:08 2014
New Revision: 1596669

URL: http://svn.apache.org/r1596669
Log:
SLING-3596 - Content navigator icon is jagged

Use the default icon for the SyncDir and add a 'web content' overlay.

Added:
    sling/trunk/tooling/ide/eclipse-ui/icons/ovr16/
    sling/trunk/tooling/ide/eclipse-ui/icons/ovr16/content_ovr.gif   (with 
props)
Modified:
    
sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/JcrNodeDecorator.java
    
sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/SharedImages.java
    
sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/nav/model/SyncDir.java

Added: sling/trunk/tooling/ide/eclipse-ui/icons/ovr16/content_ovr.gif
URL: 
http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-ui/icons/ovr16/content_ovr.gif?rev=1596669&view=auto
==============================================================================
Binary file - no diff available.

Propchange: sling/trunk/tooling/ide/eclipse-ui/icons/ovr16/content_ovr.gif
------------------------------------------------------------------------------
    svn:mime-type = image/gif

Modified: 
sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/JcrNodeDecorator.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/JcrNodeDecorator.java?rev=1596669&r1=1596668&r2=1596669&view=diff
==============================================================================
--- 
sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/JcrNodeDecorator.java
 (original)
+++ 
sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/JcrNodeDecorator.java
 Wed May 21 20:15:08 2014
@@ -17,6 +17,7 @@
 package org.apache.sling.ide.eclipse.ui.internal;
 
 import org.apache.sling.ide.eclipse.ui.nav.model.JcrNode;
+import org.apache.sling.ide.eclipse.ui.nav.model.SyncDir;
 import org.eclipse.jface.viewers.IDecoration;
 import org.eclipse.jface.viewers.ILabelDecorator;
 import org.eclipse.jface.viewers.ILightweightLabelDecorator;
@@ -43,6 +44,10 @@ public class JcrNodeDecorator extends La
             if (node.getPrimaryType() != null) {
                 decoration.addSuffix(" [" + node.getPrimaryType() + "]");
             }
+
+            if (node instanceof SyncDir) {
+                decoration.addOverlay(SharedImages.CONTENT_OVERLAY, 
IDecoration.BOTTOM_RIGHT);
+            }
         }
     }
 }

Modified: 
sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/SharedImages.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/SharedImages.java?rev=1596669&r1=1596668&r2=1596669&view=diff
==============================================================================
--- 
sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/SharedImages.java
 (original)
+++ 
sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/SharedImages.java
 Wed May 21 20:15:08 2014
@@ -16,6 +16,8 @@
  */
 package org.apache.sling.ide.eclipse.ui.internal;
 
+import org.eclipse.core.runtime.FileLocator;
+import org.eclipse.core.runtime.Path;
 import org.eclipse.debug.internal.ui.DebugPluginImages;
 import org.eclipse.debug.ui.IDebugUIConstants;
 import org.eclipse.jface.resource.ImageDescriptor;
@@ -32,6 +34,8 @@ public final class SharedImages {
     public static final ImageDescriptor SLING_LOG = 
ImageDescriptor.createFromFile(SharedImages.class, "sling-logo.png");
     public static final ImageDescriptor SLING_ICON = 
ImageDescriptor.createFromFile(SharedImages.class, "sling.gif");
     public static final ImageDescriptor NT_UNSTRUCTURED_ICON = 
ImageDescriptor.createFromFile(SharedImages.class, "unstructured.png");
+    public static final ImageDescriptor CONTENT_OVERLAY = 
ImageDescriptor.createFromURL(FileLocator.find(Activator
+            .getDefault().getBundle(), 
Path.fromPortableString("icons/ovr16/content_ovr.gif"), null));
     
     public static final ImageDescriptor DISCONNECT = 
DebugPluginImages.getImageDescriptor(IDebugUIConstants.IMG_LCL_DISCONNECT);
     public static final ImageDescriptor RUN_CONNECT = new 
DecorationOverlayIcon(DebugPluginImages.getImageDescriptor(IDebugUIConstants.IMG_ACT_RUN).createImage(),
 ImageDescriptor.createFromFile(SharedImages.class, "connectOverlay.png"), 
IDecoration.BOTTOM_RIGHT);

Modified: 
sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/nav/model/SyncDir.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/nav/model/SyncDir.java?rev=1596669&r1=1596668&r2=1596669&view=diff
==============================================================================
--- 
sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/nav/model/SyncDir.java
 (original)
+++ 
sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/nav/model/SyncDir.java
 Wed May 21 20:15:08 2014
@@ -50,11 +50,6 @@ public class SyncDir extends JcrNode {
                }
                return false;
        }
-       
-       @Override
-       public Image getImage() {
-               return SharedImages.SLING_ICON.createImage();
-       }
 
        public String getLabel() {
         return folder.getProjectRelativePath().toString();