#34 - Improve and refactor Active Learning code

- Further reduced code - Some renaming - Formatting - Instead of replacing the layer dropdown after session start, just disable it - Use constant from RecommenderEditorExtension instead of redefining it
inception-project · Apr 11, 2018 · 3e78af0 · 3e78af0
1 parent 388a30b
commit 3e78af0
Show file tree

Hide file tree

Showing 3 changed files with 101 additions and 131 deletions.
diff --git a/.../java/de/tudarmstadt/ukp/inception/active/learning/sidebar/ActiveLearningRecommender.java b/.../java/de/tudarmstadt/ukp/inception/active/learning/sidebar/ActiveLearningRecommender.java
@@ -32,10 +32,7 @@
 import org.apache.uima.cas.text.AnnotationFS;
 import org.apache.uima.fit.util.CasUtil;
 import org.apache.uima.jcas.JCas;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
-import de.tudarmstadt.ukp.clarin.webanno.api.AnnotationSchemaService;
 import de.tudarmstadt.ukp.clarin.webanno.api.DocumentService;
 import de.tudarmstadt.ukp.clarin.webanno.api.annotation.model.AnnotatorState;
 import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationLayer;
@@ -49,26 +46,23 @@
 public class ActiveLearningRecommender
     implements Serializable
 {
-    private static final Logger logger = LoggerFactory.getLogger(ActiveLearningSidebar.class);
     private static final long serialVersionUID = -2308436775710912029L;
 
     private RecommendationService recommendationService;
     private List<AnnotationObject> recommendations;
     private List<List<AnnotationObject>> listOfRecommendationsForEachToken;
     private AnnotatorState annotatorState;
     private AnnotationLayer selectedLayer;
-    private AnnotationSchemaService annotationService;
     private LearningRecordService learningRecordService;
     private DocumentService documentService;
 
     public ActiveLearningRecommender(RecommendationService recommendationService,
             AnnotatorState annotatorState, AnnotationLayer selectedLayer,
-            AnnotationSchemaService annotationService, LearningRecordService recordService)
+            LearningRecordService recordService)
     {
         this.recommendationService = recommendationService;
         this.annotatorState = annotatorState;
         this.selectedLayer = selectedLayer;
-        this.annotationService = annotationService;
         this.learningRecordService = recordService;
     }
 

diff --git a/...main/java/de/tudarmstadt/ukp/inception/active/learning/sidebar/ActiveLearningSidebar.html b/...main/java/de/tudarmstadt/ukp/inception/active/learning/sidebar/ActiveLearningSidebar.html
@@ -24,7 +24,7 @@
         <h3 class="panel-title">Active Learning</h3>
       </div>
       <div class="panel-body flex-v-container">
-        <form class="panel panel-default panel-small" wicket:id="layerSelectionForm">
+        <form class="panel panel-default panel-small" wicket:id="sessionControlForm">
           <div class="panel-heading">
             <h3 class="panel-title">Session</h3>
           </div>
@@ -33,7 +33,6 @@ <h3 class="panel-title">Session</h3>
               <label class="col-sm-3 control-label">Layer</label>
               <div class="col-sm-9">
                 <select class="form-control" wicket:id="selectLayer"></select>
-                <span class="form-control" wicket:id="showSelectedLayer"></span>
               </div>
             </div>
           </div>