August 2010 - jbosstools-commits - Jboss List Archives

JBoss Tools SVN: r23937 - trunk/jst/plugins/org.jboss.tools.jst.web.kb/taglibs.

by jbosstools-commits＠lists.jboss.org

Author: dazarov Date: 2010-08-05 10:05:02 -0400 (Thu, 05 Aug 2010) New Revision: 23937 Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/taglibs/SeamPdf.xml Log: https://jira.jboss.org/browse/JBIDE-5231 Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/taglibs/SeamPdf.xml =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web.kb/taglibs/SeamPdf.xml 2010-08-05 12:11:46 UTC (rev 23936) +++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/taglibs/SeamPdf.xml 2010-08-05 14:05:02 UTC (rev 23937) @@ -2,78 +2,106 @@ <!DOCTYPE tag-lib PUBLIC "-//Red Hat, Inc//DTD Knowledge Base 2.0//EN" "http://anonsvn.jboss.org/repos/jbosstools/trunk/jst/plugins/org.jboss.too..."> <tag-lib defaultPrefix="p"> - <component name="document"> - <description>Documents are generated by facelets documents using tags in the http://jboss.com/products/seam/pdf namespace. Documents should always have the document tag at the root of the document. The document tag prepares Seam to generate a document into the DocumentStore and renders an HTML redirect to that stored content.</description> - <attribute name="type"> - <description>The type of the document to be produced. Valid values are PDF, RTF and HTML modes. Seam defaults to PDF generation, and many of the features only work correctly when generating PDF documents.</description> - <proposal type="enumeration"> + <component extended="false" name="document"> + <description>Documents are generated by facelets documents using tags + in the http://jboss.com/products/seam/pdf namespace. Documents should + always have the document tag at the root of the document. The + document tag prepares Seam to generate a document into the + DocumentStore and renders an HTML redirect to that stored content. + </description> + <attribute extended="false" name="type"> + <description>The type of the document to be produced. Valid values + are PDF, RTF and HTML modes. Seam defaults to PDF generation, and + many of the features only work correctly when generating PDF + documents.</description> + <proposal type="enumeration"> <param value="PDF" /> <param value="RTF" /> <param value="HTML" /> </proposal> - </attribute> - <attribute name="pageSize"> - <description>The size of the page to be generate. The most commonly used values would be LETTER and A4. A full list of supported pages sizes can be found in com.lowagie.text.PageSize class. Alternatively, pageSize can provide the width and height of the page directly. The value "612 792", for example, is equivalent to the LETTER page size.</description> - <proposal type="enumeration"> + </attribute> + <attribute extended="false" name="pageSize"> + <description>The size of the page to be generate. The most commonly + used values would be LETTER and A4. A full list of supported pages + sizes can be found in com.lowagie.text.PageSize class. + Alternatively, pageSize can provide the width and height of the page + directly. The value "612 792", for example, is equivalent to the + LETTER page size.</description> + <proposal type="enumeration"> <param value="LETTER" /> <param value="A4" /> </proposal> - </attribute> - <attribute name="orientation"> - <description>The orientation of the page. Valid values are portrait and landscape. In landscape mode, the height and width page size values are reversed.</description> - <proposal type="enumeration"> + </attribute> + <attribute extended="false" name="orientation"> + <description>The orientation of the page. Valid values are portrait + and landscape. In landscape mode, the height and width page size + values are reversed.</description> + <proposal type="enumeration"> <param value="portrait" /> <param value="landscape" /> </proposal> - </attribute> - <attribute name="margins"> - <description>The left, right, top and bottom margin values.</description> - </attribute> - <attribute name="marginMirroring"> - <description>Indicates that margin settings should be reversed an alternating pages.</description> - </attribute> - <attribute name="title" /> - <attribute name="subject" /> - <attribute name="keywords" /> - <attribute name="author" /> - <attribute name="creator" /> + </attribute> + <attribute extended="false" name="margins"> + <description>The left, right, top and bottom margin values. + </description> + </attribute> + <attribute extended="false" name="marginMirroring"> + <description>Indicates that margin settings should be reversed an + alternating pages.</description> + </attribute> + <attribute extended="false" name="title" /> + <attribute extended="false" name="subject" /> + <attribute extended="false" name="keywords" /> + <attribute extended="false" name="author" /> + <attribute extended="false" name="creator" /> </component> - - <component name="paragraph"> - <description>Most uses of text should be sectioned into paragraphs so that text fragments can be flowed, formatted and styled in logical groups.</description> - <attribute name="firstLineIndent" /> - <attribute name="extraParagraphSpace" /> - <attribute name="leading" /> - <attribute name="multipliedLeading" /> - <attribute name="spacingBefore"> - <description>The blank space to be inserted before the element.</description> - </attribute> - <attribute name="spacingAfter"> - <description>The blank space to be inserted after the element.</description> - </attribute> - <attribute name="indentationLeft" /> - <attribute name="indentationRight" /> - <attribute name="keepTogether" /> + + <component extended="false" name="paragraph"> + <description>Most uses of text should be sectioned into paragraphs so + that text fragments can be flowed, formatted and styled in logical + groups.</description> + <attribute extended="false" name="firstLineIndent" /> + <attribute extended="false" name="extraParagraphSpace" /> + <attribute extended="false" name="leading" /> + <attribute extended="false" name="multipliedLeading" /> + <attribute extended="false" name="spacingBefore"> + <description>The blank space to be inserted before the element. + </description> + </attribute> + <attribute extended="false" name="spacingAfter"> + <description>The blank space to be inserted after the element. + </description> + </attribute> + <attribute extended="false" name="indentationLeft" /> + <attribute extended="false" name="indentationRight" /> + <attribute extended="false" name="keepTogether" /> </component> - <component name="text"> - <description>The text tag allows text fragments to be produced from application data using normal JSF converter mechanisms. It is very similar to the outputText tag used when rendering HTML documents.</description> - <attribute name="value"> - <description>The value to be displayed. This will typically be a value binding expression.</description> - </attribute> + <component extended="false" name="text"> + <description>The text tag allows text fragments to be produced from + application data using normal JSF converter mechanisms. It is very + similar to the outputText tag used when rendering HTML documents. + </description> + <attribute extended="false" name="value"> + <description>The value to be displayed. This will typically be a + value binding expression.</description> + </attribute> </component> - <component name="font"> - <description>The font tag defines the default font to be used for all text inside of it.</description> - <attribute name="name"> - <description>The font name, for example: COURIER, HELVETICA, TIMES-ROMAN, SYMBOL or ZAPFDINGBATS.</description> - </attribute> - <attribute name="size"> - <description>The point size of the font.</description> - </attribute> - <attribute name="style"> - <description>The font styles. Any combination of : NORMAL, BOLD, ITALIC, OBLIQUE, UNDERLINE, LINE-THROUGH</description> - <proposal type="enumeration"> + <component extended="false" name="font"> + <description>The font tag defines the default font to be used for all + text inside of it.</description> + <attribute extended="false" name="name"> + <description>The font name, for example: COURIER, HELVETICA, + TIMES-ROMAN, SYMBOL or ZAPFDINGBATS.</description> + </attribute> + <attribute extended="false" name="size"> + <description>The point size of the font.</description> + </attribute> + <attribute extended="false" name="style"> + <description>The font styles. Any combination of : NORMAL, BOLD, + ITALIC, OBLIQUE, UNDERLINE, LINE-THROUGH</description> + <proposal type="enumeration"> <param value="NORMAL" /> <param value="BOLD" /> <param value="ITALIC" /> @@ -81,34 +109,42 @@ <param value="UNDERLINE" /> <param value="LINE-THROUGH" /> </proposal> - </attribute> - <attribute name="encoding"> - <description>The character set encoding.</description> - </attribute> + </attribute> + <attribute extended="false" name="encoding"> + <description>The character set encoding.</description> + </attribute> </component> - - <component name="newPage"> + + <component extended="false" closeTag="true" name="newPage"> <description>p:newPage inserts a page break.</description> </component> - - <component name="image"> - <description>p:image inserts an image into the document. Images can be be loaded from the classpath or from the web application context using the value attribute. -Resources can also be dynamically generated by application code. The imageData attribute can specify a value binding expression whose value is a java.awt.Image object.</description> - <attribute name="value"> - <description>A resource name or a method expression binding to an application-generated image.</description> - </attribute> - <attribute name="rotation"> - <description>The rotation of the image in degrees.</description> - </attribute> - <attribute name="height"> - <description>The height of the image.</description> - </attribute> - <attribute name="width"> - <description>The width of the image.</description> - </attribute> - <attribute name="alignment"> - <description>The alignment of the image. Seam PDF supports the following horizontal alignment values: left, right, center, justify and justifyall. The vertical alignment values are top, middle, bottom, and baseline.</description> - <proposal type="enumeration"> + + <component extended="false" closeTag="true" name="image"> + <description>p:image inserts an image into the document. Images can be + be loaded from the classpath or from the web application context + using the value attribute. Resources can also be dynamically + generated by application code. The imageData attribute can specify a + value binding expression whose value is a java.awt.Image object. + </description> + <attribute extended="false" name="value"> + <description>A resource name or a method expression binding to an + application-generated image.</description> + </attribute> + <attribute extended="false" name="rotation"> + <description>The rotation of the image in degrees.</description> + </attribute> + <attribute extended="false" name="height"> + <description>The height of the image.</description> + </attribute> + <attribute extended="false" name="width"> + <description>The width of the image.</description> + </attribute> + <attribute extended="false" name="alignment"> + <description>The alignment of the image. Seam PDF supports the + following horizontal alignment values: left, right, center, justify + and justifyall. The vertical alignment values are top, middle, + bottom, and baseline.</description> + <proposal type="enumeration"> <param value="left" /> <param value="right" /> <param value="center" /> @@ -119,43 +155,61 @@ <param value="bottom" /> <param value="baseline" /> </proposal> - </attribute> - <attribute name="alt"> - <description>Alternative text representation for the image.</description> - </attribute> - <attribute name="indentationLeft" /> - <attribute name="indentationRight" /> - <attribute name="spacingBefore"> - <description>The blank space to be inserted before the element.</description> - </attribute> - <attribute name="spacingAfter"> - <description>The blank space to be inserted after the element.</description> - </attribute> - <attribute name="widthPercentage" /> - <attribute name="initialRotation" /> - <attribute name="dpi" /> - <attribute name="scalePercent"> - <description>The scaling factor (as a percentage) to use for the image. This can be expressed as a single percentage value or as two percentage values representing separate x and y scaling percentages.</description> - </attribute> - <attribute name="wrap" /> - <attribute name="underlying" /> + </attribute> + <attribute extended="false" name="alt"> + <description>Alternative text representation for the image. + </description> + </attribute> + <attribute extended="false" name="indentationLeft" /> + <attribute extended="false" name="indentationRight" /> + <attribute extended="false" name="spacingBefore"> + <description>The blank space to be inserted before the element. + </description> + </attribute> + <attribute extended="false" name="spacingAfter"> + <description>The blank space to be inserted after the element. + </description> + </attribute> + <attribute extended="false" name="widthPercentage" /> + <attribute extended="false" name="initialRotation" /> + <attribute extended="false" name="dpi" /> + <attribute extended="false" name="scalePercent"> + <description>The scaling factor (as a percentage) to use for the + image. This can be expressed as a single percentage value or as two + percentage values representing separate x and y scaling percentages. + </description> + </attribute> + <attribute extended="false" name="wrap" /> + <attribute extended="false" name="underlying" /> </component> - - <component name="anchor"> - <description>p:anchor defines clickable links from a document.</description> - <attribute name="name"> - <description>The name of an in-document anchor destination.</description> - </attribute> - <attribute name="reference"> - <description>The destination the link refers to. Links to other points in the document should begin with a "#". For example, "#link1" to refer to an anchor postion with a name of link1. Links may also be a full URL to point to a resource outside of the document.</description> - </attribute> + + <component extended="false" name="anchor"> + <description>p:anchor defines clickable links from a document. + </description> + <attribute extended="false" name="name"> + <description>The name of an in-document anchor destination. + </description> + </attribute> + <attribute extended="false" name="reference"> + <description>The destination the link refers to. Links to other + points in the document should begin with a "#". For example, + "#link1" to refer to an anchor postion with a name of link1. Links + may also be a full URL to point to a resource outside of the + document.</description> + </attribute> </component> - - <component name="header"> - <description>The p:header and p:footer components provide the ability to place header and footer text on each page of a generated document, with the exception of the first page. Header and footer declarations should appear near the top of a document.</description> - <attribute name="alignment"> - <description>The alignment of the image. Seam PDF supports the following horizontal alignment values: left, right, center, justify and justifyall. The vertical alignment values are top, middle, bottom, and baseline.</description> - <proposal type="enumeration"> + + <component extended="false" name="header"> + <description>The p:header and p:footer components provide the ability + to place header and footer text on each page of a generated document, + with the exception of the first page. Header and footer declarations + should appear near the top of a document.</description> + <attribute extended="false" name="alignment"> + <description>The alignment of the image. Seam PDF supports the + following horizontal alignment values: left, right, center, justify + and justifyall. The vertical alignment values are top, middle, + bottom, and baseline.</description> + <proposal type="enumeration"> <param value="left" /> <param value="right" /> <param value="center" /> @@ -166,10 +220,13 @@ <param value="bottom" /> <param value="baseline" /> </proposal> - </attribute> - <attribute name="backgroundColor"> - <description>The background color of the header/footer box. Currently, only named colors are supported. They are: white, gray, lightgray, darkgray, black, red, pink, yellow, green, magenta, cyan and blue.</description> - <proposal type="enumeration"> + </attribute> + <attribute extended="false" name="backgroundColor"> + <description>The background color of the header/footer box. + Currently, only named colors are supported. They are: white, gray, + lightgray, darkgray, black, red, pink, yellow, green, magenta, cyan + and blue.</description> + <proposal type="enumeration"> <param value="white" /> <param value="gray" /> <param value="lightgray" /> @@ -183,10 +240,14 @@ <param value="cyan" /> <param value="blue" /> </proposal> - </attribute> - <attribute name="borderColor"> - <description>The border color of the header/footer box. Individual border sides can be set using borderColorLeft, borderColorRight, borderColorTop and borderColorBottom. Currently, only named colors are supported. They are: white, gray, lightgray, darkgray, black, red, pink, yellow, green, magenta, cyan and blue.</description> - <proposal type="enumeration"> + </attribute> + <attribute extended="false" name="borderColor"> + <description>The border color of the header/footer box. Individual + border sides can be set using borderColorLeft, borderColorRight, + borderColorTop and borderColorBottom. Currently, only named colors + are supported. They are: white, gray, lightgray, darkgray, black, + red, pink, yellow, green, magenta, cyan and blue.</description> + <proposal type="enumeration"> <param value="white" /> <param value="gray" /> <param value="lightgray" /> @@ -200,10 +261,12 @@ <param value="cyan" /> <param value="blue" /> </proposal> - </attribute> - <attribute name="borderColorLeft"> - <description>Currently, only named colors are supported. They are: white, gray, lightgray, darkgray, black, red, pink, yellow, green, magenta, cyan and blue.</description> - <proposal type="enumeration"> + </attribute> + <attribute extended="false" name="borderColorLeft"> + <description>Currently, only named colors are supported. They are: + white, gray, lightgray, darkgray, black, red, pink, yellow, green, + magenta, cyan and blue.</description> + <proposal type="enumeration"> <param value="white" /> <param value="gray" /> <param value="lightgray" /> @@ -217,10 +280,12 @@ <param value="cyan" /> <param value="blue" /> </proposal> - </attribute> - <attribute name="borderColorRight"> - <description>Currently, only named colors are supported. They are: white, gray, lightgray, darkgray, black, red, pink, yellow, green, magenta, cyan and blue.</description> - <proposal type="enumeration"> + </attribute> + <attribute extended="false" name="borderColorRight"> + <description>Currently, only named colors are supported. They are: + white, gray, lightgray, darkgray, black, red, pink, yellow, green, + magenta, cyan and blue.</description> + <proposal type="enumeration"> <param value="white" /> <param value="gray" /> <param value="lightgray" /> @@ -234,10 +299,12 @@ <param value="cyan" /> <param value="blue" /> </proposal> - </attribute> - <attribute name="borderColorTop"> - <description>Currently, only named colors are supported. They are: white, gray, lightgray, darkgray, black, red, pink, yellow, green, magenta, cyan and blue.</description> - <proposal type="enumeration"> + </attribute> + <attribute extended="false" name="borderColorTop"> + <description>Currently, only named colors are supported. They are: + white, gray, lightgray, darkgray, black, red, pink, yellow, green, + magenta, cyan and blue.</description> + <proposal type="enumeration"> <param value="white" /> <param value="gray" /> <param value="lightgray" /> @@ -251,10 +318,12 @@ <param value="cyan" /> <param value="blue" /> </proposal> - </attribute> - <attribute name="borderColorBottom"> - <description>Currently, only named colors are supported. They are: white, gray, lightgray, darkgray, black, red, pink, yellow, green, magenta, cyan and blue.</description> - <proposal type="enumeration"> + </attribute> + <attribute extended="false" name="borderColorBottom"> + <description>Currently, only named colors are supported. They are: + white, gray, lightgray, darkgray, black, red, pink, yellow, green, + magenta, cyan and blue.</description> + <proposal type="enumeration"> <param value="white" /> <param value="gray" /> <param value="lightgray" /> @@ -268,21 +337,29 @@ <param value="cyan" /> <param value="blue" /> </proposal> - </attribute> - <attribute name="borderWidth"> - <description>The width of the border. Inidvidual border sides can be specified using borderWidthLeft, borderWidthRight, borderWidthTop and borderWidthBottom.</description> - </attribute> - <attribute name="borderWidthLeft" /> - <attribute name="borderWidthRight" /> - <attribute name="borderWidthTop" /> - <attribute name="borderWidthBottom" /> + </attribute> + <attribute extended="false" name="borderWidth"> + <description>The width of the border. Inidvidual border sides can be + specified using borderWidthLeft, borderWidthRight, borderWidthTop + and borderWidthBottom.</description> + </attribute> + <attribute extended="false" name="borderWidthLeft" /> + <attribute extended="false" name="borderWidthRight" /> + <attribute extended="false" name="borderWidthTop" /> + <attribute extended="false" name="borderWidthBottom" /> </component> - <component name="footer"> - <description>The p:header and p:footer components provide the ability to place header and footer text on each page of a generated document, with the exception of the first page. Header and footer declarations should appear near the top of a document.</description> - <attribute name="alignment"> - <description>The alignment of the image. Seam PDF supports the following horizontal alignment values: left, right, center, justify and justifyall. The vertical alignment values are top, middle, bottom, and baseline.</description> - <proposal type="enumeration"> + <component extended="false" name="footer"> + <description>The p:header and p:footer components provide the ability + to place header and footer text on each page of a generated document, + with the exception of the first page. Header and footer declarations + should appear near the top of a document.</description> + <attribute extended="false" name="alignment"> + <description>The alignment of the image. Seam PDF supports the + following horizontal alignment values: left, right, center, justify + and justifyall. The vertical alignment values are top, middle, + bottom, and baseline.</description> + <proposal type="enumeration"> <param value="left" /> <param value="right" /> <param value="center" /> @@ -293,10 +370,13 @@ <param value="bottom" /> <param value="baseline" /> </proposal> - </attribute> - <attribute name="backgroundColor"> - <description>The background color of the header/footer box. Currently, only named colors are supported. They are: white, gray, lightgray, darkgray, black, red, pink, yellow, green, magenta, cyan and blue.</description> - <proposal type="enumeration"> + </attribute> + <attribute extended="false" name="backgroundColor"> + <description>The background color of the header/footer box. + Currently, only named colors are supported. They are: white, gray, + lightgray, darkgray, black, red, pink, yellow, green, magenta, cyan + and blue.</description> + <proposal type="enumeration"> <param value="white" /> <param value="gray" /> <param value="lightgray" /> @@ -310,10 +390,14 @@ <param value="cyan" /> <param value="blue" /> </proposal> - </attribute> - <attribute name="borderColor"> - <description>The border color of the header/footer box. Individual border sides can be set using borderColorLeft, borderColorRight, borderColorTop and borderColorBottom. Currently, only named colors are supported. They are: white, gray, lightgray, darkgray, black, red, pink, yellow, green, magenta, cyan and blue.</description> - <proposal type="enumeration"> + </attribute> + <attribute extended="false" name="borderColor"> + <description>The border color of the header/footer box. Individual + border sides can be set using borderColorLeft, borderColorRight, + borderColorTop and borderColorBottom. Currently, only named colors + are supported. They are: white, gray, lightgray, darkgray, black, + red, pink, yellow, green, magenta, cyan and blue.</description> + <proposal type="enumeration"> <param value="white" /> <param value="gray" /> <param value="lightgray" /> @@ -327,10 +411,12 @@ <param value="cyan" /> <param value="blue" /> </proposal> - </attribute> - <attribute name="borderColorLeft"> - <description>Currently, only named colors are supported. They are: white, gray, lightgray, darkgray, black, red, pink, yellow, green, magenta, cyan and blue.</description> - <proposal type="enumeration"> + </attribute> + <attribute extended="false" name="borderColorLeft"> + <description>Currently, only named colors are supported. They are: + white, gray, lightgray, darkgray, black, red, pink, yellow, green, + magenta, cyan and blue.</description> + <proposal type="enumeration"> <param value="white" /> <param value="gray" /> <param value="lightgray" /> @@ -344,10 +430,12 @@ <param value="cyan" /> <param value="blue" /> </proposal> - </attribute> - <attribute name="borderColorRight"> - <description>Currently, only named colors are supported. They are: white, gray, lightgray, darkgray, black, red, pink, yellow, green, magenta, cyan and blue.</description> - <proposal type="enumeration"> + </attribute> + <attribute extended="false" name="borderColorRight"> + <description>Currently, only named colors are supported. They are: + white, gray, lightgray, darkgray, black, red, pink, yellow, green, + magenta, cyan and blue.</description> + <proposal type="enumeration"> <param value="white" /> <param value="gray" /> <param value="lightgray" /> @@ -361,10 +449,12 @@ <param value="cyan" /> <param value="blue" /> </proposal> - </attribute> - <attribute name="borderColorTop"> - <description>Currently, only named colors are supported. They are: white, gray, lightgray, darkgray, black, red, pink, yellow, green, magenta, cyan and blue.</description> - <proposal type="enumeration"> + </attribute> + <attribute extended="false" name="borderColorTop"> + <description>Currently, only named colors are supported. They are: + white, gray, lightgray, darkgray, black, red, pink, yellow, green, + magenta, cyan and blue.</description> + <proposal type="enumeration"> <param value="white" /> <param value="gray" /> <param value="lightgray" /> @@ -378,10 +468,12 @@ <param value="cyan" /> <param value="blue" /> </proposal> - </attribute> - <attribute name="borderColorBottom"> - <description>Currently, only named colors are supported. They are: white, gray, lightgray, darkgray, black, red, pink, yellow, green, magenta, cyan and blue.</description> - <proposal type="enumeration"> + </attribute> + <attribute extended="false" name="borderColorBottom"> + <description>Currently, only named colors are supported. They are: + white, gray, lightgray, darkgray, black, red, pink, yellow, green, + magenta, cyan and blue.</description> + <proposal type="enumeration"> <param value="white" /> <param value="gray" /> <param value="lightgray" /> @@ -395,25 +487,38 @@ <param value="cyan" /> <param value="blue" /> </proposal> - </attribute> - <attribute name="borderWidth"> - <description>The width of the border. Inidvidual border sides can be specified using borderWidthLeft, borderWidthRight, borderWidthTop and borderWidthBottom.</description> - </attribute> - <attribute name="borderWidthLeft" /> - <attribute name="borderWidthRight" /> - <attribute name="borderWidthTop" /> - <attribute name="borderWidthBottom" /> + </attribute> + <attribute extended="false" name="borderWidth"> + <description>The width of the border. Inidvidual border sides can be + specified using borderWidthLeft, borderWidthRight, borderWidthTop + and borderWidthBottom.</description> + </attribute> + <attribute extended="false" name="borderWidthLeft" /> + <attribute extended="false" name="borderWidthRight" /> + <attribute extended="false" name="borderWidthTop" /> + <attribute extended="false" name="borderWidthBottom" /> </component> - - <component name="pageNumber"> - <description>The current page number can be placed inside of a header or footer using the p:pageNumber tag. The page number tag can only be used in the context of a header or footer and can only be used once.</description> + + <component extended="false" closeTag="true" name="pageNumber"> + <description>The current page number can be placed inside of a header + or footer using the p:pageNumber tag. The page number tag can only be + used in the context of a header or footer and can only be used once. + </description> </component> - - <component name="chapter"> - <description>If the generated document follows a book/article structure, the p:chapter and p:section tags can be used to provide the necessary structure. Sections can only be used inside of chapters, but they may be nested arbitrarily deep. Most PDF viewers provide easy navigation between chapters and sections in a document.</description> - <attribute name="alignment"> - <description>The alignment of the chapter/section box section. Seam PDF supports the following horizontal alignment values: left, right, center, justify and justifyall. The vertical alignment values are top, middle, bottom, and baseline.</description> - <proposal type="enumeration"> + + <component extended="false" name="chapter"> + <description>If the generated document follows a book/article + structure, the p:chapter and p:section tags can be used to provide + the necessary structure. Sections can only be used inside of + chapters, but they may be nested arbitrarily deep. Most PDF viewers + provide easy navigation between chapters and sections in a document. + </description> + <attribute extended="false" name="alignment"> + <description>The alignment of the chapter/section box section. Seam + PDF supports the following horizontal alignment values: left, right, + center, justify and justifyall. The vertical alignment values are + top, middle, bottom, and baseline.</description> + <proposal type="enumeration"> <param value="left" /> <param value="right" /> <param value="center" /> @@ -424,20 +529,34 @@ <param value="bottom" /> <param value="baseline" /> </proposal> - </attribute> - <attribute name="number"> - <description>The chapter number. Every chapter should be assigned a chapter number.</description> - </attribute> - <attribute name="numberDepth"> - <description>The depth of numbering for section. All sections are numbered relative to their surrounding chapter/sections. The fourth section of of the first section of chapter three would be section 3.1.4, if displayed at the default number depth of three. To omit the chapter number, a number depth of 2 should be used. In that case, the section number would be displayed as 1.4.</description> - </attribute> + </attribute> + <attribute extended="false" name="number"> + <description>The chapter number. Every chapter should be assigned a + chapter number.</description> + </attribute> + <attribute extended="false" name="numberDepth"> + <description>The depth of numbering for section. All sections are + numbered relative to their surrounding chapter/sections. The fourth + section of of the first section of chapter three would be section + 3.1.4, if displayed at the default number depth of three. To omit + the chapter number, a number depth of 2 should be used. In that + case, the section number would be displayed as 1.4.</description> + </attribute> </component> - - <component name="section"> - <description>If the generated document follows a book/article structure, the p:chapter and p:section tags can be used to provide the necessary structure. Sections can only be used inside of chapters, but they may be nested arbitrarily deep. Most PDF viewers provide easy navigation between chapters and sections in a document.</description> - <attribute name="alignment"> - <description>The alignment of the chapter/section box section. Seam PDF supports the following horizontal alignment values: left, right, center, justify and justifyall. The vertical alignment values are top, middle, bottom, and baseline.</description> - <proposal type="enumeration"> + + <component extended="false" name="section"> + <description>If the generated document follows a book/article + structure, the p:chapter and p:section tags can be used to provide + the necessary structure. Sections can only be used inside of + chapters, but they may be nested arbitrarily deep. Most PDF viewers + provide easy navigation between chapters and sections in a document. + </description> + <attribute extended="false" name="alignment"> + <description>The alignment of the chapter/section box section. Seam + PDF supports the following horizontal alignment values: left, right, + center, justify and justifyall. The vertical alignment values are + top, middle, bottom, and baseline.</description> + <proposal type="enumeration"> <param value="left" /> <param value="right" /> <param value="center" /> @@ -448,23 +567,33 @@ <param value="bottom" /> <param value="baseline" /> </proposal> - </attribute> - <attribute name="number"> - <description>The chapter number. Every chapter should be assigned a chapter number.</description> - </attribute> - <attribute name="numberDepth"> - <description>The depth of numbering for section. All sections are numbered relative to their surrounding chapter/sections. The fourth section of of the first section of chapter three would be section 3.1.4, if displayed at the default number depth of three. To omit the chapter number, a number depth of 2 should be used. In that case, the section number would be displayed as 1.4.</description> - </attribute> + </attribute> + <attribute extended="false" name="number"> + <description>The chapter number. Every chapter should be assigned a + chapter number.</description> + </attribute> + <attribute extended="false" name="numberDepth"> + <description>The depth of numbering for section. All sections are + numbered relative to their surrounding chapter/sections. The fourth + section of of the first section of chapter three would be section + 3.1.4, if displayed at the default number depth of three. To omit + the chapter number, a number depth of 2 should be used. In that + case, the section number would be displayed as 1.4.</description> + </attribute> </component> - - <component name="title"> - <description>Any chapter or section can contain a p:title. The title will be displayed next to the chapter/section number. The body of the title may contain raw text or may be a p:paragraph.</description> + + <component extended="false" name="title"> + <description>Any chapter or section can contain a p:title. The title + will be displayed next to the chapter/section number. The body of the + title may contain raw text or may be a p:paragraph.</description> </component> - <component name="list"> - <attribute name="type"> - <description> The ordering/bulleting style of list. One of: NUMBERED, LETTERED, GREEK, ROMAN, ZAPFDINGBATS, ZAPFDINGBATS_NUMBER. If no style is given, the list items are bulleted.</description> - <proposal type="enumeration"> + <component extended="false" name="list"> + <attribute extended="false" name="type"> + <description> The ordering/bulleting style of list. One of: NUMBERED, + LETTERED, GREEK, ROMAN, ZAPFDINGBATS, ZAPFDINGBATS_NUMBER. If no + style is given, the list items are bulleted.</description> + <proposal type="enumeration"> <param value="NUMBERED" /> <param value="LETTERED" /> <param value="GREEK" /> @@ -472,28 +601,35 @@ <param value="ZAPFDINGBATS" /> <param value="ZAPFDINGBATS_NUMBER" /> </proposal> - </attribute> - <attribute name="listSymbol"> - <description>For bulleted lists, specifies the bullet symbol.</description> - </attribute> - <attribute name="indent"> - <description>The indentation level of the list.</description> - </attribute> - <attribute name="lowerCase"> - <description>For list styles using letters, indicates whether the letters should be lower case.</description> - </attribute> - <attribute name="charNumber"> - <description>For ZAPFDINGBATS, indicates the character code of the bullet character.</description> - </attribute> - <attribute name="numberType"> - <description>For ZAPFDINGBATS_NUMBER, indicates the numbering style.</description> - </attribute> + </attribute> + <attribute extended="false" name="listSymbol"> + <description>For bulleted lists, specifies the bullet symbol. + </description> + </attribute> + <attribute extended="false" name="indent"> + <description>The indentation level of the list.</description> + </attribute> + <attribute extended="false" name="lowerCase"> + <description>For list styles using letters, indicates whether the + letters should be lower case.</description> + </attribute> + <attribute extended="false" name="charNumber"> + <description>For ZAPFDINGBATS, indicates the character code of the + bullet character.</description> + </attribute> + <attribute extended="false" name="numberType"> + <description>For ZAPFDINGBATS_NUMBER, indicates the numbering style. + </description> + </attribute> </component> - <component name="listItem"> - <attribute name="alignment"> - <description>The alignment of the list item. Seam PDF supports the following horizontal alignment values: left, right, center, justify and justifyall. The vertical alignment values are top, middle, bottom, and baseline.</description> - <proposal type="enumeration"> + <component extended="false" name="listItem"> + <attribute extended="false" name="alignment"> + <description>The alignment of the list item. Seam PDF supports the + following horizontal alignment values: left, right, center, justify + and justifyall. The vertical alignment values are top, middle, + bottom, and baseline.</description> + <proposal type="enumeration"> <param value="left" /> <param value="right" /> <param value="center" /> @@ -504,116 +640,141 @@ <param value="bottom" /> <param value="baseline" /> </proposal> - </attribute> - <attribute name="indentationLeft"> - <description>The left indentation amount.</description> - </attribute> - <attribute name="indentationRight"> - <description>The right indentation amount.</description> - </attribute> - <attribute name="listSymbol"> - <description>Overrides the default list symbol for this list item.</description> - </attribute> + </attribute> + <attribute extended="false" name="indentationLeft"> + <description>The left indentation amount.</description> + </attribute> + <attribute extended="false" name="indentationRight"> + <description>The right indentation amount.</description> + </attribute> + <attribute extended="false" name="listSymbol"> + <description>Overrides the default list symbol for this list item. + </description> + </attribute> </component> - <component name="table"> - <attribute name="columns"> - <description>The number of columns (cells) that make up a table row.</description> - </attribute> - <attribute name="widths"> - <description>The relative widths of each column. There should be one value for each column. For example: widths="2 1 1" would indicate that there are 3 columns and the first column should be twice the size of the second and third column.</description> - </attribute> - <attribute name="headerRows"> - <description>The initial number of rows which are considered to be headers or footer rows and should be repeated if the table spans multiple pages.</description> - </attribute> - <attribute name="footerRows"> - <description>The number of rows that are considered to be footer rows. This value is subtracted from the headerRows value. If document has 2 rows which make up the header and one row that makes up the footer, headerRows should be set to 3 and footerRows should be set to 1</description> - </attribute> - <attribute name="widthPercentage"> - <description>The percentage of the page width that the table spans.</description> - </attribute> - <attribute name="horizontalAlignment"> - <description>The horizontal alignment of the table. Seam PDF supports the following horizontal alignment values: left, right, center, justify and justifyall.</description> - <proposal type="enumeration"> + <component extended="false" name="table"> + <attribute extended="false" name="columns"> + <description>The number of columns (cells) that make up a table row. + </description> + </attribute> + <attribute extended="false" name="widths"> + <description>The relative widths of each column. There should be one + value for each column. For example: widths="2 1 1" would indicate + that there are 3 columns and the first column should be twice the + size of the second and third column.</description> + </attribute> + <attribute extended="false" name="headerRows"> + <description>The initial number of rows which are considered to be + headers or footer rows and should be repeated if the table spans + multiple pages.</description> + </attribute> + <attribute extended="false" name="footerRows"> + <description>The number of rows that are considered to be footer + rows. This value is subtracted from the headerRows value. If + document has 2 rows which make up the header and one row that makes + up the footer, headerRows should be set to 3 and footerRows should + be set to 1</description> + </attribute> + <attribute extended="false" name="widthPercentage"> + <description>The percentage of the page width that the table spans. + </description> + </attribute> + <attribute extended="false" name="horizontalAlignment"> + <description>The horizontal alignment of the table. Seam PDF supports + the following horizontal alignment values: left, right, center, + justify and justifyall.</description> + <proposal type="enumeration"> <param value="left" /> <param value="right" /> <param value="center" /> <param value="justify" /> <param value="justifyall" /> </proposal> - </attribute> - <attribute name="skipFirstHeader" /> - <attribute name="runDirection" /> - <attribute name="lockedWidth" /> - <attribute name="splitRows" /> - <attribute name="spacingBefore"> - <description>The blank space to be inserted before the element.</description> - </attribute> - <attribute name="spacingAfter"> - <description>The blank space to be inserted after the element.</description> - </attribute> - <attribute name="extendLastRow" /> - <attribute name="headersInEvent" /> - <attribute name="splitLate" /> - <attribute name="keepTogether" /> + </attribute> + <attribute extended="false" name="skipFirstHeader" /> + <attribute extended="false" name="runDirection" /> + <attribute extended="false" name="lockedWidth" /> + <attribute extended="false" name="splitRows" /> + <attribute extended="false" name="spacingBefore"> + <description>The blank space to be inserted before the element. + </description> + </attribute> + <attribute extended="false" name="spacingAfter"> + <description>The blank space to be inserted after the element. + </description> + </attribute> + <attribute extended="false" name="extendLastRow" /> + <attribute extended="false" name="headersInEvent" /> + <attribute extended="false" name="splitLate" /> + <attribute extended="false" name="keepTogether" /> </component> - <component name="cell"> - <attribute name="colspan"> - <description>Cells can span more than one column by declaring a colspan greater than 1. Tables do not have the ability to span across multiple rows.</description> - </attribute> - <attribute name="horizontalAlignment"> - <description>The horizontal alignment of the cell. Seam PDF supports the following horizontal alignment values: left, right, center, justify and justifyall.</description> - <proposal type="enumeration"> + <component extended="false" name="cell"> + <attribute extended="false" name="colspan"> + <description>Cells can span more than one column by declaring a + colspan greater than 1. Tables do not have the ability to span + across multiple rows.</description> + </attribute> + <attribute extended="false" name="horizontalAlignment"> + <description>The horizontal alignment of the cell. Seam PDF supports + the following horizontal alignment values: left, right, center, + justify and justifyall.</description> + <proposal type="enumeration"> <param value="left" /> <param value="right" /> <param value="center" /> <param value="justify" /> <param value="justifyall" /> </proposal> - </attribute> - <attribute name="verticalAlignment"> - <description>The vertical alignment of the cell. Seam PDF supports the following vertical alignment values: top, middle, bottom, and baseline.</description> - <proposal type="enumeration"> + </attribute> + <attribute extended="false" name="verticalAlignment"> + <description>The vertical alignment of the cell. Seam PDF supports + the following vertical alignment values: top, middle, bottom, and + baseline.</description> + <proposal type="enumeration"> <param value="top" /> <param value="middle" /> <param value="bottom" /> <param value="baseline" /> </proposal> - </attribute> - <attribute name="padding"> - <description>Padding on a given side can also be specified using paddingLeft, paddingRight, paddingTop and paddingBottom.</description> - </attribute> - <attribute name="paddingLeft" /> - <attribute name="paddingRight" /> - <attribute name="paddingTop" /> - <attribute name="paddingBottom" /> - <attribute name="useBorderPadding" /> - <attribute name="leading" /> - <attribute name="multipliedLeading" /> - <attribute name="indent" /> - <attribute name="extraParagraphSpace" /> - <attribute name="fixedHeight" /> - <attribute name="noWrap" /> - <attribute name="minimumHeight" /> - <attribute name="followingIndent" /> - <attribute name="rightIndent" /> - <attribute name="spaceCharRatio" /> - <attribute name="runDirection" /> - <attribute name="arabicOptions" /> - <attribute name="useAscender" /> - <attribute name="grayFill" /> - <attribute name="rotation" /> + </attribute> + <attribute extended="false" name="padding"> + <description>Padding on a given side can also be specified using + paddingLeft, paddingRight, paddingTop and paddingBottom. + </description> + </attribute> + <attribute extended="false" name="paddingLeft" /> + <attribute extended="false" name="paddingRight" /> + <attribute extended="false" name="paddingTop" /> + <attribute extended="false" name="paddingBottom" /> + <attribute extended="false" name="useBorderPadding" /> + <attribute extended="false" name="leading" /> + <attribute extended="false" name="multipliedLeading" /> + <attribute extended="false" name="indent" /> + <attribute extended="false" name="extraParagraphSpace" /> + <attribute extended="false" name="fixedHeight" /> + <attribute extended="false" name="noWrap" /> + <attribute extended="false" name="minimumHeight" /> + <attribute extended="false" name="followingIndent" /> + <attribute extended="false" name="rightIndent" /> + <attribute extended="false" name="spaceCharRatio" /> + <attribute extended="false" name="runDirection" /> + <attribute extended="false" name="arabicOptions" /> + <attribute extended="false" name="useAscender" /> + <attribute extended="false" name="grayFill" /> + <attribute extended="false" name="rotation" /> </component> - <component name="barchart"> + <component extended="false" name="barchart"> <description>Displays a bar chart.</description> - <attribute name="borderVisible"> - <description>Controls whether or not a border is displayed around the entire chart.</description> - </attribute> - <attribute name="borderPaint"> - <description>The color of the border, if visible.</description> - <proposal type="enumeration"> + <attribute extended="false" name="borderVisible"> + <description>Controls whether or not a border is displayed around the + entire chart.</description> + </attribute> + <attribute extended="false" name="borderPaint"> + <description>The color of the border, if visible.</description> + <proposal type="enumeration"> <param value="white" /> <param value="gray" /> <param value="lightgray" /> @@ -627,10 +788,10 @@ <param value="cyan" /> <param value="blue" /> </proposal> - </attribute> - <attribute name="borderBackgroundPaint"> - <description>The default background color of the chart.</description> - <proposal type="enumeration"> + </attribute> + <attribute extended="false" name="borderBackgroundPaint"> + <description>The default background color of the chart.</description> + <proposal type="enumeration"> <param value="white" /> <param value="gray" /> <param value="lightgray" /> @@ -644,14 +805,14 @@ <param value="cyan" /> <param value="blue" /> </proposal> - </attribute> - <attribute name="borderStroke" /> - <attribute name="domainAxisLabel"> - <description>The text label for the domain axis.</description> - </attribute> - <attribute name="domainAxisPaint"> - <description>The color of the domain axis label.</description> - <proposal type="enumeration"> + </attribute> + <attribute extended="false" name="borderStroke" /> + <attribute extended="false" name="domainAxisLabel"> + <description>The text label for the domain axis.</description> + </attribute> + <attribute extended="false" name="domainAxisPaint"> + <description>The color of the domain axis label.</description> + <proposal type="enumeration"> <param value="white" /> <param value="gray" /> <param value="lightgray" /> @@ -665,13 +826,15 @@ <param value="cyan" /> <param value="blue" /> </proposal> - </attribute> - <attribute name="domainGridlinesVisible"> - <description>Controls whether or not gridlines for the domain axis are shown on the chart.</description> - </attribute> - <attribute name="domainGridlinePaint"> - <description>The color of the domain gridlines, if visible.</description> - <proposal type="enumeration"> + </attribute> + <attribute extended="false" name="domainGridlinesVisible"> + <description>Controls whether or not gridlines for the domain axis + are shown on the chart.</description> + </attribute> + <attribute extended="false" name="domainGridlinePaint"> + <description>The color of the domain gridlines, if visible. + </description> + <proposal type="enumeration"> <param value="white" /> <param value="gray" /> <param value="lightgray" /> @@ -685,25 +848,37 @@ <param value="cyan" /> <param value="blue" /> </proposal> - </attribute> - <attribute name="domainGridlineStroke"> - <description>The stroke style of the domain gridleines, if visible.</description> - </attribute> - <attribute name="height"> - <description>The height of the chart.</description> - </attribute> - <attribute name="width"> - <description>The width of the chart.</description> - </attribute> - <attribute name="is3D"> - <description>A boolean value indicating that the chart should be rendered in 3D instead of 2D.</description> - </attribute> - <attribute name="legend"> - <description>A boolean value indicating whether or not the chart should include a legend.</description> - </attribute> - <attribute name="legendItemPaint"> - <description>The default color of the text labels in the legend.</description> - <proposal type="enumeration"> + </attribute> + <attribute extended="false" name="domainGridlineStroke"> + <description>The stroke style of the domain gridleines, if visible. + </description> + </attribute> + <attribute extended="false" name="height"> + <description>The height of the chart.</description> + </attribute> + <attribute extended="false" name="width"> + <description>The width of the chart.</description> + </attribute> + <attribute extended="false" name="is3D"> + <description>A boolean value indicating that the chart should be + rendered in 3D instead of 2D.</description> + <proposal type="enumeration"> + <param value="true" /> + <param value="false" /> + </proposal> + </attribute> + <attribute extended="false" name="legend"> + <description>A boolean value indicating whether or not the chart + should include a legend.</description> + <proposal type="enumeration"> + <param value="true" /> + <param value="false" /> + </proposal> + </attribute> + <attribute extended="false" name="legendItemPaint"> + <description>The default color of the text labels in the legend. + </description> + <proposal type="enumeration"> <param value="white" /> <param value="gray" /> <param value="lightgray" /> @@ -717,20 +892,22 @@ <param value="cyan" /> <param value="blue" /> </proposal> - </attribute> - <attribute name="legendItemBackgoundPaint"> - <description>The background color for the legend, if different from the chart background color.</description> - </attribute> - <attribute name="orientation"> - <description>The orientation of the plot, either vertical (the default) or horizontal.</description> - <proposal type="enumeration"> + </attribute> + <attribute extended="false" name="legendItemBackgoundPaint"> + <description>The background color for the legend, if different from + the chart background color.</description> + </attribute> + <attribute extended="false" name="orientation"> + <description>The orientation of the plot, either vertical (the + default) or horizontal.</description> + <proposal type="enumeration"> <param value="vertical" /> <param value="horizontal" /> </proposal> - </attribute> - <attribute name="plotBackgroundPaint"> - <description>The color of the plot background.</description> - <proposal type="enumeration"> + </attribute> + <attribute extended="false" name="plotBackgroundPaint"> + <description>The color of the plot background.</description> + <proposal type="enumeration"> <param value="white" /> <param value="gray" /> <param value="lightgray" /> @@ -744,16 +921,21 @@ <param value="cyan" /> <param value="blue" /> </proposal> - </attribute> - <attribute name="plotBackgroundAlpha"> - <description>The alpha (transparency) level of the plot background. It should be a number between 0 (completely transparent) and 1 (completely opaque).</description> - </attribute> - <attribute name="plotForegroundAlpha"> - <description>The alpha (transparency) level of the plot. It should be a number between 0 (completely transparent) and 1 (completely opaque).</description> - </attribute> - <attribute name="plotOutlinePaint"> - <description>The color of the range gridlines, if visible.</description> - <proposal type="enumeration"> + </attribute> + <attribute extended="false" name="plotBackgroundAlpha"> + <description>The alpha (transparency) level of the plot background. + It should be a number between 0 (completely transparent) and 1 + (completely opaque).</description> + </attribute> + <attribute extended="false" name="plotForegroundAlpha"> + <description>The alpha (transparency) level of the plot. It should be + a number between 0 (completely transparent) and 1 (completely + opaque).</description> + </attribute> + <attribute extended="false" name="plotOutlinePaint"> + <description>The color of the range gridlines, if visible. + </description> + <proposal type="enumeration"> <param value="white" /> <param value="gray" /> <param value="lightgray" /> @@ -767,16 +949,17 @@ <param value="cyan" /> <param value="blue" /> </proposal> - </attribute> - <attribute name="plotOutlineStroke"> - <description>The stroke style of the range gridleines, if visible.</description> - </attribute> - <attribute name="rangeAxisLabel"> - <description>The text label for the range axis.</description> - </attribute> - <attribute name="rangeAxisPaint"> - <description>The color of the range axis label.</description> - <proposal type="enumeration"> + </attribute> + <attribute extended="false" name="plotOutlineStroke"> + <description>The stroke style of the range gridleines, if visible. + </description> + </attribute> + <attribute extended="false" name="rangeAxisLabel"> + <description>The text label for the range axis.</description> + </attribute> + <attribute extended="false" name="rangeAxisPaint"> + <description>The color of the range axis label.</description> + <proposal type="enumeration"> <param value="white" /> <param value="gray" /> <param value="lightgray" /> @@ -790,22 +973,25 @@ <param value="cyan" /> <param value="blue" /> </proposal> - </attribute> - <attribute name="rangeGridlinesVisible"> - <description>Controls whether or not gridlines for the range axis are shown on the chart.</description> - </attribute> - <attribute name="rangeGridlinePaint"> - <description>The color of the range gridlines, if visible.</description> - </attribute> - <attribute name="rangeGridlineStroke"> - <description>The stroke style of the range gridleines, if visible.</description> - </attribute> - <attribute name="title"> - <description>The chart title text.</description> - </attribute> - <attribute name="titlePaint"> - <description>The color of the chart title text.</description> - <proposal type="enumeration"> + </attribute> + <attribute extended="false" name="rangeGridlinesVisible"> + <description>Controls whether or not gridlines for the range axis are + shown on the chart.</description> + </attribute> + <attribute extended="false" name="rangeGridlinePaint"> + <description>The color of the range gridlines, if visible. + </description> + </attribute> + <attribute extended="false" name="rangeGridlineStroke"> + <description>The stroke style of the range gridleines, if visible. + </description> + </attribute> + <attribute extended="false" name="title"> + <description>The chart title text.</description> + </attribute> + <attribute extended="false" name="titlePaint"> + <description>The color of the chart title text.</description> + <proposal type="enumeration"> <param value="white" /> <param value="gray" /> <param value="lightgray" /> @@ -819,10 +1005,11 @@ <param value="cyan" /> <param value="blue" /> </proposal> - </attribute> - <attribute name="titleBackgroundPaint"> - <description>The background color around the chart title.</description> - <proposal type="enumeration"> + </attribute> + <attribute extended="false" name="titleBackgroundPaint"> + <description>The background color around the chart title. + </description> + <proposal type="enumeration"> <param value="white" /> <param value="gray" /> <param value="lightgray" /> @@ -836,17 +1023,18 @@ <param value="cyan" /> <param value="blue" /> </proposal> - </attribute> + </attribute> </component> - <component name="linechart"> + <component extended="false" name="linechart"> <description>Displays a line chart.</description> - <attribute name="borderVisible"> - <description>Controls whether or not a border is displayed around the entire chart.</description> - </attribute> - <attribute name="borderPaint"> - <description>The color of the border, if visible.</description> - <proposal type="enumeration"> + <attribute extended="false" name="borderVisible"> + <description>Controls whether or not a border is displayed around the + entire chart.</description> + </attribute> + <attribute extended="false" name="borderPaint"> + <description>The color of the border, if visible.</description> + <proposal type="enumeration"> <param value="white" /> <param value="gray" /> <param value="lightgray" /> @@ -860,17 +1048,17 @@ <param value="cyan" /> <param value="blue" /> </proposal> - </attribute> - <attribute name="borderBackgroundPaint"> - <description>The default background color of the chart.</description> - </attribute> - <attribute name="borderStroke" /> - <attribute name="domainAxisLabel"> - <description>The text label for the domain axis.</description> - </attribute> - <attribute name="domainAxisPaint"> - <description>The color of the domain axis label.</description> - <proposal type="enumeration"> + </attribute> + <attribute extended="false" name="borderBackgroundPaint"> + <description>The default background color of the chart.</description> + </attribute> + <attribute extended="false" name="borderStroke" /> + <attribute extended="false" name="domainAxisLabel"> + <description>The text label for the domain axis.</description> + </attribute> + <attribute extended="false" name="domainAxisPaint"> + <description>The color of the domain axis label.</description> + <proposal type="enumeration"> <param value="white" /> <param value="gray" /> <param value="lightgray" /> @@ -884,13 +1072,15 @@ <param value="cyan" /> <param value="blue" /> </proposal> - </attribute> - <attribute name="domainGridlinesVisible"> - <description>Controls whether or not gridlines for the domain axis are shown on the chart.</description> - </attribute> - <attribute name="domainGridlinePaint"> - <description>The color of the domain gridlines, if visible.</description> - <proposal type="enumeration"> + </attribute> + <attribute extended="false" name="domainGridlinesVisible"> + <description>Controls whether or not gridlines for the domain axis + are shown on the chart.</description> + </attribute> + <attribute extended="false" name="domainGridlinePaint"> + <description>The color of the domain gridlines, if visible. + </description> + <proposal type="enumeration"> <param value="white" /> <param value="gray" /> <param value="lightgray" /> @@ -904,25 +1094,37 @@ <param value="cyan" /> <param value="blue" /> </proposal> - </attribute> - <attribute name="domainGridlineStroke"> - <description>The stroke style of the domain gridleines, if visible.</description> - </attribute> - <attribute name="height"> - <description>The height of the chart.</description> - </attribute> - <attribute name="width"> - <description>The width of the chart.</description> - </attribute> - <attribute name="is3D"> - <description>A boolean value indicating that the chart should be rendered in 3D instead of 2D.</description> - </attribute> - <attribute name="legend"> - <description>A boolean value indicating whether or not the chart should include a legend.</description> - </attribute> - <attribute name="legendItemPaint"> - <description>The default color of the text labels in the legend.</description> - <proposal type="enumeration"> + </attribute> + <attribute extended="false" name="domainGridlineStroke"> + <description>The stroke style of the domain gridleines, if visible. + </description> + </attribute> + <attribute extended="false" name="height"> + <description>The height of the chart.</description> + </attribute> + <attribute extended="false" name="width"> + <description>The width of the chart.</description> + </attribute> + <attribute extended="false" name="is3D"> + <description>A boolean value indicating that the chart should be + rendered in 3D instead of 2D.</description> + <proposal type="enumeration"> + <param value="true" /> + <param value="false" /> + </proposal> + </attribute> + <attribute extended="false" name="legend"> + <description>A boolean value indicating whether or not the chart + should include a legend.</description> + <proposal type="enumeration"> + <param value="true" /> + <param value="false" /> + </proposal> + </attribute> + <attribute extended="false" name="legendItemPaint"> + <description>The default color of the text labels in the legend. + </description> + <proposal type="enumeration"> <param value="white" /> <param value="gray" /> <param value="lightgray" /> @@ -936,20 +1138,22 @@ <param value="cyan" /> <param value="blue" /> </proposal> - </attribute> - <attribute name="legendItemBackgoundPaint"> - <description>The background color for the legend, if different from the chart background color.</description> - </attribute> - <attribute name="orientation"> - <description>The orientation of the plot, either vertical (the default) or horizontal.</description> - <proposal type="enumeration"> + </attribute> + <attribute extended="false" name="legendItemBackgoundPaint"> + <description>The background color for the legend, if different from + the chart background color.</description> + </attribute> + <attribute extended="false" name="orientation"> + <description>The orientation of the plot, either vertical (the + default) or horizontal.</description> + <proposal type="enumeration"> <param value="vertical" /> <param value="horizontal" /> </proposal> - </attribute> - <attribute name="plotBackgroundPaint"> - <description>The color of the plot background.</description> - <proposal type="enumeration"> + </attribute> + <attribute extended="false" name="plotBackgroundPaint"> + <description>The color of the plot background.</description> + <proposal type="enumeration"> <param value="white" /> <param value="gray" /> <param value="lightgray" /> @@ -963,22 +1167,26 @@ <param value="cyan" /> <param value="blue" /> </proposal> - </attribute> - <attribute name="plotBackgroundAlpha"> - <description>The alpha (transparency) level of the plot background. It should be a number between 0 (completely transparent) and 1 (completely opaque).</description> - </attribute> - <attribute name="plotOutlinePaint"> - <description>The color of the range gridlines, if visible.</description> - </attribute> - <attribute name="plotOutlineStroke"> - <description>The stroke style of the range gridleines, if visible.</description> - </attribute> - <attribute name="rangeAxisLabel"> - <description>The text label for the range axis.</description> - </attribute> - <attribute name="rangeAxisPaint"> - <description>The color of the range axis label.</description> - <proposal type="enumeration"> + </attribute> + <attribute extended="false" name="plotBackgroundAlpha"> + <description>The alpha (transparency) level of the plot background. + It should be a number between 0 (completely transparent) and 1 + (completely opaque).</description> + </attribute> + <attribute extended="false" name="plotOutlinePaint"> + <description>The color of the range gridlines, if visible. + </description> + </attribute> + <attribute extended="false" name="plotOutlineStroke"> + <description>The stroke style of the range gridleines, if visible. + </description> + </attribute> + <attribute extended="false" name="rangeAxisLabel"> + <description>The text label for the range axis.</description> + </attribute> + <attribute extended="false" name="rangeAxisPaint"> + <description>The color of the range axis label.</description> + <proposal type="enumeration"> <param value="white" /> <param value="gray" /> <param value="lightgray" /> @@ -992,13 +1200,15 @@ <param value="cyan" /> <param value="blue" /> </proposal> - </attribute> - <attribute name="rangeGridlinesVisible"> - <description>Controls whether or not gridlines for the range axis are shown on the chart.</description> - </attribute> - <attribute name="rangeGridlinePaint"> - <description>The color of the range gridlines, if visible.</description> - <proposal type="enumeration"> + </attribute> + <attribute extended="false" name="rangeGridlinesVisible"> + <description>Controls whether or not gridlines for the range axis are + shown on the chart.</description> + </attribute> + <attribute extended="false" name="rangeGridlinePaint"> + <description>The color of the range gridlines, if visible. + </description> + <proposal type="enumeration"> <param value="white" /> <param value="gray" /> <param value="lightgray" /> @@ -1012,16 +1222,17 @@ <param value="cyan" /> <param value="blue" /> </proposal> - </attribute> - <attribute name="rangeGridlineStroke"> - <description>The stroke style of the range gridleines, if visible.</description> - </attribute> - <attribute name="title"> - <description>The chart title text.</description> - </attribute> - <attribute name="titlePaint"> - <description>The color of the chart title text.</description> - <proposal type="enumeration"> + </attribute> + <attribute extended="false" name="rangeGridlineStroke"> + <description>The stroke style of the range gridleines, if visible. + </description> + </attribute> + <attribute extended="false" name="title"> + <description>The chart title text.</description> + </attribute> + <attribute extended="false" name="titlePaint"> + <description>The color of the chart title text.</description> + <proposal type="enumeration"> <param value="white" /> <param value="gray" /> <param value="lightgray" /> @@ -1035,10 +1246,11 @@ <param value="cyan" /> <param value="blue" /> </proposal> - </attribute> - <attribute name="titleBackgroundPaint"> - <description>The background color around the chart title.</description> - <proposal type="enumeration"> + </attribute> + <attribute extended="false" name="titleBackgroundPaint"> + <description>The background color around the chart title. + </description> + <proposal type="enumeration"> <param value="white" /> <param value="gray" /> <param value="lightgray" /> @@ -1052,24 +1264,34 @@ <param value="cyan" /> <param value="blue" /> </proposal> - </attribute> + </attribute> </component> - <component name="piechart"> + <component extended="false" name="piechart"> <description>Displays a pie chart.</description> - <attribute name="title"> - <description>The chart title text.</description> - </attribute> - <attribute name="label" /> - <attribute name="legend"> - <description>A boolean value indicating whether or not the chart should include a legend.</description> - </attribute> - <attribute name="is3D"> - <description>A boolean value indicating that the chart should be rendered in 3D instead of 2D.</description> - </attribute> - <attribute name="labelLinkMargin" /> - <attribute name="labelLinkPaint"> - <proposal type="enumeration"> + <attribute extended="false" name="title"> + <description>The chart title text.</description> + </attribute> + <attribute extended="false" name="label" /> + <attribute extended="false" name="legend"> + <description>A boolean value indicating whether or not the chart + should include a legend.</description> + <proposal type="enumeration"> + <param value="true" /> + <param value="false" /> + </proposal> + </attribute> + <attribute extended="false" name="is3D"> + <description>A boolean value indicating that the chart should be + rendered in 3D instead of 2D.</description> + <proposal type="enumeration"> + <param value="true" /> + <param value="false" /> + </proposal> + </attribute> + <attribute extended="false" name="labelLinkMargin" /> + <attribute extended="false" name="labelLinkPaint"> + <proposal type="enumeration"> <param value="white" /> <param value="gray" /> <param value="lightgray" /> @@ -1084,10 +1306,10 @@ <param value="blue" /> </proposal> </attribute> - <attribute name="labelLinkStroke" /> - <attribute name="labelLinksVisible" /> - <attribute name="labelOutlinePaint"> - <proposal type="enumeration"> + <attribute extended="false" name="labelLinkStroke" /> + <attribute extended="false" name="labelLinksVisible" /> + <attribute extended="false" name="labelOutlinePaint"> + <proposal type="enumeration"> <param value="white" /> <param value="gray" /> <param value="lightgray" /> @@ -1102,9 +1324,9 @@ <param value="blue" /> </proposal> </attribute> - <attribute name="labelOutlineStroke" /> - <attribute name="labelShadowPaint"> - <proposal type="enumeration"> + <attribute extended="false" name="labelOutlineStroke" /> + <attribute extended="false" name="labelShadowPaint"> + <proposal type="enumeration"> <param value="white" /> <param value="gray" /> <param value="lightgray" /> @@ -1119,10 +1341,10 @@ <param value="blue" /> </proposal> </attribute> - <attribute name="labelPaint" /> - <attribute name="labelGap" /> - <attribute name="labelBackgroundPaint"> - <proposal type="enumeration"> + <attribute extended="false" name="labelPaint" /> + <attribute extended="false" name="labelGap" /> + <attribute extended="false" name="labelBackgroundPaint"> + <proposal type="enumeration"> <param value="white" /> <param value="gray" /> <param value="lightgray" /> @@ -1137,11 +1359,11 @@ <param value="blue" /> </proposal> </attribute> - <attribute name="startAngle" /> - <attribute name="circular" /> - <attribute name="direction" /> - <attribute name="sectionOutlinePaint"> - <proposal type="enumeration"> + <attribute extended="false" name="startAngle" /> + <attribute extended="false" name="circular" /> + <attribute extended="false" name="direction" /> + <attribute extended="false" name="sectionOutlinePaint"> + <proposal type="enumeration"> <param value="white" /> <param value="gray" /> <param value="lightgray" /> @@ -1156,10 +1378,10 @@ <param value="blue" /> </proposal> </attribute> - <attribute name="sectionOutlineStroke" /> - <attribute name="sectionOutlinesVisible" /> - <attribute name="baseSectionOutlinePaint"> - <proposal type="enumeration"> + <attribute extended="false" name="sectionOutlineStroke" /> + <attribute extended="false" name="sectionOutlinesVisible" /> + <attribute extended="false" name="baseSectionOutlinePaint"> + <proposal type="enumeration"> <param value="white" /> <param value="gray" /> <param value="lightgray" /> @@ -1174,8 +1396,8 @@ <param value="blue" /> </proposal> </attribute> - <attribute name="baseSectionPaint"> - <proposal type="enumeration"> + <attribute extended="false" name="baseSectionPaint"> + <proposal type="enumeration"> <param value="white" /> <param value="gray" /> <param value="lightgray" /> @@ -1190,7 +1412,229 @@ <param value="blue" /> </proposal> </attribute> - <attribute name="baseSectionOutlineStroke" /> + <attribute extended="false" name="baseSectionOutlineStroke" /> </component> + <component extended="false" name="series"> + <description>Category data can be broken down into series. The series + tag is used to categorize a set of data with a series and apply + styling to the entire series.</description> + <attribute extended="false" name="key"> + <description>The series name.</description> + </attribute> + <attribute extended="false" name="seriesPaint"> + <description>The color of each item in the series.</description> + <proposal type="enumeration"> + <param value="white" /> + <param value="gray" /> + <param value="lightgray" /> + <param value="darkgray" /> + <param value="black" /> + <param value="red" /> + <param value="pink" /> + <param value="yellow" /> + <param value="green" /> + <param value="magenta" /> + <param value="cyan" /> + <param value="blue" /> + </proposal> + </attribute> + <attribute extended="false" name="seriesOutlinePaint"> + <description>The outline color for each item in the series. + </description> + <proposal type="enumeration"> + <param value="white" /> + <param value="gray" /> + <param value="lightgray" /> + <param value="darkgray" /> + <param value="black" /> + <param value="red" /> + <param value="pink" /> + <param value="yellow" /> + <param value="green" /> + <param value="magenta" /> + <param value="cyan" /> + <param value="blue" /> + </proposal> + </attribute> + <attribute extended="false" name="seriesOutlineStroke"> + <description>The stroke used to draw each item in the series. + </description> + </attribute> + <attribute extended="false" name="seriesVisible"> + <description>A boolean indicating if the series should be displayed. + </description> + <proposal type="enumeration"> + <param value="true" /> + <param value="false" /> + </proposal> + </attribute> + <attribute extended="false" name="seriesVisibleInLegend"> + <description>A boolean indiciating if the series should be listed in + the legend.</description> + <proposal type="enumeration"> + <param value="true" /> + <param value="false" /> + </proposal> + </attribute> + </component> + + <component extended="false" closeTag="true" name="data"> + <description>The data tag describes each data point to be displayed in + the graph.</description> + <attribute extended="false" name="key"> + <description>The series name.</description> + </attribute> + <attribute extended="false" name="series"> + <description>The series name, when not embedded inside a p:series. + </description> + </attribute> + <attribute extended="false" name="value"> + <description>The numeric data value.</description> + </attribute> + <attribute extended="false" name="explodedPercent"> + <description>For pie charts, indicates how exploded a from the pie a + piece is.</description> + </attribute> + <attribute extended="false" name="sectionOutlinePaint"> + <description>For bar charts, the color of the section outline. + </description> + <proposal type="enumeration"> + <param value="white" /> + <param value="gray" /> + <param value="lightgray" /> + <param value="darkgray" /> + <param value="black" /> + <param value="red" /> + <param value="pink" /> + <param value="yellow" /> + <param value="green" /> + <param value="magenta" /> + <param value="cyan" /> + <param value="blue" /> + </proposal> + </attribute> + <attribute extended="false" name="sectionOutlineStroke"> + <description>For bar charts, the stroke type for the section outline. + </description> + </attribute> + <attribute extended="false" name="sectionPaint"> + <description> For bar charts, the color of the section.</description> + <proposal type="enumeration"> + <param value="white" /> + <param value="gray" /> + <param value="lightgray" /> + <param value="darkgray" /> + <param value="black" /> + <param value="red" /> + <param value="pink" /> + <param value="yellow" /> + <param value="green" /> + <param value="magenta" /> + <param value="cyan" /> + <param value="blue" /> + </proposal> + </attribute> + </component> + + <component extended="false" closeTag="true" name="color"> + <description>The color component declares a color or gradient than can + be referenced when drawing filled shapes.</description> + <attribute extended="false" name="color"> + <description>The color value. For gradient colors, this the starting + color.</description> + <proposal type="enumeration"> + <param value="white" /> + <param value="gray" /> + <param value="lightgray" /> + <param value="darkgray" /> + <param value="black" /> + <param value="red" /> + <param value="pink" /> + <param value="yellow" /> + <param value="green" /> + <param value="magenta" /> + <param value="cyan" /> + <param value="blue" /> + </proposal> + </attribute> + <attribute extended="false" name="color2"> + <description>For gradient colors, this is the color that ends the + gradient.</description> + <proposal type="enumeration"> + <param value="white" /> + <param value="gray" /> + <param value="lightgray" /> + <param value="darkgray" /> + <param value="black" /> + <param value="red" /> + <param value="pink" /> + <param value="yellow" /> + <param value="green" /> + <param value="magenta" /> + <param value="cyan" /> + <param value="blue" /> + </proposal> + </attribute> + <attribute extended="false" name="point"> + <description>The co-ordinates where the gradient color begins. + </description> + </attribute> + <attribute extended="false" name="point2"> + <description>The co-ordinates where the gradient color ends. + </description> + </attribute> + </component> + + <component extended="false" closeTag="true" name="stroke"> + <description>Describes a stroke used to draw lines in a chart. + </description> + <attribute extended="false" name="width"> + <description>The width of the stroke.</description> + </attribute> + <attribute extended="false" name="cap"> + <description>The line cap type. Valid values are butt, round and + square.</description> + <proposal type="enumeration"> + <param value="butt" /> + <param value="round" /> + <param value="square" /> + </proposal> + </attribute> + <attribute extended="false" name="join"> + <description>The line join type. Valid values are miter, round and + bevel.</description> + <proposal type="enumeration"> + <param value="miter" /> + <param value="round" /> + <param value="bevel" /> + </proposal> + </attribute> + <attribute extended="false" name="miterLimit"> + <description>For miter joins, this value is the limit of the size of + the join.</description> + </attribute> + <attribute extended="false" name="dash"> + <description>The dash value sets the dash pattern to be used to draw + the line. The space separated integers indicate the length of each + alternating drawn and undrawn segments.</description> + </attribute> + <attribute extended="false" name="dashPhase"> + <description>The dash phase indicates the offset into the dash + pattern that the the line should be drawn with.</description> + </attribute> + </component> + + <component extended="false" name="barcode"> + <attribute extended="false" name="type" /> + <attribute extended="false" name="code" /> + <attribute extended="false" name="xpos" /> + <attribute extended="false" name="ypos" /> + <attribute extended="false" name="rotDegrees" /> + <attribute extended="false" name="barHeight" /> + <attribute extended="false" name="textSize" /> + <attribute extended="false" name="minBarWidth" /> + <attribute extended="false" name="barMultiplier" /> + </component> + </tag-lib> \ No newline at end of file

