You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@commons.apache.org by po...@apache.org on 2004/12/19 23:26:22 UTC
cvs commit: jakarta-commons/jelly/jelly-tags/swing/src/test/org/apache/commons/jelly/swing gridBagDemo.jelly run.jelly
polx 2004/12/19 14:26:22
Modified: jelly/jelly-tags/swing/src/java/org/apache/commons/jelly/tags/swing
ActionTag.java
jelly/jelly-tags/swing/src/test/org/apache/commons/jelly/swing
gridBagDemo.jelly run.jelly
Log:
Putting demo:swing back on tracks.
Oddly enough, we didn't test enough since either a change in UseBeanTag or in
BeanUtils dependency which made it that several attributes were there but were
actually not matching to correct bean-properties.
Also... ActionTag was firing at startup which is definitely wrong!
paul
Revision Changes Path
1.12 +5 -1 jakarta-commons/jelly/jelly-tags/swing/src/java/org/apache/commons/jelly/tags/swing/ActionTag.java
Index: ActionTag.java
===================================================================
RCS file: /home/cvs/jakarta-commons/jelly/jelly-tags/swing/src/java/org/apache/commons/jelly/tags/swing/ActionTag.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ActionTag.java 9 Sep 2004 12:16:57 -0000 1.11
+++ ActionTag.java 19 Dec 2004 22:26:22 -0000 1.12
@@ -99,7 +99,7 @@
public void actionPerformed(ActionEvent event) {
context.setVariable( "event", event );
try {
- invokeBody(output);
+ ActionTag.super.invokeBody(output);
}
catch (Exception e) {
log.error( "Caught: " + e, e );
@@ -110,6 +110,10 @@
}
return action;
}
+
+ public void invokeBody(XMLOutput output) {
+ // do nothing
+ }
/**
1.6 +3 -3 jakarta-commons/jelly/jelly-tags/swing/src/test/org/apache/commons/jelly/swing/gridBagDemo.jelly
Index: gridBagDemo.jelly
===================================================================
RCS file: /home/cvs/jakarta-commons/jelly/jelly-tags/swing/src/test/org/apache/commons/jelly/swing/gridBagDemo.jelly,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gridBagDemo.jelly 8 Sep 2004 05:34:01 -0000 1.5
+++ gridBagDemo.jelly 19 Dec 2004 22:26:22 -0000 1.6
@@ -40,14 +40,14 @@
<panel name="metadata-panel">
<gridBagLayout>
- <gbc name="Title-cell" gridx="0" gridy="0" idpadx="20" fill="horizontal">
+ <gbc gridx="0" gridy="0" ipadx="20" fill="horizontal">
<!-- prefer a title ?? dnd may be harder -->
<panel name="head-panel">
<label text="Definition: Definition of a metrics"/><!-- need fonts ! -->
<!-- this should be a draggable label, being the source to drop a relation -->
</panel>
</gbc>
- <gbc name="panes-cell" gridx="0" gridy="1" fill="both">
+ <gbc gridx="0" gridy="1" fill="both">
<!-- constraints variable definitions... for later use, in the children of the center element -->
<gbc var="labelConstraints"
weightx="0" weighty="0"
@@ -126,7 +126,7 @@
</gbc>
</gridBagLayout>
</gbc>
- <gbc name="content-display" gridx="0" gridy="2" fill="horizontal">
+ <gbc gridx="0" gridy="2" fill="horizontal">
<!-- would need a separator here." -->
</gbc>
</gridBagLayout>
1.7 +1 -1 jakarta-commons/jelly/jelly-tags/swing/src/test/org/apache/commons/jelly/swing/run.jelly
Index: run.jelly
===================================================================
RCS file: /home/cvs/jakarta-commons/jelly/jelly-tags/swing/src/test/org/apache/commons/jelly/swing/run.jelly,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- run.jelly 8 Sep 2004 05:34:01 -0000 1.6
+++ run.jelly 19 Dec 2004 22:26:22 -0000 1.7
@@ -26,7 +26,7 @@
<!-- action to choose a file -->
<action var="chooseFileAction" name="...">
- <fileChooser var="chooser" description="Jelly files" currentDirectory="${working.dir}"/>
+ <fileChooser var="chooser" currentDirectory="${working.dir}"/>
${chooser.showDialog(frame, 'Choose Jelly file')}
---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org