You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by ma...@apache.org on 2018/03/10 05:40:17 UTC
[10/14] logging-chainsaw git commit: Use string switch statements
Use string switch statements
Project: http://git-wip-us.apache.org/repos/asf/logging-chainsaw/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-chainsaw/commit/27a76c01
Tree: http://git-wip-us.apache.org/repos/asf/logging-chainsaw/tree/27a76c01
Diff: http://git-wip-us.apache.org/repos/asf/logging-chainsaw/diff/27a76c01
Branch: refs/heads/master
Commit: 27a76c01b75a1e24b6db7f62eb6cfd7e642eb51c
Parents: a65ced6
Author: Matt Sicker <bo...@gmail.com>
Authored: Fri Mar 9 23:09:13 2018 -0600
Committer: Matt Sicker <bo...@gmail.com>
Committed: Fri Mar 9 23:09:13 2018 -0600
----------------------------------------------------------------------
.../log4j/chainsaw/ChainsawTabbedPane.java | 18 +++++++++-------
.../log4j/chainsaw/TableColorizingRenderer.java | 21 ++++++++++---------
.../log4j/chainsaw/osx/OSXIntegration.java | 22 ++++++++++++--------
3 files changed, 35 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/27a76c01/src/main/java/org/apache/log4j/chainsaw/ChainsawTabbedPane.java
----------------------------------------------------------------------
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 @@ class ChainsawTabbedPane extends JTabbedPane implements SettingsListener {
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);
http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/27a76c01/src/main/java/org/apache/log4j/chainsaw/TableColorizingRenderer.java
----------------------------------------------------------------------
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 @@ public class TableColorizingRenderer extends DefaultTableCellRenderer {
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);
http://git-wip-us.apache.org/repos/asf/logging-chainsaw/blob/27a76c01/src/main/java/org/apache/log4j/chainsaw/osx/OSXIntegration.java
----------------------------------------------------------------------
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 @@ public class OSXIntegration {
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;