Commit: 61 - FolderMenu (svn)

OmegaT のメニューバーにフォルダーツリー参照用のメニューを追加します。

Commit MetaInfo

• Revision: 61 (tree)
• Time: 2014-05-01 17:41:37
• Author: yu-tang

Log Message

refactoring

Change Summary

• modified: trunk/src/jp/sourceforge/users/yutang/omegat/plugin/foldermenu/MenuManager.java
• modified: trunk/src/jp/sourceforge/users/yutang/omegat/plugin/foldermenu/Bundle.properties
• modified: trunk/src/jp/sourceforge/users/yutang/omegat/plugin/foldermenu/MenuHelper.java
• modified: trunk/src/jp/sourceforge/users/yutang/omegat/plugin/foldermenu/ShellLinkMenuItem.java
• modified: trunk/src/jp/sourceforge/users/yutang/omegat/plugin/foldermenu/L10n.java
• modified: trunk/src/jp/sourceforge/users/yutang/omegat/plugin/foldermenu/ShellLinkMenu.java
• modified: trunk/src/jp/sourceforge/users/yutang/omegat/plugin/foldermenu/Bundle_ja.properties

Incremental Difference

--- trunk/src/jp/sourceforge/users/yutang/omegat/plugin/foldermenu/MenuManager.java	(revision 60)
+++ trunk/src/jp/sourceforge/users/yutang/omegat/plugin/foldermenu/MenuManager.java	(revision 61)
@@ -1,7 +1,7 @@
 /**************************************************************************
  FolderMenu - easy access to project folders from menu.
  
- Copyright (C) 2013 Yu Tang
+ Copyright (C) 2013-2014 Yu Tang
                Home page: http://sourceforge.jp/users/yu-tang/
                Support center: http://sourceforge.jp/users/yu-tang/
 
@@ -64,11 +64,11 @@
         root.add(new JSeparator());
 
         // Current Source File
-        currentSourceFile = new ShellLinkMenuItem(L10n.getCurrentSourceFileNoneMenuLabel());
+        currentSourceFile = new ShellLinkMenuItem(L10n.getSourceDocumentMenuLabel());
         root.add(currentSourceFile.getMenuItem());
 
         // Current Target File
-        currentTargetFile = new ShellLinkMenuItem(L10n.getCurrentTargetFileNoneMenuLabel());
+        currentTargetFile = new ShellLinkMenuItem(L10n.getTargetDocumentMenuLabel());
         root.add(currentTargetFile.getMenuItem());
 
         // insert Files menu before the last menu (Help menu.)
@@ -92,23 +92,21 @@
     public void linkCurrentSourceFile(File file) throws IOException {
         String sourceRoot = Core.getProject().getProjectProperties().getSourceRoot();
         String midName = FileUtil.computeRelativePath(new File(sourceRoot), file);
-        String label = StaticUtils.format(L10n.getCurrentSourceFileMenuLabel(), midName);
-        currentSourceFile.link(file, label);
+        currentSourceFile.link(file, midName);
     }
 
     public void unlinkCurrentSourceFile() {
-        currentSourceFile.unlink(L10n.getCurrentSourceFileNoneMenuLabel());
+        currentSourceFile.unlink();
     }
 
     public void linkCurrentTargetFile(File file) throws IOException {
         String targetRoot = Core.getProject().getProjectProperties().getTargetRoot();
         String midName = FileUtil.computeRelativePath(new File(targetRoot), file);
-        String label = StaticUtils.format(L10n.getCurrentTargetFileMenuLabel(), midName);
-        currentTargetFile.link(file, label);
+        currentTargetFile.link(file, midName);
     }
 
     public void unlinkCurrentTargetFile() {
-        currentTargetFile.unlink(L10n.getCurrentTargetFileNoneMenuLabel());
+        currentTargetFile.unlink();
     }
 
     private JMenu createLocalizedMenu(String labelString) {

--- trunk/src/jp/sourceforge/users/yutang/omegat/plugin/foldermenu/MenuHelper.java	(revision 60)
+++ trunk/src/jp/sourceforge/users/yutang/omegat/plugin/foldermenu/MenuHelper.java	(revision 61)
@@ -1,7 +1,7 @@
 /**************************************************************************
  FolderMenu - easy access to project folders from menu.
  
- Copyright (C) 2013 Yu Tang
+ Copyright (C) 2013-2014 Yu Tang
                Home page: http://sourceforge.jp/users/yu-tang/
                Support center: http://sourceforge.jp/users/yu-tang/pf/
 
@@ -17,6 +17,7 @@
 package jp.sourceforge.users.yutang.omegat.plugin.foldermenu;
 
 import java.awt.Component;
+import java.awt.Desktop;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.KeyEvent;
@@ -36,9 +37,12 @@
 import javax.swing.event.MenuKeyListener;
 import javax.swing.event.MenuListener;
 import javax.swing.filechooser.FileSystemView;
+import jp.sourceforge.users.yutang.omegat.plugin.foldermenu.filepreview.FilePreview;
 import org.omegat.core.Core;
 import org.omegat.core.data.IProject;
 import org.omegat.util.Log;
+import static org.omegat.util.Platform.getOsType;
+import org.omegat.util.StaticUtils;
 
 /**
  *
@@ -61,7 +65,7 @@
         al = new ActionListener() {
 
             @Override
-            public void actionPerformed(ActionEvent e) { $(e).open(); }
+            public void actionPerformed(ActionEvent e) { open( (JMenuItem) e.getSource()); }
             
         };
 
@@ -80,7 +84,7 @@
                         JMenu menu = (JMenu) selection;
                         if (menu.isEnabled()) {
                             manager.clearSelectedPath();
-                            $(menu).open();
+                            open(menu);
                         }
                     }
                 }
@@ -94,7 +98,7 @@
         mol = new MouseListener() {
 
             @Override
-            public void mouseClicked(MouseEvent e) { $(e).open(); }
+            public void mouseClicked(MouseEvent e) { open((JMenuItem) e.getSource()); }
 
             @Override
             public void mousePressed(MouseEvent e) { /* do nothing */ }
