From d7f2631434392a1fd3a3e6f72b9557a854dd8eb4 Mon Sep 17 00:00:00 2001
From: Rob Greene <robgreene@gmail.com>
Date: Wed, 8 Nov 2017 13:27:22 -0600
Subject: [PATCH 1/2] Updating web site and rearranging a bit to save space per
 #6.

---
 .gitignore                                    |   2 +
 build/AppleCommander-boot.s                   |  42 +++++++++---------
 .../storage/AppleCommander-boot.dump          | Bin 254 -> 255 bytes
 3 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/.gitignore b/.gitignore
index ef55eb1..0cab0f6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,3 +18,5 @@ mac/AppleCommander.app/Contents/Info.plist
 .settings/org.eclipse.jdt.core.prefs
 build/ACBuild.properties
 build/AppleCommander.preferences
+*.o
+*.lst
diff --git a/build/AppleCommander-boot.s b/build/AppleCommander-boot.s
index 015d0bb..a769ebf 100644
--- a/build/AppleCommander-boot.s
+++ b/build/AppleCommander-boot.s
@@ -10,10 +10,13 @@
 
 ; Assemble this code with the cc65 toolchain:
 ;
-; cl65 AppleCommander-boot.s -t none --start-addr $0800
+; cl65 -t none --start-addr 0x0800 -l AppleCommander-boot.lst AppleCommander-boot.s
 ; then copy resulting AppleCommander-boot to:
 ; .../src/com/webcodepro/applecommander/storage/AppleCommander-boot.dump
 ;
+; Note that this command will hexdump a useful format for pasting and testing...
+; hexdump -e '"08%02.2_ax:" 16/1 "%02x " "\n"' AppleCommander-boot
+;
 
 ; Define as ASCII string with no attributes
 .macro  asc Arg
@@ -76,7 +79,7 @@ YOFFSET = 13
 ;
 ; Added a little chicanery for the Apple /// to branch around
 ; since it starts executing at the zeroeth byte, not the first.
-; This has the effect of setting carry based on machine type. 
+; This has the effect of setting carry based on machine type.
 ;
 .byte $01
 	SEC
@@ -140,25 +143,24 @@ WAIT:
 ; Rotate the screen (isn't that retro)!
 ;
 SETUP:
-	LDX #19
+  LDX #19
 ROTATE:
-	TXA
-	JSR CALCADDR
-	LDY #0
-	LDA (ADDR),Y
-	PHA
+  TXA
+  JSR CALCADDR
+  LDY #39
+  LDA (ADDR),Y
+  PHA
 SHIFT:
-	INY
-	LDA (ADDR),Y
-	DEY
-	STA (ADDR),Y
-	INY
-	CPY #39
-	BNE SHIFT
-	PLA
-	STA (ADDR),Y
-	DEX
-	BPL ROTATE
+  DEY
+  LDA (ADDR),Y
+  INY
+  STA (ADDR),Y
+  DEY
+  BNE SHIFT
+  PLA
+  STA (ADDR),Y
+  DEX
+  BPL ROTATE
 ;
 ; Introduce a pause between rotations.
 ;
@@ -198,7 +200,7 @@ DATA2:
 ;
 MESSAGE:
 	asccr "APPLECOMMANDER CREATED THIS DISK"
-	asccr "VISIT APPLECOMMANDER.SF.NET"
+	asccr "VISIT APPLECOMMANDER.GITHUB.IO"
 	.byte $8d
 	asc "INSERT ANOTHER DISK AND PRESS ANY KEY"
 	.byte $00
diff --git a/src/com/webcodepro/applecommander/storage/AppleCommander-boot.dump b/src/com/webcodepro/applecommander/storage/AppleCommander-boot.dump
index 0e6b496d52421f027beaa19518fa907c9a66ae54..207616cd0091526a349cde125a521a061428e443 100644
GIT binary patch
delta 96
zcmeyz_@8ltm_{jw7Z50<{Mg$DX0__<E#=VUUjgK5@=Ij$DoFk~b>ZgT858ZKWz{#T
yd30=4J26qM<HGlhiE5_=UaaI$Sn=o7g&!X-POOOFJbv=ZiK~a!ojgDBng#%Hd@Wo6

delta 95
zcmey*_>Xadm_|8=7Z50<{Mg$8X0__<E$7hWUjgK5@=Ij$DoFk~b>ZgTSrhG~<ry}r
xd7Rj&)-h4-!~yjSUo$4Eof3Gql0#v|pHmlpd^kU`EQ0Owv32K;UYU4Z0{}W^ECT=l


From c74e9ad3bd083b420bd1aea7177b0cfd8957f333 Mon Sep 17 00:00:00 2001
From: "T. Joseph Carter" <tjcarter@spiritsubstance.com>
Date: Mon, 13 Nov 2017 09:23:05 -0800
Subject: [PATCH 2/2] Fix my idiot attempt to fix this warning

My fix for the unchecked warning in AppleImage.java was completely dumb
and I had no idea what I was doing.  My understanding of how this works
is now greatly improved and the bug I introduced in 292afd2 is fixed.
---
 .../storage/filters/imagehandlers/AppleImage.java         | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/com/webcodepro/applecommander/storage/filters/imagehandlers/AppleImage.java b/src/com/webcodepro/applecommander/storage/filters/imagehandlers/AppleImage.java
index 540c15b..224643f 100644
--- a/src/com/webcodepro/applecommander/storage/filters/imagehandlers/AppleImage.java
+++ b/src/com/webcodepro/applecommander/storage/filters/imagehandlers/AppleImage.java
@@ -49,8 +49,7 @@ public abstract class AppleImage {
 	public static AppleImage create(int width, int height) {
 		String[] classes = {
 			"ImageIoImage", "SunJpegImage", "SwtImage" }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-		Class<?> constructorArgType = AppleImage.class;
-		Class<?>[] constructorArgClasses = new Class[] { AppleImage.class };
+		Class[] constructorArgClasses = new Class[] { int.class, int.class };
 		Object[] constructorArgs = new Object[] {
 			new Integer(width), new Integer(height) };
 		for (int i=0; i<classes.length; i++) {
@@ -58,8 +57,9 @@ public abstract class AppleImage {
 				Class<?> appleImageClass = Class.forName(
 					"com.webcodepro.applecommander.storage.filters.imagehandlers."  //$NON-NLS-1$
 					+ classes[i]);
-				Constructor constructor =
-					constructorArgType.getConstructor(constructorArgClasses);
+				Constructor<?> constructor =
+					appleImageClass.getConstructor(constructorArgClasses);
+
 				AppleImage appleImage = (AppleImage) 
 					constructor.newInstance(constructorArgs);
 				return appleImage;