Project

General

Profile

« Previous | Next » 

Revision 1e1a1052

Added by Patrick Plitzner almost 6 years ago

ref #6321 Cancel previous search when starting a new one

View differences:

eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/AbstractBulkEditorInput.java
143 143
	}
144 144

  
145 145
	public void performSearch(final BulkEditorQuery bulkEditorQuery) {
146
	    //cancel previous search job
146 147
	    if(searchJob!=null && searchJob.getState()!=Job.NONE){
147
	        MessagingUtils.informationDialog(Messages.AbstractBulkEditorInput_MULTIPLE_SEARCH_TITLE, Messages.AbstractBulkEditorInput_MULTIPLE_SEARCH_MESSAGE);
148
	        return;
148
	        searchJob.cancel();
149
	        searchJob = null;
149 150
	    }
150 151
	    model.clear();
151 152

  
eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/l10n/Messages.java
8 8
    public static String AbstractBulkEditorInput_LOADING;
9 9
    public static String AbstractBulkEditorInput_MERGE_ERROR_MESSAGE;
10 10
    public static String AbstractBulkEditorInput_MERGE_ERROR_TITLE;
11
    public static String AbstractBulkEditorInput_MULTIPLE_SEARCH_MESSAGE;
12
    public static String AbstractBulkEditorInput_MULTIPLE_SEARCH_TITLE;
13 11
    public static String AbstractBulkEditorInput_TARGET;
14 12
    public static String USER_CREATOR_user_exists_title;
15 13
    public static String USER_CREATOR_user_exists;
eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/l10n/messages.properties
2 2
AbstractBulkEditorInput_LOADING=Loading 
3 3
AbstractBulkEditorInput_MERGE_ERROR_MESSAGE=Could not merge chosen objects of type %s
4 4
AbstractBulkEditorInput_MERGE_ERROR_TITLE=Merging failes
5
AbstractBulkEditorInput_MULTIPLE_SEARCH_MESSAGE=Please wait for the last search to finish or cancel it.
6
AbstractBulkEditorInput_MULTIPLE_SEARCH_TITLE=Search not possible
7 5
AbstractBulkEditorInput_TARGET=[Target] 
8 6
BulkEditorE4_CANCEL=Cancel
9 7
BulkEditorE4_DONT_SAVE=Don't save (and Search)
eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/l10n/messages_de.properties
2 2
AbstractBulkEditorInput_LOADING=Lade 
3 3
AbstractBulkEditorInput_MERGE_ERROR_MESSAGE=Zusammenf?hren von Objekten des Typen %s fehlgeschlagen 
4 4
AbstractBulkEditorInput_MERGE_ERROR_TITLE=Zusammenf?hren fehlgeschlagen
5
AbstractBulkEditorInput_MULTIPLE_SEARCH_MESSAGE=Bitte warten Sie, bis die letzte Suche beendet wurde oder brechen Sie sie ab.
6
AbstractBulkEditorInput_MULTIPLE_SEARCH_TITLE=Suche nicht m?glich
7 5
AbstractBulkEditorInput_TARGET=[Ziel] 
8 6
BulkEditorE4_CANCEL=Abbrechen
9 7
BulkEditorE4_DONT_SAVE=Nicht speichern (und suchen)

Also available in: Unified diff