sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1628756 - in /sis/trunk/core: sis-build-helper/src/main/java/org/opengis/ sis-build-helper/src/main/java/org/opengis/annotation/ sis-metadata/src/main/java/org/apache/sis/metadata/iso/ sis-metadata/src/main/java/org/apache/sis/metadata/iso...
Date Wed, 01 Oct 2014 16:31:05 GMT
Author: desruisseaux
Date: Wed Oct  1 16:31:04 2014
New Revision: 1628756

URL: http://svn.apache.org/r1628756
Log:
Better workaround for the bug in JDK6 javadoc tools.

Added:
    sis/trunk/core/sis-build-helper/src/main/java/org/opengis/
    sis/trunk/core/sis-build-helper/src/main/java/org/opengis/annotation/
    sis/trunk/core/sis-build-helper/src/main/java/org/opengis/annotation/Obligation.java 
 (with props)
    sis/trunk/core/sis-build-helper/src/main/java/org/opengis/annotation/Specification.java
  (with props)
    sis/trunk/core/sis-build-helper/src/main/java/org/opengis/annotation/UML.java   (with
props)
Modified:
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultMetadataScope.java
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/AbstractParty.java
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultIndividual.java
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultOrganisation.java
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultResponsibility.java
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/constraint/DefaultReleasability.java
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultAttributeGroup.java
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultFeatureTypeInfo.java
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultSampleDimension.java
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultCoupledResource.java
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultOperationChainMetadata.java
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultOperationMetadata.java

Added: sis/trunk/core/sis-build-helper/src/main/java/org/opengis/annotation/Obligation.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-build-helper/src/main/java/org/opengis/annotation/Obligation.java?rev=1628756&view=auto
==============================================================================
--- sis/trunk/core/sis-build-helper/src/main/java/org/opengis/annotation/Obligation.java (added)
+++ sis/trunk/core/sis-build-helper/src/main/java/org/opengis/annotation/Obligation.java [UTF-8]
Wed Oct  1 16:31:04 2014
@@ -0,0 +1,30 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.opengis.annotation;
+
+
+/**
+ * A dependency required for the {@link UML} workaround.
+ *
+ * @author  Martin Desruisseaux (Geomatys)
+ * @since   0.5
+ * @version 0.5
+ * @module
+ */
+public enum Obligation {
+    MANDATORY, OPTIONAL, CONDITIONAL
+}

Propchange: sis/trunk/core/sis-build-helper/src/main/java/org/opengis/annotation/Obligation.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: sis/trunk/core/sis-build-helper/src/main/java/org/opengis/annotation/Obligation.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain;charset=UTF-8

Added: sis/trunk/core/sis-build-helper/src/main/java/org/opengis/annotation/Specification.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-build-helper/src/main/java/org/opengis/annotation/Specification.java?rev=1628756&view=auto
==============================================================================
--- sis/trunk/core/sis-build-helper/src/main/java/org/opengis/annotation/Specification.java
(added)
+++ sis/trunk/core/sis-build-helper/src/main/java/org/opengis/annotation/Specification.java
[UTF-8] Wed Oct  1 16:31:04 2014
@@ -0,0 +1,30 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.opengis.annotation;
+
+
+/**
+ * A dependency required for the {@link UML} workaround.
+ *
+ * @author  Martin Desruisseaux (Geomatys)
+ * @since   0.5
+ * @version 0.5
+ * @module
+ */
+public enum Specification {
+    ISO_19103, ISO_19107, ISO_19111, ISO_19115
+}

Propchange: sis/trunk/core/sis-build-helper/src/main/java/org/opengis/annotation/Specification.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: sis/trunk/core/sis-build-helper/src/main/java/org/opengis/annotation/Specification.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain;charset=UTF-8

