diff --git a/src/main/java/ru/volkov/springcourse/ClassicalMusic.java b/src/main/java/ru/volkov/springcourse/ClassicalMusic.java index bbf7fee..a50139c 100644 --- a/src/main/java/ru/volkov/springcourse/ClassicalMusic.java +++ b/src/main/java/ru/volkov/springcourse/ClassicalMusic.java @@ -1,6 +1,14 @@ package ru.volkov.springcourse; public class ClassicalMusic implements Music { + + public void doMyInit() { + System.out.println("Doing my initialization"); + } + + public void doMyDestroy() { + System.out.println("Doing my destruction"); + } @Override public String getSong() { return "ClassicalMusic"; diff --git a/src/main/java/ru/volkov/springcourse/MusicPlayer.java b/src/main/java/ru/volkov/springcourse/MusicPlayer.java index 9eebc41..f9dcb93 100644 --- a/src/main/java/ru/volkov/springcourse/MusicPlayer.java +++ b/src/main/java/ru/volkov/springcourse/MusicPlayer.java @@ -4,11 +4,7 @@ import java.util.List; public class MusicPlayer { - private List musicList = new ArrayList() {{ - add(new ClassicalMusic()); - add(new JasMusic()); - add(new RockMusic()); - }}; + private List musicList = new ArrayList(); private String name; private int volume; diff --git a/src/main/java/ru/volkov/springcourse/TestSpring.java b/src/main/java/ru/volkov/springcourse/TestSpring.java index 6be6222..61d005f 100644 --- a/src/main/java/ru/volkov/springcourse/TestSpring.java +++ b/src/main/java/ru/volkov/springcourse/TestSpring.java @@ -13,11 +13,14 @@ public static void main(String args[]) { //Music musicJas = context.getBean("musicBeanJas", Music.class); // MusicPlayer musicPlayer = context.getBean("musicPlayer", MusicPlayer.class); - - // musicPlayer.playMusic(); - MusicPlayer ms = new MusicPlayer(); - ms.playMusic(); - + //musicPlayer.playMusic(); + + ClassicalMusic classicalMusic = context.getBean("musicBeanClassic", ClassicalMusic.class); + ClassicalMusic classicalMusic1 = context.getBean("musicBeanClassic", ClassicalMusic.class); + ClassicalMusic classicalMusic2 = context.getBean("musicBeanClassic", ClassicalMusic.class); + System.out.println(classicalMusic.getSong()); + System.out.println(classicalMusic1.getSong()); + System.out.println(classicalMusic2.getSong()); context.close(); } diff --git a/src/main/resources/applicationContext.xml b/src/main/resources/applicationContext.xml index ee104d6..0eee3eb 100644 --- a/src/main/resources/applicationContext.xml +++ b/src/main/resources/applicationContext.xml @@ -10,8 +10,10 @@ - + + - + diff --git a/target/classes/applicationContext.xml b/target/classes/applicationContext.xml index ee104d6..0eee3eb 100644 --- a/target/classes/applicationContext.xml +++ b/target/classes/applicationContext.xml @@ -10,8 +10,10 @@ - + + - + diff --git a/target/classes/ru/volkov/springcourse/ClassicalMusic.class b/target/classes/ru/volkov/springcourse/ClassicalMusic.class index 5737e38..ce6081f 100644 Binary files a/target/classes/ru/volkov/springcourse/ClassicalMusic.class and b/target/classes/ru/volkov/springcourse/ClassicalMusic.class differ diff --git a/target/classes/ru/volkov/springcourse/MusicPlayer$1.class b/target/classes/ru/volkov/springcourse/MusicPlayer$1.class deleted file mode 100644 index 4f773a0..0000000 Binary files a/target/classes/ru/volkov/springcourse/MusicPlayer$1.class and /dev/null differ diff --git a/target/classes/ru/volkov/springcourse/MusicPlayer.class b/target/classes/ru/volkov/springcourse/MusicPlayer.class index 6ad1e2f..48bfe9b 100644 Binary files a/target/classes/ru/volkov/springcourse/MusicPlayer.class and b/target/classes/ru/volkov/springcourse/MusicPlayer.class differ diff --git a/target/classes/ru/volkov/springcourse/TestSpring.class b/target/classes/ru/volkov/springcourse/TestSpring.class index cd45614..8a7c98e 100644 Binary files a/target/classes/ru/volkov/springcourse/TestSpring.class and b/target/classes/ru/volkov/springcourse/TestSpring.class differ