Merge branch 'redeWiedergabe_dev' into 'master'

Rede wiedergabe dev

See merge request !83

de.uniwue.mk.athen/bundles/de.ids.tt.athen.rwview/src/de/ids/tt/athen/rwview/part/RedeWiedergabeView.java

@@ -1025,7 +1025,7 @@ public class RedeWiedergabeView extends AEditorSubordinateViewPart {
 					}
 				
 				for (AnnotationFS stwr : stwrList){
-					if (anno.getBegin() >= stwr.getBegin() && anno.getEnd() <= stwr.getEnd())
+					if (anno.getBegin() >= stwr.getBegin() && anno.getEnd() <= stwr.getEnd() && stwr.getFeatureValueAsString(rTypeFeat).equals("reported"))
 					{
 						anno.getFeatureValueAsString(speakerFeat);
 						addAnnotation(anno);
@@ -1080,10 +1080,10 @@ public class RedeWiedergabeView extends AEditorSubordinateViewPart {
 				//JOptionPane.showMessageDialog(jFrame, "The speaker already has the ID " + selected.getFeatureValueAsString(frameIDFeat) + ".", "Attention", JOptionPane.WARNING_MESSAGE);
 			}else if (anno.getFeatureValueAsString(speakerIDFeat).equals("0")) {
 				concatenatedId = selected.getFeatureValueAsString(frameIDFeat);
-				updateAnnotation(anno, speakerIDFeat, concatenatedId, true);		
+				updateAnnotation(anno, speakerIDFeat, concatenatedId, true);	
 			}else {
 				concatenatedId = anno.getFeatureValueAsString(speakerIDFeat) + " " + selected.getFeatureValueAsString(frameIDFeat);
-				updateAnnotation(anno, speakerIDFeat, concatenatedId, true);		
+				updateAnnotation(anno, speakerIDFeat, concatenatedId, true);	
 			}
 			
 		}
@@ -2194,7 +2194,7 @@ public class RedeWiedergabeView extends AEditorSubordinateViewPart {
 		updateAnnotation(metaDataList.get(0), timeStampFeat, timestampValue, true);
 			
 		String versionValue = metaDataList.get(0).getFeatureValueAsString(versionFeat);
-		versionValue = "0.0.11a 0.0.1s";
+		versionValue = "0.0.12a 0.0.1s";
 		//versionValue = "0.0.8a 0.0.1s";
 		updateAnnotation(metaDataList.get(0), versionFeat, versionValue, true);	
 	}

de.uniwue.mk.athen/bundles/de.ids.tt.athen.rwview/src/de/ids/tt/athen/rwview/ui/RwFrameTableComposite.java

@@ -202,7 +202,8 @@ public class RwFrameTableComposite extends Composite{
 	{
 		IStructuredSelection sel = (IStructuredSelection) frameViewer.getSelection();
 		AnnotationFS selected = (AnnotationFS) sel.getFirstElement();
-		part.createSpeakerOutsideFrame(selected);		
+		part.createSpeakerOutsideFrame(selected);	
+		refreshTable();
 	}
 
 	// small utility method

de.uniwue.mk.athen/bundles/de.ids.tt.athen.rwview/src/de/ids/tt/athen/rwview/ui/RwStwrTableComposite.java

@@ -273,7 +273,8 @@ public class RwStwrTableComposite extends Composite{
 	{
 		IStructuredSelection sel = (IStructuredSelection) stwrViewer.getSelection();
 		AnnotationFS selected = (AnnotationFS) sel.getFirstElement();
-		part.createSpeakerOutsideStwr(selected);		
+		part.createSpeakerOutsideStwr(selected);	
+		refreshTable();
 	}
 
 	// small utility method