merge-update from trunk

[taxeditor.git] / eu.etaxonomy.taxeditor.store / src / main / java / eu / etaxonomy / taxeditor / ui / dialog / selection / GrantedAuthoritySelectionDialog.java

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/GrantedAuthoritySelectionDialog.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/GrantedAuthoritySelectionDialog.java
index 7f4ba7e51fda3649e1a84ca9071efc1e2bef6199..24374e69867d40a5fe1af9ebd055db1d19b5d905 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/GrantedAuthoritySelectionDialog.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/GrantedAuthoritySelectionDialog.java
@@ -1,9 +1,9 @@
 // $Id$
 /**
 * Copyright (C) 2007 EDIT
-* European Distributed Institute of Taxonomy 
+* European Distributed Institute of Taxonomy
 * http://www.e-taxonomy.eu
-* 
+*
 * The contents of this file are subject to the Mozilla Public License Version 1.1
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
@@ -33,13 +33,13 @@ import eu.etaxonomy.taxeditor.store.CdmStore;
 public class GrantedAuthoritySelectionDialog extends   AbstractFilteredCdmResourceSelectionDialog<GrantedAuthorityImpl> {
 
        public static GrantedAuthority select(Shell shell, ConversationHolder conversation, GrantedAuthorityImpl authority){
-               
+
                GrantedAuthoritySelectionDialog dialog = new GrantedAuthoritySelectionDialog(shell, conversation,
                                "Choose Granted Authority", false, GrantedAuthoritySelectionDialog.class.getCanonicalName(), authority);
-               
+
                return getSelectionFromDialog(dialog);
        }
-       
+
        /**
         * @param shell
         * @param conversation
@@ -60,12 +60,12 @@ public class GrantedAuthoritySelectionDialog extends        AbstractFilteredCdmResource
        @Override
        protected void initModel() {
                List<GrantedAuthorityImpl> authorities = CdmStore.getService(IGrantedAuthorityService.class).list(GrantedAuthorityImpl.class, null, null, null, null);
-               
+
                model = new ArrayList<UuidAndTitleCache<GrantedAuthorityImpl>>();
-               
+
                for(GrantedAuthorityImpl authority : authorities){
                        model.add(new UuidAndTitleCache<GrantedAuthorityImpl>(GrantedAuthorityImpl.class, authority.getUuid(),String.format("%s", authority.getAuthority())));
-               }       
+               }
        }
 
        /* (non-Javadoc)
@@ -73,7 +73,7 @@ public class GrantedAuthoritySelectionDialog extends  AbstractFilteredCdmResource
         */
        @Override
        protected String getNewWizardLinkText() {
-               return "Create a new <A>GrantedAuthority</A>.";
+               return String.format("Create a new <a>%1s</a>", "GrantedAuthority ");
        }
 
        /* (non-Javadoc)
@@ -91,7 +91,7 @@ public class GrantedAuthoritySelectionDialog extends  AbstractFilteredCdmResource
        protected GrantedAuthorityImpl getPersistentObject(UUID uuid) {
                return CdmStore.getService(IGrantedAuthorityService.class).load(uuid);
        }
-       
+
        @Override
        protected String getTitle(GrantedAuthorityImpl authority) {
                return authority != null ? authority.getAuthority() : "";