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

[jalviewjs.git] / src / javajs / awt / Container.java

diff --git a/src/javajs/awt/Container.java b/src/javajs/awt/Container.java
index a734636..7ef6e90 100644 (file)
--- a/src/javajs/awt/Container.java
+++ b/src/javajs/awt/Container.java
@@ -1,79 +1,79 @@
-package javajs.awt;\r
-\r
-import javajs.util.Lst;\r
-  \r
-abstract public class Container extends Component {\r
-  \r
-  protected Lst<Component> list;\r
-  \r
-  private Component[] cList;\r
-\r
-  protected Container(String type) {\r
-    super(type);\r
-  }\r
-  \r
-  public Component getComponent(int i) {\r
-    return list.get(i);\r
-  }\r
-  \r
-  public int getComponentCount() {\r
-    return (list == null ? 0 : list.size());\r
-  }\r
-\r
-  public Component[] getComponents() {\r
-    if (cList == null) {\r
-      if (list == null)\r
-        return new Component[0];\r
-      cList = (Component[]) list.toArray();\r
-    }\r
-    return cList;\r
-  }\r
-\r
-  public Component add(Component component) {\r
-    return addComponent(component);\r
-  }\r
-\r
-  protected Component addComponent(Component component) {\r
-    if (list == null)\r
-      list = new Lst<Component>();\r
-    list.addLast(component);\r
-    cList = null;\r
-    component.parent = this;\r
-    return component;\r
-  }\r
-\r
-  protected Component insertComponent(Component component, int index) {\r
-    if (list == null)\r
-      return addComponent(component);\r
-    list.add(index, component);\r
-    cList = null;\r
-    component.parent = this;\r
-    return component;\r
-  }\r
-\r
-  public void remove(int i) {\r
-    Component c = list.remove(i);\r
-    c.parent = null;\r
-    cList = null;\r
-  }\r
-  \r
-  public void removeAll() {\r
-    if (list != null) {\r
-      for (int i = list.size(); --i >= 0;)\r
-        list.get(i).parent = null;\r
-      list.clear();\r
-    }\r
-    cList = null;\r
-  }\r
-\r
-  @Override\r
-  public int getSubcomponentWidth() {\r
-    return (list != null && list.size() == 1 ? list.get(0).getSubcomponentWidth() : 0);\r
-  }\r
-  \r
-  @Override\r
-  public int getSubcomponentHeight() {\r
-    return (list != null && list.size() == 1 ? list.get(0).getSubcomponentHeight() : 0);\r
-  }\r
-\r
-}\r
+package javajs.awt;
+
+import javajs.util.Lst;
+  
+abstract public class Container extends Component {
+  
+  protected Lst<Component> list;
+  
+  private Component[] cList;
+
+  protected Container(String type) {
+    super(type);
+  }
+  
+  public Component getComponent(int i) {
+    return list.get(i);
+  }
+  
+  public int getComponentCount() {
+    return (list == null ? 0 : list.size());
+  }
+
+  public Component[] getComponents() {
+    if (cList == null) {
+      if (list == null)
+        return new Component[0];
+      cList = (Component[]) list.toArray();
+    }
+    return cList;
+  }
+
+  public Component add(Component component) {
+    return addComponent(component);
+  }
+
+  protected Component addComponent(Component component) {
+    if (list == null)
+      list = new Lst<Component>();
+    list.addLast(component);
+    cList = null;
+    component.parent = this;
+    return component;
+  }
+
+  protected Component insertComponent(Component component, int index) {
+    if (list == null)
+      return addComponent(component);
+    list.add(index, component);
+    cList = null;
+    component.parent = this;
+    return component;
+  }
+
+  public void remove(int i) {
+    Component c = list.remove(i);
+    c.parent = null;
+    cList = null;
+  }
+  
+  public void removeAll() {
+    if (list != null) {
+      for (int i = list.size(); --i >= 0;)
+        list.get(i).parent = null;
+      list.clear();
+    }
+    cList = null;
+  }
+
+  @Override
+  public int getSubcomponentWidth() {
+    return (list != null && list.size() == 1 ? list.get(0).getSubcomponentWidth() : 0);
+  }
+  
+  @Override
+  public int getSubcomponentHeight() {
+    return (list != null && list.size() == 1 ? list.get(0).getSubcomponentHeight() : 0);
+  }
+
+}