sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1499404 - in /sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso: citation/DefaultOnlineResource.java citation/package-info.java doc-files/
Date Wed, 03 Jul 2013 13:50:48 GMT
Author: desruisseaux
Date: Wed Jul  3 13:50:48 2013
New Revision: 1499404

URL: http://svn.apache.org/r1499404
Log:
Removed the automatic inference of OnlineResource.protocol property, because it was the only
"automatic" property
to date and we may need more though about a generic way to give user control on properties
inference.

Removed:
    sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/doc-files/
Modified:
    sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultOnlineResource.java
    sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/package-info.java

Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultOnlineResource.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultOnlineResource.java?rev=1499404&r1=1499403&r2=1499404&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultOnlineResource.java
[UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultOnlineResource.java
[UTF-8] Wed Jul  3 13:50:48 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/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/package-info.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/package-info.java?rev=1499404&r1=1499403&r2=1499404&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/package-info.java
[UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/package-info.java
[UTF-8] Wed Jul  3 13:50:48 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.



Mime
View raw message