fix clash

BruceEckel · BruceEckel · commit ac323d6dcebb · 2015-05-29T14:42:32.000-07:00
diff --git a/clean.bat b/clean.bat
@@ -1,2 +1,3 @@
+del innerclasses\ArgReturnReferences.java
 del innerclasses\MultiInterfaces.java
 del logging\EmailLogger.java
diff --git a/innerclasses/arr/ArgReturnReferences.java b/innerclasses/arr/ArgReturnReferences.java
@@ -1,7 +1,7 @@
-//: innerclasses/ArgReturnReferences.java
+//: innerclasses/arr/ArgReturnReferences.java
 // �2015 MindView LLC: see Copyright.txt
 // Demonstrates method references
-package innerclasses;
+package innerclasses.arr;
 import java.util.function.*;
 import static net.mindview.util.Print.*;
 
diff --git a/innerclasses/build.xml b/innerclasses/build.xml
@@ -8,7 +8,6 @@
 
   <target name="run" description="Compile and run" depends="build">
     <jrun cls="AnonymousConstructor" />
-    <jrun cls="innerclasses.ArgReturnReferences" dirpath="../innerclasses" />
     <jrun cls="BigEgg" />
     <jrun cls="BigEgg2" />
     <jrun cls="innerclasses.Callbacks" dirpath="../innerclasses" />
@@ -41,6 +40,7 @@
     <jrun cls="TestBed$Tester" />
     <jrun cls="TestParcel" />
     <jrun cls="UnboundMethodReference" />
+    <jrun cls="innerclasses.arr.ArgReturnReferences" dirpath="../innerclasses/arr" />
     <jrun cls="innerclasses.mui.MultiInterfaces" dirpath="../innerclasses/mui" />
   </target>
 
diff --git a/innerclasses/mui/MultiInterfaces.java b/innerclasses/mui/MultiInterfaces.java
@@ -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.
-package innerclasses;
+package innerclasses.mui;
 
 interface A {}
 interface B {}

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,3 @@`
	`1`	`+del innerclasses\ArgReturnReferences.java`
`1`	`2`	`del innerclasses\MultiInterfaces.java`
`2`	`3`	`del logging\EmailLogger.java`