Changeset 10593

Timestamp:

04/27/08 20:48:45 (7 months ago)

Author:

daisuke_m

Message:

アイコン整備。ユーザタブのステータスをダブルクリックした時にReplyActionが動いていなかったのを修正。タブの移動リスナをつけてみたけど動かない。

Location:

lang/java/sabotter/trunk

Files:

• icons/add_tab.gif (added)
• icons/filter.gif (added)
• icons/refresh.gif (added)
• src/jp/xet/eclipse/sabotter/Images.java (added)
• src/jp/xet/eclipse/sabotter/SabotterPlugin.java (modified) (3 diffs)
• src/jp/xet/eclipse/sabotter/action/AddTabAction.java (modified) (5 diffs)
• src/jp/xet/eclipse/sabotter/manager/TableManager.java (modified) (2 diffs)
• src/jp/xet/eclipse/sabotter/views/SabotterView.java (modified) (12 diffs)
• src/jp/xet/eclipse/sabotter/views/TabDragListener.java (added)

lang/java/sabotter/trunk/src/jp/xet/eclipse/sabotter/SabotterPlugin.java

@@ -1 +1 @@
 package jp.xet.eclipse.sabotter;
+
+import java.net.URL;
 
 import jp.xet.eclipse.sabotter.preferences.SabotterPreference;
 import jp.xet.eclipse.sabotter.preferences.SabotterPreferenceImpl;
 
+import org.eclipse.core.runtime.FileLocator;
+import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Path;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.jface.dialogs.ErrorDialog;
 import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.jface.resource.ImageRegistry;
 import org.eclipse.ui.IWorkbenchWindow;
 import org.eclipse.ui.PlatformUI;
@@ -40 +46 @@
          */
         public static final int ALL = LOG | DIALOG | STACKTRACE;
+        
+        /** アイコンファイルの配置パス */
+        private static final String ICONS_PATH = "icons/";
         
         // The shared instance
@@ -93 +102 @@
         public static SabotterPreference getPreference() {
                 return pref;
+        }
+        
+        /**
+         * Override method.
+         * 
+         * @see org.eclipse.ui.plugin.AbstractUIPlugin#initializeImageRegistry(org.eclipse.jface.resource.ImageRegistry)
+         */
+        @Override
+        protected void initializeImageRegistry(ImageRegistry registry) {
+                registerImage(registry, Images.BUTTON_ADD_TAB, "add_tab.gif");
+                registerImage(registry, Images.BUTTON_FILTER, "filter.gif");
+                registerImage(registry, Images.BUTTON_REFRESH, "refresh.gif");
+        }
+        
+        /**
+         * ImageRegistryに指定したファイルの画像を設定します。 画像ファイルは icons/ 内に配置する必要があります。
+         * 
+         * @param registry 追加対象のImageRegistry
+         * @param key キー
+         * @param fileName ファイル名
+         */
+        private void registerImage(ImageRegistry registry, String key,
+                        String fileName) {
+                IPath path = new Path(ICONS_PATH + fileName);
+                URL url = FileLocator.find(getBundle(), path, null);
+                
+                if (url != null) {
+                        registry.put(key, ImageDescriptor.createFromURL(url));
+                }
         }
         

lang/java/sabotter/trunk/src/jp/xet/eclipse/sabotter/action/AddTabAction.java

@@ -15 +15 @@
 import org.eclipse.jface.viewers.ColumnPixelData;
 import org.eclipse.jface.viewers.IContentProvider;
+import org.eclipse.jface.viewers.IDoubleClickListener;
 import org.eclipse.jface.viewers.ILabelProvider;
 import org.eclipse.jface.viewers.ISelectionChangedListener;
@@ -52 +53 @@
         private CTabFolder tabFolder;
         
-        private ISelectionChangedListener listener;
+        private ISelectionChangedListener selectionListener;
+        
+        private IDoubleClickListener doubleClickListener;
         
         private List<TableViewer> viewers;
@@ -63 +66 @@
          * @param labelProvider
          * @param tabFolder
-         * @param listener
+         * @param selListener
+         * @param dcListener
          * @param viewers
          * @category instance creation
@@ -69 +73 @@
         public AddTabAction(IContentProvider contentProvider,
                         ILabelProvider labelProvider, CTabFolder tabFolder,
-                        ISelectionChangedListener listener, List<TableViewer> viewers) {
+                        ISelectionChangedListener selListener,
+                        IDoubleClickListener dcListener, List<TableViewer> viewers) {
                 super();
                 this.contentProvider = contentProvider;
                 this.labelProvider = labelProvider;
                 this.tabFolder = tabFolder;
-                this.listener = listener;
+                this.selectionListener = selListener;
+                doubleClickListener = dcListener;
                 this.viewers = viewers;
         }
@@ -118 +124 @@
                 viewer.setSorter(new TimeLineSorter(viewer.getTable().getColumn(2)));
                 viewer.setInput(TwitterManager.getInstance());
-                viewer.addSelectionChangedListener(listener);
+                viewer.addSelectionChangedListener(selectionListener);
+                viewer.addDoubleClickListener(doubleClickListener);
                 viewer.getTable().addKeyListener(
                                 new SabotterKeyListener(new TableManager(viewer)));

lang/java/sabotter/trunk/src/jp/xet/eclipse/sabotter/manager/TableManager.java

@@ -55 +55 @@
                 }
                 
-                ISelection sel = new StructuredSelection(viewer.getElementAt(target));
-                viewer.setSelection(sel);
+                if (checkRange(target)) {
+                        ISelection sel =
+                                        new StructuredSelection(viewer.getElementAt(target));
+                        viewer.setSelection(sel);
+                }
         }
         
@@ -72 +75 @@
                 }
                 
