#108 Consistent package naming throughout the examples

This commit is contained in:
Ilkka Seppala committed 2015-07-24 11:32:22 +03:00
1 parent af92d8dde5
commit 3d488ec15a
128 files changed
+963 -873

No files matched your search

+53 -30
View File
@@ -1,8 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<class-diagram version="1.1.8" icons="true" automaticImage="PNG" always-add-relationships="false" generalizations="true" <class-diagram version="1.1.8" icons="true" automaticImage="PNG" always-add-relationships="false" generalizations="true"
realizations="true" associations="true" dependencies="false" nesting-relationships="true"> realizations="true" associations="true" dependencies="false" nesting-relationships="true">
<class id="1" language="java" name="com.iluwatar.BusinessDelegate" project="business-delegate" <class id="1" language="java" name="com.iluwatar.business.delegate.BusinessDelegate" project="business-delegate"
file="/business-delegate/src/main/java/com/iluwatar/BusinessDelegate.java" binary="false" corner="BOTTOM_RIGHT"> file="/business-delegate/src/main/java/com/iluwatar/business/delegate/BusinessDelegate.java" binary="false"
corner="BOTTOM_RIGHT">
<position height="-1" width="-1" x="272" y="219"/> <position height="-1" width="-1" x="272" y="219"/>
<display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true"
sort-features="false" accessors="true" visibility="true"> sort-features="false" accessors="true" visibility="true">
@@ -10,8 +11,9 @@
<operations public="true" package="true" protected="true" private="true" static="true"/> <operations public="true" package="true" protected="true" private="true" static="true"/>
</display> </display>
</class> </class>
<class id="2" language="java" name="com.iluwatar.Client" project="business-delegate" <class id="2" language="java" name="com.iluwatar.business.delegate.Client" project="business-delegate"
file="/business-delegate/src/main/java/com/iluwatar/Client.java" binary="false" corner="BOTTOM_RIGHT"> file="/business-delegate/src/main/java/com/iluwatar/business/delegate/Client.java" binary="false"
corner="BOTTOM_RIGHT">
<position height="-1" width="-1" x="272" y="64"/> <position height="-1" width="-1" x="272" y="64"/>
<display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true"
sort-features="false" accessors="true" visibility="true"> sort-features="false" accessors="true" visibility="true">
@@ -19,8 +21,9 @@
<operations public="true" package="true" protected="true" private="true" static="true"/> <operations public="true" package="true" protected="true" private="true" static="true"/>
</display> </display>
</class> </class>
<enumeration id="3" language="java" name="com.iluwatar.ServiceType" project="business-delegate" <enumeration id="3" language="java" name="com.iluwatar.business.delegate.ServiceType" project="business-delegate"
file="/business-delegate/src/main/java/com/iluwatar/ServiceType.java" binary="false" corner="BOTTOM_RIGHT"> file="/business-delegate/src/main/java/com/iluwatar/business/delegate/ServiceType.java" binary="false"
corner="BOTTOM_RIGHT">
<position height="-1" width="-1" x="89" y="383"/> <position height="-1" width="-1" x="89" y="383"/>
<display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true"
sort-features="false" accessors="true" visibility="true"> sort-features="false" accessors="true" visibility="true">
@@ -28,8 +31,9 @@
<operations public="true" package="true" protected="true" private="true" static="true"/> <operations public="true" package="true" protected="true" private="true" static="true"/>
</display> </display>
</enumeration> </enumeration>
<interface id="4" language="java" name="com.iluwatar.BusinessService" project="business-delegate" <interface id="4" language="java" name="com.iluwatar.business.delegate.BusinessService" project="business-delegate"
file="/business-delegate/src/main/java/com/iluwatar/BusinessService.java" binary="false" corner="BOTTOM_RIGHT"> file="/business-delegate/src/main/java/com/iluwatar/business/delegate/BusinessService.java" binary="false"
corner="BOTTOM_RIGHT">
<position height="-1" width="-1" x="630" y="365"/> <position height="-1" width="-1" x="630" y="365"/>
<display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true"
sort-features="false" accessors="true" visibility="true"> sort-features="false" accessors="true" visibility="true">
@@ -37,8 +41,9 @@
<operations public="true" package="true" protected="true" private="true" static="true"/> <operations public="true" package="true" protected="true" private="true" static="true"/>
</display> </display>
</interface> </interface>
<class id="5" language="java" name="com.iluwatar.JmsService" project="business-delegate" <class id="5" language="java" name="com.iluwatar.business.delegate.JmsService" project="business-delegate"
file="/business-delegate/src/main/java/com/iluwatar/JmsService.java" binary="false" corner="BOTTOM_RIGHT"> file="/business-delegate/src/main/java/com/iluwatar/business/delegate/JmsService.java" binary="false"
corner="BOTTOM_RIGHT">
<position height="-1" width="-1" x="489" y="210"/> <position height="-1" width="-1" x="489" y="210"/>
<display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true"
sort-features="false" accessors="true" visibility="true"> sort-features="false" accessors="true" visibility="true">
@@ -46,8 +51,9 @@
<operations public="true" package="true" protected="true" private="true" static="true"/> <operations public="true" package="true" protected="true" private="true" static="true"/>
</display> </display>
</class> </class>
<class id="6" language="java" name="com.iluwatar.BusinessLookup" project="business-delegate" <class id="6" language="java" name="com.iluwatar.business.delegate.BusinessLookup" project="business-delegate"
file="/business-delegate/src/main/java/com/iluwatar/BusinessLookup.java" binary="false" corner="BOTTOM_RIGHT"> file="/business-delegate/src/main/java/com/iluwatar/business/delegate/BusinessLookup.java" binary="false"
corner="BOTTOM_RIGHT">
<position height="-1" width="-1" x="360" y="399"/> <position height="-1" width="-1" x="360" y="399"/>
<display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true"
sort-features="false" accessors="true" visibility="true"> sort-features="false" accessors="true" visibility="true">
@@ -55,8 +61,9 @@
<operations public="true" package="true" protected="true" private="true" static="true"/> <operations public="true" package="true" protected="true" private="true" static="true"/>
</display> </display>
</class> </class>
<class id="7" language="java" name="com.iluwatar.EjbService" project="business-delegate" <class id="7" language="java" name="com.iluwatar.business.delegate.EjbService" project="business-delegate"
file="/business-delegate/src/main/java/com/iluwatar/EjbService.java" binary="false" corner="BOTTOM_RIGHT"> file="/business-delegate/src/main/java/com/iluwatar/business/delegate/EjbService.java" binary="false"
corner="BOTTOM_RIGHT">
<position height="-1" width="-1" x="668" y="210"/> <position height="-1" width="-1" x="668" y="210"/>
<display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true"
sort-features="false" accessors="true" visibility="true"> sort-features="false" accessors="true" visibility="true">
@@ -68,40 +75,56 @@
<end type="SOURCE" refId="7"/> <end type="SOURCE" refId="7"/>
<end type="TARGET" refId="4"/> <end type="TARGET" refId="4"/>
</realization> </realization>
<realization id="9"> <association id="9">
<end type="SOURCE" refId="5"/>
<end type="TARGET" refId="4"/>
</realization>
<association id="10">
<end type="SOURCE" refId="1" navigable="false"> <end type="SOURCE" refId="1" navigable="false">
<attribute id="11" name="lookupService"/> <attribute id="10" name="lookupService">
<multiplicity id="12" minimum="0" maximum="1"/> <position height="0" width="0" x="0" y="0"/>
</attribute>
<multiplicity id="11" minimum="0" maximum="1">
<position height="0" width="0" x="0" y="0"/>
</multiplicity>
</end> </end>
<end type="TARGET" refId="6" navigable="true"/> <end type="TARGET" refId="6" navigable="true"/>
<display labels="true" multiplicity="true"/> <display labels="true" multiplicity="true"/>
</association> </association>
<association id="13"> <association id="12">
<end type="SOURCE" refId="1" navigable="false"> <end type="SOURCE" refId="1" navigable="false">
<attribute id="14" name="businessService"/> <attribute id="13" name="serviceType">
<multiplicity id="15" minimum="0" maximum="1"/> <position height="0" width="0" x="0" y="0"/>
</attribute>
<multiplicity id="14" minimum="0" maximum="1">
<position height="0" width="0" x="0" y="0"/>
</multiplicity>
</end> </end>
<end type="TARGET" refId="4" navigable="true"/> <end type="TARGET" refId="3" navigable="true"/>
<display labels="true" multiplicity="true"/> <display labels="true" multiplicity="true"/>
</association> </association>
<realization id="15">
<end type="SOURCE" refId="5"/>
<end type="TARGET" refId="4"/>
</realization>
<association id="16"> <association id="16">
<end type="SOURCE" refId="2" navigable="false"> <end type="SOURCE" refId="2" navigable="false">
<attribute id="17" name="businessDelegate"/> <attribute id="17" name="businessDelegate">
<multiplicity id="18" minimum="0" maximum="1"/> <position height="0" width="0" x="0" y="0"/>
</attribute>
<multiplicity id="18" minimum="0" maximum="1">
<position height="0" width="0" x="0" y="0"/>
</multiplicity>
</end> </end>
<end type="TARGET" refId="1" navigable="true"/> <end type="TARGET" refId="1" navigable="true"/>
<display labels="true" multiplicity="true"/> <display labels="true" multiplicity="true"/>
</association> </association>
<association id="19"> <association id="19">
<end type="SOURCE" refId="1" navigable="false"> <end type="SOURCE" refId="1" navigable="false">
<attribute id="20" name="serviceType"/> <attribute id="20" name="businessService">
<multiplicity id="21" minimum="0" maximum="1"/> <position height="0" width="0" x="0" y="0"/>
</attribute>
<multiplicity id="21" minimum="0" maximum="1">
<position height="0" width="0" x="0" y="0"/>
</multiplicity>
</end> </end>
<end type="TARGET" refId="3" navigable="true"/> <end type="TARGET" refId="4" navigable="true"/>
<display labels="true" multiplicity="true"/> <display labels="true" multiplicity="true"/>
</association> </association>
<classifier-display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" <classifier-display autosize="true" stereotype="true" package="true" initial-value="false" signature="true"
@@ -1,4 +1,4 @@
package com.iluwatar; package com.iluwatar.business.delegate;
/** /**
* *
@@ -1,4 +1,4 @@
package com.iluwatar; package com.iluwatar.business.delegate;
/** /**
* *
@@ -1,4 +1,4 @@
package com.iluwatar; package com.iluwatar.business.delegate;
/** /**
* *
@@ -1,4 +1,4 @@
package com.iluwatar; package com.iluwatar.business.delegate;
/** /**
* *
@@ -1,4 +1,4 @@
package com.iluwatar; package com.iluwatar.business.delegate;
/** /**
* *
@@ -1,4 +1,4 @@
package com.iluwatar; package com.iluwatar.business.delegate;
/** /**
* *
@@ -1,4 +1,4 @@
package com.iluwatar; package com.iluwatar.business.delegate;
/** /**
* *
@@ -1,4 +1,4 @@
package com.iluwatar; package com.iluwatar.business.delegate;
/** /**
* *
@@ -1,14 +1,14 @@
package com.iluwatar.objectpool; package com.iluwatar.business.delegate;
import org.junit.Test; import org.junit.Test;
import com.iluwatar.objectpool.App; import com.iluwatar.business.delegate.App;
public class AppTest { public class AppTest {
@Test @Test
public void test() { public void test() {
String[] args = {}; String[] args = {};
App.main(args); App.main(args);
} }
} }
@@ -1,4 +1,4 @@
package com.iluwatar.dependencyinjection; package com.iluwatar.dependency.injection;
/** /**
* *
@@ -1,4 +1,4 @@
package com.iluwatar.dependencyinjection; package com.iluwatar.dependency.injection;
import com.google.inject.Guice; import com.google.inject.Guice;
import com.google.inject.Injector; import com.google.inject.Injector;
@@ -1,4 +1,4 @@
package com.iluwatar.dependencyinjection; package com.iluwatar.dependency.injection;
import javax.inject.Inject; import javax.inject.Inject;
@@ -1,4 +1,4 @@
package com.iluwatar.dependencyinjection; package com.iluwatar.dependency.injection;
/** /**
* *
@@ -1,4 +1,4 @@
package com.iluwatar.dependencyinjection; package com.iluwatar.dependency.injection;
/** /**
* *
@@ -1,4 +1,4 @@
package com.iluwatar.dependencyinjection; package com.iluwatar.dependency.injection;
/** /**
* *
@@ -1,4 +1,4 @@
package com.iluwatar.dependencyinjection; package com.iluwatar.dependency.injection;
/** /**
* *
@@ -1,4 +1,4 @@
package com.iluwatar.dependencyinjection; package com.iluwatar.dependency.injection;
/** /**
* *
@@ -1,4 +1,4 @@
package com.iluwatar.dependencyinjection; package com.iluwatar.dependency.injection;
import com.google.inject.AbstractModule; import com.google.inject.AbstractModule;
@@ -1,4 +1,4 @@
package com.iluwatar.dependencyinjection; package com.iluwatar.dependency.injection;
/** /**
* *
@@ -1,8 +1,8 @@
package com.iluwatar.dependencyinjection; package com.iluwatar.dependency.injection;
import org.junit.Test; import org.junit.Test;
import com.iluwatar.dependencyinjection.App; import com.iluwatar.dependency.injection.App;
public class AppTest { public class AppTest {
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<class-diagram version="1.1.8" icons="true" automaticImage="PNG" always-add-relationships="false" generalizations="true" <class-diagram version="1.1.8" icons="true" automaticImage="PNG" always-add-relationships="false" generalizations="true"
realizations="true" associations="true" dependencies="false" nesting-relationships="true"> realizations="true" associations="true" dependencies="false" nesting-relationships="true">
<class id="1" language="java" name="com.iluwatar.doublecheckedlocking.Item" project="double-checked-locking" <class id="1" language="java" name="com.iluwatar.doublechecked.locking.Item" project="double-checked-locking"
file="/double-checked-locking/src/main/java/com/iluwatar/doublecheckedlocking/Item.java" binary="false" file="/double-checked-locking/src/main/java/com/iluwatar/doublechecked/locking/Item.java" binary="false"
corner="BOTTOM_RIGHT"> corner="BOTTOM_RIGHT">
<position height="124" width="205" x="146" y="504"/> <position height="124" width="205" x="146" y="504"/>
<display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true"
@@ -11,8 +11,8 @@
<operations public="true" package="true" protected="true" private="true" static="true"/> <operations public="true" package="true" protected="true" private="true" static="true"/>
</display> </display>
</class> </class>
<class id="2" language="java" name="com.iluwatar.doublecheckedlocking.Inventory" project="double-checked-locking" <class id="2" language="java" name="com.iluwatar.doublechecked.locking.Inventory" project="double-checked-locking"
file="/double-checked-locking/src/main/java/com/iluwatar/doublecheckedlocking/Inventory.java" binary="false" file="/double-checked-locking/src/main/java/com/iluwatar/doublechecked/locking/Inventory.java" binary="false"
corner="BOTTOM_RIGHT"> corner="BOTTOM_RIGHT">
<position height="142" width="205" x="146" y="322"/> <position height="142" width="205" x="146" y="322"/>
<display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true"
@@ -23,8 +23,12 @@
</class> </class>
<association id="3"> <association id="3">
<end type="SOURCE" refId="2" navigable="false"> <end type="SOURCE" refId="2" navigable="false">
<attribute id="4" name="items"/> <attribute id="4" name="items">
<multiplicity id="5" minimum="0" maximum="2147483647"/> <position height="0" width="0" x="0" y="0"/>
</attribute>
<multiplicity id="5" minimum="0" maximum="2147483647">
<position height="0" width="0" x="0" y="0"/>
</multiplicity>
</end> </end>
<end type="TARGET" refId="1" navigable="true"/> <end type="TARGET" refId="1" navigable="true"/>
<display labels="true" multiplicity="true"/> <display labels="true" multiplicity="true"/>
@@ -1,4 +1,4 @@
package com.iluwatar.doublecheckedlocking; package com.iluwatar.doublechecked.locking;
import java.util.concurrent.ExecutorService; import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors; import java.util.concurrent.Executors;
@@ -1,4 +1,4 @@
package com.iluwatar.doublecheckedlocking; package com.iluwatar.doublechecked.locking;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@@ -1,4 +1,4 @@
package com.iluwatar.doublecheckedlocking; package com.iluwatar.doublechecked.locking;
public class Item { public class Item {
String name; String name;
@@ -1,14 +1,14 @@
package com.iluwatar.factorymethod; package com.iluwatar.doublechecked.locking;
import org.junit.Test; import org.junit.Test;
import com.iluwatar.factorymethod.App; import com.iluwatar.doublechecked.locking.App;
public class AppTest { public class AppTest {
@Test @Test
public void test() { public void test() {
String[] args = {}; String[] args = {};
App.main(args); App.main(args);
} }
} }
@@ -1,14 +0,0 @@
package com.iluwatar.doublecheckedlocking;
import org.junit.Test;
import com.iluwatar.doublecheckedlocking.App;
public class AppTest {
@Test
public void test() {
String[] args = {};
App.main(args);
}
}
@@ -1,35 +1,35 @@
package com.iluwatar.eventaggregator; package com.iluwatar.event.aggregator;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
/** /**
* *
* The Event Aggregator pattern channels events from multiple objects * The Event Aggregator pattern channels events from multiple objects
* into a single object to simplify registration for clients. * into a single object to simplify registration for clients.
* *
* In the example LordBaelish, LordVarys and Scout deliver events to * In the example LordBaelish, LordVarys and Scout deliver events to
* KingsHand. KingsHand, the event aggregator, then delivers the events * KingsHand. KingsHand, the event aggregator, then delivers the events
* to KingJoffrey. * to KingJoffrey.
* *
*/ */
public class App { public class App {
public static void main(String[] args) { public static void main(String[] args) {
KingJoffrey kingJoffrey = new KingJoffrey(); KingJoffrey kingJoffrey = new KingJoffrey();
KingsHand kingsHand = new KingsHand(kingJoffrey); KingsHand kingsHand = new KingsHand(kingJoffrey);
List<EventEmitter> emitters = new ArrayList<>(); List<EventEmitter> emitters = new ArrayList<>();
emitters.add(kingsHand); emitters.add(kingsHand);
emitters.add(new LordBaelish(kingsHand)); emitters.add(new LordBaelish(kingsHand));
emitters.add(new LordVarys(kingsHand)); emitters.add(new LordVarys(kingsHand));
emitters.add(new Scout(kingsHand)); emitters.add(new Scout(kingsHand));
for (Weekday day: Weekday.values()) { for (Weekday day: Weekday.values()) {
for (EventEmitter emitter: emitters) { for (EventEmitter emitter: emitters) {
emitter.timePasses(day); emitter.timePasses(day);
} }
} }
} }
} }
@@ -1,21 +1,21 @@
package com.iluwatar.eventaggregator; package com.iluwatar.event.aggregator;
/** /**
* *
* Event enumeration. * Event enumeration.
* *
*/ */
public enum Event { public enum Event {
STARK_SIGHTED("Stark sighted"), WARSHIPS_APPROACHING("Warships approaching"), TRAITOR_DETECTED("Traitor detected"); STARK_SIGHTED("Stark sighted"), WARSHIPS_APPROACHING("Warships approaching"), TRAITOR_DETECTED("Traitor detected");
private String description; private String description;
Event(String description) { Event(String description) {
this.description = description; this.description = description;
} }
public String toString() { public String toString() {
return description; return description;
} }
} }
@@ -1,35 +1,35 @@
package com.iluwatar.eventaggregator; package com.iluwatar.event.aggregator;
import java.util.LinkedList; import java.util.LinkedList;
import java.util.List; import java.util.List;
/** /**
* *
* EventEmitter is the base class for event producers that can be observed. * EventEmitter is the base class for event producers that can be observed.
* *
*/ */
public abstract class EventEmitter { public abstract class EventEmitter {
private List<EventObserver> observers; private List<EventObserver> observers;
public EventEmitter() { public EventEmitter() {
observers = new LinkedList<>(); observers = new LinkedList<>();
} }
public EventEmitter(EventObserver obs) { public EventEmitter(EventObserver obs) {
this(); this();
registerObserver(obs); registerObserver(obs);
} }
public void registerObserver(EventObserver obs) { public void registerObserver(EventObserver obs) {
observers.add(obs); observers.add(obs);
} }
protected void notifyObservers(Event e) { protected void notifyObservers(Event e) {
for (EventObserver obs: observers) { for (EventObserver obs: observers) {
obs.onEvent(e); obs.onEvent(e);
} }
} }
public abstract void timePasses(Weekday day); public abstract void timePasses(Weekday day);
} }
@@ -1,12 +1,12 @@
package com.iluwatar.eventaggregator; package com.iluwatar.event.aggregator;
/** /**
* *
* Observers of events implement this interface. * Observers of events implement this interface.
* *
*/ */
public interface EventObserver { public interface EventObserver {
void onEvent(Event e); void onEvent(Event e);
} }
@@ -1,14 +1,14 @@
package com.iluwatar.eventaggregator; package com.iluwatar.event.aggregator;
/** /**
* *
* KingJoffrey observes events from KingsHand. * KingJoffrey observes events from KingsHand.
* *
*/ */
public class KingJoffrey implements EventObserver { public class KingJoffrey implements EventObserver {
@Override @Override
public void onEvent(Event e) { public void onEvent(Event e) {
System.out.println("Received event from the King's Hand: " + e.toString()); System.out.println("Received event from the King's Hand: " + e.toString());
} }
} }
@@ -1,28 +1,28 @@
package com.iluwatar.eventaggregator; package com.iluwatar.event.aggregator;
/** /**
* *
* KingsHand observes events from multiple sources and delivers them * KingsHand observes events from multiple sources and delivers them
* to listeners. * to listeners.
* *
*/ */
public class KingsHand extends EventEmitter implements EventObserver { public class KingsHand extends EventEmitter implements EventObserver {
public KingsHand() { public KingsHand() {
super(); super();
} }
public KingsHand(EventObserver obs) { public KingsHand(EventObserver obs) {
super(obs); super(obs);
} }
@Override @Override
public void onEvent(Event e) { public void onEvent(Event e) {
notifyObservers(e); notifyObservers(e);
} }
@Override @Override
public void timePasses(Weekday day) { public void timePasses(Weekday day) {
// NOP // NOP
} }
} }
@@ -1,24 +1,24 @@
package com.iluwatar.eventaggregator; package com.iluwatar.event.aggregator;
/** /**
* *
* LordBaelish produces events. * LordBaelish produces events.
* *
*/ */
public class LordBaelish extends EventEmitter { public class LordBaelish extends EventEmitter {
public LordBaelish() { public LordBaelish() {
super(); super();
} }
public LordBaelish(EventObserver obs) { public LordBaelish(EventObserver obs) {
super(obs); super(obs);
} }
@Override @Override
public void timePasses(Weekday day) { public void timePasses(Weekday day) {
if (day.equals(Weekday.FRIDAY)) { if (day.equals(Weekday.FRIDAY)) {
notifyObservers(Event.STARK_SIGHTED); notifyObservers(Event.STARK_SIGHTED);
} }
} }
} }
@@ -1,24 +1,24 @@
package com.iluwatar.eventaggregator; package com.iluwatar.event.aggregator;
/** /**
* *
* LordVarys produces events. * LordVarys produces events.
* *
*/ */
public class LordVarys extends EventEmitter { public class LordVarys extends EventEmitter {
public LordVarys() { public LordVarys() {
super(); super();
} }
public LordVarys(EventObserver obs) { public LordVarys(EventObserver obs) {
super(obs); super(obs);
} }
@Override @Override
public void timePasses(Weekday day) { public void timePasses(Weekday day) {
if (day.equals(Weekday.SATURDAY)) { if (day.equals(Weekday.SATURDAY)) {
notifyObservers(Event.TRAITOR_DETECTED); notifyObservers(Event.TRAITOR_DETECTED);
} }
} }
} }
@@ -1,24 +1,24 @@
package com.iluwatar.eventaggregator; package com.iluwatar.event.aggregator;
/** /**
* *
* Scout produces events. * Scout produces events.
* *
*/ */
public class Scout extends EventEmitter { public class Scout extends EventEmitter {
public Scout() { public Scout() {
super(); super();
} }
public Scout(EventObserver obs) { public Scout(EventObserver obs) {
super(obs); super(obs);
} }
@Override @Override
public void timePasses(Weekday day) { public void timePasses(Weekday day) {
if (day.equals(Weekday.TUESDAY)) { if (day.equals(Weekday.TUESDAY)) {
notifyObservers(Event.WARSHIPS_APPROACHING); notifyObservers(Event.WARSHIPS_APPROACHING);
} }
} }
} }
@@ -1,16 +1,16 @@
package com.iluwatar.eventaggregator; package com.iluwatar.event.aggregator;
public enum Weekday { public enum Weekday {
MONDAY("Monday"), TUESDAY("Tuesday"), WEDNESDAY("Wednesday"), THURSDAY("Thursday"), FRIDAY("Friday"), SATURDAY("Saturday"), SUNDAY("Sunday"); MONDAY("Monday"), TUESDAY("Tuesday"), WEDNESDAY("Wednesday"), THURSDAY("Thursday"), FRIDAY("Friday"), SATURDAY("Saturday"), SUNDAY("Sunday");
private String description; private String description;
Weekday(String description) { Weekday(String description) {
this.description = description; this.description = description;
} }
public String toString() { public String toString() {
return description; return description;
} }
} }
@@ -0,0 +1,13 @@
package com.iluwatar.event.aggregator;
import org.junit.Test;
import com.iluwatar.event.aggregator.App;
public class AppTest {
@Test
public void test() {
String[] args = {};
App.main(args);
}
}
@@ -1,13 +0,0 @@
package com.iluwatar.eventaggregator;
import org.junit.Test;
import com.iluwatar.eventaggregator.App;
public class AppTest {
@Test
public void test() {
String[] args = {};
App.main(args);
}
}
@@ -1,4 +1,4 @@
package com.iluwatar.executearound; package com.iluwatar.execute.around;
import java.io.FileWriter; import java.io.FileWriter;
import java.io.IOException; import java.io.IOException;
@@ -1,4 +1,4 @@
package com.iluwatar.executearound; package com.iluwatar.execute.around;
import java.io.FileWriter; import java.io.FileWriter;
import java.io.IOException; import java.io.IOException;
@@ -1,4 +1,4 @@
package com.iluwatar.executearound; package com.iluwatar.execute.around;
import java.io.FileWriter; import java.io.FileWriter;
import java.io.IOException; import java.io.IOException;
@@ -1,4 +1,4 @@
package com.iluwatar.executearound; package com.iluwatar.execute.around;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
@@ -7,7 +7,7 @@ import org.junit.After;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import com.iluwatar.executearound.App; import com.iluwatar.execute.around.App;
/** /**
* *
+46 -36
View File
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<class-diagram version="1.1.8" icons="true" automaticImage="PNG" always-add-relationships="false" generalizations="true" <class-diagram version="1.1.8" icons="true" automaticImage="PNG" always-add-relationships="false" generalizations="true"
realizations="true" associations="true" dependencies="false" nesting-relationships="true"> realizations="true" associations="true" dependencies="false" nesting-relationships="true">
<class id="1" language="java" name="com.iluwatar.factorymethod.OrcBlacksmith" project="factory-method" <class id="1" language="java" name="com.iluwatar.factory.method.OrcBlacksmith" project="factory-method"
file="/factory-method/src/main/java/com/iluwatar/factorymethod/OrcBlacksmith.java" binary="false" file="/factory-method/src/main/java/com/iluwatar/factory/method/OrcBlacksmith.java" binary="false"
corner="BOTTOM_RIGHT"> corner="BOTTOM_RIGHT">
<position height="106" width="280" x="-46" y="239"/> <position height="106" width="280" x="-46" y="239"/>
<display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true"
@@ -11,8 +11,9 @@
<operations public="true" package="true" protected="true" private="true" static="true"/> <operations public="true" package="true" protected="true" private="true" static="true"/>
</display> </display>
</class> </class>
<interface id="2" language="java" name="com.iluwatar.factorymethod.Blacksmith" project="factory-method" <interface id="2" language="java" name="com.iluwatar.factory.method.Blacksmith" project="factory-method"
file="/factory-method/src/main/java/com/iluwatar/factorymethod/Blacksmith.java" binary="false" corner="BOTTOM_RIGHT"> file="/factory-method/src/main/java/com/iluwatar/factory/method/Blacksmith.java" binary="false"
corner="BOTTOM_RIGHT">
<position height="88" width="280" x="114" y="385"/> <position height="88" width="280" x="114" y="385"/>
<display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true"
sort-features="false" accessors="true" visibility="true"> sort-features="false" accessors="true" visibility="true">
@@ -20,8 +21,9 @@
<operations public="true" package="true" protected="true" private="true" static="true"/> <operations public="true" package="true" protected="true" private="true" static="true"/>
</display> </display>
</interface> </interface>
<enumeration id="3" language="java" name="com.iluwatar.factorymethod.WeaponType" project="factory-method" <enumeration id="3" language="java" name="com.iluwatar.factory.method.WeaponType" project="factory-method"
file="/factory-method/src/main/java/com/iluwatar/factorymethod/WeaponType.java" binary="false" corner="BOTTOM_RIGHT"> file="/factory-method/src/main/java/com/iluwatar/factory/method/WeaponType.java" binary="false"
corner="BOTTOM_RIGHT">
<position height="196" width="210" x="793" y="385"/> <position height="196" width="210" x="793" y="385"/>
<display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true"
sort-features="false" accessors="true" visibility="true"> sort-features="false" accessors="true" visibility="true">
@@ -29,8 +31,8 @@
<operations public="true" package="true" protected="true" private="true" static="true"/> <operations public="true" package="true" protected="true" private="true" static="true"/>
</display> </display>
</enumeration> </enumeration>
<class id="4" language="java" name="com.iluwatar.factorymethod.OrcWeapon" project="factory-method" <class id="4" language="java" name="com.iluwatar.factory.method.OrcWeapon" project="factory-method"
file="/factory-method/src/main/java/com/iluwatar/factorymethod/OrcWeapon.java" binary="false" corner="BOTTOM_RIGHT"> file="/factory-method/src/main/java/com/iluwatar/factory/method/OrcWeapon.java" binary="false" corner="BOTTOM_RIGHT">
<position height="106" width="178" x="806" y="239"/> <position height="106" width="178" x="806" y="239"/>
<display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true"
sort-features="false" accessors="true" visibility="true"> sort-features="false" accessors="true" visibility="true">
@@ -38,8 +40,8 @@
<operations public="true" package="true" protected="true" private="true" static="true"/> <operations public="true" package="true" protected="true" private="true" static="true"/>
</display> </display>
</class> </class>
<class id="5" language="java" name="com.iluwatar.factorymethod.ElfWeapon" project="factory-method" <class id="5" language="java" name="com.iluwatar.factory.method.ElfWeapon" project="factory-method"
file="/factory-method/src/main/java/com/iluwatar/factorymethod/ElfWeapon.java" binary="false" corner="BOTTOM_RIGHT"> file="/factory-method/src/main/java/com/iluwatar/factory/method/ElfWeapon.java" binary="false" corner="BOTTOM_RIGHT">
<position height="106" width="172" x="594" y="239"/> <position height="106" width="172" x="594" y="239"/>
<display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true"
sort-features="false" accessors="true" visibility="true"> sort-features="false" accessors="true" visibility="true">
@@ -47,8 +49,8 @@
<operations public="true" package="true" protected="true" private="true" static="true"/> <operations public="true" package="true" protected="true" private="true" static="true"/>
</display> </display>
</class> </class>
<interface id="6" language="java" name="com.iluwatar.factorymethod.Weapon" project="factory-method" <interface id="6" language="java" name="com.iluwatar.factory.method.Weapon" project="factory-method"
file="/factory-method/src/main/java/com/iluwatar/factorymethod/Weapon.java" binary="false" corner="BOTTOM_RIGHT"> file="/factory-method/src/main/java/com/iluwatar/factory/method/Weapon.java" binary="false" corner="BOTTOM_RIGHT">
<position height="70" width="159" x="594" y="385"/> <position height="70" width="159" x="594" y="385"/>
<display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true"
sort-features="false" accessors="true" visibility="true"> sort-features="false" accessors="true" visibility="true">
@@ -56,8 +58,8 @@
<operations public="true" package="true" protected="true" private="true" static="true"/> <operations public="true" package="true" protected="true" private="true" static="true"/>
</display> </display>
</interface> </interface>
<class id="7" language="java" name="com.iluwatar.factorymethod.ElfBlacksmith" project="factory-method" <class id="7" language="java" name="com.iluwatar.factory.method.ElfBlacksmith" project="factory-method"
file="/factory-method/src/main/java/com/iluwatar/factorymethod/ElfBlacksmith.java" binary="false" file="/factory-method/src/main/java/com/iluwatar/factory/method/ElfBlacksmith.java" binary="false"
corner="BOTTOM_RIGHT"> corner="BOTTOM_RIGHT">
<position height="106" width="280" x="274" y="239"/> <position height="106" width="280" x="274" y="239"/>
<display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true"
@@ -67,37 +69,45 @@
</display> </display>
</class> </class>
<realization id="8"> <realization id="8">
<end type="SOURCE" refId="5"/>
<end type="TARGET" refId="6"/>
</realization>
<realization id="9">
<end type="SOURCE" refId="1"/>
<end type="TARGET" refId="2"/>
</realization>
<association id="10">
<end type="SOURCE" refId="4" navigable="false">
<attribute id="11" name="weaponType"/>
<multiplicity id="12" minimum="0" maximum="1"/>
</end>
<end type="TARGET" refId="3" navigable="true"/>
<display labels="true" multiplicity="true"/>
</association>
<realization id="13">
<end type="SOURCE" refId="4"/> <end type="SOURCE" refId="4"/>
<end type="TARGET" refId="6"/> <end type="TARGET" refId="6"/>
</realization> </realization>
<association id="14"> <realization id="9">
<end type="SOURCE" refId="5" navigable="false"> <end type="SOURCE" refId="7"/>
<attribute id="15" name="weaponType"/> <end type="TARGET" refId="2"/>
<multiplicity id="16" minimum="0" maximum="1"/> </realization>
<realization id="10">
<end type="SOURCE" refId="5"/>
<end type="TARGET" refId="6"/>
</realization>
<association id="11">
<end type="SOURCE" refId="4" navigable="false">
<attribute id="12" name="weaponType">
<position height="0" width="0" x="0" y="0"/>
</attribute>
<multiplicity id="13" minimum="0" maximum="1">
<position height="0" width="0" x="0" y="0"/>
</multiplicity>
</end> </end>
<end type="TARGET" refId="3" navigable="true"/> <end type="TARGET" refId="3" navigable="true"/>
<display labels="true" multiplicity="true"/> <display labels="true" multiplicity="true"/>
</association> </association>
<realization id="17"> <realization id="14">
<end type="SOURCE" refId="7"/> <end type="SOURCE" refId="1"/>
<end type="TARGET" refId="2"/> <end type="TARGET" refId="2"/>
</realization> </realization>
<association id="15">
<end type="SOURCE" refId="5" navigable="false">
<attribute id="16" name="weaponType">
<position height="0" width="0" x="0" y="0"/>
</attribute>
<multiplicity id="17" minimum="0" maximum="1">
<position height="0" width="0" x="0" y="0"/>
</multiplicity>
</end>
<end type="TARGET" refId="3" navigable="true"/>
<display labels="true" multiplicity="true"/>
</association>
<classifier-display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" <classifier-display autosize="true" stereotype="true" package="true" initial-value="false" signature="true"
sort-features="false" accessors="true" visibility="true"> sort-features="false" accessors="true" visibility="true">
<attributes public="true" package="true" protected="true" private="true" static="true"/> <attributes public="true" package="true" protected="true" private="true" static="true"/>
@@ -1,28 +1,28 @@
package com.iluwatar.factorymethod; package com.iluwatar.factory.method;
/** /**
* *
* In Factory Method we have an interface (Blacksmith) with a method for * In Factory Method we have an interface (Blacksmith) with a method for
* creating objects (manufactureWeapon). The concrete subclasses (OrcBlacksmith, * creating objects (manufactureWeapon). The concrete subclasses (OrcBlacksmith,
* ElfBlacksmith) then override the method to produce objects of their liking. * ElfBlacksmith) then override the method to produce objects of their liking.
* *
*/ */
public class App { public class App {
public static void main(String[] args) { public static void main(String[] args) {
Blacksmith blacksmith; Blacksmith blacksmith;
Weapon weapon; Weapon weapon;
blacksmith = new OrcBlacksmith(); blacksmith = new OrcBlacksmith();
weapon = blacksmith.manufactureWeapon(WeaponType.SPEAR); weapon = blacksmith.manufactureWeapon(WeaponType.SPEAR);
System.out.println(weapon); System.out.println(weapon);
weapon = blacksmith.manufactureWeapon(WeaponType.AXE); weapon = blacksmith.manufactureWeapon(WeaponType.AXE);
System.out.println(weapon); System.out.println(weapon);
blacksmith = new ElfBlacksmith(); blacksmith = new ElfBlacksmith();
weapon = blacksmith.manufactureWeapon(WeaponType.SHORT_SWORD); weapon = blacksmith.manufactureWeapon(WeaponType.SHORT_SWORD);
System.out.println(weapon); System.out.println(weapon);
weapon = blacksmith.manufactureWeapon(WeaponType.SPEAR); weapon = blacksmith.manufactureWeapon(WeaponType.SPEAR);
System.out.println(weapon); System.out.println(weapon);
} }
} }
@@ -1,12 +1,12 @@
package com.iluwatar.factorymethod; package com.iluwatar.factory.method;
/** /**
* *
* The interface containing method for producing objects. * The interface containing method for producing objects.
* *
*/ */
public interface Blacksmith { public interface Blacksmith {
Weapon manufactureWeapon(WeaponType weaponType); Weapon manufactureWeapon(WeaponType weaponType);
} }
@@ -1,14 +1,14 @@
package com.iluwatar.factorymethod; package com.iluwatar.factory.method;
/** /**
* *
* Concrete subclass for creating new objects. * Concrete subclass for creating new objects.
* *
*/ */
public class ElfBlacksmith implements Blacksmith { public class ElfBlacksmith implements Blacksmith {
public Weapon manufactureWeapon(WeaponType weaponType) { public Weapon manufactureWeapon(WeaponType weaponType) {
return new ElfWeapon(weaponType); return new ElfWeapon(weaponType);
} }
} }
@@ -1,16 +1,16 @@
package com.iluwatar.factorymethod; package com.iluwatar.factory.method;
public class ElfWeapon implements Weapon { public class ElfWeapon implements Weapon {
private WeaponType weaponType; private WeaponType weaponType;
public ElfWeapon(WeaponType weaponType) { public ElfWeapon(WeaponType weaponType) {
this.weaponType = weaponType; this.weaponType = weaponType;
} }
@Override @Override
public String toString() { public String toString() {
return "Elven " + weaponType; return "Elven " + weaponType;
} }
} }
@@ -1,14 +1,14 @@
package com.iluwatar.factorymethod; package com.iluwatar.factory.method;
/** /**
* *
* Concrete subclass for creating new objects. * Concrete subclass for creating new objects.
* *
*/ */
public class OrcBlacksmith implements Blacksmith { public class OrcBlacksmith implements Blacksmith {
public Weapon manufactureWeapon(WeaponType weaponType) { public Weapon manufactureWeapon(WeaponType weaponType) {
return new OrcWeapon(weaponType); return new OrcWeapon(weaponType);
} }
} }
@@ -1,16 +1,16 @@
package com.iluwatar.factorymethod; package com.iluwatar.factory.method;
public class OrcWeapon implements Weapon { public class OrcWeapon implements Weapon {
private WeaponType weaponType; private WeaponType weaponType;
public OrcWeapon(WeaponType weaponType) { public OrcWeapon(WeaponType weaponType) {
this.weaponType = weaponType; this.weaponType = weaponType;
} }
@Override @Override
public String toString() { public String toString() {
return "Orcish " + weaponType; return "Orcish " + weaponType;
} }
} }
@@ -0,0 +1,5 @@
package com.iluwatar.factory.method;
public interface Weapon {
}
@@ -1,17 +1,17 @@
package com.iluwatar.factorymethod; package com.iluwatar.factory.method;
public enum WeaponType { public enum WeaponType {
SHORT_SWORD("short sword"), SPEAR("spear"), AXE("axe"), UNDEFINED(""); SHORT_SWORD("short sword"), SPEAR("spear"), AXE("axe"), UNDEFINED("");
private String title; private String title;
WeaponType(String title) { WeaponType(String title) {
this.title = title; this.title = title;
} }
@Override @Override
public String toString() { public String toString() {
return title; return title;
} }
} }
@@ -1,5 +0,0 @@
package com.iluwatar.factorymethod;
public interface Weapon {
}
@@ -1,7 +1,9 @@
package com.iluwatar.interceptingfilter; package com.iluwatar.factory.method;
import org.junit.Test; import org.junit.Test;
import com.iluwatar.factory.method.App;
public class AppTest { public class AppTest {
@Test @Test
+46 -38
View File
@@ -1,8 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<class-diagram version="1.1.8" icons="true" automaticImage="PNG" always-add-relationships="false" generalizations="true" <class-diagram version="1.1.8" icons="true" automaticImage="PNG" always-add-relationships="false" generalizations="true"
realizations="true" associations="true" dependencies="false" nesting-relationships="true"> realizations="true" associations="true" dependencies="false" nesting-relationships="true">
<class id="1" language="java" name="com.iluwatar.ArcherCommand" project="front-controller" <class id="1" language="java" name="com.iluwatar.front.controller.ArcherCommand" project="front-controller"
file="/front-controller/src/main/java/com/iluwatar/ArcherCommand.java" binary="false" corner="BOTTOM_RIGHT"> file="/front-controller/src/main/java/com/iluwatar/front/controller/ArcherCommand.java" binary="false"
corner="BOTTOM_RIGHT">
<position height="-1" width="-1" x="748" y="378"/> <position height="-1" width="-1" x="748" y="378"/>
<display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true"
sort-features="false" accessors="true" visibility="true"> sort-features="false" accessors="true" visibility="true">
@@ -10,8 +11,9 @@
<operations public="true" package="true" protected="true" private="true" static="true"/> <operations public="true" package="true" protected="true" private="true" static="true"/>
</display> </display>
</class> </class>
<class id="2" language="java" name="com.iluwatar.CatapultView" project="front-controller" <class id="2" language="java" name="com.iluwatar.front.controller.CatapultView" project="front-controller"
file="/front-controller/src/main/java/com/iluwatar/CatapultView.java" binary="false" corner="BOTTOM_RIGHT"> file="/front-controller/src/main/java/com/iluwatar/front/controller/CatapultView.java" binary="false"
corner="BOTTOM_RIGHT">
<position height="-1" width="-1" x="545" y="201"/> <position height="-1" width="-1" x="545" y="201"/>
<display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true"
sort-features="false" accessors="true" visibility="true"> sort-features="false" accessors="true" visibility="true">
@@ -19,8 +21,9 @@
<operations public="true" package="true" protected="true" private="true" static="true"/> <operations public="true" package="true" protected="true" private="true" static="true"/>
</display> </display>
</class> </class>
<class id="3" language="java" name="com.iluwatar.ArcherView" project="front-controller" <class id="3" language="java" name="com.iluwatar.front.controller.ArcherView" project="front-controller"
file="/front-controller/src/main/java/com/iluwatar/ArcherView.java" binary="false" corner="BOTTOM_RIGHT"> file="/front-controller/src/main/java/com/iluwatar/front/controller/ArcherView.java" binary="false"
corner="BOTTOM_RIGHT">
<position height="-1" width="-1" x="748" y="201"/> <position height="-1" width="-1" x="748" y="201"/>
<display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true"
sort-features="false" accessors="true" visibility="true"> sort-features="false" accessors="true" visibility="true">
@@ -28,8 +31,9 @@
<operations public="true" package="true" protected="true" private="true" static="true"/> <operations public="true" package="true" protected="true" private="true" static="true"/>
</display> </display>
</class> </class>
<class id="4" language="java" name="com.iluwatar.UnknownCommand" project="front-controller" <class id="4" language="java" name="com.iluwatar.front.controller.UnknownCommand" project="front-controller"
file="/front-controller/src/main/java/com/iluwatar/UnknownCommand.java" binary="false" corner="BOTTOM_RIGHT"> file="/front-controller/src/main/java/com/iluwatar/front/controller/UnknownCommand.java" binary="false"
corner="BOTTOM_RIGHT">
<position height="-1" width="-1" x="365" y="378"/> <position height="-1" width="-1" x="365" y="378"/>
<display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true"
sort-features="false" accessors="true" visibility="true"> sort-features="false" accessors="true" visibility="true">
@@ -37,8 +41,9 @@
<operations public="true" package="true" protected="true" private="true" static="true"/> <operations public="true" package="true" protected="true" private="true" static="true"/>
</display> </display>
</class> </class>
<class id="5" language="java" name="com.iluwatar.CatapultCommand" project="front-controller" <class id="5" language="java" name="com.iluwatar.front.controller.CatapultCommand" project="front-controller"
file="/front-controller/src/main/java/com/iluwatar/CatapultCommand.java" binary="false" corner="BOTTOM_RIGHT"> file="/front-controller/src/main/java/com/iluwatar/front/controller/CatapultCommand.java" binary="false"
corner="BOTTOM_RIGHT">
<position height="-1" width="-1" x="544" y="378"/> <position height="-1" width="-1" x="544" y="378"/>
<display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true"
sort-features="false" accessors="true" visibility="true"> sort-features="false" accessors="true" visibility="true">
@@ -46,8 +51,9 @@
<operations public="true" package="true" protected="true" private="true" static="true"/> <operations public="true" package="true" protected="true" private="true" static="true"/>
</display> </display>
</class> </class>
<interface id="6" language="java" name="com.iluwatar.Command" project="front-controller" <interface id="6" language="java" name="com.iluwatar.front.controller.Command" project="front-controller"
file="/front-controller/src/main/java/com/iluwatar/Command.java" binary="false" corner="BOTTOM_RIGHT"> file="/front-controller/src/main/java/com/iluwatar/front/controller/Command.java" binary="false"
corner="BOTTOM_RIGHT">
<position height="-1" width="-1" x="545" y="551"/> <position height="-1" width="-1" x="545" y="551"/>
<display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true"
sort-features="false" accessors="true" visibility="true"> sort-features="false" accessors="true" visibility="true">
@@ -55,8 +61,9 @@
<operations public="true" package="true" protected="true" private="true" static="true"/> <operations public="true" package="true" protected="true" private="true" static="true"/>
</display> </display>
</interface> </interface>
<class id="7" language="java" name="com.iluwatar.FrontController" project="front-controller" <class id="7" language="java" name="com.iluwatar.front.controller.FrontController" project="front-controller"
file="/front-controller/src/main/java/com/iluwatar/FrontController.java" binary="false" corner="BOTTOM_RIGHT"> file="/front-controller/src/main/java/com/iluwatar/front/controller/FrontController.java" binary="false"
corner="BOTTOM_RIGHT">
<position height="-1" width="-1" x="137" y="378"/> <position height="-1" width="-1" x="137" y="378"/>
<display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true"
sort-features="false" accessors="true" visibility="true"> sort-features="false" accessors="true" visibility="true">
@@ -64,8 +71,8 @@
<operations public="true" package="true" protected="true" private="true" static="true"/> <operations public="true" package="true" protected="true" private="true" static="true"/>
</display> </display>
</class> </class>
<interface id="8" language="java" name="com.iluwatar.View" project="front-controller" <interface id="8" language="java" name="com.iluwatar.front.controller.View" project="front-controller"
file="/front-controller/src/main/java/com/iluwatar/View.java" binary="false" corner="BOTTOM_RIGHT"> file="/front-controller/src/main/java/com/iluwatar/front/controller/View.java" binary="false" corner="BOTTOM_RIGHT">
<position height="-1" width="-1" x="545" y="66"/> <position height="-1" width="-1" x="545" y="66"/>
<display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true"
sort-features="false" accessors="true" visibility="true"> sort-features="false" accessors="true" visibility="true">
@@ -73,8 +80,9 @@
<operations public="true" package="true" protected="true" private="true" static="true"/> <operations public="true" package="true" protected="true" private="true" static="true"/>
</display> </display>
</interface> </interface>
<class id="9" language="java" name="com.iluwatar.ErrorView" project="front-controller" <class id="9" language="java" name="com.iluwatar.front.controller.ErrorView" project="front-controller"
file="/front-controller/src/main/java/com/iluwatar/ErrorView.java" binary="false" corner="BOTTOM_RIGHT"> file="/front-controller/src/main/java/com/iluwatar/front/controller/ErrorView.java" binary="false"
corner="BOTTOM_RIGHT">
<position height="-1" width="-1" x="365" y="201"/> <position height="-1" width="-1" x="365" y="201"/>
<display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true"
sort-features="false" accessors="true" visibility="true"> sort-features="false" accessors="true" visibility="true">
@@ -83,48 +91,48 @@
</display> </display>
</class> </class>
<dependency id="10"> <dependency id="10">
<end type="SOURCE" refId="1"/> <end type="SOURCE" refId="5"/>
<end type="TARGET" refId="3"/> <end type="TARGET" refId="2"/>
</dependency> </dependency>
<realization id="11"> <realization id="11">
<end type="SOURCE" refId="4"/> <end type="SOURCE" refId="2"/>
<end type="TARGET" refId="6"/> <end type="TARGET" refId="8"/>
</realization> </realization>
<realization id="12"> <realization id="12">
<end type="SOURCE" refId="1"/> <end type="SOURCE" refId="1"/>
<end type="TARGET" refId="6"/> <end type="TARGET" refId="6"/>
</realization> </realization>
<realization id="13"> <realization id="13">
<end type="SOURCE" refId="3"/> <end type="SOURCE" refId="4"/>
<end type="TARGET" refId="6"/>
</realization>
<realization id="14">
<end type="SOURCE" refId="9"/>
<end type="TARGET" refId="8"/> <end type="TARGET" refId="8"/>
</realization> </realization>
<dependency id="14"> <dependency id="15">
<end type="SOURCE" refId="7"/> <end type="SOURCE" refId="7"/>
<end type="TARGET" refId="4"/> <end type="TARGET" refId="4"/>
</dependency> </dependency>
<realization id="15"> <realization id="16">
<end type="SOURCE" refId="5"/> <end type="SOURCE" refId="3"/>
<end type="TARGET" refId="6"/> <end type="TARGET" refId="8"/>
</realization> </realization>
<dependency id="16">
<end type="SOURCE" refId="5"/>
<end type="TARGET" refId="2"/>
</dependency>
<dependency id="17"> <dependency id="17">
<end type="SOURCE" refId="4"/> <end type="SOURCE" refId="4"/>
<end type="TARGET" refId="9"/> <end type="TARGET" refId="9"/>
</dependency> </dependency>
<realization id="18"> <dependency id="18">
<end type="SOURCE" refId="9"/>
<end type="TARGET" refId="8"/>
</realization>
<dependency id="19">
<end type="SOURCE" refId="7"/> <end type="SOURCE" refId="7"/>
<end type="TARGET" refId="6"/> <end type="TARGET" refId="6"/>
</dependency> </dependency>
<dependency id="19">
<end type="SOURCE" refId="1"/>
<end type="TARGET" refId="3"/>
</dependency>
<realization id="20"> <realization id="20">
<end type="SOURCE" refId="2"/> <end type="SOURCE" refId="5"/>
<end type="TARGET" refId="8"/> <end type="TARGET" refId="6"/>
</realization> </realization>
<classifier-display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" <classifier-display autosize="true" stereotype="true" package="true" initial-value="false" signature="true"
sort-features="false" accessors="true" visibility="true"> sort-features="false" accessors="true" visibility="true">
@@ -1,4 +1,4 @@
package com.iluwatar; package com.iluwatar.front.controller;
/** /**
* *
@@ -1,4 +1,4 @@
package com.iluwatar; package com.iluwatar.front.controller;
public class ApplicationException extends RuntimeException { public class ApplicationException extends RuntimeException {
@@ -1,4 +1,4 @@
package com.iluwatar; package com.iluwatar.front.controller;
/** /**
* *
@@ -1,4 +1,4 @@
package com.iluwatar; package com.iluwatar.front.controller;
/** /**
* *
@@ -1,4 +1,4 @@
package com.iluwatar; package com.iluwatar.front.controller;
/** /**
* *
@@ -1,4 +1,4 @@
package com.iluwatar; package com.iluwatar.front.controller;
/** /**
* *
@@ -1,4 +1,4 @@
package com.iluwatar; package com.iluwatar.front.controller;
/** /**
* *
@@ -1,4 +1,4 @@
package com.iluwatar; package com.iluwatar.front.controller;
/** /**
* *
@@ -1,4 +1,4 @@
package com.iluwatar; package com.iluwatar.front.controller;
/** /**
* *
@@ -1,4 +1,4 @@
package com.iluwatar; package com.iluwatar.front.controller;
/** /**
* *
@@ -1,4 +1,4 @@
package com.iluwatar; package com.iluwatar.front.controller;
/** /**
* *
@@ -1,7 +1,9 @@
package com.iluwatar; package com.iluwatar.front.controller;
import org.junit.Test; import org.junit.Test;
import com.iluwatar.front.controller.App;
public class AppTest { public class AppTest {
@Test @Test
+100 -80
View File
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<class-diagram version="1.1.8" icons="true" automaticImage="PNG" always-add-relationships="false" generalizations="true" <class-diagram version="1.1.8" icons="true" automaticImage="PNG" always-add-relationships="false" generalizations="true"
realizations="true" associations="true" dependencies="false" nesting-relationships="true"> realizations="true" associations="true" dependencies="false" nesting-relationships="true">
<class id="1" language="java" name="com.iluwatar.interceptingfilter.FilterManager" project="intercepting-filter" <class id="1" language="java" name="com.iluwatar.intercepting.filter.FilterManager" project="intercepting-filter"
file="/intercepting-filter/src/main/java/com/iluwatar/interceptingfilter/FilterManager.java" binary="false" file="/intercepting-filter/src/main/java/com/iluwatar/intercepting/filter/FilterManager.java" binary="false"
corner="BOTTOM_RIGHT"> corner="BOTTOM_RIGHT">
<position height="124" width="176" x="768" y="500"/> <position height="124" width="176" x="768" y="500"/>
<display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true"
@@ -11,8 +11,8 @@
<operations public="true" package="true" protected="true" private="true" static="true"/> <operations public="true" package="true" protected="true" private="true" static="true"/>
</display> </display>
</class> </class>
<class id="2" language="java" name="com.iluwatar.interceptingfilter.NameFilter" project="intercepting-filter" <class id="2" language="java" name="com.iluwatar.intercepting.filter.NameFilter" project="intercepting-filter"
file="/intercepting-filter/src/main/java/com/iluwatar/interceptingfilter/NameFilter.java" binary="false" file="/intercepting-filter/src/main/java/com/iluwatar/intercepting/filter/NameFilter.java" binary="false"
corner="BOTTOM_RIGHT"> corner="BOTTOM_RIGHT">
<position height="106" width="169" x="-381" y="881"/> <position height="106" width="169" x="-381" y="881"/>
<display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true"
@@ -21,8 +21,8 @@
<operations public="true" package="true" protected="true" private="true" static="true"/> <operations public="true" package="true" protected="true" private="true" static="true"/>
</display> </display>
</class> </class>
<class id="3" language="java" name="com.iluwatar.interceptingfilter.AddressFilter" project="intercepting-filter" <class id="3" language="java" name="com.iluwatar.intercepting.filter.AddressFilter" project="intercepting-filter"
file="/intercepting-filter/src/main/java/com/iluwatar/interceptingfilter/AddressFilter.java" binary="false" file="/intercepting-filter/src/main/java/com/iluwatar/intercepting/filter/AddressFilter.java" binary="false"
corner="BOTTOM_RIGHT"> corner="BOTTOM_RIGHT">
<position height="106" width="169" x="-172" y="881"/> <position height="106" width="169" x="-172" y="881"/>
<display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true"
@@ -31,8 +31,8 @@
<operations public="true" package="true" protected="true" private="true" static="true"/> <operations public="true" package="true" protected="true" private="true" static="true"/>
</display> </display>
</class> </class>
<class id="4" language="java" name="com.iluwatar.interceptingfilter.Order" project="intercepting-filter" <class id="4" language="java" name="com.iluwatar.intercepting.filter.Order" project="intercepting-filter"
file="/intercepting-filter/src/main/java/com/iluwatar/interceptingfilter/Order.java" binary="false" file="/intercepting-filter/src/main/java/com/iluwatar/intercepting/filter/Order.java" binary="false"
corner="BOTTOM_RIGHT"> corner="BOTTOM_RIGHT">
<position height="376" width="252" x="47" y="84"/> <position height="376" width="252" x="47" y="84"/>
<display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true"
@@ -41,8 +41,8 @@
<operations public="true" package="true" protected="true" private="true" static="true"/> <operations public="true" package="true" protected="true" private="true" static="true"/>
</display> </display>
</class> </class>
<class id="5" language="java" name="com.iluwatar.interceptingfilter.DepositFilter" project="intercepting-filter" <class id="5" language="java" name="com.iluwatar.intercepting.filter.DepositFilter" project="intercepting-filter"
file="/intercepting-filter/src/main/java/com/iluwatar/interceptingfilter/DepositFilter.java" binary="false" file="/intercepting-filter/src/main/java/com/iluwatar/intercepting/filter/DepositFilter.java" binary="false"
corner="BOTTOM_RIGHT"> corner="BOTTOM_RIGHT">
<position height="106" width="169" x="37" y="881"/> <position height="106" width="169" x="37" y="881"/>
<display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true"
@@ -51,8 +51,8 @@
<operations public="true" package="true" protected="true" private="true" static="true"/> <operations public="true" package="true" protected="true" private="true" static="true"/>
</display> </display>
</class> </class>
<class id="6" language="java" name="com.iluwatar.interceptingfilter.FilterChain" project="intercepting-filter" <class id="6" language="java" name="com.iluwatar.intercepting.filter.FilterChain" project="intercepting-filter"
file="/intercepting-filter/src/main/java/com/iluwatar/interceptingfilter/FilterChain.java" binary="false" file="/intercepting-filter/src/main/java/com/iluwatar/intercepting/filter/FilterChain.java" binary="false"
corner="BOTTOM_RIGHT"> corner="BOTTOM_RIGHT">
<position height="124" width="169" x="768" y="664"/> <position height="124" width="169" x="768" y="664"/>
<display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true"
@@ -61,8 +61,8 @@
<operations public="true" package="true" protected="true" private="true" static="true"/> <operations public="true" package="true" protected="true" private="true" static="true"/>
</display> </display>
</class> </class>
<class id="7" language="java" name="com.iluwatar.interceptingfilter.AbstractFilter" project="intercepting-filter" <class id="7" language="java" name="com.iluwatar.intercepting.filter.AbstractFilter" project="intercepting-filter"
file="/intercepting-filter/src/main/java/com/iluwatar/interceptingfilter/AbstractFilter.java" binary="false" file="/intercepting-filter/src/main/java/com/iluwatar/intercepting/filter/AbstractFilter.java" binary="false"
corner="BOTTOM_RIGHT"> corner="BOTTOM_RIGHT">
<position height="177" width="169" x="246" y="664"/> <position height="177" width="169" x="246" y="664"/>
<display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true"
@@ -71,8 +71,8 @@
<operations public="true" package="true" protected="true" private="true" static="true"/> <operations public="true" package="true" protected="true" private="true" static="true"/>
</display> </display>
</class> </class>
<class id="8" language="java" name="com.iluwatar.interceptingfilter.OrderFilter" project="intercepting-filter" <class id="8" language="java" name="com.iluwatar.intercepting.filter.OrderFilter" project="intercepting-filter"
file="/intercepting-filter/src/main/java/com/iluwatar/interceptingfilter/OrderFilter.java" binary="false" file="/intercepting-filter/src/main/java/com/iluwatar/intercepting/filter/OrderFilter.java" binary="false"
corner="BOTTOM_RIGHT"> corner="BOTTOM_RIGHT">
<position height="106" width="169" x="246" y="881"/> <position height="106" width="169" x="246" y="881"/>
<display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true"
@@ -81,8 +81,8 @@
<operations public="true" package="true" protected="true" private="true" static="true"/> <operations public="true" package="true" protected="true" private="true" static="true"/>
</display> </display>
</class> </class>
<class id="9" language="java" name="com.iluwatar.interceptingfilter.ContactFilter" project="intercepting-filter" <class id="9" language="java" name="com.iluwatar.intercepting.filter.ContactFilter" project="intercepting-filter"
file="/intercepting-filter/src/main/java/com/iluwatar/interceptingfilter/ContactFilter.java" binary="false" file="/intercepting-filter/src/main/java/com/iluwatar/intercepting/filter/ContactFilter.java" binary="false"
corner="BOTTOM_RIGHT"> corner="BOTTOM_RIGHT">
<position height="106" width="169" x="455" y="881"/> <position height="106" width="169" x="455" y="881"/>
<display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true"
@@ -91,8 +91,8 @@
<operations public="true" package="true" protected="true" private="true" static="true"/> <operations public="true" package="true" protected="true" private="true" static="true"/>
</display> </display>
</class> </class>
<class id="10" language="java" name="com.iluwatar.interceptingfilter.Client" project="intercepting-filter" <class id="10" language="java" name="com.iluwatar.intercepting.filter.Client" project="intercepting-filter"
file="/intercepting-filter/src/main/java/com/iluwatar/interceptingfilter/Client.java" binary="false" file="/intercepting-filter/src/main/java/com/iluwatar/intercepting/filter/Client.java" binary="false"
corner="BOTTOM_RIGHT"> corner="BOTTOM_RIGHT">
<position height="250" width="236" x="768" y="84"/> <position height="250" width="236" x="768" y="84"/>
<display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true"
@@ -101,8 +101,8 @@
<operations public="true" package="true" protected="true" private="true" static="true"/> <operations public="true" package="true" protected="true" private="true" static="true"/>
</display> </display>
</class> </class>
<class id="11" language="java" name="com.iluwatar.interceptingfilter.Target" project="intercepting-filter" <class id="11" language="java" name="com.iluwatar.intercepting.filter.Target" project="intercepting-filter"
file="/intercepting-filter/src/main/java/com/iluwatar/interceptingfilter/Target.java" binary="false" file="/intercepting-filter/src/main/java/com/iluwatar/intercepting/filter/Target.java" binary="false"
corner="BOTTOM_RIGHT"> corner="BOTTOM_RIGHT">
<position height="214" width="169" x="873" y="881"/> <position height="214" width="169" x="873" y="881"/>
<display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true"
@@ -111,8 +111,8 @@
<operations public="true" package="true" protected="true" private="true" static="true"/> <operations public="true" package="true" protected="true" private="true" static="true"/>
</display> </display>
</class> </class>
<interface id="12" language="java" name="com.iluwatar.interceptingfilter.Filter" project="intercepting-filter" <interface id="12" language="java" name="com.iluwatar.intercepting.filter.Filter" project="intercepting-filter"
file="/intercepting-filter/src/main/java/com/iluwatar/interceptingfilter/Filter.java" binary="false" file="/intercepting-filter/src/main/java/com/iluwatar/intercepting/filter/Filter.java" binary="false"
corner="BOTTOM_RIGHT"> corner="BOTTOM_RIGHT">
<position height="142" width="169" x="664" y="881"/> <position height="142" width="169" x="664" y="881"/>
<display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true"
@@ -121,8 +121,8 @@
<operations public="true" package="true" protected="true" private="true" static="true"/> <operations public="true" package="true" protected="true" private="true" static="true"/>
</display> </display>
</interface> </interface>
<class id="13" language="java" name="com.iluwatar.interceptingfilter.Target.DListener" project="intercepting-filter" <class id="13" language="java" name="com.iluwatar.intercepting.filter.Target.DListener" project="intercepting-filter"
file="/intercepting-filter/src/main/java/com/iluwatar/interceptingfilter/Target.java" binary="false" file="/intercepting-filter/src/main/java/com/iluwatar/intercepting/filter/Target.java" binary="false"
corner="BOTTOM_RIGHT"> corner="BOTTOM_RIGHT">
<position height="106" width="223" x="819" y="1135"/> <position height="106" width="223" x="819" y="1135"/>
<display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true"
@@ -132,73 +132,93 @@
</display> </display>
</class> </class>
<association id="14"> <association id="14">
<end type="SOURCE" refId="1" navigable="false">
<attribute id="15" name="filterChain"/>
<multiplicity id="16" minimum="0" maximum="1"/>
</end>
<end type="TARGET" refId="6" navigable="true"/>
<display labels="true" multiplicity="true"/>
</association>
<realization id="17">
<end type="SOURCE" refId="7"/>
<end type="TARGET" refId="12"/>
</realization>
<association id="18">
<end type="SOURCE" refId="6" navigable="false">
<attribute id="19" name="chain"/>
<multiplicity id="20" minimum="0" maximum="1"/>
</end>
<end type="TARGET" refId="12" navigable="true"/>
<display labels="true" multiplicity="true"/>
</association>
<association id="21">
<end type="SOURCE" refId="7" navigable="false">
<attribute id="22" name="next"/>
<multiplicity id="23" minimum="0" maximum="1"/>
</end>
<end type="TARGET" refId="12" navigable="true"/>
<display labels="true" multiplicity="true"/>
</association>
<generalization id="24">
<end type="SOURCE" refId="2"/>
<end type="TARGET" refId="7"/>
</generalization>
<nesting id="25">
<end type="SOURCE" refId="11"/>
<end type="TARGET" refId="13"/>
</nesting>
<generalization id="26">
<end type="SOURCE" refId="9"/>
<end type="TARGET" refId="7"/>
</generalization>
<association id="27">
<end type="SOURCE" refId="6" navigable="false">
<attribute id="28" name="target"/>
<multiplicity id="29" minimum="0" maximum="1"/>
</end>
<end type="TARGET" refId="11" navigable="true"/>
<display labels="true" multiplicity="true"/>
</association>
<association id="30">
<end type="SOURCE" refId="10" navigable="false"> <end type="SOURCE" refId="10" navigable="false">
<attribute id="31" name="filterManager"/> <attribute id="15" name="filterManager">
<multiplicity id="32" minimum="0" maximum="1"/> <position height="0" width="0" x="0" y="0"/>
</attribute>
<multiplicity id="16" minimum="0" maximum="1">
<position height="0" width="0" x="0" y="0"/>
</multiplicity>
</end> </end>
<end type="TARGET" refId="1" navigable="true"/> <end type="TARGET" refId="1" navigable="true"/>
<display labels="true" multiplicity="true"/> <display labels="true" multiplicity="true"/>
</association> </association>
<generalization id="33"> <association id="17">
<end type="SOURCE" refId="6" navigable="false">
<attribute id="18" name="chain">
<position height="0" width="0" x="0" y="0"/>
</attribute>
<multiplicity id="19" minimum="0" maximum="1">
<position height="0" width="0" x="0" y="0"/>
</multiplicity>
</end>
<end type="TARGET" refId="12" navigable="true"/>
<display labels="true" multiplicity="true"/>
</association>
<association id="20">
<end type="SOURCE" refId="7" navigable="false">
<attribute id="21" name="next">
<position height="0" width="0" x="0" y="0"/>
</attribute>
<multiplicity id="22" minimum="0" maximum="1">
<position height="0" width="0" x="0" y="0"/>
</multiplicity>
</end>
<end type="TARGET" refId="12" navigable="true"/>
<display labels="true" multiplicity="true"/>
</association>
<nesting id="23">
<end type="SOURCE" refId="11"/>
<end type="TARGET" refId="13"/>
</nesting>
<generalization id="24">
<end type="SOURCE" refId="2"/>
<end type="TARGET" refId="7"/>
</generalization>
<generalization id="25">
<end type="SOURCE" refId="3"/> <end type="SOURCE" refId="3"/>
<end type="TARGET" refId="7"/> <end type="TARGET" refId="7"/>
</generalization> </generalization>
<generalization id="34"> <generalization id="26">
<end type="SOURCE" refId="5"/> <end type="SOURCE" refId="9"/>
<end type="TARGET" refId="7"/> <end type="TARGET" refId="7"/>
</generalization> </generalization>
<generalization id="35"> <generalization id="27">
<end type="SOURCE" refId="8"/> <end type="SOURCE" refId="8"/>
<end type="TARGET" refId="7"/> <end type="TARGET" refId="7"/>
</generalization> </generalization>
<realization id="28">
<end type="SOURCE" refId="7"/>
<end type="TARGET" refId="12"/>
</realization>
<association id="29">
<end type="SOURCE" refId="1" navigable="false">
<attribute id="30" name="filterChain">
<position height="0" width="0" x="0" y="0"/>
</attribute>
<multiplicity id="31" minimum="0" maximum="1">
<position height="0" width="0" x="0" y="0"/>
</multiplicity>
</end>
<end type="TARGET" refId="6" navigable="true"/>
<display labels="true" multiplicity="true"/>
</association>
<generalization id="32">
<end type="SOURCE" refId="5"/>
<end type="TARGET" refId="7"/>
</generalization>
<association id="33">
<end type="SOURCE" refId="6" navigable="false">
<attribute id="34" name="target">
<position height="0" width="0" x="0" y="0"/>
</attribute>
<multiplicity id="35" minimum="0" maximum="1">
<position height="0" width="0" x="0" y="0"/>
</multiplicity>
</end>
<end type="TARGET" refId="11" navigable="true"/>
<display labels="true" multiplicity="true"/>
</association>
<classifier-display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" <classifier-display autosize="true" stereotype="true" package="true" initial-value="false" signature="true"
sort-features="false" accessors="true" visibility="true"> sort-features="false" accessors="true" visibility="true">
<attributes public="true" package="true" protected="true" private="true" static="true"/> <attributes public="true" package="true" protected="true" private="true" static="true"/>
@@ -1,4 +1,4 @@
package com.iluwatar.interceptingfilter; package com.iluwatar.intercepting.filter;
/** /**
* Base class for order processing filters. * Base class for order processing filters.
@@ -1,4 +1,4 @@
package com.iluwatar.interceptingfilter; package com.iluwatar.intercepting.filter;
/** /**
* Concrete implementation of filter * Concrete implementation of filter
@@ -1,4 +1,4 @@
package com.iluwatar.interceptingfilter; package com.iluwatar.intercepting.filter;
/** /**
* *
@@ -1,4 +1,4 @@
package com.iluwatar.interceptingfilter; package com.iluwatar.intercepting.filter;
import java.awt.BorderLayout; import java.awt.BorderLayout;
import java.awt.GridLayout; import java.awt.GridLayout;
@@ -1,4 +1,4 @@
package com.iluwatar.interceptingfilter; package com.iluwatar.intercepting.filter;
/** /**
* Concrete implementation of filter * Concrete implementation of filter
@@ -1,4 +1,4 @@
package com.iluwatar.interceptingfilter; package com.iluwatar.intercepting.filter;
/** /**
* Concrete implementation of filter * Concrete implementation of filter
@@ -1,4 +1,4 @@
package com.iluwatar.interceptingfilter; package com.iluwatar.intercepting.filter;
/** /**
* Filter interface Filters perform certain tasks prior or after execution of * Filter interface Filters perform certain tasks prior or after execution of
@@ -1,4 +1,4 @@
package com.iluwatar.interceptingfilter; package com.iluwatar.intercepting.filter;
/** /**
@@ -1,4 +1,4 @@
package com.iluwatar.interceptingfilter; package com.iluwatar.intercepting.filter;
/** /**
* Filter Manager manages the filters and Filter Chain. * Filter Manager manages the filters and Filter Chain.
@@ -1,4 +1,4 @@
package com.iluwatar.interceptingfilter; package com.iluwatar.intercepting.filter;
/** /**
* Concrete implementation of filter This filter checks if the input in the Name * Concrete implementation of filter This filter checks if the input in the Name
@@ -1,4 +1,4 @@
package com.iluwatar.interceptingfilter; package com.iluwatar.intercepting.filter;
/** /**
* Order class carries the order data. * Order class carries the order data.
@@ -1,4 +1,4 @@
package com.iluwatar.interceptingfilter; package com.iluwatar.intercepting.filter;
/** /**
* Concrete implementation of filter This checks for the order field * Concrete implementation of filter This checks for the order field
@@ -1,4 +1,4 @@
package com.iluwatar.interceptingfilter; package com.iluwatar.intercepting.filter;
import java.awt.BorderLayout; import java.awt.BorderLayout;
import java.awt.Dimension; import java.awt.Dimension;
@@ -0,0 +1,14 @@
package com.iluwatar.intercepting.filter;
import org.junit.Test;
import com.iluwatar.intercepting.filter.App;
public class AppTest {
@Test
public void test() {
String[] args = {};
App.main(args);
}
}
@@ -1,4 +1,4 @@
package com.iluwatar.lazyloading; package com.iluwatar.lazy.loading;
/** /**
* *
@@ -1,4 +1,4 @@
package com.iluwatar.lazyloading; package com.iluwatar.lazy.loading;
/** /**
* *
@@ -1,4 +1,4 @@
package com.iluwatar.lazyloading; package com.iluwatar.lazy.loading;
/** /**
* *
@@ -1,4 +1,4 @@
package com.iluwatar.lazyloading; package com.iluwatar.lazy.loading;
/** /**
* *
@@ -1,4 +1,4 @@
package com.iluwatar.lazyloading; package com.iluwatar.lazy.loading;
import java.util.function.Supplier; import java.util.function.Supplier;
@@ -1,7 +1,9 @@
package com.iluwatar; package com.iluwatar.lazy.loading;
import org.junit.Test; import org.junit.Test;
import com.iluwatar.lazy.loading.App;
public class AppTest { public class AppTest {
@Test @Test
@@ -1,4 +1,4 @@
package com.iluwatar.modelviewcontroller; package com.iluwatar.model.view.controller;
/** /**
* *
@@ -1,4 +1,4 @@
package com.iluwatar.modelviewcontroller; package com.iluwatar.model.view.controller;
/** /**
* *
@@ -1,4 +1,4 @@
package com.iluwatar.modelviewcontroller; package com.iluwatar.model.view.controller;
/** /**
* *
@@ -1,4 +1,4 @@
package com.iluwatar.modelviewcontroller; package com.iluwatar.model.view.controller;
/** /**
* *
@@ -1,4 +1,4 @@
package com.iluwatar.modelviewcontroller; package com.iluwatar.model.view.controller;
/** /**
* *
@@ -1,4 +1,4 @@
package com.iluwatar.modelviewcontroller; package com.iluwatar.model.view.controller;
/** /**
* *
@@ -1,4 +1,4 @@
package com.iluwatar.modelviewcontroller; package com.iluwatar.model.view.controller;
/** /**
* *
@@ -1,8 +1,8 @@
package com.iluwatar.modelviewcontroller; package com.iluwatar.model.view.controller;
import org.junit.Test; import org.junit.Test;
import com.iluwatar.modelviewcontroller.App; import com.iluwatar.model.view.controller.App;
public class AppTest { public class AppTest {
@@ -1,8 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<class-diagram version="1.1.8" icons="true" automaticImage="PNG" always-add-relationships="false" generalizations="true" <class-diagram version="1.1.8" icons="true" automaticImage="PNG" always-add-relationships="false" generalizations="true"
realizations="true" associations="true" dependencies="false" nesting-relationships="true"> realizations="true" associations="true" dependencies="false" nesting-relationships="true">
<class id="1" language="java" name="com.iluwatar.modelviewpresenter.FileSelectorJFrame" project="model-view-presenter" <class id="1" language="java" name="com.iluwatar.model.view.presenter.FileSelectorJFrame"
file="/model-view-presenter/src/main/java/com/iluwatar/modelviewpresenter/FileSelectorJFrame.java" binary="false" project="model-view-presenter"
file="/model-view-presenter/src/main/java/com/iluwatar/model/view/presenter/FileSelectorJFrame.java" binary="false"
corner="BOTTOM_RIGHT"> corner="BOTTOM_RIGHT">
<position height="430" width="259" x="33" y="149"/> <position height="430" width="259" x="33" y="149"/>
<display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true"
@@ -11,8 +12,8 @@
<operations public="true" package="true" protected="true" private="true" static="true"/> <operations public="true" package="true" protected="true" private="true" static="true"/>
</display> </display>
</class> </class>
<class id="2" language="java" name="com.iluwatar.modelviewpresenter.FileSelectorStub" project="model-view-presenter" <class id="2" language="java" name="com.iluwatar.model.view.presenter.FileSelectorStub" project="model-view-presenter"
file="/model-view-presenter/src/main/java/com/iluwatar/modelviewpresenter/FileSelectorStub.java" binary="false" file="/model-view-presenter/src/main/java/com/iluwatar/model/view/presenter/FileSelectorStub.java" binary="false"
corner="BOTTOM_RIGHT"> corner="BOTTOM_RIGHT">
<position height="358" width="259" x="332" y="149"/> <position height="358" width="259" x="332" y="149"/>
<display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true"
@@ -21,10 +22,10 @@
<operations public="true" package="true" protected="true" private="true" static="true"/> <operations public="true" package="true" protected="true" private="true" static="true"/>
</display> </display>
</class> </class>
<class id="3" language="java" name="com.iluwatar.modelviewpresenter.FileSelectorPresenter" <class id="3" language="java" name="com.iluwatar.model.view.presenter.FileSelectorPresenter"
project="model-view-presenter" project="model-view-presenter"
file="/model-view-presenter/src/main/java/com/iluwatar/modelviewpresenter/FileSelectorPresenter.java" binary="false" file="/model-view-presenter/src/main/java/com/iluwatar/model/view/presenter/FileSelectorPresenter.java"
corner="BOTTOM_RIGHT"> binary="false" corner="BOTTOM_RIGHT">
<position height="178" width="256" x="73" y="619"/> <position height="178" width="256" x="73" y="619"/>
<display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true"
sort-features="false" accessors="true" visibility="true"> sort-features="false" accessors="true" visibility="true">
@@ -32,9 +33,9 @@
<operations public="true" package="true" protected="true" private="true" static="true"/> <operations public="true" package="true" protected="true" private="true" static="true"/>
</display> </display>
</class> </class>
<interface id="4" language="java" name="com.iluwatar.modelviewpresenter.FileSelectorView" <interface id="4" language="java" name="com.iluwatar.model.view.presenter.FileSelectorView"
project="model-view-presenter" project="model-view-presenter"
file="/model-view-presenter/src/main/java/com/iluwatar/modelviewpresenter/FileSelectorView.java" binary="false" file="/model-view-presenter/src/main/java/com/iluwatar/model/view/presenter/FileSelectorView.java" binary="false"
corner="BOTTOM_RIGHT"> corner="BOTTOM_RIGHT">
<position height="232" width="259" x="73" y="837"/> <position height="232" width="259" x="73" y="837"/>
<display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true"
@@ -43,8 +44,8 @@
<operations public="true" package="true" protected="true" private="true" static="true"/> <operations public="true" package="true" protected="true" private="true" static="true"/>
</display> </display>
</interface> </interface>
<class id="5" language="java" name="com.iluwatar.modelviewpresenter.FileLoader" project="model-view-presenter" <class id="5" language="java" name="com.iluwatar.model.view.presenter.FileLoader" project="model-view-presenter"
file="/model-view-presenter/src/main/java/com/iluwatar/modelviewpresenter/FileLoader.java" binary="false" file="/model-view-presenter/src/main/java/com/iluwatar/model/view/presenter/FileLoader.java" binary="false"
corner="BOTTOM_RIGHT"> corner="BOTTOM_RIGHT">
<position height="214" width="194" x="372" y="837"/> <position height="214" width="194" x="372" y="837"/>
<display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true"
@@ -53,44 +54,60 @@
<operations public="true" package="true" protected="true" private="true" static="true"/> <operations public="true" package="true" protected="true" private="true" static="true"/>
</display> </display>
</class> </class>
<realization id="6"> <association id="6">
<bendpoint x="359" y="619"/>
<end type="SOURCE" refId="2"/>
<end type="TARGET" refId="4"/>
</realization>
<association id="7">
<end type="SOURCE" refId="3" navigable="false"> <end type="SOURCE" refId="3" navigable="false">
<attribute id="8" name="loader"/> <attribute id="7" name="loader">
<multiplicity id="9" minimum="0" maximum="1"/> <position height="0" width="0" x="0" y="0"/>
</attribute>
<multiplicity id="8" minimum="0" maximum="1">
<position height="0" width="0" x="0" y="0"/>
</multiplicity>
</end> </end>
<end type="TARGET" refId="5" navigable="true"/> <end type="TARGET" refId="5" navigable="true"/>
<display labels="true" multiplicity="true"/> <display labels="true" multiplicity="true"/>
</association> </association>
<association id="10"> <realization id="9">
<end type="SOURCE" refId="3" navigable="false">
<attribute id="11" name="view"/>
<multiplicity id="12" minimum="0" maximum="1"/>
</end>
<end type="TARGET" refId="4" navigable="true"/>
<display labels="true" multiplicity="true"/>
</association>
<association id="13">
<end type="SOURCE" refId="2" navigable="false">
<attribute id="14" name="presenter"/>
<multiplicity id="15" minimum="0" maximum="1"/>
</end>
<end type="TARGET" refId="3" navigable="true"/>
<display labels="true" multiplicity="true"/>
</association>
<realization id="16">
<bendpoint x="42" y="619"/> <bendpoint x="42" y="619"/>
<end type="SOURCE" refId="1"/> <end type="SOURCE" refId="1"/>
<end type="TARGET" refId="4"/> <end type="TARGET" refId="4"/>
</realization> </realization>
<association id="17"> <association id="10">
<end type="SOURCE" refId="1" navigable="false"> <end type="SOURCE" refId="1" navigable="false">
<attribute id="18" name="presenter"/> <attribute id="11" name="presenter">
<multiplicity id="19" minimum="0" maximum="1"/> <position height="0" width="0" x="0" y="0"/>
</attribute>
<multiplicity id="12" minimum="0" maximum="1">
<position height="0" width="0" x="0" y="0"/>
</multiplicity>
</end>
<end type="TARGET" refId="3" navigable="true"/>
<display labels="true" multiplicity="true"/>
</association>
<realization id="13">
<bendpoint x="359" y="619"/>
<end type="SOURCE" refId="2"/>
<end type="TARGET" refId="4"/>
</realization>
<association id="14">
<end type="SOURCE" refId="3" navigable="false">
<attribute id="15" name="view">
<position height="0" width="0" x="0" y="0"/>
</attribute>
<multiplicity id="16" minimum="0" maximum="1">
<position height="0" width="0" x="0" y="0"/>
</multiplicity>
</end>
<end type="TARGET" refId="4" navigable="true"/>
<display labels="true" multiplicity="true"/>
</association>
<association id="17">
<end type="SOURCE" refId="2" navigable="false">
<attribute id="18" name="presenter">
<position height="0" width="0" x="0" y="0"/>
</attribute>
<multiplicity id="19" minimum="0" maximum="1">
<position height="0" width="0" x="0" y="0"/>
</multiplicity>
</end> </end>
<end type="TARGET" refId="3" navigable="true"/> <end type="TARGET" refId="3" navigable="true"/>
<display labels="true" multiplicity="true"/> <display labels="true" multiplicity="true"/>
@@ -1,4 +1,4 @@
package com.iluwatar.modelviewpresenter; package com.iluwatar.model.view.presenter;
import java.io.BufferedReader; import java.io.BufferedReader;
import java.io.File; import java.io.File;
@@ -1,4 +1,4 @@
package com.iluwatar.modelviewpresenter; package com.iluwatar.model.view.presenter;
import java.awt.Color; import java.awt.Color;
import java.awt.event.ActionEvent; import java.awt.event.ActionEvent;
@@ -1,4 +1,4 @@
package com.iluwatar.modelviewpresenter; package com.iluwatar.model.view.presenter;
/** /**
* Every instance of this class represents the Presenter component in the * Every instance of this class represents the Presenter component in the
Loaded 100 of 128 files, more files were not shown because too many files have changed in this diff. Show more