October 2008 - jbosstools-commits

JBoss Tools SVN: r11403 - workspace/Denny/esb-example.

by jbosstools-commits＠lists.jboss.org

Author: dennyxu Date: 2008-10-31 11:28:04 -0400 (Fri, 31 Oct 2008) New Revision: 11403 Added: workspace/Denny/esb-example/helloworld_action_client.zip Log: Added: workspace/Denny/esb-example/helloworld_action_client.zip =================================================================== (Binary files differ) Property changes on: workspace/Denny/esb-example/helloworld_action_client.zip ___________________________________________________________________ Name: svn:mime-type + application/octet-stream

15 years, 5 months

1
0
0 / 0

JBoss Tools SVN: r11402 - trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components.

by jbosstools-commits＠lists.jboss.org

Author: dmaliarevich Date: 2008-10-31 11:26:55 -0400 (Fri, 31 Oct 2008) New Revision: 11402 Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/gmap.xhtml trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/gmap.xhtml.xml Log: https://jira.jboss.org/jira/browse/JBIDE-2924, rich:gmap template was updated. Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/gmap.xhtml =================================================================== (Binary files differ) Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/gmap.xhtml.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/gmap.xhtml.xml 2008-10-31 15:26:49 UTC (rev 11401) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/gmap.xhtml.xml 2008-10-31 15:26:55 UTC (rev 11402) @@ -1,5 +1,27 @@ <tests> - <test id="gmap"> - <IMG SRC="/.*resources/gmap/gmap.gif/"/> - </test> + <test id="gmap1"> + <IMG SRC="/.*resources/gmap/allControls.png/" STYLE="height: 100px;" /> + </test> + <test id="gmap2"> + <IMG SRC="/.*resources/gmap/noControls.png/" CLASS="map" + STYLE="width: 301px; height: 306px;" /> + </test> + <test id="gmap3"> + <IMG SRC="/.*resources/gmap/large.png/" CLASS="map-bg" /> + </test> + <test id="gmap4"> + <IMG SRC="/.*resources/gmap/large-type.png/" /> + </test> + <test id="gmap5"> + <IMG SRC="/.*resources/gmap/type.png/" /> + </test> + <test id="gmap6"> + <IMG SRC="/.*resources/gmap/type-scale.png/" /> + </test> + <test id="gmap7"> + <IMG SRC="/.*resources/gmap/scale.png/" /> + </test> + <test id="gmap8"> + <IMG SRC="/.*resources/gmap/large-scale.png/" /> + </test> </tests> \ No newline at end of file

15 years, 5 months

1
0
0 / 0

JBoss Tools SVN: r11401 - in trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces: src/org/jboss/tools/jsf/vpe/richfaces/template and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: dmaliarevich Date: 2008-10-31 11:26:49 -0400 (Fri, 31 Oct 2008) New Revision: 11401 Added: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/gmap/allControls.png trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/gmap/large-scale.png trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/gmap/large-type.png trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/gmap/large.png trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/gmap/noControls.png trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/gmap/type-scale.png trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/gmap/type.png Removed: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/gmap/cleanEarth.png trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/gmap/gmap.gif trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/gmap/largeMap.gif trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/gmap/mapType.png Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/gmap/scale.png trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesGMapTemplate.java Log: https://jira.jboss.org/jira/browse/JBIDE-2924, rich:gmap template was updated. Added: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/gmap/allControls.png =================================================================== (Binary files differ) Property changes on: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/gmap/allControls.png ___________________________________________________________________ Name: svn:mime-type + image/png Deleted: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/gmap/cleanEarth.png =================================================================== (Binary files differ) Deleted: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/gmap/gmap.gif =================================================================== (Binary files differ) Added: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/gmap/large-scale.png =================================================================== (Binary files differ) Property changes on: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/gmap/large-scale.png ___________________________________________________________________ Name: svn:mime-type + image/png Added: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/gmap/large-type.png =================================================================== (Binary files differ) Property changes on: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/gmap/large-type.png ___________________________________________________________________ Name: svn:mime-type + image/png Added: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/gmap/large.png =================================================================== (Binary files differ) Property changes on: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/gmap/large.png ___________________________________________________________________ Name: svn:mime-type + image/png Deleted: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/gmap/largeMap.gif =================================================================== (Binary files differ) Deleted: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/gmap/mapType.png =================================================================== (Binary files differ) Added: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/gmap/noControls.png =================================================================== (Binary files differ) Property changes on: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/gmap/noControls.png ___________________________________________________________________ Name: svn:mime-type + image/png Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/gmap/scale.png =================================================================== (Binary files differ) Added: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/gmap/type-scale.png =================================================================== (Binary files differ) Property changes on: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/gmap/type-scale.png ___________________________________________________________________ Name: svn:mime-type + image/png Added: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/gmap/type.png =================================================================== (Binary files differ) Property changes on: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/resources/gmap/type.png ___________________________________________________________________ Name: svn:mime-type + image/png Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesGMapTemplate.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesGMapTemplate.java 2008-10-31 15:13:41 UTC (rev 11400) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesGMapTemplate.java 2008-10-31 15:26:49 UTC (rev 11401) @@ -29,24 +29,20 @@ */ public class RichFacesGMapTemplate extends VpeAbstractTemplate { - private static final String CLEAN_EARTH_IMG = "gmap/cleanEarth.png"; //$NON-NLS-1$ - private static final String GMAP_TYPE_CONTROL_IMG = "gmap/mapType.png"; //$NON-NLS-1$ - private static final String GLARGE_MAP_CONTROL_IMG = "gmap/largeMap.gif"; //$NON-NLS-1$ - private static final String GSCALE_CONTROL_IMG = "gmap/scale.png"; //$NON-NLS-1$ + private static final String ALL_CONTROLS_IMG = "gmap/allControls.png"; //$NON-NLS-1$ + private static final String NO_CONTROLS_IMG = "gmap/noControls.png"; //$NON-NLS-1$ + private static final String LARGE_IMG = "gmap/large.png"; //$NON-NLS-1$ + private static final String SCALE_IMG = "gmap/scale.png"; //$NON-NLS-1$ + private static final String TYPE_IMG = "gmap/type.png"; //$NON-NLS-1$ + private static final String LARGE_SCALE_IMG = "gmap/large-scale.png"; //$NON-NLS-1$ + private static final String LARGE_TYPE_IMG = "gmap/large-type.png"; //$NON-NLS-1$ + private static final String TYPE_SCALE_IMG = "gmap/type-scale.png"; //$NON-NLS-1$ private static final String SHOW_LARGE_MAP = "showGLargeMapControl"; //$NON-NLS-1$ private static final String SHOW_MAP_TYPE = "showGMapTypeControl"; //$NON-NLS-1$ private static final String SHOW_SCALE = "showGScaleControl"; //$NON-NLS-1$ - private static final String FALSE = "false"; //$NON-NLS-1$ - private static final String VISIBILITY_HIDDEN = "visibility: hidden;"; //$NON-NLS-1$ + private static final String TRUE = "true"; //$NON-NLS-1$ -// private static final String gmapWrapperStyle ="width: 400px; height: 398px; "; //$NON-NLS-1$ - private String gmapWrapperStyle ="display: block; overflow: hidden; /*width: 400px; height: 398px;*/ float: left; position: relative; "; //$NON-NLS-1$ - private String cleanEarthImgStyle ="float: left; position: relative; width: 400px; height: 398px; "; //$NON-NLS-1$ - private String mapTypeImgStyle ="float: left; position: relative; width: 202px; height: 19px; top: 3px; left: -206px; "; //$NON-NLS-1$ - private String largeMapImgStyle ="float: left; position: relative; width: 57px; height: 270px; top: 5px; left: -596px; "; //$NON-NLS-1$ - private String scaleImgStyle ="float: left; position: relative; width: 85px; height: 27px; top: 366px; left: -592px;"; //$NON-NLS-1$ - /** * Create html instead of rich:faces component. * @@ -62,44 +58,71 @@ Element sourceElement = (Element) sourceNode; + /* + * Value indicating enabled controls combinations: + * + * 0 - no controls are available. + * 1 - map type control is enabled. + * 2 - large map control is enabled. + * 4 - scale control is enabled. + * 3 - map type and large map controls are enabled. + * 5 - map type and scale controls are enabled. + * 6 - large map and scale controls are enabled. + * 7 - all controls are enabled. + */ + int controls = 0; + String showGLargeMapControl = sourceElement.getAttribute(SHOW_LARGE_MAP); String showGMapTypeControl = sourceElement.getAttribute(SHOW_MAP_TYPE); String showGScaleControl = sourceElement.getAttribute(SHOW_SCALE); + String style = sourceElement.getAttribute(HTML.ATTR_STYLE); + String styleClass = sourceElement.getAttribute(RichFaces.ATTR_STYLE_CLASS); - nsIDOMElement gmapWrapperElement = visualDocument.createElement(HTML.TAG_DIV); - nsIDOMElement gmapCleanEarhtImg = visualDocument.createElement(HTML.TAG_IMG); - nsIDOMElement gmapGMapTypeControlImg = visualDocument.createElement(HTML.TAG_IMG); - nsIDOMElement gmapGLargeMapControlImg = visualDocument.createElement(HTML.TAG_IMG); - nsIDOMElement gmapGScaleControlImg = visualDocument.createElement(HTML.TAG_IMG); + nsIDOMElement mapImg = visualDocument.createElement(HTML.TAG_IMG); - ComponentUtil.setImg(gmapCleanEarhtImg, CLEAN_EARTH_IMG); - ComponentUtil.setImg(gmapGMapTypeControlImg, GMAP_TYPE_CONTROL_IMG); - ComponentUtil.setImg(gmapGLargeMapControlImg, GLARGE_MAP_CONTROL_IMG); - ComponentUtil.setImg(gmapGScaleControlImg, GSCALE_CONTROL_IMG); - - - gmapWrapperElement.appendChild(gmapCleanEarhtImg); - gmapWrapperElement.appendChild(gmapGMapTypeControlImg); - gmapWrapperElement.appendChild(gmapGLargeMapControlImg); - gmapWrapperElement.appendChild(gmapGScaleControlImg); - - if (FALSE.equalsIgnoreCase(showGMapTypeControl)) { - mapTypeImgStyle += VISIBILITY_HIDDEN; + if (TRUE.equalsIgnoreCase(showGMapTypeControl)) { + controls += 1; } - if (FALSE.equalsIgnoreCase(showGLargeMapControl)) { - largeMapImgStyle += VISIBILITY_HIDDEN; + if (TRUE.equalsIgnoreCase(showGLargeMapControl)) { + controls += 2; } - if (FALSE.equalsIgnoreCase(showGScaleControl)) { - scaleImgStyle += VISIBILITY_HIDDEN; + if (TRUE.equalsIgnoreCase(showGScaleControl)) { + controls += 4; } - gmapWrapperElement.setAttribute(HTML.ATTR_STYLE, gmapWrapperStyle); - gmapCleanEarhtImg.setAttribute(HTML.ATTR_STYLE, cleanEarthImgStyle); - gmapGMapTypeControlImg.setAttribute(HTML.ATTR_STYLE, mapTypeImgStyle); - gmapGLargeMapControlImg.setAttribute(HTML.ATTR_STYLE, largeMapImgStyle); - gmapGScaleControlImg.setAttribute(HTML.ATTR_STYLE, scaleImgStyle); + switch (controls) { + case 0: + ComponentUtil.setImg(mapImg, NO_CONTROLS_IMG); + break; + case 1: + ComponentUtil.setImg(mapImg, TYPE_IMG); + break; + case 2: + ComponentUtil.setImg(mapImg, LARGE_IMG); + break; + case 4: + ComponentUtil.setImg(mapImg, SCALE_IMG); + break; + case 3: + ComponentUtil.setImg(mapImg, LARGE_TYPE_IMG); + break; + case 5: + ComponentUtil.setImg(mapImg, TYPE_SCALE_IMG); + break; + case 6: + ComponentUtil.setImg(mapImg, LARGE_SCALE_IMG); + break; + case 7: + ComponentUtil.setImg(mapImg, ALL_CONTROLS_IMG); + break; + default: + ComponentUtil.setImg(mapImg, NO_CONTROLS_IMG); + } - VpeCreationData creationData = new VpeCreationData(gmapWrapperElement); + mapImg.setAttribute(HTML.ATTR_CLASS, styleClass); + mapImg.setAttribute(HTML.ATTR_STYLE, style); + + VpeCreationData creationData = new VpeCreationData(mapImg); return creationData; }

