Minor refactor for slice host

DimensionalDevelopment · Jan 30, 2017 · 9fd488c · 9fd488c
1 parent d794ae7
commit 9fd488c
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/src/main/java/org/spongepowered/asm/mixin/injection/code/ISliceContext.java b/src/main/java/org/spongepowered/asm/mixin/injection/code/ISliceContext.java
@@ -31,4 +31,6 @@
  */
 public interface ISliceContext extends IInjectionPointContext {
 
+    public abstract MethodSlice getSlice(String id);
+
 }
diff --git a/src/main/java/org/spongepowered/asm/mixin/injection/code/InjectorTarget.java b/src/main/java/org/spongepowered/asm/mixin/injection/code/InjectorTarget.java
@@ -30,7 +30,6 @@
 import org.spongepowered.asm.lib.tree.InsnList;
 import org.spongepowered.asm.lib.tree.MethodNode;
 import org.spongepowered.asm.mixin.injection.InjectionPoint;
-import org.spongepowered.asm.mixin.injection.struct.InjectionInfo;
 import org.spongepowered.asm.mixin.injection.struct.Target;
 
 /**
@@ -42,7 +41,7 @@ public class InjectorTarget {
     /**
      * Owner injector
      */
-    private final InjectionInfo info;
+    private final ISliceContext context;
 
     /**
      * Cache of slices
@@ -57,11 +56,11 @@ public class InjectorTarget {
     /**
      * ctor
      * 
-     * @param info owner
+     * @param context owner
      * @param target target
      */
-    public InjectorTarget(InjectionInfo info, Target target) {
-        this.info = info;
+    public InjectorTarget(ISliceContext context, Target target) {
+        this.context = context;
         this.target = target;
     }
 
@@ -88,7 +87,7 @@ public MethodNode getMethod() {
     public InsnList getSlice(String id) {
         ReadOnlyInsnList slice = this.cache.get(id);
         if (slice == null) {
-            MethodSlice sliceInfo = this.info.getSlice(id);
+            MethodSlice sliceInfo = this.context.getSlice(id);
             if (sliceInfo != null) {
                 slice = sliceInfo.getSlice(this.target.method);
             } else {

diff --git a/src/main/java/org/spongepowered/asm/mixin/injection/struct/InjectionInfo.java b/src/main/java/org/spongepowered/asm/mixin/injection/struct/InjectionInfo.java
@@ -287,6 +287,7 @@ public Collection<MethodNode> getTargets() {
     /**
      * Get the slice descriptors
      */
+    @Override
     public MethodSlice getSlice(String id) {
         return this.slices.get(this.getSliceId(id));
     }
-Original file line number
+Diff line change
@@ Expand Up / @@ -31,4 +31,6 @@ @@
      */
     public interface ISliceContext extends IInjectionPointContext {
+        public abstract MethodSlice getSlice(String id);
     }