BGBM BDI Projects
/
cdmlib.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
def4651
)
cleanup
author
Andreas Müller
<a.mueller@bgbm.org>
Sat, 27 Jun 2020 07:44:07 +0000
(09:44 +0200)
committer
Andreas Müller
<a.mueller@bgbm.org>
Sat, 27 Jun 2020 07:44:07 +0000
(09:44 +0200)
cdmlib-cache/src/main/java/eu/etaxonomy/cdm/cache/CdmTransientEntityCacher.java
patch
|
blob
|
history
cdmlib-model/src/main/java/eu/etaxonomy/cdm/format/AbstractEllypsisFormatter.java
patch
|
blob
|
history
cdmlib-model/src/main/java/eu/etaxonomy/cdm/format/EllypsisFormatter.java
patch
|
blob
|
history
cdmlib-model/src/main/java/eu/etaxonomy/cdm/format/IdentifiableEntityFormatter.java
patch
|
blob
|
history
diff --git
a/cdmlib-cache/src/main/java/eu/etaxonomy/cdm/cache/CdmTransientEntityCacher.java
b/cdmlib-cache/src/main/java/eu/etaxonomy/cdm/cache/CdmTransientEntityCacher.java
index 60bf8ec2066588be5f861756f2460fe247c84989..f51ea1e29e2ee3e7e7a317de3d5b2b00c0d4f530 100644
(file)
--- a/
cdmlib-cache/src/main/java/eu/etaxonomy/cdm/cache/CdmTransientEntityCacher.java
+++ b/
cdmlib-cache/src/main/java/eu/etaxonomy/cdm/cache/CdmTransientEntityCacher.java
@@
-235,6
+235,7
@@
public class CdmTransientEntityCacher implements ICdmCacher {
if(cachedCdmEntity == null) {
CdmBase cdmEntityToCache = cdmEntity;
CdmBase cachedVolatileEntity = volatileEntitiesMap.get(cdmEntity.getUuid());
+ //if former volatile object became transient now
if(cachedVolatileEntity != null) {
cachedVolatileEntity.setId(cdmEntity.getId());
cdmEntityToCache = cachedVolatileEntity;
diff --git
a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/format/AbstractEllypsisFormatter.java
b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/format/AbstractEllypsisFormatter.java
index 20d329746def2414a88cbe87e0d2c781c0009fa1..5dc4ee29c065575c0d9de6b177e3d5f39b53b888 100644
(file)
--- a/
cdmlib-model/src/main/java/eu/etaxonomy/cdm/format/AbstractEllypsisFormatter.java
+++ b/
cdmlib-model/src/main/java/eu/etaxonomy/cdm/format/AbstractEllypsisFormatter.java
@@
-109,20
+109,14
@@
public abstract class AbstractEllypsisFormatter<T extends CdmBase> implements El
}
}
-
public static class EllipsisData {
public String original;
public String truncated;
- /**
- * @param original
- * @param truncated
- */
+
public EllipsisData(String original, String truncated) {
super();
this.original = original;
this.truncated = truncated;
}
}
-
-
}
diff --git
a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/format/EllypsisFormatter.java
b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/format/EllypsisFormatter.java
index 38c15695558753a8dd9ed36c4314e1c27aac3744..2b01195369d30ebfcb028f6e4032678280545aa3 100644
(file)
--- a/
cdmlib-model/src/main/java/eu/etaxonomy/cdm/format/EllypsisFormatter.java
+++ b/
cdmlib-model/src/main/java/eu/etaxonomy/cdm/format/EllypsisFormatter.java
@@
-13,7
+13,6
@@
import eu.etaxonomy.cdm.model.common.CdmBase;
/**
* @author a.kohlbecker
* @since Dec 12, 2018
- *
*/
public interface EllypsisFormatter<T extends CdmBase> {
diff --git
a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/format/IdentifiableEntityFormatter.java
b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/format/IdentifiableEntityFormatter.java
index 6b71dcc4658db20a17f8d2ec4fd776980e23bfd8..cd401895291487dbc4d7b673a92bc67f40e011c8 100644
(file)
--- a/
cdmlib-model/src/main/java/eu/etaxonomy/cdm/format/IdentifiableEntityFormatter.java
+++ b/
cdmlib-model/src/main/java/eu/etaxonomy/cdm/format/IdentifiableEntityFormatter.java
@@
-14,7
+14,6
@@
import java.util.UUID;
import eu.etaxonomy.cdm.model.common.IdentifiableEntity;
import eu.etaxonomy.cdm.model.common.Identifier;
-
/**
* @author pplitzner
* @since Nov 30, 2015