diff --git a/AlgebraicDataflowArchitectureModel/src/graphicalrefactor/actions/NewFormulaChannelAction.java b/AlgebraicDataflowArchitectureModel/src/graphicalrefactor/actions/NewFormulaChannelAction.java index b87f5eb..aee848d 100644 --- a/AlgebraicDataflowArchitectureModel/src/graphicalrefactor/actions/NewFormulaChannelAction.java +++ b/AlgebraicDataflowArchitectureModel/src/graphicalrefactor/actions/NewFormulaChannelAction.java @@ -2,16 +2,23 @@ import java.awt.BorderLayout; import java.awt.Container; +import java.awt.FlowLayout; +import java.awt.Frame; +import java.awt.GridLayout; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; +import javax.swing.BoxLayout; import javax.swing.JButton; +import javax.swing.JDialog; import javax.swing.JFrame; import javax.swing.JLabel; import javax.swing.JOptionPane; import javax.swing.JPanel; +import javax.swing.JTextField; import graphicalrefactor.editor.Editor; +import graphicalrefactor.views.GraphicalRefactor; import models.visualModel.FormulaChannelGenerator; public class NewFormulaChannelAction extends AbstractEditorAction implements ActionListener { @@ -25,12 +32,38 @@ super("FormulaChannel...", editor); } + @Override public void actionPerformed(ActionEvent e) { - String channelName = JOptionPane.showInputDialog("FormulaChannel Name:"); - String symbol = JOptionPane.showInputDialog("symbol"); - if (channelName == null|| symbol == null) return; - editor.addFormulaChannelGenerator(new FormulaChannelGenerator(channelName, editor.getModel().getSymbol(symbol))); + + JPanel panel = new JPanel(); + + GridLayout layout = new GridLayout(2,2); + panel.setLayout(layout); + layout.setVgap(5); + layout.setHgap(20); + + panel.add(new JLabel("Channel Name:")); + JTextField channelText = new JTextField(); + panel.add(channelText); + panel.add(new JLabel("Symbol:")); + JTextField symbolText = new JTextField(); + panel.add(symbolText); + + int r = JOptionPane.showConfirmDialog( + null, // �I�[�i�[�E�B���h�E + panel, // ���b�Z�[�W + "New Formula Channel", // �E�B���h�E�^�C�g�� + JOptionPane.OK_CANCEL_OPTION, // �I�v�V�����i�{�^���̎�ށj + JOptionPane.QUESTION_MESSAGE); // ���b�Z�[�W�^�C�v�i�A�C�R���̎�ށj + + String channelName = channelText.getText(); + String symbol = symbolText.getText(); + + if(r == JOptionPane.OK_OPTION) { + editor.addFormulaChannelGenerator(new FormulaChannelGenerator(channelName, editor.getModel().getSymbol(symbol))); + } + } }