incubator-sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bdelacre...@apache.org
Subject svn commit: r1392785 - /sling/trunk/installer/console/src/main/java/org/apache/sling/installer/core/impl/console/OsgiInstallerWebConsolePlugin.java
Date Tue, 02 Oct 2012 08:12:38 GMT
Author: bdelacretaz
Date: Tue Oct  2 08:12:38 2012
New Revision: 1392785

URL: http://svn.apache.org/viewvc?rev=1392785&view=rev
Log:
SLING-2612 - EXCLUDED applies only to INSTALLED state IMO, and add (*) after INSTALLED if
there's additional info

Modified:
    sling/trunk/installer/console/src/main/java/org/apache/sling/installer/core/impl/console/OsgiInstallerWebConsolePlugin.java

Modified: sling/trunk/installer/console/src/main/java/org/apache/sling/installer/core/impl/console/OsgiInstallerWebConsolePlugin.java
URL: http://svn.apache.org/viewvc/sling/trunk/installer/console/src/main/java/org/apache/sling/installer/core/impl/console/OsgiInstallerWebConsolePlugin.java?rev=1392785&r1=1392784&r2=1392785&view=diff
==============================================================================
--- sling/trunk/installer/console/src/main/java/org/apache/sling/installer/core/impl/console/OsgiInstallerWebConsolePlugin.java
(original)
+++ sling/trunk/installer/console/src/main/java/org/apache/sling/installer/core/impl/console/OsgiInstallerWebConsolePlugin.java
Tue Oct  2 08:12:38 2012
@@ -91,8 +91,13 @@ public class OsgiInstallerWebConsolePlug
     }
 
     private String getState(final Resource rsrc) {
-        if ( rsrc.getAttribute(TaskResource.ATTR_INSTALL_EXCLUDED) != null ) {
-            return "EXCLUDED";
+        // INSTALLED state has some variants
+        if ( rsrc.getState() == ResourceState.INSTALLED) {
+            if(rsrc.getAttribute(TaskResource.ATTR_INSTALL_EXCLUDED) != null ) {
+                return "EXCLUDED";
+            } else if(rsrc.getAttribute(TaskResource.ATTR_INSTALL_INFO) != null) {
+                return "INSTALLED(*)";
+            }
         }
         return rsrc.getState().toString();
     }



Mime
View raw message