[GEOS-8646], some fixes to UI and labels

geoserver · Mar 21, 2018 · f9fe1a6 · f9fe1a6
1 parent da00f6b
commit f9fe1a6
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 13 deletions.
diff --git a/doc/en/user/source/community/wmts-multidimensional/images/expandLimitConfig.png b/doc/en/user/source/community/wmts-multidimensional/images/expandLimitConfig.png
diff --git a/...munity/wmts-multi-dimensional/src/main/java/org/geoserver/gwc/web/MultiDimAdminPanel.html b/...munity/wmts-multi-dimensional/src/main/java/org/geoserver/gwc/web/MultiDimAdminPanel.html
@@ -7,7 +7,7 @@
             <li>
                 <fieldset>
                     <legend>
-                        <span><wicket:message key="title">multidim</wicket:message></span>
+                        <span><wicket:message key="MultiDimAdminPanel.title">multidim</wicket:message></span>
                     </legend>
                     <ul>
                         <li>

diff --git a/...munity/wmts-multi-dimensional/src/main/java/org/geoserver/gwc/web/MultiDimLayerPanel.html b/...munity/wmts-multi-dimensional/src/main/java/org/geoserver/gwc/web/MultiDimLayerPanel.html
@@ -7,7 +7,7 @@
             <li>
                 <fieldset>
                     <legend>
-                        <span><wicket:message key="title">multidim</wicket:message></span>
+                        <span><wicket:message key="MultiDimLayerPanel.title">multidim</wicket:message></span>
                     </legend>
                     <ul>
                         <li>

diff --git a/...mts-multi-dimensional/src/main/java/org/geoserver/gwc/wmts/MultiDimensionalExtension.java b/...mts-multi-dimensional/src/main/java/org/geoserver/gwc/wmts/MultiDimensionalExtension.java
@@ -226,8 +226,8 @@ private Domains getDomains(SimpleConveyor conveyor) throws Exception {
 
     private int getExpandlimit(ResourceInfo resource, Object clientExpandLimit, HttpServletResponse response) throws OWSException {
         WMTSInfo wmts = geoServer.getService(WMTSInfo.class);
-        int expandLimitMax = getConfigredExpansionLimit(resource, wmts, EXPAND_LIMIT_MAX_KEY, EXPAND_LIMIT_MAX_DEFAULT);
+        int expandLimitMax = getConfiguredExpansionLimit(resource, wmts, EXPAND_LIMIT_MAX_KEY, EXPAND_LIMIT_MAX_DEFAULT);
-        int expandLimitDefault = getConfigredExpansionLimit(resource, wmts, EXPAND_LIMIT_KEY, EXPAND_LIMIT_DEFAULT);
+        int expandLimitDefault = getConfiguredExpansionLimit(resource, wmts, EXPAND_LIMIT_KEY, EXPAND_LIMIT_DEFAULT);
 
         if (clientExpandLimit != null) {
             Integer value = Converters.convert(clientExpandLimit, Integer.class);
@@ -253,15 +253,15 @@ private int getExpandlimit(ResourceInfo resource, Object clientExpandLimit, Http
         }
     }
 
-    private Integer getConfigredExpansionLimit(ResourceInfo resource, WMTSInfo wmts, String limitKey, int defaultValue) {
+    private Integer getConfiguredExpansionLimit(ResourceInfo resource, WMTSInfo wmts, String limitKey, int defaultValue) {
         MetadataMap resourceMetadata = resource.getMetadata();
-        Integer expandLimitMax = resourceMetadata.get(limitKey, Integer.class);
+        Integer limit = resourceMetadata.get(limitKey, Integer.class);
-        if (expandLimitMax == null) {
+        if (limit == null) {
             MetadataMap serviceMetadata = wmts.getMetadata();
-            expandLimitMax = Optional.ofNullable(serviceMetadata.get(limitKey, Integer.class))
+            limit = Optional.ofNullable(serviceMetadata.get(limitKey, Integer.class))
                     .orElse(defaultValue);
         }
-        return expandLimitMax;
+        return limit;
     }
 
     /**

diff --git a/src/community/wmts-multi-dimensional/src/main/resources/GeoServerApplication.properties b/src/community/wmts-multi-dimensional/src/main/resources/GeoServerApplication.properties
@@ -1,7 +1,7 @@
 MultiDimLayerPanel.title=Multidimensional extension
-MultiDimLayerPanel.defaultExpandLimit=Default expansion limit value
+MultiDimLayerPanel.defaultExpandLimit=Default DescribeDomain expansion limit
-MultiDimLayerPanel.maxExpandLimit=Maximum expansion limit value
+MultiDimLayerPanel.maxExpandLimit=Maximum DescribeDomain expansion limit
 
 MultiDimAdminPanel.title=Multidimensional extension
-MultiDimAdminPanel.defaultExpandLimit=Default expansion limit value
+MultiDimAdminPanel.defaultExpandLimit=Default DescribeDomain expansion limit
-MultiDimAdminPanel.maxExpandLimit=Maximum expansion limit value
+MultiDimAdminPanel.maxExpandLimit=Maximum DescribeDomain expansion limit