Index: .project
===================================================================
--- .project	(revision 143)
+++ .project	(working copy)
@@ -1,24 +1,30 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>CoverageViewer</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>com.adobe.flexbuilder.project.flexbuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>com.adobe.flexbuilder.apollo.apollobuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>com.adobe.flexbuilder.apollo.apollonature</nature>
-		<nature>com.adobe.flexbuilder.project.flexnature</nature>
-		<nature>com.adobe.flexbuilder.project.actionscriptnature</nature>
-	</natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>CoverageViewer</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>com.adobe.flexbuilder.project.apollobuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>com.adobe.flexbuilder.project.flexbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>com.adobe.flexbuilder.apollo.apollobuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>com.adobe.flexbuilder.project.apollonature</nature>
+		<nature>com.adobe.flexbuilder.apollo.apollonature</nature>
+		<nature>com.adobe.flexbuilder.project.flexnature</nature>
+		<nature>com.adobe.flexbuilder.project.actionscriptnature</nature>
+	</natures>
+</projectDescription>
Index: src/CoverageViewer-app.xml
===================================================================
--- src/CoverageViewer-app.xml	(revision 143)
+++ src/CoverageViewer-app.xml	(working copy)
@@ -21,7 +21,7 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE
  * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  -->
-<application xmlns="http://ns.adobe.com/air/application/1.0">
+<application xmlns="http://ns.adobe.com/air/application/1.5">
 
 <!-- Adobe AIR Application Descriptor File Template.
 
Index: src/com/allurent/coverage/model/application/Recorder.as
===================================================================
--- src/com/allurent/coverage/model/application/Recorder.as	(revision 143)
+++ src/com/allurent/coverage/model/application/Recorder.as	(working copy)
@@ -30,8 +30,11 @@
 	import com.allurent.coverage.model.ICoverageModel;
 	
 	import flash.events.EventDispatcher;
+	import flash.utils.getQualifiedClassName;
 	
 	import mx.formatters.NumberFormatter;
+	import mx.logging.ILogger;
+	import mx.logging.Log;
 	
     /** Recording of coverage data started. */
     [Event(name="recordingStart",
@@ -67,6 +70,7 @@
         private var coverageElementsMap:Object;
         private var numCoverageElements:uint = 0;		
 		private var timer:IOneTimeInterval;
+		private var _log:ILogger;
 		
 		public function Recorder(coverageModel:ICoverageModel, 
 		                          timer:IOneTimeInterval)
@@ -77,6 +81,7 @@
 			currentRecording = "";
 			coverageElementsMap = {};
 			recordingTimeout = 2000;
+			_log = Log.getLogger(getQualifiedClassName(this).replace("::","."));
 		}
 
 		public function record(keyMap:Object):void	
@@ -120,12 +125,14 @@
             if(hasReceivedDataAndHasNotStartedYet)
             {
                 startCoverageRecording();
-                trace("Recorder.record startCoverageRecording: ");
+                _log.debug("startCoverageRecording");
+                //trace("Recorder.record startCoverageRecording: ");
             }
             
             if(autoUpdate && !isEmpty)
             {
-            	trace("Recorder.record recordingTimeout: " + recordingTimeout);
+            	_log.debug("recordingTimeout"+ recordingTimeout);
+            //	trace("Recorder.record recordingTimeout: " + recordingTimeout);
             	timer.delay(recordingTimeout, handleRecordingTimeout);
             }          
 		}
@@ -142,7 +149,8 @@
             }
             
             var hasParsed:Boolean = (numCoverageElements > 0);
-            trace("Recorder.applyCoverageData ");
+            _log.debug("applyCoverageData");
+//            trace("Recorder.applyCoverageData ");
             coverageElementsMap = {};
             numCoverageElements = 0;
             currentStatusMessage = "";
@@ -166,7 +174,8 @@
             currentRecording = "";
             timer.clear();
             createStatusMessage();
