From: <ku...@us...> - 2007-08-27 15:14:21
|
Revision: 65 http://dl-learner.svn.sourceforge.net/dl-learner/?rev=65&view=rev Author: kurzum Date: 2007-08-27 08:13:33 -0700 (Mon, 27 Aug 2007) Log Message: ----------- fixed the warnings Modified Paths: -------------- trunk/src/dl-learner/org/dllearner/server/ClientState.java trunk/src/dl-learner/org/dllearner/server/LearnMonitor.java trunk/src/dl-learner/org/dllearner/server/exceptions/ClientNotKnownException.java trunk/src/dl-learner/org/dllearner/server/exceptions/NoOntologySelectedException.java trunk/src/dl-learner/org/dllearner/server/exceptions/OntologyURLNotValid.java Modified: trunk/src/dl-learner/org/dllearner/server/ClientState.java =================================================================== --- trunk/src/dl-learner/org/dllearner/server/ClientState.java 2007-08-27 15:04:36 UTC (rev 64) +++ trunk/src/dl-learner/org/dllearner/server/ClientState.java 2007-08-27 15:13:33 UTC (rev 65) @@ -110,7 +110,7 @@ AtomicConcept SelectedConcept=new AtomicConcept(Concept); ArrayList<String> al=new ArrayList<String>(); Individual indtmp=null; - Set ConceptSet=null; + Set<AtomicConcept> ConceptSet=null; AtomicConcept ac=null; @@ -173,8 +173,8 @@ { ac=superConcepts.get(jj); p("next this: "+ac.getName()); - Set negatives=rs.retrieval(ac); - Iterator i2 = negatives.iterator(); + Set<Individual> negatives=rs.retrieval(ac); + Iterator<Individual> i2 = negatives.iterator(); indtmp=null; while(i2.hasNext()){ @@ -206,15 +206,15 @@ AtomicConcept SelectedConcept=new AtomicConcept(Concept); ArrayList<String> ret=new ArrayList<String>(); Individual indtmp=null; - Set ConceptSet=null; + Set<AtomicConcept> ConceptSet=null; AtomicConcept ac=null; Random r=new Random(); System.out.println("selectAConcept: "+Concept); // add all positives - Set positives=rs.retrieval(SelectedConcept); - Iterator i = positives.iterator(); + Set<Individual> positives=rs.retrieval(SelectedConcept); + Iterator<Individual> i = positives.iterator(); while(i.hasNext()){ indtmp=(Individual)i.next(); p("added "+indtmp.getName()+" to positives"); @@ -242,9 +242,9 @@ public ArrayList<AtomicConcept> subsumesAll(AtomicConcept c){ - Set s=rs.getAtomicConcepts(); + Set<AtomicConcept> s=rs.getAtomicConcepts(); ArrayList<AtomicConcept> ret=new ArrayList<AtomicConcept>(); - Iterator i=s.iterator(); + Iterator<AtomicConcept> i=s.iterator(); while (i.hasNext()) { AtomicConcept element = (AtomicConcept) i.next(); if(rs.subsumes(element, c)) @@ -257,7 +257,7 @@ } public String[] getPositiveExamples(){ String[] ret=new String[positiveExamples.size()]; - Iterator i=positiveExamples.iterator(); + Iterator<Individual> i=positiveExamples.iterator(); int a=0; while (i.hasNext()){ ret[a++]=((Individual)i.next()).getName(); @@ -267,7 +267,7 @@ } public String[] getNegativeExamples(){ String[] ret=new String[negativeExamples.size()]; - Iterator i=negativeExamples.iterator(); + Iterator<Individual> i=negativeExamples.iterator(); int a=0; while (i.hasNext()){ ret[a++]=((Individual)i.next()).getName(); @@ -278,7 +278,7 @@ public String[] getIgnoredConcepts() { String[] ret=new String[ignoredConcept.size()]; - Iterator i=ignoredConcept.iterator(); + Iterator<String> i=ignoredConcept.iterator(); int a=0; while (i.hasNext()){ ret[a++]=((String)i.next()); @@ -334,7 +334,7 @@ SortedSet<Individual> s=rs.getIndividuals(); //System.out.println(s); String[] ret=new String[s.size()]; - Iterator i=s.iterator(); + Iterator<Individual> i=s.iterator(); int a=0; while (i.hasNext()){ ret[a++]=((Individual)i.next()).getName(); @@ -491,8 +491,8 @@ } public String[] getIndividualsForARole(String Role)throws NoOntologySelectedException{ - Map m=rs.getRoleMembers(new AtomicRole(Role)); - Set s=m.keySet(); + Map<Individual,SortedSet<Individual>> m=rs.getRoleMembers(new AtomicRole(Role)); + Set<Individual> s=m.keySet(); return SortedSet2StringListIndividuals(s); } @@ -521,10 +521,10 @@ //this.lm.notify(); } - public String[] SortedSet2StringListIndividuals(Set s){ + public String[] SortedSet2StringListIndividuals(Set<Individual> s){ String[] ret=new String[s.size()]; - Iterator i=s.iterator(); + Iterator<Individual> i=s.iterator(); int a=0; while (i.hasNext()){ ret[a++]=((Individual)i.next()).getName(); @@ -533,10 +533,10 @@ return ret; } - public String[] SortedSet2StringListConcepts(Set s){ + public String[] SortedSet2StringListConcepts(Set<AtomicConcept> s){ String[] ret=new String[s.size()]; - Iterator i=s.iterator(); + Iterator<AtomicConcept> i=s.iterator(); int a=0; while (i.hasNext()){ ret[a++]=((AtomicConcept)i.next()).getName(); @@ -544,10 +544,10 @@ Arrays.sort(ret); return ret; } - public String[] SortedSet2StringListRoles(Set s){ + public String[] SortedSet2StringListRoles(Set<AtomicRole> s){ String[] ret=new String[s.size()]; - Iterator i=s.iterator(); + Iterator<AtomicRole> i=s.iterator(); int a=0; while (i.hasNext()){ ret[a++]=((AtomicRole)i.next()).getName(); Modified: trunk/src/dl-learner/org/dllearner/server/LearnMonitor.java =================================================================== --- trunk/src/dl-learner/org/dllearner/server/LearnMonitor.java 2007-08-27 15:04:36 UTC (rev 64) +++ trunk/src/dl-learner/org/dllearner/server/LearnMonitor.java 2007-08-27 15:13:33 UTC (rev 65) @@ -37,6 +37,7 @@ public void run(){ try{ c.setStatus("still running"); + if(active); active=true; c.setStatus("running"); Modified: trunk/src/dl-learner/org/dllearner/server/exceptions/ClientNotKnownException.java =================================================================== --- trunk/src/dl-learner/org/dllearner/server/exceptions/ClientNotKnownException.java 2007-08-27 15:04:36 UTC (rev 64) +++ trunk/src/dl-learner/org/dllearner/server/exceptions/ClientNotKnownException.java 2007-08-27 15:13:33 UTC (rev 65) @@ -1,7 +1,8 @@ package org.dllearner.server.exceptions; public class ClientNotKnownException extends Exception { - String detail; + static final long serialVersionUID=100; + String detail; public ClientNotKnownException (String message, String detail) { super (message); Modified: trunk/src/dl-learner/org/dllearner/server/exceptions/NoOntologySelectedException.java =================================================================== --- trunk/src/dl-learner/org/dllearner/server/exceptions/NoOntologySelectedException.java 2007-08-27 15:04:36 UTC (rev 64) +++ trunk/src/dl-learner/org/dllearner/server/exceptions/NoOntologySelectedException.java 2007-08-27 15:13:33 UTC (rev 65) @@ -1,7 +1,8 @@ package org.dllearner.server.exceptions; public class NoOntologySelectedException extends Exception { - String detail; + static final long serialVersionUID=101; + String detail; public NoOntologySelectedException (String message, String detail) { super (message); Modified: trunk/src/dl-learner/org/dllearner/server/exceptions/OntologyURLNotValid.java =================================================================== --- trunk/src/dl-learner/org/dllearner/server/exceptions/OntologyURLNotValid.java 2007-08-27 15:04:36 UTC (rev 64) +++ trunk/src/dl-learner/org/dllearner/server/exceptions/OntologyURLNotValid.java 2007-08-27 15:13:33 UTC (rev 65) @@ -1,6 +1,7 @@ package org.dllearner.server.exceptions; public class OntologyURLNotValid extends Exception { + static final long serialVersionUID=102; String detail; public OntologyURLNotValid (String message, String detail) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |