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
core/src/main/java/org/solovyev/android/calculator/CalculatorEvalException.java
View File

@@ -7,9 +7,8 @@
package org.solovyev.android.calculator;
import org.jetbrains.annotations.NotNull;
import org.solovyev.common.exceptions.SersoException;
import org.solovyev.common.msg.Message;
import org.solovyev.common.msg.MessageType;
import org.solovyev.common.msg.MessageLevel;
import java.util.List;
import java.util.Locale;
@@ -19,7 +18,7 @@ import java.util.Locale;
* Date: 12/8/11
* Time: 1:27 AM
*/
public class CalculatorEvalException extends SersoException implements Message {
public class CalculatorEvalException extends Exception implements Message {
@NotNull
private final Message message;
@@ -53,8 +52,8 @@ public class CalculatorEvalException extends SersoException implements Message {
@NotNull
@Override
public MessageType getMessageType() {
return this.message.getMessageType();
public MessageLevel getMessageLevel() {
return this.message.getMessageLevel();
}
@Override

9
core/src/main/java/org/solovyev/android/calculator/CalculatorParseException.java
View File

@@ -8,9 +8,8 @@ package org.solovyev.android.calculator;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.solovyev.common.exceptions.SersoException;
import org.solovyev.common.msg.Message;
import org.solovyev.common.msg.MessageType;
import org.solovyev.common.msg.MessageLevel;
import java.util.List;
import java.util.Locale;
@@ -20,7 +19,7 @@ import java.util.Locale;
* Date: 10/6/11
* Time: 9:25 PM
*/
public class CalculatorParseException extends SersoException implements Message {
public class CalculatorParseException extends Exception implements Message {
@NotNull
private final Message message;
@@ -74,8 +73,8 @@ public class CalculatorParseException extends SersoException implements Message
@NotNull
@Override
public MessageType getMessageType() {
return this.message.getMessageType();
public MessageLevel getMessageLevel() {
return this.message.getMessageLevel();
}
@Override

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

@@ -2,7 +2,7 @@ package org.solovyev.android.calculator;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.solovyev.common.msg.MessageType;
import org.solovyev.common.msg.MessageLevel;
/**
* User: serso
@@ -15,7 +15,7 @@ public interface DialogData {
String getMessage();
@NotNull
MessageType getMessageType();
MessageLevel getMessageLevel();
@Nullable
String getTitle();

6
core/src/main/java/org/solovyev/android/calculator/MessageDialogData.java
View File

@@ -3,7 +3,7 @@ package org.solovyev.android.calculator;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.solovyev.common.msg.Message;
import org.solovyev.common.msg.MessageType;
import org.solovyev.common.msg.MessageLevel;
/**
* User: serso
@@ -36,8 +36,8 @@ public class MessageDialogData implements DialogData {
@NotNull
@Override
public MessageType getMessageType() {
return message.getMessageType();
public MessageLevel getMessageLevel() {
return message.getMessageLevel();
}
@Override

2
core/src/main/java/org/solovyev/android/calculator/StringDialogData.java
View File

@@ -39,7 +39,7 @@ public class StringDialogData implements DialogData {
@NotNull
@Override
public MessageType getMessageType() {
public MessageType getMessageLevel() {
return messageType;
}

6
core/src/main/java/org/solovyev/android/calculator/model/AFunction.java
View File

@@ -18,7 +18,7 @@ import org.solovyev.android.calculator.Locator;
import org.solovyev.android.calculator.MathPersistenceEntity;
import org.solovyev.common.math.MathEntity;
import org.solovyev.common.msg.Message;
import org.solovyev.common.msg.MessageType;
import org.solovyev.common.msg.MessageLevel;
import org.solovyev.common.text.Strings;
import java.io.Serializable;
@@ -315,8 +315,8 @@ public class AFunction implements IFunction, MathPersistenceEntity, Serializable
@NotNull
@Override
public MessageType getMessageType() {
return message.getMessageType();
public MessageLevel getMessageLevel() {
return message.getMessageLevel();
}
@Override