Revision 3487252c
Added by Katja Luther over 2 years ago
eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/l10n/Messages.java | ||
---|---|---|
195 | 195 |
public static String TreeNodeDropAdapter_Select_Sec_Reference_Handling_message; |
196 | 196 |
public static String TreeNodeDropAdapter_Select_Sec_Reference_Parent; |
197 | 197 |
|
198 |
public static String MoveTaxon_Different_Secundum_References; |
|
199 |
|
|
198 | 200 |
public static String SetPublishForSubtreeOperation_CHANGE_PUBLISH_OP; |
199 | 201 |
public static String TaxonNavigatorLabels_SET_PUBLISH_FOR_CHILDREN; |
200 | 202 |
public static String TaxonNavigatorLabels_ACCEPTED_TAXA_NEED_TO_BE_FROM_SAME_CLASSIFICATION; |
eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/l10n/messages.properties | ||
---|---|---|
169 | 169 |
TreeNodeDropAdapter_Select_Sec_Reference_Handling_message_always_select=Please select which reference should be used for the moved taxon/taxa |
170 | 170 |
TreeNodeDropAdapter_Select_Sec_Reference_Handling_message=The secundum reference of the new parent and/or the moved taxa are not the same. Please select which reference should be used for the moved taxa/taxon |
171 | 171 |
TreeNodeDropAdapter_Select_Sec_Reference_Parent=From new parent |
172 |
MoveTaxon_Different_Secundum_References=Different secundum references are used, maybe adaptions are needed. |
|
172 | 173 |
|
173 | 174 |
SetPublishForSubtreeOperation_CHANGE_PUBLISH_OP=Change publish flag for all children |
174 | 175 |
TaxonNavigatorLabels_SET_PUBLISH_FOR_CHILDREN=Change publish flag for all children |
eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/l10n/messages_de.properties | ||
---|---|---|
169 | 169 |
TreeNodeDropAdapter_Select_Sec_Reference_Handling_message_always_select=Bitte w?hlen Sie welche Secundum Referenz f?r das/die verschobene(n) Taxon/Taxa verwendet werden soll. |
170 | 170 |
TreeNodeDropAdapter_Select_Sec_Reference_Handling_message=Die beteiligten Secundum Referenzen unterscheiden sich, bitte w?hlen Sie welche Referenz f?r die/das verschobene(n) Taxa/Taxon verwendet werden soll. |
171 | 171 |
TreeNodeDropAdapter_Select_Sec_Reference_Parent=Vom neuen Parent |
172 |
MoveTaxon_Different_Secundum_References=Es werden unterschiedliche Secundum Referenzen verwendet, eventuell m?ssen sie angepasst werden. |
|
172 | 173 |
|
173 | 174 |
SetPublishForSubtreeOperation_CHANGE_PUBLISH_OP=Publish Flag f?r alle Kinder ?ndern |
174 | 175 |
TaxonNavigatorLabels_SET_PUBLISH_FOR_CHILDREN=?ndere Publish Flag f?r alle Kinder |
eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/e4/TreeNodeDropAdapterE4.java | ||
---|---|---|
210 | 210 |
} |
211 | 211 |
secHandling = PreferencesUtil.getSecReferenceHandlingPreference(); |
212 | 212 |
newSecUuid = null; |
213 |
if (secHandling.equals(SecReferenceHandlingEnum.AlwaysSelect) || (secReferences.size() > 1 && secHandling.equals(SecReferenceHandlingEnum.KeepOrSelect)) || (secReferences.size() == 1 && secHandling.equals(SecReferenceHandlingEnum.KeepOrSelect) && !secReferences.contains(parentSecUuid))){
|
|
213 |
if ( secHandling.equals(SecReferenceHandlingEnum.AlwaysSelect) || (secReferences.size() > 1 && secHandling.equals(SecReferenceHandlingEnum.KeepOrWarn) || secHandling.equals(SecReferenceHandlingEnum.KeepOrSelect)) || (secReferences.size() == 1 && (secHandling.equals(SecReferenceHandlingEnum.KeepOrWarn) ||secHandling.equals(SecReferenceHandlingEnum.KeepOrSelect)) && !secReferences.contains(parentSecUuid))){
|
|
214 | 214 |
//The moved nodes have different secundum references |
215 | 215 |
String message = null; |
216 | 216 |
String[] options = null; |
... | ... | |
221 | 221 |
message = Messages.TreeNodeDropAdapter_Select_Sec_Reference_Handling_message; |
222 | 222 |
options = new String[]{Messages.RemotingChangeAcceptedTaxonToSynonymHandler_Select_Sec_Reference_Keep, Messages.RemotingChangeAcceptedTaxonToSynonymHandler_Select_Sec_Reference_Select, Messages.TreeNodeDropAdapter_Select_Sec_Reference_Parent, }; |
223 | 223 |
} |
224 |
int result = MessagingUtils.confirmDialog(Messages.RemotingChangeAcceptedTaxonToSynonymHandler_Select_Sec_Reference_Handling_title, message, options); |
|
224 |
int result = 0; |
|
225 |
if (secHandling.equals(SecReferenceHandlingEnum.KeepOrWarn) ){ |
|
226 |
MessageDialog.openWarning(null, "Secundum references differ", Messages.MoveTaxon_Different_Secundum_References); |
|
227 |
}else{ |
|
228 |
result = MessagingUtils.confirmDialog(Messages.RemotingChangeAcceptedTaxonToSynonymHandler_Select_Sec_Reference_Handling_title, message, options); |
|
229 |
} |
|
225 | 230 |
|
226 | 231 |
// int result = MessagingUtils.confirmDialog(Messages.RemotingChangeAcceptedTaxonToSynonymHandler_Select_Sec_Reference_Handling_title, Messages.RemotingChangeAcceptedTaxonToSynonymHandler_Select_Sec_Reference_Handling_message, |
227 | 232 |
// new String[]{Messages.RemotingChangeAcceptedTaxonToSynonymHandler_Select_Sec_Reference_Keep, Messages.RemotingChangeAcceptedTaxonToSynonymHandler_Select_Sec_Reference_Parent, Messages.RemotingChangeAcceptedTaxonToSynonymHandler_Select_Sec_Reference_Select}); |
eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/e4/handler/MoveTaxonNodeHandlerE4.java | ||
---|---|---|
138 | 138 |
secHandling = PreferencesUtil.getSecReferenceHandlingPreference(); |
139 | 139 |
newSecUuid = null; |
140 | 140 |
UUID parentTaxonSecUuid= parentTaxonNode.getTaxon() != null && parentTaxonNode.getTaxon().getSec() != null ? parentTaxonNode.getTaxon().getSec().getUuid(): null; |
141 |
if (secHandling.equals(SecReferenceHandlingEnum.AlwaysSelect) || (oldTaxonSecUUIDs.size() > 1 && secHandling.equals(SecReferenceHandlingEnum.KeepOrSelect)) || (oldTaxonSecUUIDs.size() == 1 && secHandling.equals(SecReferenceHandlingEnum.KeepOrSelect) && !oldTaxonSecUUIDs.contains(parentTaxonSecUuid))){
|
|
141 |
if ( secHandling.equals(SecReferenceHandlingEnum.AlwaysSelect) || (oldTaxonSecUUIDs.size() > 1 && secHandling.equals(SecReferenceHandlingEnum.KeepOrSelect) || secHandling.equals(SecReferenceHandlingEnum.KeepOrWarn) ) || (oldTaxonSecUUIDs.size() == 1 && (secHandling.equals(SecReferenceHandlingEnum.KeepOrWarn) ||secHandling.equals(SecReferenceHandlingEnum.KeepOrSelect)) && !oldTaxonSecUUIDs.contains(parentTaxonSecUuid))){
|
|
142 | 142 |
//The moved nodes have different secundum references |
143 | 143 |
String message = null; |
144 | 144 |
String[] options = null; |
... | ... | |
149 | 149 |
message = Messages.TreeNodeDropAdapter_Select_Sec_Reference_Handling_message; |
150 | 150 |
options = new String[]{Messages.RemotingChangeAcceptedTaxonToSynonymHandler_Select_Sec_Reference_Keep, Messages.RemotingChangeAcceptedTaxonToSynonymHandler_Select_Sec_Reference_Select, Messages.TreeNodeDropAdapter_Select_Sec_Reference_Parent, }; |
151 | 151 |
} |
152 |
int result = MessagingUtils.confirmDialog(Messages.RemotingChangeAcceptedTaxonToSynonymHandler_Select_Sec_Reference_Handling_title, message, options); |
|
152 |
int result = 0; |
|
153 |
if (secHandling.equals(SecReferenceHandlingEnum.KeepOrWarn) ){ |
|
154 |
MessageDialog.openWarning(null, "Secundum references differ", Messages.MoveTaxon_Different_Secundum_References); |
|
155 |
}else{ |
|
156 |
result = MessagingUtils.confirmDialog(Messages.RemotingChangeAcceptedTaxonToSynonymHandler_Select_Sec_Reference_Handling_title, message, options); |
|
157 |
} |
|
158 |
|
|
153 | 159 |
|
154 | 160 |
// int result = MessagingUtils.confirmDialog(Messages.RemotingChangeAcceptedTaxonToSynonymHandler_Select_Sec_Reference_Handling_title, Messages.RemotingChangeAcceptedTaxonToSynonymHandler_Select_Sec_Reference_Handling_message, |
155 | 161 |
// new String[]{Messages.RemotingChangeAcceptedTaxonToSynonymHandler_Select_Sec_Reference_Keep, Messages.RemotingChangeAcceptedTaxonToSynonymHandler_Select_Sec_Reference_Parent, Messages.RemotingChangeAcceptedTaxonToSynonymHandler_Select_Sec_Reference_Select}); |
Also available in: Unified diff
add correct handling for keepOrWarn when moving taxa