Author: desruisseaux
Date: Thu Feb 5 17:52:45 2015
New Revision: 1657643
URL: http://svn.apache.org/r1657643
Log:
Merge from trunk a bug fix for a regression discovered during the release
process.
Modified:
sis/branches/0.5/ (props changed)
sis/branches/0.5/core/sis-build-helper/src/main/java/org/apache/sis/internal/doclet/Doclet.java
sis/branches/0.5/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/MetadataUtilities.java
sis/branches/0.5/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultBand.java
sis/branches/0.5/pom.xml
sis/branches/0.5/storage/sis-netcdf/src/main/java/org/apache/sis/storage/netcdf/MetadataReader.java
Propchange: sis/branches/0.5/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Feb 5 17:52:45 2015
@@ -1,4 +1,5 @@
/sis/branches/Android:1430670-1480699
-/sis/branches/JDK6:1394364-1656740
-/sis/branches/JDK7:1394913-1656738
-/sis/branches/JDK8:1584960-1656731
+/sis/branches/JDK6:1394364-1657639
+/sis/branches/JDK7:1394913-1657637
+/sis/branches/JDK8:1584960-1657634
+/sis/trunk:1656938-1657642
Modified:
sis/branches/0.5/core/sis-build-helper/src/main/java/org/apache/sis/internal/doclet/Doclet.java
URL:
http://svn.apache.org/viewvc/sis/branches/0.5/core/sis-build-helper/src/main/java/org/apache/sis/internal/doclet/Doclet.java?rev=1657643&r1=1657642&r2=1657643&view=diff
==============================================================================
---
sis/branches/0.5/core/sis-build-helper/src/main/java/org/apache/sis/internal/doclet/Doclet.java
[UTF-8] (original)
+++
sis/branches/0.5/core/sis-build-helper/src/main/java/org/apache/sis/internal/doclet/Doclet.java
[UTF-8] Thu Feb 5 17:52:45 2015
@@ -89,10 +89,10 @@ public final class Doclet extends HtmlDo
}
}
}
- final boolean status = HtmlDoclet.start(root);
- if (outputDirectory != null) try {
+ final boolean success = HtmlDoclet.start(root);
+ if (success && outputDirectory != null) try {
final File output = new File(outputDirectory);
- final File customCSS = customCSS(output);
+ final File customCSS = customCSS(output);
copyStylesheet(customCSS, output);
copyResources(customCSS.getParentFile(), output);
} catch (IOException e) {
@@ -102,7 +102,7 @@ public final class Doclet extends HtmlDo
root.printError(buffer.toString());
return false;
}
- return status;
+ return success;
}
/**
Modified:
sis/branches/0.5/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/MetadataUtilities.java
URL:
http://svn.apache.org/viewvc/sis/branches/0.5/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/MetadataUtilities.java?rev=1657643&r1=1657642&r2=1657643&view=diff
==============================================================================
---
sis/branches/0.5/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/MetadataUtilities.java
[UTF-8] (original)
+++
sis/branches/0.5/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/MetadataUtilities.java
[UTF-8] Thu Feb 5 17:52:45 2015
@@ -148,7 +148,7 @@ public final class MetadataUtilities ext
}
/**
- * Formats an error message and logs it is we are (un)marshalling a
document, or return the message otherwise.
+ * Formats an error message and logs it if we are (un)marshalling a
document, or return the message otherwise.
* In the later case, it is caller's responsibility to use the message for
throwing an exception.
*
* @param classe The caller class, used only in case of warning
message to log.
Modified:
sis/branches/0.5/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultBand.java
URL:
http://svn.apache.org/viewvc/sis/branches/0.5/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultBand.java?rev=1657643&r1=1657642&r2=1657643&view=diff
==============================================================================
---
sis/branches/0.5/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultBand.java
[UTF-8] (original)
+++
sis/branches/0.5/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultBand.java
[UTF-8] Thu Feb 5 17:52:45 2015
@@ -306,9 +306,11 @@ public class DefaultBand extends Default
/**
* Sets the units of data as a unit of length.
*
- * <div class="warning"><b>Upcoming API change — generalization</b><br>
- * As of ISO 19115:2014, the units of wavelength is rather {@code
boundUnits}.
- * The restriction for units of length in this {@code units} property may
be relaxed in GeoAPI 4.0.
+ * <div class="warning"><b>Upcoming precondition change —
relaxation</b><br>
+ * The current implementation requires the unit to be an instance of
{@code Unit<Length>},
+ * otherwise a {@link ClassCastException} is thrown. This is because the
value returned by
+ * {@link #getUnits()} was restricted by ISO 19115:2003 to units of length.
+ * However this restriction may be relaxed in GeoAPI 4.0.
* </div>
*
* @param newValue The new units of data as an instance of {@code
Unit<Length>}.
Modified: sis/branches/0.5/pom.xml
URL:
http://svn.apache.org/viewvc/sis/branches/0.5/pom.xml?rev=1657643&r1=1657642&r2=1657643&view=diff
==============================================================================
--- sis/branches/0.5/pom.xml (original)
+++ sis/branches/0.5/pom.xml Thu Feb 5 17:52:45 2015
@@ -403,7 +403,6 @@ Apache SIS is a free software, Java lang
=================================================================== -->
<properties>
<netcdf.version>4.4.2</netcdf.version> <!-- Last version compatible with
JDK6. -->
- <findbugs.version>2.5.3</findbugs.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<website.encoding>UTF-8</website.encoding>
<website.locale>en</website.locale>
@@ -696,15 +695,11 @@ Apache SIS is a free software, Java lang
</configuration>
</plugin>
- <!-- Dependencies requires for the SIS FindBugs configuration file.
- This dependency should be declared in the <reporting> section,
- but Maven 3.0.4 does not support dependency declaration there.
- Note that the version number is duplicated in the <reporting>
- section, because <reporting> ignores <pluginManagement>. -->
+ <!-- Dependencies requires for the SIS FindBugs configuration file. -->
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
- <version>${findbugs.version}</version>
+ <version>2.5.3</version>
<dependencies>
<dependency>
<groupId>org.apache.sis.core</groupId>
Modified:
sis/branches/0.5/storage/sis-netcdf/src/main/java/org/apache/sis/storage/netcdf/MetadataReader.java
URL:
http://svn.apache.org/viewvc/sis/branches/0.5/storage/sis-netcdf/src/main/java/org/apache/sis/storage/netcdf/MetadataReader.java?rev=1657643&r1=1657642&r2=1657643&view=diff
==============================================================================
---
sis/branches/0.5/storage/sis-netcdf/src/main/java/org/apache/sis/storage/netcdf/MetadataReader.java
[UTF-8] (original)
+++
sis/branches/0.5/storage/sis-netcdf/src/main/java/org/apache/sis/storage/netcdf/MetadataReader.java
[UTF-8] Thu Feb 5 17:52:45 2015
@@ -875,7 +875,7 @@ final class MetadataReader {
final String units = variable.getUnitsString();
if (units != null) try {
band.setUnits(Units.valueOf(units));
- } catch (IllegalArgumentException e) {
+ } catch (RuntimeException e) { // IllegalArgumentException or
ClassCastException (specific to this branch).
decoder.listeners.warning(errors().getString(Errors.Keys.CanNotAssignUnitToDimension_2,
name, units), e);
}
return band;