15 years, 4 months

1
0
0 / 0

JBoss Tools SVN: r23936 - in trunk/hibernatetools/plugins/org.hibernate.eclipse.console: src/org/hibernate/eclipse/launch and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: vyemialyanchyk Date: 2010-08-05 08:11:46 -0400 (Thu, 05 Aug 2010) New Revision: 23936 Added: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/ant-tasks-description.xml trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/ExportersXMLAttributeDescription.java Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/plugin.xml trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/CodeGenXMLFactory.java Log: https://jira.jboss.org/browse/JBIDE-6723 - fixed - ant exporters attributes description in xml Added: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/ant-tasks-description.xml =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/ant-tasks-description.xml (rev 0) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/ant-tasks-description.xml 2010-08-05 12:11:46 UTC (rev 23936) @@ -0,0 +1,55 @@ +<ant-tasks> + <task name="hbm2doc" id="org.hibernate.tools.hbm2doc"> + <attribute name="destdir" gui-name="outputdir" default=""/> + <attribute name="templatepath" gui-name="template_path" default=""/> + <attribute name="templateprefix" gui-name="templateprefix" default=""/> + </task> + <task name="hbm2cfgxml" id="org.hibernate.tools.hbm2cfgxml"> + <attribute name="destdir" gui-name="outputdir" default=""/> + <attribute name="templatepath" gui-name="template_path" default=""/> + <attribute name="templateprefix" gui-name="templateprefix" default=""/> + <attribute name="ejb3" gui-name="ejb3" default="false"/> + </task> + <task name="hbm2hbmxml" id="org.hibernate.tools.hbm2hbmxml"> + <attribute name="destdir" gui-name="outputdir" default=""/> + <attribute name="templatepath" gui-name="template_path" default=""/> + <attribute name="templateprefix" gui-name="templateprefix" default=""/> + </task> + <task name="hbmtemplate" id="org.hibernate.tools.hbmtemplate"> + <attribute name="destdir" gui-name="outputdir" default=""/> + <attribute name="templatepath" gui-name="template_path" default=""/> + <attribute name="templateprefix" gui-name="templateprefix" default=""/> + <attribute name="filepattern" gui-name="file_pattern" default=""/> + <attribute name="foreach" gui-name="for_each" default=""/> + <attribute name="template" gui-name="template_name" default=""/> + <attribute name="exporterclass" gui-name="exporterclass" default=""/> + </task> + <task name="hbm2java" id="org.hibernate.tools.hbm2java"> + <attribute name="destdir" gui-name="outputdir" default=""/> + <attribute name="templatepath" gui-name="template_path" default=""/> + <attribute name="templateprefix" gui-name="templateprefix" default=""/> + <attribute name="jdk5" gui-name="jdk5" default="false"/> + <attribute name="ejb3" gui-name="ejb3" default="false"/> + </task> + <task name="hbm2ddl" id="org.hibernate.tools.hbm2ddl"> + <attribute name="destdir" gui-name="outputdir" default=""/> + <attribute name="templatepath" gui-name="template_path" default=""/> + <attribute name="templateprefix" gui-name="templateprefix" default=""/> + <attribute name="export" gui-name="exportToDatabase" default="true"/> + <attribute name="update" gui-name="schemaUpdate" default="false"/> + <attribute name="drop" gui-name="drop" default="false"/> + <attribute name="create" gui-name="create" default="true"/> + <attribute name="outputfilename" gui-name="outputfilename" default=""/> + <attribute name="delimiter" gui-name="delimiter" default=";"/> + <attribute name="format" gui-name="format" default="false"/> + <attribute name="haltonerror" gui-name="haltonerror" default="false"/> + <attribute name="console" gui-name="scriptToConsole" default="true"/> + </task> + <task name="hbm2dao" id="org.hibernate.tools.hbm2dao"> + <attribute name="destdir" gui-name="outputdir" default=""/> + <attribute name="templatepath" gui-name="template_path" default=""/> + <attribute name="templateprefix" gui-name="templateprefix" default=""/> + <attribute name="jdk5" gui-name="jdk5" default="false"/> + <attribute name="ejb3" gui-name="ejb3" default="false"/> + </task> +</ant-tasks> \ No newline at end of file Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/plugin.xml =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/plugin.xml 2010-08-05 12:11:15 UTC (rev 23935) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/plugin.xml 2010-08-05 12:11:46 UTC (rev 23936) @@ -552,7 +552,7 @@ name="dot.executable" type="string" value="dot.exe"/> - <property + <property description="Output directory" name="outputdir" type="directory" Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/CodeGenXMLFactory.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/CodeGenXMLFactory.java 2010-08-05 12:11:15 UTC (rev 23935) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/CodeGenXMLFactory.java 2010-08-05 12:11:46 UTC (rev 23936) @@ -13,10 +13,12 @@ import java.io.ByteArrayOutputStream; import java.net.URISyntaxException; import java.net.URL; +import java.util.ArrayList; import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Properties; +import java.util.TreeMap; import org.dom4j.DocumentFactory; import org.dom4j.Element; @@ -37,7 +39,7 @@ import org.hibernate.console.preferences.ConsoleConfigurationPreferences; import org.hibernate.console.preferences.PreferencesClassPathUtils; import org.hibernate.eclipse.console.model.impl.ExporterFactory; -import org.hibernate.eclipse.console.model.impl.ExporterProperty; +import org.hibernate.eclipse.launch.ExportersXMLAttributeDescription.AttributeDescription; import org.hibernate.util.StringHelper; /** @@ -60,7 +62,9 @@ * this is necessary to proper content formating */ protected String propFileContentPreSave = ""; //$NON-NLS-1$ - + /** + * generate Ant scrip from this launch configuration + */ protected ILaunchConfiguration lc = null; public CodeGenXMLFactory(ILaunchConfiguration lc) { @@ -225,7 +229,11 @@ Element path = classpath.addElement(CodeGenerationStrings.PATH); path.addAttribute(CodeGenerationStrings.LOCATION, "${build.dir}"); //$NON-NLS-1$ // + Map<String, Map<String, AttributeDescription>> exportersDescr = + ExportersXMLAttributeDescription.getExportersDescription(); + // Properties globalProps = new Properties(); + // obligatory global properties globalProps.put(CodeGenerationStrings.EJB3, "" + attributes.isEJB3Enabled()); //$NON-NLS-1$ globalProps.put(CodeGenerationStrings.JDK5, "" + attributes.isJDK5Enabled()); //$NON-NLS-1$ List<ExporterFactory> exporterFactories = attributes.getExporterFactories(); @@ -234,39 +242,65 @@ if (!ef.isEnabled(lc)) { continue; } - Map<String, ExporterProperty> defExpProps = ef.getDefaultExporterProperties(); + //Map<String, ExporterProperty> defExpProps = ef.getDefaultExporterProperties(); + //String expId = ef.getId(); String expName = ef.getExporterTag(); + // mapping: guiName -> AttributeDescription + Map<String, AttributeDescription> attributesDescrGui = exportersDescr.get(expName); + // construct new mapping: name -> AttributeDescription + Map<String, AttributeDescription> attributesDescrAnt = new TreeMap<String, AttributeDescription>(); + for (AttributeDescription ad : attributesDescrGui.values()) { + attributesDescrAnt.put(ad.name, ad); + } + // Element exporter = hibernatetool.addElement(expName); Properties expProps = new Properties(); expProps.putAll(globalProps); expProps.putAll(ef.getProperties()); - Properties extract = new Properties(); + // + Properties extractGUISpecial = new Properties(); try { - ExporterFactory.extractExporterProperties(ef.getId(), expProps, extract); + ExporterFactory.extractExporterProperties(ef.getId(), expProps, extractGUISpecial); } catch (CoreException e) { // ignore } - expProps.putAll(extract); - for (Map.Entry<String, ExporterProperty> name2prop : defExpProps.entrySet()) { - Object val = expProps.get(name2prop.getKey()); - if (val == null || 0 == val.toString().compareTo(name2prop.getValue().getDefaultValue())) { + // convert gui special properties names into Ant names + for (Map.Entry<Object, Object> propEntry : extractGUISpecial.entrySet()) { + Object key = propEntry.getKey(); + Object val = propEntry.getValue(); + AttributeDescription ad = attributesDescrGui.get(key); + if (ad == null) { + expProps.put(key, val); continue; } - exporter.addAttribute(name2prop.getKey(), val.toString()); + expProps.put(ad.name, val); } - if ("hbmtemplate".compareToIgnoreCase(expName) == 0 ) { //$NON-NLS-1$ - Element property = null; - if (attributes.isJDK5Enabled()) { - property = exporter.addElement(CodeGenerationStrings.PROPERTY); - property.addAttribute(CodeGenerationStrings.KEY, CodeGenerationStrings.JDK5); - property.addAttribute(CodeGenerationStrings.VALUE, "" + attributes.isJDK5Enabled()); //$NON-NLS-1$ + // list2Remove - list to collect properties which put into attributes, + // all other properties be ordinal property definition + List<Object> list2Remove = new ArrayList<Object>(); + for (Map.Entry<Object, Object> propEntry : expProps.entrySet()) { + Object key = propEntry.getKey(); + Object val = propEntry.getValue(); + AttributeDescription ad = attributesDescrAnt.get(key); + if (ad == null) { + continue; } - if (attributes.isEJB3Enabled()) { - property = exporter.addElement(CodeGenerationStrings.PROPERTY); - property.addAttribute(CodeGenerationStrings.KEY, CodeGenerationStrings.EJB3); - property.addAttribute(CodeGenerationStrings.VALUE, "" + attributes.isEJB3Enabled()); //$NON-NLS-1$ + list2Remove.add(key); + if (val == null || 0 == val.toString().compareTo(ad.defaultValue)) { + continue; } + exporter.addAttribute(ad.name, val.toString()); } + for (Object obj : list2Remove) { + expProps.remove(obj); + } + for (Map.Entry<Object, Object> propEntry : expProps.entrySet()) { + Object key = propEntry.getKey(); + Object val = propEntry.getValue(); + Element property = exporter.addElement(CodeGenerationStrings.PROPERTY); + property.addAttribute(CodeGenerationStrings.KEY, key.toString()); + property.addAttribute(CodeGenerationStrings.VALUE, "" + val); //$NON-NLS-1$ + } } return root; } @@ -288,7 +322,7 @@ public String getResLocation(String path) { final IResource outputPathRes = findResource(path); - String location = ""; //$NON-NLS-1$ + String location = path == null ? "" : path; //$NON-NLS-1$ if (outputPathRes != null) { location = outputPathRes.getLocation().toOSString(); } Added: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/ExportersXMLAttributeDescription.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/ExportersXMLAttributeDescription.java (rev 0) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/ExportersXMLAttributeDescription.java 2010-08-05 12:11:46 UTC (rev 23936) @@ -0,0 +1,138 @@ +/******************************************************************************* + * Copyright (c) 2010 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributor: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.hibernate.eclipse.launch; + +import java.io.BufferedReader; +import java.io.File; +import java.io.FileReader; +import java.io.IOException; +import java.net.URL; +import java.util.Iterator; +import java.util.Map; +import java.util.TreeMap; + +import org.dom4j.Document; +import org.dom4j.DocumentException; +import org.dom4j.DocumentHelper; +import org.dom4j.Element; +import org.eclipse.core.runtime.FileLocator; +import org.eclipse.core.runtime.IPath; +import org.eclipse.core.runtime.Path; +import org.hibernate.eclipse.console.HibernateConsolePlugin; + +/** + * Ant Hibernate Exporters tasks attribute description. + * + * @author Vitali Yemialyanchyk + */ +public class ExportersXMLAttributeDescription { + + /** + * path to file to store description + */ + public static final String ANT_TASKS_DESCRIPTION_PATH = "ant-tasks-description.xml".replaceAll("//", File.separator); //$NON-NLS-1$ //$NON-NLS-2$ + + public static class AttributeDescription { + public String name; + public String guiName; + public String defaultValue; + } + + private static Map<String, Map<String, AttributeDescription>> mapExporter2AttributeDescr = null; + + private static void initExportersDescriptionmap() { + if (mapExporter2AttributeDescr != null) { + return; + } + mapExporter2AttributeDescr = new TreeMap<String, Map<String, AttributeDescription>>(); + Document doc = getDocument(); + if (doc == null) { + return; + } + Element root = doc.getRootElement(); + @SuppressWarnings("rawtypes") + Iterator itTask = root.elementIterator("task"); //$NON-NLS-1$ + while (itTask.hasNext()) { + Element elTask = (Element)itTask.next(); + Map<String, AttributeDescription> attributes = new TreeMap<String, AttributeDescription>(); + @SuppressWarnings("rawtypes") + Iterator itAttribute = elTask.elementIterator("attribute"); //$NON-NLS-1$ + while (itAttribute.hasNext()) { + Element elAttribute = (Element)itAttribute.next(); + AttributeDescription ad = new AttributeDescription(); + ad.name = elAttribute.attributeValue("name"); //$NON-NLS-1$ + ad.guiName = elAttribute.attributeValue("gui-name"); //$NON-NLS-1$ + ad.defaultValue = elAttribute.attributeValue("default"); //$NON-NLS-1$ + attributes.put(ad.guiName, ad); + } + //String taskId = elTask.attributeValue("id"); //$NON-NLS-1$ + String taskName = elTask.attributeValue("name"); //$NON-NLS-1$ + mapExporter2AttributeDescr.put(taskName, attributes); + } + } + + /** + * get map with core description + * + * @return + */ + public static Map<String, Map<String, AttributeDescription>> getExportersDescription() { + initExportersDescriptionmap(); + Map<String, Map<String, AttributeDescription>> res = + new TreeMap<String, Map<String, AttributeDescription>>(); + res.putAll(mapExporter2AttributeDescr); + return res; + } + + private static Document getDocument() { + File resourceFile = null; + try { + resourceFile = getResourceItem(ANT_TASKS_DESCRIPTION_PATH); + } catch (IOException e) { + HibernateConsolePlugin.getDefault().logErrorMessage("getResource: ", e); //$NON-NLS-1$ + } + if (resourceFile == null || !resourceFile.exists()) { + return null; + } + StringBuffer cbuf = new StringBuffer((int) resourceFile.length()); + try { + String ls = System.getProperties().getProperty("line.separator", "\n"); //$NON-NLS-1$//$NON-NLS-2$ + BufferedReader in = new BufferedReader(new FileReader(resourceFile)); + String str; + while ((str = in.readLine()) != null) { + cbuf.append(str + ls); + } + in.close(); + } catch (IOException e) { + HibernateConsolePlugin.getDefault().logErrorMessage("IOException: ", e); //$NON-NLS-1$ + } + Document res = null; + try { + res = DocumentHelper.parseText(cbuf.toString()); + } catch (DocumentException e) { + HibernateConsolePlugin.getDefault().logErrorMessage("DocumentException: ", e); //$NON-NLS-1$ + } + return res; + } + + private static File getResourceItem(String strResPath) throws IOException { + IPath resourcePath = new Path(strResPath); + File resourceFile = resourcePath.toFile(); + URL entry = HibernateConsolePlugin.getDefault().getBundle().getEntry( + strResPath); + if (entry != null) { + URL resProject = FileLocator.resolve(entry); + strResPath = FileLocator.resolve(resProject).getFile(); + } + resourceFile = new File(strResPath); + return resourceFile; + } +}

