details: /erp/devel/pi/rev/7d9a9c39fea4
changeset: 12519:7d9a9c39fea4
user: Stefan Hühner <stefan.huehner <at> openbravo.com>
date: Fri May 27 13:03:06 2011 +0200
summary: [cleanup] Remove some unused SqlMethods from non-public xsql files
details: /erp/devel/pi/rev/50f53b76463f
changeset: 12520:50f53b76463f
user: Stefan Hühner <stefan.huehner <at> openbravo.com>
date: Fri May 27 13:06:09 2011 +0200
summary: [cleanup] simplify some xsql dummy methods only used to define list
of fields
for the xsql class
details: /erp/devel/pi/rev/69d0e1906649
changeset: 12521:69d0e1906649
user: Stefan Hühner <stefan.huehner <at> openbravo.com>
date: Fri May 27 14:32:51 2011 +0200
summary: [cleanup] Remove unused private methods in several files.
diffstat:
modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/DataSourceServlet.java
| 7 -
src/org/openbravo/base/secureApp/Attribute_data.xsql
| 15 -
src/org/openbravo/base/secureApp/DefaultOptions_data.xsql
| 54 +---
src/org/openbravo/base/secureApp/HttpSecureAppServlet.java
| 30 --
src/org/openbravo/base/secureApp/OrgTree.java
| 60 -----
src/org/openbravo/base/secureApp/Seguridad_data.xsql
| 11 -
src/org/openbravo/erpCommon/ad_callouts/LocatorCombo_data.xsql
| 11 -
src/org/openbravo/erpCommon/ad_forms/CallAcctServer.java
| 37 ---
src/org/openbravo/erpCommon/ad_forms/ProductInfo.java
| 85 -------
src/org/openbravo/erpCommon/ad_forms/ProductInfo_data.xsql
| 24 --
src/org/openbravo/erpCommon/ad_forms/ShowSessionPreferences.java
| 22 -
src/org/openbravo/erpCommon/ad_process/ApplyModulesCallServlet.java
| 14 -
src/org/openbravo/erpCommon/ad_reports/Organization_data.xsql
| 11 -
src/org/openbravo/erpCommon/ad_reports/ReportCashJR_data.xsql
| 18 -
src/org/openbravo/erpCommon/ad_reports/ReportDebtPayment_data.xsql
| 8 -
src/org/openbravo/erpCommon/ad_reports/ReportProductionCost_data.xsql
| 8 -
src/org/openbravo/erpCommon/ad_reports/ReportTrialBalance_data.xsql
| 21 -
src/org/openbravo/erpCommon/ad_reports/ReportWorkRequirementDaily_data.xsql
| 15 -
src/org/openbravo/erpCommon/info/AccountElementValue.java
| 10 -
src/org/openbravo/erpCommon/info/DebtPayment.java
| 13 -
src/org/openbravo/erpCommon/info/WarehouseCombo_data.xsql
| 27 --
src/org/openbravo/erpCommon/modules/VersionUtility.java
| 5 -
src/org/openbravo/erpCommon/utility/ExportGrid.java
| 5 -
src/org/openbravo/erpCommon/utility/KeyMap.java
| 25 --
src/org/openbravo/erpCommon/utility/ReferencedLink_data.xsql
| 120 ----------
src/org/openbravo/erpCommon/utility/VerticalMenu.java
| 19 -
src/org/openbravo/erpCommon/utility/reporting/ReportManager.java
| 7 -
src/org/openbravo/erpReports/RptC_ProposalJr_data.xsql
| 34 --
src/org/openbravo/erpReports/RptPromissoryNoteTree_data.xsql
| 12 -
src/org/openbravo/erpReports/TaxPayment_data.xsql
| 108 ---------
src/org/openbravo/scheduling/ProcessRequest_data.xsql
| 20 -
src/org/openbravo/scheduling/ProcessRun_data.xsql
| 7 +-
src/org/openbravo/scheduling/Process_data.xsql
| 8 -
33 files changed, 10 insertions(+), 861 deletions(-)
diffs (truncated from 1283 to 300 lines):
diff -r 31b1f08ae65b -r 69d0e1906649
modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/DataSourceServlet.java
---
a/modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/DataSourceServlet.java
Fri May 27 14:31:00 2011 +0200
+++
b/modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/DataSourceServlet.java
Fri May 27 14:32:51 2011 +0200
@@ -696,13 +696,6 @@
w.close();
}
- private void writeResultCSV(HttpServletRequest request, HttpServletResponse
response,
- Map<String, String> parameters, String result) throws IOException,
JSONException {
-
- StringBuffer csv = new StringBuffer();
-
- }
-
private String getRequestContent(HttpServletRequest request) throws
IOException {
final BufferedReader reader = request.getReader();
if (reader == null) {
diff -r 31b1f08ae65b -r 69d0e1906649
src/org/openbravo/base/secureApp/Attribute_data.xsql
--- a/src/org/openbravo/base/secureApp/Attribute_data.xsql Fri May 27
14:31:00 2011 +0200
+++ b/src/org/openbravo/base/secureApp/Attribute_data.xsql Fri May 27
14:32:51 2011 +0200
@@ -29,21 +29,6 @@
<Parameter name="clientlist" optional="true" type="replace" after="AND
a.AD_CLIENT_ID IN (" text="'1'"/>
<Parameter name="orglist" optional="true" type="replace" after="AND
a.AD_ORG_ID IN (" text="'1'"/>
</SqlMethod>
- <SqlMethod name="selectAttributes" type="preparedStatement"
return="multiple">
- <SqlMethodComment></SqlMethodComment>
- <Sql>
- SELECT Attribute, Value, AD_Window_ID
- FROM AD_Preference
- WHERE AD_Client_ID IN ('0', ?)
- AND AD_Org_ID IN ('0', ?)
- AND (AD_User_ID IS NULL OR AD_User_ID='0' OR AD_User_ID=?)
- AND IsActive='Y'
- ORDER BY Attribute, AD_Client_ID, AD_Org_ID, AD_User_ID
- </Sql>
- <Parameter name="adClientId"/>
- <Parameter name="adOrgId"/>
- <Parameter name="adUserId"/>
- </SqlMethod>
<SqlMethod name="selectIsSOTrx" type="preparedStatement" return="multiple">
<SqlMethodComment></SqlMethodComment>
<Sql>
diff -r 31b1f08ae65b -r 69d0e1906649
src/org/openbravo/base/secureApp/DefaultOptions_data.xsql
--- a/src/org/openbravo/base/secureApp/DefaultOptions_data.xsql Fri May 27
14:31:00 2011 +0200
+++ b/src/org/openbravo/base/secureApp/DefaultOptions_data.xsql Fri May 27
14:32:51 2011 +0200
@@ -15,34 +15,18 @@
<SqlClass name="DefaultOptionsData" package="org.openbravo.base.secureApp">
<SqlClassComment></SqlClassComment>
- <SqlMethod name="getDefaultOptions" type="preparedStatement"
return="multiple">
+ <SqlMethod name="dummy" type="preparedStatement" return="multiple">
<SqlMethodComment></SqlMethodComment>
<Sql><![CDATA[
- SELECT users.DEFAULT_AD_CLIENT_ID,
- users.DEFAULT_AD_ORG_ID,
- users.DEFAULT_AD_LANGUAGE,
- users.DEFAULT_AD_ROLE_ID,
- users.DEFAULT_M_WAREHOUSE_ID,
+ SELECT '' as DEFAULT_AD_CLIENT_ID,
+ '' as DEFAULT_AD_ORG_ID,
+ '' as DEFAULT_AD_LANGUAGE,
+ '' as DEFAULT_AD_ROLE_ID,
+ '' as DEFAULT_M_WAREHOUSE_ID,
'' AS ISRTL,
- '' AS AD_LANGUAGE,
- '' AS LINE
- FROM AD_USER users
- INNER JOIN AD_CLIENT client ON users.DEFAULT_AD_CLIENT_ID =
client.AD_CLIENT_ID
- INNER JOIN AD_ORG org ON users.DEFAULT_AD_ORG_ID = org.AD_ORG_ID
- INNER JOIN AD_LANGUAGE lang ON users.DEFAULT_AD_LANGUAGE =
lang.AD_LANGUAGE
- INNER JOIN M_WAREHOUSE warehouse ON users.DEFAULT_M_WAREHOUSE_ID
= warehouse.M_WAREHOUSE_ID
- INNER JOIN AD_ROLE role ON users.DEFAULT_AD_ROLE_ID =
role.AD_ROLE_ID
- WHERE users.AD_USER_ID = ?
- AND (NOT users.DEFAULT_AD_ORG_ID IS NULL
- AND org.ISACTIVE = 'Y')
- AND (NOT users.DEFAULT_AD_LANGUAGE IS NULL
- AND lang.ISACTIVE = 'Y')
- AND (NOT users.DEFAULT_AD_ROLE_ID IS NULL
- AND role.ISACTIVE = 'Y')
- AND (NOT users.DEFAULT_M_WAREHOUSE_ID IS NULL
- AND warehouse.ISACTIVE = 'Y')
+ '' AS AD_LANGUAGE
+ FROM dual
]]></Sql>
- <Parameter name="aduserid"/>
</SqlMethod>
<SqlMethod name="defaultRole" type="preparedStatement" return="string">
@@ -199,27 +183,5 @@
]]></Sql>
</SqlMethod>
- <SqlMethod name="getFirstElementsOptions" type="preparedStatement"
return="multiple">
- <SqlMethodComment></SqlMethodComment>
- <Sql><![CDATA[
- SELECT ro.ad_role_id AS DEFAULT_AD_ROLE_ID,
- ro.ad_org_id AS DEFAULT_AD_ORG_ID,
- ro.ad_client_id AS DEFAULT_AD_CLIENT_ID,
- (SELECT MAX(w.m_warehouse_id)
- FROM m_warehouse w, ad_role_orgaccess roa WHERE w.isActive='Y'
- AND roa.ad_role_id = ro.ad_role_id
- AND roa.isActive = 'Y'
- AND w.ad_org_id=roa.ad_org_id
- AND w.ad_client_id = ro.ad_client_id)
- AS DEFAULT_M_WAREHOUSE_ID,
- (SELECT MIN(ad_language) FROM ad_language WHERE isbaselanguage='Y' AND
isactive='Y') AS DEFAULT_AD_LANGUAGE
- FROM ad_role_orgaccess ro
- WHERE ro.ad_role_id = (SELECT MAX(ad_role_id) FROM ad_user_roles WHERE
ad_user_id = ? AND isActive = 'Y')
- AND ro.isactive = 'Y'
- ORDER BY ro.ad_org_id, ro.ad_client_id
- ]]></Sql>
- <Parameter name="aduserid"/>
- </SqlMethod>
-
</SqlClass>
diff -r 31b1f08ae65b -r 69d0e1906649
src/org/openbravo/base/secureApp/HttpSecureAppServlet.java
--- a/src/org/openbravo/base/secureApp/HttpSecureAppServlet.java Fri May
27 14:31:00 2011 +0200
+++ b/src/org/openbravo/base/secureApp/HttpSecureAppServlet.java Fri May
27 14:32:51 2011 +0200
@@ -646,11 +646,6 @@
vars.setHistoryCommand(strCommand);
}
- private void advise(HttpServletResponse response, String strTipo, String
strTitulo,
- String strTexto) throws IOException {
- advise(null, response, strTipo, strTitulo, strTexto);
- }
-
protected void advise(HttpServletRequest request, HttpServletResponse
response, String strTipo,
String strTitulo, String strTexto) throws IOException {
@@ -715,16 +710,6 @@
advisePopUpRefresh(request, response, "Error", strTitle, strText);
}
- private void advisePopUpRefresh(HttpServletResponse response, String
strTitle, String strText)
- throws IOException {
- advisePopUpRefresh(null, response, "Error", strTitle, strText);
- }
-
- private void advisePopUpRefresh(HttpServletResponse response, String
strType, String strTitle,
- String strText) throws IOException {
- advisePopUpRefresh(null, response, strTitle, strText);
- }
-
/**
* Creates a pop up that when closed, will refresh the parent window.
*
@@ -760,11 +745,6 @@
out.close();
}
- private void bdError(HttpServletResponse response, String strCode, String
strLanguage)
- throws IOException {
- bdError(null, response, strCode, strLanguage);
- }
-
protected void bdError(HttpServletRequest request, HttpServletResponse
response, String strCode,
String strLanguage) throws IOException {
final XmlDocument xmlDocument =
xmlEngine.readXmlTemplate("org/openbravo/base/secureApp/Error")
@@ -785,11 +765,6 @@
out.close();
}
- private void bdErrorGeneralPopUp(HttpServletResponse response, String
strTitle, String strText)
- throws IOException {
- bdErrorGeneralPopUp(null, response, strTitle, strText);
- }
-
protected void bdErrorGeneralPopUp(HttpServletRequest request,
HttpServletResponse response,
String strTitle, String strText) throws IOException {
final XmlDocument xmlDocument = xmlEngine.readXmlTemplate(
@@ -811,11 +786,6 @@
out.close();
}
- private void bdErrorGeneral(HttpServletResponse response, String strTitle,
String strText)
- throws IOException {
- bdErrorGeneral(null, response, strTitle, strText);
- }
-
private void bdErrorGeneral(HttpServletRequest request, HttpServletResponse
response,
String strTitle, String strText) throws IOException {
String discard[] = { "" };
diff -r 31b1f08ae65b -r 69d0e1906649
src/org/openbravo/base/secureApp/OrgTree.java
--- a/src/org/openbravo/base/secureApp/OrgTree.java Fri May 27 14:31:00
2011 +0200
+++ b/src/org/openbravo/base/secureApp/OrgTree.java Fri May 27 14:32:51
2011 +0200
@@ -127,11 +127,6 @@
* @param strRole
* @return the created {@link OrgTree}
*/
- private OrgTree getAccessibleTree(ConnectionProvider conn, String strRole,
boolean withZero) {
- // TODO: this method with boolean should be removed.
- return getAccessibleTree(conn, strRole);
- }
-
public OrgTree getAccessibleTree(ConnectionProvider conn, String strRole) {
try {
OrgTreeData[] data = OrgTreeData.select(conn, strRole);
@@ -146,23 +141,6 @@
}
/**
- * Obtains a tree with all the nodes that can be referenced from the
original one.
- *
- * @param tree
- * tree contains all the nodes to reference from
- * @return new tree with referenceable nodes.
- */
- private OrgTree getReferenceableTree(OrgTree tree) {
- Iterator<OrgTreeNode> iterator = tree.iterator();
- OrgTree refeTree = new OrgTree();
- while (iterator.hasNext()) {
- OrgTreeNode o = iterator.next();
- refeTree.addTree(this.getLogicPath(o.getId()));
- }
- return refeTree;
- }
-
- /**
* Obtains all nodes descendant of the given parentNodeId
*
* @param parentNodeId
@@ -217,44 +195,6 @@
return nodes.iterator();
}
- private static String getAllOrgsString(ConnectionProvider conn, String name)
{
- try {
- OrgTreeData[] dataClients = OrgTreeData.selectAllClients(conn);
- String retVal = "";
- if (dataClients == null)
- return "";
- retVal += "var " + name + "=new Array(";
- for (int i = 0; i < dataClients.length; i++) {
- OrgTree t = new OrgTree(conn, dataClients[i].adClientId);
- OrgTreeData[] dataRole = OrgTreeData.selectRoles(conn,
dataClients[i].adClientId);
- if (dataRole != null) {
- for (int j = 0; j < dataRole.length; j++) {
- OrgTree tRole = t.getAccessibleTree(conn, dataRole[j].adRoleId,
dataRole[j].userlevel
- .contains("S"));
- Iterator<OrgTreeNode> iterator = tRole.iterator();
- while (iterator.hasNext()) {
- OrgTreeNode n = iterator.next();
- retVal += "new Array(\""
- + dataRole[j].adRoleId
- + "\", \""
- + n.getId()
- + "\", \""
- + n.getValue()
- + "\")"
- + ((!iterator.hasNext() && (j == dataRole.length - 1) && (i
== dataClients.length - 1)) ? "\n"
- : ",\n");
- }
- }
- }
- }
- retVal += ");";
-
- return retVal;
- } catch (Exception e) {
- return "";
- }
- }
-
/**
* Converts the tree into String. Nodes comma separated.
*/
diff -r 31b1f08ae65b -r 69d0e1906649
src/org/openbravo/base/secureApp/Seguridad_data.xsql
--- a/src/org/openbravo/base/secureApp/Seguridad_data.xsql Fri May 27
14:31:00 2011 +0200
+++ b/src/org/openbravo/base/secureApp/Seguridad_data.xsql Fri May 27
14:32:51 2011 +0200
@@ -98,17 +98,6 @@
<Parameter name="org"/>
</SqlMethod>
- <SqlMethod name="saveProcessed" type="preparedStatement" return="rowCount">
- <SqlMethodComment></SqlMethodComment>
- <Sql>
- UPDATE AD_SESSION SET UPDATED = now(), UPDATEDBY = ?,
- PROCESSED = 'Y'
- WHERE AD_SESSION_ID = ?
- </Sql>
- <Parameter name="adUserId"/>
- <Parameter name="adSessionId"/>
- </SqlMethod>
-
<SqlMethod name="selectAccessLevel" type="preparedStatement"
return="string">
<SqlMethodComment></SqlMethodComment>
<Sql><![CDATA[
diff -r 31b1f08ae65b -r 69d0e1906649
src/org/openbravo/erpCommon/ad_callouts/LocatorCombo_data.xsql
--- a/src/org/openbravo/erpCommon/ad_callouts/LocatorCombo_data.xsql Fri May
27 14:31:00 2011 +0200
+++ b/src/org/openbravo/erpCommon/ad_callouts/LocatorCombo_data.xsql Fri May
27 14:32:51 2011 +0200
@@ -37,15 +37,4 @@
<Parameter name="warehouse"/>
<Parameter name="client"/>
</SqlMethod>
- <SqlMethod name="selectCombo" type="preparedStatement"
return="multiple">
- <SqlMethodComment>Relación de organizaciones de un rol de la
aplicacion</SqlMethodComment>
- <Sql><![CDATA[
- SELECT M_LOCATOR_ID, X AS Name
------------------------------------------------------------------------------
vRanger cuts backup time in half-while increasing security.
With the market-leading solution for virtual backup and recovery,
you get blazing-fast, flexible, and affordable data protection.
Download your free trial now.
http://p.sf.net/sfu/quest-d2dcopy1
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
