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

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

diff --git a/src/javajs/swing/Grid.java b/src/javajs/swing/Grid.java
index 23ceda8..516110f 100644 (file)
--- a/src/javajs/swing/Grid.java
+++ b/src/javajs/swing/Grid.java
@@ -1,54 +1,54 @@
-package javajs.swing;\r
-\r
-import javajs.util.AU;\r
-import javajs.util.SB;\r
-\r
-\r
-public class Grid {\r
-\r
-       private int nrows;\r
-       private int ncols;\r
-\r
-       private Cell[][] grid;\r
-       private String renderer;\r
-       \r
-\r
-       Grid(int rows, int cols) {\r
-               grid = new Cell[0][0];\r
-       }\r
-\r
-       public void add(JComponent btn, GridBagConstraints c) {\r
-               if (c.gridx >= ncols) {\r
-                       ncols = c.gridx + 1;\r
-                       for (int i = 0; i < nrows; i++) {\r
-                               grid[i] = (Cell[]) AU.ensureLength(grid[i], ncols * 2);\r
-                       }\r
-               }\r
-               if (c.gridy >= nrows) {\r
-                       Cell[][] g = new Cell[c.gridy * 2 + 1][];\r
-                       for (int i = 0; i < nrows; i++)\r
-                               g[i] = grid[i];\r
-                       for (int i = g.length; --i >= nrows;)\r
-                               g[i] = new Cell[ncols * 2 + 1];\r
-                       grid = g;\r
-                       nrows = c.gridy + 1;\r
-               }\r
-               grid[c.gridy][c.gridx] = new Cell(btn, c);\r
-       }\r
-\r
-       public String toHTML(String id) {\r
-               SB sb = new SB();\r
-               id += "_grid";\r
-               sb.append("\n<table id='" + id + "' class='Grid' style='width:100%;height:100%'><tr><td style='height:20%;width:20%'></td></tr>");              \r
-               for (int i = 0; i < nrows; i++) {\r
-                       String rowid = id + "_" + i;\r
-                       sb.append("\n<tr id='" + rowid + "'><td></td>");\r
-                       for (int j = 0; j < ncols; j++)\r
-                               if (grid[i][j] != null)\r
-                                       sb.append(grid[i][j].toHTML(rowid + "_" + j));\r
-                       sb.append("</tr>");\r
-               }\r
-               sb.append("\n<tr><td style='height:20%;width:20%'></td></tr></table>\n");\r
-               return sb.toString();\r
-       }\r
-}\r
+package javajs.swing;
+
+import javajs.util.AU;
+import javajs.util.SB;
+
+
+public class Grid {
+
+       private int nrows;
+       private int ncols;
+
+       private Cell[][] grid;
+       private String renderer;
+       
+
+       Grid(int rows, int cols) {
+               grid = new Cell[0][0];
+       }
+
+       public void add(JComponent btn, GridBagConstraints c) {
+               if (c.gridx >= ncols) {
+                       ncols = c.gridx + 1;
+                       for (int i = 0; i < nrows; i++) {
+                               grid[i] = (Cell[]) AU.ensureLength(grid[i], ncols * 2);
+                       }
+               }
+               if (c.gridy >= nrows) {
+                       Cell[][] g = new Cell[c.gridy * 2 + 1][];
+                       for (int i = 0; i < nrows; i++)
+                               g[i] = grid[i];
+                       for (int i = g.length; --i >= nrows;)
+                               g[i] = new Cell[ncols * 2 + 1];
+                       grid = g;
+                       nrows = c.gridy + 1;
+               }
+               grid[c.gridy][c.gridx] = new Cell(btn, c);
+       }
+
+       public String toHTML(String id) {
+               SB sb = new SB();
+               id += "_grid";
+               sb.append("\n<table id='" + id + "' class='Grid' style='width:100%;height:100%'><tr><td style='height:20%;width:20%'></td></tr>");              
+               for (int i = 0; i < nrows; i++) {
+                       String rowid = id + "_" + i;
+                       sb.append("\n<tr id='" + rowid + "'><td></td>");
+                       for (int j = 0; j < ncols; j++)
+                               if (grid[i][j] != null)
+                                       sb.append(grid[i][j].toHTML(rowid + "_" + j));
+                       sb.append("</tr>");
+               }
+               sb.append("\n<tr><td style='height:20%;width:20%'></td></tr></table>\n");
+               return sb.toString();
+       }
+}