unified Descriptions

ff6c0f27 · Erik Diers · bba6689c · ff6c0f27
Commit ff6c0f27 authored 1 year ago by Erik Diers
--- a/src/AppJ_V03.java
+++ b/src/AppJ_V03.java
@@ -1006,11 +1006,11 @@ public class AppJ_V03 extends JFrame {
 		coverage.setBounds(26, 45, 334, 138);
 		panel_dublin.add(coverage);
 		
-		JLabel description = new JLabel("<html>Description<BR><font size = 2>Enter a generally understandable description of the stored research data.</font></html>");
-		description.setForeground(new Color(211, 211, 211));
-		description.setFont(new Font("Tahoma", Font.BOLD, 18));
-		description.setBounds(26, 202, 334, 70);
-		panel_dublin.add(description);
+//		JLabel description = new JLabel("<html>Description<BR><font size = 2>Enter a generally understandable description of the stored research data.</font></html>");
+//		description.setForeground(new Color(211, 211, 211));
+//		description.setFont(new Font("Tahoma", Font.BOLD, 18));
+//		description.setBounds(26, 202, 334, 70);
+//		panel_dublin.add(description);
 		
 		JLabel format = new JLabel("<html>Format<BR><font size = 2>The file format, physical medium, or dimensions of the resource. A semicolon-separated list of file extensions that are used. \r\n" + 
 				"E.g.: acq; mat; xls; xlsx\r\n" + 
@@ -1052,7 +1052,7 @@ public class AppJ_V03 extends JFrame {
 		JLabel subject = new JLabel("<html>Keywords<BR><font size = 2>The topic of the resource. Please use general search terms separated<BR> by a semicolon that best describe the research data.<BR> Individual search terms can be used as well as defined terms as listed in PSYNDEX: \r\nhttps://www.psyndex.de/ueber/inhalte-aufbau/<BR>schlagwoerter-klassifikationen/</font></html>");
 		subject.setForeground(new Color(211, 211, 211));
 		subject.setFont(new Font("Tahoma", Font.BOLD, 18));
-		subject.setBounds(687, 450, 351, 107);
+		subject.setBounds(26, 190, 350, 100);;
 		panel_dublin.add(subject);

 		
@@ -1063,16 +1063,16 @@ public class AppJ_V03 extends JFrame {
 		coverage_txt_dub.setSelectedItem(p_coverage_dub);
 		panel_dublin.add(coverage_txt_dub);
 		
-		JScrollPane scrollPane_2 = new JScrollPane();
-		scrollPane_2.setBounds(388, 202, 230, 70);
-		panel_dublin.add(scrollPane_2);
+//		JScrollPane scrollPane_2 = new JScrollPane();
+//		scrollPane_2.setBounds(388, 202, 230, 70);
+//		panel_dublin.add(scrollPane_2);
 		
 		
-		JTextArea description_txt_dub = new JTextArea(p_description_dub);
-		scrollPane_2.setViewportView(description_txt_dub);
-		description_txt_dub.setFont(new Font("Lucida Grande", Font.PLAIN, 16));
-		description_txt_dub.setBackground(new Color(220, 220, 220));
-	    //panel_dublin.add(scroller);
+//		JTextArea description_txt_dub = new JTextArea(p_description_dub);
+//		scrollPane_2.setViewportView(description_txt_dub);
+//		description_txt_dub.setFont(new Font("Lucida Grande", Font.PLAIN, 16));
+//		description_txt_dub.setBackground(new Color(220, 220, 220));
+//	    //panel_dublin.add(scroller);

 		
 		JTextField format_txt_dub = new JTextField(p_format_dub);
@@ -1115,7 +1115,7 @@ public class AppJ_V03 extends JFrame {
 		JTextField subject_txt_dub = new JTextField(p_subject_dub);
 		subject_txt_dub.setFont(new Font("Lucida Grande", Font.PLAIN, 16));
 		subject_txt_dub.setBackground(new Color(220, 220, 220));
-		subject_txt_dub.setBounds(1076, 474, 230, 70);
+		subject_txt_dub.setBounds(388, 202, 230, 70);
 		panel_dublin.add(subject_txt_dub);
 		rights_txt_dub.setNextFocusableComponent(subject_txt_dub);
 		//
@@ -1852,7 +1852,7 @@ public class AppJ_V03 extends JFrame {
    				obj.put("DublinCore-Contributor", contributor_txt.getText());
    				obj.put("DublinCore-Coverage", coverage_txt_dub.getSelectedItem().toString());
    				obj.put("DublinCore-Date", dat);
-    				obj.put("DublinCore-Description", description_txt_dub.getText());
+    				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());
@@ -1910,7 +1910,7 @@ public class AppJ_V03 extends JFrame {
            	    obj.put("DataCite-rightsIdentifier", p_rights_identifier_cite);
            	    obj.put("DataCite-rightsIdentifierScheme", p_rights_identifier_scheme_cite);
            	    obj.put("DataCite-rightsSchemeURI", p_rights_scheme_uri_cite);
-            	    obj.put("DataCite-Description", description_txt_dub.getText());
+            	    obj.put("DataCite-Description", experimentDescriptionTextArea.getText());
            	    obj.put("DataCite-descriptionType", p_description_type_cite);
            	    obj.put("DataCite-GeoLocationPlace", coverage_txt_dub.getSelectedItem().toString());
            	    obj.put("DataCite-FundingReference", p_funding_reference_cite);