| Revision | 157 (tree) |
|---|---|
| Time | 2015-12-07 19:32:48 |
| Author | t_nakayama1971 |
(empty log message)
| @@ -67,9 +67,9 @@ | ||
| 67 | 67 | @Override |
| 68 | 68 | public void write(final int b) throws IOException { |
| 69 | 69 | if (this.line == this.count) { |
| 70 | - putNextEntry(getEntry(true)); | |
| 70 | + putNextEntry(new ZipEntry(getNextEntryName(true))); | |
| 71 | 71 | } else if (!hasEntry()) { |
| 72 | - putNextEntry(getEntry(false)); | |
| 72 | + putNextEntry(new ZipEntry(getNextEntryName(false))); | |
| 73 | 73 | } |
| 74 | 74 | |
| 75 | 75 | super.out.write(b); |
| @@ -159,20 +159,20 @@ | ||
| 159 | 159 | } |
| 160 | 160 | |
| 161 | 161 | /** |
| 162 | - * ZipEntry取得 | |
| 162 | + * 次Entry名取得 | |
| 163 | 163 | * @param flg タイトル出力フラグ |
| 164 | - * @return ZipEntry | |
| 164 | + * @return Entry名 | |
| 165 | 165 | */ |
| 166 | - public ZipEntry getEntry(final boolean flg) { | |
| 166 | + public String getNextEntryName(final boolean flg) { | |
| 167 | 167 | this.titleFlg = flg; |
| 168 | 168 | String str = this.name; |
| 169 | 169 | int loc = str.lastIndexOf('.'); |
| 170 | 170 | 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); | |
| 172 | 172 | } else { |
| 173 | - str = str + addEntry(this.entries); | |
| 173 | + str = str + addEntryCount(this.entries); | |
| 174 | 174 | } |
| 175 | - return new ZipEntry(str); | |
| 175 | + return str; | |
| 176 | 176 | } |
| 177 | 177 | |
| 178 | 178 | /** |
| @@ -180,7 +180,7 @@ | ||
| 180 | 180 | * @param entry エントリ数 |
| 181 | 181 | * @return エントリ数 |
| 182 | 182 | */ |
| 183 | - private String addEntry(final int entry) { | |
| 183 | + private String addEntryCount(final int entry) { | |
| 184 | 184 | return 0 < entry ? "_" + (entry + 1) : ""; |
| 185 | 185 | } |
| 186 | 186 | } |
| @@ -7,13 +7,14 @@ | ||
| 7 | 7 | import java.util.Arrays; |
| 8 | 8 | import java.util.List; |
| 9 | 9 | import java.util.Map; |
| 10 | +import java.util.Map.Entry; | |
| 10 | 11 | import java.util.StringJoiner; |
| 11 | -import java.util.Map.Entry; | |
| 12 | 12 | import java.util.TreeMap; |
| 13 | +import java.util.zip.ZipEntry; | |
| 13 | 14 | |
| 14 | -import project.common.CsvUtil; | |
| 15 | 15 | import common.db.JdbcSource; |
| 16 | 16 | import core.file.ZippedLineOutputStream; |
| 17 | +import project.common.CsvUtil; | |
| 17 | 18 | |
| 18 | 19 | /** |
| 19 | 20 | * CSV改頁出力 |
| @@ -110,7 +111,7 @@ | ||
| 110 | 111 | } |
| 111 | 112 | if (entry != null) { |
| 112 | 113 | getZipStream().setEntryName(entry); |
| 113 | - getZipStream().putNextEntry(getZipStream().getEntry(true)); | |
| 114 | + getZipStream().putNextEntry(new ZipEntry(getZipStream().getNextEntryName(true))); | |
| 114 | 115 | } |
| 115 | 116 | } |
| 116 | 117 |