Skip to content
This repository was archived by the owner on Feb 26, 2023. It is now read-only.

Use phax/jcodemodel instead of com.sun.codemodel #1548

Merged
WonderCsabo merged 2 commits into from
Sep 21, 2015
Merged

Use phax/jcodemodel instead of com.sun.codemodel #1548

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c87cbeb
Change dependency to jcodemodel
WonderCsabo Sep 12, 2015
d1d56e9
Support multi-bounded type variables and wildcards
WonderCsabo Sep 14, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Change dependency to jcodemodel
  • Loading branch information
@WonderCsabo
WonderCsabo committed Sep 21, 2015
commit c87cbeb07c16105ef3de7a24084398477f3db01a
4 changes: 2 additions & 2 deletions AndroidAnnotations/androidannotations-core/androidannotations/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@
<artifactId>androidannotations-api</artifactId>
</dependency>
<dependency>
<groupId>com.sun.codemodel</groupId>
<artifactId>codemodel</artifactId>
<groupId>com.helger</groupId>
<artifactId>jcodemodel</artifactId>
</dependency>
<dependency>
<groupId>junit</groupId>
Expand Down
127 changes: 0 additions & 127 deletions ...idannotations-core/androidannotations/src/main/java/com/sun/codemodel/JSuperWildcard.java
View file
Open in desktop

This file was deleted.

10 changes: 5 additions & 5 deletions ...ndroidannotations/src/main/java/org/androidannotations/AndroidAnnotationsEnvironment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@
import org.androidannotations.plugin.AndroidAnnotationsPlugin;
import org.androidannotations.rclass.IRClass;

import com.sun.codemodel.JClass;
import com.sun.codemodel.JCodeModel;
import com.sun.codemodel.JDefinedClass;
import com.helger.jcodemodel.AbstractJClass;
import com.helger.jcodemodel.JCodeModel;
import com.helger.jcodemodel.JDefinedClass;

public interface AndroidAnnotationsEnvironment {

Expand Down Expand Up @@ -65,9 +65,9 @@ public interface AndroidAnnotationsEnvironment {

JCodeModel getCodeModel();

JClass getJClass(String fullyQualifiedName);
AbstractJClass getJClass(String fullyQualifiedName);

JClass getJClass(Class<?> clazz);
AbstractJClass getJClass(Class<?> clazz);

JDefinedClass getDefinedClass(String fullyQualifiedName);

Expand Down
8 changes: 4 additions & 4 deletions ...ndroidannotations/src/main/java/org/androidannotations/handler/BaseAnnotationHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@
import org.androidannotations.holder.GeneratedClassHolder;
import org.androidannotations.internal.process.ProcessHolder;

import com.sun.codemodel.JClass;
import com.sun.codemodel.JCodeModel;
import com.helger.jcodemodel.AbstractJClass;
import com.helger.jcodemodel.JCodeModel;

public abstract class BaseAnnotationHandler<T extends GeneratedClassHolder> implements AnnotationHandler<T> {

Expand Down Expand Up @@ -80,11 +80,11 @@ protected JCodeModel getCodeModel() {
return environment.getCodeModel();
}

protected JClass getJClass(String fullyQualifiedClassName) {
protected AbstractJClass getJClass(String fullyQualifiedClassName) {
return environment.getJClass(fullyQualifiedClassName);
}

protected JClass getJClass(Class<?> clazz) {
protected AbstractJClass getJClass(Class<?> clazz) {
return environment.getJClass(clazz);
}
}
Loading