[Tinyos-contrib-commits] CVS: tinyos-1.x/contrib/rincon/tools/java/com/rincon/blackbook/bdictionary BDictionaryCommands.java, 1.1, 1.2 BDictionaryArgParser.class, 1.1, 1.2 BDictionary.class, 1.1, 1.2 BDictionaryEvents.class, 1.1, 1.2 BDictionaryEvents.java, 1.1, 1.2 BDictionaryArgParser.java, 1.1, 1.2 BDictionaryCommands.class, 1.1, 1.2 BDictionary.java, 1.1, 1.2

[dmm]

Update of /cvsroot/tinyos/tinyos-1.x/contrib/rincon/tools/java/com/rincon/blackbook/bdictionary
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv28804/contrib/rincon/tools/java/com/rincon/blackbook/bdictionary

Modified Files:
	BDictionaryCommands.java BDictionaryArgParser.class 
	BDictionary.class BDictionaryEvents.class 
	BDictionaryEvents.java BDictionaryArgParser.java 
	BDictionaryCommands.class BDictionary.java 
Log Message:
Updated Blackbook to v.5.1, fixed many bugs and increased reliability

Index: BDictionaryCommands.java
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/rincon/tools/java/com/rincon/blackbook/bdictionary/BDictionaryCommands.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** BDictionaryCommands.java	20 Apr 2006 23:02:52 -0000	1.1
--- BDictionaryCommands.java	6 Jun 2006 16:50:30 -0000	1.2
***************
*** 85,87 ****
--- 85,93 ----
  	 */
  	public void getFirstKey();
+ 	
+ 	/**
+ 	 * Find if a file is a dictionary file
+ 	 * 
+ 	 */
+ 	public void isFileDictionary(String fileName);
  }

Index: BDictionaryArgParser.class
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/rincon/tools/java/com/rincon/blackbook/bdictionary/BDictionaryArgParser.class,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
Binary files /tmp/cvsn4r3eI and /tmp/cvsmX5HMj differ

Index: BDictionary.class
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/rincon/tools/java/com/rincon/blackbook/bdictionary/BDictionary.class,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
Binary files /tmp/cvsHI6sVG and /tmp/cvsC6w4ui differ

Index: BDictionaryEvents.class
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/rincon/tools/java/com/rincon/blackbook/bdictionary/BDictionaryEvents.class,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
Binary files /tmp/cvsLb6tqK and /tmp/cvsrK901l differ

Index: BDictionaryEvents.java
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/rincon/tools/java/com/rincon/blackbook/bdictionary/BDictionaryEvents.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** BDictionaryEvents.java	20 Apr 2006 23:02:52 -0000	1.1
--- BDictionaryEvents.java	6 Jun 2006 16:50:30 -0000	1.2
***************
*** 75,78 ****
--- 75,84 ----
  	 */
  	public void nextKey(long nextKey, boolean result);
+ 	
+ 	/**
+ 	 * @param isDictionary - true if the file is a dictionary file
+ 	 * @param result - SUCCESS if this result is valid
+ 	 */
+ 	public void fileIsDictionary(boolean isDictionary, boolean result);
  
  }

Index: BDictionaryArgParser.java
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/rincon/tools/java/com/rincon/blackbook/bdictionary/BDictionaryArgParser.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** BDictionaryArgParser.java	20 Apr 2006 23:02:52 -0000	1.1
--- BDictionaryArgParser.java	6 Jun 2006 16:50:30 -0000	1.2
***************
*** 90,93 ****
--- 90,100 ----
  				reportError("Missing parameter(s)");
  			}
+ 	
+ 		} else if(args[0].toLowerCase().matches("-isdictionary")) {
+ 			if(args.length > 1) {
+ 				bDictionary.isFileDictionary(args[1]);
+ 			} else {
+ 				reportError("Missing parameter(s)");
+ 			}
  			
  		} else {
***************
*** 113,116 ****
--- 120,124 ----
  		usage += "\t-getFirstKey\n";
  		usage += "\t-getNextKey <current key>\n";
+ 		usage += "\t-isDictionary <filename>\n";
  		return usage;
  	}
***************
*** 188,190 ****
--- 196,215 ----
  	}
  
+ 	public void fileIsDictionary(boolean isDictionary, boolean result) {
+ 		System.out.print("BDictionary fileIsDictionary ");
+ 		if(result) {
+ 			System.out.print("SUCCESS: File ");
+ 			if(isDictionary) {
+ 				System.out.print("is");
+ 			} else {
+ 				System.out.print("is NOT");
+ 			}
+ 			System.out.println(" a dictionary file.");
+ 		} else {
+ 			System.out.println("FAIL");
+ 		}
+ 		
+ 		System.exit(0);
+ 	}
+ 
  }

Index: BDictionaryCommands.class
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/rincon/tools/java/com/rincon/blackbook/bdictionary/BDictionaryCommands.class,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
Binary files /tmp/cvsEWNh8O and /tmp/cvsCJoDRq differ

Index: BDictionary.java
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/rincon/tools/java/com/rincon/blackbook/bdictionary/BDictionary.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** BDictionary.java	20 Apr 2006 23:02:52 -0000	1.1
--- BDictionary.java	6 Jun 2006 16:50:30 -0000	1.2
***************
*** 144,148 ****
  			break;
  			
! 		 
  		
  		case Commands.ERROR_BDICTIONARY_OPEN:
--- 144,152 ----
  			break;
  			
! 		case Commands.REPLY_BDICTIONARY_ISDICTIONARY:
! 			for(Iterator it = listeners.iterator(); it.hasNext(); ) {
! 				((BDictionaryEvents) it.next()).fileIsDictionary(inMsg.get_length() == 1, inMsg.get_result() == Commands.SUCCESS);
! 			}
! 			break;
  		
  		case Commands.ERROR_BDICTIONARY_OPEN:
***************
*** 153,156 ****
--- 157,161 ----
  		case Commands.ERROR_BDICTIONARY_NEXTKEY:
  		case Commands.ERROR_BDICTIONARY_FIRSTKEY:
+ 		case Commands.ERROR_BDICTIONARY_ISDICTIONARY:
  			System.err.println("Command immediately failed");
  			System.exit(0);
***************
*** 203,205 ****
--- 208,216 ----
  		send(command);
  	}
+ 	
+ 	public void isFileDictionary(String fileName) {
+ 		command.set_cmd(Commands.CMD_BDICTIONARY_ISDICTIONARY);
+ 		command.set_data(Util.filenameToData(fileName));
+ 		send(command);
+ 	}
  }