litvinovg/metadata-editor
1
0
Fork 0
Code Issues Pull requests Projects Releases 5 Packages Wiki Activity Actions

Modified metadata storage

Browse source
This commit is contained in:
Georgy Litvinov 2020-04-22 17:48:52 +02:00
parent 7d66b8d73b
commit 7d164e10a6
3 changed files with 15 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
source/pro/litvinovg/libreoffice/metadata/MetadataElement.java
View file

@ -1,7 +1,5 @@
package pro.litvinovg.libreoffice.metadata; package pro.litvinovg.libreoffice.metadata;
import java.io.Serializable;
public class MetadataElement { public class MetadataElement {
private String name; private String name;
@ -20,5 +18,4 @@ public class MetadataElement {
return value; return value;
} }
} }

20
source/pro/litvinovg/libreoffice/metadata/OutlineElement.java
View file

@ -2,6 +2,7 @@ package pro.litvinovg.libreoffice.metadata;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Iterator; import java.util.Iterator;
import java.util.Set;
import org.json.JSONException; import org.json.JSONException;
import org.json.JSONObject; import org.json.JSONObject;
@ -66,11 +67,14 @@ public class OutlineElement {
public void readMetadata(String data) { public void readMetadata(String data) {
try { try {
JSONObject json = new JSONObject(data); JSONObject json = new JSONObject(data);
Iterator<String> names = json.keys(); Set<String> nums = json.keySet();
while (names.hasNext()) { for (String number : nums) {
String metaName = names.next(); JSONObject meta = (JSONObject) json.get(number);
String metaValue = (String) json.get(metaName); Set<String> names = meta.keySet();
metadata.add(new MetadataElement(metaName, metaValue)); for (String name: names) {
String value = meta.getString(name);
metadata.add(new MetadataElement(name, value));
}
} }
} catch (JSONException e) { } catch (JSONException e) {
e.printStackTrace(); e.printStackTrace();
@ -81,11 +85,15 @@ public class OutlineElement {
private String metadataToString() { private String metadataToString() {
JSONObject json = new JSONObject(); JSONObject json = new JSONObject();
Integer i = 0;
for (MetadataElement element : metadata) { for (MetadataElement element : metadata) {
String name = element.getName(); String name = element.getName();
String value = element.getValue(); String value = element.getValue();
if (!name.isEmpty() && !value.isEmpty()) { if (!name.isEmpty() && !value.isEmpty()) {
json.put(element.getName(), element.getValue()); JSONObject meta = new JSONObject();
meta.put(element.getName(), element.getValue());
json.put(i.toString(), meta);
i++;
} }
} }
return json.toString(); return json.toString();

1
source/pro/litvinovg/libreoffice/metadata/views/EditorGUI.java
View file

@ -185,7 +185,6 @@ public class EditorGUI extends JFrame {
tabbedPane.addTab("Метаданные либры", null, panelStandardMetadata, null); tabbedPane.addTab("Метаданные либры", null, panelStandardMetadata, null);
tabbedPane.setEnabledAt(0, true); tabbedPane.setEnabledAt(0, true);
if (true) { addMetadataTab(new OutlineElement(null, "Тестовое название")); }
for (OutlineElement element : outline) { for (OutlineElement element : outline) {
addMetadataTab(element); addMetadataTab(element);