summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorakozak2011-11-23 01:56:04 (EST)
committer Winston Prakash2011-12-01 20:47:04 (EST)
commit89fc549cbd828ed487079845981ae637c3cce299 (patch)
tree96bcabb57fd8fcd1223ce37936c771adb132098b
parentc301a558c4a8c80eb5e9c3d843e621bcbd7ae058 (diff)
downloadorg.eclipse.hudson.core-89fc549cbd828ed487079845981ae637c3cce299.zip
org.eclipse.hudson.core-89fc549cbd828ed487079845981ae637c3cce299.tar.gz
org.eclipse.hudson.core-89fc549cbd828ed487079845981ae637c3cce299.tar.bz2
Implement cascading support for hetero-list.jelly. Add css style for div.modified
Signed-off-by: Winston Prakash <winston.prakash@gmail.com>
-rw-r--r--hudson-core/pom.xml2
-rw-r--r--hudson-core/src/main/java/hudson/util/SubClassGenerator.java2
-rw-r--r--hudson-core/src/main/resources/hudson/model/ParametersDefinitionProperty/index.jelly16
3 files changed, 11 insertions, 9 deletions
diff --git a/hudson-core/pom.xml b/hudson-core/pom.xml
index 715303c..b43d1f1 100644
--- a/hudson-core/pom.xml
+++ b/hudson-core/pom.xml
@@ -68,7 +68,7 @@
<embedded_su4j.version>1.1</embedded_su4j.version>
<sezpoz.version>1.9</sezpoz.version>
<metainf-services.version>1.1</metainf-services.version>
- <asm-commons.version>3.3.1</asm-commons.version>
+ <asm-commons.version>2.2.3</asm-commons.version>
<access-modifier-annotation.version>1.0</access-modifier-annotation.version>
<jline.version>0.9.94</jline.version>
diff --git a/hudson-core/src/main/java/hudson/util/SubClassGenerator.java b/hudson-core/src/main/java/hudson/util/SubClassGenerator.java
index e1f638a..3a80dec 100644
--- a/hudson-core/src/main/java/hudson/util/SubClassGenerator.java
+++ b/hudson-core/src/main/java/hudson/util/SubClassGenerator.java
@@ -37,7 +37,7 @@ public class SubClassGenerator extends ClassLoader {
}
public <T> Class<? extends T> generate(Class<T> base, String name) {
- ClassWriter cw = new ClassWriter(ClassWriter.COMPUTE_MAXS);//?
+ ClassWriter cw = new ClassWriter(false, false);//?
cw.visit(49, ACC_PUBLIC, name.replace('.', '/'), null,
Type.getInternalName(base),null);
diff --git a/hudson-core/src/main/resources/hudson/model/ParametersDefinitionProperty/index.jelly b/hudson-core/src/main/resources/hudson/model/ParametersDefinitionProperty/index.jelly
index 0a6c783..1d5476b 100644
--- a/hudson-core/src/main/resources/hudson/model/ParametersDefinitionProperty/index.jelly
+++ b/hudson-core/src/main/resources/hudson/model/ParametersDefinitionProperty/index.jelly
@@ -30,12 +30,14 @@
<st:include page="sidepanel.jelly" it="${it.project}" />
<l:main-panel>
<h1>${it.owner.pronoun} ${it.owner.displayName}</h1>
- <p>
- <j:invokeStatic var="escapedValue" className="hudson.Util" method="escape">
- <j:arg value="${it.owner.description}"/>
- </j:invokeStatic>
- ${escapedValue}
- </p>
+ <j:if test="${!empty(it.owner.description)}">
+ <p>
+ <j:invokeStatic var="escapedValue" className="hudson.Util" method="escape">
+ <j:arg value="${it.owner.description}"/>
+ </j:invokeStatic>
+ ${escapedValue}
+ </p>
+ </j:if>
<p>${%description}</p>
<j:set var="delay" value="${request.getParameter('delay')}" />
<f:form method="post" action="build${empty(delay)?'':'?delay='+delay}" name="parameters"
@@ -52,4 +54,4 @@
</f:form>
</l:main-panel>
</l:layout>
-</j:jelly>
+</j:jelly> \ No newline at end of file