diff --git a/icons/magnetron/suspend_co.png b/icons/magnetron/suspend_co.png deleted file mode 100644 index f7c9eae..0000000 --- a/icons/magnetron/suspend_co.png +++ /dev/null Binary files differ diff --git a/icons/magnetron/terminate_co.png b/icons/magnetron/terminate_co.png deleted file mode 100644 index 3544673..0000000 --- a/icons/magnetron/terminate_co.png +++ /dev/null Binary files differ diff --git a/res/icons/suspend_co.png b/res/icons/suspend_co.png new file mode 100644 index 0000000..f7c9eae --- /dev/null +++ b/res/icons/suspend_co.png Binary files differ diff --git a/res/icons/terminate_co.png b/res/icons/terminate_co.png new file mode 100644 index 0000000..3544673 --- /dev/null +++ b/res/icons/terminate_co.png Binary files differ diff --git a/res/strings/en.properties b/res/strings/en.properties new file mode 100644 index 0000000..3344738 --- /dev/null +++ b/res/strings/en.properties @@ -0,0 +1,12 @@ +open_file=Open File... +pause_animation=Pause +start_animation=Start +stop_animation=Stop +zoom_in=Zoom In +zoom_out=Zoom Out +file_desc=MagnetRON File� +file=File +extract_feature=Extract Feature +anim_settings=Animation Settings +normal=Normal +view=View \ No newline at end of file diff --git a/res/strings/ja.properties b/res/strings/ja.properties new file mode 100644 index 0000000..eda5566 --- /dev/null +++ b/res/strings/ja.properties @@ -0,0 +1,13 @@ +open_file=\u958B\u304F... +pause_animation=\u4E00\u6642\u505C\u6B62 +start_animation=\u518D\u751F�� +stop_animation=\u7D42\u4E86� +zoom_in=\u62E1\u5927 +zoom_out=\u7E2E\u5C0F +file_desc=MagnetRON\u30D5\u30A1\u30A4\u30EB +file=\u30D5\u30A1\u30A4\u30EB +extract_feature=\u6A5F\u80FD\u62BD\u51FA +anim_settings=\u30A2\u30CB\u30E1\u30FC\u30B7\u30E7\u30F3\u8A2D\u5B9A +normal=\u901A\u5E38 +view=\u8868\u793A + diff --git a/src/icons/suspend_co.png b/src/icons/suspend_co.png deleted file mode 100644 index f7c9eae..0000000 --- a/src/icons/suspend_co.png +++ /dev/null Binary files differ diff --git a/src/icons/terminate_co.png b/src/icons/terminate_co.png deleted file mode 100644 index 3544673..0000000 --- a/src/icons/terminate_co.png +++ /dev/null Binary files differ diff --git a/src/org/ntlab/actions/AbstractMagnetRONAction.java b/src/org/ntlab/actions/AbstractMagnetRONAction.java index 2033193..4b02bcd 100644 --- a/src/org/ntlab/actions/AbstractMagnetRONAction.java +++ b/src/org/ntlab/actions/AbstractMagnetRONAction.java @@ -6,15 +6,22 @@ import org.ntlab.deltaViewer.IMagnetRON; +/** + * + * + * @author Nitta Lab. + */ public class AbstractMagnetRONAction extends AbstractAction { + private static final long serialVersionUID = -6043745804857798325L; + protected IMagnetRON magnetRON = null; public AbstractMagnetRONAction() { } - public AbstractMagnetRONAction(String string, IMagnetRON magnetRON) { - super(string); + public AbstractMagnetRONAction(String name, IMagnetRON magnetRON) { + super(name); this.magnetRON = magnetRON; } diff --git a/src/org/ntlab/actions/OpenAction.java b/src/org/ntlab/actions/OpenAction.java index 385590b..2a70ecf 100644 --- a/src/org/ntlab/actions/OpenAction.java +++ b/src/org/ntlab/actions/OpenAction.java @@ -9,15 +9,30 @@ import org.ntlab.deltaViewer.IMagnetRON; +/** + * + * + * @author Nitta Lab. + */ public class OpenAction extends AbstractMagnetRONAction { - private String lastDir = null; + private static final long serialVersionUID = -3935721814268952040L; + private String lastDir = null; + private String fileDesc = "MagnetRON File"; public OpenAction(IMagnetRON magnetRON) { -// super("開く...", magnetRON); super("Open File...", magnetRON); } + public OpenAction(String name, IMagnetRON magnetRON) { + super(name, magnetRON); + } + + public OpenAction(String name, IMagnetRON magnetRON, String fileDesc) { + super(name, magnetRON); + this.fileDesc = fileDesc; + } + @Override public void actionPerformed(ActionEvent e) { String wd = (lastDir != null) ? lastDir : System.getProperty("user.dir"); @@ -52,8 +67,7 @@ } @Override public String getDescription() { -// return "MagnetRONファイル"; - return "MagnetRON File"; + return fileDesc; } }; fc.addChoosableFileFilter(defaultFilter); diff --git a/src/org/ntlab/actions/PauseAnimationAction.java b/src/org/ntlab/actions/PauseAnimationAction.java index 255ce31..bc38e44 100644 --- a/src/org/ntlab/actions/PauseAnimationAction.java +++ b/src/org/ntlab/actions/PauseAnimationAction.java @@ -4,13 +4,23 @@ import org.ntlab.deltaViewer.IMagnetRON; +/** + * + * + * @author Nitta Lab. + */ public class PauseAnimationAction extends AbstractMagnetRONAction { + private static final long serialVersionUID = 3866653096063437477L; + public PauseAnimationAction(IMagnetRON magnetRON) { -// super("�ꎞ��~", magnetRON); super("Pause", magnetRON); } + public PauseAnimationAction(String name, IMagnetRON magnetRON) { + super(name, magnetRON); + } + @Override public void actionPerformed(ActionEvent e) { magnetRON.pauseAnimation(); diff --git a/src/org/ntlab/actions/StartAnimationAction.java b/src/org/ntlab/actions/StartAnimationAction.java index 4020b40..782177f 100644 --- a/src/org/ntlab/actions/StartAnimationAction.java +++ b/src/org/ntlab/actions/StartAnimationAction.java @@ -4,13 +4,23 @@ import org.ntlab.deltaViewer.IMagnetRON; +/** + * + * + * @author Nitta Lab. + */ public class StartAnimationAction extends AbstractMagnetRONAction { + private static final long serialVersionUID = -6737903367467763719L; + public StartAnimationAction(IMagnetRON magnetRON) { -// super("�Đ�", magnetRON); super("Start", magnetRON); } + public StartAnimationAction(String name, IMagnetRON magnetRON) { + super(name, magnetRON); + } + @Override public void actionPerformed(ActionEvent e) { magnetRON.startAnimation(); diff --git a/src/org/ntlab/actions/StopAnimationAction.java b/src/org/ntlab/actions/StopAnimationAction.java index 41bcf64..8f73449 100644 --- a/src/org/ntlab/actions/StopAnimationAction.java +++ b/src/org/ntlab/actions/StopAnimationAction.java @@ -4,13 +4,23 @@ import org.ntlab.deltaViewer.IMagnetRON; +/** + * + * + * @author Nitta Lab. + */ public class StopAnimationAction extends AbstractMagnetRONAction { + private static final long serialVersionUID = 8106590890493246008L; + public StopAnimationAction(IMagnetRON magnetRON) { -// super("�I��", magnetRON); super("Stop", magnetRON); } + public StopAnimationAction(String name, IMagnetRON magnetRON) { + super(name, magnetRON); + } + @Override public void actionPerformed(ActionEvent e) { magnetRON.stopAnimation(); diff --git a/src/org/ntlab/actions/ZoomInAction.java b/src/org/ntlab/actions/ZoomInAction.java index 09e4d9e..7e59022 100644 --- a/src/org/ntlab/actions/ZoomInAction.java +++ b/src/org/ntlab/actions/ZoomInAction.java @@ -4,12 +4,23 @@ import org.ntlab.deltaViewer.MagnetRONViewer; +/** + * + * + * @author Nitta Lab. + */ public class ZoomInAction extends AbstractViewerAction { + + private static final long serialVersionUID = -1538971870320664372L; + public ZoomInAction(MagnetRONViewer viewer) { -// super("�g��", viewer); super("Zoom In", viewer); } + public ZoomInAction(String name, MagnetRONViewer viewer) { + super(name, viewer); + } + @Override public void actionPerformed(ActionEvent arg0) { viewer.getGraphComponent().zoomIn(); diff --git a/src/org/ntlab/actions/ZoomOutAction.java b/src/org/ntlab/actions/ZoomOutAction.java index 74a49dd..179715c 100644 --- a/src/org/ntlab/actions/ZoomOutAction.java +++ b/src/org/ntlab/actions/ZoomOutAction.java @@ -4,12 +4,23 @@ import org.ntlab.deltaViewer.MagnetRONViewer; +/** + * + * + * @author Nitta Lab. + */ public class ZoomOutAction extends AbstractViewerAction { + + private static final long serialVersionUID = 166649313967590302L; + public ZoomOutAction(MagnetRONViewer viewer) { -// super("�k��", viewer); super("Zoom Out", viewer); } + public ZoomOutAction(String name, MagnetRONViewer viewer) { + super(name, viewer); + } + @Override public void actionPerformed(ActionEvent arg0) { viewer.getGraphComponent().zoomOut(); diff --git a/src/org/ntlab/deltaViewer/MagnetRONFrame.java b/src/org/ntlab/deltaViewer/MagnetRONFrame.java index 2b8f2fd..b0284ed 100644 --- a/src/org/ntlab/deltaViewer/MagnetRONFrame.java +++ b/src/org/ntlab/deltaViewer/MagnetRONFrame.java @@ -7,17 +7,11 @@ import java.awt.image.ImageProducer; import java.io.BufferedReader; import java.io.File; -import java.io.FileNotFoundException; -import java.io.FileOutputStream; import java.io.FileReader; import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; import java.net.URL; import java.util.AbstractMap; import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -52,6 +46,9 @@ import org.ntlab.trace.TracePoint; public class MagnetRONFrame extends JFrame implements IMagnetRON { + + private static final long serialVersionUID = -7635196578197342313L; + private static Dimension DEFAULT_SIZE = new Dimension(1300, 700); private static String WINDOW_TITLE = "MagnetRON Viewer "; @@ -89,12 +86,10 @@ startImage = this.createImage((ImageProducer) startUrl.getContent()); pauseImage = this.createImage((ImageProducer) pauseUrl.getContent()); stopImage = this.createImage((ImageProducer) stopUrl.getContent()); - }catch(Exception ex){ - System.out.println("Resource Error!"); - startImage=null; - pauseUrl = null; - stopUrl = null; + }catch(Exception e){ + System.out.println("Load resource error!"); } + JButton startButton = new JButton(new ImageIcon(startImage, "Start")); startButton.addActionListener(new StartAnimationAction(this)); toolBar.add(startButton); diff --git a/src/org/ntlab/deltaViewer/MagnetRONMenuBar.java b/src/org/ntlab/deltaViewer/MagnetRONMenuBar.java index 64c4cdc..af709e3 100644 --- a/src/org/ntlab/deltaViewer/MagnetRONMenuBar.java +++ b/src/org/ntlab/deltaViewer/MagnetRONMenuBar.java @@ -1,7 +1,9 @@ package org.ntlab.deltaViewer; +import java.io.InputStream; import java.util.List; import java.util.Locale; +import java.util.Properties; import javax.swing.JCheckBox; import javax.swing.JMenu; @@ -14,7 +16,15 @@ import org.ntlab.featureExtractor.Feature; import org.ntlab.actions.ZoomActualAction; +/** + * + * + * @author Nitta Lab. + */ public class MagnetRONMenuBar extends JMenuBar { + + private static final long serialVersionUID = 4967305187008413238L; + private MagnetRONFrame magnetRON; private JMenu extractsMenu; @@ -22,26 +32,38 @@ super(); this.magnetRON = magnetRON; - Locale.setDefault(Locale.ENGLISH); -// JMenu fileMenu = add(new JMenu("�t�@�C��")); - JMenu fileMenu = add(new JMenu("File")); - fileMenu.add(new OpenAction(magnetRON)); +// Locale.setDefault(Locale.ENGLISH); + Locale local = Locale.getDefault(); + String language = local.getLanguage(); + String languageFile = null; + if(language.equals("ja") ){ + languageFile = "/strings/ja.properties"; + }else{ + languageFile = "/strings/en.properties"; + } + + Properties properties = new Properties(); + try { + InputStream langFileIn = this.getClass().getResourceAsStream(languageFile); + properties.load(langFileIn); + } catch (Exception e) { + System.out.println("Load properties error!"); + } -// extractsMenu = add(new JMenu("�@�\���o")); - extractsMenu = add(new JMenu("Extract Feature")); + JMenu fileMenu = add(new JMenu(properties.getProperty("file"))); + fileMenu.add(new OpenAction(properties.getProperty("open_file"), magnetRON, properties.getProperty("file_desc"))); -// JMenu animationSettingMenu = add(new JMenu("�A�j���[�V�����ݒ�")); - JMenu animationSettingMenu = add(new JMenu("Animation Settings")); -// JCheckBox defaultCheck = new JCheckBox("�ʏ�", true); - JCheckBox defaultCheck = new JCheckBox("Normal", true); + extractsMenu = add(new JMenu(properties.getProperty("extract_feature"))); + + JMenu animationSettingMenu = add(new JMenu(properties.getProperty("anim_settings"))); + JCheckBox defaultCheck = new JCheckBox(properties.getProperty("normal"), true); defaultCheck.addActionListener(new ZoomActualAction(magnetRON.getViewer())); defaultCheck.setEnabled(false); animationSettingMenu.add(defaultCheck); -// JMenu viewMenu = add(new JMenu("�\��")); - JMenu viewMenu = add(new JMenu("View")); - viewMenu.add(new ZoomInAction(magnetRON.getViewer())); - viewMenu.add(new ZoomOutAction(magnetRON.getViewer())); + JMenu viewMenu = add(new JMenu(properties.getProperty("view"))); + viewMenu.add(new ZoomInAction(properties.getProperty("zoom_in"), magnetRON.getViewer())); + viewMenu.add(new ZoomOutAction(properties.getProperty("zoom_out"), magnetRON.getViewer())); viewMenu.add(new ZoomActualAction(magnetRON.getViewer())); }