Project

General

Profile

« Previous | Next » 

Revision 318c0a7d

Added by Leszek Koltunski over 2 years ago

Reename ObjectList to a more logical ObjectType.

View differences:

src/main/java/org/distorted/patterns/RubikPatternList.java
19 19

  
20 20
package org.distorted.patterns;
21 21

  
22
import org.distorted.objectlib.main.ObjectList;
22
import org.distorted.objectlib.main.ObjectType;
23 23

  
24 24
///////////////////////////////////////////////////////////////////////////////////////////////////
25 25

  
26 26
public enum RubikPatternList
27 27
  {
28
  CUBE2 (ObjectList.CUBE_2, PatternCube2.patterns),
29
  CUBE3 (ObjectList.CUBE_3, PatternCube3.patterns),
30
  CUBE4 (ObjectList.CUBE_4, PatternCube4.patterns),
31
  CUBE5 (ObjectList.CUBE_5, PatternCube5.patterns),
32
  PYRA3 (ObjectList.PYRA_3, PatternPyraminx3.patterns),
33
  PYRA4 (ObjectList.PYRA_4, PatternPyraminx4.patterns),
34
  PYRA5 (ObjectList.PYRA_5, PatternPyraminx5.patterns),
35
  MEGA3 (ObjectList.MEGA_3, PatternMegaminx.patterns),
36
  MEGA5 (ObjectList.MEGA_5, PatternGigaminx.patterns),
28
  CUBE2 (ObjectType.CUBE_2, PatternCube2.patterns),
29
  CUBE3 (ObjectType.CUBE_3, PatternCube3.patterns),
30
  CUBE4 (ObjectType.CUBE_4, PatternCube4.patterns),
31
  CUBE5 (ObjectType.CUBE_5, PatternCube5.patterns),
32
  PYRA3 (ObjectType.PYRA_3, PatternPyraminx3.patterns),
33
  PYRA4 (ObjectType.PYRA_4, PatternPyraminx4.patterns),
34
  PYRA5 (ObjectType.PYRA_5, PatternPyraminx5.patterns),
35
  MEGA3 (ObjectType.MEGA_3, PatternMegaminx.patterns),
36
  MEGA5 (ObjectType.MEGA_5, PatternGigaminx.patterns),
37 37
  ;
38 38

  
39 39
  public static final int NUM_OBJECTS = values().length;
40
  private final ObjectList mObject;
40
  private final ObjectType mObject;
41 41
  private final String[][] mPatterns;
42 42

  
43 43
  private static final RubikPatternList[] objects;
......
62 62

  
63 63
///////////////////////////////////////////////////////////////////////////////////////////////////
64 64

  
65
  RubikPatternList(ObjectList object, String[][] patterns)
65
  RubikPatternList(ObjectType object, String[][] patterns)
66 66
    {
67 67
    mObject   = object;
68 68
    mPatterns = patterns;
......
87 87

  
88 88
///////////////////////////////////////////////////////////////////////////////////////////////////
89 89

  
90
  public static ObjectList getObject(int ordinal)
90
  public static ObjectType getObject(int ordinal)
91 91
    {
92 92
    return objects[ordinal].mObject;
93 93
    }

Also available in: Unified diff