Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Genesys PGR
Uploader
Commits
77d32386
Commit
77d32386
authored
May 26, 2020
by
Matija Obreza
Browse files
Fix: XSSF parsing
- It can now handle "2E-3" as Double
parent
bd436488
Changes
2
Hide whitespace changes
Inline
Side-by-side
anno-gui/src/main/java/org/genesys2/anno/reader/MyXSSFSheetHandler.java
View file @
77d32386
...
...
@@ -232,6 +232,8 @@ public class MyXSSFSheetHandler extends DefaultHandler {
if
(
DateUtil
.
isADateFormat
(
this
.
formatIndex
,
this
.
formatString
))
{
final
Date
date
=
DateUtil
.
getJavaDate
(
Double
.
valueOf
(
n
));
thisObj
=
new
SimpleDateFormat
(
"yyyyMMdd"
).
format
(
date
);
}
else
if
(
n
.
contains
(
"E-"
))
{
thisObj
=
Double
.
parseDouble
(
n
);
}
else
if
(
n
.
contains
(
"."
))
thisObj
=
Double
.
parseDouble
(
n
);
else
...
...
anno-gui/src/test/java/org/genesys2/anno/util/FormatTest.java
0 → 100644
View file @
77d32386
/*
* Copyright 2020 Global Crop Diversity Trust
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package
org.genesys2.anno.util
;
import
static
org
.
hamcrest
.
CoreMatchers
.
is
;
import
static
org
.
junit
.
Assert
.*;
import
org.junit.Test
;
/**
* The Class FormatTest.
*/
public
class
FormatTest
{
/**
* Test excel input.
*/
@Test
public
void
testExcelInput
()
{
assertThat
(
Double
.
parseDouble
(
"2E-3"
),
is
(
0.002
));
}
}
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment