From 659a1b9de7d9055d61196e571b0a8db359a6c8cc Mon Sep 17 00:00:00 2001
From: Peter Siegmund <peter.siegmund@sap.com>
Date: Tue, 13 Jun 2017 09:44:20 +0200
Subject: [PATCH] position can't be set between penalty item

---
 .../app/ui/adapters/FinishListAdapter.java           |  4 ++--
 .../ui/fragments/raceinfo/TrackingListFragment.java  | 12 ++++++------
 .../app/ui/layouts/CompetitorEditLayout.java         |  3 +++
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/adapters/FinishListAdapter.java b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/adapters/FinishListAdapter.java
index 2cd38abf210..7515c3b0ca4 100644
--- a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/adapters/FinishListAdapter.java
+++ b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/adapters/FinishListAdapter.java
@@ -105,7 +105,7 @@ public class FinishListAdapter extends BaseDraggableSwipeAdapter<FinishListAdapt
     @Override
     public ItemDraggableRange onGetItemDraggableRange(ViewHolder viewHolder, int position) {
         final int start = 0;
-        final int end = getFirstPenalty() - 1;
+        final int end = getFirstPenaltyPosition() - 1;
 
         return new GroupPositionItemDraggableRange(start, end);
     }
@@ -120,7 +120,7 @@ public class FinishListAdapter extends BaseDraggableSwipeAdapter<FinishListAdapt
         }
     }
 
-    public int getFirstPenalty() {
+    public int getFirstPenaltyPosition() {
         int result = getItemCount();
         for (int i = 0; i < getItemCount(); i++) {
             if (!mCompetitor.get(i).getMaxPointsReason().equals(MaxPointsReason.NONE)) {
diff --git a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/raceinfo/TrackingListFragment.java b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/raceinfo/TrackingListFragment.java
index 1779cf08f8c..6d3fb83a6be 100644
--- a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/raceinfo/TrackingListFragment.java
+++ b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/raceinfo/TrackingListFragment.java
@@ -500,7 +500,7 @@ public class TrackingListFragment extends BaseFragment
             name += competitor.getBoat().getSailID();
         }
         name += " - " + competitor.getName();
-        int pos = mAdapter.getFirstPenalty();
+        int pos = mAdapter.getFirstPenaltyPosition();
         // FIXME mFinishedData.size()+1 also counts penalized competitors before which the competitor is to be inserted! I just wonder how the position shown in the app seems correct...
         int greatestOneBasedRankSoFar = 0;
         for (final CompetitorResultWithIdImpl result : mFinishedData) {
@@ -601,7 +601,7 @@ public class TrackingListFragment extends BaseFragment
         AlertDialog.Builder builder = new AlertDialog.Builder(context, R.style.AppTheme_AlertDialog);
         builder.setTitle(item.getCompetitorDisplayName());
         final CompetitorEditLayout layout = new CompetitorEditLayout(getActivity(), getRace().getState()
-            .getFinishingTime(), item, mFinishedAdapter.getItemCount(), false);
+            .getFinishingTime(), item, mAdapter.getFirstPenaltyPosition(), false);
         builder.setView(layout);
         builder.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
             @Override
@@ -616,11 +616,11 @@ public class TrackingListFragment extends BaseFragment
                         replaceItemInPositioningList(index, item, newItem);
                         onItemMove(mFinishedData.indexOf(newItem), newItem.getOneBasedRank() - 1);
                     } else {
-                        onItemRemove(mFinishedData.indexOf(item));
+                        onItemRemove(index);
                     }
                 } else { // same rank
                     if (newItem.getOneBasedRank() == 0) { // empty rank -> remove
-                        onItemRemove(mFinishedData.indexOf(item));
+                        onItemRemove(index);
                     } else {
                         replaceItemInPositioningList(index, item, newItem);
                     }
@@ -657,8 +657,8 @@ public class TrackingListFragment extends BaseFragment
         getRaceState().setFinishPositioningListChanged(MillisecondsTimePoint.now(), getCompetitorResults());
     }
 
-    private void replaceItemInPositioningList(int index, CompetitorResultWithIdImpl item, CompetitorResultWithIdImpl newItem) {
-        mFinishedData.remove(item);
+    private void replaceItemInPositioningList(int index, CompetitorResultWithIdImpl oldItem, CompetitorResultWithIdImpl newItem) {
+        mFinishedData.remove(oldItem);
         mFinishedData.add(index, newItem);
     }
 
diff --git a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/layouts/CompetitorEditLayout.java b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/layouts/CompetitorEditLayout.java
index 9af3ff8aa85..f3b264038e0 100644
--- a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/layouts/CompetitorEditLayout.java
+++ b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/layouts/CompetitorEditLayout.java
@@ -84,6 +84,9 @@ public class CompetitorEditLayout extends ScrollView {
         }
 
         mCompetitor = competitor;
+        if (!mCompetitor.getMaxPointsReason().equals(MaxPointsReason.NONE)) {
+            maxPos++;
+        }
 
         mCalendar = (GregorianCalendar) GregorianCalendar.getInstance();
         if (mCompetitor.getFinishingTime() != null) {