Use string switch statements
diff --git a/src/main/java/org/apache/log4j/chainsaw/ChainsawTabbedPane.java b/src/main/java/org/apache/log4j/chainsaw/ChainsawTabbedPane.java
index 48796a7..97b0cd3 100644
--- a/src/main/java/org/apache/log4j/chainsaw/ChainsawTabbedPane.java
+++ b/src/main/java/org/apache/log4j/chainsaw/ChainsawTabbedPane.java
@@ -141,13 +141,17 @@
      SavableTabSetting setting = new SavableTabSetting();
      for(int i = 0 ; i < count ; i++){
        title = super.getTitleAt(i);
-       if(title.equals(WELCOME_TAB)){
-         setting.setWelcome(true);
-       } else if (title.equals("chainsaw-log")){
-         setting.setChainsawLog(true);
-       } else if (title.equals(ZEROCONF)){
-         setting.setZeroconf(true);
-       }
+         switch (title) {
+             case WELCOME_TAB:
+                 setting.setWelcome(true);
+                 break;
+             case "chainsaw-log":
+                 setting.setChainsawLog(true);
+                 break;
+             case ZEROCONF:
+                 setting.setZeroconf(true);
+                 break;
+         }
      }
 
      stream.toXML(setting, writer);
diff --git a/src/main/java/org/apache/log4j/chainsaw/TableColorizingRenderer.java b/src/main/java/org/apache/log4j/chainsaw/TableColorizingRenderer.java
index 5f6c1ff..970c5c2 100644
--- a/src/main/java/org/apache/log4j/chainsaw/TableColorizingRenderer.java
+++ b/src/main/java/org/apache/log4j/chainsaw/TableColorizingRenderer.java
@@ -702,16 +702,17 @@
             String elementName = elem.getName();
             if (elementName != null)
             {
-                if (elementName.equals(AbstractDocument.ParagraphElementName)) {
-                    return new OneLineParagraphView(elem);
-                } else  if (elementName.equals(AbstractDocument.ContentElementName)) {
-                    return new LabelView(elem);
-                } else if (elementName.equals(AbstractDocument.SectionElementName)) {
-                    return new BoxView(elem, View.Y_AXIS);
-                } else if (elementName.equals(StyleConstants.ComponentElementName)) {
-                    return new ComponentView(elem);
-                } else if (elementName.equals(StyleConstants.IconElementName)) {
-                    return new IconView(elem);
+                switch (elementName) {
+                    case AbstractDocument.ParagraphElementName:
+                        return new OneLineParagraphView(elem);
+                    case AbstractDocument.ContentElementName:
+                        return new LabelView(elem);
+                    case AbstractDocument.SectionElementName:
+                        return new BoxView(elem, View.Y_AXIS);
+                    case StyleConstants.ComponentElementName:
+                        return new ComponentView(elem);
+                    case StyleConstants.IconElementName:
+                        return new IconView(elem);
                 }
             }
             return new LabelView(elem);
diff --git a/src/main/java/org/apache/log4j/chainsaw/osx/OSXIntegration.java b/src/main/java/org/apache/log4j/chainsaw/osx/OSXIntegration.java
index 7d67687..f4e13ce 100644
--- a/src/main/java/org/apache/log4j/chainsaw/osx/OSXIntegration.java
+++ b/src/main/java/org/apache/log4j/chainsaw/osx/OSXIntegration.java
@@ -66,15 +66,19 @@
                         new InvocationHandler() {
 
                 public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
-                    if("handlePreferences".equals(method.getName())){
-                        LOG.info("handlePreferences(...) called");
-                        logui.showApplicationPreferences();
-                    }else if("handleQuit".equals(method.getName())){
-                        setHandled(args[0], logui.exit()?Boolean.TRUE:Boolean.FALSE);
-                        
-                    }else if("handleAbout".equals(method.getName())) {
-                        logui.showAboutBox();
-                        setHandled(args[0], Boolean.TRUE);
+                    switch (method.getName()) {
+                        case "handlePreferences":
+                            LOG.info("handlePreferences(...) called");
+                            logui.showApplicationPreferences();
+                            break;
+                        case "handleQuit":
+                            setHandled(args[0], logui.exit() ? Boolean.TRUE : Boolean.FALSE);
+
+                            break;
+                        case "handleAbout":
+                            logui.showAboutBox();
+                            setHandled(args[0], Boolean.TRUE);
+                            break;
                     }
 //                    TODO think about File Open/Save options
                     return null;