From c2736357529f8bc4fd64a1aa3a22b4e66b8cfce9 Mon Sep 17 00:00:00 2001 From: WonderCsabo Date: Sat, 9 May 2015 18:21:09 +0200 Subject: [PATCH] Remove @NoTitle annotation --- .../annotations/Fullscreen.java | 1 - .../annotations/NoTitle.java | 38 --------------- .../annotations/WindowFeature.java | 3 -- .../handler/AnnotationHandlers.java | 1 - .../handler/NoTitleHandler.java | 46 ------------------- ...nActivity.java => FullscreenActivity.java} | 5 +- 6 files changed, 1 insertion(+), 93 deletions(-) delete mode 100644 AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/NoTitle.java delete mode 100644 AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/NoTitleHandler.java rename AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/{NoTitleFullscreenActivity.java => FullscreenActivity.java} (84%) diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/Fullscreen.java b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/Fullscreen.java index e25593e6d9..0fb28f9ecd 100644 --- a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/Fullscreen.java +++ b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/Fullscreen.java @@ -38,7 +38,6 @@ * * * - * @see NoTitle * @see WindowFeature */ @Retention(RetentionPolicy.CLASS) diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/NoTitle.java b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/NoTitle.java deleted file mode 100644 index 8d5ffc009d..0000000000 --- a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/NoTitle.java +++ /dev/null @@ -1,38 +0,0 @@ -/** - * Copyright (C) 2010-2015 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; - -/** - *

- * Should be used on {@link EActivity} classes that must have no title. - *

- * - * @see WindowFeature - * - * @deprecated Please use - * @WindowFeature(Window.FEATURE_NO_TITLE}) - * instead - */ -@Deprecated -@Retention(RetentionPolicy.CLASS) -@Target(ElementType.TYPE) -public @interface NoTitle { -} diff --git a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/WindowFeature.java b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/WindowFeature.java index 424f12c662..dc15c98208 100644 --- a/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/WindowFeature.java +++ b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/WindowFeature.java @@ -28,9 +28,6 @@ * The annotation value should be one or several of {@link android.view.Window} * constants. *

- *

- * Note: This should replace {@link NoTitle} annotation. - *

*
* * Example : diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/AnnotationHandlers.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/AnnotationHandlers.java index de2fe8e804..d0950389ce 100644 --- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/AnnotationHandlers.java +++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/AnnotationHandlers.java @@ -96,7 +96,6 @@ public AnnotationHandlers(ProcessingEnvironment processingEnvironment) { add(new OptionsMenuHandler(processingEnvironment)); add(new OptionsMenuItemHandler(processingEnvironment)); add(new OptionsItemHandler(processingEnvironment)); - add(new NoTitleHandler(processingEnvironment)); add(new CustomTitleHandler(processingEnvironment)); add(new FullscreenHandler(processingEnvironment)); add(new RestServiceHandler(processingEnvironment)); diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/NoTitleHandler.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/NoTitleHandler.java deleted file mode 100644 index f998170daf..0000000000 --- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/NoTitleHandler.java +++ /dev/null @@ -1,46 +0,0 @@ -/** - * Copyright (C) 2010-2015 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.handler; - -import javax.annotation.processing.ProcessingEnvironment; -import javax.lang.model.element.Element; - -import org.androidannotations.annotations.NoTitle; -import org.androidannotations.holder.EActivityHolder; -import org.androidannotations.model.AnnotationElements; -import org.androidannotations.process.IsValid; - -import com.sun.codemodel.JFieldRef; - -@SuppressWarnings("deprecation") -public class NoTitleHandler extends BaseAnnotationHandler { - - public NoTitleHandler(ProcessingEnvironment processingEnvironment) { - super(NoTitle.class, processingEnvironment); - } - - @Override - public void validate(Element element, AnnotationElements validatedElements, IsValid valid) { - validatorHelper.hasEActivity(element, validatedElements, valid); - } - - @Override - public void process(Element element, EActivityHolder holder) { - JFieldRef noTitle = classes().WINDOW.staticRef("FEATURE_NO_TITLE"); - - holder.getInitBody().invoke("requestWindowFeature").arg(noTitle); - } -} diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/NoTitleFullscreenActivity.java b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/FullscreenActivity.java similarity index 84% rename from AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/NoTitleFullscreenActivity.java rename to AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/FullscreenActivity.java index 40d324aadf..134c1b3264 100644 --- a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/NoTitleFullscreenActivity.java +++ b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/FullscreenActivity.java @@ -17,14 +17,11 @@ import org.androidannotations.annotations.EActivity; import org.androidannotations.annotations.Fullscreen; -import org.androidannotations.annotations.NoTitle; import android.app.Activity; -@SuppressWarnings("deprecation") @EActivity -@NoTitle @Fullscreen -public class NoTitleFullscreenActivity extends Activity { +public class FullscreenActivity extends Activity { }