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-bcel.git
The following commit(s) were added to refs/heads/master by this push:
new bd91abe7 Sort members
bd91abe7 is described below
commit bd91abe7fe4cb5044af4f188878e371c6bedd6e5
Author: Gary David Gregory (Code signing key) <ggreg...@apache.org>
AuthorDate: Wed Nov 2 19:50:19 2022 -0400
Sort members
---
.../java/org/apache/bcel/classfile/Utility.java | 48 +++++++++++-----------
.../apache/bcel/generic/InstructionFactory.java | 8 ++--
src/main/java/org/apache/bcel/generic/Select.java | 16 ++++----
.../apache/bcel/verifier/GraphicalVerifier.java | 4 +-
4 files changed, 38 insertions(+), 38 deletions(-)
diff --git a/src/main/java/org/apache/bcel/classfile/Utility.java
b/src/main/java/org/apache/bcel/classfile/Utility.java
index f0f64a59..9953bba0 100644
--- a/src/main/java/org/apache/bcel/classfile/Utility.java
+++ b/src/main/java/org/apache/bcel/classfile/Utility.java
@@ -574,17 +574,6 @@ public abstract class Utility {
return str;
}
- /**
- * Converts a path to a package name.
- *
- * @param str the source path.
- * @return a package name.
- * @since 6.6.0
- */
- public static String pathToPackage(final String str) {
- return str.replace('/', '.');
- }
-
/**
* Escape all occurrences of newline chars '\n', quotes \", etc.
*/
@@ -745,6 +734,19 @@ public abstract class Utility {
return new String(buf) + str;
}
+ /**
+ * Return a string for an integer justified left or right and filled up
with `fill' characters if necessary.
+ *
+ * @param i integer to format
+ * @param length length of desired string
+ * @param leftJustify format left or right
+ * @param fill fill character
+ * @return formatted int
+ */
+ public static String format(final int i, final int length, final boolean
leftJustify, final char fill) {
+ return fillup(Integer.toString(i), length, leftJustify, fill);
+ }
+
/**
* WARNING:
*
@@ -769,19 +771,6 @@ public abstract class Utility {
* you should call typeSignatureToString directly.
*/
- /**
- * Return a string for an integer justified left or right and filled up
with `fill' characters if necessary.
- *
- * @param i integer to format
- * @param length length of desired string
- * @param leftJustify format left or right
- * @param fill fill character
- * @return formatted int
- */
- public static String format(final int i, final int length, final boolean
leftJustify, final char fill) {
- return fillup(Integer.toString(i), length, leftJustify, fill);
- }
-
/**
* Parse Java type such as "char", or "java.lang.String[]" and return the
signature in byte code format, e.g. "C" or
* "[Ljava/lang/String;" respectively.
@@ -1041,6 +1030,17 @@ public abstract class Utility {
return buf.toString();
}
+ /**
+ * Converts a path to a package name.
+ *
+ * @param str the source path.
+ * @return a package name.
+ * @since 6.6.0
+ */
+ public static String pathToPackage(final String str) {
+ return str.replace('/', '.');
+ }
+
private static int pow2(final int n) {
return 1 << n;
}
diff --git a/src/main/java/org/apache/bcel/generic/InstructionFactory.java
b/src/main/java/org/apache/bcel/generic/InstructionFactory.java
index 852b53fc..9a30335d 100644
--- a/src/main/java/org/apache/bcel/generic/InstructionFactory.java
+++ b/src/main/java/org/apache/bcel/generic/InstructionFactory.java
@@ -30,10 +30,6 @@ import org.apache.bcel.Const;
*/
public class InstructionFactory implements InstructionConstants {
- private static final String APPEND = "append";
-
- private static final String FQCN_STRING_BUFFER = "java.lang.StringBuffer";
-
private static class MethodObject {
final Type[] argTypes;
@@ -49,6 +45,10 @@ public class InstructionFactory implements
InstructionConstants {
}
}
+ private static final String APPEND = "append";
+
+ private static final String FQCN_STRING_BUFFER = "java.lang.StringBuffer";
+
// N.N. These must agree with the order of Constants.T_CHAR through T_LONG
private static final String[] shortNames = {"C", "F", "D", "B", "S", "I",
"L"};
diff --git a/src/main/java/org/apache/bcel/generic/Select.java
b/src/main/java/org/apache/bcel/generic/Select.java
index c2647a9c..d9f67dea 100644
--- a/src/main/java/org/apache/bcel/generic/Select.java
+++ b/src/main/java/org/apache/bcel/generic/Select.java
@@ -266,21 +266,21 @@ public abstract class Select extends BranchInstruction
implements VariableLength
}
/**
- * @param matchLength the match_length to set
+ *
+ * @param array
* @since 6.0
*/
- final int setMatchLength(final int matchLength) {
- this.match_length = matchLength;
- return matchLength;
+ final void setMatches(final int[] array) {
+ match = array;
}
/**
- *
- * @param array
+ * @param matchLength the match_length to set
* @since 6.0
*/
- final void setMatches(final int[] array) {
- match = array;
+ final int setMatchLength(final int matchLength) {
+ this.match_length = matchLength;
+ return matchLength;
}
/**
diff --git a/src/main/java/org/apache/bcel/verifier/GraphicalVerifier.java
b/src/main/java/org/apache/bcel/verifier/GraphicalVerifier.java
index fdd689e4..115055e0 100644
--- a/src/main/java/org/apache/bcel/verifier/GraphicalVerifier.java
+++ b/src/main/java/org/apache/bcel/verifier/GraphicalVerifier.java
@@ -28,6 +28,8 @@ import org.apache.bcel.generic.Type;
*/
public class GraphicalVerifier {
+ private static final boolean packFrame = false;
+
/** Main method. */
public static void main(final String[] args) {
try {
@@ -38,8 +40,6 @@ public class GraphicalVerifier {
new GraphicalVerifier();
}
- private static final boolean packFrame = false;
-
/** Constructor. */
public GraphicalVerifier() {
final VerifierAppFrame frame = new VerifierAppFrame();
