Author: tpalsulich
Date: Wed Dec 24 09:17:53 2014
New Revision: 1647751
URL: http://svn.apache.org/r1647751
Log:
Pure whitespace change. Fix formatting of NetCDFParser and its test.
Modified:
tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/netcdf/NetCDFParser.java
tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/netcdf/NetCDFParserTest.java
Modified:
tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/netcdf/NetCDFParser.java
URL:
http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/netcdf/NetCDFParser.java?rev=1647751&r1=1647750&r2=1647751&view=diff
==============================================================================
---
tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/netcdf/NetCDFParser.java
(original)
+++
tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/netcdf/NetCDFParser.java
Wed Dec 24 09:17:53 2014
@@ -17,6 +17,7 @@
package org.apache.tika.parser.netcdf;
//JDK imports
+
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStream;
@@ -53,11 +54,13 @@ import ucar.nc2.Dimension;
*/
public class NetCDFParser extends AbstractParser {
- /** Serial version UID */
+ /**
+ * Serial version UID
+ */
private static final long serialVersionUID = -5940938274907708665L;
private final Set<MediaType> SUPPORTED_TYPES =
- Collections.singleton(MediaType.application("x-netcdf"));
+ Collections.singleton(MediaType.application("x-netcdf"));
/*
* (non-Javadoc)
@@ -78,7 +81,7 @@ public class NetCDFParser extends Abstra
* org.apache.tika.parser.ParseContext)
*/
public void parse(InputStream stream, ContentHandler handler,
- Metadata metadata, ParseContext context) throws IOException,
+ Metadata metadata, ParseContext context) throws
IOException,
SAXException, TikaException {
TikaInputStream tis = TikaInputStream.get(stream, new
TemporaryResources());
@@ -95,45 +98,45 @@ public class NetCDFParser extends Abstra
metadata.add(property, String.valueOf(value));
}
}
-
-
- XHTMLContentHandler xhtml = new XHTMLContentHandler(handler,
metadata);
- xhtml.startDocument();
- xhtml.newline();
- xhtml.element("h1", "dimensions");
- xhtml.startElement("ul");
- xhtml.newline();
- for (Dimension dim : ncFile.getDimensions()){
- xhtml.element("li", dim.getName() + " = " +
dim.getLength());
- }
- xhtml.endElement("ul");
- xhtml.element("h1", "variables");
- xhtml.startElement("ul");
+
+ XHTMLContentHandler xhtml = new XHTMLContentHandler(handler,
metadata);
+ xhtml.startDocument();
+ xhtml.newline();
+ xhtml.element("h1", "dimensions");
+ xhtml.startElement("ul");
+ xhtml.newline();
+ for (Dimension dim : ncFile.getDimensions()) {
+ xhtml.element("li", dim.getName() + " = " + dim.getLength());
+ }
+ xhtml.endElement("ul");
+
+ xhtml.element("h1", "variables");
+ xhtml.startElement("ul");
+ xhtml.newline();
+ for (Variable var : ncFile.getVariables()) {
+ xhtml.startElement("li");
+ xhtml.characters(var.getDataType() + " " +
var.getNameAndDimensions());
xhtml.newline();
- for (Variable var : ncFile.getVariables()){
- xhtml.startElement("li");
- xhtml.characters(var.getDataType() + " " +
var.getNameAndDimensions());
- xhtml.newline();
- List<Attribute> attributes = var.getAttributes();
- if (!attributes.isEmpty()) {
- xhtml.startElement("ul");
- for(Attribute element : attributes){
- xhtml.element("li", element.toString());
- }
- xhtml.endElement("ul");
+ List<Attribute> attributes = var.getAttributes();
+ if (!attributes.isEmpty()) {
+ xhtml.startElement("ul");
+ for (Attribute element : attributes) {
+ xhtml.element("li", element.toString());
}
- xhtml.endElement("li");
- }
- xhtml.endElement("ul");
+ xhtml.endElement("ul");
+ }
+ xhtml.endElement("li");
+ }
+ xhtml.endElement("ul");
+
+ xhtml.endDocument();
- xhtml.endDocument();
-
} catch (IOException e) {
throw new TikaException("NetCDF parse error", e);
- }
+ }
}
-
+
private Property resolveMetadataKey(String localName) {
if ("title".equals(localName)) {
return TikaCoreProperties.TITLE;
Modified:
tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/netcdf/NetCDFParserTest.java
URL:
http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/netcdf/NetCDFParserTest.java?rev=1647751&r1=1647750&r2=1647751&view=diff
==============================================================================
---
tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/netcdf/NetCDFParserTest.java
(original)
+++
tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/netcdf/NetCDFParserTest.java
Wed Dec 24 09:17:53 2014
@@ -17,9 +17,6 @@
package org.apache.tika.parser.netcdf;
//JDK imports
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
import java.io.InputStream;
//TIKA imports
@@ -30,9 +27,12 @@ import org.apache.tika.parser.Parser;
import org.apache.tika.sax.BodyContentHandler;
import org.junit.Test;
import org.xml.sax.ContentHandler;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
/**
* Test cases to exercise the {@link NetCDFParser}.
- *
*/
public class NetCDFParserTest {
@@ -61,13 +61,13 @@ public class NetCDFParserTest {
"720 ppm stabilization experiment (SRESA1B)");
String content = handler.toString();
- assertTrue(content.contains("long_name = \"Surface area\""));
- assertTrue(content.contains("float area(lat=128, lon=256)"));
- assertTrue(content.contains("float lat(lat=128)"));
- assertTrue(content.contains("double lat_bnds(lat=128,
bnds=2)"));
- assertTrue(content.contains("double lon_bnds(lon=256,
bnds=2)"));
-
-
+ assertTrue(content.contains("long_name = \"Surface area\""));
+ assertTrue(content.contains("float area(lat=128, lon=256)"));
+ assertTrue(content.contains("float lat(lat=128)"));
+ assertTrue(content.contains("double lat_bnds(lat=128, bnds=2)"));
+ assertTrue(content.contains("double lon_bnds(lon=256, bnds=2)"));
+
+
}
}
