You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jdo-commits@db.apache.org by mb...@apache.org on 2022/08/13 19:35:44 UTC

[db-jdo] 05/07: JDO-817 removing compiler warnings: „static method declared final“ in api submodule

This is an automated email from the ASF dual-hosted git repository.

mbo pushed a commit to branch tck-compiler-warnings
in repository https://gitbox.apache.org/repos/asf/db-jdo.git

commit 6ff57322ce5a4ca3526cd5772ce4eacd9b4b8ec4
Author: Michael Bouschen <Mi...@akquinet.de>
AuthorDate: Sat Aug 13 21:03:52 2022 +0200

    JDO-817 removing compiler warnings: „static method declared final“ in api submodule
---
 api/src/main/java/javax/jdo/spi/I18NHelper.java | 18 +++++++++---------
 api/src/test/java/javax/jdo/pc/PCPoint.java     | 10 +++++-----
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/api/src/main/java/javax/jdo/spi/I18NHelper.java b/api/src/main/java/javax/jdo/spi/I18NHelper.java
index 4e4a0d3a..161bf844 100644
--- a/api/src/main/java/javax/jdo/spi/I18NHelper.java
+++ b/api/src/main/java/javax/jdo/spi/I18NHelper.java
@@ -227,7 +227,7 @@ public class I18NHelper {
      * @param loader the class loader from which to load the resource bundle
      * @return  the ResourceBundle
      */
-    final private static ResourceBundle loadBundle(
+    private static ResourceBundle loadBundle(
         String bundleName, ClassLoader loader) {
         ResourceBundle messages = bundles.get(bundleName);
 
@@ -276,7 +276,7 @@ public class I18NHelper {
      * @param messageKey the message key
      * @return the resolved message text
      */
-    final private static String getMessage(ResourceBundle messages, String messageKey) 
+    private static String getMessage(ResourceBundle messages, String messageKey)
     {
         return messages.getString(messageKey);
     }
@@ -288,7 +288,7 @@ public class I18NHelper {
      * @param msgArgs an array of arguments to substitute into the message
      * @return the resolved message text
      */
-    final private static String getMessage(ResourceBundle messages, 
+    private static String getMessage(ResourceBundle messages,
             String messageKey, Object[] msgArgs) 
     {
         for (int i=0; i<msgArgs.length; i++) {
@@ -305,7 +305,7 @@ public class I18NHelper {
      * @param arg the argument
      * @return the resolved message text
      */
-    final private static String getMessage(ResourceBundle messages, 
+    private static String getMessage(ResourceBundle messages,
             String messageKey, Object arg) 
     {
         Object []args = {arg};
@@ -320,7 +320,7 @@ public class I18NHelper {
      * @param arg2 the second argument
      * @return the resolved message text
      */
-    final private static String getMessage(ResourceBundle messages, 
+    private static String getMessage(ResourceBundle messages,
             String messageKey, Object arg1, Object arg2) 
     {
         Object []args = {arg1, arg2};
@@ -336,7 +336,7 @@ public class I18NHelper {
      * @param arg3 the third argument
      * @return the resolved message text
      */
-    final private static String getMessage(ResourceBundle messages, 
+    private static String getMessage(ResourceBundle messages,
             String messageKey, Object arg1, Object arg2, Object arg3) 
     {
         Object []args = {arg1, arg2, arg3};
@@ -350,7 +350,7 @@ public class I18NHelper {
      * @param arg the argument
      * @return the resolved message text
      */
-    final private static String getMessage(ResourceBundle messages, 
+    private static String getMessage(ResourceBundle messages,
             String messageKey, int arg) 
     {
         Object []args = {Integer.valueOf(arg)};
@@ -364,7 +364,7 @@ public class I18NHelper {
      * @param arg the argument
      * @return the resolved message text
      */
-    final private static String getMessage(ResourceBundle messages, 
+    private static String getMessage(ResourceBundle messages,
             String messageKey, boolean arg) 
     {
         Object []args = {String.valueOf(arg)};
@@ -377,7 +377,7 @@ public class I18NHelper {
      * package 
      * @return package portion of the specified class
      */   
-    final private static String getPackageName(final String className)
+    private static String getPackageName(final String className)
     { 
         final int index = className.lastIndexOf('.');
         return ((index != -1) ? className.substring(0, index) : ""); // NOI18N
diff --git a/api/src/test/java/javax/jdo/pc/PCPoint.java b/api/src/test/java/javax/jdo/pc/PCPoint.java
index cb30c4d5..4eb8fcc9 100644
--- a/api/src/test/java/javax/jdo/pc/PCPoint.java
+++ b/api/src/test/java/javax/jdo/pc/PCPoint.java
@@ -296,7 +296,7 @@ public class PCPoint
         return 2;
     }
 
-     public static final int jdoGetx(PCPoint pcpoint) {
+     public static int jdoGetx(PCPoint pcpoint) {
         if (pcpoint.jdoFlags <= PersistenceCapable.READ_WRITE_OK)
             return pcpoint.x;
         StateManager statemanager = pcpoint.jdoStateManager;
@@ -309,7 +309,7 @@ public class PCPoint
                 pcpoint, jdoInheritedFieldCount + 0, pcpoint.x);
     }
 
-    public static final Integer jdoGety(PCPoint pcpoint) {
+    public static Integer jdoGety(PCPoint pcpoint) {
         if (pcpoint.jdoFlags <= PersistenceCapable.READ_WRITE_OK)
             return pcpoint.y;
         StateManager statemanager = pcpoint.jdoStateManager;
@@ -322,7 +322,7 @@ public class PCPoint
                 pcpoint, jdoInheritedFieldCount + 1, pcpoint.y);
     }
 
-    public static final void jdoSetx(PCPoint pcpoint, int i) {
+    public static void jdoSetx(PCPoint pcpoint, int i) {
         if (pcpoint.jdoFlags == PersistenceCapable.READ_WRITE_OK) {
             pcpoint.x = i;
             return;
@@ -339,7 +339,7 @@ public class PCPoint
         }
     }
 
-    public static final void jdoSety(PCPoint pcpoint, Integer integer) {
+    public static void jdoSety(PCPoint pcpoint, Integer integer) {
         if (pcpoint.jdoFlags == PersistenceCapable.READ_WRITE_OK) {
             pcpoint.y = integer;
             return;
@@ -445,7 +445,7 @@ public class PCPoint
         out.defaultWriteObject();
     }
     
-    protected static final Class<?> sunjdo$classForName$(String s) {
+    protected static Class<?> sunjdo$classForName$(String s) {
         try {
             return Class.forName(s);
         }