src/ch/spherIC/recurvebowsight/RBSMainActivity.java

@@ -91,6 +91,7 @@ public class RBSMainActivity extends Activity implements ChooseArcherySetupDlgDi
     public static final int DLG_USERGUIDE_SIGHT = 2;
     public static final int DLG_ABOUT = 3;
 
+    private static final long serialVersionUID = 9142533835653341769L;
     private static final Double ANGLE_90 = 90d;
     private static final int MIN_DISTANCE = 50;
     private static final double CENTI = 0.01;
@@ -172,14 +173,8 @@ public class RBSMainActivity extends Activity implements ChooseArcherySetupDlgDi
                                                                         getResources().getStringArray(R.array.CalculationAccuracies),
                                                                         this.calcAccuracyCboBox));
 
-        List<IRiser> risers = RiserDao.getInstance().loadAll();
-        risers.add(0, new Riser(-999, getResources().getString(R.string.caption_NoSelection), "", null, null, null));
-        this.scRiserSpinner.setAdapter(new FontArrayAdapter<IRiser>(this, R.layout.rbs_spinner, risers, this.scRiserSpinner));
-
-        List<ISight> sights = SightDao.getInstance().loadAll();
-        sights.add(0, new Sight(-999, getResources().getString(R.string.caption_NoSelection), "", null, null, "", null, null));
-        this.scSightSpinner.setAdapter(new FontArrayAdapter<ISight>(this, R.layout.rbs_spinner, sights, this.scSightSpinner));
-
+        loadRiserSpinner();
+        loadSightSpinner();
         addRiserAndSightSpinnerListeners();
 
         GraphicalView flightCurveChartView;
@@ -191,6 +186,26 @@ public class RBSMainActivity extends Activity implements ChooseArcherySetupDlgDi
     }
 
 
+    private void loadRiserSpinner() {
+        IRiser selectedRiser = this.scRiserSpinner.getSelectedRiser();
+        List<IRiser> risers = RiserDao.getInstance().loadAll();
+        risers.add(0, new Riser(-999, getResources().getString(R.string.caption_NoSelection), "", null, null, null));
+        this.scRiserSpinner.setAdapter(new FontArrayAdapter<IRiser>(this, R.layout.rbs_spinner, risers, this.scRiserSpinner));
+        if (selectedRiser != null) {
+            this.scRiserSpinner.setSelectedRiser(selectedRiser);
+        }
+    }
+
+    private void loadSightSpinner() {
+        ISight selectedSight = this.scSightSpinner.getSelectedSight();
+        List<ISight> sights = SightDao.getInstance().loadAll();
+        sights.add(0, new Sight(-999, getResources().getString(R.string.caption_NoSelection), "", null, null, "", null, null));
+        this.scSightSpinner.setAdapter(new FontArrayAdapter<ISight>(this, R.layout.rbs_spinner, sights, this.scSightSpinner));
+        if (selectedSight != null) {
+            this.scSightSpinner.setSelectedSight(selectedSight);
+        }
+    }
+
     @Override
     protected void onSaveInstanceState(final Bundle outState) {
         super.onSaveInstanceState(outState);
@@ -591,8 +606,8 @@ public class RBSMainActivity extends Activity implements ChooseArcherySetupDlgDi
 
         case R.id.addConfiguration:
 
-            Intent intent = new Intent(RBSMainActivity.this, MainConfigurationActivity.class);
-            startActivity(intent);
+            Intent intent = new Intent(this, MainConfigurationActivity.class);
+            startActivityForResult(intent, 1);
             return true;
 
         case R.id.moreItems:
@@ -996,4 +1011,13 @@ public class RBSMainActivity extends Activity implements ChooseArcherySetupDlgDi
         this.calcTimeIntervalCboBox.setSelectionByVal(calcAccuracyToSet);
     }
 
+    @Override
+    protected void onActivityResult(final int requestCode, final int resultCode, final Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        if (resultCode == 1) {
+            loadRiserSpinner();
+            loadSightSpinner();
+        }
+    }
+
 }

src/ch/spherIC/recurvebowsight/configuration/MainConfigurationActivity.java

@@ -26,7 +26,6 @@ public class MainConfigurationActivity extends Activity {
 
     private ListView mainConfigListVIew;
 
-
     @Override
     protected void onCreate(final Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -59,16 +58,18 @@ public class MainConfigurationActivity extends Activity {
         this.mainConfigListVIew.setOnItemClickListener(new AdapterView.OnItemClickListener() {
 
                 @Override
-                public void onItemClick(final AdapterView<?> parent, final View view, final int position,
-                                        final long id) {
+                public void onItemClick(final AdapterView<?> parent, final View view, final int position, final long id) {
 
                     final String[] item = (String[]) parent.getItemAtPosition(position);
 
                     if (item[0].equals(getResources().getString(R.string.caption_MainCfg_Riser_MainText))) {
                         Intent intent = new Intent(MainConfigurationActivity.this, RiserConfigurationActivity.class);
-                        startActivity(intent);
-                    } else if (item[0].equals(getResources().getString(R.string.caption_MainCfg_Sight_MainText))) { }
-                    else if (item[0].equals(getResources().getString(R.string.caption_MainCfg_ArcerySetup_MainText))) { }
+                        startActivityForResult(intent, 1);
+                    } else if (item[0].equals(getResources().getString(R.string.caption_MainCfg_Sight_MainText))) {
+                        //
+                    } else if (item[0].equals(getResources().getString(R.string.caption_MainCfg_ArcerySetup_MainText))) {
+                        //
+                    }
                 }
             });
     }
@@ -79,4 +80,9 @@ public class MainConfigurationActivity extends Activity {
         return true;
     }
 
+    @Override
+    protected void onActivityResult(final int requestCode, final int resultCode, final Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        setResult(resultCode);
+    }
 }

src/ch/spherIC/recurvebowsight/configuration/RiserConfigurationActivity.java

@@ -146,6 +146,7 @@ public class RiserConfigurationActivity extends Activity {
             try {
                 RiserDao.getInstance().delete(this.selectedRiser);
                 loadRiserSpinner();
+                setResult(1);
             } catch (SQLiteConstraintException e) {
                 Toast toast = Toast.makeText(this, getResources().getString(R.string.caption_Cfg_DeleteNotPossible), Toast.LENGTH_LONG);
                 toast.setGravity(Gravity.CENTER, 0, 0);
@@ -157,7 +158,6 @@ public class RiserConfigurationActivity extends Activity {
     /**
      * Speichern.
      */
-    @SuppressWarnings("unchecked")
     protected void onSaveRiser() {
         if (this.selectedRiser != null) {
             if (!this.rcManufacturerTxtFld.getText().toString().isEmpty() && !this.rcModelTxtFld.getText().toString().isEmpty()
@@ -176,6 +176,7 @@ public class RiserConfigurationActivity extends Activity {
                     loadRiserSpinner();
                     this.rcRiserSpinner.setSelectedRiser(this.selectedRiser);
                 }
+                setResult(1);
             } else {
                 Toast toast = Toast.makeText(this, getResources().getString(R.string.caption_Cfg_FillAllMandatoryFields), Toast.LENGTH_LONG);
                 toast.setGravity(Gravity.CENTER, 0, 0);