TnSb/android-calculatorpp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed IndexOutOfBoundsException

Browse Source
This commit is contained in:
serso 2015-02-23 11:23:49 +01:00
parent 516da9fe3a
commit b5e42c599f
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
core/src/main/java/org/solovyev/android/calculator/CalculatorEditorImpl.java
View File

@ -32,6 +32,7 @@ import org.solovyev.common.text.Strings;
import javax.annotation.Nonnull; import javax.annotation.Nonnull;
import javax.annotation.Nullable; import javax.annotation.Nullable;
import static java.lang.Math.min;
import static org.solovyev.android.calculator.CalculatorEditorChangeEventData.newChangeEventData; import static org.solovyev.android.calculator.CalculatorEditorChangeEventData.newChangeEventData;
import static org.solovyev.android.calculator.CalculatorEventType.editor_state_changed; import static org.solovyev.android.calculator.CalculatorEventType.editor_state_changed;
import static org.solovyev.android.calculator.CalculatorEventType.editor_state_changed_light; import static org.solovyev.android.calculator.CalculatorEventType.editor_state_changed_light;
@ -277,8 +278,8 @@ public class CalculatorEditorImpl implements CalculatorEditor {
@Override @Override
public CalculatorEditorViewState insert(@Nonnull String text, int selectionOffset) { public CalculatorEditorViewState insert(@Nonnull String text, int selectionOffset) {
synchronized (viewLock) { synchronized (viewLock) {
final int selection = this.lastViewState.getSelection(); final String oldText = lastViewState.getText();
final String oldText = this.lastViewState.getText(); final int selection = correctSelection(lastViewState.getSelection(), oldText);
int newTextLength = text.length() + oldText.length(); int newTextLength = text.length() + oldText.length();
final StringBuilder newText = new StringBuilder(newTextLength); final StringBuilder newText = new StringBuilder(newTextLength);
@ -322,7 +323,7 @@ public class CalculatorEditorImpl implements CalculatorEditor {
public static int correctSelection(int selection, int textLength) { public static int correctSelection(int selection, int textLength) {
int result = Math.max(selection, 0); int result = Math.max(selection, 0);
result = Math.min(result, textLength); result = min(result, textLength);
return result; return result;
} }