Skip to content

Commit 3fb74f3

Browse files
yDelouisyDelouis
committed
Extract RoboGuice plugin
1 parent b37c08d commit 3fb74f3

48 files changed

Lines changed: 963 additions & 446 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎AndroidAnnotations/androidannotations-core/androidannotations-test/pom.xml‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,6 @@
5151
<version>4.1.1.4</version>
5252
<scope>provided</scope>
5353
</dependency>
54-
<dependency>
55-
<groupId>org.roboguice</groupId>
56-
<artifactId>roboguice</artifactId>
57-
<version>3.0</version>
58-
</dependency>
5954
<dependency>
6055
<groupId>com.google.android</groupId>
6156
<artifactId>support-v4</artifactId>

‎AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/AndroidManifest.xml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
<uses-permission android:name="android.permission.WAKE_LOCK" />
3030

3131
<application
32-
android:name=".roboguice.SampleRoboApplication_"
3332
android:icon="@drawable/icon"
3433
android:label="@string/app_name"
3534
android:debuggable="true" >
@@ -54,9 +53,6 @@
5453
<activity android:name=".ExtraInjectedActivity_" />
5554
<activity android:name=".TransactionalActivity_" />
5655
<activity android:name=".FromHtmlActivity_" />
57-
<activity android:name=".roboguice.MapActivityWithRoboGuice_" />
58-
<activity android:name=".roboguice.ActivityWithRoboGuice_" />
59-
<activity android:name=".ApplicationInjectedActivity_" />
6056
<activity android:name=".prefs.PrefsActivity_" />
6157
<activity android:name=".res.ResActivity_" />
6258
<activity android:name=".ThreadActivity_" />

‎AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/ebean/EnhancedClass.java‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
import android.widget.TextView;
2424

2525
import org.androidannotations.annotations.AfterInject;
26-
import org.androidannotations.annotations.App;
2726
import org.androidannotations.annotations.Background;
2827
import org.androidannotations.annotations.Bean;
2928
import org.androidannotations.annotations.Click;
@@ -36,7 +35,6 @@
3635
import org.androidannotations.annotations.ViewById;
3736
import org.androidannotations.annotations.res.StringRes;
3837
import org.androidannotations.test.ThreadActivity;
39-
import org.androidannotations.test.roboguice.SampleRoboApplication;
4038