15 years, 5 months

1
0
0 / 0

JBoss Tools SVN: r11400 - in trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt: org/jboss/tools and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: artdaw Date: 2008-10-31 11:13:41 -0400 (Fri, 31 Oct 2008) New Revision: 11400 Modified: trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/com/jboss/tools/common.xsl trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/org/jboss/tools/common.xsl Log: https://jira.jboss.org/jira/browse/JBDS-463 - markers were added Modified: trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/com/jboss/tools/common.xsl =================================================================== --- trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/com/jboss/tools/common.xsl 2008-10-31 15:11:35 UTC (rev 11399) +++ trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/com/jboss/tools/common.xsl 2008-10-31 15:13:41 UTC (rev 11400) @@ -91,17 +91,23 @@ </xsl:call-template> </xsl:attribute> - <xsl:choose> - <xsl:when test="@role='new'"> + <xsl:choose> + <xsl:when test="@role='new' or @role='updated'"> <xsl:attribute name="class"> <xsl:value-of select="@role"/> </xsl:attribute> </xsl:when> - <xsl:when test="@role='updated'"> +  + <xsl:when test="@revisionflag='added' or @revisionflag='changed'"> <xsl:attribute name="class"> - <xsl:value-of select="@role"/> - </xsl:attribute> - </xsl:when> + <xsl:value-of select="@revisionflag"/> + </xsl:attribute> + </xsl:when> + <xsl:when test="@diffmk:change='added' or @diffmk:change='changed'"> + <xsl:attribute name="class"> + <xsl:value-of select="@diffmk:change"/> + </xsl:attribute> + </xsl:when> </xsl:choose>  @@ -133,9 +139,19 @@  <xsl:template match="//diffmk:wrapper"> - - <xsl:value-of select="."/> - + <xsl:choose> + <xsl:when test="@diffmk:change='deleted'"> + <xsl:text> </xsl:text> + </xsl:when> + <xsl:when test="parent::node()[local-name()='title']"> + <xsl:value-of select="."/> + </xsl:when> + <xsl:otherwise> + + <xsl:value-of select="."/> + + </xsl:otherwise> + </xsl:choose> </xsl:template>  - <xsl:when test="../@role='updated' or ../@revisionflag='changed'"> + <xsl:when test="../@role='updated' or ../@revisionflag='changed' or ../@diffmk:change='changed'"> <img src="images/updated.png" alt="updated" class="img_marker" /> </xsl:when> - </xsl:choose> + </xsl:choose> </xsl:template>  @@ -301,15 +317,15 @@ </xsl:if> <xsl:copy-of select="$title"/> </xsl:element> - <xsl:choose> - <xsl:when test="../@role='new' or ../@revisionflag='added'"> + <xsl:choose> + <xsl:when test="../@role='new' or ../@revisionflag='added' or ../@diffmk:change='added'"> <img src="images/new.png" alt="new" class="img_marker" /> </xsl:when>  - <xsl:when test="../@role='updated' or ../@revisionflag='changed'"> + <xsl:when test="../@role='updated' or ../@revisionflag='changed' or ../@diffmk:change='changed'"> <img src="images/updated.png" alt="updated" class="img_marker" /> </xsl:when> - </xsl:choose> + </xsl:choose> </xsl:template>  Modified: trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/org/jboss/tools/common.xsl =================================================================== --- trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/org/jboss/tools/common.xsl 2008-10-31 15:11:35 UTC (rev 11399) +++ trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/org/jboss/tools/common.xsl 2008-10-31 15:13:41 UTC (rev 11400) @@ -101,6 +101,11 @@ <xsl:value-of select="@revisionflag"/> </xsl:attribute> </xsl:when> + <xsl:when test="@diffmk:change='added' or @diffmk:change='changed'"> + <xsl:attribute name="class"> + <xsl:value-of select="@diffmk:change"/> + </xsl:attribute> + </xsl:when> </xsl:choose>  @@ -122,9 +127,19 @@  <xsl:template match="//diffmk:wrapper"> - - <xsl:value-of select="."/> - + <xsl:choose> + <xsl:when test="@diffmk:change='deleted'"> + <xsl:text> </xsl:text> + </xsl:when> + <xsl:when test="parent::node()[local-name()='title']"> + <xsl:value-of select="."/> + </xsl:when> + <xsl:otherwise> + + <xsl:value-of select="."/> + + </xsl:otherwise> + </xsl:choose> </xsl:template>  - <xsl:when test="../@role='updated' or ../@revisionflag='changed'"> + <xsl:when test="../@role='updated' or ../@revisionflag='changed' or ../@diffmk:change='changed'"> <img src="images/updated.png" alt="updated" class="img_marker" /> </xsl:when> </xsl:choose> @@ -291,11 +306,11 @@ <xsl:copy-of select="$title"/> </xsl:element> <xsl:choose> - <xsl:when test="../@role='new' or ../@revisionflag='added'"> + <xsl:when test="../@role='new' or ../@revisionflag='added' or ../@diffmk:change='added'"> <img src="images/new.png" alt="new" class="img_marker" /> </xsl:when>  - <xsl:when test="../@role='updated' or ../@revisionflag='changed'"> + <xsl:when test="../@role='updated' or ../@revisionflag='changed' or ../@diffmk:change='changed'"> <img src="images/updated.png" alt="updated" class="img_marker" /> </xsl:when> </xsl:choose>

