details: https://code.openbravo.com/erp/stable/2.50/rev/2fb3137ae09f changeset: 9673:2fb3137ae09f user: Antonio Moreno <antonio.moreno <at> openbravo.com> date: Wed Sep 28 17:12:29 2011 +0200 summary: Format file
details: https://code.openbravo.com/erp/stable/2.50/rev/74ad6b9340af changeset: 9674:74ad6b9340af user: Antonio Moreno <antonio.moreno <at> openbravo.com> date: Wed Sep 28 17:13:22 2011 +0200 summary: Fixed issue 18644. The reset of the 'Scan for updates' information will not cause a 'Local changes' problem diffstat: src/org/openbravo/erpCommon/ad_forms/ModuleManagement.java | 141 ++++++------ 1 files changed, 75 insertions(+), 66 deletions(-) diffs (truncated from 336 to 300 lines): diff -r cafacaed4992 -r 74ad6b9340af src/org/openbravo/erpCommon/ad_forms/ModuleManagement.java --- a/src/org/openbravo/erpCommon/ad_forms/ModuleManagement.java Fri Sep 30 09:31:30 2011 +0000 +++ b/src/org/openbravo/erpCommon/ad_forms/ModuleManagement.java Wed Sep 28 17:13:22 2011 +0200 @@ -137,8 +137,8 @@ } else if (vars.commandIn("INSTALL")) { final String record = vars.getStringParameter("inpcRecordId"); - printPageInstall1(response, request, vars, record, false, null, new String[0], ModuleUtiltiy - .getSystemMaturityLevels(true), null); + printPageInstall1(response, request, vars, record, false, null, new String[0], + ModuleUtiltiy.getSystemMaturityLevels(true), null); } else if (vars.commandIn("INSTALL2")) { printPageInstall2(response, vars); } else if (vars.commandIn("INSTALL3")) { @@ -161,8 +161,8 @@ // clean module updates if there are any boolean isCleaned = cleanModulesUpdates(); if (isCleaned) { - msg = OBErrorBuilder.buildMessage(msg, "Info", Utility.messageBD(this, - "ModuleUpdatesRemoved", vars.getLanguage())); + msg = OBErrorBuilder.buildMessage(msg, "Info", + Utility.messageBD(this, "ModuleUpdatesRemoved", vars.getLanguage())); } response.sendRedirect(strDireccion + request.getServletPath() + "?Command=DEFAULT"); log4j.info(modules); @@ -185,8 +185,8 @@ } // For update obtain just update maturity level - printPageInstall1(response, request, vars, null, false, null, modulesToUpdate, ModuleUtiltiy - .getSystemMaturityLevels(false), null); + printPageInstall1(response, request, vars, null, false, null, modulesToUpdate, + ModuleUtiltiy.getSystemMaturityLevels(false), null); } else if (vars.commandIn("UPGRADE", "UPGRADE1")) { OBContext.setAdminMode(); try { @@ -447,8 +447,8 @@ // In case the search results must be shown request and display them if (displaySearch) - xmlDocument.setParameter("searchResults", getSearchResults(request, response, vars, - searchText)); + xmlDocument.setParameter("searchResults", + getSearchResults(request, response, vars, searchText)); out.println(xmlDocument.print()); out.close(); @@ -505,8 +505,8 @@ xmlDocument.setParameter("inpUser", strUser); try { ComboTableData comboTableData = new ComboTableData(vars, this, "18", "AD_User_ID", "110", "", - Utility.getContext(this, vars, "#AccessibleOrgTree", "ModuleManagement"), Utility - .getContext(this, vars, "#User_Client", "ModuleManagement"), 0); + Utility.getContext(this, vars, "#AccessibleOrgTree", "ModuleManagement"), + Utility.getContext(this, vars, "#User_Client", "ModuleManagement"), 0); Utility.fillSQLParameters(this, vars, null, comboTableData, "ModuleManagement", strUser); xmlDocument.setData("reportUser", "liststructure", comboTableData.select(false)); comboTableData = null; @@ -577,8 +577,8 @@ xmlDocument.setParameter("urlLink", getLink(url)); xmlDocument.setParameter("url", url); } - xmlDocument.setParameter("license", Utility.getListValueName("License Type", module - .getLicenseType(), vars.getLanguage())); + xmlDocument.setParameter("license", + Utility.getListValueName("License Type", module.getLicenseType(), vars.getLanguage())); if (dependencies != null && dependencies.length > 0) { xmlDocument.setData("dependencies", formatDeps4Display(dependencies, vars, this)); @@ -621,11 +621,11 @@ private static String getDisplayString(ModuleDependency dep, VariablesSecureApp vars, ConnectionProvider conn) { - final String DETAIL_MSG_DETAIL_BETWEEN = Utility.messageBD(conn, "MODULE_VERSION_BETWEEN", vars - .getLanguage()); + final String DETAIL_MSG_DETAIL_BETWEEN = Utility.messageBD(conn, "MODULE_VERSION_BETWEEN", + vars.getLanguage()); - final String DETAIL_MSG_OR_LATER = Utility.messageBD(conn, "MODULE_VERSION_OR_LATER", vars - .getLanguage()); + final String DETAIL_MSG_OR_LATER = Utility.messageBD(conn, "MODULE_VERSION_OR_LATER", + vars.getLanguage()); final String VERSION = Utility.messageBD(conn, "VERSION", vars.getLanguage()); @@ -829,8 +829,8 @@ xmlDocument.setParameter("moduleID", moduleId); xmlDocument.setParameter("upgradeVersion", version); - xmlDocument.setData("updateNeeded", FieldProviderFactory - .getFieldProviderArray(requiredUpdates)); + xmlDocument.setData("updateNeeded", + FieldProviderFactory.getFieldProviderArray(requiredUpdates)); response.setContentType("text/html; charset=UTF-8"); final PrintWriter out = response.getWriter(); @@ -990,8 +990,8 @@ } otherDeps += dep; } else { - String unknownMsg = Utility.messageBD(this, err.getString("errorCode"), vars - .getLanguage()); + String unknownMsg = Utility.messageBD(this, err.getString("errorCode"), + vars.getLanguage()); if (unknownMsg.equals(err.getString("errorCode"))) { unknownMsg = err.getString("message"); } else if (err.has("isMaturity") && err.getBoolean("isMaturity")) { @@ -1193,8 +1193,8 @@ + " " + module.getVersionNo() + " " - + Utility.messageBD(this, "OtherModuleVersionToinstallOrigall", vars - .getLanguage()) + " " + installOrig[i].getVersionNo()); + + Utility.messageBD(this, "OtherModuleVersionToinstallOrigall", + vars.getLanguage()) + " " + installOrig[i].getVersionNo()); } if (found) { module = installOrig[i]; @@ -1269,8 +1269,8 @@ if (!check) { discard[8] = ""; // show missing dependencies message message.setType("Warning"); - message.setTitle(Utility - .messageBD(this, "DependenciesNotSatisfied", vars.getLanguage())); + message + .setTitle(Utility.messageBD(this, "DependenciesNotSatisfied", vars.getLanguage())); } } @@ -1314,13 +1314,13 @@ xmlDocument.setParameter("language", "defaultLang=\"" + vars.getLanguage() + "\";"); xmlDocument.setParameter("theme", vars.getTheme()); if (inst != null && inst.length > 0) { - xmlDocument.setData("installs", getModuleFieldProvider(inst, minVersions, false, vars - .getLanguage(), islocal)); + xmlDocument.setData("installs", + getModuleFieldProvider(inst, minVersions, false, vars.getLanguage(), islocal)); } if (upd != null && upd.length > 0) { - xmlDocument.setData("updates", getModuleFieldProvider(upd, minVersions, false, vars - .getLanguage(), islocal)); + xmlDocument.setData("updates", + getModuleFieldProvider(upd, minVersions, false, vars.getLanguage(), islocal)); } if (merges != null && merges.length > 0) { @@ -1340,8 +1340,8 @@ xmlDocument.setParameter("maturityStyle", "none"); } else { xmlDocument.setParameter("maturityStyle", "yes"); - xmlDocument.setParameter("maturityLevel", (String) module.getAdditionalInfo().get( - "maturity.name")); + xmlDocument.setParameter("maturityLevel", + (String) module.getAdditionalInfo().get("maturity.name")); } } { @@ -1391,8 +1391,10 @@ } mod.put("versionNoCurr", currentInstalledVersion(module.getModuleID())); } else { - mod.put("versionNoMin", (minVersions.get(module.getModuleID()) == null ? module - .getVersionNo() : minVersions.get(module.getModuleID()))); + mod.put( + "versionNoMin", + (minVersions.get(module.getModuleID()) == null ? module.getVersionNo() : minVersions + .get(module.getModuleID()))); } if (!islocal) { @@ -1551,8 +1553,8 @@ xmlDocument.setParameter("language", "defaultLang=\"" + vars.getLanguage() + "\";"); xmlDocument.setParameter("theme", vars.getTheme()); xmlDocument.setParameter("minCoreVersion", minCoreVersion); - xmlDocument.setData("notAllowedModules", FieldProviderFactory - .getFieldProviderArray(modulesToAcquire)); + xmlDocument.setData("notAllowedModules", + FieldProviderFactory.getFieldProviderArray(modulesToAcquire)); response.setContentType("text/html; charset=UTF-8"); final PrintWriter out = response.getWriter(); out.println(xmlDocument.print()); @@ -1978,11 +1980,11 @@ notifications = getNotificationsJSON(vars.getLanguage()); if (!notifications.has("updatesRebuildHTML")) { if (!"".equals(ImportModule.getScanError().toString())) { - notifications.put("updatesRebuildHTML", Utility.messageBD(this, ImportModule - .getScanError().toString(), vars.getLanguage())); + notifications.put("updatesRebuildHTML", + Utility.messageBD(this, ImportModule.getScanError().toString(), vars.getLanguage())); } else { - notifications = notifications.put("updatesRebuildHTML", Utility.messageBD(this, - "NoUpdatesAvailable", vars.getLanguage())); + notifications = notifications.put("updatesRebuildHTML", + Utility.messageBD(this, "NoUpdatesAvailable", vars.getLanguage())); } } @@ -2034,12 +2036,13 @@ // clean module updates if there are any boolean isCleaned = cleanModulesUpdates(); + if (isCleaned) { - myMessage = OBErrorBuilder.buildMessage(myMessage, "Info", Utility.messageBD(this, - "ModuleUpdatesRemoved", vars.getLanguage())); + myMessage = OBErrorBuilder.buildMessage(myMessage, "Info", + Utility.messageBD(this, "ModuleUpdatesRemoved", vars.getLanguage())); } - myMessage = OBErrorBuilder.buildMessage(myMessage, "Success", Utility.messageBD(this, - "ModuleManagementSettingSaved", vars.getLanguage())); + myMessage = OBErrorBuilder.buildMessage(myMessage, "Success", + Utility.messageBD(this, "ModuleManagementSettingSaved", vars.getLanguage())); } finally { OBInterceptor.setPreventUpdateInfoChange(false); @@ -2074,18 +2077,20 @@ warn = true; warnMsg += "<br/>" + Utility.messageBD(this, "ModuleDependsButInstalled", vars.getLanguage()) - .replace("@module@", dep.getDependentModule().getName()).replace( - "@version@", dep.getFirstVersion()).replace("@installed@", - dep.getDependentModule().getVersion()); + .replace("@module@", dep.getDependentModule().getName()) + .replace("@version@", dep.getFirstVersion()) + .replace("@installed@", dep.getDependentModule().getVersion()); } else if (dep.getLastVersion() != null && !(vc.compare(dep.getFirstVersion(), dep.getDependentModule().getVersion()) <= 0 && vc .compare(dep.getLastVersion(), dep.getDependentModule().getVersion()) >= 0)) { save = false; warn = true; warnMsg += "<br/>" - + Utility.messageBD(this, "ModuleDependsButInstalled", vars.getLanguage()) - .replace("@module@", dep.getDependentModule().getName()).replace( - "@version@", dep.getFirstVersion() + " - " + dep.getLastVersion()) + + Utility + .messageBD(this, "ModuleDependsButInstalled", vars.getLanguage()) + .replace("@module@", dep.getDependentModule().getName()) + .replace("@version@", + dep.getFirstVersion() + " - " + dep.getLastVersion()) .replace("@installed@", dep.getDependentModule().getVersion()); } } @@ -2104,17 +2109,16 @@ // clean module updates if there are any final boolean isCleaned = cleanModulesUpdates(); if (isCleaned) { - myMessage = OBErrorBuilder.buildMessage(myMessage, "Info", Utility.messageBD(this, - "ModuleUpdatesRemoved", vars.getLanguage())); + myMessage = OBErrorBuilder.buildMessage(myMessage, "Info", + Utility.messageBD(this, "ModuleUpdatesRemoved", vars.getLanguage())); } if (warn) { - myMessage = OBErrorBuilder.buildMessage(myMessage, "Warning", Utility.messageBD(this, - "CannotSetMinorEnforcements", vars.getLanguage()) - + warnMsg); + myMessage = OBErrorBuilder.buildMessage(myMessage, "Warning", + Utility.messageBD(this, "CannotSetMinorEnforcements", vars.getLanguage()) + warnMsg); } else { - myMessage = OBErrorBuilder.buildMessage(myMessage, "Success", Utility.messageBD(this, - "ModuleManagementSettingSaved", vars.getLanguage())); + myMessage = OBErrorBuilder.buildMessage(myMessage, "Success", + Utility.messageBD(this, "ModuleManagementSettingSaved", vars.getLanguage())); } } @@ -2195,8 +2199,10 @@ for (org.openbravo.model.ad.domain.List value : qList.list()) { SQLReturnObject val = new SQLReturnObject(); val.setData("ID", value.getSearchKey()); - val.setData("NAME", Utility.getListValueName("Dependency Enforcement", - value.getSearchKey(), vars.getLanguage())); + val.setData( + "NAME", + Utility.getListValueName("Dependency Enforcement", value.getSearchKey(), + vars.getLanguage())); fpEnforcementCombo[i] = val; i++; } @@ -2231,8 +2237,10 @@ lastType = currentType; } - d.put("selectedEnforcement", dep.getInstanceEnforcement() == null ? dep - .getDependencyEnforcement() : dep.getInstanceEnforcement()); + d.put( + "selectedEnforcement", + dep.getInstanceEnforcement() == null ? dep.getDependencyEnforcement() : dep + .getInstanceEnforcement()); fpDeps[i] = FieldProviderFactory.getFieldProvider(d); fpEnforcements[i] = getEnforcementCombo(dep, fpEnforcementCombo, defaultStr); i++; @@ -2241,8 +2249,8 @@ final XmlDocument xmlDocument = xmlEngine.readXmlTemplate( "org/openbravo/erpCommon/ad_forms/ModuleManagementSettings", discard).createXmlDocument(); - xmlDocument.setData("moduleDetail", FieldProviderFactory - .getFieldProviderArray(moduleSpecifics)); + xmlDocument.setData("moduleDetail", ------------------------------------------------------------------------------ All of the data generated in your IT infrastructure is seriously valuable. Why? It contains a definitive record of application performance, security threats, fraudulent activity, and more. Splunk takes this data and makes sense of it. IT sense. And common sense. http://p.sf.net/sfu/splunk-d2dcopy2 _______________________________________________ Openbravo-commits mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openbravo-commits
