update author list in license for (JAL-826)

[jalview.git] / src / jalview / appletgui / EditNameDialog.java

diff --git a/src/jalview/appletgui/EditNameDialog.java b/src/jalview/appletgui/EditNameDialog.java
index 1c365ba..99ffbf6 100644 (file)
--- a/src/jalview/appletgui/EditNameDialog.java
+++ b/src/jalview/appletgui/EditNameDialog.java
@@ -1,81 +1,76 @@
-/*\r
- * Jalview - A Sequence Alignment Editor and Viewer\r
- * Copyright (C) 2007 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle\r
- *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU General Public License\r
- * as published by the Free Software Foundation; either version 2\r
- * of the License, or (at your option) any later version.\r
- *\r
- * This program is distributed in the hope that it will be useful,\r
- * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
- * GNU General Public License for more details.\r
- *\r
- * You should have received a copy of the GNU General Public License\r
- * along with this program; if not, write to the Free Software\r
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA\r
- */\r
-\r
-package jalview.appletgui;\r
-\r
-import java.awt.*;\r
-\r
-\r
-public class EditNameDialog extends JVDialog\r
-{\r
-  TextField id, description;\r
-\r
-  public String getName()\r
-  {\r
-    return id.getText();\r
-  }\r
-\r
-  public String getDescription()\r
-  {\r
-    if (description.getText().length() < 1)\r
-    {\r
-      return null;\r
-    }\r
-    else\r
-    {\r
-      return description.getText();\r
-    }\r
-  }\r
-\r
-  public EditNameDialog(String name,\r
-                        String desc,\r
-                        String label1,\r
-                        String label2,\r
-                        Frame owner,\r
-                        String title,\r
-                        int width, int height)\r
-  {\r
-    super(owner, title, true, width, height);\r
-\r
-    Panel panel = new Panel(new BorderLayout());\r
-    Panel panel2 = new Panel(new BorderLayout());\r
-\r
-    id = new TextField(name, 40);\r
-    Label label = new Label(label1);\r
-    label.setFont(new Font("Monospaced", Font.PLAIN, 12));\r
-\r
-    panel2.add(label, BorderLayout.WEST);\r
-    panel2.add(id, BorderLayout.CENTER);\r
-    panel.add(panel2, BorderLayout.NORTH);\r
-\r
-\r
-    if(label2!=null)\r
-    {\r
-      panel2 = new Panel(new BorderLayout());\r
-      description = new TextField(desc, 40);\r
-      label = new Label(label2);\r
-      label.setFont(new Font("Monospaced", Font.PLAIN, 12));\r
-      panel2.add(label, BorderLayout.WEST);\r
-      panel2.add(description, BorderLayout.CENTER);\r
-      panel.add(panel2, BorderLayout.CENTER);\r
-    }\r
-    setMainPanel(panel);\r
-    show();\r
-  }\r
-}\r
+/*
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.7)
+ * Copyright (C) 2011 J Procter, AM Waterhouse, J Engelhardt, LM Lui, G Barton, M Clamp, S Searle
+ * 
+ * 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.
+ * 
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+package jalview.appletgui;
+
+import java.awt.*;
+
+public class EditNameDialog extends JVDialog
+{
+  TextField id, description;
+
+  public String getName()
+  {
+    return id.getText();
+  }
+
+  public String getDescription()
+  {
+    if (description.getText().length() < 1)
+    {
+      return null;
+    }
+    else
+    {
+      return description.getText();
+    }
+  }
+
+  public EditNameDialog(String name, String desc, String label1,
+          String label2, Frame owner, String title, int width, int height,
+          boolean display)
+  {
+    super(owner, title, true, width, height);
+
+    Font mono = new Font("Monospaced", Font.PLAIN, 12);
+    Panel panel = new Panel(new BorderLayout());
+    Panel panel2 = new Panel(new BorderLayout());
+
+    id = new TextField(name, 40);
+    id.setFont(mono);
+    Label label = new Label(label1);
+    label.setFont(mono);
+
+    panel2.add(label, BorderLayout.WEST);
+    panel2.add(id, BorderLayout.CENTER);
+    panel.add(panel2, BorderLayout.NORTH);
+
+    if (label2 != null)
+    {
+      panel2 = new Panel(new BorderLayout());
+      description = new TextField(desc, 40);
+      description.setFont(mono);
+      label = new Label(label2);
+      label.setFont(mono);
+      panel2.add(label, BorderLayout.WEST);
+      panel2.add(description, BorderLayout.CENTER);
+      panel.add(panel2, BorderLayout.CENTER);
+    }
+    setMainPanel(panel);
+    setVisible(display);
+  }
+}