Commit 17196790 authored by Markus Krug's avatar Markus Krug
Browse files

Merge branch 'redeWiedergabe_dev' into 'master'

changed editmetadatadialog, changed version number

See merge request !76
parents 029bda9b 90943bd5
Pipeline #10843 passed with stages
in 18 minutes and 38 seconds
...@@ -1964,7 +1964,7 @@ public class RedeWiedergabeView extends AEditorSubordinateViewPart { ...@@ -1964,7 +1964,7 @@ public class RedeWiedergabeView extends AEditorSubordinateViewPart {
updateAnnotation(metaDataList.get(0), timeStampFeat, timestampValue, true); updateAnnotation(metaDataList.get(0), timeStampFeat, timestampValue, true);
String versionValue = metaDataList.get(0).getFeatureValueAsString(versionFeat); String versionValue = metaDataList.get(0).getFeatureValueAsString(versionFeat);
versionValue = "0.0.9_1a 0.0.1s"; versionValue = "0.0.9a 0.0.1s";
//versionValue = "0.0.8a 0.0.1s"; //versionValue = "0.0.8a 0.0.1s";
updateAnnotation(metaDataList.get(0), versionFeat, versionValue, true); updateAnnotation(metaDataList.get(0), versionFeat, versionValue, true);
} }
......
...@@ -151,14 +151,6 @@ public class EditMetadataDialog extends JFrame implements ActionListener { ...@@ -151,14 +151,6 @@ public class EditMetadataDialog extends JFrame implements ActionListener {
public static void main(String[] args) { public static void main(String[] args) {
/*
try {
UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
} catch (Exception ex) {
ex.printStackTrace();
}
*/
SwingUtilities.invokeLater(new Runnable() { SwingUtilities.invokeLater(new Runnable() {
@Override @Override
public void run() { public void run() {
......
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