code cleaning and fix potential null pointer

[taxeditor.git] / eu.etaxonomy.taxeditor.store / src / main / java / eu / etaxonomy / taxeditor / model / NomenclaturalCodeHelper.java

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/NomenclaturalCodeHelper.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/NomenclaturalCodeHelper.java
index ea4c9303650b13c15bce17a559e2d18039fdf7a5..1cf9d3f80e9d6ebe23d8faa91629cfac5f52d10b 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/NomenclaturalCodeHelper.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/NomenclaturalCodeHelper.java
@@ -42,9 +42,10 @@ public class NomenclaturalCodeHelper {
         */
        public static List<NomenclaturalCode> getSupportedCodes() {
                List<NomenclaturalCode> supportedCodes = new ArrayList<NomenclaturalCode>();
+               NomenclaturalCode nomenclaturalCode =PreferencesUtil.getPreferredNomenclaturalCode();
                for (NomenclaturalCode code : getAllCodes()) {
                        if (isSupported(code)) {
-                           if (PreferencesUtil.getPreferredNomenclaturalCode().equals(code)){
+                           if (nomenclaturalCode != null && nomenclaturalCode.equals(code)){
                                supportedCodes.add(0, code);
                            }else{
                                supportedCodes.add(code);