Made includes/excludes more explicit

spring-xd-dirt/src/main/java/org/springframework/xd/dirt/server/options/FromResourceLocationOptionHandler.java

@@ -19,7 +19,6 @@
 import java.io.IOException;
 import java.util.Arrays;
 import java.util.HashSet;
-import java.util.List;
 import java.util.Set;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -50,13 +49,13 @@ public class FromResourceLocationOptionHandler extends OptionHandler<String> {
 
 	private Set<String> possibleValues = new HashSet<String>();
 
-	private List<String> excluded;
+	private Set<String> excluded = new HashSet<String>();
 
 	protected FromResourceLocationOptionHandler(CmdLineParser parser, OptionDef option, Setter<String> setter,
-			String glob, String... excluded)
+			String glob)
 			throws IOException {
 		super(parser, option, setter);
-		init(glob, excluded);
+		init(glob);
 	}
 
 	@Override
@@ -101,9 +100,15 @@ private void init(String glob, String... excludes) throws IOException {
 			possibleValues.add(matcher.group(1));
 		}
 
-		excluded = Arrays.asList(excludes);
+	}
+
+	protected void exclude(String... excludes) {
+		excluded.addAll(Arrays.asList(excludes));
 		possibleValues.removeAll(excluded);
 	}
 
+	protected void include(String... includes) {
+		possibleValues.addAll(Arrays.asList(includes));
+	}
 
 }

spring-xd-dirt/src/main/java/org/springframework/xd/dirt/server/options/FromResourceLocationOptionHandlers.java

@@ -43,8 +43,7 @@ public static class DistributedControlTransportOptionHandler extends FromResourc
 
 		public DistributedControlTransportOptionHandler(CmdLineParser parser, OptionDef option, Setter<String> setter)
 				throws IOException {
-			super(parser, option, setter, "classpath*:/META-INF/spring-xd/transports/*-admin.xml",
-					SINGLE_NODE_SPECIAL_CONTROL_TRANSPORT);
+			super(parser, option, setter, "classpath*:/META-INF/spring-xd/transports/*-admin.xml");
 		}
 
 	}
@@ -57,6 +56,7 @@ public static class SingleNodeControlTransportOptionHandler extends FromResource
 		public SingleNodeControlTransportOptionHandler(CmdLineParser parser, OptionDef option, Setter<String> setter)
 				throws IOException {
 			super(parser, option, setter, "classpath*:/META-INF/spring-xd/transports/*-admin.xml");
+			include(SINGLE_NODE_SPECIAL_CONTROL_TRANSPORT);
 		}
 
 	}
@@ -68,7 +68,8 @@ public static class DistributedDataTransportOptionHandler extends FromResourceLo
 
 		public DistributedDataTransportOptionHandler(CmdLineParser parser, OptionDef option, Setter<String> setter)
 				throws IOException {
-			super(parser, option, setter, "classpath*:/META-INF/spring-xd/transports/*-bus.xml", "local");
+			super(parser, option, setter, "classpath*:/META-INF/spring-xd/transports/*-bus.xml");
+			exclude("local");
 		}
 
 	}
@@ -104,7 +105,8 @@ public static class DistributedAnalyticsOptionHandler extends FromResourceLocati
 
 		public DistributedAnalyticsOptionHandler(CmdLineParser parser, OptionDef option, Setter<String> setter)
 				throws IOException {
-			super(parser, option, setter, "classpath*:/META-INF/spring-xd/analytics/*-analytics.xml", "memory");
+			super(parser, option, setter, "classpath*:/META-INF/spring-xd/analytics/*-analytics.xml");
+			exclude("memory");
 		}
 
 	}