Added: sis/trunk/core/sis-build-helper/src/main/java/org/opengis/annotation/UML.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-build-helper/src/main/java/org/opengis/annotation/UML.java?rev=1628756&view=auto
==============================================================================
--- sis/trunk/core/sis-build-helper/src/main/java/org/opengis/annotation/UML.java (added)
+++ sis/trunk/core/sis-build-helper/src/main/java/org/opengis/annotation/UML.java [UTF-8]
Wed Oct  1 16:31:04 2014
@@ -0,0 +1,56 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.opengis.annotation;
+
+
+/**
+ * Workaround for a bug in the JDK6 Javadoc tools.
+ * Attempt to generate Javadoc on the Apache SIS trunk with JDK6 crashes with the following
exception:
+ *
+ * <pre>java.lang.ClassCastException: com.sun.tools.javadoc.MethodDocImpl cannot be
cast to com.sun.tools.javadoc.AnnotationTypeElementDocImpl</pre>
+ *
+ * The problem is caused by existence of the <code>@UML</code> annotation, defined
in GeoAPI.
+ * Adding dependency to the GeoAPI JAR file does not help. The workaround applied here is
to
+ * redefine the UML annotation without the <code>@Documented</code> meta-annotation.
+ *
+ * @author  Martin Desruisseaux (Geomatys)
+ * @since   0.5
+ * @version 0.5
+ * @module
+ */
+public @interface UML {
+    /**
+     * The UML identifier for the annotated interface, method or code list element.
+     *
+     * @return The UML identifier used in the standard.
+     */
+    String identifier();
+
+    /**
+     * The obligation declared in the UML.
+     *
+     * @return The obligation declared in the standard.
+     */
+    Obligation obligation() default Obligation.MANDATORY;
+
+    /**
+     * The specification where this UML come from.
+     *
+     * @return The originating specification.
+     */
+    Specification specification();
+}

