Merge branch 'master' of https://source.jalview.org/git/jalviewjs.git

[jalviewjs.git] / src / javajs / swing / JPanel.java

diff --git a/src/javajs/swing/JPanel.java b/src/javajs/swing/JPanel.java
index 8154a5a..64f08a2 100644 (file)
--- a/src/javajs/swing/JPanel.java
+++ b/src/javajs/swing/JPanel.java
@@ -1,67 +1,67 @@
-package javajs.swing;\r
-\r
-import javajs.awt.BorderLayout;\r
-import javajs.awt.LayoutManager;\r
-import javajs.util.SB;\r
-\r
-public class JPanel extends JComponent {\r
-\r
-       //private LayoutManager layoutManager;\r
-\r
-       private Grid grid;\r
-\r
-       private int nElements;\r
-       private JComponent last;\r
-       \r
-       \r
-       /**\r
-        * @param manager  ignored. we just use the layout designations with a grid\r
-        */\r
-       public JPanel(LayoutManager manager) {\r
-               super("JP");\r
-               //this.layoutManager = manager;\r
-               grid = new Grid(10,10);\r
-       }\r
-\r
-       public void add(JComponent btn, Object c) {\r
-               last = (++nElements == 1 ? btn : null);\r
-               if (c instanceof String) {\r
-                       if (c.equals(BorderLayout.NORTH))\r
-                               c = new GridBagConstraints(0, 0, 3, 1, 0, 0, GridBagConstraints.CENTER,\r
-                                               0, null, 0, 0);\r
-                       else if (c.equals(BorderLayout.SOUTH))\r
-                               c = new GridBagConstraints(0, 2, 3, 1, 0, 0, GridBagConstraints.CENTER,\r
-                                               0, null, 0, 0);\r
-                       else if (c.equals(BorderLayout.EAST))\r
-                               c = new GridBagConstraints(2, 1, 1, 1, 0, 0, GridBagConstraints.EAST,\r
-                                               0, null, 0, 0);\r
-                       else if (c.equals(BorderLayout.WEST))\r
-                               c = new GridBagConstraints(0, 1, 1, 1, 0, 0, GridBagConstraints.WEST,\r
-                                               0, null, 0, 0);\r
-                       else\r
-                               c = new GridBagConstraints(1, 1, 1, 1, 0, 0, GridBagConstraints.CENTER,\r
-                                               0, null, 0, 0);\r
-               }\r
-               grid.add(btn, (GridBagConstraints) c);\r
-       }\r
-       \r
-       @Override\r
-       public String toHTML() {\r
-               if (last != null) {\r
-                       // only one element\r
-                       grid = new Grid(1, 1);\r
-                       grid.add(last, new GridBagConstraints(0, 0, 1, 1, 0, 0,\r
-                                       GridBagConstraints.CENTER, 0, null, 0, 0));\r
-                       last = null;\r
-               }\r
-               SB sb = new SB();\r
-               sb.append("\n<div id='" + id + "' class='JPanel' style='"\r
-                               + getCSSstyle(100, 100) + "'>\n");\r
-               sb.append("\n<span id='" + id + "_minimizer' style='width:" + minWidth\r
-                               + "px;height:" + minHeight + "px;'>");\r
-               sb.append(grid.toHTML(id));\r
-               sb.append("</span>");\r
-               sb.append("\n</div>\n");\r
-               return sb.toString();\r
-       }\r
-}\r
+package javajs.swing;
+
+import javajs.awt.BorderLayout;
+import javajs.awt.LayoutManager;
+import javajs.util.SB;
+
+public class JPanel extends JComponent {
+
+       //private LayoutManager layoutManager;
+
+       private Grid grid;
+
+       private int nElements;
+       private JComponent last;
+       
+       
+       /**
+        * @param manager  ignored. we just use the layout designations with a grid
+        */
+       public JPanel(LayoutManager manager) {
+               super("JP");
+               //this.layoutManager = manager;
+               grid = new Grid(10,10);
+       }
+
+       public void add(JComponent btn, Object c) {
+               last = (++nElements == 1 ? btn : null);
+               if (c instanceof String) {
+                       if (c.equals(BorderLayout.NORTH))
+                               c = new GridBagConstraints(0, 0, 3, 1, 0, 0, GridBagConstraints.CENTER,
+                                               0, null, 0, 0);
+                       else if (c.equals(BorderLayout.SOUTH))
+                               c = new GridBagConstraints(0, 2, 3, 1, 0, 0, GridBagConstraints.CENTER,
+                                               0, null, 0, 0);
+                       else if (c.equals(BorderLayout.EAST))
+                               c = new GridBagConstraints(2, 1, 1, 1, 0, 0, GridBagConstraints.EAST,
+                                               0, null, 0, 0);
+                       else if (c.equals(BorderLayout.WEST))
+                               c = new GridBagConstraints(0, 1, 1, 1, 0, 0, GridBagConstraints.WEST,
+                                               0, null, 0, 0);
+                       else
+                               c = new GridBagConstraints(1, 1, 1, 1, 0, 0, GridBagConstraints.CENTER,
+                                               0, null, 0, 0);
+               }
+               grid.add(btn, (GridBagConstraints) c);
+       }
+       
+       @Override
+       public String toHTML() {
+               if (last != null) {
+                       // only one element
+                       grid = new Grid(1, 1);
+                       grid.add(last, new GridBagConstraints(0, 0, 1, 1, 0, 0,
+                                       GridBagConstraints.CENTER, 0, null, 0, 0));
+                       last = null;
+               }
+               SB sb = new SB();
+               sb.append("\n<div id='" + id + "' class='JPanel' style='"
+                               + getCSSstyle(100, 100) + "'>\n");
+               sb.append("\n<span id='" + id + "_minimizer' style='width:" + minWidth
+                               + "px;height:" + minHeight + "px;'>");
+               sb.append(grid.toHTML(id));
+               sb.append("</span>");
+               sb.append("\n</div>\n");
+               return sb.toString();
+       }
+}