details: /erp/devel/pi/rev/ffb9d2dfde48
changeset: 9820:ffb9d2dfde48
user: Martin Taal <martin.taal <at> openbravo.com>
date: Fri Jan 14 17:29:32 2011 +0100
summary: Changed Button UI Definition for supporting Button/List references
diffstat:
modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/BooleanUIDefinition.java
| 2 +
modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/UIDefinitionController.java
| 31 ----------
modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/YesNoUIDefinition.java
| 2 +-
3 files changed, 3 insertions(+), 32 deletions(-)
diffs (120 lines):
diff -r 8eb29441a244 -r ffb9d2dfde48
modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/BooleanUIDefinition.java
---
a/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/BooleanUIDefinition.java
Fri Jan 14 17:28:15 2011 +0100
+++
b/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/BooleanUIDefinition.java
Fri Jan 14 17:29:32 2011 +0100
@@ -22,7 +22,9 @@
* Implementation of the boolean ui definition.
*
* @author mtaal
+ * @deprecated use {@link YesNoUIDefinition}
*/
+@Deprecated
public class BooleanUIDefinition extends UIDefinition {
@Override
diff -r 8eb29441a244 -r ffb9d2dfde48
modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/UIDefinitionController.java
---
a/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/UIDefinitionController.java
Fri Jan 14 17:28:15 2011 +0100
+++
b/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/UIDefinitionController.java
Fri Jan 14 17:29:32 2011 +0100
@@ -18,17 +18,14 @@
*/
package org.openbravo.client.kernel.reference;
-import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
-import java.util.List;
import java.util.Map;
import org.apache.log4j.Logger;
import org.dom4j.Document;
import org.dom4j.Element;
import org.hibernate.Hibernate;
-import org.openbravo.base.exception.OBException;
import org.openbravo.base.session.OBPropertiesProvider;
import org.openbravo.base.util.OBClassLoader;
import org.openbravo.client.kernel.BaseTemplateComponent;
@@ -69,17 +66,11 @@
private Map<String, UIDefinition> cachedDefinitions = null;
private Map<String, UIDefinition> uiDefinitionsByColumnId = null;
private Map<String, FormatDefinition> formatDefinitions = null;
- private List<Reference> buttonReferences = null;
- private List<String> buttonColumns = null;
- private UIDefinition buttonDefinition = null;
public UIDefinition getUIDefinition(String columnId) {
if (cachedDefinitions == null) {
setInitCachedDefinitions();
}
- if (buttonColumns.contains(columnId)) {
- return buttonDefinition;
- }
final UIDefinition uiDefinition = uiDefinitionsByColumnId.get(columnId);
if (uiDefinition == null) {
log.warn("NO UIDefinition found for columnId " + columnId);
@@ -91,9 +82,6 @@
if (cachedDefinitions == null) {
setInitCachedDefinitions();
}
- if (buttonReferences.contains(reference)) {
- return buttonDefinition;
- }
final UIDefinition uiDefinition = cachedDefinitions.get(reference.getId());
if (uiDefinition == null) {
log.warn("NO UIDefinition found for reference " + reference.getId());
@@ -126,8 +114,6 @@
}
final Map<String, UIDefinition> localCachedDefinitions = new
HashMap<String, UIDefinition>();
final Map<String, UIDefinition> localUIDefinitionsByColumn = new
HashMap<String, UIDefinition>();
- final ArrayList<Reference> localButtonReferences = new
ArrayList<Reference>();
- final ArrayList<String> localButtonColumns = new ArrayList<String>();
OBContext.setAdminMode();
try {
@@ -151,27 +137,12 @@
log.error("Exception when creating UIDefinition for reference " +
reference, e);
}
}
- try {
- Reference buttonReference = OBDal.getInstance().get(Reference.class,
"28");
- final Class<?> clz = OBClassLoader.getInstance().loadClass(
-
buttonReference.getOBCLKERUIDefinitionList().get(0).getImplementationClassname());
- buttonDefinition = (UIDefinition) clz.newInstance();
- buttonDefinition.setReference(buttonReference);
- } catch (Exception e) {
- throw new OBException("Exception when creating button reference", e);
- }
final OBQuery<Column> columnQry =
OBDal.getInstance().createQuery(Column.class, "");
columnQry.setFilterOnActive(false);
for (Column column : columnQry.list()) {
final String referenceId;
if (column.getReferenceSearchKey() != null) {
- if (DalUtil.getId(column.getReference()).equals("28")
- && !column.getReferenceSearchKey().isBaseReference()) {
- // This reference is a button reference. We will add it to the
button references
- localButtonReferences.add(column.getReferenceSearchKey());
- localButtonColumns.add(column.getId());
- }
referenceId = (String) DalUtil.getId(column.getReferenceSearchKey());
} else {
referenceId = (String) DalUtil.getId(column.getReference());
@@ -184,8 +155,6 @@
}
uiDefinitionsByColumnId = localUIDefinitionsByColumn;
cachedDefinitions = localCachedDefinitions;
- buttonReferences = localButtonReferences;
- buttonColumns = localButtonColumns;
}
private UIDefinition getUIDefinitionImplementation(Reference reference)
throws Exception {
diff -r 8eb29441a244 -r ffb9d2dfde48
modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/YesNoUIDefinition.java
---
a/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/YesNoUIDefinition.java
Fri Jan 14 17:28:15 2011 +0100
+++
b/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/YesNoUIDefinition.java
Fri Jan 14 17:29:32 2011 +0100
@@ -21,7 +21,7 @@
import org.openbravo.model.ad.ui.Field;
/**
- * Implementation of the String ui definition.
+ * Implementation of the YesNo/Boolean ui definition.
*
* @author mtaal
*/
------------------------------------------------------------------------------
Protect Your Site and Customers from Malware Attacks
Learn about various malware tactics and how to avoid them. Understand
malware threats, the impact they can have on your business, and how you
can protect your company and customers by using code signing.
http://p.sf.net/sfu/oracle-sfdevnl
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
