solved #2990 (implement missing parts of Groups admin details view)

diff --git a/.gitattributes b/.gitattributes
index 58caab21af2db3d69d916225f416676ba88aced7..832721e8e5ed2bb4fec21c49412076370e075097 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -1152,6 +1152,7 @@ eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewC
 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewCollectionWizard.java -text
 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewDerivedUnitBaseWizard.java -text
 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewFieldObservationWizard.java -text
+eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewGrantedAuthorityWizard.java -text
 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewGroupWizard.java -text
 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewInstitutionWizard.java -text
 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewNonViralNameWizard.java -text
@@ -1353,11 +1354,14 @@ eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/des
 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/operation/ChangeDescriptionElementType.java -text
 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/feature/FeatureDistributionDetailElement.java -text
 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/feature/FeatureDistributionDetailSection.java -text
-eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/group/GrantedAuthorityDetailElement.java -text
-eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/group/GrantedAuthorityDetailSection.java -text
+eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/grantedAuthority/GrantedAuthorityCollectionElement.java -text
+eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/grantedAuthority/GrantedAuthorityDetailElement.java -text
+eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/grantedAuthority/GrantedAuthorityDetailSection.java -text
+eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/grantedAuthority/GrantedAuthorityDetailWizardPage.java -text
 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/group/GroupDetailElement.java -text
 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/group/GroupDetailSection.java -text
 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/group/GroupDetailWizardPage.java -text
+eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/group/GroupSelectionElement.java -text
 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/group/MemberDetailElement.java -text
 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/group/MemberDetailSection.java -text
 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/key/GeographicalScopeDetailSection.java -text

diff --git a/eu.etaxonomy.taxeditor.cdmlib/.classpath b/eu.etaxonomy.taxeditor.cdmlib/.classpath
index 73a0fced3936375c13261566b1e026de4c12345a..9114f423cfd10c39850a73d053faec653585ed6c 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/.classpath
+++ b/eu.etaxonomy.taxeditor.cdmlib/.classpath
@@ -114,7 +114,7 @@
        <classpathentry exported="true" kind="lib" path="lib/cdmlib-io-3.0.13-SNAPSHOT-sources.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/cdmlib-io-3.0.13-SNAPSHOT.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/cdmlib-model-3.0.13-SNAPSHOT-sources.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-model-3.0.13-SNAPSHOT.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-model-3.0.13-SNAPSHOT.jar" sourcepath="lib/cdmlib-model-3.0.13-SNAPSHOT-sources.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/cdmlib-persistence-3.0.13-SNAPSHOT-sources.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/cdmlib-persistence-3.0.13-SNAPSHOT.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/cdmlib-print-3.0.13-SNAPSHOT-sources.jar"/>

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewGrantedAuthorityWizard.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewGrantedAuthorityWizard.java
new file mode 100644 (file)
index 0000000..3515831
--- /dev/null
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewGrantedAuthorityWizard.java
@@ -0,0 +1,61 @@
+// $Id$
+/**
+* Copyright (C) 2007 EDIT
+* 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.
+*/
+
+package eu.etaxonomy.taxeditor.newWizard;
+
+import eu.etaxonomy.cdm.api.service.IGrantedAuthorityService;
+import eu.etaxonomy.cdm.api.service.IGroupService;
+import eu.etaxonomy.cdm.model.common.GrantedAuthorityImpl;
+import eu.etaxonomy.taxeditor.store.CdmStore;
+import eu.etaxonomy.taxeditor.ui.section.grantedAuthority.GrantedAuthorityDetailWizardPage;
+import eu.etaxonomy.taxeditor.ui.section.group.GroupDetailWizardPage;
+
+/**
+ * @author a.kohlbecker
+ * @created Sept 13 2012
+ */
+public class NewGrantedAuthorityWizard extends AbstractNewEntityWizard<GrantedAuthorityImpl> {
+       
+       private GrantedAuthorityDetailWizardPage authorityPage;
+       
+       /* (non-Javadoc)
+        * @see org.eclipse.jface.wizard.Wizard#addPages()
+        */
+       @Override
+       public void addPages() {
+               authorityPage = new GrantedAuthorityDetailWizardPage(formFactory, getConversationHolder(), getEntity());
+               super.addPage(authorityPage);
+       }
+
+
+       /* (non-Javadoc)
+        * @see eu.etaxonomy.taxeditor.newWizard.AbstractNewEntityWizard#saveEntity()
+        */
+       @Override
+       protected void saveEntity() {
+               CdmStore.getService(IGrantedAuthorityService.class).saveOrUpdate(getEntity());
+       }
+
+       /* (non-Javadoc)
+        * @see eu.etaxonomy.taxeditor.newWizard.AbstractNewEntityWizard#createNewEntity()
+        */
+       @Override
+       protected GrantedAuthorityImpl createNewEntity() {
+               return GrantedAuthorityImpl.NewInstance();
+       }
+
+       /* (non-Javadoc)
+        * @see eu.etaxonomy.taxeditor.newWizard.AbstractNewEntityWizard#getEntityName()
+        */
+       @Override
+       protected String getEntityName() {
+               return "GrantedAuthority";
+       }
+}

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 794f7b6955b69744835dd0ae871ddec71b28dd4a..1cd609d161b3943ca5fcaefd69bdd2a7b0355771 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
@@ -24,6 +24,7 @@ import eu.etaxonomy.cdm.api.service.IUserService;
 import eu.etaxonomy.cdm.model.common.GrantedAuthorityImpl;
 import eu.etaxonomy.cdm.model.common.UuidAndTitleCache;
 import eu.etaxonomy.taxeditor.newWizard.AbstractNewEntityWizard;