15 years, 4 months

1
0
0 / 0

JBoss Tools SVN: r23935 - in trunk/hibernatetools/tests/org.hibernate.eclipse.console.test: src/org/hibernate/eclipse/console/test and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: vyemialyanchyk Date: 2010-08-05 08:11:15 -0400 (Thu, 05 Aug 2010) New Revision: 23935 Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/sample/AntCodeGenJpa_test1.xml trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/sample/AntCodeGenJpa_test2.xml trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/sample/AntCodeGenReveng_test1.xml trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/sample/AntCodeGenReveng_test2.xml trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/sample/AntCodeGen_test1.xml trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/sample/AntCodeGen_test2.xml trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/CodeGenXMLFactoryTest.java Log: https://jira.jboss.org/browse/JBIDE-6723 - fixed - ant exporters attributes description in xml Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/sample/AntCodeGenJpa_test1.xml =================================================================== --- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/sample/AntCodeGenJpa_test1.xml 2010-08-05 11:33:21 UTC (rev 23934) +++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/sample/AntCodeGenJpa_test1.xml 2010-08-05 12:11:15 UTC (rev 23935) @@ -1,5 +1,5 @@ <project name="CodeGen" default="hibernateAntCodeGeneration"> - <property name="build.dir" location="ResLocation/test"/> + <property name="build.dir" location="reslocation/test"/> <path id="toolslib"> <path location="ejb3-persistence.jar"/> <path location="hibernate3.jar"/> @@ -17,16 +17,29 @@ <classpath> <path location="${build.dir}"/> </classpath> - <hbm2doc/> - <hbm2cfgxml/> - <hbm2hbmxml/> + <hbm2doc> + <property key="ejb3" value="true"/> + <property key="jdk5" value="true"/> + </hbm2doc> + <hbm2cfgxml ejb3="true"> + <property key="jdk5" value="true"/> + </hbm2cfgxml> + <hbm2hbmxml> + <property key="ejb3" value="true"/> + <property key="jdk5" value="true"/> + </hbm2hbmxml> <hbmtemplate> + <property key="ejb3" value="true"/> <property key="jdk5" value="true"/> + </hbmtemplate> + <hbm2java destdir="outputdir/test" ejb3="true" jdk5="true"> + <property key="keyXXX" value="valueYYY"/> + </hbm2java> + <hbm2ddl> <property key="ejb3" value="true"/> - </hbmtemplate> - <hbm2java jdk5="true" ejb3="true"/> - <hbm2ddl/> - <hbm2dao jdk5="true" ejb3="true"/> + <property key="jdk5" value="true"/> + </hbm2ddl> + <hbm2dao ejb3="true" jdk5="true"/> </hibernatetool> </target> </project> \ No newline at end of file Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/sample/AntCodeGenJpa_test2.xml =================================================================== --- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/sample/AntCodeGenJpa_test2.xml 2010-08-05 11:33:21 UTC (rev 23934) +++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/sample/AntCodeGenJpa_test2.xml 2010-08-05 12:11:15 UTC (rev 23935) @@ -1,5 +1,5 @@ <project name="CodeGen" default="hibernateAntCodeGeneration"> - <property name="build.dir" location="ResLocation/test"/> + <property name="build.dir" location="reslocation/test"/> <path id="toolslib"> <path location="ejb3-persistence.jar"/> <path location="hibernate3.jar"/> @@ -17,7 +17,9 @@ <classpath> <path location="${build.dir}"/> </classpath> - <hbm2java jdk5="true" ejb3="true"/> + <hbm2java destdir="outputdir/test" ejb3="true" jdk5="true"> + <property key="keyXXX" value="valueYYY"/> + </hbm2java> </hibernatetool> </target> </project> \ No newline at end of file Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/sample/AntCodeGenReveng_test1.xml =================================================================== --- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/sample/AntCodeGenReveng_test1.xml 2010-08-05 11:33:21 UTC (rev 23934) +++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/sample/AntCodeGenReveng_test1.xml 2010-08-05 12:11:15 UTC (rev 23935) @@ -1,19 +1,35 @@ <project name="CodeGen" default="hibernateAntCodeGeneration"> - <property name="build.dir" location="ResLocation/test"/> + <property name="build.dir" location="reslocation/test"/> <path id="toolslib"/> <target name="hibernateAntCodeGeneration"> <taskdef name="hibernatetool" classname="org.hibernate.tool.ant.HibernateToolTask" classpathref="toolslib"/> <hibernatetool destdir="${build.dir}"> - <jdbcconfiguration configurationFile="project\src\hibernate.cfg.xml" detectManyToMany="true" detectOneToOne="true" detectOptimisticLock="true" revEngFile="ResLocation/test"/> + <jdbcconfiguration configurationFile="project\src\hibernate.cfg.xml" detectManyToMany="true" detectOneToOne="true" detectOptimisticLock="true" revEngFile="reslocation/test"/> <classpath> <path location="${build.dir}"/> </classpath> - <hbm2doc/> - <hbm2cfgxml/> - <hbm2hbmxml/> - <hbmtemplate/> - <hbm2java/> - <hbm2ddl/> + <hbm2doc> + <property key="ejb3" value="false"/> + <property key="jdk5" value="false"/> + </hbm2doc> + <hbm2cfgxml> + <property key="jdk5" value="false"/> + </hbm2cfgxml> + <hbm2hbmxml> + <property key="ejb3" value="false"/> + <property key="jdk5" value="false"/> + </hbm2hbmxml> + <hbmtemplate> + <property key="ejb3" value="false"/> + <property key="jdk5" value="false"/> + </hbmtemplate> + <hbm2java destdir="outputdir/test"> + <property key="keyXXX" value="valueYYY"/> + </hbm2java> + <hbm2ddl> + <property key="ejb3" value="false"/> + <property key="jdk5" value="false"/> + </hbm2ddl> <hbm2dao/> </hibernatetool> </target> Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/sample/AntCodeGenReveng_test2.xml =================================================================== --- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/sample/AntCodeGenReveng_test2.xml 2010-08-05 11:33:21 UTC (rev 23934) +++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/sample/AntCodeGenReveng_test2.xml 2010-08-05 12:11:15 UTC (rev 23935) @@ -1,14 +1,16 @@ <project name="CodeGen" default="hibernateAntCodeGeneration"> - <property name="build.dir" location="ResLocation/test"/> + <property name="build.dir" location="reslocation/test"/> <path id="toolslib"/> <target name="hibernateAntCodeGeneration"> <taskdef name="hibernatetool" classname="org.hibernate.tool.ant.HibernateToolTask" classpathref="toolslib"/> <hibernatetool destdir="${build.dir}"> - <jdbcconfiguration configurationFile="project\src\hibernate.cfg.xml" detectManyToMany="true" detectOneToOne="true" detectOptimisticLock="true" revEngFile="ResLocation/test"/> + <jdbcconfiguration configurationFile="project\src\hibernate.cfg.xml" detectManyToMany="true" detectOneToOne="true" detectOptimisticLock="true" revEngFile="reslocation/test"/> <classpath> <path location="${build.dir}"/> </classpath> - <hbm2java/> + <hbm2java destdir="outputdir/test"> + <property key="keyXXX" value="valueYYY"/> + </hbm2java> </hibernatetool> </target> </project> \ No newline at end of file Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/sample/AntCodeGen_test1.xml =================================================================== --- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/sample/AntCodeGen_test1.xml 2010-08-05 11:33:21 UTC (rev 23934) +++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/sample/AntCodeGen_test1.xml 2010-08-05 12:11:15 UTC (rev 23935) @@ -1,5 +1,5 @@ <project name="CodeGen" default="hibernateAntCodeGeneration"> - <property name="build.dir" location="ResLocation/test"/> + <property name="build.dir" location="reslocation/test"/> <path id="toolslib"/> <target name="hibernateAntCodeGeneration"> <taskdef name="hibernatetool" classname="org.hibernate.tool.ant.HibernateToolTask" classpathref="toolslib"/> @@ -8,12 +8,28 @@ <classpath> <path location="${build.dir}"/> </classpath> - <hbm2doc/> - <hbm2cfgxml/> - <hbm2hbmxml/> - <hbmtemplate/> - <hbm2java/> - <hbm2ddl/> + <hbm2doc> + <property key="ejb3" value="false"/> + <property key="jdk5" value="false"/> + </hbm2doc> + <hbm2cfgxml> + <property key="jdk5" value="false"/> + </hbm2cfgxml> + <hbm2hbmxml> + <property key="ejb3" value="false"/> + <property key="jdk5" value="false"/> + </hbm2hbmxml> + <hbmtemplate> + <property key="ejb3" value="false"/> + <property key="jdk5" value="false"/> + </hbmtemplate> + <hbm2java destdir="outputdir/test"> + <property key="keyXXX" value="valueYYY"/> + </hbm2java> + <hbm2ddl> + <property key="ejb3" value="false"/> + <property key="jdk5" value="false"/> + </hbm2ddl> <hbm2dao/> </hibernatetool> </target> Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/sample/AntCodeGen_test2.xml =================================================================== --- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/sample/AntCodeGen_test2.xml 2010-08-05 11:33:21 UTC (rev 23934) +++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/sample/AntCodeGen_test2.xml 2010-08-05 12:11:15 UTC (rev 23935) @@ -1,5 +1,5 @@ <project name="CodeGen" default="hibernateAntCodeGeneration"> - <property name="build.dir" location="ResLocation/test"/> + <property name="build.dir" location="reslocation/test"/> <path id="toolslib"/> <target name="hibernateAntCodeGeneration"> <taskdef name="hibernatetool" classname="org.hibernate.tool.ant.HibernateToolTask" classpathref="toolslib"/> @@ -8,7 +8,9 @@ <classpath> <path location="${build.dir}"/> </classpath> - <hbm2java/> + <hbm2java destdir="outputdir/test"> + <property key="keyXXX" value="valueYYY"/> + </hbm2java> </hibernatetool> </target> </project> \ No newline at end of file Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/CodeGenXMLFactoryTest.java =================================================================== --- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/CodeGenXMLFactoryTest.java 2010-08-05 11:33:21 UTC (rev 23934) +++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/CodeGenXMLFactoryTest.java 2010-08-05 12:11:15 UTC (rev 23935) @@ -30,9 +30,11 @@ import org.hibernate.console.preferences.ConsoleConfigurationPreferences; import org.hibernate.eclipse.console.ExtensionManager; import org.hibernate.eclipse.console.model.impl.ExporterDefinition; +import org.hibernate.eclipse.console.model.impl.ExporterFactoryStrings; import org.hibernate.eclipse.console.test.launchcfg.TestConsoleConfigurationPreferences; import org.hibernate.eclipse.console.test.launchcfg.TestLaunchConfig; import org.hibernate.eclipse.launch.CodeGenXMLFactory; +import org.hibernate.eclipse.launch.CodeGenerationStrings; import org.hibernate.eclipse.launch.ExporterAttributes; import org.hibernate.eclipse.launch.HibernateLaunchConstants; @@ -126,11 +128,11 @@ } public String getConnectionProfileDriverURL(String connectionProfile) { - return "TestDriverPath.jar"; //$NON-NLS-1$ + return "test-driver-path.jar"; //$NON-NLS-1$ } public String getResLocation(String path) { - return "ResLocation/test"; //$NON-NLS-1$ + return "reslocation/test"; //$NON-NLS-1$ } } @@ -185,14 +187,14 @@ public String codeGenXMLFactory(boolean reveng, boolean exportersAll, boolean jpa) { Map<String, ExporterDefinition> exDefinitions = ExtensionManager.findExporterDefinitionsAsMap(); - Map<String, Object> testLCAttr = new HashMap<String, Object>(); + Map<String, Object> testLaunchConfigAttr = new HashMap<String, Object>(); String tmp = "12345678901234567890"; //$NON-NLS-1$ - testLCAttr.put(HibernateLaunchConstants.ATTR_TEMPLATE_DIR, tmp); - testLCAttr.put(HibernateLaunchConstants.ATTR_OUTPUT_DIR, tmp); - testLCAttr.put(HibernateLaunchConstants.ATTR_REVERSE_ENGINEER_SETTINGS, tmp); + testLaunchConfigAttr.put(HibernateLaunchConstants.ATTR_TEMPLATE_DIR, tmp); + testLaunchConfigAttr.put(HibernateLaunchConstants.ATTR_OUTPUT_DIR, tmp); + testLaunchConfigAttr.put(HibernateLaunchConstants.ATTR_REVERSE_ENGINEER_SETTINGS, tmp); if (jpa) { - testLCAttr.put(HibernateLaunchConstants.ATTR_ENABLE_EJB3_ANNOTATIONS, true); - testLCAttr.put(HibernateLaunchConstants.ATTR_ENABLE_JDK5, true); + testLaunchConfigAttr.put(HibernateLaunchConstants.ATTR_ENABLE_EJB3_ANNOTATIONS, true); + testLaunchConfigAttr.put(HibernateLaunchConstants.ATTR_ENABLE_JDK5, true); } List<String> exportersList = new ArrayList<String>(); if (exportersAll) { @@ -203,20 +205,27 @@ for (Map.Entry<String, ExporterDefinition> exDef : exDefinitions.entrySet()) { String tmp0 = exDef.getValue().getExporterTag(); String tmp1 = ExporterAttributes.getLaunchAttributePrefix(tmp0); - testLCAttr.put(tmp1 + ".extension_id", //$NON-NLS-1$ + testLaunchConfigAttr.put(tmp1 + ".extension_id", //$NON-NLS-1$ HibernateLaunchConstants.ATTR_PREFIX + tmp0); - testLCAttr.put(tmp1, Boolean.TRUE); + testLaunchConfigAttr.put(tmp1, Boolean.TRUE); if (exportersAll) { exportersList.add(tmp0); } } - testLCAttr.put(HibernateLaunchConstants.ATTR_EXPORTERS, exportersList); + testLaunchConfigAttr.put(HibernateLaunchConstants.ATTR_EXPORTERS, exportersList); Map<String, String> expProps2 = new HashMap<String, String>(); - expProps2.put(HibernateLaunchConstants.ATTR_OUTPUT_DIR, OUTDIR_PATH); - testLCAttr.put(HBMTEMPLATE0_PROPERTIES, expProps2); - testLCAttr.put(HibernateLaunchConstants.ATTR_REVERSE_ENGINEER, reveng); - TestLaunchConfig testLC = new TestLaunchConfig(testLCAttr); - CodeGenXMLFactory codeGenFactory = new CodeGenXMLFactory4Test(testLC, jpa); + // test properties overlap case: + // ExporterFactoryStrings.OUTPUTDIR & CodeGenerationStrings.DESTDIR - is a same property + // ExporterFactoryStrings.OUTPUTDIR - is a GUI name for the property + // CodeGenerationStrings.DESTDIR - is Ant script name for the property + // GUI name is more preferable, i.e. "_test_suffix" should not be in generated file + expProps2.put(ExporterFactoryStrings.OUTPUTDIR, OUTDIR_PATH); + expProps2.put(CodeGenerationStrings.DESTDIR, OUTDIR_PATH + "_test_suffix"); //$NON-NLS-1$ + expProps2.put("keyXXX", "valueYYY"); //$NON-NLS-1$ //$NON-NLS-2$ + testLaunchConfigAttr.put(HBMTEMPLATE0_PROPERTIES, expProps2); + testLaunchConfigAttr.put(HibernateLaunchConstants.ATTR_REVERSE_ENGINEER, reveng); + TestLaunchConfig testLaunchConfig = new TestLaunchConfig(testLaunchConfigAttr); + CodeGenXMLFactory codeGenFactory = new CodeGenXMLFactory4Test(testLaunchConfig, jpa); return codeGenFactory.createCodeGenXML(); }

