svn commit: r1572931 - in /opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/entitylinker: BaseLink.java LinkedSpan.java domain/

[ma...@apache.org]

Author: markg
Date: Fri Feb 28 12:25:30 2014
New Revision: 1572931

URL: http://svn.apache.org/r1572931
Log:
OPENNLP-630
OPENNLP-654
Fixed ltoString() in linkedspan and baselink to be more friendly to the cli tool (and others).
Also moved object in domain package to the entitylinker package and deleted domain package

Added:
    opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/entitylinker/BaseLink.java
      - copied, changed from r1572922, opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/entitylinker/domain/BaseLink.java
    opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/entitylinker/LinkedSpan.java
      - copied, changed from r1572922, opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/entitylinker/domain/LinkedSpan.java
Removed:
    opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/entitylinker/domain/

Copied: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/entitylinker/BaseLink.java (from r1572922, opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/entitylinker/domain/BaseLink.java)
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/entitylinker/BaseLink.java?p2=opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/entitylinker/BaseLink.java&p1=opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/entitylinker/domain/BaseLink.java&r1=1572922&r2=1572931&rev=1572931&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/entitylinker/domain/BaseLink.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/entitylinker/BaseLink.java Fri Feb 28 12:25:30 2014
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package opennlp.tools.entitylinker.domain;
+package opennlp.tools.entitylinker;
 
 import java.util.HashMap;
 import java.util.Objects;
@@ -122,7 +122,7 @@ public abstract class BaseLink {
 
   @Override
   public String toString() {
-    return "BaseLink{" + "itemParentID=" + itemParentID + ", itemID=" + itemID + ", itemName=" + itemName + ", itemType=" + itemType + ", scoreMap=" + scoreMap + '}';
+    return "BaseLink{\n" + "\nitemParentID=" + itemParentID + ", \nitemID=" + itemID + ", \nitemName=" + itemName + ", \nitemType=" + itemType + ", \nscoreMap=" + scoreMap + "\n}";
   }
 
   @Override

Copied: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/entitylinker/LinkedSpan.java (from r1572922, opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/entitylinker/domain/LinkedSpan.java)
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/entitylinker/LinkedSpan.java?p2=opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/entitylinker/LinkedSpan.java&p1=opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/entitylinker/domain/LinkedSpan.java&r1=1572922&r2=1572931&rev=1572931&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/entitylinker/domain/LinkedSpan.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/entitylinker/LinkedSpan.java Fri Feb 28 12:25:30 2014
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package opennlp.tools.entitylinker.domain;
+package opennlp.tools.entitylinker;
 
 import java.util.ArrayList;
 import java.util.Objects;
@@ -107,7 +107,7 @@ public class LinkedSpan<T extends BaseLi
 
   @Override
   public String toString() {
-    return "LinkedSpan{" + "linkedEntries=" + linkedEntries + ", sentenceid=" + sentenceid + ", searchTerm=" + searchTerm + '}';
+    return "LinkedSpan{\n\tsentenceid=" + sentenceid + ", \n\tsearchTerm=" + searchTerm + "\n\tlinkedEntries=\n" + linkedEntries + "\n}";
   }
 
   @Override
@@ -139,4 +139,4 @@ public class LinkedSpan<T extends BaseLi
     }
     return true;
   }
-}
\ No newline at end of file
+}