+import eu.etaxonomy.taxeditor.newWizard.NewGrantedAuthorityWizard;
 import eu.etaxonomy.taxeditor.newWizard.NewGroupWizard;
 import eu.etaxonomy.taxeditor.store.CdmStore;
 
@@ -83,7 +84,7 @@ public class GrantedAuthoritySelectionDialog extends  AbstractFilteredCdmResource
         */
        @Override
        protected AbstractNewEntityWizard getNewEntityWizard(String parameter) {
-               return new NewGroupWizard();
+               return new NewGrantedAuthorityWizard();
        }
 
        /* (non-Javadoc)

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/SelectionDialogFactory.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/SelectionDialogFactory.java
index 2cab2121562be0016a490a288ae21d89ffc95520..cf59a0617e6b5a46c71788e674cacfe371f6f23e 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/SelectionDialogFactory.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/SelectionDialogFactory.java
@@ -16,6 +16,7 @@ import eu.etaxonomy.cdm.model.agent.AgentBase;
 import eu.etaxonomy.cdm.model.agent.Institution;
 import eu.etaxonomy.cdm.model.agent.Person;
 import eu.etaxonomy.cdm.model.agent.Team;
+import eu.etaxonomy.cdm.model.common.GrantedAuthorityImpl;
 import eu.etaxonomy.cdm.model.common.Group;
 import eu.etaxonomy.cdm.model.common.ICdmBase;
 import eu.etaxonomy.cdm.model.common.User;
@@ -101,6 +102,9 @@ public class SelectionDialogFactory {
                if(clazz.equals(User.class)){
                        return (T) UserSelectionDialog.select(shell, conversation, (User) curentSelection);
                }
+               if(clazz.equals(GrantedAuthorityImpl.class)){
+                       return (T) GrantedAuthoritySelectionDialog.select(shell, conversation, (GrantedAuthorityImpl) curentSelection);
+               }
                if (clazz.equals(Person.class)){
                        return (T) PersonSelectionDialog.select(shell, conversation, (Person) curentSelection);
                }

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/CdmFormFactory.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/CdmFormFactory.java
index 091dd7ee82ef577b09db3565542f9b8b8a846d8f..068c03b9e3a5150e0e11f6c5fb448b66944a9605 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/CdmFormFactory.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/CdmFormFactory.java
@@ -49,6 +49,7 @@ import eu.etaxonomy.cdm.model.common.Credit;
 import eu.etaxonomy.cdm.model.common.DefinedTermBase;
 import eu.etaxonomy.cdm.model.common.DescriptionElementSource;
 import eu.etaxonomy.cdm.model.common.Extension;
+import eu.etaxonomy.cdm.model.common.GrantedAuthorityImpl;
 import eu.etaxonomy.cdm.model.common.Group;
 import eu.etaxonomy.cdm.model.common.ICdmBase;
 import eu.etaxonomy.cdm.model.common.IDefinedTerm;
@@ -148,8 +149,9 @@ import eu.etaxonomy.taxeditor.ui.section.description.detail.TaxonInteractionDeta
 import eu.etaxonomy.taxeditor.ui.section.description.detail.TextDataDetailElement;
 import eu.etaxonomy.taxeditor.ui.section.feature.FeatureDistributionDetailElement;
 import eu.etaxonomy.taxeditor.ui.section.feature.FeatureDistributionDetailSection;
-import eu.etaxonomy.taxeditor.ui.section.group.GrantedAuthorityDetailElement;
-import eu.etaxonomy.taxeditor.ui.section.group.GrantedAuthorityDetailSection;
+import eu.etaxonomy.taxeditor.ui.section.grantedAuthority.GrantedAuthorityCollectionElement;
+import eu.etaxonomy.taxeditor.ui.section.grantedAuthority.GrantedAuthorityDetailElement;
+import eu.etaxonomy.taxeditor.ui.section.grantedAuthority.GrantedAuthorityDetailSection;
 import eu.etaxonomy.taxeditor.ui.section.group.GroupDetailElement;
 import eu.etaxonomy.taxeditor.ui.section.group.GroupDetailSection;
 import eu.etaxonomy.taxeditor.ui.section.group.MemberDetailElement;
@@ -1373,43 +1375,44 @@ public class CdmFormFactory extends FormToolkit {
         * 
         */
        public static enum DetailType {
-               NONVIRALNAME, 
-               SCIENTIFICNAME, 
-               REFERENCEBASE, 
-               NOMENCLATURALREFERENCE, 
-               TAXONBASE, 
                AUTHORSHIP, 
-               TEAM, 
-               PERSON, 
+               CLASSIFICATION, 
+               COLLECTION, 
+               DERIVED_UNIT, 
+               DERIVED_UNIT_FACADE, 
+               DERIVED_UNIT_GENERAL, 
                DESCRIPTION, 
                DESCRIPTIONELEMENT, 
-               PARSINGMESSAGE, 
-               NAMERELATIONSHIP, 
-               TEAMORPERSONBASE, 
-               MEDIA, 
+               DETERMINATION, 
+               FEATURE_DISTRIBUTION, 
                FIELD_OBSERVATION, 
-               DERIVED_UNIT_FACADE, 
                GATHERING_EVENT, 
-               DERIVED_UNIT, 
+               GRANTEDAUTHORITY,
+               GROUP, 
+               HYBRID, 
+               INSTITUTION, 
+               MEDIA, 
+               NAMED_AREA, 
+               NAMED_AREA_LEVEL, 
+               NAMERELATIONSHIP, 
                NATURAL_LANGUAGE, 
-               FEATURE_DISTRIBUTION, 
-               CLASSIFICATION, 
-               TAXON_NODE, 
-               COLLECTION, 
+               NOMENCLATURALREFERENCE, 
+               NONVIRALNAME, 
+               PARSINGMESSAGE, 
+               PERSON, 
                POLYTOMOUS_KEY, 
                POLYTOMOUS_KEY_NODE, 
-               INSTITUTION, 
-               DERIVED_UNIT_GENERAL, 
-               HYBRID, 
-               USER, 
-               GROUP, 
-               DETERMINATION, 
-               TAXON_RELATIONSHIP, 
+               REFERENCEBASE, 
                REFERENCED_ENTITY, 
+               SCIENTIFICNAME, 
+               TAXON_NODE, 
+               TAXON_RELATIONSHIP, 
+               TAXONBASE, 
+               TEAM, 
+               TEAMORPERSONBASE, 
                TERM_VOCABULARY,
-               NAMED_AREA, 
-               NAMED_AREA_LEVEL, 
-               USE_RECORD
+               USE_RECORD,
+               USER
        }
        
        public AbstractFormSection createDefinedTermDetailSection(Class definedTermClass,
@@ -1729,6 +1732,9 @@ public class CdmFormFactory extends FormToolkit {
                case GROUP:
                        element = new GroupDetailElement(this, parentElement);
                        break;
+               case GRANTEDAUTHORITY:
+                       element = new GrantedAuthorityDetailElement(this, parentElement);
+                       break;
                case DETERMINATION:
                        element = new DeterminationDetailElement(this, parentElement);
                        break;
@@ -2083,8 +2089,8 @@ public class CdmFormFactory extends FormToolkit {
                        element = new MemberDetailElement(this, parentElement,
                                        (User) entity, removeListener, style);
                } else if (entity instanceof GrantedAuthority) {
-                       element = new GrantedAuthorityDetailElement(this, parentElement,
-                                       (GrantedAuthority) entity, removeListener, style);
+                       element = new GrantedAuthorityCollectionElement(this, parentElement,
+                                       (GrantedAuthorityImpl) entity, removeListener, style);
                } else if (entity instanceof Group) {
                        element = new GroupsByUserDetailElement(this, parentElement,
                                        (Group) entity, removeListener, style);

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/group/GrantedAuthorityDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/grantedAuthority/GrantedAuthorityCollectionElement.java
similarity index 50%
rename from eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/group/GrantedAuthorityDetailElement.java
rename to eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/grantedAuthority/GrantedAuthorityCollectionElement.java
index e614cd2efbbb7e7b5a4428e13f2d9160489b632f..e0a6ffcababf54aab63cb7d5ef1c740b764ba06b 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/group/GrantedAuthorityDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/grantedAuthority/GrantedAuthorityCollectionElement.java
@@ -1,6 +1,6 @@
 // $Id$
 /**
-* Copyright (C) 2007 EDIT
+* Copyright (C) 2012 EDIT
 * European Distributed Institute of Taxonomy 
 * http://www.e-taxonomy.eu
 * 
@@ -8,53 +8,52 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.ui.section.group;
+package eu.etaxonomy.taxeditor.ui.section.grantedAuthority;
 
 import org.eclipse.swt.events.SelectionListener;
-import org.springframework.security.core.GrantedAuthority;
+import org.eclipse.swt.graphics.Color;
 
+import eu.etaxonomy.cdm.model.common.GrantedAuthorityImpl;
+import eu.etaxonomy.cdm.model.common.Group;
 import eu.etaxonomy.taxeditor.ui.element.AbstractFormSection;
 import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
 import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement;
 import eu.etaxonomy.taxeditor.ui.section.AbstractEntityCollectionElement;
+import eu.etaxonomy.taxeditor.ui.selection.EntitySelectionElement;
 
 /**
- * @author n.hoffmann
- * @created Mar 9, 2011
- * @version 1.0
+ * @author a.kohlbecker
+ * @date Sept 12 2012
+ *
  */
-public class GrantedAuthorityDetailElement extends AbstractEntityCollectionElement<GrantedAuthority> {
+public class GrantedAuthorityCollectionElement extends AbstractEntityCollectionElement<GrantedAuthorityImpl> {
+       
+       private EntitySelectionElement<GrantedAuthorityImpl> selection_authority;
 
-       /**
-        * @param formFactory
-        * @param section
-        * @param entity
-        * @param removeListener
-        * @param backgroundColor
-        * @param style
-        */
-       public GrantedAuthorityDetailElement(CdmFormFactory formFactory,
-                       AbstractFormSection section, GrantedAuthority entity,
+
+       public GrantedAuthorityCollectionElement(CdmFormFactory formFactory,
+                       AbstractFormSection section, GrantedAuthorityImpl entity,
                        SelectionListener removeListener, int style) {
-               super(formFactory, section, entity, removeListener, null, style);
+               super(formFactory, section, entity, removeListener, null, style);               
+               // TODO Auto-generated constructor stub
        }
 
        /* (non-Javadoc)
         * @see eu.etaxonomy.taxeditor.ui.section.AbstractEntityCollectionElement#setEntity(java.lang.Object)
         */
        @Override
-       public void setEntity(GrantedAuthority entity) {
-               // TODO Auto-generated method stub
+       public void setEntity(GrantedAuthorityImpl entity) {
+               selection_authority.setEntity(entity);
                
        }
 
        /* (non-Javadoc)
-        * @see eu.etaxonomy.taxeditor.ui.section.AbstractEntityCollectionElement#createControls(eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement, int)
+        * @see eu.etaxonomy.taxeditor.ui.section.AbstractEntityCollectionElement#createControls(eu.etaxonomy.taxeditor.ui.element.ICdmFormElement, int)
         */
        @Override
        public void createControls(ICdmFormElement element, int style) {
-               // TODO Auto-generated method stub
-               
+               selection_authority = formFactory.createSelectionElement(
+                                       GrantedAuthorityImpl.class, getConversationHolder(), element, "", getEntity(), EntitySelectionElement.SELECTABLE, style);
        }
 
        /* (non-Javadoc)
@@ -62,9 +61,10 @@ public class GrantedAuthorityDetailElement extends AbstractEntityCollectionEleme
         */
        @Override
        public void handleEvent(Object eventSource) {
-               // TODO Auto-generated method stub
-               
+               if (eventSource == selection_authority) {
+                       setEntity(selection_authority.getEntity());
+               }
        }
 
-       
+
 }

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/grantedAuthority/GrantedAuthorityDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/grantedAuthority/GrantedAuthorityDetailElement.java
new file mode 100644 (file)
index 0000000..e443d38
--- /dev/null
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/grantedAuthority/GrantedAuthorityDetailElement.java
@@ -0,0 +1,55 @@
+// $Id$
+/**
+* Copyright (C) 2007 EDIT
+* 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.
+*/
+
+package eu.etaxonomy.taxeditor.ui.section.grantedAuthority;
+
+import eu.etaxonomy.cdm.model.common.GrantedAuthorityImpl;
+import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.element.TextWithLabelElement;
+import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement;
+
+/**
+ * @author n.hoffmann
+ * @author a.kohlbecker
+ * @created Mar 9, 2011
+ * @version 1.0
+ */
+public class GrantedAuthorityDetailElement extends AbstractCdmDetailElement<GrantedAuthorityImpl> {
+
+       private TextWithLabelElement text_authority;
+       
+       /**
+        * @param formFactory
+        * @param formElement
+        */
+       public GrantedAuthorityDetailElement(CdmFormFactory formFactory,
+                       ICdmFormElement formElement) {
+               super(formFactory, formElement);
+       }
+
+       @Override
+       protected void createControls(ICdmFormElement formElement,
+                       GrantedAuthorityImpl entity, int style) {
+               text_authority = formFactory.createTextWithLabelElement(formElement, "Authority", entity.getAuthority(), style);
+               
+       }
+
+       @Override
+       public void handleEvent(Object eventSource) {
+               if(eventSource == text_authority){
+                       getEntity().setAuthority(text_authority.getText());
+               }
+               
+       }
+
+
+       
+}

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/group/GrantedAuthorityDetailSection.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/grantedAuthority/GrantedAuthorityDetailSection.java
similarity index 98%
rename from eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/group/GrantedAuthorityDetailSection.java
rename to eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/grantedAuthority/GrantedAuthorityDetailSection.java
index aebc5a524109c56021a19e603178f0a73136a331..da87734a8deafc1046442532dfc9d36975345262 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/group/GrantedAuthorityDetailSection.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/grantedAuthority/GrantedAuthorityDetailSection.java
@@ -8,7 +8,7 @@
  * See LICENSE.TXT at the top of this package for the full license terms.
  */
 
-package eu.etaxonomy.taxeditor.ui.section.group;
+package eu.etaxonomy.taxeditor.ui.section.grantedAuthority;
 
 import java.util.Collection;
 

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/grantedAuthority/GrantedAuthorityDetailWizardPage.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/grantedAuthority/GrantedAuthorityDetailWizardPage.java
new file mode 100644 (file)
index 0000000..47d911d
--- /dev/null
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/grantedAuthority/GrantedAuthorityDetailWizardPage.java
@@ -0,0 +1,42 @@
+// $Id$
+/**
+* Copyright (C) 2007 EDIT
+* 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.
+*/
+package eu.etaxonomy.taxeditor.ui.section.grantedAuthority;
+
+import org.eclipse.swt.SWT;
+
+import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
+import eu.etaxonomy.cdm.model.common.GrantedAuthorityImpl;
+import eu.etaxonomy.taxeditor.ui.element.AbstractCdmEntityWizardPage;
+import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory.DetailType;
+import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement;
+
+/**
+ * @author a.kohlbecker
+ * @created Sept 13 2012
+ */
+public class GrantedAuthorityDetailWizardPage extends AbstractCdmEntityWizardPage<GrantedAuthorityImpl> {
+
+       public GrantedAuthorityDetailWizardPage(CdmFormFactory formFactory,
+                       ConversationHolder conversation, GrantedAuthorityImpl entity) {
+               super(formFactory, conversation, entity);
+               setTitle("GrantedAuthority");
+       }
+
+       @Override
+       public AbstractCdmDetailElement<GrantedAuthorityImpl> createElement(
+                       ICdmFormElement rootElement) {
+               GrantedAuthorityDetailElement authorityElement = (GrantedAuthorityDetailElement) formFactory.createCdmDetailElement(DetailType.GRANTEDAUTHORITY, rootElement, SWT.NULL);
+               authorityElement.setEntity(getEntity());
+               return authorityElement;
+       }
+
+}

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/group/GroupSelectionElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/group/GroupSelectionElement.java
new file mode 100644 (file)
index 0000000..58a2630
--- /dev/null
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/group/GroupSelectionElement.java
@@ -0,0 +1,43 @@
+// $Id$
+/**
+* Copyright (C) 2012 EDIT
+* 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.
+*/
+package eu.etaxonomy.taxeditor.ui.section.group;
+
+import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
+import eu.etaxonomy.cdm.model.common.Group;
+import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.selection.EntitySelectionElement;
+
+/**
+ * @author a.kohlbecker
+ *
+ */
+public class GroupSelectionElement extends EntitySelectionElement<Group> {
+       
+       public GroupSelectionElement(CdmFormFactory formFactory,
+                       ConversationHolder conversation, ICdmFormElement parentElement,
+                       String labelString, Group entity, int mode,
+                       int style) {
+               super(formFactory, conversation, parentElement, Group.class, labelString, entity,
+                               mode, style);
+       }
+
+       /* (non-Javadoc)
+        * @see eu.etaxonomy.taxeditor.ui.selection.EntitySelectionElement#getTitle()
+        */
+       @Override
+       protected String getTitle() {
+               if (getEntity() != null) {
+                       return getEntity().getName();
+               }
+               return super.getTitle();
+       }
+
+}

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/user/GroupsByUserDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/user/GroupsByUserDetailElement.java
index 061fb8afa46282bba8ab8872cdd0e5969711650d..f611e6bb9b8b66dc02088693d16dff616feffbfa 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/user/GroupsByUserDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/user/GroupsByUserDetailElement.java
@@ -56,7 +56,7 @@ public class GroupsByUserDetailElement extends
        public void createControls(ICdmFormElement element, int style) {
                selection_group = formFactory
                                .createSelectionElement(Group.class,
-                                               getConversationHolder(), element, "Group", getEntity(),
+                                               getConversationHolder(), element, "", getEntity(),
                                                EntitySelectionElement.NOTHING, style);
        }
 
@@ -70,7 +70,7 @@ public class GroupsByUserDetailElement extends
        @Override
        public void handleEvent(Object eventSource) {
                if (eventSource == selection_group) {
-
+                       setEntity(selection_group.getEntity());
                }
        }
 }

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/EntitySelectionElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/EntitySelectionElement.java
index ec948a901f3a1f9d3215d45e550106c3031d0b27..48679257e4cc203edb5179a63d10415ec15b5aab 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/EntitySelectionElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/EntitySelectionElement.java
@@ -14,10 +14,12 @@ import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Shell;
+import org.springframework.security.core.GrantedAuthority;
 
 import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
 import eu.etaxonomy.cdm.api.conversation.IConversationEnabled;
 import eu.etaxonomy.cdm.common.CdmUtils;
+import eu.etaxonomy.cdm.model.common.Group;
 import eu.etaxonomy.cdm.model.common.ICdmBase;
 import eu.etaxonomy.cdm.model.common.IIdentifiableEntity;
 import eu.etaxonomy.cdm.persistence.hibernate.CdmDataChangeMap;
@@ -289,8 +291,14 @@ public class EntitySelectionElement<T extends ICdmBase> extends
         * @return a {@link java.lang.String} object.
         */
        protected String getTitle() {
-               if (entity != null && entity instanceof IIdentifiableEntity) {
-                       return ((IIdentifiableEntity) entity).getTitleCache();
+               if (entity != null){
+                       if(entity instanceof IIdentifiableEntity) {
+                               return ((IIdentifiableEntity) entity).getTitleCache();
+                       } else if(entity instanceof Group){
+                               return ((Group) entity).getName();
+                       } else if(entity instanceof GrantedAuthority){
+                               return ((GrantedAuthority) entity).getAuthority();
+                       }
                }
                return "";
        }

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/detail/DetailsViewer.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/detail/DetailsViewer.java
index f4c2c58051ebf20cfed6d2ea370d3939f8cabd2f..2e82a19679280392d70fd2cf582616d8d757cfd8 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/detail/DetailsViewer.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/detail/DetailsViewer.java
@@ -66,7 +66,7 @@ import eu.etaxonomy.taxeditor.ui.section.description.MediaDetailsSection;
 import eu.etaxonomy.taxeditor.ui.section.description.NaturalLanguageSection;
 import eu.etaxonomy.taxeditor.ui.section.description.ScopeSection;
 import eu.etaxonomy.taxeditor.ui.section.feature.FeatureDistributionDetailSection;
-import eu.etaxonomy.taxeditor.ui.section.group.GrantedAuthorityDetailSection;
+import eu.etaxonomy.taxeditor.ui.section.grantedAuthority.GrantedAuthorityDetailSection;
 import eu.etaxonomy.taxeditor.ui.section.group.GroupDetailSection;
 import eu.etaxonomy.taxeditor.ui.section.group.MemberDetailSection;
 import eu.etaxonomy.taxeditor.ui.section.key.GeographicalScopeDetailSection;