Skip to content

Commit 4be09a9

Browse files
dodgexdodgex
committed
use LogHelper to ensure tag length does not exceed 23 characters
1 parent dedd910 commit 4be09a9

4 files changed

Lines changed: 9 additions & 7 deletions

File tree

‎AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/RootContextHandler.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717

1818
import static com.helger.jcodemodel.JExpr.cast;
1919
import static com.helger.jcodemodel.JExpr.lit;
20+
import static org.androidannotations.helper.LogHelper.logTagForClassHolder;
2021

2122
import javax.lang.model.element.Element;
2223
import javax.lang.model.type.TypeMirror;
@@ -82,7 +83,7 @@ public void assignValue(JBlock targetBlock, IJAssignmentTarget fieldRef, EBeanHo
8283
cond._then().add(fieldRef.assign(cast(extendingContextClass, holder.getContextRef())));
8384

8485
JInvocation warningInvoke = getClasses().LOG.staticInvoke("w");
85-
warningInvoke.arg(holder.getGeneratedClass().name());
86+
warningInvoke.arg(logTagForClassHolder(holder));
8687
warningInvoke.arg(lit("Due to Context class ").plus(holder.getContextRef().invoke("getClass").invoke("getSimpleName"))
8788
.plus(lit(", the @RootContext " + extendingContextClass.name() + " won't be populated")));
8889
cond._else().add(warningInvoke);

‎AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/TraceHandler.java‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import static org.androidannotations.helper.AndroidConstants.LOG_INFO;
2121
import static org.androidannotations.helper.AndroidConstants.LOG_VERBOSE;
2222
import static org.androidannotations.helper.AndroidConstants.LOG_WARN;
23+
import static org.androidannotations.helper.LogHelper.trimLogTag;
2324

2425
import java.util.ArrayList;
2526
import java.util.Arrays;
@@ -243,9 +244,6 @@ private String extractTag(Element element) {
243244
if (Trace.DEFAULT_TAG.equals(tag)) {
244245
tag = element.getEnclosingElement().getSimpleName().toString();
245246
}
246-
if (tag.length() > 23) {
247-
tag = tag.substring(0, 23);
248-
}
249-
return tag;
247+
return trimLogTag(tag);
250248
}
251249
}

‎AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/core/handler/TransactionalHandler.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
*/
1616
package org.androidannotations.internal.core.handler;
1717

18+
import static org.androidannotations.helper.LogHelper.logTagForClassHolder;
19+
1820
import javax.lang.model.element.Element;
1921
import javax.lang.model.element.ExecutableElement;
2022

@@ -102,7 +104,7 @@ public void process(Element element, EComponentHolder holder) {
102104

103105
JInvocation errorInvoke = catchBody.staticInvoke(getClasses().LOG, "e");
104106

105-
errorInvoke.arg(holder.getGeneratedClass().name());
107+
errorInvoke.arg(logTagForClassHolder(holder));
106108
errorInvoke.arg("Error in transaction");
107109
errorInvoke.arg(exceptionParam);
108110

‎AndroidAnnotations/androidannotations-ormlite/ormlite/src/main/java/org/androidannotations/ormlite/handler/OrmLiteDaoHandler.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717

1818
import static com.helger.jcodemodel.JExpr._new;
1919
import static com.helger.jcodemodel.JExpr.cast;
20+
import static org.androidannotations.helper.LogHelper.logTagForClassHolder;
2021

2122
import javax.lang.model.element.Element;
2223
import javax.lang.model.type.TypeMirror;
@@ -108,7 +109,7 @@ public void assignValue(JBlock targetBlock, IJAssignmentTarget fieldRef, ECompon
108109
String fieldName = param.getSimpleName().toString();
109110
catchBlock.body() //
110111
.staticInvoke(getClasses().LOG, "e") //
111-
.arg(holder.getGeneratedClass().name()) //
112+
.arg(logTagForClassHolder(holder))//
112113
.arg("Could not create DAO " + fieldName) //
113114
.arg(exception);
114115
}

0 commit comments

Comments
 (0)