[prev in list] [next in list] [prev in thread] [next in thread] 

List:       jakarta-commons-dev
Subject:    [commons-compress] branch master updated: Use generics
From:       ggregory () apache ! org
Date:       2022-09-30 15:56:26
Message-ID: 166455363987.561132.12192166690082961726 () gitbox2-he-fi ! apache ! org
[Download RAW message or body]

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

ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-compress.git


The following commit(s) were added to refs/heads/master by this push:
     new cd119181 Use generics
cd119181 is described below

commit cd11918164f82520997d414cf265fdc6afc6463b
Author: Gary Gregory <garydgregory@gmail.com>
AuthorDate: Fri Sep 30 12:00:35 2022 -0400

    Use generics
---
 .../java/org/apache/commons/compress/harmony/pack200/CPClass.java   | 6 +++---
 .../org/apache/commons/compress/harmony/pack200/CPConstant.java     | 2 +-
 .../java/org/apache/commons/compress/harmony/pack200/CPDouble.java  | 6 +++---
 .../java/org/apache/commons/compress/harmony/pack200/CPFloat.java   | 6 +++---
 .../java/org/apache/commons/compress/harmony/pack200/CPInt.java     | 6 +++---
 .../java/org/apache/commons/compress/harmony/pack200/CPLong.java    | 6 +++---
 .../java/org/apache/commons/compress/harmony/pack200/CPString.java  | 6 +++---
 7 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/src/main/java/org/apache/commons/compress/harmony/pack200/CPClass.java \
b/src/main/java/org/apache/commons/compress/harmony/pack200/CPClass.java index \
                33018da7..c7f4a8a6 100644
--- a/src/main/java/org/apache/commons/compress/harmony/pack200/CPClass.java
+++ b/src/main/java/org/apache/commons/compress/harmony/pack200/CPClass.java
@@ -19,7 +19,7 @@ package org.apache.commons.compress.harmony.pack200;
 /**
  * Constant pool entry for a class
  */
