Author: bpapez
Date: Fri Jun 15 14:35:12 2007
New Revision: 17592
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D17592&repname=
=3Djahia
Log:
Refactoring of Booleans
Modified:
trunk/core/src/java/org/jahia/admin/sites/ManageSites.java
Modified: trunk/core/src/java/org/jahia/admin/sites/ManageSites.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/admin/sites/ManageSites.java&rev=3D17592&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
--- trunk/core/src/java/org/jahia/admin/sites/ManageSites.java (original)
+++ trunk/core/src/java/org/jahia/admin/sites/ManageSites.java Fri Jun 15 1=
4:35:12 2007
@@ -353,7 +353,7 @@
request.setAttribute("jahiaDisplayMessage", jahiaDisplayMessage);
request.setAttribute("warningMsg", warningMsg);
request.setAttribute("defaultSite", defaultSite);
- request.setAttribute("newAdminOnly", new Boolean(grantedSites.size=
() <=3D 0));
+ request.setAttribute("newAdminOnly", Boolean.valueOf(grantedSites.=
size() <=3D 0));
=
try {
// logger.debug(" license check ");
@@ -1521,14 +1521,14 @@
String siteDescr =3D (String) request.getAttribute("siteDescr"=
);
String warningMsg =3D (String) request.getAttribute("warningMs=
g");
=
- Boolean defaultSite =3D new Boolean(false);
- Boolean versioningEnabled =3D new Boolean(site.isVersioningEna=
bled());
- Boolean stagingEnabled =3D new Boolean(site.isStagingEnabled()=
);
+ Boolean defaultSite =3D Boolean.FALSE;
+ Boolean versioningEnabled =3D Boolean.valueOf(site.isVersionin=
gEnabled());
+ Boolean stagingEnabled =3D Boolean.valueOf(site.isStagingEnabl=
ed());
=
if (request.getAttribute("defaultSite") =3D=3D null) {
JahiaSite defSite =3D getDefaultSite();
if (defSite !=3D null && defSite.getSiteKey().equals(site.=
getSiteKey())) {
- defaultSite =3D new Boolean(true);
+ defaultSite =3D Boolean.TRUE;
}
} else {
defaultSite =3D (Boolean) request.getAttribute("defaultSit=
e");
@@ -1625,9 +1625,9 @@
request.setAttribute("siteTitle", siteTitle);
request.setAttribute("siteServerName", siteServerName);
request.setAttribute("siteDescr", siteDescr);
- request.setAttribute("defaultSite", new Boolean(defaultSite));
- request.setAttribute("versioningEnabled", new Boolean(versioningEn=
abled));
- request.setAttribute("stagingEnabled", new Boolean(stagingEnabled)=
);
+ request.setAttribute("defaultSite", Boolean.valueOf(defaultSite));
+ request.setAttribute("versioningEnabled", Boolean.valueOf(versioni=
ngEnabled));
+ request.setAttribute("stagingEnabled", Boolean.valueOf(stagingEnab=
led));
=
try {
// get site...
@@ -2183,7 +2183,7 @@
request.setAttribute("firstImport", "fileImport");
request.setAttribute("fileImport", fileImport);
}
- request.setAttribute("asAJob", new Boolean(asAJob));
+ request.setAttribute("asAJob", Boolean.valueOf(asAJob));
=
if (templates !=3D null) {
SharedTemplatePackagesRegistry tmplSetReg =3D SharedTemplatePa=
ckagesRegistry.getInstance();
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list