Commit 57d13e67 authored by Matija Obreza's avatar Matija Obreza
Browse files

Merge branch 'master' into rest

parents 5296f24d a73d7a58
...@@ -35,7 +35,6 @@ import org.hibernate.search.annotations.Store; ...@@ -35,7 +35,6 @@ import org.hibernate.search.annotations.Store;
import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ObjectNode;
@Entity @Entity
@Table(name = "country") @Table(name = "country")
...@@ -145,7 +144,8 @@ public class Country extends BusinessModel { ...@@ -145,7 +144,8 @@ public class Country extends BusinessModel {
ObjectMapper mapper = new ObjectMapper(); ObjectMapper mapper = new ObjectMapper();
try { try {
this.nameJ = mapper.readTree(nameL); this.nameJ = mapper.readTree(nameL);
ObjectNode newLang = mapper.createObjectNode().put(locale.getLanguage(), name); // ObjectNode newLang =
// mapper.createObjectNode().put(locale.getLanguage(), name);
// System.err.println(newLang); // System.err.println(newLang);
} catch (IOException e) { } catch (IOException e) {
} }
......
...@@ -101,4 +101,4 @@ ...@@ -101,4 +101,4 @@
<page-encoding>UTF-8</page-encoding> <page-encoding>UTF-8</page-encoding>
</jsp-property-group> </jsp-property-group>
</jsp-config> </jsp-config>
</web-app> </web-app>
\ No newline at end of file
Supports Markdown
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