[Javaowl-commit] JavaOWL/src/org/javaowl/editor ModelEditorBean.java,1.2,1.3 ResourceEditorBean.java,1.2,1.3

[Gerardo H. <ma...@us...>]

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

Modified Files:
	ModelEditorBean.java ResourceEditorBean.java 
Log Message:
Modified pellet.jar to avoid ClassCastException

Index: ModelEditorBean.java
===================================================================
RCS file: /cvsroot/javaowl/JavaOWL/src/org/javaowl/editor/ModelEditorBean.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ModelEditorBean.java	22 Jul 2004 02:47:41 -0000	1.2
--- ModelEditorBean.java	22 Jul 2004 18:28:38 -0000	1.3
***************
*** 105,114 ****
      }
  
!     public OntProperty[] getProperties(OntResource resource, boolean all) {
!         OntClass resourceClass = resource.asClass();
          Set props = new HashSet();
!         for (Iterator it = resourceClass.listDeclaredProperties(all); it.hasNext();)
!             props.add(it.next());
!         return (OntProperty[]) props.toArray(new OntProperty[0]);
      }
  
--- 105,136 ----
      }
  
!     public Set getPropertiesURIs(Resource clazz, boolean all) {
!         List l = new ArrayList();
!         l.add(clazz.getURI());
!         if (all)
!             l.addAll(ontologyReasoner.getSuperClasses(clazz, true));
          Set props = new HashSet();
!         for (Iterator iter = l.iterator(); iter.hasNext(); ) {
!             String uri = iter.next().toString();
!             if (uri.startsWith(prefix)) {
!                 OntClass resourceClass = ontModel.getOntClass(uri);
!                 for (Iterator it = resourceClass.listDeclaredProperties(false); it.hasNext();) {
!                     OntProperty p = (OntProperty) it.next();
!                     props.add(p.getURI());
!                 }
!             }
!         }
!         return props;
!     }
!     
!     public OntProperty[] getProperties(Resource clazz, boolean all) {
!         Set props = getPropertiesURIs(clazz, all);
!         OntProperty[] result = new OntProperty[props.size()];
!         int i = 0;
!         for (Iterator iter = props.iterator(); iter.hasNext(); ) {
!             String uri = (String) iter.next();
!             result[i++] = ontModel.getOntProperty(uri);
!         }
!         return result;
      }
  

Index: ResourceEditorBean.java
===================================================================
RCS file: /cvsroot/javaowl/JavaOWL/src/org/javaowl/editor/ResourceEditorBean.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ResourceEditorBean.java	22 Jul 2004 02:47:41 -0000	1.2
--- ResourceEditorBean.java	22 Jul 2004 18:28:38 -0000	1.3
***************
*** 48,54 ****
      private final Resource resource;
  
!     private final OntProperty[] properties;
! 
!     private OntClass[] types;
  
      private final String prefix;
--- 48,52 ----
      private final Resource resource;
  
!     // private OntClass[] types;
  
      private final String prefix;
***************
*** 64,81 ****
          this.ontModel = ontModel;
          this.modelEditor = modelEditor;
-         Set props = new HashSet();
-         List classes = new ArrayList();
-         for (Iterator it = resource.listProperties(); it.hasNext();) {
-             Statement stmt = (Statement) it.next();
-             if (stmt.getPredicate().equals(RDF.type)) {
-                 Resource r = (Resource) stmt.getObject();
-                 OntClass resourceClass = ontModel.createClass(r.getURI());
-                 classes.add(resourceClass);
-                 for (Iterator it2 = resourceClass.listDeclaredProperties(); it2.hasNext();)
-                     props.add(it2.next());
-             }
-         }
-         properties = (OntProperty[]) props.toArray(new OntProperty[0]);
-         types = (OntClass[]) classes.toArray(new OntClass[0]);
          
          InstanceClassification ic = getInstanceClassification(resource);
--- 62,65 ----
***************
*** 93,102 ****
  
      public OntProperty[] getApplicableProperties() {
!         return properties;
      }
  
      public OntClass[] getTypes() {
          return types;
      }
  
      public Statement[] getProperties() {
--- 77,103 ----
  
      public OntProperty[] getApplicableProperties() {
!         Set props = new HashSet();
!         InstanceClassification ic = getInstanceClassification(resource);
!         for (Iterator iter = ic.possibleIterator(); iter.hasNext(); ) {
!             String uri = (String) iter.next();
!             if (ic.isDeclaredClass(uri) || ic.isInferredClass(uri)) {
!                 OntClass resourceClass = ontModel.getOntClass(uri);
!                 props.addAll(modelEditor.getPropertiesURIs(resourceClass, true));
!             }
!         }
!         OntProperty[] result = new OntProperty[props.size()];
!         int i = 0;
!         for (Iterator iter = props.iterator(); iter.hasNext(); ) {
!             String uri = (String) iter.next();
!             result[i++] = ontModel.getOntProperty(uri);
!         }
!         return result;
      }
  
+     /*
      public OntClass[] getTypes() {
          return types;
      }
+     */
  
      public Statement[] getProperties() {