Improved: Added '@Override' should be used on overriding and implementing methods.
Affected files:
app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Profile.java
app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Register.java
app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Setup.java
app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarkEdit.java
app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Bookmarks.java
app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarksImport.java
app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Categories.java
app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryEdit.java
app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryRemove.java
app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Comments.java
app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Entries.java
app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryAddWithMediaFile.java
app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryEdit.java
app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryRemove.java
app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/FolderEdit.java
app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Maintenance.java
app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileAdd.java
app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileEdit.java
app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileImageChooser.java
app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileImageDim.java
diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Profile.java b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Profile.java
index 37e01d5..8f6e60f 100644
--- a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Profile.java
+++ b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Profile.java
@@ -48,12 +48,14 @@
// override default security, we do not require an action weblog
+ @Override
public boolean isWeblogRequired() {
return false;
}
@SkipValidation
+ @Override
public String execute() {
User ud = getAuthenticatedUser();
// load up the form from the users existing profile data
diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Register.java b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Register.java
index baadc5e..7561ce9 100644
--- a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Register.java
+++ b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Register.java
@@ -72,11 +72,13 @@
}
// override default security, we do not require an authenticated user
+ @Override
public boolean isUserRequired() {
return false;
}
// override default security, we do not require an action weblog
+ @Override
public boolean isWeblogRequired() {
return false;
}
@@ -86,6 +88,7 @@
}
@SkipValidation
+ @Override
public String execute() {
// if registration is disabled, then don't allow registration
diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Setup.java b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Setup.java
index 0cd64fb..00ab7e1 100644
--- a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Setup.java
+++ b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Setup.java
@@ -62,6 +62,7 @@
return false;
}
+ @Override
public String execute() {
try {
diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarkEdit.java b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarkEdit.java
index c3e5642..9e55650 100644
--- a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarkEdit.java
+++ b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarkEdit.java
@@ -58,6 +58,7 @@
this.pageTitle = pageTitle;
}
+ @Override
public void myPrepare() {
if (StringUtils.isEmpty(bean.getId())) {
// Create and initialize new, not-yet-saved WeblogBookmark
@@ -85,6 +86,7 @@
@SkipValidation
+ @Override
public String execute() {
if (!isAdd()) {
// load bean with database values during initial load
diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Bookmarks.java b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Bookmarks.java
index cc86b44..457cefc 100644
--- a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Bookmarks.java
+++ b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Bookmarks.java
@@ -67,6 +67,7 @@
this.pageTitle = "bookmarksForm.rootTitle";
}
+ @Override
public void myPrepare() {
try {
BookmarkManager bmgr = WebloggerFactory.getWeblogger().getBookmarkManager();
@@ -86,6 +87,7 @@
/**
* Present the bookmarks available in the folder specified by the request.
*/
+ @Override
public String execute() {
// build list of folders that the user can navigate to
diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarksImport.java b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarksImport.java
index b225cc2..e85a053 100644
--- a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarksImport.java
+++ b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarksImport.java
@@ -65,6 +65,7 @@
/**
* Request to import bookmarks
*/
+ @Override
public String execute() {
return INPUT;
}
diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Categories.java b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Categories.java
index dd9389f..1716d1a 100644
--- a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Categories.java
+++ b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Categories.java
@@ -52,6 +52,7 @@
return Collections.singletonList(WeblogPermission.POST);
}
+ @Override
public String execute() {
try {
WeblogEntryManager wmgr = WebloggerFactory.getWeblogger().getWeblogEntryManager();
diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryEdit.java b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryEdit.java
index 17dc99a..aef58ec 100644
--- a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryEdit.java
+++ b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryEdit.java
@@ -62,6 +62,7 @@
}
+ @Override
public void myPrepare() {
if ( isAdd() ) {
@@ -84,6 +85,7 @@
* Show category form.
*/
@SkipValidation
+ @Override
public String execute() {
if (!isAdd()) {
// make sure bean is properly loaded from pojo data
diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryRemove.java b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryRemove.java
index 206e89b..572e8f9 100644
--- a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryRemove.java
+++ b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryRemove.java
@@ -68,6 +68,7 @@
}
+ @Override
public void myPrepare() {
try {
WeblogEntryManager wmgr = WebloggerFactory.getWeblogger().getWeblogEntryManager();
@@ -83,6 +84,7 @@
/**
* Display the remove template confirmation.
*/
+ @Override
public String execute() {
try {
// Build list of categories that the removed category's blog entries (if any) can be moved to
@@ -136,6 +138,7 @@
*
* @return the string
*/
+ @Override
public String cancel() {
return CANCEL;
}
diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Comments.java b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Comments.java
index 3aee5df..331530f 100644
--- a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Comments.java
+++ b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Comments.java
@@ -159,6 +159,7 @@
.getActionURL("comments", "/roller-ui/authoring", getActionWeblog().getHandle(), params, false);
}
+ @Override
public String execute() {
// load list of comments from query
diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Entries.java b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Entries.java
index 9f15e2d..040c2a5 100644
--- a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Entries.java
+++ b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Entries.java
@@ -76,6 +76,7 @@
}
+ @Override
public String execute() {
if (log.isDebugEnabled()) {
diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryAddWithMediaFile.java b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryAddWithMediaFile.java
index 02a3677..40c67e3 100644
--- a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryAddWithMediaFile.java
+++ b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryAddWithMediaFile.java
@@ -56,6 +56,7 @@
* @return String The result of the action.
*/
@SkipValidation
+ @Override
public String execute() {
MediaFileManager manager =
WebloggerFactory.getWeblogger().getMediaFileManager();
@@ -134,6 +135,7 @@
/**
* @return the weblog
*/
+ @Override
public String getWeblog() {
return weblog;
}
@@ -141,6 +143,7 @@
/**
* @param weblog the weblog to set
*/
+ @Override
public void setWeblog(String weblog) {
this.weblog = weblog;
}
diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryEdit.java b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryEdit.java
index 9ffcb2e..50bfb47 100644
--- a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryEdit.java
+++ b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryEdit.java
@@ -91,6 +91,7 @@
return Collections.singletonList(WeblogPermission.EDIT_DRAFT);
}
+ @Override
public void myPrepare() {
if (getBean().getId() == null) {
// Create and initialize new, not-yet-saved Weblog Entry
@@ -118,6 +119,7 @@
* @return String The result of the action.
*/
@SkipValidation
+ @Override
public String execute() {
if (getActionName().equals("entryEdit")) {
// load bean with pojo data
diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryRemove.java b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryRemove.java
index 64266ed..5555f70 100644
--- a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryRemove.java
+++ b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryRemove.java
@@ -53,6 +53,7 @@
this.pageTitle = "weblogEdit.deleteEntry";
}
+ @Override
public void myPrepare() {
if (getRemoveId() != null) {
try {
@@ -65,6 +66,7 @@
}
}
+ @Override
public String execute() {
return INPUT;
}
diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/FolderEdit.java b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/FolderEdit.java
index c3658c2..91dc0ae 100644
--- a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/FolderEdit.java
+++ b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/FolderEdit.java
@@ -64,6 +64,7 @@
}
// load folder to edit
+ @Override
public void myPrepare() {
if (StringUtils.isEmpty(bean.getId())) {
// Create and initialize new folder but don't save yet
@@ -89,6 +90,7 @@
* Show folder edit page.
*/
@SkipValidation
+ @Override
public String execute() {
if (!isAdd()) {
// load bean with database values during initial load
diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Maintenance.java b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Maintenance.java
index 8b57dd9..63c9443 100644
--- a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Maintenance.java
+++ b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Maintenance.java
@@ -45,6 +45,7 @@
this.pageTitle = "maintenance.title";
}
+ @Override
public String execute() {
return SUCCESS;
}
diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileAdd.java b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileAdd.java
index d13247d..2e18fff 100644
--- a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileAdd.java
+++ b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileAdd.java
@@ -74,6 +74,7 @@
/**
* Prepares action class
*/
+ @Override
public void myPrepare() {
log.debug("Into myprepare");
refreshAllDirectories();
@@ -116,6 +117,7 @@
* @return String The result of the action.
*/
@SkipValidation
+ @Override
public String execute() {
return INPUT;
}
diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileEdit.java b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileEdit.java
index 810648e..76ff2db 100644
--- a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileEdit.java
+++ b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileEdit.java
@@ -61,6 +61,7 @@
/**
* Prepares edit action.
*/
+ @Override
public void myPrepare() {
refreshAllDirectories();
try {
@@ -90,6 +91,7 @@
* @return String The result of the action.
*/
@SkipValidation
+ @Override
public String execute() {
MediaFileManager manager = WebloggerFactory.getWeblogger().getMediaFileManager();
try {
diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileImageChooser.java b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileImageChooser.java
index 399d39d..f023021 100644
--- a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileImageChooser.java
+++ b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileImageChooser.java
@@ -59,6 +59,7 @@
/**
* Prepares view action
*/
+ @Override
public void myPrepare() {
refreshAllDirectories();
}
@@ -75,6 +76,7 @@
* @return String The result of the action.
*/
@SkipValidation
+ @Override
public String execute() {
MediaFileManager manager = WebloggerFactory.getWeblogger().getMediaFileManager();
try {
diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileImageDim.java b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileImageDim.java
index df5d2e7..67b91e5 100644
--- a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileImageDim.java
+++ b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileImageDim.java
@@ -46,6 +46,7 @@
* @return String The result of the action.
*/
@SkipValidation
+ @Override
public String execute() {
try {
MediaFileManager mgr = WebloggerFactory.getWeblogger().getMediaFileManager();
