Skip to content

Commit

Permalink
1189
Browse files Browse the repository at this point in the history 
1189
  • Loading branch information
@yccheok
yccheok committed Sep 6, 2022
1 parent 40f6188 commit 44e1b5c
Show file tree
Hide file tree
Showing 7 changed files with 42 additions and 28 deletions.
6 changes: 3 additions & 3 deletions appengine/jstock-static/war/news_information/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,17 @@
<body>
<!--fe78440e-e0fe-4efb-881d-264a01be483c-->

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

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

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

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

<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>
<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>

</body>
</html>
2 changes: 1 addition & 1 deletion appengine/jstock-static/war/news_information/index.txt
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
id=ltsgi4R41y6x9GucPlNn5ls5HPDzKBIgRezXRcuYF/AjqV9XZCmyDJ9wl+KWaTed
news_id=10/06/2022
news_id=06/09/2022
news_url=https://raw.githubusercontent.com/yccheok/jstock/master/appengine/jstock-static/war/news_information/index.html
6 changes: 3 additions & 3 deletions appengine/jstock-static/war/news_information/zh/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,17 @@
<body>
<!--fe78440e-e0fe-4efb-881d-264a01be483c-->

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

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

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

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

<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>
<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>

</body>
</html>
2 changes: 1 addition & 1 deletion appengine/jstock-static/war/news_information/zh/index.txt
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
id=ltsgi4R41y6x9GucPlNn5ls5HPDzKBIgRezXRcuYF/AjqV9XZCmyDJ9wl+KWaTed
news_id=10/06/2022
news_id=06/09/2022
news_url=https://raw.githubusercontent.com/yccheok/jstock/master/appengine/jstock-static/war/news_information/index.html
10 changes: 5 additions & 5 deletions appengine/jstock-static/war/version_information/index.txt
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
applicationVersionID=1188
windowsDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-58/jstock-1.0.7.58-setup.exe
linuxDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-58/jstock-1.0.7.58-bin.zip
macDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-58/jstock-1.0.7.58-bin.zip
solarisDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-58/jstock-1.0.7.58-bin.zip
applicationVersionID=1189
windowsDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-59/jstock-1.0.7.59-setup.exe
linuxDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-59/jstock-1.0.7.59-bin.zip
macDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-59/jstock-1.0.7.59-bin.zip
solarisDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-59/jstock-1.0.7.59-bin.zip
10 changes: 5 additions & 5 deletions appengine/jstock-static/war/version_information/zh/index.txt
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
applicationVersionID=1188
windowsDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-58/jstock-1.0.7.58-setup.exe
linuxDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-58/jstock-1.0.7.58-bin.zip
macDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-58/jstock-1.0.7.58-bin.zip
solarisDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-58/jstock-1.0.7.58-bin.zip
applicationVersionID=1189
windowsDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-59/jstock-1.0.7.59-setup.exe
linuxDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-59/jstock-1.0.7.59-bin.zip
macDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-59/jstock-1.0.7.59-bin.zip
solarisDownloadLink=https://github.com/yccheok/jstock/releases/download/release_1-0-7-59/jstock-1.0.7.59-bin.zip
34 changes: 24 additions & 10 deletions src/org/yccheok/jstock/gui/Utils.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2405,23 +2405,37 @@ public static List<String> toHanyuPinyin(String chinese) {
// return new ArrayList<String>();
}
}

final List<StringBuilder> tmps = stringBuilders;
stringBuilders = new ArrayList<StringBuilder>();

if (tmps == null) {
stringBuilders = new ArrayList<StringBuilder>();

// This will be the first converted character.
for (Character character : set) {
final StringBuilder me = new StringBuilder();
me.append(character);
stringBuilders.add(me);
}
} else {
for (Character character : set) {
for (StringBuilder tmp : tmps) {
final StringBuilder me = new StringBuilder();
me.append(tmp);
me.append(character);
stringBuilders.add(me);
if (!set.isEmpty()) {
stringBuilders = new ArrayList<StringBuilder>();

for (Character character : set) {
if (tmps.isEmpty()) {
// This happens when 1st character of input string invalid.

final StringBuilder me = new StringBuilder();
me.append(character);
stringBuilders.add(me);
} else {
for (StringBuilder tmp : tmps) {
final StringBuilder me = new StringBuilder();
me.append(tmp);
me.append(character);
stringBuilders.add(me);
}
}
}
}
}
Expand Down Expand Up @@ -2802,11 +2816,11 @@ public ApplicationInfo(int applicationVersionID, String windowsDownloadLink, Str

////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////
private static final String ABOUT_BOX_VERSION_STRING = "1.0.7.58";
private static final String ABOUT_BOX_VERSION_STRING = "1.0.7.59";

// 1.0.7.58
// 1.0.7.59
// For About box comparision on latest version purpose.
private static final int APPLICATION_VERSION_ID = 1188;
private static final int APPLICATION_VERSION_ID = 1189;
////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////

Expand Down

0 comments on commit 44e1b5c

Please sign in to comment.