Skip to content

Commit 44e1b5c

Browse files
yccheokyccheok
committed
1189
1189
1 parent 40f6188 commit 44e1b5c

File tree

7 files changed

+42
-28
lines changed

7 files changed

+42
-28
lines changed

‎appengine/jstock-static/war/news_information/index.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,17 @@
44
<body>
55
<!--fe78440e-e0fe-4efb-881d-264a01be483c-->
66

7-
<p style="margin-top: 10; font-size: 9px; font-family: Tahoma;">JStock 1.0.7.58 had been released.</p>
7+
<p style="margin-top: 10; font-size: 9px; font-family: Tahoma;">JStock 1.0.7.59 had been released.</p>
88

99
<p style="margin-top: 10; font-size: 9px; font-family: Tahoma"></p>
1010

1111
<p style="margin-top: 10; font-size: 9px; font-family: Tahoma">
12-
Feature: Ability to rename stock name only, without having to rename stock code.
12+
Bugfix: Fix pinyin input for Taiwan stock market.
1313
</p>
1414

1515
<p style="margin-top: 10; font-size: 9px; font-family: Tahoma"></p>
1616

17-
<p style="margin-top: 10; font-size: 9px; font-family: Tahoma;">You may download latest JStock 1.0.7.58 from <a href="https://jstock.org/download.html?utm_source=jstock&utm_medium=news_update">https://jstock.org/download.html</a>. After upgrade, your personal data will be preserved.</p>
17+
<p style="margin-top: 10; font-size: 9px; font-family: Tahoma;">You may download latest JStock 1.0.7.59 from <a href="https://jstock.org/download.html?utm_source=jstock&utm_medium=news_update">https://jstock.org/download.html</a>. After upgrade, your personal data will be preserved.</p>
1818

1919
</body>
2020
</html>

‎appengine/jstock-static/war/news_information/index.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
id=ltsgi4R41y6x9GucPlNn5ls5HPDzKBIgRezXRcuYF/AjqV9XZCmyDJ9wl+KWaTed
2-
news_id=10/06/2022
2+
news_id=06/09/2022
33
news_url=https://raw.githubusercontent.com/yccheok/jstock/master/appengine/jstock-static/war/news_information/index.html

‎appengine/jstock-static/war/news_information/zh/index.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,17 @@
44
<body>
55
<!--fe78440e-e0fe-4efb-881d-264a01be483c-->
66

7-
<p style="margin-top: 10; font-size: 9px; font-family: Tahoma;">JStock 1.0.7.58 had been released.</p>
7+
<p style="margin-top: 10; font-size: 9px; font-family: Tahoma;">JStock 1.0.7.59 had been released.</p>
88

99
<p style="margin-top: 10; font-size: 9px; font-family: Tahoma"></p>
1010

1111
<p style="margin-top: 10; font-size: 9px; font-family: Tahoma">
12-
Feature: Ability to rename stock name only, without having to rename stock code.
12+
Bugfix: Fix pinyin input for Taiwan stock market.
1313
</p>
1414

1515
<p style="margin-top: 10; font-size: 9px; font-family: Tahoma"></p>
1616

17-
<p style="margin-top: 10; font-size: 9px; font-family: Tahoma;">You may download latest JStock 1.0.7.58 from <a href="https://jstock.org/zh/download.html?utm_source=jstock&utm_medium=news_update">https://jstock.org/zh/download.html</a>. After upgrade, your personal data will be preserved.</p>
17+
<p style="margin-top: 10; font-size: 9px; font-family: Tahoma;">You may download latest JStock 1.0.7.59 from <a href="https://jstock.org/zh/download.html?utm_source=jstock&utm_medium=news_update">https://jstock.org/zh/download.html</a>. After upgrade, your personal data will be preserved.</p>
1818

1919
</body>
2020
</html>

‎appengine/jstock-static/war/news_information/zh/index.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
id=ltsgi4R41y6x9GucPlNn5ls5HPDzKBIgRezXRcuYF/AjqV9XZCmyDJ9wl+KWaTed
2-
news_id=10/06/2022
2+
news_id=06/09/2022
33
news_url=https://raw.githubusercontent.com/yccheok/jstock/master/appengine/jstock-static/war/news_information/index.html

