fixed document and version persistence

Author: car031

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

@@ -296,7 +296,13 @@ public abstract class AbstractDocument extends ExtensibleObject implements Trans
 	 */
 	@Transient
 	private boolean modified = false;
+	
+	@Transient
+	private String documentTemplateName;
 
+	@Transient
+	private Long documentTemplateId;
+	
 	protected AbstractDocument() {
 		super();
 	}
@@ -899,6 +905,27 @@ public void setColor(String color) {
 		this.color = color;
 	}
 
+	@Override
+	public String getTemplateName() {
+		return documentTemplateName;
+	}
+
+	@Override
+	public void setTemplateName(String templateName) {
+		this.documentTemplateName = templateName;
+	}
+	
+	
+	@Override
+	public Long getTemplateId() {
+		return documentTemplateId;
+	}
+
+	@Override
+	public void setTemplateId(Long templateId) {
+		this.documentTemplateId = templateId;
+	}
+	
 	/**
 	 * Copies in the current instance the attributes of the passed values
 	 * object, but NOT the ID
@@ -980,7 +1007,7 @@ public String getLastNote() {
 	public void setLastNote(String lastNote) {
 		this.lastNote = lastNote;
 	}
-
+	
 	@Override
 	public int hashCode() {
 		final int prime = 31;

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

@@ -306,22 +306,12 @@ public void copyAttributes(AbstractDocument docVO) {
 
 	@Override
 	public Long getTemplateId() {
-		return getTemplate() != null ? getTemplate().getId() : null;
-	}
-
-	@Override
-	public void setTemplateId(Long templateId) {
-		// Not implemented
+		return getTemplate() != null ? getTemplate().getId() : super.getTemplateId();
 	}
 
 	@Override
 	public String getTemplateName() {
-		return getTemplate() != null ? getTemplate().getName() : null;
-	}
-
-	@Override
-	public void setTemplateName(String templateName) {
-		// Not implemented
+		return getTemplate() != null ? getTemplate().getName() : super.getTemplateName();
 	}
 
 	@Override

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

@@ -71,6 +71,9 @@ public class Version extends AbstractDocument implements Comparable<Version> {
 	@Column(name = "ld_templateid")
 	private Long templateId;
 
+	@Column(name = "ld_templatename")
+	private String templateName;
+
 	@ElementCollection(fetch = FetchType.LAZY)
 	@CollectionTable(name = "ld_version_ext", joinColumns = @JoinColumn(name = "ld_versionid"))
 	@MapKeyColumn(name = "ld_name", length = 255)
@@ -223,6 +226,16 @@ public void setFolderName(String folderName) {
 		this.folderName = folderName;
 	}
 
+	@Override
+	public String getTemplateName() {
+		return templateName;
+	}
+
+	@Override
+	public void setTemplateName(String templateName) {
+		this.templateName = templateName;
+	}
+
 	/**
 	 * Factory method that creates a Version and replicate all given document's
 	 * properties.<br>
@@ -356,27 +369,19 @@ public void setTemplateId(Long templateId) {
 		this.templateId = templateId;
 	}
 
-	@Override
-	public String getTemplateName() {
-		return null;
-	}
-
-	@Override
-	public void setTemplateName(String templateName) {
-		// Not implemented
-	}
-
 	@Override
 	public Template getTemplate() {
 		return null;
 	}
 
 	@Override
 	public void setTemplate(Template template) {
-		if (template != null)
+		if (template != null) {
 			templateId = template.getId();
-		else
+			setTemplateName(template.getName());
+		} else {
 			templateId = null;
+		}
 	}
 
 	@Override