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

hg merge 7ff0a307b3ea

This commit is contained in:
Carlos Ruiz 2012-10-11 12:39:16 -05:00
parent a15c08f66e 4f3708c49c
commit 462cd17efc
5 changed files with 448 additions and 382 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
org.adempiere.base/src/org/compiere/util/ValueNamePair.java
View File

@ -83,6 +83,16 @@ public final class ValueNamePair extends NamePair
return false; return false;
} // equals } // equals
/**
* Get the Object representation of the value
* @return value
*/
public Object getValueObject()
{
return m_value;
}
/** /**
* Return Hashcode of value * Return Hashcode of value
* @return hascode * @return hascode

629
org.adempiere.server-feature/feature.xml
View File

@ -1,311 +1,318 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<feature <feature
id="org.adempiere.server" id="org.adempiere.server"
label="iDempiere Server-feature" label="iDempiere Server-feature"
version="1.0.0.qualifier"> version="1.0.0.qualifier">
<description url="http://www.example.com/description"> <description url="http://www.example.com/description">
[Enter Feature Description here.] [Enter Feature Description here.]
</description> </description>
<copyright url="http://www.example.com/copyright"> <copyright url="http://www.example.com/copyright">
[Enter Copyright Description here.] [Enter Copyright Description here.]
</copyright> </copyright>
<license url="http://www.example.com/license"> <license url="http://www.example.com/license">
[Enter License Description here.] [Enter License Description here.]
</license> </license>
<includes <includes
id="org.adempiere.replication.server" id="org.adempiere.replication.server"
version="0.0.0" version="0.0.0"
optional="true"/> optional="true"/>
<includes <includes
id="org.adempiere.ui.zk" id="org.adempiere.ui.zk"
version="0.0.0"/> version="0.0.0"/>
<includes <includes
id="org.adempiere.webstore" id="org.adempiere.webstore"
version="0.0.0" version="0.0.0"
optional="true"/> optional="true"/>
<includes <includes
id="org.eclipse.gemini.web.feature" id="org.eclipse.gemini.web.feature"
version="0.0.0"/> version="0.0.0"/>
<requires> <requires>
<import feature="org.adempiere.base" version="1.0.0" match="compatible"/> <import feature="org.adempiere.base" version="1.0.0" match="compatible"/>
</requires> </requires>
<plugin <plugin
id="javax.servlet.jsp" id="javax.servlet.jsp"
download-size="0" download-size="0"
install-size="0" install-size="0"
version="0.0.0" version="0.0.0"
unpack="false"/> unpack="false"/>
<plugin <plugin
id="javax.servlet.jsp.jstl" id="javax.servlet.jsp.jstl"
download-size="0" download-size="0"
install-size="0" install-size="0"
version="0.0.0" version="0.0.0"
unpack="false"/> unpack="false"/>
<plugin <plugin
id="com.springsource.javax.xml.stream" id="com.springsource.javax.xml.stream"
download-size="0" download-size="0"
install-size="0" install-size="0"
version="0.0.0" version="0.0.0"
unpack="false"/> unpack="false"/>
<plugin <plugin
id="com.springsource.org.aopalliance" id="com.springsource.org.aopalliance"
download-size="0" download-size="0"
install-size="0" install-size="0"
version="0.0.0" version="0.0.0"
unpack="false"/> unpack="false"/>
<plugin <plugin
id="com.springsource.org.apache.catalina" id="com.springsource.org.apache.catalina"
download-size="0" download-size="0"
install-size="0" install-size="0"
version="0.0.0" version="0.0.0"
unpack="false"/> unpack="false"/>
<plugin <plugin
id="com.springsource.org.apache.coyote" id="com.springsource.org.apache.coyote"
download-size="0" download-size="0"
install-size="0" install-size="0"
version="0.0.0" version="0.0.0"
fragment="true" fragment="true"
unpack="false"/> unpack="false"/>
<plugin <plugin
id="com.springsource.org.apache.el" id="com.springsource.org.apache.el"
download-size="0" download-size="0"
install-size="0" install-size="0"
version="0.0.0" version="0.0.0"
unpack="false"/> unpack="false"/>
<plugin <plugin
id="com.springsource.org.eclipse.jdt.core.compiler.batch" id="com.springsource.org.eclipse.jdt.core.compiler.batch"
download-size="0" download-size="0"
install-size="0" install-size="0"
version="0.0.0" version="0.0.0"
unpack="false"/> unpack="false"/>
<plugin <plugin
id="com.springsource.org.apache.jasper" id="com.springsource.org.apache.jasper"
download-size="0" download-size="0"
install-size="0" install-size="0"
version="0.0.0" version="0.0.0"
fragment="true" fragment="true"
unpack="false"/> unpack="false"/>
<plugin <plugin
id="com.springsource.org.apache.juli.extras" id="com.springsource.org.apache.juli.extras"
download-size="0" download-size="0"
install-size="0" install-size="0"
version="0.0.0" version="0.0.0"
unpack="false"/> unpack="false"/>
<plugin <plugin
id="org.apache.taglibs.standard.glassfish" id="org.apache.taglibs.standard.glassfish"
download-size="0" download-size="0"
install-size="0" install-size="0"
version="0.0.0" version="0.0.0"
unpack="false"/> unpack="false"/>
<plugin <plugin
id="com.springsource.slf4j.api" id="com.springsource.slf4j.api"
download-size="0" download-size="0"
install-size="0" install-size="0"
version="0.0.0" version="0.0.0"
unpack="false"/> unpack="false"/>
<plugin <plugin
id="org.adempiere.report.jasper.webapp" id="org.adempiere.report.jasper.webapp"
download-size="0" download-size="0"
install-size="0" install-size="0"
version="0.0.0" version="0.0.0"
unpack="false"/> unpack="false"/>
<plugin <plugin
id="org.adempiere.server" id="org.adempiere.server"
download-size="0" download-size="0"
install-size="0" install-size="0"
version="0.0.0" version="0.0.0"
unpack="false"/> unpack="false"/>
<plugin <plugin
id="org.adempiere.tomcat.config" id="org.adempiere.tomcat.config"
download-size="0" download-size="0"
install-size="0" install-size="0"
version="0.0.0" version="0.0.0"
fragment="true"/> fragment="true"/>
<plugin <plugin
id="org.eclipse.virgo.util.common" id="org.eclipse.virgo.util.common"
download-size="0" download-size="0"
install-size="0" install-size="0"
version="0.0.0" version="0.0.0"
unpack="false"/> unpack="false"/>
<plugin <plugin
id="org.eclipse.virgo.util.io" id="org.eclipse.virgo.util.io"
download-size="0" download-size="0"
install-size="0" install-size="0"
version="0.0.0" version="0.0.0"
unpack="false"/> unpack="false"/>
<plugin <plugin
id="org.eclipse.virgo.util.math" id="org.eclipse.virgo.util.math"
download-size="0" download-size="0"
install-size="0" install-size="0"
version="0.0.0" version="0.0.0"
unpack="false"/> unpack="false"/>
<plugin <plugin
id="org.eclipse.virgo.util.osgi" id="org.eclipse.virgo.util.osgi"
download-size="0" download-size="0"
install-size="0" install-size="0"
version="0.0.0" version="0.0.0"
unpack="false"/> unpack="false"/>
<plugin <plugin
id="org.eclipse.virgo.util.parser.manifest" id="org.eclipse.virgo.util.parser.manifest"
download-size="0" download-size="0"
install-size="0" install-size="0"
version="0.0.0" version="0.0.0"
unpack="false"/> unpack="false"/>
<plugin <plugin
id="org.restlet.ext.servlet" id="org.restlet.ext.servlet"
download-size="0" download-size="0"
install-size="0" install-size="0"
version="0.0.0" version="0.0.0"
unpack="false"/> unpack="false"/>
<plugin <plugin
id="org.springframework.aop" id="org.springframework.aop"
download-size="0" download-size="0"
install-size="0" install-size="0"
version="0.0.0" version="0.0.0"
unpack="false"/> unpack="false"/>
<plugin <plugin
id="org.springframework.beans" id="org.springframework.beans"
download-size="0" download-size="0"
install-size="0" install-size="0"
version="0.0.0" version="0.0.0"
unpack="false"/> unpack="false"/>
<plugin <plugin
id="org.springframework.context" id="org.springframework.context"
download-size="0" download-size="0"
install-size="0" install-size="0"
version="0.0.0" version="0.0.0"
unpack="false"/> unpack="false"/>
<plugin <plugin
id="org.springframework.core" id="org.springframework.core"
download-size="0" download-size="0"
install-size="0" install-size="0"
version="0.0.0" version="0.0.0"
unpack="false"/> unpack="false"/>
<plugin <plugin
id="org.springframework.osgi.core" id="org.springframework.osgi.core"
download-size="0" download-size="0"
install-size="0" install-size="0"
version="0.0.0" version="0.0.0"
unpack="false"/> unpack="false"/>
<plugin <plugin
id="org.springframework.osgi.io" id="org.springframework.osgi.io"
download-size="0" download-size="0"
install-size="0" install-size="0"
version="0.0.0" version="0.0.0"
unpack="false"/> unpack="false"/>
<plugin <plugin
id="com.springsource.javax.xml.bind" id="com.springsource.javax.xml.bind"
download-size="0" download-size="0"
install-size="0" install-size="0"
version="0.0.0" version="0.0.0"
unpack="false"/> unpack="false"/>
<plugin <plugin
id="javax.annotation" id="javax.annotation"
download-size="0" download-size="0"
install-size="0" install-size="0"
version="0.0.0" version="0.0.0"
unpack="false"/> unpack="false"/>
<plugin <plugin
id="com.springsource.javax.persistence" id="com.springsource.javax.persistence"
download-size="0" download-size="0"
install-size="0" install-size="0"
version="0.0.0" version="0.0.0"
unpack="false"/> unpack="false"/>
<plugin <plugin
id="com.springsource.slf4j.jcl" id="com.springsource.slf4j.jcl"
download-size="0" download-size="0"
install-size="0" install-size="0"
version="0.0.0" version="0.0.0"
fragment="true" fragment="true"
unpack="false"/> unpack="false"/>
<plugin <plugin
id="com.springsource.org.apache.catalina.ha" id="com.springsource.org.apache.catalina.ha"
download-size="0" download-size="0"
install-size="0" install-size="0"
version="0.0.0" version="0.0.0"
fragment="true" fragment="true"
unpack="false"/> unpack="false"/>
<plugin <plugin
id="com.springsource.org.apache.catalina.tribes" id="com.springsource.org.apache.catalina.tribes"
download-size="0" download-size="0"
install-size="0" install-size="0"
version="0.0.0" version="0.0.0"
fragment="true" fragment="true"
unpack="false"/> unpack="false"/>
<plugin <plugin
id="org.adempiere.install" id="org.adempiere.install"
download-size="0" download-size="0"
install-size="0" install-size="0"
version="0.0.0"/> version="0.0.0"/>
<plugin <plugin
id="org.adempiere.eclipse.equinox.http.servlet" id="org.adempiere.eclipse.equinox.http.servlet"
download-size="0" download-size="0"
install-size="0" install-size="0"
version="0.0.0" version="0.0.0"
unpack="false"/> unpack="false"/>
<plugin <plugin
id="org.adempiere.eclipse.equinox.http.servletbridge" id="org.adempiere.eclipse.equinox.http.servletbridge"
download-size="0" download-size="0"
install-size="0" install-size="0"
version="0.0.0" version="0.0.0"
unpack="false"/> unpack="false"/>
<plugin <plugin
id="org.adempiere.eclipse.equinox.servletbridge" id="org.adempiere.eclipse.equinox.servletbridge"
download-size="0" download-size="0"
install-size="0" install-size="0"
version="0.0.0" version="0.0.0"
unpack="false"/> unpack="false"/>
<plugin <plugin
id="org.eclipse.equinox.http.registry" id="org.eclipse.equinox.http.registry"
download-size="0" download-size="0"
install-size="0" install-size="0"
version="0.0.0" version="0.0.0"
unpack="false"/> unpack="false"/>
</feature> <plugin
id="org.idempiere.webservices"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
</feature>

2
org.adempiere.server-feature/server.product.launch
View File

File diff suppressed because one or more lines are too long

108
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/ProcessDialog.java
View File

@ -42,6 +42,7 @@ import org.compiere.util.Env;
import org.compiere.util.Msg; import org.compiere.util.Msg;
import org.zkoss.zhtml.Table; import org.zkoss.zhtml.Table;
import org.zkoss.zhtml.Td; import org.zkoss.zhtml.Td;
import org.zkoss.zhtml.Text;
import org.zkoss.zhtml.Tr; import org.zkoss.zhtml.Tr;
import org.zkoss.zk.au.out.AuEcho; import org.zkoss.zk.au.out.AuEcho;
import org.zkoss.zk.ui.Component; import org.zkoss.zk.ui.Component;
@ -469,9 +470,10 @@ public class ProcessDialog extends Window implements EventListener<Event>, IProc
private void appendRecordLogInfo(ProcessInfoLog[] m_logs) { private void appendRecordLogInfo(ProcessInfoLog[] m_logs) {
if (m_logs == null) if (m_logs == null)
return ; return;
SimpleDateFormat dateFormat = DisplayType.getDateFormat(DisplayType.Date); SimpleDateFormat dateFormat = DisplayType
.getDateFormat(DisplayType.Date);
logMessageTable = new Table(); logMessageTable = new Table();
logMessageTable.setId("logrecords"); logMessageTable.setId("logrecords");
@ -479,51 +481,73 @@ public class ProcessDialog extends Window implements EventListener<Event>, IProc
logMessageTable.setDynamicProperty("cellpadding", "0"); logMessageTable.setDynamicProperty("cellpadding", "0");
logMessageTable.setDynamicProperty("cellspacing", "0"); logMessageTable.setDynamicProperty("cellspacing", "0");
logMessageTable.setDynamicProperty("width", "100%"); logMessageTable.setDynamicProperty("width", "100%");
this.appendChild(logMessageTable);
for (int i = 0; i < m_logs.length; i++) this.appendChild(logMessageTable);
{
Tr tr = new Tr();
logMessageTable.appendChild(tr);
ProcessInfoLog log = m_logs[i];
if (log.getP_Date() != null){
Label label = new Label(dateFormat.format(log.getP_Date()));
//label.setStyle("padding-right:100px");
Td td = new Td();
td = new Td();
td.appendChild(label);
tr.appendChild(td);
}
if (log.getP_Number() != null){
Label labelPno= new Label(""+log.getP_Number());
Td td = new Td();
td.appendChild(labelPno);
tr.appendChild(td);
}
A recordLink = null;
if (log.getP_Msg() != null){
recordLink = new A();
recordLink.setLabel(log.getP_Msg());
if (log.getAD_Table_ID() > 0 && log.getRecord_ID()> 0) { boolean datePresents = false;
recordLink.setAttribute("Record_ID", String.valueOf(log.getRecord_ID())); boolean numberPresents = false;
recordLink.setAttribute("AD_Table_ID", String.valueOf(log.getAD_Table_ID())); boolean msgPresents = false;
recordLink.addEventListener(Events.ON_CLICK, this);
for (ProcessInfoLog log : m_logs) {
if (log.getP_Date() != null)
datePresents = true;
if (log.getP_Number() != null)
numberPresents = true;
if (log.getP_Msg() != null)
msgPresents = true;
}
for (int i = 0; i < m_logs.length; i++) {
Tr tr = new Tr();
logMessageTable.appendChild(tr);
ProcessInfoLog log = m_logs[i];
if (datePresents) {
Td td = new Td();
if (log.getP_Date() != null) {
Label label = new Label(dateFormat.format(log.getP_Date()));
td.appendChild(label);
// label.setStyle("padding-right:100px");
} }
tr.appendChild(td);
}
if (numberPresents) {
Td td = new Td(); Td td = new Td();
td.appendChild(recordLink); if (log.getP_Number() != null) {
tr.appendChild(td); Label labelPno = new Label("" + log.getP_Number());
td.appendChild(labelPno);
}
tr.appendChild(td);
}
if (msgPresents) {
Td td = new Td();
if (log.getP_Msg() != null) {
if (log.getAD_Table_ID() > 0 && log.getRecord_ID() > 0) {
A recordLink = new A();
recordLink.setLabel(log.getP_Msg());
recordLink.setAttribute("Record_ID",
String.valueOf(log.getRecord_ID()));
recordLink.setAttribute("AD_Table_ID",
String.valueOf(log.getAD_Table_ID()));
recordLink.addEventListener(Events.ON_CLICK, this);
td.appendChild(recordLink);
} else {
Text t = new Text();
t.setEncode(false);
t.setValue(log.getP_Msg());
td.appendChild(t);
}
}
tr.appendChild(td);
} }
} }
messageDiv.appendChild(logMessageTable); messageDiv.appendChild(logMessageTable);
} }
private void restart() { private void restart() {

81
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WGenForm.java
View File

@ -58,6 +58,7 @@ import org.compiere.util.Env;
import org.compiere.util.Msg; import org.compiere.util.Msg;
import org.zkoss.zhtml.Table; import org.zkoss.zhtml.Table;
import org.zkoss.zhtml.Td; import org.zkoss.zhtml.Td;
import org.zkoss.zhtml.Text;
import org.zkoss.zhtml.Tr; import org.zkoss.zhtml.Tr;
import org.zkoss.zk.au.out.AuEcho; import org.zkoss.zk.au.out.AuEcho;
import org.zkoss.zk.ui.event.Event; import org.zkoss.zk.ui.event.Event;
@ -486,6 +487,20 @@ public class WGenForm extends ADForm implements EventListener, WTableModelListen
this.appendChild(logMessageTable); this.appendChild(logMessageTable);
boolean datePresents = false;
boolean numberPresents = false;
boolean msgPresents = false;
for (ProcessInfoLog log : m_logs) {
if (log.getP_Date() != null)
datePresents = true;
if (log.getP_Number() != null)
numberPresents = true;
if (log.getP_Msg() != null)
msgPresents = true;
}
for (int i = 0; i < m_logs.length; i++) for (int i = 0; i < m_logs.length; i++)
{ {
@ -494,37 +509,47 @@ public class WGenForm extends ADForm implements EventListener, WTableModelListen
ProcessInfoLog log = m_logs[i]; ProcessInfoLog log = m_logs[i];
if (log.getP_Date() != null){ if (datePresents) {
Label label = new Label(dateFormat.format(log.getP_Date()));
//label.setStyle("padding-right:100px");
Td td = new Td(); Td td = new Td();
td = new Td(); if (log.getP_Date() != null) {
td.appendChild(label); Label label = new Label(dateFormat.format(log.getP_Date()));
tr.appendChild(td); td.appendChild(label);
// label.setStyle("padding-right:100px");
}
if (log.getP_Number() != null){
Label labelPno= new Label(""+log.getP_Number());
Td td = new Td();
td.appendChild(labelPno);
tr.appendChild(td);
}
A recordLink = null;
if (log.getP_Msg() != null){
recordLink = new A();
recordLink.setLabel(log.getP_Msg());
if (log.getAD_Table_ID() > 0 && log.getRecord_ID()> 0) {
recordLink.setAttribute("Record_ID", String.valueOf(log.getRecord_ID()));
recordLink.setAttribute("AD_Table_ID", String.valueOf(log.getAD_Table_ID()));
recordLink.addEventListener(Events.ON_CLICK, this);
} }
tr.appendChild(td);
}
if (numberPresents) {
Td td = new Td(); Td td = new Td();
td.appendChild(recordLink); if (log.getP_Number() != null) {
tr.appendChild(td); Label labelPno = new Label("" + log.getP_Number());
td.appendChild(labelPno);
}
tr.appendChild(td);
}
if (msgPresents) {
Td td = new Td();
if (log.getP_Msg() != null) {
if (log.getAD_Table_ID() > 0 && log.getRecord_ID() > 0) {
A recordLink = new A();
recordLink.setLabel(log.getP_Msg());
recordLink.setAttribute("Record_ID",
String.valueOf(log.getRecord_ID()));
recordLink.setAttribute("AD_Table_ID",
String.valueOf(log.getAD_Table_ID()));
recordLink.addEventListener(Events.ON_CLICK, this);
td.appendChild(recordLink);
} else {
Text t = new Text();
t.setEncode(false);
t.setValue(log.getP_Msg());
td.appendChild(t);
}
}
tr.appendChild(td);
} }
} }
messageDiv.appendChild(logMessageTable); messageDiv.appendChild(logMessageTable);