Skip to content

Commit c6aae59

Browse files
iluwatariluwatar
committed
Corrections to package naming.
1 parent e3f8ef0 commit c6aae59

6 files changed

Lines changed: 19 additions & 19 deletions

File tree

‎fluentinterface/etc/fluentinterface.ucls‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,10 @@
3232
<operations public="true" package="true" protected="true" private="true" static="true"/>
3333
</display>
3434
</class>
35-
<interface id="4" language="java" name="com.iluwatar.fluentinterface.fluentiterable.FluentIterable"
35+
<interface id="4" language="java" name="com.iluwatar.fluentinterface.fluentiterable.core.FluentIterable"
3636
project="fluentinterface"
37-
file="/fluentinterface/src/main/java/com/iluwatar/fluentinterface/fluentiterable/FluentIterable.java" binary="false"
38-
corner="BOTTOM_RIGHT">
37+
file="/fluentinterface/src/main/java/com/iluwatar/fluentinterface/fluentiterable/core/FluentIterable.java"
38+
binary="false" corner="BOTTOM_RIGHT">
3939
<position height="-1" width="-1" x="794" y="55"/>
4040
<display autosize="true" stereotype="true" package="true" initial-value="false" signature="true"
4141
sort-features="false" accessors="true" visibility="true">
@@ -64,16 +64,16 @@
6464
</display>
6565
</interface>
6666
<dependency id="7">
67-
<end type="SOURCE" refId="3"/>
68-
<end type="TARGET" refId="5"/>
67+
<end type="SOURCE" refId="1"/>
68+
<end type="TARGET" refId="4"/>
6969
</dependency>
7070
<dependency id="8">
7171
<end type="SOURCE" refId="1"/>
7272
<end type="TARGET" refId="3"/>
7373
</dependency>
7474
<dependency id="9">
75-
<end type="SOURCE" refId="1"/>
76-
<end type="TARGET" refId="4"/>
75+
<end type="SOURCE" refId="3"/>
76+
<end type="TARGET" refId="5"/>
7777
</dependency>
7878
<realization id="10">
7979
<end type="SOURCE" refId="2"/>
@@ -83,14 +83,14 @@
8383
<end type="SOURCE" refId="3"/>
8484
<end type="TARGET" refId="4"/>
8585
</realization>
86-
<dependency id="12">
87-
<end type="SOURCE" refId="1"/>
88-
<end type="TARGET" refId="2"/>
89-
</dependency>
90-
<generalization id="13">
86+
<generalization id="12">
9187
<end type="SOURCE" refId="4"/>
9288
<end type="TARGET" refId="6"/>
9389
</generalization>
90+
<dependency id="13">
91+
<end type="SOURCE" refId="1"/>
92+
<end type="TARGET" refId="2"/>
93+
</dependency>
9494
<classifier-display autosize="true" stereotype="true" package="true" initial-value="true" signature="true"
9595
sort-features="false" accessors="true" visibility="true">
9696
<attributes public="true" package="true" protected="true" private="true" static="true"/>

‎fluentinterface/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
<artifactId>urm-maven-plugin</artifactId>
2424
<configuration>
2525
<packages>
26-
<param>com.iluwatar.fluentinterface</param>
27-
<param>com.iluwatar.fluentinterface.fluentiterable</param>
26+
<param>com.iluwatar.fluentinterface.app</param>
27+
<param>com.iluwatar.fluentinterface.fluentiterable.core</param>
2828
<param>com.iluwatar.fluentinterface.fluentiterable.lazy</param>
2929
<param>com.iluwatar.fluentinterface.fluentiterable.simple</param>
3030
</packages>

‎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,6 +1,6 @@
11
package com.iluwatar.fluentinterface.app;
22

3-
import com.iluwatar.fluentinterface.fluentiterable.FluentIterable;
3+
import com.iluwatar.fluentinterface.fluentiterable.core.FluentIterable;
44
import com.iluwatar.fluentinterface.fluentiterable.lazy.LazyFluentIterable;
55
import com.iluwatar.fluentinterface.fluentiterable.simple.SimpleFluentIterable;
66

fluentinterface/src/main/java/com/iluwatar/fluentinterface/fluentiterable/FluentIterable.java renamed to fluentinterface/src/main/java/com/iluwatar/fluentinterface/fluentiterable/core/FluentIterable.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.iluwatar.fluentinterface.fluentiterable;
1+
package com.iluwatar.fluentinterface.fluentiterable.core;
22

33
import java.util.ArrayList;
44
import java.util.Iterator;

‎fluentinterface/src/main/java/com/iluwatar/fluentinterface/fluentiterable/lazy/LazyFluentIterable.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import java.util.function.Function;
88
import java.util.function.Predicate;
99

10-
import com.iluwatar.fluentinterface.fluentiterable.FluentIterable;
10+
import com.iluwatar.fluentinterface.fluentiterable.core.FluentIterable;
1111

1212
/**
1313
* This is a lazy implementation of the FluentIterable interface. It evaluates all chained

‎fluentinterface/src/main/java/com/iluwatar/fluentinterface/fluentiterable/simple/SimpleFluentIterable.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
package com.iluwatar.fluentinterface.fluentiterable.simple;
22

3-
import com.iluwatar.fluentinterface.fluentiterable.FluentIterable;
4-
53
import java.util.*;
64
import java.util.function.Consumer;
75
import java.util.function.Function;
86
import java.util.function.Predicate;
97

8+
import com.iluwatar.fluentinterface.fluentiterable.core.FluentIterable;
9+
1010
/**
1111
* This is a simple implementation of the FluentIterable interface. It evaluates all chained
1212
* operations eagerly. This implementation would be costly to be utilized in real applications.

0 commit comments

Comments
 (0)