From d0c22414e1d9c259c2da09b81db76f55e07a38af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mans=20F=2EFranz=C3=A9n?= <manfr689@student.liu.se>
Date: Thu, 12 Sep 2019 15:13:38 +0200
Subject: [PATCH] Updated
---
Task_B/src/main/AdapterFactory.java | 18 ++++++++++++++++++
Task_B/src/main/Builder.java | 7 +++++++
Task_B/src/main/Main.java | 13 +++++--------
Task_B/src/main/XMLAdapter.java | 18 ++++++++++++++++++
Task_B/src/main/YAMLAdapter.java | 17 +++++++++++++++++
5 files changed, 65 insertions(+), 8 deletions(-)
create mode 100644 Task_B/src/main/AdapterFactory.java
create mode 100644 Task_B/src/main/Builder.java
create mode 100644 Task_B/src/main/XMLAdapter.java
create mode 100644 Task_B/src/main/YAMLAdapter.java
diff --git a/Task_B/src/main/AdapterFactory.java b/Task_B/src/main/AdapterFactory.java
new file mode 100644
index 0000000..f71b3c8
--- /dev/null
+++ b/Task_B/src/main/AdapterFactory.java
@@ -0,0 +1,18 @@
+package main;
+
+public class AdapterFactory {
+
+ public void buildTarget(String fileName, String target) {
+ Builder adapter;
+ if(fileName.equals("build.xml"))
+ adapter = new XMLAdapter();
+
+ else
+ adapter = new YAMLAdapter();
+
+ adapter.build(1, target);
+
+
+ }
+
+}
diff --git a/Task_B/src/main/Builder.java b/Task_B/src/main/Builder.java
new file mode 100644
index 0000000..7e0d9f5
--- /dev/null
+++ b/Task_B/src/main/Builder.java
@@ -0,0 +1,7 @@
+package main;
+
+public interface Builder {
+
+public void build(int debuglevel, String target);
+
+}
diff --git a/Task_B/src/main/Main.java b/Task_B/src/main/Main.java
index e67fc3c..c284c2e 100755
--- a/Task_B/src/main/Main.java
+++ b/Task_B/src/main/Main.java
@@ -10,13 +10,10 @@ import yaml.YamlBuildConfigurationReader;
public class Main {
public static void main(String[] args) {
- XMLBuildConfigurationReader buildConfigurationReader = new XMLBuildConfigurationReader("build.xml");
- final Project xmlProject = buildConfigurationReader.getProject();
- Build build = new Build(xmlProject);
- build.build(1, "dist");
- YamlBuildConfigurationReader yamlConfigReader = new YamlBuildConfigurationReader("build.yaml");
- final BuildConfig yamlBuildConfig = yamlConfigReader.getBuildConfig();
- Compile compile = new Compile(yamlBuildConfig, "dist");
- compile.build(1);
+ AdapterFactory factory = new AdapterFactory();
+
+ final String target = "dist";
+ factory.buildTarget("build.xml", target);
+ factory.buildTarget("build.yaml", target);
}
}
diff --git a/Task_B/src/main/XMLAdapter.java b/Task_B/src/main/XMLAdapter.java
new file mode 100644
index 0000000..dc2c67b
--- /dev/null
+++ b/Task_B/src/main/XMLAdapter.java
@@ -0,0 +1,18 @@
+package main;
+
+import domain.Project;
+import xml.Build;
+import xml.XMLBuildConfigurationReader;
+
+public class XMLAdapter implements Builder {
+
+ @Override
+ public void build(int debuglevel, String target) {
+ XMLBuildConfigurationReader buildConfigurationReader = new XMLBuildConfigurationReader("build.xml");
+ final Project xmlProject = buildConfigurationReader.getProject();
+ Build build = new Build(xmlProject);
+ build.build(debuglevel, target);
+
+ }
+
+}
diff --git a/Task_B/src/main/YAMLAdapter.java b/Task_B/src/main/YAMLAdapter.java
new file mode 100644
index 0000000..2aaf9fd
--- /dev/null
+++ b/Task_B/src/main/YAMLAdapter.java
@@ -0,0 +1,17 @@
+package main;
+
+import domain.BuildConfig;
+import yaml.Compile;
+import yaml.YamlBuildConfigurationReader;
+
+public class YAMLAdapter implements Builder {
+
+ @Override
+ public void build(int debuglevel, String target) {
+ YamlBuildConfigurationReader yamlConfigReader = new YamlBuildConfigurationReader("build.yaml");
+ final BuildConfig yamlBuildConfig = yamlConfigReader.getBuildConfig();
+ Compile compile = new Compile(yamlBuildConfig, target);
+ compile.build(debuglevel);
+ }
+
+}
--
GitLab