• R/O
  • HTTP
  • SSH

jaxcel: 提交

Commit MetaInfo

修訂2e6d34cfee291462276c45d7a09eef6dddbafb76 (tree)
時間2014-08-21 22:59:37
作者msnobosan <msnobosan@gmal...>

Log Message


Change Summary


--- a/Jaxcel/.classpath
+++ b/Jaxcel/.classpath
@@ -1,15 +1,24 @@
11 <?xml version="1.0" encoding="UTF-8"?>
22 <classpath>
33 <classpathentry kind="src" path="src"/>
4- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
54 <classpathentry kind="lib" path="lib/ooxml-schemas-1.1.jar"/>
65 <classpathentry kind="lib" path="lib/poi-3.10-FINAL-20140208.jar"/>
76 <classpathentry kind="lib" path="lib/poi-ooxml-3.10-FINAL-20140208.jar"/>
87 <classpathentry kind="lib" path="lib/slf4j-api-1.7.5.jar"/>
98 <classpathentry kind="lib" path="lib/commons-jexl-2.1.1.jar"/>
109 <classpathentry kind="lib" path="lib/commons-lang3-3.3.2.jar"/>
11- <classpathentry kind="lib" path="lib/poi-scratchpad-3.10-FINAL-20140208.jar"/>
1210 <classpathentry kind="lib" path="lib/xmlbeans-2.6.0.jar"/>
1311 <classpathentry kind="lib" path="lib/commons-codec-1.9.jar"/>
12+ <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
13+ <classpathentry kind="con" path="org.eclipse.jst.server.core.container/org.eclipse.jst.server.tomcat.runtimeTarget/Apache Tomcat v7.0">
14+ <attributes>
15+ <attribute name="owner.project.facets" value="jst.utility"/>
16+ </attributes>
17+ </classpathentry>
18+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jre7">
19+ <attributes>
20+ <attribute name="owner.project.facets" value="java"/>
21+ </attributes>
22+ </classpathentry>
1423 <classpathentry kind="output" path="bin"/>
1524 </classpath>
--- a/Jaxcel/.project
+++ b/Jaxcel/.project
@@ -6,12 +6,25 @@
66 </projects>
77 <buildSpec>
88 <buildCommand>
9+ <name>org.eclipse.wst.common.project.facet.core.builder</name>
10+ <arguments>
11+ </arguments>
12+ </buildCommand>
13+ <buildCommand>
914 <name>org.eclipse.jdt.core.javabuilder</name>
1015 <arguments>
1116 </arguments>
1217 </buildCommand>
18+ <buildCommand>
19+ <name>org.eclipse.wst.validation.validationbuilder</name>
20+ <arguments>
21+ </arguments>
22+ </buildCommand>
1323 </buildSpec>
1424 <natures>
25+ <nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
26+ <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
1527 <nature>org.eclipse.jdt.core.javanature</nature>
28+ <nature>org.eclipse.wst.common.project.facet.core.nature</nature>
1629 </natures>
1730 </projectDescription>
--- /dev/null
+++ b/Jaxcel/LICENSE.txt
@@ -0,0 +1,165 @@
2+ Version 3, 29 June 2007
4+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
5+ Everyone is permitted to copy and distribute verbatim copies
6+ of this license document, but changing it is not allowed.
9+ This version of the GNU Lesser General Public License incorporates
10+the terms and conditions of version 3 of the GNU General Public
11+License, supplemented by the additional permissions listed below.
13+ 0. Additional Definitions.
15+ As used herein, "this License" refers to version 3 of the GNU Lesser
16+General Public License, and the "GNU GPL" refers to version 3 of the GNU
17+General Public License.
19+ "The Library" refers to a covered work governed by this License,
20+other than an Application or a Combined Work as defined below.
22+ An "Application" is any work that makes use of an interface provided
23+by the Library, but which is not otherwise based on the Library.
24+Defining a subclass of a class defined by the Library is deemed a mode
25+of using an interface provided by the Library.
27+ A "Combined Work" is a work produced by combining or linking an
28+Application with the Library. The particular version of the Library
29+with which the Combined Work was made is also called the "Linked
32+ The "Minimal Corresponding Source" for a Combined Work means the
33+Corresponding Source for the Combined Work, excluding any source code
34+for portions of the Combined Work that, considered in isolation, are
35+based on the Application, and not on the Linked Version.
37+ The "Corresponding Application Code" for a Combined Work means the
38+object code and/or source code for the Application, including any data
39+and utility programs needed for reproducing the Combined Work from the
40+Application, but excluding the System Libraries of the Combined Work.
42+ 1. Exception to Section 3 of the GNU GPL.
44+ You may convey a covered work under sections 3 and 4 of this License
45+without being bound by section 3 of the GNU GPL.
47+ 2. Conveying Modified Versions.
49+ If you modify a copy of the Library, and, in your modifications, a
50+facility refers to a function or data to be supplied by an Application
51+that uses the facility (other than as an argument passed when the
52+facility is invoked), then you may convey a copy of the modified
55+ a) under this License, provided that you make a good faith effort to
56+ ensure that, in the event an Application does not supply the
57+ function or data, the facility still operates, and performs
58+ whatever part of its purpose remains meaningful, or
60+ b) under the GNU GPL, with none of the additional permissions of
61+ this License applicable to that copy.
63+ 3. Object Code Incorporating Material from Library Header Files.
65+ The object code form of an Application may incorporate material from
66+a header file that is part of the Library. You may convey such object
67+code under terms of your choice, provided that, if the incorporated
68+material is not limited to numerical parameters, data structure
69+layouts and accessors, or small macros, inline functions and templates
70+(ten or fewer lines in length), you do both of the following:
72+ a) Give prominent notice with each copy of the object code that the
73+ Library is used in it and that the Library and its use are
74+ covered by this License.
76+ b) Accompany the object code with a copy of the GNU GPL and this license
77+ document.
79+ 4. Combined Works.
81+ You may convey a Combined Work under terms of your choice that,
82+taken together, effectively do not restrict modification of the
83+portions of the Library contained in the Combined Work and reverse
84+engineering for debugging such modifications, if you also do each of
85+the following:
87+ a) Give prominent notice with each copy of the Combined Work that
88+ the Library is used in it and that the Library and its use are
89+ covered by this License.
91+ b) Accompany the Combined Work with a copy of the GNU GPL and this license
92+ document.
94+ c) For a Combined Work that displays copyright notices during
95+ execution, include the copyright notice for the Library among
96+ these notices, as well as a reference directing the user to the
97+ copies of the GNU GPL and this license document.
99+ d) Do one of the following:
101+ 0) Convey the Minimal Corresponding Source under the terms of this
102+ License, and the Corresponding Application Code in a form
103+ suitable for, and under terms that permit, the user to
104+ recombine or relink the Application with a modified version of
105+ the Linked Version to produce a modified Combined Work, in the
106+ manner specified by section 6 of the GNU GPL for conveying
107+ Corresponding Source.
109+ 1) Use a suitable shared library mechanism for linking with the
110+ Library. A suitable mechanism is one that (a) uses at run time
111+ a copy of the Library already present on the user's computer
112+ system, and (b) will operate properly with a modified version
113+ of the Library that is interface-compatible with the Linked
114+ Version.
116+ e) Provide Installation Information, but only if you would otherwise
117+ be required to provide such information under section 6 of the
118+ GNU GPL, and only to the extent that such information is
119+ necessary to install and execute a modified version of the
120+ Combined Work produced by recombining or relinking the
121+ Application with a modified version of the Linked Version. (If
122+ you use option 4d0, the Installation Information must accompany
123+ the Minimal Corresponding Source and Corresponding Application
124+ Code. If you use option 4d1, you must provide the Installation
125+ Information in the manner specified by section 6 of the GNU GPL
126+ for conveying Corresponding Source.)
128+ 5. Combined Libraries.
130+ You may place library facilities that are a work based on the
131+Library side by side in a single library together with other library
132+facilities that are not Applications and are not covered by this
133+License, and convey such a combined library under terms of your
134+choice, if you do both of the following:
136+ a) Accompany the combined library with a copy of the same work based
137+ on the Library, uncombined with any other library facilities,
138+ conveyed under the terms of this License.
140+ b) Give prominent notice with the combined library that part of it
141+ is a work based on the Library, and explaining where to find the
142+ accompanying uncombined form of the same work.
144+ 6. Revised Versions of the GNU Lesser General Public License.
146+ The Free Software Foundation may publish revised and/or new versions
147+of the GNU Lesser General Public License from time to time. Such new
148+versions will be similar in spirit to the present version, but may
149+differ in detail to address new problems or concerns.
151+ Each version is given a distinguishing version number. If the
152+Library as you received it specifies that a certain numbered version
153+of the GNU Lesser General Public License "or any later version"
154+applies to it, you have the option of following the terms and
155+conditions either of that published version or of any later version
156+published by the Free Software Foundation. If the Library as you
157+received it does not specify a version number of the GNU Lesser
158+General Public License, you may choose any version of the GNU Lesser
159+General Public License ever published by the Free Software Foundation.
161+ If the Library as you received it specifies that a proxy can decide
162+whether future versions of the GNU Lesser General Public License shall
163+apply, that proxy's public statement of acceptance of any version is
164+permanent authorization for you to choose that version for the
\ No newline at end of file
--- a/Jaxcel/src/org/hanei/jaxcel/report/TLParser.java
+++ b/Jaxcel/src/org/hanei/jaxcel/report/TLParser.java
@@ -80,6 +80,8 @@ public class TLParser {
8080 private static final int IDX_BASE = 1;
8181 private static final int PARSE_MAX = 10;
83+ private static final short FORMAT_GENERAL = 0;
8385 private Sheet sheet = null;
8486 private JaxcelContext context = null;
8587 private ELManager elMgr = null;
@@ -595,8 +597,15 @@ public class TLParser {
595597 if(cell.getCellType() == Cell.CELL_TYPE_STRING) {
596598 cell.setCellType(Cell.CELL_TYPE_BLANK);
597599 cell.setCellType(Cell.CELL_TYPE_NUMERIC);
598- cell.setCellValue(DateUtils.parseDateStrictly(newCellVal, DATE_FORMATS));
599- log.debug("set value type: Date");
600+ // 書式未設定なら文字列のまま挿入
601+ if(FORMAT_GENERAL == cell.getCellStyle().getDataFormat()) {
602+ cell.setCellValue(newCellVal);
603+ log.debug("set value type: String");
604+ }
605+ else {
606+ cell.setCellValue(DateUtils.parseDateStrictly(newCellVal, DATE_FORMATS));
607+ log.debug("set value type: Date");
608+ }
600609 }
601610 // もともと計算式セルの場合は計算式として値をセット
602611 else {
Show on old repository browser