Revision c4f68783
Added by Katja Luther over 6 years ago
| eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/l10n/Messages.java | ||
|---|---|---|
| 43 | 43 |
public static String DeleteHandler_DELETE_NODE; |
| 44 | 44 |
public static String DeleteHandler_MOVE_TO_PARENT; |
| 45 | 45 |
public static String DeleteHandler_SKIP; |
| 46 |
public static String DeleteHandler_DELETE; |
|
| 46 | 47 |
public static String DeleteHandler_THERE_ARE_CHILDNODES; |
| 47 | 48 |
public static String DeleteHandler_THERE_ARE_CHILDREN; |
| 48 | 49 |
public static String DeleteOperation_ABORT; |
| eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/l10n/messages.properties | ||
|---|---|---|
| 23 | 23 |
DeleteHandler_DELETE_CLASSIFICATION=Do you really want to delete the classification? |
| 24 | 24 |
DeleteHandler_DELETE_NODE=Do you really want to delete the selected node(s)? |
| 25 | 25 |
DeleteHandler_MOVE_TO_PARENT=Move children to parent node |
| 26 |
DeleteHandler_SKIP=Skip |
|
| 26 |
DeleteHandler_SKIP=Cancel |
|
| 27 |
DeleteHandler_DELETE=Delete |
|
| 27 | 28 |
DeleteHandler_THERE_ARE_CHILDNODES=\ There are childnodes, which will be deleted, too. |
| 28 | 29 |
DeleteHandler_THERE_ARE_CHILDREN=\ The tree has children, they will be deleted, too. |
| 29 | 30 |
DeleteOperation_ABORT=Delete abort |
| eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/l10n/messages_de.properties | ||
|---|---|---|
| 23 | 23 |
DeleteHandler_DELETE_CLASSIFICATION=Wollen Sie die Klassifikation wirklich l?schen? |
| 24 | 24 |
DeleteHandler_DELETE_NODE=Wollen Sie die ausgew?hlten Knoten wirklich l?schen? |
| 25 | 25 |
DeleteHandler_MOVE_TO_PARENT=Verschiebe Kinder zu Elternknoten |
| 26 |
DeleteHandler_SKIP=?berspringen |
|
| 26 |
DeleteHandler_SKIP=Abbrechen |
|
| 27 |
DeleteHandler_DELETE=L?schen |
|
| 27 | 28 |
DeleteHandler_THERE_ARE_CHILDNODES=\ Es sind Kindknoten vorhanden, die auch gel?scht werden. |
| 28 | 29 |
DeleteHandler_THERE_ARE_CHILDREN=\ Der Baum hat Kindknoten, die auch gel?scht werden. |
| 29 | 30 |
DeleteOperation_ABORT=L?schen abbrechen |
| eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/e4/handler/DeleteHandlerE4.java | ||
|---|---|---|
| 56 | 56 |
protected static final String DO_YOU_REALLY_WANT_TO_DELETE_THE_SELECTED_NODE_S = Messages.DeleteHandler_DELETE_NODE; |
| 57 | 57 |
protected static final String DO_YOU_REALLY_WANT_TO_DELETE_THE_CLASSIFICATION = Messages.DeleteHandler_DELETE_CLASSIFICATION; |
| 58 | 58 |
protected static final String CONFIRM_DELETION = Messages.DeleteHandler_CONFIRM_DELETE; |
| 59 |
protected static final String DELETE = Messages.DeleteHandler_DELETE; |
|
| 59 | 60 |
|
| 60 | 61 |
@Execute |
| 61 | 62 |
public void execute(@Named(IServiceConstants.ACTIVE_SELECTION)TreeSelection selection, |
| eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/e4/handler/RemotingDeleteTaxonNodeHandlerE4.java | ||
|---|---|---|
| 133 | 133 |
return Status.CANCEL_STATUS; |
| 134 | 134 |
} |
| 135 | 135 |
} else{
|
| 136 |
if(!DeleteConfiguratorDialog.openConfirmWithConfigurator(configNodes, shell, DeleteHandlerE4.CONFIRM_DELETION, DeleteHandlerE4.DO_YOU_REALLY_WANT_TO_DELETE_THE_SELECTED_NODE_S)){
|
|
| 136 |
|
|
| 137 |
DeleteConfiguratorDialog dialog = new DeleteConfiguratorDialog( |
|
| 138 |
config, |
|
| 139 |
shell, |
|
| 140 |
DeleteHandlerE4.CONFIRM_DELETION, |
|
| 141 |
null, |
|
| 142 |
DeleteHandlerE4.DO_YOU_REALLY_WANT_TO_DELETE_THE_SELECTED_NODE_S, |
|
| 143 |
MessageDialog.WARNING, new String[] { DeleteHandlerE4.DELETE, DeleteHandlerE4.SKIP }, 0);
|
|
| 144 |
int result = dialog.open(); |
|
| 145 |
if (result == 0){
|
|
| 146 |
//delete all children |
|
| 147 |
configNodes.setChildHandling(ChildHandling.DELETE); |
|
| 148 |
config.setTaxonNodeConfig(configNodes); |
|
| 149 |
} else {
|
|
| 137 | 150 |
return Status.CANCEL_STATUS; |
| 138 | 151 |
} |
| 139 |
config.setTaxonNodeConfig(configNodes); |
|
| 152 |
// if(!DeleteConfiguratorDialog.openConfirmWithConfigurator(configNodes, shell, DeleteHandlerE4.CONFIRM_DELETION, DeleteHandlerE4.DO_YOU_REALLY_WANT_TO_DELETE_THE_SELECTED_NODE_S)){
|
|
| 153 |
// return Status.CANCEL_STATUS; |
|
| 154 |
// } |
|
| 155 |
// config.setTaxonNodeConfig(configNodes); |
|
| 140 | 156 |
} |
| 141 | 157 |
} |
| 142 | 158 |
} |
Also available in: Unified diff
fix #7069: use the same configurator for deleting a taxon node with or without children