Fixed #2435
authorn.hoffmann <n.hoffmann@localhost>
Tue, 28 Feb 2012 14:53:07 +0000 (14:53 +0000)
committern.hoffmann <n.hoffmann@localhost>
Tue, 28 Feb 2012 14:53:07 +0000 (14:53 +0000)
16 files changed:
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/TextHelper.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/AbstractNewEntityWizard.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewClassificationWizard.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewCollectionWizard.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewDerivedUnitBaseWizard.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewFieldObservationWizard.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewGroupWizard.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewInstitutionWizard.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewNonViralNameWizard.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewPersonWizard.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewPolytomousKeyWizard.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewReferenceWizard.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewTaxonNodeWizard.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewTeamWizard.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewUserWizard.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/EditFromSelectionWizard.java

index 51681507807b4d4fe95159b3dd2a678b6ac92f7e..5c2d7a379c93c9bead6f68b2ffeb944c63db3e3f 100644 (file)
@@ -62,4 +62,9 @@ public class TextHelper {
                return textValue;
                
        }
+       
+       public static String deproxyClassName(Class clazz){
+               String name = clazz.getSimpleName();
+               return name.substring(0, name.indexOf("_$$"));
+       }
 }
index fee26b5c69658e984556ce720920011128d52691..f2657aae1f13b8d4400d0e925b477cc3d0f1a9f9 100644 (file)
@@ -50,9 +50,16 @@ public abstract class AbstractNewEntityWizard<T> extends Wizard implements
         * @param <T> a T object.
         */
        public AbstractNewEntityWizard(){
-               setWindowTitle("New Entity");
+               setWindowTitle(String.format("New %s", getEntityName()));
        }
        
+       /**
+        * FIXME there might be a smarter way to do this,
+        * 
+        * @return
+        */
+       protected abstract String getEntityName();
+
        /* (non-Javadoc)
         * @see org.eclipse.jface.wizard.Wizard#performFinish()
         */
index b105ac6a6ce4d00920184b9c0d2702bd9528495c..6b23b4bc04b8974d7f04b79dae779a71fa605be5 100644 (file)
@@ -32,7 +32,7 @@ public class NewClassificationWizard extends AbstractNewEntityWizard<Classificat
         */
        @Override
        public void setEntity(Classification entity) {
-               setWindowTitle("Edit Classification");
+               setWindowTitle(String.format("Edit %s", getEntityName()));
                entity = CdmStore.getService(IClassificationService.class).load(entity.getUuid());
                super.setEntity(entity);
        }
@@ -52,4 +52,9 @@ public class NewClassificationWizard extends AbstractNewEntityWizard<Classificat
        protected Classification createNewEntity() {
                return Classification.NewInstance(null);
        }
+
+       @Override
+       protected String getEntityName() {
+               return "Classification";
+       }
 }
index 7ec742e5c444f73e1a0258578419b4577ecf27b2..d28f0ec5d6ddf22aebde5d18e77193ed517b6ba5 100644 (file)
@@ -47,5 +47,10 @@ public class NewCollectionWizard extends AbstractNewEntityWizard<Collection> {
        protected Collection createNewEntity() {
                return Collection.NewInstance();
        }
+
+       @Override
+       protected String getEntityName() {
+               return "Collection";
+       }
        
 }
index d64adb137642bac0e8c8e4c062179a0e3fc2f660..d132f0544eb0b3beb48ff8a99753768ec1dd666d 100644 (file)
@@ -72,4 +72,11 @@ public class NewDerivedUnitBaseWizard extends AbstractNewEntityWizard<DerivedUni
        protected void saveEntity() {
                CdmStore.getService(IOccurrenceService.class).saveOrUpdate(getEntity());
        }
+
+       @Override
+       protected String getEntityName() {
+               return "Specimen";
+       }
+       
+       
 }
index d25a83869fbeee4670b394b73dff0186e6915025..925aead2a171bf33a16efd6bd1a18ad22050cf27 100644 (file)
@@ -40,4 +40,9 @@ public class NewFieldObservationWizard extends AbstractNewEntityWizard<FieldObse
        protected void saveEntity() {
                CdmStore.getService(IOccurrenceService.class).saveOrUpdate(getEntity());
        }
+
+       @Override
+       protected String getEntityName() {
+               return "Field Observation";
+       }
 }
index 5cf320748e9ba554c05670a177cedd683dfd6690..ad6c3ac255de9a5d835726ce5b3b8ef04734a295 100644 (file)
@@ -49,4 +49,9 @@ public class NewGroupWizard extends AbstractNewEntityWizard<Group> {
                return Group.NewInstance();
        }
 
+       @Override
+       protected String getEntityName() {
+               return "Group";
+       }
+
 }
