Strolch
/
strolch
mirror of https://github.com/strolch-li/strolch.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[Fix] Remove version of parsed files in inspector

This commit is contained in:
Robert von Burg 2018-02-02 11:56:41 +01:00
parent ba115b70c4
commit a5f9d655b8
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
li.strolch.agent/src/main/java/li/strolch/agent/impl/CachedElementMap.java
View File

@ -267,7 +267,7 @@ public abstract class CachedElementMap<T extends StrolchRootElement> implements
@Override @Override
public synchronized void update(StrolchTransaction tx, T element) { public synchronized void update(StrolchTransaction tx, T element) {
updateVersion(tx, element); updateVersion(tx, element, false);
// first perform cached change // first perform cached change
getCachedDao().update(element); getCachedDao().update(element);
@ -278,7 +278,7 @@ public abstract class CachedElementMap<T extends StrolchRootElement> implements
@Override @Override
public synchronized void updateAll(StrolchTransaction tx, List<T> elements) { public synchronized void updateAll(StrolchTransaction tx, List<T> elements) {
for (T t : elements) { for (T t : elements) {
updateVersion(tx, t); updateVersion(tx, t, false);
} }
// first perform cached change // first perform cached change
@ -289,7 +289,7 @@ public abstract class CachedElementMap<T extends StrolchRootElement> implements
@Override @Override
public synchronized void remove(StrolchTransaction tx, T element) { public synchronized void remove(StrolchTransaction tx, T element) {
updateVersion(tx, element); updateVersion(tx, element, true);
if (this.realm.isVersioningEnabled()) { if (this.realm.isVersioningEnabled()) {
@ -310,7 +310,7 @@ public abstract class CachedElementMap<T extends StrolchRootElement> implements
@Override @Override
public synchronized void removeAll(StrolchTransaction tx, List<T> elements) { public synchronized void removeAll(StrolchTransaction tx, List<T> elements) {
for (T t : elements) { for (T t : elements) {
updateVersion(tx, t); updateVersion(tx, t, true);
} }
if (this.realm.isVersioningEnabled()) { if (this.realm.isVersioningEnabled()) {
@ -329,9 +329,9 @@ public abstract class CachedElementMap<T extends StrolchRootElement> implements
} }
} }
private void updateVersion(StrolchTransaction tx, T element) { private void updateVersion(StrolchTransaction tx, T element, boolean deleted) {
if (this.realm.isVersioningEnabled()) { if (this.realm.isVersioningEnabled()) {
Version.updateVersionFor(element, tx.getCertificate().getUsername(), false); Version.updateVersionFor(element, tx.getCertificate().getUsername(), deleted);
} else { } else {
Version.setInitialVersionFor(element, -1, tx.getCertificate().getUsername()); Version.setInitialVersionFor(element, -1, tx.getCertificate().getUsername());
} }