remove "sample" files, fix classpath.

[FreeShisen] / src / de / cwde / shisensho / ShisenSho.java

diff --git a/src/de/cwde/shisensho/ShisenSho.java b/src/de/cwde/shisensho/ShisenSho.java
index 00f959e84b89e6da517638cab0c0289fbeab11fb..0ca4ede97e39b5c4517954beb099749858ffa74b 100644 (file)
--- a/src/de/cwde/shisensho/ShisenSho.java
+++ b/src/de/cwde/shisensho/ShisenSho.java
@@ -9,7 +9,7 @@ public class ShisenSho extends Application {
        private static ShisenSho instance = null; 
        private ShisenShoView view = null;
        public ShisenShoActivity activity = null;
        private static ShisenSho instance = null; 
        private ShisenShoView view = null;
        public ShisenShoActivity activity = null;

-       
+

        public Board board;
        public int[] boardSize=new int[2];
        public int difficulty=1; // 1=Easy, 2=Hard
        public Board board;
        public int[] boardSize=new int[2];
        public int difficulty=1; // 1=Easy, 2=Hard


@@ -57,16 +57,16 @@ public class ShisenSho extends Application {
                instance = this;
                setSize(size);
        }
                instance = this;
                setSize(size);
        }

-       
+

        public static synchronized ShisenSho app() {
                return instance;
        }
        public static synchronized ShisenSho app() {
                return instance;
        }

-       
+

        public ShisenShoView getView() {
                if (view == null) view = new ShisenShoView(this);
                return view;
        }
        public ShisenShoView getView() {
                if (view == null) view = new ShisenShoView(this);
                return view;
        }

-               
+

        /** Called when the activity is first created. */
        @Override
        public void onCreate() {
        /** Called when the activity is first created. */
        @Override
        public void onCreate() {


@@ -77,19 +77,20 @@ public class ShisenSho extends Application {
 
        public void setOptions() {
                SharedPreferences sharedPref = PreferenceManager.getDefaultSharedPreferences(this);
 
        public void setOptions() {
                SharedPreferences sharedPref = PreferenceManager.getDefaultSharedPreferences(this);

-               
-               int size = sharedPref.getInt("size", 1);
-               int difficulty = sharedPref.getInt("difficulty", 1);
-               boolean gravity = sharedPref.getBoolean("gravity", true);
-               boolean timeCounter = sharedPref.getBoolean("timeCounter", true);
+
+               // FIXME: handle NumberFormatException here?
+               int size = Integer.parseInt(sharedPref.getString("pref_size", "1"));
+               int difficulty = Integer.parseInt(sharedPref.getString("pref_diff", "1"));
+               boolean gravity = sharedPref.getBoolean("pref_grav", true);
+               boolean timeCounter = sharedPref.getBoolean("pref_time", true);

 
                boolean needsReset = false;
 
                boolean needsReset = false;

-               
+

                if (size != this.size) {
                        setSize(size);
                        needsReset = true;
                }
                if (size != this.size) {
                        setSize(size);
                        needsReset = true;
                }

-               
+

                if (difficulty != this.difficulty) {
                        this.difficulty = difficulty;
                        needsReset = true;
                if (difficulty != this.difficulty) {
                        this.difficulty = difficulty;
                        needsReset = true;


@@ -99,7 +100,7 @@ public class ShisenSho extends Application {
                        this.gravity = gravity;
                        needsReset = true;
                }
                        this.gravity = gravity;
                        needsReset = true;
                }

-               
+

                if (timeCounter != this.timeCounter) {
                        this.timeCounter = timeCounter;
                        view.onTimeCounterActivate();
                if (timeCounter != this.timeCounter) {
                        this.timeCounter = timeCounter;
                        view.onTimeCounterActivate();