svn commit: r1616651 - in /roller/trunk/app/src/main/java/org/apache/roller/weblogger: business/themes/SharedThemeTemplateRendition.java pojos/TemplateRendition.java ui/struts2/editor/TemplateEdit.java

[gmazza]

Author: gmazza
Date: Fri Aug  8 00:34:33 2014
New Revision: 1616651

URL: http://svn.apache.org/r1616651
Log:
Removed temporary WeblogTemplate accessors from TemplateRendition, as it's not 
relevant for implementing class SharedThemeTemplateRendition.

Modified:
    
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/SharedThemeTemplateRendition.java
    
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/TemplateRendition.java
    
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateEdit.java

Modified: 
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/SharedThemeTemplateRendition.java
URL: 
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/SharedThemeTemplateRendition.java?rev=1616651&r1=1616650&r2=1616651&view=diff
==============================================================================
--- 
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/SharedThemeTemplateRendition.java
 (original)
+++ 
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/SharedThemeTemplateRendition.java
 Fri Aug  8 00:34:33 2014
@@ -21,7 +21,6 @@ package org.apache.roller.weblogger.busi
 import org.apache.roller.weblogger.pojos.TemplateRendition;
 import org.apache.commons.lang3.builder.EqualsBuilder;
 import org.apache.commons.lang3.builder.HashCodeBuilder;
-import org.apache.roller.weblogger.pojos.WeblogTemplate;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -31,7 +30,6 @@ import java.util.Date;
  */
 public class SharedThemeTemplateRendition implements Serializable, 
TemplateRendition {
 
-       private WeblogTemplate weblogTemplate = null;
        private String template = null;
        private RenditionType type = null;
        private TemplateLanguage templateLanguage = null;
@@ -55,15 +53,6 @@ public class SharedThemeTemplateRenditio
        }
 
        // @Override
-       public WeblogTemplate getWeblogTemplate() {
-               return null;
-       }
-
-       // @Override
-       public void setWeblogTemplate(WeblogTemplate templateId) {
-       }
-
-       // @Override
        public RenditionType getType() {
                return type;
        }

Modified: 
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/TemplateRendition.java
URL: 
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/TemplateRendition.java?rev=1616651&r1=1616650&r2=1616651&view=diff
==============================================================================
--- 
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/TemplateRendition.java
 (original)
+++ 
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/TemplateRendition.java
 Fri Aug  8 00:34:33 2014
@@ -41,16 +41,12 @@ public interface TemplateRendition {
 
     String getTemplate();
 
-    WeblogTemplate getWeblogTemplate();
-
     TemplateLanguage getTemplateLanguage();
 
     RenditionType getType();
 
     void setTemplate(String template);
 
-    void setWeblogTemplate(WeblogTemplate template);
-
     void setTemplateLanguage(TemplateLanguage templateLanguage);
 
     void setType(RenditionType type);

Modified: 
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateEdit.java
URL: 
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateEdit.java?rev=1616651&r1=1616650&r2=1616651&view=diff
==============================================================================
--- 
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateEdit.java
 (original)
+++ 
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateEdit.java
 Fri Aug  8 00:34:33 2014
@@ -29,10 +29,8 @@ import org.apache.roller.weblogger.ui.st
 import org.apache.roller.weblogger.util.cache.CacheManager;
 import org.apache.struts2.interceptor.validation.SkipValidation;
 
-import java.util.ArrayList;
 import java.util.Date;
 import java.util.EnumMap;
-import java.util.List;
 import java.util.Map;