Skip to content

GitLab

Commit 2d206d8b authored by Markus Krug's avatar Markus Krug
Browse files
Options

Merge branch 'redeWiedergabe_dev' into 'master' 

changed typesystem, added lsergel to names, deleted tvalta from names,...

See merge request !74
parents 9b947997 2ed5197a
Pipeline #10630 passed with stages
      in 19 minutes and 20 seconds
      Hide whitespace changes
      Inline Side-by-side
      Showing with 146 additions and 70 deletions
      de.uniwue.mk.athen/bundles/de.ids.tt.athen.rwview/src/de/ids/tt/athen/rwview/part/RedeWiedergabeView.java
      View file @ 2d206d8b
      ......@@ -1840,9 +1840,6 @@ public class RedeWiedergabeView extends AEditorSubordinateViewPart {
      borderValue = STATE;
      break;
      case STATE:
      borderValue = FEEL;
      break;
      case FEEL:
      borderValue = UNSPEC;
      break;
      default:
      ......@@ -1939,10 +1936,6 @@ public class RedeWiedergabeView extends AEditorSubordinateViewPart {
      nameFeatString = "ttu";
      rwMetadataDialog.ttuFlag = false;
      } else if (rwMetadataDialog.tvaltaFlag == true) {
      nameFeatString = "tvalta";
      rwMetadataDialog.tvaltaFlag = false;
      } else if (rwMetadataDialog.ahartmannFlag == true) {
      nameFeatString = "ahartmann";
      rwMetadataDialog.ahartmannFlag = false;
      ......@@ -1951,6 +1944,10 @@ public class RedeWiedergabeView extends AEditorSubordinateViewPart {
      nameFeatString = "lschaefer";
      rwMetadataDialog.lschaeferFlag = false;
      } else if (rwMetadataDialog.lsergelFlag == true) {
      nameFeatString = "lsergel";
      rwMetadataDialog.lsergelFlag = false;
      /*
      } else {
      ......@@ -1967,7 +1964,7 @@ public class RedeWiedergabeView extends AEditorSubordinateViewPart {
      updateAnnotation(metaDataList.get(0), timeStampFeat, timestampValue, true);
      String versionValue = metaDataList.get(0).getFeatureValueAsString(versionFeat);
      versionValue = "0.0.8_1a 0.0.1s";
      versionValue = "0.0.9_1a 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/EditMetadataDialog.java
      View file @ 2d206d8b
      ......@@ -15,8 +15,7 @@ import javax.swing.JLabel;
      import javax.swing.JPanel;
      import javax.swing.JTextField;
      import javax.swing.SwingUtilities;
      import javax.swing.UIManager;
      import javax.swing.text.DefaultCaret;
      import de.ids.tt.athen.rwview.part.RedeWiedergabeView;
      ......@@ -24,13 +23,13 @@ public class EditMetadataDialog extends JFrame implements ActionListener {
      static RedeWiedergabeView part;
      private JComboBox<String> titleComboBox;
      private JComboBox<String> authorComboBox;
      private JTextField titleField = new JTextField(20);
      private JTextField authorField = new JTextField(20);
      private Color thistle = new Color(216,191,216);
      private String corpuspartArray [] = {"not defined", "famz", "erz", "zeit"};
      private JComboBox<String> corpuspartComboBox = new JComboBox<String>(corpuspartArray);
      private JComboBox<String> corpuspartComboBox= new JComboBox<String>(corpuspartArray);
      private String fictionalArray [] = {"not defined", "yes", "no", "unsure"};
      private JComboBox<String> fictionalComboBox = new JComboBox<String>(fictionalArray);
      ......@@ -67,31 +66,24 @@ public class EditMetadataDialog extends JFrame implements ActionListener {
      constraints.gridx = 1;
      if (label.getText().equals("Title")){
      String titleArray[] = {metadataVal.get(i)};
      titleComboBox = new JComboBox<String>(titleArray);
      panel.add(titleComboBox, constraints);
      titleComboBox.setSelectedItem(metadataVal.get(i));
      titleComboBox.setEditable(true);
      panel.add(titleField, constraints);
      titleField.setText(metadataVal.get(i));
      }
      if (label.getText().equals("Author")){
      String authorArray[] = {metadataVal.get(i)};
      authorComboBox = new JComboBox<String>(authorArray);
      panel.add(authorComboBox, constraints);
      authorComboBox.setSelectedItem(metadataVal.get(i));
      authorComboBox.setEditable(true);
      panel.add(authorField, constraints);
      authorField.setText(metadataVal.get(i));
      }
      if (label.getText().equals("Id") || label.getText().equals("OrigFile") || label.getText().equals("Year") || label.getText().equals("Decade")
      || label.getText().equals("Textlength") || label.getText().equals("SampleID") || label.getText().equals("Periodical") ||
      label.getText().equals("Name") || label.getText().equals("Timestamp") || label.getText().equals("Version"))
      {
      String valueArray[] = {metadataVal.get(i)};
      JComboBox<String> comboBox = new JComboBox<String>(valueArray);
      panel.add(comboBox, constraints);
      comboBox.setSelectedItem(metadataVal.get(i));
      comboBox.setEditable(false);
      comboBox.setBackground(thistle);
      JTextField field = new JTextField(20);
      panel.add(field, constraints);
      field.setText(metadataVal.get(i));
      field.setEditable(false);
      field.setBackground(thistle);
      }
      else if (label.getText().equals("Corpuspart")){
      ......@@ -131,7 +123,16 @@ public class EditMetadataDialog extends JFrame implements ActionListener {
      narrativeComboBox.setSelectedItem(narrativeArray[0]);
      }
      }
      }
      }
      /*
      else if (label.getText().equals("title") || label.getText().equals("Author")){
      JTextField field = new JTextField(50);
      field.setText(metadataVal.get(i));
      panel.add(field, constraints);
      }
      */
      }
      constraints.gridx = 0;
      ......@@ -170,9 +171,9 @@ public class EditMetadataDialog extends JFrame implements ActionListener {
      @Override
      public void actionPerformed(ActionEvent e) {
      String titleInput = titleComboBox.getSelectedItem().toString();
      String titleInput = titleField.getText();
      part.setTitleInput(titleInput);
      String authorInput = authorComboBox.getSelectedItem().toString();
      String authorInput = authorField.getText();
      part.setAuthorInput(authorInput);
      String corpuspartInput = corpuspartComboBox.getSelectedItem().toString();
      part.setCorpuspartInput(corpuspartInput);
      ......
      de.uniwue.mk.athen/bundles/de.ids.tt.athen.rwview/src/de/ids/tt/athen/rwview/ui/RwMetadataDialog.java
      View file @ 2d206d8b
      ......@@ -21,10 +21,11 @@ public class RwMetadataDialog extends Dialog {
      public boolean abrunnerFlag = false;
      public boolean cpeterekFlag = false;
      public boolean lweimerFlag = false;
      public boolean tvaltaFlag = false;
      public boolean ttuFlag = false;
      public boolean ahartmannFlag = false;
      public boolean lschaeferFlag = false;
      public boolean lsergelFlag = false;
      public RwMetadataDialog(Shell parentShell) {
      super(parentShell);
      ......@@ -50,9 +51,9 @@ public class RwMetadataDialog extends Dialog {
      cpeterekFlag = false;
      lweimerFlag = false;
      ttuFlag = false;
      tvaltaFlag = false;
      ahartmannFlag = false;
      lschaeferFlag = false;
      lsergelFlag = false;
      close();
      }
      else
      ......@@ -78,9 +79,9 @@ public class RwMetadataDialog extends Dialog {
      abrunnerFlag = false;
      lweimerFlag = false;
      ttuFlag = false;
      tvaltaFlag = false;
      ahartmannFlag = false;
      lschaeferFlag = false;
      lsergelFlag = false;
      close();
      }
      else
      ......@@ -105,9 +106,9 @@ public class RwMetadataDialog extends Dialog {
      abrunnerFlag = false;
      cpeterekFlag = false;
      ttuFlag = false;
      tvaltaFlag = false;
      ahartmannFlag = false;
      lschaeferFlag = false;
      lsergelFlag = false;
      close();
      }
      else
      ......@@ -133,9 +134,9 @@ public class RwMetadataDialog extends Dialog {
      abrunnerFlag = false;
      cpeterekFlag = false;
      lweimerFlag = false;
      tvaltaFlag = false;
      ahartmannFlag = false;
      lschaeferFlag = false;
      lsergelFlag = false;
      close();
      }
      else
      ......@@ -146,84 +147,84 @@ public class RwMetadataDialog extends Dialog {
      }
      });
      final Button TVALTA = new Button(container, SWT.PUSH);
      TVALTA.setLayoutData(new GridData(SWT.BEGINNING, SWT.CENTER, false, false));
      TVALTA.setBackground(new Color (device, 220,20,60));
      TVALTA.setText("tvalta");
      final Button AHARTMANN = new Button(container, SWT.PUSH);
      AHARTMANN.setLayoutData(new GridData(SWT.BEGINNING, SWT.CENTER, false, false));
      AHARTMANN.setBackground(new Color (device, 100,149,237));
      AHARTMANN.setText("ahartmann");
      TVALTA.addSelectionListener(new SelectionAdapter() {
      AHARTMANN.addSelectionListener(new SelectionAdapter() {
      @Override
      public void widgetSelected(SelectionEvent e)
      {
      if (TVALTA.getEnabled() == true)
      if (AHARTMANN.getEnabled() == true)
      {
      tvaltaFlag = true;
      ahartmannFlag = true;
      abrunnerFlag = false;
      cpeterekFlag = false;
      lweimerFlag = false;
      ttuFlag = false;
      ahartmannFlag = false;
      lschaeferFlag = false;
      lsergelFlag = false;
      close();
      }
      else
      {
      tvaltaFlag = false;
      ahartmannFlag = false;
      }
      }
      });
      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");
      final Button AHARTMANN = new Button(container, SWT.PUSH);
      AHARTMANN.setLayoutData(new GridData(SWT.BEGINNING, SWT.CENTER, false, false));
      AHARTMANN.setBackground(new Color (device, 100,149,237));
      AHARTMANN.setText("ahartmann");
      AHARTMANN.addSelectionListener(new SelectionAdapter() {
      LSCHAEFER.addSelectionListener(new SelectionAdapter() {
      @Override
      public void widgetSelected(SelectionEvent e)
      {
      if (AHARTMANN.getEnabled() == true)
      if (LSCHAEFER.getEnabled() == true)
      {
      ahartmannFlag = true;
      lschaeferFlag = true;
      abrunnerFlag = false;
      ahartmannFlag = false;
      cpeterekFlag = false;
      lweimerFlag = false;
      ttuFlag = false;
      tvaltaFlag = false;
      lschaeferFlag = false;
      lsergelFlag = false;
      close();
      }
      else
      {
      ahartmannFlag = false;
      lschaeferFlag = false;
      }
      }
      });
      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");
      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));
      LSERGEL.setText("lsergel");
      LSCHAEFER.addSelectionListener(new SelectionAdapter() {
      LSERGEL.addSelectionListener(new SelectionAdapter() {
      @Override
      public void widgetSelected(SelectionEvent e)
      {
      if (LSCHAEFER.getEnabled() == true)
      if (LSERGEL.getEnabled() == true)
      {
      lschaeferFlag = true;
      lsergelFlag = true;
      lschaeferFlag = false;
      abrunnerFlag = false;
      ahartmannFlag = false;
      cpeterekFlag = false;
      lweimerFlag = false;
      ttuFlag = false;
      tvaltaFlag = false;
      close();
      }
      else
      {
      lschaeferFlag = false;
      lsergelFlag = false;
      }
      }
      });
      ......
      de.uniwue.mk.athen/bundles/de.ids.tt.athen.rwview/typesystem/redeWiedergabeTypesystem_compare_tei_cab.xml
      View file @ 2d206d8b
      ......@@ -5,9 +5,7 @@
      <description/>
      <version>1.0</version>
      <vendor/>
      <imports>
      </imports>
      <types>
      <types>
      <typeDescription>
      <name>de.idsma.rw.Metadata</name>
      <description/>
      ......@@ -688,7 +686,7 @@
      <typeDescription>
      <name>de.idsma.rw.CabToken</name>
      <description/>
      <description>CAB tokenizer</description>
      <supertypeName>uima.tcas.Annotation</supertypeName>
      <features>
      <featureDescription>
      ......@@ -716,6 +714,11 @@
      <description/>
      <rangeTypeName>uima.cas.String</rangeTypeName>
      </featureDescription>
      <featureDescription>
      <name>RfPos</name>
      <description/>
      <rangeTypeName>uima.cas.String</rangeTypeName>
      </featureDescription>
      </features>
      </typeDescription>
      ......@@ -749,5 +752,79 @@
      </typeDescription>
      <typeDescription>
      <name>de.idsma.rw.preprocessing.Token</name>
      <description>openNLPTokenizer</description>
      <supertypeName>uima.tcas.Annotation</supertypeName>
      <features>
      <featureDescription>
      <name>Lemma</name>
      <description/>
      <rangeTypeName>uima.cas.String</rangeTypeName>
      </featureDescription>
      <featureDescription>
      <name>RFPos</name>
      <description/>
      <rangeTypeName>uima.cas.String</rangeTypeName>
      </featureDescription>
      </features>
      </typeDescription>
      <typeDescription>
      <name>de.idsma.rw.preprocessing.OpenNLPCabSentence</name>
      <description>OpenNLP sentence detector used for CABToken</description>
      <supertypeName>uima.tcas.Annotation</supertypeName>
      </typeDescription>
      <typeDescription>
      <name>de.idsma.rw.AutoStwr</name>
      <description>Stwr annotations created by a rule-based function / machine learning</description>
      <supertypeName>uima.tcas.Annotation</supertypeName>
      <features>
      <featureDescription>
      <name>AutoMedium</name>
      <description/>
      <rangeTypeName>uima.cas.String</rangeTypeName>
      </featureDescription>
      <featureDescription>
      <name>AutoRType</name>
      <description/>
      <rangeTypeName>uima.cas.String</rangeTypeName>
      </featureDescription>
      <featureDescription>
      <name>AutoLevel</name>
      <description/>
      <rangeTypeName>uima.cas.String</rangeTypeName>
      </featureDescription>
      <featureDescription>
      <name>AutoNonFact</name>
      <description/>
      <rangeTypeName>uima.cas.String</rangeTypeName>
      </featureDescription>
      <featureDescription>
      <name>AutoPrag</name>
      <description/>
      <rangeTypeName>uima.cas.String</rangeTypeName>
      </featureDescription>
      <featureDescription>
      <name>AutoBorder</name>
      <description/>
      <rangeTypeName>uima.cas.String</rangeTypeName>
      </featureDescription>
      <featureDescription>
      <name>AutoMetaph</name>
      <description/>
      <rangeTypeName>uima.cas.String</rangeTypeName>
      </featureDescription>
      <featureDescription>
      <name>AutoStwr</name>
      <description/>
      <rangeTypeName>uima.cas.String</rangeTypeName>
      </featureDescription>
      <featureDescription>
      <name>AutoStwrID</name>
      <description/>
      <rangeTypeName>uima.cas.String</rangeTypeName>
      </featureDescription>
      </features>
      </typeDescription>
      </types>
      </typeSystemDescription>
      Markdown is supported
      0% or .
      You are about to add 0 people to the discussion. Proceed with caution.
      Finish editing this message first!
      Please register or to comment