sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1727639 - in /sis/branches/JDK8/core/sis-referencing/src: main/java/org/apache/sis/internal/referencing/provider/ test/java/org/apache/sis/internal/referencing/provider/ test/java/org/apache/sis/referencing/report/ test/java/org/apache/sis...
Date Fri, 29 Jan 2016 21:20:40 GMT
Author: desruisseaux
Date: Fri Jan 29 21:20:40 2016
New Revision: 1727639

URL: http://svn.apache.org/viewvc?rev=1727639&view=rev
Log:
Group together the classes that generate HTML reports for the web site.

Added:
    sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/report/
    sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/report/CoordinateOperationMethods.java
      - copied, changed from r1727638, sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/CoordinateOperationMethodsHTML.java
    sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/report/CoordinateReferenceSystems.java
  (with props)
    sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/report/HTMLGenerator.java
      - copied, changed from r1727638, sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/test/HTMLGenerator.java
    sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/report/package-info.java
  (with props)
Removed:
    sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/CoordinateOperationMethodsHTML.java
    sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/test/HTMLGenerator.java
Modified:
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/LambertConformal2SP.java

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/LambertConformal2SP.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/LambertConformal2SP.java?rev=1727639&r1=1727638&r2=1727639&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/LambertConformal2SP.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/LambertConformal2SP.java
[UTF-8] Fri Jan 29 21:20:40 2016
@@ -88,7 +88,7 @@ public final class LambertConformal2SP e
     /**
      * The group of all parameters expected by this coordinate operation.
      */
