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

Display/Editor views should not be cleared by closing activity if new activity has already been started

Browse Source
This commit is contained in:
serso
2015-06-16 13:36:49 +02:00
parent 127f27810e
commit 70a5e7e2e5
7 changed files with 41 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/src/main/java/org/solovyev/android/calculator/CalculatorDisplay.java
View File

@@ -32,7 +32,8 @@ import javax.annotation.Nullable;
*/
public interface CalculatorDisplay extends CalculatorEventListener {
void setView(@Nullable CalculatorDisplayView view);
void setView(@Nonnull CalculatorDisplayView view);
void clearView(@Nonnull CalculatorDisplayView view);
@Nullable
CalculatorDisplayView getView();

19
core/src/main/java/org/solovyev/android/calculator/CalculatorDisplayImpl.java
View File

@@ -25,7 +25,12 @@ package org.solovyev.android.calculator;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import static org.solovyev.android.calculator.CalculatorEventType.*;
import static org.solovyev.android.calculator.CalculatorEventType.calculation_cancelled;
import static org.solovyev.android.calculator.CalculatorEventType.calculation_failed;
import static org.solovyev.android.calculator.CalculatorEventType.calculation_result;
import static org.solovyev.android.calculator.CalculatorEventType.conversion_failed;
import static org.solovyev.android.calculator.CalculatorEventType.conversion_result;
import static org.solovyev.android.calculator.CalculatorEventType.display_state_changed;
/**
* User: serso
@@ -56,12 +61,18 @@ public class CalculatorDisplayImpl implements CalculatorDisplay {
}
@Override
public void setView(@Nullable CalculatorDisplayView view) {
public void setView(@Nonnull CalculatorDisplayView view) {
synchronized (viewLock) {
this.view = view;
this.view.setState(viewState);
}
}
if (view != null) {
this.view.setState(viewState);
@Override
public void clearView(@Nonnull CalculatorDisplayView view) {
synchronized (viewLock) {
if (this.view == view) {
this.view = null;
}
}
}

4
core/src/main/java/org/solovyev/android/calculator/CalculatorEditor.java
View File

@@ -25,7 +25,6 @@ package org.solovyev.android.calculator;
import org.solovyev.common.gui.CursorControl;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
/**
* User: Solovyev_S
@@ -37,7 +36,8 @@ public interface CalculatorEditor extends CalculatorEventListener {
@Nonnull
String TAG = CalculatorEditor.class.getSimpleName();
void setView(@Nullable CalculatorEditorView view);
void setView(@Nonnull CalculatorEditorView view);
void clearView(@Nonnull CalculatorEditorView view);
@Nonnull
CalculatorEditorViewState getViewState();

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

@@ -73,12 +73,18 @@ public class CalculatorEditorImpl implements CalculatorEditor {
}
@Override
public void setView(@Nullable CalculatorEditorView view) {
public void setView(@Nonnull CalculatorEditorView view) {
synchronized (viewLock) {
this.view = view;
this.view.setState(lastViewState);
}
}
if (view != null) {
view.setState(lastViewState);
@Override
public void clearView(@Nonnull CalculatorEditorView view) {
synchronized (viewLock) {
if (this.view == view) {
this.view = null;
}
}
}