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

changes

Browse Source
This commit is contained in:
Sergey Solovyev
2013-06-13 00:23:10 +04:00
parent cdc478174c
commit 30e8b55a73
11 changed files with 43 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
android-app-core/src/main/java/org/solovyev/android/calculator/FixableMessage.java
View File

@@ -46,7 +46,14 @@ public class FixableMessage implements Parcelable {
public FixableMessage(@NotNull Message message) {
this.message = message.getLocalizedMessage();
this.messageType = message.getMessageType();
int messageLevel = message.getMessageLevel().getMessageLevel();
if(messageLevel < MessageType.info.getMessageLevel()) {
this.messageType = MessageType.info;
} else if (messageLevel < MessageType.warning.getMessageLevel()) {
this.messageType = MessageType.warning;
} else {
this.messageType = MessageType.error;
}
this.fixableError = CalculatorFixableError.getErrorByMessageCode(message.getMessageCode());
}

7
android-app-core/src/main/java/org/solovyev/android/calculator/ParcelableDialogData.java
View File

@@ -4,6 +4,7 @@ import android.os.Parcel;
import android.os.Parcelable;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.solovyev.common.msg.MessageLevel;
import org.solovyev.common.msg.MessageType;
/**
@@ -81,8 +82,8 @@ public final class ParcelableDialogData implements DialogData, Parcelable {
@NotNull
@Override
public MessageType getMessageType() {
return nestedData.getMessageType();
public MessageLevel getMessageLevel() {
return nestedData.getMessageLevel();
}
@Nullable
@@ -99,7 +100,7 @@ public final class ParcelableDialogData implements DialogData, Parcelable {
@Override
public void writeToParcel(@NotNull Parcel out, int flags) {
out.writeString(this.getMessage());
out.writeInt(this.getMessageType().ordinal());
out.writeInt(this.getMessageLevel().getMessageLevel());
out.writeString(this.getTitle());
}
}