Project

General

Profile

« Previous | Next » 

Revision 52002c73

Added by Cherian Mathew over 9 years ago

merge from trunk

View differences:

eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/PreferencesUtil.java
28 28
import org.apache.commons.lang.StringUtils;
29 29
import org.eclipse.equinox.internal.p2.ui.model.MetadataRepositoryElement;
30 30
import org.eclipse.jface.preference.IPreferenceStore;
31
import org.eclipse.jface.window.Window;
31 32
import org.eclipse.swt.widgets.Shell;
32 33
import org.eclipse.ui.PlatformUI;
33 34

  
......
50 51
import eu.etaxonomy.cdm.strategy.match.IMatchStrategy;
51 52
import eu.etaxonomy.cdm.strategy.match.MatchException;
52 53
import eu.etaxonomy.cdm.strategy.match.MatchMode;
54
import eu.etaxonomy.taxeditor.model.AbstractUtility;
53 55
import eu.etaxonomy.taxeditor.model.MessagingUtils;
54 56
import eu.etaxonomy.taxeditor.model.NomenclaturalCodeHelper;
55 57
import eu.etaxonomy.taxeditor.store.CdmStore;
56
import eu.etaxonomy.taxeditor.store.StoreUtil;
57 58
import eu.etaxonomy.taxeditor.store.internal.TaxeditorStorePlugin;
58 59
import eu.etaxonomy.taxeditor.ui.dialog.DefaultLanguageDialog;
59 60

  
......
426 427
							"The following has been set as your preferred nomenclatural code:\n\n\t"
427 428
									+ NomenclaturalCodeHelper
428 429
											.getDescription(code)
429
									+ "\n\nYou iour is not consistent throughout the application. For DescriptionElemts and also PolytomousKeyNode.Question and PolytomousKeyNode.Statement it shows only the languages where text is available whereas for PolytomousKeyNode.modyfingText it shows a strange list of about 10-20 (different for different nodes) most of them starting with can change the nomenclatural code at any time in the \"Preferences\" menu.");*/
430
									+ "\n\nYou can change the nomenclatural code at any time in the \"Preferences\" menu.");*/
430 431
		}
431 432
	}
432 433

  
433 434
	public static void checkDefaultLanguage(){
434 435
	    if(PreferencesUtil.getPreferredDefaultLangugae() == null){
435
	       Shell shell = StoreUtil.getShell();
436
	       Shell shell = AbstractUtility.getShell();
436 437
	       int open = new DefaultLanguageDialog(shell).open();
437
	       if(open == 0){//FIXME:window performed ok. Find variable for it
438
	       if(open == Window.OK){
438 439
	           PlatformUI.getWorkbench().restart();
439 440
	       }
440 441
	    }else{

Also available in: Unified diff