Skip to content

Commit d06b621

Browse files
committed
chore: internal reorganisation (breaking)
1 parent 6607300 commit d06b621

12 files changed

+15
-16
lines changed

src/main/java/ftbsc/lll/exceptions/InstructionMismatchException.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package ftbsc.lll.exceptions;
22

3-
import ftbsc.lll.tools.InsnSequence;
3+
import ftbsc.lll.utils.InsnSequence;
44

55
/**
66
* Thrown when attempting to build an {@link InsnSequence} between two

src/main/java/ftbsc/lll/proxies/impl/FieldProxy.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
import java.lang.reflect.Field;
99

10-
import static ftbsc.lll.tools.DescriptorBuilder.nameToDescriptor;
10+
import static ftbsc.lll.utils.DescriptorBuilder.nameToDescriptor;
1111

1212
/**
1313
* A container for information about class fields to be used

src/main/java/ftbsc/lll/proxies/impl/MethodProxy.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
import java.util.Arrays;
1111
import java.util.List;
1212

13-
import static ftbsc.lll.tools.DescriptorBuilder.nameToDescriptor;
13+
import static ftbsc.lll.utils.DescriptorBuilder.nameToDescriptor;
1414

1515
/**
1616
* A container for information about class methods to be used

src/main/java/ftbsc/lll/proxies/impl/TypeProxy.java

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
package ftbsc.lll.proxies.impl;
22

3-
import ftbsc.lll.proxies.AbstractProxy;
43
import ftbsc.lll.proxies.ProxyType;
54
import ftbsc.lll.proxies.QualifiableProxy;
65
import org.objectweb.asm.Type;
76

87
import java.lang.reflect.Modifier;
98

10-
import static ftbsc.lll.tools.DescriptorBuilder.nameToDescriptor;
9+
import static ftbsc.lll.utils.DescriptorBuilder.nameToDescriptor;
1110

1211
/**
1312
* A container for information about classes to be used
@@ -123,4 +122,4 @@ public static TypeProxy from(Class<?> clazz) {
123122
public boolean equals(Object obj) {
124123
return obj instanceof TypeProxy && super.equals(obj);
125124
}
126-
}
125+
}

src/main/java/ftbsc/lll/tools/DescriptorBuilder.java src/main/java/ftbsc/lll/utils/DescriptorBuilder.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package ftbsc.lll.tools;
1+
package ftbsc.lll.utils;
22

33
import org.objectweb.asm.Type;
44

src/main/java/ftbsc/lll/tools/InsnSequence.java src/main/java/ftbsc/lll/utils/InsnSequence.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package ftbsc.lll.tools;
1+
package ftbsc.lll.utils;
22

33
import ftbsc.lll.exceptions.InstructionMismatchException;
44
import org.objectweb.asm.tree.AbstractInsnNode;

src/main/java/ftbsc/lll/tools/PatternMatcher.java src/main/java/ftbsc/lll/utils/PatternMatcher.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package ftbsc.lll.tools;
1+
package ftbsc.lll.utils;
22

33
import ftbsc.lll.exceptions.PatternNotFoundException;
44
import org.objectweb.asm.tree.AbstractInsnNode;

src/main/java/ftbsc/lll/tools/StackTools.java src/main/java/ftbsc/lll/utils/StackUtils.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package ftbsc.lll.tools;
1+
package ftbsc.lll.utils;
22

33
import org.objectweb.asm.Opcodes;
44
import org.objectweb.asm.tree.*;
@@ -10,7 +10,7 @@
1010
* Includes anything from instantiation to variable manipulation - just about
1111
* anything that loads stuff on or from the stack.
1212
*/
13-
public class StackTools implements Opcodes {
13+
public class StackUtils implements Opcodes {
1414
/**
1515
* Creates a new instance of an object, given its internal name, constructor descriptor and instructions to load
1616
* the parameters.

src/main/java/ftbsc/lll/tools/debug/BytecodePrinter.java src/main/java/ftbsc/lll/utils/debug/BytecodePrinter.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package ftbsc.lll.tools.debug;
1+
package ftbsc.lll.utils.debug;
22

33
import org.apache.logging.log4j.Logger;
44
import org.objectweb.asm.tree.AbstractInsnNode;
@@ -76,4 +76,4 @@ public static String insnToString(AbstractInsnNode insn) {
7676
PRINTER.getText().clear();
7777
return sw.toString();
7878
}
79-
}
79+
}

src/main/java/ftbsc/lll/tools/nodes/FieldProxyInsnNode.java src/main/java/ftbsc/lll/utils/nodes/FieldProxyInsnNode.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package ftbsc.lll.tools.nodes;
1+
package ftbsc.lll.utils.nodes;
22

33
import ftbsc.lll.proxies.impl.FieldProxy;
44
import org.objectweb.asm.tree.FieldInsnNode;

src/main/java/ftbsc/lll/tools/nodes/MethodProxyInsnNode.java src/main/java/ftbsc/lll/utils/nodes/MethodProxyInsnNode.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package ftbsc.lll.tools.nodes;
1+
package ftbsc.lll.utils.nodes;
22

33
import ftbsc.lll.proxies.impl.MethodProxy;
44
import org.objectweb.asm.tree.MethodInsnNode;

src/main/java/ftbsc/lll/tools/nodes/TypeProxyInsnNode.java src/main/java/ftbsc/lll/utils/nodes/TypeProxyInsnNode.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package ftbsc.lll.tools.nodes;
1+
package ftbsc.lll.utils.nodes;
22

33
import ftbsc.lll.proxies.impl.TypeProxy;
44
import org.objectweb.asm.tree.TypeInsnNode;

0 commit comments

Comments
 (0)