details: /erp/devel/pi/rev/73c9a3d5709a
changeset: 9436:73c9a3d5709a
user: Martin Taal <martin.taal <at> openbravo.com>
date: Tue Dec 28 13:57:35 2010 +0100
summary: Made myob classes into weld components
diffstat:
modules/org.openbravo.client.myob/src/org/openbravo/client/myob/MyOBUtils.java
| 50 +++++----
modules/org.openbravo.client.myob/src/org/openbravo/client/myob/MyOpenbravoActionHandler.java
| 16 ++-
modules/org.openbravo.client.myob/src/org/openbravo/client/myob/MyOpenbravoComponent.java
| 9 +-
modules/org.openbravo.client.myob/src/org/openbravo/client/myob/MyOpenbravoWidgetComponent.java
| 7 +-
modules/org.openbravo.client.myob/src/org/openbravo/client/myob/WidgetProvider.java
| 7 +-
5 files changed, 60 insertions(+), 29 deletions(-)
diffs (249 lines):
diff -r 767c291c148f -r 73c9a3d5709a
modules/org.openbravo.client.myob/src/org/openbravo/client/myob/MyOBUtils.java
---
a/modules/org.openbravo.client.myob/src/org/openbravo/client/myob/MyOBUtils.java
Tue Dec 28 13:56:04 2010 +0100
+++
b/modules/org.openbravo.client.myob/src/org/openbravo/client/myob/MyOBUtils.java
Tue Dec 28 13:57:35 2010 +0100
@@ -20,6 +20,9 @@
import java.util.List;
+import javax.enterprise.context.ApplicationScoped;
+import javax.inject.Inject;
+
import org.apache.log4j.Logger;
import org.codehaus.jettison.json.JSONArray;
import org.codehaus.jettison.json.JSONException;
@@ -27,6 +30,7 @@
import org.hibernate.criterion.Expression;
import org.openbravo.base.exception.OBException;
import org.openbravo.base.util.OBClassLoader;
+import org.openbravo.base.weld.WeldUtils;
import org.openbravo.dal.core.DalUtil;
import org.openbravo.dal.core.OBContext;
import org.openbravo.dal.service.OBCriteria;
@@ -41,7 +45,8 @@
*
* @author mtaal
*/
-abstract public class MyOBUtils {
+...@applicationscoped
+public class MyOBUtils {
private static Logger log = Logger.getLogger(MyOBUtils.class);
private static String MENU_ITEM_IS_SEPARATOR = "isSeparator";
private static String MENU_ITEM_TITLE = "title";
@@ -121,26 +126,6 @@
return obcMenuItems.list();
}
- /**
- * Creates the widgetProvider from the widgetClass object. Also calls/sets
the
- * {...@link WidgetProvider#setWidgetClass(WidgetClass)}.
- *
- * @param widgetClass
- * @return instance of a {...@link WidgetProvider}
- */
- static WidgetProvider getWidgetProvider(WidgetClass widgetClass) {
- try {
- String strJavaClass = (widgetClass.getWidgetSuperclass() != null) ?
widgetClass
- .getWidgetSuperclass().getJavaClass() : widgetClass.getJavaClass();
- final Class<?> clz = OBClassLoader.getInstance().loadClass(strJavaClass);
- final WidgetProvider widgetProvider = (WidgetProvider) clz.newInstance();
- widgetProvider.setWidgetClass(widgetClass);
- return widgetProvider;
- } catch (Exception e) {
- throw new OBException(e);
- }
- }
-
static List<WidgetInstance> getDefaultWidgetInstances(String
availableAtLevel,
String[] availableAtValues) {
OBCriteria<WidgetInstance> widgetInstancesCrit =
OBDal.getInstance().createCriteria(
@@ -215,4 +200,27 @@
return widgetClassCrit.list().get(0);
}
+ @Inject
+ private WeldUtils weldUtils;
+
+ /**
+ * Creates the widgetProvider from the widgetClass object. Also calls/sets
the
+ * {...@link WidgetProvider#setWidgetClass(WidgetClass)}.
+ *
+ * @param widgetClass
+ * @return instance of a {...@link WidgetProvider}
+ */
+ WidgetProvider getWidgetProvider(WidgetClass widgetClass) {
+ try {
+ String strJavaClass = (widgetClass.getWidgetSuperclass() != null) ?
widgetClass
+ .getWidgetSuperclass().getJavaClass() : widgetClass.getJavaClass();
+ final Class<?> clz = OBClassLoader.getInstance().loadClass(strJavaClass);
+ final WidgetProvider widgetProvider = (WidgetProvider)
weldUtils.getInstance(clz);
+ widgetProvider.setWidgetClass(widgetClass);
+ return widgetProvider;
+ } catch (Exception e) {
+ throw new OBException(e);
+ }
+ }
+
}
diff -r 767c291c148f -r 73c9a3d5709a
modules/org.openbravo.client.myob/src/org/openbravo/client/myob/MyOpenbravoActionHandler.java
---
a/modules/org.openbravo.client.myob/src/org/openbravo/client/myob/MyOpenbravoActionHandler.java
Tue Dec 28 13:56:04 2010 +0100
+++
b/modules/org.openbravo.client.myob/src/org/openbravo/client/myob/MyOpenbravoActionHandler.java
Tue Dec 28 13:57:35 2010 +0100
@@ -23,6 +23,7 @@
import java.util.Map;
import javax.enterprise.context.ApplicationScoped;
+import javax.inject.Inject;
import org.apache.commons.lang.StringUtils;
import org.apache.log4j.Logger;
@@ -32,9 +33,10 @@
import org.openbravo.base.exception.OBException;
import org.openbravo.base.provider.OBProvider;
import org.openbravo.base.secureApp.VariablesSecureApp;
+import org.openbravo.base.weld.WeldUtils;
import org.openbravo.client.application.Parameter;
+import org.openbravo.client.application.ParameterUtils;
import org.openbravo.client.application.ParameterValue;
-import org.openbravo.client.application.ParameterUtils;
import org.openbravo.client.kernel.BaseActionHandler;
import org.openbravo.client.kernel.RequestContext;
import org.openbravo.dal.core.OBContext;
@@ -58,6 +60,12 @@
private static final String RELOAD_WIDGETS = "RELOAD_WIDGETS";
private static final String GET_AVAILABLE_WIDGET_CLASSES =
"GET_AVAILABLE_WIDGET_CLASSES";
+ @Inject
+ private MyOBUtils myOBUtils;
+
+ @Inject
+ private WeldUtils weldUtils;
+
@Override
protected JSONObject execute(Map<String, Object> parameters, String content)
{
OBContext.setAdminMode();
@@ -138,13 +146,13 @@
List<WidgetInstance> widgetsList =
MyOBUtils.getDefaultWidgetInstances(availableAtLevel,
availableAtLevelValue);
for (WidgetInstance widgetInstance : widgetsList) {
- final JSONObject jsonObject =
MyOBUtils.getWidgetProvider(widgetInstance.getWidgetClass())
+ final JSONObject jsonObject =
myOBUtils.getWidgetProvider(widgetInstance.getWidgetClass())
.getWidgetInstanceDefinition(widgetInstance);
widgets.put(jsonObject);
log.debug(">> Added widget instance: " + jsonObject.toString());
}
} else {
- MyOpenbravoComponent myOBComponent = new MyOpenbravoComponent();
+ MyOpenbravoComponent myOBComponent =
weldUtils.getInstance(MyOpenbravoComponent.class);
List<String> widgetsList = myOBComponent.getWidgetInstanceDefinitions();
for (String widgetInstance : widgetsList) {
widgets.put(new JSONObject(widgetInstance));
@@ -160,7 +168,7 @@
}
private void addAvailableWidgetClasses(JSONObject o) {
- MyOpenbravoComponent component = new MyOpenbravoComponent();
+ MyOpenbravoComponent component =
weldUtils.getInstance(MyOpenbravoComponent.class);
try {
List<String> availableClasses = component.getAvailableWidgetClasses();
o.put("availableWidgetClasses", availableClasses);
diff -r 767c291c148f -r 73c9a3d5709a
modules/org.openbravo.client.myob/src/org/openbravo/client/myob/MyOpenbravoComponent.java
---
a/modules/org.openbravo.client.myob/src/org/openbravo/client/myob/MyOpenbravoComponent.java
Tue Dec 28 13:56:04 2010 +0100
+++
b/modules/org.openbravo.client.myob/src/org/openbravo/client/myob/MyOpenbravoComponent.java
Tue Dec 28 13:57:35 2010 +0100
@@ -28,6 +28,8 @@
import java.util.Set;
import java.util.UUID;
+import javax.inject.Inject;
+
import org.apache.log4j.Logger;
import org.codehaus.jettison.json.JSONException;
import org.codehaus.jettison.json.JSONObject;
@@ -60,6 +62,9 @@
private List<String> widgetClassDefinitions = null;
private Logger log = Logger.getLogger(MyOpenbravoComponent.class);
+ @Inject
+ private MyOBUtils myOBUtils;
+
/*
* (non-Javadoc)
*
@@ -93,7 +98,7 @@
WidgetClass.class, WidgetClass.PROPERTY_SUPERCLASS + " is false");
for (WidgetClass widgetClass : widgetClassesQry.list()) {
if (isAccessible(widgetClass)) {
- final WidgetProvider widgetProvider =
MyOBUtils.getWidgetProvider(widgetClass);
+ final WidgetProvider widgetProvider =
myOBUtils.getWidgetProvider(widgetClass);
definitions.add(widgetProvider.getWidgetClassDefinition());
try {
classDef = widgetProvider.generate();
@@ -123,7 +128,7 @@
try {
final List<String> result = new ArrayList<String>();
for (WidgetInstance widget : getContextWidgetInstances()) {
- final JSONObject jsonObject =
MyOBUtils.getWidgetProvider(widget.getWidgetClass())
+ final JSONObject jsonObject =
myOBUtils.getWidgetProvider(widget.getWidgetClass())
.getWidgetInstanceDefinition(widget);
result.add(jsonObject.toString());
}
diff -r 767c291c148f -r 73c9a3d5709a
modules/org.openbravo.client.myob/src/org/openbravo/client/myob/MyOpenbravoWidgetComponent.java
---
a/modules/org.openbravo.client.myob/src/org/openbravo/client/myob/MyOpenbravoWidgetComponent.java
Tue Dec 28 13:56:04 2010 +0100
+++
b/modules/org.openbravo.client.myob/src/org/openbravo/client/myob/MyOpenbravoWidgetComponent.java
Tue Dec 28 13:57:35 2010 +0100
@@ -18,6 +18,8 @@
*/
package org.openbravo.client.myob;
+import javax.inject.Inject;
+
import org.codehaus.jettison.json.JSONObject;
import org.openbravo.base.exception.OBException;
import org.openbravo.client.kernel.BaseComponent;
@@ -36,6 +38,9 @@
static final String COMPONENT_ID = "MyOpenbravoWidgetComponent";
public static final String CLASSNAMEPARAMETER = "widgetClassName";
+ @Inject
+ private MyOBUtils myOBUtils;
+
/*
* (non-Javadoc)
*
@@ -63,7 +68,7 @@
}
try {
- final WidgetProvider widgetProvider =
MyOBUtils.getWidgetProvider(widgetClass);
+ final WidgetProvider widgetProvider =
myOBUtils.getWidgetProvider(widgetClass);
widgetProvider.setParameters(getParameters());
return widgetProvider.generate();
} catch (Exception e) {
diff -r 767c291c148f -r 73c9a3d5709a
modules/org.openbravo.client.myob/src/org/openbravo/client/myob/WidgetProvider.java
---
a/modules/org.openbravo.client.myob/src/org/openbravo/client/myob/WidgetProvider.java
Tue Dec 28 13:56:04 2010 +0100
+++
b/modules/org.openbravo.client.myob/src/org/openbravo/client/myob/WidgetProvider.java
Tue Dec 28 13:57:35 2010 +0100
@@ -26,6 +26,8 @@
import java.util.Map;
import java.util.Set;
+import javax.inject.Inject;
+
import org.apache.log4j.Logger;
import org.codehaus.jettison.json.JSONException;
import org.codehaus.jettison.json.JSONObject;
@@ -86,6 +88,9 @@
// through the MyOBUtils class.
private WidgetClass widgetClass;
+ @Inject
+ private MyOBUtils myOBUtils;
+
// prevent anyone else from creating a widgetprovider directly
protected WidgetProvider() {
}
@@ -162,7 +167,7 @@
protected void addDefaultWidgetProperties(JSONObject jsonObject,
WidgetInstance widgetInstance)
throws JSONException {
- jsonObject.put(MyOpenbravoWidgetComponent.CLASSNAMEPARAMETER,
MyOBUtils.getWidgetProvider(
+ jsonObject.put(MyOpenbravoWidgetComponent.CLASSNAMEPARAMETER,
myOBUtils.getWidgetProvider(
widgetClass).getClientSideWidgetClassName());
jsonObject.put(DBINSTANCEID, widgetInstance.getId());
jsonObject.put(TITLE, MyOBUtils.getWidgetTitle(widgetInstance));
------------------------------------------------------------------------------
Learn how Oracle Real Application Clusters (RAC) One Node allows customers
to consolidate database storage, standardize their database environment, and,
should the need arise, upgrade to a full multi-node Oracle RAC database
without downtime or disruption
http://p.sf.net/sfu/oracle-sfdevnl
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
