merge-update from trunk
authorPatric Plitzner <p.plitzner@bgbm.org>
Wed, 9 Oct 2013 07:59:13 +0000 (07:59 +0000)
committerPatric Plitzner <p.plitzner@bgbm.org>
Wed, 9 Oct 2013 07:59:13 +0000 (07:59 +0000)
14 files changed:
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/AgentSelectionDialog.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/CollectionSelectionDialog.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/DerivedUnitSelectionDialog.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/FeatureTreeSelectionDialog.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/FieldObservationSelectionDialog.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/GrantedAuthoritySelectionDialog.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/GroupSelectionDialog.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/InstitutionSelectionDialog.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/NameSelectionDialog.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/NomenclaturalAuthorTeamSelectionDialog.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/PersonSelectionDialog.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/ReferenceSelectionDialog.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/TeamSelectionDialog.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/UserSelectionDialog.java

index 54dbf489de52709c8b9d0daf48049ad8c89f64a3..4bf7c09a5c659617ed1d8c4d24e5cecd0eb3439f 100644 (file)
@@ -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.
 */
@@ -35,13 +35,13 @@ import eu.etaxonomy.taxeditor.store.CdmStore;
  */
 public class AgentSelectionDialog extends
                AbstractFilteredCdmResourceSelectionDialog<AgentBase> {
-       
+
        /**
-        * 
+        *
         */
        private static final String PERSON = "Person";
        /**
-        * 
+        *
         */
        private static final String TEAM = "Team";
 
@@ -58,7 +58,7 @@ public class AgentSelectionDialog extends
                                "Choose Agent", false, AgentSelectionDialog.class.getCanonicalName(), entity);
                return getSelectionFromDialog(dialog);
        }
-       
+
        /**
         * <p>Constructor for FilteredAgentSelectionDialog.</p>
         *
@@ -72,8 +72,8 @@ public class AgentSelectionDialog extends
        protected AgentSelectionDialog(Shell shell, ConversationHolder conversation, String title, boolean multi, String settings, AgentBase agent) {
                super(shell, conversation, title, multi, settings, agent);
        }
-       
-       
+
+
        /**
         * @author p.ciardelli
         * @created 18.09.2009
@@ -83,12 +83,13 @@ public class AgentSelectionDialog extends
                /* (non-Javadoc)
                 * @see org.eclipse.jface.viewers.ILabelProvider#getText(java.lang.Object)
                 */
-               public String getText(Object element) {
+               @Override
+        public String getText(Object element) {
                        AgentBase agent = getCdmObjectByUuid(((UuidAndTitleCache<AgentBase>) element).getUuid());
                        if (agent instanceof INomenclaturalAuthor) {
-                               return "Nomenclatural title: '" + ((INomenclaturalAuthor) agent).getNomenclaturalTitle() + "'"; 
+                               return "Nomenclatural title: '" + ((INomenclaturalAuthor) agent).getNomenclaturalTitle() + "'";
                        } else {
-                               return "'" + agent.getTitleCache() + "' is not a nomenclatural author."; 
+                               return "'" + agent.getTitleCache() + "' is not a nomenclatural author.";
                        }
                }
        }
@@ -121,7 +122,7 @@ public class AgentSelectionDialog extends
        protected String getNewWizardLinkText() {
                return String.format("Create a new <a>%1s</a> or <a>%2s</a>", TEAM, PERSON);
        }
-       
+
        /* (non-Javadoc)
         * @see eu.etaxonomy.taxeditor.dialogs.filteredSelection.AbstractFilteredCdmResourceSelectionDialog#getNewWizardLinkSelectionListener()
         */
index 15f0798b25937fa5056197f24ee664759f5e7ff4..6f084b1f1a0718e9df678419e8ab691b7dbb325d 100644 (file)
@@ -85,7 +85,7 @@ public class CollectionSelectionDialog extends
        /** {@inheritDoc} */
        @Override
        protected String getNewWizardLinkText() {
-        return String.format("Click link to create a new <a>%1s</a>", "Collection ");
+        return String.format("Create a new <a>%1s</a>", "Collection ");
        }
 
        /* (non-Javadoc)
index 70976a68be2a88553faf7b9462ee4703b8837934..5c564893923e352b0c5122b7be534af6eddd26d5 100644 (file)
@@ -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.
 */
@@ -47,7 +47,7 @@ public class DerivedUnitSelectionDialog extends
                                "Choose Unit", false, DerivedUnitSelectionDialog.class.getCanonicalName(), unit);
                return getSelectionFromDialog(dialog);
        }
-       
+
        /**
         * <p>Constructor for FilteredDerivedUnitSelectionDialog.</p>
         *
@@ -62,19 +62,19 @@ public class DerivedUnitSelectionDialog extends
                        boolean multi, String settings, DerivedUnit cdmObject) {
                super(shell, conversation, title, multi, settings, cdmObject);
        }
-       
+
        /** {@inheritDoc} */
        @Override
        protected DerivedUnit getPersistentObject(UUID uuid) {
                Object object = CdmStore.getService(IOccurrenceService.class).load(uuid);
-               
+
                SpecimenOrObservationBase specimenObservationBase = (SpecimenOrObservationBase) HibernateProxyHelper.deproxy(object);
-               
-               if(specimenObservationBase instanceof DerivedUnit){     
-                       return (DerivedUnit) specimenObservationBase; 
+
+               if(specimenObservationBase instanceof DerivedUnit){
+                       return (DerivedUnit) specimenObservationBase;
                }
                StoreUtil.error(this.getClass(), "Selected unit is not a derived unit", null);
-               return null;            
+               return null;
        }
 
        /** {@inheritDoc} */
@@ -92,6 +92,6 @@ public class DerivedUnitSelectionDialog extends
        /** {@inheritDoc} */
        @Override
        protected String getNewWizardLinkText() {
-               return "Click link to create a new <A>Unit</A>.";
+               return String.format("Create a new <a>%1s</a>", "Unit ");
        }
 }
index f8a41093209fd07f005269c5a1229d18510b87e5..813bf0a3d7f77b8dda9230f2a30f71b5b1224a3e 100644 (file)
@@ -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.
 */
@@ -41,7 +41,7 @@ import eu.etaxonomy.taxeditor.store.CdmStore;
  */
 public class FeatureTreeSelectionDialog extends
                AbstractFilteredCdmResourceSelectionDialog<FeatureTree> {
-       
+
        /**
         * Creates a filtered selection dialog to select a named area.
         *
@@ -56,7 +56,7 @@ public class FeatureTreeSelectionDialog extends
                                "Choose a feature tree", false, featureTree);
                return getSelectionFromDialog(dialog);
        }
-       
+
        /**
         * <p>Constructor for FilteredFeatureTreeSelectionDialog.</p>
         *
@@ -71,7 +71,7 @@ public class FeatureTreeSelectionDialog extends
                        FeatureTree cdmObject) {
                super(shell, conversation, title, multi, FeatureTreeSelectionDialog.class.getCanonicalName(), cdmObject);
        }
-       
+
        /* (non-Javadoc)
         * @see eu.etaxonomy.taxeditor.dialogs.filteredSelection.AbstractFilteredCdmResourceSelectionDialog#getPersistentObject(java.util.UUID)
         */
@@ -88,13 +88,13 @@ public class FeatureTreeSelectionDialog extends
        @Override
        protected void initModel() {
                List<FeatureTree> featureTrees = CdmStore.getService(IFeatureTreeService.class).list(FeatureTree.class, null, null, null, null);
-               
+
                if(model == null){
                        model = new ArrayList<UuidAndTitleCache<FeatureTree>>();
                }
                model.clear();
                for(FeatureTree featureTree : featureTrees){
-                       UuidAndTitleCache<FeatureTree> element = new UuidAndTitleCache<FeatureTree>(FeatureTree.class, featureTree.getUuid(), featureTree.getTitleCache()); 
+                       UuidAndTitleCache<FeatureTree> element = new UuidAndTitleCache<FeatureTree>(FeatureTree.class, featureTree.getUuid(), featureTree.getTitleCache());
                        model.add(element);
                }
        }
@@ -108,12 +108,13 @@ public class FeatureTreeSelectionDialog extends
                Link link = new Link(parent, SWT.NONE);
                link.setText(getNewWizardLinkText());
                link.addListener (SWT.Selection, new Listener () {
-                       public void handleEvent(Event event) {
-                               
+                       @Override
+            public void handleEvent(Event event) {
+
                                FeatureTreeEditorWizard wizard = new FeatureTreeEditorWizard();
                                WizardDialog dialog = new WizardDialog(getShell(), wizard);
                                int status = dialog.open();
-                               
+
                                if (status == IStatus.OK) {
                                        refresh();
                                }
@@ -121,14 +122,14 @@ public class FeatureTreeSelectionDialog extends
                });
                return link;
        }
-       
+
        /* (non-Javadoc)
         * @see eu.etaxonomy.taxeditor.dialogs.filteredSelection.AbstractFilteredCdmResourceSelectionDialog#getNewWizardLinkText()
         */
        /** {@inheritDoc} */
        @Override
        protected String getNewWizardLinkText() {
-               return "Click <A>here</A> to create or edit a feature tree.";
+               return String.format("Create a new <a>%1s</a>" , "Feature tree ");
        }
 
        /* (non-Javadoc)
index c7bbf281382b34f6aa4e6adc40ce2dbd39cafbb9..a3bf4c29c7fc663518e1ef585efd3e62fa4df784 100644 (file)
@@ -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,7 +33,7 @@ import eu.etaxonomy.taxeditor.store.StoreUtil;
  */
 public class FieldObservationSelectionDialog extends
                AbstractFilteredCdmResourceSelectionDialog<FieldUnit> {
-       
+
        /**
         * <p>select</p>
         *
@@ -58,12 +58,12 @@ public class FieldObservationSelectionDialog extends
         * @param settings a {@link java.lang.String} object.
         * @param cdmObject a {@link eu.etaxonomy.cdm.model.occurrence.FieldObservation} object.
         */
-       protected FieldObservationSelectionDialog(Shell shell, ConversationHolder conversation, 
+       protected FieldObservationSelectionDialog(Shell shell, ConversationHolder conversation,
                        String title, boolean multi, String settings,
                        FieldUnit cdmObject) {
                super(shell, conversation, title, multi, settings, cdmObject);
        }
-       
+
        /* (non-Javadoc)
         * @see eu.etaxonomy.taxeditor.dialogs.filteredSelection.AbstractFilteredCdmResourceSelectionDialog#getPersistentObject(java.util.UUID)
         */
@@ -71,11 +71,11 @@ public class FieldObservationSelectionDialog extends
        @Override
        protected FieldUnit getPersistentObject(UUID uuid) {
                Object object = CdmStore.getService(IOccurrenceService.class).load(uuid);
-               
+
                SpecimenOrObservationBase specimenObservationBase = (SpecimenOrObservationBase) HibernateProxyHelper.deproxy(object);
-               
-               if(specimenObservationBase instanceof FieldUnit){       
-                       return (FieldUnit) specimenObservationBase; 
+
+               if(specimenObservationBase instanceof FieldUnit){
+                       return (FieldUnit) specimenObservationBase;
                }
                StoreUtil.error(this.getClass(), "Selected object is not a field observation", null);
                return null;
@@ -99,6 +99,6 @@ public class FieldObservationSelectionDialog extends
        /** {@inheritDoc} */
        @Override
        protected String getNewWizardLinkText() {
-               return "Click link to create a new <A>Field Observation</A>.";
+               return String.format("Create a new <a>%1s</a>", "Field Observation ");
        }
 }
index 7f4ba7e51fda3649e1a84ca9071efc1e2bef6199..24374e69867d40a5fe1af9ebd055db1d19b5d905 100644 (file)
@@ -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() : "";
index a480daadf4c630d38fc0eadfce9322007ef417e0..45c9980fc664230c6d6de98e7ba4f30c3df82d0f 100644 (file)
@@ -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.
 */
@@ -37,7 +37,7 @@ public class GroupSelectionDialog extends
                                "Choose Group", false, GroupSelectionDialog.class.getCanonicalName(), group);
                return getSelectionFromDialog(dialog);
        }
-       
+
        /**
         * @param shell
         * @param conversation
@@ -58,12 +58,12 @@ public class GroupSelectionDialog extends
        @Override
        protected void initModel() {
                List<Group> groups = CdmStore.getService(IGroupService.class).list(Group.class, null, null, null, null);
-               
+
                model = new ArrayList<UuidAndTitleCache<Group>>();
-               
+
                for(Group group : groups){
                        model.add(new UuidAndTitleCache<Group>(Group.class, group.getUuid(),String.format("%s", group.getName())));
-               }       
+               }
        }
 
        /* (non-Javadoc)
@@ -71,7 +71,7 @@ public class GroupSelectionDialog extends
         */
        @Override
        protected String getNewWizardLinkText() {
-               return "Create a new <A>Group</A>.";
+               return String.format("Create a new <a>%1s</a>", "Group ");
        }
 
        /* (non-Javadoc)
@@ -89,7 +89,7 @@ public class GroupSelectionDialog extends
        protected Group getPersistentObject(UUID uuid) {
                return CdmStore.getService(IGroupService.class).load(uuid);
        }
-       
+
        @Override
        protected String getTitle(Group group) {
                return group != null ? group.getName() : "";
index 9312db0b6cc1f1f52610d915cf76ada41357d4fe..cd60c33018793c4f0f925b32fd761da126448a49 100644 (file)
@@ -76,7 +76,7 @@ public class InstitutionSelectionDialog extends
         */
        @Override
        protected String getNewWizardLinkText() {
-               return "Create a new <a>Institution</a>.";
+               return String.format("Create a new <a>%1s</a>", "Institution ");
        }
 
        /* (non-Javadoc)
index c9effb37d937869835a4ec2eb28d3c83a44b7412..18555cafa5d44631d12cb85d420f58080dc62186 100644 (file)
@@ -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.
 */
@@ -45,7 +45,7 @@ public class NameSelectionDialog extends AbstractFilteredCdmResourceSelectionDia
                                "Choose a name", false, name);
                return getSelectionFromDialog(dialog);
        }
-       
+
        /**
         * <p>Constructor for FilteredNameSelectionDialog.</p>
         *
@@ -74,7 +74,7 @@ public class NameSelectionDialog extends AbstractFilteredCdmResourceSelectionDia
        /** {@inheritDoc} */
        @Override
        protected void initModel() {
-               model = CdmStore.getService(INameService.class).getUuidAndTitleCache();         
+               model = CdmStore.getService(INameService.class).getUuidAndTitleCache();
        }
 
        /** {@inheritDoc} */
@@ -86,6 +86,6 @@ public class NameSelectionDialog extends AbstractFilteredCdmResourceSelectionDia
        /** {@inheritDoc} */
        @Override
        protected String getNewWizardLinkText() {
-               return "Click <A>here</A> to create a new name.";
+               return String.format("Create a new <a>%1s</a>", "Name ");
        }
 }
index 2615d33199e2f77f26e85d0fe26f4af38dac3af0..f43399142cfd9d64b25c9d11dad73b657aae3182 100644 (file)
@@ -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.
 */
@@ -44,7 +44,7 @@ public class NomenclaturalAuthorTeamSelectionDialog extends
                                "Choose Author Team", false, NomenclaturalAuthorTeamSelectionDialog.class.getCanonicalName(), team);
                return getSelectionFromDialog(dialog);
        }
-       
+
        /**
         * <p>Constructor for FilteredNomenclaturalAuthorTeamSelectionDialog.</p>
         *
@@ -59,7 +59,7 @@ public class NomenclaturalAuthorTeamSelectionDialog extends
                        boolean multi, String settings, Team agent) {
                super(shell, conversation, title, multi, settings, agent);
        }
-       
+
        /** {@inheritDoc} */
        @Override
        protected AbstractNewEntityWizard getNewEntityWizard(String parameter) {
@@ -69,7 +69,7 @@ public class NomenclaturalAuthorTeamSelectionDialog extends
        /** {@inheritDoc} */
        @Override
        protected String getNewWizardLinkText() {
-               return "Click link to create a new <A>Team</A>.";
+               return String.format("Create a new <a>%1s</a>", "Team ");
        }
 
        /** {@inheritDoc} */
index 5b59d029ede812bacffdb6d826193ae510f41408..15bb0bdbf47d79db9c108aa3a12ef4cfb0e20e00 100644 (file)
@@ -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.
 */
@@ -30,7 +30,7 @@ import eu.etaxonomy.taxeditor.store.CdmStore;
  */
 public class PersonSelectionDialog extends
                        AbstractFilteredCdmResourceSelectionDialog<Person> {
-       
+
        /**
         * <p>select</p>
         *
@@ -42,9 +42,9 @@ public class PersonSelectionDialog extends
        public static Person select(Shell shell, ConversationHolder conversation, Person person){
                PersonSelectionDialog dialog = new PersonSelectionDialog(shell, conversation,
                                "Choose a person", false, PersonSelectionDialog.class.getCanonicalName(), person);
-               return getSelectionFromDialog(dialog); 
+               return getSelectionFromDialog(dialog);
        }
-       
+
        /**
         * <p>Constructor for FilteredPersonSelectionDialog.</p>
         *
@@ -89,6 +89,6 @@ public class PersonSelectionDialog extends
        /** {@inheritDoc} */
        @Override
        protected String getNewWizardLinkText() {
-               return "Click link to create a new <A>Person</A>.";
+               return String.format("Create a new <a>%1s</a>", "Person ");
        }
 }
index d2858ccdd53b93164f672ba8630a6b213044603f..db37406d42e9673f27a5e6c072bef21039db4c17 100644 (file)
@@ -100,7 +100,7 @@ public class ReferenceSelectionDialog extends AbstractFilteredCdmResourceSelecti
        /** {@inheritDoc} */
        @Override
        protected String getNewWizardLinkText() {
-               return "Click <A>here</A> to create a new reference.";
+               return String.format("Create a new <a>%1s</a>", "Reference ");
        }
 
 }
