From: <lor...@us...> - 2011-11-14 16:29:31
|
Revision: 3402 http://dl-learner.svn.sourceforge.net/dl-learner/?rev=3402&view=rev Author: lorenz_b Date: 2011-11-14 16:29:24 +0000 (Mon, 14 Nov 2011) Log Message: ----------- Made templates serializable. Modified Paths: -------------- trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/sparql/Query.java trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/sparql/SPARQL_Filter.java trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/sparql/SPARQL_Pair.java trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/sparql/SPARQL_Prefix.java trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/sparql/SPARQL_Term.java trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/sparql/SPARQL_Triple.java trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/sparql/SPARQL_Value.java trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/sparql/Slot.java trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/sparql/Template.java Modified: trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/sparql/Query.java =================================================================== --- trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/sparql/Query.java 2011-11-14 14:19:28 UTC (rev 3401) +++ trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/sparql/Query.java 2011-11-14 16:29:24 UTC (rev 3402) @@ -1,13 +1,14 @@ package org.dllearner.algorithm.tbsl.sparql; +import java.io.Serializable; import java.util.ArrayList; import java.util.HashSet; import java.util.List; import java.util.Set; -public class Query -{ - +public class Query implements Serializable { + + private static final long serialVersionUID = 6040368736352575802L; Set<SPARQL_Term> selTerms; // SELECT ?x ?y Set<SPARQL_Prefix> prefixes; Set<SPARQL_Triple> conditions; Modified: trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/sparql/SPARQL_Filter.java =================================================================== --- trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/sparql/SPARQL_Filter.java 2011-11-14 14:19:28 UTC (rev 3401) +++ trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/sparql/SPARQL_Filter.java 2011-11-14 16:29:24 UTC (rev 3402) @@ -1,11 +1,13 @@ package org.dllearner.algorithm.tbsl.sparql; +import java.io.Serializable; import java.util.HashSet; import java.util.Set; -public class SPARQL_Filter +public class SPARQL_Filter implements Serializable { - + private static final long serialVersionUID = -6243542586884540703L; + private Set<SPARQL_Pair> terms = new HashSet<SPARQL_Pair>(); private boolean and = true; Modified: trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/sparql/SPARQL_Pair.java =================================================================== --- trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/sparql/SPARQL_Pair.java 2011-11-14 14:19:28 UTC (rev 3401) +++ trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/sparql/SPARQL_Pair.java 2011-11-14 16:29:24 UTC (rev 3402) @@ -1,7 +1,11 @@ package org.dllearner.algorithm.tbsl.sparql; -public class SPARQL_Pair +import java.io.Serializable; + +public class SPARQL_Pair implements Serializable { + private static final long serialVersionUID = -1255754209857823420L; + public SPARQL_Term a; public Object b; Modified: trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/sparql/SPARQL_Prefix.java =================================================================== --- trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/sparql/SPARQL_Prefix.java 2011-11-14 14:19:28 UTC (rev 3401) +++ trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/sparql/SPARQL_Prefix.java 2011-11-14 16:29:24 UTC (rev 3402) @@ -1,7 +1,11 @@ package org.dllearner.algorithm.tbsl.sparql; -public class SPARQL_Prefix { +import java.io.Serializable; + +public class SPARQL_Prefix implements Serializable{ + private static final long serialVersionUID = 1971250768286898228L; + private String name; private String url; Modified: trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/sparql/SPARQL_Term.java =================================================================== --- trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/sparql/SPARQL_Term.java 2011-11-14 14:19:28 UTC (rev 3401) +++ trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/sparql/SPARQL_Term.java 2011-11-14 16:29:24 UTC (rev 3402) @@ -1,12 +1,15 @@ package org.dllearner.algorithm.tbsl.sparql; +import java.io.Serializable; + import org.dllearner.algorithm.tbsl.sparql.SPARQL_Aggregate; import org.dllearner.algorithm.tbsl.sparql.SPARQL_OrderBy; import org.dllearner.algorithm.tbsl.sparql.SPARQL_Term; import org.dllearner.algorithm.tbsl.sparql.SPARQL_Value; -public class SPARQL_Term extends SPARQL_Value { +public class SPARQL_Term extends SPARQL_Value{ + SPARQL_OrderBy orderBy = SPARQL_OrderBy.NONE; SPARQL_Aggregate aggregate = SPARQL_Aggregate.NONE; boolean isURI = false; Modified: trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/sparql/SPARQL_Triple.java =================================================================== --- trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/sparql/SPARQL_Triple.java 2011-11-14 14:19:28 UTC (rev 3401) +++ trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/sparql/SPARQL_Triple.java 2011-11-14 16:29:24 UTC (rev 3402) @@ -1,6 +1,11 @@ package org.dllearner.algorithm.tbsl.sparql; -public class SPARQL_Triple { +import java.io.Serializable; + +public class SPARQL_Triple implements Serializable{ + + private static final long serialVersionUID = -1681019680404287955L; + SPARQL_Term variable = new SPARQL_Term(""); SPARQL_Property property = new SPARQL_Property(""); SPARQL_Value value = new SPARQL_Value(); Modified: trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/sparql/SPARQL_Value.java =================================================================== --- trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/sparql/SPARQL_Value.java 2011-11-14 14:19:28 UTC (rev 3401) +++ trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/sparql/SPARQL_Value.java 2011-11-14 16:29:24 UTC (rev 3402) @@ -1,6 +1,11 @@ package org.dllearner.algorithm.tbsl.sparql; -public class SPARQL_Value { +import java.io.Serializable; + +public class SPARQL_Value implements Serializable{ + + private static final long serialVersionUID = -3733491240975566183L; + protected String name; private boolean isVariable = false; Modified: trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/sparql/Slot.java =================================================================== --- trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/sparql/Slot.java 2011-11-14 14:19:28 UTC (rev 3401) +++ trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/sparql/Slot.java 2011-11-14 16:29:24 UTC (rev 3402) @@ -1,11 +1,14 @@ package org.dllearner.algorithm.tbsl.sparql; +import java.io.Serializable; import java.util.ArrayList; import java.util.Iterator; import java.util.List; -public class Slot { +public class Slot implements Serializable{ + private static final long serialVersionUID = 8672756914248710435L; + String anchor; String token; SlotType type; Modified: trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/sparql/Template.java =================================================================== --- trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/sparql/Template.java 2011-11-14 14:19:28 UTC (rev 3401) +++ trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/sparql/Template.java 2011-11-14 16:29:24 UTC (rev 3402) @@ -1,10 +1,13 @@ package org.dllearner.algorithm.tbsl.sparql; +import java.io.Serializable; import java.util.ArrayList; import java.util.List; -public class Template { +public class Template implements Serializable{ + private static final long serialVersionUID = -3925093269596915997L; + Query query; List<Slot> slots; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |