Skip to content

Commit 3117a98

Browse files
committed
Deprecated Old Constructors. Fixed Formating
Prepared the Recognizer class for the final transition from String Language Codes to Language enumerations.
1 parent 705f297 commit 3117a98

File tree

1 file changed

+45
-25
lines changed

1 file changed

+45
-25
lines changed

src/com/darkprograms/speech/recognizer/Recognizer.java

Lines changed: 45 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -13,28 +13,28 @@ public class Recognizer {
1313

1414
public enum Languages{
1515
AUTO_DETECT(null),//tells Google to auto-detect the language
16-
ARABIC__JORDAN("ar-JO"),
17-
ARABIC__LEBANON("ar-LB"),
18-
ARABIC__QATAR("ar-QA"),
19-
ARABIC__UAE("ar-AE"),
20-
ARABIC__MOROCCO("ar-MA"),
21-
ARABIC__IRAQ("ar-IQ"),
22-
ARABIC__ALGERIA("ar-DZ"),
23-
ARABIC__BAHRAIN("ar-BH"),
24-
ARABIC__LYBIA("ar-LY"),
25-
ARABIC__OMAN("ar-OM"),
26-
ARABIC__SAUDI_ARABIA("ar-SA"),
27-
ARABIC__TUNISIA("ar-TN"),
28-
ARABIC__YEMEN("ar-YE"),
16+
ARABIC_JORDAN("ar-JO"),
17+
ARABIC_LEBANON("ar-LB"),
18+
ARABIC_QATAR("ar-QA"),
19+
ARABIC_UAE("ar-AE"),
20+
ARABIC_MOROCCO("ar-MA"),
21+
ARABIC_IRAQ("ar-IQ"),
22+
ARABIC_ALGERIA("ar-DZ"),
23+
ARABIC_BAHRAIN("ar-BH"),
24+
ARABIC_LYBIA("ar-LY"),
25+
ARABIC_OMAN("ar-OM"),
26+
ARABIC_SAUDI_ARABIA("ar-SA"),
27+
ARABIC_TUNISIA("ar-TN"),
28+
ARABIC_YEMEN("ar-YE"),
2929
BASQUE("eu"),
3030
CATALAN("ca"),
3131
CZECH("cs"),
3232
DUTCH("nl-NL"),
33-
ENGLISH__AUSTRALIA("en-AU"),
34-
ENGLISH__CANADA("en-CA"),
35-
ENGLISH__INDIA("en-IN"),
36-
ENGLISH__NEW_ZEALAND("en-NZ"),
37-
ENGLISH__SOUTH_AFRICA("en-ZA"),
33+
ENGLISH_AUSTRALIA("en-AU"),
34+
ENGLISH_CANADA("en-CA"),
35+
ENGLISH_INDIA("en-IN"),
36+
ENGLISH_NEW_ZEALAND("en-NZ"),
37+
ENGLISH_SOUTH_AFRICA("en-ZA"),
3838
ENGLISH_UK("en-GB"),
3939
ENGLISH_US("en-US"),
4040
FINNISH("fi"),
@@ -53,21 +53,21 @@ public enum Languages{
5353
TRADITIONAL_TAIWAN("zh-TW"),
5454
SIMPLIFIED_CHINA("ZH-CN"),
5555
SIMPLIFIED_HONG_KONG("zh-HK"),
56-
YUE_CHINESE__TRADITIONAL_HONG_KONG("zh-yue"),
56+
YUE_CHINESE_TRADITIONAL_HONG_KONG("zh-yue"),
5757
MALAYSIAN("ms-MY"),
5858
NORWEGIAN("no-NO"),
5959
POLISH("pl"),
6060
PIG_LATIN("xx-piglatin"),
6161
PORTUGUESE("pt-PT"),
62-
PORTUGUESE__BRASIL("pt-BR"),
62+
PORTUGUESE_BRASIL("pt-BR"),
6363
ROMANIAN("ro-RO"),
6464
RUSSIAN("ru"),
6565
SERBIAN("sr-SP"),
6666
SLOVAK("sk"),
67-
SPANISH__ARGENTINA("es-AR"),
67+
SPANISH_ARGENTINA("es-AR"),
6868
SPANISH_BOLIVIA("es-BO"),
69-
SPANISH__CHILE("es-CL"),
70-
SPANISH__COLOMBIA("es-CO"),
69+
SPANISH_CHILE("es-CL"),
70+
SPANISH_COLOMBIA("es-CO"),
7171
SPANISH_COSTA_RICA("es-CR"),
7272
SPANISH_DOMINICAN_REPUBLIC("es-DO"),
7373
SPANISH_ECUADOR("es-EC"),
@@ -125,10 +125,19 @@ public Recognizer() {
125125
* Constructor
126126
* @param Language
127127
*/
128+
@Deprecated
128129
public Recognizer(String language) {
129130
this.language = language;
130131
}
131132

133+
/**
134+
* Constructor
135+
* @param language The Languages class for the language you want to designate
136+
*/
137+
public Recognizer(Languages language){
138+
this.language = language.languageCode;
139+
}
140+
132141
/**
133142
* Constructor
134143
* @param profanityFilter
@@ -142,11 +151,22 @@ public Recognizer(boolean profanityFilter){
142151
* @param language
143152
* @param profanityFilter
144153
*/
154+
@Deprecated
145155
public Recognizer(String language, boolean profanityFilter){
146156
this.language = language;
147157
this.profanityFilter = profanityFilter;
148158
}
149159

160+
/**
161+
* Constructor
162+
* @param language
163+
* @param profanityFilter
164+
*/
165+
public Recognizer(Languages language, boolean profanityFilter){
166+
this.language = language.languageCode;
167+
this.profanityFilter = profanityFilter;
168+
}
169+
150170
/**
151171
* Language: Contains all supported languages for Google Speech to Text.
152172
* Setting this to null will make Google use it's own language detection.
@@ -157,10 +177,10 @@ public void setLanguage(Languages language) {
157177
this.language = language.languageCode;
158178
}
159179

160-
/**Language code. This language code must match the language of the speech to be recognized. ex. en-US ru-RU
180+
/**Language code. This language code must match the language of the speech to be recognized. ex. en-US ru-RU
161181
* This value is null by default.
162182
*/
163-
@Deprecated
183+
@Deprecated
164184
public void setLanguage(String language) {
165185
this.language = language;
166186
}

0 commit comments

Comments
 (0)