From: Cherian Mathew Date: Fri, 2 Oct 2015 16:59:14 +0000 (+0200) Subject: #5282 Integrate remoting in referencing objects view X-Git-Tag: 3.12.0^2~127^2~3 X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/cf412a2297752d1f7c5f4da10e0f5c0d30e5e154 #5282 Integrate remoting in referencing objects view --- diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/referencingobjects/ReferencingObjectsView.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/referencingobjects/ReferencingObjectsView.java index 0cb1a8519..12b2ef19f 100644 --- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/referencingobjects/ReferencingObjectsView.java +++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/referencingobjects/ReferencingObjectsView.java @@ -57,6 +57,7 @@ import eu.etaxonomy.cdm.model.taxon.TaxonBase; import eu.etaxonomy.taxeditor.bulkeditor.BulkEditor; import eu.etaxonomy.taxeditor.model.DescriptionHelper; import eu.etaxonomy.taxeditor.model.LineSelection; +import eu.etaxonomy.taxeditor.session.ICdmEntitySession; import eu.etaxonomy.taxeditor.store.CdmStore; import eu.etaxonomy.taxeditor.view.AbstractCdmViewPart; @@ -78,6 +79,11 @@ public class ReferencingObjectsView extends AbstractCdmViewPart { private String referencedObjectTitleCache; private ConversationHolder conversation; + private ICdmEntitySession cdmEntitySession; + + public ReferencingObjectsView() { + cdmEntitySession = CdmStore.getCurrentSessionManager().newSession(this, true); + } /* (non-Javadoc) * @see eu.etaxonomy.taxeditor.model.AbstractCdmViewPart#createViewer(org.eclipse.swt.widgets.Composite) @@ -149,6 +155,10 @@ public class ReferencingObjectsView extends AbstractCdmViewPart { viewer.setColumnProperties(titles); } + @Override + public void setFocus() { + cdmEntitySession.bind(); + } /** *

updateReferencingObjects

* @@ -171,9 +181,12 @@ public class ReferencingObjectsView extends AbstractCdmViewPart { @Override public void run() { if (entityUUID != null){ - + ICdmEntitySession previousCdmEntitySession = CdmStore.getCurrentSessionManager().getActiveSession(); + cdmEntitySession.bind(); List referencingObjects = getReferencingObjects(entityUUID, objectClass); - + if(previousCdmEntitySession != null) { + previousCdmEntitySession.bind(); + } updateView(referencingObjects); } @@ -313,6 +326,7 @@ public class ReferencingObjectsView extends AbstractCdmViewPart { conversation.close(); selectionService.removePostSelectionListener(this); selectionService.removeSelectionListener(this); + cdmEntitySession.dispose(); super.dispose(); } diff --git a/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/remoting/cache/CdmTransientEntityCacher.java b/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/remoting/cache/CdmTransientEntityCacher.java index a811d28db..7e67ecd22 100644 --- a/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/remoting/cache/CdmTransientEntityCacher.java +++ b/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/remoting/cache/CdmTransientEntityCacher.java @@ -95,7 +95,7 @@ public class CdmTransientEntityCacher implements ICdmCacher { */ private CacheConfiguration getEntityCacheConfiguration(String cacheId) { SizeOfPolicyConfiguration sizeOfConfig = new SizeOfPolicyConfiguration(); - sizeOfConfig.setMaxDepth(10000); + sizeOfConfig.setMaxDepth(100); sizeOfConfig.setMaxDepthExceededBehavior("abort"); return new CacheConfiguration(cacheId, 0)