s434730/RandomSec
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

resolve the conflict

Browse Source
This commit is contained in:
Jacky 2017-12-15 22:07:07 -05:00
parent d207c74f62
commit a55e0dab1c
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
main/src/com/google/refine/ProjectMetadata.java
View File

@ -36,6 +36,7 @@ package com.google.refine;
import java.io.Serializable; import java.io.Serializable;
import java.lang.reflect.Field; import java.lang.reflect.Field;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.Iterator; import java.util.Iterator;
import java.util.List; import java.util.List;
@ -82,9 +83,6 @@ public class ProjectMetadata implements Jsonizable {
private Map<String, Serializable> _customMetadata = new HashMap<String, Serializable>(); private Map<String, Serializable> _customMetadata = new HashMap<String, Serializable>();
private PreferenceStore _preferenceStore = new PreferenceStore(); private PreferenceStore _preferenceStore = new PreferenceStore();
private Map<String, Serializable> _customMetadata = new HashMap<String, Serializable>();
private PreferenceStore _preferenceStore = new PreferenceStore();
private final static Logger logger = LoggerFactory.getLogger("project_metadata"); private final static Logger logger = LoggerFactory.getLogger("project_metadata");
protected ProjectMetadata(LocalDateTime date) { protected ProjectMetadata(LocalDateTime date) {
@ -116,6 +114,8 @@ public class ProjectMetadata implements Jsonizable {
writer.value(tag); writer.value(tag);
} }
writer.endArray(); writer.endArray();
writer.key("created"); writer.value(ParsingUtilities.localDateToString(_created));
writer.key("modified"); writer.value(ParsingUtilities.localDateToString(_modified));
writer.key("creator"); writer.key("creator");
writer.value(_creator); writer.value(_creator);
writer.key("contributors"); writer.key("contributors");
@ -129,8 +129,7 @@ public class ProjectMetadata implements Jsonizable {
writer.key("customMetadata"); writer.key("customMetadata");
writer.object(); writer.object();
writer.key("created"); writer.value(ParsingUtilities.localDateToString(_created));
writer.key("modified"); writer.value(ParsingUtilities.localDateToString(_modified));
for (String key : _customMetadata.keySet()) { for (String key : _customMetadata.keySet()) {
Serializable value = _customMetadata.get(key); Serializable value = _customMetadata.get(key);
writer.key(key); writer.key(key);