You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pivot.apache.org by rw...@apache.org on 2015/09/15 19:44:38 UTC
svn commit: r1703266 - in /pivot/branches/2.0.x: ./
tutorials/src/org/apache/pivot/tutorials/calculator/Calculator.java
Author: rwhitcomb
Date: Tue Sep 15 17:44:38 2015
New Revision: 1703266
URL: http://svn.apache.org/r1703266
Log:
PIVOT-972: Fix a bug with percent calculations in the Calculator tutorial application.
This is a merge of revision 1688306 from trunk to branches/2.0.x.
Modified:
pivot/branches/2.0.x/ (props changed)
pivot/branches/2.0.x/tutorials/src/org/apache/pivot/tutorials/calculator/Calculator.java
Propchange: pivot/branches/2.0.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 15 17:44:38 2015
@@ -1 +1 @@
-/pivot/trunk:1346574,1347051,1394847,1394858,1398511,1399331,1401781,1405882,1407585,1409081,1410536,1410555,1417081,1417258,1428056,1428650,1435351,1436707,1438126,1438659,1444260,1444910,1502657,1510821,1516518,1519859,1522078,1523205,1523736,1523776,1525982,1526005,1536829,1537222,1604238,1610563,1611829,1614462,1624381,1675204,1675517,1678238,1678251,1687873-1687874,1688523,1691618
+/pivot/trunk:1346574,1347051,1394847,1394858,1398511,1399331,1401781,1405882,1407585,1409081,1410536,1410555,1417081,1417258,1428056,1428650,1435351,1436707,1438126,1438659,1444260,1444910,1502657,1510821,1516518,1519859,1522078,1523205,1523736,1523776,1525982,1526005,1536829,1537222,1604238,1610563,1611829,1614462,1624381,1675204,1675517,1678238,1678251,1687873-1687874,1688306,1688523,1691618
Modified: pivot/branches/2.0.x/tutorials/src/org/apache/pivot/tutorials/calculator/Calculator.java
URL: http://svn.apache.org/viewvc/pivot/branches/2.0.x/tutorials/src/org/apache/pivot/tutorials/calculator/Calculator.java?rev=1703266&r1=1703265&r2=1703266&view=diff
==============================================================================
--- pivot/branches/2.0.x/tutorials/src/org/apache/pivot/tutorials/calculator/Calculator.java (original)
+++ pivot/branches/2.0.x/tutorials/src/org/apache/pivot/tutorials/calculator/Calculator.java Tue Sep 15 17:44:38 2015
@@ -294,7 +294,14 @@ public class Calculator
PERCENT {
@Override
public void perform(Component source) {
- result = result.scaleByPowerOfTen(-2);
+ if (currentOperator == null ||
+ currentOperator == Operator.MULTIPLY ||
+ currentOperator == Operator.DIVIDE ||
+ accumulator == null) {
+ result = result.scaleByPowerOfTen(-2);
+ } else {
+ result = accumulator.multiply(result, MC).scaleByPowerOfTen(-2);
+ }
updateResult();
}
},