8328751: Fix missing @OVERRIDES in modules except javafx.web

Andy Goryachev · Andy Goryachev · commit 93e3bb2ce8c7 · 2024-03-25T22:06:37.000Z
Reviewed-by: kcr
diff --git a/modules/javafx.base/src/test/java/test/javafx/binding/GenericBindingTest.java b/modules/javafx.base/src/test/java/test/javafx/binding/GenericBindingTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -427,6 +427,7 @@ public ObservableList<?> getDependencies() {
             return null;
         }
 
+        @Override
         public void publicUnbind(Observable... observables) {
             super.unbind(observables);
         }
@@ -464,6 +465,7 @@ public ObservableList<?> getDependencies() {
             return null;
         }
 
+        @Override
         public void publicUnbind(Observable... observables) {
             super.unbind(observables);
         }
@@ -501,6 +503,7 @@ public ObservableList<?> getDependencies() {
             return null;
         }
 
+        @Override
         public void publicUnbind(Observable... observables) {
             super.unbind(observables);
         }
@@ -538,6 +541,7 @@ public ObservableList<?> getDependencies() {
             return null;
         }
 
+        @Override
         public void publicUnbind(Observable... observables) {
             super.unbind(observables);
         }
@@ -575,6 +579,7 @@ public ObservableList<?> getDependencies() {
             return null;
         }
 
+        @Override
         public void publicUnbind(Observable... observables) {
             super.unbind(observables);
         }
@@ -612,6 +617,7 @@ public ObservableList<?> getDependencies() {
             return null;
         }
 
+        @Override
         public void publicUnbind(Observable... observables) {
             super.unbind(observables);
         }
@@ -649,6 +655,7 @@ public ObservableList<?> getDependencies() {
             return null;
         }
 
+        @Override
         public void publicUnbind(Observable... observables) {
             super.unbind(observables);
         }
@@ -686,6 +693,7 @@ public ObservableList<?> getDependencies() {
             return null;
         }
 
+        @Override
         public void publicUnbind(Observable... observables) {
             super.unbind(observables);
         }
diff --git a/modules/javafx.controls/src/main/java/javafx/scene/control/skin/VirtualFlow.java b/modules/javafx.controls/src/main/java/javafx/scene/control/skin/VirtualFlow.java
@@ -3290,14 +3290,17 @@ public ArrayLinkedList() {
             }
         }
 
+        @Override
         public T getFirst() {
             return firstIndex == -1 ? null : array.get(firstIndex);
         }
 
+        @Override
         public T getLast() {
             return lastIndex == -1 ? null : array.get(lastIndex);
         }
 
+        @Override
         public void addFirst(T cell) {
             // if firstIndex == -1 then that means this is the first item in the
             // list and we need to initialize firstIndex and lastIndex
@@ -3316,6 +3319,7 @@ public void addFirst(T cell) {
             }
         }
 
