You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ro...@apache.org on 2014/05/05 14:52:17 UTC
svn commit: r1592516 - in /sling/trunk/tooling/ide/eclipse-ui: ./
src/org/apache/sling/ide/eclipse/ui/internal/
Author: rombert
Date: Mon May 5 12:52:16 2014
New Revision: 1592516
URL: http://svn.apache.org/r1592516
Log:
SLING-3153 - Sling project overlay conflicts with the version control
overlay
Remove Sling project overlay.
Removed:
sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/SlingProjectDecorator.java
sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/slingDecoration.png
Modified:
sling/trunk/tooling/ide/eclipse-ui/plugin.xml
sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/SharedImages.java
Modified: sling/trunk/tooling/ide/eclipse-ui/plugin.xml
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-ui/plugin.xml?rev=1592516&r1=1592515&r2=1592516&view=diff
==============================================================================
--- sling/trunk/tooling/ide/eclipse-ui/plugin.xml (original)
+++ sling/trunk/tooling/ide/eclipse-ui/plugin.xml Mon May 5 12:52:16 2014
@@ -463,25 +463,6 @@
point="org.eclipse.ui.decorators">
<decorator
adaptable="true"
- class="org.apache.sling.ide.eclipse.ui.internal.SlingProjectDecorator"
- id="org.apache.sling.ide.eclipse-ui.decorator"
- label="Sling Project Decorator"
- lightweight="true"
- location="BOTTOM_RIGHT"
- state="true">
- <enablement>
- <and>
- <objectClass
- name="org.eclipse.core.resources.IResource">
- </objectClass>
- <objectClass
- name="org.eclipse.core.resources.IProject">
- </objectClass>
- </and>
- </enablement>
- </decorator>
- <decorator
- adaptable="true"
class="org.apache.sling.ide.eclipse.ui.internal.ServerModuleDecorator"
id="org.apache.sling.ide.eclipse-ui.serverModuleDecorator"
label="ServerModule Decorator"
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=1592516&r1=1592515&r2=1592516&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 Mon May 5 12:52:16 2014
@@ -36,7 +36,6 @@ public final class SharedImages {
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);
public static final ImageDescriptor DEBUG_CONNECT = new DecorationOverlayIcon(DebugPluginImages.getImageDescriptor(IDebugUIConstants.IMG_ACT_DEBUG).createImage(), ImageDescriptor.createFromFile(SharedImages.class, "connectOverlay.png"), IDecoration.BOTTOM_RIGHT);
- public static final ImageDescriptor SLING_DECORATION = ImageDescriptor.createFromFile(SharedImages.class, "slingDecoration.png");
private SharedImages() {
}