deegree#1393 (deegree#232) - removed static

lat-lon · May 12, 2023 · 4f3a43b · 4f3a43b
1 parent 25cae92
commit 4f3a43b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/...emotewms/src/main/java/org/deegree/layer/persistence/remotewms/RemoteWmsLayerBuilder.java b/...emotewms/src/main/java/org/deegree/layer/persistence/remotewms/RemoteWmsLayerBuilder.java
@@ -131,7 +131,7 @@ private Map<String, Layer> collectConfiguredRemoteLayers( Map<String, LayerMetad
         return map;
     }
 
-    private static void mergeStyleAndLegendStyles( LayerMetadata remoteServiceMd, LayerMetadata confMd ) {
+    private void mergeStyleAndLegendStyles( LayerMetadata remoteServiceMd, LayerMetadata confMd ) {
         Map<String, Style> configuredLegendStyles = confMd.getLegendStyles();
         Map<String, Style> remoteServiceLegendStyles = remoteServiceMd.getLegendStyles();
         Map<String, Style> remoteServiceStyles = remoteServiceMd.getStyles();
@@ -153,7 +153,7 @@ private static void mergeStyleAndLegendStyles( LayerMetadata remoteServiceMd, La
         confMd.setStyles( remoteServiceStyles );
     }
 
-    private static void removeUnconfiguredStyles( Map<String, Style> configuredLegendStyles,
+    private void removeUnconfiguredStyles( Map<String, Style> configuredLegendStyles,
                                                   Map<String, Style> remoteServiceLegendStyles,
                                                   Map<String, Style> remoteServiceStyles ) {
         for ( String remoteServiceStyleName : remoteServiceStyles.keySet() ) {
@@ -165,7 +165,7 @@ private static void removeUnconfiguredStyles( Map<String, Style> configuredLegen
         }
     }
 
-    private static void setLegendUrlAndFile( Style targetStyle, Style sourceStyle ) {
+    private void setLegendUrlAndFile( Style targetStyle, Style sourceStyle ) {
         targetStyle.setPrefersGetLegendGraphicUrl( sourceStyle.prefersGetLegendGraphicUrl() );
         if ( sourceStyle.getLegendURL() != null ) {
             targetStyle.setLegendURL( sourceStyle.getLegendURL() );

diff --git a/deegree-services/deegree-webservices-handbook/src/main/asciidoc/layers.adoc b/deegree-services/deegree-webservices-handbook/src/main/asciidoc/layers.adoc
@@ -656,7 +656,7 @@ parameters fixed to the configured values.
 ==== Layer configuration
 
 The manual configuration allows you to pick out a layer, rename it, and
-optionally override the _common description, spatial metadata and legend graphic of the styles. What
+optionally override the common description, spatial metadata and legend graphic of the styles. What
 you don't override, will be copied from the source. Let's look at an
 example: