Author: bpapez
Date: Wed Jun 6 17:48:37 2007
New Revision: 17492
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D17492&repname=
=3Djahia
Log:
Refactoring of Booleans
Modified:
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/admin/sites/Manage=
Sites.java
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/admin/sites/=
ManageSites.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/admin/sites/ManageSites.java&rev=3D17492&re=
pname=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-5-0-SP-BRANCH/core/src/java/org/jahia/admin/sites/Manage=
Sites.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/admin/sites/Manage=
Sites.java Wed Jun 6 17:48:37 2007
@@ -321,7 +321,7 @@
=
Boolean defaultSite =3D (Boolean) session.getAttribute(CLASS_NAME =
+ "defaultSite");
if (defaultSite =3D=3D null) {
- defaultSite =3D new Boolean(true);
+ defaultSite =3D Boolean.TRUE;
}
=
// store in session
@@ -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 ");
@@ -402,7 +402,7 @@
String siteKey =3D JahiaTools.getStrParameter(request, "siteKey", =
"").toLowerCase().trim();
String siteDescr =3D JahiaTools.getStrParameter(request, "siteDesc=
r", "").trim();
String siteAdmin =3D JahiaTools.getStrParameter(request, "siteAdmi=
n", "").trim();
- Boolean defaultSite =3D new Boolean(request.getParameter("defaultS=
ite") !=3D null);
+ Boolean defaultSite =3D Boolean.valueOf(request.getParameter("defa=
ultSite") !=3D null);
request.getSession().setAttribute("siteAdminOption",siteAdmin);
String warningMsg =3D "";
=
@@ -498,7 +498,7 @@
if (session.getAttribute(CLASS_NAME + "noSites") !=3D null=
) {
displayList(request, response, session);
} else {
- displayAdd(request, response, session); =
=
+ displayAdd(request, response, session);
}
}
} catch (JahiaException ex) {
@@ -906,9 +906,6 @@
Locale selectedLocale =3D (Locale) session.getAttribute(CLASS_NAME=
+ "selectedLocale");
=
try {
- JahiaUser currentUser =3D ServicesRegistry.getInstance()
- .getJahiaUserManagerService()
- .lookupUser(0, (String) session.getAttribute(CLASS_NAM=
E + "jahiaLoginUsername"));
JahiaUser adminSiteUser =3D null;
=
// get services...
@@ -920,6 +917,7 @@
JahiaPageTemplateService jpts =3D ServicesRegistry.getInstance=
().getJahiaPageTemplateService();
JahiaSearchService searchServ =3D ServicesRegistry.getInstance=
().getJahiaSearchService();
=
+ JahiaUser currentUser =3D jums.lookupUser(0, (String) session.=
getAttribute(CLASS_NAME + "jahiaLoginUsername"));
// add the site in siteManager...
sMgr.addSite(site);
=
@@ -937,13 +935,11 @@
JahiaAclEntry adminAclEntry =3D new JahiaAclEntry(7, 0);
=
// root admin group
- JahiaGroup adminGrp =3D ServicesRegistry.getInstance()
- .getJahiaGroupManagerService().getAdministratorGro=
up(0);
+ JahiaGroup adminGrp =3D jgms.getAdministratorGroup(0);
site.getACL().setGroupEntry(adminGrp, adminAclEntry);
=
// site admin group
- adminGrp =3D ServicesRegistry.getInstance()
- .getJahiaGroupManagerService().getAdministratorGro=
up(site.getID());
+ adminGrp =3D jgms.getAdministratorGroup(site.getID());
site.getACL().setGroupEntry(adminGrp, adminAclEntry);
=
// create default groups...
@@ -1522,14 +1518,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");
@@ -1626,9 +1622,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...
@@ -2018,6 +2014,7 @@
File f =3D fileUpload.getFile((String) iterator.next());
processFileImport(f, request);
}
+
}
if (jParams.getParameter("importpath") !=3D null) {
File f=3D new File(jParams.getParameter("importpath"));
@@ -2184,7 +2181,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
