jstrachan 2003/02/26 05:34:22
Modified:
jelly/jelly-tags/jface/src/java/org/apache/commons/jelly/tags/jface/window
ApplicationWindowTag.java
jelly/jelly-tags/jface/src/test/org/apache/commons/jelly/tags/jface
JFaceDemo.jelly
Log:
Applied latest patches supplied by Christiaan ten Klooster to allow
<applicationWindow> to have a title specified
Revision Changes Path
1.2 +8 -0
jakarta-commons/jelly/jelly-tags/jface/src/java/org/apache/commons/jelly/tags/jface/window/ApplicationWindowTag.java
Index: ApplicationWindowTag.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/jelly/jelly-tags/jface/src/java/org/apache/commons/jelly/tags/jface/window/ApplicationWindowTag.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ApplicationWindowTag.java 26 Feb 2003 12:53:37 -0000 1.1
+++ ApplicationWindowTag.java 26 Feb 2003 13:34:21 -0000 1.2
@@ -106,7 +106,15 @@
+ parent);
}
}
+
super.doTag(output);
+
+ // set Title of aaplicationWindow
+ Object title = attributes.remove("title");
+ if (title != null) {
+ getWindow().getShell().setText((String)title);
+ }
+
}
/*
1.3 +2 -1
jakarta-commons/jelly/jelly-tags/jface/src/test/org/apache/commons/jelly/tags/jface/JFaceDemo.jelly
Index: JFaceDemo.jelly
===================================================================
RCS file:
/home/cvs/jakarta-commons/jelly/jelly-tags/jface/src/test/org/apache/commons/jelly/tags/jface/JFaceDemo.jelly,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- JFaceDemo.jelly 26 Feb 2003 12:53:37 -0000 1.2
+++ JFaceDemo.jelly 26 Feb 2003 13:34:22 -0000 1.3
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<j:jelly xmlns:j="jelly:core" xmlns="jelly:jface" xmlns:log="jelly:log">
- <applicationWindow var="mainapp">
+ <applicationWindow var="mainapp" title="Welcome to the JFace Demo">
<menuManager text="File">
<action text="Test">
@@ -29,6 +29,7 @@
</applicationWindow>
${mainapp.MenuBarManager.updateAll(true)}
+ ${mainapp.getShell().pack()}
${mainapp.open()}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