-public class CPClass extends CPConstant implements Comparable {
+public class CPClass extends CPConstant<CPClass> {
 
     private final String className;
     private final CPUTF8 utf8;
@@ -39,8 +39,8 @@ public class CPClass extends CPConstant implements Comparable {
     }
 
     @Override
-    public int compareTo(final Object arg0) {
-        return className.compareTo(((CPClass) arg0).className);
+    public int compareTo(final CPClass arg0) {
+        return className.compareTo(arg0.className);
     }
 
     @Override
diff --git a/src/main/java/org/apache/commons/compress/harmony/pack200/CPConstant.java \
b/src/main/java/org/apache/commons/compress/harmony/pack200/CPConstant.java index \
                50769f22..800a7330 100644
--- a/src/main/java/org/apache/commons/compress/harmony/pack200/CPConstant.java
+++ b/src/main/java/org/apache/commons/compress/harmony/pack200/CPConstant.java
@@ -19,6 +19,6 @@ package org.apache.commons.compress.harmony.pack200;
 /**
  * Abstract superclass for constant pool constant entries such as numbers or Strings
  */
-public abstract class CPConstant extends ConstantPoolEntry implements Comparable {
+public abstract class CPConstant<T extends CPConstant<T>> extends ConstantPoolEntry \
implements Comparable<T> {  
 }
diff --git a/src/main/java/org/apache/commons/compress/harmony/pack200/CPDouble.java \
b/src/main/java/org/apache/commons/compress/harmony/pack200/CPDouble.java index \
                f35b03fd..4a98910e 100644
--- a/src/main/java/org/apache/commons/compress/harmony/pack200/CPDouble.java
+++ b/src/main/java/org/apache/commons/compress/harmony/pack200/CPDouble.java
@@ -19,7 +19,7 @@ package org.apache.commons.compress.harmony.pack200;
 /**
  * Constant pool entry for a double.
  */
-public class CPDouble extends CPConstant {
+public class CPDouble extends CPConstant<CPDouble> {
 
     private final double theDouble;
 
@@ -28,8 +28,8 @@ public class CPDouble extends CPConstant {
     }
 
     @Override
-    public int compareTo(final Object obj) {
-        return Double.compare(theDouble, ((CPDouble) obj).theDouble);
+    public int compareTo(final CPDouble obj) {
+        return Double.compare(theDouble, obj.theDouble);
     }
 
     public double getDouble() {
diff --git a/src/main/java/org/apache/commons/compress/harmony/pack200/CPFloat.java \
b/src/main/java/org/apache/commons/compress/harmony/pack200/CPFloat.java index \
                0fc54a40..cfe5b8f5 100644
--- a/src/main/java/org/apache/commons/compress/harmony/pack200/CPFloat.java
+++ b/src/main/java/org/apache/commons/compress/harmony/pack200/CPFloat.java
@@ -19,7 +19,7 @@ package org.apache.commons.compress.harmony.pack200;
 /**
  * Constant pool entry for a float.
  */
-public class CPFloat extends CPConstant {
+public class CPFloat extends CPConstant<CPFloat> {
 
     private final float theFloat;
 
@@ -28,8 +28,8 @@ public class CPFloat extends CPConstant {
     }
 
     @Override
-    public int compareTo(final Object obj) {
-        return Float.compare(theFloat, ((CPFloat) obj).theFloat);
+    public int compareTo(final CPFloat obj) {
+        return Float.compare(theFloat, obj.theFloat);
     }
 
     public float getFloat() {
diff --git a/src/main/java/org/apache/commons/compress/harmony/pack200/CPInt.java \
b/src/main/java/org/apache/commons/compress/harmony/pack200/CPInt.java index \
                5bbaa5cd..1ea487e9 100644
--- a/src/main/java/org/apache/commons/compress/harmony/pack200/CPInt.java
+++ b/src/main/java/org/apache/commons/compress/harmony/pack200/CPInt.java
@@ -19,7 +19,7 @@ package org.apache.commons.compress.harmony.pack200;
 /**
  * Constant pool entry for an int.
  */
-public class CPInt extends CPConstant {
+public class CPInt extends CPConstant<CPInt> {
 
     private final int theInt;
 
@@ -28,8 +28,8 @@ public class CPInt extends CPConstant {
     }
 
     @Override
-    public int compareTo(final Object obj) {
-        return Integer.compare(theInt, ((CPInt) obj).theInt);
+    public int compareTo(final CPInt obj) {
+        return Integer.compare(theInt, obj.theInt);
     }
 
     public int getInt() {
diff --git a/src/main/java/org/apache/commons/compress/harmony/pack200/CPLong.java \
b/src/main/java/org/apache/commons/compress/harmony/pack200/CPLong.java index \
                c0c0e858..9a5a385e 100644
--- a/src/main/java/org/apache/commons/compress/harmony/pack200/CPLong.java
+++ b/src/main/java/org/apache/commons/compress/harmony/pack200/CPLong.java
@@ -19,7 +19,7 @@ package org.apache.commons.compress.harmony.pack200;
 /**
  * Constant pool entry for a long.
  */
-public class CPLong extends CPConstant {
+public class CPLong extends CPConstant<CPLong> {
 
     private final long theLong;
 
@@ -28,8 +28,8 @@ public class CPLong extends CPConstant {
     }
 
     @Override
-    public int compareTo(final Object obj) {
-        return Long.compare(theLong, ((CPLong) obj).theLong);
+    public int compareTo(final CPLong obj) {
+        return Long.compare(theLong, obj.theLong);
     }
 
     public long getLong() {
diff --git a/src/main/java/org/apache/commons/compress/harmony/pack200/CPString.java \
b/src/main/java/org/apache/commons/compress/harmony/pack200/CPString.java index \
                a6860f68..097a809d 100644
--- a/src/main/java/org/apache/commons/compress/harmony/pack200/CPString.java
+++ b/src/main/java/org/apache/commons/compress/harmony/pack200/CPString.java
@@ -19,7 +19,7 @@ package org.apache.commons.compress.harmony.pack200;
 /**
  * Constant pool entry for a String.
  */
-public class CPString extends CPConstant {
+public class CPString extends CPConstant<CPString> {
 
     private final String string;
     private final CPUTF8 utf8;
@@ -30,8 +30,8 @@ public class CPString extends CPConstant {
     }
 
     @Override
-    public int compareTo(final Object arg0) {
-        return string.compareTo(((CPString) arg0).string);
+    public int compareTo(final CPString arg0) {
+        return string.compareTo(arg0.string);
     }
 
     @Override


[prev in list] [next in list] [prev in thread] [next in thread]