This is an automated email from the ASF dual-hosted git repository. desruisseaux pushed a commit to branch geoapi-4.0 in repository https://gitbox.apache.org/repos/asf/sis.git
commit b35d75f713175e6252a30ff47cc6da5b9b6dd41d Author: Martin Desruisseaux <[email protected]> AuthorDate: Fri Jun 30 10:29:59 2023 +0200 Rename `org.apache.sis.internal.style` package as `org.apache.sis.style.se1`. By moving the package outside `internal` namespace, we are making it public. However we still target SIS 1.5, not SIS 1.4, for release. The `se1` name stands for "OGC Symbology Encoding 1". We do not commit this package as a generic style API, because there is revision in progress in OGC and ISO 19117. We use SE1 as an API that we can use for now, but with the intend to make a more generic API available in the future. --- .../apache/sis/internal/map/ResourceSymbolizer.java | 2 +- .../java/org/apache/sis/internal/map/SEPortrayer.java | 6 +++--- .../org/apache/sis/internal/map/SEPresentation.java | 2 +- .../org/apache/sis/internal/map/SymbologyVisitor.java | 10 +++++----- .../main/java/org/apache/sis/portrayal/MapLayer.java | 2 +- .../sis/{internal/style => style/se1}/AnchorPoint.java | 2 +- .../style => style/se1}/ChannelSelection.java | 18 +++++++++--------- .../sis/{internal/style => style/se1}/ColorMap.java | 2 +- .../style => style/se1}/ColorReplacement.java | 2 +- .../style => style/se1}/ContrastEnhancement.java | 2 +- .../sis/{internal/style => style/se1}/Description.java | 2 +- .../{internal/style => style/se1}/Displacement.java | 2 +- .../{internal/style => style/se1}/ExternalGraphic.java | 2 +- .../style => style/se1}/FeatureTypeStyle.java | 2 +- .../apache/sis/{internal/style => style/se1}/Fill.java | 2 +- .../apache/sis/{internal/style => style/se1}/Font.java | 2 +- .../sis/{internal/style => style/se1}/Graphic.java | 2 +- .../sis/{internal/style => style/se1}/GraphicFill.java | 2 +- .../{internal/style => style/se1}/GraphicStroke.java | 2 +- .../style => style/se1}/GraphicalElement.java | 2 +- .../{internal/style => style/se1}/GraphicalSymbol.java | 2 +- .../apache/sis/{internal/style => style/se1}/Halo.java | 2 +- .../{internal/style => style/se1}/LabelPlacement.java | 2 +- .../se1/LegendGraphic.java} | 12 ++++++------ .../{internal/style => style/se1}/LinePlacement.java | 2 +- .../{internal/style => style/se1}/LineSymbolizer.java | 2 +- .../apache/sis/{internal/style => style/se1}/Mark.java | 2 +- .../{internal/style => style/se1}/PointPlacement.java | 2 +- .../{internal/style => style/se1}/PointSymbolizer.java | 2 +- .../style => style/se1}/PolygonSymbolizer.java | 2 +- .../style => style/se1}/RasterSymbolizer.java | 6 +++--- .../apache/sis/{internal/style => style/se1}/Rule.java | 10 +++++----- .../se1/SelectedChannel.java} | 14 +++++++------- .../{internal/style => style/se1}/ShadedRelief.java | 2 +- .../sis/{internal/style => style/se1}/Stroke.java | 2 +- .../sis/{internal/style => style/se1}/Style.java | 2 +- .../{internal/style => style/se1}/StyleElement.java | 2 +- .../sis/{internal/style => style/se1}/Symbolizer.java | 2 +- .../{internal/style => style/se1}/TextSymbolizer.java | 2 +- .../sis/{internal/style => style/se1}/Translucent.java | 2 +- .../org/apache/sis/internal/map/SEPortrayerTest.java | 10 +++++----- .../{internal/style => style/se1}/AnchorPointTest.java | 2 +- .../style => style/se1}/ChannelSelectionTest.java | 14 +++++++------- .../style => style/se1}/ContrastEnhancementTest.java | 2 +- .../{internal/style => style/se1}/DescriptionTest.java | 2 +- .../style => style/se1}/DisplacementTest.java | 2 +- .../style => style/se1}/ExternalGraphicTest.java | 2 +- .../style => style/se1}/FeatureTypeStyleTest.java | 2 +- .../sis/{internal/style => style/se1}/FillTest.java | 2 +- .../sis/{internal/style => style/se1}/FontTest.java | 2 +- .../style => style/se1}/GraphicStrokeTest.java | 2 +- .../sis/{internal/style => style/se1}/GraphicTest.java | 2 +- .../sis/{internal/style => style/se1}/HaloTest.java | 2 +- .../style => style/se1}/LinePlacementTest.java | 2 +- .../style => style/se1}/LineSymbolizerTest.java | 2 +- .../sis/{internal/style => style/se1}/MarkTest.java | 2 +- .../style => style/se1}/PointPlacementTest.java | 2 +- .../style => style/se1}/PointSymbolizerTest.java | 2 +- .../style => style/se1}/PolygonSymbolizerTest.java | 2 +- .../style => style/se1}/RasterSymbolizerTest.java | 2 +- .../sis/{internal/style => style/se1}/RuleTest.java | 4 ++-- .../se1/SelectedChannelTest.java} | 12 ++++++------ .../style => style/se1}/ShadedReliefTest.java | 2 +- .../sis/{internal/style => style/se1}/StrokeTest.java | 2 +- .../sis/{internal/style => style/se1}/StyleTest.java | 2 +- .../{internal/style => style/se1}/StyleTestCase.java | 2 +- .../{internal/style => style/se1}/SymbolizerTest.java | 2 +- .../style => style/se1}/TextSymbolizerTest.java | 2 +- 68 files changed, 115 insertions(+), 115 deletions(-) diff --git a/core/sis-portrayal/src/main/java/org/apache/sis/internal/map/ResourceSymbolizer.java b/core/sis-portrayal/src/main/java/org/apache/sis/internal/map/ResourceSymbolizer.java index c043794985..07ea6abd40 100644 --- a/core/sis-portrayal/src/main/java/org/apache/sis/internal/map/ResourceSymbolizer.java +++ b/core/sis-portrayal/src/main/java/org/apache/sis/internal/map/ResourceSymbolizer.java @@ -16,7 +16,7 @@ */ package org.apache.sis.internal.map; -import org.apache.sis.internal.style.Symbolizer; +import org.apache.sis.style.se1.Symbolizer; /** diff --git a/core/sis-portrayal/src/main/java/org/apache/sis/internal/map/SEPortrayer.java b/core/sis-portrayal/src/main/java/org/apache/sis/internal/map/SEPortrayer.java index 90370b7da9..5814406f92 100644 --- a/core/sis-portrayal/src/main/java/org/apache/sis/internal/map/SEPortrayer.java +++ b/core/sis-portrayal/src/main/java/org/apache/sis/internal/map/SEPortrayer.java @@ -57,9 +57,9 @@ import org.apache.sis.storage.GridCoverageResource; import org.apache.sis.storage.Query; import org.apache.sis.storage.Resource; import org.apache.sis.util.ArgumentChecks; -import org.apache.sis.internal.style.FeatureTypeStyle; -import org.apache.sis.internal.style.Rule; -import org.apache.sis.internal.style.Symbolizer; +import org.apache.sis.style.se1.FeatureTypeStyle; +import org.apache.sis.style.se1.Rule; +import org.apache.sis.style.se1.Symbolizer; // Branch-dependent imports import org.opengis.feature.AttributeType; diff --git a/core/sis-portrayal/src/main/java/org/apache/sis/internal/map/SEPresentation.java b/core/sis-portrayal/src/main/java/org/apache/sis/internal/map/SEPresentation.java index cf0aa7d3fb..7df7cf5f05 100644 --- a/core/sis-portrayal/src/main/java/org/apache/sis/internal/map/SEPresentation.java +++ b/core/sis-portrayal/src/main/java/org/apache/sis/internal/map/SEPresentation.java @@ -19,7 +19,7 @@ package org.apache.sis.internal.map; import java.util.Objects; import org.apache.sis.portrayal.MapLayer; import org.apache.sis.storage.Resource; -import org.apache.sis.internal.style.Symbolizer; +import org.apache.sis.style.se1.Symbolizer; // Branch-dependent imports import org.opengis.feature.Feature; diff --git a/core/sis-portrayal/src/main/java/org/apache/sis/internal/map/SymbologyVisitor.java b/core/sis-portrayal/src/main/java/org/apache/sis/internal/map/SymbologyVisitor.java index 42dfd8f3ea..1ee4aeea0e 100644 --- a/core/sis-portrayal/src/main/java/org/apache/sis/internal/map/SymbologyVisitor.java +++ b/core/sis-portrayal/src/main/java/org/apache/sis/internal/map/SymbologyVisitor.java @@ -21,7 +21,7 @@ import org.opengis.filter.Filter; import org.opengis.filter.Expression; import org.opengis.filter.Literal; import org.opengis.filter.ValueReference; -import org.apache.sis.internal.style.*; +import org.apache.sis.style.se1.*; import static org.apache.sis.internal.util.CollectionsExt.nonNull; @@ -248,7 +248,7 @@ public abstract class SymbologyVisitor { } } - protected void visit(final GraphicLegend candidate) { + protected void visit(final LegendGraphic candidate) { visit((GraphicalElement) candidate); } @@ -273,16 +273,16 @@ public abstract class SymbologyVisitor { protected void visit(final ChannelSelection candidate) { if (candidate != null) { - SelectedChannelType[] channels = candidate.getChannels(); + SelectedChannel[] channels = candidate.getChannels(); if (channels != null) { - for (final SelectedChannelType sct : channels) { + for (final SelectedChannel sct : channels) { visit(sct); } } } } - protected void visit(final SelectedChannelType candidate) { + protected void visit(final SelectedChannel candidate) { if (candidate != null) { candidate.getContrastEnhancement().ifPresent(this::visit); } diff --git a/core/sis-portrayal/src/main/java/org/apache/sis/portrayal/MapLayer.java b/core/sis-portrayal/src/main/java/org/apache/sis/portrayal/MapLayer.java index 2362f4a1c1..7c93058e94 100644 --- a/core/sis-portrayal/src/main/java/org/apache/sis/portrayal/MapLayer.java +++ b/core/sis-portrayal/src/main/java/org/apache/sis/portrayal/MapLayer.java @@ -24,7 +24,7 @@ import org.apache.sis.storage.DataStoreException; import org.apache.sis.storage.Query; import org.apache.sis.storage.Resource; import org.apache.sis.util.ArgumentChecks; -import org.apache.sis.internal.style.Style; +import org.apache.sis.style.se1.Style; import org.opengis.coverage.Coverage; import org.opengis.feature.Feature; import org.opengis.geometry.Envelope; diff --git a/core/sis-portrayal/src/main/java/org/apache/sis/internal/style/AnchorPoint.java b/core/sis-portrayal/src/main/java/org/apache/sis/style/se1/AnchorPoint.java similarity index 99% rename from core/sis-portrayal/src/main/java/org/apache/sis/internal/style/AnchorPoint.java rename to core/sis-portrayal/src/main/java/org/apache/sis/style/se1/AnchorPoint.java index 84a6028180..4bd9637fd5 100644 --- a/core/sis-portrayal/src/main/java/org/apache/sis/internal/style/AnchorPoint.java +++ b/core/sis-portrayal/src/main/java/org/apache/sis/style/se1/AnchorPoint.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sis.internal.style; +package org.apache.sis.style.se1; import jakarta.xml.bind.annotation.XmlType; import jakarta.xml.bind.annotation.XmlElement; diff --git a/core/sis-portrayal/src/main/java/org/apache/sis/internal/style/ChannelSelection.java b/core/sis-portrayal/src/main/java/org/apache/sis/style/se1/ChannelSelection.java similarity index 92% rename from core/sis-portrayal/src/main/java/org/apache/sis/internal/style/ChannelSelection.java rename to core/sis-portrayal/src/main/java/org/apache/sis/style/se1/ChannelSelection.java index f5ab98095b..49e3ddc585 100644 --- a/core/sis-portrayal/src/main/java/org/apache/sis/internal/style/ChannelSelection.java +++ b/core/sis-portrayal/src/main/java/org/apache/sis/style/se1/ChannelSelection.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sis.internal.style; +package org.apache.sis.style.se1; import jakarta.xml.bind.annotation.XmlType; import jakarta.xml.bind.annotation.XmlElement; @@ -48,28 +48,28 @@ public class ChannelSelection extends StyleElement { * This property is mutually exclusive with {@link #gray}. */ @XmlElement(name = "RedChannel") - protected SelectedChannelType red; + protected SelectedChannel red; /** * The green channel, or {@code null} if none. * This property is mutually exclusive with {@link #gray}. */ @XmlElement(name = "GreenChannel") - protected SelectedChannelType green; + protected SelectedChannel green; /** * The blue channel, or {@code null} if none. * This property is mutually exclusive with {@link #gray}. */ @XmlElement(name = "BlueChannel") - protected SelectedChannelType blue; + protected SelectedChannel blue; /** * The gray channel, or {@code null} if none. * This property is mutually exclusive with {@link #red}, {@link #green} and {@link #blue}. */ @XmlElement(name = "GrayChannel") - protected SelectedChannelType gray; + protected SelectedChannel gray; /** * Creates an initially empty channel selection. @@ -101,11 +101,11 @@ public class ChannelSelection extends StyleElement { * * @todo Replace null value by some default value. */ - public SelectedChannelType[] getChannels() { + public SelectedChannel[] getChannels() { if (red != null || green != null || blue != null) { - return new SelectedChannelType[] {red, green, blue}; + return new SelectedChannel[] {red, green, blue}; } else if (gray != null) { - return new SelectedChannelType[] {gray}; + return new SelectedChannel[] {gray}; } else { return null; } @@ -122,7 +122,7 @@ public class ChannelSelection extends StyleElement { * @param values array of channels, or {@code null} if none. * @throws IllegalArgumentException if the length of the specified array is not 0, 1 or 3. */ - public void setChannels(final SelectedChannelType... values) { + public void setChannels(final SelectedChannel... values) { red = null; green = null; blue = null; diff --git a/core/sis-portrayal/src/main/java/org/apache/sis/internal/style/ColorMap.java b/core/sis-portrayal/src/main/java/org/apache/sis/style/se1/ColorMap.java similarity index 98% rename from core/sis-portrayal/src/main/java/org/apache/sis/internal/style/ColorMap.java rename to core/sis-portrayal/src/main/java/org/apache/sis/style/se1/ColorMap.java index 6b4cfc2a49..bae948b067 100644 --- a/core/sis-portrayal/src/main/java/org/apache/sis/internal/style/ColorMap.java +++ b/core/sis-portrayal/src/main/java/org/apache/sis/style/se1/ColorMap.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sis.internal.style; +package org.apache.sis.style.se1; import jakarta.xml.bind.annotation.XmlType; import jakarta.xml.bind.annotation.XmlRootElement; diff --git a/core/sis-portrayal/src/main/java/org/apache/sis/internal/style/ColorReplacement.java b/core/sis-portrayal/src/main/java/org/apache/sis/style/se1/ColorReplacement.java similarity index 98% rename from core/sis-portrayal/src/main/java/org/apache/sis/internal/style/ColorReplacement.java rename to core/sis-portrayal/src/main/java/org/apache/sis/style/se1/ColorReplacement.java index aca082aaac..d07590de4c 100644 --- a/core/sis-portrayal/src/main/java/org/apache/sis/internal/style/ColorReplacement.java +++ b/core/sis-portrayal/src/main/java/org/apache/sis/style/se1/ColorReplacement.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sis.internal.style; +package org.apache.sis.style.se1; import jakarta.xml.bind.annotation.XmlType; import jakarta.xml.bind.annotation.XmlRootElement; diff --git a/core/sis-portrayal/src/main/java/org/apache/sis/internal/style/ContrastEnhancement.java b/core/sis-portrayal/src/main/java/org/apache/sis/style/se1/ContrastEnhancement.java similarity index 99% rename from core/sis-portrayal/src/main/java/org/apache/sis/internal/style/ContrastEnhancement.java rename to core/sis-portrayal/src/main/java/org/apache/sis/style/se1/ContrastEnhancement.java index 5dc499ae52..1cf6c910b0 100644 --- a/core/sis-portrayal/src/main/java/org/apache/sis/internal/style/ContrastEnhancement.java +++ b/core/sis-portrayal/src/main/java/org/apache/sis/style/se1/ContrastEnhancement.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sis.internal.style; +package org.apache.sis.style.se1; import jakarta.xml.bind.annotation.XmlType; import jakarta.xml.bind.annotation.XmlElement; diff --git a/core/sis-portrayal/src/main/java/org/apache/sis/internal/style/Description.java b/core/sis-portrayal/src/main/java/org/apache/sis/style/se1/Description.java similarity index 99% rename from core/sis-portrayal/src/main/java/org/apache/sis/internal/style/Description.java rename to core/sis-portrayal/src/main/java/org/apache/sis/style/se1/Description.java index 4b121a2aa3..805fc2a33d 100644 --- a/core/sis-portrayal/src/main/java/org/apache/sis/internal/style/Description.java +++ b/core/sis-portrayal/src/main/java/org/apache/sis/style/se1/Description.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sis.internal.style; +package org.apache.sis.style.se1; import java.util.Optional; import jakarta.xml.bind.annotation.XmlType; diff --git a/core/sis-portrayal/src/main/java/org/apache/sis/internal/style/Displacement.java b/core/sis-portrayal/src/main/java/org/apache/sis/style/se1/Displacement.java similarity index 99% rename from core/sis-portrayal/src/main/java/org/apache/sis/internal/style/Displacement.java rename to core/sis-portrayal/src/main/java/org/apache/sis/style/se1/Displacement.java index 2afb41e7d0..4cd83e8d4e 100644 --- a/core/sis-portrayal/src/main/java/org/apache/sis/internal/style/Displacement.java +++ b/core/sis-portrayal/src/main/java/org/apache/sis/style/se1/Displacement.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sis.internal.style; +package org.apache.sis.style.se1; import jakarta.xml.bind.annotation.XmlType; import jakarta.xml.bind.annotation.XmlElement; diff --git a/core/sis-portrayal/src/main/java/org/apache/sis/internal/style/ExternalGraphic.java b/core/sis-portrayal/src/main/java/org/apache/sis/style/se1/ExternalGraphic.java similarity index 99% rename from core/sis-portrayal/src/main/java/org/apache/sis/internal/style/ExternalGraphic.java rename to core/sis-portrayal/src/main/java/org/apache/sis/style/se1/ExternalGraphic.java index be2d6fe82d..11d5899f04 100644 --- a/core/sis-portrayal/src/main/java/org/apache/sis/internal/style/ExternalGraphic.java +++ b/core/sis-portrayal/src/main/java/org/apache/sis/style/se1/ExternalGraphic.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sis.internal.style; +package org.apache.sis.style.se1; import java.util.List; import java.util.ArrayList; diff --git a/core/sis-portrayal/src/main/java/org/apache/sis/internal/style/FeatureTypeStyle.java b/core/sis-portrayal/src/main/java/org/apache/sis/style/se1/FeatureTypeStyle.java similarity index 99% rename from core/sis-portrayal/src/main/java/org/apache/sis/internal/style/FeatureTypeStyle.java rename to core/sis-portrayal/src/main/java/org/apache/sis/style/se1/FeatureTypeStyle.java index 03251ed174..fd27c07876 100644 --- a/core/sis-portrayal/src/main/java/org/apache/sis/internal/style/FeatureTypeStyle.java +++ b/core/sis-portrayal/src/main/java/org/apache/sis/style/se1/FeatureTypeStyle.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sis.internal.style; +package org.apache.sis.style.se1; import java.util.Set; import java.util.List; diff --git a/core/sis-portrayal/src/main/java/org/apache/sis/internal/style/Fill.java b/core/sis-portrayal/src/main/java/org/apache/sis/style/se1/Fill.java similarity index 99% rename from core/sis-portrayal/src/main/java/org/apache/sis/internal/style/Fill.java rename to core/sis-portrayal/src/main/java/org/apache/sis/style/se1/Fill.java index c7759ffeec..094d3b04a0 100644 --- a/core/sis-portrayal/src/main/java/org/apache/sis/internal/style/Fill.java +++ b/core/sis-portrayal/src/main/java/org/apache/sis/style/se1/Fill.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sis.internal.style; +package org.apache.sis.style.se1; import java.awt.Color; import java.util.Optional; diff --git a/core/sis-portrayal/src/main/java/org/apache/sis/internal/style/Font.java b/core/sis-portrayal/src/main/java/org/apache/sis/style/se1/Font.java similarity index 99% rename from core/sis-portrayal/src/main/java/org/apache/sis/internal/style/Font.java rename to core/sis-portrayal/src/main/java/org/apache/sis/style/se1/Font.java index a167c05284..d5bfae3557 100644 --- a/core/sis-portrayal/src/main/java/org/apache/sis/internal/style/Font.java +++ b/core/sis-portrayal/src/main/java/org/apache/sis/style/se1/Font.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sis.internal.style; +package org.apache.sis.style.se1; import java.util.List; import java.util.ArrayList; diff --git a/core/sis-portrayal/src/main/java/org/apache/sis/internal/style/Graphic.java b/core/sis-portrayal/src/main/java/org/apache/sis/style/se1/Graphic.java similarity index 99% rename from core/sis-portrayal/src/main/java/org/apache/sis/internal/style/Graphic.java rename to core/sis-portrayal/src/main/java/org/apache/sis/style/se1/Graphic.java index c83413d1f4..f3a6139c61 100644 --- a/core/sis-portrayal/src/main/java/org/apache/sis/internal/style/Graphic.java +++ b/core/sis-portrayal/src/main/java/org/apache/sis/style/se1/Graphic.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sis.internal.style; +package org.apache.sis.style.se1; import java.util.List; import java.util.ArrayList; diff --git a/core/sis-portrayal/src/main/java/org/apache/sis/internal/style/GraphicFill.java b/core/sis-portrayal/src/main/java/org/apache/sis/style/se1/GraphicFill.java similarity index 99% rename from core/sis-portrayal/src/main/java/org/apache/sis/internal/style/GraphicFill.java rename to core/sis-portrayal/src/main/java/org/apache/sis/style/se1/GraphicFill.java index 79dc7513fe..0eb96ea48f 100644 --- a/core/sis-portrayal/src/main/java/org/apache/sis/internal/style/GraphicFill.java +++ b/core/sis-portrayal/src/main/java/org/apache/sis/style/se1/GraphicFill.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sis.internal.style; +package org.apache.sis.style.se1; import jakarta.xml.bind.annotation.XmlType; import jakarta.xml.bind.annotation.XmlElement; diff --git a/core/sis-portrayal/src/main/java/org/apache/sis/internal/style/GraphicStroke.java b/core/sis-portrayal/src/main/java/org/apache/sis/style/se1/GraphicStroke.java similarity index 99% rename from core/sis-portrayal/src/main/java/org/apache/sis/internal/style/GraphicStroke.java rename to core/sis-portrayal/src/main/java/org/apache/sis/style/se1/GraphicStroke.java index 7eeb608ff7..186ade25d6 100644 --- a/core/sis-portrayal/src/main/java/org/apache/sis/internal/style/GraphicStroke.java +++ b/core/sis-portrayal/src/main/java/org/apache/sis/style/se1/GraphicStroke.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sis.internal.style; +package org.apache.sis.style.se1; import jakarta.xml.bind.annotation.XmlType; import jakarta.xml.bind.annotation.XmlElement; diff --git a/core/sis-portrayal/src/main/java/org/apache/sis/internal/style/GraphicalElement.java b/core/sis-portrayal/src/main/java/org/apache/sis/style/se1/GraphicalElement.java similarity index 98% rename from core/sis-portrayal/src/main/java/org/apache/sis/internal/style/GraphicalElement.java rename to core/sis-portrayal/src/main/java/org/apache/sis/style/se1/GraphicalElement.java index c305b0cf48..c8aa67cfd4 100644 --- a/core/sis-portrayal/src/main/java/org/apache/sis/internal/style/GraphicalElement.java +++ b/core/sis-portrayal/src/main/java/org/apache/sis/style/se1/GraphicalElement.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sis.internal.style; +package org.apache.sis.style.se1; /** diff --git a/core/sis-portrayal/src/main/java/org/apache/sis/internal/style/GraphicalSymbol.java b/core/sis-portrayal/src/main/java/org/apache/sis/style/se1/GraphicalSymbol.java similarity index 99% rename from core/sis-portrayal/src/main/java/org/apache/sis/internal/style/GraphicalSymbol.java rename to core/sis-portrayal/src/main/java/org/apache/sis/style/se1/GraphicalSymbol.java index 27ca6c5401..52938ad56c 100644 --- a/core/sis-portrayal/src/main/java/org/apache/sis/internal/style/GraphicalSymbol.java +++ b/core/sis-portrayal/src/main/java/org/apache/sis/style/se1/GraphicalSymbol.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sis.internal.style; +package org.apache.sis.style.se1; import javax.swing.Icon; import java.util.Optional; diff --git a/core/sis-portrayal/src/main/java/org/apache/sis/internal/style/Halo.java b/core/sis-portrayal/src/main/java/org/apache/sis/style/se1/Halo.java similarity index 99% rename from core/sis-portrayal/src/main/java/org/apache/sis/internal/style/Halo.java rename to core/sis-portrayal/src/main/java/org/apache/sis/style/se1/Halo.java index 7fae4fe368..8bf8e32fe3 100644 --- a/core/sis-portrayal/src/main/java/org/apache/sis/internal/style/Halo.java +++ b/core/sis-portrayal/src/main/java/org/apache/sis/style/se1/Halo.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sis.internal.style; +package org.apache.sis.style.se1; import jakarta.xml.bind.annotation.XmlType; import jakarta.xml.bind.annotation.XmlElement; diff --git a/core/sis-portrayal/src/main/java/org/apache/sis/internal/style/LabelPlacement.java b/core/sis-portrayal/src/main/java/org/apache/sis/style/se1/LabelPlacement.java similarity index 98% rename from core/sis-portrayal/src/main/java/org/apache/sis/internal/style/LabelPlacement.java rename to core/sis-portrayal/src/main/java/org/apache/sis/style/se1/LabelPlacement.java index 82399a87d2..72ef4133c1 100644 --- a/core/sis-portrayal/src/main/java/org/apache/sis/internal/style/LabelPlacement.java +++ b/core/sis-portrayal/src/main/java/org/apache/sis/style/se1/LabelPlacement.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sis.internal.style; +package org.apache.sis.style.se1; import jakarta.xml.bind.annotation.XmlSeeAlso; diff --git a/core/sis-portrayal/src/main/java/org/apache/sis/internal/style/GraphicLegend.java b/core/sis-portrayal/src/main/java/org/apache/sis/style/se1/LegendGraphic.java similarity index 92% rename from core/sis-portrayal/src/main/java/org/apache/sis/internal/style/GraphicLegend.java rename to core/sis-portrayal/src/main/java/org/apache/sis/style/se1/LegendGraphic.java index 78721aae9b..5fa7f34cf6 100644 --- a/core/sis-portrayal/src/main/java/org/apache/sis/internal/style/GraphicLegend.java +++ b/core/sis-portrayal/src/main/java/org/apache/sis/style/se1/LegendGraphic.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sis.internal.style; +package org.apache.sis.style.se1; import jakarta.xml.bind.annotation.XmlType; import jakarta.xml.bind.annotation.XmlElement; @@ -31,7 +31,7 @@ import jakarta.xml.bind.annotation.XmlRootElement; */ @XmlType(name = "LegendGraphicType") @XmlRootElement(name = "LegendGraphic") -public class GraphicLegend extends StyleElement implements GraphicalElement { +public class LegendGraphic extends StyleElement implements GraphicalElement { /** * The graphic to use as a legend, or {@code null} for lazily constructed default. * This property is mandatory: a null value <em>shall</em> be replaced by a default value when first requested. @@ -44,7 +44,7 @@ public class GraphicLegend extends StyleElement implements GraphicalElement { /** * Creates a legend initialized to the default graphic. */ - public GraphicLegend() { + public LegendGraphic() { } /** @@ -53,7 +53,7 @@ public class GraphicLegend extends StyleElement implements GraphicalElement { * * @param source the object to copy. */ - public GraphicLegend(final GraphicLegend source) { + public LegendGraphic(final LegendGraphic source) { super(source); graphic = source.graphic; } @@ -102,8 +102,8 @@ public class GraphicLegend extends StyleElement implements GraphicalElement { * @return deep clone of all style elements. */ @Override - public GraphicLegend clone() { - final var clone = (GraphicLegend) super.clone(); + public LegendGraphic clone() { + final var clone = (LegendGraphic) super.clone(); clone.selfClone(); return clone; } diff --git a/core/sis-portrayal/src/main/java/org/apache/sis/internal/style/LinePlacement.java b/core/sis-portrayal/src/main/java/org/apache/sis/style/se1/LinePlacement.java similarity index 99% rename from core/sis-portrayal/src/main/java/org/apache/sis/internal/style/LinePlacement.java rename to core/sis-portrayal/src/main/java/org/apache/sis/style/se1/LinePlacement.java index 490b5e7c74..961189eac0 100644 --- a/core/sis-portrayal/src/main/java/org/apache/sis/internal/style/LinePlacement.java +++ b/core/sis-portrayal/src/main/java/org/apache/sis/style/se1/LinePlacement.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sis.internal.style; +package org.apache.sis.style.se1; import jakarta.xml.bind.annotation.XmlType; import jakarta.xml.bind.annotation.XmlElement; diff --git a/core/sis-portrayal/src/main/java/org/apache/sis/internal/style/LineSymbolizer.java b/core/sis-portrayal/src/main/java/org/apache/sis/style/se1/LineSymbolizer.java similarity index 99% rename from core/sis-portrayal/src/main/java/org/apache/sis/internal/style/LineSymbolizer.java rename to core/sis-portrayal/src/main/java/org/apache/sis/style/se1/LineSymbolizer.java index 03c8da3b14..351baeba00 100644 --- a/core/sis-portrayal/src/main/java/org/apache/sis/internal/style/LineSymbolizer.java +++ b/core/sis-portrayal/src/main/java/org/apache/sis/style/se1/LineSymbolizer.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sis.internal.style; +package org.apache.sis.style.se1; import jakarta.xml.bind.annotation.XmlType; import jakarta.xml.bind.annotation.XmlElement; diff --git a/core/sis-portrayal/src/main/java/org/apache/sis/internal/style/Mark.java b/core/sis-portrayal/src/main/java/org/apache/sis/style/se1/Mark.java similarity index 99% rename from core/sis-portrayal/src/main/java/org/apache/sis/internal/style/Mark.java rename to core/sis-portrayal/src/main/java/org/apache/sis/style/se1/Mark.java index 5a4d9bc90d..b15f9d202d 100644 --- a/core/sis-portrayal/src/main/java/org/apache/sis/internal/style/Mark.java +++ b/core/sis-portrayal/src/main/java/org/apache/sis/style/se1/Mark.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sis.internal.style; +package org.apache.sis.style.se1; import java.util.Optional; import jakarta.xml.bind.Marshaller; diff --git a/core/sis-portrayal/src/main/java/org/apache/sis/internal/style/PointPlacement.java b/core/sis-portrayal/src/main/java/org/apache/sis/style/se1/PointPlacement.java similarity index 99% rename from core/sis-portrayal/src/main/java/org/apache/sis/internal/style/PointPlacement.java rename to core/sis-portrayal/src/main/java/org/apache/sis/style/se1/PointPlacement.java index 79a84d8689..6864f4aa30 100644 --- a/core/sis-portrayal/src/main/java/org/apache/sis/internal/style/PointPlacement.java +++ b/core/sis-portrayal/src/main/java/org/apache/sis/style/se1/PointPlacement.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sis.internal.style; +package org.apache.sis.style.se1; import jakarta.xml.bind.annotation.XmlType; import jakarta.xml.bind.annotation.XmlElement; diff --git a/core/sis-portrayal/src/main/java/org/apache/sis/internal/style/PointSymbolizer.java b/core/sis-portrayal/src/main/java/org/apache/sis/style/se1/PointSymbolizer.java similarity index 99% rename from core/sis-portrayal/src/main/java/org/apache/sis/internal/style/PointSymbolizer.java rename to core/sis-portrayal/src/main/java/org/apache/sis/style/se1/PointSymbolizer.java index d03fb752cc..a27782684c 100644 --- a/core/sis-portrayal/src/main/java/org/apache/sis/internal/style/PointSymbolizer.java +++ b/core/sis-portrayal/src/main/java/org/apache/sis/style/se1/PointSymbolizer.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sis.internal.style; +package org.apache.sis.style.se1; import jakarta.xml.bind.Marshaller; import jakarta.xml.bind.Unmarshaller; diff --git a/core/sis-portrayal/src/main/java/org/apache/sis/internal/style/PolygonSymbolizer.java b/core/sis-portrayal/src/main/java/org/apache/sis/style/se1/PolygonSymbolizer.java similarity index 99% rename from core/sis-portrayal/src/main/java/org/apache/sis/internal/style/PolygonSymbolizer.java rename to core/sis-portrayal/src/main/java/org/apache/sis/style/se1/PolygonSymbolizer.java index c0ad23911e..719cf6d692 100644 --- a/core/sis-portrayal/src/main/java/org/apache/sis/internal/style/PolygonSymbolizer.java +++ b/core/sis-portrayal/src/main/java/org/apache/sis/style/se1/PolygonSymbolizer.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sis.internal.style; +package org.apache.sis.style.se1; import java.util.Optional; import jakarta.xml.bind.Marshaller; diff --git a/core/sis-portrayal/src/main/java/org/apache/sis/internal/style/RasterSymbolizer.java b/core/sis-portrayal/src/main/java/org/apache/sis/style/se1/RasterSymbolizer.java similarity index 98% rename from core/sis-portrayal/src/main/java/org/apache/sis/internal/style/RasterSymbolizer.java rename to core/sis-portrayal/src/main/java/org/apache/sis/style/se1/RasterSymbolizer.java index 9f045f40ba..0e0b983296 100644 --- a/core/sis-portrayal/src/main/java/org/apache/sis/internal/style/RasterSymbolizer.java +++ b/core/sis-portrayal/src/main/java/org/apache/sis/style/se1/RasterSymbolizer.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sis.internal.style; +package org.apache.sis.style.se1; import java.util.Optional; import jakarta.xml.bind.annotation.XmlType; @@ -246,7 +246,7 @@ public class RasterSymbolizer extends Symbolizer implements Translucent { * * @return contrast enhancement for the whole image. * - * @see SelectedChannelType#getContrastEnhancement() + * @see SelectedChannel#getContrastEnhancement() */ public Optional<ContrastEnhancement> getContrastEnhancement() { return Optional.ofNullable(contrastEnhancement); @@ -259,7 +259,7 @@ public class RasterSymbolizer extends Symbolizer implements Translucent { * * @param value new contrast enhancement, or {@code null} if none. * - * @see SelectedChannelType#setContrastEnhancement(ContrastEnhancement) + * @see SelectedChannel#setContrastEnhancement(ContrastEnhancement) */ public void setContrastEnhancement(final ContrastEnhancement value) { contrastEnhancement = value; diff --git a/core/sis-portrayal/src/main/java/org/apache/sis/internal/style/Rule.java b/core/sis-portrayal/src/main/java/org/apache/sis/style/se1/Rule.java similarity index 98% rename from core/sis-portrayal/src/main/java/org/apache/sis/internal/style/Rule.java rename to core/sis-portrayal/src/main/java/org/apache/sis/style/se1/Rule.java index e0dffbfd4d..8d72197b73 100644 --- a/core/sis-portrayal/src/main/java/org/apache/sis/internal/style/Rule.java +++ b/core/sis-portrayal/src/main/java/org/apache/sis/style/se1/Rule.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sis.internal.style; +package org.apache.sis.style.se1; import java.util.List; import java.util.ArrayList; @@ -83,10 +83,10 @@ public class Rule<R> extends StyleElement { * Small graphic to draw in a legend window, or {@code null} if none. * * @see #getLegend() - * @see #setLegend(GraphicLegend) + * @see #setLegend(LegendGraphic) */ @XmlElement(name = "LegendGraphic") - protected GraphicLegend legend; + protected LegendGraphic legend; /** * Filter that will limit the features, or {@code null} if none. @@ -217,7 +217,7 @@ public class Rule<R> extends StyleElement { * * @return small graphic to draw in a legend window. */ - public Optional<GraphicLegend> getLegend() { + public Optional<LegendGraphic> getLegend() { return Optional.ofNullable(legend); } @@ -228,7 +228,7 @@ public class Rule<R> extends StyleElement { * * @param value new legend graphic, or {@code null} if none. */ - public void setLegend(final GraphicLegend value) { + public void setLegend(final LegendGraphic value) { legend = value; } diff --git a/core/sis-portrayal/src/main/java/org/apache/sis/internal/style/SelectedChannelType.java b/core/sis-portrayal/src/main/java/org/apache/sis/style/se1/SelectedChannel.java similarity index 93% rename from core/sis-portrayal/src/main/java/org/apache/sis/internal/style/SelectedChannelType.java rename to core/sis-portrayal/src/main/java/org/apache/sis/style/se1/SelectedChannel.java index e5a8cd9e34..ec46a85107 100644 --- a/core/sis-portrayal/src/main/java/org/apache/sis/internal/style/SelectedChannelType.java +++ b/core/sis-portrayal/src/main/java/org/apache/sis/style/se1/SelectedChannel.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sis.internal.style; +package org.apache.sis.style.se1; import java.util.Optional; import jakarta.xml.bind.annotation.XmlType; @@ -44,7 +44,7 @@ import org.opengis.filter.Expression; "contrastEnhancement" }) // No root element is specified in OGC 05-077r4. -public class SelectedChannelType extends StyleElement { +public class SelectedChannel extends StyleElement { /** * The channel's name, or {@code null} if unspecified. * @@ -68,7 +68,7 @@ public class SelectedChannelType extends StyleElement { /** * Creates an initially empty selected channel. */ - public SelectedChannelType() { + public SelectedChannel() { } /** @@ -76,7 +76,7 @@ public class SelectedChannelType extends StyleElement { * * @param name source channel name. */ - public SelectedChannelType(final String name) { + public SelectedChannel(final String name) { ArgumentChecks.ensureNonEmpty("name", name); sourceChannelName = literal(name); } @@ -87,7 +87,7 @@ public class SelectedChannelType extends StyleElement { * * @param source the object to copy. */ - public SelectedChannelType(final SelectedChannelType source) { + public SelectedChannel(final SelectedChannel source) { super(source); sourceChannelName = source.sourceChannelName; contrastEnhancement = source.contrastEnhancement; @@ -155,8 +155,8 @@ public class SelectedChannelType extends StyleElement { * @return deep clone of all style elements. */ @Override - public SelectedChannelType clone() { - final var clone = (SelectedChannelType) super.clone(); + public SelectedChannel clone() { + final var clone = (SelectedChannel) super.clone(); clone.selfClone(); return clone; } diff --git a/core/sis-portrayal/src/main/java/org/apache/sis/internal/style/ShadedRelief.java b/core/sis-portrayal/src/main/java/org/apache/sis/style/se1/ShadedRelief.java similarity index 99% rename from core/sis-portrayal/src/main/java/org/apache/sis/internal/style/ShadedRelief.java rename to core/sis-portrayal/src/main/java/org/apache/sis/style/se1/ShadedRelief.java index 4f5a300a9d..9bdf2b6641 100644 --- a/core/sis-portrayal/src/main/java/org/apache/sis/internal/style/ShadedRelief.java +++ b/core/sis-portrayal/src/main/java/org/apache/sis/style/se1/ShadedRelief.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sis.internal.style; +package org.apache.sis.style.se1; import jakarta.xml.bind.annotation.XmlType; import jakarta.xml.bind.annotation.XmlElement; diff --git a/core/sis-portrayal/src/main/java/org/apache/sis/internal/style/Stroke.java b/core/sis-portrayal/src/main/java/org/apache/sis/style/se1/Stroke.java similarity index 99% rename from core/sis-portrayal/src/main/java/org/apache/sis/internal/style/Stroke.java rename to core/sis-portrayal/src/main/java/org/apache/sis/style/se1/Stroke.java index 9a148d5922..c25c3b999e 100644 --- a/core/sis-portrayal/src/main/java/org/apache/sis/internal/style/Stroke.java +++ b/core/sis-portrayal/src/main/java/org/apache/sis/style/se1/Stroke.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sis.internal.style; +package org.apache.sis.style.se1; import java.awt.Color; import java.util.Optional; diff --git a/core/sis-portrayal/src/main/java/org/apache/sis/internal/style/Style.java b/core/sis-portrayal/src/main/java/org/apache/sis/style/se1/Style.java similarity index 99% rename from core/sis-portrayal/src/main/java/org/apache/sis/internal/style/Style.java rename to core/sis-portrayal/src/main/java/org/apache/sis/style/se1/Style.java index 17395fc1fb..8cd2d62272 100644 --- a/core/sis-portrayal/src/main/java/org/apache/sis/internal/style/Style.java +++ b/core/sis-portrayal/src/main/java/org/apache/sis/style/se1/Style.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sis.internal.style; +package org.apache.sis.style.se1; import java.util.List; import java.util.ArrayList; diff --git a/core/sis-portrayal/src/main/java/org/apache/sis/internal/style/StyleElement.java b/core/sis-portrayal/src/main/java/org/apache/sis/style/se1/StyleElement.java similarity index 99% rename from core/sis-portrayal/src/main/java/org/apache/sis/internal/style/StyleElement.java rename to core/sis-portrayal/src/main/java/org/apache/sis/style/se1/StyleElement.java index c0178ff5b1..6626c50cec 100644 --- a/core/sis-portrayal/src/main/java/org/apache/sis/internal/style/StyleElement.java +++ b/core/sis-portrayal/src/main/java/org/apache/sis/style/se1/StyleElement.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sis.internal.style; +package org.apache.sis.style.se1; import java.util.Arrays; import jakarta.xml.bind.annotation.XmlTransient; diff --git a/core/sis-portrayal/src/main/java/org/apache/sis/internal/style/Symbolizer.java b/core/sis-portrayal/src/main/java/org/apache/sis/style/se1/Symbolizer.java similarity index 99% rename from core/sis-portrayal/src/main/java/org/apache/sis/internal/style/Symbolizer.java rename to core/sis-portrayal/src/main/java/org/apache/sis/style/se1/Symbolizer.java index 2aaeed071d..f1723cfc2e 100644 --- a/core/sis-portrayal/src/main/java/org/apache/sis/internal/style/Symbolizer.java +++ b/core/sis-portrayal/src/main/java/org/apache/sis/style/se1/Symbolizer.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sis.internal.style; +package org.apache.sis.style.se1; import java.util.Objects; import java.util.Optional; diff --git a/core/sis-portrayal/src/main/java/org/apache/sis/internal/style/TextSymbolizer.java b/core/sis-portrayal/src/main/java/org/apache/sis/style/se1/TextSymbolizer.java similarity index 99% rename from core/sis-portrayal/src/main/java/org/apache/sis/internal/style/TextSymbolizer.java rename to core/sis-portrayal/src/main/java/org/apache/sis/style/se1/TextSymbolizer.java index efa37960ee..4fe9b344f5 100644 --- a/core/sis-portrayal/src/main/java/org/apache/sis/internal/style/TextSymbolizer.java +++ b/core/sis-portrayal/src/main/java/org/apache/sis/style/se1/TextSymbolizer.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sis.internal.style; +package org.apache.sis.style.se1; import java.util.Optional; import jakarta.xml.bind.annotation.XmlType; diff --git a/core/sis-portrayal/src/main/java/org/apache/sis/internal/style/Translucent.java b/core/sis-portrayal/src/main/java/org/apache/sis/style/se1/Translucent.java similarity index 97% rename from core/sis-portrayal/src/main/java/org/apache/sis/internal/style/Translucent.java rename to core/sis-portrayal/src/main/java/org/apache/sis/style/se1/Translucent.java index c4be8f3487..ae8d42628b 100644 --- a/core/sis-portrayal/src/main/java/org/apache/sis/internal/style/Translucent.java +++ b/core/sis-portrayal/src/main/java/org/apache/sis/style/se1/Translucent.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sis.internal.style; +package org.apache.sis.style.se1; import org.opengis.feature.Feature; import org.opengis.filter.Expression; diff --git a/core/sis-portrayal/src/test/java/org/apache/sis/internal/map/SEPortrayerTest.java b/core/sis-portrayal/src/test/java/org/apache/sis/internal/map/SEPortrayerTest.java index c98e1b3839..e2b3d026ee 100644 --- a/core/sis-portrayal/src/test/java/org/apache/sis/internal/map/SEPortrayerTest.java +++ b/core/sis-portrayal/src/test/java/org/apache/sis/internal/map/SEPortrayerTest.java @@ -38,10 +38,10 @@ import org.apache.sis.filter.DefaultFilterFactory; import org.apache.sis.geometry.GeneralEnvelope; import org.apache.sis.internal.feature.AttributeConvention; import org.apache.sis.internal.storage.MemoryFeatureSet; -import org.apache.sis.internal.style.FeatureTypeStyle; -import org.apache.sis.internal.style.LineSymbolizer; -import org.apache.sis.internal.style.Rule; -import org.apache.sis.internal.style.Style; +import org.apache.sis.style.se1.FeatureTypeStyle; +import org.apache.sis.style.se1.LineSymbolizer; +import org.apache.sis.style.se1.Rule; +import org.apache.sis.style.se1.Style; import org.apache.sis.storage.FeatureQuery; import org.apache.sis.portrayal.MapItem; import org.apache.sis.portrayal.MapLayer; @@ -56,7 +56,7 @@ import org.apache.sis.storage.event.StoreEvent; import org.apache.sis.storage.event.StoreListener; import org.apache.sis.test.TestCase; import org.apache.sis.util.iso.Names; -import org.apache.sis.internal.style.Symbolizer; +import org.apache.sis.style.se1.Symbolizer; import org.locationtech.jts.geom.CoordinateXY; import org.locationtech.jts.geom.GeometryFactory; import org.locationtech.jts.geom.Point; diff --git a/core/sis-portrayal/src/test/java/org/apache/sis/internal/style/AnchorPointTest.java b/core/sis-portrayal/src/test/java/org/apache/sis/style/se1/AnchorPointTest.java similarity index 97% rename from core/sis-portrayal/src/test/java/org/apache/sis/internal/style/AnchorPointTest.java rename to core/sis-portrayal/src/test/java/org/apache/sis/style/se1/AnchorPointTest.java index d2fec10f12..4267cb5f22 100644 --- a/core/sis-portrayal/src/test/java/org/apache/sis/internal/style/AnchorPointTest.java +++ b/core/sis-portrayal/src/test/java/org/apache/sis/style/se1/AnchorPointTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sis.internal.style; +package org.apache.sis.style.se1; import org.junit.Test; diff --git a/core/sis-portrayal/src/test/java/org/apache/sis/internal/style/ChannelSelectionTest.java b/core/sis-portrayal/src/test/java/org/apache/sis/style/se1/ChannelSelectionTest.java similarity index 86% rename from core/sis-portrayal/src/test/java/org/apache/sis/internal/style/ChannelSelectionTest.java rename to core/sis-portrayal/src/test/java/org/apache/sis/style/se1/ChannelSelectionTest.java index 848f7a1c08..c8469efb97 100644 --- a/core/sis-portrayal/src/test/java/org/apache/sis/internal/style/ChannelSelectionTest.java +++ b/core/sis-portrayal/src/test/java/org/apache/sis/style/se1/ChannelSelectionTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sis.internal.style; +package org.apache.sis.style.se1; import org.junit.Test; import static org.junit.Assert.*; @@ -45,10 +45,10 @@ public final class ChannelSelectionTest extends StyleTestCase { assertNull(cdt.getChannels()); // Check get/set - var values = new SelectedChannelType[] { - new SelectedChannelType("R"), - new SelectedChannelType("G"), - new SelectedChannelType("B") + var values = new SelectedChannel[] { + new SelectedChannel("R"), + new SelectedChannel("G"), + new SelectedChannel("B") }; cdt.setChannels(values); assertArrayEquals(values, cdt.getChannels()); @@ -66,8 +66,8 @@ public final class ChannelSelectionTest extends StyleTestCase { assertNull(cdt.getChannels()); // Check get/set - var values = new SelectedChannelType[] { - new SelectedChannelType("Gray") + var values = new SelectedChannel[] { + new SelectedChannel("Gray") }; cdt.setChannels(values); assertArrayEquals(values, cdt.getChannels()); diff --git a/core/sis-portrayal/src/test/java/org/apache/sis/internal/style/ContrastEnhancementTest.java b/core/sis-portrayal/src/test/java/org/apache/sis/style/se1/ContrastEnhancementTest.java similarity index 98% rename from core/sis-portrayal/src/test/java/org/apache/sis/internal/style/ContrastEnhancementTest.java rename to core/sis-portrayal/src/test/java/org/apache/sis/style/se1/ContrastEnhancementTest.java index e7990bc4b2..a2a562f551 100644 --- a/core/sis-portrayal/src/test/java/org/apache/sis/internal/style/ContrastEnhancementTest.java +++ b/core/sis-portrayal/src/test/java/org/apache/sis/style/se1/ContrastEnhancementTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sis.internal.style; +package org.apache.sis.style.se1; import org.junit.Test; import static org.junit.Assert.*; diff --git a/core/sis-portrayal/src/test/java/org/apache/sis/internal/style/DescriptionTest.java b/core/sis-portrayal/src/test/java/org/apache/sis/style/se1/DescriptionTest.java similarity index 97% rename from core/sis-portrayal/src/test/java/org/apache/sis/internal/style/DescriptionTest.java rename to core/sis-portrayal/src/test/java/org/apache/sis/style/se1/DescriptionTest.java index 65b8aac7df..313f9398c0 100644 --- a/core/sis-portrayal/src/test/java/org/apache/sis/internal/style/DescriptionTest.java +++ b/core/sis-portrayal/src/test/java/org/apache/sis/style/se1/DescriptionTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sis.internal.style; +package org.apache.sis.style.se1; import org.apache.sis.util.SimpleInternationalString; import org.junit.Test; diff --git a/core/sis-portrayal/src/test/java/org/apache/sis/internal/style/DisplacementTest.java b/core/sis-portrayal/src/test/java/org/apache/sis/style/se1/DisplacementTest.java similarity index 97% rename from core/sis-portrayal/src/test/java/org/apache/sis/internal/style/DisplacementTest.java rename to core/sis-portrayal/src/test/java/org/apache/sis/style/se1/DisplacementTest.java index 5af1471ce6..6d06aa1ee2 100644 --- a/core/sis-portrayal/src/test/java/org/apache/sis/internal/style/DisplacementTest.java +++ b/core/sis-portrayal/src/test/java/org/apache/sis/style/se1/DisplacementTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sis.internal.style; +package org.apache.sis.style.se1; import org.junit.Test; diff --git a/core/sis-portrayal/src/test/java/org/apache/sis/internal/style/ExternalGraphicTest.java b/core/sis-portrayal/src/test/java/org/apache/sis/style/se1/ExternalGraphicTest.java similarity index 98% rename from core/sis-portrayal/src/test/java/org/apache/sis/internal/style/ExternalGraphicTest.java rename to core/sis-portrayal/src/test/java/org/apache/sis/style/se1/ExternalGraphicTest.java index 23032f3376..d49bd468a3 100644 --- a/core/sis-portrayal/src/test/java/org/apache/sis/internal/style/ExternalGraphicTest.java +++ b/core/sis-portrayal/src/test/java/org/apache/sis/style/se1/ExternalGraphicTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sis.internal.style; +package org.apache.sis.style.se1; import java.util.List; import javax.swing.ImageIcon; diff --git a/core/sis-portrayal/src/test/java/org/apache/sis/internal/style/FeatureTypeStyleTest.java b/core/sis-portrayal/src/test/java/org/apache/sis/style/se1/FeatureTypeStyleTest.java similarity index 98% rename from core/sis-portrayal/src/test/java/org/apache/sis/internal/style/FeatureTypeStyleTest.java rename to core/sis-portrayal/src/test/java/org/apache/sis/style/se1/FeatureTypeStyleTest.java index 2132cb1f86..aa5fe112a6 100644 --- a/core/sis-portrayal/src/test/java/org/apache/sis/internal/style/FeatureTypeStyleTest.java +++ b/core/sis-portrayal/src/test/java/org/apache/sis/style/se1/FeatureTypeStyleTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sis.internal.style; +package org.apache.sis.style.se1; import java.util.Set; import java.util.List; diff --git a/core/sis-portrayal/src/test/java/org/apache/sis/internal/style/FillTest.java b/core/sis-portrayal/src/test/java/org/apache/sis/style/se1/FillTest.java similarity index 98% rename from core/sis-portrayal/src/test/java/org/apache/sis/internal/style/FillTest.java rename to core/sis-portrayal/src/test/java/org/apache/sis/style/se1/FillTest.java index ab99e646ad..9fb3ee5bdd 100644 --- a/core/sis-portrayal/src/test/java/org/apache/sis/internal/style/FillTest.java +++ b/core/sis-portrayal/src/test/java/org/apache/sis/style/se1/FillTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sis.internal.style; +package org.apache.sis.style.se1; import java.awt.Color; import org.junit.Test; diff --git a/core/sis-portrayal/src/test/java/org/apache/sis/internal/style/FontTest.java b/core/sis-portrayal/src/test/java/org/apache/sis/style/se1/FontTest.java similarity index 98% rename from core/sis-portrayal/src/test/java/org/apache/sis/internal/style/FontTest.java rename to core/sis-portrayal/src/test/java/org/apache/sis/style/se1/FontTest.java index 44d187961a..5d1a76d750 100644 --- a/core/sis-portrayal/src/test/java/org/apache/sis/internal/style/FontTest.java +++ b/core/sis-portrayal/src/test/java/org/apache/sis/style/se1/FontTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sis.internal.style; +package org.apache.sis.style.se1; import java.util.List; import org.junit.Test; diff --git a/core/sis-portrayal/src/test/java/org/apache/sis/internal/style/GraphicStrokeTest.java b/core/sis-portrayal/src/test/java/org/apache/sis/style/se1/GraphicStrokeTest.java similarity index 97% rename from core/sis-portrayal/src/test/java/org/apache/sis/internal/style/GraphicStrokeTest.java rename to core/sis-portrayal/src/test/java/org/apache/sis/style/se1/GraphicStrokeTest.java index 2e19774f96..b608915782 100644 --- a/core/sis-portrayal/src/test/java/org/apache/sis/internal/style/GraphicStrokeTest.java +++ b/core/sis-portrayal/src/test/java/org/apache/sis/style/se1/GraphicStrokeTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sis.internal.style; +package org.apache.sis.style.se1; import org.junit.Test; diff --git a/core/sis-portrayal/src/test/java/org/apache/sis/internal/style/GraphicTest.java b/core/sis-portrayal/src/test/java/org/apache/sis/style/se1/GraphicTest.java similarity index 98% rename from core/sis-portrayal/src/test/java/org/apache/sis/internal/style/GraphicTest.java rename to core/sis-portrayal/src/test/java/org/apache/sis/style/se1/GraphicTest.java index 0fd1555220..130332ca4d 100644 --- a/core/sis-portrayal/src/test/java/org/apache/sis/internal/style/GraphicTest.java +++ b/core/sis-portrayal/src/test/java/org/apache/sis/style/se1/GraphicTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sis.internal.style; +package org.apache.sis.style.se1; import org.junit.Test; import static org.junit.Assert.*; diff --git a/core/sis-portrayal/src/test/java/org/apache/sis/internal/style/HaloTest.java b/core/sis-portrayal/src/test/java/org/apache/sis/style/se1/HaloTest.java similarity index 97% rename from core/sis-portrayal/src/test/java/org/apache/sis/internal/style/HaloTest.java rename to core/sis-portrayal/src/test/java/org/apache/sis/style/se1/HaloTest.java index 96f9345b77..95b316e2d0 100644 --- a/core/sis-portrayal/src/test/java/org/apache/sis/internal/style/HaloTest.java +++ b/core/sis-portrayal/src/test/java/org/apache/sis/style/se1/HaloTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sis.internal.style; +package org.apache.sis.style.se1; import org.junit.Test; diff --git a/core/sis-portrayal/src/test/java/org/apache/sis/internal/style/LinePlacementTest.java b/core/sis-portrayal/src/test/java/org/apache/sis/style/se1/LinePlacementTest.java similarity index 98% rename from core/sis-portrayal/src/test/java/org/apache/sis/internal/style/LinePlacementTest.java rename to core/sis-portrayal/src/test/java/org/apache/sis/style/se1/LinePlacementTest.java index cbab30a0e5..a224c51109 100644 --- a/core/sis-portrayal/src/test/java/org/apache/sis/internal/style/LinePlacementTest.java +++ b/core/sis-portrayal/src/test/java/org/apache/sis/style/se1/LinePlacementTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sis.internal.style; +package org.apache.sis.style.se1; import org.junit.Test; diff --git a/core/sis-portrayal/src/test/java/org/apache/sis/internal/style/LineSymbolizerTest.java b/core/sis-portrayal/src/test/java/org/apache/sis/style/se1/LineSymbolizerTest.java similarity index 98% rename from core/sis-portrayal/src/test/java/org/apache/sis/internal/style/LineSymbolizerTest.java rename to core/sis-portrayal/src/test/java/org/apache/sis/style/se1/LineSymbolizerTest.java index 14b3220b42..d986a23e87 100644 --- a/core/sis-portrayal/src/test/java/org/apache/sis/internal/style/LineSymbolizerTest.java +++ b/core/sis-portrayal/src/test/java/org/apache/sis/style/se1/LineSymbolizerTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sis.internal.style; +package org.apache.sis.style.se1; import java.awt.Color; import org.junit.Test; diff --git a/core/sis-portrayal/src/test/java/org/apache/sis/internal/style/MarkTest.java b/core/sis-portrayal/src/test/java/org/apache/sis/style/se1/MarkTest.java similarity index 98% rename from core/sis-portrayal/src/test/java/org/apache/sis/internal/style/MarkTest.java rename to core/sis-portrayal/src/test/java/org/apache/sis/style/se1/MarkTest.java index 2e97b14eb7..26691fd522 100644 --- a/core/sis-portrayal/src/test/java/org/apache/sis/internal/style/MarkTest.java +++ b/core/sis-portrayal/src/test/java/org/apache/sis/style/se1/MarkTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sis.internal.style; +package org.apache.sis.style.se1; import org.junit.Test; import static org.junit.Assert.*; diff --git a/core/sis-portrayal/src/test/java/org/apache/sis/internal/style/PointPlacementTest.java b/core/sis-portrayal/src/test/java/org/apache/sis/style/se1/PointPlacementTest.java similarity index 98% rename from core/sis-portrayal/src/test/java/org/apache/sis/internal/style/PointPlacementTest.java rename to core/sis-portrayal/src/test/java/org/apache/sis/style/se1/PointPlacementTest.java index 73564c4bb3..9d89994565 100644 --- a/core/sis-portrayal/src/test/java/org/apache/sis/internal/style/PointPlacementTest.java +++ b/core/sis-portrayal/src/test/java/org/apache/sis/style/se1/PointPlacementTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sis.internal.style; +package org.apache.sis.style.se1; import org.junit.Test; import static org.junit.Assert.*; diff --git a/core/sis-portrayal/src/test/java/org/apache/sis/internal/style/PointSymbolizerTest.java b/core/sis-portrayal/src/test/java/org/apache/sis/style/se1/PointSymbolizerTest.java similarity index 97% rename from core/sis-portrayal/src/test/java/org/apache/sis/internal/style/PointSymbolizerTest.java rename to core/sis-portrayal/src/test/java/org/apache/sis/style/se1/PointSymbolizerTest.java index e24852610f..80e24161c4 100644 --- a/core/sis-portrayal/src/test/java/org/apache/sis/internal/style/PointSymbolizerTest.java +++ b/core/sis-portrayal/src/test/java/org/apache/sis/style/se1/PointSymbolizerTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sis.internal.style; +package org.apache.sis.style.se1; import org.junit.Test; import static org.junit.Assert.*; diff --git a/core/sis-portrayal/src/test/java/org/apache/sis/internal/style/PolygonSymbolizerTest.java b/core/sis-portrayal/src/test/java/org/apache/sis/style/se1/PolygonSymbolizerTest.java similarity index 98% rename from core/sis-portrayal/src/test/java/org/apache/sis/internal/style/PolygonSymbolizerTest.java rename to core/sis-portrayal/src/test/java/org/apache/sis/style/se1/PolygonSymbolizerTest.java index 449f8d58f4..e1074f47e3 100644 --- a/core/sis-portrayal/src/test/java/org/apache/sis/internal/style/PolygonSymbolizerTest.java +++ b/core/sis-portrayal/src/test/java/org/apache/sis/style/se1/PolygonSymbolizerTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sis.internal.style; +package org.apache.sis.style.se1; import java.awt.Color; import org.junit.Test; diff --git a/core/sis-portrayal/src/test/java/org/apache/sis/internal/style/RasterSymbolizerTest.java b/core/sis-portrayal/src/test/java/org/apache/sis/style/se1/RasterSymbolizerTest.java similarity index 99% rename from core/sis-portrayal/src/test/java/org/apache/sis/internal/style/RasterSymbolizerTest.java rename to core/sis-portrayal/src/test/java/org/apache/sis/style/se1/RasterSymbolizerTest.java index dc98f45e8e..2d6284fcea 100644 --- a/core/sis-portrayal/src/test/java/org/apache/sis/internal/style/RasterSymbolizerTest.java +++ b/core/sis-portrayal/src/test/java/org/apache/sis/style/se1/RasterSymbolizerTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sis.internal.style; +package org.apache.sis.style.se1; import org.junit.Test; import static org.junit.Assert.*; diff --git a/core/sis-portrayal/src/test/java/org/apache/sis/internal/style/RuleTest.java b/core/sis-portrayal/src/test/java/org/apache/sis/style/se1/RuleTest.java similarity index 98% rename from core/sis-portrayal/src/test/java/org/apache/sis/internal/style/RuleTest.java rename to core/sis-portrayal/src/test/java/org/apache/sis/style/se1/RuleTest.java index 68376cab96..9acd4ceb92 100644 --- a/core/sis-portrayal/src/test/java/org/apache/sis/internal/style/RuleTest.java +++ b/core/sis-portrayal/src/test/java/org/apache/sis/style/se1/RuleTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sis.internal.style; +package org.apache.sis.style.se1; import java.util.List; import org.junit.Test; @@ -84,7 +84,7 @@ public final class RuleTest extends StyleTestCase { assertEmpty(cdt.getLegend()); // Check get/set - GraphicLegend value = new GraphicLegend(); + LegendGraphic value = new LegendGraphic(); cdt.setLegend(value); assertOptionalEquals(value, cdt.getLegend()); } diff --git a/core/sis-portrayal/src/test/java/org/apache/sis/internal/style/SelectedChannelTypeTest.java b/core/sis-portrayal/src/test/java/org/apache/sis/style/se1/SelectedChannelTest.java similarity index 85% rename from core/sis-portrayal/src/test/java/org/apache/sis/internal/style/SelectedChannelTypeTest.java rename to core/sis-portrayal/src/test/java/org/apache/sis/style/se1/SelectedChannelTest.java index 1f3c219ec7..76b214eb52 100644 --- a/core/sis-portrayal/src/test/java/org/apache/sis/internal/style/SelectedChannelTypeTest.java +++ b/core/sis-portrayal/src/test/java/org/apache/sis/style/se1/SelectedChannelTest.java @@ -14,24 +14,24 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sis.internal.style; +package org.apache.sis.style.se1; import org.junit.Test; import static org.junit.Assert.*; /** - * Tests for {@link SelectedChannelType}. + * Tests for {@link SelectedChannel}. * * @author Johann Sorel (Geomatys) * @version 1.5 * @since 1.5 */ -public final class SelectedChannelTypeTest extends StyleTestCase { +public final class SelectedChannelTest extends StyleTestCase { /** * Creates a new test case. */ - public SelectedChannelTypeTest() { + public SelectedChannelTest() { } /** @@ -39,7 +39,7 @@ public final class SelectedChannelTypeTest extends StyleTestCase { */ @Test public void testChannelName() { - SelectedChannelType cdt = new SelectedChannelType(); + SelectedChannel cdt = new SelectedChannel(); // Check defaults assertNull(cdt.getSourceChannelName()); @@ -55,7 +55,7 @@ public final class SelectedChannelTypeTest extends StyleTestCase { */ @Test public void testContrastEnhancement() { - SelectedChannelType cdt = new SelectedChannelType(); + SelectedChannel cdt = new SelectedChannel(); // Check defaults assertEmpty(cdt.getContrastEnhancement()); diff --git a/core/sis-portrayal/src/test/java/org/apache/sis/internal/style/ShadedReliefTest.java b/core/sis-portrayal/src/test/java/org/apache/sis/style/se1/ShadedReliefTest.java similarity index 97% rename from core/sis-portrayal/src/test/java/org/apache/sis/internal/style/ShadedReliefTest.java rename to core/sis-portrayal/src/test/java/org/apache/sis/style/se1/ShadedReliefTest.java index 1f0083302c..a247aa89fb 100644 --- a/core/sis-portrayal/src/test/java/org/apache/sis/internal/style/ShadedReliefTest.java +++ b/core/sis-portrayal/src/test/java/org/apache/sis/style/se1/ShadedReliefTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sis.internal.style; +package org.apache.sis.style.se1; import org.junit.Test; import static org.junit.Assert.*; diff --git a/core/sis-portrayal/src/test/java/org/apache/sis/internal/style/StrokeTest.java b/core/sis-portrayal/src/test/java/org/apache/sis/style/se1/StrokeTest.java similarity index 99% rename from core/sis-portrayal/src/test/java/org/apache/sis/internal/style/StrokeTest.java rename to core/sis-portrayal/src/test/java/org/apache/sis/style/se1/StrokeTest.java index 5f56393021..61d5993e56 100644 --- a/core/sis-portrayal/src/test/java/org/apache/sis/internal/style/StrokeTest.java +++ b/core/sis-portrayal/src/test/java/org/apache/sis/style/se1/StrokeTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sis.internal.style; +package org.apache.sis.style.se1; import java.awt.Color; import org.junit.Test; diff --git a/core/sis-portrayal/src/test/java/org/apache/sis/internal/style/StyleTest.java b/core/sis-portrayal/src/test/java/org/apache/sis/style/se1/StyleTest.java similarity index 98% rename from core/sis-portrayal/src/test/java/org/apache/sis/internal/style/StyleTest.java rename to core/sis-portrayal/src/test/java/org/apache/sis/style/se1/StyleTest.java index c51313f0e3..34c66e45c1 100644 --- a/core/sis-portrayal/src/test/java/org/apache/sis/internal/style/StyleTest.java +++ b/core/sis-portrayal/src/test/java/org/apache/sis/style/se1/StyleTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sis.internal.style; +package org.apache.sis.style.se1; import org.junit.Test; import static org.junit.Assert.*; diff --git a/core/sis-portrayal/src/test/java/org/apache/sis/internal/style/StyleTestCase.java b/core/sis-portrayal/src/test/java/org/apache/sis/style/se1/StyleTestCase.java similarity index 98% rename from core/sis-portrayal/src/test/java/org/apache/sis/internal/style/StyleTestCase.java rename to core/sis-portrayal/src/test/java/org/apache/sis/style/se1/StyleTestCase.java index 6e45f605b3..7171c4d445 100644 --- a/core/sis-portrayal/src/test/java/org/apache/sis/internal/style/StyleTestCase.java +++ b/core/sis-portrayal/src/test/java/org/apache/sis/style/se1/StyleTestCase.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sis.internal.style; +package org.apache.sis.style.se1; import java.awt.Color; import java.util.Optional; diff --git a/core/sis-portrayal/src/test/java/org/apache/sis/internal/style/SymbolizerTest.java b/core/sis-portrayal/src/test/java/org/apache/sis/style/se1/SymbolizerTest.java similarity index 98% rename from core/sis-portrayal/src/test/java/org/apache/sis/internal/style/SymbolizerTest.java rename to core/sis-portrayal/src/test/java/org/apache/sis/style/se1/SymbolizerTest.java index 86b5043535..ccc02fea67 100644 --- a/core/sis-portrayal/src/test/java/org/apache/sis/internal/style/SymbolizerTest.java +++ b/core/sis-portrayal/src/test/java/org/apache/sis/style/se1/SymbolizerTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sis.internal.style; +package org.apache.sis.style.se1; import org.apache.sis.measure.Units; import org.junit.Test; diff --git a/core/sis-portrayal/src/test/java/org/apache/sis/internal/style/TextSymbolizerTest.java b/core/sis-portrayal/src/test/java/org/apache/sis/style/se1/TextSymbolizerTest.java similarity index 98% rename from core/sis-portrayal/src/test/java/org/apache/sis/internal/style/TextSymbolizerTest.java rename to core/sis-portrayal/src/test/java/org/apache/sis/style/se1/TextSymbolizerTest.java index 38e79d2904..8c7ff576e2 100644 --- a/core/sis-portrayal/src/test/java/org/apache/sis/internal/style/TextSymbolizerTest.java +++ b/core/sis-portrayal/src/test/java/org/apache/sis/style/se1/TextSymbolizerTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sis.internal.style; +package org.apache.sis.style.se1; import org.junit.Test; import static org.junit.Assert.*;
