Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fixes enablement of layer move up/down actions #248

Merged
merged 2 commits into from
Feb 13, 2018
Merged

fixes enablement of layer move up/down actions #248

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b8ad961
fixes enablement of layer move up/down actions
fgdrf Jul 18, 2017
2421577
fix issue with multiple non consecutive layer movement
nprigour Feb 13, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
99 changes: 90 additions & 9 deletions ...ocationtech.udig.project.ui/src/org/locationtech/udig/project/ui/internal/LayersView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@
import org.locationtech.udig.project.internal.Map;
import org.locationtech.udig.project.internal.ProjectPackage;
import org.locationtech.udig.project.internal.ProjectPlugin;
import org.locationtech.udig.project.internal.impl.IEListVisitor;
import org.locationtech.udig.project.internal.impl.SynchronizedEObjectWithInverseResolvingEList;
import org.locationtech.udig.project.render.IViewportModel;
import org.locationtech.udig.project.render.IViewportModelListener;
import org.locationtech.udig.project.render.ViewportModelEvent;
Expand Down Expand Up @@ -400,6 +402,15 @@ public void selectionChanged( SelectionChangedEvent event ) {

private abstract class LayerAction extends Action implements ISelectionListener {

/**
* marker if layer is selected
*/
protected static final char SELECTED = 'X';
/**
* marker if layer isn't selected
*/
protected static final char UNSELECTED = 'O';
protected final String SEL_INDEX_SEARCH_PATTERN = new StringBuilder().append(UNSELECTED).append(SELECTED).toString();
protected IStructuredSelection selection;

/**
Expand All @@ -417,21 +428,77 @@ public void selectionChanged( IWorkbenchPart part, ISelection selection ) {
if (!(selection instanceof IStructuredSelection))
return;
this.selection = (IStructuredSelection) selection;
if (part instanceof LayersView && selection != null && !selection.isEmpty())
setEnabled(true);
if (getCurrentMap() != null && part instanceof LayersView) {
setEnabled(canEnable(this.selection));
return;
}
setEnabled(false);
}
abstract boolean canEnable(IStructuredSelection selection);

/**
* Returns a String of selection status for each map layer. if a layer is selected {@link #SELECTED} is at the specific
* index and if a layer isn't selected, {@link #UNSELECTED} is at the index.
* e.g '0XX0' means, that layer 1 and 4 are not selected whereas 2 and 3 are. It can be used to find out, if an action
* should be enabled/disabled.
*
* @param currentMap current map
* @param selection current selection
* @return empty string (anything else than layers are in the selection) or String of {@link #SELECTED} and
* {@link #UNSELECTED} for each layer at the specific index
*/
@SuppressWarnings("rawtypes")
protected String getSelectionIndexForLayers(Map currentMap, IStructuredSelection selection) {
final List<Layer> selectedLayers = new ArrayList<Layer>();
if (currentMap == null || selection == null) {
return selectedLayers.toString();
}

if (selection != null) {
for (Iterator iter = selection.iterator(); iter.hasNext();) {
Object obj = iter.next();
if (obj instanceof Layer) {
selectedLayers.add((Layer) obj);
}
}
}

final StringBuilder selectionIndex = new StringBuilder();
List<Layer> mapLayers = currentMap.getLayersInternal();
if (mapLayers instanceof SynchronizedEObjectWithInverseResolvingEList) {
((SynchronizedEObjectWithInverseResolvingEList<Layer>) mapLayers).syncedIteration(new IEListVisitor<Layer>() {
@Override
public void visit(Layer layer) {
if (selectedLayers.contains(layer)) {
selectionIndex.append(SELECTED);
} else {
selectionIndex.append(UNSELECTED);
}
}
});

} else {
for (Layer layer : mapLayers) {
if (selectedLayers.contains(layer)) {
selectionIndex.append(SELECTED);
} else {
selectionIndex.append(UNSELECTED);
}
}
}
return selectionIndex.toString();
}
/**
* @see org.eclipse.jface.action.Action#setEnabled(boolean)
*/
@SuppressWarnings("unchecked")
@SuppressWarnings("rawtypes")
public void setEnabled( boolean enabled ) {
super.setEnabled(false);

if (!enabled || selection == null || selection.isEmpty())
return;

for( Iterator iter = selection.iterator(); iter.hasNext(); ) {
for(Iterator iter = selection.iterator(); iter.hasNext(); ) {
Object obj = iter.next();
if (!(obj instanceof Layer))
return;
Expand Down Expand Up @@ -634,7 +701,7 @@ public void notifyChanged( Notification notification ) {
setCurrentMap((Map)obj);
}
}

viewer.setSorter(new ViewerLayerSorter());

// sets the layer visibility to match the check box setting.
Expand Down Expand Up @@ -735,9 +802,16 @@ private LayerAction downAction() {
public void run() {
if( selection.isEmpty() ) return;
IMap map = getCurrentMap();
// map.sendCommandSync( new LayerMoveDownCommand( selection ));
map.sendCommandASync( new LayerMoveDownCommand( selection ));
map.sendCommandSync( new LayerMoveDownCommand( selection ));
viewer.setSelection(viewer.getSelection());
}

@Override
boolean canEnable(IStructuredSelection selection) {
String selectionIndex = new StringBuilder(getSelectionIndexForLayers(getCurrentMap(), selection)).toString();
return selectionIndex.indexOf(SEL_INDEX_SEARCH_PATTERN) >= 0;
}

};
downAction.setEnabled(false);
downAction.setToolTipText(Messages.LayersView_down_tooltip);
Expand All @@ -756,9 +830,16 @@ private LayerAction upAction() {
public void run() {
if( selection.isEmpty() ) return;
IMap map = getCurrentMap();
//map.sendCommandSync( new LayerMoveUpCommand( selection ));
map.sendCommandASync( new LayerMoveUpCommand( selection ));
map.sendCommandSync( new LayerMoveUpCommand( selection ));
viewer.setSelection(viewer.getSelection());
}

@Override
boolean canEnable(IStructuredSelection selection) {
String selectionIndex = new StringBuilder(getSelectionIndexForLayers(getCurrentMap(), selection)).reverse().toString();
return selectionIndex.indexOf(SEL_INDEX_SEARCH_PATTERN) >= 0;
}

};
upAction.setEnabled(false);
upAction.setToolTipText(Messages.LayersView_up_tooltip);
Expand Down
7 changes: 7 additions & 0 deletions ...tech.udig.project/src/org/locationtech/udig/project/command/map/LayerMoveDownCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
7 changes: 7 additions & 0 deletions ...ontech.udig.project/src/org/locationtech/udig/project/command/map/LayerMoveUpCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down