Skip to content
Snippets Groups Projects
Commit 53f3268b authored by Bastian Hoffmann's avatar Bastian Hoffmann
Browse files

Refactor Naming

parent 6849c968
No related branches found
No related tags found
No related merge requests found
......@@ -3,16 +3,16 @@ package main;
import xml.XMLBuildConfigurationReader;
import yaml.YamlBuildConfigurationReader;
public class MyBuildConfigReaderFactory implements IBuildConfigReaderFactory {
public class BuildConfigReaderFactory implements IBuildConfigReaderFactory {
@Override
public IBuildConfigReader createBuildConfigReader(String buildFileName) {
String fileNameExtension = buildFileName.substring(buildFileName.lastIndexOf("."));
if (fileNameExtension.equals(".yaml")) {
return new MyYamlBuildConfigReader(new YamlBuildConfigurationReader(buildFileName));
return new YamlBuildConfigReaderAdapter(new YamlBuildConfigurationReader(buildFileName));
} else if (fileNameExtension.equals(".xml")) {
return new MyXMLBuildConfigReader(new XMLBuildConfigurationReader(buildFileName));
return new XMLBuildConfigReaderAdapter(new XMLBuildConfigurationReader(buildFileName));
} else {
return null;
......
......@@ -4,16 +4,16 @@ import domain.BuildConfig;
import xml.Build;
import yaml.Compile;
public class MyBuildFactory implements IBuildFactory {
public class BuildFactory implements IBuildFactory {
@Override
public IBuild createBuild(String buildFileName, BuildConfig buildConfig, String targetName) {
String fileNameExtension = buildFileName.substring(buildFileName.lastIndexOf("."));
if (fileNameExtension.equals(".yaml")) {
return new MyYamlBuild(new Compile(buildConfig, targetName));
return new YamlBuildAdapter(new Compile(buildConfig, targetName));
} else if (fileNameExtension.equals(".xml")) {
return new MyXMLBuild(new Build(buildConfig.getProject()), targetName);
return new XMLBuildAdapter(new Build(buildConfig.getProject()), targetName);
} else {
return null;
......
package main;
import domain.BuildConfig;
public interface IBuild {
public void build(int debuglevel);
}
......@@ -26,10 +26,10 @@ public class Main {
}
private static void buildTarget(String buildFileName, String target) {
MyBuildConfigReaderFactory buildConfigReaderFactory = new MyBuildConfigReaderFactory();
BuildConfigReaderFactory buildConfigReaderFactory = new BuildConfigReaderFactory();
IBuildConfigReader buildConfigReader = buildConfigReaderFactory.createBuildConfigReader(buildFileName);
BuildConfig buildConfig = buildConfigReader.getBuildConfig();
MyBuildFactory builderFactory = new MyBuildFactory();
BuildFactory builderFactory = new BuildFactory();
IBuild build = builderFactory.createBuild(buildFileName, buildConfig, target);
build.build(1);
}
......
......@@ -2,12 +2,12 @@ package main;
import xml.Build;
public class MyXMLBuild implements IBuild {
public class XMLBuildAdapter implements IBuild {
Build adaptee;
String targetName;
public MyXMLBuild(Build xmlBuild, String targetName) {
public XMLBuildAdapter(Build xmlBuild, String targetName) {
adaptee = xmlBuild;
this.targetName = targetName;
}
......
......@@ -3,11 +3,11 @@ package main;
import domain.BuildConfig;
import xml.XMLBuildConfigurationReader;
public class MyXMLBuildConfigReader implements IBuildConfigReader {
public class XMLBuildConfigReaderAdapter implements IBuildConfigReader {
private XMLBuildConfigurationReader adaptee;
public MyXMLBuildConfigReader(XMLBuildConfigurationReader buildConfigReader) {
public XMLBuildConfigReaderAdapter(XMLBuildConfigurationReader buildConfigReader) {
adaptee = buildConfigReader;
}
......
......@@ -2,11 +2,11 @@ package main;
import yaml.Compile;
public class MyYamlBuild implements IBuild {
public class YamlBuildAdapter implements IBuild {
Compile adaptee;
public MyYamlBuild(Compile yamlCompile) {
public YamlBuildAdapter(Compile yamlCompile) {
adaptee = yamlCompile;
}
......
......@@ -3,11 +3,11 @@ package main;
import domain.BuildConfig;
import yaml.YamlBuildConfigurationReader;
public class MyYamlBuildConfigReader implements IBuildConfigReader {
public class YamlBuildConfigReaderAdapter implements IBuildConfigReader {
private YamlBuildConfigurationReader adaptee;
public MyYamlBuildConfigReader(YamlBuildConfigurationReader buildConfigReader) {
public YamlBuildConfigReaderAdapter(YamlBuildConfigurationReader buildConfigReader) {
adaptee = buildConfigReader;
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment