From cc481c8554f51b52b533df980fec7140470e9cea Mon Sep 17 00:00:00 2001
From: tu <tu@PC-Tu.IDS.DOM>
Date: Mon, 15 Oct 2018 16:21:56 +0200
Subject: [PATCH] deleted old metadata_names; fixed speaker bug
---
.../athen/rwview/part/RedeWiedergabeView.java | 21 +++--
.../tt/athen/rwview/ui/RwMetadataDialog.java | 77 +------------------
2 files changed, 12 insertions(+), 86 deletions(-)
diff --git a/de.uniwue.mk.athen/bundles/de.ids.tt.athen.rwview/src/de/ids/tt/athen/rwview/part/RedeWiedergabeView.java b/de.uniwue.mk.athen/bundles/de.ids.tt.athen.rwview/src/de/ids/tt/athen/rwview/part/RedeWiedergabeView.java
index 680e9432..76a99905 100644
--- a/de.uniwue.mk.athen/bundles/de.ids.tt.athen.rwview/src/de/ids/tt/athen/rwview/part/RedeWiedergabeView.java
+++ b/de.uniwue.mk.athen/bundles/de.ids.tt.athen.rwview/src/de/ids/tt/athen/rwview/part/RedeWiedergabeView.java
@@ -1066,7 +1066,6 @@ public class RedeWiedergabeView extends AEditorSubordinateViewPart {
if (speakerSelection != null && speakerSelection.size() > 0)
{
AnnotationFS anno = speakerSelection.get(0);
- anno.setFeatureValueFromString(speakerIDFeat, "");
if (anno.getFeatureValueAsString(speakerIDFeat) == null)
{
concatenatedId = selected.getFeatureValueAsString(frameIDFeat);
@@ -1079,10 +1078,14 @@ public class RedeWiedergabeView extends AEditorSubordinateViewPart {
//speakerOutsideFrameShell.close();
//JFrame jFrame = new JFrame("Information");
//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);
}else {
concatenatedId = anno.getFeatureValueAsString(speakerIDFeat) + " " + selected.getFeatureValueAsString(frameIDFeat);
updateAnnotation(anno, speakerIDFeat, concatenatedId, true);
}
+
}
renewPage();
}
@@ -1107,9 +1110,13 @@ public class RedeWiedergabeView extends AEditorSubordinateViewPart {
//speakerOutsideStwrShell.close();
//JFrame jFrame = new JFrame("Information");
//JOptionPane.showMessageDialog(jFrame, "The speaker already has the ID " + selected.getFeatureValueAsString(stwrIDFeat) + ".", "Attention", JOptionPane.WARNING_MESSAGE);
+ }else if (anno.getFeatureValueAsString(speakerIDFeat).equals("0")) {
+ concatenatedId = selected.getFeatureValueAsString(stwrIDFeat);
+ updateAnnotation(anno, speakerIDFeat, concatenatedId, true);
}else {
- concatenatedId = anno.getFeatureValueAsString(speakerIDFeat) + " " + selected.getFeatureValueAsString(stwrIDFeat);
- updateAnnotation(anno, speakerIDFeat, concatenatedId, true);
+ concatenatedId = anno.getFeatureValueAsString(speakerIDFeat) + " " + selected.getFeatureValueAsString(stwrIDFeat);
+ updateAnnotation(anno, speakerIDFeat, concatenatedId, true);
+
}
}
renewPage();
@@ -2146,10 +2153,6 @@ public class RedeWiedergabeView extends AEditorSubordinateViewPart {
if (rwMetadataDialog.abrunnerFlag == true) {
nameFeatString = "abrunner";
rwMetadataDialog.abrunnerFlag = false;
-
- } else if (rwMetadataDialog.cpeterekFlag == true) {
- nameFeatString = "cpeterek";
- rwMetadataDialog.cpeterekFlag = false;
} else if (rwMetadataDialog.lweimerFlag == true) {
nameFeatString = "lweimer";
@@ -2163,10 +2166,6 @@ public class RedeWiedergabeView extends AEditorSubordinateViewPart {
nameFeatString = "ahartmann";
rwMetadataDialog.ahartmannFlag = false;
- } else if (rwMetadataDialog.lschaeferFlag == true) {
- nameFeatString = "lschaefer";
- rwMetadataDialog.lschaeferFlag = false;
-
} else if (rwMetadataDialog.lsergelFlag == true) {
nameFeatString = "lsergel";
rwMetadataDialog.lsergelFlag = false;
diff --git a/de.uniwue.mk.athen/bundles/de.ids.tt.athen.rwview/src/de/ids/tt/athen/rwview/ui/RwMetadataDialog.java b/de.uniwue.mk.athen/bundles/de.ids.tt.athen.rwview/src/de/ids/tt/athen/rwview/ui/RwMetadataDialog.java
index f91150cf..a6119496 100644
--- a/de.uniwue.mk.athen/bundles/de.ids.tt.athen.rwview/src/de/ids/tt/athen/rwview/ui/RwMetadataDialog.java
+++ b/de.uniwue.mk.athen/bundles/de.ids.tt.athen.rwview/src/de/ids/tt/athen/rwview/ui/RwMetadataDialog.java
@@ -19,11 +19,9 @@ public class RwMetadataDialog extends Dialog {
private Device device;
public boolean abrunnerFlag = false;
- public boolean cpeterekFlag = false;
public boolean lweimerFlag = false;
public boolean ttuFlag = false;
public boolean ahartmannFlag = false;
- public boolean lschaeferFlag = false;
public boolean lsergelFlag = false;
public boolean sgorkeFlag = false;
public boolean jlorenzenFlag = false;
@@ -50,11 +48,9 @@ public class RwMetadataDialog extends Dialog {
if (ABRUNNER.getEnabled() == true)
{
abrunnerFlag = true;
- cpeterekFlag = false;
lweimerFlag = false;
ttuFlag = false;
ahartmannFlag = false;
- lschaeferFlag = false;
lsergelFlag = false;
sgorkeFlag = false;
jlorenzenFlag = false;
@@ -68,35 +64,7 @@ public class RwMetadataDialog extends Dialog {
}
});
-
- final Button CPETEREK = new Button(container, SWT.PUSH);
- CPETEREK.setLayoutData(new GridData(SWT.BEGINNING, SWT.CENTER, false, false));
- CPETEREK.setBackground(new Color (device, 0,255,0));
- CPETEREK.setText("cpeterek");
-
- CPETEREK.addSelectionListener(new SelectionAdapter() {
- @Override
- public void widgetSelected(SelectionEvent e) {
- if (CPETEREK.getEnabled() == true)
- {
- cpeterekFlag = true;
- abrunnerFlag = false;
- lweimerFlag = false;
- ttuFlag = false;
- ahartmannFlag = false;
- lschaeferFlag = false;
- lsergelFlag = false;
- sgorkeFlag = false;
- jlorenzenFlag = false;
- close();
- }
- else
- {
- cpeterekFlag = false;
- }
- }
- });
-
+
final Button LWEIMER = new Button(container, SWT.PUSH);
LWEIMER.setLayoutData(new GridData(SWT.BEGINNING, SWT.CENTER, false, false));
LWEIMER.setBackground(new Color (device, 0,0,139));
@@ -110,10 +78,8 @@ public class RwMetadataDialog extends Dialog {
{
lweimerFlag = true;
abrunnerFlag = false;
- cpeterekFlag = false;
ttuFlag = false;
ahartmannFlag = false;
- lschaeferFlag = false;
lsergelFlag = false;
sgorkeFlag = false;
jlorenzenFlag = false;
@@ -140,10 +106,8 @@ public class RwMetadataDialog extends Dialog {
{
ttuFlag = true;
abrunnerFlag = false;
- cpeterekFlag = false;
lweimerFlag = false;
ahartmannFlag = false;
- lschaeferFlag = false;
lsergelFlag = false;
sgorkeFlag = false;
jlorenzenFlag = false;
@@ -171,10 +135,8 @@ public class RwMetadataDialog extends Dialog {
{
ahartmannFlag = true;
abrunnerFlag = false;
- cpeterekFlag = false;
lweimerFlag = false;
ttuFlag = false;
- lschaeferFlag = false;
lsergelFlag = false;
sgorkeFlag = false;
jlorenzenFlag = false;
@@ -186,36 +148,7 @@ public class RwMetadataDialog extends Dialog {
}
}
});
-
- final Button LSCHAEFER = new Button(container, SWT.PUSH);
- LSCHAEFER.setLayoutData(new GridData(SWT.BEGINNING, SWT.CENTER, false, false));
- LSCHAEFER.setBackground(new Color (device, 255,215,0));
- LSCHAEFER.setText("lschaefer");
-
- LSCHAEFER.addSelectionListener(new SelectionAdapter() {
- @Override
- public void widgetSelected(SelectionEvent e)
- {
- if (LSCHAEFER.getEnabled() == true)
- {
- lschaeferFlag = true;
- abrunnerFlag = false;
- ahartmannFlag = false;
- cpeterekFlag = false;
- lweimerFlag = false;
- ttuFlag = false;
- lsergelFlag = false;
- sgorkeFlag = false;
- jlorenzenFlag = false;
- close();
- }
- else
- {
- lschaeferFlag = false;
- }
- }
- });
-
+
final Button LSERGEL = new Button(container, SWT.PUSH);
LSERGEL.setLayoutData(new GridData(SWT.BEGINNING, SWT.CENTER, false, false));
LSERGEL.setBackground(new Color (device, 220,20,60));
@@ -228,10 +161,8 @@ public class RwMetadataDialog extends Dialog {
if (LSERGEL.getEnabled() == true)
{
lsergelFlag = true;
- lschaeferFlag = false;
abrunnerFlag = false;
ahartmannFlag = false;
- cpeterekFlag = false;
lweimerFlag = false;
ttuFlag = false;
sgorkeFlag = false;
@@ -257,10 +188,8 @@ public class RwMetadataDialog extends Dialog {
if (SGORKE.getEnabled() == true)
{
sgorkeFlag = true;
- lschaeferFlag = false;
abrunnerFlag = false;
ahartmannFlag = false;
- cpeterekFlag = false;
lweimerFlag = false;
lsergelFlag = false;
ttuFlag = false;
@@ -286,10 +215,8 @@ public class RwMetadataDialog extends Dialog {
if (JLORENZEN.getEnabled() == true)
{
jlorenzenFlag = true;
- lschaeferFlag = false;
abrunnerFlag = false;
ahartmannFlag = false;
- cpeterekFlag = false;
lweimerFlag = false;
lsergelFlag = false;
ttuFlag = false;
--
GitLab