+        @Override
         public void addLast(T cell) {
 
             // if lastIndex == -1 then that means this is the first item in the
@@ -3362,11 +3366,13 @@ public void clear() {
             firstIndex = lastIndex = -1;
         }
 
+        @Override
         public T removeFirst() {
             if (isEmpty()) return null;
             return remove(0);
         }
 
+        @Override
         public T removeLast() {
             if (isEmpty()) return null;
             return remove(lastIndex - firstIndex);
diff --git a/modules/javafx.graphics/src/main/java/com/sun/javafx/font/CompositeFontResource.java b/modules/javafx.graphics/src/main/java/com/sun/javafx/font/CompositeFontResource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -42,6 +42,7 @@ default public int addSlotFont(FontResource font) {
      */
     public int getSlotForFont(String fontName);
 
+    @Override
     default boolean isColorGlyph(int glyphCode) {
         int slot = (glyphCode >>> 24);
         int slotglyphCode = glyphCode & CompositeGlyphMapper.GLYPHMASK;
diff --git a/modules/javafx.graphics/src/main/java/com/sun/javafx/font/FallbackResource.java b/modules/javafx.graphics/src/main/java/com/sun/javafx/font/FallbackResource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -272,6 +272,7 @@ private int addNativeFallback(FontResource fr) {
         return ns+1;
     }
 
+    @Override
     public int addSlotFont(FontResource fr) {
         int slot = getSlotForFont(fr.getFullName());
         if (slot >= 0) {
@@ -366,6 +367,7 @@ public FontStrike getStrike(float size, BaseTransform transform,
         return strike;
     }
 
+    @Override
     public String toString() {
         int ns = getNumSlots();
         String s = "Fallback resource:\n";
diff --git a/modules/javafx.graphics/src/main/java/com/sun/javafx/font/LogicalFont.java b/modules/javafx.graphics/src/main/java/com/sun/javafx/font/LogicalFont.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -304,6 +304,7 @@ private int addNativeFallback(FontResource fr) {
         return ns;
     }
 
+    @Override
     public int addSlotFont(FontResource fr) {
         if (fr == null) {
             return -1;
diff --git a/modules/javafx.graphics/src/main/java/com/sun/javafx/font/PrismFontFile.java b/modules/javafx.graphics/src/main/java/com/sun/javafx/font/PrismFontFile.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -1420,6 +1420,7 @@ private synchronized boolean fontSupportsColorGlyphs() {
        return hasColorTables;
     }
 
+    @Override
     public boolean isColorGlyph(int glyphID) {
         if (!fontSupportsColorGlyphs()) {
             return false;
diff --git a/modules/javafx.graphics/src/main/java/com/sun/javafx/font/coretext/CTFactory.java b/modules/javafx.graphics/src/main/java/com/sun/javafx/font/coretext/CTFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -100,6 +100,7 @@ public boolean isExcluded(String name) {
          return name.startsWith(".") || name.startsWith("System Font");
     }
 
+    @Override
     public FontFallbackInfo getFallbacks(FontResource primaryResource) {
         FontFallbackInfo info = new FontFallbackInfo();
         ArrayList<String> names;
diff --git a/modules/javafx.graphics/src/main/java/com/sun/javafx/font/directwrite/DWFactory.java b/modules/javafx.graphics/src/main/java/com/sun/javafx/font/directwrite/DWFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -160,6 +160,7 @@ static synchronized ID2D1Factory getD2DFactory() {
     /*
      * Ignoring the primary on Windows - this should change some day.
      */
+    @Override
     public FontFallbackInfo getFallbacks(FontResource primaryResource) {
         FontFallbackInfo info = new FontFallbackInfo();
 
diff --git a/modules/javafx.graphics/src/main/java/com/sun/javafx/font/freetype/FTFactory.java b/modules/javafx.graphics/src/main/java/com/sun/javafx/font/freetype/FTFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -127,6 +127,7 @@ public void layout(TextRun run, PGFont font, FontStrike strike, char[] text) {
         }
     }
 
+    @Override
     public FontFallbackInfo getFallbacks(FontResource primaryResource) {
         boolean isBold = primaryResource.isBold();
         boolean isItalic = primaryResource.isItalic();

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright (c) 2011, 2023, Oracle and/or its affiliates. All rights reserved.`
	`2`	`+ * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.`
`3`	`3`	`* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.`
`4`	`4`	`*`
`5`	`5`	`* This code is free software; you can redistribute it and/or modify it`
`@@ -427,6 +427,7 @@ public ObservableList<?> getDependencies() {`
`427`	`427`	`return null;`
`428`	`428`	`}`
`429`	`429`
	`430`	`+ @Override`
`430`	`431`	`public void publicUnbind(Observable... observables) {`
`431`	`432`	`super.unbind(observables);`
`432`	`433`	`}`
`@@ -464,6 +465,7 @@ public ObservableList<?> getDependencies() {`
`464`	`465`	`return null;`
`465`	`466`	`}`
`466`	`467`
	`468`	`+ @Override`
`467`	`469`	`public void publicUnbind(Observable... observables) {`
`468`	`470`	`super.unbind(observables);`
`469`	`471`	`}`
`@@ -501,6 +503,7 @@ public ObservableList<?> getDependencies() {`
`501`	`503`	`return null;`
`502`	`504`	`}`
`503`	`505`
	`506`	`+ @Override`
`504`	`507`	`public void publicUnbind(Observable... observables) {`
`505`	`508`	`super.unbind(observables);`
`506`	`509`	`}`
`@@ -538,6 +541,7 @@ public ObservableList<?> getDependencies() {`
`538`	`541`	`return null;`
`539`	`542`	`}`
`540`	`543`
	`544`	`+ @Override`
`541`	`545`	`public void publicUnbind(Observable... observables) {`
`542`	`546`	`super.unbind(observables);`
`543`	`547`	`}`
`@@ -575,6 +579,7 @@ public ObservableList<?> getDependencies() {`
`575`	`579`	`return null;`
`576`	`580`	`}`
`577`	`581`
	`582`	`+ @Override`
`578`	`583`	`public void publicUnbind(Observable... observables) {`
`579`	`584`	`super.unbind(observables);`
`580`	`585`	`}`
`@@ -612,6 +617,7 @@ public ObservableList<?> getDependencies() {`
`612`	`617`	`return null;`
`613`	`618`	`}`
`614`	`619`
	`620`	`+ @Override`
`615`	`621`	`public void publicUnbind(Observable... observables) {`
`616`	`622`	`super.unbind(observables);`
`617`	`623`	`}`
`@@ -649,6 +655,7 @@ public ObservableList<?> getDependencies() {`
`649`	`655`	`return null;`
`650`	`656`	`}`
`651`	`657`
	`658`	`+ @Override`
`652`	`659`	`public void publicUnbind(Observable... observables) {`
`653`	`660`	`super.unbind(observables);`
`654`	`661`	`}`
`@@ -686,6 +693,7 @@ public ObservableList<?> getDependencies() {`
`686`	`693`	`return null;`
`687`	`694`	`}`
`688`	`695`
	`696`	`+ @Override`
`689`	`697`	`public void publicUnbind(Observable... observables) {`
`690`	`698`	`super.unbind(observables);`
`691`	`699`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3290,14 +3290,17 @@ public ArrayLinkedList() {`
`3290`	`3290`	`}`
`3291`	`3291`	`}`
`3292`	`3292`
	`3293`	`+ @Override`
`3293`	`3294`	`public T getFirst() {`
`3294`	`3295`	`return firstIndex == -1 ? null : array.get(firstIndex);`
`3295`	`3296`	`}`
`3296`	`3297`
	`3298`	`+ @Override`
`3297`	`3299`	`public T getLast() {`
`3298`	`3300`	`return lastIndex == -1 ? null : array.get(lastIndex);`
`3299`	`3301`	`}`
`3300`	`3302`
	`3303`	`+ @Override`
`3301`	`3304`	`public void addFirst(T cell) {`
`3302`	`3305`	`// if firstIndex == -1 then that means this is the first item in the`
`3303`	`3306`	`// list and we need to initialize firstIndex and lastIndex`
`@@ -3316,6 +3319,7 @@ public void addFirst(T cell) {`
`3316`	`3319`	`}`
`3317`	`3320`	`}`
`3318`	`3321`
	`3322`	`+ @Override`
`3319`	`3323`	`public void addLast(T cell) {`
`3320`	`3324`
`3321`	`3325`	`// if lastIndex == -1 then that means this is the first item in the`
`@@ -3362,11 +3366,13 @@ public void clear() {`
`3362`	`3366`	`firstIndex = lastIndex = -1;`
`3363`	`3367`	`}`
`3364`	`3368`
	`3369`	`+ @Override`
`3365`	`3370`	`public T removeFirst() {`
`3366`	`3371`	`if (isEmpty()) return null;`
`3367`	`3372`	`return remove(0);`
`3368`	`3373`	`}`
`3369`	`3374`
	`3375`	`+ @Override`
`3370`	`3376`	`public T removeLast() {`
`3371`	`3377`	`if (isEmpty()) return null;`
`3372`	`3378`	`return remove(lastIndex - firstIndex);`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright (c) 2013, 2023, Oracle and/or its affiliates. All rights reserved.`
	`2`	`+ * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.`
`3`	`3`	`* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.`
`4`	`4`	`*`
`5`	`5`	`* This code is free software; you can redistribute it and/or modify it`
`@@ -100,6 +100,7 @@ public boolean isExcluded(String name) {`
`100`	`100`	`return name.startsWith(".") \|\| name.startsWith("System Font");`
`101`	`101`	`}`
`102`	`102`
	`103`	`+ @Override`
`103`	`104`	`public FontFallbackInfo getFallbacks(FontResource primaryResource) {`
`104`	`105`	`FontFallbackInfo info = new FontFallbackInfo();`
`105`	`106`	`ArrayList<String> names;`