NPE TermColorKeywordImpl.toString radkovo#100

dmercuriali · May 31, 2019 · 8546265 · 8546265
1 parent 4cf1c97
commit 8546265
Show file tree

Hide file tree

Showing 2 changed files with 179 additions and 62 deletions.
diff --git a/src/main/java/cz/vutbr/web/csskit/TermColorKeywordImpl.java b/src/main/java/cz/vutbr/web/csskit/TermColorKeywordImpl.java
@@ -12,7 +12,7 @@
  * @author Radek Burget
  */
 public class TermColorKeywordImpl extends TermImpl<Color> implements TermColor {
-    
+
     private Keyword keyword;
 
     protected TermColorKeywordImpl(Keyword keyword, int r, int g, int b, int a) {
@@ -24,18 +24,23 @@ protected TermColorKeywordImpl(Keyword keyword, int r, int g, int b, int a) {
     public Keyword getKeyword() {
         return keyword;
     }
-    
+
     @Override
     public boolean isTransparent() {
         return (keyword == Keyword.TRANSPARENT) || (value.getAlpha() == 0);
     }
 
     @Override
     public String toString() {
-        if (operator != null)
-            return operator.value() + keyword.toString();
-        else
-            return keyword.toString();
+        String operatorValue = operator == null
+            ? ""
+            : operator.value();
+
+        String keywordStr = keyword == null
+            ? ""
+            : keyword.toString();
+
+        return operatorValue + keywordStr;
     }
 
 }