Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit74481a0

Browse files
committed
Merge branch 'master' into urm
2 parents325b689 +dd0fcea commit74481a0

File tree

20 files changed

+33
-284
lines changed

20 files changed

+33
-284
lines changed

‎fluentinterface/etc/fluentinterface.ucls

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<class-diagramversion="1.1.8"icons="true"automaticImage="PNG"always-add-relationships="false"generalizations="true"
33
realizations="true"associations="true"dependencies="false"nesting-relationships="true">
4-
<classid="1"language="java"name="com.iluwatar.fluentinterface.App"project="fluentinterface"
5-
file="/fluentinterface/src/main/java/com/iluwatar/fluentinterface/App.java"binary="false"corner="BOTTOM_RIGHT">
4+
<classid="1"language="java"name="com.iluwatar.fluentinterface.app.App"project="fluentinterface"
5+
file="/fluentinterface/src/main/java/com/iluwatar/fluentinterface/app/App.java"binary="false"corner="BOTTOM_RIGHT">
66
<positionheight="-1"width="-1"x="289"y="-8"/>
77
<displayautosize="true"stereotype="true"package="true"initial-value="false"signature="true"
88
sort-features="false"accessors="true"visibility="true">
@@ -55,7 +55,7 @@
5555
</display>
5656
</class>
5757
<interfaceid="6"language="java"name="java.lang.Iterable"project="fluentinterface"
58-
file="/opt/Softwares/Eclipses/MARS/eclipse/jre/lib/rt.jar"binary="true"corner="BOTTOM_RIGHT">
58+
file="C:/Program Files/Java/jdk1.8.0_25/jre/lib/rt.jar"binary="true"corner="BOTTOM_RIGHT">
5959
<positionheight="-1"width="-1"x="793"y="-163"/>
6060
<displayautosize="true"stereotype="true"package="true"initial-value="false"signature="true"
6161
sort-features="false"accessors="true"visibility="true">
@@ -64,33 +64,33 @@
6464
</display>
6565
</interface>
6666
<dependencyid="7">
67-
<endtype="SOURCE"refId="1"/>
68-
<endtype="TARGET"refId="2"/>
69-
</dependency>
70-
<realizationid="8">
71-
<endtype="SOURCE"refId="3"/>
72-
<endtype="TARGET"refId="4"/>
73-
</realization>
74-
<dependencyid="9">
7567
<endtype="SOURCE"refId="3"/>
7668
<endtype="TARGET"refId="5"/>
7769
</dependency>
78-
<generalizationid="10">
79-
<endtype="SOURCE"refId="4"/>
80-
<endtype="TARGET"refId="6"/>
81-
</generalization>
82-
<dependencyid="11">
70+
<dependencyid="8">
8371
<endtype="SOURCE"refId="1"/>
8472
<endtype="TARGET"refId="3"/>
8573
</dependency>
86-
<dependencyid="12">
74+
<dependencyid="9">
8775
<endtype="SOURCE"refId="1"/>
8876
<endtype="TARGET"refId="4"/>
8977
</dependency>
90-
<realizationid="13">
78+
<realizationid="10">
9179
<endtype="SOURCE"refId="2"/>
9280
<endtype="TARGET"refId="4"/>
9381
</realization>
82+
<realizationid="11">
83+
<endtype="SOURCE"refId="3"/>
84+
<endtype="TARGET"refId="4"/>
85+
</realization>
86+
<dependencyid="12">
87+
<endtype="SOURCE"refId="1"/>
88+
<endtype="TARGET"refId="2"/>
89+
</dependency>
90+
<generalizationid="13">
91+
<endtype="SOURCE"refId="4"/>
92+
<endtype="TARGET"refId="6"/>
93+
</generalization>
9494
<classifier-displayautosize="true"stereotype="true"package="true"initial-value="true"signature="true"
9595
sort-features="false"accessors="true"visibility="true">
9696
<attributespublic="true"package="true"protected="true"private="true"static="true"/>

‎fluentinterface/src/main/java/com/iluwatar/fluentinterface/App.javarenamed to‎fluentinterface/src/main/java/com/iluwatar/fluentinterface/app/App.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
packagecom.iluwatar.fluentinterface;
1+
packagecom.iluwatar.fluentinterface.app;
22

33
importcom.iluwatar.fluentinterface.fluentiterable.FluentIterable;
44
importcom.iluwatar.fluentinterface.fluentiterable.lazy.LazyFluentIterable;

‎fluentinterface/src/test/java/com/iluwatar/fluentinterface/AppTest.javarenamed to‎fluentinterface/src/test/java/com/iluwatar/fluentinterface/app/AppTest.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
1-
packagecom.iluwatar.fluentinterface;
1+
packagecom.iluwatar.fluentinterface.app;
22

