Skip to content

Commit fc1f7d7

Browse files
committed
Switched from Graph to AbstractData
1 parent 2757a12 commit fc1f7d7

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

src/main/java/org/javawebstack/framework/WebApplication.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package org.javawebstack.framework;
22

33
import com.github.javafaker.Faker;
4+
import org.javawebstack.abstractdata.AbstractElement;
45
import org.javawebstack.command.CommandSystem;
56
import org.javawebstack.command.MultiCommand;
67
import org.javawebstack.framework.bind.ModelBindParamTransformer;
@@ -12,7 +13,6 @@
1213
import org.javawebstack.framework.seed.MergedSeeder;
1314
import org.javawebstack.framework.seed.Seeder;
1415
import org.javawebstack.framework.util.*;
15-
import org.javawebstack.graph.GraphElement;
1616
import org.javawebstack.httpserver.HTTPServer;
1717
import org.javawebstack.httpserver.transformer.response.JsonResponseTransformer;
1818
import org.javawebstack.injector.Injector;
@@ -137,7 +137,7 @@ public void addTranslation(Locale locale, ClassLoader classLoader, String resour
137137
if(!resource.endsWith(".json"))
138138
resource += ".json";
139139
try {
140-
GraphElement element = GraphElement.fromJson(IO.readTextResource(classLoader, resource));
140+
AbstractElement element = AbstractElement.fromJson(IO.readTextResource(classLoader, resource));
141141
if(element.isObject())
142142
translation.add(locale, element.object());
143143
if(element.isArray())

src/main/java/org/javawebstack/framework/util/I18N.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package org.javawebstack.framework.util;
22

3-
import org.javawebstack.graph.GraphArray;
4-
import org.javawebstack.graph.GraphObject;
3+
import org.javawebstack.abstractdata.AbstractArray;
4+
import org.javawebstack.abstractdata.AbstractObject;
55

66
import java.util.HashMap;
77
import java.util.Locale;
@@ -32,21 +32,21 @@ public void set(String key, Map<String, Object> fields){
3232
set(getDefaultLocale(), key, fields);
3333
}
3434

35-
public void add(GraphArray array){
35+
public void add(AbstractArray array){
3636
add(getDefaultLocale(), array);
3737
}
3838

39-
public void add(Locale locale, GraphArray array){
40-
GraphObject object = new GraphObject();
39+
public void add(Locale locale, AbstractArray array){
40+
AbstractObject object = new AbstractObject();
4141
array.forEach(e -> object.set(e.object().get("key").string(), e));
4242
add(locale, object);
4343
}
4444

45-
public void add(GraphObject object){
45+
public void add(AbstractObject object){
4646
add(getDefaultLocale(), object);
4747
}
4848

49-
public void add(Locale locale, GraphObject object){
49+
public void add(Locale locale, AbstractObject object){
5050
for(String key : object.keys()){
5151
Map<String, Object> fields = new HashMap<>();
5252
object.get(key).object().forEach((k, v) -> fields.put(k, v.isNumber() ? v.number() : v.string()));

0 commit comments

Comments
 (0)