-            trace("Recorder.endCoverageRecording recordingTimeout ");
+            _log.debug("endCoverageRecording recordingTimeout");
+          //  trace("Recorder.endCoverageRecording recordingTimeout ");
             dispatchEvent(new CoverageEvent(CoverageEvent.RECORDING_END));
         }
         
Index: src/com/allurent/coverage/service/CoverageCommunicator.as
===================================================================
--- src/com/allurent/coverage/service/CoverageCommunicator.as	(revision 143)
+++ src/com/allurent/coverage/service/CoverageCommunicator.as	(working copy)
@@ -35,8 +35,11 @@
 	import flash.events.SecurityErrorEvent;
 	import flash.events.StatusEvent;
 	import flash.utils.Dictionary;
+	import flash.utils.getQualifiedClassName;
 	
 	import mx.controls.Alert;
+	import mx.logging.ILogger;
+	import mx.logging.Log;
 	
     /** This event is dispatched when a coverageEnd even is received from the sender.*/
     [Event(name="coverageEnd",
@@ -72,8 +75,11 @@
         private var recorder:IRecorder;
 		private var isTooBusyToReceiveMore:Boolean;
 		
+		private var _log:ILogger;
+		
 	    public function CoverageCommunicator(recorder:IRecorder)
 		{
+	       _log = Log.getLogger(getQualifiedClassName(this).replace("::","."))
 	       this.recorder = recorder;
            this.recorder.addEventListener(CoverageEvent.RECORDING_END, onRecordingEnd);
            this.recorder.addEventListener(CoverageEvent.PARSING_END, onParsingEnd);	       
@@ -101,7 +107,8 @@
             }
             
             // Set up our LocalConnection.  Note that the Controller handles
-            trace("attachConnection coverageDataConnection: " + connectionName);
+            _log.debug("attachConnection coverageDataConnection: " + connectionName);
+            //trace("attachConnection coverageDataConnection: " + connectionName);
             coverageDataConnection = createCoverageDataConnection();
             coverageDataConnection.allowDomain("*");
             coverageDataConnection.client = this;
@@ -135,12 +142,14 @@
          */
         public function coverageData(keyMap:Object, mapNumber:int):void
         {
-        	trace("Received keyMap ", mapNumber);
+        	_log.debug("coverage Data #"+mapNumber);
+        	//Alert.show("Received keyMap ", mapNumber.toString());
         	lastMapNumber = mapNumber; 
         	
             if(keyMap == null)
             {
-                trace("++++++++++CoverageCommunicator.coverageData ");
+                _log.debug("++++++++++CoverageCommunicator.coverageData null keymap");
+               // trace("++++++++++CoverageCommunicator.coverageData ");
                 sendRegistration();
             }
             else
@@ -164,6 +173,8 @@
          */
         public function coverageDataAndExit(keyMap:Object, mapNumber:int):void
         {
+         //  Alert.show("coverage data & exit");
+         	 _log.debug("coverage data & exit");
             coverageData(keyMap, mapNumber);
             dispatchEvent(new Event(COVERAGE_END_EVENT));
         }
@@ -186,8 +197,8 @@
         		currentAckConnection = 1;
         	}
         	var name:String = getACKConnectionName(currentAckConnection);
-        	
-        	trace("rotateConnection " + name);
+        	_log.debug("rotateConnection");
+        	//trace("rotateConnection " + name);
         	return name;
         }
 
@@ -205,12 +216,13 @@
         private function sendRegistration():void
         {
             var name:String = getACKConnectionName(++ackConnectionCounter);            
-            trace("sendRegistration name " + name);
+            _log.debug("sendRegistration name " + name);
+//            trace("sendRegistration name " + name);
             
             var ackConnection:ISendingLocalConnection = initializeAckConnection();
         	registerAckConnection(name, ackConnection);
-            
-            trace("sendRegistration ackConnection " + ackConnection);
+            _log.debug("sendRegistration ackConnection " + ackConnection);
+//            trace("sendRegistration ackConnection " + ackConnection);
             sendACK(name, lastMapNumber);
         }
         
@@ -234,7 +246,8 @@
             try
             {
                 //send ack of received message
-                trace("Sending ACK of " + mapNumber + " via ", ackConnectionName);
+//                trace("Sending ACK of " + mapNumber + " via ", ackConnectionName);
+                _log.debug("Sending ACK of " + mapNumber + " via ", ackConnectionName);
                 var ackConnection:ISendingLocalConnection = ISendingLocalConnection(ackConnections[ackConnectionName]);
                 ackConnection.send(ackConnectionName, ACK_HANDLER, mapNumber);
             }
@@ -263,7 +276,8 @@
         
         private function handleConnectionError(e:ErrorEvent):void
         {
-            trace("CoverageCommunicator.handleConnectionError: " + e.text);
+            _log.error("CoverageCommunicator.handleConnectionError: " + e.text);
+          //  trace("CoverageCommunicator.handleConnectionError: " + e.text);
             Alert.show(e.type + " " + e.text, "Coverage Recording Acknowledgement Error");
         }
         
@@ -271,11 +285,13 @@
         {
             if (e.level == "error")
             {
-                trace("CoverageCommunicator.handleConnectionStatus: level error, code " + e.code);
+                _log.error("CoverageCommunicator.handleConnectionStatus: level error, code " + e.code);
+                //trace("CoverageCommunicator.handleConnectionStatus: level error, code " + e.code);
             }
             else if (e.level == "status")
             {
-                trace("CoverageCommunicator.handleConnectionStatus: level status, code " + e.code);
+               _log.info("CoverageCommunicator.handleConnectionStatus: level status, code " + e.code);
+               // trace("CoverageCommunicator.handleConnectionStatus: level status, code " + ObjectUtil.toString(e));
             }
         }
 	}