@@ -115,7 +119,7 @@
             @Override
             public void menuSelected(MenuEvent e) {
                 // Lazy create submenus
-                $(e).createChildren();
+                ((ShellLinkMenu) e.getSource()).createChildren();
             }
 
             @Override
@@ -148,29 +152,45 @@
                 }
 
                 if (sourceFile == null || !sourceFile.isFile()) {
-                    menuManager.unlinkCurrentSourceFile();
-                    menuManager.unlinkCurrentTargetFile();
+                    if (prevSourceFile != null) {
+                        menuManager.unlinkCurrentSourceFile();
+                        prevSourceFile = null;
+                    }
+                    if (prevTranslatedFile != null) {
+                        menuManager.unlinkCurrentTargetFile();
+                        prevTranslatedFile = null;
+                    }
                     return;
                 }
                 
                 try {
-                    menuManager.linkCurrentSourceFile(sourceFile);
+                    if (!sourceFile.equals(prevSourceFile)) {
+                        menuManager.linkCurrentSourceFile(sourceFile);
+                        prevSourceFile = sourceFile;
+                    }
                 } catch (IOException ex) {
                     Log.log(ex.getMessage());
                     menuManager.unlinkCurrentSourceFile();
+                    prevSourceFile = null;
                 }
 
                 if (translatedFile == null || !translatedFile.isFile()) {
-                    menuManager.unlinkCurrentTargetFile();
+                    if (prevTranslatedFile != null) {
+                        menuManager.unlinkCurrentTargetFile();
+                        prevTranslatedFile = null;
+                    }
                 } else {
                     try {
-                        menuManager.linkCurrentTargetFile(translatedFile);
+                        if (!translatedFile.equals(prevTranslatedFile)) {
+                            menuManager.linkCurrentTargetFile(translatedFile);
+                            prevTranslatedFile = translatedFile;
+                        }
                     } catch (IOException ex) {
                         Log.log(ex.getMessage());
                         menuManager.unlinkCurrentTargetFile();
+                        prevTranslatedFile = null;
                     }
                 }
-
             }
 
             @Override
@@ -240,26 +260,36 @@
         return comp;
     }
 