15 years, 4 months

1
0
0 / 0

JBoss Tools SVN: r23934 - branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/core/v1_1.

by jbosstools-commits＠lists.jboss.org

Author: tfennelly Date: 2010-08-05 07:33:21 -0400 (Thu, 05 Aug 2010) New Revision: 23934 Removed: branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/core/v1_1/v1.1.out.xml Log: removed backup file committed in error Deleted: branches/smooks-dmb/plugins/org.jboss.tools.smooks.ecore.model/src/org/jboss/tools/smooks/model/core/v1_1/v1.1.out.xml ===================================================================

15 years, 4 months

1
0
0 / 0

JBoss Tools SVN: r23933 - trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util.

by jbosstools-commits＠lists.jboss.org

Author: mareshkau Date: 2010-08-05 04:22:20 -0400 (Thu, 05 Aug 2010) New Revision: 23933 Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/VpeStyleUtil.java Log: https://jira.jboss.org/browse/JBIDE-6774 Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/VpeStyleUtil.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/VpeStyleUtil.java 2010-08-05 07:53:03 UTC (rev 23932) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/VpeStyleUtil.java 2010-08-05 08:22:20 UTC (rev 23933) @@ -829,7 +829,9 @@ try { uri = new URI(resolvedValue); } catch (URISyntaxException e) { - VpePlugin.getDefault().logWarning("Error in parsiong URI string", e); //$NON-NLS-1$ + // here we process user input, and when user enter url, there possible that we will not be able parse it. + // so we just ignore this. + // VpePlugin.getDefault().logWarning("Error in parsiong URI string", e); //$NON-NLS-1$ } if ((uri != null) && (uri.isAbsolute()))

15 years, 4 months

1
0
0 / 0

JBoss Tools SVN: r23932 - in trunk/vpe: plugins/org.jboss.tools.vpe.spring/src/org/jboss/tools/vpe/spring/template/util and 4 other directories.

by jbosstools-commits＠lists.jboss.org

Author: yradtsevich Date: 2010-08-05 03:53:03 -0400 (Thu, 05 Aug 2010) New Revision: 23932 Added: trunk/vpe/plugins/org.jboss.tools.vpe.spring/src/org/jboss/tools/vpe/spring/template/SpringUrlTemplate.java trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/url.jsp trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/url.jsp.xml Removed: trunk/vpe/tests/org.jboss.tools.vpe.spring.test/src/org/jboss/tools/vpe/spring/test/SpringComponentTest.java Modified: trunk/vpe/plugins/org.jboss.tools.vpe.spring/src/org/jboss/tools/vpe/spring/template/util/Spring.java trunk/vpe/plugins/org.jboss.tools.vpe.spring/templates/vpe-templates-spring.xml trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/form.jsp.xml trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/springapp-servlet.xml trunk/vpe/tests/org.jboss.tools.vpe.spring.test/src/org/jboss/tools/vpe/spring/test/SpringAllTests.java trunk/vpe/tests/org.jboss.tools.vpe.spring.test/src/org/jboss/tools/vpe/spring/test/SpringComponentContentTest.java Log: https://jira.jboss.org/browse/JBIDE-6711 : Spring templates for VPE - spring:url - template is updated, JUnit is created - spring:form - JUnit is updated - SpringComponentTest is removed Added: trunk/vpe/plugins/org.jboss.tools.vpe.spring/src/org/jboss/tools/vpe/spring/template/SpringUrlTemplate.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.spring/src/org/jboss/tools/vpe/spring/template/SpringUrlTemplate.java (rev 0) +++ trunk/vpe/plugins/org.jboss.tools.vpe.spring/src/org/jboss/tools/vpe/spring/template/SpringUrlTemplate.java 2010-08-05 07:53:03 UTC (rev 23932) @@ -0,0 +1,70 @@ +/******************************************************************************* + * Copyright (c) 2007-2010 Red Hat, Inc. Distributed under license by + * Red Hat, Inc. All rights reserved. This program is made available + * under the terms of the Eclipse Public License v1.0 which + * accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html Contributor: Red Hat, + * Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.vpe.spring.template; + +import org.jboss.tools.vpe.editor.context.VpePageContext; +import org.jboss.tools.vpe.editor.template.VpeAbstractTemplate; +import org.jboss.tools.vpe.editor.template.VpeCreationData; +import org.jboss.tools.vpe.editor.template.VpeTemplateManager; +import org.jboss.tools.vpe.editor.util.VisualDomUtil; +import org.jboss.tools.vpe.spring.template.util.Spring; +import org.mozilla.interfaces.nsIDOMDocument; +import org.mozilla.interfaces.nsIDOMElement; +import org.w3c.dom.Element; +import org.w3c.dom.Node; +import org.w3c.dom.NodeList; + +/** + * Template class for spring:url and nested spring:param tags. + * + * @author Yahor Radtsevich (yradtsevich) + */ +public class SpringUrlTemplate extends VpeAbstractTemplate { + + /* (non-Javadoc) + * @see org.jboss.tools.vpe.editor.template.VpeTemplate#create(org.jboss.tools.vpe.editor.context.VpePageContext, org.w3c.dom.Node, org.mozilla.interfaces.nsIDOMDocument) + */ + public VpeCreationData create(VpePageContext pageContext, Node sourceNode, + nsIDOMDocument visualDocument) { + Element sourceElement = (Element) sourceNode; + nsIDOMElement urlContainer = VisualDomUtil.createBorderlessContainer(visualDocument); + if (sourceElement.hasAttribute(Spring.ATTR_VALUE) && + !sourceElement.hasAttribute(Spring.ATTR_VAR)) { + String valueAttribute = sourceElement.getAttribute(Spring.ATTR_VALUE); + StringBuilder url = new StringBuilder(valueAttribute); + + boolean hasParams = valueAttribute.contains("?"); //$NON-NLS-1$ + NodeList childNodes = sourceElement.getChildNodes(); + for (int i = 0; i < childNodes.getLength(); i++) { + Node childNode = childNodes.item(i); + String childTemplateName = VpeTemplateManager.getInstance() + .getTemplateName(pageContext, childNode); + if (Spring.TAG_SPRING_PARAM.equals(childTemplateName)) { + url.append(hasParams ? '&' : '?'); + hasParams = true; + appendParam(url, (Element) childNode); + } + } + urlContainer.appendChild(visualDocument.createTextNode(url.toString())); + } + return new VpeCreationData(urlContainer); + } + + /** + * @param paramElement + */ + private void appendParam(StringBuilder url, Element paramElement) { + if (paramElement.hasAttribute(Spring.ATTR_NAME)) { + url.append(paramElement.getAttribute(Spring.ATTR_NAME)); + if (paramElement.hasAttribute(Spring.ATTR_VALUE)) { + url.append('=').append(paramElement.getAttribute(Spring.ATTR_VALUE)); + } + } + } +} Modified: trunk/vpe/plugins/org.jboss.tools.vpe.spring/src/org/jboss/tools/vpe/spring/template/util/Spring.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.spring/src/org/jboss/tools/vpe/spring/template/util/Spring.java 2010-08-05 07:38:56 UTC (rev 23931) +++ trunk/vpe/plugins/org.jboss.tools.vpe.spring/src/org/jboss/tools/vpe/spring/template/util/Spring.java 2010-08-05 07:53:03 UTC (rev 23932) @@ -24,7 +24,12 @@ public static final String ATTR_ITEM_LABEL = "itemLabel"; //$NON-NLS-1$ public static final String ATTR_PATH = "path"; //$NON-NLS-1$ public static final String ATTR_MULTIPLE = "multiple"; //$NON-NLS-1$ + public static final String ATTR_NAME = "name"; //$NON-NLS-1$ + public static final String ATTR_VALUE = "value"; //$NON-NLS-1$ + public static final String ATTR_VAR = "var"; //$NON-NLS-1$ public static final String VALUE_TRUE = "true"; //$NON-NLS-1$ public static final String VALUE_FALSE = "false"; //$NON-NLS-1$ + + public static final String TAG_SPRING_PARAM = "spring:param"; //$NON-NLS-1$ } Modified: trunk/vpe/plugins/org.jboss.tools.vpe.spring/templates/vpe-templates-spring.xml =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.spring/templates/vpe-templates-spring.xml 2010-08-05 07:38:56 UTC (rev 23931) +++ trunk/vpe/plugins/org.jboss.tools.vpe.spring/templates/vpe-templates-spring.xml 2010-08-05 07:53:03 UTC (rev 23932) @@ -470,13 +470,8 @@ </vpe:tag> <vpe:tag name="spring:url" case-sensitive="yes"> - <vpe:if test="attrpresent('var')"> - <vpe:template children="no" modify="yes" /> - </vpe:if> - <vpe:template children="no" modify="yes"> - <span class="vpe-text"> - <vpe:value expr="{@value}" /> - </span> + <vpe:template children="no" modify="yes" + class="org.jboss.tools.vpe.spring.template.SpringUrlTemplate"> </vpe:template> </vpe:tag> Modified: trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/form.jsp.xml =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/form.jsp.xml 2010-08-05 07:38:56 UTC (rev 23931) +++ trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/form.jsp.xml 2010-08-05 07:53:03 UTC (rev 23932) @@ -10,8 +10,7 @@ <FORM CLASS="yellow-text" ID="form2" STYLE="background-color: black;"> <SPAN CLASS="vpe-text"> - This is a form:form with style and class attributes. Yellow text on black - background. + This is a form:form with style and class attributes. Yellow text on black background. </SPAN> </FORM> </test> Added: trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/url.jsp =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/url.jsp (rev 0) +++ trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/url.jsp 2010-08-05 07:53:03 UTC (rev 23932) @@ -0,0 +1,21 @@ +<%@ taglib prefix="security" uri="http://www.springframework.org/security/tags" %> +<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %> +<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> +<html> +<body> + <div id="url1"> + <spring:url value="http://community.jboss.org/en/jbosstools?view=discussions"/> + </div> + <div id="url2"> + <spring:url value="http://community.jboss.org/en/jbosstools"> + <spring:param name="view" value="discussions" /> + <spring:param name="emptyParam2"/> + </spring:url> + </div> + <div id="url3"> + <spring:url value="http://community.jboss.org/en/jbosstools?view=discussions"> + <spring:param name="emptyParam2"/> + </spring:url> + </div> +</body> +</html> \ No newline at end of file Added: trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/url.jsp.xml =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/url.jsp.xml (rev 0) +++ trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/url.jsp.xml 2010-08-05 07:53:03 UTC (rev 23932) @@ -0,0 +1,23 @@ +<tests> + <test id="url1"> + <DIV ID="url1"> + <SPAN CLASS="vpe-text"> + http://community.jboss.org/en/jbosstools?view=discussions + </SPAN> + </DIV> + </test> + <test id="url2"> + <DIV ID="url2"> + <SPAN CLASS="vpe-text"> + http://community.jboss.org/en/jbosstools?view=discussions&emptyParam2 + </SPAN> + </DIV> + </test> + <test id="url3"> + <DIV ID="url3"> + <SPAN CLASS="vpe-text"> + http://community.jboss.org/en/jbosstools?view=discussions&emptyParam2 + </SPAN> + </DIV> + </test> +</tests> Modified: trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/springapp-servlet.xml =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/springapp-servlet.xml 2010-08-05 07:38:56 UTC (rev 23931) +++ trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/springapp-servlet.xml 2010-08-05 07:53:03 UTC (rev 23932) @@ -29,6 +29,7 @@ </bean> <bean name="/select.htm" class="org.jboss.tools.vpe.spring.test.springtest.FormController"/> <bean name="/escapeBody.htm" class="org.jboss.tools.vpe.spring.test.springtest.FormController"/> + <bean name="/url.htm" class="org.jboss.tools.vpe.spring.test.springtest.FormController"/> <bean id="userValidator" class="org.jboss.tools.vpe.spring.test.springtest.validator.UserValidator"/> <bean id="beanValidator" class="org.jboss.tools.vpe.spring.test.springtest.validator.BeanValidator"/> Modified: trunk/vpe/tests/org.jboss.tools.vpe.spring.test/src/org/jboss/tools/vpe/spring/test/SpringAllTests.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.spring.test/src/org/jboss/tools/vpe/spring/test/SpringAllTests.java 2010-08-05 07:38:56 UTC (rev 23931) +++ trunk/vpe/tests/org.jboss.tools.vpe.spring.test/src/org/jboss/tools/vpe/spring/test/SpringAllTests.java 2010-08-05 07:53:03 UTC (rev 23932) @@ -32,7 +32,6 @@ public static Test suite() { TestSuite suite = new TestSuite("Tests for Vpe Spring components"); //$NON-NLS-1$ // $JUnit-BEGIN$ - suite.addTestSuite(SpringComponentTest.class); suite.addTestSuite(SpringComponentContentTest.class); //cleanUpTests(); // $JUnit-END$ Modified: trunk/vpe/tests/org.jboss.tools.vpe.spring.test/src/org/jboss/tools/vpe/spring/test/SpringComponentContentTest.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.spring.test/src/org/jboss/tools/vpe/spring/test/SpringComponentContentTest.java 2010-08-05 07:38:56 UTC (rev 23931) +++ trunk/vpe/tests/org.jboss.tools.vpe.spring.test/src/org/jboss/tools/vpe/spring/test/SpringComponentContentTest.java 2010-08-05 07:53:03 UTC (rev 23932) @@ -105,10 +105,18 @@ performContentTestByFullPath("src/main/webapp/WEB-INF/jsp/escapeBody.jsp"); //$NON-NLS-1$ } + public void testForm() throws Throwable { + performContentTestByFullPath("src/main/webapp/WEB-INF/jsp/form.jsp"); //$NON-NLS-1$ + } + public void testEval() throws Throwable { performContentTestByFullPath("src/main/webapp/WEB-INF/jsp/eval.jsp"); //$NON-NLS-1$ } - + + public void testUrl() throws Throwable { + performContentTestByFullPath("src/main/webapp/WEB-INF/jsp/url.jsp"); //$NON-NLS-1$ + } + @Override protected String getTestProjectName() { return SpringAllTests.IMPORT_PROJECT_NAME; Deleted: trunk/vpe/tests/org.jboss.tools.vpe.spring.test/src/org/jboss/tools/vpe/spring/test/SpringComponentTest.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.spring.test/src/org/jboss/tools/vpe/spring/test/SpringComponentTest.java 2010-08-05 07:38:56 UTC (rev 23931) +++ trunk/vpe/tests/org.jboss.tools.vpe.spring.test/src/org/jboss/tools/vpe/spring/test/SpringComponentTest.java 2010-08-05 07:53:03 UTC (rev 23932) @@ -1,61 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007-2010 Red Hat, Inc. - * Distributed under license by Red Hat, Inc. All rights reserved. - * This program is made available under the terms of the - * Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - * - * Contributor: - * Red Hat, Inc. - initial API and implementation - ******************************************************************************/ -package org.jboss.tools.vpe.spring.test; - -import org.eclipse.core.resources.IFile; -import org.jboss.tools.vpe.ui.test.TestUtil; -import org.jboss.tools.vpe.ui.test.VpeTest; - -/** - * Class for testing form spring components - * - * @author Yahor Radtsevich (yradtsevich) - * - */ -public class SpringComponentTest extends VpeTest { - - public SpringComponentTest(String name) { - super(name); - } - - /* - * Spring Form test cases - */ - public void testCheckbox() throws Throwable { - performTestForVpeComponent((IFile)TestUtil.getResource( - "src/main/webapp/WEB-INF/jsp/checkbox.jsp", SpringAllTests.IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - } - - public void testCheckboxes() throws Throwable { - performTestForVpeComponent((IFile)TestUtil.getResource( - "src/main/webapp/WEB-INF/jsp/checkboxes.jsp", SpringAllTests.IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - } - - public void testRadiobutton() throws Throwable { - performTestForVpeComponent((IFile)TestUtil.getResource( - "src/main/webapp/WEB-INF/jsp/radiobutton.jsp", SpringAllTests.IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - } - - public void testRadiobuttons() throws Throwable { - performTestForVpeComponent((IFile)TestUtil.getResource( - "src/main/webapp/WEB-INF/jsp/radiobuttons.jsp", SpringAllTests.IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - } - - public void testForm() throws Throwable { - performTestForVpeComponent((IFile)TestUtil.getResource( - "src/main/webapp/WEB-INF/jsp/form.jsp", SpringAllTests.IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - } - - public void testErrors() throws Throwable { - performTestForVpeComponent((IFile)TestUtil.getResource( - "src/main/webapp/WEB-INF/jsp/errors.jsp", SpringAllTests.IMPORT_PROJECT_NAME)); //$NON-NLS-1$ - } -}