Propchange: sis/trunk/core/sis-build-helper/src/main/java/org/opengis/annotation/UML.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: sis/trunk/core/sis-build-helper/src/main/java/org/opengis/annotation/UML.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain;charset=UTF-8

Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultMetadataScope.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultMetadataScope.java?rev=1628756&r1=1628755&r2=1628756&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultMetadataScope.java
[UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultMetadataScope.java
[UTF-8] Wed Oct  1 16:31:04 2014
@@ -29,9 +29,7 @@ import static org.opengis.annotation.Obl
 import static org.opengis.annotation.Specification.ISO_19115;
 
 
-// Leading </pre> is a workaround for a javadoc 6 bug on classes having @UML annotation.
 /**
- * </pre>
  * Information about the scope of the resource.
  *
  * <div class="warning"><b>Note on International Standard versions</b><br>
@@ -109,9 +107,7 @@ public class DefaultMetadataScope extend
         }
     }
 
-    // Leading </pre> is a workaround for a javadoc 6 bug on methods having @UML annotation.
     /**
-     * </pre>
      * Return the code for the scope.
      *
      * @return The ode for the scope.
@@ -132,9 +128,7 @@ public class DefaultMetadataScope extend
         resourceScope = newValue;
     }
 
-    // Leading </pre> is a workaround for a javadoc 6 bug on methods having @UML annotation.
     /**
-     * </pre>
      * Return a description of the scope, or {@code null} if none.
      *
      * @return Description of the scope, or {@code null} if none.

Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/AbstractParty.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/AbstractParty.java?rev=1628756&r1=1628755&r2=1628756&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/AbstractParty.java
[UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/AbstractParty.java
[UTF-8] Wed Oct  1 16:31:04 2014
@@ -32,9 +32,7 @@ import static org.opengis.annotation.Obl
 import static org.opengis.annotation.Specification.ISO_19115;
 
 
-// Leading </pre> is a workaround for a javadoc 6 bug on classes having @UML annotation.
 /**
- * </pre>
  * Information about the individual and / or organization of the party.
  *
  * <div class="warning"><b>Note on International Standard versions</b><br>
@@ -114,9 +112,7 @@ public class AbstractParty extends ISOMe
         }
     }
 
-    // Leading </pre> is a workaround for a javadoc 6 bug on methods having @UML annotation.
     /**
-     * </pre>
      * Return the name of the party.
      *
      * @return Name of the party.
@@ -137,9 +133,7 @@ public class AbstractParty extends ISOMe
        name = newValue;
     }
 
-    // Leading </pre> is a workaround for a javadoc 6 bug on methods having @UML annotation.
     /**
-     * </pre>
      * Returns the contact information for the party.
      *
      * @return Contact information for the party.

Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultIndividual.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultIndividual.java?rev=1628756&r1=1628755&r2=1628756&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultIndividual.java
[UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultIndividual.java
[UTF-8] Wed Oct  1 16:31:04 2014
@@ -29,9 +29,7 @@ import static org.opengis.annotation.Obl
 import static org.opengis.annotation.Specification.ISO_19115;
 
 
-// Leading </pre> is a workaround for a javadoc 6 bug on classes having @UML annotation.
 /**
- * </pre>
  * Information about the party if the party is an individual.
  *
  * <div class="warning"><b>Note on International Standard versions</b><br>
@@ -108,9 +106,7 @@ public class DefaultIndividual extends A
         }
     }
 
-    // Leading </pre> is a workaround for a javadoc 6 bug on methods having @UML annotation.
     /**
-     * </pre>
      * Returns position of the individual in an organization, or {@code null} if none.
      *
      * @return Position of the individual in an organization, or {@code null} if none.

Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultOrganisation.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultOrganisation.java?rev=1628756&r1=1628755&r2=1628756&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultOrganisation.java
[UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultOrganisation.java
[UTF-8] Wed Oct  1 16:31:04 2014
@@ -30,9 +30,7 @@ import static org.opengis.annotation.Obl
 import static org.opengis.annotation.Specification.ISO_19115;
 
 
-// Leading </pre> is a workaround for a javadoc 6 bug on classes having @UML annotation.
 /**
- * </pre>
  * Information about the party if the party is an organization.
  *
  * <div class="warning"><b>Note on International Standard versions</b><br>
@@ -119,9 +117,7 @@ public class DefaultOrganisation extends
         }
     }
 
-    // Leading </pre> is a workaround for a javadoc 6 bug on methods having @UML annotation.
     /**
-     * </pre>
      * Returns the graphics identifying organization.
      *
      * @return Graphics identifying organization, or an empty collection if there is none.
@@ -141,9 +137,7 @@ public class DefaultOrganisation extends
         logo = writeCollection(newValues, logo, BrowseGraphic.class);
     }
 
-    // Leading </pre> is a workaround for a javadoc 6 bug on methods having @UML annotation.
     /**
-     * </pre>
      * Returns the individuals in the named organization.
      *
      * <div class="warning"><b>Upcoming API change — generalization</b><br>

Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultResponsibility.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultResponsibility.java?rev=1628756&r1=1628755&r2=1628756&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultResponsibility.java
[UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultResponsibility.java
[UTF-8] Wed Oct  1 16:31:04 2014
@@ -32,9 +32,7 @@ import static org.opengis.annotation.Obl
 import static org.opengis.annotation.Specification.ISO_19115;
 
 
-// Leading </pre> is a workaround for a javadoc 6 bug on classes having @UML annotation.
 /**
- * </pre>
  * Information about the party and their role.
  *
  * <div class="warning"><b>Note on International Standard versions</b><br>
@@ -138,9 +136,7 @@ public class DefaultResponsibility exten
         }
     }
 
-    // Leading </pre> is a workaround for a javadoc 6 bug on methods having @UML annotation.
     /**
-     * </pre>
      * Returns the function performed by the responsible party.
      *
      * @return Function performed by the responsible party.
@@ -161,9 +157,7 @@ public class DefaultResponsibility exten
         role = newValue;
     }
 
-    // Leading </pre> is a workaround for a javadoc 6 bug on methods having @UML annotation.
     /**
-     * </pre>
      * Returns the spatial or temporal extents of the role.
      *
      * @return The spatial or temporal extents of the role.
@@ -183,9 +177,7 @@ public class DefaultResponsibility exten
         extents = writeCollection(newValues, extents, Extent.class);
     }
 
-    // Leading </pre> is a workaround for a javadoc 6 bug on methods having @UML annotation.
     /**
-     * </pre>
      * Returns information about the parties.
      *
      * <div class="warning"><b>Upcoming API change — generalization</b><br>

Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/constraint/DefaultReleasability.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/constraint/DefaultReleasability.java?rev=1628756&r1=1628755&r2=1628756&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/constraint/DefaultReleasability.java
[UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/constraint/DefaultReleasability.java
[UTF-8] Wed Oct  1 16:31:04 2014
@@ -31,9 +31,7 @@ import static org.opengis.annotation.Obl
 import static org.opengis.annotation.Specification.ISO_19115;
 
 
-// Leading </pre> is a workaround for a javadoc 6 bug on classes having @UML annotation.
 /**
- * </pre>
  * Information about resource release constraints.
  *
  * <div class="warning"><b>Note on International Standard versions</b><br>
@@ -110,9 +108,7 @@ public class DefaultReleasability extend
         }
     }
 
-    // Leading </pre> is a workaround for a javadoc 6 bug on methods having @UML annotation.
     /**
-     * </pre>
      * Returns the parties to which the release statement applies.
      *
      * <div class="warning"><b>Upcoming API change — generalization</b><br>
@@ -142,9 +138,7 @@ public class DefaultReleasability extend
         addressees = writeCollection(newValues, addressees, DefaultResponsibility.class);
     }
 
-    // Leading </pre> is a workaround for a javadoc 6 bug on methods having @UML annotation.
     /**
-     * </pre>
      * Returns the release statement.
      *
      * @return Release statement, or {@code null} if none.
@@ -165,9 +159,7 @@ public class DefaultReleasability extend
         statement = newValue;
     }
 
-    // Leading </pre> is a workaround for a javadoc 6 bug on methods having @UML annotation.
     /**
-     * </pre>
      * Components in determining releasability.
      *
      * @return Components in determining releasability.

Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultAttributeGroup.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultAttributeGroup.java?rev=1628756&r1=1628755&r2=1628756&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultAttributeGroup.java
[UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultAttributeGroup.java
[UTF-8] Wed Oct  1 16:31:04 2014
@@ -31,9 +31,7 @@ import static org.opengis.annotation.Obl
 import static org.opengis.annotation.Specification.ISO_19115;
 
 
-// Leading </pre> is a workaround for a javadoc 6 bug on classes having @UML annotation.
 /**
- * </pre>
  * Information about content type for groups of attributes for a specific
  * {@linkplain DefaultRangeDimension range dimension}.
  *
@@ -116,9 +114,7 @@ public class DefaultAttributeGroup exten
         }
     }
 
-    // Leading </pre> is a workaround for a javadoc 6 bug on methods having @UML annotation.
     /**
-     * </pre>
      * Returns the types of information represented by the value(s).
      *
      * @return The types of information represented by the value(s).
@@ -138,9 +134,7 @@ public class DefaultAttributeGroup exten
         contentTypes = writeCollection(newValues, contentTypes, CoverageContentType.class);
     }
 
-    // Leading </pre> is a workaround for a javadoc 6 bug on methods having @UML annotation.
     /**
-     * </pre>
      * Returns information on an attribute of the resource.
      *
      * @return Information on an attribute of the resource.

Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultFeatureTypeInfo.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultFeatureTypeInfo.java?rev=1628756&r1=1628755&r2=1628756&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultFeatureTypeInfo.java
[UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultFeatureTypeInfo.java
[UTF-8] Wed Oct  1 16:31:04 2014
@@ -31,9 +31,7 @@ import static org.opengis.annotation.Obl
 import static org.opengis.annotation.Specification.ISO_19115;
 
 
-// Leading </pre> is a workaround for a javadoc 6 bug on classes having @UML annotation.
 /**
- * </pre>
  * Information about the occurring feature type.
  *
  * <div class="warning"><b>Note on International Standard versions</b><br>
@@ -111,9 +109,7 @@ public class DefaultFeatureTypeInfo exte
         }
     }
 
-    // Leading </pre> is a workaround for a javadoc 6 bug on methods having @UML annotation.
     /**
-     * </pre>
      * Returns the name of the feature type.
      *
      * @return Name of the feature type.
@@ -136,9 +132,7 @@ public class DefaultFeatureTypeInfo exte
         featureTypeName = newValue;
     }
 
-    // Leading </pre> is a workaround for a javadoc 6 bug on methods having @UML annotation.
     /**
-     * </pre>
      * Returns the number of occurrence of feature instances for this feature types, or {@code
null} if none.
      *
      * @return The number of occurrence of feature instances for this feature types, or {@code
null} if none.

Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultSampleDimension.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultSampleDimension.java?rev=1628756&r1=1628755&r2=1628756&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultSampleDimension.java
[UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultSampleDimension.java
[UTF-8] Wed Oct  1 16:31:04 2014
@@ -33,9 +33,7 @@ import static org.opengis.annotation.Obl
 import static org.opengis.annotation.Specification.ISO_19115;
 
 
-// Leading </pre> is a workaround for a javadoc 6 bug on classes having @UML annotation.
 /**
- * </pre>
  * The characteristic of each dimension (layer) included in the resource.
  *
  * <div class="warning"><b>Note on International Standard versions</b><br>
@@ -198,9 +196,7 @@ public class DefaultSampleDimension exte
         }
     }
 
-    // Leading </pre> is a workaround for a javadoc 6 bug on methods having @UML annotation.
     /**
-     * </pre>
      * Returns the minimum value of data values in each dimension included in the resource.
      *
      * @return Minimum value of data values in each dimension included in the resource, or
{@code null} if unspecified.
@@ -221,9 +217,7 @@ public class DefaultSampleDimension exte
         minValue = newValue;
     }
 
-    // Leading </pre> is a workaround for a javadoc 6 bug on methods having @UML annotation.
     /**
-     * </pre>
      * Returns the maximum value of data values in each dimension included in the resource.
      *
      * @return Maximum value of data values in each dimension included in the resource, or
{@code null} if unspecified.
@@ -244,9 +238,7 @@ public class DefaultSampleDimension exte
         maxValue = newValue;
     }
 
-    // Leading </pre> is a workaround for a javadoc 6 bug on methods having @UML annotation.
     /**
-     * </pre>
      * Returns the mean value of data values in each dimension included in the resource.
      *
      * @return The mean value of data values in each dimension included in the resource,
or {@code null} if none.
@@ -267,9 +259,7 @@ public class DefaultSampleDimension exte
         meanValue = newValue;
     }
 
-    // Leading </pre> is a workaround for a javadoc 6 bug on methods having @UML annotation.
     /**
-     * </pre>
      * Returns the number of values used in a thematic classification resource.
      *
      * @return The number of values used in a thematic classification resource, or {@code
null} if none.
@@ -290,9 +280,7 @@ public class DefaultSampleDimension exte
         numberOfValues = newValues;
     }
 
-    // Leading </pre> is a workaround for a javadoc 6 bug on methods having @UML annotation.
     /**
-     * </pre>
      * Returns the standard deviation of data values in each dimension included in the resource.
      *
      * @return Standard deviation of data values in each dimension included in the resource,
or {@code null} if none.
@@ -313,9 +301,7 @@ public class DefaultSampleDimension exte
         standardDeviation = newValue;
     }
 
-    // Leading </pre> is a workaround for a javadoc 6 bug on methods having @UML annotation.
     /**
-     * </pre>
      * Returns the units of data in the dimension.
      *
      * @return The units of data in the dimension, or {@code null} if unspecified.
@@ -336,9 +322,7 @@ public class DefaultSampleDimension exte
         units = newValue;
     }
 
-    // Leading </pre> is a workaround for a javadoc 6 bug on methods having @UML annotation.
     /**
-     * </pre>
      * Returns the scale factor which has been applied to the cell value.
      *
      * @return Scale factor which has been applied to the cell value, or {@code null} if
none.
@@ -359,9 +343,7 @@ public class DefaultSampleDimension exte
         scaleFactor = newValue;
     }
 
-    // Leading </pre> is a workaround for a javadoc 6 bug on methods having @UML annotation.
     /**
-     * </pre>
      * Returns the physical value corresponding to a cell value of zero.
      *
      * @return The physical value corresponding to a cell value of zero, or {@code null}
if none.
@@ -382,9 +364,7 @@ public class DefaultSampleDimension exte
         offset = newValue;
     }
 
-    // Leading </pre> is a workaround for a javadoc 6 bug on methods having @UML annotation.
     /**
-     * </pre>
      * Returns the maximum number of significant bits in the uncompressed representation
      * for the value in each band of each pixel.
      *
@@ -409,9 +389,7 @@ public class DefaultSampleDimension exte
         bitsPerValue = newValue;
     }
 
-    // Leading </pre> is a workaround for a javadoc 6 bug on methods having @UML annotation.
     /**
-     * </pre>
      * Returns type of other attribute description.
      *
      * @return Type of other attribute description, or {@code null} if none.
@@ -432,9 +410,7 @@ public class DefaultSampleDimension exte
         otherPropertyType = newValue;
     }
 
-    // Leading </pre> is a workaround for a javadoc 6 bug on methods having @UML annotation.
     /**
-     * </pre>
      * Returns instance of other/attributeType that defines attributes not explicitly
      * included in {@link CoverageContentType}, or {@code null} if none.
      *

Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultCoupledResource.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultCoupledResource.java?rev=1628756&r1=1628755&r2=1628756&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultCoupledResource.java
[UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultCoupledResource.java
[UTF-8] Wed Oct  1 16:31:04 2014
@@ -37,9 +37,7 @@ import static org.opengis.annotation.Obl
 import static org.opengis.annotation.Specification.ISO_19115;
 
 
-// Leading </pre> is a workaround for a javadoc 6 bug on classes having @UML annotation.
 /**
- * </pre>
  * Links a given operation name with a resource identified by an "identifier".
  *
  * <div class="warning"><b>Note on International Standard versions</b><br>
@@ -145,9 +143,7 @@ public class DefaultCoupledResource exte
         }
     }
 
-    // Leading </pre> is a workaround for a javadoc 6 bug on methods having @UML annotation.
     /**
-     * </pre>
      * Returns scoped identifier of the resource in the context of the given service instance.
      *
      * @return identifier of the resource, or {@code null} if none.

Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultOperationChainMetadata.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultOperationChainMetadata.java?rev=1628756&r1=1628755&r2=1628756&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultOperationChainMetadata.java
[UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultOperationChainMetadata.java
[UTF-8] Wed Oct  1 16:31:04 2014
@@ -32,9 +32,7 @@ import static org.opengis.annotation.Obl
 import static org.opengis.annotation.Specification.ISO_19115;
 
 
-// Leading </pre> is a workaround for a javadoc 6 bug on classes having @UML annotation.
 /**
- * </pre>
  * Operation chain information.
  *
  * <div class="warning"><b>Note on International Standard versions</b><br>
@@ -142,9 +140,7 @@ public class DefaultOperationChainMetada
         name = newValue;
     }
 
-    // Leading </pre> is a workaround for a javadoc 6 bug on methods having @UML annotation.
     /**
-     * </pre>
      * Returns a narrative explanation of the services in the chain and resulting output.
      *
      * @return Narrative explanation of the services in the chain and resulting output, or
{@code null} if none.
@@ -165,9 +161,7 @@ public class DefaultOperationChainMetada
         description = newValue;
     }
 
-    // Leading </pre> is a workaround for a javadoc 6 bug on methods having @UML annotation.
     /**
-     * </pre>
      * Returns information about the operations applied by the chain.
      *
      * <div class="warning"><b>Upcoming API change — generalization</b><br>

Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultOperationMetadata.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultOperationMetadata.java?rev=1628756&r1=1628755&r2=1628756&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultOperationMetadata.java
[UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultOperationMetadata.java
[UTF-8] Wed Oct  1 16:31:04 2014
@@ -34,9 +34,7 @@ import static org.opengis.annotation.Obl
 import static org.opengis.annotation.Specification.ISO_19115;
 
 
-// Leading </pre> is a workaround for a javadoc 6 bug on classes having @UML annotation.
 /**
- * </pre>
  * Parameter information.
  *
  * <div class="warning"><b>Note on International Standard versions</b><br>
@@ -143,9 +141,7 @@ public class DefaultOperationMetadata ex
         }
     }
 
-    // Leading </pre> is a workaround for a javadoc 6 bug on methods having @UML annotation.
     /**
-     * </pre>
      * Returns an unique identifier for this interface.
      *
      * @return An unique identifier for this interface.
@@ -166,9 +162,7 @@ public class DefaultOperationMetadata ex
         operationName = newValue;
     }
 
-    // Leading </pre> is a workaround for a javadoc 6 bug on methods having @UML annotation.
     /**
-     * </pre>
      * Returns the distributed computing platforms (DCPs) on which the operation has been
implemented.
      *
      * <div class="warning"><b>Upcoming API change — specialization</b><br>
@@ -193,9 +187,7 @@ public class DefaultOperationMetadata ex
         distributedComputingPlatforms = writeCollection(newValues, distributedComputingPlatforms,
Object.class);
     }
 
-    // Leading </pre> is a workaround for a javadoc 6 bug on methods having @UML annotation.
     /**
-     * </pre>
      * Returns free text description of the intent of the operation and the results of the
operation.
      *
      * @return Free text description of the intent of the operation and the results of the
operation, or {@code null} if none.
@@ -216,9 +208,7 @@ public class DefaultOperationMetadata ex
         operationDescription = newValue;
     }
 
-    // Leading </pre> is a workaround for a javadoc 6 bug on methods having @UML annotation.
     /**
-     * </pre>
      * Returns the name used to invoke this interface within the context of the DCP.
      *
      * @return The name used to invoke this interface within the context of the distributed
computing platforms,
@@ -240,9 +230,7 @@ public class DefaultOperationMetadata ex
         invocationName = newValue;
     }
 
-    // Leading </pre> is a workaround for a javadoc 6 bug on methods having @UML annotation.
     /**
-     * </pre>
      * Returns the handle for accessing the service interface.
      *
      * @return Handle for accessing the service interface.
@@ -262,9 +250,7 @@ public class DefaultOperationMetadata ex
         connectPoints = writeCollection(newValue, connectPoints, OnlineResource.class);
     }
 
-    // Leading </pre> is a workaround for a javadoc 6 bug on methods having @UML annotation.
     /**
-     * </pre>
      * Returns the parameters that are required for this interface.
      *
      * @return The parameters that are required for this interface, or an empty collection
if none.
@@ -286,9 +272,7 @@ public class DefaultOperationMetadata ex
         parameters = writeCollection(newValues, parameters, (Class) ParameterDescriptor.class);
     }
 
-    // Leading </pre> is a workaround for a javadoc 6 bug on methods having @UML annotation.
     /**
-     * </pre>
      * Returns the list of operation that must be completed immediately before current operation
is invoked.
      *
      * <div class="warning"><b>Upcoming API change — generalization</b><br>



Mime
View raw message