-    static final ParameterDescriptorGroup PARAMETERS;
+    private static final ParameterDescriptorGroup PARAMETERS;
     static {
         final ParameterBuilder builder = builder();
         /*

Copied: sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/report/CoordinateOperationMethods.java
(from r1727638, sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/CoordinateOperationMethodsHTML.java)
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/report/CoordinateOperationMethods.java?p2=sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/report/CoordinateOperationMethods.java&p1=sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/CoordinateOperationMethodsHTML.java&r1=1727638&r2=1727639&rev=1727639&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/CoordinateOperationMethodsHTML.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/report/CoordinateOperationMethods.java
[UTF-8] Fri Jan 29 21:20:40 2016
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sis.internal.referencing.provider;
+package org.apache.sis.referencing.report;
 
 import java.util.Map;
 import java.util.HashMap;
@@ -35,18 +35,19 @@ import org.opengis.referencing.crs.Gener
 import org.apache.sis.internal.system.DefaultFactories;
 import org.apache.sis.internal.util.Constants;
 import org.apache.sis.internal.util.PatchedUnitFormat;
+import org.apache.sis.internal.referencing.provider.Affine;
+import org.apache.sis.internal.referencing.provider.LambertConformal2SP;
 import org.apache.sis.measure.Range;
 import org.apache.sis.measure.Latitude;
 import org.apache.sis.measure.Longitude;
 import org.apache.sis.measure.RangeFormat;
-import org.apache.sis.metadata.iso.extent.DefaultGeographicBoundingBox;
 import org.apache.sis.parameter.Parameters;
-import org.apache.sis.referencing.CRS;
+import org.apache.sis.metadata.iso.extent.DefaultGeographicBoundingBox;
 import org.apache.sis.referencing.operation.DefaultOperationMethod;
+import org.apache.sis.referencing.CRS;
 import org.apache.sis.util.ArraysExt;
 import org.apache.sis.util.Characters;
 import org.apache.sis.util.Numbers;
-import org.apache.sis.test.HTMLGenerator;
 
 
 /**
@@ -62,10 +63,10 @@ import org.apache.sis.test.HTMLGenerator
  *
  * @author  Martin Desruisseaux (Geomatys)
  * @since   0.6
- * @version 0.6
+ * @version 0.7
  * @module
  */
-public final strictfp class CoordinateOperationMethodsHTML extends HTMLGenerator {
+public strictfp class CoordinateOperationMethods extends HTMLGenerator {
     /**
      * Generates the HTML report.
      *
@@ -85,7 +86,7 @@ public final strictfp class CoordinateOp
             }
             return c;
         });
-        try (final CoordinateOperationMethodsHTML writer = new CoordinateOperationMethodsHTML())
{
+        try (final CoordinateOperationMethods writer = new CoordinateOperationMethods())
{
             writer.writeIndex(methods);
             for (final OperationMethod method : methods) {
                 writer.write(method);
@@ -106,9 +107,8 @@ public final strictfp class CoordinateOp
      * @todo Not yet completed.
      */
     private final GeneralParameterDescriptor defaultToLatitudeOfOrigin[] = {
-//      AlbersEqualArea        .PARAMETERS.descriptor("Latitude of 1st standard parallel"),
-        LambertConformal2SP    .PARAMETERS.descriptor("Latitude of 1st standard parallel"),
-        LambertConformalBelgium.PARAMETERS.descriptor("Latitude of 1st standard parallel")
+//      AlbersEqualArea    .PARAMETERS.descriptor("Latitude of 1st standard parallel"),
+        LambertConformal2SP.STANDARD_PARALLEL_1
     };
 
     /**
@@ -118,9 +118,8 @@ public final strictfp class CoordinateOp
      * @todo Not yet completed.
      */
     private final GeneralParameterDescriptor defaultToStandardParallel1[] = {
-//      AlbersEqualArea        .PARAMETERS.descriptor("Latitude of 2nd standard parallel"),
-        LambertConformal2SP    .PARAMETERS.descriptor("Latitude of 2nd standard parallel"),
-        LambertConformalBelgium.PARAMETERS.descriptor("Latitude of 2nd standard parallel")
+//      AlbersEqualArea    .PARAMETERS.descriptor("Latitude of 2nd standard parallel"),
+        LambertConformal2SP.STANDARD_PARALLEL_2
     };
 
     /**
@@ -153,9 +152,9 @@ public final strictfp class CoordinateOp
      *
      * @throws IOException if an error occurred while writing to the file.
      */
-    public CoordinateOperationMethodsHTML() throws IOException {
+    public CoordinateOperationMethods() throws IOException {
         super("CoordinateOperationMethods.html", "Apache SIS Coordinate Operation Methods");
-        domainOfValidity = Collections.emptyMap(); // TODO: not yet available.
+        domainOfValidity = Collections.emptyMap();      // TODO: not yet available.
         rangeFormat = new RangeFormat(LOCALE);
         final int header = openTag("header");
         println("h1", "Apache SIS™ Coordinate Operation Methods");

Added: sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/report/CoordinateReferenceSystems.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/report/CoordinateReferenceSystems.java?rev=1727639&view=auto
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/report/CoordinateReferenceSystems.java
(added)
+++ sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/report/CoordinateReferenceSystems.java
[UTF-8] Fri Jan 29 21:20:40 2016
@@ -0,0 +1,247 @@
+/*
+ * 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.apache.sis.referencing.report;
+
+import java.util.Locale;
+import java.io.File;
+import java.io.IOException;
+
+import org.opengis.util.FactoryException;
+import org.opengis.util.InternationalString;
+import org.opengis.referencing.IdentifiedObject;
+import org.opengis.referencing.cs.CartesianCS;
+import org.opengis.referencing.cs.SphericalCS;
+import org.opengis.referencing.cs.CoordinateSystem;
+import org.opengis.referencing.crs.CompoundCRS;
+import org.opengis.referencing.crs.VerticalCRS;
+import org.opengis.referencing.crs.GeocentricCRS;
+import org.opengis.referencing.crs.GeographicCRS;
+import org.opengis.referencing.crs.EngineeringCRS;
+import org.opengis.referencing.crs.GeneralDerivedCRS;
+import org.opengis.referencing.crs.CoordinateReferenceSystem;
+import org.opengis.referencing.crs.CRSAuthorityFactory;
+import org.opengis.referencing.datum.VerticalDatumType;
+import org.opengis.test.report.AuthorityCodesReport;
+import org.apache.sis.referencing.crs.AbstractCRS;
+import org.apache.sis.referencing.cs.AxesConvention;
+import org.apache.sis.util.logging.Logging;
+import org.apache.sis.util.CharSequences;
+import org.apache.sis.util.ComparisonMode;
+import org.apache.sis.util.Deprecable;
+import org.apache.sis.util.Utilities;
+import org.apache.sis.util.Version;
+
+
+/**
+ * Generates a list of supported Coordinate Reference Systems in the current directory.
+ * This class is for manual execution after the EPSG database has been updated,
+ * or the projection implementations changed.
+ *
+ * @author  Martin Desruisseaux (Geomatys)
+ * @since   0.7
+ * @version 0.7
+ * @module
+ */
+public strictfp class CoordinateReferenceSystems extends AuthorityCodesReport {
+    /**
+     * The symbol to write in from of EPSG code of CRS having an axis order different
+     * then the (longitude, latitude) one.
+     */
+    private static final char YX_ORDER = '\u21B7';
+
+    /**
+     * The factory which create CRS instances.
+     */
+    private final CRSAuthorityFactory factory;
+
+    /**
+     * Creates a new instance.
+     */
+    private CoordinateReferenceSystems() throws FactoryException {
+        super(null);
+        properties.setProperty("PRODUCT.NAME",    "Apache SIS™");
+        properties.setProperty("PRODUCT.VERSION", getVersion());
+        properties.setProperty("PRODUCT.URL",     "http://sis.apache.org");
+        properties.setProperty("JAVADOC.GEOAPI",  "http://www.geoapi.org/snapshot/javadoc");
+        properties.setProperty("FACTORY.NAME",    "EPSG");
+        properties.setProperty("FACTORY.VERSION", "7.9");
+        properties.setProperty("FACTORY.VERSION.SUFFIX", ", together with other sources");
+        properties.setProperty("DESCRIPTION", "<p><b>Notation:</b></p>\n"
+
+                "<ul>\n" +
+                "  <li>The " + YX_ORDER + " symbol in front of authority codes (${PERCENT.ANNOTATED}
of them)" +
+                " identifies the CRS having an axis order different than (<var>easting</var>,
<var>northing</var>).</li>\n" +
+                "  <li>The <del>codes with a strike</del> (${PERCENT.DEPRECATED}
of them) identify deprecated CRS." +
+                " In some cases, the remarks column indicates the replacement.</li>\n"
+
+                "</ul>");
+        factory = org.apache.sis.referencing.CRS.getAuthorityFactory(null);
+        add(factory);
+        /*
+         * We have to use this hack for now because exceptions are formatted in the current
locale.
+         */
+        Locale.setDefault(getLocale());
+    }
+
+    /**
+     * Returns the current Apache SIS version, with the {@code -SNAPSHOT} trailing part omitted.
+     *
+     * @return The current Apache SIS version.
+     */
+    private static String getVersion() {
+        String version = Version.SIS.toString();
+        final int snapshot = version.lastIndexOf('-');
+        if (snapshot >= 2) {
+            version = version.substring(0, snapshot);
+        }
+        return version;
+    }
+
+    /**
+     * Generates the HTML report.
+     *
+     * @param  args Ignored.
+     * @throws FactoryException If an error occurred while fetching the CRS.
+     * @throws IOException If an error occurred while writing the HTML file.
+     */
+    @SuppressWarnings("UseOfSystemOutOrSystemErr")
+    public static void main(final String[] args) throws FactoryException, IOException {
+        final CoordinateReferenceSystems writer = new CoordinateReferenceSystems();
+        final File file = writer.write(new File("CoordinateReferenceSystems.html"));
+        System.out.println("Created " + file.getAbsolutePath());
+    }
+
+    /**
+     * Creates the remarks for the given CRS.
+     */
+    private String getRemark(final CoordinateReferenceSystem crs) {
+        if (crs instanceof GeographicCRS) {
+            return (crs.getCoordinateSystem().getDimension() == 3) ? "Geographic 3D" : "Geographic";
+        }
+        if (crs instanceof GeneralDerivedCRS) {
+            return ((GeneralDerivedCRS) crs).getConversionFromBase().getMethod().getName().getCode().replace('_',
' ');
+        }
+        if (crs instanceof GeocentricCRS) {
+            final CoordinateSystem cs = crs.getCoordinateSystem();
+            if (cs instanceof CartesianCS) {
+                return "Geocentric (Cartesian coordinate system)";
+            } else if (cs instanceof SphericalCS) {
+                return "Geocentric (spherical coordinate system)";
+            }
+            return "Geocentric";
+        }
+        if (crs instanceof VerticalCRS) {
+            final VerticalDatumType type = ((VerticalCRS) crs).getDatum().getVerticalDatumType();
+            return CharSequences.camelCaseToSentence(type.name().toLowerCase(getLocale()))
+ " height";
+        }
+        if (crs instanceof CompoundCRS) {
+            final StringBuilder buffer = new StringBuilder();
+            for (final CoordinateReferenceSystem component : ((CompoundCRS) crs).getComponents())
{
+                if (buffer.length() != 0) {
+                    buffer.append(" + ");
+                }
+                buffer.append(getRemark(component));
+            }
+            return buffer.toString();
+        }
+        if (crs instanceof EngineeringCRS) {
+            return "Engineering (" + crs.getCoordinateSystem().getName().getCode() + ')';
+        }
+        return "";
+    }
+
+    /**
+     * Invoked when a CRS has been successfully created. This method modifies the default
+     * {@link org.opengis.test.report.AuthorityCodesReport.Row} attribute values created
+     * by GeoAPI.
+     *
+     * @param  code    The authority code of the created object.
+     * @param  object  The object created from the given authority code.
+     * @return The created row, or {@code null} if the row should be ignored.
+     */
+    @Override
+    protected Row createRow(final String code, final IdentifiedObject object) {
+        final Row row = super.createRow(code, object);
+        final CoordinateReferenceSystem crs = (CoordinateReferenceSystem) object;
+        final CoordinateReferenceSystem crsXY = AbstractCRS.castOrCopy(crs).forConvention(AxesConvention.RIGHT_HANDED);
+        if (!Utilities.deepEquals(crs.getCoordinateSystem(), crsXY.getCoordinateSystem(),
ComparisonMode.IGNORE_METADATA)) {
+            row.annotation = YX_ORDER;
+        }
+        row.remark = getRemark(crs);
+        if (object instanceof Deprecable) {
+            row.isDeprecated = ((Deprecable) object).isDeprecated();
+        }
+        /*
+         * If the object is deprecated, try to find the reason.
+         * Don't take the whole comment, because it may be pretty long.
+         */
+        if (row.isDeprecated) {
+            final InternationalString i18n = object.getRemarks();
+            if (i18n != null) {
+                String remark = i18n.toString(getLocale());
+                final int s = Math.max(remark.lastIndexOf("Superseded"),
+                              Math.max(remark.lastIndexOf("superseded"),
+                              Math.max(remark.lastIndexOf("Replaced"),
+                              Math.max(remark.lastIndexOf("replaced"),
+                              Math.max(remark.lastIndexOf("See"),
+                                       remark.lastIndexOf("see"))))));
+                if (s >= 0) {
+                    final int start = remark.lastIndexOf('.', s) + 1;
+                    final int end = remark.indexOf('.', s);
+                    remark = (end >= 0) ? remark.substring(start, end) : remark.substring(start);
+                    remark = CharSequences.trimWhitespaces(remark.replace('¶', '\n').trim());
+                    if (!remark.isEmpty()) {
+                        row.remark = remark;
+                    }
+                }
+            }
+        }
+        return row;
+    }
+
+    /**
+     * Invoked when a CRS creation failed. This method modifies the default
+     * {@link org.opengis.test.report.AuthorityCodesReport.Row} attribute values
+     * created by GeoAPI.
+     *
+     * @param  code      The authority code of the object to create.
+     * @param  exception The exception that occurred while creating the identified object.
+     * @return The created row, or {@code null} if the row should be ignored.
+     */
+    @Override
+    protected Row createRow(final String code, final FactoryException exception) {
+        final Row row = super.createRow(code, exception);
+        try {
+            row.name = factory.getDescriptionText(code).toString(getLocale());
+        } catch (FactoryException e) {
+            Logging.unexpectedException(null, CoordinateReferenceSystems.class, "createRow",
e);
+        }
+        String message;
+        if (code.startsWith("AUTO2:")) {
+            // It is normal to be unable to instantiate an "AUTO" CRS,
+            // because those authority codes need parameters.
+            message = "Projected";
+            row.hasError = false;
+        } else {
+            message = exception.getMessage();
+            if (message.contains("Unable to format units in UCUM")) {
+                // Simplify a very long and badly formatted message.
+                message = "Unable to format units in UCUM";
+            }
+        }
+        row.remark = message;
+        return row;
+    }
+}

Propchange: sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/report/CoordinateReferenceSystems.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/report/CoordinateReferenceSystems.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain;charset=UTF-8

Copied: sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/report/HTMLGenerator.java
(from r1727638, sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/test/HTMLGenerator.java)
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/report/HTMLGenerator.java?p2=sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/report/HTMLGenerator.java&p1=sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/test/HTMLGenerator.java&r1=1727638&r2=1727639&rev=1727639&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/test/HTMLGenerator.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/report/HTMLGenerator.java
[UTF-8] Fri Jan 29 21:20:40 2016
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sis.test;
+package org.apache.sis.referencing.report;
 
 import java.util.Deque;
 import java.util.ArrayDeque;
@@ -39,10 +39,10 @@ import org.apache.sis.util.Deprecable;
  *
  * @author  Martin Desruisseaux (Geomatys)
  * @since   0.6
- * @version 0.6
+ * @version 0.7
  * @module
  */
-public abstract class HTMLGenerator implements Closeable {
+abstract strictfp class HTMLGenerator implements Closeable {
     /**
      * The encoding of the files to generate.
      */
@@ -53,7 +53,7 @@ public abstract class HTMLGenerator impl
      *
      * @see #toLocalizedString(InternationalString)
      */
-    protected static final Locale LOCALE = Locale.US;
+    static final Locale LOCALE = Locale.US;
 
     /**
      * The number of space to add or remove in the {@linkplain #margin}
@@ -87,7 +87,7 @@ public abstract class HTMLGenerator impl
      * @param  title The document title.
      * @throws IOException if the file can not be created (e.g. because it already exists).
      */
-    protected HTMLGenerator(final String filename, final String title) throws IOException
{
+    HTMLGenerator(final String filename, final String title) throws IOException {
         final File file = new File(filename);
         if (file.exists()) {
             throw new IOException("File " + file.getAbsolutePath() + " already exists.");
@@ -123,7 +123,7 @@ public abstract class HTMLGenerator impl
      * @param  text The text to escape, or {@code null}.
      * @return The escaped text, or {@code null} if the given text was null.
      */
-    protected static CharSequence escape(CharSequence text) {
+    static CharSequence escape(CharSequence text) {
         text = CharSequences.replace(text, "&", "&amp;");
         text = CharSequences.replace(text, "<", "&lt;");
         text = CharSequences.replace(text, ">", "&gt;");
@@ -149,7 +149,7 @@ public abstract class HTMLGenerator impl
      * @return The value to give to {@link #closeTags(int)} for closing the tags.
      * @throws IOException if an error occurred while writing to the file.
      */
-    protected final int openTag(final String tag) throws IOException {
+    final int openTag(final String tag) throws IOException {
         out.write(margin);
         out.write('<');
         out.write(tag);
@@ -167,7 +167,7 @@ public abstract class HTMLGenerator impl
      * @param  tag The HTML tag without brackets (e.g. {@code "h2"}).
      * @throws IOException if an error occurred while writing to the file.
      */
-    protected final void reopenTag(final String tag) throws IOException {
+    final void reopenTag(final String tag) throws IOException {
         final String tagWithoutAttributes = omitAttributes(tag);
         if (openedTags.getLast().equals(tagWithoutAttributes)) {
             out.write(CharSequences.spaces(margin.length() - INDENTATION).toString());
@@ -188,7 +188,7 @@ public abstract class HTMLGenerator impl
      * @param  openedTag The value returned by the {@link #openTag(String)} matching the
tag to close.
      * @throws IOException if an error occurred while writing to the file.
      */
-    protected final void closeTags(final int openedTag) throws IOException {
+    final void closeTags(final int openedTag) throws IOException {
         while (openedTags.size() != openedTag) {
             margin = CharSequences.spaces(margin.length() - INDENTATION).toString();
             out.write(margin);
@@ -208,7 +208,7 @@ public abstract class HTMLGenerator impl
      * @param  value The text to write, or {@code null} for none.
      * @throws IOException if an error occurred while writing to the file.
      */
-    protected final void println(final String tag, final CharSequence value) throws IOException
{
+    final void println(final String tag, final CharSequence value) throws IOException {
         out.write(margin);
         out.write('<');
         out.write(tag);
@@ -231,7 +231,7 @@ public abstract class HTMLGenerator impl
      * @param  value The text to write, or {@code null} if none.
      * @throws IOException if an error occurred while writing to the file.
      */
-    protected final void println(final CharSequence value) throws IOException {
+    final void println(final CharSequence value) throws IOException {
         if (value != null) {
             out.write(margin);
             out.write(value.toString());
@@ -258,7 +258,7 @@ public abstract class HTMLGenerator impl
      *
      * @see #LOCALE
      */
-    protected static String toLocalizedString(final InternationalString text) {
+    static String toLocalizedString(final InternationalString text) {
         return (text != null) ? text.toString(LOCALE) : null;
     }
 
@@ -268,7 +268,7 @@ public abstract class HTMLGenerator impl
      * @param  object The object to test.
      * @return {@code true} if the given object is deprecated.
      */
-    protected static boolean isDeprecated(final Object object) {
+    static boolean isDeprecated(final Object object) {
         return (object instanceof Deprecable) && ((Deprecable) object).isDeprecated();
     }
 }

Added: sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/report/package-info.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/report/package-info.java?rev=1727639&view=auto
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/report/package-info.java
(added)
+++ sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/report/package-info.java
[UTF-8] Fri Jan 29 21:20:40 2016
@@ -0,0 +1,29 @@
+/*
+ * 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.
+ */
+
+/**
+ * Generates some HTML reports for the Apache SIS library. The classes in this package iterate
+ * over some kind of services declared by theSIS library (for example the list of map projections)
+ * and produce HTML reports to be copied on the web server.
+ * The reports are for example the list of all supported EPSG codes.
+ *
+ * @author  Martin Desruisseaux (Geomatys)
+ * @since   0.7
+ * @version 0.7
+ * @module
+ */
+package org.apache.sis.referencing.report;

Propchange: sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/report/package-info.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/report/package-info.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain;charset=UTF-8



Mime
View raw message