CINXE.COM

<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width, initial-scale=1"><title>Diff - 942ed063adf2d75f9e8c658d52a87c6126fb902f^! - training/sample - Git at Google</title><link rel="stylesheet" type="text/css" href="/+static/base.css"></head><body class="Site"><header class="Site-header"><div class="Header"><a class="Header-image" href="/"><img src="//www.gstatic.com/images/branding/lockups/2x/lockup_git_color_108x24dp.png" width="108" height="24" alt="Google Git"></a><div class="Header-menu"> <a class="Header-menuItem" href="https://accounts.google.com/AccountChooser?faa=1&service=gerritcodereview&continue=https://gerrit.googlesource.com/login/training/sample/%2B/942ed063adf2d75f9e8c658d52a87c6126fb902f%255E%2521/">Sign in</a> </div></div></header><div class="Site-content"><div class="Container "><div class="Breadcrumbs"><a class="Breadcrumbs-crumb" href="/?format=HTML">gerrit</a> / <a class="Breadcrumbs-crumb" href="/training/">training</a> / <a class="Breadcrumbs-crumb" href="/training/sample/">sample</a> / <a class="Breadcrumbs-crumb" href="/training/sample/+/942ed063adf2d75f9e8c658d52a87c6126fb902f%5E%21/">942ed063adf2d75f9e8c658d52a87c6126fb902f^!</a> / .</div><div class="u-monospace Metadata"><table><tr><th class="Metadata-title">commit</th><td>942ed063adf2d75f9e8c658d52a87c6126fb902f</td><td>[<a href="/training/sample/+log/942ed063adf2d75f9e8c658d52a87c6126fb902f/">log</a>] [<a href="/training/sample/+archive/942ed063adf2d75f9e8c658d52a87c6126fb902f/.tar.gz">tgz</a>]</td></tr><tr><th class="Metadata-title">author</th><td>Matthias Sohn <matthias.sohn@sap.com></td><td>Fri Feb 25 15:18:37 2011 +0100</td></tr><tr><th class="Metadata-title">committer</th><td>Matthias Sohn <matthias.sohn@sap.com></td><td>Fri Feb 25 15:21:08 2011 +0100</td></tr><tr><th class="Metadata-title">tree</th><td><a href="/training/sample/+/942ed063adf2d75f9e8c658d52a87c6126fb902f/">42a412f10b411a0a30aff1de2f365186709e2e48</a></td></tr><tr><th class="Metadata-title">parent</th><td><a href="/training/sample/+/942ed063adf2d75f9e8c658d52a87c6126fb902f%5E">b49618df18608568fe20195bfa8cc1c06eb23c37</a> [<a href="/training/sample/+/942ed063adf2d75f9e8c658d52a87c6126fb902f%5E%21/">diff</a>]</td></tr></table></div><pre class="u-pre u-monospace MetadataMessage">Fix redundant clear display after unary operation Signed-off-by: Matthias Sohn <matthias.sohn@sap.com> </pre><pre class="u-pre u-monospace Diff"><a name="F0" class="Diff-fileIndex"></a>diff --git <a href="/training/sample/+/b49618df18608568fe20195bfa8cc1c06eb23c37/org.eclipse.example.calc/src/org/eclipse/example/calc/internal/ui/Calculator.java">a/org.eclipse.example.calc/src/org/eclipse/example/calc/internal/ui/Calculator.java</a> <a href="/training/sample/+/942ed063adf2d75f9e8c658d52a87c6126fb902f/org.eclipse.example.calc/src/org/eclipse/example/calc/internal/ui/Calculator.java">b/org.eclipse.example.calc/src/org/eclipse/example/calc/internal/ui/Calculator.java</a> index db032da..ff2c20f 100644 --- a/org.eclipse.example.calc/src/org/eclipse/example/calc/internal/ui/Calculator.java +++ b/org.eclipse.example.calc/src/org/eclipse/example/calc/internal/ui/Calculator.java </pre><pre class="u-pre u-monospace Diff-unified">@@ -37,14 +37,21 @@ private static final long serialVersionUID = 1L; private String cmd; + private boolean clearDisplay; + private float value; private JTextField display; + private JPanel buttonsPanel; + private JPanel numberButtonsPanel; + private JPanel cmdButtonsPanel; + private JButton numberButtons[]; + private JButton cmdButtons[]; public static void main(String args[]) { @@ -162,32 +169,36 @@ // get current value of display curValue = Float.parseFloat(display.getText()); - if (cmd == null || cmd.equals("")) { - // if no command was saved previously, save this one and clear + Operation currentOp = Operations.INSTANCE.getOperation(cmdName); + if ((currentOp instanceof BinaryOperation) && (cmd == null)) { + // if last clicked operation was binary and there is no saved + // operation, store it cmd = cmdName; clearDisplay = true; } else { - // perform the saved command - Operation op = Operations.INSTANCE.getOperation(cmd); - assert (op != null); - if (op instanceof BinaryOperation) { - BinaryOperation bop = (BinaryOperation) op; + // if saved command is binary perform it + Operation savedOp = Operations.INSTANCE.getOperation(cmd); + if (savedOp instanceof BinaryOperation) { + BinaryOperation bop = (BinaryOperation) savedOp; newValue = bop.perform(value, curValue); - } else if (op instanceof UnaryOperation) { - UnaryOperation uop = (UnaryOperation) op; + } // if current operation is unary perform it + else if (currentOp instanceof UnaryOperation) { + UnaryOperation uop = (UnaryOperation) currentOp; newValue = uop.perform(curValue); } - // display the result and order to clear + // display the result and prepare clear on next button display.setText("" + newValue); clearDisplay = true; - - if (cmdName.equals("=")) { - // do not save = command + if (currentOp instanceof Equals) { + // do not save "=" command cmd = null; - } else { - // save other commands + } else if (currentOp instanceof BinaryOperation) { + // save binary commands as they are executed on next operation cmd = cmdName; + } else { + // clear saved command + cmd = null; } } </pre></div> </div> <footer class="Site-footer"><div class="Footer">Powered by <a href="https://gerrit.googlesource.com/gitiles/">Gitiles</a>| <a href="https://policies.google.com/privacy">Privacy</a>| <a href="https://policies.google.com/terms">Terms</a><a class="u-monospace Footer-formatsItem" href="?format=TEXT">txt</a> <a class="u-monospace Footer-formatsItem" href="?format=JSON">json</a></div></footer></body></html>