fix issue with multiple non consecutive layer movement

Signed-off-by: Nikolaos Pringouris <[email protected]>
locationtech · Feb 13, 2018 · 467f237 · 467f237
1 parent 6b4ee67
commit 467f237
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/...tech.udig.project/src/org/locationtech/udig/project/command/map/LayerMoveDownCommand.java b/...tech.udig.project/src/org/locationtech/udig/project/command/map/LayerMoveDownCommand.java
@@ -67,10 +67,17 @@ public String getName() {
     public void run( IProgressMonitor monitor ) throws Exception {
         // need to reverse otherwise nothing happens on multiselect
         Collections.reverse(selection);
+        int lastAllowedIndex = 0; 
         for( ILayer layer : selection ) {
+            int layerIndex = layer.getZorder();
+            if (layerIndex == lastAllowedIndex) {
+                lastAllowedIndex++;
+                continue;
+            }
             getMap().lowerLayer((Layer) layer);
         }
     }
+
     public void rollback( IProgressMonitor monitor ) throws Exception {
         for( ILayer layer : selection ) {
             getMap().raiseLayer((Layer) layer);

diff --git a/...ontech.udig.project/src/org/locationtech/udig/project/command/map/LayerMoveUpCommand.java b/...ontech.udig.project/src/org/locationtech/udig/project/command/map/LayerMoveUpCommand.java
@@ -65,10 +65,17 @@ public String getName() {
     }
 
     public void run( IProgressMonitor monitor ) throws Exception {
+        int maxAllowedIndex = getMap().getLayersInternal().size()-1;
         for( ILayer layer : selection ) {
+            int layerIndex = layer.getZorder();
+            if (layerIndex == maxAllowedIndex) {
+                maxAllowedIndex--;
+                continue;
+            }
             getMap().raiseLayer((Layer) layer);
         }
     }
+
     public void rollback( IProgressMonitor monitor ) throws Exception {
         // need to reverse otherwise nothing happens on multiselect
         Collections.reverse(selection);