Revision 2401 org.gvsig.tools/library/trunk/org.gvsig.tools/org.gvsig.tools.util/org.gvsig.tools.util.api/src/main/java/org/gvsig/json/Json.java

View differences:

Json.java
104 104
        return array;
105 105
    }
106 106
   
107
    public static String toString(JsonObject obj) {
107
    public static String toString(JsonValue obj) {
108 108
        JsonManager manager = ToolsUtilLocator.getJsonManager();
109 109
        String json = manager.toString(obj);
110 110
        return json;
111 111
    }
112 112
    
113
    public static String toString(JsonArray array) {
114
        JsonManager manager = ToolsUtilLocator.getJsonManager();
115
        String json = manager.toString(array);
116
        return json;
117
    }
118
    
119
    public static String toString(JsonStructure obj) {
120
        JsonManager manager = ToolsUtilLocator.getJsonManager();
121
        String json = manager.toString(obj);
122
        return json;
123
    }
124
    
125
    public static Object toObject(String name, JsonObject json) {
126
        JsonManager manager = ToolsUtilLocator.getJsonManager();
127
        return manager.toObject(name,json);
128
    }
129

  
130 113
    public static Object toObject(JsonValue value) {
131 114
        JsonManager manager = ToolsUtilLocator.getJsonManager();
132 115
        return manager.toObject(value);
133 116
    }
134 117

  
135
    public static Object toObject(int index, JsonArray json) {
118
    public static Object toObject(JsonArray json, int index) {
136 119
        JsonManager manager = ToolsUtilLocator.getJsonManager();
137
        return manager.toObject(index,json);
120
        return manager.toObject(json, index);
138 121
    }
139 122

  
140 123
    public static Object toObject(JsonObject json, String name) {
......
145 128
            return null;
146 129
        }
147 130
        JsonManager manager = ToolsUtilLocator.getJsonManager();
148
        return manager.toObject(json.getJsonObject(name));
131
        return manager.toObject(json,name);
149 132
    }
150 133
    
151
    public static Object toObject(JsonObject json) {
152
        JsonManager manager = ToolsUtilLocator.getJsonManager();
153
        return manager.toObject(json);
154
    }
155
    
156 134
    public static Object toObject(String json) {
157 135
        JsonManager manager = ToolsUtilLocator.getJsonManager();
158 136
        JsonObject jsonObject = manager.createObject(json);
......
186 164
        return manager.addAll(target, json);
187 165
    }
188 166

  
189
    public static Map toHashMap(JsonObject json, String name) {
167
    public static Map toMap(JsonObject json, String name) {
190 168
        if( json == null ) {
191 169
            return null;
192 170
        }
......
194 172
            return null;
195 173
        }
196 174
        JsonManager manager = ToolsUtilLocator.getJsonManager();
197
        return manager.toHashMap(json.getJsonObject(name));
175
        return manager.toMap(json.getJsonObject(name));
198 176
    }
199 177
    
200
    public static Map toHashMap(JsonObject json) {
178
    public static Map toMap(JsonObject json) {
201 179
        JsonManager manager = ToolsUtilLocator.getJsonManager();
202
        return manager.toHashMap(json);
180
        return manager.toMap(json);
203 181
    }
204 182

  
205 183
}

Also available in: Unified diff