X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FEditNameDialog.java;h=6d5cb4662e15287d4da38b3e2f863daa464f3101;hb=155a17a423e980849fd4dc5f857da1a72b0010b9;hp=5e69ac7fe287b890ac887f77ae95df946ee15a45;hpb=b2f9a8d7bce642ff4011bc6d49e02bb0569fbb11;p=jalview.git
diff --git a/src/jalview/gui/EditNameDialog.java b/src/jalview/gui/EditNameDialog.java
index 5e69ac7..6d5cb46 100644
--- a/src/jalview/gui/EditNameDialog.java
+++ b/src/jalview/gui/EditNameDialog.java
@@ -1,37 +1,54 @@
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.1)
- * Copyright (C) 2014 The Jalview Authors
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
*
* This file is part of Jalview.
*
* Jalview is free software: you can redistribute it and/or
* modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+ * as published by the Free Software Foundation, either version 3
+ * of the License, or (at your option) any later version.
*
* Jalview is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty
* of MERCHANTABILITY or FITNESS FOR A PARTICULAR
* PURPOSE. See the GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License along with Jalview. If not, see .
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview. If not, see .
* The Jalview Authors are detailed in the 'AUTHORS' file.
*/
package jalview.gui;
-import jalview.util.MessageManager;
+import java.awt.FlowLayout;
+import java.awt.Font;
+
+import javax.swing.BoxLayout;
+import javax.swing.JButton;
+import javax.swing.JComponent;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.JTextField;
-import java.awt.*;
-import javax.swing.*;
+import jalview.util.MessageManager;
+/**
+ * A dialog where a name and description may be edited
+ */
public class EditNameDialog
{
- JTextField id, description;
+ private static final Font COURIER_12 = new Font("Courier", Font.PLAIN,
+ 12);
+
+ JTextField id;
+
+ JTextField description;
JButton ok = new JButton(MessageManager.getString("action.accept"));
JButton cancel = new JButton(MessageManager.getString("action.cancel"));
- boolean accept = false;
+ private JPanel panel;
public String getName()
{
@@ -50,36 +67,68 @@ public class EditNameDialog
}
}
+ /**
+ * Constructor
+ *
+ * @param name
+ * @param desc
+ * @param label1
+ * @param label2
+ */
public EditNameDialog(String name, String desc, String label1,
- String label2, String title, JComponent parent)
+ String label2)
{
- JLabel idlabel = new JLabel(label1);
- JLabel desclabel = new JLabel(label2);
- idlabel.setFont(new Font("Courier", Font.PLAIN, 12));
- desclabel.setFont(new Font("Courier", Font.PLAIN, 12));
+ panel = new JPanel();
+ panel.setLayout(new BoxLayout(panel, BoxLayout.Y_AXIS));
+ JPanel namePanel = new JPanel(new FlowLayout(FlowLayout.RIGHT));
+ JPanel descriptionPanel = new JPanel(new FlowLayout(FlowLayout.RIGHT));
+ panel.add(namePanel);
+ panel.add(descriptionPanel);
+
+ JLabel nameLabel = new JLabel(label1);
+ // nameLabel.setFont(COURIER_12);
+ namePanel.add(nameLabel);
+
id = new JTextField(name, 40);
+ namePanel.add(id);
+
description = new JTextField(desc, 40);
- JPanel panel = new JPanel(new BorderLayout());
- JPanel panel2 = new JPanel(new BorderLayout());
- panel2.add(idlabel, BorderLayout.WEST);
- panel2.add(id, BorderLayout.CENTER);
- panel.add(panel2, BorderLayout.NORTH);
+
+ /*
+ * optionally add field for description
+ */
if (desc != null || label2 != null)
{
- panel2 = new JPanel(new BorderLayout());
- panel2.add(desclabel, BorderLayout.WEST);
- panel2.add(description, BorderLayout.CENTER);
- panel.add(panel2, BorderLayout.SOUTH);
- }
- int reply = JOptionPane.showInternalConfirmDialog(parent, panel, title,
- JOptionPane.OK_CANCEL_OPTION);
- if (!parent.requestFocusInWindow())
- {
- System.err.println("Bad focus for dialog!");
- }
- if (reply == JOptionPane.OK_OPTION)
- {
- accept = true;
+ JLabel descLabel = new JLabel(label2);
+ // descLabel.setFont(COURIER_12);
+ descriptionPanel.add(descLabel);
+ descriptionPanel.add(description);
}
}
+
+ /**
+ * Shows the dialog, and runs the response action if OK is selected
+ *
+ * @param action
+ */
+ public void showDialog(JComponent parent, String title, Runnable action)
+ {
+ String ok = MessageManager.getString("action.ok");
+ String cancel = MessageManager.getString("action.cancel");
+ String[] options = new String[] { ok, cancel };
+
+ JvOptionPane.newOptionDialog(parent)
+ .setResponseHandler(JvOptionPane.OK_OPTION, action)
+ .showInternalDialog(panel, title, JvOptionPane.OK_CANCEL_OPTION,
+ JvOptionPane.PLAIN_MESSAGE, null, options, ok);
+
+ /*
+ List actions = new ArrayList<>();
+ actions.add(action);
+ actions.add(JvOptionPane.NULLCALLABLE);
+
+ JvOptionPane.frameDialog(panel, title, JvOptionPane.PLAIN_MESSAGE,
+ options, ok, actions, false);
+ */
+ }
}