Project

General

Profile

« Previous | Next » 

Revision d433b50e

Added by Leszek Koltunski over 2 years ago

In the 'magic' app, ObjectType is now only used in RubikObject and RubikObjectList classes and nowhere else.
This is a major step towards being able to download objects from an online repository.

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.ObjectType;
22
import org.distorted.objectlib.main.ObjectConstants;
23 23

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

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

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

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

  
56 56
///////////////////////////////////////////////////////////////////////////////////////////////////
57 57

  
58
  public static String[][] getPatterns(int ordinal)
58
  RubikPatternList(int object, String[][] patterns)
59 59
    {
60
    return ordinal>=0 && ordinal<NUM_OBJECTS ? objects[ordinal].mPatterns : null;
60
    mObject   = object;
61
    mPatterns = patterns;
61 62
    }
62 63

  
64
///////////////////////////////////////////////////////////////////////////////////////////////////
65
// PUBLIC API
63 66
///////////////////////////////////////////////////////////////////////////////////////////////////
64 67

  
65
  RubikPatternList(ObjectType object, String[][] patterns)
68
  public static String[][] getPatterns(int ordinal)
66 69
    {
67
    mObject   = object;
68
    mPatterns = patterns;
70
    return ordinal>=0 && ordinal<NUM_OBJECTS ? objects[ordinal].mPatterns : null;
69 71
    }
70 72

  
71
///////////////////////////////////////////////////////////////////////////////////////////////////
72
// PUBLIC API
73 73
///////////////////////////////////////////////////////////////////////////////////////////////////
74 74

  
75
  public static int getOrdinal(ObjectType object)
75
  public static int getOrdinal(int objectOrdinal)
76 76
    {
77 77
    for(int i=0; i<NUM_OBJECTS; i++)
78 78
      {
79
      if( objects[i].mObject == object )
79
      if( objects[i].mObject == objectOrdinal )
80 80
        {
81 81
        return i;
82 82
        }
......
87 87

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

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

Also available in: Unified diff