From 45c43867e99a5860a71e4f82ebfc44a2e5d6f878 Mon Sep 17 00:00:00 2001 From: Olyutorskii Date: Sat, 18 Jun 2016 10:51:45 +0900 Subject: [PATCH 1/1] =?utf8?q?checkstyle=E8=AD=A6=E5=91=8A=E5=AF=BE?= =?utf8?q?=E5=BF=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- src/main/java/jp/sfjp/jindolf/JindolfMain.java | 3 +++ src/main/java/jp/sfjp/jindolf/config/EnvInfo.java | 22 +++++++++++----------- .../java/jp/sfjp/jindolf/config/InterVMLock.java | 1 + src/main/java/jp/sfjp/jindolf/data/Anchor.java | 4 ++-- src/main/java/jp/sfjp/jindolf/data/Talk.java | 4 +++- .../java/jp/sfjp/jindolf/glyph/Discussion.java | 2 +- src/main/java/jp/sfjp/jindolf/glyph/FontEnv.java | 18 ++++++++++++++++++ src/main/java/jp/sfjp/jindolf/view/FindPanel.java | 2 +- src/main/java/jp/sfjp/jindolf/view/PeriodView.java | 2 +- 9 files changed, 41 insertions(+), 17 deletions(-) diff --git a/src/main/java/jp/sfjp/jindolf/JindolfMain.java b/src/main/java/jp/sfjp/jindolf/JindolfMain.java index 3cd5f30..459f85a 100644 --- a/src/main/java/jp/sfjp/jindolf/JindolfMain.java +++ b/src/main/java/jp/sfjp/jindolf/JindolfMain.java @@ -147,6 +147,7 @@ public final class JindolfMain { if(splashWindow == null) return; EventQueue.invokeLater(new Runnable(){ + /** {@inheritDoc} */ @Override public void run(){ splashWindow.setVisible(false); @@ -312,6 +313,7 @@ public final class JindolfMain { final Runtime runtime = Runtime.getRuntime(); runtime.addShutdownHook(new Thread(){ + /** {@inheritDoc} */ @Override @SuppressWarnings("CallToThreadYield") public void run(){ @@ -330,6 +332,7 @@ public final class JindolfMain { int exitCode = 0; try{ EventQueue.invokeAndWait(new Runnable(){ + /** {@inheritDoc} */ @Override public void run(){ startGUI(appSetting); diff --git a/src/main/java/jp/sfjp/jindolf/config/EnvInfo.java b/src/main/java/jp/sfjp/jindolf/config/EnvInfo.java index baf44d2..4d35025 100644 --- a/src/main/java/jp/sfjp/jindolf/config/EnvInfo.java +++ b/src/main/java/jp/sfjp/jindolf/config/EnvInfo.java @@ -32,13 +32,13 @@ public final class EnvInfo{ /** 最大ヒープメモリ。 */ public static final long MAX_MEMORY; - private static final SortedMap propertyMap = + private static final SortedMap PROPERTY_MAP = new TreeMap<>(); - private static final SortedMap environmentMap = + private static final SortedMap ENVIRONMENT_MAP = new TreeMap<>(); - private static final String[] classpaths; + private static final String[] CLASSPATHS; static{ OS_NAME = getSecureProperty("os.name"); @@ -60,7 +60,7 @@ public final class EnvInfo{ }else{ pathVec = new String[0]; } - classpaths = pathVec; + CLASSPATHS = pathVec; } @@ -82,7 +82,7 @@ public final class EnvInfo{ String result; try{ result = System.getProperty(key); - if(result != null) propertyMap.put(key, result); + if(result != null) PROPERTY_MAP.put(key, result); }catch(SecurityException e){ result = null; } @@ -98,7 +98,7 @@ public final class EnvInfo{ String result; try{ result = System.getenv(name); - if(result != null) environmentMap.put(name, result); + if(result != null) ENVIRONMENT_MAP.put(name, result); }catch(SecurityException e){ result = null; } @@ -120,10 +120,10 @@ public final class EnvInfo{ result.append("\n"); result.append("主要システムプロパティ:\n"); - Set propKeys = propertyMap.keySet(); + Set propKeys = PROPERTY_MAP.keySet(); for(String propKey : propKeys){ if(propKey.equals("java.class.path")) continue; - String value = propertyMap.get(propKey); + String value = PROPERTY_MAP.get(propKey); result.append(" "); result.append(propKey).append("=").append(value).append("\n"); } @@ -131,9 +131,9 @@ public final class EnvInfo{ result.append("\n"); result.append("主要環境変数:\n"); - Set envKeys = environmentMap.keySet(); + Set envKeys = ENVIRONMENT_MAP.keySet(); for(String envKey : envKeys){ - String value = environmentMap.get(envKey); + String value = ENVIRONMENT_MAP.get(envKey); result.append(" "); result.append(envKey).append("=").append(value).append("\n"); } @@ -141,7 +141,7 @@ public final class EnvInfo{ result.append("\n"); result.append("クラスパス:\n"); - for(String path : classpaths){ + for(String path : CLASSPATHS){ result.append(" "); result.append(path).append("\n"); } diff --git a/src/main/java/jp/sfjp/jindolf/config/InterVMLock.java b/src/main/java/jp/sfjp/jindolf/config/InterVMLock.java index 2d6fbd6..383d39b 100644 --- a/src/main/java/jp/sfjp/jindolf/config/InterVMLock.java +++ b/src/main/java/jp/sfjp/jindolf/config/InterVMLock.java @@ -38,6 +38,7 @@ public class InterVMLock{ static{ Runtime runtime = Runtime.getRuntime(); runtime.addShutdownHook(new Thread(){ + /** {@inheritDoc} */ @Override public void run(){ shutdown(); diff --git a/src/main/java/jp/sfjp/jindolf/data/Anchor.java b/src/main/java/jp/sfjp/jindolf/data/Anchor.java index 4ac2531..7eb1b9b 100644 --- a/src/main/java/jp/sfjp/jindolf/data/Anchor.java +++ b/src/main/java/jp/sfjp/jindolf/data/Anchor.java @@ -45,8 +45,8 @@ public final class Anchor{ +")" +sp_n +")?"; String hhmm = - "(?:"+ - "(" + "(?:" + +"(" +"([0-2０-２]?[0-9０-９])" +sp_n+ "[:;：；]?" +sp_n +"([0-5０-５][0-9０-９])" diff --git a/src/main/java/jp/sfjp/jindolf/data/Talk.java b/src/main/java/jp/sfjp/jindolf/data/Talk.java index cec80bc..579e8fc 100644 --- a/src/main/java/jp/sfjp/jindolf/data/Talk.java +++ b/src/main/java/jp/sfjp/jindolf/data/Talk.java @@ -83,7 +83,9 @@ public class Talk implements Topic{ case PRIVATE: result = "灰"; break; case WOLFONLY: result = "赤"; break; case GRAVE: result = "青"; break; - default: assert false; return null; + default: + assert false; + return null; } return result; diff --git a/src/main/java/jp/sfjp/jindolf/glyph/Discussion.java b/src/main/java/jp/sfjp/jindolf/glyph/Discussion.java index 2d89b4d..b334052 100644 --- a/src/main/java/jp/sfjp/jindolf/glyph/Discussion.java +++ b/src/main/java/jp/sfjp/jindolf/glyph/Discussion.java @@ -1171,7 +1171,7 @@ public class Discussion extends JComponent return; } - }; + } /** * ポップアップメニュー。 diff --git a/src/main/java/jp/sfjp/jindolf/glyph/FontEnv.java b/src/main/java/jp/sfjp/jindolf/glyph/FontEnv.java index ab64d9a..ddf348b 100644 --- a/src/main/java/jp/sfjp/jindolf/glyph/FontEnv.java +++ b/src/main/java/jp/sfjp/jindolf/glyph/FontEnv.java @@ -245,6 +245,15 @@ public class FontEnv { * フォントリスト収集タスク。 */ protected final class FontListLoader implements Callable> { + + /** + * コンストラクタ。 + */ + private FontListLoader(){ + super(); + return; + } + /** * {@inheritDoc} * @return {@inheritDoc} @@ -269,6 +278,15 @@ public class FontEnv { * フォント選択タスク。 */ protected final class FontSelector implements Callable { + + /** + * コンストラクタ。 + */ + private FontSelector(){ + super(); + return; + } + /** * {@inheritDoc} * @return {@inheritDoc} diff --git a/src/main/java/jp/sfjp/jindolf/view/FindPanel.java b/src/main/java/jp/sfjp/jindolf/view/FindPanel.java index 65e4cca..fbabb65 100644 --- a/src/main/java/jp/sfjp/jindolf/view/FindPanel.java +++ b/src/main/java/jp/sfjp/jindolf/view/FindPanel.java @@ -602,7 +602,7 @@ public class FindPanel extends JDialog /** * コンボボックスの独自データモデル。 */ - private static class CustomModel implements ComboBoxModel{ + private static class CustomModel implements ComboBoxModel { private static final int HISTORY_MAX = 7; private static final RegexPattern INITITEM = diff --git a/src/main/java/jp/sfjp/jindolf/view/PeriodView.java b/src/main/java/jp/sfjp/jindolf/view/PeriodView.java index 107b233..fd44be2 100644 --- a/src/main/java/jp/sfjp/jindolf/view/PeriodView.java +++ b/src/main/java/jp/sfjp/jindolf/view/PeriodView.java @@ -364,7 +364,7 @@ public class PeriodView extends JPanel implements ItemListener{ .append(talk.getAvatar().getName()) .toString(); }else{ - newValue=" "; + newValue = " "; } Component superResult = -- 2.11.0