[Jrobin-commits] src/org/jrobin/cmd RrdCommander.java,1.6,1.7 RrdToolCmd.java,1.4,1.5

[Sasa M. <sa...@us...>]

Update of /cvsroot/jrobin/src/org/jrobin/cmd
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22984/org/jrobin/cmd

Modified Files:
	RrdCommander.java RrdToolCmd.java 
Log Message:
XPORT command added (not tested yet)

Index: RrdToolCmd.java
===================================================================
RCS file: /cvsroot/jrobin/src/org/jrobin/cmd/RrdToolCmd.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** RrdToolCmd.java	16 Jul 2004 07:40:48 -0000	1.4
--- RrdToolCmd.java	16 Jul 2004 08:01:13 -0000	1.5
***************
*** 40,45 ****
  	abstract Object execute() throws RrdException, IOException;
  
! 	void setCommand(String command) throws RrdException {
  		cmdScanner = new RrdCmdScanner(command);
  	}
  
--- 40,46 ----
  	abstract Object execute() throws RrdException, IOException;
  
! 	Object executeCommand(String command) throws RrdException, IOException {
  		cmdScanner = new RrdCmdScanner(command);
+ 		return execute();
  	}
  

Index: RrdCommander.java
===================================================================
RCS file: /cvsroot/jrobin/src/org/jrobin/cmd/RrdCommander.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** RrdCommander.java	16 Jul 2004 07:40:48 -0000	1.6
--- RrdCommander.java	16 Jul 2004 08:01:09 -0000	1.7
***************
*** 44,49 ****
  		new RrdFetchCmd(),
  		new RrdDumpCmd(),
! 		new RrdRestoreCmd()
! 
  	};
  
--- 44,49 ----
  		new RrdFetchCmd(),
  		new RrdDumpCmd(),
! 		new RrdRestoreCmd(),
! 		new RrdXportCmd()
  	};
  
***************
*** 120,125 ****
  		for(int i = 0; i < rrdCommands.length; i++) {
  			if(cmd.startsWith(rrdCommands[i].getCmdType())) {
! 				rrdCommands[i].setCommand(cmd);
! 				return rrdCommands[i].execute();
  			}
  		}
--- 120,124 ----
  		for(int i = 0; i < rrdCommands.length; i++) {
  			if(cmd.startsWith(rrdCommands[i].getCmdType())) {
! 				return rrdCommands[i].executeCommand(cmd);
  			}
  		}