minor corrections

qos-ch · Mar 5, 2019 · 6a1c3b9 · 6a1c3b9
1 parent eaafcc8
commit 6a1c3b9
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 9 deletions.
diff --git a/logback-core/src/main/java/ch/qos/logback/core/joran/action/Action.java b/logback-core/src/main/java/ch/qos/logback/core/joran/action/Action.java
@@ -74,17 +74,17 @@ public String toString() {
     }
 
     protected int getColumnNumber(InterpretationContext ic) {
-        Interpreter ji = ic.getJoranInterpreter();
-        Locator locator = ji.getLocator();
+        Interpreter interpreter = ic.getJoranInterpreter();
+        Locator locator = interpreter.getLocator();
         if (locator != null) {
             return locator.getColumnNumber();
         }
         return -1;
     }
 
     protected int getLineNumber(InterpretationContext ic) {
-        Interpreter ji = ic.getJoranInterpreter();
-        Locator locator = ji.getLocator();
+        Interpreter interpreter = ic.getJoranInterpreter();
+        Locator locator = interpreter.getLocator();
         if (locator != null) {
             return locator.getLineNumber();
         }

diff --git a/logback-core/src/test/java/ch/qos/logback/core/joran/action/DefinePropertyActionTest.java b/logback-core/src/test/java/ch/qos/logback/core/joran/action/DefinePropertyActionTest.java
@@ -40,7 +40,6 @@
 import ch.qos.logback.core.status.Status;
 import ch.qos.logback.core.testUtil.CoreTestConstants;
 import ch.qos.logback.core.testUtil.StatusChecker;
-import ch.qos.logback.core.util.StatusPrinter;
 
 /**
  * Test {@link DefinePropertyAction}.
@@ -57,8 +56,6 @@ public class DefinePropertyActionTest {
 
     SimpleConfigurator simpleConfigurator;
     Context context = new ContextBase();
-    DefinePropertyAction definerAction;
-    InterpretationContext ic;
     StatusChecker checker = new StatusChecker(context);
 
     @Before
@@ -84,7 +81,6 @@ protected DefaultProcessor buildDefaultProcessor(Context context, Interpretation
 
     @After
     public void tearDown() throws Exception {
-        // StatusPrinter.printInCaseOfErrorsOrWarnings(context);
     }
 
     @Test

diff --git a/logback-core/src/test/java/ch/qos/logback/core/joran/action/PackageTest.java b/logback-core/src/test/java/ch/qos/logback/core/joran/action/PackageTest.java
@@ -18,6 +18,6 @@
 import org.junit.runners.Suite.SuiteClasses;
 
 @RunWith(Suite.class)
-@SuiteClasses({ PropertyActionTest.class, IncludeActionTest.class })
+@SuiteClasses({ PropertyActionTest.class, IncludeActionTest.class, DefinePropertyActionTest.class })
 public class PackageTest {
 }