Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings
This repository was archived by the owner on Feb 26, 2023. It is now read-only.

Upgrade to RoboGuice 2 #983

Merged
DayS merged 3 commits into from
May 31, 2014
Merged

Upgrade to RoboGuice 2 #983

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9dcdf29
Upgrade to RoboGuice 2
WonderCsabo May 2, 2014
4b63413
Merge upstream changes
WonderCsabo May 13, 2014
137353b
Fix @RoboGuice init method
WonderCsabo May 14, 2014
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
92 changes: 46 additions & 46 deletions 92 .../androidannotations-api/src/main/java/org/androidannotations/annotations/CustomTitle.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,46 +1,46 @@
/**
* Copyright (C) 2010-2014 eBusiness Information, Excilys Group
*
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed To in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
* License for the specific language governing permissions and limitations under
* the License.
*/
package org.androidannotations.annotations;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
/**
* Use it on {@link EActivity} annotated classes to set a custom title layout.
* <p/>
* The annotation value is mandatory and should be one of R.layout.* fields.
* <p/>
* <blockquote>
*
* Example :
*
* <pre>
* &#064;CustomTitle(R.layout.activityTitleLayout)
* &#064;EActivity(R.layout.main)
* public class MyActivity extends Activity {
*
* }
* </pre>
*
* </blockquote>
*/
@Retention(RetentionPolicy.CLASS)
@Target(ElementType.TYPE)
public @interface CustomTitle {
int value();
}
/**
* Copyright (C) 2010-2014 eBusiness Information, Excilys Group
*
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed To in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
* License for the specific language governing permissions and limitations under
* the License.
*/
package org.androidannotations.annotations;

import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;

/**
* Use it on {@link EActivity} annotated classes to set a custom title layout.
* <p/>
* The annotation value is mandatory and should be one of R.layout.* fields.
* <p/>
* <blockquote>
*
* Example :
*
* <pre>
* &#064;CustomTitle(R.layout.activityTitleLayout)
* &#064;EActivity(R.layout.main)
* public class MyActivity extends Activity {
*
* }
* </pre>
*
* </blockquote>
*/
@Retention(RetentionPolicy.CLASS)
@Target(ElementType.TYPE)
public @interface CustomTitle {
int value();
}
101 changes: 44 additions & 57 deletions 101 ...ons/androidannotations/src/main/java/org/androidannotations/handler/RoboGuiceHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@

import com.sun.codemodel.JBlock;
import com.sun.codemodel.JClass;
import com.sun.codemodel.JExpr;
import com.sun.codemodel.JExpression;
import com.sun.codemodel.JFieldVar;
import com.sun.codemodel.JInvocation;
Expand All @@ -49,7 +50,7 @@