15 years, 4 months

1
0
0 / 0

JBoss Tools SVN: r23931 - in trunk/drools/plugins: org.guvnor.tools and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: dennyxu Date: 2010-08-05 03:38:56 -0400 (Thu, 05 Aug 2010) New Revision: 23931 Added: trunk/drools/plugins/org.eclipse.webdav/.classpath trunk/drools/plugins/org.eclipse.webdav/.project trunk/drools/plugins/org.guvnor.tools/.classpath trunk/drools/plugins/org.guvnor.tools/.project Log: JBIDE-6665 Added: trunk/drools/plugins/org.eclipse.webdav/.classpath =================================================================== --- trunk/drools/plugins/org.eclipse.webdav/.classpath (rev 0) +++ trunk/drools/plugins/org.eclipse.webdav/.classpath 2010-08-05 07:38:56 UTC (rev 23931) @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/> + <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> + <classpathentry kind="src" path="src/kernel"/> + <classpathentry kind="src" path="src/interface"/> + <classpathentry kind="src" path="src/client"/> + <classpathentry kind="output" path="bin"/> +</classpath> Added: trunk/drools/plugins/org.eclipse.webdav/.project =================================================================== --- trunk/drools/plugins/org.eclipse.webdav/.project (rev 0) +++ trunk/drools/plugins/org.eclipse.webdav/.project 2010-08-05 07:38:56 UTC (rev 23931) @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.webdav</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.pde.ManifestBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.pde.SchemaBuilder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + </natures> +</projectDescription> Added: trunk/drools/plugins/org.guvnor.tools/.classpath =================================================================== --- trunk/drools/plugins/org.guvnor.tools/.classpath (rev 0) +++ trunk/drools/plugins/org.guvnor.tools/.classpath 2010-08-05 07:38:56 UTC (rev 23931) @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> + <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> + <classpathentry kind="src" path="src"/> + <classpathentry kind="output" path="bin"/> +</classpath> Added: trunk/drools/plugins/org.guvnor.tools/.project =================================================================== --- trunk/drools/plugins/org.guvnor.tools/.project (rev 0) +++ trunk/drools/plugins/org.guvnor.tools/.project 2010-08-05 07:38:56 UTC (rev 23931) @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.guvnor.tools</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.pde.ManifestBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.pde.SchemaBuilder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + </natures> +</projectDescription>

