From fe81d95b0e12a62c81c7441420cdebb26e2650a0 Mon Sep 17 00:00:00 2001
From: LoveSy <shana@zju.edu.cn>
Date: Fri, 3 Feb 2023 18:37:00 +0800
Subject: [PATCH] Make DexParser.Id comparable

---
 .../github/libxposed/api/utils/DexParser.java | 38 +++++++++----------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/api/src/main/java/io/github/libxposed/api/utils/DexParser.java b/api/src/main/java/io/github/libxposed/api/utils/DexParser.java
index 878f352..201ac2c 100644
--- a/api/src/main/java/io/github/libxposed/api/utils/DexParser.java
+++ b/api/src/main/java/io/github/libxposed/api/utils/DexParser.java
@@ -89,24 +89,10 @@ public interface DexParser extends Closeable {
         @NonNull
         StringId getName();
     }
-
-    /**
-     * The interface Type id.
-     */
-    interface TypeId {
-        /**
-         * Gets descriptor.
-         *
-         * @return the descriptor
-         */
-        @NonNull
-        StringId getDescriptor();
-    }
-
     /**
      * The interface Id.
      */
-    interface Id {
+    interface Id<Self> extends Comparable<Self> {
         /**
          * Gets id.
          *
@@ -115,10 +101,24 @@ public interface DexParser extends Closeable {
         int getId();
     }
 
+    /**
+     * The interface Type id.
+     */
+    interface TypeId extends Id<TypeId> {
+        /**
+         * Gets descriptor.
+         *
+         * @return the descriptor
+         */
+        @NonNull
+        StringId getDescriptor();
+    }
+
+
     /**
      * The interface String id.
      */
-    interface StringId extends Id {
+    interface StringId extends Id<StringId> {
         /**
          * Gets string.
          *
@@ -131,7 +131,7 @@ public interface DexParser extends Closeable {
     /**
      * The interface Field id.
      */
-    interface FieldId extends Id {
+    interface FieldId extends Id<FieldId> {
         /**
          * Gets type.
          *
@@ -160,7 +160,7 @@ public interface DexParser extends Closeable {
     /**
      * The interface Method id.
      */
-    interface MethodId extends Id {
+    interface MethodId extends Id<MethodId> {
         /**
          * Gets declaring class.
          *
@@ -189,7 +189,7 @@ public interface DexParser extends Closeable {
     /**
      * The interface Proto id.
      */
-    interface ProtoId extends Id {
+    interface ProtoId extends Id<ProtoId> {
         /**
          * Gets shorty.
          *