You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sis.apache.org by de...@apache.org on 2013/07/03 15:59:33 UTC
svn commit: r1499410 - in /sis/trunk: ./
core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/
core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/doc-files/
core/sis-utility/src/main/java/org/apache/sis/util/logging/ core/sis-u...
Author: desruisseaux
Date: Wed Jul 3 13:59:33 2013
New Revision: 1499410
URL: http://svn.apache.org/r1499410
Log:
Merge the change from JDK7 branch which removed the automatic inference of OnlineResource.protocol property.
This feature is considered not ready for the 0.3 release. See http://issues.apache.org/jira/browse/SIS-110
Removed:
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/doc-files/
Modified:
sis/trunk/ (props changed)
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultOnlineResource.java
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/package-info.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/logging/MonolineFormatter.java
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/resources/IndexedResourceBundle.java
Propchange: sis/trunk/
------------------------------------------------------------------------------
Merged /sis/branches/JDK7:r1498907-1499406
Merged /sis/branches/JDK6:r1498917-1499408
Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultOnlineResource.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultOnlineResource.java?rev=1499410&r1=1499409&r2=1499410&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultOnlineResource.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultOnlineResource.java [UTF-8] Wed Jul 3 13:59:33 2013
@@ -242,18 +242,11 @@ public class DefaultOnlineResource exten
}
/**
- * Returns the connection protocol to be used. If no protocol has been {@linkplain #setProtocol(String)
- * explicitely set}, then this method returns the {@linkplain #getLinkage() linkage}
- * {@linkplain URI#getScheme() scheme} (if any).
- *
- * @see <a href="../doc-files/auto-properties.html">List of automatic properties</a>
+ * Returns the connection protocol to be used.
*/
@Override
@XmlElement(name = "protocol")
public String getProtocol() {
- if (protocol == null && linkage != null) {
- return linkage.getScheme();
- }
return protocol;
}
Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/package-info.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/package-info.java?rev=1499410&r1=1499409&r2=1499410&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/package-info.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/package-info.java [UTF-8] Wed Jul 3 13:59:33 2013
@@ -64,11 +64,6 @@
* except at XML marshalling time (for ISO 19139 compliance).
* See {@link org.apache.sis.xml.IdentifierMap} for more information.
*
- * {@section Automatic properties}
- * Some properties provide default value based on the value of other properties.
- * See the <a href="../doc-files/auto-properties.html">list of automatic properties</a>
- * page for more information.
- *
* {@section Null values, nil objects and collections}
* All constructors (except the <cite>copy constructors</cite>) and setter methods accept {@code null} arguments.
* A null argument value means that the metadata element can not be provided, and the reason for that is unspecified.
Modified: sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/logging/MonolineFormatter.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/logging/MonolineFormatter.java?rev=1499410&r1=1499409&r2=1499410&view=diff
==============================================================================
--- sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/logging/MonolineFormatter.java [UTF-8] (original)
+++ sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/logging/MonolineFormatter.java [UTF-8] Wed Jul 3 13:59:33 2013
@@ -33,6 +33,7 @@ import org.apache.sis.internal.system.OS
import org.apache.sis.internal.util.X364;
import org.apache.sis.io.IO;
import org.apache.sis.io.LineAppender;
+import org.apache.sis.util.ArgumentChecks;
import org.apache.sis.util.CharSequences;
import org.apache.sis.util.Configuration;
import org.apache.sis.util.ThreadSafe;
@@ -859,6 +860,7 @@ loop: for (int i=0; ; i++) {
@Debug
@Configuration
public static MonolineFormatter install(final Logger logger, final Level level) throws SecurityException {
+ ArgumentChecks.ensureNonNull("logger", logger);
MonolineFormatter monoline = null;
for (final Handler handler : logger.getHandlers()) {
if (handler instanceof ConsoleHandler) {
Modified: sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/resources/IndexedResourceBundle.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/resources/IndexedResourceBundle.java?rev=1499410&r1=1499409&r2=1499410&view=diff
==============================================================================
--- sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/resources/IndexedResourceBundle.java [UTF-8] (original)
+++ sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/resources/IndexedResourceBundle.java [UTF-8] Wed Jul 3 13:59:33 2013
@@ -248,7 +248,7 @@ public class IndexedResourceBundle exten
/*
* If there is no explicit resources for this instance, inherit the resources
* from the parent. Note that this IndexedResourceBundle instance may still
- * differ from its parent in the way date and numbers are formatted.
+ * differ from its parent in the way dates and numbers are formatted.
*/
if (resources == null) {
// If we get a NullPointerException or ClassCastException here,