index 954e0aec8bd28e752ac12fb98efe695cecfae10e..ec2e3fb76f7fefa3391df0e638e51c5b580738f5 100644 (file)
@@ -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.
 */
@@ -30,7 +30,7 @@ import eu.etaxonomy.taxeditor.store.CdmStore;
  */
 public class TeamSelectionDialog extends
                AbstractFilteredCdmResourceSelectionDialog<Team> {
-       
+
        /**
         * <p>select</p>
         *
@@ -44,7 +44,7 @@ public class TeamSelectionDialog extends
                                "Choose Team", false, TeamSelectionDialog.class.getCanonicalName(), team);
                return getSelectionFromDialog(dialog);
        }
-       
+
        /**
         * <p>Constructor for FilteredTeamSelectionDialog.</p>
         *
@@ -79,7 +79,7 @@ public class TeamSelectionDialog extends
        /** {@inheritDoc} */
        @Override
        protected String getNewWizardLinkText() {
-               return "Click link to create a new <A>Team</A>.";
+               return String.format("Create a new <a>%1s</a>", "Team ");
        }
 
        /** {@inheritDoc} */
index d15e451639d8bfb4beb6a886537301378305add7..a73d9443d726d1f59b7f136accf89f6556988c41 100644 (file)
@@ -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,7 +33,7 @@ public class UserSelectionDialog extends
                AbstractFilteredCdmResourceSelectionDialog<User> {
 
        /**
-        * 
+        *
         * @param shell
         * @param conversation
         * @param user
@@ -44,7 +44,7 @@ public class UserSelectionDialog extends
                                "Choose User", false, UserSelectionDialog.class.getCanonicalName(), user);
                return getSelectionFromDialog(dialog);
        }
-       
+
        /**
         * @param shell
         * @param conversation
@@ -64,12 +64,12 @@ public class UserSelectionDialog extends
        @Override
        protected void initModel() {
                List<User> users = CdmStore.getService(IUserService.class).list(User.class, null, null, null, null);
-               
+
                model = new ArrayList<UuidAndTitleCache<User>>();
-               
+
                for(User user : users){
                        model.add(new UuidAndTitleCache<User>(User.class, user.getUuid(),String.format("%s, %s", user.getUsername(), user.getPerson())));
-               }                
+               }
        }
 
        /* (non-Javadoc)
@@ -77,7 +77,7 @@ public class UserSelectionDialog extends
         */
        @Override
        protected String getNewWizardLinkText() {
-               return "Create a new <A>User</A>.";
+               return String.format("Create a new <a>%1s</a>", "User ");
        }
 
        /* (non-Javadoc)
@@ -100,5 +100,5 @@ public class UserSelectionDialog extends
        protected String getTitle(User user) {
                return user != null ? user.getUsername() : "";
        }
-       
+
 }