-                ISelection sel = new StructuredSelection(viewer.getElementAt(target));
-                viewer.setSelection(sel);
+                if (checkRange(target)) {
+                        ISelection sel =
+                                        new StructuredSelection(viewer.getElementAt(target));
+                        viewer.setSelection(sel);
+                }
+        }
+        
+        private boolean checkRange(int target) {
+                if (target >= 0 && target < viewer.getTable().getItemCount()) {
+                        return true;
+                }
+                return false;
         }
         

lang/java/sabotter/trunk/src/jp/xet/eclipse/sabotter/views/SabotterView.java

@@ -6 +6 @@
 import java.util.Map;
 
+import jp.xet.eclipse.sabotter.Images;
 import jp.xet.eclipse.sabotter.SabotterPlugin;
 import jp.xet.eclipse.sabotter.action.AddTabAction;
@@ -16 +17 @@
 import jp.xet.eclipse.sabotter.preferences.PreferColor;
 import jp.xet.eclipse.sabotter.preferences.SabotterPreference;
-
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.action.IMenuListener;
@@ -24 +24 @@
 import org.eclipse.jface.action.Separator;
 import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.jface.resource.ImageRegistry;
 import org.eclipse.jface.viewers.DoubleClickEvent;
 import org.eclipse.jface.viewers.IContentProvider;
@@ -48 +49 @@
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Listener;
 import org.eclipse.swt.widgets.Menu;
 import org.eclipse.swt.widgets.Shell;
@@ -67 +69 @@
  */
 public class SabotterView extends ViewPart implements
-                ISelectionChangedListener {
+                ISelectionChangedListener, IDoubleClickListener {
         
         /** ビューID */
@@ -74 +76 @@
         
         /** アクション・マップ */
-        private Map<String, Action> actions = new HashMap<String, Action>();
+        Map<String, Action> actions = new HashMap<String, Action>();
+        
+        private static ImageRegistry imageRegistry =
+                        SabotterPlugin.getDefault().getImageRegistry();
         
         /** ステータステキスト入力欄 */
@@ -220 +225 @@
                         TwitterManager.getInstance().setReaded((Status) obj);
                 }
+                
+                viewer.refresh();
+        }
+        
+        /**
+         * Override method.
+         * 
+         * @see org.eclipse.jface.viewers.IDoubleClickListener#doubleClick(org.eclipse.jface.viewers.DoubleClickEvent)
+         */
+        public void doubleClick(DoubleClickEvent event) {
+                actions.get(ReplyAction.ACTION_ID).run();
         }
         
@@ -248 +264 @@
                 gd.horizontalSpan = 3;
                 tabFolder.setLayoutData(gd);
+//              tabFolder.setSimple(false);
+                
+                Listener listener = new TabDragListener(tabFolder);
+                tabFolder.addListener(SWT.DragDetect, listener);
+                tabFolder.addListener(SWT.MouseUp, listener);
+                tabFolder.addListener(SWT.MouseMove, listener);
+                tabFolder.addListener(SWT.MouseExit, listener);
+                tabFolder.addListener(SWT.MouseEnter, listener);
                 
                 contentProvider = new TimeLineContentProvider(this);
@@ -354 +378 @@
                 getFriendTimeLineAction
                         .setToolTipText(Messages.tooltip_get_new_friend_time_line);
-                getFriendTimeLineAction.setImageDescriptor(PlatformUI.getWorkbench()
-                        .getSharedImages().getImageDescriptor(ISharedImages.IMG_TOOL_UP)); // TODO select icon
+                getFriendTimeLineAction.setImageDescriptor(imageRegistry
+                        .getDescriptor(Images.BUTTON_REFRESH));
                 actions.put(GetNewFriendTimeLineAction.ACTION_ID,
                                 getFriendTimeLineAction);
@@ -377 +401 @@
                 filterSettingAction.setText("filter setting"); // TODO to resource file
                 filterSettingAction.setToolTipText("setting time-line filters.");
-                filterSettingAction.setImageDescriptor(PlatformUI.getWorkbench()
-                        .getSharedImages().getImageDescriptor(ISharedImages.IMG_TOOL_CUT)); // TODO select icon
+                filterSettingAction.setImageDescriptor(imageRegistry
+                        .getDescriptor(Images.BUTTON_FILTER));
                 actions.put(FilterSettingAction.ACTION_ID, filterSettingAction);
                 
                 Action addTabAction =
                                 new AddTabAction(contentProvider, labelProvider, tabFolder,
-                                                this, viewers);
+                                                this, this, viewers);
                 addTabAction.setText("add new tab"); // TODO to resource file
                 addTabAction.setToolTipText("add new tab");
-                addTabAction.setImageDescriptor(PlatformUI.getWorkbench()
-                        .getSharedImages().getImageDescriptor(ISharedImages.IMG_TOOL_UP)); // TODO select icon
+                addTabAction.setImageDescriptor(imageRegistry
+                        .getDescriptor(Images.BUTTON_ADD_TAB));
                 actions.put(AddTabAction.ACTION_ID, addTabAction);
         }
@@ -438 +462 @@
         private void hookDoubleClickAction() {
                 for (TableViewer viewer : viewers) {
-                        viewer.addDoubleClickListener(new IDoubleClickListener() {
-                                
-                                public void doubleClick(DoubleClickEvent event) {
-                                        actions.get(ReplyAction.ACTION_ID).run();
-                                }
-                        });
+                        viewer.addDoubleClickListener(this);
                 }
         }
@@ -496 +515 @@
         }
         
+        /**
+         * 現在アクティブなタブのテーブルビューアを取得する。
+         * 
+         * @return テーブルビューア
+         */
+        public TableViewer getCurrentViewer() {
+                int index = tabFolder.getSelectionIndex();
+                return viewers.get(index);
+        }
 }