Merge branch 'master' of https://github.com/schlusslicht/Cheiron

Conflicts:
	.settings/org.eclipse.jdt.core.prefs

Author: Hendrik Schmeer

.settings/org.eclipse.jdt.core.prefs

@@ -0,0 +1,12 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.source=1.8

src/Cheiron/Processor/Matetools/Lemmatizer.java

@@ -22,6 +22,9 @@ public class Lemmatizer extends JCasAnnotator_ImplBase {
 	private static Map<String, is2.lemmatizer2.Lemmatizer> detectors = new HashMap<String, is2.lemmatizer2.Lemmatizer>();
 
 	private void processView(JCas view) {
+		if (!detectors.containsKey(view.getDocumentLanguage()))
+			return;
+
 		Token token = null;
 		String[] tokens = null;
 		ArrayList<Token> tokenList = null;
@@ -72,8 +75,7 @@ private void processView(JCas view) {
 				lemma.addToIndexes();
 				token.setLemma(lemma);
 
-				System.out
-						.println("Matetools.Lemmatizer: " + token.getCoveredText() + "/" + lemma.getValue());
+				System.out.println("Matetools.Lemmatizer: " + token.getCoveredText() + "/" + lemma.getValue());
 			}
 
 			token_it.moveToFirst();

src/Cheiron/Processor/Matetools/Postagger.java

@@ -26,6 +26,9 @@ public class Postagger extends JCasAnnotator_ImplBase {
 	private static Map<String, Parser> pdetectors = new HashMap<String, Parser>();
 
 	private void processView(JCas view) {
+		if (ldetectors.containsKey(view.getDocumentLanguage()) || !pdetectors.containsKey(view.getDocumentLanguage()))
+			return;
+
 		Token token = null;
 		String[] tokens = null;
 		ArrayList<Token> tokenList = null;
@@ -87,8 +90,7 @@ private void processView(JCas view) {
 				}
 				token.setPosTag(tokenArray);
 
-				System.out
-						.println("Matetools.Postagger: " + token.getCoveredText() + "/" + postag.getValue());
+				System.out.println("Matetools.Postagger: " + token.getCoveredText() + "/" + postag.getValue());
 			}
 
 			token_it.moveToFirst();

src/Cheiron/Processor/OpenNLP/Postagger.java

@@ -23,6 +23,9 @@ public class Postagger extends Processor_ImplBase {
 
 	@Override
 	public void processView(JCas view) {
+		if (!detectors.containsKey(view.getDocumentLanguage()))
+			return;
+
 		Token token = null;
 		String[] tokens = null;
 		List<Token> tokenList = null;

src/Cheiron/Processor/OpenNLP/Sentencer.java

@@ -18,6 +18,9 @@ public class Sentencer extends Processor_ImplBase {
 
 	@Override
 	public void processView(JCas view) {
+		if (!detectors.containsKey(view.getDocumentLanguage()))
+			return;
+
 		Sentence sentence = null;
 
 		for (Span span : detectors.get(view.getDocumentLanguage()).sentPosDetect(view.getDocumentText())) {

src/Cheiron/Processor/OpenNLP/Tokenizer.java

@@ -20,6 +20,9 @@ public class Tokenizer extends Processor_ImplBase {
 
 	@Override
 	public void processView(JCas view) {
+		if (!detectors.containsKey(view.getDocumentLanguage()))
+			return;
+
 		Token token = null;
 
 		for (Sentence sentence : JCasUtil.select(view, Sentence.class)) {

src/Cheiron/Processor/Stanford/Postagger.java

@@ -24,6 +24,9 @@ public class Postagger extends Processor_ImplBase {
 
 	@Override
 	public void processView(JCas view) {
+		if (!detectors.containsKey(view.getDocumentLanguage()))
+			return;
+		
 		Token token = null;
 		List<Word> tokens = null;
 		List<Token> tokenList = null;
@@ -42,6 +45,7 @@ public void processView(JCas view) {
 			for (Token t : tokenList)
 				tokens.add(new Word(t.getCoveredText()));
 
+			
 			postags = detectors.get(view.getDocumentLanguage()).tagSentence(tokens);
 
 			for (int i = 0; i < postags.size(); i++) {