-    private static ShellLinkMenuItem $(JMenuItem mi) {
-        return new ShellLinkMenuItem(mi);
-    }
+    private static void open(JMenuItem item) {
+        if (! item.isEnabled()) {
+            return;
+        }
 
-    private static ShellLinkMenu $(JMenu m) {
-        return new ShellLinkMenu(m);
+        String path = item.getActionCommand();
+        try {
+            switch (getOsType()) {
+                case WIN64:
+                case WIN32:
+                    File file = new File(path);
+                    if (! FilePreview.open(file)) {
+                        Desktop.getDesktop().open(file);
+                    }
+                    break;
+                case MAC64:
+                case MAC32:
+                    new ProcessBuilder("open", path).start();
+                    break;
+                default: // Linux and others
+                    new ProcessBuilder("xdg-open", path).start();
+                    break;
+            }
+        } catch (IOException ex) {
+            Log.log(ex);
+            Core.getMainWindow().showMessageDialog(StaticUtils.format(
+                    L10n.getErrMsgFileHasNoAssoc(), path));
+        }
     }
 
-    private static ShellLinkMenuItem $(ActionEvent e) {
-        return new ShellLinkMenuItem((JMenuItem) e.getSource());
-    }
-
-    private static ShellLinkMenu $(MouseEvent e) {
-        return new ShellLinkMenu((JMenu) e.getSource());
-    }
-
-    private static ShellLinkMenu $(MenuEvent e) {
-        return new ShellLinkMenu((JMenu) e.getSource());
-    }
-
     public static void setMenuManager(MenuManager manager) {
         menuManager = manager;
     }
@@ -273,5 +303,7 @@
     private static final MenuListener     melRoot;
     private static final Comparator<File> comp;
     private static       MenuManager      menuManager;
+    private static       File             prevSourceFile;
+    private static       File             prevTranslatedFile;
 
 }

--- trunk/src/jp/sourceforge/users/yutang/omegat/plugin/foldermenu/ShellLinkMenuItem.java	(revision 60)
+++ trunk/src/jp/sourceforge/users/yutang/omegat/plugin/foldermenu/ShellLinkMenuItem.java	(revision 61)
@@ -1,7 +1,7 @@
 /**************************************************************************
  FolderMenu - easy access to project folders from menu.
  
- Copyright (C) 2013 Yu Tang
+ Copyright (C) 2013-2014 Yu Tang
                Home page: http://sourceforge.jp/users/yu-tang/
                Support center: http://sourceforge.jp/users/yu-tang/pf/
 
@@ -16,97 +16,51 @@
 
 package jp.sourceforge.users.yutang.omegat.plugin.foldermenu;
 
-import java.awt.Desktop;
 import java.io.File;
 import java.io.IOException;
 import javax.swing.JMenuItem;
-import org.omegat.core.Core;
-import jp.sourceforge.users.yutang.omegat.plugin.foldermenu.filepreview.FilePreview;
-import org.omegat.util.Log;
-import static org.omegat.util.Platform.OsType.*;
-import static org.omegat.util.Platform.getOsType;
-import org.omegat.util.StaticUtils;
 
 /**
  *
  * @author Yu Tang
  */
