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/06/23 16:32:55 UTC

svn commit: r1604819 - /sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/SelectionUtils.java

Author: rombert
Date: Mon Jun 23 14:32:55 2014
New Revision: 1604819

URL: http://svn.apache.org/r1604819
Log:
SLING-3687 - "The selected project is not configured with/added to any
Sling server" during Sling Import or Export

Support multiple facets by evaluating all possible modules

Contributed by: Konrad Windszus <ko...@netcentric.biz>

Modified:
    sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/SelectionUtils.java

Modified: sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/SelectionUtils.java
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/SelectionUtils.java?rev=1604819&r1=1604818&r2=1604819&view=diff
==============================================================================
--- sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/SelectionUtils.java (original)
+++ sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/SelectionUtils.java Mon Jun 23 14:32:55 2014
@@ -53,15 +53,13 @@ public abstract class SelectionUtils {
 		}
 		List<IServer> servers = new ArrayList<IServer>();
 
-        IModule module = ServerUtil.getModule(project);
-
-        if (module == null) {
-            return Collections.emptyList();
-        }
+        IModule[] modules = ServerUtil.getModules(project);
 
         for (IServer server : ServerCore.getServers()) {
-            if (ServerUtil.containsModule(server, module, monitor)) {
-                servers.add(server);
+            for (IModule module : modules) {
+                if (ServerUtil.containsModule(server, module, monitor)) {
+                    servers.add(server);
+                }
             }
         }