index 50e1117d35239199953000d78c69e8799ef592df..1eba0be640dbf9de4c056c80c32d23bdedc40e47 100644 (file)
@@ -46,4 +46,9 @@ public class NewInstitutionWizard extends AbstractNewEntityWizard<Institution> {
                return Institution.NewInstance();
        }
 
+       @Override
+       protected String getEntityName() {
+               return "Institution";
+       }
+
 }
index c82a842be4398b4f31dde650e770daeb2a07e4e7..9ab033f49d32d61679c873dd9ec5d0cc357084e5 100644 (file)
@@ -51,4 +51,9 @@ public class NewNonViralNameWizard extends AbstractNewEntityWizard<NonViralName>
        protected void saveEntity() {
                CdmStore.getService(INameService.class).saveOrUpdate(getEntity());
        }
+
+       @Override
+       protected String getEntityName() {
+               return "Scientific Name";
+       }
 }
index 2268713342c95ad21c1e9d7dfa0cb52514c1ee9d..da18787665f6b06ea4ce61095da79e6055b150b8 100644 (file)
@@ -41,4 +41,9 @@ public class NewPersonWizard extends AbstractNewEntityWizard<Person> {
        protected void saveEntity() {
                CdmStore.getService(IAgentService.class).saveOrUpdate(getEntity());
        }
+
+       @Override
+       protected String getEntityName() {
+               return "Person";
+       }
 }
index ec67349a0f5c1f6b4af7b466674e6a7630908a9b..7b7624a7361c96aecc332e82442da9812f959df3 100644 (file)
@@ -35,4 +35,9 @@ public class NewPolytomousKeyWizard extends AbstractNewEntityWizard<PolytomousKe
                return PolytomousKey.NewInstance();
        }
 
+       @Override
+       protected String getEntityName() {
+               return "Polytomous Key";
+       }
+
 }
index 91131aa736c68df006757c12a102602751695de1..f1b19c94a5dac2417fac4d26252401f63d027f98 100644 (file)
@@ -54,4 +54,9 @@ public class NewReferenceWizard extends AbstractNewEntityWizard<Reference> {
                super.setEntity(entity);
                referencePage.getDetailElement().setEntity(entity);
        }
+
+       @Override
+       protected String getEntityName() {
+               return "Reference";
+       }
 }
index 983785da1fc30be6b6f58fe5a82db84dafc7a445..f0e65cbd5134ab5f0ac512e08deb4e2c2c07da35 100644 (file)
@@ -105,5 +105,10 @@ public class NewTaxonNodeWizard extends AbstractNewEntityWizard<ITreeNode>{
        public ITreeNode getParentTreeNode(){
                return taxonNodePage.getParentTreeNode();
        }
+
+       @Override
+       protected String getEntityName() {
+               return "Taxon";
+       }
        
 }
\ No newline at end of file
index 4e50f0c6b8fcc706b27bb319e13ed595dbea6866..050b5984334b77d838c98d2b54b95715fcd87b6c 100644 (file)
@@ -44,4 +44,9 @@ public class NewTeamWizard extends AbstractNewEntityWizard<Team> {
        protected void saveEntity() {
                CdmStore.getService(IAgentService.class).saveOrUpdate(getEntity());
        }
+
+       @Override
+       protected String getEntityName() {
+               return "Team";
+       }
 }
index 61243981c3c76b1fce788e3d0e03276952efb08f..aa3cd19dd733d2ae274bbc270091134c2b05eb6c 100644 (file)
@@ -32,4 +32,9 @@ public class NewUserWizard extends AbstractNewEntityWizard<User> {
                return User.NewInstance(null, null);
        }
 
+       @Override
+       protected String getEntityName() {
+               return "Institution";
+       }
+
 }
index 5319bb240692070558de0648b9871b33853a2a4f..7c2da263c727d4019e6e7fb5441488db986f9ce2 100644 (file)
@@ -28,6 +28,7 @@ import eu.etaxonomy.cdm.model.name.NonViralName;
 import eu.etaxonomy.cdm.model.occurrence.Collection;
 import eu.etaxonomy.cdm.model.occurrence.DerivedUnitBase;
 import eu.etaxonomy.cdm.model.reference.Reference;
+import eu.etaxonomy.taxeditor.model.TextHelper;
 import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
 import eu.etaxonomy.taxeditor.store.StoreUtil;
 import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
@@ -69,7 +70,7 @@ public class EditFromSelectionWizard extends Wizard implements
         */
        public EditFromSelectionWizard(EntitySelectionElement selectionElement) {
                this.selectionElement = selectionElement;
-               this.setWindowTitle("Edit Entity");
+               this.setWindowTitle(String.format("Edit %s", TextHelper.deproxyClassName(selectionElement.getEntity().getClass())));
        }
 
        /** {@inheritDoc} */