Optimize ternary operator

Author: emmanue1

src/main/java/org/jd/core/v1/model/token/TextToken.java

@@ -38,6 +38,7 @@ public class TextToken implements Token {
     public static final TextToken SEMICOLON_SPACE = new TextToken("; ");
     public static final TextToken VARARGS = new TextToken("... ");
     public static final TextToken VERTICALLINE = new TextToken("|");
+    public static final TextToken EXCLAMATION = new TextToken("!");
 
     protected final String text;
 

src/main/java/org/jd/core/v1/service/fragmenter/javasyntaxtojavafragment/visitor/ExpressionVisitor.java

@@ -558,44 +558,40 @@ public void visit(SuperExpression expression) {
     public void visit(TernaryOperatorExpression expression) {
         tokens.addLineNumberToken(expression.getCondition());
 
-        if (expression.getCondition().getPriority() > 3) {
-            tokens.add(TextToken.LEFTROUNDBRACKET);
-            expression.getCondition().accept(this);
-            tokens.add(TextToken.RIGHTROUNDBRACKET);
-        } else {
-            expression.getCondition().accept(this);
-        }
-
-        if ((expression.getType() == PrimitiveType.TYPE_BOOLEAN) &&
-            (expression.getExpressionTrue().getClass() == BooleanExpression.class) &&
+        if ((expression.getExpressionTrue().getClass() == BooleanExpression.class) &&
             (expression.getExpressionFalse().getClass() == BooleanExpression.class)) {
 
             BooleanExpression be1 = (BooleanExpression)expression.getExpressionTrue();
             BooleanExpression be2 = (BooleanExpression)expression.getExpressionFalse();
 
             if (be1.isTrue() && be2.isFalse()) {
+                printTernaryOperatorExpression(expression.getCondition());
                 return;
             }
-        }
-
-        tokens.add(TextToken.SPACE_QUESTION_SPACE);
 
-        if (expression.getExpressionTrue().getPriority() > 3) {
-            tokens.add(TextToken.LEFTROUNDBRACKET);
-            expression.getExpressionTrue().accept(this);
-            tokens.add(TextToken.RIGHTROUNDBRACKET);
-        } else {
-            expression.getExpressionTrue().accept(this);
+            if (be1.isFalse() && be2.isTrue()) {
+                tokens.add(TextToken.EXCLAMATION);
+                tokens.add(TextToken.LEFTROUNDBRACKET);
+                expression.getCondition().accept(this);
+                tokens.add(TextToken.RIGHTROUNDBRACKET);
+                return;
+            }
         }
 
+        printTernaryOperatorExpression(expression.getCondition());
+        tokens.add(TextToken.SPACE_QUESTION_SPACE);
+        printTernaryOperatorExpression(expression.getExpressionTrue());
         tokens.add(TextToken.SPACE_COLON_SPACE);
+        printTernaryOperatorExpression(expression.getExpressionFalse());
+    }
 
-        if (expression.getExpressionFalse().getPriority() > 3) {
+    protected void printTernaryOperatorExpression(Expression expression) {
+        if (expression.getPriority() > 3) {
             tokens.add(TextToken.LEFTROUNDBRACKET);
-            expression.getExpressionFalse().accept(this);
+            expression.accept(this);
             tokens.add(TextToken.RIGHTROUNDBRACKET);
         } else {
-            expression.getExpressionFalse().accept(this);
+            expression.accept(this);
         }
     }
 

src/test/java/org/jd/core/v1/ClassFileToJavaSourceTest.java

@@ -1051,7 +1051,7 @@ public void testJdk118TernaryOperator() throws Exception {
         assertTrue(source.matches(PatternMaker.make(":  15]", "\"1\"")));
         assertTrue(source.matches(PatternMaker.make(":  16]", "\"2\";")));
         assertTrue(source.matches(PatternMaker.make(":  24]", "s = (s == null) ? ((s == null) ? \"1\" : \"2\") : ((s == null) ? \"3\" : \"4\");")));
-        assertTrue(source.matches(PatternMaker.make(":  34]", "return (s != s || time < time) ? false : true;")));
+        assertTrue(source.matches(PatternMaker.make(":  34]", "return !(s != s || time < time);")));
         assertTrue(source.matches(PatternMaker.make(":  40]", "if ((s1 == null) ? (s2 == null) : s1.equals(s2))")));
         assertTrue(source.matches(PatternMaker.make(":  60]", "if ((s1 == null) ? (s2 == null) : s1.equals(s2))")));
         assertTrue(source.matches(PatternMaker.make(":  71]", "if ((s1 == null) ? false : (s1.length() > 0))")));