diff --git a/src/icons/resume_co.png b/src/icons/resume_co.png new file mode 100644 index 0000000..67c1611 --- /dev/null +++ b/src/icons/resume_co.png Binary files differ diff --git a/src/icons/suspend_co.png b/src/icons/suspend_co.png new file mode 100644 index 0000000..f7c9eae --- /dev/null +++ b/src/icons/suspend_co.png Binary files differ diff --git a/src/icons/terminate_co.png b/src/icons/terminate_co.png new file mode 100644 index 0000000..3544673 --- /dev/null +++ b/src/icons/terminate_co.png Binary files differ diff --git a/src/org/ntlab/actions/OpenAction.java b/src/org/ntlab/actions/OpenAction.java index ed7b40c..385590b 100644 --- a/src/org/ntlab/actions/OpenAction.java +++ b/src/org/ntlab/actions/OpenAction.java @@ -4,6 +4,7 @@ import java.io.File; import javax.swing.JFileChooser; +import javax.swing.UIManager; import javax.swing.filechooser.FileFilter; import org.ntlab.deltaViewer.IMagnetRON; @@ -13,14 +14,37 @@ private String lastDir = null; public OpenAction(IMagnetRON magnetRON) { - super("�J��...", magnetRON); +// super("開く...", magnetRON); + super("Open File...", magnetRON); } @Override public void actionPerformed(ActionEvent e) { String wd = (lastDir != null) ? lastDir : System.getProperty("user.dir"); + UIManager.put("FileChooser.acceptAllFileFilterText", "All files"); + UIManager.put("FileChooser.lookInLabelText", "Location"); + UIManager.put("FileChooser.cancelButtonText", "Cancel"); + UIManager.put("FileChooser.cancelButtonToolTipText", "Cancel"); + UIManager.put("FileChooser.openButtonText", "Open"); + UIManager.put("FileChooser.openButtonToolTipText", "Open File"); + UIManager.put("FileChooser.filesOfTypeLabelText", "Type"); + UIManager.put("FileChooser.fileNameLabelText", "File"); + UIManager.put("FileChooser.listViewButtonToolTipText", "List"); + UIManager.put("FileChooser.listViewButtonAccessibleName", "List"); + UIManager.put("FileChooser.detailsViewButtonToolTipText", "Details"); + UIManager.put("FileChooser.detailsViewButtonAccessibleName", "Details"); + UIManager.put("FileChooser.upFolderToolTipText", "Up one level"); + UIManager.put("FileChooser.upFolderAccessibleName", "Up one level"); + UIManager.put("FileChooser.homeFolderToolTipText", "Workplace"); + UIManager.put("FileChooser.homeFolderAccessibleName", "Workplace"); + UIManager.put("FileChooser.fileNameHeaderText", "Name"); + UIManager.put("FileChooser.fileSizeHeaderText", "Size"); + UIManager.put("FileChooser.fileTypeHeaderText", "Type"); + UIManager.put("FileChooser.fileDateHeaderText", "Date"); + UIManager.put("FileChooser.fileAttrHeaderText", "Attributes"); + UIManager.put("FileChooser.openDialogTitleText","Open file"); + UIManager.put("FileChooser.readOnly", Boolean.TRUE); JFileChooser fc = new JFileChooser(wd); - // Adds file filter for supported file format FileFilter defaultFilter = new FileFilter() { public boolean accept(File file) { String lcase = file.getName().toLowerCase(); @@ -28,7 +52,8 @@ } @Override public String getDescription() { - return "MagnetRON�t�@�C��"; +// return "MagnetRONファイル"; + return "MagnetRON File"; } }; fc.addChoosableFileFilter(defaultFilter); diff --git a/src/org/ntlab/actions/PauseAnimationAction.java b/src/org/ntlab/actions/PauseAnimationAction.java index 1d10340..255ce31 100644 --- a/src/org/ntlab/actions/PauseAnimationAction.java +++ b/src/org/ntlab/actions/PauseAnimationAction.java @@ -7,7 +7,8 @@ public class PauseAnimationAction extends AbstractMagnetRONAction { public PauseAnimationAction(IMagnetRON magnetRON) { - super("�ꎞ��~", magnetRON); +// super("�ꎞ��~", magnetRON); + super("Pause", magnetRON); } @Override diff --git a/src/org/ntlab/actions/StartAnimationAction.java b/src/org/ntlab/actions/StartAnimationAction.java index c065303..4020b40 100644 --- a/src/org/ntlab/actions/StartAnimationAction.java +++ b/src/org/ntlab/actions/StartAnimationAction.java @@ -7,7 +7,8 @@ public class StartAnimationAction extends AbstractMagnetRONAction { public StartAnimationAction(IMagnetRON magnetRON) { - super("�Đ�", magnetRON); +// super("�Đ�", magnetRON); + super("Start", magnetRON); } @Override diff --git a/src/org/ntlab/actions/StopAnimationAction.java b/src/org/ntlab/actions/StopAnimationAction.java index 6372c4f..41bcf64 100644 --- a/src/org/ntlab/actions/StopAnimationAction.java +++ b/src/org/ntlab/actions/StopAnimationAction.java @@ -7,7 +7,8 @@ public class StopAnimationAction extends AbstractMagnetRONAction { public StopAnimationAction(IMagnetRON magnetRON) { - super("�I��", magnetRON); +// super("�I��", magnetRON); + super("Stop", magnetRON); } @Override diff --git a/src/org/ntlab/actions/ZoomInAction.java b/src/org/ntlab/actions/ZoomInAction.java index e8c9e83..09e4d9e 100644 --- a/src/org/ntlab/actions/ZoomInAction.java +++ b/src/org/ntlab/actions/ZoomInAction.java @@ -6,7 +6,8 @@ public class ZoomInAction extends AbstractViewerAction { public ZoomInAction(MagnetRONViewer viewer) { - super("�g��", viewer); +// super("�g��", viewer); + super("Zoom In", viewer); } @Override diff --git a/src/org/ntlab/actions/ZoomOutAction.java b/src/org/ntlab/actions/ZoomOutAction.java index ddd5b85..74a49dd 100644 --- a/src/org/ntlab/actions/ZoomOutAction.java +++ b/src/org/ntlab/actions/ZoomOutAction.java @@ -6,7 +6,8 @@ public class ZoomOutAction extends AbstractViewerAction { public ZoomOutAction(MagnetRONViewer viewer) { - super("�k��", viewer); +// super("�k��", viewer); + super("Zoom Out", viewer); } @Override diff --git a/src/org/ntlab/deltaViewer/MagnetRONFrame.java b/src/org/ntlab/deltaViewer/MagnetRONFrame.java index f30c920..2b8f2fd 100644 --- a/src/org/ntlab/deltaViewer/MagnetRONFrame.java +++ b/src/org/ntlab/deltaViewer/MagnetRONFrame.java @@ -3,11 +3,17 @@ import java.awt.BorderLayout; import java.awt.Dimension; import java.awt.HeadlessException; +import java.awt.Image; +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; @@ -73,13 +79,29 @@ setJMenuBar(menuBar); JToolBar toolBar = new JToolBar(); - JButton startButton = new JButton(new ImageIcon("icons/magnetron/resume_co.png")); + Image startImage = null; + Image pauseImage = null; + Image stopImage = null; + URL startUrl = this.getClass().getResource("/icons/resume_co.png"); + URL pauseUrl = this.getClass().getResource("/icons/suspend_co.png"); + URL stopUrl = this.getClass().getResource("/icons/terminate_co.png"); + try { + 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; + } + JButton startButton = new JButton(new ImageIcon(startImage, "Start")); startButton.addActionListener(new StartAnimationAction(this)); toolBar.add(startButton); - JButton suspendButton = new JButton(new ImageIcon("icons/magnetron/suspend_co.png")); + JButton suspendButton = new JButton(new ImageIcon(pauseImage, "Pause")); suspendButton.addActionListener(new PauseAnimationAction(this)); toolBar.add(suspendButton); - JButton terminateButton = new JButton(new ImageIcon("icons/magnetron/terminate_co.png")); + JButton terminateButton = new JButton(new ImageIcon(stopImage, "Stop")); terminateButton.addActionListener(new StopAnimationAction(this)); toolBar.add(terminateButton); add(toolBar, BorderLayout.NORTH); diff --git a/src/org/ntlab/deltaViewer/MagnetRONMenuBar.java b/src/org/ntlab/deltaViewer/MagnetRONMenuBar.java index 6530248..64c4cdc 100644 --- a/src/org/ntlab/deltaViewer/MagnetRONMenuBar.java +++ b/src/org/ntlab/deltaViewer/MagnetRONMenuBar.java @@ -1,6 +1,7 @@ package org.ntlab.deltaViewer; import java.util.List; +import java.util.Locale; import javax.swing.JCheckBox; import javax.swing.JMenu; @@ -21,18 +22,24 @@ super(); this.magnetRON = magnetRON; - JMenu fileMenu = add(new JMenu("�t�@�C��")); + Locale.setDefault(Locale.ENGLISH); +// JMenu fileMenu = add(new JMenu("�t�@�C��")); + JMenu fileMenu = add(new JMenu("File")); fileMenu.add(new OpenAction(magnetRON)); - extractsMenu = add(new JMenu("�@�\���o")); +// extractsMenu = add(new JMenu("�@�\���o")); + extractsMenu = add(new JMenu("Extract Feature")); - JMenu animationSettingMenu = add(new JMenu("�A�j���[�V�����ݒ�")); - JCheckBox defaultCheck = new JCheckBox("�ʏ�", true); +// 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); defaultCheck.addActionListener(new ZoomActualAction(magnetRON.getViewer())); defaultCheck.setEnabled(false); animationSettingMenu.add(defaultCheck); - JMenu viewMenu = add(new JMenu("�\��")); +// JMenu viewMenu = add(new JMenu("�\��")); + JMenu viewMenu = add(new JMenu("View")); viewMenu.add(new ZoomInAction(magnetRON.getViewer())); viewMenu.add(new ZoomOutAction(magnetRON.getViewer())); viewMenu.add(new ZoomActualAction(magnetRON.getViewer())); diff --git a/traces/ArgoUML.magnet b/traces/ArgoUML.magnet index d3ac3a1..08d9e02 100644 --- a/traces/ArgoUML.magnet +++ b/traces/ArgoUML.magnet @@ -2,7 +2,7 @@ "trace": "ArgoUMLBenchmarkWithMoreStandardClasses.trace", "features": [ { - "feature": "ArgoUML�}�`�폜�@�\", + "feature": "ArgoUML (Delete Figure)", "extracts": [ { "src": { @@ -31,7 +31,7 @@ ] }, { - "feature": "ArgoUML�}�`�I���@�\", + "feature": "ArgoUML (Select Figure)", "extracts": [ { "src": { diff --git a/traces/JHotDraw.magnet b/traces/JHotDraw.magnet index c33ea20..52f5305 100644 --- a/traces/JHotDraw.magnet +++ b/traces/JHotDraw.magnet @@ -2,7 +2,7 @@ "trace": "jHotDrawBenchmarkWithMoreStandardClasses.trace", "features": [ { - "feature": "JHotDraw�}�`�ړ��@�\", + "feature": "JHotDraw (Transform Figure)", "extracts": [ { "src": { @@ -19,7 +19,7 @@ ] }, { - "feature": "JHotDraw�}�`�I���@�\", + "feature": "JHotDraw (Select Figure)", "extracts": [ { "src": { diff --git a/traces/TinyProblemA1_B1_C1_D1.magnet b/traces/TinyProblemA1_B1_C1_D1.magnet index 8c7c905..88eddea 100644 --- a/traces/TinyProblemA1_B1_C1_D1.magnet +++ b/traces/TinyProblemA1_B1_C1_D1.magnet @@ -2,7 +2,7 @@ "trace": "pre_Exp1.trace", "features": [ { - "feature": "���ۑ�A1/B1/C1/D1", + "feature": "AP1", "extracts": [ { "src": { diff --git a/traces/TinyProblemA2_B2_C6_D6.magnet b/traces/TinyProblemA2_B2_C6_D6.magnet index 52d0921..7eddd32 100644 --- a/traces/TinyProblemA2_B2_C6_D6.magnet +++ b/traces/TinyProblemA2_B2_C6_D6.magnet @@ -2,7 +2,7 @@ "trace": "pre_Exp2.trace", "features": [ { - "feature": "���ۑ�A2/B2/C6/D6", + "feature": "AP2", "extracts": [ { "src": { diff --git a/traces/TinyProblemA3_B3_C5_D5.magnet b/traces/TinyProblemA3_B3_C5_D5.magnet index 2c8f4d6..d89c9b4 100644 --- a/traces/TinyProblemA3_B3_C5_D5.magnet +++ b/traces/TinyProblemA3_B3_C5_D5.magnet @@ -2,7 +2,7 @@ "trace": "pre_Exp3.trace", "features": [ { - "feature": "���ۑ�A3/B3/C5/D5", + "feature": "AP3", "extracts": [ { "src": { diff --git a/traces/TinyProblemA4_B4_C4_D4.magnet b/traces/TinyProblemA4_B4_C4_D4.magnet index 0178ec2..f36ad78 100644 --- a/traces/TinyProblemA4_B4_C4_D4.magnet +++ b/traces/TinyProblemA4_B4_C4_D4.magnet @@ -2,7 +2,7 @@ "trace": "pre_Exp4.trace", "features": [ { - "feature": "���ۑ�A4/B4/C4/D4", + "feature": "AP4", "extracts": [ { "src": { diff --git a/traces/TinyProblemA5_B5_C3_D3.magnet b/traces/TinyProblemA5_B5_C3_D3.magnet index 0c5d960..42d9f51 100644 --- a/traces/TinyProblemA5_B5_C3_D3.magnet +++ b/traces/TinyProblemA5_B5_C3_D3.magnet @@ -2,7 +2,7 @@ "trace": "pre_Exp5.trace", "features": [ { - "feature": "���ۑ�A5/B5/C3/D3", + "feature": "AP5", "extracts": [ { "src": { diff --git a/traces/TinyProblemA6_B6_C2_D2.magnet b/traces/TinyProblemA6_B6_C2_D2.magnet index 446c491..6fae9b7 100644 --- a/traces/TinyProblemA6_B6_C2_D2.magnet +++ b/traces/TinyProblemA6_B6_C2_D2.magnet @@ -2,7 +2,7 @@ "trace": "pre_Exp7.trace", "features": [ { - "feature": "���ۑ�A6/B6/C2/D2", + "feature": "AP6", "extracts": [ { "src": {