Project

General

Profile

« Previous | Next » 

Revision 0b5e585c

Added by Leszek Koltunski almost 2 years ago

  • ID 0b5e585cb8c00a1dd32b0f9da5a2c056eba34550
  • Parent fad10885

Sort the objects in the object popup by difficulty level.

View differences:

src/main/java/org/distorted/objects/RubikObject.java
40 40
  private final String mLowerName, mUpperName;
41 41
  private final int mIconID;
42 42
  private final String[][] mPatterns;
43
  private final int mDifficulty;
43 44

  
44 45
  private int mJsonID, mMeshID, mExtrasID;
45 46
  private int mObjectMinor, mExtrasMinor;
......
57 58
    mUpperName   = type.name();
58 59
    mLowerName   = type.name().toLowerCase(Locale.ENGLISH);
59 60
    mNumScramble = type.getNumScramble();
61
    mDifficulty  = type.getDifficulty();
60 62

  
61 63
    mIconID      = type.getIconID();
62 64
    mJsonID      = ObjectJson.getObjectJsonID(ordinal);
......
85 87
    mLowerName     = object.shortName;
86 88
    mUpperName     = object.shortName.toUpperCase(Locale.ENGLISH);
87 89
    mNumScramble   = object.numScrambles;
90
    mDifficulty    = object.difficulty;
88 91
    mObjectMinor   = object.objectMinor;
89 92
    mExtrasMinor   = object.extrasMinor;
90 93

  
......
204 207
    return mUpperName;
205 208
    }
206 209

  
210
///////////////////////////////////////////////////////////////////////////////////////////////////
211

  
212
  public int getDifficulty()
213
    {
214
    return mDifficulty;
215
    }
216

  
207 217
///////////////////////////////////////////////////////////////////////////////////////////////////
208 218

  
209 219
  public int getNumScramble()

Also available in: Unified diff