4139
/**
4240
* This class doesn't have any test, currently it's just there to show that
@@ -64,9 +62,6 @@ public class EnhancedClass {
6462
@ViewById
6563
TextView myTextView;
6664

67-
@App
68-
SampleRoboApplication customApplication;
69-
7065
@StringRes
7166
String hello;
7267

‎AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/efragment/MyFragment.java‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717

1818
import org.androidannotations.annotations.AfterInject;
1919
import org.androidannotations.annotations.AfterViews;
20-
import org.androidannotations.annotations.App;
2120
import org.androidannotations.annotations.Click;
2221
import org.androidannotations.annotations.EFragment;
2322
import org.androidannotations.annotations.SystemService;
@@ -26,7 +25,6 @@
2625
import org.androidannotations.annotations.UiThread;
2726
import org.androidannotations.annotations.ViewById;
2827
import org.androidannotations.test.R;
29-
import org.androidannotations.test.roboguice.SampleRoboApplication;
3028

3129
import android.app.ActivityManager;
3230
import android.database.sqlite.SQLiteDatabase;
@@ -38,9 +36,6 @@ public class MyFragment extends AbstractFragment {
3836
@ViewById
3937
TextView myTextView;
4038

41-
@App
42-
SampleRoboApplication customApplication;
43-
4439
@SystemService
4540
ActivityManager activityManager;
4641

‎AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/efragment/MySupportFragment.java‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222

2323
import org.androidannotations.annotations.AfterInject;
2424
import org.androidannotations.annotations.AfterViews;
25-
import org.androidannotations.annotations.App;
2625
import org.androidannotations.annotations.Bean;
2726
import org.androidannotations.annotations.Click;
2827
import org.androidannotations.annotations.EFragment;
@@ -33,7 +32,6 @@
3332
import org.androidannotations.annotations.ViewById;
3433
import org.androidannotations.test.R;
3534
import org.androidannotations.test.ebean.SomeBean;
36-
import org.androidannotations.test.roboguice.SampleRoboApplication;
3735

3836
@EFragment(R.layout.injected)
3937
public class MySupportFragment extends Fragment {
@@ -44,9 +42,6 @@ public class MySupportFragment extends Fragment {
4442
@ViewById
4543
TextView myTextView;
4644

47-
@App
48-
SampleRoboApplication customApplication;
49-
5045
@SystemService
5146
ActivityManager activityManager;
5247

‎AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/res/layout/injected.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<ImageView
2626
android:layout_width="wrap_content"
2727
android:layout_height="wrap_content"
28-
android:src="@drawable/roboguice" />
28+
android:src="@drawable/icon" />
2929

3030
<TextView
3131
android:id="@+id/injected_text_view"

‎AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/res/values/strings.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
</string>
2424
<string name="app_name">android-functional-test-1-5</string>
2525
<string name="someView">TextView Text</string>
26-
<string name="injected_activity_caption">Roboguice Activity tested with Robolectric</string>
2726
<string name="injected_string">test</string>
2827

2928
<string-array name="planets_array">

‎AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/CorePlugin.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,6 @@
7575
import org.androidannotations.handler.PreferenceScreenHandler;
7676
import org.androidannotations.handler.ReceiverActionHandler;
7777
import org.androidannotations.handler.ReceiverHandler;
78-
import org.androidannotations.handler.RoboGuiceHandler;
7978
import org.androidannotations.handler.RootContextHandler;
8079
import org.androidannotations.handler.SeekBarProgressChangeHandler;
8180
import org.androidannotations.handler.SeekBarTouchStartHandler;
@@ -128,7 +127,6 @@ public void addHandlers(AnnotationHandlers annotationHandlers, AndroidAnnotation
128127
annotationHandlers.add(new EViewHandler(androidAnnotationEnv));
129128
annotationHandlers.add(new SharedPrefHandler(androidAnnotationEnv));
130129
annotationHandlers.add(new PrefHandler(androidAnnotationEnv));
131-
annotationHandlers.add(new RoboGuiceHandler(androidAnnotationEnv));
132130
annotationHandlers.add(new ViewByIdHandler(androidAnnotationEnv));
133131
annotationHandlers.add(new ViewsByIdHandler(androidAnnotationEnv));
134132
annotationHandlers.add(new FragmentByIdHandler(androidAnnotationEnv));

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

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -79,10 +79,6 @@ public APTCodeModelHelper(AndroidAnnotationsEnvironment environment) {
7979
this.environment = environment;
8080
}
8181

82-
public APTCodeModelHelper() {
83-
84-
}
85-
8682
public JClass typeMirrorToJClass(TypeMirror type) {
8783
return typeMirrorToJClass(type, Collections.<String, TypeMirror> emptyMap());
8884
}
@@ -168,7 +164,7 @@ private Map<String, TypeMirror> getActualTypes(Types typeUtils, DeclaredType bas
168164
}
169165

170166
public JClass typeBoundsToJClass(List<? extends TypeMirror> bounds) {
171-
return typeBoundsToJClass(bounds, Collections.<String, TypeMirror> emptyMap());
167+
return typeBoundsToJClass(bounds, Collections.<String, TypeMirror>emptyMap());
172168
}
173169

174170
private JClass typeBoundsToJClass(List<? extends TypeMirror> bounds, Map<String, TypeMirror> actualTypes) {
@@ -373,6 +369,19 @@ public void copy(JBlock body, JBlock newBody) {
373369
}
374370
}
375371

372+
public void removeBraces(JBlock block) {
373+
try {
374+
Field bracesRequiredField = JBlock.class.getDeclaredField("bracesRequired");
375+
bracesRequiredField.setAccessible(true);
376+
bracesRequiredField.set(block, false);
377+
Field indentRequiredField = JBlock.class.getDeclaredField("indentRequired");
378+
indentRequiredField.setAccessible(true);
379+
indentRequiredField.set(block, false);
380+
} catch (Exception e) {
381+
throw new RuntimeException(e);
382+
}
383+
}
384+
376385
public void replaceSuperCall(JMethod method, JBlock replacement) {
377386
String superCallStart = "super." + method.name() + "(";
378387

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

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -146,32 +146,6 @@ public final class CanonicalNameConstants {
146146
public static final String REST_CLIENT_EXCEPTION = "org.springframework.web.client.RestClientException";
147147
public static final String NESTED_RUNTIME_EXCEPTION = "org.springframework.core.NestedRuntimeException";
148148

149-
/*
150-
* RoboGuice
151-
*/
152-
public static final String ROBO_APPLICATION = "roboguice.application.RoboApplication";
153-
public static final String ON_START_EVENT_OLD = "roboguice.activity.event.OnStartEvent";
154-
public static final String ROBO_CONTEXT = "roboguice.util.RoboContext";
155-
public static final String ROBO_INJECTOR = "roboguice.inject.RoboInjector";
156-
public static final String KEY = "com.google.inject.Key";
157-
public static final String CONTENT_VIEW_LISTENER = "roboguice.inject.ContentViewListener";
158-
public static final String ON_RESTART_EVENT = "roboguice.activity.event.OnRestartEvent";
159-
public static final String ON_START_EVENT = "roboguice.context.event.OnStartEvent";
160-
public static final String ON_RESUME_EVENT = "roboguice.activity.event.OnResumeEvent";
161-
public static final String ON_PAUSE_EVENT = "roboguice.activity.event.OnPauseEvent";
162-
public static final String ON_NEW_INTENT_EVENT = "roboguice.activity.event.OnNewIntentEvent";
163-
public static final String EVENT_MANAGER = "roboguice.event.EventManager";
164-
public static final String CONTEXT_SCOPE = "roboguice.inject.ContextScope";
165-
public static final String VIEW_MEMBERS_INJECTOR = "roboguice.inject.ViewListener.ViewMembersInjector";
166-
public static final String ROBO_GUICE = "roboguice.RoboGuice";
167-
public static final String INJECT = "com.google.inject.Inject";
168-
public static final String ON_STOP_EVENT = "roboguice.activity.event.OnStopEvent";
169-
public static final String ON_DESTROY_EVENT = "roboguice.context.event.OnDestroyEvent";
170-
public static final String ON_CONFIGURATION_CHANGED_EVENT = "roboguice.context.event.OnConfigurationChangedEvent";
171-
public static final String ON_CONTENT_CHANGED_EVENT = "roboguice.activity.event.OnContentChangedEvent";
172-
public static final String ON_ACTIVITY_RESULT_EVENT = "roboguice.activity.event.OnActivityResultEvent";
173-
public static final String ON_CONTENT_VIEW_AVAILABLE_EVENT = "roboguice.activity.event.OnContentViewAvailableEvent";
174-
public static final String ON_CREATE_EVENT = "roboguice.context.event.OnCreateEvent";
175149

176150
/*
177151
* ORMLite

0 commit comments

Comments
 (0)