public class RoboGuiceHandler extends BaseAnnotationHandler<EActivityHolder> {

private APTCodeModelHelper codeModelHelper = new APTCodeModelHelper();
private APTCodeModelHelper codeModelHelper = new APTCodeModelHelper();

public RoboGuiceHandler(ProcessingEnvironment processingEnvironment) {
super(RoboGuice.class, processingEnvironment);
Expand All @@ -66,25 +67,25 @@ public void validate(Element element, AnnotationElements validatedElements, IsVa
public void process(Element element, EActivityHolder holder) {
RoboGuiceHolder roboGuiceHolder = holder.getRoboGuiceHolder();

holder.getGeneratedClass()._implements(classes().INJECTOR_PROVIDER);
holder.getGeneratedClass()._implements(classes().ROBO_CONTEXT);

JFieldVar scope = roboGuiceHolder.getScopeField();
JFieldVar scopedObjects = roboGuiceHolder.getScopedObjectsField();
JFieldVar eventManager = roboGuiceHolder.getEventManagerField();
JMethod getInjector = roboGuiceHolder.getGetInjector();
roboGuiceHolder.getContentViewListenerField();
listenerFields(element, holder);

beforeCreateMethod(holder, scope, eventManager, getInjector);
afterSetContentView(holder, scope, eventManager);
onRestartMethod(roboGuiceHolder, scope, eventManager);
onStartMethod(roboGuiceHolder, scope, eventManager);
onResumeMethod(roboGuiceHolder, scope, eventManager);
beforeCreateMethod(holder, scopedObjects, eventManager);
onRestartMethod(roboGuiceHolder, eventManager);
onStartMethod(roboGuiceHolder, eventManager);
onResumeMethod(roboGuiceHolder, eventManager);
onPauseMethod(roboGuiceHolder, eventManager);
onNewIntentMethod(roboGuiceHolder, scope, eventManager);
onStopMethod(roboGuiceHolder, scope, eventManager);
onDestroyMethod(roboGuiceHolder, scope, eventManager);
onNewIntentMethod(roboGuiceHolder, eventManager);
onStopMethod(roboGuiceHolder, eventManager);
onDestroyMethod(roboGuiceHolder, eventManager);
onConfigurationChangedMethod(roboGuiceHolder, eventManager);
onContentChangedMethod(roboGuiceHolder, eventManager);
onActivityResultMethod(roboGuiceHolder, scope, eventManager);
onActivityResultMethod(roboGuiceHolder, eventManager);
getScopedObjectMap(holder, scopedObjects);
}

private void listenerFields(Element element, EActivityHolder holder) {
Expand Down Expand Up @@ -130,39 +131,29 @@ private List<String> extractListenerClasses(Element activityElement) {
return new ArrayList<String>(0);
}

private void beforeCreateMethod(EActivityHolder holder, JFieldVar scope, JFieldVar eventManager, JMethod getInjector) {
private void beforeCreateMethod(EActivityHolder holder, JFieldVar scopedObjects, JFieldVar eventManager) {
JBlock body = holder.getInitBody();
JVar injector = body.decl(classes().INJECTOR, "injector_", invoke(getInjector));
body.assign(scope, invoke(injector, "getInstance").arg(classes().CONTEXT_SCOPE.dotclass()));
body.invoke(scope, "enter").arg(_this());
body.invoke(injector, "injectMembers").arg(_this());
JClass keyWildCard = classes().KEY.narrow(codeModel().wildcard());
JClass scopedHashMap = classes().HASH_MAP.narrow(keyWildCard, classes().OBJECT);
body.assign(scopedObjects, JExpr._new(scopedHashMap));

JVar injector = body.decl(classes().ROBO_INJECTOR, "injector_", classes().ROBO_GUICE.staticInvoke("getInjector").arg(_this()));
body.assign(eventManager, invoke(injector, "getInstance").arg(classes().EVENT_MANAGER.dotclass()));
body.add(injector.invoke("injectMembersWithoutViews").arg(_this()));
fireEvent(eventManager, body, classes().ON_CREATE_EVENT, holder.getInitSavedInstanceParam());
}

private void afterSetContentView(EActivityHolder holder, JFieldVar scope, JFieldVar eventManager) {
JBlock onViewChanged = holder.getOnViewChangedBody();
onViewChanged.invoke(scope, "injectViews");
fireEvent(eventManager, onViewChanged, classes().ON_CONTENT_VIEW_AVAILABLE_EVENT);
}

private void onRestartMethod(RoboGuiceHolder holder, JFieldVar scope, JFieldVar eventManager) {
JBlock onRestartBeforeSuperBlock = holder.getOnRestartBeforeSuperBlock();
onRestartBeforeSuperBlock.invoke(scope, "enter").arg(_this());
private void onRestartMethod(RoboGuiceHolder holder, JFieldVar eventManager) {
JBlock onRestartAfterSuperBlock = holder.getOnRestartAfterSuperBlock();
fireEvent(eventManager, onRestartAfterSuperBlock, classes().ON_RESTART_EVENT);
}

private void onStartMethod(RoboGuiceHolder holder, JFieldVar scope, JFieldVar eventManager) {
JBlock onStartBeforeSuperBlock = holder.getOnStartBeforeSuperBlock();
onStartBeforeSuperBlock.invoke(scope, "enter").arg(_this());
private void onStartMethod(RoboGuiceHolder holder, JFieldVar eventManager) {
JBlock onStartAfterSuperBlock = holder.getOnStartAfterSuperBlock();
fireEvent(eventManager, onStartAfterSuperBlock, classes().ON_START_EVENT);
}

private void onResumeMethod(RoboGuiceHolder holder, JFieldVar scope, JFieldVar eventManager) {
JBlock onResumeBeforeSuperBlock = holder.getOnResumeBeforeSuperBlock();
onResumeBeforeSuperBlock.invoke(scope, "enter").arg(_this());
private void onResumeMethod(RoboGuiceHolder holder, JFieldVar eventManager) {
JBlock onResumeAfterSuperBlock = holder.getOnResumeAfterSuperBlock();
fireEvent(eventManager, onResumeAfterSuperBlock, classes().ON_RESUME_EVENT);
}
Expand All @@ -172,42 +163,37 @@ private void onPauseMethod(RoboGuiceHolder holder, JFieldVar eventManager) {
fireEvent(eventManager, onPauseAfterSuperBlock, classes().ON_PAUSE_EVENT);
}

private void onNewIntentMethod(RoboGuiceHolder holder, JFieldVar scope, JFieldVar eventManager) {
private void onNewIntentMethod(RoboGuiceHolder holder, JFieldVar eventManager) {
JBlock onNewIntentAfterSuperBlock = holder.getOnNewIntentAfterSuperBlock();
onNewIntentAfterSuperBlock.invoke(scope, "enter").arg(_this());
fireEvent(eventManager, onNewIntentAfterSuperBlock, classes().ON_NEW_INTENT_EVENT);
}

private void onStopMethod(RoboGuiceHolder holder, JFieldVar scope, JFieldVar eventManager) {
private void onStopMethod(RoboGuiceHolder holder, JFieldVar eventManager) {
JBlock onStopBlock = new JBlock(false, false);
onStopBlock.invoke(scope, "enter").arg(_this());

JTryBlock tryBlock = onStopBlock._try();
fireEvent(eventManager, tryBlock.body(), classes().ON_STOP_EVENT);
JBlock finallyBody = tryBlock._finally();

finallyBody.invoke(scope, "exit").arg(_this());
finallyBody.invoke(_super(), "onStop");

JMethod onStop = holder.getOnStop();
codeModelHelper.replaceSuperCall(onStop, onStopBlock);
JMethod onStop = holder.getOnStop();
codeModelHelper.replaceSuperCall(onStop, onStopBlock);
}

private void onDestroyMethod(RoboGuiceHolder holder, JFieldVar scope, JFieldVar eventManager) {
JBlock onDestroyBlock = new JBlock(false, false);
onDestroyBlock.invoke(scope, "enter").arg(_this());
private void onDestroyMethod(RoboGuiceHolder holder, JFieldVar eventManager) {
JBlock onDestroyBlock = new JBlock(false, false);

JTryBlock tryBlock = onDestroyBlock._try();
fireEvent(eventManager, tryBlock.body(), classes().ON_DESTROY_EVENT);
JBlock finallyBody = tryBlock._finally();

finallyBody.invoke(eventManager, "clear").arg(_this());
finallyBody.invoke(scope, "exit").arg(_this());
finallyBody.invoke(scope, "dispose").arg(_this());
finallyBody.invoke(_super(), "onDestroy");
JTryBlock tryInFinally = finallyBody._try();
tryInFinally.body().add(classes().ROBO_GUICE.staticInvoke("destroyInjector").arg(_this()));
tryInFinally._finally().invoke(_super(), "onDestroy");

JMethod onDestroy = holder.getOnDestroy();
codeModelHelper.replaceSuperCall(onDestroy, onDestroyBlock);
JMethod onDestroy = holder.getOnDestroy();
codeModelHelper.replaceSuperCall(onDestroy, onDestroyBlock);
}

private void onConfigurationChangedMethod(RoboGuiceHolder holder, JFieldVar eventManager) {
Expand All @@ -219,22 +205,17 @@ private void onConfigurationChangedMethod(RoboGuiceHolder holder, JFieldVar even

private void onContentChangedMethod(RoboGuiceHolder holder, JFieldVar eventManager) {
JBlock onContentChangedAfterSuperBlock = holder.getOnContentChangedAfterSuperBlock();
onContentChangedAfterSuperBlock.add(classes().ROBO_GUICE.staticInvoke("getInjector").arg(_this()).invoke("injectViewMembers").arg(_this()));
fireEvent(eventManager, onContentChangedAfterSuperBlock, classes().ON_CONTENT_CHANGED_EVENT);
}

private void onActivityResultMethod(RoboGuiceHolder holder, JFieldVar scope, JFieldVar eventManager) {
private void onActivityResultMethod(RoboGuiceHolder holder, JFieldVar eventManager) {
JBlock onActivityResultAfterSuperBlock = holder.getOnActivityResultAfterSuperBlock();
JVar requestCode = holder.getRequestCode();
JVar resultCode = holder.getResultCode();
JVar data = holder.getData();

onActivityResultAfterSuperBlock.invoke(scope, "enter").arg(_this());

JTryBlock tryBlock = onActivityResultAfterSuperBlock._try();
fireEvent(eventManager, tryBlock.body(), classes().ON_ACTIVITY_RESULT_EVENT, requestCode, resultCode, data);

JBlock finallyBody = tryBlock._finally();
finallyBody.invoke(scope, "exit").arg(_this());
fireEvent(eventManager, onActivityResultAfterSuperBlock, classes().ON_ACTIVITY_RESULT_EVENT, requestCode, resultCode, data);
}

private void fireEvent(JFieldVar eventManager, JBlock body, JClass eventClass, JExpression... eventArguments) {
Expand All @@ -244,4 +225,10 @@ private void fireEvent(JFieldVar eventManager, JBlock body, JClass eventClass, J
}
body.invoke(eventManager, "fire").arg(newEvent);
}

private void getScopedObjectMap(EActivityHolder holder, JFieldVar scopedObjectMap) {
JMethod getScopedObjectMapMethod = holder.getGeneratedClass().method(JMod.PUBLIC, scopedObjectMap.type(), "getScopedObjectMap");
getScopedObjectMapMethod.annotate(Override.class);
getScopedObjectMapMethod.body()._return(scopedObjectMap);
}
}
7 changes: 5 additions & 2 deletions 7 ...ndroidannotations/src/main/java/org/androidannotations/helper/CanonicalNameConstants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,15 +141,18 @@ public final class CanonicalNameConstants {
/*
* RoboGuice
*/
public static final String INJECTOR_PROVIDER = "roboguice.inject.InjectorProvider";
public static final String INJECTOR = "com.google.inject.Injector";
public static final String ROBO_CONTEXT = "roboguice.util.RoboContext";
public static final String ROBO_INJECTOR = "roboguice.inject.RoboInjector";
public static final String KEY = "com.google.inject.Key";
public static final String CONTENT_VIEW_LISTENER = "roboguice.inject.ContentViewListener";
public static final String ON_RESTART_EVENT = "roboguice.activity.event.OnRestartEvent";
public static final String ON_START_EVENT = "roboguice.activity.event.OnStartEvent";
public static final String ON_RESUME_EVENT = "roboguice.activity.event.OnResumeEvent";
public static final String ON_PAUSE_EVENT = "roboguice.activity.event.OnPauseEvent";
public static final String ON_NEW_INTENT_EVENT = "roboguice.activity.event.OnNewIntentEvent";
public static final String EVENT_MANAGER = "roboguice.event.EventManager";
public static final String CONTEXT_SCOPE = "roboguice.inject.ContextScope";
public static final String ROBO_GUICE = "roboguice.RoboGuice";
public static final String INJECT = "com.google.inject.Inject";
public static final String ON_STOP_EVENT = "roboguice.activity.event.OnStopEvent";
public static final String ON_DESTROY_EVENT = "roboguice.activity.event.OnDestroyEvent";
Expand Down
Loading
Morty Proxy This is a proxified and sanitized view of the page, visit original site.