33
importorg.junit.Test;
44

5+
importcom.iluwatar.fluentinterface.app.App;
6+
57
publicclassAppTest {
68

79
@Test

‎model-view-controller/src/main/java/com/iluwatar/model/view/controller/with/observer/App.java

Lines changed: 0 additions & 29 deletions
This file was deleted.

‎model-view-controller/src/main/java/com/iluwatar/model/view/controller/with/observer/Fatigue.java

Lines changed: 0 additions & 22 deletions
This file was deleted.

‎model-view-controller/src/main/java/com/iluwatar/model/view/controller/with/observer/GiantController.java

Lines changed: 0 additions & 46 deletions
This file was deleted.

‎model-view-controller/src/main/java/com/iluwatar/model/view/controller/with/observer/GiantModel.java

Lines changed: 0 additions & 63 deletions
This file was deleted.

‎model-view-controller/src/main/java/com/iluwatar/model/view/controller/with/observer/GiantModelObserver.java

Lines changed: 0 additions & 12 deletions
This file was deleted.

‎model-view-controller/src/main/java/com/iluwatar/model/view/controller/with/observer/GiantView.java

Lines changed: 0 additions & 18 deletions
This file was deleted.

‎model-view-controller/src/main/java/com/iluwatar/model/view/controller/with/observer/Health.java

Lines changed: 0 additions & 22 deletions
This file was deleted.

‎model-view-controller/src/main/java/com/iluwatar/model/view/controller/with/observer/Nourishment.java

Lines changed: 0 additions & 22 deletions
This file was deleted.

‎model-view-controller/src/test/java/com/iluwatar/model/view/controller/with/observer/AppTest.java

Lines changed: 0 additions & 19 deletions
This file was deleted.

‎service-layer/src/main/java/com/iluwatar/servicelayer/app/App.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44

55
importcom.iluwatar.servicelayer.magic.MagicService;
66
importcom.iluwatar.servicelayer.magic.MagicServiceImpl;
7-
importcom.iluwatar.servicelayer.servicelayer.spell.Spell;
8-
importcom.iluwatar.servicelayer.servicelayer.spell.SpellDao;
9-
importcom.iluwatar.servicelayer.servicelayer.spell.SpellDaoImpl;
7+
importcom.iluwatar.servicelayer.spell.Spell;
8+
importcom.iluwatar.servicelayer.spell.SpellDao;
9+
importcom.iluwatar.servicelayer.spell.SpellDaoImpl;
1010
importcom.iluwatar.servicelayer.spellbook.Spellbook;
1111
importcom.iluwatar.servicelayer.spellbook.SpellbookDao;
1212
importcom.iluwatar.servicelayer.spellbook.SpellbookDaoImpl;

‎service-layer/src/main/java/com/iluwatar/servicelayer/hibernate/HibernateUtil.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
importorg.hibernate.SessionFactory;
44
importorg.hibernate.cfg.Configuration;
55

6-
importcom.iluwatar.servicelayer.servicelayer.spell.Spell;
6+
importcom.iluwatar.servicelayer.spell.Spell;
77
importcom.iluwatar.servicelayer.spellbook.Spellbook;
88
importcom.iluwatar.servicelayer.wizard.Wizard;
99

‎service-layer/src/main/java/com/iluwatar/servicelayer/magic/MagicService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
importjava.util.List;
44

5-
importcom.iluwatar.servicelayer.servicelayer.spell.Spell;
5+
importcom.iluwatar.servicelayer.spell.Spell;
66
importcom.iluwatar.servicelayer.spellbook.Spellbook;
77
importcom.iluwatar.servicelayer.wizard.Wizard;
88

‎service-layer/src/main/java/com/iluwatar/servicelayer/magic/MagicServiceImpl.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
importjava.util.ArrayList;
44
importjava.util.List;
55

6-
importcom.iluwatar.servicelayer.servicelayer.spell.Spell;
7-
importcom.iluwatar.servicelayer.servicelayer.spell.SpellDao;
6+
importcom.iluwatar.servicelayer.spell.Spell;
7+
importcom.iluwatar.servicelayer.spell.SpellDao;
88
importcom.iluwatar.servicelayer.spellbook.Spellbook;
99
importcom.iluwatar.servicelayer.spellbook.SpellbookDao;
1010
importcom.iluwatar.servicelayer.wizard.Wizard;

‎service-layer/src/main/java/com/iluwatar/servicelayer/servicelayer/spell/Spell.javarenamed to‎service-layer/src/main/java/com/iluwatar/servicelayer/spell/Spell.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
packagecom.iluwatar.servicelayer.servicelayer.spell;
1+
packagecom.iluwatar.servicelayer.spell;
22

33
importjavax.persistence.Column;
44
importjavax.persistence.Entity;

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp