fix clash

This commit is contained in:
Bruce Eckel 2015-05-29 14:42:32 -07:00
parent 51d7993818
commit ac323d6dce
4 changed files with 7 additions and 5 deletions

View File

@ -1,2 +1,3 @@
del innerclasses\ArgReturnReferences.java
del innerclasses\MultiInterfaces.java del innerclasses\MultiInterfaces.java
del logging\EmailLogger.java del logging\EmailLogger.java

View File

@ -1,7 +1,7 @@
//: innerclasses/ArgReturnReferences.java //: innerclasses/arr/ArgReturnReferences.java
// ©2015 MindView LLC: see Copyright.txt // ©2015 MindView LLC: see Copyright.txt
// Demonstrates method references // Demonstrates method references
package innerclasses; package innerclasses.arr;
import java.util.function.*; import java.util.function.*;
import static net.mindview.util.Print.*; import static net.mindview.util.Print.*;

View File

@ -8,7 +8,6 @@
<target name="run" description="Compile and run" depends="build"> <target name="run" description="Compile and run" depends="build">
<jrun cls="AnonymousConstructor" /> <jrun cls="AnonymousConstructor" />
<jrun cls="innerclasses.ArgReturnReferences" dirpath="../innerclasses" />
<jrun cls="BigEgg" /> <jrun cls="BigEgg" />
<jrun cls="BigEgg2" /> <jrun cls="BigEgg2" />
<jrun cls="innerclasses.Callbacks" dirpath="../innerclasses" /> <jrun cls="innerclasses.Callbacks" dirpath="../innerclasses" />
@ -41,6 +40,7 @@
<jrun cls="TestBed$Tester" /> <jrun cls="TestBed$Tester" />
<jrun cls="TestParcel" /> <jrun cls="TestParcel" />
<jrun cls="UnboundMethodReference" /> <jrun cls="UnboundMethodReference" />
<jrun cls="innerclasses.arr.ArgReturnReferences" dirpath="../innerclasses/arr" />
<jrun cls="innerclasses.mui.MultiInterfaces" dirpath="../innerclasses/mui" /> <jrun cls="innerclasses.mui.MultiInterfaces" dirpath="../innerclasses/mui" />
</target> </target>

View File

@ -1,6 +1,7 @@
//: innerclasses/MultiInterfaces.java //: innerclasses/mui/MultiInterfaces.java
// ©2015 MindView LLC: see Copyright.txt
// Two ways that a class can implement multiple interfaces. // Two ways that a class can implement multiple interfaces.
package innerclasses; package innerclasses.mui;
interface A {} interface A {}
interface B {} interface B {}