Commit a9de67d7 authored by Alexander David Hellwig's avatar Alexander David Hellwig
Browse files

Fix visibility of CompilationGenerator methods

parent 50e0b10e
...@@ -35,27 +35,27 @@ public class BashCompilationGenerator extends CompilationGenerator { ...@@ -35,27 +35,27 @@ public class BashCompilationGenerator extends CompilationGenerator {
} }
@Override @Override
public String getPathTemplate() { protected String getPathTemplate() {
return PATH_TEMPLATE; return PATH_TEMPLATE;
} }
@Override @Override
public String getCheckExeTemplate() { protected String getCheckExeTemplate() {
return CHECK_EXE_TEMPLATE; return CHECK_EXE_TEMPLATE;
} }
@Override @Override
public String getSourceEnvVarsTemplate() { protected String getSourceEnvVarsTemplate() {
return SOURCE_ENV_VARS_TEMPLATE; return SOURCE_ENV_VARS_TEMPLATE;
} }
@Override @Override
public String getScriptTemplate() { protected String getScriptTemplate() {
return TemplateHelper.getCompilationBashTemplate(); return TemplateHelper.getCompilationBashTemplate();
} }
@Override @Override
public List<String> getAdditionalPathDirs() { protected List<String> getAdditionalPathDirs() {
return Arrays.asList("cmake","make"); return Arrays.asList("cmake","make");
} }
......
...@@ -20,15 +20,15 @@ public abstract class CompilationGenerator { ...@@ -20,15 +20,15 @@ public abstract class CompilationGenerator {
return (supportsRos() || !useRos()) && (supportsRos2() || !useRos2()); return (supportsRos() || !useRos()) && (supportsRos2() || !useRos2());
} }
public abstract String getPathTemplate(); protected abstract String getPathTemplate();
public abstract String getCheckExeTemplate(); protected abstract String getCheckExeTemplate();
public abstract String getSourceEnvVarsTemplate(); protected abstract String getSourceEnvVarsTemplate();
public abstract String getScriptTemplate(); protected abstract String getScriptTemplate();
public abstract List<String> getAdditionalPathDirs(); protected abstract List<String> getAdditionalPathDirs();
protected abstract String getFileName(); protected abstract String getFileName();
......
...@@ -14,12 +14,12 @@ public class MingwCompilationGenerator extends WindowsCompilationGenerator { ...@@ -14,12 +14,12 @@ public class MingwCompilationGenerator extends WindowsCompilationGenerator {
} }
@Override @Override
public String getScriptTemplate() { protected String getScriptTemplate() {
return TemplateHelper.getCompilationMingwTemplate(); return TemplateHelper.getCompilationMingwTemplate();
} }
@Override @Override
public List<String> getAdditionalPathDirs() { protected List<String> getAdditionalPathDirs() {
return Arrays.asList("cmake","make","g++"); return Arrays.asList("cmake","make","g++");
} }
......
...@@ -13,12 +13,12 @@ public class MsbuildCompilationGenerator extends WindowsCompilationGenerator { ...@@ -13,12 +13,12 @@ public class MsbuildCompilationGenerator extends WindowsCompilationGenerator {
} }
@Override @Override
public String getScriptTemplate() { protected String getScriptTemplate() {
return TemplateHelper.getCompilationMsbuildTemplate(); return TemplateHelper.getCompilationMsbuildTemplate();
} }
@Override @Override
public List<String> getAdditionalPathDirs() { protected List<String> getAdditionalPathDirs() {
return Arrays.asList("cmake","msbuild"); return Arrays.asList("cmake","msbuild");
} }
......
...@@ -20,17 +20,17 @@ public abstract class WindowsCompilationGenerator extends CompilationGenerator { ...@@ -20,17 +20,17 @@ public abstract class WindowsCompilationGenerator extends CompilationGenerator {
private String SOURCE_ENV_VARS_TEMPLATE = "call <env_file>"; private String SOURCE_ENV_VARS_TEMPLATE = "call <env_file>";
@Override @Override
public String getPathTemplate() { protected String getPathTemplate() {
return PATH_TEMPLATE; return PATH_TEMPLATE;
} }
@Override @Override
public String getCheckExeTemplate() { protected String getCheckExeTemplate() {
return CHECK_EXE_TEMPLATE; return CHECK_EXE_TEMPLATE;
} }
@Override @Override
public String getSourceEnvVarsTemplate() { protected String getSourceEnvVarsTemplate() {
return SOURCE_ENV_VARS_TEMPLATE; return SOURCE_ENV_VARS_TEMPLATE;
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment