@Override追加

diff --git a/src/main/java/jp/sourceforge/jindolf/AbstractTextRow.java b/src/main/java/jp/sourceforge/jindolf/AbstractTextRow.java
index f43160e..ef4dc65 100644 (file)
--- a/src/main/java/jp/sourceforge/jindolf/AbstractTextRow.java
+++ b/src/main/java/jp/sourceforge/jindolf/AbstractTextRow.java
@@ -45,6 +45,7 @@ public abstract class AbstractTextRow implements TextRow{
      * @param newWidth {@inheritDoc}\r
      * @return {@inheritDoc}\r
      */\r
+    @Override\r
     public Rectangle setWidth(int newWidth){\r
         this.bounds.width = newWidth;\r
         recalcBounds();\r
@@ -55,6 +56,7 @@ public abstract class AbstractTextRow implements TextRow{
      * {@inheritDoc}\r
      * @return {@inheritDoc}\r
      */\r
+    @Override\r
     public Rectangle getBounds(){\r
         return this.bounds;\r
     }\r
@@ -64,6 +66,7 @@ public abstract class AbstractTextRow implements TextRow{
      * @param xPos {@inheritDoc}\r
      * @param yPos {@inheritDoc}\r
      */\r
+    @Override\r
     public void setPos(int xPos, int yPos){\r
         this.bounds.x = xPos;\r
         this.bounds.y = yPos;\r
@@ -74,6 +77,7 @@ public abstract class AbstractTextRow implements TextRow{
      * {@inheritDoc}\r
      * @return {@inheritDoc}\r
      */\r
+    @Override\r
     public int getWidth(){\r
         return this.bounds.width;\r
     }\r
@@ -82,6 +86,7 @@ public abstract class AbstractTextRow implements TextRow{
      * {@inheritDoc}\r
      * @return {@inheritDoc}\r
      */\r
+    @Override\r
     public int getHeight(){\r
         return this.bounds.height;\r
     }\r
@@ -90,6 +95,7 @@ public abstract class AbstractTextRow implements TextRow{
      * {@inheritDoc}\r
      * @param fontInfo {@inheritDoc}\r
      */\r
+    @Override\r
     public void setFontInfo(FontInfo fontInfo){\r
         this.fontInfo = fontInfo;\r
         return;\r
@@ -99,6 +105,7 @@ public abstract class AbstractTextRow implements TextRow{
      * {@inheritDoc}\r
      * @return {@inheritDoc}\r
      */\r
+    @Override\r
     public boolean isVisible(){\r
         return this.visible;\r
     }\r
@@ -107,6 +114,7 @@ public abstract class AbstractTextRow implements TextRow{
      * {@inheritDoc}\r
      * @param visible {@inheritDoc}\r
      */\r
+    @Override\r
     public void setVisible(boolean visible){\r
         this.visible = visible;\r
         return;\r

diff --git a/src/main/java/jp/sourceforge/jindolf/AccountPanel.java b/src/main/java/jp/sourceforge/jindolf/AccountPanel.java
index 32fd0e4..3f932eb 100644 (file)
--- a/src/main/java/jp/sourceforge/jindolf/AccountPanel.java
+++ b/src/main/java/jp/sourceforge/jindolf/AccountPanel.java
@@ -415,6 +415,7 @@ public class AccountPanel
      * @param event イベント {@inheritDoc}\r
      */\r
     // TODO Return キー押下によるログインもサポートしたい\r
+    @Override\r
     public void actionPerformed(ActionEvent event){\r
         Object source = event.getSource();\r
 \r
@@ -440,6 +441,7 @@ public class AccountPanel
      * コンボボックス操作のリスナ。\r
      * @param event イベント {@inheritDoc}\r
      */\r
+    @Override\r
     public void itemStateChanged(ItemEvent event){\r
         Object source = event.getSource();\r
         if(source != this.landBox) return;\r

diff --git a/src/main/java/jp/sourceforge/jindolf/AnchorDraw.java b/src/main/java/jp/sourceforge/jindolf/AnchorDraw.java
index e78c8f3..949d03c 100644 (file)
--- a/src/main/java/jp/sourceforge/jindolf/AnchorDraw.java
+++ b/src/main/java/jp/sourceforge/jindolf/AnchorDraw.java
@@ -134,6 +134,7 @@ public class AnchorDraw extends AbstractTextRow{
      * {@inheritDoc}\r
      * @return {@inheritDoc}\r
      */\r
+    @Override\r
     public Rectangle recalcBounds(){\r
         int newWidth = getWidth();\r
 \r
@@ -220,6 +221,7 @@ public class AnchorDraw extends AbstractTextRow{
      * @param from {@inheritDoc}\r
      * @param to {@inheritDoc}\r
      */\r
+    @Override\r
     public void drag(Point from, Point to){\r
         this.caption.drag(from, to);\r
         this.dialog.drag(from, to);\r
@@ -232,6 +234,7 @@ public class AnchorDraw extends AbstractTextRow{
      * @return {@inheritDoc}\r
      * @throws java.io.IOException {@inheritDoc}\r
      */\r
+    @Override\r
     public Appendable appendSelected(Appendable appendable)\r
             throws IOException{\r
         this.caption.appendSelected(appendable);\r
@@ -242,6 +245,7 @@ public class AnchorDraw extends AbstractTextRow{
     /**\r
      * {@inheritDoc}\r
      */\r
+    @Override\r
     public void clearSelect(){\r
         this.caption.clearSelect();\r
         this.dialog.clearSelect();\r
@@ -265,6 +269,7 @@ public class AnchorDraw extends AbstractTextRow{
      * {@inheritDoc}\r
      * @param g {@inheritDoc}\r
      */\r
+    @Override\r
     public void paint(Graphics2D g){\r
         final int xPos = this.bounds.x;\r
         final int yPos = this.bounds.y;\r

diff --git a/src/main/java/jp/sourceforge/jindolf/Avatar.java b/src/main/java/jp/sourceforge/jindolf/Avatar.java
index 99d2210..1fa02e9 100644 (file)
--- a/src/main/java/jp/sourceforge/jindolf/Avatar.java
+++ b/src/main/java/jp/sourceforge/jindolf/Avatar.java
@@ -290,6 +290,7 @@ public class Avatar implements Comparable<Avatar> {
      * @param avatar {@inheritDoc}\r
      * @return {@inheritDoc}\r
      */\r
+    @Override\r
     public int compareTo(Avatar avatar){\r
         if(avatar == null) return +1;\r
         return this.idNum - avatar.idNum;\r

diff --git a/src/main/java/jp/sourceforge/jindolf/BalloonBorder.java b/src/main/java/jp/sourceforge/jindolf/BalloonBorder.java
index 4019307..fe89428 100644 (file)
--- a/src/main/java/jp/sourceforge/jindolf/BalloonBorder.java
+++ b/src/main/java/jp/sourceforge/jindolf/BalloonBorder.java
@@ -52,6 +52,7 @@ public class BalloonBorder implements Border{
      * @param comp {@inheritDoc}\r
      * @return {@inheritDoc}\r
      */\r
+    @Override\r
     public Insets getBorderInsets(Component comp){\r
         Insets insets = new Insets(RADIUS, RADIUS, RADIUS, RADIUS);\r
         return insets;\r
@@ -62,6 +63,7 @@ public class BalloonBorder implements Border{
      * 必ずfalseを返す(このBorderは透明)。\r
      * @return {@inheritDoc}\r
      */\r
+    @Override\r
     public boolean isBorderOpaque(){\r
         return false;\r
     }\r
@@ -75,6 +77,7 @@ public class BalloonBorder implements Border{
      * @param width {@inheritDoc}\r
      * @param height {@inheritDoc}\r
      */\r
+    @Override\r
     public void paintBorder(Component comp,\r
                               Graphics g,\r
                               int x, int y,\r

diff --git a/src/main/java/jp/sourceforge/jindolf/ClipboardAction.java b/src/main/java/jp/sourceforge/jindolf/ClipboardAction.java
index d630d06..189fc65 100644 (file)
--- a/src/main/java/jp/sourceforge/jindolf/ClipboardAction.java
+++ b/src/main/java/jp/sourceforge/jindolf/ClipboardAction.java
@@ -112,6 +112,7 @@ public class ClipboardAction extends TextAction{
      * アクションの受信によってクリップボード操作を行う。\r
      * @param event {@inheritDoc}\r
      */\r
+    @Override\r
     public void actionPerformed(ActionEvent event){\r
         JTextComponent textComp = getTextComponent(event);\r
         if(textComp == null) return;\r

diff --git a/src/main/java/jp/sourceforge/jindolf/Controller.java b/src/main/java/jp/sourceforge/jindolf/Controller.java
index ccbd47b..be54b6a 100644 (file)
--- a/src/main/java/jp/sourceforge/jindolf/Controller.java
+++ b/src/main/java/jp/sourceforge/jindolf/Controller.java
@@ -1344,6 +1344,7 @@ public class Controller
      * ツリーリストで何らかの要素（国、村）がクリックされたときの処理。\r
      * @param event イベント {@inheritDoc}\r
      */\r
+    @Override\r
     public void valueChanged(TreeSelectionEvent event){\r
         TreePath path = event.getNewLeadSelectionPath();\r
         if(path == null) return;\r
@@ -1398,6 +1399,7 @@ public class Controller
      * Periodがタブ選択されたときもしくは発言フィルタが操作されたときの処理。\r
      * @param event イベント {@inheritDoc}\r
      */\r
+    @Override\r
     public void stateChanged(ChangeEvent event){\r
         Object source = event.getSource();\r
 \r
@@ -1418,6 +1420,7 @@ public class Controller
      * 主にメニュー選択やボタン押下など。\r
      * @param e イベント {@inheritDoc}\r
      */\r
+    @Override\r
     public void actionPerformed(ActionEvent e){\r
         if(this.isBusyNow) return;\r
 \r
@@ -1485,6 +1488,7 @@ public class Controller
      * 村選択ツリーリストが畳まれるとき呼ばれる。\r
      * @param event ツリーイベント {@inheritDoc}\r
      */\r
+    @Override\r
     public void treeWillCollapse(TreeExpansionEvent event){\r
         return;\r
     }\r
@@ -1494,6 +1498,7 @@ public class Controller
      * 村選択ツリーリストが展開されるとき呼ばれる。\r
      * @param event ツリーイベント {@inheritDoc}\r
      */\r
+    @Override\r
     public void treeWillExpand(TreeExpansionEvent event){\r
         if(!(event.getSource() instanceof JTree)){\r
             return;\r
@@ -1518,6 +1523,7 @@ public class Controller
      * {@inheritDoc}\r
      * @param event {@inheritDoc}\r
      */\r
+    @Override\r
     public void anchorHitted(AnchorHitEvent event){\r
         PeriodView periodView = currentPeriodView();\r
         if(periodView == null) return;\r

diff --git a/src/main/java/jp/sourceforge/jindolf/CsvExporter.java b/src/main/java/jp/sourceforge/jindolf/CsvExporter.java
index 7039bf6..292ba6a 100644 (file)
--- a/src/main/java/jp/sourceforge/jindolf/CsvExporter.java
+++ b/src/main/java/jp/sourceforge/jindolf/CsvExporter.java
@@ -529,6 +529,7 @@ public final class CsvExporter{
          * @param file {@inheritDoc}\r
          * @return {@inheritDoc}\r
          */\r
+        @Override\r
         public boolean accept(File file){\r
             if(file.isDirectory()) return true;\r
             if( ! file.isFile() ) return false;\r
@@ -542,6 +543,7 @@ public final class CsvExporter{
          * {@inheritDoc}\r
          * @return {@inheritDoc}\r
          */\r
+        @Override\r
         public String getDescription(){\r
             return "CSVファイル (*.csv)";\r
         }\r

diff --git a/src/main/java/jp/sourceforge/jindolf/DaySummary.java b/src/main/java/jp/sourceforge/jindolf/DaySummary.java
index 62ee74b..799981b 100644 (file)
--- a/src/main/java/jp/sourceforge/jindolf/DaySummary.java
+++ b/src/main/java/jp/sourceforge/jindolf/DaySummary.java
@@ -309,6 +309,7 @@ public class DaySummary extends JDialog
      * {@inheritDoc}\r
      * @param event {@inheritDoc}\r
      */\r
+    @Override\r
     public void windowActivated(WindowEvent event){\r
         return;\r
     }\r
@@ -317,6 +318,7 @@ public class DaySummary extends JDialog
      * {@inheritDoc}\r
      * @param event {@inheritDoc}\r
      */\r
+    @Override\r
     public void windowDeactivated(WindowEvent event){\r
         return;\r
     }\r
@@ -325,6 +327,7 @@ public class DaySummary extends JDialog
      * {@inheritDoc}\r
      * @param event {@inheritDoc}\r
      */\r
+    @Override\r
     public void windowIconified(WindowEvent event){\r
         return;\r
     }\r
@@ -333,6 +336,7 @@ public class DaySummary extends JDialog
      * {@inheritDoc}\r
      * @param event {@inheritDoc}\r
      */\r
+    @Override\r
     public void windowDeiconified(WindowEvent event){\r
         return;\r
     }\r
@@ -341,6 +345,7 @@ public class DaySummary extends JDialog
      * {@inheritDoc}\r
      * @param event {@inheritDoc}\r
      */\r
+    @Override\r
     public void windowOpened(WindowEvent event){\r
         return;\r
     }\r
@@ -350,6 +355,7 @@ public class DaySummary extends JDialog
      * ダイアログのクローズボタン押下処理を行う。\r
      * @param event ウィンドウ変化イベント {@inheritDoc}\r
      */\r
+    @Override\r
     public void windowClosing(WindowEvent event){\r
         close();\r
         return;\r
@@ -359,6 +365,7 @@ public class DaySummary extends JDialog
      * {@inheritDoc}\r
      * @param event {@inheritDoc}\r
      */\r
+    @Override\r
     public void windowClosed(WindowEvent event){\r
         return;\r
     }\r
@@ -368,6 +375,7 @@ public class DaySummary extends JDialog
      * クローズボタン押下処理。\r
      * @param event イベント {@inheritDoc}\r
      */\r
+    @Override\r
     public void actionPerformed(ActionEvent event){\r
         if(event.getSource() != this.closeButton) return;\r
         close();\r
@@ -379,6 +387,7 @@ public class DaySummary extends JDialog
      * コンボボックス操作処理。\r
      * @param event イベント {@inheritDoc}\r
      */\r
+    @Override\r
     public void itemStateChanged(ItemEvent event){\r
         if(event.getStateChange() != ItemEvent.SELECTED) return;\r
 \r

diff --git a/src/main/java/jp/sourceforge/jindolf/Discussion.java b/src/main/java/jp/sourceforge/jindolf/Discussion.java
index 5f0b852..0a0260f 100644 (file)
--- a/src/main/java/jp/sourceforge/jindolf/Discussion.java
+++ b/src/main/java/jp/sourceforge/jindolf/Discussion.java
@@ -626,6 +626,7 @@ public class Discussion extends JComponent
      * {@inheritDoc}\r
      * @return {@inheritDoc}\r
      */\r
+    @Override\r
     public Dimension getPreferredScrollableViewportSize(){\r
         return getPreferredSize();\r
     }\r
@@ -634,6 +635,7 @@ public class Discussion extends JComponent
      * {@inheritDoc}\r
      * @return {@inheritDoc}\r
      */\r
+    @Override\r
     public boolean getScrollableTracksViewportWidth(){\r
         return true;\r
     }\r
@@ -642,6 +644,7 @@ public class Discussion extends JComponent
      * {@inheritDoc}\r
      * @return {@inheritDoc}\r
      */\r
+    @Override\r
     public boolean getScrollableTracksViewportHeight(){\r
         return false;\r
     }\r
@@ -653,6 +656,7 @@ public class Discussion extends JComponent
      * @param direction {@inheritDoc}\r
      * @return {@inheritDoc}\r
      */\r
+    @Override\r
     public int getScrollableBlockIncrement(Rectangle visibleRect,\r
                                                int orientation,\r
                                                int direction        ){\r
@@ -669,6 +673,7 @@ public class Discussion extends JComponent
      * @param direction {@inheritDoc}\r
      * @return {@inheritDoc}\r
      */\r
+    @Override\r
     public int getScrollableUnitIncrement(Rectangle visibleRect,\r
                                               int orientation,\r
                                               int direction      ){\r
@@ -783,6 +788,7 @@ public class Discussion extends JComponent
      * @param event {@inheritDoc}\r
      */\r
     // TODO 距離判定がシビアすぎ\r
+    @Override\r
     public void mouseClicked(MouseEvent event){\r
         Point pt = event.getPoint();\r
         if(event.getButton() == MouseEvent.BUTTON1){\r
@@ -797,6 +803,7 @@ public class Discussion extends JComponent
      * {@inheritDoc}\r
      * @param event {@inheritDoc}\r
      */\r
+    @Override\r
     public void mouseEntered(MouseEvent event){\r
         // TODO ここでキーボードフォーカス処理が必要？\r
         return;\r
@@ -806,6 +813,7 @@ public class Discussion extends JComponent
      * {@inheritDoc}\r
      * @param event {@inheritDoc}\r
      */\r
+    @Override\r
     public void mouseExited(MouseEvent event){\r
         return;\r
     }\r
@@ -815,6 +823,7 @@ public class Discussion extends JComponent
      * ドラッグ開始処理を行う。\r
      * @param event {@inheritDoc}\r
      */\r
+    @Override\r
     public void mousePressed(MouseEvent event){\r
         requestFocusInWindow();\r
 \r
@@ -831,6 +840,7 @@ public class Discussion extends JComponent
      * ドラッグ終了処理を行う。\r
      * @param event {@inheritDoc}\r
      */\r
+    @Override\r
     public void mouseReleased(MouseEvent event){\r
         if(event.getButton() == MouseEvent.BUTTON1){\r
             this.dragFrom = null;\r
@@ -844,6 +854,7 @@ public class Discussion extends JComponent
      * @param event {@inheritDoc}\r
      */\r
     // TODO ドラッグ範囲がビューポートを超えたら自動的にスクロールしてほしい。\r
+    @Override\r
     public void mouseDragged(MouseEvent event){\r
         if(this.dragFrom == null) return;\r
         Point dragTo = event.getPoint();\r
@@ -855,6 +866,7 @@ public class Discussion extends JComponent
      * {@inheritDoc}\r
      * @param event {@inheritDoc}\r
      */\r
+    @Override\r
     public void mouseMoved(MouseEvent event){\r
         return;\r
     }\r
@@ -863,6 +875,7 @@ public class Discussion extends JComponent
      * {@inheritDoc}\r
      * @param event {@inheritDoc}\r
      */\r
+    @Override\r
     public void componentShown(ComponentEvent event){\r
         return;\r
     }\r
@@ -871,6 +884,7 @@ public class Discussion extends JComponent
      * {@inheritDoc}\r
      * @param event {@inheritDoc}\r
      */\r
+    @Override\r
     public void componentHidden(ComponentEvent event){\r
         return;\r
     }\r
@@ -879,6 +893,7 @@ public class Discussion extends JComponent
      * {@inheritDoc}\r
      * @param event {@inheritDoc}\r
      */\r
+    @Override\r
     public void componentMoved(ComponentEvent event){\r
         return;\r
     }\r
@@ -887,6 +902,7 @@ public class Discussion extends JComponent
      * {@inheritDoc}\r
      * @param event {@inheritDoc}\r
      */\r
+    @Override\r
     public void componentResized(ComponentEvent event){\r
         int width  = getWidth();\r
         int height = getHeight();\r
@@ -1123,6 +1139,7 @@ public class Discussion extends JComponent
          * {@inheritDoc}\r
          * @param event {@inheritDoc}\r
          */\r
+        @Override\r
         public void actionPerformed(ActionEvent event){\r
             Object source  = event.getSource();\r
             int id         = event.getID();\r

diff --git a/src/main/java/jp/sourceforge/jindolf/EditArray.java b/src/main/java/jp/sourceforge/jindolf/EditArray.java
index 400ce12..386c2c9 100644 (file)
--- a/src/main/java/jp/sourceforge/jindolf/EditArray.java
+++ b/src/main/java/jp/sourceforge/jindolf/EditArray.java
@@ -550,6 +550,7 @@ public class EditArray extends JPanel
      * エディタのフォーカス取得とともにアクティブ状態にする。\r
      * @param event {@inheritDoc}\r
      */\r
+    @Override\r
     public void focusGained(FocusEvent event){\r
         Object source = event.getSource();\r
         if( ! (source instanceof JTextComponent) ) return;\r
@@ -567,6 +568,7 @@ public class EditArray extends JPanel
      * {@inheritDoc}\r
      * @param event {@inheritDoc}\r
      */\r
+    @Override\r
     public void focusLost(FocusEvent event){\r
         // NOTHING\r
         return;\r
@@ -576,6 +578,7 @@ public class EditArray extends JPanel
      * {@inheritDoc}\r
      * @return {@inheritDoc}\r
      */\r
+    @Override\r
     public Dimension getPreferredScrollableViewportSize(){\r
         Dimension result = getPreferredSize();\r
         return result;\r
@@ -586,6 +589,7 @@ public class EditArray extends JPanel
      * 横スクロールバーを極力出さないようレイアウトでがんばる。\r
      * @return {@inheritDoc}\r
      */\r
+    @Override\r
     public boolean getScrollableTracksViewportWidth(){\r
         return true;\r
     }\r
@@ -595,6 +599,7 @@ public class EditArray extends JPanel
      * 縦スクロールバーを出しても良いのでレイアウトでがんばらない。\r
      * @return {@inheritDoc}\r
      */\r
+    @Override\r
     public boolean getScrollableTracksViewportHeight(){\r
         return false;\r
     }\r
@@ -606,6 +611,7 @@ public class EditArray extends JPanel
      * @param direction {@inheritDoc}\r
      * @return {@inheritDoc}\r
      */\r
+    @Override\r
     public int getScrollableBlockIncrement(Rectangle visibleRect,\r
                                            int orientation,\r
                                            int direction ){\r
@@ -622,6 +628,7 @@ public class EditArray extends JPanel
      * @param direction {@inheritDoc}\r
      * @return {@inheritDoc}\r
      */\r
+    @Override\r
     public int getScrollableUnitIncrement(Rectangle visibleRect,\r
                                           int orientation,\r
                                           int direction ){\r
@@ -703,6 +710,7 @@ public class EditArray extends JPanel
          * {@inheritDoc}\r
          * @param event {@inheritDoc}\r
          */\r
+        @Override\r
         public void changedUpdate(DocumentEvent event){\r
             detachAdjustTask(event);\r
             return;\r
@@ -712,6 +720,7 @@ public class EditArray extends JPanel
          * {@inheritDoc}\r
          * @param event {@inheritDoc}\r
          */\r
+        @Override\r
         public void insertUpdate(DocumentEvent event){\r
             detachAdjustTask(event);\r
             return;\r
@@ -721,6 +730,7 @@ public class EditArray extends JPanel
          * {@inheritDoc}\r
          * @param event {@inheritDoc}\r
          */\r
+        @Override\r
         public void removeUpdate(DocumentEvent event){\r
             detachAdjustTask(event);\r
             return;\r

diff --git a/src/main/java/jp/sourceforge/jindolf/FilterPanel.java b/src/main/java/jp/sourceforge/jindolf/FilterPanel.java
index 632ed7f..5351f40 100644 (file)
--- a/src/main/java/jp/sourceforge/jindolf/FilterPanel.java
+++ b/src/main/java/jp/sourceforge/jindolf/FilterPanel.java
@@ -342,6 +342,7 @@ public class FilterPanel extends JDialog
      * {@inheritDoc}\r
      * @param event イベント\r
      */\r
+    @Override\r
     public void actionPerformed(ActionEvent event){\r
         Object source = event.getSource();\r
 \r
@@ -403,6 +404,7 @@ public class FilterPanel extends JDialog
      * @param topic {@inheritDoc}\r
      * @return {@inheritDoc}\r
      */\r
+    @Override\r
     public boolean isFiltered(Topic topic){\r
         Talk talk;\r
         if(topic instanceof Talk){\r
@@ -456,6 +458,7 @@ public class FilterPanel extends JDialog
      * {@inheritDoc}\r
      * @return {@inheritDoc}\r
      */\r
+    @Override\r
     public FilterContext getFilterContext(){\r
         return new FilterPanelContext();\r
     }\r
@@ -465,6 +468,7 @@ public class FilterPanel extends JDialog
      * @param context {@inheritDoc}\r
      * @return {@inheritDoc}\r
      */\r
+    @Override\r
     public boolean isSame(FilterContext context){\r
         if(context == null) return false;\r
         if( ! (context instanceof FilterPanelContext) ) return false;\r

diff --git a/src/main/java/jp/sourceforge/jindolf/FindPanel.java b/src/main/java/jp/sourceforge/jindolf/FindPanel.java
index e81588e..e702e5e 100644 (file)
--- a/src/main/java/jp/sourceforge/jindolf/FindPanel.java
+++ b/src/main/java/jp/sourceforge/jindolf/FindPanel.java
@@ -383,6 +383,7 @@ public class FindPanel extends JDialog
      * ボタン操作時にリスナとして呼ばれる。\r
      * @param event イベント {@inheritDoc}\r
      */\r
+    @Override\r
     public void actionPerformed(ActionEvent event){\r
         Object source = event.getSource();\r
         if(source == this.closeButton){\r
@@ -401,6 +402,7 @@ public class FindPanel extends JDialog
      * コンボボックスのアイテム選択リスナ。\r
      * @param event アイテム選択イベント {@inheritDoc}\r
      */\r
+    @Override\r
     public void itemStateChanged(ItemEvent event){\r
         int stateChange = event.getStateChange();\r
         if(stateChange != ItemEvent.SELECTED) return;\r
@@ -419,6 +421,7 @@ public class FindPanel extends JDialog
      * チェックボックス操作のリスナ。\r
      * @param event チェックボックス操作イベント {@inheritDoc}\r
      */\r
+    @Override\r
     public void stateChanged(ChangeEvent event){\r
         if(event.getSource() != this.regexSwitch) return;\r
         maskRegexUI();\r
@@ -440,6 +443,7 @@ public class FindPanel extends JDialog
      * コンボボックスのUI変更通知を受け取るリスナ。\r
      * @param event UI差し替えイベント {@inheritDoc}\r
      */\r
+    @Override\r
     public void propertyChange(PropertyChangeEvent event){\r
         if( ! event.getPropertyName().equals("UI") ) return;\r
         if(event.getSource() != this.findBox) return;\r
@@ -637,6 +641,7 @@ public class FindPanel extends JDialog
          * {@inheritDoc}\r
          * @return {@inheritDoc}\r
          */\r
+        @Override\r
         public Object getSelectedItem(){\r
             return this.selected;\r
         }\r
@@ -645,6 +650,7 @@ public class FindPanel extends JDialog
          * {@inheritDoc}\r
          * @param item {@inheritDoc}\r
          */\r
+        @Override\r
         public void setSelectedItem(Object item){\r
             if(item instanceof JSeparator) return;\r
             this.selected = item;\r
@@ -656,6 +662,7 @@ public class FindPanel extends JDialog
          * @param index {@inheritDoc}\r
          * @return {@inheritDoc}\r
          */\r
+        @Override\r
         public Object getElementAt(int index){\r
             int historySize = this.history.size();\r
 \r
@@ -685,6 +692,7 @@ public class FindPanel extends JDialog
          * {@inheritDoc}\r
          * @return {@inheritDoc}\r
          */\r
+        @Override\r
         public int getSize(){\r
             int size = 1;\r
             size += 1;         // first separator\r
@@ -698,6 +706,7 @@ public class FindPanel extends JDialog
          * {@inheritDoc}\r
          * @param listener {@inheritDoc}\r
          */\r
+        @Override\r
         public void addListDataListener(ListDataListener listener){\r
             this.listenerList.add(ListDataListener.class, listener);\r
             return;\r
@@ -707,6 +716,7 @@ public class FindPanel extends JDialog
          * {@inheritDoc}\r
          * @param listener {@inheritDoc}\r
          */\r
+        @Override\r
         public void removeListDataListener(ListDataListener listener){\r
             this.listenerList.remove(ListDataListener.class, listener);\r
             return;\r

diff --git a/src/main/java/jp/sourceforge/jindolf/FontChooser.java b/src/main/java/jp/sourceforge/jindolf/FontChooser.java
index bd75378..0d46279 100644 (file)
--- a/src/main/java/jp/sourceforge/jindolf/FontChooser.java
+++ b/src/main/java/jp/sourceforge/jindolf/FontChooser.java
@@ -431,6 +431,7 @@ public class FontChooser extends JPanel
      * チェックボックス操作のリスナ。\r
      * @param event 操作イベント {@inheritDoc}\r
      */\r
+    @Override\r
     public void itemStateChanged(ItemEvent event){\r
         if(this.maskListener) return;\r
 \r
@@ -517,6 +518,7 @@ public class FontChooser extends JPanel
      * ボタン操作及びフォントサイズ指定コンボボックス操作のリスナ。\r
      * @param event 操作イベント {@inheritDoc}\r
      */\r
+    @Override\r
     public void actionPerformed(ActionEvent event){\r
         if(this.maskListener) return;\r
 \r
@@ -538,6 +540,7 @@ public class FontChooser extends JPanel
      * フォントファミリリスト選択操作のリスナ。\r
      * @param event 操作イベント {@inheritDoc}\r
      */\r
+    @Override\r
     public void valueChanged(ListSelectionEvent event){\r
         if(this.maskListener) return;\r
 \r

diff --git a/src/main/java/jp/sourceforge/jindolf/GameSummary.java b/src/main/java/jp/sourceforge/jindolf/GameSummary.java
index 19dc2c7..7e8e45c 100644 (file)
--- a/src/main/java/jp/sourceforge/jindolf/GameSummary.java
+++ b/src/main/java/jp/sourceforge/jindolf/GameSummary.java
@@ -1040,6 +1040,7 @@ public class GameSummary{
          * @param p2 {@inheritDoc}\r
          * @return {@inheritDoc}\r
          */\r
+        @Override\r
         public int compare(Player p1, Player p2){\r
             if(p1 == p2) return 0;\r
             if(p1 == null) return -1;\r

diff --git a/src/main/java/jp/sourceforge/jindolf/GlyphDraw.java b/src/main/java/jp/sourceforge/jindolf/GlyphDraw.java
index cdbcdca..4c76cf1 100644 (file)
--- a/src/main/java/jp/sourceforge/jindolf/GlyphDraw.java
+++ b/src/main/java/jp/sourceforge/jindolf/GlyphDraw.java
@@ -132,6 +132,7 @@ public class GlyphDraw extends AbstractTextRow implements SwingConstants{
      * @return {@inheritDoc}\r
      */\r
     // TODO 最後が \n で終わるダイアログが無限再帰を起こす？\r
+    @Override\r
     public Rectangle recalcBounds(){\r
         float newWidth = (float) getWidth();\r
         this.lines.clear();\r
@@ -246,6 +247,7 @@ public class GlyphDraw extends AbstractTextRow implements SwingConstants{
      * @return {@inheritDoc}\r
      * @throws java.io.IOException {@inheritDoc}\r
      */\r
+    @Override\r
     public Appendable appendSelected(Appendable appendable)\r
             throws IOException{\r
         if(this.selectStart < 0 || this.selectLast < 0) return appendable;\r
@@ -259,6 +261,7 @@ public class GlyphDraw extends AbstractTextRow implements SwingConstants{
     /**\r
      * {@inheritDoc}\r
      */\r
+    @Override\r
     public void clearSelect(){\r
         this.selectStart = -1;\r
         this.selectLast  = -1;\r
@@ -288,6 +291,7 @@ public class GlyphDraw extends AbstractTextRow implements SwingConstants{
      * @param from {@inheritDoc}\r
      * @param to {@inheritDoc}\r
      */\r
+    @Override\r
     public void drag(Point from, Point to){\r
         Point fromPt = from;\r
         Point toPt = to;\r
@@ -545,6 +549,7 @@ public class GlyphDraw extends AbstractTextRow implements SwingConstants{
      * {@inheritDoc}\r
      * @param g {@inheritDoc}\r
      */\r
+    @Override\r
     public void paint(Graphics2D g){\r
         g.setFont(this.fontInfo.getFont());\r
         FontMetrics metrics = g.getFontMetrics();\r

diff --git a/src/main/java/jp/sourceforge/jindolf/HelpFrame.java b/src/main/java/jp/sourceforge/jindolf/HelpFrame.java
index 2bd84df..93c42b2 100644 (file)
--- a/src/main/java/jp/sourceforge/jindolf/HelpFrame.java
+++ b/src/main/java/jp/sourceforge/jindolf/HelpFrame.java
@@ -158,6 +158,7 @@ public class HelpFrame extends JFrame
      * 閉じるボタン押下処理。\r
      * @param event ボタン押下イベント {@inheritDoc}\r
      */\r
+    @Override\r
     public void actionPerformed(ActionEvent event){\r
         if(event.getSource() != this.closeButton) return;\r
         close();\r
@@ -169,6 +170,7 @@ public class HelpFrame extends JFrame
      * リンククリック処理。\r
      * @param event リンククリックイベント {@inheritDoc}\r
      */\r
+    @Override\r
     public void hyperlinkUpdate(HyperlinkEvent event){\r
         if(event.getEventType() != HyperlinkEvent.EventType.ACTIVATED){\r
             return;\r

diff --git a/src/main/java/jp/sourceforge/jindolf/HtmlSequence.java b/src/main/java/jp/sourceforge/jindolf/HtmlSequence.java
index 24da97f..8d62782 100644 (file)
--- a/src/main/java/jp/sourceforge/jindolf/HtmlSequence.java
+++ b/src/main/java/jp/sourceforge/jindolf/HtmlSequence.java
@@ -70,6 +70,7 @@ public class HtmlSequence implements CharSequence{
      * @param index {@inheritDoc}\r
      * @return {@inheritDoc}\r
      */\r
+    @Override\r
     public char charAt(int index){\r
         return this.html.charAt(index);\r
     }\r
@@ -78,6 +79,7 @@ public class HtmlSequence implements CharSequence{
      * {@inheritDoc}\r
      * @return {@inheritDoc}\r
      */\r
+    @Override\r
     public int length(){\r
         return this.html.length();\r
     }\r
@@ -88,6 +90,7 @@ public class HtmlSequence implements CharSequence{
      * @param end {@inheritDoc}\r
      * @return {@inheritDoc}\r
      */\r
+    @Override\r
     public CharSequence subSequence(int start, int end){\r
         return this.html.subSequence(start, end);\r
     }\r

diff --git a/src/main/java/jp/sourceforge/jindolf/LandsModel.java b/src/main/java/jp/sourceforge/jindolf/LandsModel.java
index c7a8801..46f64b6 100644 (file)
--- a/src/main/java/jp/sourceforge/jindolf/LandsModel.java
+++ b/src/main/java/jp/sourceforge/jindolf/LandsModel.java
@@ -278,6 +278,7 @@ public class LandsModel implements TreeModel{ // ComboBoxModelも付けるか？
      * {@inheritDoc}\r
      * @param l {@inheritDoc}\r
      */\r
+    @Override\r
     public void addTreeModelListener(TreeModelListener l){\r
         this.listeners.add(TreeModelListener.class, l);\r
         return;\r
@@ -287,6 +288,7 @@ public class LandsModel implements TreeModel{ // ComboBoxModelも付けるか？
      * {@inheritDoc}\r
      * @param l {@inheritDoc}\r
      */\r
+    @Override\r
     public void removeTreeModelListener(TreeModelListener l){\r
         this.listeners.remove(TreeModelListener.class, l);\r
         return;\r
@@ -325,6 +327,7 @@ public class LandsModel implements TreeModel{ // ComboBoxModelも付けるか？
      * @param index {@inheritDoc}\r
      * @return {@inheritDoc}\r
      */\r
+    @Override\r
     public Object getChild(Object parent, int index){\r
         if(index < 0)                      return null;\r
         if(index >= getChildCount(parent)) return null;\r
@@ -361,6 +364,7 @@ public class LandsModel implements TreeModel{ // ComboBoxModelも付けるか？
      * @param parent {@inheritDoc}\r
      * @return {@inheritDoc}\r
      */\r
+    @Override\r
     public int getChildCount(Object parent){\r
         if(parent == ROOT){\r
             return getLandList().size();\r
@@ -384,6 +388,7 @@ public class LandsModel implements TreeModel{ // ComboBoxModelも付けるか？
      * @param child {@inheritDoc}\r
      * @return {@inheritDoc}\r
      */\r
+    @Override\r
     public int getIndexOfChild(Object parent, Object child){\r
         if(child == null) return -1;\r
         if(parent == ROOT){\r
@@ -414,6 +419,7 @@ public class LandsModel implements TreeModel{ // ComboBoxModelも付けるか？
      * {@inheritDoc}\r
      * @return {@inheritDoc}\r
      */\r
+    @Override\r
     public Object getRoot(){\r
         return ROOT;\r
     }\r
@@ -423,6 +429,7 @@ public class LandsModel implements TreeModel{ // ComboBoxModelも付けるか？
      * @param node {@inheritDoc}\r
      * @return {@inheritDoc}\r
      */\r
+    @Override\r
     public boolean isLeaf(Object node){\r
         if(node == ROOT)                   return false;\r
         if(node instanceof Land)           return false;\r
@@ -437,6 +444,7 @@ public class LandsModel implements TreeModel{ // ComboBoxModelも付けるか？
      * @param path {@inheritDoc}\r
      * @param newValue {@inheritDoc}\r
      */\r
+    @Override\r
     public void valueForPathChanged(TreePath path, Object newValue){\r
         throw new UnsupportedOperationException("Not supported yet.");\r
     }\r

diff --git a/src/main/java/jp/sourceforge/jindolf/LandsTree.java b/src/main/java/jp/sourceforge/jindolf/LandsTree.java
index 89ca7d2..e613768 100644 (file)
--- a/src/main/java/jp/sourceforge/jindolf/LandsTree.java
+++ b/src/main/java/jp/sourceforge/jindolf/LandsTree.java
@@ -200,6 +200,7 @@ public class LandsTree
      * ボタン押下処理。\r
      * @param event ボタン押下イベント {@inheritDoc}\r
      */\r
+    @Override\r
     public void actionPerformed(ActionEvent event){\r
         String cmd = event.getActionCommand();\r
         if(ActionManager.CMD_SWITCHORDER.equals(cmd)){\r
@@ -213,6 +214,7 @@ public class LandsTree
      * ツリーリストで何らかの要素（国、村）がクリックされたときの処理。\r
      * @param event イベント {@inheritDoc}\r
      */\r
+    @Override\r
     public void valueChanged(TreeSelectionEvent event){\r
         TreePath path = event.getNewLeadSelectionPath();\r
         if(path == null){\r

diff --git a/src/main/java/jp/sourceforge/jindolf/LogFrame.java b/src/main/java/jp/sourceforge/jindolf/LogFrame.java
index 811983e..c50d311 100644 (file)
--- a/src/main/java/jp/sourceforge/jindolf/LogFrame.java
+++ b/src/main/java/jp/sourceforge/jindolf/LogFrame.java
@@ -273,6 +273,7 @@ public class LogFrame extends JDialog
      * {@inheritDoc}\r
      * @param event {@inheritDoc}\r
      */\r
+    @Override\r
     public void windowActivated(WindowEvent event){\r
         return;\r
     }\r
@@ -281,6 +282,7 @@ public class LogFrame extends JDialog
      * {@inheritDoc}\r
      * @param event {@inheritDoc}\r
      */\r
+    @Override\r
     public void windowDeactivated(WindowEvent event){\r
         return;\r
     }\r
@@ -289,6 +291,7 @@ public class LogFrame extends JDialog
      * {@inheritDoc}\r
      * @param event {@inheritDoc}\r
      */\r
+    @Override\r
     public void windowIconified(WindowEvent event){\r
         this.textarea.setDocument(DOC_EMPTY);\r
         return;\r
@@ -298,6 +301,7 @@ public class LogFrame extends JDialog
      * {@inheritDoc}\r
      * @param event {@inheritDoc}\r
      */\r
+    @Override\r
     public void windowDeiconified(WindowEvent event){\r
         this.textarea.setDocument(this.document);\r
         showLastPos();\r
@@ -308,6 +312,7 @@ public class LogFrame extends JDialog
      * {@inheritDoc}\r
      * @param event {@inheritDoc}\r
      */\r
+    @Override\r
     public void windowOpened(WindowEvent event){\r
         this.textarea.setDocument(this.document);\r
         showLastPos();\r
@@ -318,6 +323,7 @@ public class LogFrame extends JDialog
      * {@inheritDoc}\r
      * @param event {@inheritDoc}\r
      */\r
+    @Override\r
     public void windowClosed(WindowEvent event){\r
         return;\r
     }\r
@@ -326,6 +332,7 @@ public class LogFrame extends JDialog
      * {@inheritDoc}\r
      * @param event {@inheritDoc}\r
      */\r
+    @Override\r
     public void windowClosing(WindowEvent event){\r
         close();\r
         return;\r
@@ -335,6 +342,7 @@ public class LogFrame extends JDialog
      * {@inheritDoc}\r
      * @param event {@inheritDoc}\r
      */\r
+    @Override\r
     public void actionPerformed(ActionEvent event){\r
         Object source = event.getSource();\r
         if(source == this.clearButton){\r

diff --git a/src/main/java/jp/sourceforge/jindolf/OptionPanel.java b/src/main/java/jp/sourceforge/jindolf/OptionPanel.java
index 2cc10bb..6282cc8 100644 (file)
--- a/src/main/java/jp/sourceforge/jindolf/OptionPanel.java
+++ b/src/main/java/jp/sourceforge/jindolf/OptionPanel.java
@@ -174,6 +174,7 @@ public class OptionPanel
      * {@inheritDoc}\r
      * @param event {@inheritDoc}\r
      */\r
+    @Override\r
     public void windowOpened(WindowEvent event){\r
         return;\r
     }\r
@@ -184,6 +185,7 @@ public class OptionPanel
      * キャンセルボタン押下時と同じ。\r
      * @param event {@inheritDoc}\r
      */\r
+    @Override\r
     public void windowClosing(WindowEvent event){\r
         actionCancel();\r
         return;\r
@@ -193,6 +195,7 @@ public class OptionPanel
      * {@inheritDoc}\r
      * @param event {@inheritDoc}\r
      */\r
+    @Override\r
     public void windowClosed(WindowEvent event){\r
         return;\r
     }\r
@@ -201,6 +204,7 @@ public class OptionPanel
      * {@inheritDoc}\r
      * @param event {@inheritDoc}\r
      */\r
+    @Override\r
     public void windowActivated(WindowEvent event){\r
         return;\r
     }\r
@@ -209,6 +213,7 @@ public class OptionPanel
      * {@inheritDoc}\r
      * @param event {@inheritDoc}\r
      */\r
+    @Override\r
     public void windowDeactivated(WindowEvent event){\r
         return;\r
     }\r
@@ -217,6 +222,7 @@ public class OptionPanel
      * {@inheritDoc}\r
      * @param event {@inheritDoc}\r
      */\r
+    @Override\r
     public void windowIconified(WindowEvent event){\r
         return;\r
     }\r
@@ -225,6 +231,7 @@ public class OptionPanel
      * {@inheritDoc}\r
      * @param event {@inheritDoc}\r
      */\r
+    @Override\r
     public void windowDeiconified(WindowEvent event){\r
         return;\r
     }\r

diff --git a/src/main/java/jp/sourceforge/jindolf/PeriodView.java b/src/main/java/jp/sourceforge/jindolf/PeriodView.java
index 829df27..3a9a7e8 100644 (file)
--- a/src/main/java/jp/sourceforge/jindolf/PeriodView.java
+++ b/src/main/java/jp/sourceforge/jindolf/PeriodView.java
@@ -282,6 +282,7 @@ public class PeriodView extends JPanel implements ItemListener{
      * コンボボックス操作のリスナ。\r
      * @param event コンボボックス操作イベント {@inheritDoc}\r
      */\r
+    @Override\r
     public void itemStateChanged(ItemEvent event){\r
         if(event.getStateChange() != ItemEvent.SELECTED) return;\r
 \r

diff --git a/src/main/java/jp/sourceforge/jindolf/SequenceCharacterIterator.java b/src/main/java/jp/sourceforge/jindolf/SequenceCharacterIterator.java
index 764d0dd..00ab16e 100644 (file)
--- a/src/main/java/jp/sourceforge/jindolf/SequenceCharacterIterator.java
+++ b/src/main/java/jp/sourceforge/jindolf/SequenceCharacterIterator.java
@@ -66,6 +66,7 @@ public class SequenceCharacterIterator
      * {@inheritDoc}\r
      * @return {@inheritDoc}\r
      */\r
+    @Override\r
     public char first(){\r
         this.cursorPos = this.cursorBegin;\r
         return current();\r
@@ -75,6 +76,7 @@ public class SequenceCharacterIterator
      * {@inheritDoc}\r
      * @return {@inheritDoc}\r
      */\r
+    @Override\r
     public char last(){\r
         this.cursorPos = this.cursorEnd - 1;\r
         return current();\r
@@ -84,6 +86,7 @@ public class SequenceCharacterIterator
      * {@inheritDoc}\r
      * @return {@inheritDoc}\r
      */\r
+    @Override\r
     public char current(){\r
         if(this.cursorLength <= 0 || this.cursorPos < this.cursorBegin){\r
             this.cursorPos = this.cursorBegin;\r
@@ -100,6 +103,7 @@ public class SequenceCharacterIterator
      * {@inheritDoc}\r
      * @return {@inheritDoc}\r
      */\r
+    @Override\r
     public char next(){\r
         this.cursorPos++;\r
         return current();\r
@@ -109,6 +113,7 @@ public class SequenceCharacterIterator
      * {@inheritDoc}\r
      * @return {@inheritDoc}\r
      */\r
+    @Override\r
     public char previous(){\r
         this.cursorPos--;\r
         return current();\r
@@ -120,6 +125,7 @@ public class SequenceCharacterIterator
      * @return {@inheritDoc}\r
      * @throws java.lang.IllegalArgumentException {@inheritDoc}\r
      */\r
+    @Override\r
     public char setIndex(int newPos) throws IllegalArgumentException{\r
         if(newPos < this.cursorBegin || this.cursorEnd < newPos){\r
             throw new IllegalArgumentException();\r
@@ -132,6 +138,7 @@ public class SequenceCharacterIterator
      * {@inheritDoc}\r
      * @return {@inheritDoc}\r
      */\r
+    @Override\r
     public int getBeginIndex(){\r
         return this.cursorBegin;\r
     }\r
@@ -140,6 +147,7 @@ public class SequenceCharacterIterator
      * {@inheritDoc}\r
      * @return {@inheritDoc}\r
      */\r
+    @Override\r
     public int getEndIndex(){\r
         return this.cursorEnd;\r
     }\r
@@ -148,6 +156,7 @@ public class SequenceCharacterIterator
      * {@inheritDoc}\r
      * @return {@inheritDoc}\r
      */\r
+    @Override\r
     public int getIndex(){\r
         return this.cursorPos;\r
     }\r

diff --git a/src/main/java/jp/sourceforge/jindolf/SysEventDraw.java b/src/main/java/jp/sourceforge/jindolf/SysEventDraw.java
index 0f3d56d..639baf6 100644 (file)
--- a/src/main/java/jp/sourceforge/jindolf/SysEventDraw.java
+++ b/src/main/java/jp/sourceforge/jindolf/SysEventDraw.java
@@ -120,6 +120,7 @@ public class SysEventDraw extends AbstractTextRow{
      * {@inheritDoc}\r
      * @return {@inheritDoc}\r
      */\r
+    @Override\r
     public Rectangle recalcBounds(){\r
         int newWidth = getWidth();\r
 \r
@@ -160,6 +161,7 @@ public class SysEventDraw extends AbstractTextRow{
      * @param from {@inheritDoc}\r
      * @param to {@inheritDoc}\r
      */\r
+    @Override\r
     public void drag(Point from, Point to){\r
         this.sysMessage.drag(from, to);\r
         return;\r
@@ -171,6 +173,7 @@ public class SysEventDraw extends AbstractTextRow{
      * @return {@inheritDoc}\r
      * @throws java.io.IOException {@inheritDoc}\r
      */\r
+    @Override\r
     public Appendable appendSelected(Appendable appendable)\r
             throws IOException{\r
         this.sysMessage.appendSelected(appendable);\r
@@ -180,6 +183,7 @@ public class SysEventDraw extends AbstractTextRow{
     /**\r
      * {@inheritDoc}\r
      */\r
+    @Override\r
     public void clearSelect(){\r
         this.sysMessage.clearSelect();\r
         return;\r
@@ -201,6 +205,7 @@ public class SysEventDraw extends AbstractTextRow{
      * {@inheritDoc}\r
      * @param g {@inheritDoc}\r
      */\r
+    @Override\r
     public void paint(Graphics2D g){\r
         g.setColor(this.fgColor);\r
 \r

diff --git a/src/main/java/jp/sourceforge/jindolf/TalkDraw.java b/src/main/java/jp/sourceforge/jindolf/TalkDraw.java
index 2befecf..e5992d8 100644 (file)
--- a/src/main/java/jp/sourceforge/jindolf/TalkDraw.java
+++ b/src/main/java/jp/sourceforge/jindolf/TalkDraw.java
@@ -345,6 +345,7 @@ public class TalkDraw extends AbstractTextRow{
      * {@inheritDoc}\r
      * @return {@inheritDoc}\r
      */\r
+    @Override\r
     public Rectangle recalcBounds(){\r
         int newWidth = getWidth();\r
 \r
@@ -475,6 +476,7 @@ public class TalkDraw extends AbstractTextRow{
      * {@inheritDoc}\r
      * @param g {@inheritDoc}\r
      */\r
+    @Override\r
     public void paint(Graphics2D g){\r
         final int xPos = this.bounds.x;\r
         final int yPos = this.bounds.y + UPPER_MARGIN;\r
@@ -565,6 +567,7 @@ public class TalkDraw extends AbstractTextRow{
      * @param from {@inheritDoc}\r
      * @param to {@inheritDoc}\r
      */\r
+    @Override\r
     public void drag(Point from, Point to){\r
         this.caption.drag(from, to);\r
         this.dialog.drag(from, to);\r
@@ -580,6 +583,7 @@ public class TalkDraw extends AbstractTextRow{
      * @return {@inheritDoc}\r
      * @throws java.io.IOException {@inheritDoc}\r
      */\r
+    @Override\r
     public Appendable appendSelected(Appendable appendable)\r
             throws IOException{\r
         this.caption.appendSelected(appendable);\r
@@ -595,6 +599,7 @@ public class TalkDraw extends AbstractTextRow{
     /**\r
      * {@inheritDoc}\r
      */\r
+    @Override\r
     public void clearSelect(){\r
         this.caption.clearSelect();\r
         this.dialog.clearSelect();\r

diff --git a/src/main/java/jp/sourceforge/jindolf/TalkEditor.java b/src/main/java/jp/sourceforge/jindolf/TalkEditor.java
index 565c126..d34477d 100644 (file)
--- a/src/main/java/jp/sourceforge/jindolf/TalkEditor.java
+++ b/src/main/java/jp/sourceforge/jindolf/TalkEditor.java
@@ -515,6 +515,7 @@ public class TalkEditor
      * @param event {@inheritDoc}\r
      */\r
     // TODO いつ呼ばれるのか不明\r
+    @Override\r
     public void changedUpdate(DocumentEvent event){\r
         updateStat();\r
         return;\r
@@ -525,6 +526,7 @@ public class TalkEditor
      * 集計情報を更新する。\r
      * @param event {@inheritDoc}\r
      */\r
+    @Override\r
     public void insertUpdate(DocumentEvent event){\r
         updateStat();\r
         return;\r
@@ -535,6 +537,7 @@ public class TalkEditor
      * 集計情報を更新する。\r
      * @param event {@inheritDoc}\r
      */\r
+    @Override\r
     public void removeUpdate(DocumentEvent event){\r
         updateStat();\r
         return;\r

diff --git a/src/main/java/jp/sourceforge/jindolf/TalkPreview.java b/src/main/java/jp/sourceforge/jindolf/TalkPreview.java
index 4fc70e7..f645b52 100644 (file)
--- a/src/main/java/jp/sourceforge/jindolf/TalkPreview.java
+++ b/src/main/java/jp/sourceforge/jindolf/TalkPreview.java
@@ -476,6 +476,7 @@ public class TalkPreview extends JFrame
      * 各種ボタン操作の処理。\r
      * @param event {@inheritDoc}\r
      */\r
+    @Override\r
     public void actionPerformed(ActionEvent event){\r
         Object source = event.getSource();\r
         if     (source == this.cutButton)      actionCutActive();\r

diff --git a/src/main/java/jp/sourceforge/jindolf/TallyInputStream.java b/src/main/java/jp/sourceforge/jindolf/TallyInputStream.java
index 659cc69..57d4819 100644 (file)
--- a/src/main/java/jp/sourceforge/jindolf/TallyInputStream.java
+++ b/src/main/java/jp/sourceforge/jindolf/TallyInputStream.java
@@ -107,6 +107,7 @@ public class TallyInputStream extends InputStream{
      * @return {@inheritDoc}\r
      * @throws java.io.IOException {@inheritDoc}\r
      */\r
+    @Override\r
     public int read() throws IOException{\r
         if(this.counter <= 0) this.nanoLap = System.nanoTime();\r
 \r

diff --git a/src/main/java/jp/sourceforge/jindolf/TallyOutputStream.java b/src/main/java/jp/sourceforge/jindolf/TallyOutputStream.java
index dd2deea..826c7ef 100644 (file)
--- a/src/main/java/jp/sourceforge/jindolf/TallyOutputStream.java
+++ b/src/main/java/jp/sourceforge/jindolf/TallyOutputStream.java
@@ -129,6 +129,7 @@ public class TallyOutputStream extends OutputStream{
      * @param b {@inheritDoc}\r
      * @throws java.io.IOException {@inheritDoc}\r
      */\r
+    @Override\r
     public void write(int b) throws IOException{\r
         if(this.counter <= 0) this.nanoLap = System.nanoTime();\r
 \r

diff --git a/src/main/java/jp/sourceforge/jindolf/TextEditor.java b/src/main/java/jp/sourceforge/jindolf/TextEditor.java
index a30eb2f..d40f0a7 100644 (file)
--- a/src/main/java/jp/sourceforge/jindolf/TextEditor.java
+++ b/src/main/java/jp/sourceforge/jindolf/TextEditor.java
@@ -119,6 +119,7 @@ public class TextEditor extends JTextArea
      * {@inheritDoc}\r
      * @param event {@inheritDoc}\r
      */\r
+    @Override\r
     public void caretPositionChanged(InputMethodEvent event){\r
         // NOTHING\r
         return;\r
@@ -129,6 +130,7 @@ public class TextEditor extends JTextArea
      * このテキストエディタで現在IMEの変換中か否か判定する処理を含む。\r
      * @param event {@inheritDoc}\r
      */\r
+    @Override\r
     public void inputMethodTextChanged(InputMethodEvent event){\r
         int committed = event.getCommittedCharacterCount();\r
         AttributedCharacterIterator aci = event.getText();\r

diff --git a/src/main/java/jp/sourceforge/jindolf/TextPopup.java b/src/main/java/jp/sourceforge/jindolf/TextPopup.java
index a693e3a..28d338d 100644 (file)
--- a/src/main/java/jp/sourceforge/jindolf/TextPopup.java
+++ b/src/main/java/jp/sourceforge/jindolf/TextPopup.java
@@ -142,6 +142,7 @@ public class TextPopup extends JPopupMenu implements PropertyChangeListener{
      * ポップアップ呼び出し元を監視してL&Fを変更する。\r
      * @param event {@inheritDoc}\r
      */\r
+    @Override\r
     public void propertyChange(PropertyChangeEvent event){\r
         String propertyName = event.getPropertyName();\r
         if(PROPERTY_UI.equals(propertyName)) updateUI();\r

diff --git a/src/main/java/jp/sourceforge/jindolf/UriExporter.java b/src/main/java/jp/sourceforge/jindolf/UriExporter.java
index b0ff276..ea47b2f 100644 (file)
--- a/src/main/java/jp/sourceforge/jindolf/UriExporter.java
+++ b/src/main/java/jp/sourceforge/jindolf/UriExporter.java
@@ -59,6 +59,7 @@ public class UriExporter implements Transferable{
      * {@inheritDoc}\r
      * @return {@inheritDoc}\r
      */\r
+    @Override\r
     public DataFlavor[] getTransferDataFlavors(){\r
         DataFlavor[] result = new DataFlavor[URI_FLAVORS.size()];\r
         int index = 0;\r
@@ -78,6 +79,7 @@ public class UriExporter implements Transferable{
      * @param flavor {@inheritDoc}\r
      * @return {@inheritDoc}\r
      */\r
+    @Override\r
     public boolean isDataFlavorSupported(DataFlavor flavor){\r
         for(DataFlavor dataFlavor : URI_FLAVORS){\r
             if(dataFlavor.equals(flavor)) return true;\r
@@ -93,6 +95,7 @@ public class UriExporter implements Transferable{
      * @throws java.awt.datatransfer.UnsupportedFlavorException {@inheritDoc}\r
      * @throws java.io.IOException {@inheritDoc}\r
      */\r
+    @Override\r
     public Object getTransferData(DataFlavor flavor)\r
             throws UnsupportedFlavorException,\r
                    IOException {\r

diff --git a/src/main/java/jp/sourceforge/jindolf/Village.java b/src/main/java/jp/sourceforge/jindolf/Village.java
index 317c985..b9b87ed 100644 (file)
--- a/src/main/java/jp/sourceforge/jindolf/Village.java
+++ b/src/main/java/jp/sourceforge/jindolf/Village.java
@@ -51,6 +51,7 @@ public class Village implements Comparable<Village> {
          * @param v2 {@inheritDoc}\r
          * @return {@inheritDoc}\r
          */\r
+        @Override\r
         public int compare(Village v1, Village v2){\r
             int v1Num;\r
             if(v1 == null) v1Num = Integer.MIN_VALUE;\r
@@ -583,6 +584,7 @@ public class Village implements Comparable<Village> {
      * @param village {@inheritDoc}\r
      * @return {@inheritDoc}\r
      */\r
+    @Override\r
     public int compareTo(Village village){\r
         int cmpResult = VILLAGE_COMPARATOR.compare(this, village);\r
         return cmpResult;\r

diff --git a/src/main/java/jp/sourceforge/jindolf/XmlResourceResolver.java b/src/main/java/jp/sourceforge/jindolf/XmlResourceResolver.java
index 6f2c1cc..4218830 100644 (file)
--- a/src/main/java/jp/sourceforge/jindolf/XmlResourceResolver.java
+++ b/src/main/java/jp/sourceforge/jindolf/XmlResourceResolver.java
@@ -113,6 +113,7 @@ public class XmlResourceResolver
      * @param baseURI {@inheritDoc}\r
      * @return {@inheritDoc}\r
      */\r
+    @Override\r
     public LSInput resolveResource(String type,\r
                                      String namespaceURI,\r
                                      String publicId,\r
@@ -152,6 +153,7 @@ public class XmlResourceResolver
      * @throws org.xml.sax.SAXException {@inheritDoc}\r
      * @throws java.io.IOException {@inheritDoc}\r
      */\r
+    @Override\r
     public InputSource resolveEntity(String publicId, String systemId)\r
             throws SAXException, IOException{\r
         if(systemId == null) return null;\r
@@ -201,6 +203,7 @@ public class XmlResourceResolver
          * {@inheritDoc}\r
          * @return {@inheritDoc}\r
          */\r
+        @Override\r
         public String getBaseURI(){\r
             return this.baseURI;\r
         }\r
@@ -209,6 +212,7 @@ public class XmlResourceResolver
          * {@inheritDoc}\r
          * @param baseURI {@inheritDoc}\r
          */\r
+        @Override\r
         public void setBaseURI(String baseURI){\r
             this.baseURI = baseURI;\r
             return;\r
@@ -218,6 +222,7 @@ public class XmlResourceResolver
          * {@inheritDoc}\r
          * @return {@inheritDoc}\r
          */\r
+        @Override\r
         public InputStream getByteStream(){\r
             return this.byteStream;\r
         }\r
@@ -226,6 +231,7 @@ public class XmlResourceResolver
          * {@inheritDoc}\r
          * @param byteStream {@inheritDoc}\r
          */\r
+        @Override\r
         public void setByteStream(InputStream byteStream){\r
             this.byteStream = byteStream;\r
         }\r
@@ -234,6 +240,7 @@ public class XmlResourceResolver
          * {@inheritDoc}\r
          * @return {@inheritDoc}\r
          */\r
+        @Override\r
         public boolean getCertifiedText(){\r
             return this.certifiedText;\r
         }\r
@@ -242,6 +249,7 @@ public class XmlResourceResolver
          * {@inheritDoc}\r
          * @param certifiedText {@inheritDoc}\r
          */\r
+        @Override\r
         public void setCertifiedText(boolean certifiedText){\r
             this.certifiedText = certifiedText;\r
             return;\r
@@ -251,6 +259,7 @@ public class XmlResourceResolver
          * {@inheritDoc}\r
          * @return {@inheritDoc}\r
          */\r
+        @Override\r
         public Reader getCharacterStream(){\r
             return this.characterStream;\r
         }\r
@@ -259,6 +268,7 @@ public class XmlResourceResolver
          * {@inheritDoc}\r
          * @param characterStream {@inheritDoc}\r
          */\r
+        @Override\r
         public void setCharacterStream(Reader characterStream){\r
             this.characterStream = characterStream;\r
         }\r
@@ -267,6 +277,7 @@ public class XmlResourceResolver
          * {@inheritDoc}\r
          * @return {@inheritDoc}\r
          */\r
+        @Override\r
         public String getEncoding(){\r
             return this.encoding;\r
         }\r
@@ -275,6 +286,7 @@ public class XmlResourceResolver
          * {@inheritDoc}\r
          * @param encoding {@inheritDoc}\r
          */\r
+        @Override\r
         public void setEncoding(String encoding){\r
             this.encoding = encoding;\r
             return;\r
@@ -284,6 +296,7 @@ public class XmlResourceResolver
          * {@inheritDoc}\r
          * @return {@inheritDoc}\r
          */\r
+        @Override\r
         public String getPublicId(){\r
             return this.publicId;\r
         }\r
@@ -292,6 +305,7 @@ public class XmlResourceResolver
          * {@inheritDoc}\r
          * @param publicId {@inheritDoc}\r
          */\r
+        @Override\r
         public void setPublicId(String publicId){\r
             this.publicId = publicId;\r
             return;\r
@@ -301,6 +315,7 @@ public class XmlResourceResolver
          * {@inheritDoc}\r
          * @return {@inheritDoc}\r
          */\r
+        @Override\r
         public String getStringData(){\r
             return this.stringData;\r
         }\r
@@ -309,6 +324,7 @@ public class XmlResourceResolver
          * {@inheritDoc}\r
          * @param stringData {@inheritDoc}\r
          */\r
+        @Override\r
         public void setStringData(String stringData){\r
             this.stringData = stringData;\r
             return;\r
@@ -318,6 +334,7 @@ public class XmlResourceResolver
          * {@inheritDoc}\r
          * @return {@inheritDoc}\r
          */\r
+        @Override\r
         public String getSystemId(){\r
             return this.systemId;\r
         }\r
@@ -326,6 +343,7 @@ public class XmlResourceResolver
          * {@inheritDoc}\r
          * @param systemId {@inheritDoc}\r
          */\r
+        @Override\r
         public void setSystemId(String systemId){\r
             this.systemId = systemId;\r
             return;\r

diff --git a/src/main/java/jp/sourceforge/jindolf/XmlUtils.java b/src/main/java/jp/sourceforge/jindolf/XmlUtils.java
index f0f7fbe..93e4e63 100644 (file)
--- a/src/main/java/jp/sourceforge/jindolf/XmlUtils.java
+++ b/src/main/java/jp/sourceforge/jindolf/XmlUtils.java
@@ -126,6 +126,7 @@ public final class XmlUtils{
          * @param e {@inheritDoc} エラー情報\r
          * @throws org.xml.sax.SAXException {@inheritDoc} 引数と同じ物\r
          */\r
+        @Override\r
         public void error(SAXParseException e) throws SAXException{\r
             throw e;\r
         }\r
@@ -135,6 +136,7 @@ public final class XmlUtils{
          * @param e {@inheritDoc} エラー情報\r
          * @throws org.xml.sax.SAXException {@inheritDoc} 引数と同じ物\r
          */\r
+        @Override\r
         public void fatalError(SAXParseException e) throws SAXException{\r
             throw e;\r
         }\r
@@ -144,6 +146,7 @@ public final class XmlUtils{
          * @param e {@inheritDoc} エラー情報\r
          * @throws org.xml.sax.SAXException {@inheritDoc} 引数と同じ物\r
          */\r
+        @Override\r
         public void warning(SAXParseException e) throws SAXException{\r
             throw e;\r
         }\r

diff --git a/src/main/java/jp/sourceforge/jindolf/json/AbstractJsValue.java b/src/main/java/jp/sourceforge/jindolf/json/AbstractJsValue.java
index fde9b8a..13a4347 100644 (file)
--- a/src/main/java/jp/sourceforge/jindolf/json/AbstractJsValue.java
+++ b/src/main/java/jp/sourceforge/jindolf/json/AbstractJsValue.java
@@ -26,6 +26,7 @@ public class AbstractJsValue implements JsValue{
      * @param visitor {@inheritDoc}\r
      * @throws JsVisitException {@inheritDoc}\r
      */\r
+    @Override\r
     public void traverse(ValueVisitor visitor)\r
             throws JsVisitException{\r
         visitor.visitValue(this);\r
@@ -36,6 +37,7 @@ public class AbstractJsValue implements JsValue{
      * {@inheritDoc}\r
      * @return {@inheritDoc}\r
      */\r
+    @Override\r
     public boolean hasChanged(){\r
         return false;\r
     }\r
@@ -43,6 +45,7 @@ public class AbstractJsValue implements JsValue{
     /**\r
      * {@inheritDoc}\r
      */\r
+    @Override\r
     public void setUnchanged(){\r
         return;\r
     }\r

diff --git a/src/main/java/jp/sourceforge/jindolf/json/JsBoolean.java b/src/main/java/jp/sourceforge/jindolf/json/JsBoolean.java
index b6df019..ab8cbea 100644 (file)
--- a/src/main/java/jp/sourceforge/jindolf/json/JsBoolean.java
+++ b/src/main/java/jp/sourceforge/jindolf/json/JsBoolean.java
@@ -95,6 +95,7 @@ public final class JsBoolean
      * @param value {@inheritDoc}\r
      * @return {@inheritDoc}\r
      */\r
+    @Override\r
     public int compareTo(JsBoolean value){\r
         if(value == null) throw new NullPointerException();\r
         if(this == value) return 0;\r

diff --git a/src/main/java/jp/sourceforge/jindolf/json/JsNull.java b/src/main/java/jp/sourceforge/jindolf/json/JsNull.java
index 9838b23..4a3a9cf 100644 (file)
--- a/src/main/java/jp/sourceforge/jindolf/json/JsNull.java
+++ b/src/main/java/jp/sourceforge/jindolf/json/JsNull.java
@@ -32,6 +32,7 @@ public final class JsNull
      * @param value {@inheritDoc}\r
      * @return {@inheritDoc}\r
      */\r
+    @Override\r
     public int compareTo(JsNull value){\r
         if(value == null) throw new NullPointerException();\r
         return 0;\r

diff --git a/src/main/java/jp/sourceforge/jindolf/json/JsNumber.java b/src/main/java/jp/sourceforge/jindolf/json/JsNumber.java
index 2b47292..32948b0 100644 (file)
--- a/src/main/java/jp/sourceforge/jindolf/json/JsNumber.java
+++ b/src/main/java/jp/sourceforge/jindolf/json/JsNumber.java
@@ -306,6 +306,7 @@ public class JsNumber
      * @param value {@inheritDoc}\r
      * @return {@inheritDoc}\r
      */\r
+    @Override\r
     public int compareTo(JsNumber value){\r
         if(this == value) return 0;\r
         return this.decimal.compareTo(value.decimal);\r

diff --git a/src/main/java/jp/sourceforge/jindolf/json/JsString.java b/src/main/java/jp/sourceforge/jindolf/json/JsString.java
index 54b464b..09184bf 100644 (file)
--- a/src/main/java/jp/sourceforge/jindolf/json/JsString.java
+++ b/src/main/java/jp/sourceforge/jindolf/json/JsString.java
@@ -179,6 +179,7 @@ public class JsString
      * @return {@inheritDoc}\r
      * @throws IndexOutOfBoundsException {@inheritDoc}\r
      */\r
+    @Override\r
     public char charAt(int index)\r
             throws IndexOutOfBoundsException{\r
         return this.text.charAt(index);\r
@@ -188,6 +189,7 @@ public class JsString
      * {@inheritDoc}\r
      * @return {@inheritDoc}\r
      */\r
+    @Override\r
     public int length(){\r
         return this.text.length();\r
     }\r
@@ -199,6 +201,7 @@ public class JsString
      * @return {@inheritDoc}\r
      * @throws IndexOutOfBoundsException {@inheritDoc}\r
      */\r
+    @Override\r
     public CharSequence subSequence(int start, int end)\r
             throws IndexOutOfBoundsException{\r
         return this.text.subSequence(start, end);\r
@@ -234,6 +237,7 @@ public class JsString
      * @param value {@inheritDoc}\r
      * @return {@inheritDoc}\r
      */\r
+    @Override\r
     public int compareTo(JsString value){\r
         if(this == value) return 0;\r
         if(value == null) return +1;\r

diff --git a/src/main/java/jp/sourceforge/jindolf/json/JsonAppender.java b/src/main/java/jp/sourceforge/jindolf/json/JsonAppender.java
index a6b1224..db38715 100644 (file)
--- a/src/main/java/jp/sourceforge/jindolf/json/JsonAppender.java
+++ b/src/main/java/jp/sourceforge/jindolf/json/JsonAppender.java
@@ -188,6 +188,7 @@ class JsonAppender
      * @param value {@inheritDoc}\r
      * @throws JsVisitException {@inheritDoc}\r
      */\r
+    @Override\r
     public void visitValue(JsValue value)\r
             throws JsVisitException{\r
         try{\r
@@ -224,6 +225,7 @@ class JsonAppender
      * @param name {@inheritDoc}\r
      * @throws JsVisitException {@inheritDoc}\r
      */\r
+    @Override\r
     public void visitPairName(String name)\r
             throws JsVisitException{\r
         try{\r
@@ -250,6 +252,7 @@ class JsonAppender
      * @param composite {@inheritDoc}\r
      * @throws JsVisitException {@inheritDoc}\r
      */\r
+    @Override\r
     public void visitCollectionClose(JsValue composite)\r
             throws JsVisitException{\r
         boolean hasChild = hasChildOut();\r