Skip to content

Commit 26f7a16

Browse files
BoDBoD
committed
- Use latest version on the sample
- Version bump
1 parent 0a8bc25 commit 26f7a16

File tree

10 files changed

+31
-27
lines changed

10 files changed

+31
-27
lines changed

‎CHANGELOG.md

+4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
Android ContentProvider Generator Changelog
22
===========================================
33

4+
v1.9.2 (2015-03-05)
5+
------
6+
- Fix for issue #77.
7+
48
v1.9.1 (2015-02-21)
59
------
610
- Fix for issue #73.

‎README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ https://github.com/BoD/android-contentprovider-generator/releases/latest
124124

125125
### Run the tool
126126

127-
`java -jar android_contentprovider_generator-1.9.1-bundle.jar -i <input folder> -o <output folder>`
127+
`java -jar android_contentprovider_generator-1.9.2-bundle.jar -i <input folder> -o <output folder>`
128128
- Input folder: where to find `_config.json` and your entity json files
129129
- Output folder: where the resulting files will be generated
130130

@@ -224,7 +224,7 @@ You need maven to build this tool.
224224

225225
`mvn package`
226226

227-
This will produce `android_contentprovider_generator-1.9.1-bundle.jar` in the `target` folder.
227+
This will produce `android_contentprovider_generator-1.9.2-bundle.jar` in the `target` folder.
228228

229229

230230
Similar tools

