javaowl-commit

[Elmer G. <ega...@us...>]

Update of /cvsroot/javaowl/JavaOWL/src/org/javaowl/models/prevalence
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27545/src/org/javaowl/models/prevalence

Modified Files:
	AddTripleCommand.java DeleteTripleCommand.java 
Log Message:
Fixed delete command.

Index: DeleteTripleCommand.java
===================================================================
RCS file: /cvsroot/javaowl/JavaOWL/src/org/javaowl/models/prevalence/DeleteTripleCommand.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** DeleteTripleCommand.java	26 Jul 2004 22:55:02 -0000	1.1
--- DeleteTripleCommand.java	27 Jul 2004 16:20:00 -0000	1.2
***************
*** 1,5 ****
  /*
!  * DeleteTripleCommand.java Copyright (C) 2004 Gerardo Horvilleur Martinez, Elmer
!  * Garduno Hernandez
   * 
   * This library is free software; you can redistribute it and/or modify it under
--- 1,5 ----
  /*
!  * DeleteTripleCommand.java Copyright (C) 2004 Gerardo Horvilleur Martinez,
!  * Elmer Garduno Hernandez
   * 
   * This library is free software; you can redistribute it and/or modify it under
***************
*** 20,23 ****
--- 20,24 ----
  package org.javaowl.models.prevalence;
  
+ import com.hp.hpl.jena.graph.Node;
  import com.hp.hpl.jena.graph.Triple;
  
***************
*** 25,33 ****
  import org.prevayler.PrevalentSystem;
  
  import java.io.Serializable;
  
  class DeleteTripleCommand implements Command {
  
!     private final Triple triple;
  
      DeleteTripleCommand(Triple triple) {
--- 26,37 ----
  import org.prevayler.PrevalentSystem;
  
+ import java.io.IOException;
+ import java.io.ObjectInputStream;
+ import java.io.ObjectOutputStream;
  import java.io.Serializable;
  
  class DeleteTripleCommand implements Command {
  
!     private transient Triple triple;
  
      DeleteTripleCommand(Triple triple) {
***************
*** 39,42 ****
--- 43,60 ----
          return null;
      }
+ 
+     private void writeObject(ObjectOutputStream out) throws IOException {
+         out.writeUTF(StorageUtil.nodeToRDBString(triple.getSubject()));
+         out.writeUTF(StorageUtil.nodeToRDBString(triple.getPredicate()));
+         out.writeUTF(StorageUtil.nodeToRDBString(triple.getObject()));
+     }
+ 
+     private void readObject(ObjectInputStream in) throws IOException,
+             ClassNotFoundException {
+         Node subject = StorageUtil.rdbStringToNode(in.readUTF());
+         Node predicate = StorageUtil.rdbStringToNode(in.readUTF());
+         Node object = StorageUtil.rdbStringToNode(in.readUTF());
+         this.triple = new Triple(subject, predicate, object);
+     }
  }
  

Index: AddTripleCommand.java
===================================================================
RCS file: /cvsroot/javaowl/JavaOWL/src/org/javaowl/models/prevalence/AddTripleCommand.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** AddTripleCommand.java	27 Jul 2004 15:51:00 -0000	1.5
--- AddTripleCommand.java	27 Jul 2004 16:20:00 -0000	1.6
***************
*** 33,64 ****
  class AddTripleCommand implements Command {
  
! 	private transient Triple triple;
  
! 	AddTripleCommand(Triple triple) {
! 		this.triple = triple;
! 	}
  
! 	public Serializable execute(PrevalentSystem system) throws Exception {
! 		((StorageGraph) system).add(triple);
! 		return null;
! 	}
  
! 	private void writeObject(ObjectOutputStream out) throws IOException {
! 		out.writeUTF(StorageUtil.nodeToRDBString(triple.getSubject()));
! 		out.writeUTF(StorageUtil.nodeToRDBString(triple.getPredicate()));
! 		out.writeUTF(StorageUtil.nodeToRDBString(triple.getObject()));
! 	}
  
! 	private void readObject(ObjectInputStream in) throws IOException,
! 			ClassNotFoundException {
! 		try {
! 			Node subject = StorageUtil.rdbStringToNode(in.readUTF());
! 			Node predicate = StorageUtil.rdbStringToNode(in.readUTF());
! 			Node object = StorageUtil.rdbStringToNode(in.readUTF());
! 			this.triple = new Triple(subject, predicate, object);
! 		} catch (Exception e) {
! 			e.printStackTrace();
! 		}
! 	}
  }
  
--- 33,60 ----
  class AddTripleCommand implements Command {
  
!     private transient Triple triple;
  
!     AddTripleCommand(Triple triple) {
!         this.triple = triple;
!     }
  
!     public Serializable execute(PrevalentSystem system) throws Exception {
!         ((StorageGraph) system).add(triple);
!         return null;
!     }
  
!     private void writeObject(ObjectOutputStream out) throws IOException {
!         out.writeUTF(StorageUtil.nodeToRDBString(triple.getSubject()));
!         out.writeUTF(StorageUtil.nodeToRDBString(triple.getPredicate()));
!         out.writeUTF(StorageUtil.nodeToRDBString(triple.getObject()));
!     }
  
!     private void readObject(ObjectInputStream in) throws IOException,
!             ClassNotFoundException {
!         Node subject = StorageUtil.rdbStringToNode(in.readUTF());
!         Node predicate = StorageUtil.rdbStringToNode(in.readUTF());
!         Node object = StorageUtil.rdbStringToNode(in.readUTF());
!         this.triple = new Triple(subject, predicate, object);
!     }
  }