diff options
Diffstat (limited to 'org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/instructions/PlusOperator.java')
-rw-r--r-- | org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/instructions/PlusOperator.java | 100 |
1 files changed, 60 insertions, 40 deletions
diff --git a/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/instructions/PlusOperator.java b/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/instructions/PlusOperator.java index 3760d8660..13aa93351 100644 --- a/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/instructions/PlusOperator.java +++ b/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/instructions/PlusOperator.java @@ -19,98 +19,118 @@ import org.eclipse.jdt.internal.debug.core.model.JDINullValue; public class PlusOperator extends BinaryOperator { - public static final String NULL= "null"; //$NON-NLS-1$ - public static final String TOSTRING_SELECTOR= "toString"; //$NON-NLS-1$ - public static final String TOSTRING_SIGNATURE= "()Ljava/lang/String;"; //$NON-NLS-1$ + public static final String NULL = "null"; //$NON-NLS-1$ + public static final String TOSTRING_SELECTOR = "toString"; //$NON-NLS-1$ + public static final String TOSTRING_SIGNATURE = "()Ljava/lang/String;"; //$NON-NLS-1$ public PlusOperator(int resultId, int leftTypeId, int rightTypeId, int start) { this(resultId, leftTypeId, rightTypeId, false, start); } - - protected PlusOperator(int resultId, int leftTypeId, int rightTypeId, boolean isAssignmentOperator, int start) { + + protected PlusOperator(int resultId, int leftTypeId, int rightTypeId, + boolean isAssignmentOperator, int start) { super(resultId, leftTypeId, rightTypeId, isAssignmentOperator, start); } - - private String getString(IJavaValue value, int typeId) throws DebugException { - + + private String getString(IJavaValue value, int typeId) + throws DebugException { + // test if value == null if (value instanceof JDINullValue) { return NULL; } - + if (value instanceof IJavaObject) { if (typeId == T_String) { return value.getValueString(); } - return ((IJavaObject) value).sendMessage(TOSTRING_SELECTOR, TOSTRING_SIGNATURE, null, getContext().getThread(), null).getValueString(); + return ((IJavaObject) value).sendMessage(TOSTRING_SELECTOR, + TOSTRING_SIGNATURE, null, getContext().getThread(), null) + .getValueString(); } - - IJavaPrimitiveValue primitiveValue= (IJavaPrimitiveValue)value; + + IJavaPrimitiveValue primitiveValue = (IJavaPrimitiveValue) value; switch (typeId) { - case T_boolean: - return Boolean.valueOf(primitiveValue.getBooleanValue()).toString(); - case T_byte: - return new Integer(primitiveValue.getByteValue()).toString(); - case T_char: - return new Character(primitiveValue.getCharValue()).toString(); - case T_double: - return new Double(primitiveValue.getDoubleValue()).toString(); - case T_float: - return new Float(primitiveValue.getFloatValue()).toString(); - case T_int: - return new Integer(primitiveValue.getIntValue()).toString(); - case T_long: - return new Long(primitiveValue.getLongValue()).toString(); - case T_short: - return new Integer(primitiveValue.getShortValue()).toString(); + case T_boolean: + return Boolean.valueOf(primitiveValue.getBooleanValue()).toString(); + case T_byte: + return new Integer(primitiveValue.getByteValue()).toString(); + case T_char: + return new Character(primitiveValue.getCharValue()).toString(); + case T_double: + return new Double(primitiveValue.getDoubleValue()).toString(); + case T_float: + return new Float(primitiveValue.getFloatValue()).toString(); + case T_int: + return new Integer(primitiveValue.getIntValue()).toString(); + case T_long: + return new Long(primitiveValue.getLongValue()).toString(); + case T_short: + return new Integer(primitiveValue.getShortValue()).toString(); } return NULL; - } - + } + /* * @see BinaryOperator#getBooleanResult(IJavaValue, IJavaValue) */ - protected boolean getBooleanResult(IJavaValue leftOperand, IJavaValue rightOperand) { + @Override + protected boolean getBooleanResult(IJavaValue leftOperand, + IJavaValue rightOperand) { return false; } /* * @see BinaryOperator#getDoubleResult(IJavaValue, IJavaValue) */ - protected double getDoubleResult(IJavaValue leftOperand, IJavaValue rightOperand) { - return ((IJavaPrimitiveValue)leftOperand).getDoubleValue() + ((IJavaPrimitiveValue)rightOperand).getDoubleValue(); + @Override + protected double getDoubleResult(IJavaValue leftOperand, + IJavaValue rightOperand) { + return ((IJavaPrimitiveValue) leftOperand).getDoubleValue() + + ((IJavaPrimitiveValue) rightOperand).getDoubleValue(); } /* * @see BinaryOperator#getFloatResult(IJavaValue, IJavaValue) */ - protected float getFloatResult(IJavaValue leftOperand, IJavaValue rightOperand) { - return ((IJavaPrimitiveValue)leftOperand).getFloatValue() + ((IJavaPrimitiveValue)rightOperand).getFloatValue(); + @Override + protected float getFloatResult(IJavaValue leftOperand, + IJavaValue rightOperand) { + return ((IJavaPrimitiveValue) leftOperand).getFloatValue() + + ((IJavaPrimitiveValue) rightOperand).getFloatValue(); } /* * @see BinaryOperator#getIntResult(IJavaValue, IJavaValue) */ + @Override protected int getIntResult(IJavaValue leftOperand, IJavaValue rightOperand) { - return ((IJavaPrimitiveValue)leftOperand).getIntValue() + ((IJavaPrimitiveValue)rightOperand).getIntValue(); + return ((IJavaPrimitiveValue) leftOperand).getIntValue() + + ((IJavaPrimitiveValue) rightOperand).getIntValue(); } /* * @see BinaryOperator#getLongResult(IJavaValue, IJavaValue) */ + @Override protected long getLongResult(IJavaValue leftOperand, IJavaValue rightOperand) { - return ((IJavaPrimitiveValue)leftOperand).getLongValue() + ((IJavaPrimitiveValue)rightOperand).getLongValue(); + return ((IJavaPrimitiveValue) leftOperand).getLongValue() + + ((IJavaPrimitiveValue) rightOperand).getLongValue(); } /* * @see BinaryOperator#getStringResult(IJavaValue, IJavaValue) */ - protected String getStringResult(IJavaValue leftOperand, IJavaValue rightOperand) throws CoreException { - return getString(leftOperand, fLeftTypeId) + getString(rightOperand, fRightTypeId); + @Override + protected String getStringResult(IJavaValue leftOperand, + IJavaValue rightOperand) throws CoreException { + return getString(leftOperand, fLeftTypeId) + + getString(rightOperand, fRightTypeId); } + @Override public String toString() { - return InstructionsEvaluationMessages.PlusOperator______operator_2; + return InstructionsEvaluationMessages.PlusOperator______operator_2; } } |