Merge branch 'develop' into 220_rest_template_generics

mathieuboniface · Feb 4, 2013 · Oct 1, 2012 · Oct 2, 2012 · Oct 2, 2012 · Oct 2, 2012
commit ac2fa8405b1cde56a720fe73437d97c0a9432de4
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,2 @@
+.DS_Store
+rebel.xml
diff --git a/AndroidAnnotations/HOW-TO.txt b/AndroidAnnotations/HOW-TO.txt
diff --git a/AndroidAnnotations/LICENSE.txt b/AndroidAnnotations/LICENSE.txt
diff --git a/AndroidAnnotations/androidannotations-api/.gitignore b/AndroidAnnotations/androidannotations-api/.gitignore
@@ -0,0 +1,4 @@
+.classpath
+.project
+target/
+
diff --git a/AndroidAnnotations/androidannotations-api/.settings/org.eclipse.core.resources.prefs b/AndroidAnnotations/androidannotations-api/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,4 @@
+eclipse.preferences.version=1
+encoding//src/main/java=UTF-8
+encoding//src/test/java=UTF-8
+encoding/<project>=UTF-8
diff --git a/AndroidAnnotations/androidannotations-api/.settings/org.eclipse.jdt.core.prefs b/AndroidAnnotations/androidannotations-api/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,5 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.source=1.6
diff --git a/AndroidAnnotations/androidannotations-api/.settings/org.eclipse.m2e.core.prefs b/AndroidAnnotations/androidannotations-api/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/AndroidAnnotations/androidannotations-api/META-INF/MANIFEST.MF b/AndroidAnnotations/androidannotations-api/META-INF/MANIFEST.MF
@@ -0,0 +1,18 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: androidannotations-api
+Bundle-SymbolicName: org.androidannotations-api;singleton:=true
+Bundle-Version: 1.0.0
+Export-Package: org.androidannotations.annotations,
+ org.androidannotations.annotations.res,
+ org.androidannotations.annotations.rest,
+ org.androidannotations.annotations.sharedpreferences,
+ org.androidannotations.api,
+ org.androidannotations.api.rest,
+ org.androidannotations.api.sharedpreferences
+Bundle-Vendor: androidannotations
+Bundle-Activator: org.androidannotations.api.Activator
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Require-Bundle: org.eclipse.core.runtime;bundle-version="3.6.0",
+ org.eclipse.jdt.apt.core;bundle-version="3.3.500",
+ androidannotations-dependencies;bundle-version="1.0.0"
diff --git a/AndroidAnnotations/androidannotations-api/build.properties b/AndroidAnnotations/androidannotations-api/build.properties
@@ -0,0 +1,5 @@
+source.. = src/main/java/,\
+           src/test/java/,\
+           src/main/eclipse/
+bin.includes = META-INF/,\
+               .
diff --git a/AndroidAnnotations/androidannotations-api/pom.xml b/AndroidAnnotations/androidannotations-api/pom.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+
+	<parent>
+		<artifactId>androidannotations-parent</artifactId>
+		<groupId>org.androidannotations</groupId>
+		<version>3.0-SNAPSHOT</version>
+	</parent>
+
+	<artifactId>androidannotations-api</artifactId>
+	<description>The API jar containing the annotations and the runtime helpers</description>
+	<name>AndroidAnnotations API</name>
+
+
+	<dependencies>
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>com.google.android</groupId>
+			<artifactId>android</artifactId>
+			<version>1.6_r2</version>
+			<scope>provided</scope>
+		</dependency>
+	</dependencies>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<configuration>
+					<source>1.6</source>
+					<target>1.6</target>
+				</configuration>
+			</plugin>
+			<plugin>
+				<artifactId>maven-javadoc-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>attach-javadocs</id>
+						<goals>
+							<goal>jar</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<artifactId>maven-source-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>attach-sources</id>
+						<goals>
+							<goal>jar</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+
+</project>
diff --git a/...glecode/androidannotations/Activator.java → ...org/androidannotations/api/Activator.java b/...glecode/androidannotations/Activator.java → ...org/androidannotations/api/Activator.java
@@ -1,3 +1,4 @@
+package org.androidannotations.api;
 /**
  * Copyright (C) 2010-2012 eBusiness Information, Excilys Group
  *
@@ -13,7 +14,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations;
+
 
 import org.eclipse.core.runtime.Plugin;
 import org.osgi.framework.BundleContext;
@@ -24,7 +25,7 @@
 public class Activator extends Plugin {
 
         // The plug-in ID
-        public static final String PLUGIN_ID = "com.googlecode.androidannotations";
+        public static final String PLUGIN_ID = "org.androidannotations-api";
 
         // The shared instance
         private static Activator plugin;

diff --git a/...dannotations/annotations/AfterInject.java → ...dannotations/annotations/AfterInject.java b/...dannotations/annotations/AfterInject.java → ...dannotations/annotations/AfterInject.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.annotations;
+package org.androidannotations.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

diff --git a/...otations/annotations/AfterTextChange.java → ...otations/annotations/AfterTextChange.java b/...otations/annotations/AfterTextChange.java → ...otations/annotations/AfterTextChange.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.annotations;
+package org.androidannotations.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

diff --git a/...idannotations/annotations/AfterViews.java → ...idannotations/annotations/AfterViews.java b/...idannotations/annotations/AfterViews.java → ...idannotations/annotations/AfterViews.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.annotations;
+package org.androidannotations.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

diff --git a/...e/androidannotations/annotations/App.java → ...g/androidannotations/annotations/App.java b/...e/androidannotations/annotations/App.java → ...g/androidannotations/annotations/App.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.annotations;
+package org.androidannotations.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

diff --git a/...idannotations/annotations/Background.java → ...idannotations/annotations/Background.java b/...idannotations/annotations/Background.java → ...idannotations/annotations/Background.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.annotations;
+package org.androidannotations.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

diff --git a/.../androidannotations/annotations/Bean.java → .../androidannotations/annotations/Bean.java b/.../androidannotations/annotations/Bean.java → .../androidannotations/annotations/Bean.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.annotations;
+package org.androidannotations.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

diff --git a/...tations/annotations/BeforeTextChange.java → ...tations/annotations/BeforeTextChange.java b/...tations/annotations/BeforeTextChange.java → ...tations/annotations/BeforeTextChange.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.annotations;
+package org.androidannotations.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

diff --git a/...androidannotations/annotations/Click.java → ...androidannotations/annotations/Click.java b/...androidannotations/annotations/Click.java → ...androidannotations/annotations/Click.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.annotations;
+package org.androidannotations.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

diff --git a/...oidannotations/annotations/EActivity.java → ...oidannotations/annotations/EActivity.java b/...oidannotations/annotations/EActivity.java → ...oidannotations/annotations/EActivity.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.annotations;
+package org.androidannotations.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

diff --git a/...annotations/annotations/EApplication.java → ...annotations/annotations/EApplication.java b/...annotations/annotations/EApplication.java → ...annotations/annotations/EApplication.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.annotations;
+package org.androidannotations.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

diff --git a/...androidannotations/annotations/EBean.java → ...androidannotations/annotations/EBean.java b/...androidannotations/annotations/EBean.java → ...androidannotations/annotations/EBean.java
@@ -13,14 +13,14 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.annotations;
+package org.androidannotations.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import com.googlecode.androidannotations.api.Scope;
+import org.androidannotations.api.Scope;
 
 /**
  * Should be used on custom classes to enable usage of AndroidAnnotations

diff --git a/...oidannotations/annotations/EFragment.java → ...oidannotations/annotations/EFragment.java b/...oidannotations/annotations/EFragment.java → ...oidannotations/annotations/EFragment.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.annotations;
+package org.androidannotations.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

diff --git a/...oidannotations/annotations/EProvider.java → ...oidannotations/annotations/EProvider.java b/...oidannotations/annotations/EProvider.java → ...oidannotations/annotations/EProvider.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.annotations;
+package org.androidannotations.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

diff --git a/...oidannotations/annotations/EReceiver.java → ...oidannotations/annotations/EReceiver.java b/...oidannotations/annotations/EReceiver.java → ...oidannotations/annotations/EReceiver.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.annotations;
+package org.androidannotations.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

diff --git a/...roidannotations/annotations/EService.java → ...roidannotations/annotations/EService.java b/...roidannotations/annotations/EService.java → ...roidannotations/annotations/EService.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.annotations;
+package org.androidannotations.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

diff --git a/...androidannotations/annotations/EView.java → ...androidannotations/annotations/EView.java b/...androidannotations/annotations/EView.java → ...androidannotations/annotations/EView.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.annotations;
+package org.androidannotations.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

diff --git a/...idannotations/annotations/EViewGroup.java → ...idannotations/annotations/EViewGroup.java b/...idannotations/annotations/EViewGroup.java → ...idannotations/annotations/EViewGroup.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.annotations;
+package org.androidannotations.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

diff --git a/...androidannotations/annotations/Extra.java → ...androidannotations/annotations/Extra.java b/...androidannotations/annotations/Extra.java → ...androidannotations/annotations/Extra.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.annotations;
+package org.androidannotations.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

diff --git a/.../androidannotations-api/src/main/java/org/androidannotations/annotations/FragmentArg.java b/.../androidannotations-api/src/main/java/org/androidannotations/annotations/FragmentArg.java
@@ -0,0 +1,36 @@
+/**
+ * Copyright (C) 2010-2012 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 on fields in fragments. This String value field corresponds to the
+ * argument name.
+ * 
+ * When {@link FragmentArg} is used on fields in a Fragment, the fragment
+ * builder will hold dedicated methods for these arguments.
+ * 
+ */
+@Retention(RetentionPolicy.CLASS)
+@Target(ElementType.FIELD)
+public @interface FragmentArg {
+
+	String value() default "";
+}
diff --git a/...annotations/annotations/FragmentById.java → ...annotations/annotations/FragmentById.java b/...annotations/annotations/FragmentById.java → ...annotations/annotations/FragmentById.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.annotations;
+package org.androidannotations.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

diff --git a/...nnotations/annotations/FragmentByTag.java → ...nnotations/annotations/FragmentByTag.java b/...nnotations/annotations/FragmentByTag.java → ...nnotations/annotations/FragmentByTag.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.annotations;
+package org.androidannotations.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

diff --git a/...roidannotations/annotations/FromHtml.java → ...roidannotations/annotations/FromHtml.java b/...roidannotations/annotations/FromHtml.java → ...roidannotations/annotations/FromHtml.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.googlecode.androidannotations.annotations;
+package org.androidannotations.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;