Skip to content

Commit 8e82eea

Browse files
pyricaupyricau
committed
Merge branch 'develop' into jzapata-ecomponent
2 parents 63488c2 + 1e502f5 commit 8e82eea

File tree

258 files changed

+630
-344
lines changed

Some content is hidden

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

258 files changed

+630
-344
lines changed

‎AndroidAnnotations/.settings/org.eclipse.core.resources.prefs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
#Thu Oct 27 16:48:40 CEST 2011
2+
eclipse.preferences.version=1
3+
encoding/<project>=UTF-8

‎AndroidAnnotations/.settings/org.eclipse.m2e.core.prefs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
#Thu Oct 27 16:48:39 CEST 2011
2+
activeProfiles=
3+
eclipse.preferences.version=1
4+
resolveWorkspaceProjects=true
5+
version=1

‎AndroidAnnotations/LICENSE.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
************************************
22
This project is available under the following license:
33
************************************
4-
Copyright 2010-2011 Pierre-Yves Ricau
4+
Copyright 2010-2011 eBusiness Information, Excilys Group
55

66
Licensed under the Apache License, Version 2.0 (the "License"); you may not
77
use this file except in compliance with the License. You may obtain a copy of

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

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
Manifest-Version: 1.0
2+
Bundle-ManifestVersion: 2
3+
Bundle-Name: androidannotations
4+
Bundle-SymbolicName: com.googlecode.androidannotations;singleton:=true
5+
Bundle-Version: 1.0.0
6+
Export-Package: com.googlecode.androidannotations,
7+
com.googlecode.androidannotations.annotationprocessor,
8+
com.googlecode.androidannotations.annotations,
9+
com.googlecode.androidannotations.annotations.res,
10+
com.googlecode.androidannotations.annotations.rest,
11+
com.googlecode.androidannotations.annotations.sharedpreferences,
12+
com.googlecode.androidannotations.api,
13+
com.googlecode.androidannotations.api.sharedpreferences,
14+
com.googlecode.androidannotations.generation,
15+
com.googlecode.androidannotations.helper,
16+
com.googlecode.androidannotations.model,
17+
com.googlecode.androidannotations.processing,
18+
com.googlecode.androidannotations.processing.rest,
19+
com.googlecode.androidannotations.rclass,
20+
com.googlecode.androidannotations.validation,
21+
com.googlecode.androidannotations.validation.rest
22+
Bundle-Vendor: androidannotations
23+
Require-Bundle: org.eclipse.core.runtime;bundle-version="3.6.0",
24+
org.eclipse.jdt.apt.core;bundle-version="3.3.402",
25+
androidannotations-dependencies;bundle-version="1.0.0"
26+
Import-Package: com.googlecode.androidannotations
27+
Bundle-Activator: com.googlecode.androidannotations.Activator
28+
Bundle-RequiredExecutionEnvironment: JavaSE-1.6

‎AndroidAnnotations/functional-test-1-5/default.properties renamed to ‎AndroidAnnotations/androidannotations/build.properties

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright (C) 2010-2011 Pierre-Yves Ricau (py.ricau at gmail.com)
2+
# Copyright (C) 2010-2011 eBusiness Information, Excilys Group
33
#
44
# Licensed under the Apache License, Version 2.0 (the "License"); you may not
55
# use this file except in compliance with the License. You may obtain a copy of
@@ -14,6 +14,10 @@
1414
# the License.
1515
#
1616

17-
# File used by Eclipse to determine the target system
18-
# Project target.
19-
target=android-3
17+
source.. = src/main/java/,\
18+
src/main/eclipse/,\
19+
src/main/resources/,\
20+
src/test/java/
21+
bin.includes = META-INF/,\
22+
.,\
23+
plugin.xml