Index: src/com/allurent/coverage/Controller.as
===================================================================
--- src/com/allurent/coverage/Controller.as	(revision 143)
+++ src/com/allurent/coverage/Controller.as	(working copy)
@@ -1,261 +1,293 @@
 /* 
- * Copyright (c) 2008 Allurent, Inc.
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify,
- * merge, publish, distribute, sublicense, and/or sell copies of the
- * Software, and to permit persons to whom the Software is furnished
- * to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
- * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE
- * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
- 
+* Copyright (c) 2008 Allurent, Inc.
+*
+* Permission is hereby granted, free of charge, to any person
+* obtaining a copy of this software and associated documentation
+* files (the "Software"), to deal in the Software without restriction,
+* including without limitation the rights to use, copy, modify,
+* merge, publish, distribute, sublicense, and/or sell copies of the
+* Software, and to permit persons to whom the Software is furnished
+* to do so, subject to the following conditions:
+*
+* The above copyright notice and this permission notice shall be
+* included in all copies or substantial portions of the Software.
+*
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+* OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE
+* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
 //TODO: way too many responsiblities. Needs refactoring.
 package com.allurent.coverage
 {
-    import com.allurent.coverage.event.CoverageEvent;
-    import com.allurent.coverage.model.ICoverageModel;
-    import com.allurent.coverage.model.application.IRecorder;
-    import com.allurent.coverage.model.application.ProjectModel;
-    import com.allurent.coverage.model.application.Recorder;
-    import com.allurent.coverage.parse.CommandLineOptionsParser;
-    import com.allurent.coverage.parse.CoverageReportParser;
-    import com.allurent.coverage.parse.FileParser;
-    import com.allurent.coverage.parse.MetadataParser;
-    import com.allurent.coverage.parse.TraceLogParser;
-    import com.allurent.coverage.service.CoverageCommunicator;
-    import com.allurent.coverage.service.ICoverageCommunicator;
-    
-    import flash.desktop.NativeApplication;
-    import flash.events.Event;
-    import flash.events.EventDispatcher;
-    import flash.filesystem.File;
-    import flash.filesystem.FileMode;
-    import flash.filesystem.FileStream;
-    
-    /** This event is dispatched when the coverage model is updated with new metadata. */
-    [Event(name="coverageModelChange",
+	import com.allurent.coverage.event.CoverageEvent;
+	import com.allurent.coverage.model.ICoverageModel;
+	import com.allurent.coverage.model.application.IRecorder;
+	import com.allurent.coverage.model.application.ProjectModel;
+	import com.allurent.coverage.model.application.Recorder;
+	import com.allurent.coverage.parse.CommandLineOptionsParser;
+	import com.allurent.coverage.parse.CoverageReportParser;
+	import com.allurent.coverage.parse.EMMAReportAdapter;
+	import com.allurent.coverage.parse.FileParser;
+	import com.allurent.coverage.parse.MetadataParser;
+	import com.allurent.coverage.parse.TraceLogParser;
+	import com.allurent.coverage.service.CoverageCommunicator;
+	import com.allurent.coverage.service.ICoverageCommunicator;
+	
+	import flash.desktop.NativeApplication;
+	import flash.events.Event;
+	import flash.events.EventDispatcher;
+	import flash.filesystem.File;
+	import flash.filesystem.FileMode;
+	import flash.filesystem.FileStream;
+	
+	import mx.controls.Alert;
+	
+	/** This event is dispatched when the coverage model is updated with new metadata. */
+	[Event(name="coverageModelChange",
             type="com.allurent.coverage.event.CoverageEvent")]                       
-    /** Recording of coverage data ended. Bubbled up from Recorder */
-    [Event(name="recordingEnd",
+	/** Recording of coverage data ended. Bubbled up from Recorder */
+	[Event(name="recordingEnd",
             type="com.allurent.coverage.event.CoverageEvent")]    
-    
-    
-    /**
-     * Overall Controller for actions in the Coverage Viewer application. 
-     * 
-     */
-    public class Controller extends EventDispatcher implements IController
-    {
-        [Bindable]
-        public var project:ProjectModel;
-        [Bindable]
-        public var recorder:IRecorder;
-        public var communicator:ICoverageCommunicator;
-        
-        [Bindable]
-        public var coverageModel:ICoverageModel;
-        [Bindable]
-        public var isCoverageDataCleared:Boolean;
-        
-        [Bindable]
-        public var currentStatusMessage:String;        
-        
-        /**
-         * Flag indicating that application should exit when instrumented app is done.
-         * and all pending data has been written.
-         */ 
-        public var autoExit:Boolean;
-        
-        /**
-         * Output file to which coverage data should be written when application is done.
-         */
-        public var coverageOutputFile:File;        
-        
-        public function Controller(project:ProjectModel)
-        {
-        	currentStatusMessage = "";
-        	isCoverageDataCleared = true;
-        	
-            this.project = project;
-        }
-        
-        public function setup(coverageModel:ICoverageModel, 
-                              recorder:IRecorder, 
-                              communicator:ICoverageCommunicator):void
-        {
-            this.coverageModel = coverageModel;        
-            this.recorder = recorder;
-            this.recorder.addEventListener(CoverageEvent.RECORDING_END, handleRecorderEvents);
-            this.recorder.addEventListener(CoverageEvent.PARSING_END, handleRecorderEvents);            
-            
-            this.communicator = communicator;
-            this.communicator.addEventListener(CoverageCommunicator.COVERAGE_END_EVENT, 
-                                               onCoverageEnd);                  	
-        }
-        
-        public function processCommandLineArguments(arguments:Array):void
-        {
-            var parser:CommandLineOptionsParser = new CommandLineOptionsParser(this);            
-            parser.addEventListener(CoverageEvent.COVERAGE_MODEL_CHANGE, dispatchEvent);            
-            parser.parse(arguments);        	
-        }
-        
-        public function processFileArgument(files:Array):void
-        {
-            var parser:FileParser = new FileParser(this);
-            parser.addEventListener(
-                            CoverageEvent.COVERAGE_MODEL_CHANGE, 
-                            dispatchEvent);
-            for each (var f:File in files)
-            {
-                parser.parse(f);
-            }
-        }
-        
-        /**
-         * Load an XML project definition file.
-         *  
-         * @param file the project file to be loaded.
-         */
-        public function loadProject(file:File):void
-        {
-            var input:FileStream = new FileStream();
-            input.open(file, FileMode.READ);
-            var fileContents:String = input.readUTFBytes(input.bytesAvailable);
-            input.close();
-            
-            project = new ProjectModel();
-            project.fromXML(new XML(fileContents));
-            loadProjectContents();
-        }
-        
-        /**
-         * Load a new coverage model from the currently active project definition. 
-         * Note that this definition need not have been read from a project file, but may
-         * have been constructed directly from command line options.
-         */
-        public function loadProjectContents():void
-        {
-            for each (var metadataFile:String in project.metadataFiles)
-            {
-                loadMetadata(new File(metadataFile));
-            }
-
-            for each (var traceLog:String in project.traceLogs)
-            {
-                loadTraceLog(new File(traceLog));
-            }
-        }
-
-        /**
-         * Load a metadata file into the project. 
-         */
-        public function loadMetadata(metadataFile:File):void
-        {
-            new MetadataParser(coverageModel, project).parseFile(metadataFile);
-            dispatchCoverageModelChangeEvent();
-        }  
-
-        /**
-         * Load a trace log file into the project. 
-         */
-        public function loadTraceLog(traceLog:File):void
-        {
-            new TraceLogParser(coverageModel, project).parseFile(traceLog);
-        }
-        
-        /**
-         * Load a coverage report into the project. 
-         */
-        public function loadCoverageReport(report:File):void
-        {
-            new CoverageReportParser(coverageModel, project).parseFile(report);
-            isCoverageDataCleared = false;
-            dispatchCoverageModelChangeEvent();
-        }
-        
-        public function endCoverageRecording():void
-        {
-            recorder.endCoverageRecording();
-        }
-
-        public function applyCoverageData():void
-        {
-        	recorder.applyCoverageData();
-        }
-        
-        public function clearCoverageData():void
-        {
-            coverageModel.clearCoverageData();
-            isCoverageDataCleared = true;
-        }
-
-        /**
-         * Handle closure of the application. 
-         * 
-         */
-        public function close():void
-        {
-            if (coverageOutputFile != null)
-            {
-                applyCoverageData();
-                writeReport(coverageOutputFile);
-            }
-            NativeApplication.nativeApplication.exit();
-        }
-        
-        /**
-         * Write accumulated coverage data to an output file if specified. 
-         */
-        public function writeReport(f:File):void
-        {
-            var out:FileStream = new FileStream();
-            out.open(f, FileMode.WRITE);
-            out.writeUTFBytes(coverageModel.toXML().toXMLString());
-            out.writeUTFBytes("\n");
-            out.close();
-        }
-        
-        private function onCoverageEnd(event:Event):void
-        {
-            if (coverageOutputFile != null)
-            {
-                applyCoverageData();
-                writeReport(coverageOutputFile);
-            }
-            if (autoExit)
-            {
-                NativeApplication.nativeApplication.exit();
-            }
-        }        
-        
-        private function handleRecorderEvents(event:CoverageEvent):void
-        {
-        	if(event.type == CoverageEvent.PARSING_END && event.hasParsed)
-        	{
-        		isCoverageDataCleared = false;
-        	}
-            currentStatusMessage = Recorder(event.currentTarget).currentStatusMessage;
-            dispatchEvent(event);
-        }
-        
-        private function dispatchCoverageModelChangeEvent():void
-        {
-            dispatchEvent(new CoverageEvent(
-            						CoverageEvent.COVERAGE_MODEL_CHANGE, 
-            						coverageModel));
-        }
-    }
+	
+	
+	/**
+	 * Overall Controller for actions in the Coverage Viewer application. 
+	 * 
+	 */
+	public class Controller extends EventDispatcher implements IController
+	{
+		[Bindable]
+		public var project:ProjectModel;
+		[Bindable]
+		public var recorder:IRecorder;
+		public var communicator:ICoverageCommunicator;
+		
+		[Bindable]
+		public var coverageModel:ICoverageModel;
+		[Bindable]
+		public var isCoverageDataCleared:Boolean;
+		
+		[Bindable]
+		public var currentStatusMessage:String;        
+		
+		/**
+		 * Flag indicating that application should exit when instrumented app is done.
+		 * and all pending data has been written.
+		 */ 
+		public var autoExit:Boolean;
+		
+		/**
+		 * Output file to which coverage data should be written when application is done.
+		 */
+		public var coverageOutputFile:File;
+		public var emmaOutputFile:File;
+		
+		public function Controller(project:ProjectModel)
+		{
+			currentStatusMessage = "";
+			isCoverageDataCleared = true;
+			
+			this.project = project;
+		}
+		
+		public function setup(coverageModel:ICoverageModel, 
+							  recorder:IRecorder, 
+							  communicator:ICoverageCommunicator):void
+		{
+			this.coverageModel = coverageModel;        
+			this.recorder = recorder;
+			this.recorder.addEventListener(CoverageEvent.RECORDING_END, handleRecorderEvents);
+			this.recorder.addEventListener(CoverageEvent.PARSING_END, handleRecorderEvents);            
+			
+			this.communicator = communicator;
+			this.communicator.addEventListener(CoverageCommunicator.COVERAGE_END_EVENT, 
+				onCoverageEnd);                  	
+		}
+		
+		public function processCommandLineArguments(arguments:Array):void
+		{
+			var parser:CommandLineOptionsParser = new CommandLineOptionsParser(this);            
+			parser.addEventListener(CoverageEvent.COVERAGE_MODEL_CHANGE, dispatchEvent);            
+			parser.parse(arguments);        	
+		}
+		
+		public function processFileArgument(files:Array):void
+		{
+			var parser:FileParser = new FileParser(this);
+			parser.addEventListener(
+				CoverageEvent.COVERAGE_MODEL_CHANGE, 
+				dispatchEvent);
+			for each (var f:File in files)
+			{
+				parser.parse(f);
+			}
+		}
+		
+		/**
+		 * Load an XML project definition file.
+		 *  
+		 * @param file the project file to be loaded.
+		 */
+		public function loadProject(file:File):void
+		{
+			var input:FileStream = new FileStream();
+			input.open(file, FileMode.READ);
+			var fileContents:String = input.readUTFBytes(input.bytesAvailable);
+			input.close();
+			
+			project = new ProjectModel();
+			project.fromXML(new XML(fileContents));
+			loadProjectContents();
+		}
+		
+		/**
+		 * Load a new coverage model from the currently active project definition. 
+		 * Note that this definition need not have been read from a project file, but may
+		 * have been constructed directly from command line options.
+		 */
+		public function loadProjectContents():void
+		{
+			for each (var metadataFile:String in project.metadataFiles)
+			{
+				loadMetadata(new File(metadataFile));
+			}
+			
+			for each (var traceLog:String in project.traceLogs)
+			{
+				loadTraceLog(new File(traceLog));
+			}
+		}
+		
+		/**
+		 * Load a metadata file into the project. 
+		 */
+		public function loadMetadata(metadataFile:File):void
+		{
+			new MetadataParser(coverageModel, project).parseFile(metadataFile);
+			dispatchCoverageModelChangeEvent();
+		}  
+		
+		/**
+		 * Load a trace log file into the project. 
+		 */
+		public function loadTraceLog(traceLog:File):void
+		{
+			new TraceLogParser(coverageModel, project).parseFile(traceLog);
+		}
+		
+		/**
+		 * Load a coverage report into the project. 
+		 */
+		public function loadCoverageReport(report:File):void
+		{
+			new CoverageReportParser(coverageModel, project).parseFile(report);
+			isCoverageDataCleared = false;
+			dispatchCoverageModelChangeEvent();
+		}
+		
+		public function endCoverageRecording():void
+		{
+			recorder.endCoverageRecording();
+		}
+		
+		public function applyCoverageData():void
+		{
+			recorder.applyCoverageData();
+		}
+		
+		public function clearCoverageData():void
+		{
+			coverageModel.clearCoverageData();
+			isCoverageDataCleared = true;
+		}
+		
+		/**
+		 * Handle closure of the application. 
+		 * 
+		 */
+		public function close():void
+		{
+			if (coverageOutputFile != null)
+			{
+				applyCoverageData();
+				writeReport(coverageOutputFile);
+				writeReports();
+			}
+			NativeApplication.nativeApplication.exit();
+		}
+		
+		/**
+		 * Write accumulated coverage data to an output file if specified. 
+		 */
+		public function writeReport(f:File):void
+		{
+			var out:FileStream = new FileStream();
+			out.open(f, FileMode.WRITE);
+			out.writeUTFBytes(coverageModel.toXML().toXMLString());
+			out.writeUTFBytes("\n");
+			out.close();
+		}
+		
+		private function writeReports():void{
+			var str:String = "writingreports: "
+			if(coverageOutputFile!=null){
+				str += coverageOutputFile.nativePath;
+				writeReport(coverageOutputFile);
+			}
+			if(emmaOutputFile != null){
+				str += "\n "+emmaOutputFile.nativePath;
+				writeEmmaReport(emmaOutputFile);
+			}
+			Alert.show(str);
+		}        
+		
+		private function writeEmmaReport(f:File):void{
+			
+			var xml:XML = coverageModel.toXML(); 
+			var emmaXML:XML = new EMMAReportAdapter(xml).toEmmaFormat();
+			var out:FileStream = new FileStream();
+			out.open(f, FileMode.WRITE);
+			out.writeUTFBytes(emmaXML.toXMLString());
+			out.writeUTFBytes("\n");
+			out.close();
+		}
+		
+		private function onCoverageEnd(event:Event):void
+		{
+			if (coverageOutputFile != null)
+			{
+				applyCoverageData();
+				writeReport(coverageOutputFile);
+				writeReports();
+			}
+			if (autoExit)
+			{
+				NativeApplication.nativeApplication.exit();
+			}
+		} 
+		
+		
+		
+		private function handleRecorderEvents(event:CoverageEvent):void
+		{
+			if(event.type == CoverageEvent.PARSING_END && event.hasParsed)
+			{
+				isCoverageDataCleared = false;
+			}
+			currentStatusMessage = Recorder(event.currentTarget).currentStatusMessage;
+			dispatchEvent(event);
+		}
+		
+		private function dispatchCoverageModelChangeEvent():void
+		{
+			dispatchEvent(new CoverageEvent(
+				CoverageEvent.COVERAGE_MODEL_CHANGE, 
+				coverageModel));
+		}
+	}
 }
\ No newline at end of file
Index: src/com/allurent/coverage/parse/CommandLineOptionsParser.as
===================================================================
--- src/com/allurent/coverage/parse/CommandLineOptionsParser.as	(revision 143)
+++ src/com/allurent/coverage/parse/CommandLineOptionsParser.as	(working copy)
@@ -95,6 +95,12 @@
                     controller.autoExit = true;
                     controller.recorder.autoUpdate = false;
                     break;
+                
+                case "emma-report":
+                	controller.emmaOutputFile = new File(arg);
+                    controller.autoExit = true;
+                    controller.recorder.autoUpdate = false;
+                    break;
                     
                 case "coverage-metadata":
                     controller.loadMetadata(new File(arg));
Index: .flexProperties
===================================================================
--- .flexProperties	(revision 143)
+++ .flexProperties	(working copy)
@@ -1,2 +1,2 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<flexProperties flexServerType="0" toolCompile="true" useServerFlexSDK="false" version="1"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<flexProperties enableServiceManager="false" flexServerFeatures="0" flexServerType="0" toolCompile="true" useServerFlexSDK="false" version="1"/>
Index: .actionScriptProperties
===================================================================
--- .actionScriptProperties	(revision 143)
+++ .actionScriptProperties	(working copy)
@@ -1,27 +1,29 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<actionScriptProperties mainApplicationPath="CoverageViewer.mxml" version="3">
-<compiler additionalCompilerArguments="-locale en_US" copyDependentFiles="true" enableModuleDebug="true" flexSDK="Flex 3" generateAccessible="false" htmlExpressInstall="false" htmlGenerate="false" htmlHistoryManagement="false" htmlPlayerVersion="9.0.28" htmlPlayerVersionCheck="false" outputFolderPath="bin-debug" sourceFolderPath="src" strict="true" useApolloConfig="false" verifyDigests="true" warn="true">
-<compilerSourcePath/>
-<libraryPath defaultLinkType="1">
-<libraryPathEntry kind="4" path="">
-<modifiedEntries>
-<libraryPathEntry kind="3" linkType="4" path="${PROJECT_FRAMEWORKS}/libs/framework.swc" useDefaultLinkType="true">
-<crossDomainRsls>
-<crossDomainRslEntry autoExtract="true" policyFileUrl="" rslUrl="framework_3.0.${build.number}.swz"/>
-<crossDomainRslEntry autoExtract="true" policyFileUrl="" rslUrl="framework_3.0.${build.number}.swf"/>
-</crossDomainRsls>
-</libraryPathEntry>
-</modifiedEntries>
-</libraryPathEntry>
-<libraryPathEntry kind="3" linkType="1" path="${PROJECT_FRAMEWORKS}/libs/datavisualization.swc" useDefaultLinkType="false"/>
-<libraryPathEntry kind="3" linkType="1" path="/CoverageUtilities/bin/CoverageUtilities.swc" useDefaultLinkType="false"/>
-<libraryPathEntry kind="3" linkType="1" path="/CoverageAgent/bin/CoverageAgent.swc" useDefaultLinkType="false"/>
-</libraryPath>
-<sourceAttachmentPath/>
-</compiler>
-<applications>
-<application path="CoverageViewer.mxml"/>
-</applications>
-<modules/>
-<buildCSSFiles/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<actionScriptProperties analytics="false" mainApplicationPath="CoverageViewer.mxml" projectUUID="7d77db2f-e6b8-4c7a-8b1d-9f15de191607" version="10">
+  <compiler additionalCompilerArguments="-locale en_US -source-path+=locale/{locale}" autoRSLOrdering="false" copyDependentFiles="true" flexSDK="Flex 3.2" fteInMXComponents="false" generateAccessible="false" htmlExpressInstall="false" htmlGenerate="false" htmlHistoryManagement="false" htmlPlayerVersionCheck="false" includeNetmonSwc="false" outputFolderPath="bin-debug" removeUnusedRSL="true" sourceFolderPath="src" strict="true" targetPlayerVersion="0.0.0" useApolloConfig="false" useDebugRSLSwfs="true" verifyDigests="true" warn="true">
+    <compilerSourcePath/>
+    <libraryPath defaultLinkType="1">
+      <libraryPathEntry kind="4" path=""/>
+      <libraryPathEntry kind="3" linkType="1" path="/CoverageUtilities/bin/CoverageUtilities.swc" useDefaultLinkType="false"/>
+      <libraryPathEntry kind="3" linkType="1" path="/CoverageAgent/bin/CoverageAgent.swc" useDefaultLinkType="false"/>
+      <libraryPathEntry kind="1" linkType="1" path="libs"/>
+    </libraryPath>
+    <sourceAttachmentPath/>
+  </compiler>
+  <applications>
+    <application path="CoverageViewer.mxml">
+      <airExcludes/>
+    </application>
+  </applications>
+  <modules/>
+  <buildCSSFiles/>
+  <flashCatalyst validateFlashCatalystCompatibility="false"/>
+  <buildTargets>
+    <buildTarget buildTargetName="default">
+      <airSettings airCertificatePath="" airTimestamp="true" version="1">
+        <airExcludes/>
+      </airSettings>
+      <actionScriptSettings version="1"/>
+    </buildTarget>
+  </buildTargets>
 </actionScriptProperties>