Projekt

Obecné

Profil

« Předchozí | Další » 

Revize a6f38344

Přidáno uživatelem Jan Havlíček před asi 4 roky(ů)

re #7891 Indentation OK
Switched field name and value issue still remains

Zobrazit rozdíly:

project/Deserializer/src/jdeserialize/classdesc.java
224 224
        }
225 225
    }
226 226

  
227
    public @Override String toJson(String indentation, Map<classdesc, Map<field, Object>> fielddata, Map<String, String> formatting)
227
    public @Override String toJson(String indentation, Map<classdesc, Map<field, Object>> fielddata, Map<String, String> formatting, boolean child)
228 228
    {
229 229
        StringBuffer sb = new StringBuffer();
230 230
        String val = "";
231 231

  
232
        sb.append(indentation).append("{" + formatting.get("lineBreak"));
232
        if(!child)
233
        {
234
            sb.append(indentation);
235
        }
236
        sb.append("{" + formatting.get("lineBreak"));
233 237

  
234 238
        indentation += formatting.get("indent");
235 239

  
......
264 268

  
265 269
            if(locVal instanceof content)
266 270
            {
267
                val = ((content)locVal).toJson(indentation, fielddata, formatting);
271
                val = ((content)locVal).toJson(indentation, fielddata, formatting, true);
268 272
            }
269 273
            else {
270 274
                val = locVal.toString();
......
288 292
            indentation = indentation.replaceFirst(formatting.get("indent"), "");
289 293
            sb.append(formatting.get("lineBreak")).append("}");
290 294
            sb.append("," + formatting.get("lineBreak"));
291
            sb.append(this.superclass.toJson(indentation, fielddata, formatting));
295
            sb.append(this.superclass.toJson(indentation, fielddata, formatting, child));
292 296
        }
293 297
        else 
294 298
        {

Také k dispozici: Unified diff