Author: sshyrkov
Date: Mon Nov 19 16:30:26 2007
New Revision: 19222
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D19222&repname=
=3Djahia
Log:
Clean: 1) replace deprecated ActionErrors et al. with ActionMessages =
2) replace deprecated method call from LockKey
Modified:
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/views/engines=
/versioning/actions/ContentVersioningAction.java
Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/views/e=
ngines/versioning/actions/ContentVersioningAction.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/java/org/jahia/views/engines/versioning/actions/Conte=
ntVersioningAction.java&rev=3D19222&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/views/engines=
/versioning/actions/ContentVersioningAction.java (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/views/engines=
/versioning/actions/ContentVersioningAction.java Mon Nov 19 16:30:26 2007
@@ -226,7 +226,7 @@
throws IOException, ServletException {
=
ActionForward forward =3D mapping.findForward("operationChoices");
- ActionErrors errors =3D new ActionErrors();
+ ActionMessages errors =3D new ActionMessages();
JahiaEngineCommonData engineCommonData;
try {
init(mapping, request);
@@ -247,8 +247,8 @@
} catch (Throwable t) {
JahiaErrorDisplay.DisplayException(request, response,
super.getServlet().getServletContext(), t);
- errors.add(ActionErrors.GLOBAL_ERROR,
- new ActionError("Error preparing Operation Choices vie=
w"));
+ errors.add(ActionMessages.GLOBAL_MESSAGE,
+ new ActionMessage("Error preparing Operation Choices v=
iew"));
}
// set engine screen
request.setAttribute("engineView", "operationChoices");
@@ -274,7 +274,7 @@
throws IOException, ServletException {
=
ActionForward forward =3D mapping.getInputForward();
- ActionErrors errors =3D new ActionErrors();
+ ActionMessages errors =3D new ActionMessages();
ContentVersioningViewHelper versViewHelper =3D null;
JahiaEngineCommonData engineCommonData;
try {
@@ -302,8 +302,8 @@
} catch (Throwable t) {
JahiaErrorDisplay.DisplayException(request, response,
super.getServlet().getServletContext(), t);
- errors.add(ActionErrors.GLOBAL_ERROR,
- new ActionError("Exception occured when processing con=
tent object ["
+ errors.add(ActionMessages.GLOBAL_MESSAGE,
+ new ActionMessage("Exception occured when processing c=
ontent object ["
+ versViewHelper.getContentObject().getObjectK=
ey() + "]"));
}
// set engine screen
@@ -413,7 +413,7 @@
throws IOException, ServletException {
=
ActionForward forward =3D mapping.findForward("sitemap");
- ActionErrors errors =3D new ActionErrors();
+ ActionMessages errors =3D new ActionMessages();
PagesVersioningViewHelper pagesVersViewHelper;
JahiaEngineCommonData engineCommonData;
try {
@@ -458,8 +458,8 @@
} catch (Throwable t) {
JahiaErrorDisplay.DisplayException(request, response,
super.getServlet().getServletContext(), t);
- errors.add(ActionErrors.GLOBAL_ERROR,
- new ActionError("Error preparing sitemap view"));
+ errors.add(ActionMessages.GLOBAL_MESSAGE,
+ new ActionMessage("Error preparing sitemap view"));
}
// set engine screen
request.setAttribute("engineView", "sitemap");
@@ -485,7 +485,7 @@
throws IOException, ServletException {
=
ActionForward forward =3D null;
- ActionErrors errors =3D new ActionErrors();
+ ActionMessages errors =3D new ActionMessages();
ContentVersioningViewHelper versViewHelper;
JahiaEngineCommonData engineCommonData;
try {
@@ -572,8 +572,8 @@
} catch (Throwable t) {
JahiaErrorDisplay.DisplayException(request, response,
super.getServlet().getServletContext(), t);
- errors.add(ActionErrors.GLOBAL_ERROR,
- new ActionError("Error preparing confirm restore view"=
));
+ errors.add(ActionMessages.GLOBAL_MESSAGE,
+ new ActionMessage("Error preparing confirm restore vie=
w"));
}
// set engine screen
request.setAttribute("engineView", "confirmRestore");
@@ -598,7 +598,7 @@
throws IOException, ServletException {
=
ActionForward forward =3D null;
- ActionErrors errors =3D new ActionErrors();
+ ActionMessages errors =3D new ActionMessages();
ContentVersioningViewHelper versViewHelper;
JahiaEngineCommonData engineCommonData;
try {
@@ -629,8 +629,8 @@
} catch (Throwable t) {
JahiaErrorDisplay.DisplayException(request, response,
super.getServlet().getServletContext(), t);
- errors.add(ActionErrors.GLOBAL_ERROR,
- new ActionError("Error preparing confirm undo view"));
+ errors.add(ActionMessages.GLOBAL_MESSAGE,
+ new ActionMessage("Error preparing confirm undo view")=
);
}
// set engine screen
request.setAttribute("engineView", "confirmRestore");
@@ -674,7 +674,7 @@
throws IOException, ServletException {
=
ContentVersioningViewHelper versViewHelper;
- ActionErrors errors =3D new ActionErrors();
+ ActionMessages errors =3D new ActionMessages();
try {
init(mapping, request);
versViewHelper =3D (ContentVersioningViewHelper)
@@ -702,8 +702,8 @@
} catch (Throwable t) {
JahiaErrorDisplay.DisplayException(request, response,
super.getServlet().getServletContext(), t);
- errors.add(ActionErrors.GLOBAL_ERROR,
- new ActionError("Error processing restore save action"=
));
+ errors.add(ActionMessages.GLOBAL_MESSAGE,
+ new ActionMessage("Error processing restore save actio=
n"));
}
return null;
}
@@ -726,7 +726,7 @@
throws IOException, ServletException {
=
ActionForward forward =3D mapping.findForward("sitemap");
- ActionErrors errors =3D new ActionErrors();
+ ActionMessages errors =3D new ActionMessages();
PagesVersioningViewHelper pagesVersViewHelper;
JahiaEngineCommonData engineCommonData;
try {
@@ -815,8 +815,8 @@
} catch (Throwable t) {
JahiaErrorDisplay.DisplayException(request, response,
super.getServlet().getServletContext(), t);
- errors.add(ActionErrors.GLOBAL_ERROR,
- new ActionError("Error processing page restore"));
+ errors.add(ActionMessages.GLOBAL_MESSAGE,
+ new ActionMessage("Error processing page restore"));
} finally {
ServicesRegistry.getInstance().getJahiaEventService().fireAggr=
egatedEvents();
ServicesRegistry.getInstance().getCacheService().syncClusterNo=
w();
@@ -845,7 +845,7 @@
throws IOException, ServletException {
=
ActionForward forward =3D mapping.findForward("revisionDetails");
- ActionErrors errors =3D new ActionErrors();
+ ActionMessages errors =3D new ActionMessages();
ContentVersioningViewHelper versViewHelper;
JahiaEngineCommonData engineCommonData;
try {
@@ -891,8 +891,8 @@
} catch (Throwable t) {
JahiaErrorDisplay.DisplayException(request, response,
super.getServlet().getServletContext(), t);
- errors.add(ActionErrors.GLOBAL_ERROR,
- new ActionError("Error processing container restore"));
+ errors.add(ActionMessages.GLOBAL_MESSAGE,
+ new ActionMessage("Error processing container restore"=
));
} finally {
ServicesRegistry.getInstance().getJahiaEventService().fireAggr=
egatedEvents();
ServicesRegistry.getInstance().getCacheService().syncClusterNo=
w();
@@ -940,7 +940,7 @@
throws IOException, ServletException {
=
ActionForward forward =3D mapping.findForward("revisionsDetail");
- ActionErrors errors =3D new ActionErrors();
+ ActionMessages errors =3D new ActionMessages();
PagesVersioningViewHelper pagesVersViewHelper =3D null;
try {
init(mapping, request);
@@ -974,8 +974,8 @@
} catch (Throwable t) {
JahiaErrorDisplay.DisplayException(request, response,
super.getServlet().getServletContext(), t);
- errors.add(ActionErrors.GLOBAL_ERROR,
- new ActionError("Exception processing show restore ver=
sion test result"));
+ errors.add(ActionMessages.GLOBAL_MESSAGE,
+ new ActionMessage("Exception processing show restore v=
ersion test result"));
}
request.setAttribute("engineView", "revisionsDetail");
return continueForward(mapping, request, errors, forward);
@@ -999,7 +999,7 @@
throws IOException, ServletException {
=
ActionForward forward =3D mapping.findForward("close");
- ActionErrors errors =3D new ActionErrors();
+ ActionMessages errors =3D new ActionMessages();
ContentVersioningViewHelper versViewHelper =3D null;
JahiaEngineCommonData engineCommonData =3D null;
try {
@@ -1016,8 +1016,8 @@
} catch (Throwable t) {
JahiaErrorDisplay.DisplayException(request, response,
super.getServlet().getServletContext(), t);
- errors.add(ActionErrors.GLOBAL_ERROR,
- new ActionError("Error preparing Operation Choices vie=
w"));
+ errors.add(ActionMessages.GLOBAL_MESSAGE,
+ new ActionMessage("Error preparing Operation Choices v=
iew"));
} finally {
if (versViewHelper !=3D null && versViewHelper.isRestoringPage=
()) {
try {
@@ -1052,7 +1052,7 @@
HttpServletResponse response)
throws IOException, ServletException {
ActionForward forward =3D mapping.findForward("close");
- ActionErrors errors =3D new ActionErrors();
+ ActionMessages errors =3D new ActionMessages();
JahiaEngineCommonData engineCommonData =3D null;
try {
init(mapping, request);
@@ -1061,8 +1061,8 @@
} catch (Throwable t) {
JahiaErrorDisplay.DisplayException(request, response,
super.getServlet().getServletContext(), t);
- errors.add(ActionErrors.GLOBAL_ERROR,
- new ActionError("Error preparing Operation Choices vie=
w"));
+ errors.add(ActionMessages.GLOBAL_MESSAGE,
+ new ActionMessage("Error preparing Operation Choices v=
iew"));
} finally {
try {
releaseTreeLocks(engineCommonData.getParamBean());
@@ -1470,7 +1470,7 @@
throws JahiaException {
=
ActionForward forward =3D mapping.findForward("containerVersionCom=
pare");
- ActionErrors errors =3D new ActionErrors();
+ ActionMessages errors =3D new ActionMessages();
ContainerVersioningViewHelper versViewHelper =3D null;
JahiaEngineCommonData engineCommonData =3D null;
try {
@@ -1498,8 +1498,8 @@
} catch (Throwable t) {
JahiaErrorDisplay.DisplayException(request, response,
super.getServlet().getServletContext(), t);
- errors.add(ActionErrors.GLOBAL_ERROR,
- new ActionError("Exception processing container versio=
n compare"));
+ errors.add(ActionMessages.GLOBAL_MESSAGE,
+ new ActionMessage("Exception processing container vers=
ion compare"));
}
request.setAttribute("DisableButtons", "DisableButtons");
request.setAttribute("engineView", "containerVersionCompare");
@@ -1517,7 +1517,7 @@
protected ActionForward continueForward(
ActionMapping mapping,
HttpServletRequest request,
- ActionErrors errors,
+ ActionMessages errors,
ActionForward continueForward) {
=
if (errors !=3D null && !errors.isEmpty()) {
@@ -1885,7 +1885,7 @@
HtmlCache htmlCache =3D ServicesRegistry.getInstance().getCach=
eService().getHtmlCacheInstance();
LockService lockRegistry =3D ServicesRegistry.getInstance().ge=
tLockService();
LockKey lockKey =3D LockKey.composeLockKey(LockKey.UPDATE_PAGE=
_TYPE,
- jParams.getPageID(), jParams.getPageID());
+ jParams.getPageID());
final JahiaUser user =3D jParams.getUser();
lockRegistry.release(lockKey, user, user.getUserKey());
htmlCache.invalidatePageEntries(Integer.toString(jParams.getPa=
geID()));
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
