/ - Diff - EDIT - EDIT Project Management

         private static final String COPY_ENTITY = "!";
         private CdmBase entity;
         private Set<CdmBase> entities = new HashSet<>();
         private Map<EntityKey, CdmBase> entityyMap = new HashMap<>();
-...
         private Set<Object> objectsSeen = new HashSet<>();
         public CdmEntityCache(CdmBase entity){
             this.entity = entity;
             this.entities.add(entity);
             update();
+        }
-...
             objectsSeen.clear();
             copyEntitiyKeys.clear();
             String propertyPath = "";
             analyzeEntity(entity, propertyPath);
             for(CdmBase entity : entities){
             analyzeEntity(entity, "");
+            }
             return copyEntitiyKeys.isEmpty();
+        }
-...
          */
         @Override
         public <CDM extends CdmBase> CDM find(CDM value) {
             EntityKey entityKey = new EntityKey(HibernateProxyHelper.deproxy(value));
             return (CDM) entityyMap.get(entityKey);
             if(value != null){
                 EntityKey entityKey = new EntityKey(HibernateProxyHelper.deproxy(value));
                 return (CDM) entityyMap.get(entityKey);
+            }
             return null;
+        }
         /**
-...
             return (CDM) entityyMap.get(entityKey);
+        }
         /**
          * {@inheritDoc}
          */
         @Override
         public <CDM extends CdmBase> void add(CDM value) {
             entities.add(value);
             analyzeEntity(value, "");
+        }
+    }

         public boolean update();
         public <CDM extends CdmBase> void add(CDM value);
         /**
          * @param type
          * @param id

      */
     public class PersistentContextAnalyzer {
         /**
+         *
          */
         private static final char HASH_SEPARATOR = '.';
         /**
+         *
          */
-...
         private Set<Object> objectsSeen = new HashSet<>();
         private boolean showHashCodes = false;
         public PersistentContextAnalyzer(CdmBase entity, Session session){
             this.session = session;
-...
          */
         protected void printLegend(PrintStream printStream) {
             printStream.println("PersistentContextAnalyzer legend: ");
             printStream.println("    - '*': entity mapped in persistent context");
             printStream.println("    - '.{objectHash}': unique copy entity, followed by object hash (only shown when showHashCodes is enabled)");
             printStream.println("    - '!{objectHash}': detected copy entity, followed by object hash");
             printStream.println("    - '*': entity mapped in persistent context");
+        }
         /**
-...
             String flags = "";
             CdmBase mappedEntity = entityyMap.put(entityKey, bean);
             boolean hashAdded = false;
             if(session != null && session.contains(bean)){
                 flags += IN_PERSITENT_CONTEXT;
+            }
             if(mappedEntity != null && mappedEntity != bean) {
                 copyEntitiyKeys.add(entityKey);
                 flags += COPY_ENTITY + bean.hashCode();
                 hashAdded = true;
+            }
             if(showHashCodes && ! hashAdded){
                 flags += HASH_SEPARATOR + bean.hashCode();
+            }
             if(!flags.isEmpty()){
                 propertyPath += "(" + flags + ")";
-...
+            }
+        }
         /**
          * @return the showHashCodes
          */
         public boolean isShowHashCodes() {
             return showHashCodes;
+        }
         /**
          * @param showHashCodes the showHashCodes to set
          */
         public void setShowHashCodes(boolean showHashCodes) {
             boolean runUpdate = this.showHashCodes != showHashCodes;
             this.showHashCodes = showHashCodes;
             if(runUpdate){
                 update();
+            }
+        }
         class EntityKey {
             Class type;

     import org.springframework.transaction.annotation.Transactional;
     import eu.etaxonomy.cdm.api.application.CdmRepository;
     import eu.etaxonomy.cdm.debug.PersistentContextAnalyzer;
     import eu.etaxonomy.cdm.model.common.VersionableEntity;
     import eu.etaxonomy.cdm.model.name.Registration;
     import eu.etaxonomy.cdm.model.name.SpecimenTypeDesignation;
-...
             FieldUnit newfieldUnit = FieldUnit.NewInstance();
             Registration reg = repo.getRegistrationService().load(registrationId, RegistrationWorkingSetService.REGISTRATION_INIT_STRATEGY);
             TaxonName typifiedName = repo.getNameService().load(typifiedNameId, TAXON_NAME_INIT_STRATEGY);
             Reference citation = repo.getReferenceService().load(registrationId, Arrays.asList("$"));
             Reference citation = repo.getReferenceService().load(publicationId, Arrays.asList("$"));
             SpecimenTypeDesignationWorkingSetDTO<Registration> workingSetDto = new SpecimenTypeDesignationWorkingSetDTO<Registration>(reg, newfieldUnit, citation, typifiedName);
             return workingSetDto;
+        }
-...
                 Session session = repo.getSession();
                 PersistentContextAnalyzer regAnalyzer = new PersistentContextAnalyzer(dto.getOwner(), session);
                 regAnalyzer.printEntityGraph(System.out);
                 regAnalyzer.printCopyEntities(System.out);
                 session.merge(dto.getOwner());
                 session.flush();
+            }

         @Override
         public void valueChange(ValueChangeEvent event) {
             CDM value = (CDM)event.getProperty().getValue();
             if(value == null) {
                 return;
+            }
             value = HibernateProxyHelper.deproxy(value);
             EntityCache cache = cachingPresenter.getCache();
             if(cache != null){
                 cache.update();
                 CDM cachedEntity = cache.find(value);
                 if(cachedEntity != null && cachedEntity != value){
                 if(cachedEntity == null){
                     cache.add(value);
                 } else if(cachedEntity != value){
                     toOneRelatedEntityField.removeValueChangeListener(this);
                     toOneRelatedEntityField.setValue(null); // reset to trick equals check in vaadin
                     toOneRelatedEntityField.setValue(cachedEntity);

             super();
             this.owner = owner;
             this.baseEntity = baseEntity;
             if(citation == null){
                 throw new NullPointerException("citation must not be null");
+            }
             if(typifiedName == null){
                 throw new NullPointerException("typifiedName must not be null");
+            }
             this.citation = citation;
             this.typifiedName = typifiedName;
             if(baseEntity instanceof FieldUnit){

src/main/java/eu/etaxonomy/cdm/vaadin/view/name/SpecimenTypeDesignationDTORow.java
82	82
83	83	mediaSpecimenReference.setEnabled(publishedImageType);
84	84	mediaSpecimenReferenceDetail.setEnabled(publishedImageType);
85		mediaUri.setEnabled(unPublishedImageType);
	85	mediaUri.setEnabled(publishedImageType \|\| unPublishedImageType);
86	86
87	87	}
88	88	}

                             );
                     row.collection.getSelect().setCaptionGenerator(new CdmTitleCacheCaptionGenerator<Collection>());
                     row.collection.getSelect().addValueChangeListener(new ToOneRelatedEntityButtonUpdater<Collection>(row.collection));
                     row.collection.getSelect().addValueChangeListener(new ToOneRelatedEntityReloader<Collection>(row.collection.getSelect(), SpecimenTypeDesignationWorkingsetEditorPresenter.this));
                     row.collection.getSelect().addValueChangeListener(new ToOneRelatedEntityReloader<Collection>(row.collection.getSelect(),
                             SpecimenTypeDesignationWorkingsetEditorPresenter.this));
                     row.mediaSpecimenReference.loadFrom(
                             referencePagingProvider,
-...
                     row.mediaSpecimenReference.getSelect().setCaptionGenerator(new CdmTitleCacheCaptionGenerator<Reference>());
                     row.mediaSpecimenReference.getSelect().addValueChangeListener(new ToOneRelatedEntityButtonUpdater<Reference>(row.mediaSpecimenReference));
                     row.mediaSpecimenReference.getSelect().addValueChangeListener(new ToOneRelatedEntityReloader<Reference>(row.mediaSpecimenReference.getSelect(),
                             SpecimenTypeDesignationWorkingsetEditorPresenter.this));
                     getView().applyDefaultComponentStyle(row.components());

Project

General

Profile

EDIT

Revision 5e97d775

Added by Andreas Kohlbecker over 5 years ago