Skip to content

Commit fde4553

Browse files
committed
Fixes issue with setting Language Index
Closes #50
1 parent 8e3fa6c commit fde4553

File tree

1 file changed

+10
-14
lines changed

1 file changed

+10
-14
lines changed

src/main/java/com/akathist/maven/plugins/launch4j/VersionInfo.java

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -88,19 +88,19 @@ public class VersionInfo {
8888
String originalFilename;
8989

9090
/**
91-
* Language to be used during installation
91+
* Language to be used during installation, default ENGLISH_US
9292
*/
93-
String language;
93+
String language = LanguageID.ENGLISH_US.name();
9494

9595
/**
9696
* Trademarks of author
9797
*/
9898
String trademarks;
9999

100100
/**
101-
* Index of language to be used during installation
101+
* Index of language to be used during installation, default index of ENGLISH_US
102102
*/
103-
int languageIndex;
103+
int languageIndex = LanguageID.ENGLISH_US.getIndex();
104104

105105
net.sf.launch4j.config.VersionInfo toL4j() {
106106
net.sf.launch4j.config.VersionInfo ret = new net.sf.launch4j.config.VersionInfo();
@@ -115,22 +115,18 @@ net.sf.launch4j.config.VersionInfo toL4j() {
115115
ret.setCompanyName(companyName);
116116
ret.setInternalName(internalName);
117117
ret.setOriginalFilename(originalFilename);
118-
ret.setLanguage(LANGUAGE_TO_LANGUAGE_ID.get(language));
119-
if (isLanguageIndex()) {
120-
ret.setLanguageIndex(languageIndex);
121-
}
118+
setLanguage(ret);
122119
ret.setTrademarks(trademarks);
123120

124121
return ret;
125122
}
126123

127-
private boolean isLanguageIndex() {
128-
for (LanguageID languageID : LanguageID.values()) {
129-
if (languageID.getIndex() == languageIndex) {
130-
return true;
131-
}
124+
private void setLanguage(net.sf.launch4j.config.VersionInfo ret) {
125+
LanguageID languageID = LANGUAGE_TO_LANGUAGE_ID.get(language);
126+
if (languageID != null) {
127+
ret.setLanguage(languageID);
128+
ret.setLanguageIndex(languageID.getIndex());
132129
}
133-
return false;
134130
}
135131

136132
@Override

0 commit comments

Comments
 (0)