Pair Module is now done.

src/builder/java/speiger/src/builder/PrimitiveCollectionsBuilder.java

@@ -253,8 +253,8 @@ public class PrimitiveCollectionsBuilder extends TemplateProcessor
 			boolean force = flags.contains("force");
 			boolean tests = flags.contains("tests");
 			boolean forceTests =  flags.contains("force-tests");
-			boolean load = flags.contains("load");
-			boolean save = !flags.contains("save");
+			boolean load = !flags.contains("load");
+			boolean save = flags.contains("save");
 			int flag = (load ? LOAD : 0) | (save ? SAVE : 0);
             new PrimitiveCollectionsBuilder(silent).setFlags(flag).process(force);
             if(tests) {

src/builder/java/speiger/src/builder/modules/PairModule.java

@@ -1,5 +1,11 @@
 package speiger.src.builder.modules;
 
+import java.util.Arrays;
+import java.util.Set;
+import java.util.TreeSet;
+
+import speiger.src.builder.ClassType;
+
 @SuppressWarnings("javadoc")
 public class PairModule extends BaseModule
 {
@@ -11,17 +17,28 @@ public class PairModule extends BaseModule
 	@Override
 	protected void loadVariables() {}
 	@Override
-	protected void loadBlockades() {}
-	@Override
-	protected void loadFlags() {}
-	@Override
 	protected void loadFunctions() {}
 	@Override
 	protected void loadTestClasses() {}
+	@Override
+	public Set<String> getModuleKeys(ClassType keyType, ClassType valueType) { return new TreeSet<>(Arrays.asList("Mutable", "Immutable")); }
 	
 	@Override
-	protected void loadRemappers()
-	{
+	protected void loadFlags() {
+		if(isModuleEnabled()) addFlag("PAIR_MODULE");
+		if(isModuleEnabled("Mutable")) addFlag("MUTABLE_PAIR");
+		if(isModuleEnabled("Immutable")) addFlag("IMMUTABLE_PAIR");
+	}
+	
+	@Override
+	protected void loadBlockades() {
+		if(!isModuleEnabled()) addBlockedFiles("Pair");
+		if(!isModuleEnabled("Mutable")) addBlockedFiles("MutablePair");
+		if(!isModuleEnabled("Immutable")) addBlockedFiles("ImmutablePair");
+	}
+	
+	@Override
+	protected void loadRemappers() {
 		//Main Classes
 		addBiRequirement("Pair", "");
 		addBiRequirement("MutablePair", "");
@@ -32,8 +49,7 @@ public class PairModule extends BaseModule
 	}
 	
 	@Override
-	protected void loadClasses()
-	{
+	protected void loadClasses() {
 		//Implementations
 		addBiClassMapper("IMMUTABLE_PAIR", "ImmutablePair", "");
 		addBiClassMapper("MUTABLE_PAIR", "MutablePair", "");