[Javaowl-commit] JavaOWL/src/org/javaowl/editor/remote SerializableTriple.java,NONE,1.1 RemoteModelEditor.java,1.2,1.3 RemoteModelEditorWrapper.java,1.2,1.3

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

Update of /cvsroot/javaowl/JavaOWL/src/org/javaowl/editor/remote
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17990/src/org/javaowl/editor/remote

Modified Files:
	RemoteModelEditor.java RemoteModelEditorWrapper.java 
Added Files:
	SerializableTriple.java 
Log Message:
more work on remote model

Index: RemoteModelEditorWrapper.java
===================================================================
RCS file: /cvsroot/javaowl/JavaOWL/src/org/javaowl/editor/remote/RemoteModelEditorWrapper.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** RemoteModelEditorWrapper.java	18 Aug 2004 01:23:24 -0000	1.2
--- RemoteModelEditorWrapper.java	19 Aug 2004 14:45:32 -0000	1.3
***************
*** 20,25 ****
  package org.javaowl.editor.remote;
  
- import java.util.Set;
- 
  import org.javaowl.editor.ModelEditor;
  import org.javaowl.editor.ResourceEditorBean;
--- 20,23 ----
***************
*** 30,34 ****
  import com.hp.hpl.jena.ontology.OntResource;
  import com.hp.hpl.jena.rdf.model.Literal;
- import com.hp.hpl.jena.rdf.model.Model;
  import com.hp.hpl.jena.rdf.model.Property;
  import com.hp.hpl.jena.rdf.model.Resource;
--- 28,31 ----
***************
*** 48,133 ****
  	public OntClass[] getAllClasses() {
  		String[] uris = remote.getAllClasses();
! 		OntClass[] resources = new OntClass[uris.length];
! 		for (int i = 0; i < uris.length; i++)
! 			resources[i] = ontModel.createClass(uris[i]);
! 		return null;
! 	}
! 
! 	/* (non-Javadoc)
! 	 * @see org.javaowl.editor.ModelEditor#getPropertiesURIs(com.hp.hpl.jena.rdf.model.Resource, boolean)
! 	 */
! 	public Set getPropertiesURIs(Resource clazz, boolean all) {
! 		// TODO Auto-generated method stub
! 		return null;
  	}
  
! 	/* (non-Javadoc)
! 	 * @see org.javaowl.editor.ModelEditor#getProperties(com.hp.hpl.jena.rdf.model.Resource, boolean)
! 	 */
! 	public OntProperty[] getProperties(Resource clazz, boolean all) {
! 		// TODO Auto-generated method stub
! 		return null;
  	}
! 
! 	/* (non-Javadoc)
! 	 * @see org.javaowl.editor.ModelEditor#getAllDatatypeProperties()
! 	 */
  	public OntProperty[] getAllDatatypeProperties() {
! 		// TODO Auto-generated method stub
! 		return null;
  	}
  
! 	/* (non-Javadoc)
! 	 * @see org.javaowl.editor.ModelEditor#getInstances(com.hp.hpl.jena.ontology.OntResource, boolean)
! 	 */
! 	public Resource[] getInstances(OntResource clazz, boolean all) {
! 		// TODO Auto-generated method stub
! 		return null;
  	}
  
- 	/* (non-Javadoc)
- 	 * @see org.javaowl.editor.ModelEditor#getOntClass(com.hp.hpl.jena.rdf.model.Resource)
- 	 */
  	public OntClass getOntClass(Resource resource) {
! 		// TODO Auto-generated method stub
! 		return null;
  	}
  
- 	/* (non-Javadoc)
- 	 * @see org.javaowl.editor.ModelEditor#getOntProperty(com.hp.hpl.jena.rdf.model.Property)
- 	 */
  	public OntProperty getOntProperty(Property property) {
! 		// TODO Auto-generated method stub
! 		return null;
  	}
  
- 	/* (non-Javadoc)
- 	 * @see org.javaowl.editor.ModelEditor#getTypedLiteral(java.lang.Object, com.hp.hpl.jena.ontology.OntResource)
- 	 */
  	public Literal getTypedLiteral(Object value, OntResource type) {
! 		// TODO Auto-generated method stub
! 		return null;
  	}
  
- 	/* (non-Javadoc)
- 	 * @see org.javaowl.editor.ModelEditor#removeStatement(com.hp.hpl.jena.rdf.model.Statement)
- 	 */
  	public void removeStatement(Statement statement) {
! 		// TODO Auto-generated method stub
  
  	}
  
  	/* (non-Javadoc)
! 	 * @see org.javaowl.editor.ModelEditor#removeResource(com.hp.hpl.jena.rdf.model.Resource)
  	 */
