From 1987164dc543deb088ec90214cf4a4ac19099819 Mon Sep 17 00:00:00 2001
From: Rob Greene <robgreene@gmail.com>
Date: Sun, 4 Mar 2018 13:27:08 -0600
Subject: [PATCH] Adding 'dos' and 'as' to the AntTask. #20

---
 .../webcodepro/applecommander/ui/AntTask.java | 23 +++++++++++++++----
 .../com/webcodepro/applecommander/ui/ac.java  |  2 +-
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/webcodepro/applecommander/ui/AntTask.java b/src/main/java/com/webcodepro/applecommander/ui/AntTask.java
index cbc5a80..eb4d9e6 100644
--- a/src/main/java/com/webcodepro/applecommander/ui/AntTask.java
+++ b/src/main/java/com/webcodepro/applecommander/ui/AntTask.java
@@ -1,5 +1,7 @@
 package com.webcodepro.applecommander.ui;
 
+import java.io.FileInputStream;
+
 /*
  * Copyright (C) 2012 by David Schmidt
  * david__schmidt at users.sourceforge.net
@@ -25,6 +27,7 @@ import java.io.PrintStream;
 
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Task;
+
 import com.webcodepro.applecommander.storage.Disk;
 import com.webcodepro.applecommander.storage.DiskException;
 import com.webcodepro.applecommander.storage.FormattedDisk;
@@ -35,7 +38,8 @@ public class AntTask extends Task
 	{
 		/*
 		 * Commands: 
-		 * cc65: <imagename> <filename> <type> 
+		 * dos: <imagename> <filename> <type>
+		 * as: <imagename> [<filename>] 
 		 * d: <imagename> <filename>
 		 * e: <imagename> <filename>
 		 * i: <imagename>
@@ -83,7 +87,7 @@ public class AntTask extends Task
 					System.out.println(ex.getMessage());
 			}
 		}
-		else if (_command.equals("p") || (_command.equals("cc65")))
+		else if (_command.equals("p") || (_command.equals("cc65") || (_command.equals("cc65")) || (_command.equals("as"))))
 		{
 			try
 			{
@@ -91,8 +95,19 @@ public class AntTask extends Task
 				{
 					com.webcodepro.applecommander.ui.ac.putFile(_input, _imageName, _fileName, _type, _address);
 				}
-				else
-					com.webcodepro.applecommander.ui.ac.putCC65(_input, _imageName, _fileName, _type);
+				else if (_command.equals("cc65")) 
+				{
+					System.err.println("Note: 'cc65' is deprecated.  Please use 'as' or 'dos' as appropriate."); 
+					com.webcodepro.applecommander.ui.ac.putDOS(_input, _imageName, _fileName, _type);
+				}
+				else if (_command.equals("dos")) 
+				{
+					com.webcodepro.applecommander.ui.ac.putDOS(_input, _imageName, _fileName, _type);
+				}
+				else {
+					com.webcodepro.applecommander.ui.ac.putAppleSingle(_imageName, _fileName,
+							new FileInputStream(_input));
+				}
 			}
 			catch (Exception ex)
 			{
diff --git a/src/main/java/com/webcodepro/applecommander/ui/ac.java b/src/main/java/com/webcodepro/applecommander/ui/ac.java
index be23d01..86e140e 100644
--- a/src/main/java/com/webcodepro/applecommander/ui/ac.java
+++ b/src/main/java/com/webcodepro/applecommander/ui/ac.java
@@ -247,7 +247,7 @@ public class ac {
 	 * Put file fileName into the file named fileOnImageName on the disk named imageName;
 	 * Assume a cc65 style four-byte header with start address in bytes 0-1.
 	 */
-	public static void putCC65(String fileName, String imageName, String fileOnImageName, String fileType)
+	public static void putDOS(String fileName, String imageName, String fileOnImageName, String fileType)
 		throws IOException, DiskException {
 
 		byte[] header = new byte[4];