details: /erp/devel/pi/rev/61a01b060a4e
changeset: 6692:61a01b060a4e
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Fri Mar 12 15:31:51 2010 +0100
summary: Apply Java format
details: /erp/devel/pi/rev/21035403a4bd
changeset: 6693:21035403a4bd
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Fri Mar 12 15:33:06 2010 +0100
summary: fixed bug 12576: Having Quickstart installed, the Enterprise Module
Management seems not to work properly
diffstat:
src/org/openbravo/erpCommon/modules/ModuleReferenceDataClientTree.java | 12 +-
src/org/openbravo/erpCommon/modules/ModuleReferenceDataOrgTree.java | 84
+++++----
2 files changed, 57 insertions(+), 39 deletions(-)
diffs (212 lines):
diff -r 936b06ec1cab -r 21035403a4bd
src/org/openbravo/erpCommon/modules/ModuleReferenceDataClientTree.java
--- a/src/org/openbravo/erpCommon/modules/ModuleReferenceDataClientTree.java
Fri Mar 12 13:40:04 2010 +0100
+++ b/src/org/openbravo/erpCommon/modules/ModuleReferenceDataClientTree.java
Fri Mar 12 15:33:06 2010 +0100
@@ -11,7 +11,7 @@
* under the License.
* The Original Code is Openbravo ERP.
* The Initial Developer of the Original Code is Openbravo SL
- * All portions are Copyright (C) 2008 Openbravo SL
+ * All portions are Copyright (C) 2008-2010 Openbravo SL
* All Rights Reserved.
* Contributor(s): ______________________________________.
************************************************************************
@@ -21,6 +21,7 @@
import javax.servlet.ServletException;
import org.openbravo.base.HttpBaseServlet;
+import org.openbravo.erpCommon.utility.FieldProviderFactory;
import org.openbravo.xmlEngine.XmlDocument;
/**
@@ -64,6 +65,15 @@
}
}
+ protected void setLevel(int level) {
+ super.setLevel(level);
+
+ // set position with the current data, not the one in the Module tree
+ for (int pos = 0; pos < data.length; pos++) {
+ FieldProviderFactory.setField(data[pos], "position",
Integer.toString(pos + 1));
+ }
+ }
+
/**
* Generates a subtree with nodeId as root node
*
diff -r 936b06ec1cab -r 21035403a4bd
src/org/openbravo/erpCommon/modules/ModuleReferenceDataOrgTree.java
--- a/src/org/openbravo/erpCommon/modules/ModuleReferenceDataOrgTree.java
Fri Mar 12 13:40:04 2010 +0100
+++ b/src/org/openbravo/erpCommon/modules/ModuleReferenceDataOrgTree.java
Fri Mar 12 15:33:06 2010 +0100
@@ -11,7 +11,7 @@
* under the License.
* The Original Code is Openbravo ERP.
* The Initial Developer of the Original Code is Openbravo SL
- * All portions are Copyright (C) 2008 Openbravo SL
+ * All portions are Copyright (C) 2008-2010 Openbravo SL
* All Rights Reserved.
* Contributor(s): ______________________________________.
************************************************************************
@@ -22,23 +22,25 @@
import java.util.Collections;
import java.util.Comparator;
import java.util.Map;
+
import javax.servlet.ServletException;
import org.openbravo.base.HttpBaseServlet;
import org.openbravo.data.FieldProvider;
+import org.openbravo.erpCommon.utility.FieldProviderFactory;
import org.openbravo.erpCommon.utility.Utility;
import org.openbravo.xmlEngine.XmlDocument;
/**
* Manages the tree of installed modules.
- *
+ *
* It implements GenericTree, detailed description is in that API doc.
*/
public class ModuleReferenceDataOrgTree extends ModuleTree {
/**
* Constructor to generate a root tree
- *
+ *
* @param base
* @param bSmall
* Normal size or small size (true)
@@ -53,7 +55,7 @@
/**
* Constructor to generate a root tree
- *
+ *
* @param base
* @param strClient
* Client ID
@@ -65,8 +67,8 @@
* @param bSmall
* Normal size or small size (true)
*/
- public ModuleReferenceDataOrgTree(HttpBaseServlet base, String strClient,
String strOrg, boolean bAddLinks,
- boolean bSmall) {
+ public ModuleReferenceDataOrgTree(HttpBaseServlet base, String strClient,
String strOrg,
+ boolean bAddLinks, boolean bSmall) {
super(base, bSmall);
setRootTree(strClient, strOrg, bAddLinks);
}
@@ -80,7 +82,7 @@
/**
* Constructor to generate a root tree
- *
+ *
* @param base
* @param strClient
* Client ID
@@ -113,6 +115,15 @@
}
}
+ protected void setLevel(int level) {
+ super.setLevel(level);
+
+ // set position with the current data, not the one in the Module tree
+ for (int pos = 0; pos < data.length; pos++) {
+ FieldProviderFactory.setField(data[pos], "position",
Integer.toString(pos + 1));
+ }
+ }
+
/**
* Sets to data the root tree.
*/
@@ -131,46 +142,43 @@
}
}
-
private void cleanData() {
- // this function removes duplicates in data. Fixes issue 0012356:
Enterprise module management: Behaviour not correct
+ // this function removes duplicates in data. Fixes issue 0012356:
Enterprise module management:
+ // Behaviour not correct
- Map<String, ModuleReferenceDataOrgTreeData> mappeddata = new
java.util.HashMap<String, ModuleReferenceDataOrgTreeData>();
+ Map<String, ModuleReferenceDataOrgTreeData> mappeddata = new
java.util.HashMap<String, ModuleReferenceDataOrgTreeData>();
- for (FieldProvider f : data) {
- if (mappeddata.get(f.getField("node_id")) == null
- || "Y".equals(f.getField("update_available"))) {
- mappeddata.put(f.getField("node_id"),
(ModuleReferenceDataOrgTreeData) f);
- }
+ for (FieldProvider f : data) {
+ if (mappeddata.get(f.getField("node_id")) == null
+ || "Y".equals(f.getField("update_available"))) {
+ mappeddata.put(f.getField("node_id"), (ModuleReferenceDataOrgTreeData)
f);
+ }
+ }
+
+ ArrayList<ModuleReferenceDataOrgTreeData> l = new
ArrayList<ModuleReferenceDataOrgTreeData>();
+ l.addAll(mappeddata.values());
+ Collections.sort(l, new Comparator<ModuleReferenceDataOrgTreeData>() {
+
+ @Override
+ public int compare(ModuleReferenceDataOrgTreeData o1,
ModuleReferenceDataOrgTreeData o2) {
+ return getSeqNo(o1).compareTo(getSeqNo(o2));
}
- ArrayList<ModuleReferenceDataOrgTreeData> l = new
ArrayList<ModuleReferenceDataOrgTreeData>();
- l.addAll(mappeddata.values());
- Collections.sort(l, new Comparator<ModuleReferenceDataOrgTreeData>() {
+ private Integer getSeqNo(ModuleReferenceDataOrgTreeData o) {
- @Override
- public int compare(ModuleReferenceDataOrgTreeData o1,
ModuleReferenceDataOrgTreeData o2) {
- return getSeqNo(o1).compareTo(getSeqNo(o2));
- }
+ try {
+ return Integer.valueOf(o.getField("seqno"));
+ } catch (NumberFormatException e) {
+ return 0;
+ }
+ }
+ });
- private Integer getSeqNo(ModuleReferenceDataOrgTreeData o) {
-
- try {
- return Integer.valueOf(o.getField("seqno"));
- } catch (NumberFormatException e) {
- return 0;
- }
- }
- });
-
-
- data = l.toArray(new ModuleReferenceDataOrgTreeData[l.size()]);
-
+ data = l.toArray(new ModuleReferenceDataOrgTreeData[l.size()]);
}
-
/**
* Adds links to the current sets of nodes, these links can be Update or
Apply.
*/
@@ -206,7 +214,7 @@
/**
* Returns a HTML with the description for the given node
- *
+ *
* @param node
* @return a HTML String with the description for the given node
*/
@@ -239,7 +247,7 @@
/**
* Generates a subtree with nodeId as root node
- *
+ *
* @param nodeId
*/
public void setSubTree(String nodeId, String level) {
------------------------------------------------------------------------------
Download Intel® Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs
proactively, and fine-tune applications for parallel performance.
See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
