From 53f3268b8b8adc641684368a456256bf9f2ec436 Mon Sep 17 00:00:00 2001
From: Bastian Hoffmann <basho213@student.liu.se>
Date: Tue, 10 Sep 2019 17:30:33 +0200
Subject: [PATCH] Refactor Naming
---
...nfigReaderFactory.java => BuildConfigReaderFactory.java} | 6 +++---
Task_B/src/main/{MyBuildFactory.java => BuildFactory.java} | 6 +++---
Task_B/src/main/IBuild.java | 2 --
Task_B/src/main/Main.java | 4 ++--
Task_B/src/main/{MyXMLBuild.java => XMLBuildAdapter.java} | 4 ++--
...ldConfigReader.java => XMLBuildConfigReaderAdapter.java} | 4 ++--
Task_B/src/main/{MyYamlBuild.java => YamlBuildAdapter.java} | 4 ++--
...dConfigReader.java => YamlBuildConfigReaderAdapter.java} | 4 ++--
8 files changed, 16 insertions(+), 18 deletions(-)
rename Task_B/src/main/{MyBuildConfigReaderFactory.java => BuildConfigReaderFactory.java} (60%)
rename Task_B/src/main/{MyBuildFactory.java => BuildFactory.java} (66%)
rename Task_B/src/main/{MyXMLBuild.java => XMLBuildAdapter.java} (66%)
rename Task_B/src/main/{MyXMLBuildConfigReader.java => XMLBuildConfigReaderAdapter.java} (68%)
rename Task_B/src/main/{MyYamlBuild.java => YamlBuildAdapter.java} (62%)
rename Task_B/src/main/{MyYamlBuildConfigReader.java => YamlBuildConfigReaderAdapter.java} (62%)
diff --git a/Task_B/src/main/MyBuildConfigReaderFactory.java b/Task_B/src/main/BuildConfigReaderFactory.java
similarity index 60%
rename from Task_B/src/main/MyBuildConfigReaderFactory.java
rename to Task_B/src/main/BuildConfigReaderFactory.java
index 5dddcd8..0743b43 100644
--- a/Task_B/src/main/MyBuildConfigReaderFactory.java
+++ b/Task_B/src/main/BuildConfigReaderFactory.java
@@ -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;
diff --git a/Task_B/src/main/MyBuildFactory.java b/Task_B/src/main/BuildFactory.java
similarity index 66%
rename from Task_B/src/main/MyBuildFactory.java
rename to Task_B/src/main/BuildFactory.java
index 4d301e7..8c8855c 100644
--- a/Task_B/src/main/MyBuildFactory.java
+++ b/Task_B/src/main/BuildFactory.java
@@ -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;
diff --git a/Task_B/src/main/IBuild.java b/Task_B/src/main/IBuild.java
index 434f5f8..4da4f5d 100644
--- a/Task_B/src/main/IBuild.java
+++ b/Task_B/src/main/IBuild.java
@@ -1,7 +1,5 @@
package main;
-import domain.BuildConfig;
-
public interface IBuild {
public void build(int debuglevel);
}
diff --git a/Task_B/src/main/Main.java b/Task_B/src/main/Main.java
index 8e4c885..a866f8e 100755
--- a/Task_B/src/main/Main.java
+++ b/Task_B/src/main/Main.java
@@ -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);
}
diff --git a/Task_B/src/main/MyXMLBuild.java b/Task_B/src/main/XMLBuildAdapter.java
similarity index 66%
rename from Task_B/src/main/MyXMLBuild.java
rename to Task_B/src/main/XMLBuildAdapter.java
index 8d094a5..43aab2a 100644
--- a/Task_B/src/main/MyXMLBuild.java
+++ b/Task_B/src/main/XMLBuildAdapter.java
@@ -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;
}
diff --git a/Task_B/src/main/MyXMLBuildConfigReader.java b/Task_B/src/main/XMLBuildConfigReaderAdapter.java
similarity index 68%
rename from Task_B/src/main/MyXMLBuildConfigReader.java
rename to Task_B/src/main/XMLBuildConfigReaderAdapter.java
index 4aad5be..7767285 100644
--- a/Task_B/src/main/MyXMLBuildConfigReader.java
+++ b/Task_B/src/main/XMLBuildConfigReaderAdapter.java
@@ -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;
}
diff --git a/Task_B/src/main/MyYamlBuild.java b/Task_B/src/main/YamlBuildAdapter.java
similarity index 62%
rename from Task_B/src/main/MyYamlBuild.java
rename to Task_B/src/main/YamlBuildAdapter.java
index 7e1027b..6791b86 100644
--- a/Task_B/src/main/MyYamlBuild.java
+++ b/Task_B/src/main/YamlBuildAdapter.java
@@ -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;
}
diff --git a/Task_B/src/main/MyYamlBuildConfigReader.java b/Task_B/src/main/YamlBuildConfigReaderAdapter.java
similarity index 62%
rename from Task_B/src/main/MyYamlBuildConfigReader.java
rename to Task_B/src/main/YamlBuildConfigReaderAdapter.java
index 9e4d4fd..638bf58 100644
--- a/Task_B/src/main/MyYamlBuildConfigReader.java
+++ b/Task_B/src/main/YamlBuildConfigReaderAdapter.java
@@ -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;
}
--
GitLab