Merge pull request orhanobut#32 from orhanobut/oo/method-offset

method count offset
shiehnpin · May 30, 2015 · 0cd51f5 · 0cd51f5
2 parents 5abbc15 + c527157
commit 0cd51f5
Show file tree

Hide file tree

Showing 6 changed files with 44 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -16,7 +16,7 @@ Logger provides :
 
 ### Gradle
 ```groovy
-compile 'com.orhanobut:logger:1.9'
+compile 'com.orhanobut:logger:1.10'
 ```
 
 ### Current Log system
@@ -72,6 +72,7 @@ public class MyApplication extends Application {
              .setMethodCount(3)            // default 2
              .hideThreadInfo()             // default shown
              .setLogLevel(LogLevel.NONE);  // default LogLevel.FULL
+             .setMethodOffset(2)           // default 0
     }
 }
 ```
@@ -111,6 +112,11 @@ Logger.t(1).d("hello");
 
 <img src='https://github.com/orhanobut/logger/blob/master/images/one-method-with-thread.png'/>
 
+### Change method stack offset (Default: 0)
+To integrate logger with other libraries, you can set the offset in order to avoid that library's methods.
+```java
+Logger.init().setMethodOffset(5);
+```
 
 ### Hide thread information
 ```java

diff --git a/app/src/main/java/com/orhanobut/loggersample/MainActivity.java b/app/src/main/java/com/orhanobut/loggersample/MainActivity.java
@@ -16,7 +16,7 @@ protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
 
-        Logger.init("test").hideThreadInfo().setMethodCount(0);
+        Logger.init("test").hideThreadInfo().setMethodCount(3).setMethodOffset(2);
 
         printNormalLog();
         printPretty();

diff --git a/gradle.properties b/gradle.properties
@@ -18,8 +18,8 @@
 # org.gradle.parallel=true
 
 #VERSION_NAME=1.0-SNAPSHOT
-VERSION_NAME=1.9
-VERSION_CODE=10
+VERSION_NAME=1.10
+VERSION_CODE=11
 GROUP=com.orhanobut
 
 POM_DESCRIPTION=Simple,pretty and powerful log

diff --git a/logger/src/androidTest/java/com/orhanobut/logger/LoggerTest.java b/logger/src/androidTest/java/com/orhanobut/logger/LoggerTest.java
@@ -72,4 +72,27 @@ public void testStackTraceWithHugeMethodCount() {
             fail();
         }
     }
+
+    public void testSetMethodOffset() {
+        try {
+            Logger.init().setMethodOffset(100);
+            Assert.assertTrue(true);
+        } catch (Exception e) {
+            fail();
+        }
+        try {
+            Logger.init().setMethodOffset(0);
+            Assert.assertTrue(true);
+        } catch (Exception e) {
+            fail();
+        }
+        try {
+            Logger.init()
+                    .setMethodCount(100)
+                    .setMethodOffset(100);
+            Assert.assertTrue(true);
+        } catch (Exception e) {
+            fail();
+        }
+    }
 }
diff --git a/logger/src/main/java/com/orhanobut/logger/LoggerPrinter.java b/logger/src/main/java/com/orhanobut/logger/LoggerPrinter.java
@@ -248,7 +248,7 @@ private void logHeaderContent(int logType, String tag, int methodCount) {
         }
         String level = "";
 
-        int stackOffset = getStackOffset(trace);
+        int stackOffset = getStackOffset(trace) + settings.getMethodOffset();
 
         //corresponding method count with the current stack may exceeds the stack trace. Trims the count
         if (methodCount + stackOffset > trace.length) {

diff --git a/logger/src/main/java/com/orhanobut/logger/Settings.java b/logger/src/main/java/com/orhanobut/logger/Settings.java
@@ -7,6 +7,7 @@ public final class Settings {
 
     private int methodCount = 2;
     private boolean showThreadInfo = true;
+    private int methodOffset = 0;
 
     /**
      * Determines how logs will printed
@@ -28,6 +29,11 @@ public Settings setLogLevel(LogLevel logLevel) {
         return this;
     }
 
+    public Settings setMethodOffset(int offset) {
+        this.methodOffset = offset;
+        return this;
+    }
+
     public int getMethodCount() {
         return methodCount;
     }
@@ -39,4 +45,8 @@ public boolean isShowThreadInfo() {
     public LogLevel getLogLevel() {
         return logLevel;
     }
+
+    public int getMethodOffset() {
+        return methodOffset;
+    }
 }