-public class ShellLinkMenuItem {
+public class ShellLinkMenuItem extends JMenuItem {
 
-    protected JMenuItem menuItem;
-
     public ShellLinkMenuItem() {
-        menuItem = new JMenuItem();
+        super();
     }
 
-    public ShellLinkMenuItem(JMenuItem mi) {
-        menuItem = mi;
-    }
-    
     public ShellLinkMenuItem(File file) throws IOException {
-        JMenuItem m = new JMenuItem(file.getName(), MenuHelper.getIcon(file));
-        m.setActionCommand(file.getCanonicalPath());
-        m.addActionListener(MenuHelper.getActionListener());
-        menuItem = m;
+        super(file.getName(), MenuHelper.getIcon(file));
+        setActionCommand(file.getCanonicalPath());
+        addActionListener(MenuHelper.getActionListener());
     }
 
     public ShellLinkMenuItem(String label) {
-        menuItem = new JMenuItem(label);
-        menuItem.setEnabled(false);
+        super(label);
+        setEnabled(false);
     }
-    
-    public boolean isEnabled() {
-        return menuItem.isEnabled();
-    }
-    
+
     public JMenuItem getMenuItem() {
-        return menuItem;
+        return (JMenuItem) this;
     }
 
-    public void link(File file, String label) throws IOException {
-        menuItem.setActionCommand(file.getCanonicalPath());
-        menuItem.setIcon(MenuHelper.getIcon(file));
-        menuItem.setEnabled(true);
-        menuItem.setText(label);
-        if (menuItem.getActionListeners().length == 0) {
-            menuItem.addActionListener(MenuHelper.getActionListener());
+    public void link(File file, String toolTipText) throws IOException {
+        setToolTipText(toolTipText);
+        setActionCommand(file.getCanonicalPath());
+        setIcon(MenuHelper.getIcon(file));
+        setEnabled(true);
+        
+        if (getActionListeners().length == 0) {
+            addActionListener(MenuHelper.getActionListener());
         }
     }
 
-    public void unlink(String label) {
-        menuItem.setEnabled(false);
-        menuItem.setActionCommand("");
-        menuItem.setIcon(null);
-        menuItem.setText(label);
+    public void unlink() {
+        setToolTipText(null);
+        setEnabled(false);
+        setActionCommand("");
+        setIcon(null);
     }
 
-    public void open() {
-        if (! menuItem.isEnabled()) {
-            return;
-        }
-
-        String path = menuItem.getActionCommand();
-        try {
-            switch (getOsType()) {
-                case WIN64:
-                case WIN32:
-                    File file = new File(path);
-                    if (! FilePreview.open(file)) {
-                        Desktop.getDesktop().open(file);
-                    }
-                    break;
-                case MAC64:
-                case MAC32:
-                    new ProcessBuilder("open", path).start();
-                    break;
-                default: // Linux and others
-                    new ProcessBuilder("xdg-open", path).start();
-                    break;
-            }
-        } catch (IOException ex) {
-            Log.log(ex);
-            Core.getMainWindow().showMessageDialog(StaticUtils.format(
-                    L10n.getErrMsgFileHasNoAssoc(), path));
-        }
-    }
 }

--- trunk/src/jp/sourceforge/users/yutang/omegat/plugin/foldermenu/L10n.java	(revision 60)
+++ trunk/src/jp/sourceforge/users/yutang/omegat/plugin/foldermenu/L10n.java	(revision 61)
@@ -1,7 +1,7 @@
 /**************************************************************************
  FolderMenu - easy access to project folders from menu.
  
- Copyright (C) 2013 Yu Tang
+ Copyright (C) 2013-2014 Yu Tang
                Home page: http://sourceforge.jp/users/yu-tang/
                Support center: http://sourceforge.jp/users/yu-tang/
 
@@ -43,22 +43,14 @@
     public static String getUserConfigMenuLabel() {
         return bundle.getString("USER_CONFIG_MENU_LABEL");
     }
-    
-    public static String getCurrentSourceFileNoneMenuLabel() {
-        return bundle.getString("CURRENT_SOURCE_FILE_NONE_MENU_LABEL");
+
+    public static String getSourceDocumentMenuLabel() {
+        return bundle.getString("SOURCE_DOC_MENU_LABEL");
     }
     
-    public static String getCurrentTargetFileNoneMenuLabel() {
-        return bundle.getString("CURRENT_TARGET_FILE_NONE_MENU_LABEL");
+    public static String getTargetDocumentMenuLabel() {
+        return bundle.getString("TARGET_DOC_MENU_LABEL");
     }
-    
-    public static String getCurrentSourceFileMenuLabel() {
-        return bundle.getString("CURRENT_SOURCE_FILE_MENU_LABEL");
-    }
-    
-    public static String getCurrentTargetFileMenuLabel() {
-        return bundle.getString("CURRENT_TARGET_FILE_MENU_LABEL");
-    }
 
     // for Word
 

--- trunk/src/jp/sourceforge/users/yutang/omegat/plugin/foldermenu/ShellLinkMenu.java	(revision 60)
+++ trunk/src/jp/sourceforge/users/yutang/omegat/plugin/foldermenu/ShellLinkMenu.java	(revision 61)
@@ -1,7 +1,7 @@
 /**************************************************************************
  FolderMenu - easy access to project folders from menu.
  
- Copyright (C) 2013 Yu Tang
+ Copyright (C) 2013-2014 Yu Tang
                Home page: http://sourceforge.jp/users/yu-tang/
                Support center: http://sourceforge.jp/users/yu-tang/pf/
 
@@ -22,7 +22,6 @@
 import javax.swing.JMenu;
 import static jp.sourceforge.users.yutang.omegat.plugin.foldermenu.MenuHelper.getComparator;
 import static jp.sourceforge.users.yutang.omegat.plugin.foldermenu.MenuHelper.getFilteredListFiles;
-import static jp.sourceforge.users.yutang.omegat.plugin.foldermenu.MenuHelper.getIcon;
 import static jp.sourceforge.users.yutang.omegat.plugin.foldermenu.MenuHelper.getMenuListener;
 import static jp.sourceforge.users.yutang.omegat.plugin.foldermenu.MenuHelper.getMouseListener;
 import org.omegat.util.Log;
@@ -32,46 +31,38 @@
  *
  * @author Yu Tang
  */
-public class ShellLinkMenu extends ShellLinkMenuItem {
+public class ShellLinkMenu extends JMenu {
 
-    public ShellLinkMenu(JMenu m) {
-        super(m);
+    @SuppressWarnings("LeakingThisInConstructor")
+    public ShellLinkMenu(File folder, String label) throws IOException {
+        this(folder);
+        Mnemonics.setLocalizedText(this, label);
     }
 
     public ShellLinkMenu(File folder) throws IOException {
-        this(folder, null);
+        super(folder.getName());
+
+        addMenuListener(getMenuListener());
+        addMouseListener(getMouseListener());
+
+        setIcon(MenuHelper.getIcon(folder));
+        setActionCommand(folder.getCanonicalPath());
     }
 
+    @SuppressWarnings("LeakingThisInConstructor")
     public ShellLinkMenu(String label) throws IOException {
-        this(null, label);
-    }
+        super();
+        Mnemonics.setLocalizedText(this, label);
 
-    public ShellLinkMenu(File folder, String label) throws IOException {
-        JMenu m;
-        if (label == null) {
-            m = new JMenu(folder.getName());
-        } else {
-            m = new JMenu();
-            Mnemonics.setLocalizedText(m, label);
-        }
-        
-        m.addMenuListener(getMenuListener());
-        m.addMouseListener(getMouseListener());
-        
-        if (folder != null) {
-            m.setIcon(getIcon(folder));
-            m.setActionCommand(folder.getCanonicalPath());
-        } else {
-            m.setEnabled(false);     
-        }
-
-        menuItem = m;
+        addMenuListener(getMenuListener());
+        addMouseListener(getMouseListener());
+ 
+        setEnabled(false);
     }
 
     public void createChildren() {
-        JMenu menu = (JMenu) menuItem;
-        if (menu.isEnabled() && menu.getItemCount() == 0) {
-            File folder = new File(menu.getActionCommand());
+        if (isEnabled() && getItemCount() == 0) {
+            File folder = new File(getActionCommand());
             File[] filteredListFiles = getFilteredListFiles(folder);
             Arrays.sort(filteredListFiles, getComparator());
 
@@ -78,9 +69,9 @@
             for (File file : filteredListFiles) {
                 try {
                     if (file.isDirectory() && hasChildren(file)) {
-                        menu.add(new ShellLinkMenu(file).getMenuItem());
+                        add(new ShellLinkMenu(file));
                     } else {
-                        menu.add(new ShellLinkMenuItem(file).getMenuItem());
+                        add(new ShellLinkMenuItem(file));
                     }
                 } catch (IOException ex) {
                     Log.log(ex);
@@ -90,25 +81,24 @@
     }
     
     public JMenu getMenu() {
-        return (JMenu) menuItem;
+        return (JMenu) this;
     }
 
     public void link(File folder) throws IOException {
-        JMenu menu = (JMenu) menuItem;
-        menu.setActionCommand(folder.getCanonicalPath());
-        menu.setIcon(getIcon(folder));
-        menu.setEnabled(true);
+        setActionCommand(folder.getCanonicalPath());
+        setIcon(MenuHelper.getIcon(folder));
+        setEnabled(true);
     }
 
     public void unlink() {
-        JMenu menu = (JMenu) menuItem;
-        menu.setEnabled(false);
-        menu.removeAll();
-        menu.setActionCommand("");
-        menu.setIcon(null);
+        setEnabled(false);
+        removeAll();
+        setActionCommand("");
+        setIcon(null);
     }
 
     private boolean hasChildren(File folder) {
         return getFilteredListFiles(folder).length > 0;
     }
+
 }