1.6移行に伴うインタフェース実装への@Overrideアノテーション対応

diff --git a/src/main/java/jp/sfjp/jindolf/Controller.java b/src/main/java/jp/sfjp/jindolf/Controller.java
index 2d1fc52..27a5be7 100644 (file)
--- a/src/main/java/jp/sfjp/jindolf/Controller.java
+++ b/src/main/java/jp/sfjp/jindolf/Controller.java
@@ -763,9 +763,11 @@ public class Controller
         final VillageDigest digest = villageDigest;
         Executor executor = Executors.newCachedThreadPool();
         executor.execute(new Runnable(){
+            @Override
             public void run(){
                 taskFullOpenAllPeriod();
                 EventQueue.invokeLater(new Runnable(){
+                    @Override
                     public void run(){
                         digest.setVillage(village);
                         digest.setVisible(true);
@@ -865,6 +867,7 @@ public class Controller
     private void bulkSearch(){
         Executor executor = Executors.newCachedThreadPool();
         executor.execute(new Runnable(){
+            @Override
             public void run(){
                 taskBulkSearch();
                 return;
@@ -1022,6 +1025,7 @@ public class Controller
     private void actionLoadAllPeriod(){
         Executor executor = Executors.newCachedThreadPool();
         executor.execute(new Runnable(){
+            @Override
             public void run(){
                 taskLoadAllPeriod();
                 return;
@@ -1135,6 +1139,7 @@ public class Controller
 
         Executor executor = Executors.newCachedThreadPool();
         executor.execute(new Runnable(){
+            @Override
             public void run(){
                 setBusy(true);
                 updateStatusBar("ジャンプ先の読み込み中…");
@@ -1161,6 +1166,7 @@ public class Controller
                     final PeriodView target = browser.getPeriodView(tabIndex);
 
                     EventQueue.invokeLater(new Runnable(){
+                        @Override
                         public void run(){
                             browser.setSelectedIndex(tabIndex);
                             target.setPeriod(targetPeriod);
@@ -1248,6 +1254,7 @@ public class Controller
 
         Executor executor = Executors.newCachedThreadPool();
         executor.execute(new Runnable(){
+            @Override
             public void run(){
                 setBusy(true);
                 try{
@@ -1290,6 +1297,7 @@ public class Controller
                 }
                 try{
                     SwingUtilities.invokeAndWait(new Runnable(){
+                        @Override
                         public void run(){
                             tabBrowser.setVillage(village);
                             return;
@@ -1312,6 +1320,7 @@ public class Controller
                     final int lastPos = periodView.getVerticalPosition();
                     try{
                         SwingUtilities.invokeAndWait(new Runnable(){
+                            @Override
                             public void run(){
                                 periodView.showTopics();
                                 return;
@@ -1327,6 +1336,7 @@ public class Controller
                                 e );
                     }
                     EventQueue.invokeLater(new Runnable(){
+                        @Override
                         public void run(){
                             periodView.setVerticalPosition(lastPos);
                         }
@@ -1472,6 +1482,7 @@ public class Controller
 
             Executor executor = Executors.newCachedThreadPool();
             executor.execute(new Runnable(){
+                @Override
                 public void run(){
                     setBusy(true);
                     updateStatusBar("村情報を読み込み中…");
@@ -1490,6 +1501,7 @@ public class Controller
                     setFrameTitle(village.getVillageFullName());
 
                     EventQueue.invokeLater(new Runnable(){
+                        @Override
                         public void run(){
                             Controller.this.topView.showVillageInfo(village);
                             return;
@@ -1647,6 +1659,7 @@ public class Controller
 
         Executor executor = Executors.newCachedThreadPool();
         executor.execute(new Runnable(){
+            @Override
             public void run(){
                 setBusy(true);
                 updateStatusBar("アンカーの展開中…");
@@ -1667,6 +1680,7 @@ public class Controller
                         return;
                     }
                     EventQueue.invokeLater(new Runnable(){
+                        @Override
                         public void run(){
                             talkDraw.showAnchorTalks(anchor, talkList);
                             discussion.layoutRows();
@@ -1701,6 +1715,7 @@ public class Controller
         this.isBusyNow = isBusy;
 
         Runnable microJob = new Runnable(){
+            @Override
             public void run(){
                 Cursor cursor;
                 if(isBusy){

diff --git a/src/main/java/jp/sfjp/jindolf/JindolfMain.java b/src/main/java/jp/sfjp/jindolf/JindolfMain.java
index 734c88f..de0a526 100644 (file)
--- a/src/main/java/jp/sfjp/jindolf/JindolfMain.java
+++ b/src/main/java/jp/sfjp/jindolf/JindolfMain.java
@@ -144,6 +144,7 @@ public final class JindolfMain {
         if(splashWindow == null) return;
 
         EventQueue.invokeLater(new Runnable(){
+            @Override
             public void run(){
                 splashWindow.setVisible(false);
                 splashWindow.dispose();
@@ -324,6 +325,7 @@ public final class JindolfMain {
         int exitCode = 0;
         try{
             EventQueue.invokeAndWait(new Runnable(){
+                @Override
                 public void run(){
                     startGUI(appSetting);
                     return;

diff --git a/src/main/java/jp/sfjp/jindolf/dxchg/WebButton.java b/src/main/java/jp/sfjp/jindolf/dxchg/WebButton.java
index 1cf72aa..dfeda27 100644 (file)
--- a/src/main/java/jp/sfjp/jindolf/dxchg/WebButton.java
+++ b/src/main/java/jp/sfjp/jindolf/dxchg/WebButton.java
@@ -153,6 +153,7 @@ public class WebButton extends JPanel implements ActionListener{
      * ボタン押下イベントの受信。
      * @param event イベント
      */
+    @Override
     public void actionPerformed(ActionEvent event){
         if(event.getSource() != this.button) return;
 

diff --git a/src/main/java/jp/sfjp/jindolf/dxchg/WebIPCDialog.java b/src/main/java/jp/sfjp/jindolf/dxchg/WebIPCDialog.java
index dc794fb..d803354 100644 (file)
--- a/src/main/java/jp/sfjp/jindolf/dxchg/WebIPCDialog.java
+++ b/src/main/java/jp/sfjp/jindolf/dxchg/WebIPCDialog.java
@@ -271,6 +271,7 @@ public class WebIPCDialog
      * ボタン押下リスナ。
      * @param event ボタン押下イベント
      */
+    @Override
     public void actionPerformed(ActionEvent event){
         Object source = event.getSource();
         if(source == this.browse){

diff --git a/src/main/java/jp/sfjp/jindolf/editor/EditArray.java b/src/main/java/jp/sfjp/jindolf/editor/EditArray.java
index 1500bdb..f04acb7 100644 (file)
--- a/src/main/java/jp/sfjp/jindolf/editor/EditArray.java
+++ b/src/main/java/jp/sfjp/jindolf/editor/EditArray.java
@@ -238,6 +238,7 @@ public class EditArray extends JPanel
         this.onAdjusting = true;
 
         EventQueue.invokeLater(new Runnable(){
+            @Override
             public void run(){
                 try{
                     adjustTask(triggerEditor);

diff --git a/src/main/java/jp/sfjp/jindolf/editor/TalkPreview.java b/src/main/java/jp/sfjp/jindolf/editor/TalkPreview.java
index c95d4a0..9a04c43 100644 (file)
--- a/src/main/java/jp/sfjp/jindolf/editor/TalkPreview.java
+++ b/src/main/java/jp/sfjp/jindolf/editor/TalkPreview.java
@@ -502,6 +502,7 @@ public class TalkPreview extends JFrame
      * アクティブなエディタが変更された時の処理。
      * @param event イベント情報
      */
+    @Override
     public void stateChanged(ChangeEvent event){
         TalkEditor activeEditor = this.editArray.getActiveEditor();
         int seqNo = activeEditor.getSequenceNumber();

diff --git a/src/main/java/jp/sfjp/jindolf/net/ProxyChooser.java b/src/main/java/jp/sfjp/jindolf/net/ProxyChooser.java
index 491c96c..30e758a 100644 (file)
--- a/src/main/java/jp/sfjp/jindolf/net/ProxyChooser.java
+++ b/src/main/java/jp/sfjp/jindolf/net/ProxyChooser.java
@@ -289,6 +289,7 @@ public class ProxyChooser extends JPanel implements ItemListener{
      * プロクシ種別ボタン操作の受信。
      * @param event ボタン操作イベント
      */
+    @Override
     public void itemStateChanged(ItemEvent event){
         Object source = event.getSource();
 

diff --git a/src/main/java/jp/sfjp/jindolf/summary/VillageDigest.java b/src/main/java/jp/sfjp/jindolf/summary/VillageDigest.java
index 800aec2..1a16ede 100644 (file)
--- a/src/main/java/jp/sfjp/jindolf/summary/VillageDigest.java
+++ b/src/main/java/jp/sfjp/jindolf/summary/VillageDigest.java
@@ -647,6 +647,7 @@ public class VillageDigest
      * アクションイベントの振り分け。
      * @param event アクションイベント
      */
+    @Override
     public void actionPerformed(ActionEvent event){
         Object source = event.getSource();
 
@@ -718,6 +719,7 @@ public class VillageDigest
         this.templateArea.setText(wikiText.toString());
         // 最上部へスクロールアップ
         EventQueue.invokeLater(new Runnable(){
+            @Override
             public void run(){
                 templateArea.scrollRectToVisible(new Rectangle());
             }
@@ -814,6 +816,7 @@ public class VillageDigest
      * コンボボックス操作の受信。
      * @param event コンボボックス操作イベント
      */
+    @Override
     public void itemStateChanged(ItemEvent event){
         int state = event.getStateChange();
         if(state != ItemEvent.SELECTED) return;

diff --git a/src/main/java/jp/sfjp/jindolf/util/GUIUtils.java b/src/main/java/jp/sfjp/jindolf/util/GUIUtils.java
index 4ec5f82..87d4526 100644 (file)
--- a/src/main/java/jp/sfjp/jindolf/util/GUIUtils.java
+++ b/src/main/java/jp/sfjp/jindolf/util/GUIUtils.java
@@ -55,6 +55,7 @@ public final class GUIUtils{
 
     private static final Runnable TASK_NOTHING = new Runnable(){
         /** 何もしない。 */
+        @Override
         public void run(){}
     };
 

diff --git a/src/main/java/jp/sfjp/jindolf/util/Monodizer.java b/src/main/java/jp/sfjp/jindolf/util/Monodizer.java
index 2b51337..49f9ea7 100644 (file)
--- a/src/main/java/jp/sfjp/jindolf/util/Monodizer.java
+++ b/src/main/java/jp/sfjp/jindolf/util/Monodizer.java
@@ -149,6 +149,7 @@ public final class Monodizer implements PropertyChangeListener{
      * フォント変更イベントの受信。
      * @param event フォント変更イベント
      */
+    @Override
     public void propertyChange(PropertyChangeEvent event){
         Object source = event.getSource();
         if( ! (source instanceof JComponent) ) return;

diff --git a/src/main/java/jp/sfjp/jindolf/view/DialogPrefPanel.java b/src/main/java/jp/sfjp/jindolf/view/DialogPrefPanel.java
index edba258..37ab262 100644 (file)
--- a/src/main/java/jp/sfjp/jindolf/view/DialogPrefPanel.java
+++ b/src/main/java/jp/sfjp/jindolf/view/DialogPrefPanel.java
@@ -228,6 +228,7 @@ public class DialogPrefPanel
      * デフォルトボタン押下処理。
      * @param event ボタン押下イベント
      */
+    @Override
     public void actionPerformed(ActionEvent event){
         Object source = event.getSource();
         if(source != this.resetDefault) return;
@@ -243,6 +244,7 @@ public class DialogPrefPanel
      * チェックボックス操作の受信。
      * @param event チェックボックス操作イベント
      */
+    @Override
     public void itemStateChanged(ItemEvent event){
         modifyGUIState();
         return;

diff --git a/src/main/java/jp/sfjp/jindolf/view/LandsTree.java b/src/main/java/jp/sfjp/jindolf/view/LandsTree.java
index 911c5d7..117a2e1 100644 (file)
--- a/src/main/java/jp/sfjp/jindolf/view/LandsTree.java
+++ b/src/main/java/jp/sfjp/jindolf/view/LandsTree.java
@@ -185,6 +185,7 @@ public class LandsTree
         }
 
         EventQueue.invokeLater(new Runnable(){
+            @Override
             public void run(){
                 if(lastPath != null){
                     LandsTree.this.treeView.setSelectionPath(lastPath);

diff --git a/src/main/java/jp/sfjp/jindolf/view/LockErrorPane.java b/src/main/java/jp/sfjp/jindolf/view/LockErrorPane.java
index 3ec7a3b..f1ff5cf 100644 (file)
--- a/src/main/java/jp/sfjp/jindolf/view/LockErrorPane.java
+++ b/src/main/java/jp/sfjp/jindolf/view/LockErrorPane.java
@@ -152,6 +152,7 @@ public class LockErrorPane extends JOptionPane implements ActionListener{
                 super.createDialog(parentComponent, title);
 
         ActionListener listener = new ActionListener(){
+            @Override
             public void actionPerformed(ActionEvent event){
                 dialog.setVisible(false);
                 return;
@@ -168,6 +169,7 @@ public class LockErrorPane extends JOptionPane implements ActionListener{
      * ボタン押下を受信する。
      * @param event イベント
      */
+    @Override
     public void actionPerformed(ActionEvent event){
         Object source = event.getSource();
         if(source == this.okButton) this.aborted = false;

diff --git a/src/main/java/jp/sfjp/jindolf/view/OptionPanel.java b/src/main/java/jp/sfjp/jindolf/view/OptionPanel.java
index 864a828..d15fde3 100644 (file)
--- a/src/main/java/jp/sfjp/jindolf/view/OptionPanel.java
+++ b/src/main/java/jp/sfjp/jindolf/view/OptionPanel.java
@@ -166,6 +166,7 @@ public class OptionPanel
      * ボタン押下イベント受信。
      * @param event イベント
      */
+    @Override
     public void actionPerformed(ActionEvent event){
         Object source = event.getSource();
         if     (source == this.okButton    ) actionOk();