From b97ceaabdbcedfd288bb56a2421bee4d735a394e Mon Sep 17 00:00:00 2001
From: Erik Diers <erik.diers@rub.de>
Date: Wed, 15 May 2024 18:02:57 +0200
Subject: [PATCH] Update codebase
---
src/AppJ_V03.java | 62 ++++++++++++++++++++++++++++++++---------------
1 file changed, 43 insertions(+), 19 deletions(-)
diff --git a/src/AppJ_V03.java b/src/AppJ_V03.java
index 623f727..3f15916 100644
--- a/src/AppJ_V03.java
+++ b/src/AppJ_V03.java
@@ -67,17 +67,39 @@ import com.toedter.calendar.JDateChooser;
**/
public class AppJ_V03 extends JFrame {
- private static final String currentSoftwareVersion = "20240413";
+ private static final String currentSoftwareVersion = "20240415";
private static final String[] RIGHTS_URI = new String[] {
- "http://rightsstatements.org/vocab/InC/1.0/", "https://creativecommons.org/licenses/by/4.0/", "https://creativecommons.org/licenses/by-sa/4.0/", "https://creativecommons.org/licenses/by-nd/4.0/", "https://creativecommons.org/licenses/by-nc/4.0/", "https://creativecommons.org/licenses/by-nc-nd/4.0/",
- "https://creativecommons.org/licenses/by-nc-nd/4.0/", "https://creativecommons.org/licenses/by-nc-sa/4.0/", "http://creativecommons.org/publicdomain/zero/1.0/", "http://creativecommons.org/publicdomain/mark/1.0/", "http://www.apache.org/licenses/LICENSE-2.0", "http://www.gnu.org/licenses/gpl.html", "http://opensource.org/licenses/MIT"
- };
+ "",
+ "http://rightsstatements.org/vocab/InC/1.0/",
+ "https://creativecommons.org/licenses/by/4.0/",
+ "https://creativecommons.org/licenses/by-sa/4.0/",
+ "https://creativecommons.org/licenses/by-nd/4.0/",
+ "https://creativecommons.org/licenses/by-nc/4.0/",
+ "https://creativecommons.org/licenses/by-nc-nd/4.0/",
+ "https://creativecommons.org/licenses/by-nc-sa/4.0/",
+ "http://creativecommons.org/publicdomain/zero/1.0/",
+ "http://creativecommons.org/publicdomain/mark/1.0/",
+ "http://www.apache.org/licenses/LICENSE-2.0",
+ "http://www.gnu.org/licenses/gpl.html",
+ "http://opensource.org/licenses/MIT"
+ };
private static final String[] RIGHTS_LABELS = new String[] {
- "In Copyright", "Creative Commons BY Attribution 4.0 International", "Creative Commons BY-SA Attribution-ShareAlike 4.0 International", "Creative Commons BY-ND Attribution-NoDerivatives 4.0 International", "Creative Commons BY-NC Attribution-NonCommercial 4.0 International", "Creative Commons BY-NC-ND Attribution-NonCommercial-NoDerivs 4.0 International",
- "Creative Commons BY-NC-SA Attribution-NonCommercial-ShareAlike 4.0 International", "Creative Commons BY-NC-SA Attribution-NonCommercial-ShareAlike 4.0 International", "Creative Commons CC0 1.0 Universal", "Creative Commons Public Domain Mark 1.0", "Creative Commons Public Domain Mark 1.0", "Apache License 2.0", "GNU General Public License", "MIT License"
- };
+ "-",
+ "In Copyright",
+ "Creative Commons BY Attribution 4.0 International",
+ "Creative Commons BY-SA Attribution-ShareAlike 4.0 International",
+ "Creative Commons BY-ND Attribution-NoDerivatives 4.0 International",
+ "Creative Commons BY-NC Attribution-NonCommercial 4.0 International",
+ "Creative Commons BY-NC-ND Attribution-NonCommercial-NoDerivs 4.0 International",
+ "Creative Commons BY-NC-SA Attribution-NonCommercial-ShareAlike 4.0 International",
+ "Creative Commons CC0 1.0 Universal",
+ "Creative Commons Public Domain Mark 1.0",
+ "Apache License 2.0",
+ "GNU General Public License",
+ "MIT License"
+ };
private static final long serialVersionUID = 1L;
@@ -414,10 +436,9 @@ public class AppJ_V03 extends JFrame {
String p_language_dub = "";
String p_publisher_dub = "";
String p_relation_dub = "";
- String p_rights_dub = "";
+ String p_rights_dub = "-";
String p_source_dub = "";
String p_subject_dub = "";
- @SuppressWarnings("unused")
String p_type_dub = "Collection";
//---------------------------------------- DataCite ---------------------------------------------------
String p_identifier_cite = "";
@@ -458,8 +479,8 @@ public class AppJ_V03 extends JFrame {
String p_alternate_identifier_type_cite = "";
//..........................................
String p_related_identifier_cite = "";
- String p_related_identifier_type_cite = "DOI";
- String p_relation_type_cite = "IsReferencedBy";
+ String p_related_identifier_type_cite = "-";
+ String p_relation_type_cite = "-";
//..........................................
String p_size_cite = "";
String p_version_cite = "1.0";
@@ -1085,7 +1106,10 @@ public class AppJ_V03 extends JFrame {
panel_dublin.add(format_txt_dub);
- JTextField language_txt_dub = new JTextField(p_language_dub);
+ JComboBox<String> language_txt_dub = new JComboBox<>();
+ language_txt_dub.setEditable(true);
+ language_txt_dub.setModel(new DefaultComboBoxModel<>(new String[] {"EN", "DE"}));
+ language_txt_dub.setSelectedItem(p_language_dub);
language_txt_dub.setFont(new Font("Lucida Grande", Font.PLAIN, 16));
language_txt_dub.setBackground(new Color(220, 220, 220));
language_txt_dub.setBounds(388, 474, 230, 70);
@@ -1592,7 +1616,7 @@ public class AppJ_V03 extends JFrame {
panel_cite.add(related_identifier_txt_cite);
related_identifier_type_combo_cite = new JComboBox<String>();
- related_identifier_type_combo_cite.setModel(new DefaultComboBoxModel<>(new String[] {"ARK", "arXiv", "bibcode", "DOI", "EAN13", "EISSN", "Handle", "IGSN", "ISBN", "ISSN", "ISTC", "LISSN", "LSID", "PMID", "PURL", "UPC", "URL", "URN", "w3id"}));
+ related_identifier_type_combo_cite.setModel(new DefaultComboBoxModel<>(new String[] {"-", "ARK", "arXiv", "bibcode", "DOI", "EAN13", "EISSN", "Handle", "IGSN", "ISBN", "ISSN", "ISTC", "LISSN", "LSID", "PMID", "PURL", "UPC", "URL", "URN", "w3id"}));
related_identifier_type_combo_cite.setSelectedItem(p_related_identifier_type_cite);
related_identifier_type_combo_cite.setBounds(1093, 330, 210, 36);
panel_cite.add(related_identifier_type_combo_cite);
@@ -1600,7 +1624,7 @@ public class AppJ_V03 extends JFrame {
relation_type_combo_cite = new JComboBox<String>();
- relation_type_combo_cite.setModel(new DefaultComboBoxModel<>(new String[] {"IsCitedBy", "Cites", "IsSupplementTo", "IsSupplementedBy", "IsContinuedBy", "Continues", "IsDescribedBy", "Describes", "HasMetadata", "IsMetadataFor", "HasVersion", "IsVersionOf", "IsNewVersionOf", "IsPreviousVersionOf", "IsPartOf", "HasPart", "IsPublishedIn", "IsReferencedBy", "References", "IsDocumentedBy", "Documents", "IsCompiledBy", "Compiles", "IsVariantFormOf", "IsOriginalFormOf", "IsIdenticalTo", "IsReviewedBy", "Reviews", "IsDerivedFrom", "IsSourceOf", "IsRequiredBy", "Requires", "IsObsoletedBy", "Obsoletes", "IsCollectedBy", "Collects"}));
+ relation_type_combo_cite.setModel(new DefaultComboBoxModel<>(new String[] {"-", "IsCitedBy", "Cites", "IsSupplementTo", "IsSupplementedBy", "IsContinuedBy", "Continues", "IsDescribedBy", "Describes", "HasMetadata", "IsMetadataFor", "HasVersion", "IsVersionOf", "IsNewVersionOf", "IsPreviousVersionOf", "IsPartOf", "HasPart", "IsPublishedIn", "IsReferencedBy", "References", "IsDocumentedBy", "Documents", "IsCompiledBy", "Compiles", "IsVariantFormOf", "IsOriginalFormOf", "IsIdenticalTo", "IsReviewedBy", "Reviews", "IsDerivedFrom", "IsSourceOf", "IsRequiredBy", "Requires", "IsObsoletedBy", "Obsoletes", "IsCollectedBy", "Collects"}));
relation_type_combo_cite.setSelectedItem(p_relation_type_cite);
relation_type_combo_cite.setBounds(1093, 401, 210, 36);
panel_cite.add(relation_type_combo_cite);
@@ -1661,7 +1685,7 @@ public class AppJ_V03 extends JFrame {
char[] comma_invalid = new char[] {','};
disableInvalid(publisher_txt_dub, comma_invalid);
disableInvalid(subject_txt_dub, comma_invalid);
- disableInvalid(language_txt_dub, comma_invalid);
+ //disableInvalid(language_txt_dub, comma_invalid);
disableInvalid(relation_txt_dub, comma_invalid);
//
disableInvalid(creator_name_identifier_txt_cite, comma_invalid);
@@ -1697,7 +1721,7 @@ public class AppJ_V03 extends JFrame {
checkRedTrail(publisher_txt_dub);
checkRedTrail(relation_txt_dub);
checkRedTrail(format_txt_dub);
- checkRedTrail(language_txt_dub);
+ //checkRedTrail(language_txt_dub);
checkRedTrail(subject_txt_dub);
// checkParent(creator_name_identifier_txt_cite, creator_txt);
@@ -1747,7 +1771,7 @@ public class AppJ_V03 extends JFrame {
//...............................................................................
//from DublinCore to SFB meta data
} else if (cmd.equals(PREVIOUS)) {
- if(errBox(publisher_txt_dub)|| errBox(subject_txt_dub) || errBox(relation_txt_dub) || errBox(format_txt_dub) || errBox(language_txt_dub)) {
+ if(errBox(publisher_txt_dub)|| errBox(subject_txt_dub) || errBox(relation_txt_dub) || errBox(format_txt_dub) ) { //|| errBox(language_txt_dub)
JOptionPane.showMessageDialog(c, "Please correct the red fields!", "", getDefaultCloseOperation());
} else {
cl.previous(cards);
@@ -1851,7 +1875,7 @@ public class AppJ_V03 extends JFrame {
obj.put("DublinCore-Description", experimentDescriptionTextArea.getText());
obj.put("DublinCore-Format", format_txt_dub.getText());
obj.put("DublinCore-Identifier", p_identifier_dub);
- obj.put("DublinCore-Language", language_txt_dub.getText());
+ obj.put("DublinCore-Language", language_txt_dub.getSelectedItem());
obj.put("DublinCore-Publisher", publisher_txt_dub.getText());
obj.put("DublinCore-Relation", relation_txt_dub.getText());
obj.put("DublinCore-Rights", rights_combo_dub.getSelectedItem());
@@ -1892,7 +1916,7 @@ public class AppJ_V03 extends JFrame {
obj.put("DataCite-subjectScheme", subject_scheme_txt_cite.getText());
obj.put("DataCite-subjectSchemeURI", subject_scheme_uri_txt_cite.getText());
obj.put("DataCite-subjectValueURI", p_subject_value_uri_cite);
- obj.put("DataCite-Language", language_txt_dub.getText());
+ obj.put("DataCite-Language", language_txt_dub.getSelectedItem());
obj.put("DataCite-alternateIdentifier", p_alternate_identifier_cite);
obj.put("DataCite-alternateIdentifierType", p_alternate_identifier_type_cite);
obj.put("DataCite-RelatedIdentifier", related_identifier_txt_cite.getText());
--
GitLab