Author: gmazza
Date: Thu Jul 24 15:51:04 2014
New Revision: 1613165
URL: http://svn.apache.org/r1613165
Log:
Unused code removed.
Added:
roller/trunk/app/src/main/webapp/themes/gaurav/images/theme-responsive-mobile.png
- copied unchanged from r1613159,
roller/trunk/app/src/main/webapp/themes/gaurav/images/theme-resposive-mobile.png
roller/trunk/app/src/main/webapp/themes/gaurav/images/theme-responsive.png
- copied unchanged from r1613069,
roller/trunk/app/src/main/webapp/themes/gaurav/images/theme-resposive.png
Removed:
roller/trunk/app/src/main/webapp/themes/gaurav/images/theme-resposive-mobile.png
roller/trunk/app/src/main/webapp/themes/gaurav/images/theme-resposive.png
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/WeblogManager.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/WeblogCustomTheme.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/Weblog.java
roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/Weblog.orm.xml
roller/trunk/app/src/main/webapp/themes/gaurav/theme.xml
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/WeblogManager.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/WeblogManager.java?rev=1613165&r1=1613164&r2=1613165&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/WeblogManager.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/WeblogManager.java
Thu Jul 24 15:51:04 2014
@@ -142,7 +142,7 @@ public interface WeblogManager {
List<Weblog> getWeblogsByLetter(char letter, int offset, int length)
throws WebloggerException;
- /**
+ /**
* Store page.
*/
void savePage(WeblogTemplate data) throws WebloggerException;
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/WeblogCustomTheme.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/WeblogCustomTheme.java?rev=1613165&r1=1613164&r2=1613165&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/WeblogCustomTheme.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/WeblogCustomTheme.java
Thu Jul 24 15:51:04 2014
@@ -86,7 +86,7 @@ public class WeblogCustomTheme extends W
* Returns null if no stylesheet can be found.
*/
public ThemeTemplate getStylesheet() throws WebloggerException {
- return getTemplateByLink(this.weblog.getCustomStylesheetPath());
+ return getTemplateByLink(this.weblog.getCustomStylesheetPath());
}
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/Weblog.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/Weblog.java?rev=1613165&r1=1613164&r2=1613165&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/Weblog.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/Weblog.java
Thu Jul 24 15:51:04 2014
@@ -122,16 +122,9 @@ public class Weblog implements Serializa
//------------------------------------------------------- Good citizenship
public String toString() {
- StringBuilder buf = new StringBuilder();
- buf.append("{");
- buf.append(getId());
- buf.append(", ").append(getHandle());
- buf.append(", ").append(getName());
- buf.append(", ").append(getEmailAddress());
- buf.append(", ").append(getLocale());
- buf.append(", ").append(getTimeZone());
- buf.append("}");
- return buf.toString();
+ return "{" + getId() + ", " + getHandle()
+ + ", " + getName() + ", " + getEmailAddress()
+ + ", " + getLocale() + ", " + getTimeZone() + "}";
}
public boolean equals(Object other) {
@@ -170,20 +163,6 @@ public class Weblog implements Serializa
}
/**
- * Lookup the default page for this website.
- */
- public ThemeTemplate getDefaultPage() throws WebloggerException {
-
- // look for the page in our Theme
- Theme weblogTheme = getTheme();
- if(weblogTheme != null) {
- return weblogTheme.getDefaultTemplate();
- }
-
- return null;
- }
-
- /**
* Id of the Website.
*/
public String getId() {
@@ -455,38 +434,6 @@ public class Weblog implements Serializa
return false;
}
- /** Get number of users associated with website */
- public int getUserCount() {
- int count = 0;
- try {
- UserManager umgr =
WebloggerFactory.getWeblogger().getUserManager();
- for (WeblogPermission perm : umgr.getWeblogPermissions(this)) {
- count++;
- }
- } catch (WebloggerException ex) {
- // something is seriously wrong, not me we can do here
- log.error("ERROR error getting admin user count", ex);
- }
- return count;
- }
-
- public int getAdminUserCount() {
- int count = 0;
- try {
- UserManager umgr =
WebloggerFactory.getWeblogger().getUserManager();
- for (WeblogPermission perm : umgr.getWeblogPermissions(this)) {
- if (perm.hasAction(WeblogPermission.ADMIN)) {
- count++;
- }
- }
-
- } catch (WebloggerException ex) {
- // something is seriously wrong, not me we can do here
- log.error("ERROR error getting admin user count", ex);
- }
- return count;
- }
-
public int getEntryDisplayCount() {
return entryDisplayCount;
}
@@ -496,7 +443,7 @@ public class Weblog implements Serializa
}
/**
- * Set to FALSE to completely disable and hide this weblog from public
view.
+ * Set to FALSE to disable and hide this weblog from public view.
*/
public Boolean getVisible() {
return this.visible;
Modified:
roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/Weblog.orm.xml
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/Weblog.orm.xml?rev=1613165&r1=1613164&r2=1613165&view=diff
==============================================================================
---
roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/Weblog.orm.xml
(original)
+++
roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/Weblog.orm.xml
Thu Jul 24 15:51:04 2014
@@ -9,51 +9,9 @@
<named-query name="Weblog.getByHandle">
<query>SELECT w FROM Weblog w WHERE w.handle =
?1</query>
</named-query>
- <named-query name="Weblog.getByHandleOrderByHandle">
- <query>SELECT w FROM Weblog w WHERE w.handle = ?1 ORDER
BY w.handle</query>
- </named-query>
<named-query name="Weblog.getByLetterOrderByHandle">
<query>SELECT w FROM Weblog w WHERE UPPER(w.handle)
like ?1 ORDER BY w.handle</query>
</named-query>
- <named-query
name="Weblog.getByEndDate&StartDate&Enabled&ActiveOrderByDateCreatedDesc">
- <query>SELECT w FROM Weblog w WHERE w.dateCreated <
?1 AND w.dateCreated > ?2
- AND w.visible = ?3 AND
w.active = ?4
- ORDER BY w.dateCreated
DESC</query>
- </named-query>
- <named-query
name="Weblog.getByEndDate&StartDate&EnabledOrderByDateCreatedDesc">
- <query>SELECT w FROM Weblog w WHERE w.dateCreated <
?1 AND w.dateCreated > ?2
- AND w.visible = ?3
- ORDER BY w.dateCreated
DESC</query>
- </named-query>
- <named-query
name="Weblog.getByEndDate&StartDateOrderByDateCreatedDesc">
- <query>SELECT w FROM Weblog w WHERE w.dateCreated <
?1 AND w.dateCreated > ?2
- ORDER BY w.dateCreated
DESC</query>
- </named-query>
- <named-query name="Weblog.getByEndDateOrderByDateCreatedDesc">
- <query>SELECT w FROM Weblog w WHERE w.dateCreated <
?1
- ORDER BY w.dateCreated
DESC</query>
- </named-query>
- <named-query
name="Weblog.getByEndDate&StartDate&ActiveOrderByDateCreatedDesc">
- <query>SELECT w FROM Weblog w WHERE w.dateCreated <
?1 AND w.dateCreated > ?2
- AND w.active = ?3
- ORDER BY w.dateCreated
DESC</query>
- </named-query>
- <named-query
name="Weblog.getByEndDate&Enabled&ActiveOrderByDateCreatedDesc">
- <query>SELECT w FROM Weblog w WHERE w.dateCreated <
?1
- AND w.visible = ?2 AND
w.active = ?3
- ORDER BY w.dateCreated
DESC</query>
- </named-query>
- <named-query
name="Weblog.getByEndDate&EnabledOrderByDateCreatedDesc">
- <query>SELECT w FROM Weblog w WHERE w.dateCreated <
?1
- AND w.visible = ?2
- ORDER BY w.dateCreated
DESC</query>
- </named-query>
-
- <named-query
name="Weblog.getByEndDate&ActiveOrderByDateCreatedDesc">
- <query>SELECT w FROM Weblog w WHERE w.dateCreated <
?1
- AND w.active = ?2
- ORDER BY w.dateCreated
DESC</query>
- </named-query>
<named-query name="Weblog.getCountAllDistinct">
<!-- DISTINCT is not required here -->
<query>SELECT COUNT(w) FROM Weblog w</query>
@@ -171,14 +129,11 @@
</one-to-many>
<transient name="theme"/>
<transient name="creator"/>
- <transient name="defaultPage"/>
<transient name="absoluteURL"/>
- <transient name="adminUserCount"/>
<transient name="commentCount"/>
<transient name="commentModerationRequired"/>
<transient name="todaysHits"/>
<transient name="URL"/>
- <transient name="userCount"/>
<transient name="entryCount"/>
<transient name="initializedPlugins"/>
<transient name="localeInstance"/>
Modified: roller/trunk/app/src/main/webapp/themes/gaurav/theme.xml
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/themes/gaurav/theme.xml?rev=1613165&r1=1613164&r2=1613165&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/themes/gaurav/theme.xml (original)
+++ roller/trunk/app/src/main/webapp/themes/gaurav/theme.xml Thu Jul 24
15:51:04 2014
@@ -9,7 +9,7 @@
<author>Gaurav Saini</author>
<!-- theme preview image -->
- <preview-image path="images/theme-resposive.png" />
+ <preview-image path="images/theme-responsive.png" />
<!-- stylesheet -->
<stylesheet>
