From 6b2fced807f125ea639b5601235ff59070c54274 Mon Sep 17 00:00:00 2001 From: MoMeak Date: Thu, 31 Aug 2017 10:09:25 +0800 Subject: [PATCH] PMD --- .../com/fr/design/gui/style/BorderPane.java | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/designer_base/src/com/fr/design/gui/style/BorderPane.java b/designer_base/src/com/fr/design/gui/style/BorderPane.java index 1e1a8b935f..ee2445884d 100644 --- a/designer_base/src/com/fr/design/gui/style/BorderPane.java +++ b/designer_base/src/com/fr/design/gui/style/BorderPane.java @@ -27,6 +27,7 @@ import javax.swing.*; import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; import java.awt.*; +import java.util.Arrays; import java.util.HashSet; /** @@ -35,18 +36,7 @@ import java.util.HashSet; */ public class BorderPane extends AbstractBasicStylePane implements GlobalNameObserver { - private static final HashSet BORDERSET = new HashSet() {{ - add("currentLineCombo"); - add("currentLineColorPane"); - add("outerToggleButton"); - add("topToggleButton"); - add("leftToggleButton"); - add("bottomToggleButton"); - add("rightToggleButton"); - add("innerToggleButton"); - add("horizontalToggleButton"); - add("verticalToggleButton"); - }}; + private static String[] BORDERARRAY = {"currentLineCombo", "currentLineColorPane", "outerToggleButton", "topToggleButton", "leftToggleButton", "bottomToggleButton", "rightToggleButton", "innerToggleButton", "horizontalToggleButton", "verticalToggleButton"}; private boolean insideMode = false; private UIToggleButton topToggleButton; @@ -210,8 +200,8 @@ public class BorderPane extends AbstractBasicStylePane implements GlobalNameObse } CellBorderStyle cellBorderStyle = this.update(); - - if (BORDERSET.contains(globalNameListener.getGlobalName())) { + HashSet borderSet = new HashSet(Arrays.asList(BORDERARRAY)); + if (borderSet.contains(globalNameListener.getGlobalName())) { style = style.deriveBorder(cellBorderStyle.getTopStyle(), cellBorderStyle.getTopColor(), cellBorderStyle.getBottomStyle(), cellBorderStyle.getBottomColor(), cellBorderStyle.getLeftStyle(), cellBorderStyle.getLeftColor(), cellBorderStyle.getRightStyle(), cellBorderStyle.getRightColor()); } else {