diff --git a/WEB-INF/web.xml b/WEB-INF/web.xml
deleted file mode 100644
index 28fc779..0000000
--- a/WEB-INF/web.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
-
-
diff --git a/src/main/java/proto/Customer.java b/src/main/java/proto/Customer.java
index f14c727..b18e399 100644
--- a/src/main/java/proto/Customer.java
+++ b/src/main/java/proto/Customer.java
@@ -1,11 +1,11 @@
package proto;
public class Customer {
- public String company;
public String address;
+ public Company office;
- public Customer(String company, String address) {
- this.company = company;
+ public Customer(String address, Company office) {
this.address = address;
+ this.office = office;
}
}
diff --git a/src/main/java/proto/Main.java b/src/main/java/proto/Main.java
index 95c17d6..f322f2a 100644
--- a/src/main/java/proto/Main.java
+++ b/src/main/java/proto/Main.java
@@ -2,7 +2,12 @@
public class Main {
public static void main(String[] args) {
-
+ Root root = new Root();
+ System.out.println(Root.companies);
+ System.out.println(Root.customers.get("A").office.address);
+ System.out.println(Root.customers.get("B").office.address);
+ Root.companies.get("C1").address = "Osaka";
+ System.out.println(Root.customers.get("A").office.address);
}
}
diff --git a/src/main/java/proto/Root.java b/src/main/java/proto/Root.java
new file mode 100644
index 0000000..b4c80d4
--- /dev/null
+++ b/src/main/java/proto/Root.java
@@ -0,0 +1,20 @@
+package proto;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class Root {
+ static Map companies = new HashMap<>();
+ static Map customers = new HashMap<>();
+
+ public Root() {
+ companies.put("C1", new Company("Tokyo"));
+ companies.put("C2", new Company("Osaka"));
+ customers.put("A", new Customer("Tokyo",companies.get("C1")));
+ customers.put("B", new Customer("Tokyo",companies.get("C2")));
+ }
+
+ public void Channel1() {
+
+ }
+}
diff --git a/src/main/java/proto/System.java b/src/main/java/proto/System.java
deleted file mode 100644
index e069368..0000000
--- a/src/main/java/proto/System.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package proto;
-
-import java.util.HashMap;
-import java.util.Map;
-
-public class System {
- static Map companies = new HashMap<>();
- static Map customers = new HashMap<>();
-}