Adjustments to Kanban, fixed bug with labels with punct and formatting

Author: dlutz2

src/org/opensextant/howler/Howler.java

@@ -33,7 +33,6 @@
 
 import org.opensextant.howler.abstraction.Document;
 import org.opensextant.howler.abstraction.Statement;
-import org.opensextant.howler.kanban.elements.KanbanSentence;
 import org.opensextant.howler.owl.FromOWL;
 import org.opensextant.howler.owl.ToOWL;
 import org.opensextant.howler.text.FromText;
@@ -194,24 +193,40 @@ public Properties getProperties() {
     return properties;
   }
 
-  /**
-   * Gets the text factory.
-   * @return the text factory used by this Howler.
-   */
-  public FromText getTextFactory() {
+  public Document convertText(String title, String text) {
+    return fromText.convertText(text, IRI.create(defaultNamespace, title.replace(" ", "_")), title);
+  }
+
+  public FromText getFromText() {
     return fromText;
   }
 
-  /**
-   * Gets the OWL factory.
-   * @return the OWL factory used by this Howler.
-   */
-  public FromOWL getOwlFactory() {
+  public void setFromText(FromText fromText) {
+    this.fromText = fromText;
+  }
+
+  public ToText getToText() {
+    return toText;
+  }
+
+  public void setToText(ToText toText) {
+    this.toText = toText;
+  }
+
+  public FromOWL getFromOWL() {
     return fromOWL;
   }
 
-  public Document convertText(String title, String text) {
-    return fromText.convertText(text, IRI.create(defaultNamespace, title.replace(" ", "_")), title);
+  public void setFromOWL(FromOWL fromOWL) {
+    this.fromOWL = fromOWL;
+  }
+
+  public ToOWL getToOWL() {
+    return toOWL;
+  }
+
+  public void setToOWL(ToOWL toOWL) {
+    this.toOWL = toOWL;
   }
 
 }

src/org/opensextant/howler/abstraction/Vocabulary.java

@@ -50,7 +50,7 @@ public class Vocabulary {
   /*--- Nouns ---*/
   public static final CommonNoun THING = new CommonNoun("thing", THING_IRI);
   public static final CommonNoun NOTHING = new CommonNoun("no thing", NOTHING_IRI);
- // public static final DataType DATAVALUE = new DataType("data value", DATATYPE_THING_IRI,DataTypeCategory.OTHER);
+  // public static final DataType DATAVALUE = new DataType("data value", DATATYPE_THING_IRI,DataTypeCategory.OTHER);
   public static final CommonNoun ITSELF = new CommonNoun("itself", ITSELF_IRI);
 
   /*--- Builtin scoped predicates ---*/
@@ -73,11 +73,11 @@ public class Vocabulary {
   public static final GenericWord HAS_AUX = new GenericWord("has", "VB");
   public static final GenericWord INVERSE_OF = new GenericWord("the inverse of", "ZZ");
 
-  /* -------- parts of conjunctions/disjuntions -------*/
+  /* -------- parts of conjunctions/disjuntions ------- */
   public static final GenericWord EITHER = new GenericWord("either", "ZZ");
   public static final GenericWord BOTH = new GenericWord("both", "ZZ");
   public static final GenericWord EXCLUSIVE = new GenericWord("exclusively", "ZZ");
-  
+
   /*-----punctuation -----*/
   public static final GenericWord DQUOTE = new GenericWord("\"", "DQUOTE");
   public static final GenericWord PERIOD = new GenericWord(".", "PERIOD");
@@ -161,7 +161,7 @@ public class Vocabulary {
       IRI.create("http://www.w3.org/2001/XMLSchema#anyURI"), DataTypeCategory.OTHER);
   public static final DataType DATE_TYPE = new DataType("date datatype",
       IRI.create("http://www.w3.org/2001/XMLSchema#date"), DataTypeCategory.DATE);
-  
+
   /*--- Builtin Predicates ---*/
   public static final AnnotationPredicate BACKWARD = new AnnotationPredicate("is backward compatible with",
       IRI.create(OWLNamespace.toString(), "backwardCompatibleWith"));