! 	public void removeResource(Resource resource) {
  		// TODO Auto-generated method stub
! 
  	}
  
  	/* (non-Javadoc)
! 	 * @see org.javaowl.editor.ModelEditor#getSubClasses(com.hp.hpl.jena.ontology.OntClass)
  	 */
! 	public OntClass[] getSubClasses(OntClass resourceClass) {
  		// TODO Auto-generated method stub
  		return null;
--- 45,107 ----
  	public OntClass[] getAllClasses() {
  		String[] uris = remote.getAllClasses();
! 		return createOntClassesFromUri(uris);
  	}
  
! 	public OntClass[] getSubClasses(OntClass resourceClass) {
! 		String[] uris = remote.getSubClasses(resourceClass.getURI());
! 		return createOntClassesFromUri(uris);
  	}
! 	
  	public OntProperty[] getAllDatatypeProperties() {
! 		String[] uris = remote.getAllDatatypeProperties();
! 		return createOntPropertiesFromURIs(uris);
  	}
  
! 	public OntProperty[] getProperties(Resource clazz, boolean all) {
! 		String[] uris = remote.getProperties(clazz.getURI(), all);
! 		return createOntPropertiesFromURIs(uris);
! 	}
! 	
! 	public Resource[] getInstances(Resource clazz, boolean all) {
! 		String[] uris = remote.getInstances(clazz.getURI(), all);
! 		Resource[] resources = new Resource[uris.length];
! 		for (int i = 0; i < uris.length; i++)
! 			resources[i] = ontModel.createOntProperty(uris[i]);
! 		return resources;
  	}
  
  	public OntClass getOntClass(Resource resource) {
! 		return ontModel.createClass(resource.getURI());
  	}
  
  	public OntProperty getOntProperty(Property property) {
! 		return ontModel.createOntProperty(property.getURI());
  	}
  
  	public Literal getTypedLiteral(Object value, OntResource type) {
! 		return ontModel.createTypedLiteral(value, type.getURI());
  	}
  
  	public void removeStatement(Statement statement) {
! 		remote.removeStatement(new SerializableTriple(statement.asTriple()));
! 	}
! 
! 	public void removeResource(Resource resource) {
! 		remote.removeResource(resource.getURI());
  
  	}
  
  	/* (non-Javadoc)
! 	 * @see org.javaowl.editor.ModelEditor#createResource(com.hp.hpl.jena.ontology.OntResource)
  	 */
! 	public ResourceEditorBean createResourceEditor(OntResource classResource) {
  		// TODO Auto-generated method stub
! 		return null;
  	}
  
  	/* (non-Javadoc)
! 	 * @see org.javaowl.editor.ModelEditor#createResource(java.lang.String, com.hp.hpl.jena.ontology.OntResource)
  	 */
! 	public ResourceEditorBean createResourceEditor(String uri, OntResource classResource) {
  		// TODO Auto-generated method stub
  		return null;
***************
*** 135,149 ****
  
  	/* (non-Javadoc)
! 	 * @see org.javaowl.editor.ModelEditor#createResource(com.hp.hpl.jena.ontology.OntResource)
  	 */
! 	public ResourceEditorBean createResource(OntResource classResource) {
  		// TODO Auto-generated method stub
  		return null;
  	}
  
  	/* (non-Javadoc)
! 	 * @see org.javaowl.editor.ModelEditor#createResource(java.lang.String, com.hp.hpl.jena.ontology.OntResource)
  	 */
! 	public ResourceEditorBean createResource(String uri, OntResource classResource) {
  		// TODO Auto-generated method stub
  		return null;
--- 109,137 ----
  
  	/* (non-Javadoc)
! 	 * @see org.javaowl.editor.ModelEditor#getResource(com.hp.hpl.jena.rdf.model.Resource)
  	 */
! 	public ResourceEditorBean getResourceEditor(Resource resource) {
  		// TODO Auto-generated method stub
  		return null;
  	}
+ 	
+ 	private OntClass[] createOntClassesFromUri(String[] uris) {
+ 		OntClass[] classes = new OntClass[uris.length];
+ 		for (int i = 0; i < uris.length; i++)
+ 			classes[i] = ontModel.createClass(uris[i]);
+ 		return classes;
+ 	}
+ 	
+ 	private OntProperty[] createOntPropertiesFromURIs(String[] uris) {
+ 		OntProperty[] properties = new OntProperty[uris.length];
+ 		for (int i = 0; i < uris.length; i++)
+ 			properties[i] = ontModel.createOntProperty(uris[i]);
+ 		return properties;
+ 	}
  
  	/* (non-Javadoc)
! 	 * @see org.javaowl.editor.ModelEditor#getApplicableProperties(com.hp.hpl.jena.rdf.model.Resource)
  	 */
! 	public OntProperty[] getApplicableProperties(Resource resource) {
  		// TODO Auto-generated method stub
  		return null;
***************
*** 151,157 ****
  
  	/* (non-Javadoc)
! 	 * @see org.javaowl.editor.ModelEditor#getResource(com.hp.hpl.jena.rdf.model.Resource)
  	 */
! 	public ResourceEditorBean getResource(Resource resource) {
  		// TODO Auto-generated method stub
  		return null;
--- 139,145 ----
  
  	/* (non-Javadoc)
! 	 * @see org.javaowl.editor.ModelEditor#createResource(com.hp.hpl.jena.ontology.OntResource)
  	 */
! 	public Resource createResource(OntResource classResource) {
  		// TODO Auto-generated method stub
  		return null;
***************
*** 159,165 ****
  
  	/* (non-Javadoc)
! 	 * @see org.javaowl.editor.ModelEditor#getOntology()
  	 */
! 	public Model getOntology() {
  		// TODO Auto-generated method stub
  		return null;
--- 147,153 ----
  
  	/* (non-Javadoc)
! 	 * @see org.javaowl.editor.ModelEditor#createResource(java.lang.String, com.hp.hpl.jena.ontology.OntResource)
  	 */
! 	public Resource createResource(String uri, OntResource classResource) {
  		// TODO Auto-generated method stub
  		return null;
***************
*** 167,173 ****
  
  	/* (non-Javadoc)
! 	 * @see org.javaowl.editor.ModelEditor#getData()
  	 */
! 	public Model getData() {
  		// TODO Auto-generated method stub
  		return null;
--- 155,161 ----
  
  	/* (non-Javadoc)
! 	 * @see org.javaowl.editor.ModelEditor#getDeclaredProperties(com.hp.hpl.jena.rdf.model.Resource)
  	 */
! 	public Statement[] getDeclaredProperties(Resource resource) {
  		// TODO Auto-generated method stub
  		return null;

Index: RemoteModelEditor.java
===================================================================
RCS file: /cvsroot/javaowl/JavaOWL/src/org/javaowl/editor/remote/RemoteModelEditor.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** RemoteModelEditor.java	18 Aug 2004 01:23:24 -0000	1.2
--- RemoteModelEditor.java	19 Aug 2004 14:45:32 -0000	1.3
***************
*** 29,31 ****
--- 29,66 ----
  	String[] getAllClasses();
  
+ 	/**
+ 	 * @return
+ 	 */
+ 	String[] getAllDatatypeProperties();
+ 
+ 	/**
+ 	 * @param uri
+ 	 * @param all
+ 	 * @return
+ 	 */
+ 	String[] getProperties(String uri, boolean all);
+ 
+ 	/**
+ 	 * @param uri
+ 	 */
+ 	void removeResource(String uri);
+ 
+ 	/**
+ 	 * @param uri
+ 	 * @param all
+ 	 * @return
+ 	 */
+ 	String[] getInstances(String uri, boolean all);
+ 
+ 	/**
+ 	 * @param uri
+ 	 * @return
+ 	 */
+ 	String[] getSubClasses(String uri);
+ 
+ 	/**
+ 	 * @param triple
+ 	 */
+ 	void removeStatement(SerializableTriple triple);
+ 
  }

--- NEW FILE: SerializableTriple.java ---
/*
 * RemoteGraph.java Copyright (C) 2004 Gerardo Horvilleur Martinez, Elmer
 * Garduno Hernandez
 * 
 * This library is free software; you can redistribute it and/or modify it under
 * the terms of the GNU Lesser General Public License as published by the Free
 * Software Foundation; either version 2.1 of the License, or (at your option)
 * any later version.
 * 
 * This library is distributed in the hope that it will be useful, but WITHOUT
 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
 * details.
 * 
 * You should have received a copy of the GNU Lesser General Public License
 * along with this library; if not, write to the Free Software Foundation, Inc.,
 * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 */


package org.javaowl.editor.remote;

import java.io.Serializable;

import com.hp.hpl.jena.graph.Triple;

import org.javaowl.models.prevalence.TripleUtil;

public class SerializableTriple implements Serializable {

    private String subject;
    
    private String predicate;
    
    private String object;

    public SerializableTriple() {}

    public SerializableTriple(Triple triple) {
        subject = TripleUtil.nodeToString(triple.getSubject());
        predicate = TripleUtil.nodeToString(triple.getPredicate());
        object = TripleUtil.nodeToString(triple.getObject());
    }
    
    public String getObject() {
        return object;
    }
    
    public String getPredicate(){
        return predicate;
    }

    public String getSubject(){
        return subject;
    }

    public void setObject(String object){
        this.object = object;
    }

    public void setPredicate(String predicate){
        this.predicate = predicate;
    }
    
    public void setSubject(String subject){
        this.subject = subject;
    }

}