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

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

diff --git a/src/javajs/awt/Color.java b/src/javajs/awt/Color.java
index a36ee73..82c27f2 100644 (file)
--- a/src/javajs/awt/Color.java
+++ b/src/javajs/awt/Color.java
@@ -1,53 +1,53 @@
-package javajs.awt;\r
-\r
-import javajs.api.GenericColor;\r
-\r
-public class Color implements GenericColor {\r
-\r
-       public int argb;\r
-\r
-\r
-  @Override\r
-  public int getRGB() {\r
-               return argb & 0x00FFFFFF;\r
-       }\r
-\r
-\r
-  @Override\r
-  public int getOpacity255() {\r
-               return ((argb >> 24) & 0xFF);\r
-       }\r
-\r
-       \r
-  @Override\r
-  public void setOpacity255(int a) {\r
-               argb = argb & 0xFFFFFF | ((a & 0xFF) << 24);\r
-       }\r
-\r
-       public static GenericColor get1(int rgb) {\r
-               Color c = new Color();\r
-               c.argb = rgb | 0xFF000000;\r
-               return c;\r
-       }\r
-\r
-       public static GenericColor get3(int r, int g, int b) {\r
-               return new Color().set4(r, g, b, 0xFF);\r
-       }\r
-\r
-       public static GenericColor get4(int r, int g, int b, int a) {\r
-               return new Color().set4(r, g, b, a);\r
-       }\r
-\r
-       private GenericColor set4(int r, int g, int b, int a) {\r
-               argb = ((a << 24) | (r << 16) | (g << 8) | b) & 0xFFFFFFFF;\r
-               return this;\r
-       }\r
-\r
-  @Override\r
-  public String toString() {\r
-    String s = ("00000000" + Integer.toHexString(argb));\r
-    return "[0x" + s.substring(s.length() - 8, s.length()) + "]";\r
-  }\r
-\r
-       \r
-}\r
+package javajs.awt;
+
+import javajs.api.GenericColor;
+
+public class Color implements GenericColor {
+
+       public int argb;
+
+
+  @Override
+  public int getRGB() {
+               return argb & 0x00FFFFFF;
+       }
+
+
+  @Override
+  public int getOpacity255() {
+               return ((argb >> 24) & 0xFF);
+       }
+
+       
+  @Override
+  public void setOpacity255(int a) {
+               argb = argb & 0xFFFFFF | ((a & 0xFF) << 24);
+       }
+
+       public static GenericColor get1(int rgb) {
+               Color c = new Color();
+               c.argb = rgb | 0xFF000000;
+               return c;
+       }
+
+       public static GenericColor get3(int r, int g, int b) {
+               return new Color().set4(r, g, b, 0xFF);
+       }
+
+       public static GenericColor get4(int r, int g, int b, int a) {
+               return new Color().set4(r, g, b, a);
+       }
+
+       private GenericColor set4(int r, int g, int b, int a) {
+               argb = ((a << 24) | (r << 16) | (g << 8) | b) & 0xFFFFFFFF;
+               return this;
+       }
+
+  @Override
+  public String toString() {
+    String s = ("00000000" + Integer.toHexString(argb));
+    return "[0x" + s.substring(s.length() - 8, s.length()) + "]";
+  }
+
+       
+}