15 years, 4 months

1
0
0 / 0

JBoss Tools SVN: r23930 - in trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner: chrome and 2 other directories.

by jbosstools-commits＠lists.jboss.org

Author: dgolovin Date: 2010-08-04 19:02:14 -0400 (Wed, 04 Aug 2010) New Revision: 23930 Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/chrome/classic.jar trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/chrome/comm.jar trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/chrome/en-US.jar trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/chrome/pippki.jar trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/chrome/toolkit.jar trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/components/libdbusservice.so trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/components/libimgicon.so trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/components/nsLivemarkService.js trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/components/nsSearchService.js trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/crashreporter trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/javaxpcom.jar trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/libfreebl3.chk trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/libfreebl3.so trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/libjavaxpcomglue.so trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/libmozjs.so trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/libnspr4.so trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/libnss3.so trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/libnssckbi.so trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/libnssdbm3.chk trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/libnssdbm3.so trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/libnssutil3.so trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/libplc4.so trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/libplds4.so trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/libsmime3.so trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/libsoftokn3.chk trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/libsoftokn3.so trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/libsqlite3.so trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/libssl3.so trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/libxpcom.so trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/libxul.so trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/mozilla-xremote-client trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/platform.ini trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/plugins/libnullplugin.so trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/plugins/libunixprintplugin.so trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/updater trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/xpcshell trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/xpidl trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/xpt_dump trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/xpt_link trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/xulrunner-bin trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/xulrunner-stub Log: logging enabled for xulrunner Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/chrome/classic.jar =================================================================== (Binary files differ) Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/chrome/comm.jar =================================================================== (Binary files differ) Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/chrome/en-US.jar =================================================================== (Binary files differ) Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/chrome/pippki.jar =================================================================== (Binary files differ) Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/chrome/toolkit.jar =================================================================== (Binary files differ) Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/components/libdbusservice.so =================================================================== (Binary files differ) Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/components/libimgicon.so =================================================================== (Binary files differ) Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/components/nsLivemarkService.js =================================================================== --- trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/components/nsLivemarkService.js 2010-08-04 22:23:48 UTC (rev 23929) +++ trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/components/nsLivemarkService.js 2010-08-04 23:02:14 UTC (rev 23930) @@ -228,6 +228,47 @@ this.unregister(); } +//@line 136 "/home/eskimo/Projects/mozilla-1.9.2/toolkit/components/url-classifier/content/moz/observer.js" +function TEST_G_Observer() { + if (G_GDEBUG) { + + var z = "observer UNITTEST"; + G_debugService.enableZone(z); + + G_Debug(z, "Starting"); + + var regularObserverRan = 0; + var observerServiceObserverRan = 0; + + function regularObserver() { + regularObserverRan++; + }; + + function observerServiceObserver() { + observerServiceObserverRan++; + }; + + var service = Cc["@mozilla.org/observer-service;1"] + .getService(Ci.nsIObserverService); + var topic = "google-observer-test"; + + var o1 = new G_ObserverWrapper(topic, regularObserver); + service.addObserver(o1, topic, false); + + new G_ObserverServiceObserver(topic, + observerServiceObserver, true /* once */); + + // Notifications happen synchronously, so this is easy + service.notifyObservers(null, topic, null); + service.notifyObservers(null, topic, null); + + G_Assert(z, regularObserverRan == 2, "Regular observer broken"); + G_Assert(z, observerServiceObserverRan == 1, "ObsServObs broken"); + + service.removeObserver(o1, topic); + G_Debug(z, "PASSED"); + } +} //@line 36 "/home/eskimo/Projects/mozilla-1.9.2/toolkit/components/url-classifier/content/moz/alarm.js" Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/components/nsSearchService.js =================================================================== --- trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/components/nsSearchService.js 2010-08-04 22:23:48 UTC (rev 23929) +++ trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/components/nsSearchService.js 2010-08-04 23:02:14 UTC (rev 23930) @@ -203,13 +203,16 @@ consoleService.logStringMessage(aText); } -//@line 258 "/home/eskimo/Projects/mozilla-1.9.2/toolkit/components/search/nsSearchService.js" - +//@line 247 "/home/eskimo/Projects/mozilla-1.9.2/toolkit/components/search/nsSearchService.js" /** - * Otherwise, don't log at all by default. This can be overridden at startup - * by the pref, see SearchService's _init method. + * In debug builds, use a live, pref-based (browser.search.log) LOG function + * to allow enabling/disabling without a restart. */ -var LOG = function(){}; +function PREF_LOG(aText) { + if (getBoolPref(BROWSER_SEARCH_PREF + "log", false)) + DO_LOG(aText); +} +var LOG = PREF_LOG; //@line 266 "/home/eskimo/Projects/mozilla-1.9.2/toolkit/components/search/nsSearchService.js" Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/crashreporter =================================================================== (Binary files differ) Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/javaxpcom.jar =================================================================== (Binary files differ) Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/libfreebl3.chk =================================================================== (Binary files differ) Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/libfreebl3.so =================================================================== (Binary files differ) Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/libjavaxpcomglue.so =================================================================== (Binary files differ) Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/libmozjs.so =================================================================== (Binary files differ) Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/libnspr4.so =================================================================== (Binary files differ) Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/libnss3.so =================================================================== (Binary files differ) Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/libnssckbi.so =================================================================== (Binary files differ) Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/libnssdbm3.chk =================================================================== (Binary files differ) Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/libnssdbm3.so =================================================================== (Binary files differ) Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/libnssutil3.so =================================================================== (Binary files differ) Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/libplc4.so =================================================================== (Binary files differ) Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/libplds4.so =================================================================== (Binary files differ) Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/libsmime3.so =================================================================== (Binary files differ) Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/libsoftokn3.chk =================================================================== (Binary files differ) Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/libsoftokn3.so =================================================================== (Binary files differ) Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/libsqlite3.so =================================================================== (Binary files differ) Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/libssl3.so =================================================================== (Binary files differ) Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/libxpcom.so =================================================================== (Binary files differ) Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/libxul.so =================================================================== (Binary files differ) Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/mozilla-xremote-client =================================================================== (Binary files differ) Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/platform.ini =================================================================== --- trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/platform.ini 2010-08-04 22:23:48 UTC (rev 23929) +++ trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/platform.ini 2010-08-04 23:02:14 UTC (rev 23930) @@ -1,3 +1,3 @@ [Build] -BuildID=20100803022546 +BuildID=20100804061926 Milestone=1.9.2 Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/plugins/libnullplugin.so =================================================================== (Binary files differ) Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/plugins/libunixprintplugin.so =================================================================== (Binary files differ) Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/updater =================================================================== (Binary files differ) Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/xpcshell =================================================================== (Binary files differ) Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/xpidl =================================================================== (Binary files differ) Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/xpt_dump =================================================================== (Binary files differ) Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/xpt_link =================================================================== (Binary files differ) Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/xulrunner-bin =================================================================== (Binary files differ) Modified: trunk/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/xulrunner/xulrunner-stub =================================================================== (Binary files differ)

15 years, 4 months

1
0
0 / 0

JBoss Tools SVN: r23929 - in trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core: src/org/jboss/tools/deltacloud/core and 1 other directories.

by jbosstools-commits＠lists.jboss.org