‎appengine/jstock-static/war/version_information/index.txt‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
applicationVersionID=1188
2-
windowsDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-58/jstock-1.0.7.58-setup.exe
3-
linuxDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-58/jstock-1.0.7.58-bin.zip
4-
macDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-58/jstock-1.0.7.58-bin.zip
5-
solarisDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-58/jstock-1.0.7.58-bin.zip
1+
applicationVersionID=1189
2+
windowsDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-59/jstock-1.0.7.59-setup.exe
3+
linuxDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-59/jstock-1.0.7.59-bin.zip
4+
macDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-59/jstock-1.0.7.59-bin.zip
5+
solarisDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-59/jstock-1.0.7.59-bin.zip

‎appengine/jstock-static/war/version_information/zh/index.txt‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
applicationVersionID=1188
2-
windowsDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-58/jstock-1.0.7.58-setup.exe
3-
linuxDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-58/jstock-1.0.7.58-bin.zip
4-
macDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-58/jstock-1.0.7.58-bin.zip
5-
solarisDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-58/jstock-1.0.7.58-bin.zip
1+
applicationVersionID=1189
2+
windowsDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-59/jstock-1.0.7.59-setup.exe
3+
linuxDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-59/jstock-1.0.7.59-bin.zip
4+
macDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-59/jstock-1.0.7.59-bin.zip
5+
solarisDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-59/jstock-1.0.7.59-bin.zip

‎src/org/yccheok/jstock/gui/Utils.java‎

Lines changed: 24 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2405,23 +2405,37 @@ public static List<String> toHanyuPinyin(String chinese) {
24052405
// return new ArrayList<String>();
24062406
}
24072407
}
2408+
24082409
final List<StringBuilder> tmps = stringBuilders;
2409-
stringBuilders = new ArrayList<StringBuilder>();
24102410

24112411
if (tmps == null) {
2412+
stringBuilders = new ArrayList<StringBuilder>();
2413+
24122414
// This will be the first converted character.
24132415
for (Character character : set) {
24142416
final StringBuilder me = new StringBuilder();
24152417
me.append(character);
24162418
stringBuilders.add(me);
24172419
}
24182420
} else {
2419-
for (Character character : set) {
2420-
for (StringBuilder tmp : tmps) {
2421-
final StringBuilder me = new StringBuilder();
2422-
me.append(tmp);
2423-
me.append(character);
2424-
stringBuilders.add(me);
2421+
if (!set.isEmpty()) {
2422+
stringBuilders = new ArrayList<StringBuilder>();
2423+
2424+
for (Character character : set) {
2425+
if (tmps.isEmpty()) {
2426+
// This happens when 1st character of input string invalid.
2427+
2428+
final StringBuilder me = new StringBuilder();
2429+
me.append(character);
2430+
stringBuilders.add(me);
2431+
} else {
2432+
for (StringBuilder tmp : tmps) {
2433+
final StringBuilder me = new StringBuilder();
2434+
me.append(tmp);
2435+
me.append(character);
2436+
stringBuilders.add(me);
2437+
}
2438+
}
24252439
}
24262440
}
24272441
}
@@ -2802,11 +2816,11 @@ public ApplicationInfo(int applicationVersionID, String windowsDownloadLink, Str
28022816

28032817
////////////////////////////////////////////////////////////////////////////
28042818
////////////////////////////////////////////////////////////////////////////
2805-
private static final String ABOUT_BOX_VERSION_STRING = "1.0.7.58";
2819+
private static final String ABOUT_BOX_VERSION_STRING = "1.0.7.59";
28062820

2807-
// 1.0.7.58
2821+
// 1.0.7.59
28082822
// For About box comparision on latest version purpose.
2809-
private static final int APPLICATION_VERSION_ID = 1188;
2823+
private static final int APPLICATION_VERSION_ID = 1189;
28102824
////////////////////////////////////////////////////////////////////////////
28112825
////////////////////////////////////////////////////////////////////////////
28122826

0 commit comments

Comments
 (0)