15 years, 5 months

1
0
0 / 0

JBoss Tools SVN: r11399 - workspace/Denny/esb-example.

by jbosstools-commits＠lists.jboss.org

Author: dennyxu Date: 2008-10-31 11:11:35 -0400 (Fri, 31 Oct 2008) New Revision: 11399 Added: workspace/Denny/esb-example/helloworld_action_testclient.zip Log: Added: workspace/Denny/esb-example/helloworld_action_testclient.zip =================================================================== (Binary files differ) Property changes on: workspace/Denny/esb-example/helloworld_action_testclient.zip ___________________________________________________________________ Name: svn:mime-type + application/octet-stream

15 years, 5 months

1
0
0 / 0

JBoss Tools SVN: r11398 - workspace/Denny/esb-example.

by jbosstools-commits＠lists.jboss.org

Author: dennyxu Date: 2008-10-31 11:10:56 -0400 (Fri, 31 Oct 2008) New Revision: 11398 Removed: workspace/Denny/esb-example/helloworld_action_testclient.zip Log: Deleted: workspace/Denny/esb-example/helloworld_action_testclient.zip =================================================================== (Binary files differ)

15 years, 5 months

1
0
0 / 0

JBoss Tools SVN: r11397 - in trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta: impl and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: scabanovich Date: 2008-10-31 11:09:59 -0400 (Fri, 31 Oct 2008) New Revision: 11397 Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/XModelEntity.java trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/impl/XMetaDataLoader.java trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/impl/XModelEntityImpl.java trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/impl/XModelMetaDataImpl.java Log: JBIDE-2969 Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/XModelEntity.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/XModelEntity.java 2008-10-31 12:29:14 UTC (rev 11396) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/XModelEntity.java 2008-10-31 15:09:59 UTC (rev 11397) @@ -15,6 +15,9 @@ import org.jboss.tools.common.model.loaders.XObjectLoader; public interface XModelEntity extends XMetaElement, XDependencies { + + public String getModule(); + public XAttribute[] getAttributes(); public XAttribute getAttribute(String name); Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/impl/XMetaDataLoader.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/impl/XMetaDataLoader.java 2008-10-31 12:29:14 UTC (rev 11396) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/impl/XMetaDataLoader.java 2008-10-31 15:09:59 UTC (rev 11397) @@ -15,8 +15,10 @@ import java.util.*; import org.w3c.dom.*; import org.jboss.tools.common.meta.XMetaElement; +import org.jboss.tools.common.meta.XModelEntity; import org.jboss.tools.common.model.plugin.ModelPlugin; import org.jboss.tools.common.model.util.*; +import org.jboss.tools.common.xml.XMLUtilities; public class XMetaDataLoader implements XMetaDataConstants { @@ -115,15 +117,22 @@ static void loadEntityGroup(XModelMetaDataImpl factory, Element g) { // String n = g.getAttribute("NAME"); + String module = ""; + Element v = XMLUtilities.getUniqueChild(g, "VERSION"); + if(v != null && v.hasAttribute("MODULE")) { + module = v.getAttribute("module"); + } loadMappings(factory, g); factory.createIconList(getUniqueChild(g, ICONS)); loadGlobalActions(factory, g); - loadEntities(factory, g); + loadEntities(factory, g, module); } - private static void loadEntities(XModelMetaDataImpl factory, Element element) { + private static void loadEntities(XModelMetaDataImpl factory, Element element, String module) { Element[] cs = getChildrenElements(element, XMODEL_ENTITY); - for (int i = 0; i < cs.length; i++) factory.createEntity(cs[i]); + for (int i = 0; i < cs.length; i++) { + factory.createEntity(cs[i], module); + } cs = getChildrenElements(element, XENTITY_EXTENTION); XExtensions extensions = factory.getExtensions(); for (int i = 0; i < cs.length; i++) extensions.addExtension(cs[i]); Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/impl/XModelEntityImpl.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/impl/XModelEntityImpl.java 2008-10-31 12:29:14 UTC (rev 11396) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/impl/XModelEntityImpl.java 2008-10-31 15:09:59 UTC (rev 11397) @@ -26,6 +26,7 @@ public class XModelEntityImpl extends XMetaElementImpl implements XModelEntity { public static boolean hideHelp = true; + protected String module; protected XChildrenImpl children = new XChildrenImpl(); protected XAttribute[] m_Attributes; protected XActionListImpl actions = new XActionListImpl(); @@ -44,6 +45,14 @@ protected XModelEntityImpl() {} + public void setModule(String s) { + module = s; + } + + public String getModule() { + return module; + } + void setElement(Element element) { this.element = element; setName(element.getAttribute(NAME)); Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/impl/XModelMetaDataImpl.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/impl/XModelMetaDataImpl.java 2008-10-31 12:29:14 UTC (rev 11396) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/impl/XModelMetaDataImpl.java 2008-10-31 15:09:59 UTC (rev 11397) @@ -18,6 +18,8 @@ import org.jboss.tools.common.meta.*; import org.jboss.tools.common.meta.action.*; import org.jboss.tools.common.meta.action.impl.*; +import org.jboss.tools.common.meta.constraint.XAttributeConstraint; +import org.jboss.tools.common.meta.constraint.impl.XAttributeConstraintAList; import org.jboss.tools.common.model.icons.impl.*; public class XModelMetaDataImpl implements XModelMetaData, XMetaDataConstants { @@ -59,12 +61,50 @@ XModelEntity[] es = this.entities.values().toArray(new XModelEntity[0]); for (int i = 0; i < es.length; i++) ((XModelEntityImpl)es[i]).validate(); +// makeStatistics(es); if(reportLoadingTime) { long dt = - t + (t = System.currentTimeMillis()); ModelPlugin.getPluginLog().logInfo("Meta model loaded in " + dt + " ms"); } } + private void makeStatistics(XModelEntity[] es) { + Set<String> attNames = new HashSet<String>(); + Set<String> listValues = new HashSet<String>(); + Set<String> actionMenuNames = new HashSet<String>(); + int attrCount = 0; + for (int i = 0; i < es.length; i++) { + XAttribute[] as = es[i].getAttributes(); + for (int j = 0; j < as.length; j++) { + if(!as[j].isVisible()) continue; + attrCount++; + attNames.add(as[j].getName()); + XAttributeConstraint c = as[j].getConstraint(); + if(c instanceof XAttributeConstraintAList) { + String[] values = ((XAttributeConstraintAList)c).getValues(); + for (int k = 0; k < values.length; k++) + listValues.add(values[k]); + } + } + + XActionList al = es[i].getActionList(); + makeActionList(al, actionMenuNames); + } + System.out.println("------> Attributes=" + attNames.size() + " (total " + attrCount + ")"); + System.out.println("------> List values=" + listValues.size()); + System.out.println("------> Action menu names=" + actionMenuNames.size()); + } + + private void makeActionList(XActionList list, Set<String> actionMenuNames) { + XActionItem[] is = list.getActionItems(); + for (int i = 0; i < is.length; i++) { + actionMenuNames.add(is[i].getName()); + if(is[i] instanceof XActionList) { + makeActionList((XActionList)is[i], actionMenuNames); + } + } + } + public XIconList getIconList() { return icons; } @@ -83,8 +123,9 @@ return extensions; } - public XModelEntity createEntity(Element element) { + public XModelEntity createEntity(Element element, String module) { XModelEntityImpl entity = new XModelEntityImpl(); + entity.setModule(module); entity.setElement(element); entities.put(entity.getName(), entity); return entity;

15 years, 5 months

1
0
0 / 0

JBoss Tools SVN: r11396 - trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/extractor.

by jbosstools-commits＠lists.jboss.org

Author: vyemialyanchyk Date: 2008-10-31 08:29:14 -0400 (Fri, 31 Oct 2008) New Revision: 11396 Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/extractor/HBMInfoExtractor.java Log: JBIDE-2960 - add check to prevent null pointer exception Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/extractor/HBMInfoExtractor.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/extractor/HBMInfoExtractor.java 2008-10-31 11:15:07 UTC (rev 11395) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/extractor/HBMInfoExtractor.java 2008-10-31 12:29:14 UTC (rev 11396) @@ -584,21 +584,23 @@ if(parentTypeName!=null) { String componentName = componentPropertyNodeName.getNodeValue(); IType parentType = project.findType(parentTypeName); - IField field = parentType.getField(componentName); - if(field.exists()) { - String fieldTypeSignature = field.getTypeSignature(); - String qualifier = Signature.getSignatureQualifier(fieldTypeSignature); - String simpleName = Signature.getSignatureSimpleName(fieldTypeSignature); - if(!StringHelper.isEmpty(qualifier)) { - simpleName = Signature.toQualifiedName(new String[] { qualifier, simpleName }); + if(parentType!=null) { // check to avoid null pointer exception + IField field = parentType.getField(componentName); + if(field.exists()) { + String fieldTypeSignature = field.getTypeSignature(); + String qualifier = Signature.getSignatureQualifier(fieldTypeSignature); + String simpleName = Signature.getSignatureSimpleName(fieldTypeSignature); + if(!StringHelper.isEmpty(qualifier)) { + simpleName = Signature.toQualifiedName(new String[] { qualifier, simpleName }); + } + + String[][] possibleTypes = null; + possibleTypes = parentType.resolveType(simpleName); + if(possibleTypes != null && possibleTypes.length>0) { + typename = Signature.toQualifiedName(possibleTypes[0]); + } + } - - String[][] possibleTypes = null; - possibleTypes = parentType.resolveType(simpleName); - if(possibleTypes != null && possibleTypes.length>0) { - typename = Signature.toQualifiedName(possibleTypes[0]); - } - } } }

15 years, 5 months

1
0
0 / 0

JBoss Tools SVN: r11395 - in trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor: ecore/pages/impl and 1 other directories.

by jbosstools-commits＠lists.jboss.org

Author: scabanovich Date: 2008-10-31 07:15:07 -0400 (Fri, 31 Oct 2008) New Revision: 11395 Modified: trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/ecore/pages/Page.java trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/ecore/pages/impl/PageImpl.java trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/PageWrapper.java trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/PagesDiagramEditPart.java trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/ParamEditPart.java trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/ParamListEditPart.java Log: JBIDE-3021 Modified: trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/ecore/pages/Page.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/ecore/pages/Page.java 2008-10-31 10:56:38 UTC (rev 11394) +++ trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/ecore/pages/Page.java 2008-10-31 11:15:07 UTC (rev 11395) @@ -1,5 +1,7 @@ package org.jboss.tools.seam.ui.pages.editor.ecore.pages; +import org.jboss.tools.seam.ui.pages.editor.edit.PageWrapper; + /** * @author daniel * @@ -40,4 +42,12 @@ * @generated */ void setParamsVisible(boolean value); + + /** + *  + *  + * @generated NOT + */ + public PageWrapper getParamList(); + } Modified: trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/ecore/pages/impl/PageImpl.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/ecore/pages/impl/PageImpl.java 2008-10-31 10:56:38 UTC (rev 11394) +++ trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/ecore/pages/impl/PageImpl.java 2008-10-31 11:15:07 UTC (rev 11395) @@ -25,6 +25,7 @@ import org.jboss.tools.seam.ui.pages.editor.ecore.pages.PagesFactory; import org.jboss.tools.seam.ui.pages.editor.ecore.pages.PagesPackage; import org.jboss.tools.seam.ui.pages.editor.ecore.pages.Param; +import org.jboss.tools.seam.ui.pages.editor.edit.PageWrapper; /** *  @@ -314,4 +315,20 @@ return ps; } + /** + *  + *  + * @generated NOT + */ + PageWrapper paramList = new PageWrapper(this); + + /** + *  + *  + * @generated NOT + */ + public PageWrapper getParamList() { + return paramList; + } + } //PageImpl Modified: trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/PageWrapper.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/PageWrapper.java 2008-10-31 10:56:38 UTC (rev 11394) +++ trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/PageWrapper.java 2008-10-31 11:15:07 UTC (rev 11395) @@ -12,4 +12,5 @@ public Page getPage(){ return page; } + } Modified: trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/PagesDiagramEditPart.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/PagesDiagramEditPart.java 2008-10-31 10:56:38 UTC (rev 11394) +++ trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/PagesDiagramEditPart.java 2008-10-31 11:15:07 UTC (rev 11395) @@ -239,7 +239,7 @@ if(getPagesModel().getChildren().get(i) instanceof Page){ Page page = (Page)getPagesModel().getChildren().get(i); if(page.getChildren().size() > 0 && page.isParamsVisible()){ - PageWrapper wrapper = new PageWrapper(page); + PageWrapper wrapper = page.getParamList(); list.add(wrapper); } } Modified: trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/ParamEditPart.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/ParamEditPart.java 2008-10-31 10:56:38 UTC (rev 11394) +++ trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/ParamEditPart.java 2008-10-31 11:15:07 UTC (rev 11395) @@ -25,6 +25,7 @@ import org.eclipse.gef.EditPartListener; import org.eclipse.gef.EditPolicy; import org.eclipse.gef.GraphicalEditPart; +import org.eclipse.gef.editparts.AbstractEditPart; import org.eclipse.swt.accessibility.AccessibleControlEvent; import org.eclipse.swt.accessibility.AccessibleEvent; import org.jboss.tools.seam.ui.pages.editor.ecore.pages.Param; @@ -171,6 +172,9 @@ public void notifyChanged(Notification notification) { refresh(); refreshVisuals(); + if(getParent() instanceof ParamListEditPart) { + ((ParamListEditPart)getParent()).refreshSizeAndLocation(); + } } /** * ) Modified: trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/ParamListEditPart.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/ParamListEditPart.java 2008-10-31 10:56:38 UTC (rev 11394) +++ trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/ParamListEditPart.java 2008-10-31 11:15:07 UTC (rev 11395) @@ -123,6 +123,16 @@ } protected void refreshVisuals() { + refreshSizeAndLocation(); + + if(getParent() != null){ + ((PagesDiagramEditPart) ParamListEditPart.this.getParent()) + .setToFront(this); + } + + } + + void refreshSizeAndLocation() { Point loc = getPageWrapperModel().getPage().getLocation().getCopy(); int links = getPageWrapperModel().getPage().getOutputLinks().size(); if(links == 0) @@ -136,11 +146,7 @@ if(getParent() != null){ ((GraphicalEditPart) getParent()).setLayoutConstraint(this, getFigure(), r); - - ((PagesDiagramEditPart) ParamListEditPart.this.getParent()) - .setToFront(this); } - } protected List getModelChildren() {

15 years, 5 months

1
0
0 / 0

JBoss Tools SVN: r11394 - workspace/examples.

by jbosstools-commits＠lists.jboss.org

Author: dennyxu Date: 2008-10-31 06:56:38 -0400 (Fri, 31 Oct 2008) New Revision: 11394 Modified: workspace/examples/projectExamples.xml Log: add ESB helloworld action sample Modified: workspace/examples/projectExamples.xml =================================================================== --- workspace/examples/projectExamples.xml 2008-10-31 10:56:13 UTC (rev 11393) +++ workspace/examples/projectExamples.xml 2008-10-31 10:56:38 UTC (rev 11394) @@ -170,7 +170,7 @@ <description>This sample is to test the deployed helloworld_action ESB. It requires the helloworld_action project</description> <size>71000</size> <url> - http://anonsvn.jboss.org/repos/jbosstools/workspace/Denny/esb-example/hel... + http://anonsvn.jboss.org/repos/jbosstools/workspace/Denny/esb-example/hel... </url> </project>

15 years, 5 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

jbosstools-commits October 2008