Author: gmazza
Date: Sun Jan 19 23:00:09 2014
New Revision: 1559595
URL: http://svn.apache.org/r1559595
Log:
Remove old/unused XDoclet and struts annotations.
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/Weblog.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogBookmark.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogBookmarkFolder.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogEntry.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogPermission.java
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=1559595&r1=1559594&r2=1559595&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
Sun Jan 19 23:00:09 2014
@@ -547,12 +547,6 @@ public class Weblog implements Serializa
return count;
}
- /** No-op needed to please XDoclet generated code */
- private int userCount = 0;
- public void setUserCount(int userCount) {
- // no-op
- }
-
public int getAdminUserCount() {
int count = 0;
try {
@@ -570,12 +564,6 @@ public class Weblog implements Serializa
return count;
}
- /** No-op needed to please XDoclet generated code */
- private int adminUserCount = 0;
- public void setAdminUserCount(int adminUserCount) {
- // no-op
- }
-
public int getEntryDisplayCount() {
return entryDisplayCount;
}
@@ -954,9 +942,6 @@ public class Weblog implements Serializa
return Collections.EMPTY_LIST;
}
- /** No-op method to please XDoclet */
- public void setTodaysReferrers(List ignored) {}
-
/**
* Get number of hits counted today.
*/
@@ -973,11 +958,7 @@ public class Weblog implements Serializa
}
return 0;
}
-
- /** No-op method to please XDoclet */
- public void setTodaysHits(int ignored) {}
-
/**
* Get a list of TagStats objects for the most popular tags
*
@@ -1016,9 +997,6 @@ public class Weblog implements Serializa
return count;
}
- /** No-op method to please XDoclet */
- public void setCommentCount(int ignored) {}
-
public long getEntryCount() {
long count = 0;
try {
@@ -1031,9 +1009,6 @@ public class Weblog implements Serializa
return count;
}
- /** No-op method to please XDoclet */
- public void setEntryCount(int ignored) {}
-
/**
* @return mobileTheme
*/
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogBookmark.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogBookmark.java?rev=1559595&r1=1559594&r2=1559595&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogBookmark.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogBookmark.java
Sun Jan 19 23:00:09 2014
@@ -81,9 +81,6 @@ public class WeblogBookmark implements S
/**
* Name of bookmark.
- *
- * @struts.validator type="required" msgkey="errors.required"
- * @struts.validator-args arg0resource="bookmarkForm.name"
*/
public String getName() {
return this.name;
@@ -117,10 +114,6 @@ public class WeblogBookmark implements S
/**
* Weight indicates prominence of link
- *
- * @struts.validator type="required" msgkey="errors.required"
- * @struts.validator type="integer" msgkey="errors.integer"
- * @struts.validator-args arg0resource="bookmarkForm.weight"
*/
public java.lang.Integer getWeight() {
return this.weight;
@@ -132,10 +125,6 @@ public class WeblogBookmark implements S
/**
* Priority determines order of display
- *
- * @struts.validator type="required" msgkey="errors.required"
- * @struts.validator type="integer" msgkey="errors.integer"
- * @struts.validator-args arg0resource="bookmarkForm.priority"
*/
public java.lang.Integer getPriority() {
return this.priority;
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogBookmarkFolder.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogBookmarkFolder.java?rev=1559595&r1=1559594&r2=1559595&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogBookmarkFolder.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogBookmarkFolder.java
Sun Jan 19 23:00:09 2014
@@ -147,11 +147,6 @@ public class WeblogBookmarkFolder implem
/**
* The short name for this folder.
- *
- * @struts.validator type="required" msgkey="errors.required"
- * @struts.validator type="mask" msgkey="errors.noslashes"
- * @struts.validator-var name="mask" value="${noslashes}"
- * @struts.validator-args arg0resource="folderForm.name"
*/
public String getName() {
return this.name;
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogEntry.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogEntry.java?rev=1559595&r1=1559594&r2=1559595&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogEntry.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogEntry.java
Sun Jan 19 23:00:09 2014
@@ -57,8 +57,6 @@ import org.apache.roller.weblogger.util.
/**
* Represents a Weblog Entry.
- *
- * @struts.form include-all="true"
*/
public class WeblogEntry implements Serializable {
private static Log mLogger =
@@ -234,11 +232,6 @@ public class WeblogEntry implements Seri
return cats;
}
- /** No-op method to please XDoclet */
- public void setCategories(List cats) {
- // no-op
- }
-
public Weblog getWebsite() {
return this.website;
}
@@ -351,9 +344,7 @@ public class WeblogEntry implements Seri
}
//-------------------------------------------------------------------------
- /**
- * Map attributes as set because XDoclet 1.2b4 map support is broken.
- */
+
public Set<WeblogEntryAttribute> getEntryAttributes() {
return attSet;
}
@@ -362,9 +353,6 @@ public class WeblogEntry implements Seri
this.attSet = atts;
}
- /**
- * Would be named getEntryAttribute, but that would set off XDoclet
- */
public String findEntryAttribute(String name) {
if (getEntryAttributes() != null) {
for (WeblogEntryAttribute att : getEntryAttributes()) {
@@ -767,11 +755,6 @@ public class WeblogEntry implements Seri
return comments.size();
}
- /** No-op to please XDoclet */
- public void setCommentCount(int ignored) {
- // no-op
- }
-
public List getReferers() {
List referers = null;
try {
@@ -813,13 +796,6 @@ public class WeblogEntry implements Seri
return getPermaLink() + "#comments";
}
- /**
- * to please XDoclet
- * @deprecated Use commentLink() instead
- */
- public void setCommentsLink(String ignored) {}
-
-
/**
* Return the Title of this post, or the first 255 characters of the
* entry's text.
@@ -934,52 +910,31 @@ public class WeblogEntry implements Seri
public boolean isDraft() {
return getStatus().equals(DRAFT);
}
- /** no-op: needed only to satisfy XDoclet, use setStatus() instead */
- public void setDraft(boolean value) {
- }
-
+
/** Convenience method for checking status */
public boolean isPending() {
return getStatus().equals(PENDING);
}
- /** no-op: needed only to satisfy XDoclet, use setStatus() instead */
- public void setPending(boolean value) {
- }
-
+
/** Convenience method for checking status */
public boolean isPublished() {
return getStatus().equals(PUBLISHED);
}
- /** no-op: needed only to satisfy XDoclet, use setStatus() instead */
- public void setPublished(boolean value) {
- }
-
+
/**
* Get entry text, transformed by plugins enabled for entry.
*/
public String getTransformedText() {
return render(getText());
}
- /**
- * No-op to please XDoclet.
- */
- public void setTransformedText(String t) {
- // no-op
- }
-
+
/**
* Get entry summary, transformed by plugins enabled for entry.
*/
public String getTransformedSummary() {
return render(getSummary());
}
- /**
- * No-op to please XDoclet.
- */
- public void setTransformedSummary(String t) {
- // no-op
- }
-
+
/**
* Determine if the specified user has permissions to edit this entry.
*/
@@ -1100,6 +1055,4 @@ public class WeblogEntry implements Seri
return displayContent(null);
}
- /** No-op method to please XDoclet */
- public void setDisplayContent(String ignored) {}
}
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogPermission.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogPermission.java?rev=1559595&r1=1559594&r2=1559595&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogPermission.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogPermission.java
Sun Jan 19 23:00:09 2014
@@ -30,8 +30,6 @@ import org.apache.roller.weblogger.busin
/**
* Permission for one specific weblog
- * @struts.form include-all="true"
- *
* @author Dave Johnson
*/
public class WeblogPermission extends ObjectPermission implements Serializable
{
