指定したユーザが購読しているリスト，作成したリスト，フォローされているリスト一覧を表示できるようにした

git-svn-id: http://svn.sourceforge.jp/svnroot/nt-manager/NishioTweetManager/trunk@104 d8c9ecd3-d47d-4367-8645-de82c00e513f

diff --git a/src/twitter/gui/action/TweetMainAction.java b/src/twitter/gui/action/TweetMainAction.java
index 22fae1b..8f1a822 100644 (file)
--- a/src/twitter/gui/action/TweetMainAction.java
+++ b/src/twitter/gui/action/TweetMainAction.java
@@ -911,6 +911,7 @@ public class TweetMainAction {
         }
     }
 
+
     /**
      * Tweet取得時間情報を更新
      */
@@ -1031,6 +1032,21 @@ public class TweetMainAction {
     }
 
     /**
+     * 選択したユーザが作成したリスト一覧を表示
+     * @param selection
+     */
+    public void actionShowSelectedUserList(ListGetterSelection selection) {
+        Status status = null;
+        if( this.getCurrentStatus().isRetweet() ) {
+            status = this.getCurrentStatus().getRetweetedStatus();
+        }else {
+            status = this.getCurrentStatus();
+        }
+        String username = status.getUser().getScreenName();
+        actionShowUserListDialog(status.getUser().getScreenName(), selection);
+    }
+
+    /**
      * 選択しているツイートをお気に入りに追加
      */
     public void actionCreateFavorite() {

diff --git a/src/twitter/gui/form/NishioTweetManager.form b/src/twitter/gui/form/NishioTweetManager.form
index c1ee5d6..2c77e12 100644 (file)
--- a/src/twitter/gui/form/NishioTweetManager.form
+++ b/src/twitter/gui/form/NishioTweetManager.form
@@ -345,7 +345,11 @@
           <SubComponents>
             <MenuItem class="javax.swing.JMenuItem" name="jMenuItem25">
               <Properties>
-                <Property name="text" type="java.lang.String" value="&#x81ea;&#x5206;&#x304c;&#x4f5c;&#x6210;&#x3057;&#x305f;&#x30ea;&#x30b9;&#x30c8;&#x4e00;&#x89a7;"/>
+                <Property name="accelerator" type="javax.swing.KeyStroke" editor="org.netbeans.modules.form.editors.KeyStrokeEditor">
+                  <KeyStroke key="Ctrl+L"/>
+                </Property>
+                <Property name="mnemonic" type="int" value="67"/>
+                <Property name="text" type="java.lang.String" value="&#x81ea;&#x5206;&#x304c;&#x4f5c;&#x6210;&#x3057;&#x305f;&#x30ea;&#x30b9;&#x30c8;&#x4e00;&#x89a7;(C)"/>
               </Properties>
               <Events>
                 <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jMenuItem25ActionPerformed"/>
@@ -353,7 +357,11 @@
             </MenuItem>
             <MenuItem class="javax.swing.JMenuItem" name="jMenuItem24">
               <Properties>
-                <Property name="text" type="java.lang.String" value="&#x8cfc;&#x8aad;&#x3057;&#x3066;&#x3044;&#x308b;&#x30ea;&#x30b9;&#x30c8;&#x4e00;&#x89a7;"/>
+                <Property name="accelerator" type="javax.swing.KeyStroke" editor="org.netbeans.modules.form.editors.KeyStrokeEditor">
+                  <KeyStroke key="Alt+L"/>
+                </Property>
+                <Property name="mnemonic" type="int" value="83"/>
+                <Property name="text" type="java.lang.String" value="&#x8cfc;&#x8aad;&#x3057;&#x3066;&#x3044;&#x308b;&#x30ea;&#x30b9;&#x30c8;&#x4e00;&#x89a7;(S)"/>
               </Properties>
               <Events>
                 <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jMenuItem24ActionPerformed"/>
@@ -361,12 +369,42 @@
             </MenuItem>
             <MenuItem class="javax.swing.JMenuItem" name="jMenuItem26">
               <Properties>
-                <Property name="text" type="java.lang.String" value="&#x81ea;&#x5206;&#x304c;&#x30d5;&#x30a9;&#x30ed;&#x30fc;&#x3055;&#x308c;&#x3066;&#x3044;&#x308b;&#x30ea;&#x30b9;&#x30c8;&#x4e00;&#x89a7;"/>
+                <Property name="accelerator" type="javax.swing.KeyStroke" editor="org.netbeans.modules.form.editors.KeyStrokeEditor">
+                  <KeyStroke key="Shift+L"/>
+                </Property>
+                <Property name="mnemonic" type="int" value="70"/>
+                <Property name="text" type="java.lang.String" value="&#x81ea;&#x5206;&#x304c;&#x30d5;&#x30a9;&#x30ed;&#x30fc;&#x3055;&#x308c;&#x3066;&#x3044;&#x308b;&#x30ea;&#x30b9;&#x30c8;&#x4e00;&#x89a7;(F)"/>
               </Properties>
               <Events>
                 <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jMenuItem26ActionPerformed"/>
               </Events>
             </MenuItem>
+            <MenuItem class="javax.swing.JPopupMenu$Separator" name="jSeparator7">
+            </MenuItem>
+            <MenuItem class="javax.swing.JMenuItem" name="jMenuItem27">
+              <Properties>
+                <Property name="text" type="java.lang.String" value="&#x9078;&#x629e;&#x3057;&#x305f;&#x30e6;&#x30fc;&#x30b6;&#x304c;&#x4f5c;&#x6210;&#x3057;&#x305f;&#x30ea;&#x30b9;&#x30c8;&#x4e00;&#x89a7;"/>
+              </Properties>
+              <Events>
+                <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jMenuItem27ActionPerformed"/>
+              </Events>
+            </MenuItem>
+            <MenuItem class="javax.swing.JMenuItem" name="jMenuItem28">
+              <Properties>
+                <Property name="text" type="java.lang.String" value="&#x9078;&#x629e;&#x3057;&#x305f;&#x30e6;&#x30fc;&#x30b6;&#x304c;&#x8cfc;&#x8aad;&#x3057;&#x3066;&#x3044;&#x308b;&#x30ea;&#x30b9;&#x30c8;&#x4e00;&#x89a7;"/>
+              </Properties>
+              <Events>
+                <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jMenuItem28ActionPerformed"/>
+              </Events>
+            </MenuItem>
+            <MenuItem class="javax.swing.JMenuItem" name="jMenuItem29">
+              <Properties>
+                <Property name="text" type="java.lang.String" value="&#x9078;&#x629e;&#x3057;&#x305f;&#x30e6;&#x30fc;&#x30b6;&#x304c;&#x30d5;&#x30a9;&#x30ed;&#x30fc;&#x3055;&#x308c;&#x3066;&#x3044;&#x308b;&#x30ea;&#x30b9;&#x30c8;&#x4e00;&#x89a7;"/>
+              </Properties>
+              <Events>
+                <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jMenuItem29ActionPerformed"/>
+              </Events>
+            </MenuItem>
           </SubComponents>
         </Menu>
         <Menu class="javax.swing.JMenu" name="jMenu2">

diff --git a/src/twitter/gui/form/NishioTweetManager.java b/src/twitter/gui/form/NishioTweetManager.java
index c884eef..4bc458b 100644 (file)
--- a/src/twitter/gui/form/NishioTweetManager.java
+++ b/src/twitter/gui/form/NishioTweetManager.java
@@ -217,6 +217,10 @@ public class NishioTweetManager extends javax.swing.JFrame {
         jMenuItem25 = new javax.swing.JMenuItem();
         jMenuItem24 = new javax.swing.JMenuItem();
         jMenuItem26 = new javax.swing.JMenuItem();
+        jSeparator7 = new javax.swing.JPopupMenu.Separator();
+        jMenuItem27 = new javax.swing.JMenuItem();
+        jMenuItem28 = new javax.swing.JMenuItem();
+        jMenuItem29 = new javax.swing.JMenuItem();
         jMenu2 = new javax.swing.JMenu();
         jMenuItem2 = new javax.swing.JMenuItem();
         jMenuItem4 = new javax.swing.JMenuItem();
@@ -872,7 +876,9 @@ public class NishioTweetManager extends javax.swing.JFrame {
         jMenu7.setMnemonic('L');
         jMenu7.setText("リスト(L)");
 
-        jMenuItem25.setText("自分が作成したリスト一覧");
+        jMenuItem25.setAccelerator(javax.swing.KeyStroke.getKeyStroke(java.awt.event.KeyEvent.VK_L, java.awt.event.InputEvent.CTRL_MASK));
+        jMenuItem25.setMnemonic('C');
+        jMenuItem25.setText("自分が作成したリスト一覧(C)");
         jMenuItem25.addActionListener(new java.awt.event.ActionListener() {
             public void actionPerformed(java.awt.event.ActionEvent evt) {
                 jMenuItem25ActionPerformed(evt);
@@ -880,7 +886,9 @@ public class NishioTweetManager extends javax.swing.JFrame {
         });
         jMenu7.add(jMenuItem25);
 
-        jMenuItem24.setText("購読しているリスト一覧");
+        jMenuItem24.setAccelerator(javax.swing.KeyStroke.getKeyStroke(java.awt.event.KeyEvent.VK_L, java.awt.event.InputEvent.ALT_MASK));
+        jMenuItem24.setMnemonic('S');
+        jMenuItem24.setText("購読しているリスト一覧(S)");
         jMenuItem24.addActionListener(new java.awt.event.ActionListener() {
             public void actionPerformed(java.awt.event.ActionEvent evt) {
                 jMenuItem24ActionPerformed(evt);
@@ -888,13 +896,40 @@ public class NishioTweetManager extends javax.swing.JFrame {
         });
         jMenu7.add(jMenuItem24);
 
-        jMenuItem26.setText("自分がフォローされているリスト一覧");
+        jMenuItem26.setAccelerator(javax.swing.KeyStroke.getKeyStroke(java.awt.event.KeyEvent.VK_L, java.awt.event.InputEvent.SHIFT_MASK));
+        jMenuItem26.setMnemonic('F');
+        jMenuItem26.setText("自分がフォローされているリスト一覧(F)");
         jMenuItem26.addActionListener(new java.awt.event.ActionListener() {
             public void actionPerformed(java.awt.event.ActionEvent evt) {
                 jMenuItem26ActionPerformed(evt);
             }
         });
         jMenu7.add(jMenuItem26);
+        jMenu7.add(jSeparator7);
+
+        jMenuItem27.setText("選択したユーザが作成したリスト一覧");
+        jMenuItem27.addActionListener(new java.awt.event.ActionListener() {
+            public void actionPerformed(java.awt.event.ActionEvent evt) {
+                jMenuItem27ActionPerformed(evt);
+            }
+        });
+        jMenu7.add(jMenuItem27);
+
+        jMenuItem28.setText("選択したユーザが購読しているリスト一覧");
+        jMenuItem28.addActionListener(new java.awt.event.ActionListener() {
+            public void actionPerformed(java.awt.event.ActionEvent evt) {
+                jMenuItem28ActionPerformed(evt);
+            }
+        });
+        jMenu7.add(jMenuItem28);
+
+        jMenuItem29.setText("選択したユーザがフォローされているリスト一覧");
+        jMenuItem29.addActionListener(new java.awt.event.ActionListener() {
+            public void actionPerformed(java.awt.event.ActionEvent evt) {
+                jMenuItem29ActionPerformed(evt);
+            }
+        });
+        jMenu7.add(jMenuItem29);
 
         jMenuBar1.add(jMenu7);
 
@@ -1218,6 +1253,18 @@ public class NishioTweetManager extends javax.swing.JFrame {
                 ListGetterSelection.MEMBERSHIPS);
     }//GEN-LAST:event_jMenuItem26ActionPerformed
 
+    private void jMenuItem27ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jMenuItem27ActionPerformed
+        this.mainAction.actionShowSelectedUserList(ListGetterSelection.CREATED);
+    }//GEN-LAST:event_jMenuItem27ActionPerformed
+
+    private void jMenuItem28ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jMenuItem28ActionPerformed
+        this.mainAction.actionShowSelectedUserList(ListGetterSelection.SUBSCRIPTION);
+    }//GEN-LAST:event_jMenuItem28ActionPerformed
+
+    private void jMenuItem29ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jMenuItem29ActionPerformed
+        this.mainAction.actionShowSelectedUserList(ListGetterSelection.MEMBERSHIPS);
+    }//GEN-LAST:event_jMenuItem29ActionPerformed
+
     /**
      *
      */
@@ -1351,6 +1398,9 @@ public class NishioTweetManager extends javax.swing.JFrame {
     private javax.swing.JMenuItem jMenuItem24;
     private javax.swing.JMenuItem jMenuItem25;
     private javax.swing.JMenuItem jMenuItem26;
+    private javax.swing.JMenuItem jMenuItem27;
+    private javax.swing.JMenuItem jMenuItem28;
+    private javax.swing.JMenuItem jMenuItem29;
     private javax.swing.JMenuItem jMenuItem3;
     private javax.swing.JMenuItem jMenuItem4;
     private javax.swing.JMenuItem jMenuItem5;
@@ -1372,6 +1422,7 @@ public class NishioTweetManager extends javax.swing.JFrame {
     private javax.swing.JPopupMenu.Separator jSeparator4;
     private javax.swing.JPopupMenu.Separator jSeparator5;
     private javax.swing.JPopupMenu.Separator jSeparator6;
+    private javax.swing.JPopupMenu.Separator jSeparator7;
     private javax.swing.JTabbedPane jTabbedPane1;
     private javax.swing.JTextPane jTextPane;
     private javax.swing.JToggleButton jToggleButton1;

diff --git a/src/twitter/gui/form/UserListDialog.java b/src/twitter/gui/form/UserListDialog.java
index 55e4cc6..f30eb80 100644 (file)
--- a/src/twitter/gui/form/UserListDialog.java
+++ b/src/twitter/gui/form/UserListDialog.java
@@ -158,7 +158,9 @@ public class UserListDialog extends javax.swing.JDialog {
         int index = table.convertRowIndexToModel(table.getSelectedRow());
         UserList info = null;
         if (model instanceof TweetListTableModel) {
-            info = ((TweetListTableModel) model).getUserList(index);
+            if( index >= 0 ) {
+                info = ((TweetListTableModel) model).getUserList(index);
+            }
         }
         return info;
     }