midsuit
/
core-jgi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge cf7b58b5e6d2

This commit is contained in:
Heng Sin Low 2013-07-31 16:42:54 +08:00
parent 714ce29278 92532db6de
commit 5a661371e7
6 changed files with 13 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
org.adempiere.base/OSGI-INF/metatype/metatype.xml
View File

@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<metatype:MetaData xmlns:metatype="http://www.osgi.org/xmlns/metatype/v1.0.0"> <metatype:MetaData xmlns:metatype="http://www.osgi.org/xmlns/metatype/v1.0.0">
<OCD description="Request Service" name="Request Service" id="org.adempiere.base.event.request.service"> <OCD description="Request Service" name="Request Service" id="org.adempiere.base.event.RequestEventHandler">
<AD name="Ignore Request Types" id="ignoreRequestTypes" required="true" type="String" default=""/> <AD name="Ignore Request Types" id="ignoreRequestTypes" required="true" type="String" default=""/>
</OCD> </OCD>
<Designate pid="org.adempiere.base.event.request.service"> <Designate pid="org.adempiere.base.event.RequestEventHandler">
<Object ocdref="org.adempiere.base.event.request.service"/> <Object ocdref="org.adempiere.base.event.RequestEventHandler"/>
</Designate> </Designate>
</metatype:MetaData> </metatype:MetaData>

10
org.adempiere.base/OSGI-INF/requesteventhandler.xml
View File

@ -1,6 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.adempiere.base.event.RequestEventHandler"> <scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" configuration-policy="require" name="org.adempiere.base.event.RequestEventHandler">
<implementation class="org.adempiere.base.event.RequestEventHandler"/> <implementation class="org.adempiere.base.event.RequestEventHandler"/>
<reference bind="bindEventManager" cardinality="1..1" interface="org.adempiere.base.event.IEventManager" name="IEventManager" policy="static" unbind="unbindEventManager"/>e.base.event.RequestSendEMailEventHandler"/> <reference bind="bindEventManager" cardinality="1..1" interface="org.adempiere.base.event.IEventManager" name="IEventManager" policy="static" unbind="unbindEventManager"/>
<service>
<provide interface="org.osgi.service.cm.ManagedService"/>
<provide interface="org.adempiere.base.event.RequestEventHandler"/>
</service>
<property name="service.pid" type="String" value="org.adempiere.base.event.RequestEventHandler"/>
</scr:component> </scr:component>

10
org.adempiere.base/OSGI-INF/requestservice.xml
View File

@ -1,10 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" configuration-policy="require" name="org.adempiere.base.event.request.service">
<implementation class="org.adempiere.base.event.RequestEventHandler"/>
<property name="service.ranking" type="Integer" value="1"/>
<service>
<provide interface="org.osgi.service.cm.ManagedService"/>
<provide interface="org.adempiere.base.event.RequestEventHandler"/>
</service>
<property name="service.pid" type="String" value="org.adempiere.base.event.request.service"/>
</scr:component>

1
org.adempiere.base/build.properties
View File

@ -29,7 +29,6 @@ bin.includes = META-INF/,\
OSGI-INF/defaultpaymentprocessorfactory.xml,\ OSGI-INF/defaultpaymentprocessorfactory.xml,\
OSGI-INF/broadcastutil.xml,\ OSGI-INF/broadcastutil.xml,\
OSGI-INF/requesteventhandler.xml,\ OSGI-INF/requesteventhandler.xml,\
OSGI-INF/requestservice.xml,\
OSGI-INF/requestpropertyservice.xml,\ OSGI-INF/requestpropertyservice.xml,\
schema/ schema/
output.base.jar = build/ output.base.jar = build/

3
org.adempiere.base/src/org/adempiere/base/event/RequestPropertyService.java
View File

@ -23,7 +23,6 @@ import java.util.Hashtable;
import java.util.Properties; import java.util.Properties;
import java.util.logging.Level; import java.util.logging.Level;
import org.adempiere.base.event.RequestEventHandler;
import org.compiere.util.CLogger; import org.compiere.util.CLogger;
import org.compiere.util.Ini; import org.compiere.util.Ini;
import org.compiere.util.Util; import org.compiere.util.Util;
@ -65,7 +64,7 @@ public class RequestPropertyService {
String ignoreRequesTypes = p.getProperty(RequestEventHandler.IGNORE_REQUEST_TYPES); String ignoreRequesTypes = p.getProperty(RequestEventHandler.IGNORE_REQUEST_TYPES);
if (!Util.isEmpty(ignoreRequesTypes)) { if (!Util.isEmpty(ignoreRequesTypes)) {
Configuration configuration = service.getConfiguration("org.adempiere.base.event.request.service"); Configuration configuration = service.getConfiguration(RequestEventHandler.class.getName());
if (configuration.getProperties() == null) { if (configuration.getProperties() == null) {
Dictionary<String, Object> map = new Hashtable<String, Object>(); Dictionary<String, Object> map = new Hashtable<String, Object>();
map.put(RequestEventHandler.IGNORE_REQUEST_TYPES, ignoreRequesTypes); map.put(RequestEventHandler.IGNORE_REQUEST_TYPES, ignoreRequesTypes);

2
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/TreeSearchPanel.java
View File

@ -276,7 +276,7 @@ public class TreeSearchPanel extends Panel implements EventListener<Event>, Tree
protected boolean isFolder(Treeitem treeItem) { protected boolean isFolder(Treeitem treeItem) {
List<Component> list = treeItem.getChildren(); List<Component> list = treeItem.getChildren();
for (Component c : list) { for (Component c : list) {
if (c instanceof Treechildren && ((Treechildren)c).getChildren().size() > 1) { if (c instanceof Treechildren && ((Treechildren)c).getChildren().size() > 0) {
return true; return true;
} }
} }