commit 5d99af6c0745a17db4d66a2a1424d724b91ce4cf
Author: leszek <leszek@koltunski.pl>
Date:   Fri Aug 11 16:41:58 2023 +0200

    Jings: further corrections.

diff --git a/src/main/java/org/distorted/solvers/SolverCube2.java b/src/main/java/org/distorted/solvers/SolverCube2.java
index 9a090e8d..71471c8c 100644
--- a/src/main/java/org/distorted/solvers/SolverCube2.java
+++ b/src/main/java/org/distorted/solvers/SolverCube2.java
@@ -13,7 +13,7 @@ import android.content.res.Resources;
 
 import org.distorted.main.R;
 import org.distorted.objectlib.helpers.OperatingSystemInterface;
-import org.distorted.objectlib.main.ObjectSignatures;
+import org.distorted.objectlib.main.ObjectType;
 import org.distorted.objectlib.main.TwistyObject;
 import org.distorted.objectlib.tablebases.ImplementedTablebasesList;
 import org.distorted.objectlib.tablebases.TablebaseHelpers;
@@ -288,7 +288,7 @@ public class SolverCube2 extends SolverTablebase
     {
     if( mSolver==null )
       {
-      mSolver = ImplementedTablebasesList.createPacked(os,ObjectSignatures.CUBE_2);
+      mSolver = ImplementedTablebasesList.createPacked(os, ObjectType.CUBE_2.name() );
       }
 
     return mSolver!=null ? mSolver.solution(index,null,os) : null;
diff --git a/src/main/java/org/distorted/solvers/SolverCuboid232.java b/src/main/java/org/distorted/solvers/SolverCuboid232.java
index 4ccb95f9..761cf4b8 100644
--- a/src/main/java/org/distorted/solvers/SolverCuboid232.java
+++ b/src/main/java/org/distorted/solvers/SolverCuboid232.java
@@ -13,7 +13,7 @@ import android.content.res.Resources;
 
 import org.distorted.main.R;
 import org.distorted.objectlib.helpers.OperatingSystemInterface;
-import org.distorted.objectlib.main.ObjectSignatures;
+import org.distorted.objectlib.main.ObjectType;
 import org.distorted.objectlib.main.TwistyObject;
 import org.distorted.objectlib.tablebases.ImplementedTablebasesList;
 import org.distorted.objectlib.tablebases.TablebaseHelpers;
@@ -409,7 +409,7 @@ public class SolverCuboid232 extends SolverTablebase
     {
     if( mSolver==null )
       {
-      mSolver = ImplementedTablebasesList.createPacked(os, ObjectSignatures.CU_232);
+      mSolver = ImplementedTablebasesList.createPacked(os, ObjectType.CU_232.name() );
       }
 
     return mSolver!=null ? mSolver.solution(index,null,os) : null;
diff --git a/src/main/java/org/distorted/solvers/SolverCuboid323.java b/src/main/java/org/distorted/solvers/SolverCuboid323.java
index 2afc5d2b..4275a9ae 100644
--- a/src/main/java/org/distorted/solvers/SolverCuboid323.java
+++ b/src/main/java/org/distorted/solvers/SolverCuboid323.java
@@ -13,7 +13,7 @@ import android.content.res.Resources;
 
 import org.distorted.main.R;
 import org.distorted.objectlib.helpers.OperatingSystemInterface;
-import org.distorted.objectlib.main.ObjectSignatures;
+import org.distorted.objectlib.main.ObjectType;
 import org.distorted.objectlib.main.TwistyObject;
 import org.distorted.objectlib.tablebases.ImplementedTablebasesList;
 import org.distorted.objectlib.tablebases.TBCuboid323;
@@ -446,9 +446,7 @@ public class SolverCuboid323 extends SolverTablebase
     {
     if( mSolver==null )
       {
-      mSolver = ImplementedTablebasesList.createPacked(os,ObjectSignatures.CU_323);
-      //mSolver = ImplementedTablebasesList.createUnpacked(ObjectSignatures.CU_323);
-      //if( mSolver!=null ) mSolver.createTablebase(1);
+      mSolver = ImplementedTablebasesList.createPacked(os, ObjectType.CU_323.name() );
       }
 
     ((TBCuboid323)mSolver).initialize();
diff --git a/src/main/java/org/distorted/solvers/SolverDino4.java b/src/main/java/org/distorted/solvers/SolverDino4.java
index e26b7a04..28973574 100644
--- a/src/main/java/org/distorted/solvers/SolverDino4.java
+++ b/src/main/java/org/distorted/solvers/SolverDino4.java
@@ -15,7 +15,7 @@ import android.content.res.Resources;
 
 import org.distorted.main.R;
 import org.distorted.objectlib.helpers.OperatingSystemInterface;
-import org.distorted.objectlib.main.ObjectSignatures;
+import org.distorted.objectlib.main.ObjectType;
 import org.distorted.objectlib.main.TwistyObject;
 import org.distorted.objectlib.shape.ShapeHexahedron;
 import org.distorted.objectlib.tablebases.ImplementedTablebasesList;
@@ -177,7 +177,7 @@ public class SolverDino4 extends SolverTablebase
     {
     if( mSolver==null )
       {
-      mSolver = ImplementedTablebasesList.createPacked(os,ObjectSignatures.DIN4_3);
+      mSolver = ImplementedTablebasesList.createPacked(os, ObjectType.DIN4_3.name() );
       }
 
     return mSolver!=null ? mSolver.solution(index,null,os) : null;
diff --git a/src/main/java/org/distorted/solvers/SolverDino6.java b/src/main/java/org/distorted/solvers/SolverDino6.java
index 5d687f0b..6fe83b74 100644
--- a/src/main/java/org/distorted/solvers/SolverDino6.java
+++ b/src/main/java/org/distorted/solvers/SolverDino6.java
@@ -13,7 +13,7 @@ import android.content.res.Resources;
 
 import org.distorted.main.R;
 import org.distorted.objectlib.helpers.OperatingSystemInterface;
-import org.distorted.objectlib.main.ObjectSignatures;
+import org.distorted.objectlib.main.ObjectType;
 import org.distorted.objectlib.main.TwistyObject;
 import org.distorted.objectlib.tablebases.ImplementedTablebasesList;
 import org.distorted.objectlib.tablebases.TBDino6;
@@ -442,7 +442,7 @@ public class SolverDino6 extends SolverTablebase
     {
     if( mSolver==null )
       {
-      mSolver = ImplementedTablebasesList.createPacked(os,ObjectSignatures.DINO_3);
+      mSolver = ImplementedTablebasesList.createPacked(os, ObjectType.DINO_3.name() );
       }
 
     return mSolver!=null ? mSolver.solution(index,null,os) : null;
diff --git a/src/main/java/org/distorted/solvers/SolverIvyCube.java b/src/main/java/org/distorted/solvers/SolverIvyCube.java
index 978cdfa4..a530f0cb 100644
--- a/src/main/java/org/distorted/solvers/SolverIvyCube.java
+++ b/src/main/java/org/distorted/solvers/SolverIvyCube.java
@@ -13,7 +13,7 @@ import android.content.res.Resources;
 
 import org.distorted.main.R;
 import org.distorted.objectlib.helpers.OperatingSystemInterface;
-import org.distorted.objectlib.main.ObjectSignatures;
+import org.distorted.objectlib.main.ObjectType;
 import org.distorted.objectlib.main.TwistyObject;
 import org.distorted.objectlib.tablebases.ImplementedTablebasesList;
 import org.distorted.objectlib.tablebases.TablebaseHelpers;
@@ -245,7 +245,7 @@ public class SolverIvyCube extends SolverTablebase
     {
     if( mSolver==null )
       {
-      mSolver = ImplementedTablebasesList.createPacked(os, ObjectSignatures.IVY_2);
+      mSolver = ImplementedTablebasesList.createPacked(os, ObjectType.IVY_2.name() );
       }
 
     return mSolver!=null ? mSolver.solution(index,null,os) : null;
diff --git a/src/main/java/org/distorted/solvers/SolverJing.java b/src/main/java/org/distorted/solvers/SolverJing.java
index 5c1bae78..37f0d9b2 100644
--- a/src/main/java/org/distorted/solvers/SolverJing.java
+++ b/src/main/java/org/distorted/solvers/SolverJing.java
@@ -13,7 +13,7 @@ import android.content.res.Resources;
 
 import org.distorted.main.R;
 import org.distorted.objectlib.helpers.OperatingSystemInterface;
-import org.distorted.objectlib.main.ObjectSignatures;
+import org.distorted.objectlib.main.ObjectType;
 import org.distorted.objectlib.main.TwistyObject;
 import org.distorted.objectlib.tablebases.ImplementedTablebasesList;
 import org.distorted.objectlib.tablebases.TBPyraminx;
@@ -527,7 +527,7 @@ public class SolverJing extends SolverTablebase
     {
     if( mSolver==null )
       {
-      mSolver = ImplementedTablebasesList.createPacked(os,ObjectSignatures.JING_2);
+      mSolver = ImplementedTablebasesList.createPacked(os, ObjectType.JING_2.name());
       }
 
     return mSolver!=null ? mSolver.solution(index,null,os) : null;
diff --git a/src/main/java/org/distorted/solvers/SolverPyraminx.java b/src/main/java/org/distorted/solvers/SolverPyraminx.java
index 9c435dc5..1d5b1042 100644
--- a/src/main/java/org/distorted/solvers/SolverPyraminx.java
+++ b/src/main/java/org/distorted/solvers/SolverPyraminx.java
@@ -13,7 +13,7 @@ import android.content.res.Resources;
 
 import org.distorted.main.R;
 import org.distorted.objectlib.helpers.OperatingSystemInterface;
-import org.distorted.objectlib.main.ObjectSignatures;
+import org.distorted.objectlib.main.ObjectType;
 import org.distorted.objectlib.main.TwistyObject;
 import org.distorted.objectlib.tablebases.ImplementedTablebasesList;
 import org.distorted.objectlib.tablebases.TablebaseHelpers;
@@ -540,7 +540,7 @@ public class SolverPyraminx extends SolverTablebase
     {
     if( mSolver==null )
       {
-      mSolver = ImplementedTablebasesList.createPacked(os, ObjectSignatures.PYRA_3);
+      mSolver = ImplementedTablebasesList.createPacked(os, ObjectType.PYRA_3.name());
       }
 
     return mSolver!=null ? mSolver.solution(index,mCornerTwist,os) : null;
diff --git a/src/main/java/org/distorted/solvers/SolverPyraminxDiamond.java b/src/main/java/org/distorted/solvers/SolverPyraminxDiamond.java
index 61a0a0fd..18ca7b5c 100644
--- a/src/main/java/org/distorted/solvers/SolverPyraminxDiamond.java
+++ b/src/main/java/org/distorted/solvers/SolverPyraminxDiamond.java
@@ -13,7 +13,7 @@ import android.content.res.Resources;
 
 import org.distorted.main.R;
 import org.distorted.objectlib.helpers.OperatingSystemInterface;
-import org.distorted.objectlib.main.ObjectSignatures;
+import org.distorted.objectlib.main.ObjectType;
 import org.distorted.objectlib.main.TwistyObject;
 import org.distorted.objectlib.tablebases.ImplementedTablebasesList;
 import org.distorted.objectlib.tablebases.TablebaseHelpers;
@@ -366,7 +366,7 @@ android.util.Log.e("D", "ret="+(total_twist + 2048*centers_perm_num) );
     {
     if( mSolver==null )
       {
-      mSolver = ImplementedTablebasesList.createPacked(os,ObjectSignatures.PDIA_3);
+      mSolver = ImplementedTablebasesList.createPacked(os, ObjectType.PDIA_3.name() );
       }
 
     return mSolver!=null ? mSolver.solution(index,null,os) : null;
diff --git a/src/main/java/org/distorted/solvers/SolverPyraminxDuo.java b/src/main/java/org/distorted/solvers/SolverPyraminxDuo.java
index a813d9fe..0f7a2d0c 100644
--- a/src/main/java/org/distorted/solvers/SolverPyraminxDuo.java
+++ b/src/main/java/org/distorted/solvers/SolverPyraminxDuo.java
@@ -13,7 +13,7 @@ import android.content.res.Resources;
 
 import org.distorted.main.R;
 import org.distorted.objectlib.helpers.OperatingSystemInterface;
-import org.distorted.objectlib.main.ObjectSignatures;
+import org.distorted.objectlib.main.ObjectType;
 import org.distorted.objectlib.main.TwistyObject;
 import org.distorted.objectlib.tablebases.ImplementedTablebasesList;
 import org.distorted.objectlib.tablebases.TablebasesAbstract;
@@ -290,7 +290,7 @@ public class SolverPyraminxDuo extends SolverTablebase
     {
     if( mSolver==null )
       {
-      mSolver = ImplementedTablebasesList.createPacked(os, ObjectSignatures.PDUO_2);
+      mSolver = ImplementedTablebasesList.createPacked(os, ObjectType.PDUO_2.name() );
       }
 
     return mSolver!=null ? mSolver.solution(index,null,os) : null;
diff --git a/src/main/java/org/distorted/solvers/SolverSkewb.java b/src/main/java/org/distorted/solvers/SolverSkewb.java
index b3776f0d..cf8f8e27 100644
--- a/src/main/java/org/distorted/solvers/SolverSkewb.java
+++ b/src/main/java/org/distorted/solvers/SolverSkewb.java
@@ -15,7 +15,7 @@ import android.content.res.Resources;
 
 import org.distorted.main.R;
 import org.distorted.objectlib.helpers.OperatingSystemInterface;
-import org.distorted.objectlib.main.ObjectSignatures;
+import org.distorted.objectlib.main.ObjectType;
 import org.distorted.objectlib.main.TwistyObject;
 import org.distorted.objectlib.tablebases.ImplementedTablebasesList;
 import org.distorted.objectlib.tablebases.TBSkewb;
@@ -389,7 +389,7 @@ public class SolverSkewb extends SolverTablebase
     {
     if( mSolver==null )
       {
-      mSolver = ImplementedTablebasesList.createPacked(os,ObjectSignatures.SKEW_2);
+      mSolver = ImplementedTablebasesList.createPacked(os, ObjectType.SKEW_2.name() );
       }
 
     return mSolver!=null ? mSolver.solution(index,null,os) : null;
diff --git a/src/main/java/org/distorted/solvers/SolverSkewbDiamond.java b/src/main/java/org/distorted/solvers/SolverSkewbDiamond.java
index 6ec6d80c..e7796bdb 100644
--- a/src/main/java/org/distorted/solvers/SolverSkewbDiamond.java
+++ b/src/main/java/org/distorted/solvers/SolverSkewbDiamond.java
@@ -13,7 +13,7 @@ import android.content.res.Resources;
 
 import org.distorted.main.R;
 import org.distorted.objectlib.helpers.OperatingSystemInterface;
-import org.distorted.objectlib.main.ObjectSignatures;
+import org.distorted.objectlib.main.ObjectType;
 import org.distorted.objectlib.main.TwistyObject;
 import org.distorted.objectlib.tablebases.ImplementedTablebasesList;
 import org.distorted.objectlib.tablebases.TablebaseHelpers;
@@ -503,7 +503,7 @@ android.util.Log.e("D", "corn twist: "+corners_twist[0]+" "+corners_twist[1]+" "
     {
     if( mSolver==null )
       {
-      mSolver = ImplementedTablebasesList.createPacked(os, ObjectSignatures.DIAM_2);
+      mSolver = ImplementedTablebasesList.createPacked(os, ObjectType.DIAM_2.name());
       }
 
     return mSolver!=null ? mSolver.solution(index,null,os) : null;