Skip to content

Commit 556da48

Browse files
mathieubonifacemathieuboniface
committed
Helper classes previously contained in the api jar are now generated at compile time.
1 parent c8c6c5a commit 556da48

32 files changed

Lines changed: 233 additions & 35 deletions

‎AndroidAnnotations/androidannotations-api/META-INF/MANIFEST.MF‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,7 @@ Export-Package: org.androidannotations.annotations,
77
org.androidannotations.annotations.res,
88
org.androidannotations.annotations.rest,
99
org.androidannotations.annotations.sharedpreferences,
10-
org.androidannotations.api,
11-
org.androidannotations.api.rest,
12-
org.androidannotations.api.sharedpreferences
10+
org.androidannotations.api.rest
1311
Bundle-Vendor: androidannotations
1412
Bundle-Activator: org.androidannotations.api.Activator
1513
Bundle-RequiredExecutionEnvironment: JavaSE-1.6

‎AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/sharedpreferences/Pref.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@
2020
import java.lang.annotation.RetentionPolicy;
2121
import java.lang.annotation.Target;
2222

23-
import org.androidannotations.api.sharedpreferences.SharedPreferencesHelper;
24-
2523
/**
2624
* Injects a {@link SharedPref}
2725
*

‎AndroidAnnotations/androidannotations/pom.xml‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
<groupId>com.google.android</groupId>
3434
<artifactId>android</artifactId>
3535
<version>1.6_r2</version>
36-
<scope>test</scope>
36+
<scope>provided</scope>
3737
</dependency>
3838
<dependency>
3939
<!-- spring-android-rest-template is required to use the Rest API -->
@@ -85,6 +85,12 @@
8585
<exclude>rebel.xml</exclude>
8686
</excludes>
8787
</resource>
88+
<resource>
89+
<directory>src/main/java</directory>
90+
<includes>
91+
<include>org/androidannotations/api/**</include>
92+
</includes>
93+
</resource>
8894
</resources>
8995
</build>
9096

AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/api/BackgroundExecutor.java renamed to AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/api/BackgroundExecutor.java

File renamed without changes.

AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/api/SdkVersionHelper.java renamed to AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/api/SdkVersionHelper.java

File renamed without changes.

‎AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/api/rest/MediaType.java‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
/**
2+
* Copyright (C) 2010-2012 eBusiness Information, Excilys Group
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
5+
* use this file except in compliance with the License. You may obtain a copy of
6+
* the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed To in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
12+
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
13+
* License for the specific language governing permissions and limitations under
14+
* the License.
15+
*/
16+
package org.androidannotations.api.rest;
17+
18+
public final class MediaType {
19+
20+
public final static String ALL = "*/*";
21+
public final static String APPLICATION_ATOM_XML = "application/atom+xml";
22+
public final static String APPLICATION_RSS_XML = "application/rss+xml";
23+
public final static String APPLICATION_FORM_URLENCODED = "application/x-www-form-urlencoded";
24+
public final static String APPLICATION_JSON = "application/json";
25+
public final static String APPLICATION_OCTET_STREAM = "application/octet-stream";
26+
public final static String APPLICATION_XHTML_XML = "application/xhtml+xml";
27+
public final static String IMAGE_GIF = "image/gif";
28+
public final static String IMAGE_JPEG = "image/jpeg";
29+
public final static String IMAGE_PNG = "image/png";
30+
public final static String APPLICATION_XML = "application/xml";
31+
public final static String APPLICATION_WILDCARD_XML = "application/*+xml";
32+
public final static String MULTIPART_FORM_DATA = "multipart/form-data";
33+
public final static String TEXT_HTML = "text/html";
34+
public final static String TEXT_PLAIN = "text/plain";
35+
public final static String TEXT_XML = "text/xml";
36+
37+
private MediaType() {
38+
39+
}
40+
41+
}

AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/api/sharedpreferences/AbstractPrefEditorField.java renamed to AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/api/sharedpreferences/AbstractPrefEditorField.java

File renamed without changes.

AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/api/sharedpreferences/AbstractPrefField.java renamed to AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/api/sharedpreferences/AbstractPrefField.java

File renamed without changes.

AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/api/sharedpreferences/BooleanPrefEditorField.java renamed to AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/api/sharedpreferences/BooleanPrefEditorField.java

File renamed without changes.

AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/api/sharedpreferences/BooleanPrefField.java renamed to AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/api/sharedpreferences/BooleanPrefField.java

File renamed without changes.

0 commit comments

Comments
 (0)