‎etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/provider/company/CompanyColumns.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -78,9 +78,9 @@ public class CompanyColumns implements BaseColumns {
7878
public static boolean hasColumns(String[] projection) {
7979
if (projection == null) return true;
8080
for (String c : projection) {
81-
if (c == NAME || c.contains("." + NAME)) return true;
82-
if (c == ADDRESS || c.contains("." + ADDRESS)) return true;
83-
if (c == SERIAL_NUMBER_ID || c.contains("." + SERIAL_NUMBER_ID)) return true;
81+
if (c.equals(NAME) || c.contains("." + NAME)) return true;
82+
if (c.equals(ADDRESS) || c.contains("." + ADDRESS)) return true;
83+
if (c.equals(SERIAL_NUMBER_ID) || c.contains("." + SERIAL_NUMBER_ID)) return true;
8484
}
8585
return false;
8686
}

‎etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/provider/manual/ManualColumns.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,8 @@ public class ManualColumns implements BaseColumns {
6666
public static boolean hasColumns(String[] projection) {
6767
if (projection == null) return true;
6868
for (String c : projection) {
69-
if (c == TITLE || c.contains("." + TITLE)) return true;
70-
if (c == ISBN || c.contains("." + ISBN)) return true;
69+
if (c.equals(TITLE) || c.contains("." + TITLE)) return true;
70+
if (c.equals(ISBN) || c.contains("." + ISBN)) return true;
7171
}
7272
return false;
7373
}

‎etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/provider/person/PersonColumns.java

+8-8
Original file line numberDiff line numberDiff line change
@@ -93,14 +93,14 @@ public class PersonColumns implements BaseColumns {
9393
public static boolean hasColumns(String[] projection) {
9494
if (projection == null) return true;
9595
for (String c : projection) {
96-
if (c == FIRST_NAME || c.contains("." + FIRST_NAME)) return true;
97-
if (c == LAST_NAME || c.contains("." + LAST_NAME)) return true;
98-
if (c == AGE || c.contains("." + AGE)) return true;
99-
if (c == BIRTH_DATE || c.contains("." + BIRTH_DATE)) return true;
100-
if (c == HAS_BLUE_EYES || c.contains("." + HAS_BLUE_EYES)) return true;
101-
if (c == HEIGHT || c.contains("." + HEIGHT)) return true;
102-
if (c == GENDER || c.contains("." + GENDER)) return true;
103-
if (c == COUNTRY_CODE || c.contains("." + COUNTRY_CODE)) return true;
96+
if (c.equals(FIRST_NAME) || c.contains("." + FIRST_NAME)) return true;
97+
if (c.equals(LAST_NAME) || c.contains("." + LAST_NAME)) return true;
98+
if (c.equals(AGE) || c.contains("." + AGE)) return true;
99+
if (c.equals(BIRTH_DATE) || c.contains("." + BIRTH_DATE)) return true;
100+
if (c.equals(HAS_BLUE_EYES) || c.contains("." + HAS_BLUE_EYES)) return true;
101+
if (c.equals(HEIGHT) || c.contains("." + HEIGHT)) return true;
102+
if (c.equals(GENDER) || c.contains("." + GENDER)) return true;
103+
if (c.equals(COUNTRY_CODE) || c.contains("." + COUNTRY_CODE)) return true;
104104
}
105105
return false;
106106
}

‎etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/provider/personteam/PersonTeamColumns.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,8 @@ public class PersonTeamColumns implements BaseColumns {
6666
public static boolean hasColumns(String[] projection) {
6767
if (projection == null) return true;
6868
for (String c : projection) {
69-
if (c == PERSON_ID || c.contains("." + PERSON_ID)) return true;
70-
if (c == TEAM_ID || c.contains("." + TEAM_ID)) return true;
69+
if (c.equals(PERSON_ID) || c.contains("." + PERSON_ID)) return true;
70+
if (c.equals(TEAM_ID) || c.contains("." + TEAM_ID)) return true;
7171
}
7272
return false;
7373
}

‎etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/provider/product/ProductColumns.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -68,9 +68,9 @@ public class ProductColumns implements BaseColumns {
6868
public static boolean hasColumns(String[] projection) {
6969
if (projection == null) return true;
7070
for (String c : projection) {
71-
if (c == PRODUCT_ID || c.contains("." + PRODUCT_ID)) return true;
72-
if (c == NAME || c.contains("." + NAME)) return true;
73-
if (c == MANUAL_ID || c.contains("." + MANUAL_ID)) return true;
71+
if (c.equals(PRODUCT_ID) || c.contains("." + PRODUCT_ID)) return true;
72+
if (c.equals(NAME) || c.contains("." + NAME)) return true;
73+
if (c.equals(MANUAL_ID) || c.contains("." + MANUAL_ID)) return true;
7474
}
7575
return false;
7676
}

‎etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/provider/serialnumber/SerialNumberColumns.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,8 @@ public class SerialNumberColumns implements BaseColumns {
7272
public static boolean hasColumns(String[] projection) {
7373
if (projection == null) return true;
7474
for (String c : projection) {
75-
if (c == PART0 || c.contains("." + PART0)) return true;
76-
if (c == PART1 || c.contains("." + PART1)) return true;
75+
if (c.equals(PART0) || c.contains("." + PART0)) return true;
76+
if (c.equals(PART1) || c.contains("." + PART1)) return true;
7777
}
7878
return false;
7979
}

‎etc/sample/app/src/org/jraf/androidcontentprovidergenerator/sample/provider/team/TeamColumns.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -78,10 +78,10 @@ public class TeamColumns implements BaseColumns {
7878
public static boolean hasColumns(String[] projection) {
7979
if (projection == null) return true;
8080
for (String c : projection) {
81-
if (c == COMPANY_ID || c.contains("." + COMPANY_ID)) return true;
82-
if (c == NAME || c.contains("." + NAME)) return true;
83-
if (c == COUNTRY_CODE || c.contains("." + COUNTRY_CODE)) return true;
84-
if (c == SERIAL_NUMBER_ID || c.contains("." + SERIAL_NUMBER_ID)) return true;
81+
if (c.equals(COMPANY_ID) || c.contains("." + COMPANY_ID)) return true;
82+
if (c.equals(NAME) || c.contains("." + NAME)) return true;
83+
if (c.equals(COUNTRY_CODE) || c.contains("." + COUNTRY_CODE)) return true;
84+
if (c.equals(SERIAL_NUMBER_ID) || c.contains("." + SERIAL_NUMBER_ID)) return true;
8585
}
8686
return false;
8787
}

‎pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
<groupId>org.jraf</groupId>
55
<artifactId>android_contentprovider_generator</artifactId>
6-
<version>1.9.1</version> <!-- Do not forget to update README.md and CHANGELOG.md when updating this value -->
6+
<version>1.9.2</version> <!-- Do not forget to update README.md and CHANGELOG.md when updating this value -->
77
<packaging>jar</packaging>
88

99
<name>GenerateAndroidProvider</name>

0 commit comments

Comments
 (0)