Author: jjohnstn Date: 2010-08-04 18:23:48 -0400 (Wed, 04 Aug 2010) New Revision: 23929 Added: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudHardwareProfile.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudHardwareProperty.java Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/ChangeLog trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloud.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/DeltaCloudClient.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/HardwareProfile.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/Property.java Log: 2010-08-04 Jeff Johnston <jjohnstn(a)redhat.com> * src/org/jboss/tools/deltacloud/core/DeltaCloudHardwareProfile.java: New file. * src/org/jboss/tools/deltacloud/core/DeltaCloudHardwareProperty.java: New file. * src/org/jboss/tools/deltacloud/core/client/HardwareProfile.java (getArchitecture): Return the value instead of using toString method. (getNamedProperty): Verify that properties is not null before accessing. (getCPU): Return value instead of using toString. * src/org/jboss/tools/deltacloud/core/client/Property.java (Range.Range): New class. (getRange): New method. (Range.getLast): Ditto. (Range.getFirst): Ditto. (getEnums): Ditto. (toString): Fix to not include unit if it is "label". * src/org/jboss/tools/deltacloud/core/DeltaCloud.java (getProfiles): New method. * src/org/jboss/tools/deltacloud/core/client/DeltaCloudClient.java (buildHardwareProfile): Fix bug with getting enum properties. Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/ChangeLog =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/ChangeLog 2010-08-04 22:15:49 UTC (rev 23928) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/ChangeLog 2010-08-04 22:23:48 UTC (rev 23929) @@ -1,5 +1,23 @@ 2010-08-04 Jeff Johnston <jjohnstn(a)redhat.com> + * src/org/jboss/tools/deltacloud/core/DeltaCloudHardwareProfile.java: New file. + * src/org/jboss/tools/deltacloud/core/DeltaCloudHardwareProperty.java: New file. + * src/org/jboss/tools/deltacloud/core/client/HardwareProfile.java (getArchitecture): Return + the value instead of using toString method. + (getNamedProperty): Verify that properties is not null before accessing. + (getCPU): Return value instead of using toString. + * src/org/jboss/tools/deltacloud/core/client/Property.java (Range.Range): New class. + (getRange): New method. + (Range.getLast): Ditto. + (Range.getFirst): Ditto. + (getEnums): Ditto. + (toString): Fix to not include unit if it is "label". + * src/org/jboss/tools/deltacloud/core/DeltaCloud.java (getProfiles): New method. + * src/org/jboss/tools/deltacloud/core/client/DeltaCloudClient.java (buildHardwareProfile): Fix + bug with getting enum properties. + +2010-08-04 Jeff Johnston <jjohnstn(a)redhat.com> + * src/org/jboss/tools/deltacloud/core/client/DeltaCloudAuthException.java: New file. * src/org/jboss/tools/deltacloud/core/DeltaCloudException.java: New file. * src/org/jboss/tools/deltacloud/core/DeltaCloudRealm.java: New file. @@ -14,7 +32,7 @@ printing stack trace. (getImages): Ditto. (getRealms): New method. - (testConnection): Ditto. + (testConnection): Ditto. 2010-08-03 Jeff Johnston <jjohnstn(a)redhat.com> Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloud.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloud.java 2010-08-04 22:15:49 UTC (rev 23928) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloud.java 2010-08-04 22:23:48 UTC (rev 23929) @@ -10,6 +10,7 @@ import org.jboss.tools.deltacloud.core.client.DeltaCloudAuthException; import org.jboss.tools.deltacloud.core.client.DeltaCloudClient; import org.jboss.tools.deltacloud.core.client.DeltaCloudClientException; +import org.jboss.tools.deltacloud.core.client.HardwareProfile; import org.jboss.tools.deltacloud.core.client.Image; import org.jboss.tools.deltacloud.core.client.Instance; import org.jboss.tools.deltacloud.core.client.Realm; @@ -88,6 +89,22 @@ notifyInstanceListListeners(instanceArray); return instanceArray; } + + public DeltaCloudHardwareProfile[] getProfiles() { + ArrayList<DeltaCloudHardwareProfile> profiles = new ArrayList<DeltaCloudHardwareProfile>(); + try { + List<HardwareProfile> list = client.listProfiles(); + for (Iterator<HardwareProfile> i = list.iterator(); i.hasNext();) { + DeltaCloudHardwareProfile profile = new DeltaCloudHardwareProfile(i.next()); + profiles.add(profile); + } + } catch (DeltaCloudClientException e) { + Activator.log(e); + } + DeltaCloudHardwareProfile[] profileArray = new DeltaCloudHardwareProfile[profiles.size()]; + profileArray = profiles.toArray(profileArray); + return profileArray; + } public DeltaCloudImage[] getImages() { ArrayList<DeltaCloudImage> images = new ArrayList<DeltaCloudImage>(); Added: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudHardwareProfile.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudHardwareProfile.java (rev 0) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudHardwareProfile.java 2010-08-04 22:23:48 UTC (rev 23929) @@ -0,0 +1,44 @@ +package org.jboss.tools.deltacloud.core; + +import java.util.ArrayList; +import java.util.List; + +import org.jboss.tools.deltacloud.core.client.HardwareProfile; +import org.jboss.tools.deltacloud.core.client.Property; + +public class DeltaCloudHardwareProfile { + + private HardwareProfile profile; + + public DeltaCloudHardwareProfile(HardwareProfile profile) { + this.profile = profile; + } + + public String getId() { + return profile.getId(); + } + + public String getArchitecture() { + return profile.getArchitecture(); + } + + public List<DeltaCloudHardwareProperty> getProperties() { + ArrayList<DeltaCloudHardwareProperty> properties = new ArrayList<DeltaCloudHardwareProperty>(); + List<Property> clientProperties = profile.getProperties(); + for (Property p : clientProperties) { + DeltaCloudHardwareProperty hwp = new DeltaCloudHardwareProperty(p); + properties.add(hwp); + } + return properties; + } + + public DeltaCloudHardwareProperty getNamedProperty(String name) { + List<Property> clientProperties = profile.getProperties(); + for (Property p : clientProperties) { + if (p.getName().equals(name)) + return new DeltaCloudHardwareProperty(p); + } + return null; + } + +} Added: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudHardwareProperty.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudHardwareProperty.java (rev 0) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudHardwareProperty.java 2010-08-04 22:23:48 UTC (rev 23929) @@ -0,0 +1,59 @@ +package org.jboss.tools.deltacloud.core; + +import java.util.List; + +import org.jboss.tools.deltacloud.core.client.Property; + +public class DeltaCloudHardwareProperty { + + public static enum Kind {FIXED, RANGE, ENUM}; + + private Property property; + + public class Range { + private String first; + private String last; + + public Range(String first, String last) { + this.first = first; + this.last = last; + } + + public String getFirst() { + return first; + } + + public String getLast() { + return last; + } + } + + public DeltaCloudHardwareProperty(Property property) { + this.property = property; + } + + public Kind getKind() { + return Kind.valueOf(property.getKind()); + } + + public Range getRange() { + return new Range(property.getRange().getFirst(), property.getRange().getLast()); + } + + public String getUnit() { + return property.getUnit(); + } + + public String getName() { + return property.getName(); + } + + public String getValue() { + return property.getValue(); + } + + public List<String> getEnums() { + return property.getEnums(); + } + +} Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/DeltaCloudClient.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/DeltaCloudClient.java 2010-08-04 22:15:49 UTC (rev 23928) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/DeltaCloudClient.java 2010-08-04 22:23:48 UTC (rev 23929) @@ -323,7 +323,11 @@ NodeList enumChildren = child.getChildNodes(); for (int j = 0; j < enumChildren.getLength(); ++j) { Node enumChild = enumChildren.item(j); - enums.add(enumChild.getAttributes().getNamedItem("value").getNodeValue()); //$NON-NLS-1$ + if (enumChild.getNodeName().equals("entry")) { + NamedNodeMap attrs = enumChild.getAttributes(); + Node x = attrs.getNamedItem("value"); + enums.add(enumChild.getAttributes().getNamedItem("value").getNodeValue()); //$NON-NLS-1$ + } } } } Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/HardwareProfile.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/HardwareProfile.java 2010-08-04 22:15:49 UTC (rev 23928) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/HardwareProfile.java 2010-08-04 22:23:48 UTC (rev 23929) @@ -20,9 +20,11 @@ } private Property getNamedProperty(String name) { - for (Property p : properties) { - if (p.getName().equals(name)) - return p; + if (properties != null) { + for (Property p : properties) { + if (p.getName().equals(name)) + return p; + } } return null; } @@ -31,7 +33,7 @@ { Property p = getNamedProperty("architecture"); if (p != null) - return p.toString(); + return p.getValue(); return null; } @@ -55,7 +57,7 @@ { Property p = getNamedProperty("cpu"); if (p != null) - return p.toString(); + return p.getValue(); return null; } Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/Property.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/Property.java 2010-08-04 22:15:49 UTC (rev 23928) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/Property.java 2010-08-04 22:23:48 UTC (rev 23929) @@ -10,6 +10,24 @@ public static enum Kind {FIXED, RANGE, ENUM}; + public class Range { + private String first; + private String last; + + public Range(String first, String last) { + this.first = first; + this.last = last; + } + + public String getFirst() { + return first; + } + + public String getLast() { + return last; + } + } + public Property() { } @@ -49,6 +67,14 @@ return value; } + public Range getRange() { + return new Range(first, last); + } + + public List<String> getEnums() { + return enums; + } + public void setName(String name) { this.name = name; } @@ -87,7 +113,7 @@ return s; } // must be "fixed" - return value += " " + unit; + return value += " " + (unit.equals("label") ? "" : unit); } }

15 years, 4 months

1
0
0 / 0

JBoss Tools SVN: r23928 - in trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui: src/org/jboss/tools/internal/deltacloud/ui/wizards and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: jjohnstn Date: 2010-08-04 18:15:49 -0400 (Wed, 04 Aug 2010) New Revision: 23928 Added: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/ProfileComposite.java Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewCloudConnectionPage.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstancePage.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/WizardMessages.properties Log: 2010-08-04 Jeff Johnston <jjohnstn(a)redhat.com> * src/org/jboss/tools/internal/deltacloud/ui/wizards/ProfileComposite.java: New file. * src/org/jboss/tools/internal/deltacloud/ui/wizards/NewCloudConnectionPage.java (createControl): Clean up format. * src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstancePage.java (NewInstancePage): Calculate the possible hardware profiles using getPossibleProfiles method. (.modifyText): New method for handling name text control. (getPossibleProfiles): New method. (createControl): Start fleshing out actual controls. (validate): New method. (getProfileIds): Ditto. * src/org/jboss/tools/internal/deltacloud/ui/wizards/WizardMessages.properties: Add new messages for create instance wizard. Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog 2010-08-04 18:40:03 UTC (rev 23927) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog 2010-08-04 22:15:49 UTC (rev 23928) @@ -1,6 +1,22 @@ 2010-08-04 Jeff Johnston <jjohnstn(a)redhat.com> - * src/org/jboss/tools/internal/deltacloud/ui/wizards/NewCloudConnection.java (addPages): + * src/org/jboss/tools/internal/deltacloud/ui/wizards/ProfileComposite.java: New file. + * src/org/jboss/tools/internal/deltacloud/ui/wizards/NewCloudConnectionPage.java (createControl): Clean + up format. + * src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstancePage.java (NewInstancePage): Calculate + the possible hardware profiles using getPossibleProfiles method. + (.modifyText): New method for handling name text control. + (getPossibleProfiles): New method. + (createControl): Start fleshing out actual controls. + (validate): New method. + (getProfileIds): Ditto. + * src/org/jboss/tools/internal/deltacloud/ui/wizards/WizardMessages.properties: Add new + messages for create instance wizard. + +2010-08-04 Jeff Johnston <jjohnstn(a)redhat.com> + + * src/org/jboss/tools/internal/deltacloud/ui/wizards/NewCloudConnection.java (addPages): Add + this to page constructor. (performTest): New method to test connection. * src/org/jboss/tools/internal/deltacloud/ui/wizards/NewCloudConnectionPage.java (checkURL): (NewCloudConnectionPage): Pass in calling wizard. @@ -9,6 +25,7 @@ (validate): Clear the message area each time. * src/org/jboss/tools/internal/deltacloud/ui/wizards/WizardMessages.properties: Add new messages for connection testing purposes. + 2010-08-03 Jeff Johnston <jjohnstn(a)redhat.com> Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewCloudConnectionPage.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewCloudConnectionPage.java 2010-08-04 18:40:03 UTC (rev 23927) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewCloudConnectionPage.java 2010-08-04 22:15:49 UTC (rev 23928) @@ -64,7 +64,6 @@ private NewCloudConnection wizard; - private Label errorLabel; private Button testButton; private Text nameText; @@ -297,7 +296,7 @@ layout.marginWidth = 5; container.setLayout(layout); - errorLabel = new Label(container, SWT.NULL); + Label dummyLabel = new Label(container, SWT.NULL); // errorLabel.setForeground(JFaceResources.getColorRegistry().get(JFacePreferences.ERROR_COLOR)); Label nameLabel = new Label(container, SWT.NULL); @@ -345,14 +344,14 @@ FormData f = new FormData(); f.left = new FormAttachment(0, 0); f.right = new FormAttachment(100, 0); - errorLabel.setLayoutData(f); + dummyLabel.setLayoutData(f); f = new FormData(); - f.top = new FormAttachment(errorLabel, 11); + f.top = new FormAttachment(dummyLabel, 11); nameLabel.setLayoutData(f); f = new FormData(); - f.top = new FormAttachment(errorLabel, 8); + f.top = new FormAttachment(dummyLabel, 8); f.left = new FormAttachment(usernameLabel, 5); f.right = new FormAttachment(100, 0); nameText.setLayoutData(f); Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstancePage.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstancePage.java 2010-08-04 18:40:03 UTC (rev 23927) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstancePage.java 2010-08-04 22:15:49 UTC (rev 23928) @@ -1,38 +1,207 @@ package org.jboss.tools.internal.deltacloud.ui.wizards; +import java.util.ArrayList; + import org.eclipse.jface.wizard.WizardPage; import org.eclipse.swt.SWT; +import org.eclipse.swt.events.ModifyEvent; +import org.eclipse.swt.events.ModifyListener; +import org.eclipse.swt.layout.FormAttachment; +import org.eclipse.swt.layout.FormData; import org.eclipse.swt.layout.FormLayout; +import org.eclipse.swt.widgets.Combo; import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Group; +import org.eclipse.swt.widgets.Label; +import org.eclipse.swt.widgets.Text; import org.jboss.tools.deltacloud.core.DeltaCloud; +import org.jboss.tools.deltacloud.core.DeltaCloudHardwareProfile; +import org.jboss.tools.deltacloud.core.DeltaCloudHardwareProperty; import org.jboss.tools.deltacloud.core.DeltaCloudImage; -import org.jboss.tools.deltacloud.ui.SWTImagesFactory; public class NewInstancePage extends WizardPage { private final static String NAME = "NewInstance.name"; //$NON-NLS-1$ private final static String DESCRIPTION = "NewInstance.desc"; //$NON-NLS-1$ private final static String TITLE = "NewInstance.title"; //$NON-NLS-1$ + + private static final String NAME_LABEL = "Name.label"; //$NON-NLS-1$ + private static final String IMAGE_LABEL = "Image.label"; //$NON-NLS-1$ + private static final String ARCH_LABEL = "Arch.label"; //$NON-NLS-1$ + private static final String HARDWARE_LABEL = "Profiles.label"; //$NON-NLS-1$ + private static final String NAME_ALREADY_IN_USE = "ErrorNameInUse.text"; //$NON-NLS-1$ + private DeltaCloud cloud; private DeltaCloudImage image; + private ArrayList<DeltaCloudHardwareProfile> profiles; + private Text nameText; + private Combo hardware; + private String[] profileIds; + private ProfileComposite currPage; + private ProfileComposite[] profilePages; + + + private ModifyListener textListener = new ModifyListener() { + + @Override + public void modifyText(ModifyEvent e) { + validate(); + } + }; + + private ModifyListener comboListener = new ModifyListener() { + + @Override + public void modifyText(ModifyEvent e) { + int index = hardware.getSelectionIndex(); + currPage.setVisible(false); + profilePages[index].setVisible(true); + } + }; + public NewInstancePage(DeltaCloud cloud, DeltaCloudImage image) { super(WizardMessages.getString(NAME)); this.cloud = cloud; this.image = image; + getPossibleProfiles(); setDescription(WizardMessages.getString(DESCRIPTION)); setTitle(WizardMessages.getString(TITLE)); setPageComplete(false); } + + private void validate() { + boolean complete = true; + boolean errorFree = true; + + setMessage(null); + + String name = nameText.getText(); + if (name.length() == 0) { + complete = false; + } + + if (errorFree) + setErrorMessage(null); + setPageComplete(complete & errorFree); + } + private void getPossibleProfiles() { + profiles = new ArrayList<DeltaCloudHardwareProfile>(); + DeltaCloudHardwareProfile[] allProfiles = cloud.getProfiles(); + for (DeltaCloudHardwareProfile p : allProfiles) { + if (image.getArchitecture().equals(p.getArchitecture())) { + profiles.add(p); + } + } + } + + private String[] getProfileIds(Composite container) { + String[] ids = new String[profiles.size()]; + profilePages = new ProfileComposite[profiles.size()]; + for (int i = 0; i < profiles.size(); ++i) { + DeltaCloudHardwareProfile p = profiles.get(i); + ids[i] = p.getId(); + profilePages[i] = new ProfileComposite(p, container); + } + return ids; + } + @Override public void createControl(Composite parent) { final Composite container = new Composite(parent, SWT.NULL); FormLayout layout = new FormLayout(); layout.marginHeight = 5; layout.marginWidth = 5; - container.setLayout(layout); + container.setLayout(layout); + + Label dummyLabel = new Label(container, SWT.NULL); + + Label imageLabel = new Label(container, SWT.NULL); + imageLabel.setText(WizardMessages.getString(IMAGE_LABEL)); + + Label imageId = new Label(container, SWT.NULL); + imageId.setText(image.getName()); + + Label archLabel = new Label(container, SWT.NULL); + archLabel.setText(WizardMessages.getString(ARCH_LABEL)); + + Label arch = new Label(container, SWT.NULL); + arch.setText(image.getArchitecture()); + + Label nameLabel = new Label(container, SWT.NULL); + nameLabel.setText(WizardMessages.getString(NAME_LABEL)); + + nameText = new Text(container, SWT.BORDER | SWT.SINGLE); + nameText.addModifyListener(textListener); + + Label hardwareLabel = new Label(container, SWT.NULL); + hardwareLabel.setText(WizardMessages.getString(HARDWARE_LABEL)); + + hardware = new Combo(container, SWT.READ_ONLY); + Composite groupContainer = new Composite(container, SWT.NULL); + FormLayout groupLayout = new FormLayout(); + groupLayout.marginHeight = 0; + groupLayout.marginWidth = 0; + groupContainer.setLayout(groupLayout); + + profileIds = getProfileIds(groupContainer); + + if (profileIds.length > 0) { + hardware.setItems(profileIds); + hardware.setText(profileIds[0]); +// hardware.addModifyListener(comboListener); + } + + FormData f = new FormData(); + f.left = new FormAttachment(0, 0); + f.right = new FormAttachment(100, 0); + dummyLabel.setLayoutData(f); + + f = new FormData(); + f.top = new FormAttachment(dummyLabel, 8); + f.left = new FormAttachment(0, 0); + imageLabel.setLayoutData(f); + + f = new FormData(); + f.top = new FormAttachment(dummyLabel, 8); + f.left = new FormAttachment(hardwareLabel, 5); + f.right = new FormAttachment(100, 0); + imageId.setLayoutData(f); + + f = new FormData(); + f.top = new FormAttachment(imageLabel, 8); + f.left = new FormAttachment(0, 0); + archLabel.setLayoutData(f); + + f = new FormData(); + f.top = new FormAttachment(imageLabel, 8); + f.left = new FormAttachment(hardwareLabel, 5); + arch.setLayoutData(f); + + f = new FormData(); + f.top = new FormAttachment(archLabel, 8); + f.left = new FormAttachment(0, 0); + nameLabel.setLayoutData(f); + + f = new FormData(); + f.top = new FormAttachment(arch, 5); + f.left = new FormAttachment(hardwareLabel, 5); + f.right = new FormAttachment(100, 0); + nameText.setLayoutData(f); + + f = new FormData(); + f.top = new FormAttachment(nameText, 8); + f.left = new FormAttachment(0, 0); + hardwareLabel.setLayoutData(f); + + f = new FormData(); + f.top = new FormAttachment(nameText, 5); + f.left = new FormAttachment(hardwareLabel, 5); + f.right = new FormAttachment(100, 0); + hardware.setLayoutData(f); + setControl(container); } Added: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/ProfileComposite.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/ProfileComposite.java (rev 0) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/ProfileComposite.java 2010-08-04 22:15:49 UTC (rev 23928) @@ -0,0 +1,97 @@ +package org.jboss.tools.internal.deltacloud.ui.wizards; + +import java.util.List; + +import org.eclipse.swt.SWT; +import org.eclipse.swt.events.ModifyEvent; +import org.eclipse.swt.events.ModifyListener; +import org.eclipse.swt.events.SelectionAdapter; +import org.eclipse.swt.events.SelectionEvent; +import org.eclipse.swt.events.SelectionListener; +import org.eclipse.swt.widgets.Button; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Label; +import org.eclipse.swt.widgets.Spinner; +import org.jboss.tools.deltacloud.core.DeltaCloudHardwareProfile; +import org.jboss.tools.deltacloud.core.DeltaCloudHardwareProperty; + +public class ProfileComposite { + + private static final String CPU_LABEL = "Cpu.label"; //$NON-NLS-1$ + + private Composite container; + private DeltaCloudHardwareProfile profile; + private String cpu; + private String cpuDefaultValue; + private Button[] cpuButtons; + + private ModifyListener cpuSpinnerListener = new ModifyListener() { + + @Override + public void modifyText(ModifyEvent e) { + cpu = ((Spinner)e.widget).getText(); + } + }; + + private SelectionListener cpuButtonListener = new SelectionAdapter() { + + @Override + public void widgetSelected(SelectionEvent e) { + for (int i = 0; i < cpuButtons.length; ++i) { + Button b = cpuButtons[i]; + if (b != e.widget) { + b.setSelection(false); + } else { + b.setSelection(true); + cpu = b.getText(); + } + } + } + + }; + + public ProfileComposite(DeltaCloudHardwareProfile profile, Composite parent) { + this.profile = profile; + container = new Composite(parent, SWT.NULL); + + DeltaCloudHardwareProperty cpuProperty = profile.getNamedProperty("cpu"); + if (cpuProperty != null) { + Label cpuLabel = new Label(container, SWT.NULL); + cpuLabel.setText(WizardMessages.getString(CPU_LABEL)); + if (cpuProperty.getKind() == DeltaCloudHardwareProperty.Kind.FIXED) { + Label cpu = new Label(container, SWT.NULL); + cpu.setText(cpuProperty.getValue()); + } else if (cpuProperty.getKind() == DeltaCloudHardwareProperty.Kind.RANGE) { + cpuDefaultValue = cpuProperty.getValue(); + Spinner cpuSpinner = new Spinner(container, SWT.READ_ONLY); + cpuSpinner.setMinimum(Integer.valueOf(cpuProperty.getRange().getFirst())); + cpuSpinner.setMaximum(Integer.valueOf(cpuProperty.getRange().getLast())); + cpuSpinner.addModifyListener(cpuSpinnerListener); + cpuSpinner.setSelection(Integer.valueOf(cpuDefaultValue)); + } else if (cpuProperty.getKind() == DeltaCloudHardwareProperty.Kind.ENUM) { + cpuDefaultValue = cpuProperty.getValue(); + List<String> values = cpuProperty.getEnums(); + cpuButtons = new Button[values.size()]; + for (int i = 0; i < values.size(); ++i) { + Button button = new Button(container, SWT.RADIO); + String value = values.get(i); + button.setText(value); + if (value.equals(cpuDefaultValue)) + button.setSelection(true); + button.addSelectionListener(cpuButtonListener); + cpuButtons[i] = button; + } + } + } + } + + public void setVisible(boolean visible) { + container.setVisible(visible); + } + + public String getCPU() { + if (cpu != null && !cpu.equals(cpuDefaultValue)) + return cpu; + return null; + } +} Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/WizardMessages.properties =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/WizardMessages.properties 2010-08-04 18:40:03 UTC (rev 23927) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/WizardMessages.properties 2010-08-04 22:15:49 UTC (rev 23928) @@ -11,6 +11,10 @@ Password.label=Password: TestButton.label=Test UnknownType.label=Unknown +Image.label=Image: +Arch.label=Architecture: +Profiles.label=Hardware Profiles: +Cpu.label=CPUs: EC2UserNameLink.text=For EC2 use the <a href="https://console.aws.amazon.com/ec2/home">Access ID</a> EC2PasswordLink.text=For EC2 use the <a href="https://console.aws.amazon.com/ec2/home">Access Secret Key</a>

15 years, 4 months

1
0
0 / 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

jbosstools-commits August 2010