/ - Diff - Magic Cube - Distorted Android

       private final int mIconID;
       private final String[][] mPatterns;
       private final int mPrice;
       private final int mSolverOrdinal;
       private final int[] mSolverOrdinals;
       private final int mObjectOrdinal;
       private final boolean mIsLocal;
       private final int mCategory, mYear;
-...
         int patternOrdinal  = RubikPatternList.getOrdinal(mObjectIndex);
         mPatterns = RubikPatternList.getPatterns(patternOrdinal);
         mSolverOrdinal = SolvingList.getSolverOrdinal(mObjectOrdinal);
         mSolverOrdinals= SolvingList.getSolverOrdinals(mObjectOrdinal);
         mExtrasOrdinal = -1;
         mObjectVersion = meta.objectVersion();
-...
         mPatterns      = null;
         mExtrasOrdinal = -1;
         mSolverOrdinal = -1;
         mSolverOrdinals= null;
         mObjectOrdinal = -1;
         mIsLocal       = true;
-...
       public boolean hasSolver()
+        {
         return mSolverOrdinal>=0;
         return mSolverOrdinals!=null;
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
       public int getSolverOrdinal()
       public int[] getSolverOrdinals()
+        {
         return mSolverOrdinal;
         return mSolverOrdinals;
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////

     ///////////////////////////////////////////////////////////////////////////////////////////////////
       public static int getSolverOrdinal(int objectOrdinal)
       public static int[] getSolverOrdinals(int objectOrdinal)
+        {
         int numSolvers = 0;
         for(int o=0; o<NUM_OBJECTS; o++)
           if( objects[o].mObjectOrdinal==objectOrdinal ) return o;
           if( objects[o].mObjectOrdinal==objectOrdinal ) numSolvers++;
         return -1;
         if( numSolvers>0 )
+          {
           int[] ret = new int[numSolvers];
           int index = 0;
           for(int o=0; o<NUM_OBJECTS; o++)
             if( objects[o].mObjectOrdinal==objectOrdinal ) ret[index++] = o;
           return ret;
+          }
         return null;
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////

       private int mNumColors;
       private float mBitmapSize;
       private WeakReference<SolverActivity> mWeakAct;
       private SolvingList mList;
       private int mObjectOrdinal;
     ///////////////////////////////////////////////////////////////////////////////////////////////////
-...
+        {
         ObjectControl control = act.getControl();
         control.setLock(false);
         control.solveOnly();
         float width = act.getScreenWidthInPixels();
         float heigh = act.getScreenHeightInPixels();
-...
         mWeakAct = new WeakReference<>(act);
         mSolving = false;
         int solverIndex= act.getSolverOrdinal();
         mList = SolvingList.getSolver(solverIndex);
         int currentObject = mList.getObjectOrdinal();
         control.solveOnly();
         generateFaceColors(currentObject);
         mObjectOrdinal = act.getObjectOrdinal();
         generateFaceColors(mObjectOrdinal);
         final float BUTTON_RATIO = 0.75f;
         int sizeV = (int)(heigh*MainActivity.RATIO_BAR*BUTTON_RATIO);
-...
           });
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
       private boolean solvePressed(SolverActivity act)
+        {
         int[] solverOrdinals = SolvingList.getSolverOrdinals(mObjectOrdinal);
         if( solverOrdinals!=null )
+          {
           int len = solverOrdinals.length;
           if( len==1 )
+            {
             SolvingList list = SolvingList.getSolver(solverOrdinals[0]);
             TwistyObject object = act.getObject();
             SolvingThread solver = new SolvingThread( act.getInterface(), act.getResources(), object, list );
             solver.start();
             return true;
+            }
           else
+            {
             // TODO
             return false;
+            }
+          }
         else  // no solvers found - impossible!
+          {
           android.util.Log.e("D", "no solvers found for object "+mObjectOrdinal);
           return false;
+          }
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
       private void setupSolveButton(final SolverActivity act)
-...
           @Override
           public void onClick(View v)
+            {
             if( !mSolving )
+              {
               mSolving = true;
               TwistyObject object = act.getObject();
               SolvingThread solver = new SolvingThread( act.getInterface(), act.getResources(), object, mList );
               solver.start();
+              }
             if( !mSolving && solvePressed(act) ) mSolving = true;
+            }
           });
+        }

     import org.distorted.objects.RubikObject;
     import org.distorted.objects.RubikObjectList;
     import org.distorted.os.OSInterface;
     import org.distorted.solvers.SolvingList;
     import java.io.InputStream;
-...
         private static final int ACTIVITY_NUMBER = 4;
         private static final float RATIO_INSET= 0.09f;
         private int mSolverOrdinal;
         private int mObjectOrdinal;
         private boolean mDisplayMessageDialog;
-...
           Bundle b = getIntent().getExtras();
           mObjectOrdinal = b!=null ? b.getInt("obj") : 0;
           RubikObject object = RubikObjectList.getObject(mObjectOrdinal);
           mSolverOrdinal = object==null ? -1 : object.getSolverOrdinal();
           mDisplayMessageDialog = true;
           computeScreenDimensions();
-...
           return view.getObjectControl();
+          }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
         public int getSolverOrdinal()
+          {
           return mSolverOrdinal;
+          }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
         public int getObjectOrdinal()

Project

General

Profile

Magic Cube

Revision b35900ee

Added by Leszek Koltunski about 22 hours ago