Skip to content

Commit 2c10bf2

Browse files
WonderCsaboWonderCsabo
committed
Move Ormlite-specific code from core module
1 parent ae23d81 commit 2c10bf2

5 files changed

Lines changed: 5 additions & 26 deletions

File tree

‎AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/helper/CanonicalNameConstants.java‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -129,15 +129,6 @@ public final class CanonicalNameConstants {
129129
public static final String INTERNET_PERMISSION = "android.permission.INTERNET";
130130
public static final String WAKELOCK_PERMISSION = "android.permission.WAKE_LOCK";
131131

132-
/*
133-
* ORMLite
134-
*/
135-
public static final String DAO = "com.j256.ormlite.dao.Dao";
136-
public static final String DAO_MANAGER = "com.j256.ormlite.dao.DaoManager";
137-
public static final String CONNECTION_SOURCE = "com.j256.ormlite.support.ConnectionSource";
138-
public static final String OPEN_HELPER_MANAGER = "com.j256.ormlite.android.apptools.OpenHelperManager";
139-
public static final String RUNTIME_EXCEPTION_DAO = "com.j256.ormlite.dao.RuntimeExceptionDao";
140-
141132
/*
142133
* HttpClient
143134
*/

‎AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/process/ProcessHolder.java‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -129,14 +129,6 @@ public class Classes {
129129
public final JClass PREFERENCE_CLICK_LISTENER = refClass(CanonicalNameConstants.PREFERENCE_CLICK_LISTENER);
130130
public final JClass PREFERENCE_ACTIVITY_HEADER = refClass(CanonicalNameConstants.PREFERENCE_ACTIVITY_HEADER);
131131

132-
/*
133-
* OrmLite
134-
*/
135-
public final JClass CONNECTION_SOURCE = refClass(CanonicalNameConstants.CONNECTION_SOURCE);
136-
public final JClass OPEN_HELPER_MANAGER = refClass(CanonicalNameConstants.OPEN_HELPER_MANAGER);
137-
public final JClass RUNTIME_EXCEPTION_DAO = refClass(CanonicalNameConstants.RUNTIME_EXCEPTION_DAO);
138-
public final JClass DAO_MANAGER = refClass(CanonicalNameConstants.DAO_MANAGER);
139-
140132
/*
141133
* HttpClient
142134
*/

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@
2424
import com.sun.codemodel.JVar;
2525
import org.androidannotations.AndroidAnnotationsEnvironment;
2626
import org.androidannotations.handler.BaseAnnotationHandler;
27-
import org.androidannotations.helper.CanonicalNameConstants;
2827
import org.androidannotations.holder.EComponentHolder;
2928
import org.androidannotations.ormlite.annotations.OrmLiteDao;
29+
import org.androidannotations.ormlite.helper.OrmLiteClasses;
3030
import org.androidannotations.ormlite.helper.OrmLiteHelper;
3131
import org.androidannotations.ormlite.helper.OrmLiteValidatorHelper;
3232
import org.androidannotations.ormlite.holder.OrmLiteHolder;
@@ -73,7 +73,7 @@ public void process(Element element, EComponentHolder holder) {
7373
JClass idClass = refClass(ormLiteHelper.getEntityIdType(element));
7474
JExpression modelClassDotClass = modelClass.dotclass();
7575

76-
JClass daoClass = refClass(CanonicalNameConstants.DAO).narrow(modelClass, idClass);
76+
JClass daoClass = refClass(OrmLiteClasses.DAO).narrow(modelClass, idClass);
7777

7878
TypeMirror databaseHelperTypeMirror = annotationHelper.extractAnnotationParameter(element, "helper");
7979
JFieldVar databaseHelperRef = ormLiteHolder.getDatabaseHelperRef(databaseHelperTypeMirror);

‎AndroidAnnotations/androidannotations-ormlite/ormlite/src/main/java/org/androidannotations/ormlite/helper/OrmLiteClasses.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@
1818
public final class OrmLiteClasses {
1919

2020
public static final String DAO = "com.j256.ormlite.dao.Dao";
21-
public static final String DAO_MANAGER = "com.j256.ormlite.dao.DaoManager";
22-
public static final String CONNECTION_SOURCE = "com.j256.ormlite.support.ConnectionSource";
2321
public static final String OPEN_HELPER_MANAGER = "com.j256.ormlite.android.apptools.OpenHelperManager";
2422
public static final String RUNTIME_EXCEPTION_DAO = "com.j256.ormlite.dao.RuntimeExceptionDao";
2523

‎AndroidAnnotations/androidannotations-ormlite/ormlite/src/main/java/org/androidannotations/ormlite/helper/OrmLiteHelper.java‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,15 @@
1616
package org.androidannotations.ormlite.helper;
1717

1818

19-
import org.androidannotations.helper.CanonicalNameConstants;
2019
import org.androidannotations.helper.TargetAnnotationHelper;
2120

22-
import java.util.List;
23-
2421
import javax.lang.model.element.Element;
2522
import javax.lang.model.element.TypeElement;
2623
import javax.lang.model.type.DeclaredType;
2724
import javax.lang.model.type.TypeKind;
2825
import javax.lang.model.type.TypeMirror;
2926
import javax.lang.model.util.Types;
27+
import java.util.List;
3028

3129
public class OrmLiteHelper {
3230

@@ -107,8 +105,8 @@ public DeclaredType getTypedRuntimeExceptionDao(Element element) {
107105
}
108106

109107
private void createDaoParametrizedTypes() {
110-
daoTypeElement = helper.typeElementFromQualifiedName(CanonicalNameConstants.DAO);
111-
runtimeExceptionDaoTypeElement = helper.typeElementFromQualifiedName(CanonicalNameConstants.RUNTIME_EXCEPTION_DAO);
108+
daoTypeElement = helper.typeElementFromQualifiedName(OrmLiteClasses.DAO);
109+
runtimeExceptionDaoTypeElement = helper.typeElementFromQualifiedName(OrmLiteClasses.RUNTIME_EXCEPTION_DAO);
112110

113111
Types typeUtils = helper.getTypeUtils();
114112
TypeMirror wildcardType = typeUtils.getWildcardType(null, null);

0 commit comments

Comments
 (0)