[Tinyos-contrib-commits] CVS: tinyos-1.x/contrib/wustl/tools/java/edu/wustl/mobilab/agilla/messages AgillaErrorMsgJ.java, 1.2, 1.3

[Chien-Liang Fok]

Update of /cvsroot/tinyos/tinyos-1.x/contrib/wustl/tools/java/edu/wustl/mobilab/agilla/messages
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv26560/messages

Modified Files:
	AgillaErrorMsgJ.java 
Log Message:
Integrated new error checking code.

Index: AgillaErrorMsgJ.java
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/wustl/tools/java/edu/wustl/mobilab/agilla/messages/AgillaErrorMsgJ.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** AgillaErrorMsgJ.java	11 Nov 2005 02:15:49 -0000	1.2
--- AgillaErrorMsgJ.java	15 Nov 2006 00:22:41 -0000	1.3
***************
*** 35,42 ****
   * See the GNU Lesser General Public License for more details, which can
   * be found here: http://www.gnu.org/copyleft/lesser.html
!  */
! package edu.wustl.mobilab.agilla.messages;
  import edu.wustl.mobilab.agilla.*;
! import edu.wustl.mobilab.agilla.variables.*;
  /**
   * AgillaErrorMsgJ.java
--- 35,42 ----
   * See the GNU Lesser General Public License for more details, which can
   * be found here: http://www.gnu.org/copyleft/lesser.html
!  */
! package edu.wustl.mobilab.agilla.messages;
  import edu.wustl.mobilab.agilla.*;
! import edu.wustl.mobilab.agilla.variables.*;
  /**
   * AgillaErrorMsgJ.java
***************
*** 47,52 ****
  	private AgillaAgentID id;
  	private short cause, instr, sp;
! 	private int src, pc, reason1, reason2;
! 	public AgillaErrorMsgJ() {}
  	public AgillaErrorMsgJ(AgillaAgentID id, int src,
  	                       short cause, short pc, short instr,
--- 47,52 ----
  	private AgillaAgentID id;
  	private short cause, instr, sp;
! 	private int src, pc, reason1, reason2;
! 	public AgillaErrorMsgJ() {}
  	public AgillaErrorMsgJ(AgillaAgentID id, int src,
  	                       short cause, short pc, short instr,
***************
*** 61,65 ****
  		this.reason1 = reason1;
  		this.reason2 = reason2;
! 	}
  	public AgillaErrorMsgJ(AgillaErrorMsg msg) {
  		id = new AgillaAgentID(msg.get_id_id());
--- 61,65 ----
  		this.reason1 = reason1;
  		this.reason2 = reason2;
! 	}
  	public AgillaErrorMsgJ(AgillaErrorMsg msg) {
  		id = new AgillaAgentID(msg.get_id_id());
***************
*** 71,83 ****
  		reason1 = msg.get_reason1();
  		reason2 = msg.get_reason2();
! 	}
  	public AgillaAgentID getID() {
  		return id;
! 	}
  	public int getSrc() {
  		return src;
  	}
  	
! 	public short getCause() {
		return cause;
  	}
  	
--- 71,84 ----
  		reason1 = msg.get_reason1();
  		reason2 = msg.get_reason2();
! 	}
  	public AgillaAgentID getID() {
  		return id;
! 	}
  	public int getSrc() {
  		return src;
  	}
  	
! 	public short getCause() {
! 		return cause;
  	}
  	
***************
*** 92,103 ****
  	public short getSP() {
  		return sp;
! 	}
  	public int getReason1() {
  		return reason1;
! 	}
  	public int getReason2() {
  		return reason2;
! 	}
! 	public int getType() {
		//return AM_AGILLAERRORMSG;
  		return AgillaErrorMsg.AM_TYPE;
  	}
--- 93,105 ----
  	public short getSP() {
  		return sp;
! 	}
  	public int getReason1() {
  		return reason1;
! 	}
  	public int getReason2() {
  		return reason2;
! 	}
! 	public int getType() {
! 		//return AM_AGILLAERRORMSG;
  		return AgillaErrorMsg.AM_TYPE;
  	}
***************
*** 114,123 ****
  		msg.set_reason2(reason2);
  		return msg;
! 	}
  	public String toString() {
  		String result = "AgillaErrorMessage: \n";
  		result += "\t" + id + "\n";
  		result += "\tSource: " + src + "\n";
! 		result += "\tCause: " + cause + " (" + ErrorDisplayer.getCause(cause) + ")\n";
  		result += "\tpc: " + pc + "\n";
  		result += "\tinstruction: 0x" + Integer.toHexString(instr) + "\n";
--- 116,125 ----
  		msg.set_reason2(reason2);
  		return msg;
! 	}
  	public String toString() {
  		String result = "AgillaErrorMessage: \n";
  		result += "\t" + id + "\n";
  		result += "\tSource: " + src + "\n";
! 		result += "\tCause: " + cause + " (" + ErrorDisplayer.getDisplayer().getCause(cause) + ")\n";
  		result += "\tpc: " + pc + "\n";
  		result += "\tinstruction: 0x" + Integer.toHexString(instr) + "\n";
***************
*** 127,130 ****
  		return result;
  	}
! }
! 
--- 129,132 ----
  		return result;
  	}
! }
!