• R/O
  • SSH
  • HTTPS

Commit

Tags
No Tags

Frequently used words (click to add to your profile)

javac++androidlinuxc#windowsobjective-ccocoa誰得qtpythonphprubygameguibathyscaphec計画中(planning stage)翻訳omegatframeworktwitterdomtestvb.netdirectxゲームエンジンbtronarduinopreviewer

Commit MetaInfo

Revision157 (tree)
Time2015-12-07 19:32:48
Authort_nakayama1971

Log Message

(empty log message)

Change Summary

Incremental Difference

--- trunk/framework/fwBase/src/core/file/ZippedLineOutputStream.java (revision 156)
+++ trunk/framework/fwBase/src/core/file/ZippedLineOutputStream.java (revision 157)
@@ -67,9 +67,9 @@
6767 @Override
6868 public void write(final int b) throws IOException {
6969 if (this.line == this.count) {
70- putNextEntry(getEntry(true));
70+ putNextEntry(new ZipEntry(getNextEntryName(true)));
7171 } else if (!hasEntry()) {
72- putNextEntry(getEntry(false));
72+ putNextEntry(new ZipEntry(getNextEntryName(false)));
7373 }
7474
7575 super.out.write(b);
@@ -159,20 +159,20 @@
159159 }
160160
161161 /**
162- * ZipEntry取得
162+ * 次Entry名取得
163163 * @param flg タイトル出力フラグ
164- * @return ZipEntry
164+ * @return Entry名
165165 */
166- public ZipEntry getEntry(final boolean flg) {
166+ public String getNextEntryName(final boolean flg) {
167167 this.titleFlg = flg;
168168 String str = this.name;
169169 int loc = str.lastIndexOf('.');
170170 if (0 <= loc) {
171- str = str.substring(0, loc).trim() + addEntry(this.entries) + str.substring(loc);
171+ str = str.substring(0, loc).trim() + addEntryCount(this.entries) + str.substring(loc);
172172 } else {
173- str = str + addEntry(this.entries);
173+ str = str + addEntryCount(this.entries);
174174 }
175- return new ZipEntry(str);
175+ return str;
176176 }
177177
178178 /**
@@ -180,7 +180,7 @@
180180 * @param entry エントリ数
181181 * @return エントリ数
182182 */
183- private String addEntry(final int entry) {
183+ private String addEntryCount(final int entry) {
184184 return 0 < entry ? "_" + (entry + 1) : "";
185185 }
186186 }
--- trunk/framework/pjCom/src/project/common/file/CsvPageBreakOutputStream.java (revision 156)
+++ trunk/framework/pjCom/src/project/common/file/CsvPageBreakOutputStream.java (revision 157)
@@ -7,13 +7,14 @@
77 import java.util.Arrays;
88 import java.util.List;
99 import java.util.Map;
10+import java.util.Map.Entry;
1011 import java.util.StringJoiner;
11-import java.util.Map.Entry;
1212 import java.util.TreeMap;
13+import java.util.zip.ZipEntry;
1314
14-import project.common.CsvUtil;
1515 import common.db.JdbcSource;
1616 import core.file.ZippedLineOutputStream;
17+import project.common.CsvUtil;
1718
1819 /**
1920 * CSV改頁出力
@@ -110,7 +111,7 @@
110111 }
111112 if (entry != null) {
112113 getZipStream().setEntryName(entry);
113- getZipStream().putNextEntry(getZipStream().getEntry(true));
114+ getZipStream().putNextEntry(new ZipEntry(getZipStream().getNextEntryName(true)));
114115 }
115116 }
116117