Removed passing incremental cache base dir via module script.

This commit is contained in:
Evgeny Gerashchenko
2014-08-19 17:34:36 +04:00
parent cda1be3fc7
commit 184ddbc9e1
15 changed files with 14 additions and 93 deletions
@@ -24,10 +24,8 @@ import java.util.Collections;
import java.util.List;
public class ModuleScriptData {
public static final ModuleScriptData EMPTY = new ModuleScriptData(Collections.<Module>emptyList(), null);
public static final ModuleScriptData EMPTY = new ModuleScriptData(Collections.<Module>emptyList());
@Nullable
private final String incrementalCacheDir;
@NotNull
private final List<Module> modules;
@@ -36,13 +34,7 @@ public class ModuleScriptData {
return modules;
}
@Nullable
public String getIncrementalCacheDir() {
return incrementalCacheDir;
}
public ModuleScriptData(@NotNull List<Module> modules, @Nullable String incrementalCacheDir) {
this.incrementalCacheDir = incrementalCacheDir;
public ModuleScriptData(@NotNull List<Module> modules) {
this.modules = modules;
}
}
@@ -43,7 +43,6 @@ public class ModuleXmlParser {
public static final String MODULE = "module";
public static final String NAME = "name";
public static final String OUTPUT_DIR = "outputDir";
public static final String INCREMENTAL_CACHE = "incrementalCache";
public static final String SOURCES = "sources";
public static final String PATH = "path";
public static final String CLASSPATH = "classpath";
@@ -70,7 +69,6 @@ public class ModuleXmlParser {
}
private final MessageCollector messageCollector;
private String incrementalCacheDir;
private final List<Module> modules = new SmartList<Module>();
private DefaultHandler currentState;
@@ -93,7 +91,7 @@ public class ModuleXmlParser {
return currentState;
}
});
return new ModuleScriptData(modules, incrementalCacheDir);
return new ModuleScriptData(modules);
}
catch (ParserConfigurationException e) {
MessageCollectorUtil.reportException(messageCollector, e);
@@ -114,7 +112,6 @@ public class ModuleXmlParser {
throw createError(qName);
}
incrementalCacheDir = attributes.getValue(INCREMENTAL_CACHE);
setCurrentState(insideModules);
}
};