refactored History

Author: car031

logicaldoc-core/src/main/java/com/logicaldoc/core/communication/EventCollector.java

@@ -16,7 +16,7 @@
 import com.logicaldoc.core.document.Document;
 import com.logicaldoc.core.document.DocumentDAO;
 import com.logicaldoc.core.history.AbstractDocumentHistory;
-import com.logicaldoc.core.history.History;
+import com.logicaldoc.core.history.ExtendedHistory;
 import com.logicaldoc.core.threading.ThreadPools;
 import com.logicaldoc.util.Context;
 
@@ -64,7 +64,7 @@ public void removeListener(EventListener listener) {
 	 * @param history
 	 * @return true if it was not remembered already, false otherwise
 	 */
-	private boolean rememberHistory(History history) {
+	private boolean rememberHistory(ExtendedHistory history) {
 		Queue<Long> fifo = fifos.get(history.getClass().getName());
 		if (fifo == null) {
 			fifo = new CircularFifoQueue<>(FIFO_SIZE);
@@ -84,7 +84,7 @@ private boolean rememberHistory(History history) {
 	 * 
 	 * @param history the history to notify
 	 */
-	public void newEvent(History history) {
+	public void newEvent(ExtendedHistory history) {
 		if (!isEnabled()) {
 			log.debug("Aspect {} not enabled", ASPECT);
 			return;

logicaldoc-core/src/main/java/com/logicaldoc/core/communication/EventListener.java

@@ -1,6 +1,6 @@
 package com.logicaldoc.core.communication;
 
-import com.logicaldoc.core.history.History;
+import com.logicaldoc.core.history.ExtendedHistory;
 
 /**
  * A listener for the event emitted by the collector
@@ -15,5 +15,5 @@ public interface EventListener {
 	 * 
 	 * @param event the event to process
 	 */
-	public void newEvent(History event);
+	public void newEvent(ExtendedHistory event);
 }

logicaldoc-core/src/main/java/com/logicaldoc/core/document/DocumentHistory.java

@@ -4,6 +4,7 @@
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 
 import org.hibernate.annotations.Cache;
 import org.hibernate.annotations.CacheConcurrencyStrategy;
@@ -26,7 +27,32 @@ public class DocumentHistory extends AbstractDocumentHistory {
 
 	@Column(name = "ld_color", length = 255)
 	protected String color;
+
+	@Column(name = "ld_new")
+	private int isNew = 1;
+	
+	@Transient
+	private String file = null;
+
+	public DocumentHistory() {
+		super();
+	}
+	
+	public DocumentHistory(DocumentHistory source) {
+		copyAttributesFrom(source);
+		this.color = source.color;
+		setFile(source.getFile());
+		setIsNew(source.getIsNew());
+	}
 
+	public String getFile() {
+		return file;
+	}
+
+	public void setFile(String file) {
+		this.file = file;
+	}
+
 	public String getColor() {
 		return color;
 	}
@@ -35,13 +61,12 @@ public void setColor(String color) {
 		this.color = color;
 	}
 
-	public DocumentHistory() {
-		super();
+	public int getIsNew() {
+		return isNew;
 	}
 
-	public DocumentHistory(DocumentHistory source) {
-		copyAttributesFrom(source);
-		this.color=source.color;
+	public void setIsNew(int isNew) {
+		this.isNew = isNew;
 	}
 
 	@Override

logicaldoc-core/src/main/java/com/logicaldoc/core/document/DocumentManager.java

@@ -38,7 +38,7 @@
 import com.logicaldoc.core.folder.FolderDAO;
 import com.logicaldoc.core.folder.FolderEvent;
 import com.logicaldoc.core.folder.FolderHistory;
-import com.logicaldoc.core.history.History;
+import com.logicaldoc.core.history.ExtendedHistory;
 import com.logicaldoc.core.metadata.Attribute;
 import com.logicaldoc.core.metadata.Template;
 import com.logicaldoc.core.metadata.TemplateDAO;
@@ -226,7 +226,7 @@ public DocumentFuture replaceFile(long docId, String fileVersion, File newFile,
 		}
 	}
 
-	private void validateTransaction(History transaction) {
+	private void validateTransaction(ExtendedHistory transaction) {
 		if (transaction == null)
 			throw new IllegalArgumentException(TRANSACTION_CANNOT_BE_NULL);
 		if (transaction.getUser() == null)

logicaldoc-core/src/main/java/com/logicaldoc/core/history/AbstractDocumentHistory.java

@@ -16,7 +16,7 @@
  * @since 9.2
  */
 @MappedSuperclass
-public abstract class AbstractDocumentHistory extends History {
+public abstract class AbstractDocumentHistory extends ExtendedHistory {
 
 	private static final long serialVersionUID = 1L;
 
@@ -43,9 +43,6 @@ public abstract class AbstractDocumentHistory extends History {
 
 	@Column(name = "ld_filesize")
 	private Long fileSize = null;
-	
-	@Column(name = "ld_new")
-	private int isNew = 1;
 
 	/**
 	 * Something to better qualify the event
@@ -129,14 +126,6 @@ public String getFilenameOld() {
 	public void setFilenameOld(String filenameOld) {
 		this.filenameOld = filenameOld;
 	}
-	
-	public int getIsNew() {
-		return isNew;
-	}
-
-	public void setIsNew(int isNew) {
-		this.isNew = isNew;
-	}
 
 	public String getReason() {
 		return reason;
@@ -187,7 +176,6 @@ protected void copyAttributesFrom(AbstractDocumentHistory source) {
 		setDocId(source.getDocId());
 		setFolderId(source.getFolderId());
 		setReason(source.getReason());
-		setIsNew(source.getIsNew());
 		setFilename(source.getFilename());
 		setFileSize(source.getFileSize());
 	}