Project

General

Profile

« Previous | Next » 

Revision de4a7e02

Added by Leszek Koltunski over 2 years ago

Remove ObjectType and info it held (icons, mesh file, num of scrambles, shortname) from the JSON file.

View differences:

src/main/java/org/distorted/objectlib/json/JsonWriter.java
36 36
import org.distorted.objectlib.helpers.ObjectSticker;
37 37
import org.distorted.objectlib.helpers.ScrambleState;
38 38
import org.distorted.objectlib.main.TwistyObject;
39
import org.distorted.objectlib.main.ObjectType;
40 39

  
41 40
///////////////////////////////////////////////////////////////////////////////////////////////////
42 41

  
......
355 354
    {
356 355
    JSONObject metadata = new JSONObject();
357 356

  
358
    ObjectType type  = object.getObjectType();
359
    String inventor  = object.getInventor();
360
    String shortname = type.name();
361
    String lowerShort= shortname.toLowerCase();
362
    String longname  = object.getObjectName();
363

  
364
    metadata.put("longname"     , longname );
365
    metadata.put("shortname"    , shortname );
366
    metadata.put("inventor"     , inventor);
367
    metadata.put("year"         , object.getYearOfInvention());
368
    metadata.put("complexity"   , object.getComplexity());
369
    metadata.put("icon_huge"    , "h_"+lowerShort+".png");
370
    metadata.put("icon_big"     , "b_"+lowerShort+".png");
371
    metadata.put("icon_medium"  , "m_"+lowerShort+".png");
372
    metadata.put("icon_small"   , "s_"+lowerShort+".png");
373
    metadata.put("mesh"         , lowerShort+".dmesh");
374
    metadata.put("num_scrambles", type.getNumScramble() );
375
    metadata.put("size"         , object.getSize() );
376
    metadata.put("solved_func"  , object.getSolvedFunctionIndex() );
357
    metadata.put("longname"   , object.getObjectName() );
358
    metadata.put("inventor"   , object.getInventor());
359
    metadata.put("year"       , object.getYearOfInvention());
360
    metadata.put("complexity" , object.getComplexity());
361
    metadata.put("size"       , object.getSize() );
362
    metadata.put("solved_func", object.getSolvedFunctionIndex() );
377 363

  
378 364
    return metadata;
379 365
    }

Also available in: Unified diff