Project

General

Profile

« Previous | Next » 

Revision da57afae

Added by Leszek Koltunski about 1 year ago

Move opening local files to the OSInterface

View differences:

src/main/java/org/distorted/solvers/SolverMain.java
11 11

  
12 12
import android.content.res.Resources;
13 13

  
14
import org.distorted.objectlib.helpers.OperatingSystemInterface;
14 15
import org.distorted.objectlib.main.ObjectSignatures;
15 16
import org.distorted.objectlib.main.TwistyObject;
16 17

  
......
23 24
public class SolverMain implements Runnable
24 25
{
25 26
  private final Resources mRes;
27
  private final OperatingSystemInterface mOS;
26 28
  private final long mSignature;
27 29
  private final TwistyObject mObject;
28 30

  
29 31
///////////////////////////////////////////////////////////////////////////////////////////////////
30 32

  
31
  public SolverMain(Resources res, TwistyObject object)
33
  public SolverMain(OperatingSystemInterface os, Resources res, TwistyObject object)
32 34
    {
33 35
    mRes       = res;
36
    mOS        = os;
34 37
    mObject    = object;
35 38
    long[] sig = object.getSignature().getArray();
36 39
    mSignature = sig[sig.length-1];
......
78 81
      }
79 82
    else if( mSignature==ObjectSignatures.PDUO_2 )
80 83
      {
81
      SolverTablebase solver = new SolverPyraminxDuo(mRes,mObject);
84
      SolverTablebase solver = new SolverPyraminxDuo(mOS,mRes,mObject);
82 85
      solver.solve(screen);
83 86
      }
84 87
    else if( mSignature==ObjectSignatures.IVY_2 )
85 88
      {
86
      SolverTablebase solver = new SolverIvyCube(mRes,mObject);
89
      SolverTablebase solver = new SolverIvyCube(mOS,mRes,mObject);
87 90
      solver.solve(screen);
88 91
      }
89 92
    else if( mSignature==ObjectSignatures.CU_232 )
90 93
      {
91
      SolverTablebase solver = new SolverCuboid232(mRes,mObject);
94
      SolverTablebase solver = new SolverCuboid232(mOS,mRes,mObject);
92 95
      solver.solve(screen);
93 96
      }
94 97
    else if( mSignature==ObjectSignatures.PYRA_3 )
95 98
      {
96
      SolverTablebase solver = new SolverPyraminx(mRes,mObject);
99
      SolverTablebase solver = new SolverPyraminx(mOS,mRes,mObject);
97 100
      solver.solve(screen);
98 101
      }
99 102
    else if( mSignature==ObjectSignatures.DIAM_2 )
100 103
      {
101
      SolverTablebase solver = new SolverSkewbDiamond(mRes,mObject);
104
      SolverTablebase solver = new SolverSkewbDiamond(mOS,mRes,mObject);
102 105
      solver.solve(screen);
103 106
      }
104 107
    else if( mSignature==ObjectSignatures.CUBE_2 )
105 108
      {
106
      SolverTablebase solver = new SolverCube2(mRes,mObject);
109
      SolverTablebase solver = new SolverCube2(mOS,mRes,mObject);
107 110
      solver.solve(screen);
108 111
      }
109 112
    else if( mSignature==ObjectSignatures.JING_2 )
110 113
      {
111
      SolverTablebase solver = new SolverJing(mRes,mObject);
114
      SolverTablebase solver = new SolverJing(mOS,mRes,mObject);
112 115
      solver.solve(screen);
113 116
      }
114 117
    else if( mSignature==ObjectSignatures.SKEW_2 )
115 118
      {
116
      SolverTablebase solver = new SolverSkewb(mRes,mObject);
119
      SolverTablebase solver = new SolverSkewb(mOS,mRes,mObject);
117 120
      solver.solve(screen);
118 121
      }
119 122
    else if( mSignature==ObjectSignatures.DINO_3 )
120 123
      {
121
      SolverTablebase solver = new SolverDino6(mRes,mObject);
124
      SolverTablebase solver = new SolverDino6(mOS,mRes,mObject);
122 125
      solver.solve(screen);
123 126
      }
124 127
    else if( mSignature==ObjectSignatures.DIN4_3 )
125 128
      {
126
      SolverTablebase solver = new SolverDino4(mRes,mObject);
129
      SolverTablebase solver = new SolverDino4(mOS,mRes,mObject);
127 130
      solver.solve(screen);
128 131
      }
129 132
    else if( mSignature==ObjectSignatures.PDIA_3 )
130 133
      {
131
      SolverTablebase solver = new SolverPyraminxDiamond(mRes,mObject);
134
      SolverTablebase solver = new SolverPyraminxDiamond(mOS,mRes,mObject);
132 135
      solver.solve(screen);
133 136
      }
134 137
    else

Also available in: Unified diff