‎AndroidAnnotations/androidannotations/plugin.xml

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
4+
Copyright (C) 2010-2011 eBusiness Information, Excilys Group
5+
6+
Licensed under the Apache License, Version 2.0 (the "License"); you may not
7+
use this file except in compliance with the License. You may obtain a copy of
8+
the License at
9+
10+
http://www.apache.org/licenses/LICENSE-2.0
11+
12+
Unless required by applicable law or agreed To in writing, software
13+
distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
14+
WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
15+
License for the specific language governing permissions and limitations under
16+
the License.
17+
18+
-->
19+
<?eclipse version="3.4"?>
20+
<plugin>
21+
<extension
22+
point="org.eclipse.jdt.apt.core.annotationProcessorFactory">
23+
<java6processors enableDefault="true">
24+
<java6processor class="com.googlecode.androidannotations.AndroidAnnotationProcessor"/>
25+
</java6processors>
26+
</extension>
27+
28+
</plugin>

‎AndroidAnnotations/androidannotations/src/etc/header.txt

Lines changed: 0 additions & 15 deletions
This file was deleted.

‎AndroidAnnotations/androidannotations/src/main/assembly/distribution.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<!--
22
3-
Copyright (C) 2010-2011 Pierre-Yves Ricau (py.ricau at gmail.com)
3+
Copyright (C) 2010-2011 eBusiness Information, Excilys Group
44
55
Licensed under the Apache License, Version 2.0 (the "License"); you may not
66
use this file except in compliance with the License. You may obtain a copy of

‎AndroidAnnotations/androidannotations/src/main/eclipse/com/googlecode/androidannotations/Activator.java

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
/**
2+
* Copyright (C) 2010-2011 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 com.googlecode.androidannotations;
17+
18+
import org.eclipse.core.runtime.Plugin;
19+
import org.osgi.framework.BundleContext;
20+
21+
/**
22+
* The activator class controls the plug-in life cycle
23+
*/
24+
public class Activator extends Plugin {
25+
26+
// The plug-in ID
27+
public static final String PLUGIN_ID = "com.googlecode.androidannotations";
28+
29+
// The shared instance
30+
private static Activator plugin;
31+
32+
/**
33+
* The constructor
34+
*/
35+
public Activator() {
36+
}
37+
38+
/*
39+
* (non-Javadoc)
40+
* @see org.eclipse.core.runtime.Plugins#start(org.osgi.framework.BundleContext)
41+
*/
42+
public void start(BundleContext context) throws Exception {
43+
super.start(context);
44+
plugin = this;
45+
}
46+
47+
/*
48+
* (non-Javadoc)
49+
* @see org.eclipse.core.runtime.Plugin#stop(org.osgi.framework.BundleContext)
50+
*/
51+
public void stop(BundleContext context) throws Exception {
52+
plugin = null;
53+
super.stop(context);
54+
}
55+
56+
/**
57+
* Returns the shared instance
58+
*
59+
* @return the shared instance
60+
*/
61+
public static Activator getDefault() {
62+
return plugin;
63+
}
64+
}

‎AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/AndroidAnnotationProcessor.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright (C) 2010-2011 Pierre-Yves Ricau (py.ricau at gmail.com)
2+
* Copyright (C) 2010-2011 eBusiness Information, Excilys Group
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
55
* use this file except in compliance with the License. You may obtain a copy of
@@ -59,6 +59,7 @@
5959
import com.googlecode.androidannotations.annotations.res.DimensionPixelSizeRes;
6060
import com.googlecode.androidannotations.annotations.res.DimensionRes;
6161
import com.googlecode.androidannotations.annotations.res.DrawableRes;
62+
import com.googlecode.androidannotations.annotations.res.HtmlRes;
6263
import com.googlecode.androidannotations.annotations.res.IntArrayRes;
6364
import com.googlecode.androidannotations.annotations.res.IntegerRes;
6465
import com.googlecode.androidannotations.annotations.res.LayoutRes;
@@ -190,7 +191,8 @@
190191
Options.class, //
191192
Post.class, //
192193
Put.class,
193-
FromHtml.class})
194+
FromHtml.class,
195+
HtmlRes.class})
194196
@SupportedSourceVersion(SourceVersion.RELEASE_6)
195197
public class AndroidAnnotationProcessor extends AnnotatedAbstractProcessor {
196198

0 commit comments

Comments
 (0)