October 2008 - jbosstools-commits

JBoss Tools SVN: r11056 - in trunk/jsf/plugins: org.jboss.tools.jsf.vpe.jsf/templates and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: dsakovich Date: 2008-10-21 12:01:18 -0400 (Tue, 21 Oct 2008) New Revision: 11056 Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.ajax4jsf/templates/vpe-templates-ajax4jsf.xml trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/templates/vpe-templates-jsf.xml Log: correct h:commandButton and a4j:commandButton Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.ajax4jsf/templates/vpe-templates-ajax4jsf.xml =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.ajax4jsf/templates/vpe-templates-ajax4jsf.xml 2008-10-21 15:11:46 UTC (rev 11055) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.ajax4jsf/templates/vpe-templates-ajax4jsf.xml 2008-10-21 16:01:18 UTC (rev 11056) @@ -1,234 +1,235 @@ -<?xml version="1.0" encoding="UTF-8"?> -<vpe:templates xmlns:vpe="http://org.jboss.org/tools/vpe/template" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <vpe:template-taglib uri="https://ajax4jsf.dev.java.net/ajax" prefix="a4j" /> - <vpe:template-taglib uri="http://richfaces.org/a4j" prefix="a4j" /> - - <vpe:tag name="a4j:page" case-sensitive="yes"> - <vpe:template children="yes" modify="yes"> - <vpe:copy attrs="id,style,dir"/> - <vpe:resize> - <vpe:width width-attr="style.width" /> - <vpe:height height-attr="style.height" /> - </vpe:resize> - <vpe:dnd> - <vpe:drag start-enable="yes" /> - <vpe:drop container="yes" /> - </vpe:dnd> - </vpe:template> - </vpe:tag> - - <vpe:tag name="a4j:region" case-sensitive="yes"> - <vpe:template children="yes" modify="yes"> - <vpe:copy attrs="id"/> - <vpe:resize> - <vpe:width width-attr="style.width" /> - <vpe:height height-attr="style.height" /> - </vpe:resize> - <vpe:dnd> - <vpe:drag start-enable="yes" /> - <vpe:drop container="yes" /> - </vpe:dnd> - </vpe:template> - </vpe:tag> - - <vpe:tag name="a4j:ajaxListener" case-sensitive="yes"> - <vpe:template children="no" modify="no" > - </vpe:template> - </vpe:tag> - - <vpe:tag name="a4j:keepAlive" case-sensitive="yes"> - <vpe:template children="no" modify="no"> - <vpe:value expr="{@beanName}"/> - </vpe:template> - </vpe:tag> - - <vpe:tag name="a4j:support" case-sensitive="yes"> - <vpe:template children="no" modify="no" /> - </vpe:tag> - - <vpe:tag name="a4j:poll" case-sensitive="yes"> - <vpe:template children="no" modify="no" > - </vpe:template> - </vpe:tag> - - <vpe:tag name="a4j:commandLink" case-sensitive="yes"> - <vpe:template children="yes" modify="yes"> - - <vpe:value expr="{jsfvalue(@value)}"/> - - <vpe:dnd> - <vpe:drag start-enable="yes"/> - <vpe:drop container="yes"> - <vpe:container-child tag-name="outputText"/> - </vpe:drop> - </vpe:dnd> - <vpe:textFormatting use-default-formats="yes"> - <vpe:format type="UnderlineFormat" setDefault="true"> - <vpe:formatAttribute type="style"/> - </vpe:format> - </vpe:textFormatting> - <vpe:pseudoContent/> - </vpe:template> - </vpe:tag> - - <vpe:tag name="a4j:commandButton" case-sensitive="yes"> - <vpe:if test="not(attrpresent('image'))"> - <vpe:if test="(@type='')"> - <vpe:template children="no" modify="no"> - <input type="button" value="{jsfvalue(@value)}" class="{@styleClass}" style="{@style}" title="{tagstring()}"/> - <vpe:resize> - <vpe:width width-attr="style.width" /> - <vpe:height height-attr="style.height" /> - </vpe:resize> - <vpe:dnd> - <vpe:drag start-enable="yes"/> - </vpe:dnd> - <vpe:textFormatting use-default-formats="yes"> - </vpe:textFormatting> - </vpe:template> - </vpe:if> - - <vpe:if test="not(@type='') "> - <vpe:template children="no" modify="no"> - <input type="{@type}" value="{jsfvalue(@value)}" class="{@styleClass}" style="{@style}" title="{tagstring()}"/> - <vpe:resize> - <vpe:width width-attr="style.width" /> - <vpe:height height-attr="style.height" /> - </vpe:resize> - <vpe:dnd> - <vpe:drag start-enable="yes"/> - </vpe:dnd> - <vpe:textFormatting use-default-formats="yes"> - </vpe:textFormatting> - </vpe:template> - </vpe:if> - </vpe:if> - <vpe:if test="attrpresent('image')"> - <vpe:template children="no" modify="no"> - <input type="image" src="{src(@image)}" class="{@styleClass}" style="{@style}" title="{tagstring()}"/> - <vpe:resize> - <vpe:width width-attr="style.width" /> - <vpe:height height-attr="style.height" /> - </vpe:resize> - <vpe:textFormatting use-default-formats="yes"> - </vpe:textFormatting> - </vpe:template> - </vpe:if> - </vpe:tag> - - <vpe:tag name="a4j:outputPanel" case-sensitive="yes"> - <vpe:template children="yes" modify="yes"> - <div id="{@id}" style="{@style}" dir="{@dir}"/> - <vpe:resize> - <vpe:width width-attr="style.width" /> - <vpe:height height-attr="style.height" /> - </vpe:resize> - <vpe:dnd> - <vpe:drag start-enable="yes" /> - <vpe:drop container="yes" /> - </vpe:dnd> - </vpe:template> - </vpe:tag> - - <vpe:tag name="a4j:actionparam" case-sensitive="yes"> - <vpe:template children="no" modify="no" > - </vpe:template> - </vpe:tag> - - <vpe:tag name="a4j:status" case-sensitive="yes"> - <vpe:template children="yes" modify="yes"> - - <vpe:value expr=" {jsfvalue(@stopText)}"/> - - </vpe:template> - </vpe:tag> - - <vpe:tag name="a4j:loadBundle" case-sensitive="yes"> - <vpe:template children="no" modify="no"> - <vpe:load-bundle/> - </vpe:template> - </vpe:tag> - - <vpe:tag name="a4j:loadStyle" case-sensitive="yes"> - <vpe:template children="no" modify="no" > - <vpe:link rel="stylesheet" href="{href(@src)}" /> - </vpe:template> - </vpe:tag> - - <vpe:tag name="a4j:loadScript" case-sensitive="yes"> - <vpe:template children="no" modify="no" > - </vpe:template> - </vpe:tag> - - <vpe:tag name="a4j:jsFunction" case-sensitive="yes"> - <vpe:template children="no" modify="no" > - </vpe:template> - </vpe:tag> - - <vpe:tag name="a4j:mediaOutput" case-sensitive="yes"> - <vpe:template children="no" modify="no" - class="org.jboss.tools.jsf.vpe.ajax4jsf.template.Ajax4JSFMediaOutput"> - - </vpe:template> - </vpe:tag> - - <vpe:tag name="a4j:log" case-sensitive="yes"> - <vpe:template children="no" modify="no" > - </vpe:template> - </vpe:tag> - - <vpe:tag name="a4j:form" case-sensitive="yes"> - <vpe:template children="yes" modify="yes"> - <vpe:copy attrs="id"/> - <vpe:dnd> - <vpe:drag start-enable="yes" /> - <vpe:drop container="yes" /> - </vpe:dnd> - </vpe:template> - </vpe:tag> - - <vpe:tag name="a4j:htmlCommandLink" case-sensitive="yes"> - <vpe:template children="yes" modify="yes"> - - <vpe:value expr="{jsfvalue(@value)}"/> - - <vpe:dnd> - <vpe:drag start-enable="yes"/> - <vpe:drop container="yes"> - <vpe:container-child tag-name="outputText"/> - </vpe:drop> - </vpe:dnd> - <vpe:textFormatting use-default-formats="yes"> - <vpe:format type="BlockFormat" - handler="org.jboss.tools.vpe.editor.toolbar.format.handler.BlockFormatHandler" /> - <vpe:format type="UnderlineFormat" setDefault="true"> - <vpe:formatAttribute type="style"/> - </vpe:format> - </vpe:textFormatting> - <vpe:pseudoContent/> - </vpe:template> - </vpe:tag> - - <vpe:tag name="a4j:include" case-sensitive="yes"> +<?xml version="1.0" encoding="UTF-8"?> +<vpe:templates xmlns:vpe="http://org.jboss.org/tools/vpe/template" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <vpe:template-taglib uri="https://ajax4jsf.dev.java.net/ajax" prefix="a4j" /> + <vpe:template-taglib uri="http://richfaces.org/a4j" prefix="a4j" /> + + <vpe:tag name="a4j:page" case-sensitive="yes"> + <vpe:template children="yes" modify="yes"> + <vpe:copy attrs="id,style,dir"/> + <vpe:resize> + <vpe:width width-attr="style.width" /> + <vpe:height height-attr="style.height" /> + </vpe:resize> + <vpe:dnd> + <vpe:drag start-enable="yes" /> + <vpe:drop container="yes" /> + </vpe:dnd> + </vpe:template> + </vpe:tag> + + <vpe:tag name="a4j:region" case-sensitive="yes"> + <vpe:template children="yes" modify="yes"> + <vpe:copy attrs="id"/> + <vpe:resize> + <vpe:width width-attr="style.width" /> + <vpe:height height-attr="style.height" /> + </vpe:resize> + <vpe:dnd> + <vpe:drag start-enable="yes" /> + <vpe:drop container="yes" /> + </vpe:dnd> + </vpe:template> + </vpe:tag> + + <vpe:tag name="a4j:ajaxListener" case-sensitive="yes"> + <vpe:template children="no" modify="no" > + </vpe:template> + </vpe:tag> + + <vpe:tag name="a4j:keepAlive" case-sensitive="yes"> + <vpe:template children="no" modify="no"> + <vpe:value expr="{@beanName}"/> + </vpe:template> + </vpe:tag> + + <vpe:tag name="a4j:support" case-sensitive="yes"> + <vpe:template children="no" modify="no" /> + </vpe:tag> + + <vpe:tag name="a4j:poll" case-sensitive="yes"> + <vpe:template children="no" modify="no" > + </vpe:template> + </vpe:tag> + + <vpe:tag name="a4j:commandLink" case-sensitive="yes"> + <vpe:template children="yes" modify="yes"> + <vpe:a class="{@styleClass}" value="{jsfvalue(@value)}" + style="{@style}" dir="{@dir}" title="{tagstring()}"/> + <vpe:dnd> + <vpe:drag start-enable="yes"/> + <vpe:drop container="yes"> + <vpe:container-child tag-name="outputText"/> + </vpe:drop> + </vpe:dnd> + <vpe:textFormatting use-default-formats="yes"> + <vpe:format type="UnderlineFormat" setDefault="true"> + <vpe:formatAttribute type="style"/> + </vpe:format> + </vpe:textFormatting> + <vpe:pseudoContent/> + </vpe:template> + </vpe:tag> + + <vpe:tag name="a4j:commandButton" case-sensitive="yes"> + <vpe:if test="not(attrpresent('image'))"> + <vpe:if test="(@type='')"> + <vpe:template children="no" modify="no"> + <input type="button" value="{jsfvalue(@value)}" + class="{@styleClass}" style="{@style}" + title="{tagstring()}" dir="{@dir}"/> + <vpe:resize> + <vpe:width width-attr="style.width" /> + <vpe:height height-attr="style.height" /> + </vpe:resize> + <vpe:dnd> + <vpe:drag start-enable="yes"/> + </vpe:dnd> + <vpe:textFormatting use-default-formats="yes"> + </vpe:textFormatting> + </vpe:template> + </vpe:if> + <vpe:if test="not(@type='')"> + <vpe:template children="no" modify="no"> + <input type="{@type}" value="{jsfvalue(@value)}" + class="{@styleClass}" style="{@style}" + title="{tagstring()}" dir="{@dir}"/> + <vpe:resize> + <vpe:width width-attr="style.width" /> + <vpe:height height-attr="style.height" /> + </vpe:resize> + <vpe:dnd> + <vpe:drag start-enable="yes"/> + </vpe:dnd> + <vpe:textFormatting use-default-formats="yes"> + </vpe:textFormatting> + </vpe:template> + </vpe:if> + </vpe:if> + <vpe:if test="attrpresent('image')"> + <vpe:template children="no" modify="no"> + <input type="image" src="{src(@image)}" class="{@styleClass}" style="{@style}" title="{tagstring()}"/> + <vpe:resize> + <vpe:width width-attr="style.width" /> + <vpe:height height-attr="style.height" /> + </vpe:resize> + <vpe:textFormatting use-default-formats="yes"> + </vpe:textFormatting> + </vpe:template> + </vpe:if> + </vpe:tag> + + <vpe:tag name="a4j:outputPanel" case-sensitive="yes"> + <vpe:template children="yes" modify="yes"> + <div id="{@id}" style="{@style}" dir="{@dir}"/> + <vpe:resize> + <vpe:width width-attr="style.width" /> + <vpe:height height-attr="style.height" /> + </vpe:resize> + <vpe:dnd> + <vpe:drag start-enable="yes" /> + <vpe:drop container="yes" /> + </vpe:dnd> + </vpe:template> + </vpe:tag> + + <vpe:tag name="a4j:actionparam" case-sensitive="yes"> + <vpe:template children="no" modify="no" > + </vpe:template> + </vpe:tag> + + <vpe:tag name="a4j:status" case-sensitive="yes"> + <vpe:template children="yes" modify="yes"> + + <vpe:value expr=" {jsfvalue(@stopText)}"/> + + </vpe:template> + </vpe:tag> + + <vpe:tag name="a4j:loadBundle" case-sensitive="yes"> + <vpe:template children="no" modify="no"> + <vpe:load-bundle/> + </vpe:template> + </vpe:tag> + + <vpe:tag name="a4j:loadStyle" case-sensitive="yes"> + <vpe:template children="no" modify="no" > + <vpe:link rel="stylesheet" href="{href(@src)}" /> + </vpe:template> + </vpe:tag> + + <vpe:tag name="a4j:loadScript" case-sensitive="yes"> + <vpe:template children="no" modify="no" > + </vpe:template> + </vpe:tag> + + <vpe:tag name="a4j:jsFunction" case-sensitive="yes"> + <vpe:template children="no" modify="no" > + </vpe:template> + </vpe:tag> + + <vpe:tag name="a4j:mediaOutput" case-sensitive="yes"> + <vpe:template children="no" modify="no" + class="org.jboss.tools.jsf.vpe.ajax4jsf.template.Ajax4JSFMediaOutput"> + + </vpe:template> + </vpe:tag> + + <vpe:tag name="a4j:log" case-sensitive="yes"> + <vpe:template children="no" modify="no" > + </vpe:template> + </vpe:tag> + + <vpe:tag name="a4j:form" case-sensitive="yes"> + <vpe:template children="yes" modify="yes"> + <vpe:copy attrs="id"/> + <vpe:dnd> + <vpe:drag start-enable="yes" /> + <vpe:drop container="yes" /> + </vpe:dnd> + </vpe:template> + </vpe:tag> + + <vpe:tag name="a4j:htmlCommandLink" case-sensitive="yes"> + <vpe:template children="yes" modify="yes"> + <vpe:a class="{@styleClass}" value="{jsfvalue(@value)}" + style="{@style}" title="{tagstring()}" dir="{@dir}"/> + <vpe:dnd> + <vpe:drag start-enable="yes"/> + <vpe:drop container="yes"> + <vpe:container-child tag-name="outputText"/> + </vpe:drop> + </vpe:dnd> + <vpe:textFormatting use-default-formats="yes"> + <vpe:format type="BlockFormat" + handler="org.jboss.tools.vpe.editor.toolbar.format.handler.BlockFormatHandler" /> + <vpe:format type="UnderlineFormat" setDefault="true"> + <vpe:formatAttribute type="style"/> + </vpe:format> + </vpe:textFormatting> + <vpe:pseudoContent/> + </vpe:template> + </vpe:tag> + + <vpe:tag name="a4j:include" case-sensitive="yes"> <vpe:template children="yes" file="{@viewId}" class="org.jboss.tools.vpe.editor.template.VpeIncludeTemplate"/> - </vpe:tag> - - <vpe:tag name="a4j:repeat" case-sensitive="yes" haveVisualPreview="no"> + </vpe:tag> + + <vpe:tag name="a4j:repeat" case-sensitive="yes" haveVisualPreview="no"> <vpe:template children="yes" modify="yes" class="org.jboss.tools.jsf.vpe.ajax4jsf.template.Ajax4JSFReapeatTemplate"> - </vpe:template> + </vpe:template> </vpe:tag> - - <vpe:tag name="a4j:portlet" case-sensitive="yes"> - <vpe:template children="yes" modify="no"> - - - </vpe:template> - </vpe:tag> - - <vpe:tag name="a4j:push" case-sensitive="yes"> - <vpe:template children="no" modify="no" > - </vpe:template> - </vpe:tag> - + + <vpe:tag name="a4j:portlet" case-sensitive="yes"> + <vpe:template children="yes" modify="no"> + + + </vpe:template> + </vpe:tag> + + <vpe:tag name="a4j:push" case-sensitive="yes"> + <vpe:template children="no" modify="no" > + </vpe:template> + </vpe:tag> + </vpe:templates> \ No newline at end of file Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/templates/vpe-templates-jsf.xml =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/templates/vpe-templates-jsf.xml 2008-10-21 15:11:46 UTC (rev 11055) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/templates/vpe-templates-jsf.xml 2008-10-21 16:01:18 UTC (rev 11056) @@ -181,9 +181,11 @@  <vpe:tag name="h:commandButton" case-sensitive="yes"> <vpe:if test="not(attrpresent('image'))"> + <vpe:if test="(@type='')"> <vpe:template children="no" modify="no"> <input type="button" value="{iif(@value='',' ',jsfvalue(@value))}" - class="{@styleClass}" style="{@style}" title="{tagstring()}" /> + class="{@styleClass}" style="{@style}" + title="{tagstring()}" dir="{@dir}"/> <vpe:resize> <vpe:width width-attr="style.width" /> <vpe:height height-attr="style.height" /> @@ -194,6 +196,23 @@ <vpe:textFormatting use-default-formats="yes"> </vpe:textFormatting> </vpe:template> + </vpe:if> + <vpe:if test="not(@type='')"> + <vpe:template children="no" modify="no"> + <input type="{@type}" value="{iif(@value='',' ',jsfvalue(@value))}" + class="{@styleClass}" style="{@style}" + title="{tagstring()}" dir="{@dir}"/> + <vpe:resize> + <vpe:width width-attr="style.width" /> + <vpe:height height-attr="style.height" /> + </vpe:resize> + <vpe:dnd> + <vpe:drag start-enable="yes" /> + </vpe:dnd> + <vpe:textFormatting use-default-formats="yes"> + </vpe:textFormatting> + </vpe:template> + </vpe:if> </vpe:if> <vpe:if test="attrpresent('image')"> <vpe:template children="no" modify="no"> @@ -460,19 +479,19 @@ </vpe:template> </vpe:if> <vpe:if - test="hasinparents('t:selectManyMenu')| - hasinparents('x:selectOneRadio')| - hasinparents('x:selectOneMenu')"> -  - <vpe:template children="no" modify="yes"> - <option value="{@itemValue}" title="{tagstring()}"> - <vpe:value expr="{jsfvalue(@itemLabel)}" /> - </option> - </vpe:template> - </vpe:if> - </vpe:tag> - - <vpe:tag name="f:selectItems" case-sensitive="yes"> + test="hasinparents('t:selectManyMenu')| + hasinparents('x:selectOneRadio')| + hasinparents('x:selectOneMenu')"> +  + <vpe:template children="no" modify="yes"> + <option value="{@itemValue}" title="{tagstring()}"> + <vpe:value expr="{jsfvalue(@itemLabel)}" /> + </option> + </vpe:template> + </vpe:if> + </vpe:tag> + + <vpe:tag name="f:selectItems" case-sensitive="yes"> <vpe:if test="hasinparents('h:selectManyCheckbox')|hasinparents('x:selectManyCheckbox')">  @@ -498,34 +517,34 @@ </vpe:template> </vpe:if> <vpe:if - test="hasinparents('h:selectOneListbox')| - hasinparents('h:selectManyListbox')| - hasinparents('h:selectOneMenu')| - hasinparents('h:selectManyMenu')| + test="hasinparents('h:selectOneListbox')| + hasinparents('h:selectManyListbox')| + hasinparents('h:selectOneMenu')| + hasinparents('h:selectManyMenu')| hasinparents('x:selectOneMenu')| - hasinparents('rich:pickList')"> - - <vpe:template children="no" modify="yes"> - <option value="{@itemValue}" title="{tagstring()}"> - <vpe:value expr="{jsfvalue(@value)}" /> - </option> - </vpe:template> - </vpe:if> - </vpe:tag> - - <vpe:tag name="h:selectOneMenu" case-sensitive="yes"> - <vpe:template children="yes" modify="no"> - <select></select> - <vpe:dnd> - <vpe:drag start-enable="yes" /> - </vpe:dnd> - </vpe:template> - </vpe:tag> - - <vpe:tag name="h:panelGroup" case-sensitive="yes"> - - <vpe:if test="@layout='block'"> - <vpe:template children="yes" modify="yes"> + hasinparents('rich:pickList')"> + + <vpe:template children="no" modify="yes"> + <option value="{@itemValue}" title="{tagstring()}"> + <vpe:value expr="{jsfvalue(@value)}" /> + </option> + </vpe:template> + </vpe:if> + </vpe:tag> + + <vpe:tag name="h:selectOneMenu" case-sensitive="yes"> + <vpe:template children="yes" modify="no"> + <select></select> + <vpe:dnd> + <vpe:drag start-enable="yes" /> + </vpe:dnd> + </vpe:template> + </vpe:tag> + + <vpe:tag name="h:panelGroup" case-sensitive="yes"> + + <vpe:if test="@layout='block'"> + <vpe:template children="yes" modify="yes"> <div style="{@style}" class="{@styleClass}" title="{tagstring()}" /> <vpe:breaker type="ignore" />

17 years, 2 months

1
0
0 / 0

JBoss Tools SVN: r11055 - branches/jbosstools-3.0.0.Beta1/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard.

by jbosstools-commits＠lists.jboss.org

Author: akazakov Date: 2008-10-21 11:11:46 -0400 (Tue, 21 Oct 2008) New Revision: 11055 Modified: branches/jbosstools-3.0.0.Beta1/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamProjectWizard.java Log: https://jira.jboss.org/jira/browse/JBIDE-2944 Fixed in trunk and brunch (3.0.0beta1) Modified: branches/jbosstools-3.0.0.Beta1/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamProjectWizard.java =================================================================== --- branches/jbosstools-3.0.0.Beta1/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamProjectWizard.java 2008-10-21 15:10:09 UTC (rev 11054) +++ branches/jbosstools-3.0.0.Beta1/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamProjectWizard.java 2008-10-21 15:11:46 UTC (rev 11055) @@ -340,6 +340,7 @@ newAddition = postAddition[0]; model.notifyPropertyChange(ISeamFacetDataModelProperties.JBOSS_AS_TARGET_SERVER, IDataModel.VALID_VALUES_CHG); + isPageComplete(); if (newAddition != null) model.setProperty(ISeamFacetDataModelProperties.JBOSS_AS_TARGET_SERVER, newAddition); else

17 years, 2 months

1
0
0 / 0

JBoss Tools SVN: r11054 - branches/jbosstools-3.0.0.Beta1/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/helpers.

by jbosstools-commits＠lists.jboss.org

Author: scabanovich Date: 2008-10-21 11:10:09 -0400 (Tue, 21 Oct 2008) New Revision: 11054 Modified: branches/jbosstools-3.0.0.Beta1/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/helpers/SeamPagesDiagramHelper.java Log: JBIDE-2780 Modified: branches/jbosstools-3.0.0.Beta1/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/helpers/SeamPagesDiagramHelper.java =================================================================== --- branches/jbosstools-3.0.0.Beta1/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/helpers/SeamPagesDiagramHelper.java 2008-10-21 15:08:11 UTC (rev 11053) +++ branches/jbosstools-3.0.0.Beta1/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/helpers/SeamPagesDiagramHelper.java 2008-10-21 15:10:09 UTC (rev 11054) @@ -222,6 +222,8 @@ return; } // if(item.isUpToDate()) return; + boolean iud = item.isUpToDate(); + long ts = item.getTimeStamp(); item.notifyUpdate(); XModelObject sourcePage = item.getReference(); item.setAttributeValue(ATTR_ID, sourcePage.getPathPart()); @@ -234,6 +236,9 @@ item.setAttributeValue("params", sb.toString()); XModelObject[] cs = getPageTargets(sourcePage); updateOutputs(item, cs); + if(!iud && ts == item.getTimeStamp()) { + item.fireReferenceChanged(); + } } private void updateUndeclaredPageItem(ReferenceObjectImpl item) {

17 years, 2 months

1
0
0 / 0

JBoss Tools SVN: r11053 - trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard.

by jbosstools-commits＠lists.jboss.org

Author: akazakov Date: 2008-10-21 11:08:11 -0400 (Tue, 21 Oct 2008) New Revision: 11053 Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamProjectWizard.java Log: https://jira.jboss.org/jira/browse/JBIDE-2944 Fixed in trunk and brunch (3.0.0beta1) Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamProjectWizard.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamProjectWizard.java 2008-10-21 15:07:42 UTC (rev 11052) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamProjectWizard.java 2008-10-21 15:08:11 UTC (rev 11053) @@ -340,6 +340,7 @@ newAddition = postAddition[0]; model.notifyPropertyChange(ISeamFacetDataModelProperties.JBOSS_AS_TARGET_SERVER, IDataModel.VALID_VALUES_CHG); + isPageComplete(); if (newAddition != null) model.setProperty(ISeamFacetDataModelProperties.JBOSS_AS_TARGET_SERVER, newAddition); else

17 years, 2 months

1
0
0 / 0

JBoss Tools SVN: r11052 - trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/helpers.

by jbosstools-commits＠lists.jboss.org

Author: scabanovich Date: 2008-10-21 11:07:42 -0400 (Tue, 21 Oct 2008) New Revision: 11052 Modified: trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/helpers/SeamPagesDiagramHelper.java Log: JBIDE-2780 Modified: trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/helpers/SeamPagesDiagramHelper.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/helpers/SeamPagesDiagramHelper.java 2008-10-21 15:02:30 UTC (rev 11051) +++ trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/helpers/SeamPagesDiagramHelper.java 2008-10-21 15:07:42 UTC (rev 11052) @@ -222,6 +222,8 @@ return; } // if(item.isUpToDate()) return; + boolean iud = item.isUpToDate(); + long ts = item.getTimeStamp(); item.notifyUpdate(); XModelObject sourcePage = item.getReference(); item.setAttributeValue(ATTR_ID, sourcePage.getPathPart()); @@ -234,6 +236,9 @@ item.setAttributeValue("params", sb.toString()); XModelObject[] cs = getPageTargets(sourcePage); updateOutputs(item, cs); + if(!iud && ts == item.getTimeStamp()) { + item.fireReferenceChanged(); + } } private void updateUndeclaredPageItem(ReferenceObjectImpl item) {

17 years, 2 months

1
0
0 / 0

JBoss Tools SVN: r11051 - in trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test: src/org/jboss/tools/jsf/vpe/richfaces/test and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: dmaliarevich Date: 2008-10-21 11:02:30 -0400 (Tue, 21 Oct 2008) New Revision: 11051 Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/insert.xhtml.xml trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/jQuery.xhtml Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/insert.xhtml trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesComponentContentTest.java Log: https://jira.jboss.org/jira/browse/JBIDE-2810, tests for rich:insert and rich:jQuery. Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/insert.xhtml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/insert.xhtml 2008-10-21 14:50:18 UTC (rev 11050) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/insert.xhtml 2008-10-21 15:02:30 UTC (rev 11051) @@ -9,7 +9,9 @@ <head> </head> <body> -  - <rich:insert></rich:insert> +<f:view> + <rich:insert id="insert" src="/richfaces/insert/snippets/sample.groovy" + highlight="groovy" /> +</f:view> </body> </html> \ No newline at end of file Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/insert.xhtml.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/insert.xhtml.xml (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/insert.xhtml.xml 2008-10-21 15:02:30 UTC (rev 11051) @@ -0,0 +1,9 @@ +<tests> + <test id="insert"> + <DIV STYLE="color: red; font-weight: bold;"> + Resource reading error. + + </DIV> + </test> +</tests> \ No newline at end of file Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/insert.xhtml.xml ___________________________________________________________________ Name: svn:mime-type + text/xml Name: svn:eol-style + native Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/jQuery.xhtml =================================================================== (Binary files differ) Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/jQuery.xhtml ___________________________________________________________________ Name: svn:mime-type + application/xhtml+xml Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesComponentContentTest.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesComponentContentTest.java 2008-10-21 14:50:18 UTC (rev 11050) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesComponentContentTest.java 2008-10-21 15:02:30 UTC (rev 11051) @@ -188,11 +188,11 @@ } public void testInsert() throws Throwable { - assertTrue("it is necessary to add a body of the test ", false);//$NON-NLS-1$ + performContentTest("components/insert.xhtml");//$NON-NLS-1$ } public void testJQuery() throws Throwable { - assertTrue("it is necessary to add a body of the test ", false);//$NON-NLS-1$ + performInvisibleTagTest("components/jQuery.xhtml", "jQuery"); //$NON-NLS-1$ //$NON-NLS-2$ } public void testListShuttle() throws Throwable {

17 years, 2 months

1
0
0 / 0

JBoss Tools SVN: r11050 - branches/jbosstools-3.0.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.core.

by jbosstools-commits＠lists.jboss.org

Author: akazakov Date: 2008-10-21 10:50:18 -0400 (Tue, 21 Oct 2008) New Revision: 11050 Modified: branches/jbosstools-3.0.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml Log: https://jira.jboss.org/jira/browse/JBIDE-2944 Remove seam and jsf facets from JBoss AS default configuration. Fixed in trunk and brunch (3.0.0beta1) Modified: branches/jbosstools-3.0.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml =================================================================== --- branches/jbosstools-3.0.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml 2008-10-21 14:47:29 UTC (rev 11049) +++ branches/jbosstools-3.0.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml 2008-10-21 14:50:18 UTC (rev 11050) @@ -502,14 +502,6 @@ id="jst.java" version="5.0"> </facet> - <facet - id="jst.jsf" - version="1.2"> - </facet> - <facet - id="jst.seam" - version="1.2"> - </facet> </default-facets> </extension> <extension

17 years, 2 months

1
0
0 / 0

JBoss Tools SVN: r11049 - trunk/as/plugins/org.jboss.ide.eclipse.as.core.

by jbosstools-commits＠lists.jboss.org

Author: akazakov Date: 2008-10-21 10:47:29 -0400 (Tue, 21 Oct 2008) New Revision: 11049 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml Log: https://jira.jboss.org/jira/browse/JBIDE-2944 Remove seam and jsf facets from JBoss AS default configuration. Fixed in trunk and brunch (3.0.0beta1) Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml 2008-10-21 13:28:33 UTC (rev 11048) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml 2008-10-21 14:47:29 UTC (rev 11049) @@ -502,14 +502,6 @@ id="jst.java" version="5.0"> </facet> - <facet - id="jst.jsf" - version="1.2"> - </facet> - <facet - id="jst.seam" - version="1.2"> - </facet> </default-facets> </extension> <extension

17 years, 2 months

1
0
0 / 0

JBoss Tools SVN: r11048 - trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test.

by jbosstools-commits＠lists.jboss.org

Author: dmaliarevich Date: 2008-10-21 09:28:33 -0400 (Tue, 21 Oct 2008) New Revision: 11048 Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/hotkey.xhtml Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesComponentContentTest.java Log: https://jira.jboss.org/jira/browse/JBIDE-2810, tests for rich:hotkey , rich:inplaceInput, rich:inplaceSelect, rich:inputNumberSlider, rich:inputNumberSpinner. Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesComponentContentTest.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesComponentContentTest.java 2008-10-21 13:27:42 UTC (rev 11047) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesComponentContentTest.java 2008-10-21 13:28:33 UTC (rev 11048) @@ -168,23 +168,23 @@ } public void testHotKey() throws Throwable { - assertTrue("it is necessary to add a body of the test ", false);//$NON-NLS-1$ + performInvisibleTagTest("components/hotkey.xhtml", "hotkey"); //$NON-NLS-1$ //$NON-NLS-2$ } public void testInplaceInput() throws Throwable { - assertTrue("it is necessary to add a body of the test ", false);//$NON-NLS-1$ + performContentTest("components/inplaceInput.xhtml");//$NON-NLS-1$ } public void testInplaceSelect() throws Throwable { - assertTrue("it is necessary to add a body of the test ", false);//$NON-NLS-1$ + performContentTest("components/inplaceSelect.xhtml");//$NON-NLS-1$ } public void testInputNumberSlider() throws Throwable { - assertTrue("it is necessary to add a body of the test ", false);//$NON-NLS-1$ + performContentTest("components/inputNumberSlider.xhtml");//$NON-NLS-1$ } public void testInputNumberSpinner() throws Throwable { - assertTrue("it is necessary to add a body of the test ", false);//$NON-NLS-1$ + performContentTest("components/inputNumberSpinner.xhtml");//$NON-NLS-1$ } public void testInsert() throws Throwable { Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/hotkey.xhtml =================================================================== (Binary files differ) Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/hotkey.xhtml ___________________________________________________________________ Name: svn:mime-type + application/xhtml+xml

17 years, 2 months

1
0
0 / 0

JBoss Tools SVN: r11047 - 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-21 09:27:42 -0400 (Tue, 21 Oct 2008) New Revision: 11047 Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/hotkey.xhtml trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/inplaceInput.xhtml trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/inplaceInput.xhtml.xml trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/inplaceSelect.xhtml trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/inplaceSelect.xhtml.xml trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/inputNumberSlider.xhtml.xml trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/inputNumberSpinner.xhtml.xml Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/inputNumberSlider.xhtml trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/inputNumberSpinner.xhtml Log: https://jira.jboss.org/jira/browse/JBIDE-2810, tests for rich:hotkey , rich:inplaceInput, rich:inplaceSelect, rich:inputNumberSlider, rich:inputNumberSpinner. Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/hotkey.xhtml =================================================================== (Binary files differ) Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/hotkey.xhtml ___________________________________________________________________ Name: svn:mime-type + application/xhtml+xml Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/inplaceInput.xhtml =================================================================== (Binary files differ) Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/inplaceInput.xhtml ___________________________________________________________________ Name: svn:mime-type + application/xhtml+xml Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/inplaceInput.xhtml.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/inplaceInput.xhtml.xml (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/inplaceInput.xhtml.xml 2008-10-21 13:27:42 UTC (rev 11047) @@ -0,0 +1,6 @@ +<tests> + <test id="inplaceInput"> + click to enter your name + </test> +</tests> \ No newline at end of file Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/inplaceInput.xhtml.xml ___________________________________________________________________ Name: svn:mime-type + text/xml Name: svn:eol-style + native Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/inplaceSelect.xhtml =================================================================== (Binary files differ) Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/inplaceSelect.xhtml ___________________________________________________________________ Name: svn:mime-type + application/xhtml+xml Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/inplaceSelect.xhtml.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/inplaceSelect.xhtml.xml (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/inplaceSelect.xhtml.xml 2008-10-21 13:27:42 UTC (rev 11047) @@ -0,0 +1,6 @@ +<tests> + <test id="inplaceSelect"> + Click here to edit + </test> +</tests> \ No newline at end of file Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/inplaceSelect.xhtml.xml ___________________________________________________________________ Name: svn:mime-type + text/xml Name: svn:eol-style + native Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/inputNumberSlider.xhtml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/inputNumberSlider.xhtml 2008-10-21 13:27:25 UTC (rev 11046) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/inputNumberSlider.xhtml 2008-10-21 13:27:42 UTC (rev 11047) @@ -9,8 +9,7 @@ <head> </head> <body> -  - <rich:inputNumberSlider maxValue="50"> + <rich:inputNumberSlider id="inputNumberSlider" value="50"> </rich:inputNumberSlider> </body> </html> \ No newline at end of file Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/inputNumberSlider.xhtml.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/inputNumberSlider.xhtml.xml (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/inputNumberSlider.xhtml.xml 2008-10-21 13:27:42 UTC (rev 11047) @@ -0,0 +1,36 @@ +<tests> + <test id="inputNumberSlider"> + <TABLE CELLSPACING="0" CELLPADDING="0" BORDER="0" CLASS="dr-insldr rich-slider"> + <TR> + <TD CLASS="dr-insldr-left-num rich-inslider-left-num"> 0</TD> + <TD CLASS="dr-insldr-right-num rich-inslider-right-num"> 100</TD> + <TD STYLE="text-align: left; vertical-align: bottom;" ROWSPAN="2"> + <INPUT TYPE="text" SIZE="3" + STYLE="/background-image: url$.*org.jboss.tools.jsf.vpe.richfaces/resources/inputNumberSlider/input.gif$;/" + VALUE="50" CLASS="dr-insldr-field dr-insldr-field-right rich-inslider-field"/> + </TD> + </TR> + <TR> + <TD CLASS="dr-insldr-size dr-insldr-vert-spacer" COLSPAN="2"> + <DIV STYLE="position: relative;"> + <DIV CLASS="dr-insldr-handler rich-inslider-handler" + STYLE="/background-image: url$.*org.jboss.tools.jsf.vpe.richfaces/resources/inputNumberSlider/handler.gif$;/"> + </DIV> + </DIV> + <DIV CLASS="dr-insldr-track rich-inslider-track" + STYLE="/background-image: url$.*org.jboss.tools.jsf.vpe.richfaces/resources/inputNumberSlider/track.gif$;/"> + <TABLE CELLSPACING="0" CELLPADDING="0" CLASS="dr-insldr-track-decor-1"> + <TR> + <TD CLASS="dr-insldr-track-decor-2"> + <IMG + SRC="/.*org.jboss.tools.jsf.vpe.richfaces/resources/inputNumberSlider/spacer.gif/" + STYLE="display: block;"/> + </TD> + </TR> + </TABLE> + </DIV> + </TD> + </TR> + </TABLE> + </test> +</tests> \ No newline at end of file Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/inputNumberSlider.xhtml.xml ___________________________________________________________________ Name: svn:mime-type + text/xml Name: svn:eol-style + native Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/inputNumberSpinner.xhtml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/inputNumberSpinner.xhtml 2008-10-21 13:27:25 UTC (rev 11046) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/inputNumberSpinner.xhtml 2008-10-21 13:27:42 UTC (rev 11047) @@ -9,8 +9,7 @@ <head> </head> <body> -  - <rich:inputNumberSpinner minValue="1" maxValue="50"> + <rich:inputNumberSpinner id="inputNumberSpinner" value="50"> </rich:inputNumberSpinner> </body> </html> \ No newline at end of file Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/inputNumberSpinner.xhtml.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/inputNumberSpinner.xhtml.xml (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/inputNumberSpinner.xhtml.xml 2008-10-21 13:27:42 UTC (rev 11047) @@ -0,0 +1,30 @@ +<tests> + <test id="inputNumberSpinner"> + <TABLE CELLSPACING="0" CELLPADDING="0" BORDER="0" > + <TR> + <TD VALIGN="top" CLASS="ins-dr-spnr-e"> + <INPUT TYPE="text" CLASS="ins-input" STYLE="" SIZE="10" + VALUE="50"/> + </TD> + <TD VALIGN="middle" CLASS="dr-spnr-b"> + <TABLE CELLSPACING="0" CELLPADDING="0" BORDER="0"> + <TR> + <TD> + <INPUT TYPE="image" BORDER="0" + SRC="/.*org.jboss.tools.jsf.vpe.richfaces/resources/inputNumberSpinner/up.gif/" + CLASS="dr-spnr-bn"/> + </TD> + </TR> + <TR> + <TD> + <INPUT TYPE="image" BORDER="0" + SRC="/.*org.jboss.tools.jsf.vpe.richfaces/resources/inputNumberSpinner/down.gif/" + CLASS="dr-spnr-bn"/> + </TD> + </TR> + </TABLE> + </TD> + </TR> + </TABLE> + </test> +</tests> \ No newline at end of file Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/inputNumberSpinner.xhtml.xml ___________________________________________________________________ Name: svn:mime-type + text/xml Name: svn:eol-style + native

17 years, 2 months

1
0
0 / 0

JBoss Tools SVN: r11046 - branches/jbosstools-3.0.0.Beta1/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor.

by jbosstools-commits＠lists.jboss.org

Author: scabanovich Date: 2008-10-21 09:27:25 -0400 (Tue, 21 Oct 2008) New Revision: 11046 Modified: branches/jbosstools-3.0.0.Beta1/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java Log: JBIDE-2894 Modified: branches/jbosstools-3.0.0.Beta1/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java =================================================================== --- branches/jbosstools-3.0.0.Beta1/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java 2008-10-21 13:24:58 UTC (rev 11045) +++ branches/jbosstools-3.0.0.Beta1/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java 2008-10-21 13:27:25 UTC (rev 11046) @@ -16,6 +16,7 @@ import java.util.Properties; import org.eclipse.core.resources.IFile; +import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; @@ -87,10 +88,12 @@ import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel; import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode; import org.jboss.tools.common.el.core.ELReferenceList; +import org.jboss.tools.common.model.XModel; import org.jboss.tools.common.model.XModelObject; import org.jboss.tools.common.model.event.XModelTreeEvent; import org.jboss.tools.common.model.event.XModelTreeListener; import org.jboss.tools.common.model.options.PreferenceModelUtilities; +import org.jboss.tools.common.model.project.IModelNature; import org.jboss.tools.common.model.ui.dnd.ModelTransfer; import org.jboss.tools.common.model.ui.editor.IModelObjectEditorInput; import org.jboss.tools.common.model.ui.editors.dnd.DropCommandFactory; @@ -111,6 +114,8 @@ import org.jboss.tools.jst.jsp.editor.IJSPTextEditor; import org.jboss.tools.jst.jsp.editor.IVisualController; import org.jboss.tools.jst.jsp.preferences.VpePreference; +import org.jboss.tools.jst.web.model.helpers.WebAppHelper; +import org.jboss.tools.jst.web.project.WebProject; import org.jboss.tools.jst.web.tld.TLDToPaletteHelper; import org.jboss.tools.jst.web.tld.TLDUtil; import org.jboss.tools.jst.web.tld.URIConstants; @@ -281,6 +286,22 @@ return; } sourceModel.addModelLifecycleListener(this); + + IEditorInput editorInput = pageContext.getEditPart().getEditorInput(); + if(editorInput instanceof IFileEditorInput) { + XModel xm = null; + IProject project = ((IFileEditorInput) editorInput).getFile() + .getProject(); + IModelNature mn = EclipseResourceUtil.getModelNature(project); + if (mn != null) { + xm = mn.getModel(); + } + if (xm != null) { + WebProject.getInstance(xm).getTaglibMapping().revalidate( + WebAppHelper.getWebApp(xm)); + } + } + IDOMDocument sourceDocument = sourceModel.getDocument(); visualBuilder.refreshExternalLinks(); visualBuilder.buildDom(sourceDocument);

17 years, 2 months

1
0
0 / 0

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

by jbosstools-commits＠lists.jboss.org

Author: scabanovich Date: 2008-10-21 09:24:58 -0400 (Tue, 21 Oct 2008) New Revision: 11045 Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java Log: JBIDE-2894 Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java 2008-10-21 13:21:56 UTC (rev 11044) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java 2008-10-21 13:24:58 UTC (rev 11045) @@ -287,15 +287,20 @@ } sourceModel.addModelLifecycleListener(this); - XModel xm = null; - IProject project = ((IFileEditorInput)pageContext.getEditPart().getEditorInput()).getFile().getProject(); - IModelNature mn = EclipseResourceUtil.getModelNature(project); - if(mn!=null) { - xm = mn.getModel(); + IEditorInput editorInput = pageContext.getEditPart().getEditorInput(); + if(editorInput instanceof IFileEditorInput) { + XModel xm = null; + IProject project = ((IFileEditorInput) editorInput).getFile() + .getProject(); + IModelNature mn = EclipseResourceUtil.getModelNature(project); + if (mn != null) { + xm = mn.getModel(); + } + if (xm != null) { + WebProject.getInstance(xm).getTaglibMapping().revalidate( + WebAppHelper.getWebApp(xm)); + } } - if(xm != null) { - WebProject.getInstance(xm).getTaglibMapping().revalidate(WebAppHelper.getWebApp(xm)); - } IDOMDocument sourceDocument = sourceModel.getDocument(); visualBuilder.refreshExternalLinks();

17 years, 2 months

1
0
0 / 0

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

by jbosstools-commits＠lists.jboss.org

Author: scabanovich Date: 2008-10-21 09:21:56 -0400 (Tue, 21 Oct 2008) New Revision: 11044 Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java Log: JBIDE-2894 Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java 2008-10-21 12:38:38 UTC (rev 11043) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java 2008-10-21 13:21:56 UTC (rev 11044) @@ -16,6 +16,7 @@ import java.util.Properties; import org.eclipse.core.resources.IFile; +import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; @@ -87,10 +88,12 @@ import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel; import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode; import org.jboss.tools.common.el.core.ELReferenceList; +import org.jboss.tools.common.model.XModel; import org.jboss.tools.common.model.XModelObject; import org.jboss.tools.common.model.event.XModelTreeEvent; import org.jboss.tools.common.model.event.XModelTreeListener; import org.jboss.tools.common.model.options.PreferenceModelUtilities; +import org.jboss.tools.common.model.project.IModelNature; import org.jboss.tools.common.model.ui.dnd.ModelTransfer; import org.jboss.tools.common.model.ui.editor.IModelObjectEditorInput; import org.jboss.tools.common.model.ui.editors.dnd.DropCommandFactory; @@ -111,6 +114,8 @@ import org.jboss.tools.jst.jsp.editor.IJSPTextEditor; import org.jboss.tools.jst.jsp.editor.IVisualController; import org.jboss.tools.jst.jsp.preferences.VpePreference; +import org.jboss.tools.jst.web.model.helpers.WebAppHelper; +import org.jboss.tools.jst.web.project.WebProject; import org.jboss.tools.jst.web.tld.TLDToPaletteHelper; import org.jboss.tools.jst.web.tld.TLDUtil; import org.jboss.tools.jst.web.tld.URIConstants; @@ -281,6 +286,17 @@ return; } sourceModel.addModelLifecycleListener(this); + + XModel xm = null; + IProject project = ((IFileEditorInput)pageContext.getEditPart().getEditorInput()).getFile().getProject(); + IModelNature mn = EclipseResourceUtil.getModelNature(project); + if(mn!=null) { + xm = mn.getModel(); + } + if(xm != null) { + WebProject.getInstance(xm).getTaglibMapping().revalidate(WebAppHelper.getWebApp(xm)); + } + IDOMDocument sourceDocument = sourceModel.getDocument(); visualBuilder.refreshExternalLinks(); visualBuilder.buildDom(sourceDocument);

17 years, 2 months

1
0
0 / 0

JBoss Tools SVN: r11043 - branches/jbosstools-3.0.0.Beta1/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/utils.

by jbosstools-commits＠lists.jboss.org

Author: dgeraskov Date: 2008-10-21 08:38:38 -0400 (Tue, 21 Oct 2008) New Revision: 11043 Modified: branches/jbosstools-3.0.0.Beta1/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/utils/DriverClassHelpers.java Log: https://jira.jboss.org/jira/browse/JBIDE-2931 Modified: branches/jbosstools-3.0.0.Beta1/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/utils/DriverClassHelpers.java =================================================================== --- branches/jbosstools-3.0.0.Beta1/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/utils/DriverClassHelpers.java 2008-10-21 12:38:33 UTC (rev 11042) +++ branches/jbosstools-3.0.0.Beta1/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/utils/DriverClassHelpers.java 2008-10-21 12:38:38 UTC (rev 11043) @@ -25,11 +25,11 @@ import java.util.Collections; import java.util.HashMap; import java.util.HashSet; +import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Set; -import org.eclipse.core.runtime.IPath; /** * @author max @@ -260,6 +260,15 @@ return (String[]) list.toArray(new String[list.size()]); } + public String getShortDialectName(String fullName) { + Iterator keyIterator = dialectNames.keySet().iterator(); + while (keyIterator.hasNext()){ + String key = (String)keyIterator.next(); + if (dialectNames.get(key).equals(fullName)) return key; + } + return null; + } + /** * * @param dialectName

17 years, 2 months

1
0
0 / 0

JBoss Tools SVN: r11042 - branches/jbosstools-3.0.0.Beta1/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/persistence/details.

by jbosstools-commits＠lists.jboss.org

Author: dgeraskov Date: 2008-10-21 08:38:33 -0400 (Tue, 21 Oct 2008) New Revision: 11042 Modified: branches/jbosstools-3.0.0.Beta1/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/persistence/details/HibernatePropertiesComposite.java Log: https://jira.jboss.org/jira/browse/JBIDE-2931 Modified: branches/jbosstools-3.0.0.Beta1/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/persistence/details/HibernatePropertiesComposite.java =================================================================== --- branches/jbosstools-3.0.0.Beta1/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/persistence/details/HibernatePropertiesComposite.java 2008-10-21 12:36:36 UTC (rev 11041) +++ branches/jbosstools-3.0.0.Beta1/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/persistence/details/HibernatePropertiesComposite.java 2008-10-21 12:38:33 UTC (rev 11042) @@ -43,6 +43,8 @@ JpaPageComposite<PersistenceUnit> { private Text cfgFile; + + DriverClassHelpers helper; /** * @param subjectHolder @@ -54,11 +56,11 @@ super(subjectHolder, container, widgetFactory); } - protected void initializeLayout(Composite container) { + protected void initializeLayout(Composite container) { - final DriverClassHelpers helper = new DriverClassHelpers(); - Composite section = buildSection(container, "Basic properties"); + + helper = new DriverClassHelpers(); final SimpleListValueModel<String> lvmDialect = new SimpleListValueModel<String>(Arrays.asList(helper .getDialectNames())); @@ -82,8 +84,8 @@ final SimpleListValueModel<String> lvmUrl = new SimpleListValueModel<String>(urls); WritablePropertyValueModel<String> dialectHolder = buildDialectHolder(); - WritablePropertyValueModel<String> driverHolder = buildDriverHolder(); - WritablePropertyValueModel<String> urlHolder = buildUrlHolder(); + final WritablePropertyValueModel<String> driverHolder = buildDriverHolder(); + final WritablePropertyValueModel<String> urlHolder = buildUrlHolder(); Button b = buildButton(section, HibernateConsoleMessages.CodeGenerationSettingsTab_browse, createSetupAction()); cfgFile = buildLabeledText(section, @@ -115,8 +117,10 @@ public void propertyChanged(PropertyChangeEvent event) { String dialectClass = helper.getDialectClass((String) event.getNewValue()); String[] driverClasses = helper.getDriverClasses(dialectClass); + String driver = driverHolder.getValue();//save value lvmDriver.clear(); lvmDriver.addAll(Arrays.asList(driverClasses)); + driverHolder.setValue(driver); //restore value } }); @@ -124,8 +128,10 @@ public void propertyChanged(PropertyChangeEvent event) { String driverClass = helper.getDialectClass((String) event.getNewValue()); String[] connectionURLS = helper.getConnectionURLS(driverClass); + String url = urlHolder.getValue();//save value lvmUrl.clear(); lvmUrl.addAll(Arrays.asList(connectionURLS)); + urlHolder.setValue(url); //restore value } }); @@ -193,13 +199,18 @@ BasicHibernateProperties.DIALECT_PROPERTY) { @Override protected String buildValue_() { - return subject.getDialect(); + String dialect = subject.getDialect(); + String value = helper.getShortDialectName(dialect); + if (value == null) value = dialect; + return value; } @Override protected void setValue_(String value) { if ("".equals(value))value = null; //$NON-NLS-1$ - subject.setDialect(value); + String dialect = helper.getDialectClass(value); + if (dialect == null) dialect = value; + subject.setDialect(dialect); } }; }

17 years, 2 months

1
0
0 / 0

JBoss Tools SVN: r11041 - trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/persistence/details.

by jbosstools-commits＠lists.jboss.org

Author: dgeraskov Date: 2008-10-21 08:36:36 -0400 (Tue, 21 Oct 2008) New Revision: 11041 Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/persistence/details/HibernatePropertiesComposite.java Log: https://jira.jboss.org/jira/browse/JBIDE-2931 Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/persistence/details/HibernatePropertiesComposite.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/persistence/details/HibernatePropertiesComposite.java 2008-10-21 12:36:31 UTC (rev 11040) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/persistence/details/HibernatePropertiesComposite.java 2008-10-21 12:36:36 UTC (rev 11041) @@ -43,6 +43,8 @@ JpaPageComposite<PersistenceUnit> { private Text cfgFile; + + DriverClassHelpers helper; /** * @param subjectHolder @@ -54,11 +56,11 @@ super(subjectHolder, container, widgetFactory); } - protected void initializeLayout(Composite container) { + protected void initializeLayout(Composite container) { - final DriverClassHelpers helper = new DriverClassHelpers(); - Composite section = buildSection(container, "Basic properties"); + + helper = new DriverClassHelpers(); final SimpleListValueModel<String> lvmDialect = new SimpleListValueModel<String>(Arrays.asList(helper .getDialectNames())); @@ -82,8 +84,8 @@ final SimpleListValueModel<String> lvmUrl = new SimpleListValueModel<String>(urls); WritablePropertyValueModel<String> dialectHolder = buildDialectHolder(); - WritablePropertyValueModel<String> driverHolder = buildDriverHolder(); - WritablePropertyValueModel<String> urlHolder = buildUrlHolder(); + final WritablePropertyValueModel<String> driverHolder = buildDriverHolder(); + final WritablePropertyValueModel<String> urlHolder = buildUrlHolder(); Button b = buildButton(section, HibernateConsoleMessages.CodeGenerationSettingsTab_browse, createSetupAction()); cfgFile = buildLabeledText(section, @@ -115,8 +117,10 @@ public void propertyChanged(PropertyChangeEvent event) { String dialectClass = helper.getDialectClass((String) event.getNewValue()); String[] driverClasses = helper.getDriverClasses(dialectClass); + String driver = driverHolder.getValue();//save value lvmDriver.clear(); lvmDriver.addAll(Arrays.asList(driverClasses)); + driverHolder.setValue(driver); //restore value } }); @@ -124,8 +128,10 @@ public void propertyChanged(PropertyChangeEvent event) { String driverClass = helper.getDialectClass((String) event.getNewValue()); String[] connectionURLS = helper.getConnectionURLS(driverClass); + String url = urlHolder.getValue();//save value lvmUrl.clear(); lvmUrl.addAll(Arrays.asList(connectionURLS)); + urlHolder.setValue(url); //restore value } }); @@ -193,13 +199,18 @@ BasicHibernateProperties.DIALECT_PROPERTY) { @Override protected String buildValue_() { - return subject.getDialect(); + String dialect = subject.getDialect(); + String value = helper.getShortDialectName(dialect); + if (value == null) value = dialect; + return value; } @Override protected void setValue_(String value) { if ("".equals(value))value = null; //$NON-NLS-1$ - subject.setDialect(value); + String dialect = helper.getDialectClass(value); + if (dialect == null) dialect = value; + subject.setDialect(dialect); } }; }

17 years, 2 months

1
0
0 / 0

JBoss Tools SVN: r11040 - trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/utils.

by jbosstools-commits＠lists.jboss.org

Author: dgeraskov Date: 2008-10-21 08:36:31 -0400 (Tue, 21 Oct 2008) New Revision: 11040 Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/utils/DriverClassHelpers.java Log: https://jira.jboss.org/jira/browse/JBIDE-2931 Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/utils/DriverClassHelpers.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/utils/DriverClassHelpers.java 2008-10-21 12:30:03 UTC (rev 11039) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/utils/DriverClassHelpers.java 2008-10-21 12:36:31 UTC (rev 11040) @@ -25,11 +25,11 @@ import java.util.Collections; import java.util.HashMap; import java.util.HashSet; +import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Set; -import org.eclipse.core.runtime.IPath; /** * @author max @@ -260,6 +260,15 @@ return (String[]) list.toArray(new String[list.size()]); } + public String getShortDialectName(String fullName) { + Iterator keyIterator = dialectNames.keySet().iterator(); + while (keyIterator.hasNext()){ + String key = (String)keyIterator.next(); + if (dialectNames.get(key).equals(fullName)) return key; + } + return null; + } + /** * * @param dialectName

17 years, 2 months

1
0
0 / 0

JBoss Tools SVN: r11039 - in branches/jbosstools-3.0.0.Beta1: jst/plugins/org.jboss.tools.jst.jsp/schema and 2 other directories.

by jbosstools-commits＠lists.jboss.org

Author: mareshkau Date: 2008-10-21 08:30:03 -0400 (Tue, 21 Oct 2008) New Revision: 11039 Added: branches/jbosstools-3.0.0.Beta1/jst/plugins/org.jboss.tools.jst.jsp/schema/ branches/jbosstools-3.0.0.Beta1/jst/plugins/org.jboss.tools.jst.jsp/schema/visulaEditorImplementations.exsd Modified: branches/jbosstools-3.0.0.Beta1/jst/plugins/org.jboss.tools.jst.jsp/plugin.xml branches/jbosstools-3.0.0.Beta1/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPMultiPageEditor.java branches/jbosstools-3.0.0.Beta1/vpe/plugins/org.jboss.tools.vpe/plugin.xml Log: =JBIDE-2894,adding extension point for VPE implementation to branch Modified: branches/jbosstools-3.0.0.Beta1/jst/plugins/org.jboss.tools.jst.jsp/plugin.xml =================================================================== --- branches/jbosstools-3.0.0.Beta1/jst/plugins/org.jboss.tools.jst.jsp/plugin.xml 2008-10-21 11:16:45 UTC (rev 11038) +++ branches/jbosstools-3.0.0.Beta1/jst/plugins/org.jboss.tools.jst.jsp/plugin.xml 2008-10-21 12:30:03 UTC (rev 11039) @@ -3,7 +3,8 @@ <plugin> <extension-point id="occurrenceStructureProviders" - name="%occurrenceStructureProvidersExtensionPoint" /> + name="%occurrenceStructureProvidersExtensionPoint" /> + <extension-point id="visulaEditorImplementations" name="Visual Editor Implementations" schema="schema/visulaEditorImplementations.exsd"/> <extension point="org.eclipse.wst.sse.ui.editorConfiguration"> <sourceViewerConfiguration @@ -401,4 +402,4 @@ </extension> -</plugin> \ No newline at end of file +</plugin> Added: branches/jbosstools-3.0.0.Beta1/jst/plugins/org.jboss.tools.jst.jsp/schema/visulaEditorImplementations.exsd =================================================================== --- branches/jbosstools-3.0.0.Beta1/jst/plugins/org.jboss.tools.jst.jsp/schema/visulaEditorImplementations.exsd (rev 0) +++ branches/jbosstools-3.0.0.Beta1/jst/plugins/org.jboss.tools.jst.jsp/schema/visulaEditorImplementations.exsd 2008-10-21 12:30:03 UTC (rev 11039) @@ -0,0 +1,115 @@ +<?xml version='1.0' encoding='UTF-8'?> + +<schema targetNamespace="org.jboss.tools.jst.jsp" xmlns="http://www.w3.org/2001/XMLSchema"> +<annotation> + <appinfo> + <meta.schema plugin="org.jboss.tools.jst.jsp" id="visulaEditorImplementations" name="Visual Editor Implementations"/> + </appinfo> + <documentation> + [Enter description of this extension point.] + </documentation> + </annotation> + + <element name="extension"> + <annotation> + <appinfo> + <meta.element /> + </appinfo> + </annotation> + <complexType> + <sequence> + <element ref="visualEditorImplementation"/> + </sequence> + <attribute name="point" type="string" use="required"> + <annotation> + <documentation> + + </documentation> + </annotation> + </attribute> + <attribute name="id" type="string" use="required"> + <annotation> + <documentation> + + </documentation> + <appinfo> + <meta.attribute kind="identifier"/> + </appinfo> + </annotation> + </attribute> + <attribute name="name" type="string"> + <annotation> + <documentation> + + </documentation> + <appinfo> + <meta.attribute translatable="true"/> + </appinfo> + </annotation> + </attribute> + </complexType> + </element> + + <element name="visualEditorImplementation"> + <complexType> + <attribute name="name" type="string"> + <annotation> + <documentation> + The name of visual editor implementation + </documentation> + <appinfo> + <meta.attribute translatable="true"/> + </appinfo> + </annotation> + </attribute> + <attribute name="class" type="string" use="required"> + <annotation> + <documentation> + Class which implement visual editor factory + </documentation> + <appinfo> + <meta.attribute kind="java" basedOn=":org.jboss.tools.jst.jsp.editor.IVisualEditorFactory"/> + </appinfo> + </annotation> + </attribute> + </complexType> + </element> + + <annotation> + <appinfo> + <meta.section type="since"/> + </appinfo> + <documentation> + [Enter the first release in which this extension point appears.] + </documentation> + </annotation> + + <annotation> + <appinfo> + <meta.section type="examples"/> + </appinfo> + <documentation> + [Enter extension point usage example here.] + </documentation> + </annotation> + + <annotation> + <appinfo> + <meta.section type="apiinfo"/> + </appinfo> + <documentation> + [Enter API information here.] + </documentation> + </annotation> + + <annotation> + <appinfo> + <meta.section type="implementation"/> + </appinfo> + <documentation> + [Enter information about supplied implementation of this extension point.] + </documentation> + </annotation> + + +</schema> Modified: branches/jbosstools-3.0.0.Beta1/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPMultiPageEditor.java =================================================================== --- branches/jbosstools-3.0.0.Beta1/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPMultiPageEditor.java 2008-10-21 11:16:45 UTC (rev 11038) +++ branches/jbosstools-3.0.0.Beta1/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPMultiPageEditor.java 2008-10-21 12:30:03 UTC (rev 11039) @@ -19,6 +19,8 @@ import org.eclipse.core.resources.IResourceDelta; import org.eclipse.core.resources.IWorkspace; import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IConfigurationElement; +import org.eclipse.core.runtime.IExtension; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.Platform; @@ -80,7 +82,6 @@ import org.jboss.tools.jst.jsp.preferences.VpePreference; import org.jboss.tools.jst.web.tld.VpeTaglibManager; import org.jboss.tools.jst.web.tld.VpeTaglibManagerProvider; -import org.osgi.framework.Bundle; // Fix for EXIN-232: The IMultiPageEditor interface implementation is added. public class JSPMultiPageEditor extends JSPMultiPageEditorPart implements @@ -101,8 +102,12 @@ private static final String PREVIEW_TAB="Preview"; //$NON-NLS-1$ //visual tab private static final String VISUAL_SOURCE_TAB="Visual/Source"; //$NON-NLS-1$ + + private static final String VPE_VISUAL_EDITOR_IMPL_ID="org.jboss.tools.vpe.org.jboss.tools.vpe.editor.VpeEditorPartFactory"; //$NON-NLS-1$ //source tab private static final String SOURCE_TAB="Source"; //$NON-NLS-1$ + + private static final String VISUAL_EDITOR_IMPL_EXTENSION_POINT_NAME="visulaEditorImplementations"; //$NON-NLS-1$ private IVisualEditor visualEditor; @@ -137,19 +142,32 @@ static IVisualEditorFactory visualEditorFactory; static { + //Fix For JBIDE-2674 try { - Bundle b = Platform.getBundle("org.jboss.tools.vpe"); //$NON-NLS-1$ - //FIX for JBIDE-2248 - if(b!=null) { - Class cls = b - .loadClass("org.jboss.tools.vpe.editor.VpeEditorPartFactory"); //$NON-NLS-1$ - visualEditorFactory = (IVisualEditorFactory) cls.newInstance(); + IExtension visualEditorExtension = Platform.getExtensionRegistry() + .getExtension(JspEditorPlugin.PLUGIN_ID, + VISUAL_EDITOR_IMPL_EXTENSION_POINT_NAME, + VPE_VISUAL_EDITOR_IMPL_ID); + if (visualEditorExtension != null) { + IConfigurationElement[] configurationElements = visualEditorExtension + .getConfigurationElements(); + if (configurationElements != null + && configurationElements.length == 1) { + visualEditorFactory = (IVisualEditorFactory) configurationElements[0] + .createExecutableExtension("class"); //$NON-NLS-1$ + } else { + JspEditorPlugin + .getPluginLog() + .logError( + "Visual Editor Extension Point not configured correctly"); //$NON-NLS-1$ + } } else { - JspEditorPlugin.getPluginLog().logError("Plugin org.jboss.tools.vpe not available," + //$NON-NLS-1$ - " visual page editor will be not available"); //$NON-NLS-1$ + JspEditorPlugin.getPluginLog().logError( + "Visual Editor Implementation not available"); //$NON-NLS-1$ } - } catch (Exception e) { - JspEditorPlugin.getPluginLog().logError("Error in loading visual editor factory", e); //$NON-NLS-1$ + } catch (CoreException e) { + JspEditorPlugin.getPluginLog().logError( + "Visual Editor Implementation not available" + e); //$NON-NLS-1$ } } Modified: branches/jbosstools-3.0.0.Beta1/vpe/plugins/org.jboss.tools.vpe/plugin.xml =================================================================== --- branches/jbosstools-3.0.0.Beta1/vpe/plugins/org.jboss.tools.vpe/plugin.xml 2008-10-21 11:16:45 UTC (rev 11038) +++ branches/jbosstools-3.0.0.Beta1/vpe/plugins/org.jboss.tools.vpe/plugin.xml 2008-10-21 12:30:03 UTC (rev 11039) @@ -71,4 +71,7 @@ contextId="org.jboss.tools.vpe.editorContext" sequence="M1+M2+Tab"/> </extension> + <extension point="org.jboss.tools.jst.jsp.visulaEditorImplementations" id="org.jboss.tools.vpe.editor.VpeEditorPartFactory"> + <visualEditorImplementation name="XulRunner Visual Editor" class="org.jboss.tools.vpe.editor.VpeEditorPartFactory"/> + </extension> </plugin>

17 years, 2 months

1
0
0 / 0

JBoss Tools SVN: r11038 - trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/templates.

by jbosstools-commits＠lists.jboss.org

Author: sdzmitrovich Date: 2008-10-21 07:16:45 -0400 (Tue, 21 Oct 2008) New Revision: 11038 Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/templates/vpe-templates-jsf.xml Log: corrected commandButton Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/templates/vpe-templates-jsf.xml =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/templates/vpe-templates-jsf.xml 2008-10-21 11:14:11 UTC (rev 11037) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/templates/vpe-templates-jsf.xml 2008-10-21 11:16:45 UTC (rev 11038) @@ -182,7 +182,7 @@ <vpe:tag name="h:commandButton" case-sensitive="yes"> <vpe:if test="not(attrpresent('image'))"> <vpe:template children="no" modify="no"> - <input type="submit" value="{iif(@value='',' ',jsfvalue(@value))}" + <input type="button" value="{iif(@value='',' ',jsfvalue(@value))}" class="{@styleClass}" style="{@style}" title="{tagstring()}" /> <vpe:resize> <vpe:width width-attr="style.width" />

17 years, 2 months

1
0
0 / 0

JBoss Tools SVN: r11037 - trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/templates.

by jbosstools-commits＠lists.jboss.org

Author: sdzmitrovich Date: 2008-10-21 07:14:11 -0400 (Tue, 21 Oct 2008) New Revision: 11037 Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/templates/vpe-templates-jsf.xml Log: corrected commandButton Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/templates/vpe-templates-jsf.xml =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/templates/vpe-templates-jsf.xml 2008-10-21 11:04:01 UTC (rev 11036) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/templates/vpe-templates-jsf.xml 2008-10-21 11:14:11 UTC (rev 11037) @@ -181,7 +181,6 @@  <vpe:tag name="h:commandButton" case-sensitive="yes"> <vpe:if test="not(attrpresent('image'))"> - <vpe:if test="@type=''"> <vpe:template children="no" modify="no"> <input type="submit" value="{iif(@value='',' ',jsfvalue(@value))}" class="{@styleClass}" style="{@style}" title="{tagstring()}" /> @@ -195,23 +194,6 @@ <vpe:textFormatting use-default-formats="yes"> </vpe:textFormatting> </vpe:template> - </vpe:if> - <vpe:if - test="(@type='button')|(@type='reset')|(@type='submit')"> - <vpe:template children="no" modify="no"> - <input type="{@type}" value="{jsfvalue(@value)}" - class="{@styleClass}" style="{@style}" title="{tagstring()}" /> - <vpe:resize> - <vpe:width width-attr="style.width" /> - <vpe:height height-attr="style.height" /> - </vpe:resize> - <vpe:dnd> - <vpe:drag start-enable="yes" /> - </vpe:dnd> - <vpe:textFormatting use-default-formats="yes"> - </vpe:textFormatting> - </vpe:template> - </vpe:if> </vpe:if> <vpe:if test="attrpresent('image')"> <vpe:template children="no" modify="no">

17 years, 2 months

1
0
0 / 0

JBoss Tools SVN: r11036 - trunk/jsf/plugins/org.jboss.tools.jsf.vpe.ajax4jsf/templates.

by jbosstools-commits＠lists.jboss.org

Author: sdzmitrovich Date: 2008-10-21 07:04:01 -0400 (Tue, 21 Oct 2008) New Revision: 11036 Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.ajax4jsf/templates/vpe-templates-ajax4jsf.xml Log: corrected a4j:commandButton Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.ajax4jsf/templates/vpe-templates-ajax4jsf.xml =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.ajax4jsf/templates/vpe-templates-ajax4jsf.xml 2008-10-21 09:20:19 UTC (rev 11035) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.ajax4jsf/templates/vpe-templates-ajax4jsf.xml 2008-10-21 11:04:01 UTC (rev 11036) @@ -74,9 +74,9 @@ <vpe:tag name="a4j:commandButton" case-sensitive="yes"> <vpe:if test="not(attrpresent('image'))"> - <vpe:if test="(@type='')|(@type='submit')"> + <vpe:if test="(@type='')"> <vpe:template children="no" modify="no"> - <input type="reset" value="{jsfvalue(@value)}" class="{@styleClass}" style="{@style}" title="{tagstring()}"/> + <input type="button" value="{jsfvalue(@value)}" class="{@styleClass}" style="{@style}" title="{tagstring()}"/> <vpe:resize> <vpe:width width-attr="style.width" /> <vpe:height height-attr="style.height" /> @@ -89,7 +89,7 @@ </vpe:template> </vpe:if> - <vpe:if test="not(@type='') and not(@type='submit')"> + <vpe:if test="not(@type='') "> <vpe:template children="no" modify="no"> <input type="{@type}" value="{jsfvalue(@value)}" class="{@styleClass}" style="{@style}" title="{tagstring()}"/> <vpe:resize>

17 years, 2 months

1
0
0 / 0

JBoss Tools SVN: r11035 - in trunk/smooks/plugins/org.jboss.tools.smooks.ui: META-INF and 4 other directories.

by jbosstools-commits＠lists.jboss.org

Author: DartPeng Date: 2008-10-21 05:20:19 -0400 (Tue, 21 Oct 2008) New Revision: 11035 Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/icons/full/obj16/esb16.png trunk/smooks/plugins/org.jboss.tools.smooks.ui/libs/dom4j.license Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/META-INF/MANIFEST.MF trunk/smooks/plugins/org.jboss.tools.smooks.ui/plugin.xml trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/TypeIDSelectionWizardPage.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/wizards/NewResourceConfigWizardPage.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/wizards/SmooksConfigFileNewWizard.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/wizards/SmooksConfigFileNewWizardPage.java Log: JBIDE-2846 Thanks John for helping me to modify that Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/META-INF/MANIFEST.MF =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/META-INF/MANIFEST.MF 2008-10-21 09:18:30 UTC (rev 11034) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/META-INF/MANIFEST.MF 2008-10-21 09:20:19 UTC (rev 11035) @@ -21,7 +21,8 @@ org.eclipse.emf.edit, org.eclipse.emf.edit.ui, org.eclipse.xsd.edit, - org.jboss.tools.smooks.core + org.jboss.tools.smooks.core, + org.jboss.tools.common.model.ui Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-ClassPath: ., Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/icons/full/obj16/esb16.png =================================================================== (Binary files differ) Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/icons/full/obj16/esb16.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/libs/dom4j.license =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/libs/dom4j.license (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/libs/dom4j.license 2008-10-21 09:20:19 UTC (rev 11035) @@ -0,0 +1,13 @@ +BSD style license + +Redistribution and use of this software and associated documentation ("Software"), with or without modification, are permitted provided that the following conditions are met: + + 1. Redistributions of source code must retain copyright statements and notices. Redistributions must also contain a copy of this document. + 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. + 3. The name "DOM4J" must not be used to endorse or promote products derived from this Software without prior written permission of MetaStuff, Ltd. For written permission, please contact dom4j-info(a)metastuff.com. + 4. Products derived from this Software may not be called "DOM4J" nor may "DOM4J" appear in their names without prior written permission of MetaStuff, Ltd. DOM4J is a registered trademark of MetaStuff, Ltd. + 5. Due credit should be given to the DOM4J Project - http://www.dom4j.org + +THIS SOFTWARE IS PROVIDED BY METASTUFF, LTD. AND CONTRIBUTORS ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL METASTUFF, LTD. OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +Copyright 2001-2005 (C) MetaStuff, Ltd. All Rights Reserved. \ No newline at end of file Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/plugin.xml =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/plugin.xml 2008-10-21 09:18:30 UTC (rev 11034) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/plugin.xml 2008-10-21 09:20:19 UTC (rev 11035) @@ -1,161 +1,161 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?eclipse version="3.2"?> -<plugin> - <extension-point id="viewerInitor" name="viewerInitor" schema="schema/viewerInitor.exsd"/> - <extension-point id="analyzer" name="analyzer" schema="schema/analyzer.exsd"/> - <extension point="org.eclipse.emf.ecore.generated_package"> - <package - uri = "http://www.jboss.org/tools/smooks/graphicalInformation" - class = "org.jboss.tools.smooks.graphical.GraphicalPackage" - genModel = "model/graphical.genmodel" /> - </extension> - - <extension - point="org.eclipse.ui.editors"> - <editor - name="Smooks Form Editor" - extensions="smooks" - icon="icons/sample.gif" - class="org.jboss.tools.smooks.ui.editors.SmooksFormEditor" - id="org.jboss.tools.smooks.ui.editors.SmooksFormEditor"> - </editor> - </extension> - <extension - point="org.eclipse.ui.views.properties.tabbed.propertySections"> - <propertySections - contributorId="org.jboss.tools.smooks.ui.editors.SmooksFormEditor"> - <propertySection - class="org.jboss.tools.smooks.ui.ConnectionPropertySection" - id="org.jboss.tools.smooks.ui.connection.propertyTab.Section" - tab="org.jboss.tools.smooks.ui.connection.propertyTab"> - <input - type="org.jboss.tools.smooks.ui.gef.model.LineConnectionModel"> - </input> - </propertySection> - </propertySections> - </extension> - <extension - point="org.eclipse.ui.views.properties.tabbed.propertyContributor"> - <propertyContributor - contributorId="org.jboss.tools.smooks.ui.editors.SmooksFormEditor" - typeMapper="org.jboss.tools.smooks.ui.SmooksGraphPropertyTypeMapper"> - <propertyCategory - category="connection"></propertyCategory> - </propertyContributor> - </extension> - <extension - point="org.eclipse.ui.views.properties.tabbed.propertyTabs"> - <propertyTabs - contributorId="org.jboss.tools.smooks.ui.editors.SmooksFormEditor"> - <propertyTab - category="connection" - id="org.jboss.tools.smooks.ui.connection.propertyTab" - label="Mapping Properties"> - </propertyTab> - </propertyTabs> - </extension> - <extension - point="org.eclipse.ui.newWizards"> - <category - id="org.jboss.tools.smooks.ui.wizards" - name="Smooks"> - </category> - <wizard - category="org.jboss.tools.smooks.ui.wizards" - class="org.jboss.tools.smooks.ui.wizards.SmooksConfigFileNewWizard" - icon="icons/sample.gif" - id="org.jboss.tools.smooks.ui.wizards.SmooksConfigFileNewWizard" - name="Smooks Configuration File"> - </wizard> - </extension> - - <extension - point="org.jboss.tools.smooks.ui.viewerInitor"> - <viewerInitor - contentProvider="org.jboss.tools.smooks.xml.ui.XMLStructuredDataContentProvider" - creationWizard="org.jboss.tools.smooks.xml.ui.XMLStructuredDataWizard" - description="XML data type comes from any .xml file." - labelProvider="org.jboss.tools.smooks.xml.ui.XMLStructuredDataLabelProvider" - name="XML Data Type" - typeID="org.jboss.tools.smooks.xml.viewerInitor.xml"> - </viewerInitor> - </extension> - <extension - point="org.jboss.tools.smooks.ui.analyzer"> - <mappingAnalyzer - class="org.jboss.tools.smooks.xml2xml.XML2XMLAnalyzer" - name="XML2XML Analyzer" - typeID="org.jboss.tools.smooks.xml.viewerInitor.xml"> - <targetSourceType - id="org.jboss.tools.smooks.xml.viewerInitor.xml" - name="XML"> - </targetSourceType> - </mappingAnalyzer> - </extension> - <extension - point="org.jboss.tools.smooks.ui.viewerInitor"> - <viewerInitor - contentProvider="org.jboss.tools.smooks.javabean.model.BeanContentProvider" - creationWizard="org.jboss.tools.smooks.javabean.ui.NewJavaBeanStrucutredDataWizard" - description="This data type can get from any Java .class." - labelProvider="org.jboss.tools.smooks.javabean.model.BeanlabelProvider" - name="JavaBean Data Type" - typeID="org.jboss.tools.smooks.ui.viewerInitor.javabean"> - </viewerInitor> - </extension> - <extension - point="org.jboss.tools.smooks.ui.analyzer"> - <mappingAnalyzer - class="org.jboss.tools.smooks.javabean.analyzer.JavaBeanAnalyzer" - name="JavaBean Analyzer" - typeID="org.jboss.tools.smooks.ui.viewerInitor.javabean"> - <targetSourceType - id="org.jboss.tools.smooks.ui.viewerInitor.javabean" - name="java2java"> - </targetSourceType> - </mappingAnalyzer> - <sourceModelAnalyzer - class="org.jboss.tools.smooks.javabean.analyzer.JavaBeanAnalyzer" - level="0" - name="JavaBean SourceModel Analyzer" - typeID="org.jboss.tools.smooks.ui.viewerInitor.javabean"> - </sourceModelAnalyzer> - <targetModelAnalyzer - class="org.jboss.tools.smooks.javabean.analyzer.JavaBeanAnalyzer" - level="0" - name="JavaBean TargetModel Analyzer" - typeID="org.jboss.tools.smooks.ui.viewerInitor.javabean"> - </targetModelAnalyzer> - </extension> - - <extension - point="org.jboss.tools.smooks.ui.analyzer"> - <mappingAnalyzer - class="org.jboss.tools.smooks.java2xml.analyzer.Java2XMLAnalyzer" - name="Java Bean" - typeID="org.jboss.tools.smooks.ui.viewerInitor.javabean"> - <targetSourceType - id="org.jboss.tools.smooks.xml.viewerInitor.xml" - name="XML"> - </targetSourceType> - </mappingAnalyzer> - </extension> - - <extension - point="org.jboss.tools.smooks.ui.analyzer"> - <mappingAnalyzer - class="org.jboss.tools.smooks.xml2java.analyzer.XML2JavaAnalyzer" - name="XML2Java" - typeID="org.jboss.tools.smooks.xml.viewerInitor.xml"> - <targetSourceType - id="org.jboss.tools.smooks.ui.viewerInitor.javabean" - name="JavaBean"> - </targetSourceType> - </mappingAnalyzer> - <sourceModelAnalyzer - class="org.jboss.tools.smooks.xml2java.analyzer.XMLSourceModelAnalyzer" - name="XML" - typeID="org.jboss.tools.smooks.xml.viewerInitor.xml"> - </sourceModelAnalyzer> - </extension> -</plugin> +<?xml version="1.0" encoding="UTF-8"?> +<?eclipse version="3.2"?> +<plugin> + <extension-point id="viewerInitor" name="viewerInitor" schema="schema/viewerInitor.exsd"/> + <extension-point id="analyzer" name="analyzer" schema="schema/analyzer.exsd"/> + <extension point="org.eclipse.emf.ecore.generated_package"> + <package + uri = "http://www.jboss.org/tools/smooks/graphicalInformation" + class = "org.jboss.tools.smooks.graphical.GraphicalPackage" + genModel = "model/graphical.genmodel" /> + </extension> + + <extension + point="org.eclipse.ui.editors"> + <editor + name="Smooks Form Editor" + extensions="smooks" + icon="icons/sample.gif" + class="org.jboss.tools.smooks.ui.editors.SmooksFormEditor" + id="org.jboss.tools.smooks.ui.editors.SmooksFormEditor"> + </editor> + </extension> + <extension + point="org.eclipse.ui.views.properties.tabbed.propertySections"> + <propertySections + contributorId="org.jboss.tools.smooks.ui.editors.SmooksFormEditor"> + <propertySection + class="org.jboss.tools.smooks.ui.ConnectionPropertySection" + id="org.jboss.tools.smooks.ui.connection.propertyTab.Section" + tab="org.jboss.tools.smooks.ui.connection.propertyTab"> + <input + type="org.jboss.tools.smooks.ui.gef.model.LineConnectionModel"> + </input> + </propertySection> + </propertySections> + </extension> + <extension + point="org.eclipse.ui.views.properties.tabbed.propertyContributor"> + <propertyContributor + contributorId="org.jboss.tools.smooks.ui.editors.SmooksFormEditor" + typeMapper="org.jboss.tools.smooks.ui.SmooksGraphPropertyTypeMapper"> + <propertyCategory + category="connection"></propertyCategory> + </propertyContributor> + </extension> + <extension + point="org.eclipse.ui.views.properties.tabbed.propertyTabs"> + <propertyTabs + contributorId="org.jboss.tools.smooks.ui.editors.SmooksFormEditor"> + <propertyTab + category="connection" + id="org.jboss.tools.smooks.ui.connection.propertyTab" + label="Mapping Properties"> + </propertyTab> + </propertyTabs> + </extension> + <extension + point="org.eclipse.ui.newWizards"> + <category + id="org.jboss.tools.smooks.ui.wizards" + name="Smooks"> + </category> + <wizard + category="org.jboss.tools.smooks.ui.wizards" + class="org.jboss.tools.smooks.ui.wizards.SmooksConfigFileNewWizard" + icon="icons/full/obj16/esb16.png" + id="org.jboss.tools.smooks.ui.wizards.SmooksConfigFileNewWizard" + name="Smooks Configuration File"> + </wizard> + </extension> + + <extension + point="org.jboss.tools.smooks.ui.viewerInitor"> + <viewerInitor + contentProvider="org.jboss.tools.smooks.xml.ui.XMLStructuredDataContentProvider" + creationWizard="org.jboss.tools.smooks.xml.ui.XMLStructuredDataWizard" + description="XML data type comes from any .xml file." + labelProvider="org.jboss.tools.smooks.xml.ui.XMLStructuredDataLabelProvider" + name="XML Data Type" + typeID="org.jboss.tools.smooks.xml.viewerInitor.xml"> + </viewerInitor> + </extension> + <extension + point="org.jboss.tools.smooks.ui.analyzer"> + <mappingAnalyzer + class="org.jboss.tools.smooks.xml2xml.XML2XMLAnalyzer" + name="XML2XML Analyzer" + typeID="org.jboss.tools.smooks.xml.viewerInitor.xml"> + <targetSourceType + id="org.jboss.tools.smooks.xml.viewerInitor.xml" + name="XML"> + </targetSourceType> + </mappingAnalyzer> + </extension> + <extension + point="org.jboss.tools.smooks.ui.viewerInitor"> + <viewerInitor + contentProvider="org.jboss.tools.smooks.javabean.model.BeanContentProvider" + creationWizard="org.jboss.tools.smooks.javabean.ui.NewJavaBeanStrucutredDataWizard" + description="This data type can get from any Java .class." + labelProvider="org.jboss.tools.smooks.javabean.model.BeanlabelProvider" + name="JavaBean Data Type" + typeID="org.jboss.tools.smooks.ui.viewerInitor.javabean"> + </viewerInitor> + </extension> + <extension + point="org.jboss.tools.smooks.ui.analyzer"> + <mappingAnalyzer + class="org.jboss.tools.smooks.javabean.analyzer.JavaBeanAnalyzer" + name="JavaBean Analyzer" + typeID="org.jboss.tools.smooks.ui.viewerInitor.javabean"> + <targetSourceType + id="org.jboss.tools.smooks.ui.viewerInitor.javabean" + name="java2java"> + </targetSourceType> + </mappingAnalyzer> + <sourceModelAnalyzer + class="org.jboss.tools.smooks.javabean.analyzer.JavaBeanAnalyzer" + level="0" + name="JavaBean SourceModel Analyzer" + typeID="org.jboss.tools.smooks.ui.viewerInitor.javabean"> + </sourceModelAnalyzer> + <targetModelAnalyzer + class="org.jboss.tools.smooks.javabean.analyzer.JavaBeanAnalyzer" + level="0" + name="JavaBean TargetModel Analyzer" + typeID="org.jboss.tools.smooks.ui.viewerInitor.javabean"> + </targetModelAnalyzer> + </extension> + + <extension + point="org.jboss.tools.smooks.ui.analyzer"> + <mappingAnalyzer + class="org.jboss.tools.smooks.java2xml.analyzer.Java2XMLAnalyzer" + name="Java Bean" + typeID="org.jboss.tools.smooks.ui.viewerInitor.javabean"> + <targetSourceType + id="org.jboss.tools.smooks.xml.viewerInitor.xml" + name="XML"> + </targetSourceType> + </mappingAnalyzer> + </extension> + + <extension + point="org.jboss.tools.smooks.ui.analyzer"> + <mappingAnalyzer + class="org.jboss.tools.smooks.xml2java.analyzer.XML2JavaAnalyzer" + name="XML2Java" + typeID="org.jboss.tools.smooks.xml.viewerInitor.xml"> + <targetSourceType + id="org.jboss.tools.smooks.ui.viewerInitor.javabean" + name="JavaBean"> + </targetSourceType> + </mappingAnalyzer> + <sourceModelAnalyzer + class="org.jboss.tools.smooks.xml2java.analyzer.XMLSourceModelAnalyzer" + name="XML" + typeID="org.jboss.tools.smooks.xml.viewerInitor.xml"> + </sourceModelAnalyzer> + </extension> +</plugin> Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/TypeIDSelectionWizardPage.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/TypeIDSelectionWizardPage.java 2008-10-21 09:18:30 UTC (rev 11034) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/TypeIDSelectionWizardPage.java 2008-10-21 09:20:19 UTC (rev 11035) @@ -1,483 +1,503 @@ -/******************************************************************************* - * Copyright (c) 2008 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 - * - * Contributors: - * Red Hat, Inc. - initial API and implementation - ******************************************************************************/ -package org.jboss.tools.smooks.ui.editors; - -import java.util.Collection; -import java.util.Iterator; -import java.util.List; - -import org.eclipse.jface.dialogs.Dialog; -import org.eclipse.jface.dialogs.MessageDialog; -import org.eclipse.jface.viewers.CheckStateChangedEvent; -import org.eclipse.jface.viewers.CheckboxTableViewer; -import org.eclipse.jface.viewers.ICheckStateListener; -import org.eclipse.jface.viewers.IStructuredContentProvider; -import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.jface.viewers.ITableLabelProvider; -import org.eclipse.jface.viewers.LabelProvider; -import org.eclipse.jface.viewers.Viewer; -import org.eclipse.jface.wizard.IWizard; -import org.eclipse.jface.wizard.IWizardContainer; -import org.eclipse.jface.wizard.IWizardNode; -import org.eclipse.jface.wizard.IWizardPage; -import org.eclipse.jface.wizard.WizardPage; -import org.eclipse.swt.SWT; -import org.eclipse.swt.graphics.Image; -import org.eclipse.swt.layout.GridData; -import org.eclipse.swt.layout.GridLayout; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Label; -import org.eclipse.swt.widgets.TableColumn; -import org.eclipse.ui.INewWizard; -import org.eclipse.ui.forms.events.HyperlinkEvent; -import org.eclipse.ui.forms.events.IHyperlinkListener; -import org.eclipse.ui.forms.widgets.Hyperlink; -import org.jboss.tools.smooks.analyzer.AnalyzerFactory; -import org.jboss.tools.smooks.analyzer.DataTypeID; -import org.jboss.tools.smooks.ui.IStructuredDataCreationWizard; -import org.jboss.tools.smooks.ui.IViewerInitor; -import org.jboss.tools.smooks.ui.StructuredDataCreationWizardDailog; -import org.jboss.tools.smooks.ui.ViewerInitorStore; -import org.jboss.tools.smooks.ui.wizards.ISmooksDataCreationAddtionWizard; -import org.jboss.tools.smooks.ui.wizards.TransformSelectWizardNode; - -/** - * @author Dart Peng - * Date : Sep 5, 2008 - */ -public class TypeIDSelectionWizardPage extends WizardPage { - protected IWizard sourceDataCreationWizard; - - protected IWizard targetDataCreationWizard; - - private Object sourceTreeViewerInputContents; - - private Object targetTreeViewerInputContents; - - protected CheckboxTableViewer source; - protected CheckboxTableViewer target; - private List sourceList; - private String sourceID = null; - private String targetID = null; - private String oldSourceID = null; - private String oldTargetID = null; - private IStructuredSelection selection; - private boolean showDataSelectPage = false; - - private Hyperlink sourceDataLink; - - private Hyperlink targetDataLink; - - public IStructuredSelection getSelection() { - return selection; - } - - public void setSelection(IStructuredSelection selection) { - this.selection = selection; - } - - public String getSourceID() { - return sourceID; - } - - public void setSourceID(String sourceID) { - this.sourceID = sourceID; - } - - public String getTargetID() { - return targetID; - } - - public void setTargetID(String targetID) { - this.targetID = targetID; - } - - public TypeIDSelectionWizardPage(String pageName, boolean showDataSelectPage) { - super(pageName); - this.showDataSelectPage = showDataSelectPage; - } - - @Override - public boolean canFlipToNextPage() { - if (this.getSourceID() != null || getTargetID() != null) { - return true; - } - return false; - } - - @Override - public IWizardPage getNextPage() { - String sourceID = this.getSourceID(); - String targetID = this.getTargetID(); - IStructuredDataCreationWizard sourceWizard = null; - IStructuredDataCreationWizard targetWizard = null; - IWizard rootWizard = getWizard(); - ISmooksDataCreationAddtionWizard wizard = (ISmooksDataCreationAddtionWizard) rootWizard; - if (sourceID == null) { - wizard.clearSourceWizardPages(); - } - if (targetID == null) { - wizard.clearTargetWizardPages(); - } - if (sourceID != null && (!sourceID.equals(oldSourceID))) { - sourceWizard = ViewerInitorStore.getInstance() - .getStructuredDataCreationWizard(sourceID); - oldSourceID = sourceID; - } - if (targetID != null && (!targetID.equals(oldTargetID))) { - targetWizard = ViewerInitorStore.getInstance() - .getStructuredDataCreationWizard(targetID); - oldTargetID = targetID; - } - if (!wizardIsCreated(sourceWizard) && sourceWizard != null) { - if (sourceWizard instanceof INewWizard) { - ((INewWizard) sourceWizard).init(null, selection); - } - sourceWizard.addPages(); - } - if (!wizardIsCreated(targetWizard) && targetWizard != null) { - if (targetWizard instanceof INewWizard) { - ((INewWizard) targetWizard).init(null, selection); - } - targetWizard.addPages(); - } - addDataCreationPages(sourceWizard, targetWizard); - return super.getNextPage(); - } - - private void addDataCreationPages(IWizard sourceWizard, IWizard targetWizard) { - IWizard rootWizard = getWizard(); - if (rootWizard instanceof ISmooksDataCreationAddtionWizard) { - ISmooksDataCreationAddtionWizard wizard = (ISmooksDataCreationAddtionWizard) rootWizard; - if (sourceWizard != null) { - wizard.clearSourceWizardPages(); - IWizardPage[] pages = sourceWizard.getPages(); - for (int i = 0; i < pages.length; i++) { - IWizardPage p = pages[i]; - wizard.addSourceWizardPage(p); - p.setWizard(rootWizard); - } - } - - if (targetWizard != null) { - wizard.clearTargetWizardPages(); - IWizardPage[] pages = targetWizard.getPages(); - for (int i = 0; i < pages.length; i++) { - IWizardPage p = pages[i]; - wizard.addTargetWizardPage(p); - p.setWizard(rootWizard); - } - } - } - sourceDataCreationWizard = sourceWizard; - targetDataCreationWizard = targetWizard; - } - - private boolean wizardIsCreated(IWizard wizard) { - if (wizard == null) - return false; - if (wizard.getPageCount() <= 0) { - return false; - } - return true; - } - - /* - * (non-Javadoc) - * - * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite) - */ - public void createControl(Composite parent) { - Composite mainComposite = new Composite(parent, SWT.NONE); - GridLayout gl = new GridLayout(); - gl.numColumns = 2; - gl.makeColumnsEqualWidth = true; - mainComposite.setLayout(gl); - sourceList = AnalyzerFactory.getInstance().getRegistrySourceIDList(); - Label sl = new Label(mainComposite, SWT.NONE); - sl.setText("Source Data Type ID List : "); - - Label tl = new Label(mainComposite, SWT.NONE); - tl.setText("Target Data Type ID List : "); - - source = createTableViewer(mainComposite); - GridData gd = new GridData(GridData.FILL_BOTH); - source.getTable().setLayoutData(gd); - target = createTableViewer(mainComposite); - target.getTable().setLayoutData(gd); - - source.setInput(sourceList); - target.setInput(sourceList); - initViewer(); - - sourceDataLink = new Hyperlink(mainComposite, SWT.NONE); - sourceDataLink.setText("Source Model Select:Empty"); - sourceDataLink.addHyperlinkListener(new IHyperlinkListener() { - - public void linkActivated(HyperlinkEvent e) { - openSourceWizard(); - } - - public void linkEntered(HyperlinkEvent e) { - - } - - public void linkExited(HyperlinkEvent e) { - - } - - }); - // TODO don't show this - sourceDataLink.setVisible(false); - targetDataLink = new Hyperlink(mainComposite, SWT.NONE); - targetDataLink.setText("Target Model Select:Empty"); - targetDataLink.addHyperlinkListener(new IHyperlinkListener() { - - public void linkActivated(HyperlinkEvent e) { - openTargetWizard(); - } - - public void linkEntered(HyperlinkEvent e) { - - } - - public void linkExited(HyperlinkEvent e) { - - } - - }); - // TODO don't show this - targetDataLink.setVisible(false); - - this.setControl(mainComposite); - } - - protected void openTargetWizard() { - targetTreeViewerInputContents = getReturnObjectFromWizard(getTargetID()); - resetLinkText(); - } - - protected IWizard getWizardViaDataID(String dataID) { - if (dataID == null) - return null; - IWizardNode wn = getSourceWizard(dataID); - // setSelectedNode(wn); - IWizard sw = wn.getWizard(); - if (sw instanceof IStructuredDataCreationWizard) { - // ((IStrucutredDataCreationWizard)sw).i - } - if (sw instanceof INewWizard) { - ((INewWizard) sw).init(null, this.getSelection()); - } - return sw; - } - - protected Object getReturnObjectFromWizard(String dataID) { - IWizard wizard = getWizardViaDataID(dataID); - if (wizard != null) { - StructuredDataCreationWizardDailog dialog = new StructuredDataCreationWizardDailog( - getShell(), wizard); - if (dialog.open() == Dialog.OK) { - return dialog.getCurrentCreationWizard() - .getTreeViewerInputContents(); - } - } else { - MessageDialog.openInformation(getShell(), "Info", - "Please select the data type first"); - } - - return null; - } - - protected void openSourceWizard() { - sourceTreeViewerInputContents = getReturnObjectFromWizard(getSourceID()); - resetLinkText(); - } - - private void resetLinkText() { - if (sourceTreeViewerInputContents != null) { - sourceDataLink.setText("Source Model Select"); - } - - if (targetTreeViewerInputContents != null) { - targetDataLink.setText("Target Model Select"); - } - } - - protected String getDataTypeID(CheckboxTableViewer viewer) { - Object[] objs = viewer.getCheckedElements(); - if (objs == null) - return null; - if (objs.length <= 0) - return null; - DataTypeID d = (DataTypeID) objs[0]; - return d.getId(); - } - - protected void initViewer() { - IWizard wizard = this.getWizard(); - if (wizard instanceof TypeIDSelectionWizard) { - String s = ((TypeIDSelectionWizard) wizard).getSourceDataTypeID(); - String t = ((TypeIDSelectionWizard) wizard).getTargetDataTypeID(); - this.setSourceID(s); - this.setTargetID(t); - if (initViewerCheckState(s, source)) { - source.getTable().setEnabled(false); - } - if (initViewerCheckState(t, target)) { - target.getTable().setEnabled(false); - } - } - } - - protected boolean initViewerCheckState(String id, CheckboxTableViewer viewer) { - if (id == null) - return false; - List l = (List) viewer.getInput(); - for (Iterator iterator = l.iterator(); iterator.hasNext();) { - DataTypeID dti = (DataTypeID) iterator.next(); - if (id.equals(dti.getId())) { - viewer.setChecked(dti, true); - return true; - } - } - return false; - } - - private IWizardNode getSourceWizard(String id) { - Collection<IViewerInitor> viewers = ViewerInitorStore.getInstance() - .getViewerInitorCollection(); - for (Iterator iterator = viewers.iterator(); iterator.hasNext();) { - IViewerInitor viewerInitor = (IViewerInitor) iterator.next(); - if (viewerInitor.getTypeID().equals(id)) { - TransformSelectWizardNode wn = new TransformSelectWizardNode(); - IStructuredDataCreationWizard wizard = viewerInitor - .getStructuredDataLoadWizard(); - if (wizard == null) - return null; - wn.setWizard(wizard); - wn.setName(viewerInitor.getName()); - wn.setIconPath(viewerInitor.getWizardIconPath()); - wn.setDescription(viewerInitor.getDescription()); - return wn; - } - } - return null; - } - - protected CheckboxTableViewer createTableViewer(Composite parent) { - final CheckboxTableViewer viewer = CheckboxTableViewer.newCheckList( - parent, SWT.FULL_SELECTION); - viewer.addCheckStateListener(new ICheckStateListener() { - private boolean fireEvent = true; - - public void checkStateChanged(CheckStateChangedEvent event) { - if (!fireEvent) - return; - boolean check = event.getChecked(); - if (check) { - fireEvent = false; - viewer.setAllChecked(false); - viewer.setChecked(event.getElement(), true); - fireEvent = true; - } - - if (viewer == source) { - String sourceID = getDataTypeID(source); - setSourceID(sourceID); - } - - if (viewer == target) { - String targetID = getDataTypeID(target); - setTargetID(targetID); - } - IWizardContainer container = getContainer(); - if (container != null) { - container.updateButtons(); - } - } - - }); - TableColumn nameColumn = new TableColumn(viewer.getTable(), SWT.NONE); - nameColumn.setWidth(100); - nameColumn.setText("Name"); - viewer.setContentProvider(new TypeIDContentProvider()); - viewer.setLabelProvider(new TypeIDLabelProvider()); - return viewer; - } - - private class TypeIDContentProvider implements IStructuredContentProvider { - - public Object[] getElements(Object inputElement) { - if (inputElement instanceof List) { - return ((List) inputElement).toArray(); - } - return new Object[] {}; - } - - public void dispose() { - - } - - public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { - } - - } - - private class TypeIDLabelProvider extends LabelProvider implements - ITableLabelProvider { - - public Image getColumnImage(Object element, int columnIndex) { - - return null; - } - - public String getColumnText(Object element, int columnIndex) { - if (element instanceof DataTypeID) { - switch (columnIndex) { - case 0: - return ((DataTypeID) element).getName(); - // case 1: - // return ((DataTypeID) element).getId(); - } - } - return ""; - } - - } - - - public Object getSourceTreeViewerInputContents() { - return sourceTreeViewerInputContents; - } - - public void setSourceTreeViewerInputContents( - Object sourceTreeViewerInputContents) { - this.sourceTreeViewerInputContents = sourceTreeViewerInputContents; - } - - public Object getTargetTreeViewerInputContents() { - return targetTreeViewerInputContents; - } - - public void setTargetTreeViewerInputContents( - Object targetTreeViewerInputContents) { - this.targetTreeViewerInputContents = targetTreeViewerInputContents; - } - - public IWizard getSourceDataCreationWizard() { - return sourceDataCreationWizard; - } - - public IWizard getTargetDataCreationWizard() { - return targetDataCreationWizard; - } -} +/******************************************************************************* + * Copyright (c) 2008 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 + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.smooks.ui.editors; + +import java.util.Collection; +import java.util.Iterator; +import java.util.List; + +import org.eclipse.draw2d.ColorConstants; +import org.eclipse.jface.dialogs.Dialog; +import org.eclipse.jface.dialogs.MessageDialog; +import org.eclipse.jface.viewers.CheckStateChangedEvent; +import org.eclipse.jface.viewers.CheckboxTableViewer; +import org.eclipse.jface.viewers.ICheckStateListener; +import org.eclipse.jface.viewers.IStructuredContentProvider; +import org.eclipse.jface.viewers.IStructuredSelection; +import org.eclipse.jface.viewers.ITableLabelProvider; +import org.eclipse.jface.viewers.LabelProvider; +import org.eclipse.jface.viewers.Viewer; +import org.eclipse.jface.wizard.IWizard; +import org.eclipse.jface.wizard.IWizardContainer; +import org.eclipse.jface.wizard.IWizardNode; +import org.eclipse.jface.wizard.IWizardPage; +import org.eclipse.jface.wizard.WizardPage; +import org.eclipse.swt.SWT; +import org.eclipse.swt.graphics.Image; +import org.eclipse.swt.layout.FillLayout; +import org.eclipse.swt.layout.GridData; +import org.eclipse.swt.layout.GridLayout; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Label; +import org.eclipse.swt.widgets.TableColumn; +import org.eclipse.ui.INewWizard; +import org.eclipse.ui.forms.events.HyperlinkEvent; +import org.eclipse.ui.forms.events.IHyperlinkListener; +import org.eclipse.ui.forms.widgets.Hyperlink; +import org.jboss.tools.smooks.analyzer.AnalyzerFactory; +import org.jboss.tools.smooks.analyzer.DataTypeID; +import org.jboss.tools.smooks.ui.IStructuredDataCreationWizard; +import org.jboss.tools.smooks.ui.IViewerInitor; +import org.jboss.tools.smooks.ui.StructuredDataCreationWizardDailog; +import org.jboss.tools.smooks.ui.ViewerInitorStore; +import org.jboss.tools.smooks.ui.wizards.ISmooksDataCreationAddtionWizard; +import org.jboss.tools.smooks.ui.wizards.TransformSelectWizardNode; + +/** + * @author Dart Peng + * Date : Sep 5, 2008 + */ +public class TypeIDSelectionWizardPage extends WizardPage { + protected IWizard sourceDataCreationWizard; + + protected IWizard targetDataCreationWizard; + + private Object sourceTreeViewerInputContents; + + private Object targetTreeViewerInputContents; + + protected CheckboxTableViewer source; + protected CheckboxTableViewer target; + private List sourceList; + private String sourceID = null; + private String targetID = null; + private String oldSourceID = null; + private String oldTargetID = null; + private IStructuredSelection selection; + private boolean showDataSelectPage = false; + + private Hyperlink sourceDataLink; + + private Hyperlink targetDataLink; + + public IStructuredSelection getSelection() { + return selection; + } + + public void setSelection(IStructuredSelection selection) { + this.selection = selection; + } + + public String getSourceID() { + return sourceID; + } + + public void setSourceID(String sourceID) { + this.sourceID = sourceID; + } + + public String getTargetID() { + return targetID; + } + + public void setTargetID(String targetID) { + this.targetID = targetID; + } + + public TypeIDSelectionWizardPage(String pageName, boolean showDataSelectPage) { + super(pageName); + this.showDataSelectPage = showDataSelectPage; + setTitle("Select Source/Target Data Type"); + setDescription("Select the data type for source/target data"); + } + + @Override + public boolean canFlipToNextPage() { + if (this.getSourceID() != null && getTargetID() != null) { + return true; + } + return false; + } + + @Override + public IWizardPage getNextPage() { + String sourceID = this.getSourceID(); + String targetID = this.getTargetID(); + IStructuredDataCreationWizard sourceWizard = null; + IStructuredDataCreationWizard targetWizard = null; + IWizard rootWizard = getWizard(); + ISmooksDataCreationAddtionWizard wizard = (ISmooksDataCreationAddtionWizard) rootWizard; + if (sourceID == null) { + wizard.clearSourceWizardPages(); + } + if (targetID == null) { + wizard.clearTargetWizardPages(); + } + if (sourceID != null && (!sourceID.equals(oldSourceID))) { + sourceWizard = ViewerInitorStore.getInstance() + .getStructuredDataCreationWizard(sourceID); + oldSourceID = sourceID; + } + if (targetID != null && (!targetID.equals(oldTargetID))) { + targetWizard = ViewerInitorStore.getInstance() + .getStructuredDataCreationWizard(targetID); + oldTargetID = targetID; + } + if (!wizardIsCreated(sourceWizard) && sourceWizard != null) { + if (sourceWizard instanceof INewWizard) { + ((INewWizard) sourceWizard).init(null, selection); + } + sourceWizard.addPages(); + } + if (!wizardIsCreated(targetWizard) && targetWizard != null) { + if (targetWizard instanceof INewWizard) { + ((INewWizard) targetWizard).init(null, selection); + } + targetWizard.addPages(); + } + addDataCreationPages(sourceWizard, targetWizard); + return super.getNextPage(); + } + + private void addDataCreationPages(IWizard sourceWizard, IWizard targetWizard) { + IWizard rootWizard = getWizard(); + if (rootWizard instanceof ISmooksDataCreationAddtionWizard) { + ISmooksDataCreationAddtionWizard wizard = (ISmooksDataCreationAddtionWizard) rootWizard; + if (sourceWizard != null) { + wizard.clearSourceWizardPages(); + IWizardPage[] pages = sourceWizard.getPages(); + for (int i = 0; i < pages.length; i++) { + IWizardPage p = pages[i]; + wizard.addSourceWizardPage(p); + p.setWizard(rootWizard); + } + } + + if (targetWizard != null) { + wizard.clearTargetWizardPages(); + IWizardPage[] pages = targetWizard.getPages(); + for (int i = 0; i < pages.length; i++) { + IWizardPage p = pages[i]; + wizard.addTargetWizardPage(p); + p.setWizard(rootWizard); + } + } + } + sourceDataCreationWizard = sourceWizard; + targetDataCreationWizard = targetWizard; + } + + private boolean wizardIsCreated(IWizard wizard) { + if (wizard == null) + return false; + if (wizard.getPageCount() <= 0) { + return false; + } + return true; + } + + /* + * (non-Javadoc) + * + * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite) + */ + public void createControl(Composite parent) { + Composite mainComposite = new Composite(parent, SWT.NONE); + GridLayout gl = new GridLayout(); + gl.numColumns = 2; + gl.makeColumnsEqualWidth = true; + mainComposite.setLayout(gl); + sourceList = AnalyzerFactory.getInstance().getRegistrySourceIDList(); + Label sl = new Label(mainComposite, SWT.NONE); + sl.setText("Source Data Type ID List : "); + + Label tl = new Label(mainComposite, SWT.NONE); + tl.setText("Target Data Type ID List : "); + + Composite sourceBorder = new Composite(mainComposite,SWT.NONE); + sourceBorder.setBackground(ColorConstants.black); + FillLayout sbLayout = new FillLayout(); + sbLayout.marginHeight = 1; + sbLayout.marginWidth = 1; + sourceBorder.setLayout(sbLayout); + source = createTableViewer(sourceBorder); + GridData gd = new GridData(GridData.FILL_BOTH); + sourceBorder.setLayoutData(gd); + + + Composite targetBorder = new Composite(mainComposite,SWT.NONE); + targetBorder.setBackground(ColorConstants.black); + FillLayout tbLayout = new FillLayout(); + tbLayout.marginHeight = 1; + tbLayout.marginWidth = 1; + targetBorder.setLayout(tbLayout); + target = createTableViewer(targetBorder); + targetBorder.setLayoutData(gd); + + source.setInput(sourceList); + target.setInput(sourceList); + initViewer(); + + sourceDataLink = new Hyperlink(mainComposite, SWT.NONE); + sourceDataLink.setText("Source Model Select:Empty"); + sourceDataLink.addHyperlinkListener(new IHyperlinkListener() { + + public void linkActivated(HyperlinkEvent e) { + openSourceWizard(); + } + + public void linkEntered(HyperlinkEvent e) { + + } + + public void linkExited(HyperlinkEvent e) { + + } + + }); + // TODO don't show this + sourceDataLink.setVisible(false); + targetDataLink = new Hyperlink(mainComposite, SWT.NONE); + targetDataLink.setText("Target Model Select:Empty"); + targetDataLink.addHyperlinkListener(new IHyperlinkListener() { + + public void linkActivated(HyperlinkEvent e) { + openTargetWizard(); + } + + public void linkEntered(HyperlinkEvent e) { + + } + + public void linkExited(HyperlinkEvent e) { + + } + + }); + // TODO don't show this + targetDataLink.setVisible(false); + + this.setControl(mainComposite); + } + + protected void openTargetWizard() { + targetTreeViewerInputContents = getReturnObjectFromWizard(getTargetID()); + resetLinkText(); + } + + protected IWizard getWizardViaDataID(String dataID) { + if (dataID == null) + return null; + IWizardNode wn = getSourceWizard(dataID); + // setSelectedNode(wn); + IWizard sw = wn.getWizard(); + if (sw instanceof IStructuredDataCreationWizard) { + // ((IStrucutredDataCreationWizard)sw).i + } + if (sw instanceof INewWizard) { + ((INewWizard) sw).init(null, this.getSelection()); + } + return sw; + } + + protected Object getReturnObjectFromWizard(String dataID) { + IWizard wizard = getWizardViaDataID(dataID); + if (wizard != null) { + StructuredDataCreationWizardDailog dialog = new StructuredDataCreationWizardDailog( + getShell(), wizard); + if (dialog.open() == Dialog.OK) { + return dialog.getCurrentCreationWizard() + .getTreeViewerInputContents(); + } + } else { + MessageDialog.openInformation(getShell(), "Info", + "Please select the data type first"); + } + + return null; + } + + protected void openSourceWizard() { + sourceTreeViewerInputContents = getReturnObjectFromWizard(getSourceID()); +// resetLinkText(); + } +/** + * @deprecated + */ + private void resetLinkText() { + // if (sourceTreeViewerInputContents != null) { + // sourceDataLink.setText("Source Model Select"); + // } + // + // if (targetTreeViewerInputContents != null) { + // targetDataLink.setText("Target Model Select"); + // } + } + + protected String getDataTypeID(CheckboxTableViewer viewer) { + Object[] objs = viewer.getCheckedElements(); + if (objs == null) + return null; + if (objs.length <= 0) + return null; + DataTypeID d = (DataTypeID) objs[0]; + return d.getId(); + } + + protected void initViewer() { + IWizard wizard = this.getWizard(); + if (wizard instanceof TypeIDSelectionWizard) { + String s = ((TypeIDSelectionWizard) wizard).getSourceDataTypeID(); + String t = ((TypeIDSelectionWizard) wizard).getTargetDataTypeID(); + this.setSourceID(s); + this.setTargetID(t); + if (initViewerCheckState(s, source)) { + source.getTable().setEnabled(false); + } + if (initViewerCheckState(t, target)) { + target.getTable().setEnabled(false); + } + } + } + + protected boolean initViewerCheckState(String id, CheckboxTableViewer viewer) { + if (id == null) + return false; + List l = (List) viewer.getInput(); + for (Iterator iterator = l.iterator(); iterator.hasNext();) { + DataTypeID dti = (DataTypeID) iterator.next(); + if (id.equals(dti.getId())) { + viewer.setChecked(dti, true); + return true; + } + } + return false; + } + + private IWizardNode getSourceWizard(String id) { + Collection<IViewerInitor> viewers = ViewerInitorStore.getInstance() + .getViewerInitorCollection(); + for (Iterator iterator = viewers.iterator(); iterator.hasNext();) { + IViewerInitor viewerInitor = (IViewerInitor) iterator.next(); + if (viewerInitor.getTypeID().equals(id)) { + TransformSelectWizardNode wn = new TransformSelectWizardNode(); + IStructuredDataCreationWizard wizard = viewerInitor + .getStructuredDataLoadWizard(); + if (wizard == null) + return null; + wn.setWizard(wizard); + wn.setName(viewerInitor.getName()); + wn.setIconPath(viewerInitor.getWizardIconPath()); + wn.setDescription(viewerInitor.getDescription()); + return wn; + } + } + return null; + } + + protected CheckboxTableViewer createTableViewer(Composite parent) { + final CheckboxTableViewer viewer = CheckboxTableViewer.newCheckList( + parent, SWT.FULL_SELECTION); + viewer.addCheckStateListener(new ICheckStateListener() { + private boolean fireEvent = true; + + public void checkStateChanged(CheckStateChangedEvent event) { + if (!fireEvent) + return; + boolean check = event.getChecked(); + if (check) { + fireEvent = false; + viewer.setAllChecked(false); + viewer.setChecked(event.getElement(), true); + fireEvent = true; + } + + if (viewer == source) { + String sourceID = getDataTypeID(source); + setSourceID(sourceID); + } + + if (viewer == target) { + String targetID = getDataTypeID(target); + setTargetID(targetID); + } + IWizardContainer container = getContainer(); + if (container != null) { + container.updateButtons(); + } + } + + }); + TableColumn nameColumn = new TableColumn(viewer.getTable(), SWT.NONE); + nameColumn.setWidth(250); + nameColumn.setText("Name"); + viewer.setContentProvider(new TypeIDContentProvider()); + viewer.setLabelProvider(new TypeIDLabelProvider()); + return viewer; + } + + private class TypeIDContentProvider implements IStructuredContentProvider { + + public Object[] getElements(Object inputElement) { + if (inputElement instanceof List) { + return ((List) inputElement).toArray(); + } + return new Object[] {}; + } + + public void dispose() { + + } + + public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { + } + + } + + private class TypeIDLabelProvider extends LabelProvider implements + ITableLabelProvider { + + public Image getColumnImage(Object element, int columnIndex) { + + return null; + } + + public String getColumnText(Object element, int columnIndex) { + if (element instanceof DataTypeID) { + switch (columnIndex) { + case 0: + return ((DataTypeID) element).getName(); + // case 1: + // return ((DataTypeID) element).getId(); + } + } + return ""; + } + + } + + + public Object getSourceTreeViewerInputContents() { + return sourceTreeViewerInputContents; + } + + public void setSourceTreeViewerInputContents( + Object sourceTreeViewerInputContents) { + this.sourceTreeViewerInputContents = sourceTreeViewerInputContents; + } + + public Object getTargetTreeViewerInputContents() { + return targetTreeViewerInputContents; + } + + public void setTargetTreeViewerInputContents( + Object targetTreeViewerInputContents) { + this.targetTreeViewerInputContents = targetTreeViewerInputContents; + } + + public IWizard getSourceDataCreationWizard() { + return sourceDataCreationWizard; + } + + public IWizard getTargetDataCreationWizard() { + return targetDataCreationWizard; + } +} Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/wizards/NewResourceConfigWizardPage.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/wizards/NewResourceConfigWizardPage.java 2008-10-21 09:18:30 UTC (rev 11034) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/wizards/NewResourceConfigWizardPage.java 2008-10-21 09:20:19 UTC (rev 11035) @@ -1,128 +1,131 @@ -/******************************************************************************* - * Copyright (c) 2008 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 - * - * Contributors: - * Red Hat, Inc. - initial API and implementation - ******************************************************************************/ -package org.jboss.tools.smooks.ui.wizards; - -import java.util.List; - -import org.eclipse.jface.resource.ImageDescriptor; -import org.eclipse.jface.viewers.ISelectionChangedListener; -import org.eclipse.jface.viewers.IStructuredContentProvider; -import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.jface.viewers.LabelProvider; -import org.eclipse.jface.viewers.SelectionChangedEvent; -import org.eclipse.jface.viewers.TableViewer; -import org.eclipse.jface.viewers.Viewer; -import org.eclipse.jface.wizard.WizardPage; -import org.eclipse.swt.SWT; -import org.eclipse.swt.graphics.Image; -import org.eclipse.swt.layout.FillLayout; -import org.eclipse.swt.widgets.Composite; - -/** - * @author Dart Peng - * Date : Sep 18, 2008 - */ -public class NewResourceConfigWizardPage extends WizardPage implements ISelectionChangedListener{ - - private NewResourceConfigKey selectedKey = null; - - public NewResourceConfigWizardPage(String pageName, String title, - ImageDescriptor titleImage) { - super(pageName, title, titleImage); - // TODO Auto-generated constructor stub - } - - public NewResourceConfigWizardPage(String pageName) { - super(pageName); - } - - /* (non-Javadoc) - * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite) - */ - public void createControl(Composite parent) { - Composite mainComposite = new Composite(parent,SWT.NONE); - FillLayout layout = new FillLayout(); -// layout.marginHeight = 350; - mainComposite.setLayout(layout); - TableViewer viewer = new TableViewer(mainComposite); - viewer.setContentProvider(new NewResourceConfigKeyContentProvider()); - viewer.setLabelProvider(new NewResourceConfigKeyLabelProvider()); - viewer.setInput(NewResourceConfigFactory.getInstance().getAllIDs()); - viewer.addSelectionChangedListener(this); - setControl(mainComposite); - - validatePageFinish(); - } - - protected void validatePageFinish(){ - String error = null; - if(selectedKey == null){ - error = "Please select one key"; - } - - setErrorMessage(error); - setPageComplete(error == null); - } - - private class NewResourceConfigKeyContentProvider implements IStructuredContentProvider{ - - public Object[] getElements(Object inputElement) { - if(inputElement instanceof List){ - return ((List)inputElement).toArray(); - } - if(inputElement.getClass().isArray()){ - return (Object[])inputElement; - } - return new Object[]{}; - } - - public void dispose() { - - } - - public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { - - } - - } - - private class NewResourceConfigKeyLabelProvider extends LabelProvider{ - - public Image getImage(Object element) { - if(element instanceof NewResourceConfigKey){ - return ((NewResourceConfigKey)element).getImage(); - } - return super.getImage(element); - } - - public String getText(Object element) { - if(element instanceof NewResourceConfigKey){ - return ((NewResourceConfigKey)element).getName(); - } - return super.getText(element); - } - - } - - public void selectionChanged(SelectionChangedEvent event) { - Object obj = ((IStructuredSelection)event.getSelection()).getFirstElement(); - if(obj != null && obj instanceof NewResourceConfigKey){ - selectedKey = (NewResourceConfigKey)obj; - } - - validatePageFinish(); - } - - public NewResourceConfigKey getSelectedKey() { - return selectedKey; - } - -} +/******************************************************************************* + * Copyright (c) 2008 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 + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.smooks.ui.wizards; + +import java.util.List; + +import org.eclipse.jface.resource.ImageDescriptor; +import org.eclipse.jface.viewers.ISelectionChangedListener; +import org.eclipse.jface.viewers.IStructuredContentProvider; +import org.eclipse.jface.viewers.IStructuredSelection; +import org.eclipse.jface.viewers.LabelProvider; +import org.eclipse.jface.viewers.SelectionChangedEvent; +import org.eclipse.jface.viewers.TableViewer; +import org.eclipse.jface.viewers.Viewer; +import org.eclipse.jface.wizard.WizardPage; +import org.eclipse.swt.SWT; +import org.eclipse.swt.graphics.Image; +import org.eclipse.swt.layout.FillLayout; +import org.eclipse.swt.widgets.Composite; + +/** + * @author Dart Peng + * Date : Sep 18, 2008 + */ +public class NewResourceConfigWizardPage extends WizardPage implements ISelectionChangedListener{ + + private NewResourceConfigKey selectedKey = null; + + + public NewResourceConfigWizardPage(String pageName, String title, + ImageDescriptor titleImage) { + super(pageName, "Select New ResourceConfig Type", titleImage); + setDescription("Select the ResourceConfig type to add into the config file"); + } + + public NewResourceConfigWizardPage(String pageName) { + super(pageName); + setTitle("Select New ResourceConfig Type"); + setDescription("Select the ResourceConfig type to add into the config file"); + } + + /* (non-Javadoc) + * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite) + */ + public void createControl(Composite parent) { + Composite mainComposite = new Composite(parent,SWT.NONE); + FillLayout layout = new FillLayout(); +// layout.marginHeight = 350; + mainComposite.setLayout(layout); + TableViewer viewer = new TableViewer(mainComposite); + viewer.setContentProvider(new NewResourceConfigKeyContentProvider()); + viewer.setLabelProvider(new NewResourceConfigKeyLabelProvider()); + viewer.setInput(NewResourceConfigFactory.getInstance().getAllIDs()); + viewer.addSelectionChangedListener(this); + setControl(mainComposite); + + validatePageFinish(); + } + + protected void validatePageFinish(){ + String error = null; + if(selectedKey == null){ + error = "Please select one key"; + } + + setErrorMessage(error); + setPageComplete(error == null); + } + + private class NewResourceConfigKeyContentProvider implements IStructuredContentProvider{ + + public Object[] getElements(Object inputElement) { + if(inputElement instanceof List){ + return ((List)inputElement).toArray(); + } + if(inputElement.getClass().isArray()){ + return (Object[])inputElement; + } + return new Object[]{}; + } + + public void dispose() { + + } + + public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { + + } + + } + + private class NewResourceConfigKeyLabelProvider extends LabelProvider{ + + public Image getImage(Object element) { + if(element instanceof NewResourceConfigKey){ + return ((NewResourceConfigKey)element).getImage(); + } + return super.getImage(element); + } + + public String getText(Object element) { + if(element instanceof NewResourceConfigKey){ + return ((NewResourceConfigKey)element).getName(); + } + return super.getText(element); + } + + } + + public void selectionChanged(SelectionChangedEvent event) { + Object obj = ((IStructuredSelection)event.getSelection()).getFirstElement(); + if(obj != null && obj instanceof NewResourceConfigKey){ + selectedKey = (NewResourceConfigKey)obj; + } + + validatePageFinish(); + } + + public NewResourceConfigKey getSelectedKey() { + return selectedKey; + } + +} Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/wizards/SmooksConfigFileNewWizard.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/wizards/SmooksConfigFileNewWizard.java 2008-10-21 09:18:30 UTC (rev 11034) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/wizards/SmooksConfigFileNewWizard.java 2008-10-21 09:20:19 UTC (rev 11035) @@ -1,301 +1,304 @@ -package org.jboss.tools.smooks.ui.wizards; - -import java.io.ByteArrayInputStream; -import java.io.IOException; -import java.io.InputStream; -import java.lang.reflect.InvocationTargetException; -import java.util.ArrayList; -import java.util.List; - -import org.eclipse.core.resources.IFile; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Status; -import org.eclipse.jface.dialogs.MessageDialog; -import org.eclipse.jface.operation.IRunnableWithProgress; -import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.jface.wizard.IWizard; -import org.eclipse.jface.wizard.IWizardPage; -import org.eclipse.jface.wizard.Wizard; -import org.eclipse.ui.INewWizard; -import org.eclipse.ui.IWorkbench; -import org.eclipse.ui.IWorkbenchPage; -import org.eclipse.ui.PartInitException; -import org.eclipse.ui.PlatformUI; -import org.eclipse.ui.ide.IDE; -import org.jboss.tools.smooks.graphical.util.GraphicalInformationSaver; -import org.jboss.tools.smooks.ui.IStructuredDataCreationWizard; -import org.jboss.tools.smooks.ui.editors.SmooksFileEditorInput; -import org.jboss.tools.smooks.ui.editors.SmooksFormEditor; -import org.jboss.tools.smooks.ui.editors.TypeIDSelectionWizardPage; - -/** - * This is a sample new wizard. Its role is to create a new file resource in the - * provided container. If the container resource (a folder or a project) is - * selected in the workspace when the wizard is opened, it will accept it as the - * target container. The wizard creates one file with the extension "smooks". If - * a sample multi-page editor (also available as a template) is registered for - * the same extension, it will be able to open it. - */ - -public class SmooksConfigFileNewWizard extends Wizard implements INewWizard, - ISmooksDataCreationAddtionWizard { - private SmooksConfigFileNewWizardPage page; - private TypeIDSelectionWizardPage typeIDPage; - - private List<IWizardPage> sourceCreationPages = new ArrayList<IWizardPage>(); - - private List<IWizardPage> targetCreationPages = new ArrayList<IWizardPage>(); - - private IStructuredSelection selection; - - private IWorkbench workbench; - - /** - * Constructor for SmooksConfigFileNewWizard. - */ - public SmooksConfigFileNewWizard() { - super(); - setNeedsProgressMonitor(true); - } - - /** - * Adding the page to the wizard. - */ - public void addPages() { - page = new SmooksConfigFileNewWizardPage("newSmooksFile1", - getSelection()); - addPage(page); - // TODO don't use the WizardSelectionPage - typeIDPage = new TypeIDSelectionWizardPage("", false); - typeIDPage.setSelection(selection); - addPage(typeIDPage); - } - - /** - * This method is called when 'Finish' button is pressed in the wizard. We - * will create an operation and run it using wizard as execution context. - */ - public boolean performFinish() { - // final String containerName = page.getContainerName(); - // final String fileName = page.getFileName(); - final IFile file = page.createNewFile(); - IRunnableWithProgress op = new IRunnableWithProgress() { - public void run(IProgressMonitor monitor) - throws InvocationTargetException { - try { - doFinish(file, monitor); - } catch (CoreException e) { - throw new InvocationTargetException(e); - } finally { - monitor.done(); - } - } - }; - try { - getContainer().run(true, false, op); - } catch (InterruptedException e) { - return false; - } catch (InvocationTargetException e) { - Throwable realException = e.getTargetException(); - MessageDialog.openError(getShell(), "Error", realException - .getMessage()); - return false; - } - return true; - } - - /** - * The worker method. It will find the container, create the file if missing - * or just replace its contents, and open the editor on the newly created - * file. - */ - - private void doFinish(final IFile file, IProgressMonitor monitor) - throws CoreException { - // create a sample file - String sourceTypeID = typeIDPage.getSourceID(); - String targetTypeID = typeIDPage.getTargetID(); - - try { - InputStream stream = openContentStream(); - if (file.exists()) { - file.setContents(stream, true, true, monitor); - } else { - file.create(stream, true, monitor); - } - stream.close(); - GraphicalInformationSaver ginforSave = new GraphicalInformationSaver( - file); - ginforSave.doSave(monitor, sourceTypeID, targetTypeID); - } catch (IOException e) { - } - monitor.worked(1); - monitor.setTaskName("Opening file for editing..."); - getShell().getDisplay().asyncExec(new Runnable() { - public void run() { - IWorkbenchPage page = PlatformUI.getWorkbench() - .getActiveWorkbenchWindow().getActivePage(); - try { - SmooksFileEditorInput input = new SmooksFileEditorInput( - file); - IWizard sourceWizard = typeIDPage - .getSourceDataCreationWizard(); - IWizard targetWizard = typeIDPage - .getTargetDataCreationWizard(); - if (sourceWizard != null) { - sourceWizard.performFinish(); - } - if (targetWizard != null) { - targetWizard.performFinish(); - } - if (sourceWizard instanceof IStructuredDataCreationWizard) { - Object sourceObj = ((IStructuredDataCreationWizard) sourceWizard) - .getTreeViewerInputContents(); -// if (sourceObj instanceof List) { -// if (!((List) sourceObj).isEmpty()) { -// sourceObj = ((List) sourceObj).get(0); -// } -// } - input.setSourceTreeViewerInputContents(sourceObj); - } - - if (targetWizard instanceof IStructuredDataCreationWizard) { - Object targetObj = ((IStructuredDataCreationWizard) targetWizard) - .getTreeViewerInputContents(); -// if (targetObj instanceof List) { -// if (!((List) targetObj).isEmpty()) { -// targetObj = ((List) targetObj).get(0); -// } -// } - input.setTargetTreeViewerInputContents(targetObj); - - } - - IDE.openEditor(page, input, SmooksFormEditor.EDITOR_ID, - true);// openEditor(page, file, true); - } catch (PartInitException e) { - } - } - }); - monitor.worked(1); - } - - /** - * We will initialize file contents with a sample text. - */ - - private InputStream openContentStream() { - String contents = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" - + " <smooks-resource-list xmlns=\"http://www.milyn.org/xsd/smooks-1.0.xsd\"/>"; - return new ByteArrayInputStream(contents.getBytes()); - } - - private void throwCoreException(String message) throws CoreException { - IStatus status = new Status(IStatus.ERROR, "org.jboss.tools.smooks.ui", - IStatus.OK, message, null); - throw new CoreException(status); - } - - public void init(IWorkbench workbench, IStructuredSelection selection) { - this.workbench = workbench; - this.selection = selection; - } - - public IStructuredSelection getSelection() { - return selection; - } - - public void setSelection(IStructuredSelection selection) { - this.selection = selection; - } - - public void addSourceWizardPage(IWizardPage page) { - sourceCreationPages.add(page); - page.setTitle("Source Data Selection Page"); - } - - public void addTargetWizardPage(IWizardPage page) { - targetCreationPages.add(page); - page.setTitle("Target Data Selection Page"); - } - - public void clearSourceWizardPages() { - // for (Iterator iterator = sourceCreationPages.iterator(); - // iterator.hasNext();) { - // IWizardPage page = (IWizardPage) iterator.next(); - // if(page != null){ - // page.dispose(); - // } - // } - sourceCreationPages.clear(); - } - - private IWizardPage getSourceCreationPage(IWizardPage page) { - if (page == typeIDPage) { - if (sourceCreationPages.isEmpty()) - return null; - return (IWizardPage) sourceCreationPages.get(0); - } - if (sourceCreationPages.contains(page)) { - int i = sourceCreationPages.indexOf(page); - if ((i + 1) >= sourceCreationPages.size()) { - return null; - } - return (IWizardPage) sourceCreationPages.get(i + 1); - } - return null; - } - - private IWizardPage getTargetCreationPage(IWizardPage page) { - if (page == typeIDPage) { - if (targetCreationPages.isEmpty()) - return null; - return (IWizardPage) targetCreationPages.get(0); - } - if (targetCreationPages.contains(page)) { - int i = targetCreationPages.indexOf(page); - if ((i + 1) >= targetCreationPages.size()) { - return null; - } - return (IWizardPage) targetCreationPages.get(i + 1); - } - if (sourceCreationPages.contains(page)) { - if (sourceCreationPages.get(sourceCreationPages.size() - 1) == page) { - return (IWizardPage) targetCreationPages.get(0); - } - } - return null; - } - - @Override - public IWizardPage getNextPage(IWizardPage page) { - IWizardPage p = getSourceCreationPage(page); - if (p != null) - return p; - p = getTargetCreationPage(page); - if (p != null) - return p; - return super.getNextPage(page); - } - - public void clearTargetWizardPages() { - // for (Iterator iterator = sourceCreationPages.iterator(); - // iterator.hasNext();) { - // IWizardPage page = (IWizardPage) iterator.next(); - // if(page != null){ - // page.dispose(); - // } - // } - targetCreationPages.clear(); - } - - public void removeSourceWIzardPage(IWizardPage page) { - sourceCreationPages.remove(page); - } - - public void removeTargetWIzardPage(IWizardPage page) { - targetCreationPages.remove(page); - } +package org.jboss.tools.smooks.ui.wizards; + +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.lang.reflect.InvocationTargetException; +import java.util.ArrayList; +import java.util.List; + +import org.eclipse.core.resources.IFile; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.Status; +import org.eclipse.jface.dialogs.MessageDialog; +import org.eclipse.jface.operation.IRunnableWithProgress; +import org.eclipse.jface.viewers.IStructuredSelection; +import org.eclipse.jface.wizard.IWizard; +import org.eclipse.jface.wizard.IWizardPage; +import org.eclipse.jface.wizard.Wizard; +import org.eclipse.ui.INewWizard; +import org.eclipse.ui.IWorkbench; +import org.eclipse.ui.IWorkbenchPage; +import org.eclipse.ui.PartInitException; +import org.eclipse.ui.PlatformUI; +import org.eclipse.ui.ide.IDE; +import org.jboss.tools.common.model.ui.ModelUIImages; +import org.jboss.tools.smooks.graphical.util.GraphicalInformationSaver; +import org.jboss.tools.smooks.ui.IStructuredDataCreationWizard; +import org.jboss.tools.smooks.ui.editors.SmooksFileEditorInput; +import org.jboss.tools.smooks.ui.editors.SmooksFormEditor; +import org.jboss.tools.smooks.ui.editors.TypeIDSelectionWizardPage; + +/** + * This is a sample new wizard. Its role is to create a new file resource in the + * provided container. If the container resource (a folder or a project) is + * selected in the workspace when the wizard is opened, it will accept it as the + * target container. The wizard creates one file with the extension "smooks". If + * a sample multi-page editor (also available as a template) is registered for + * the same extension, it will be able to open it. + */ + +public class SmooksConfigFileNewWizard extends Wizard implements INewWizard, + ISmooksDataCreationAddtionWizard { + private SmooksConfigFileNewWizardPage page; + private TypeIDSelectionWizardPage typeIDPage; + + private List<IWizardPage> sourceCreationPages = new ArrayList<IWizardPage>(); + + private List<IWizardPage> targetCreationPages = new ArrayList<IWizardPage>(); + + private IStructuredSelection selection; + + private IWorkbench workbench; + + /** + * Constructor for SmooksConfigFileNewWizard. + */ + public SmooksConfigFileNewWizard() { + super(); + setNeedsProgressMonitor(true); + super.setWindowTitle("New Smooks Configuration File"); + setDefaultPageImageDescriptor(ModelUIImages.getImageDescriptor(ModelUIImages.WIZARD_NEW_PROJECT)); + } + + /** + * Adding the page to the wizard. + */ + public void addPages() { + page = new SmooksConfigFileNewWizardPage("newSmooksFile1", + getSelection()); + addPage(page); + // TODO don't use the WizardSelectionPage + typeIDPage = new TypeIDSelectionWizardPage("", false); + typeIDPage.setSelection(selection); + addPage(typeIDPage); + } + + /** + * This method is called when 'Finish' button is pressed in the wizard. We + * will create an operation and run it using wizard as execution context. + */ + public boolean performFinish() { + // final String containerName = page.getContainerName(); + // final String fileName = page.getFileName(); + final IFile file = page.createNewFile(); + IRunnableWithProgress op = new IRunnableWithProgress() { + public void run(IProgressMonitor monitor) + throws InvocationTargetException { + try { + doFinish(file, monitor); + } catch (CoreException e) { + throw new InvocationTargetException(e); + } finally { + monitor.done(); + } + } + }; + try { + getContainer().run(true, false, op); + } catch (InterruptedException e) { + return false; + } catch (InvocationTargetException e) { + Throwable realException = e.getTargetException(); + MessageDialog.openError(getShell(), "Error", realException + .getMessage()); + return false; + } + return true; + } + + /** + * The worker method. It will find the container, create the file if missing + * or just replace its contents, and open the editor on the newly created + * file. + */ + + private void doFinish(final IFile file, IProgressMonitor monitor) + throws CoreException { + // create a sample file + String sourceTypeID = typeIDPage.getSourceID(); + String targetTypeID = typeIDPage.getTargetID(); + + try { + InputStream stream = openContentStream(); + if (file.exists()) { + file.setContents(stream, true, true, monitor); + } else { + file.create(stream, true, monitor); + } + stream.close(); + GraphicalInformationSaver ginforSave = new GraphicalInformationSaver( + file); + ginforSave.doSave(monitor, sourceTypeID, targetTypeID); + } catch (IOException e) { + } + monitor.worked(1); + monitor.setTaskName("Opening file for editing..."); + getShell().getDisplay().asyncExec(new Runnable() { + public void run() { + IWorkbenchPage page = PlatformUI.getWorkbench() + .getActiveWorkbenchWindow().getActivePage(); + try { + SmooksFileEditorInput input = new SmooksFileEditorInput( + file); + IWizard sourceWizard = typeIDPage + .getSourceDataCreationWizard(); + IWizard targetWizard = typeIDPage + .getTargetDataCreationWizard(); + if (sourceWizard != null) { + sourceWizard.performFinish(); + } + if (targetWizard != null) { + targetWizard.performFinish(); + } + if (sourceWizard instanceof IStructuredDataCreationWizard) { + Object sourceObj = ((IStructuredDataCreationWizard) sourceWizard) + .getTreeViewerInputContents(); +// if (sourceObj instanceof List) { +// if (!((List) sourceObj).isEmpty()) { +// sourceObj = ((List) sourceObj).get(0); +// } +// } + input.setSourceTreeViewerInputContents(sourceObj); + } + + if (targetWizard instanceof IStructuredDataCreationWizard) { + Object targetObj = ((IStructuredDataCreationWizard) targetWizard) + .getTreeViewerInputContents(); +// if (targetObj instanceof List) { +// if (!((List) targetObj).isEmpty()) { +// targetObj = ((List) targetObj).get(0); +// } +// } + input.setTargetTreeViewerInputContents(targetObj); + + } + + IDE.openEditor(page, input, SmooksFormEditor.EDITOR_ID, + true);// openEditor(page, file, true); + } catch (PartInitException e) { + } + } + }); + monitor.worked(1); + } + + /** + * We will initialize file contents with a sample text. + */ + + private InputStream openContentStream() { + String contents = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" + + " <smooks-resource-list xmlns=\"http://www.milyn.org/xsd/smooks-1.0.xsd\"/>"; + return new ByteArrayInputStream(contents.getBytes()); + } + + private void throwCoreException(String message) throws CoreException { + IStatus status = new Status(IStatus.ERROR, "org.jboss.tools.smooks.ui", + IStatus.OK, message, null); + throw new CoreException(status); + } + + public void init(IWorkbench workbench, IStructuredSelection selection) { + this.workbench = workbench; + this.selection = selection; + } + + public IStructuredSelection getSelection() { + return selection; + } + + public void setSelection(IStructuredSelection selection) { + this.selection = selection; + } + + public void addSourceWizardPage(IWizardPage page) { + sourceCreationPages.add(page); + page.setTitle("Source Data Selection"); + } + + public void addTargetWizardPage(IWizardPage page) { + targetCreationPages.add(page); + page.setTitle("Target Data Selection"); + } + + public void clearSourceWizardPages() { + // for (Iterator iterator = sourceCreationPages.iterator(); + // iterator.hasNext();) { + // IWizardPage page = (IWizardPage) iterator.next(); + // if(page != null){ + // page.dispose(); + // } + // } + sourceCreationPages.clear(); + } + + private IWizardPage getSourceCreationPage(IWizardPage page) { + if (page == typeIDPage) { + if (sourceCreationPages.isEmpty()) + return null; + return (IWizardPage) sourceCreationPages.get(0); + } + if (sourceCreationPages.contains(page)) { + int i = sourceCreationPages.indexOf(page); + if ((i + 1) >= sourceCreationPages.size()) { + return null; + } + return (IWizardPage) sourceCreationPages.get(i + 1); + } + return null; + } + + private IWizardPage getTargetCreationPage(IWizardPage page) { + if (page == typeIDPage) { + if (targetCreationPages.isEmpty()) + return null; + return (IWizardPage) targetCreationPages.get(0); + } + if (targetCreationPages.contains(page)) { + int i = targetCreationPages.indexOf(page); + if ((i + 1) >= targetCreationPages.size()) { + return null; + } + return (IWizardPage) targetCreationPages.get(i + 1); + } + if (sourceCreationPages.contains(page)) { + if (sourceCreationPages.get(sourceCreationPages.size() - 1) == page) { + return (IWizardPage) targetCreationPages.get(0); + } + } + return null; + } + + @Override + public IWizardPage getNextPage(IWizardPage page) { + IWizardPage p = getSourceCreationPage(page); + if (p != null) + return p; + p = getTargetCreationPage(page); + if (p != null) + return p; + return super.getNextPage(page); + } + + public void clearTargetWizardPages() { + // for (Iterator iterator = sourceCreationPages.iterator(); + // iterator.hasNext();) { + // IWizardPage page = (IWizardPage) iterator.next(); + // if(page != null){ + // page.dispose(); + // } + // } + targetCreationPages.clear(); + } + + public void removeSourceWIzardPage(IWizardPage page) { + sourceCreationPages.remove(page); + } + + public void removeTargetWIzardPage(IWizardPage page) { + targetCreationPages.remove(page); + } } \ No newline at end of file Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/wizards/SmooksConfigFileNewWizardPage.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/wizards/SmooksConfigFileNewWizardPage.java 2008-10-21 09:18:30 UTC (rev 11034) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/wizards/SmooksConfigFileNewWizardPage.java 2008-10-21 09:20:19 UTC (rev 11035) @@ -1,37 +1,40 @@ -package org.jboss.tools.smooks.ui.wizards; - -import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.ui.dialogs.WizardNewFileCreationPage; - -/** - * - * @author dart - * - */ -public class SmooksConfigFileNewWizardPage extends WizardNewFileCreationPage { - public SmooksConfigFileNewWizardPage(String pageName, - IStructuredSelection selection) { - super(pageName, selection); - setFileExtension("smooks"); - } - - @Override - protected boolean validatePage() { - boolean flag = super.validatePage(); - String name = this.getFileName(); - if (name.indexOf(".") == -1) - return flag; - String extensionName = name.substring(name.indexOf(".") + 1, name - .length()); - String error = null; - if (extensionName.equalsIgnoreCase(this.getFileExtension())) { - - } else { - error = "file extension must be \"smooks\""; - } - if (error != null) { - this.setErrorMessage(error); - } - return (error == null); - } +package org.jboss.tools.smooks.ui.wizards; + +import org.eclipse.jface.viewers.IStructuredSelection; +import org.eclipse.ui.dialogs.WizardNewFileCreationPage; + +/** + * + * @author dart + * + */ +public class SmooksConfigFileNewWizardPage extends WizardNewFileCreationPage { + public SmooksConfigFileNewWizardPage(String pageName, + IStructuredSelection selection) { + super(pageName, selection); + setFileExtension("smooks"); + super.setTitle("Smooks Configuration"); + super.setDescription("Create a new Smooks configuration file"); + this.setFileName("newConfig.smooks"); + } + + @Override + protected boolean validatePage() { + boolean flag = super.validatePage(); + String name = this.getFileName(); + if (name.indexOf(".") == -1) + return flag; + String extensionName = name.substring(name.indexOf(".") + 1, name + .length()); + String error = null; + if (extensionName.equalsIgnoreCase(this.getFileExtension())) { + + } else { + error = "file extension must be \"smooks\""; + } + if (error != null) { + this.setErrorMessage(error); + } + return (error == null); + } } \ No newline at end of file

17 years, 2 months

1
0
0 / 0

JBoss Tools SVN: r11034 - trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl.

by jbosstools-commits＠lists.jboss.org

Author: scabanovich Date: 2008-10-21 05:18:30 -0400 (Tue, 21 Oct 2008) New Revision: 11034 Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/AbstractXMLFileImpl.java trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/FileAnyImpl.java Log: JBIDE-2909 Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/AbstractXMLFileImpl.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/AbstractXMLFileImpl.java 2008-10-21 09:15:01 UTC (rev 11033) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/AbstractXMLFileImpl.java 2008-10-21 09:18:30 UTC (rev 11034) @@ -67,11 +67,11 @@ for (int i = 0; i < errors.length; i++) { String er = errors[i]; int q = er.lastIndexOf(':'); - String pos = er.substring(q + 1); - er = er.substring(0, q); + String pos = (q < 0) ? "" : er.substring(q + 1); + if(q >= 0) er = er.substring(0, q); q = er.lastIndexOf(':'); - String ln = er.substring(q + 1), ln1 = ln; - er = er.substring(0, q); + String ln = (q < 0) ? "" : er.substring(q + 1), ln1 = ln; + if(q >= 0) er = er.substring(0, q); int iln = -1; try { if(q >= 0 && ln1.length() > 0) { Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/FileAnyImpl.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/FileAnyImpl.java 2008-10-21 09:15:01 UTC (rev 11033) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/FileAnyImpl.java 2008-10-21 09:18:30 UTC (rev 11034) @@ -185,6 +185,10 @@ } public void fileRenamed(String name, String extension) { + if(name != null && name.equals(super.get("NAME")) + && extension != null && extension.equals(super.get("EXTENSION"))) { + return; + } super.set("NAME", name); super.set("EXTENSION", extension); fireObjectChanged(null);

17 years, 2 months

1
0
0 / 0

JBoss Tools SVN: r11033 - in branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui: META-INF and 4 other directories.

by jbosstools-commits＠lists.jboss.org

Author: DartPeng Date: 2008-10-21 05:15:01 -0400 (Tue, 21 Oct 2008) New Revision: 11033 Added: branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/icons/full/obj16/esb16.png branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/libs/dom4j.license Modified: branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/META-INF/MANIFEST.MF branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/plugin.xml branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/TypeIDSelectionWizardPage.java branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/wizards/NewResourceConfigWizardPage.java branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/wizards/SmooksConfigFileNewWizard.java branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/wizards/SmooksConfigFileNewWizardPage.java Log: JBIDE-2846 Thanks John for helping me modify that :) Modified: branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/META-INF/MANIFEST.MF =================================================================== --- branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/META-INF/MANIFEST.MF 2008-10-21 08:50:25 UTC (rev 11032) +++ branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/META-INF/MANIFEST.MF 2008-10-21 09:15:01 UTC (rev 11033) @@ -20,8 +20,9 @@ org.eclipse.emf, org.eclipse.emf.edit, org.eclipse.emf.edit.ui, - org.eclipse.xsd.edit;bundle-version="2.4.0", - org.jboss.tools.smooks.core + org.eclipse.xsd.edit, + org.jboss.tools.smooks.core, + org.jboss.tools.common.model.ui Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-ClassPath: ., Added: branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/icons/full/obj16/esb16.png =================================================================== (Binary files differ) Property changes on: branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/icons/full/obj16/esb16.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/libs/dom4j.license =================================================================== --- branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/libs/dom4j.license (rev 0) +++ branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/libs/dom4j.license 2008-10-21 09:15:01 UTC (rev 11033) @@ -0,0 +1,13 @@ +BSD style license + +Redistribution and use of this software and associated documentation ("Software"), with or without modification, are permitted provided that the following conditions are met: + + 1. Redistributions of source code must retain copyright statements and notices. Redistributions must also contain a copy of this document. + 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. + 3. The name "DOM4J" must not be used to endorse or promote products derived from this Software without prior written permission of MetaStuff, Ltd. For written permission, please contact dom4j-info(a)metastuff.com. + 4. Products derived from this Software may not be called "DOM4J" nor may "DOM4J" appear in their names without prior written permission of MetaStuff, Ltd. DOM4J is a registered trademark of MetaStuff, Ltd. + 5. Due credit should be given to the DOM4J Project - http://www.dom4j.org + +THIS SOFTWARE IS PROVIDED BY METASTUFF, LTD. AND CONTRIBUTORS ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL METASTUFF, LTD. OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +Copyright 2001-2005 (C) MetaStuff, Ltd. All Rights Reserved. \ No newline at end of file Modified: branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/plugin.xml =================================================================== --- branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/plugin.xml 2008-10-21 08:50:25 UTC (rev 11032) +++ branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/plugin.xml 2008-10-21 09:15:01 UTC (rev 11033) @@ -1,161 +1,161 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?eclipse version="3.2"?> -<plugin> - <extension-point id="viewerInitor" name="viewerInitor" schema="schema/viewerInitor.exsd"/> - <extension-point id="analyzer" name="analyzer" schema="schema/analyzer.exsd"/> - <extension point="org.eclipse.emf.ecore.generated_package"> - <package - uri = "http://www.jboss.org/tools/smooks/graphicalInformation" - class = "org.jboss.tools.smooks.graphical.GraphicalPackage" - genModel = "model/graphical.genmodel" /> - </extension> - - <extension - point="org.eclipse.ui.editors"> - <editor - name="Smooks Form Editor" - extensions="smooks" - icon="icons/sample.gif" - class="org.jboss.tools.smooks.ui.editors.SmooksFormEditor" - id="org.jboss.tools.smooks.ui.editors.SmooksFormEditor"> - </editor> - </extension> - <extension - point="org.eclipse.ui.views.properties.tabbed.propertySections"> - <propertySections - contributorId="org.jboss.tools.smooks.ui.editors.SmooksFormEditor"> - <propertySection - class="org.jboss.tools.smooks.ui.ConnectionPropertySection" - id="org.jboss.tools.smooks.ui.connection.propertyTab.Section" - tab="org.jboss.tools.smooks.ui.connection.propertyTab"> - <input - type="org.jboss.tools.smooks.ui.gef.model.LineConnectionModel"> - </input> - </propertySection> - </propertySections> - </extension> - <extension - point="org.eclipse.ui.views.properties.tabbed.propertyContributor"> - <propertyContributor - contributorId="org.jboss.tools.smooks.ui.editors.SmooksFormEditor" - typeMapper="org.jboss.tools.smooks.ui.SmooksGraphPropertyTypeMapper"> - <propertyCategory - category="connection"></propertyCategory> - </propertyContributor> - </extension> - <extension - point="org.eclipse.ui.views.properties.tabbed.propertyTabs"> - <propertyTabs - contributorId="org.jboss.tools.smooks.ui.editors.SmooksFormEditor"> - <propertyTab - category="connection" - id="org.jboss.tools.smooks.ui.connection.propertyTab" - label="Mapping Properties"> - </propertyTab> - </propertyTabs> - </extension> - <extension - point="org.eclipse.ui.newWizards"> - <category - id="org.jboss.tools.smooks.ui.wizards" - name="Smooks"> - </category> - <wizard - category="org.jboss.tools.smooks.ui.wizards" - class="org.jboss.tools.smooks.ui.wizards.SmooksConfigFileNewWizard" - icon="icons/sample.gif" - id="org.jboss.tools.smooks.ui.wizards.SmooksConfigFileNewWizard" - name="Smooks Configuration File"> - </wizard> - </extension> - - <extension - point="org.jboss.tools.smooks.ui.viewerInitor"> - <viewerInitor - contentProvider="org.jboss.tools.smooks.xml.ui.XMLStructuredDataContentProvider" - creationWizard="org.jboss.tools.smooks.xml.ui.XMLStructuredDataWizard" - description="XML data type comes from any .xml file." - labelProvider="org.jboss.tools.smooks.xml.ui.XMLStructuredDataLabelProvider" - name="XML Data Type" - typeID="org.jboss.tools.smooks.xml.viewerInitor.xml"> - </viewerInitor> - </extension> - <extension - point="org.jboss.tools.smooks.ui.analyzer"> - <mappingAnalyzer - class="org.jboss.tools.smooks.xml2xml.XML2XMLAnalyzer" - name="XML2XML Analyzer" - typeID="org.jboss.tools.smooks.xml.viewerInitor.xml"> - <targetSourceType - id="org.jboss.tools.smooks.xml.viewerInitor.xml" - name="XML"> - </targetSourceType> - </mappingAnalyzer> - </extension> - <extension - point="org.jboss.tools.smooks.ui.viewerInitor"> - <viewerInitor - contentProvider="org.jboss.tools.smooks.javabean.model.BeanContentProvider" - creationWizard="org.jboss.tools.smooks.javabean.ui.NewJavaBeanStrucutredDataWizard" - description="This data type can get from any Java .class." - labelProvider="org.jboss.tools.smooks.javabean.model.BeanlabelProvider" - name="JavaBean Data Type" - typeID="org.jboss.tools.smooks.ui.viewerInitor.javabean"> - </viewerInitor> - </extension> - <extension - point="org.jboss.tools.smooks.ui.analyzer"> - <mappingAnalyzer - class="org.jboss.tools.smooks.javabean.analyzer.JavaBeanAnalyzer" - name="JavaBean Analyzer" - typeID="org.jboss.tools.smooks.ui.viewerInitor.javabean"> - <targetSourceType - id="org.jboss.tools.smooks.ui.viewerInitor.javabean" - name="java2java"> - </targetSourceType> - </mappingAnalyzer> - <sourceModelAnalyzer - class="org.jboss.tools.smooks.javabean.analyzer.JavaBeanAnalyzer" - level="0" - name="JavaBean SourceModel Analyzer" - typeID="org.jboss.tools.smooks.ui.viewerInitor.javabean"> - </sourceModelAnalyzer> - <targetModelAnalyzer - class="org.jboss.tools.smooks.javabean.analyzer.JavaBeanAnalyzer" - level="0" - name="JavaBean TargetModel Analyzer" - typeID="org.jboss.tools.smooks.ui.viewerInitor.javabean"> - </targetModelAnalyzer> - </extension> - - <extension - point="org.jboss.tools.smooks.ui.analyzer"> - <mappingAnalyzer - class="org.jboss.tools.smooks.java2xml.analyzer.Java2XMLAnalyzer" - name="Java Bean" - typeID="org.jboss.tools.smooks.ui.viewerInitor.javabean"> - <targetSourceType - id="org.jboss.tools.smooks.xml.viewerInitor.xml" - name="XML"> - </targetSourceType> - </mappingAnalyzer> - </extension> - - <extension - point="org.jboss.tools.smooks.ui.analyzer"> - <mappingAnalyzer - class="org.jboss.tools.smooks.xml2java.analyzer.XML2JavaAnalyzer" - name="XML2Java" - typeID="org.jboss.tools.smooks.xml.viewerInitor.xml"> - <targetSourceType - id="org.jboss.tools.smooks.ui.viewerInitor.javabean" - name="JavaBean"> - </targetSourceType> - </mappingAnalyzer> - <sourceModelAnalyzer - class="org.jboss.tools.smooks.xml2java.analyzer.XMLSourceModelAnalyzer" - name="XML" - typeID="org.jboss.tools.smooks.xml.viewerInitor.xml"> - </sourceModelAnalyzer> - </extension> -</plugin> +<?xml version="1.0" encoding="UTF-8"?> +<?eclipse version="3.2"?> +<plugin> + <extension-point id="viewerInitor" name="viewerInitor" schema="schema/viewerInitor.exsd"/> + <extension-point id="analyzer" name="analyzer" schema="schema/analyzer.exsd"/> + <extension point="org.eclipse.emf.ecore.generated_package"> + <package + uri = "http://www.jboss.org/tools/smooks/graphicalInformation" + class = "org.jboss.tools.smooks.graphical.GraphicalPackage" + genModel = "model/graphical.genmodel" /> + </extension> + + <extension + point="org.eclipse.ui.editors"> + <editor + name="Smooks Form Editor" + extensions="smooks" + icon="icons/sample.gif" + class="org.jboss.tools.smooks.ui.editors.SmooksFormEditor" + id="org.jboss.tools.smooks.ui.editors.SmooksFormEditor"> + </editor> + </extension> + <extension + point="org.eclipse.ui.views.properties.tabbed.propertySections"> + <propertySections + contributorId="org.jboss.tools.smooks.ui.editors.SmooksFormEditor"> + <propertySection + class="org.jboss.tools.smooks.ui.ConnectionPropertySection" + id="org.jboss.tools.smooks.ui.connection.propertyTab.Section" + tab="org.jboss.tools.smooks.ui.connection.propertyTab"> + <input + type="org.jboss.tools.smooks.ui.gef.model.LineConnectionModel"> + </input> + </propertySection> + </propertySections> + </extension> + <extension + point="org.eclipse.ui.views.properties.tabbed.propertyContributor"> + <propertyContributor + contributorId="org.jboss.tools.smooks.ui.editors.SmooksFormEditor" + typeMapper="org.jboss.tools.smooks.ui.SmooksGraphPropertyTypeMapper"> + <propertyCategory + category="connection"></propertyCategory> + </propertyContributor> + </extension> + <extension + point="org.eclipse.ui.views.properties.tabbed.propertyTabs"> + <propertyTabs + contributorId="org.jboss.tools.smooks.ui.editors.SmooksFormEditor"> + <propertyTab + category="connection" + id="org.jboss.tools.smooks.ui.connection.propertyTab" + label="Mapping Properties"> + </propertyTab> + </propertyTabs> + </extension> + <extension + point="org.eclipse.ui.newWizards"> + <category + id="org.jboss.tools.smooks.ui.wizards" + name="Smooks"> + </category> + <wizard + category="org.jboss.tools.smooks.ui.wizards" + class="org.jboss.tools.smooks.ui.wizards.SmooksConfigFileNewWizard" + icon="icons/full/obj16/esb16.png" + id="org.jboss.tools.smooks.ui.wizards.SmooksConfigFileNewWizard" + name="Smooks Configuration File"> + </wizard> + </extension> + + <extension + point="org.jboss.tools.smooks.ui.viewerInitor"> + <viewerInitor + contentProvider="org.jboss.tools.smooks.xml.ui.XMLStructuredDataContentProvider" + creationWizard="org.jboss.tools.smooks.xml.ui.XMLStructuredDataWizard" + description="XML data type comes from any .xml file." + labelProvider="org.jboss.tools.smooks.xml.ui.XMLStructuredDataLabelProvider" + name="XML Data Type" + typeID="org.jboss.tools.smooks.xml.viewerInitor.xml"> + </viewerInitor> + </extension> + <extension + point="org.jboss.tools.smooks.ui.analyzer"> + <mappingAnalyzer + class="org.jboss.tools.smooks.xml2xml.XML2XMLAnalyzer" + name="XML2XML Analyzer" + typeID="org.jboss.tools.smooks.xml.viewerInitor.xml"> + <targetSourceType + id="org.jboss.tools.smooks.xml.viewerInitor.xml" + name="XML"> + </targetSourceType> + </mappingAnalyzer> + </extension> + <extension + point="org.jboss.tools.smooks.ui.viewerInitor"> + <viewerInitor + contentProvider="org.jboss.tools.smooks.javabean.model.BeanContentProvider" + creationWizard="org.jboss.tools.smooks.javabean.ui.NewJavaBeanStrucutredDataWizard" + description="This data type can get from any Java .class." + labelProvider="org.jboss.tools.smooks.javabean.model.BeanlabelProvider" + name="JavaBean Data Type" + typeID="org.jboss.tools.smooks.ui.viewerInitor.javabean"> + </viewerInitor> + </extension> + <extension + point="org.jboss.tools.smooks.ui.analyzer"> + <mappingAnalyzer + class="org.jboss.tools.smooks.javabean.analyzer.JavaBeanAnalyzer" + name="JavaBean Analyzer" + typeID="org.jboss.tools.smooks.ui.viewerInitor.javabean"> + <targetSourceType + id="org.jboss.tools.smooks.ui.viewerInitor.javabean" + name="java2java"> + </targetSourceType> + </mappingAnalyzer> + <sourceModelAnalyzer + class="org.jboss.tools.smooks.javabean.analyzer.JavaBeanAnalyzer" + level="0" + name="JavaBean SourceModel Analyzer" + typeID="org.jboss.tools.smooks.ui.viewerInitor.javabean"> + </sourceModelAnalyzer> + <targetModelAnalyzer + class="org.jboss.tools.smooks.javabean.analyzer.JavaBeanAnalyzer" + level="0" + name="JavaBean TargetModel Analyzer" + typeID="org.jboss.tools.smooks.ui.viewerInitor.javabean"> + </targetModelAnalyzer> + </extension> + + <extension + point="org.jboss.tools.smooks.ui.analyzer"> + <mappingAnalyzer + class="org.jboss.tools.smooks.java2xml.analyzer.Java2XMLAnalyzer" + name="Java Bean" + typeID="org.jboss.tools.smooks.ui.viewerInitor.javabean"> + <targetSourceType + id="org.jboss.tools.smooks.xml.viewerInitor.xml" + name="XML"> + </targetSourceType> + </mappingAnalyzer> + </extension> + + <extension + point="org.jboss.tools.smooks.ui.analyzer"> + <mappingAnalyzer + class="org.jboss.tools.smooks.xml2java.analyzer.XML2JavaAnalyzer" + name="XML2Java" + typeID="org.jboss.tools.smooks.xml.viewerInitor.xml"> + <targetSourceType + id="org.jboss.tools.smooks.ui.viewerInitor.javabean" + name="JavaBean"> + </targetSourceType> + </mappingAnalyzer> + <sourceModelAnalyzer + class="org.jboss.tools.smooks.xml2java.analyzer.XMLSourceModelAnalyzer" + name="XML" + typeID="org.jboss.tools.smooks.xml.viewerInitor.xml"> + </sourceModelAnalyzer> + </extension> +</plugin> Modified: branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/TypeIDSelectionWizardPage.java =================================================================== --- branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/TypeIDSelectionWizardPage.java 2008-10-21 08:50:25 UTC (rev 11032) +++ branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/editors/TypeIDSelectionWizardPage.java 2008-10-21 09:15:01 UTC (rev 11033) @@ -14,6 +14,7 @@ import java.util.Iterator; import java.util.List; +import org.eclipse.draw2d.ColorConstants; import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.viewers.CheckStateChangedEvent; @@ -31,6 +32,7 @@ import org.eclipse.jface.wizard.WizardPage; import org.eclipse.swt.SWT; import org.eclipse.swt.graphics.Image; +import org.eclipse.swt.layout.FillLayout; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Composite; @@ -103,11 +105,13 @@ public TypeIDSelectionWizardPage(String pageName, boolean showDataSelectPage) { super(pageName); this.showDataSelectPage = showDataSelectPage; + setTitle("Select Source/Target Data Type"); + setDescription("Select the data type for source/target data"); } @Override public boolean canFlipToNextPage() { - if (this.getSourceID() != null || getTargetID() != null) { + if (this.getSourceID() != null && getTargetID() != null) { return true; } return false; @@ -207,12 +211,26 @@ Label tl = new Label(mainComposite, SWT.NONE); tl.setText("Target Data Type ID List : "); - - source = createTableViewer(mainComposite); + + Composite sourceBorder = new Composite(mainComposite,SWT.NONE); + sourceBorder.setBackground(ColorConstants.black); + FillLayout sbLayout = new FillLayout(); + sbLayout.marginHeight = 1; + sbLayout.marginWidth = 1; + sourceBorder.setLayout(sbLayout); + source = createTableViewer(sourceBorder); GridData gd = new GridData(GridData.FILL_BOTH); - source.getTable().setLayoutData(gd); - target = createTableViewer(mainComposite); - target.getTable().setLayoutData(gd); + sourceBorder.setLayoutData(gd); + + + Composite targetBorder = new Composite(mainComposite,SWT.NONE); + targetBorder.setBackground(ColorConstants.black); + FillLayout tbLayout = new FillLayout(); + tbLayout.marginHeight = 1; + tbLayout.marginWidth = 1; + targetBorder.setLayout(tbLayout); + target = createTableViewer(targetBorder); + targetBorder.setLayoutData(gd); source.setInput(sourceList); target.setInput(sourceList); @@ -299,17 +317,19 @@ protected void openSourceWizard() { sourceTreeViewerInputContents = getReturnObjectFromWizard(getSourceID()); - resetLinkText(); +// resetLinkText(); } - +/** + * @deprecated + */ private void resetLinkText() { - if (sourceTreeViewerInputContents != null) { - sourceDataLink.setText("Source Model Select"); - } - - if (targetTreeViewerInputContents != null) { - targetDataLink.setText("Target Model Select"); - } + // if (sourceTreeViewerInputContents != null) { + // sourceDataLink.setText("Source Model Select"); + // } + // + // if (targetTreeViewerInputContents != null) { + // targetDataLink.setText("Target Model Select"); + // } } protected String getDataTypeID(CheckboxTableViewer viewer) { @@ -407,7 +427,7 @@ }); TableColumn nameColumn = new TableColumn(viewer.getTable(), SWT.NONE); - nameColumn.setWidth(100); + nameColumn.setWidth(250); nameColumn.setText("Name"); viewer.setContentProvider(new TypeIDContentProvider()); viewer.setLabelProvider(new TypeIDLabelProvider()); Modified: branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/wizards/NewResourceConfigWizardPage.java =================================================================== --- branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/wizards/NewResourceConfigWizardPage.java 2008-10-21 08:50:25 UTC (rev 11032) +++ branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/wizards/NewResourceConfigWizardPage.java 2008-10-21 09:15:01 UTC (rev 11033) @@ -34,14 +34,17 @@ private NewResourceConfigKey selectedKey = null; + public NewResourceConfigWizardPage(String pageName, String title, ImageDescriptor titleImage) { - super(pageName, title, titleImage); - // TODO Auto-generated constructor stub + super(pageName, "Select New ResourceConfig Type", titleImage); + setDescription("Select the ResourceConfig type to add into the config file"); } public NewResourceConfigWizardPage(String pageName) { super(pageName); + setTitle("Select New ResourceConfig Type"); + setDescription("Select the ResourceConfig type to add into the config file"); } /* (non-Javadoc) Modified: branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/wizards/SmooksConfigFileNewWizard.java =================================================================== --- branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/wizards/SmooksConfigFileNewWizard.java 2008-10-21 08:50:25 UTC (rev 11032) +++ branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/wizards/SmooksConfigFileNewWizard.java 2008-10-21 09:15:01 UTC (rev 11033) @@ -1,301 +1,304 @@ -package org.jboss.tools.smooks.ui.wizards; - -import java.io.ByteArrayInputStream; -import java.io.IOException; -import java.io.InputStream; -import java.lang.reflect.InvocationTargetException; -import java.util.ArrayList; -import java.util.List; - -import org.eclipse.core.resources.IFile; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Status; -import org.eclipse.jface.dialogs.MessageDialog; -import org.eclipse.jface.operation.IRunnableWithProgress; -import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.jface.wizard.IWizard; -import org.eclipse.jface.wizard.IWizardPage; -import org.eclipse.jface.wizard.Wizard; -import org.eclipse.ui.INewWizard; -import org.eclipse.ui.IWorkbench; -import org.eclipse.ui.IWorkbenchPage; -import org.eclipse.ui.PartInitException; -import org.eclipse.ui.PlatformUI; -import org.eclipse.ui.ide.IDE; -import org.jboss.tools.smooks.graphical.util.GraphicalInformationSaver; -import org.jboss.tools.smooks.ui.IStructuredDataCreationWizard; -import org.jboss.tools.smooks.ui.editors.SmooksFileEditorInput; -import org.jboss.tools.smooks.ui.editors.SmooksFormEditor; -import org.jboss.tools.smooks.ui.editors.TypeIDSelectionWizardPage; - -/** - * This is a sample new wizard. Its role is to create a new file resource in the - * provided container. If the container resource (a folder or a project) is - * selected in the workspace when the wizard is opened, it will accept it as the - * target container. The wizard creates one file with the extension "smooks". If - * a sample multi-page editor (also available as a template) is registered for - * the same extension, it will be able to open it. - */ - -public class SmooksConfigFileNewWizard extends Wizard implements INewWizard, - ISmooksDataCreationAddtionWizard { - private SmooksConfigFileNewWizardPage page; - private TypeIDSelectionWizardPage typeIDPage; - - private List<IWizardPage> sourceCreationPages = new ArrayList<IWizardPage>(); - - private List<IWizardPage> targetCreationPages = new ArrayList<IWizardPage>(); - - private IStructuredSelection selection; - - private IWorkbench workbench; - - /** - * Constructor for SmooksConfigFileNewWizard. - */ - public SmooksConfigFileNewWizard() { - super(); - setNeedsProgressMonitor(true); - } - - /** - * Adding the page to the wizard. - */ - public void addPages() { - page = new SmooksConfigFileNewWizardPage("newSmooksFile1", - getSelection()); - addPage(page); - // TODO don't use the WizardSelectionPage - typeIDPage = new TypeIDSelectionWizardPage("", false); - typeIDPage.setSelection(selection); - addPage(typeIDPage); - } - - /** - * This method is called when 'Finish' button is pressed in the wizard. We - * will create an operation and run it using wizard as execution context. - */ - public boolean performFinish() { - // final String containerName = page.getContainerName(); - // final String fileName = page.getFileName(); - final IFile file = page.createNewFile(); - IRunnableWithProgress op = new IRunnableWithProgress() { - public void run(IProgressMonitor monitor) - throws InvocationTargetException { - try { - doFinish(file, monitor); - } catch (CoreException e) { - throw new InvocationTargetException(e); - } finally { - monitor.done(); - } - } - }; - try { - getContainer().run(true, false, op); - } catch (InterruptedException e) { - return false; - } catch (InvocationTargetException e) { - Throwable realException = e.getTargetException(); - MessageDialog.openError(getShell(), "Error", realException - .getMessage()); - return false; - } - return true; - } - - /** - * The worker method. It will find the container, create the file if missing - * or just replace its contents, and open the editor on the newly created - * file. - */ - - private void doFinish(final IFile file, IProgressMonitor monitor) - throws CoreException { - // create a sample file - String sourceTypeID = typeIDPage.getSourceID(); - String targetTypeID = typeIDPage.getTargetID(); - - try { - InputStream stream = openContentStream(); - if (file.exists()) { - file.setContents(stream, true, true, monitor); - } else { - file.create(stream, true, monitor); - } - stream.close(); - GraphicalInformationSaver ginforSave = new GraphicalInformationSaver( - file); - ginforSave.doSave(monitor, sourceTypeID, targetTypeID); - } catch (IOException e) { - } - monitor.worked(1); - monitor.setTaskName("Opening file for editing..."); - getShell().getDisplay().asyncExec(new Runnable() { - public void run() { - IWorkbenchPage page = PlatformUI.getWorkbench() - .getActiveWorkbenchWindow().getActivePage(); - try { - SmooksFileEditorInput input = new SmooksFileEditorInput( - file); - IWizard sourceWizard = typeIDPage - .getSourceDataCreationWizard(); - IWizard targetWizard = typeIDPage - .getTargetDataCreationWizard(); - if (sourceWizard != null) { - sourceWizard.performFinish(); - } - if (targetWizard != null) { - targetWizard.performFinish(); - } - if (sourceWizard instanceof IStructuredDataCreationWizard) { - Object sourceObj = ((IStructuredDataCreationWizard) sourceWizard) - .getTreeViewerInputContents(); -// if (sourceObj instanceof List) { -// if (!((List) sourceObj).isEmpty()) { -// sourceObj = ((List) sourceObj).get(0); -// } -// } - input.setSourceTreeViewerInputContents(sourceObj); - } - - if (targetWizard instanceof IStructuredDataCreationWizard) { - Object targetObj = ((IStructuredDataCreationWizard) targetWizard) - .getTreeViewerInputContents(); -// if (targetObj instanceof List) { -// if (!((List) targetObj).isEmpty()) { -// targetObj = ((List) targetObj).get(0); -// } -// } - input.setTargetTreeViewerInputContents(targetObj); - - } - - IDE.openEditor(page, input, SmooksFormEditor.EDITOR_ID, - true);// openEditor(page, file, true); - } catch (PartInitException e) { - } - } - }); - monitor.worked(1); - } - - /** - * We will initialize file contents with a sample text. - */ - - private InputStream openContentStream() { - String contents = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" - + " <smooks-resource-list xmlns=\"http://www.milyn.org/xsd/smooks-1.0.xsd\"/>"; - return new ByteArrayInputStream(contents.getBytes()); - } - - private void throwCoreException(String message) throws CoreException { - IStatus status = new Status(IStatus.ERROR, "org.jboss.tools.smooks.ui", - IStatus.OK, message, null); - throw new CoreException(status); - } - - public void init(IWorkbench workbench, IStructuredSelection selection) { - this.workbench = workbench; - this.selection = selection; - } - - public IStructuredSelection getSelection() { - return selection; - } - - public void setSelection(IStructuredSelection selection) { - this.selection = selection; - } - - public void addSourceWizardPage(IWizardPage page) { - sourceCreationPages.add(page); - page.setTitle("Source Data Selection Page"); - } - - public void addTargetWizardPage(IWizardPage page) { - targetCreationPages.add(page); - page.setTitle("Target Data Selection Page"); - } - - public void clearSourceWizardPages() { - // for (Iterator iterator = sourceCreationPages.iterator(); - // iterator.hasNext();) { - // IWizardPage page = (IWizardPage) iterator.next(); - // if(page != null){ - // page.dispose(); - // } - // } - sourceCreationPages.clear(); - } - - private IWizardPage getSourceCreationPage(IWizardPage page) { - if (page == typeIDPage) { - if (sourceCreationPages.isEmpty()) - return null; - return (IWizardPage) sourceCreationPages.get(0); - } - if (sourceCreationPages.contains(page)) { - int i = sourceCreationPages.indexOf(page); - if ((i + 1) >= sourceCreationPages.size()) { - return null; - } - return (IWizardPage) sourceCreationPages.get(i + 1); - } - return null; - } - - private IWizardPage getTargetCreationPage(IWizardPage page) { - if (page == typeIDPage) { - if (targetCreationPages.isEmpty()) - return null; - return (IWizardPage) targetCreationPages.get(0); - } - if (targetCreationPages.contains(page)) { - int i = targetCreationPages.indexOf(page); - if ((i + 1) >= targetCreationPages.size()) { - return null; - } - return (IWizardPage) targetCreationPages.get(i + 1); - } - if (sourceCreationPages.contains(page)) { - if (sourceCreationPages.get(sourceCreationPages.size() - 1) == page) { - return (IWizardPage) targetCreationPages.get(0); - } - } - return null; - } - - @Override - public IWizardPage getNextPage(IWizardPage page) { - IWizardPage p = getSourceCreationPage(page); - if (p != null) - return p; - p = getTargetCreationPage(page); - if (p != null) - return p; - return super.getNextPage(page); - } - - public void clearTargetWizardPages() { - // for (Iterator iterator = sourceCreationPages.iterator(); - // iterator.hasNext();) { - // IWizardPage page = (IWizardPage) iterator.next(); - // if(page != null){ - // page.dispose(); - // } - // } - targetCreationPages.clear(); - } - - public void removeSourceWIzardPage(IWizardPage page) { - sourceCreationPages.remove(page); - } - - public void removeTargetWIzardPage(IWizardPage page) { - targetCreationPages.remove(page); - } +package org.jboss.tools.smooks.ui.wizards; + +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.lang.reflect.InvocationTargetException; +import java.util.ArrayList; +import java.util.List; + +import org.eclipse.core.resources.IFile; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.Status; +import org.eclipse.jface.dialogs.MessageDialog; +import org.eclipse.jface.operation.IRunnableWithProgress; +import org.eclipse.jface.viewers.IStructuredSelection; +import org.eclipse.jface.wizard.IWizard; +import org.eclipse.jface.wizard.IWizardPage; +import org.eclipse.jface.wizard.Wizard; +import org.eclipse.ui.INewWizard; +import org.eclipse.ui.IWorkbench; +import org.eclipse.ui.IWorkbenchPage; +import org.eclipse.ui.PartInitException; +import org.eclipse.ui.PlatformUI; +import org.eclipse.ui.ide.IDE; +import org.jboss.tools.common.model.ui.ModelUIImages; +import org.jboss.tools.smooks.graphical.util.GraphicalInformationSaver; +import org.jboss.tools.smooks.ui.IStructuredDataCreationWizard; +import org.jboss.tools.smooks.ui.editors.SmooksFileEditorInput; +import org.jboss.tools.smooks.ui.editors.SmooksFormEditor; +import org.jboss.tools.smooks.ui.editors.TypeIDSelectionWizardPage; + +/** + * This is a sample new wizard. Its role is to create a new file resource in the + * provided container. If the container resource (a folder or a project) is + * selected in the workspace when the wizard is opened, it will accept it as the + * target container. The wizard creates one file with the extension "smooks". If + * a sample multi-page editor (also available as a template) is registered for + * the same extension, it will be able to open it. + */ + +public class SmooksConfigFileNewWizard extends Wizard implements INewWizard, + ISmooksDataCreationAddtionWizard { + private SmooksConfigFileNewWizardPage page; + private TypeIDSelectionWizardPage typeIDPage; + + private List<IWizardPage> sourceCreationPages = new ArrayList<IWizardPage>(); + + private List<IWizardPage> targetCreationPages = new ArrayList<IWizardPage>(); + + private IStructuredSelection selection; + + private IWorkbench workbench; + + /** + * Constructor for SmooksConfigFileNewWizard. + */ + public SmooksConfigFileNewWizard() { + super(); + setNeedsProgressMonitor(true); + super.setWindowTitle("New Smooks Configuration File"); + setDefaultPageImageDescriptor(ModelUIImages.getImageDescriptor(ModelUIImages.WIZARD_NEW_PROJECT)); + } + + /** + * Adding the page to the wizard. + */ + public void addPages() { + page = new SmooksConfigFileNewWizardPage("newSmooksFile1", + getSelection()); + addPage(page); + // TODO don't use the WizardSelectionPage + typeIDPage = new TypeIDSelectionWizardPage("", false); + typeIDPage.setSelection(selection); + addPage(typeIDPage); + } + + /** + * This method is called when 'Finish' button is pressed in the wizard. We + * will create an operation and run it using wizard as execution context. + */ + public boolean performFinish() { + // final String containerName = page.getContainerName(); + // final String fileName = page.getFileName(); + final IFile file = page.createNewFile(); + IRunnableWithProgress op = new IRunnableWithProgress() { + public void run(IProgressMonitor monitor) + throws InvocationTargetException { + try { + doFinish(file, monitor); + } catch (CoreException e) { + throw new InvocationTargetException(e); + } finally { + monitor.done(); + } + } + }; + try { + getContainer().run(true, false, op); + } catch (InterruptedException e) { + return false; + } catch (InvocationTargetException e) { + Throwable realException = e.getTargetException(); + MessageDialog.openError(getShell(), "Error", realException + .getMessage()); + return false; + } + return true; + } + + /** + * The worker method. It will find the container, create the file if missing + * or just replace its contents, and open the editor on the newly created + * file. + */ + + private void doFinish(final IFile file, IProgressMonitor monitor) + throws CoreException { + // create a sample file + String sourceTypeID = typeIDPage.getSourceID(); + String targetTypeID = typeIDPage.getTargetID(); + + try { + InputStream stream = openContentStream(); + if (file.exists()) { + file.setContents(stream, true, true, monitor); + } else { + file.create(stream, true, monitor); + } + stream.close(); + GraphicalInformationSaver ginforSave = new GraphicalInformationSaver( + file); + ginforSave.doSave(monitor, sourceTypeID, targetTypeID); + } catch (IOException e) { + } + monitor.worked(1); + monitor.setTaskName("Opening file for editing..."); + getShell().getDisplay().asyncExec(new Runnable() { + public void run() { + IWorkbenchPage page = PlatformUI.getWorkbench() + .getActiveWorkbenchWindow().getActivePage(); + try { + SmooksFileEditorInput input = new SmooksFileEditorInput( + file); + IWizard sourceWizard = typeIDPage + .getSourceDataCreationWizard(); + IWizard targetWizard = typeIDPage + .getTargetDataCreationWizard(); + if (sourceWizard != null) { + sourceWizard.performFinish(); + } + if (targetWizard != null) { + targetWizard.performFinish(); + } + if (sourceWizard instanceof IStructuredDataCreationWizard) { + Object sourceObj = ((IStructuredDataCreationWizard) sourceWizard) + .getTreeViewerInputContents(); +// if (sourceObj instanceof List) { +// if (!((List) sourceObj).isEmpty()) { +// sourceObj = ((List) sourceObj).get(0); +// } +// } + input.setSourceTreeViewerInputContents(sourceObj); + } + + if (targetWizard instanceof IStructuredDataCreationWizard) { + Object targetObj = ((IStructuredDataCreationWizard) targetWizard) + .getTreeViewerInputContents(); +// if (targetObj instanceof List) { +// if (!((List) targetObj).isEmpty()) { +// targetObj = ((List) targetObj).get(0); +// } +// } + input.setTargetTreeViewerInputContents(targetObj); + + } + + IDE.openEditor(page, input, SmooksFormEditor.EDITOR_ID, + true);// openEditor(page, file, true); + } catch (PartInitException e) { + } + } + }); + monitor.worked(1); + } + + /** + * We will initialize file contents with a sample text. + */ + + private InputStream openContentStream() { + String contents = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" + + " <smooks-resource-list xmlns=\"http://www.milyn.org/xsd/smooks-1.0.xsd\"/>"; + return new ByteArrayInputStream(contents.getBytes()); + } + + private void throwCoreException(String message) throws CoreException { + IStatus status = new Status(IStatus.ERROR, "org.jboss.tools.smooks.ui", + IStatus.OK, message, null); + throw new CoreException(status); + } + + public void init(IWorkbench workbench, IStructuredSelection selection) { + this.workbench = workbench; + this.selection = selection; + } + + public IStructuredSelection getSelection() { + return selection; + } + + public void setSelection(IStructuredSelection selection) { + this.selection = selection; + } + + public void addSourceWizardPage(IWizardPage page) { + sourceCreationPages.add(page); + page.setTitle("Source Data Selection"); + } + + public void addTargetWizardPage(IWizardPage page) { + targetCreationPages.add(page); + page.setTitle("Target Data Selection"); + } + + public void clearSourceWizardPages() { + // for (Iterator iterator = sourceCreationPages.iterator(); + // iterator.hasNext();) { + // IWizardPage page = (IWizardPage) iterator.next(); + // if(page != null){ + // page.dispose(); + // } + // } + sourceCreationPages.clear(); + } + + private IWizardPage getSourceCreationPage(IWizardPage page) { + if (page == typeIDPage) { + if (sourceCreationPages.isEmpty()) + return null; + return (IWizardPage) sourceCreationPages.get(0); + } + if (sourceCreationPages.contains(page)) { + int i = sourceCreationPages.indexOf(page); + if ((i + 1) >= sourceCreationPages.size()) { + return null; + } + return (IWizardPage) sourceCreationPages.get(i + 1); + } + return null; + } + + private IWizardPage getTargetCreationPage(IWizardPage page) { + if (page == typeIDPage) { + if (targetCreationPages.isEmpty()) + return null; + return (IWizardPage) targetCreationPages.get(0); + } + if (targetCreationPages.contains(page)) { + int i = targetCreationPages.indexOf(page); + if ((i + 1) >= targetCreationPages.size()) { + return null; + } + return (IWizardPage) targetCreationPages.get(i + 1); + } + if (sourceCreationPages.contains(page)) { + if (sourceCreationPages.get(sourceCreationPages.size() - 1) == page) { + return (IWizardPage) targetCreationPages.get(0); + } + } + return null; + } + + @Override + public IWizardPage getNextPage(IWizardPage page) { + IWizardPage p = getSourceCreationPage(page); + if (p != null) + return p; + p = getTargetCreationPage(page); + if (p != null) + return p; + return super.getNextPage(page); + } + + public void clearTargetWizardPages() { + // for (Iterator iterator = sourceCreationPages.iterator(); + // iterator.hasNext();) { + // IWizardPage page = (IWizardPage) iterator.next(); + // if(page != null){ + // page.dispose(); + // } + // } + targetCreationPages.clear(); + } + + public void removeSourceWIzardPage(IWizardPage page) { + sourceCreationPages.remove(page); + } + + public void removeTargetWIzardPage(IWizardPage page) { + targetCreationPages.remove(page); + } } \ No newline at end of file Modified: branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/wizards/SmooksConfigFileNewWizardPage.java =================================================================== --- branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/wizards/SmooksConfigFileNewWizardPage.java 2008-10-21 08:50:25 UTC (rev 11032) +++ branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/wizards/SmooksConfigFileNewWizardPage.java 2008-10-21 09:15:01 UTC (rev 11033) @@ -1,37 +1,40 @@ -package org.jboss.tools.smooks.ui.wizards; - -import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.ui.dialogs.WizardNewFileCreationPage; - -/** - * - * @author dart - * - */ -public class SmooksConfigFileNewWizardPage extends WizardNewFileCreationPage { - public SmooksConfigFileNewWizardPage(String pageName, - IStructuredSelection selection) { - super(pageName, selection); - setFileExtension("smooks"); - } - - @Override - protected boolean validatePage() { - boolean flag = super.validatePage(); - String name = this.getFileName(); - if (name.indexOf(".") == -1) - return flag; - String extensionName = name.substring(name.indexOf(".") + 1, name - .length()); - String error = null; - if (extensionName.equalsIgnoreCase(this.getFileExtension())) { - - } else { - error = "file extension must be \"smooks\""; - } - if (error != null) { - this.setErrorMessage(error); - } - return (error == null); - } +package org.jboss.tools.smooks.ui.wizards; + +import org.eclipse.jface.viewers.IStructuredSelection; +import org.eclipse.ui.dialogs.WizardNewFileCreationPage; + +/** + * + * @author dart + * + */ +public class SmooksConfigFileNewWizardPage extends WizardNewFileCreationPage { + public SmooksConfigFileNewWizardPage(String pageName, + IStructuredSelection selection) { + super(pageName, selection); + setFileExtension("smooks"); + super.setTitle("Smooks Configuration"); + super.setDescription("Create a new Smooks configuration file"); + this.setFileName("newConfig.smooks"); + } + + @Override + protected boolean validatePage() { + boolean flag = super.validatePage(); + String name = this.getFileName(); + if (name.indexOf(".") == -1) + return flag; + String extensionName = name.substring(name.indexOf(".") + 1, name + .length()); + String error = null; + if (extensionName.equalsIgnoreCase(this.getFileExtension())) { + + } else { + error = "file extension must be \"smooks\""; + } + if (error != null) { + this.setErrorMessage(error); + } + return (error == null); + } } \ No newline at end of file

17 years, 2 months

1
0
0 / 0

JBoss Tools SVN: r11032 - in trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test: src/org/jboss/tools/jsf/vpe/richfaces/test and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: dmaliarevich Date: 2008-10-21 04:50:25 -0400 (Tue, 21 Oct 2008) New Revision: 11032 Added: 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 trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/virtualEarth.xhtml.xml Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/virtualEarth.xhtml trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesComponentContentTest.java Log: https://jira.jboss.org/jira/browse/JBIDE-2810, tests for rich:gmap and rich:virtualEarth. Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/gmap.xhtml =================================================================== (Binary files differ) Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/gmap.xhtml ___________________________________________________________________ Name: svn:mime-type + application/xhtml+xml Added: 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 (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/gmap.xhtml.xml 2008-10-21 08:50:25 UTC (rev 11032) @@ -0,0 +1,5 @@ +<tests> + <test id="gmap"> + <IMG SRC="/.*org.jboss.tools.jsf.vpe.richfaces/resources/gmap/gmap.gif/"/> + </test> +</tests> \ No newline at end of file Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/gmap.xhtml.xml ___________________________________________________________________ Name: svn:mime-type + text/xml Name: svn:eol-style + native Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/virtualEarth.xhtml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/virtualEarth.xhtml 2008-10-21 08:34:11 UTC (rev 11031) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/virtualEarth.xhtml 2008-10-21 08:50:25 UTC (rev 11032) @@ -10,11 +10,9 @@ </head> <body> - -<rich:virtualEarth> - <rich:toolTip> - <h:outputText value="This is virtual earth component" /> - </rich:toolTip> -</rich:virtualEarth> +<f:view> + <rich:virtualEarth id="virtualEarth"> + </rich:virtualEarth> +</f:view> </body> </html> \ No newline at end of file Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/virtualEarth.xhtml.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/virtualEarth.xhtml.xml (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/virtualEarth.xhtml.xml 2008-10-21 08:50:25 UTC (rev 11032) @@ -0,0 +1,5 @@ +<tests> + <test id="virtualEarth"> + <IMG SRC="/.*org.jboss.tools.jsf.vpe.richfaces/resources/virtualEarth/earth_road.png/"/> + </test> +</tests> \ No newline at end of file Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/virtualEarth.xhtml.xml ___________________________________________________________________ Name: svn:mime-type + text/xml Name: svn:eol-style + native Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesComponentContentTest.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesComponentContentTest.java 2008-10-21 08:34:11 UTC (rev 11031) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesComponentContentTest.java 2008-10-21 08:50:25 UTC (rev 11032) @@ -160,11 +160,11 @@ } public void testGmap() throws Throwable { - assertTrue("it is necessary to add a body of the test ", false);//$NON-NLS-1$ + performContentTest("components/gmap.xhtml");//$NON-NLS-1$ } public void testVirtualEarth() throws Throwable { - assertTrue("it is necessary to add a body of the test ", false);//$NON-NLS-1$ + performContentTest("components/virtualEarth.xhtml");//$NON-NLS-1$ } public void testHotKey() throws Throwable {

17 years, 2 months

1
0
0 / 0

JBoss Tools SVN: r11031 - branches/jbosstools-3.0.0.Beta1/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/ecore/pages/impl.

by jbosstools-commits＠lists.jboss.org

Author: dazarov Date: 2008-10-21 04:34:11 -0400 (Tue, 21 Oct 2008) New Revision: 11031 Modified: branches/jbosstools-3.0.0.Beta1/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/ecore/pages/impl/PagesModelImpl.java Log: https://jira.jboss.org/jira/browse/JBIDE-2925 Modified: branches/jbosstools-3.0.0.Beta1/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/ecore/pages/impl/PagesModelImpl.java =================================================================== --- branches/jbosstools-3.0.0.Beta1/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/ecore/pages/impl/PagesModelImpl.java 2008-10-21 08:29:53 UTC (rev 11030) +++ branches/jbosstools-3.0.0.Beta1/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/ecore/pages/impl/PagesModelImpl.java 2008-10-21 08:34:11 UTC (rev 11031) @@ -342,13 +342,30 @@ link.dataChanged(); } } + + /** + *  + *  + * @generated NOT + */ + public void structureChanged(final XModelTreeEvent event) { + if(Display.getCurrent() != null){ + structureChangedInternal(event); + }else{ + Display.getDefault().asyncExec(new Runnable(){ + public void run(){ + structureChangedInternal(event); + } + }); + } + } /** *  *  * @generated NOT */ - public void structureChanged(XModelTreeEvent event) { + public void structureChangedInternal(XModelTreeEvent event) { if(getData() == null) return; XModelObject diagramXML = (XModelObject)getData(); XModelObject target = event.getModelObject();

17 years, 2 months

1
0
0 / 0

JBoss Tools SVN: r11030 - 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-21 04:29:53 -0400 (Tue, 21 Oct 2008) New Revision: 11030 Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/fileUpload.xhtml.xml Log: https://jira.jboss.org/jira/browse/JBIDE-2810, tests for rich:effect and rich:fileUpload. Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/fileUpload.xhtml.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/fileUpload.xhtml.xml (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/fileUpload.xhtml.xml 2008-10-21 08:29:53 UTC (rev 11030) @@ -0,0 +1,35 @@ +<tests> + <test id="fileUpload"> + <DIV CLASS="rich-fileupload-list-decor" STYLE="width: 400px;"> + <TABLE CLASS="rich-fileupload-toolbar-decor"> + <TR> + <TD> + <DIV CLASS="rich-fileupload-button-border" STYLE="float: left;"> + <DIV CLASS="rich-fileupload-button rich-fileupload-font" + STYLE="position: relative;"> + <DIV + CLASS="rich-fileupload-button-content rich-fileupload-font rich-fileupload-ico rich-fileupload-ico-add"> Add...</DIV> + </DIV> + </DIV> + <DIV CLASS="rich-fileupload-button-border" STYLE="float: left;"> + <DIV + CLASS="rich-fileupload-button-content rich-fileupload-font rich-fileupload-ico rich-fileupload-ico-start"> + Upload + </DIV> + </DIV> + <DIV CLASS="rich-fileupload-button-border" STYLE="float: right;"> + <DIV CLASS="rich-fileupload-button rich-fileupload-font"> + <A CLASS="rich-fileupload-button-selection"> + <DIV + CLASS="rich-fileupload-button-content rich-fileupload-font rich-fileupload-ico rich-fileupload-ico-clear">Clear All</DIV> + </A> + </DIV> + </DIV> + </TD> + </TR> + </TABLE> + <DIV CLASS="rich-fileupload-list-overflow" STYLE="width: 100%; height: 210px;"> + </DIV> + </DIV> + </test> +</tests> \ No newline at end of file Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/fileUpload.xhtml.xml ___________________________________________________________________ Name: svn:mime-type + text/xml Name: svn:eol-style + native

17 years, 2 months

1
0
0 / 0

JBoss Tools SVN: r11029 - in trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test: src/org/jboss/tools/jsf/vpe/richfaces/test and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: dmaliarevich Date: 2008-10-21 04:28:03 -0400 (Tue, 21 Oct 2008) New Revision: 11029 Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/fileUpload.xhtml Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/effect.xhtml trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesComponentContentTest.java Log: https://jira.jboss.org/jira/browse/JBIDE-2810, tests for rich:effect and rich:fileUpload. Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/effect.xhtml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/effect.xhtml 2008-10-21 07:30:00 UTC (rev 11028) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/effect.xhtml 2008-10-21 08:28:03 UTC (rev 11029) @@ -9,13 +9,14 @@ <head> </head> <body> -  - <rich:panel id="fadebox" styleClass="box"> - <f:facet name="header">Fade Effect</f:facet> - <rich:effect event="onclick" type="Fade" /> - <rich:effect event="onclick" for="fadebox" type="Appear" - params="delay:3.0,duration:0.5" /> - <h:outputText value="Click to Activate" /> - </rich:panel> +<f:view> +<div id="contentDiv"> + ..... div content ...... +</div> +<input type="button" onclick="hideDiv({duration:0.7})" value="Hide" /> +<input type="button" onclick="showDiv()" value="Show" /> +<rich:effect id="effect1" name="hideDiv" for="contentDiv" type="Fade" /> +<rich:effect id="effect2" name="showDiv" for="contentDiv" type="Appear" /> +</f:view> </body> </html> \ No newline at end of file Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/fileUpload.xhtml =================================================================== (Binary files differ) Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/fileUpload.xhtml ___________________________________________________________________ Name: svn:mime-type + application/xhtml+xml Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesComponentContentTest.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesComponentContentTest.java 2008-10-21 07:30:00 UTC (rev 11028) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesComponentContentTest.java 2008-10-21 08:28:03 UTC (rev 11029) @@ -152,11 +152,11 @@ } public void testEffect() throws Throwable { - assertTrue("it is necessary to add a body of the test ", false);//$NON-NLS-1$ + performInvisibleTagTest("components/effect.xhtml", "effect1"); //$NON-NLS-1$ //$NON-NLS-2$ } public void testFileUpload() throws Throwable { - assertTrue("it is necessary to add a body of the test ", false);//$NON-NLS-1$ + performContentTest("components/fileUpload.xhtml");//$NON-NLS-1$ } public void testGmap() throws Throwable {

17 years, 2 months

1
0
0 / 0

JBoss Tools SVN: r11028 - 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-21 03:30:00 -0400 (Tue, 21 Oct 2008) New Revision: 11028 Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/dropDownMenu.xhtml.xml trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/dropListener.xhtml trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/extendedDataTable.xhtml trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/menuGroup.xhtml trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/menuGroup.xhtml.xml Log: https://jira.jboss.org/jira/browse/JBIDE-2810, tests for rich:dropDownMenu, rich:menuGroup, rich:menuItem, rich:dropListener, rich:dragListener, rich:extendedDataTable. Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/dropDownMenu.xhtml.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/dropDownMenu.xhtml.xml (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/dropDownMenu.xhtml.xml 2008-10-21 07:30:00 UTC (rev 11028) @@ -0,0 +1,72 @@ +<tests> + <test id="dropDownMenu"> + +<UL VPE-DDM-MENU-TITLE-UL="" > +<LI VPE-DDM-MENU-TITLE-LI="" CLASS="rich-ddmenu-label rich-ddmenu-label-unselect" STYLE="" > +<DIV CLASS="dr-menu-top-div" > + +Menu 1 + +</DIV> +<UL VPE-DDM-MENU-CHILDREN-UL="" CLASS="rich-menu-list-border rich-menu-list-bg" STYLE="" > +<LI VPE-DDM-MENU-LI="" CLASS="rich-menu-item" STYLE="" > +<DIV CLASS="dr-menu-item-top-div" > + +<IMG SRC="/.*org.jboss.tools.jsf.vpe.richfaces/resources/menuItem/spacer.gif/" /> + + + + +Item 1 + + +</DIV> +</LI> +<LI VPE-DDM-MENU-LI="" CLASS="rich-menu-group" STYLE="" > +<DIV CLASS="dr-menu-group-top-div" > + +<IMG SRC="/.*org.jboss.tools.jsf.vpe.richfaces/resources/menuGroup/spacer.gif/" /> + + + +Group 2 + + +<IMG SRC="/.*org.jboss.tools.jsf.vpe.richfaces/resources/menuGroup/arrow.gif/" /> + +</DIV> +<UL VPE-DDM-MENU-UL="" CLASS="rich-menu-list-border rich-menu-list-bg" > +<LI VPE-DDM-MENU-LI="" CLASS="rich-menu-item" STYLE="" > +<DIV CLASS="dr-menu-item-top-div" > + +<IMG SRC="/.*org.jboss.tools.jsf.vpe.richfaces/resources/menuItem/spacer.gif/" /> + + + + +Item 2 + + +</DIV> +</LI> +</UL> +</LI> +<LI VPE-DDM-MENU-LI="" CLASS="rich-menu-item" STYLE="" > +<DIV CLASS="dr-menu-item-top-div" > + +<IMG SRC="/.*org.jboss.tools.jsf.vpe.richfaces/resources/menuItem/spacer.gif/" /> + + + + +Item 3 + + +</DIV> +</LI> +</UL> +</LI> +</UL> + + </test> +</tests> \ No newline at end of file Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/dropDownMenu.xhtml.xml ___________________________________________________________________ Name: svn:mime-type + text/xml Name: svn:eol-style + native Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/dropListener.xhtml =================================================================== (Binary files differ) Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/dropListener.xhtml ___________________________________________________________________ Name: svn:mime-type + application/xhtml+xml Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/extendedDataTable.xhtml =================================================================== (Binary files differ) Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/extendedDataTable.xhtml ___________________________________________________________________ Name: svn:mime-type + application/xhtml+xml Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/menuGroup.xhtml =================================================================== (Binary files differ) Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/menuGroup.xhtml ___________________________________________________________________ Name: svn:mime-type + application/xhtml+xml Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/menuGroup.xhtml.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/menuGroup.xhtml.xml (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/menuGroup.xhtml.xml 2008-10-21 07:30:00 UTC (rev 11028) @@ -0,0 +1,35 @@ +<tests> + <test id="menuGroup"> + +<LI VPE-DDM-MENU-LI="" CLASS="rich-menu-group" STYLE="" > +<DIV CLASS="dr-menu-group-top-div" > + +<IMG SRC="/.*org.jboss.tools.jsf.vpe.richfaces/resources/menuGroup/spacer.gif/" /> + + + +Group 2 + + +<IMG SRC="/.*org.jboss.tools.jsf.vpe.richfaces/resources/menuGroup/arrow.gif/" /> + +</DIV> +<UL VPE-DDM-MENU-UL="" CLASS="rich-menu-list-border rich-menu-list-bg" > +<LI VPE-DDM-MENU-LI="" CLASS="rich-menu-item" STYLE="" > +<DIV CLASS="dr-menu-item-top-div" > + +<IMG SRC="/.*org.jboss.tools.jsf.vpe.richfaces/resources/menuItem/spacer.gif/" /> + + + + +Item 2 + + +</DIV> +</LI> +</UL> +</LI> + + </test> +</tests> \ No newline at end of file Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/menuGroup.xhtml.xml ___________________________________________________________________ Name: svn:mime-type + text/xml Name: svn:eol-style + native

17 years, 2 months

1
0
0 / 0

JBoss Tools SVN: r11027 - trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/model.

by jbosstools-commits＠lists.jboss.org

Author: DartPeng Date: 2008-10-21 03:16:31 -0400 (Tue, 21 Oct 2008) New Revision: 11027 Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/model/TreeItemRelationModel.java Log: JBIDE-2943 Fix it Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/model/TreeItemRelationModel.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/model/TreeItemRelationModel.java 2008-10-21 07:15:20 UTC (rev 11026) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/model/TreeItemRelationModel.java 2008-10-21 07:16:31 UTC (rev 11027) @@ -1,111 +1,115 @@ -/******************************************************************************* - * Copyright (c) 2008 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 - * - * Contributors: - * Red Hat, Inc. - initial API and implementation - ******************************************************************************/ -package org.jboss.tools.smooks.ui.gef.model; - -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; - -import org.eclipse.swt.widgets.TreeItem; - -/** - * @author Dart Peng - * @Date Jul 31, 2008 - */ -public class TreeItemRelationModel extends AbstractStructuredDataModel - implements IConnectableModel { - - public static final String PRO_TREE_ITEM_SELECTION_STATUS = "__pro_treeitem_selection_status"; - - public static final String PRO_TREE_REPAINT = "__pro_tree_repaint"; - - TreeItem treeItem = null; - List<Object> modelSourceConnections = new ArrayList<Object>(); - List<Object> modelTargetConnections = new ArrayList<Object>(); - - public TreeItem getTreeItem() { - return treeItem; - } - - public boolean isCollapse() { - TreeItem item = getTreeItem(); - int y = Integer.MAX_VALUE; - if (item != null) { - y = item.getBounds().y; - } - return (y == 0); - } - - public void setTreeItem(TreeItem treeItem) { - this.treeItem = treeItem; - } - - public void addSourceConnection(Object connx) { - this.getModelSourceConnections().add(connx); - this.firePropertyChange(P_SOURCE_CONNECTION, null, connx); - } - - public void addTargetConnection(Object connx) { - this.getModelTargetConnections().add(connx); - this.firePropertyChange(P_TARGET_CONNECTION, null, connx); - } - - public void removeSourceConnection(Object connx) { - this.getModelSourceConnections().remove(connx); - this.firePropertyChange(P_SOURCE_CONNECTION, connx, null); - } - - public void removeTargetConnection(Object connx) { - this.getModelTargetConnections().remove(connx); - this.firePropertyChange(P_TARGET_CONNECTION, connx, null); - } - - public List<Object> getModelSourceConnections() { - return modelSourceConnections; - } - - public void setModelSourceConnections(List<Object> modelSourceConnections) { - this.modelSourceConnections = modelSourceConnections; - } - - public List<Object> getModelTargetConnections() { - return modelTargetConnections; - } - - public void setModelTargetConnections(List<Object> modelTargetConnections) { - this.modelTargetConnections = modelTargetConnections; - } - - public boolean isSourceConnectWith(IConnectableModel target) { - List list = this.getModelSourceConnections(); - for (Iterator iterator = list.iterator(); iterator.hasNext();) { - LineConnectionModel connection = (LineConnectionModel) iterator - .next(); - if (connection.getTarget() == target) { - return true; - } - } - return false; - } - - public boolean isTargetConnectWith(IConnectableModel source) { - List list = this.getModelTargetConnections(); - for (Iterator iterator = list.iterator(); iterator.hasNext();) { - LineConnectionModel connection = (LineConnectionModel) iterator - .next(); - if (connection.getSource() == source) { - return true; - } - } - return false; - } - -} +/******************************************************************************* + * Copyright (c) 2008 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 + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.smooks.ui.gef.model; + +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; + +import org.eclipse.swt.widgets.TreeItem; + +/** + * @author Dart Peng + * @Date Jul 31, 2008 + */ +public class TreeItemRelationModel extends AbstractStructuredDataModel + implements IConnectableModel { + + public static final String PRO_TREE_ITEM_SELECTION_STATUS = "__pro_treeitem_selection_status"; + + public static final String PRO_TREE_REPAINT = "__pro_tree_repaint"; + + TreeItem treeItem = null; + List<Object> modelSourceConnections = new ArrayList<Object>(); + List<Object> modelTargetConnections = new ArrayList<Object>(); + + public TreeItem getTreeItem() { + return treeItem; + } + + public boolean isCollapse() { + TreeItem item = getTreeItem(); + int y = Integer.MAX_VALUE; + if (item != null) { + y = item.getBounds().y; + // for windows + TreeItem parentItem = item.getParentItem(); + if(parentItem == null) return false; + } + + return (y == 0); + } + + public void setTreeItem(TreeItem treeItem) { + this.treeItem = treeItem; + } + + public void addSourceConnection(Object connx) { + this.getModelSourceConnections().add(connx); + this.firePropertyChange(P_SOURCE_CONNECTION, null, connx); + } + + public void addTargetConnection(Object connx) { + this.getModelTargetConnections().add(connx); + this.firePropertyChange(P_TARGET_CONNECTION, null, connx); + } + + public void removeSourceConnection(Object connx) { + this.getModelSourceConnections().remove(connx); + this.firePropertyChange(P_SOURCE_CONNECTION, connx, null); + } + + public void removeTargetConnection(Object connx) { + this.getModelTargetConnections().remove(connx); + this.firePropertyChange(P_TARGET_CONNECTION, connx, null); + } + + public List<Object> getModelSourceConnections() { + return modelSourceConnections; + } + + public void setModelSourceConnections(List<Object> modelSourceConnections) { + this.modelSourceConnections = modelSourceConnections; + } + + public List<Object> getModelTargetConnections() { + return modelTargetConnections; + } + + public void setModelTargetConnections(List<Object> modelTargetConnections) { + this.modelTargetConnections = modelTargetConnections; + } + + public boolean isSourceConnectWith(IConnectableModel target) { + List list = this.getModelSourceConnections(); + for (Iterator iterator = list.iterator(); iterator.hasNext();) { + LineConnectionModel connection = (LineConnectionModel) iterator + .next(); + if (connection.getTarget() == target) { + return true; + } + } + return false; + } + + public boolean isTargetConnectWith(IConnectableModel source) { + List list = this.getModelTargetConnections(); + for (Iterator iterator = list.iterator(); iterator.hasNext();) { + LineConnectionModel connection = (LineConnectionModel) iterator + .next(); + if (connection.getSource() == source) { + return true; + } + } + return false; + } + +}

17 years, 2 months

1
0
0 / 0

JBoss Tools SVN: r11026 - branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/model.

by jbosstools-commits＠lists.jboss.org

Author: DartPeng Date: 2008-10-21 03:15:20 -0400 (Tue, 21 Oct 2008) New Revision: 11026 Modified: branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/model/TreeItemRelationModel.java Log: JBIDE-2943 Fix it Modified: branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/model/TreeItemRelationModel.java =================================================================== --- branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/model/TreeItemRelationModel.java 2008-10-21 03:42:46 UTC (rev 11025) +++ branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/model/TreeItemRelationModel.java 2008-10-21 07:15:20 UTC (rev 11026) @@ -40,7 +40,11 @@ int y = Integer.MAX_VALUE; if (item != null) { y = item.getBounds().y; + // for windows + TreeItem parentItem = item.getParentItem(); + if(parentItem == null) return false; } + return (y == 0); }

17 years, 2 months

1
0
0 / 0

JBoss Tools SVN: r11025 - in trunk/smooks/plugins/org.jboss.tools.smooks.ui: src/org/jboss/tools/smooks/ui/gef/commands and 6 other directories.

by jbosstools-commits＠lists.jboss.org

Author: DartPeng Date: 2008-10-20 23:42:46 -0400 (Mon, 20 Oct 2008) New Revision: 11025 Removed: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/commands/ChangeConstraintCommand.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/editparts/HiddenEditPart.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/editparts/StructuredDataContentEditPart.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/editparts/StructuredDataEditPart.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/figures/ConnectionPointFiguresLocationCaculator.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/figures/ContainerBoxFigure.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/figures/ContainerFigure.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/figures/ContainerLeftEdgeAnchor.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/figures/ContainerRightEdgeAnchor.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/figures/ExpandableGraphNodeContentFigure.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/figures/GraphNodeContentFigure.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/figures/GroupFigure.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/figures/IExpandable.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/figures/ITreeContainer.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/figures/IconAreaFigure.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/figures/LabelAreaFigure.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/figures/RightAlignContainerLayout.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/figures/RoundedLineBorder.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/figures/SourceConnectionDecoration.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/figures/SpacingFigure.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/figures/TreeNodeContentFigure.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/model/DataObjectContainerModel.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/model/HiddenAreaModel.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/policy/NodeSelectionHandlesEditPolicyImpl.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/util/editparts/InteractorHelper.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/util/figures/ContainerLayout.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/util/figures/FillLayout.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/util/figures/IConnectedFigure.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/util/figures/Interactor.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/util/figures/Placeholder.java Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/META-INF/MANIFEST.MF trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/commands/CreateStructuredDataModelCommand.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/editparts/SmooksEditPartFactory.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/policy/RootGraphicsXYLayoutEditPolicy.java Log: JBIDE-2942 remove all needless codes Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/META-INF/MANIFEST.MF =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/META-INF/MANIFEST.MF 2008-10-21 03:41:10 UTC (rev 11024) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/META-INF/MANIFEST.MF 2008-10-21 03:42:46 UTC (rev 11025) @@ -49,8 +49,6 @@ org.jboss.tools.smooks.ui.gef.policy, org.jboss.tools.smooks.ui.gef.tools, org.jboss.tools.smooks.ui.gef.util, - org.jboss.tools.smooks.ui.gef.util.editparts, - org.jboss.tools.smooks.ui.gef.util.figures, org.jboss.tools.smooks.ui.modelparser, org.jboss.tools.smooks.ui.wizards, org.jboss.tools.smooks.utils, Deleted: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/commands/ChangeConstraintCommand.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/commands/ChangeConstraintCommand.java 2008-10-21 03:41:10 UTC (rev 11024) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/commands/ChangeConstraintCommand.java 2008-10-21 03:42:46 UTC (rev 11025) @@ -1,85 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 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 - * - * Contributors: - * Red Hat, Inc. - initial API and implementation - ******************************************************************************/ -package org.jboss.tools.smooks.ui.gef.commands; - -import org.eclipse.draw2d.geometry.Rectangle; -import org.eclipse.gef.commands.Command; -import org.jboss.tools.smooks.ui.gef.model.IGraphicalModel; - -/** - * @deprecated - * @author Dart Peng - * - */ -public class ChangeConstraintCommand extends Command { - Rectangle constraint = null; - - IGraphicalModel graphicalModel = null; - - /** - * @return the graphicalModel - */ - public IGraphicalModel getGraphicalModel() { - return graphicalModel; - } - - /** - * @param graphicalModel the graphicalModel to set - */ - public void setGraphicalModel(IGraphicalModel graphicalModel) { - this.graphicalModel = graphicalModel; - } - - Rectangle prevConstraint = null; - - /** - * @return the constraint - */ - public Rectangle getConstraint() { - return constraint; - } - - /** - * @param constraint - * the constraint to set - */ - public void setConstraint(Rectangle constraint) { - this.constraint = constraint; - } - - @Override - public void execute() { - if (constraint != null && graphicalModel != null) { - graphicalModel.setConstraint(constraint); - } - } - - /* (non-Javadoc) - * @see org.eclipse.gef.commands.Command#redo() - */ - @Override - public void redo() { - // TODO Auto-generated method stub - super.redo(); - } - - /* (non-Javadoc) - * @see org.eclipse.gef.commands.Command#undo() - */ - @Override - public void undo() { - // TODO Auto-generated method stub - super.undo(); - } - - - -} Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/commands/CreateStructuredDataModelCommand.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/commands/CreateStructuredDataModelCommand.java 2008-10-21 03:41:10 UTC (rev 11024) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/commands/CreateStructuredDataModelCommand.java 2008-10-21 03:42:46 UTC (rev 11025) @@ -22,6 +22,7 @@ * @author Dart Peng * * @CreateTime Jul 22, 2008 + * @deprecated */ public class CreateStructuredDataModelCommand extends Command { private AbstractStructuredDataModel parent; Deleted: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/editparts/HiddenEditPart.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/editparts/HiddenEditPart.java 2008-10-21 03:41:10 UTC (rev 11024) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/editparts/HiddenEditPart.java 2008-10-21 03:42:46 UTC (rev 11025) @@ -1,57 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 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 - * - * Contributors: - * Red Hat, Inc. - initial API and implementation - ******************************************************************************/ -package org.jboss.tools.smooks.ui.gef.editparts; - -import org.eclipse.draw2d.Figure; -import org.eclipse.draw2d.IFigure; -import org.eclipse.draw2d.geometry.Dimension; -import org.eclipse.gef.editparts.AbstractGraphicalEditPart; - -/** - * @author Dart Peng - * - */ -public class HiddenEditPart extends AbstractGraphicalEditPart { - - /* (non-Javadoc) - * @see org.eclipse.gef.editparts.AbstractGraphicalEditPart#createFigure() - */ - @Override - protected IFigure createFigure() { - Figure figure = new Figure(){ - - @Override - public Dimension getPreferredSize(int hint, int hint2) { - // TODO Auto-generated method stub - return new Dimension(200,300); - } - - @Override - public Dimension getMaximumSize() { - // TODO Auto-generated method stub - return new Dimension(100,300); - } - - - - }; - return figure; - } - - /* (non-Javadoc) - * @see org.eclipse.gef.editparts.AbstractEditPart#createEditPolicies() - */ - @Override - protected void createEditPolicies() { - - } - -} Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/editparts/SmooksEditPartFactory.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/editparts/SmooksEditPartFactory.java 2008-10-21 03:41:10 UTC (rev 11024) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/editparts/SmooksEditPartFactory.java 2008-10-21 03:42:46 UTC (rev 11025) @@ -1,68 +1,57 @@ -package org.jboss.tools.smooks.ui.gef.editparts; - -import org.eclipse.gef.EditPart; -import org.eclipse.gef.EditPartFactory; -import org.jboss.tools.smooks.ui.gef.model.GraphRootModel; -import org.jboss.tools.smooks.ui.gef.model.HiddenAreaModel; -import org.jboss.tools.smooks.ui.gef.model.LineConnectionModel; -import org.jboss.tools.smooks.ui.gef.model.RootModel; -import org.jboss.tools.smooks.ui.gef.model.SourceModel; -import org.jboss.tools.smooks.ui.gef.model.StructuredDataContentModel; -import org.jboss.tools.smooks.ui.gef.model.StructuredDataModel; -import org.jboss.tools.smooks.ui.gef.model.TargetModel; - -/** - * - * @author Dart Peng - * @Date Jul 30, 2008 - */ -public class SmooksEditPartFactory implements EditPartFactory { - - public SmooksEditPartFactory() { - - } - - /* - * (non-Javadoc) - * - * @see org.eclipse.gef.EditPartFactory#createEditPart(org.eclipse.gef.EditPart, - * java.lang.Object) - */ - public EditPart createEditPart(EditPart context, Object model) { - EditPart part = getPartForElement(model); - if (part != null) - part.setModel(model); - - return part; - } - - /** - * - * @param modelElement - * @return - */ - private EditPart getPartForElement(Object modelElement) { - - if (modelElement instanceof RootModel) { - return new RootModelEditPart(); - } else if (modelElement instanceof HiddenAreaModel) { - return new HiddenEditPart(); - } else if (modelElement instanceof StructuredDataModel) { - return new StructuredDataEditPart(); - } else if (modelElement instanceof StructuredDataContentModel) { - return new StructuredDataContentEditPart(); - } else if (modelElement instanceof LineConnectionModel) { - return new StructuredDataConnectionEditPart(); - } else if (modelElement instanceof GraphRootModel) { - return new RootModelEditPart(); - } else if (modelElement instanceof TargetModel) { - return new TargetConnectionPointEditPart(); - } else if (modelElement instanceof SourceModel) { - return new SourceConnectionPointEditPart(); - } - - throw new RuntimeException("Can't create part from model element: " - + ((modelElement != null) ? modelElement.getClass().getName() - : "null")); - } +package org.jboss.tools.smooks.ui.gef.editparts; + +import org.eclipse.gef.EditPart; +import org.eclipse.gef.EditPartFactory; +import org.jboss.tools.smooks.ui.gef.model.GraphRootModel; +import org.jboss.tools.smooks.ui.gef.model.LineConnectionModel; +import org.jboss.tools.smooks.ui.gef.model.SourceModel; +import org.jboss.tools.smooks.ui.gef.model.TargetModel; + +/** + * + * @author Dart Peng + * @Date Jul 30, 2008 + */ +public class SmooksEditPartFactory implements EditPartFactory { + + public SmooksEditPartFactory() { + + } + + /* + * (non-Javadoc) + * + * @see + * org.eclipse.gef.EditPartFactory#createEditPart(org.eclipse.gef.EditPart, + * java.lang.Object) + */ + public EditPart createEditPart(EditPart context, Object model) { + EditPart part = getPartForElement(model); + if (part != null) + part.setModel(model); + + return part; + } + + /** + * + * @param modelElement + * @return + */ + private EditPart getPartForElement(Object modelElement) { + + if (modelElement instanceof LineConnectionModel) { + return new StructuredDataConnectionEditPart(); + } else if (modelElement instanceof GraphRootModel) { + return new RootModelEditPart(); + } else if (modelElement instanceof TargetModel) { + return new TargetConnectionPointEditPart(); + } else if (modelElement instanceof SourceModel) { + return new SourceConnectionPointEditPart(); + } + + throw new RuntimeException("Can't create part from model element: " + + ((modelElement != null) ? modelElement.getClass().getName() + : "null")); + } } \ No newline at end of file Deleted: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/editparts/StructuredDataContentEditPart.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/editparts/StructuredDataContentEditPart.java 2008-10-21 03:41:10 UTC (rev 11024) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/editparts/StructuredDataContentEditPart.java 2008-10-21 03:42:46 UTC (rev 11025) @@ -1,267 +0,0 @@ -package org.jboss.tools.smooks.ui.gef.editparts; - -import java.beans.PropertyChangeEvent; -import java.util.Collections; -import java.util.Iterator; -import java.util.List; - -import org.eclipse.draw2d.ColorConstants; -import org.eclipse.draw2d.ConnectionAnchor; -import org.eclipse.draw2d.IFigure; -import org.eclipse.draw2d.Label; -import org.eclipse.draw2d.MarginBorder; -import org.eclipse.draw2d.PositionConstants; -import org.eclipse.draw2d.RectangleFigure; -import org.eclipse.draw2d.geometry.Dimension; -import org.eclipse.draw2d.geometry.Rectangle; -import org.eclipse.gef.ConnectionEditPart; -import org.eclipse.gef.EditPart; -import org.eclipse.gef.EditPolicy; -import org.eclipse.gef.GraphicalEditPart; -import org.eclipse.gef.Request; -import org.eclipse.gef.editparts.AbstractConnectionEditPart; -import org.eclipse.swt.graphics.Color; -import org.jboss.tools.smooks.ui.gef.figures.ContainerFigure; -import org.jboss.tools.smooks.ui.gef.figures.ContainerLeftEdgeAnchor; -import org.jboss.tools.smooks.ui.gef.figures.ContainerRightEdgeAnchor; -import org.jboss.tools.smooks.ui.gef.figures.LabelAreaFigure; -import org.jboss.tools.smooks.ui.gef.figures.TreeNodeContentFigure; -import org.jboss.tools.smooks.ui.gef.model.AbstractStructuredDataModel; -import org.jboss.tools.smooks.ui.gef.model.StructuredDataContentModel; -import org.jboss.tools.smooks.ui.gef.policy.ConnectFeedbackEditPolicy; -import org.jboss.tools.smooks.ui.gef.policy.CustomGraphicalNodeEditPolicy; -import org.jboss.tools.smooks.ui.gef.policy.NonResizableSelectionEditPolicy; -import org.jboss.tools.smooks.ui.gef.util.GraphicsConstants; -import org.jboss.tools.smooks.ui.gef.util.LeftSourceAnchor; -import org.jboss.tools.smooks.ui.gef.util.RightSourceAnchor; -import org.jboss.tools.smooks.ui.gef.util.editparts.InteractorHelper; -import org.jboss.tools.smooks.ui.gef.util.figures.Interactor; -import org.jboss.tools.smooks.ui.gef.util.figures.Placeholder; - -/** - * - * @author Dart Peng - * - */ -public class StructuredDataContentEditPart extends - AbstractStructuredDataEditPart implements GraphicsConstants, - IConnectableEditPart { - - protected static final Color label2ForegroundColor = new Color(null, 82, - 82, 158); - - protected Label propertyName; - protected Label javaTypeLabel; - protected ContainerFigure labelHolder = new ContainerFigure(); - protected TreeNodeContentFigure contentFigure; - protected InteractorHelper interactorHelper; - protected boolean isExpanded = false; - - private EditPart expandPart; - - public void propertyChange(PropertyChangeEvent event) { - - if (event.getPropertyName().equals( - StructuredDataContentModel.P_SOURCE_CONNECTION)) { - refreshSourceConnections(); - } else if (event.getPropertyName().equals( - StructuredDataContentModel.P_TARGET_CONNECTION)) { - refreshTargetConnections(); - } - } - - public IFigure getContentPane() { - return contentFigure.getInnerContentArea(); - } - - protected IFigure createFigure() { - createContentFigure(); - createFigureContent(); - return contentFigure; - } - - protected void createEditPolicies() { - installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, - new CustomGraphicalNodeEditPolicy()); - installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, - new NonResizableSelectionEditPolicy()); - installEditPolicy("CONNECTION_FEED_BACK", new ConnectFeedbackEditPolicy()); - } - - protected void createContentFigure() { - contentFigure = new TreeNodeContentFigure(); - contentFigure.setFill(true); - } - - protected void createFigureContent() { - - StructuredDataContentModel model = (StructuredDataContentModel) getModel(); - - // add a bit of space between the interactor and icon - // - - RectangleFigure space = new RectangleFigure(); - space.setVisible(false); - space.setPreferredSize(new Dimension(5, 5)); - - labelHolder = new LabelAreaFigure(); - labelHolder.setFill(true); - - IFigure interactor = null; - - if (model.getChildren() != null - && !model.getChildren().equals(Collections.EMPTY_LIST)) { - - interactor = new Interactor(); - interactor.setBorder(new MarginBorder(0, 0, 0, 5)); - interactor.setForegroundColor(ColorConstants.black); - interactor.setBackgroundColor(ColorConstants.white); - } else { - interactor = new Placeholder(); - interactor.setBorder(new MarginBorder(0, 0, 0, 5)); - interactor.setForegroundColor(ColorConstants.white); - } - - // contentFigure.getIconArea().getContainerLayout().setAlign( - // PositionConstants.RIGHT); - //contentFigure.getIconArea().getContainerLayout().setHorizontal(false); - if (!((AbstractStructuredDataModel) getModel()).isLeft()) { - contentFigure.getIconArea().getContainerLayout().setAlign( - PositionConstants.RIGHT); - contentFigure.getIconArea().add(space); - contentFigure.getIconArea().add(labelHolder); - contentFigure.setInteractor(interactor); - } else { - contentFigure.getIconArea().getContainerLayout().setAlign( - PositionConstants.LEFT); - contentFigure.setInteractor(interactor); - contentFigure.getIconArea().add(space); - contentFigure.getIconArea().add(labelHolder); - } - - propertyName = new Label(model.getLabelName()); - propertyName.setForegroundColor(ColorConstants.black); -// propertyName.setTextAlignment(PositionConstants.RIGHT); - // propertyName.setBackgroundColor(ColorConstants.red); - // propertyName.setOpaque(true); - - // if ( model.isRootNode() ) { - // propertyName.setIcon(SDPlugin.getImageDescriptor(IImagePaths. - // IMAGE_XSD_ALL).createImage()); - // } else if ( model.isListType() ) { - // propertyName.setIcon(SDPlugin.getImageDescriptor(IImagePaths. - // IMAGE_XSD_CHOICE).createImage()); - // } else if ( !model.isListType() && model.isComplexType() ) { - // propertyName.setIcon(SDPlugin.getImageDescriptor(IImagePaths. - // IMAGE_XSD_COMPLEX_TYPE).createImage()); - // } else if ( !model.isListType() && !model.isComplexType() ) { - // propertyName.setIcon(SDPlugin.getImageDescriptor(IImagePaths. - // IMAGE_XSD_SIMPLE_TYPE).createImage()); - // } - // contentFigure.getIconArea().setFill(true); - // contentFigure.getIconArea().setBackgroundColor(ColorConstants.black); - labelHolder.add(propertyName); - - if (model.getChildren() != null - && !model.getChildren().equals(Collections.EMPTY_LIST)) { - interactorHelper = new InteractorHelper(this, contentFigure - .getInteractor(), contentFigure.getInnerContentArea()); - } - - javaTypeLabel = new Label(); - javaTypeLabel.setBorder(new MarginBorder(0, 5, 0, 0)); - javaTypeLabel.setForegroundColor(label2ForegroundColor); - // javaTypeLabel.setIcon(SDPlugin.getImageDescriptor( - // "icons/XSDSimpleType.gif").createImage()); - - if (model.getTypeString() != null) { - javaTypeLabel.setText("- (" + model.getTypeString() + ")"); - } - labelHolder.add(javaTypeLabel); - } - - protected void refreshVisuals() { - Rectangle constraint = ((StructuredDataContentModel) getModel()) - .getConstraint(); - - ((GraphicalEditPart) getParent()).setLayoutConstraint(this, - getFigure(), constraint); - - super.refreshVisuals(); - } - - public void notifyExpand(EditPart part) { - expandPart = part; - List sourceConnections = this.getSourceConnections(); - for (Iterator iter = sourceConnections.iterator(); iter.hasNext();) { - AbstractConnectionEditPart sourceC = (AbstractConnectionEditPart) iter - .next(); - sourceC.refresh(); - } - List targetConnections = this.getTargetConnections(); - for (Iterator iter = targetConnections.iterator(); iter.hasNext();) { - AbstractConnectionEditPart sourceC = (AbstractConnectionEditPart) iter - .next(); - sourceC.refresh(); - } - - } - - public IFigure getSelectionFigure() { - return ((TreeNodeContentFigure) getFigure()).getIconArea(); - } - - public IFigure getAnchroFigure() { - if (expandPart == null) - return ((TreeNodeContentFigure) getFigure()).getIconArea(); - - if (expandPart instanceof StructuredDataContentEditPart) { - IFigure figure = ((StructuredDataContentEditPart) expandPart) - .getFigure(); - if (figure instanceof TreeNodeContentFigure) { - return ((TreeNodeContentFigure) figure).getIconArea(); - } - } - return ((GraphicalEditPart) expandPart).getFigure(); - } - - protected List getModelChildren() { - return ((AbstractStructuredDataModel) getModel()).getChildren(); - } - - public ConnectionAnchor getSourceConnectionAnchor( - ConnectionEditPart connection) { - return new ContainerRightEdgeAnchor(getAnchroFigure()); - } - - public ConnectionAnchor getTargetConnectionAnchor( - ConnectionEditPart connection) { - return new ContainerLeftEdgeAnchor(getAnchroFigure()); - } - - public ConnectionAnchor getSourceConnectionAnchor(Request request) { - return new RightSourceAnchor(getAnchroFigure()); - } - - public ConnectionAnchor getTargetConnectionAnchor(Request request) { - return new LeftSourceAnchor(getAnchroFigure()); - } - - public List getModelSourceConnections() { - return ((StructuredDataContentModel) getModel()) - .getModelSourceConnections(); - } - - public List getModelTargetConnections() { - return ((StructuredDataContentModel) getModel()) - .getModelTargetConnections(); - } - - public boolean isExpanded() { - return isExpanded; - } - - public void setExpanded(boolean isExpanded) { - this.isExpanded = isExpanded; - } -} \ No newline at end of file Deleted: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/editparts/StructuredDataEditPart.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/editparts/StructuredDataEditPart.java 2008-10-21 03:41:10 UTC (rev 11024) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/editparts/StructuredDataEditPart.java 2008-10-21 03:42:46 UTC (rev 11025) @@ -1,274 +0,0 @@ -package org.jboss.tools.smooks.ui.gef.editparts; - -import java.beans.PropertyChangeEvent; -import java.util.List; - -import org.eclipse.draw2d.ColorConstants; -import org.eclipse.draw2d.ConnectionAnchor; -import org.eclipse.draw2d.Graphics; -import org.eclipse.draw2d.IFigure; -import org.eclipse.draw2d.Label; -import org.eclipse.draw2d.MarginBorder; -import org.eclipse.draw2d.PositionConstants; -import org.eclipse.draw2d.RectangleFigure; -import org.eclipse.draw2d.ScrollPane; -import org.eclipse.draw2d.Viewport; -import org.eclipse.draw2d.ViewportLayout; -import org.eclipse.draw2d.geometry.Dimension; -import org.eclipse.draw2d.geometry.Rectangle; -import org.eclipse.gef.ConnectionEditPart; -import org.eclipse.gef.EditPolicy; -import org.eclipse.gef.GraphicalEditPart; -import org.eclipse.gef.Request; -import org.eclipse.gef.commands.Command; -import org.eclipse.gef.editpolicies.ContainerEditPolicy; -import org.eclipse.gef.requests.CreateRequest; -import org.jboss.tools.smooks.ui.gef.figures.ContainerBoxFigure; -import org.jboss.tools.smooks.ui.gef.figures.ContainerFigure; -import org.jboss.tools.smooks.ui.gef.figures.ContainerLeftEdgeAnchor; -import org.jboss.tools.smooks.ui.gef.figures.ContainerRightEdgeAnchor; -import org.jboss.tools.smooks.ui.gef.figures.RoundedLineBorder; -import org.jboss.tools.smooks.ui.gef.model.AbstractStructuredDataModel; -import org.jboss.tools.smooks.ui.gef.model.IConnectableModel; -import org.jboss.tools.smooks.ui.gef.model.StructuredDataContentModel; -import org.jboss.tools.smooks.ui.gef.model.StructuredDataModel; -import org.jboss.tools.smooks.ui.gef.policy.CustomGraphicalNodeEditPolicy; -import org.jboss.tools.smooks.ui.gef.util.GraphicsConstants; -import org.jboss.tools.smooks.ui.gef.util.LeftSourceAnchor; -import org.jboss.tools.smooks.ui.gef.util.RightSourceAnchor; -import org.jboss.tools.smooks.ui.gef.util.figures.ContainerLayout; -import org.jboss.tools.smooks.ui.gef.util.figures.FillLayout; - -/** - * - */ -public class StructuredDataEditPart extends AbstractStructuredDataEditPart - implements GraphicsConstants, IConnectableEditPart { - - protected ScrollPane scrollpane; - protected Label label; - protected ContainerFigure outerPane; - - public IFigure getContentPane() { - return scrollpane.getContents(); - } - - /* - * (non-Javadoc) - * - * @seejava.beans.PropertyChangeListener#propertyChange(java.beans. - * PropertyChangeEvent) - */ - public void propertyChange(PropertyChangeEvent evt) { - String pname = evt.getPropertyName(); - if (AbstractStructuredDataModel.P_CHILDREN.equals(pname)) { - refreshChildren(); - } - if (AbstractStructuredDataModel.P_BOUNDS_CHANGE.equals(pname)) { - refresh(); - } - - if (StructuredDataContentModel.P_SOURCE_CONNECTION.equals(pname)) { - refreshSourceConnections(); - } else if (StructuredDataContentModel.P_TARGET_CONNECTION.equals(pname)) { - refreshTargetConnections(); - } - } - - /* - * (non-Javadoc) - * - * @see org.eclipse.gef.editparts.AbstractGraphicalEditPart#createFigure() - */ - protected IFigure createFigure() { - - AbstractStructuredDataModel model = (AbstractStructuredDataModel) getModel(); - - outerPane = new ContainerBoxFigure(); - outerPane.setMinimumSize(new Dimension(100, 100)); - outerPane.setBorder(new RoundedLineBorder(1, 5)); - outerPane.setForegroundColor(groupBorderColor); - outerPane.setFill(true); - outerPane.setBackgroundColor(ColorConstants.white); - ContainerFigure titleFigure = new ContainerFigure(){ - @Override - protected void fillShape(Graphics graphics) { - graphics.pushState(); - graphics.setForegroundColor(graphics.getBackgroundColor()); - graphics.setBackgroundColor(ColorConstants.white); - graphics.fillGradient(getBounds(), true); - graphics.popState(); - } - }; - // r.setCornerDimensions(new Dimension(4, 4)); - titleFigure.setOutline(false); - titleFigure.setMinimumSize(new Dimension(0, 0)); - - titleFigure.setFill(true); - - titleFigure.setBackgroundColor(groupHeaderColor); - outerPane.add(titleFigure); - - label = new Label(); - label.setForegroundColor(ColorConstants.black); - label.setBorder(new MarginBorder(2, 4, 2, 4)); - titleFigure.add(label); // Holder); - - RectangleFigure line = new RectangleFigure(); - line.setPreferredSize(20, 1); - outerPane.add(line); - - int minHeight = 400; - final int theMinHeight = minHeight; - FillLayout outerLayout = new FillLayout() { - protected Dimension calculatePreferredSize(IFigure parent, - int width, int height) { - Dimension d = super.calculatePreferredSize(parent, width, - height); - d.union(new Dimension(250, theMinHeight)); - return d; - } - }; - - outerLayout.setHorizontal(false); - // layout.setSpacing(5); - outerPane.setLayoutManager(outerLayout); - - scrollpane = new ScrollPane(); - scrollpane.setForegroundColor(ColorConstants.black); - scrollpane.setVerticalScrollBarVisibility(ScrollPane.AUTOMATIC); - scrollpane.setHorizontalScrollBarVisibility(ScrollPane.AUTOMATIC); - scrollpane.scrollHorizontalTo(scrollpane.getBounds().width / 2); - scrollpane.scrollVerticalTo(scrollpane.getBounds().height / 2); - outerPane.add(scrollpane); - - ContainerFigure pane = new ContainerFigure(); - pane.setBorder(new MarginBorder(5, 8, 5, 8)); - ContainerLayout layout = new ContainerLayout(); - layout.setHorizontal(false); - layout.setSpacing(0); - AbstractStructuredDataModel currentModel = (AbstractStructuredDataModel) this - .getModel(); - if (!currentModel.isLeft()) { - layout.setAlign(PositionConstants.RIGHT); - } - pane.setLayoutManager(layout); - // pane.setBackgroundColor(ColorConstants.black); - // pane.setFill(true); - - Viewport viewport = new Viewport(); - viewport.setContentsTracksHeight(true); - ViewportLayout viewportLayout = new ViewportLayout() { - protected Dimension calculatePreferredSize(IFigure parent, - int width, int height) { - Dimension d = super.calculatePreferredSize(parent, width, - height); - d.height = Math.min(d.height, theMinHeight - 25); - return d; - } - }; - - viewport.setLayoutManager(viewportLayout); - - scrollpane.setViewport(viewport); - scrollpane.setContents(pane); - if (model instanceof StructuredDataModel) { - label.setText(((StructuredDataModel) model).getLabelName()); - } - return outerPane; - } - - /* - * (non-Javadoc) - * - * @see org.eclipse.gef.editparts.AbstractEditPart#createEditPolicies() - */ - protected void createEditPolicies() { - this.installEditPolicy(EditPolicy.CONTAINER_ROLE, - new ContainerEditPolicy() { - - @Override - protected Command getCreateCommand(CreateRequest arg0) { - return null; - } - - }); - - this.installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, - new CustomGraphicalNodeEditPolicy()); - - } - - /* - * (non-Javadoc) - * - * @see - * org.eclipse.gef.editparts.AbstractGraphicalEditPart#getModelSourceConnections - * () - */ - @Override - protected List getModelSourceConnections() { - return ((IConnectableModel) getModel()).getModelSourceConnections(); - } - - /* - * (non-Javadoc) - * - * @see - * org.eclipse.gef.editparts.AbstractGraphicalEditPart#getModelTargetConnections - * () - */ - @Override - protected List getModelTargetConnections() { - return ((IConnectableModel) getModel()).getModelTargetConnections(); - } - - /* - * (non-Javadoc) - * - * @see org.eclipse.gef.editparts.AbstractEditPart#getModelChildren() - */ - protected List getModelChildren() { - return ((AbstractStructuredDataModel) getModel()).getChildren(); - } - - /* - * (non-Javadoc) - * - * @see org.eclipse.gef.editparts.AbstractEditPart#refreshVisuals() - */ - protected void refreshVisuals() { - Rectangle constraint = null; - AbstractStructuredDataModel model = (AbstractStructuredDataModel) getModel(); - - if (model instanceof StructuredDataModel) { - constraint = ((StructuredDataModel) model).getConstraint(); - } - if (constraint == null) - constraint = new Rectangle(0, 0, -1, -1); - ((GraphicalEditPart) getParent()).setLayoutConstraint(this, - getFigure(), constraint); - - super.refreshVisuals(); - } - - public ConnectionAnchor getSourceConnectionAnchor(ConnectionEditPart arg0) { - return new ContainerRightEdgeAnchor(label); - } - - public ConnectionAnchor getSourceConnectionAnchor(Request arg0) { - return new RightSourceAnchor(label); - } - - public ConnectionAnchor getTargetConnectionAnchor(ConnectionEditPart arg0) { - return new ContainerLeftEdgeAnchor(label); - } - - public ConnectionAnchor getTargetConnectionAnchor(Request arg0) { - return new LeftSourceAnchor(label); - } - - public IFigure getAnchroFigure() { - return label; - } -} \ No newline at end of file Deleted: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/figures/ConnectionPointFiguresLocationCaculator.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/figures/ConnectionPointFiguresLocationCaculator.java 2008-10-21 03:41:10 UTC (rev 11024) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/figures/ConnectionPointFiguresLocationCaculator.java 2008-10-21 03:42:46 UTC (rev 11025) @@ -1,19 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2008 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 - * - * Contributors: - * Red Hat, Inc. - initial API and implementation - ******************************************************************************/ -package org.jboss.tools.smooks.ui.gef.figures; - -/** - * @author Dart Peng - * @Date Jul 30, 2008 - */ -public class ConnectionPointFiguresLocationCaculator { - int itemY = 0; -} Deleted: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/figures/ContainerBoxFigure.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/figures/ContainerBoxFigure.java 2008-10-21 03:41:10 UTC (rev 11024) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/figures/ContainerBoxFigure.java 2008-10-21 03:42:46 UTC (rev 11025) @@ -1,20 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 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 - * - * Contributors: - * Red Hat, Inc. - initial API and implementation - ******************************************************************************/ -package org.jboss.tools.smooks.ui.gef.figures; - -/** - * @author Dart Peng - * - */ -public class ContainerBoxFigure extends ContainerFigure implements - ITreeContainer { - -} Deleted: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/figures/ContainerFigure.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/figures/ContainerFigure.java 2008-10-21 03:41:10 UTC (rev 11024) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/figures/ContainerFigure.java 2008-10-21 03:42:46 UTC (rev 11025) @@ -1,52 +0,0 @@ -package org.jboss.tools.smooks.ui.gef.figures; - -import org.eclipse.draw2d.Graphics; -import org.eclipse.draw2d.RectangleFigure; -import org.jboss.tools.smooks.ui.gef.util.figures.ContainerLayout; - - -public class ContainerFigure extends RectangleFigure implements IExpandable { - - protected boolean isOutlined = false; - - protected boolean isExpanded = true; - - public ContainerFigure() { - setLayoutManager(new ContainerLayout()); - setFill(false); - } - - public void doLayout() { - layout(); - setValid(true); - } - - public ContainerLayout getContainerLayout() { - return (ContainerLayout) getLayoutManager(); - } - - public void setOutlined(boolean isOutlined) { - this.isOutlined = isOutlined; - } - - protected void outlineShape(Graphics graphics) { - if (isOutlined) { - super.outlineShape(graphics); - } - } - - - - /* (non-Javadoc) - * @see org.eclipse.draw2d.RectangleFigure#fillShape(org.eclipse.draw2d.Graphics) - */ - - public boolean isExpanded() { - return isExpanded; - } - - public void setExpanded(boolean isExpanded) { - this.isExpanded = isExpanded; - } - -} \ No newline at end of file Deleted: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/figures/ContainerLeftEdgeAnchor.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/figures/ContainerLeftEdgeAnchor.java 2008-10-21 03:41:10 UTC (rev 11024) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/figures/ContainerLeftEdgeAnchor.java 2008-10-21 03:42:46 UTC (rev 11025) @@ -1,62 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 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 - * - * Contributors: - * Red Hat, Inc. - initial API and implementation - ******************************************************************************/ -package org.jboss.tools.smooks.ui.gef.figures; - -import org.eclipse.draw2d.ChopboxAnchor; -import org.eclipse.draw2d.IFigure; -import org.eclipse.draw2d.geometry.Point; - -/** - * @author Dart Peng - * - */ -public class ContainerLeftEdgeAnchor extends ChopboxAnchor { - - public ContainerLeftEdgeAnchor(IFigure owner) { - super(owner); - } - - /* - * (non-Javadoc) - * - * @see - * org.eclipse.draw2d.ChopboxAnchor#getLocation(org.eclipse.draw2d.geometry - * .Point) - */ - @Override - public Point getLocation(Point reference) { - Point p; - IFigure figure = getOwner(); - IFigure parent = findTheTreeContainerFigure(figure); - // caculate the right edge of parent figure - if (parent == null) - return getOwner().getBounds().getLeft(); - p = getOwner().getBounds().getCenter(); - getOwner().translateToAbsolute(p); - p = getOwner().getBounds().getLeft(); - getOwner().translateToAbsolute(p); - return new Point(parent.getBounds().x , p.y); - } - - protected IFigure findTheTreeContainerFigure(IFigure figure) { - if (figure == null) - return null; - IFigure parent = figure.getParent(); - if (parent == null) - return null; - if (parent instanceof ITreeContainer) { - return parent; - } else { - return findTheTreeContainerFigure(parent); - } - } - -} Deleted: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/figures/ContainerRightEdgeAnchor.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/figures/ContainerRightEdgeAnchor.java 2008-10-21 03:41:10 UTC (rev 11024) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/figures/ContainerRightEdgeAnchor.java 2008-10-21 03:42:46 UTC (rev 11025) @@ -1,62 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 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 - * - * Contributors: - * Red Hat, Inc. - initial API and implementation - ******************************************************************************/ -package org.jboss.tools.smooks.ui.gef.figures; - -import org.eclipse.draw2d.ChopboxAnchor; -import org.eclipse.draw2d.IFigure; -import org.eclipse.draw2d.geometry.Point; - -/** - * @author Dart Peng - * - */ -public class ContainerRightEdgeAnchor extends ChopboxAnchor { - - public ContainerRightEdgeAnchor(IFigure owner) { - super(owner); - } - - /* - * (non-Javadoc) - * - * @see - * org.eclipse.draw2d.ChopboxAnchor#getLocation(org.eclipse.draw2d.geometry - * .Point) - */ - @Override - public Point getLocation(Point reference) { - Point p; - IFigure figure = getOwner(); - IFigure parent = findTheTreeContainerFigure(figure); - // caculate the right edge of parent figure - if (parent == null) - return getOwner().getBounds().getRight(); - p = getOwner().getBounds().getCenter(); - getOwner().translateToAbsolute(p); - p = getOwner().getBounds().getRight(); - getOwner().translateToAbsolute(p); - return new Point(parent.getBounds().x + parent.getBounds().width, p.y); - } - - protected IFigure findTheTreeContainerFigure(IFigure figure) { - if (figure == null) - return null; - IFigure parent = figure.getParent(); - if (parent == null) - return null; - if (parent instanceof ITreeContainer) { - return parent; - } else { - return findTheTreeContainerFigure(parent); - } - } - -} Deleted: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/figures/ExpandableGraphNodeContentFigure.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/figures/ExpandableGraphNodeContentFigure.java 2008-10-21 03:41:10 UTC (rev 11024) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/figures/ExpandableGraphNodeContentFigure.java 2008-10-21 03:42:46 UTC (rev 11025) @@ -1,73 +0,0 @@ -package org.jboss.tools.smooks.ui.gef.figures; - -import org.eclipse.draw2d.IFigure; -import org.eclipse.draw2d.MarginBorder; -import org.eclipse.draw2d.RectangleFigure; -import org.eclipse.draw2d.geometry.Dimension; -import org.jboss.tools.smooks.ui.gef.util.figures.Interactor; - - -//-------------------------------------------- -//| ExpandableGraphNodeContentFigure | -//| | -//| ---------------------------------- | -//| | verticalGroup | | -//| | | | -//| | ----------------------------- | | -//| | | horizontalGroup | | | -//| | | | | | -//| | | --------------------- | | | -//| | | | outlinedArea | | | | -//| | | | ----------------- | | | | -//| | | | |[+]iconArea | | | | | -//| | | | ----------------- | | | | -//| | | | ----------------- | | | | -//| | | | | innerContent | | | | | -//| | | | ----------------- | | | | -//| | | --------------------- | | | -//| | ----------------------------- | | -//| | | | -//| ---------------------------------- | -//-------------------------------------------- - -public class ExpandableGraphNodeContentFigure extends GraphNodeContentFigure { - - protected IFigure interactor; - - public ExpandableGraphNodeContentFigure() { - super(); - } - - public Interactor getInteractor() { - return (Interactor)interactor; - } - - protected void createFigure() { - createVerticalGroup(this); - createOutlinedArea(verticalGroup); -// createInteractor(iconArea); - innerContentArea.setBorder(new MarginBorder(0, 10, 0, 0)); - } - - protected void createInteractor(IFigure parent) { -// interactor = new Interactor(); -// interactor.setBorder(new MarginBorder(0, 0, 0, 5)); -// interactor.setForegroundColor(ColorConstants.black); -// interactor.setBackgroundColor(ColorConstants.white); -// parent.add(interactor); - } - - protected void createPreceedingSpace(IFigure parent) { - RectangleFigure space = new RectangleFigure(); - space.setVisible(false); - space.setPreferredSize(new Dimension(10, 10)); - parent.add(space); - } - - /** - */ - public void setInteractor(IFigure interactor) { - this.interactor = interactor; - iconArea.add(interactor); - } -} \ No newline at end of file Deleted: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/figures/GraphNodeContentFigure.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/figures/GraphNodeContentFigure.java 2008-10-21 03:41:10 UTC (rev 11024) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/figures/GraphNodeContentFigure.java 2008-10-21 03:42:46 UTC (rev 11025) @@ -1,79 +0,0 @@ -package org.jboss.tools.smooks.ui.gef.figures; - -import org.eclipse.draw2d.IFigure; -import org.jboss.tools.smooks.ui.gef.util.figures.IConnectedFigure; - - -//------------------------------ -//| GraphNodeContentFigure | -//| | -//| ------------------------- | -//| | vertical group | | -//| | --------------------- | | -//| | | outlined area | | | -//| | | ----------------- | | | -//| | | | icon area | | | | -//| | | ----------------- | | | -//| | | ----------------- | | | -//| | | | inner content | | | | -//| | | ----------------- | | | -//| | --------------------- | | -//| ------------------------- | -//------------------------------ - -public class GraphNodeContentFigure extends ContainerFigure implements IConnectedFigure { - - protected ContainerFigure verticalGroup; - protected ContainerFigure outlinedArea; - protected ContainerFigure iconArea; - protected ContainerFigure innerContentArea; - - public GraphNodeContentFigure() { - createFigure(); - } - - public IFigure getConnectionFigure() { - return outlinedArea; - } - - public ContainerFigure getIconArea() { - return iconArea; - } - - public ContainerFigure getOutlinedArea() { - return outlinedArea; - } - - public ContainerFigure getInnerContentArea() { - return innerContentArea; - } - - protected void createFigure() { - createVerticalGroup(this); - createOutlinedArea(verticalGroup); - } - - protected void createVerticalGroup(IFigure parent) { - verticalGroup = new ContainerFigure(); - verticalGroup.getContainerLayout().setHorizontal(false); - parent.add(verticalGroup); - } - - protected void createOutlinedArea(IFigure parent) { - outlinedArea = new ContainerFigure(); - outlinedArea.getContainerLayout().setHorizontal(false); -// outlinedArea.setBackgroundColor(ColorConstants.red); -// outlinedArea.setFill(true); - parent.add(outlinedArea); - - iconArea = new IconAreaFigure(); - iconArea.getContainerLayout().setHorizontal(true); - outlinedArea.add(iconArea); - - innerContentArea = new ContainerFigure(); - innerContentArea.getContainerLayout().setHorizontal(false); -// innerContentArea.setBackgroundColor(ColorConstants.red); -// innerContentArea.setFill(true); - outlinedArea.add(innerContentArea); - } -} \ No newline at end of file Deleted: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/figures/GroupFigure.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/figures/GroupFigure.java 2008-10-21 03:41:10 UTC (rev 11024) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/figures/GroupFigure.java 2008-10-21 03:42:46 UTC (rev 11025) @@ -1,153 +0,0 @@ -package org.jboss.tools.smooks.ui.gef.figures; - -import org.eclipse.draw2d.ColorConstants; -import org.eclipse.draw2d.IFigure; -import org.eclipse.draw2d.Label; -import org.eclipse.draw2d.MarginBorder; -import org.eclipse.draw2d.PositionConstants; -import org.eclipse.draw2d.RectangleFigure; -import org.eclipse.draw2d.ScrollPane; -import org.eclipse.draw2d.Viewport; -import org.eclipse.draw2d.ViewportLayout; -import org.eclipse.draw2d.geometry.Dimension; -import org.eclipse.swt.SWT; -import org.jboss.tools.smooks.ui.gef.util.GraphicsConstants; -import org.jboss.tools.smooks.ui.gef.util.figures.ContainerLayout; -import org.jboss.tools.smooks.ui.gef.util.figures.FillLayout; - - -//---------------------------------- -//| GroupFigure Head Area | -//| | -//| ----------------------------- | -//| | | | -//| | GroupFigure Client Area | | -//| | | | -//| | | | -//| | | | -//| | | | -//| | | | -//| | | | -//| ----------------------------- | -//---------------------------------- -public class GroupFigure extends RectangleFigure implements GraphicsConstants { - - private static final int DEFAULT_MIN_HEIGHT = 250; - - protected ScrollPane scrollpane; - /** - * Text Name - */ - protected Label label; - protected ContainerFigure outerPane; - - public GroupFigure() { - - FillLayout outerLayout = new FillLayout() { - protected Dimension calculatePreferredSize(IFigure parent, - int width, int height) { - Dimension d = super.calculatePreferredSize(parent, width, - height); - d.union(new Dimension(100, DEFAULT_MIN_HEIGHT)); - return d; - } - }; - setLayoutManager(outerLayout); - setFill(false); - createFigure(); - } - - public void doLayout() { - layout(); - setValid(true); - } - - public FillLayout getFillLayout() { - return (FillLayout)getLayoutManager(); - } - - protected void createFigure() { - outerPane = new ContainerFigure(); - outerPane.setBorder(new RoundedLineBorder(1, 6)); - outerPane.setForegroundColor(groupBorderColor); - - ContainerFigure r = new ContainerFigure(); - //r.setCornerDimensions(new Dimension(4, 4)); - r.setOutline(false); - r.setMinimumSize(new Dimension(0, 0)); - - r.setFill(true); - - r.setBackgroundColor(groupHeaderColor); - outerPane.add(r); - - //ContainerFigure labelHolder = new ContainerFigure(); - //labelHolder.add(label); - label = new Label(); - label.setForegroundColor(ColorConstants.black); - label.setBorder(new MarginBorder(2, 4, 2, 4)); - r.add(label); //Holder); -// label.setTextAlignment(PositionConstants.RIGHT); - RectangleFigure line = new RectangleFigure(); - line.setPreferredSize(20, 1); - outerPane.add(line); - - int minHeight = 250; - final int theMinHeight = minHeight; - FillLayout outerLayout = new FillLayout() { - protected Dimension calculatePreferredSize(IFigure parent, - int width, int height) { - Dimension d = super.calculatePreferredSize(parent, width, - height); - d.union(new Dimension(100, theMinHeight)); - return d; - } - }; - - outerLayout.setHorizontal(false); -// outerLayout.setSpacing(10); - outerPane.setLayoutManager(outerLayout); - - scrollpane = new ScrollPane(); - scrollpane.setForegroundColor(ColorConstants.black); - scrollpane.setVerticalScrollBarVisibility(ScrollPane.AUTOMATIC); //ScrollPane.ALWAYS); - outerPane.add(scrollpane); - - ContainerFigure pane = new ContainerFigure(); - pane.setBorder(new MarginBorder(5, 8, 5, 8)); - ContainerLayout layout = new ContainerLayout(); - layout.setHorizontal(false); - layout.setSpacing(0); - pane.setLayoutManager(layout); - - Viewport viewport = new Viewport(); - viewport.setContentsTracksHeight(true); - ViewportLayout viewportLayout = new ViewportLayout() { - protected Dimension calculatePreferredSize(IFigure parent, - int width, int height) { - Dimension d = super.calculatePreferredSize(parent, width, - height); - d.height = Math.min(d.height, theMinHeight - 25); // getViewer().getControl().getBounds().height); - return d; - } - }; - - viewport.setLayoutManager(viewportLayout); - - scrollpane.setViewport(viewport); - scrollpane.setContents(pane); - - this.add(outerPane); - } - - public void setTextName(String name) { - label.setText(name); - } - - /** - * @return - */ - public String getTextName() { - return label == null ? null : label.getText(); - } -} \ No newline at end of file Deleted: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/figures/IExpandable.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/figures/IExpandable.java 2008-10-21 03:41:10 UTC (rev 11024) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/figures/IExpandable.java 2008-10-21 03:42:46 UTC (rev 11025) @@ -1,9 +0,0 @@ -package org.jboss.tools.smooks.ui.gef.figures; - -import org.eclipse.draw2d.IFigure; - -public interface IExpandable extends IFigure { - boolean isExpanded(); - - void setExpanded(boolean isExpanded); -} Deleted: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/figures/ITreeContainer.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/figures/ITreeContainer.java 2008-10-21 03:41:10 UTC (rev 11024) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/figures/ITreeContainer.java 2008-10-21 03:42:46 UTC (rev 11025) @@ -1,19 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 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 - * - * Contributors: - * Red Hat, Inc. - initial API and implementation - ******************************************************************************/ -package org.jboss.tools.smooks.ui.gef.figures; - -/** - * @author Dart Peng - * - */ -public interface ITreeContainer { - -} Deleted: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/figures/IconAreaFigure.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/figures/IconAreaFigure.java 2008-10-21 03:41:10 UTC (rev 11024) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/figures/IconAreaFigure.java 2008-10-21 03:42:46 UTC (rev 11025) @@ -1,25 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 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 - * - * Contributors: - * Red Hat, Inc. - initial API and implementation - ******************************************************************************/ -package org.jboss.tools.smooks.ui.gef.figures; - - -/** - * @author Dart Peng - * - */ -public class IconAreaFigure extends ContainerFigure { - - public IconAreaFigure() { - setLayoutManager(new RightAlignContainerLayout()); - setFill(false); - } - -} Deleted: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/figures/LabelAreaFigure.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/figures/LabelAreaFigure.java 2008-10-21 03:41:10 UTC (rev 11024) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/figures/LabelAreaFigure.java 2008-10-21 03:42:46 UTC (rev 11025) @@ -1,20 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 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 - * - * Contributors: - * Red Hat, Inc. - initial API and implementation - ******************************************************************************/ -package org.jboss.tools.smooks.ui.gef.figures; - -/** - * @author Dart Peng - * - * @CreateTime Jul 21, 2008 - */ -public class LabelAreaFigure extends ContainerFigure { - -} Deleted: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/figures/RightAlignContainerLayout.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/figures/RightAlignContainerLayout.java 2008-10-21 03:41:10 UTC (rev 11024) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/figures/RightAlignContainerLayout.java 2008-10-21 03:42:46 UTC (rev 11025) @@ -1,34 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 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 - * - * Contributors: - * Red Hat, Inc. - initial API and implementation - ******************************************************************************/ -package org.jboss.tools.smooks.ui.gef.figures; - -import org.eclipse.draw2d.IFigure; -import org.eclipse.draw2d.PositionConstants; -import org.jboss.tools.smooks.ui.gef.util.figures.ContainerLayout; - -/** - * @author Dart Peng - * - */ -public class RightAlignContainerLayout extends ContainerLayout { - - public RightAlignContainerLayout() { - super(); - this.setAlign(PositionConstants.RIGHT); - this.setHorizontal(false); - } - - @Override - public void layout(IFigure parent) { - super.layout(parent); - } - -} Deleted: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/figures/RoundedLineBorder.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/figures/RoundedLineBorder.java 2008-10-21 03:41:10 UTC (rev 11024) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/figures/RoundedLineBorder.java 2008-10-21 03:42:46 UTC (rev 11025) @@ -1,51 +0,0 @@ -package org.jboss.tools.smooks.ui.gef.figures; - -import org.eclipse.draw2d.Graphics; -import org.eclipse.draw2d.IFigure; -import org.eclipse.draw2d.LineBorder; -import org.eclipse.draw2d.geometry.Insets; -import org.eclipse.swt.graphics.Color; - -public class RoundedLineBorder extends LineBorder { - protected int arcLength; - - protected int lineStyle = Graphics.LINE_SOLID; - - public RoundedLineBorder(Color c, int width, int arcLength) { - super(c, width); - this.arcLength = arcLength; - } - - public RoundedLineBorder(int width, int arcLength) { - super(width); - this.arcLength = arcLength; - } - - public RoundedLineBorder(Color c, int width, int arcLength, int lineStyle) { - super(c, width); - this.arcLength = arcLength; - this.lineStyle = lineStyle; - } - - public RoundedLineBorder(int width, int arcLength, int lineStyle) { - super(width); - this.arcLength = arcLength; - this.lineStyle = lineStyle; - } - - public void paint(IFigure figure, Graphics graphics, Insets insets) { - tempRect.setBounds(getPaintRectangle(figure, insets)); - int width = getWidth(); - Color color = getColor(); - if (width % 2 == 1) { - tempRect.width--; - tempRect.height--; - } - tempRect.shrink(width / 2, width / 2); - graphics.setLineWidth(width); - graphics.setLineStyle(lineStyle); - if (color != null) - graphics.setForegroundColor(color); - graphics.drawRoundRectangle(tempRect, arcLength, arcLength); - } -} Deleted: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/figures/SourceConnectionDecoration.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/figures/SourceConnectionDecoration.java 2008-10-21 03:41:10 UTC (rev 11024) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/figures/SourceConnectionDecoration.java 2008-10-21 03:42:46 UTC (rev 11025) @@ -1,21 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 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 - * - * Contributors: - * Red Hat, Inc. - initial API and implementation - ******************************************************************************/ -package org.jboss.tools.smooks.ui.gef.figures; - -import org.eclipse.draw2d.Figure; - -/** - * @author Dart Peng - * - */ -public class SourceConnectionDecoration extends Figure { - -} Deleted: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/figures/SpacingFigure.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/figures/SpacingFigure.java 2008-10-21 03:41:10 UTC (rev 11024) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/figures/SpacingFigure.java 2008-10-21 03:42:46 UTC (rev 11025) @@ -1,11 +0,0 @@ -package org.jboss.tools.smooks.ui.gef.figures; - -import org.eclipse.draw2d.RectangleFigure; -import org.eclipse.draw2d.geometry.Dimension; - -public class SpacingFigure extends RectangleFigure { - public SpacingFigure() { - setFill(false); - setPreferredSize(new Dimension(0, 0)); - } -} Deleted: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/figures/TreeNodeContentFigure.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/figures/TreeNodeContentFigure.java 2008-10-21 03:41:10 UTC (rev 11024) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/figures/TreeNodeContentFigure.java 2008-10-21 03:42:46 UTC (rev 11025) @@ -1,77 +0,0 @@ -package org.jboss.tools.smooks.ui.gef.figures; - -import org.eclipse.draw2d.ColorConstants; -import org.eclipse.draw2d.Graphics; -import org.eclipse.draw2d.IFigure; -import org.eclipse.draw2d.MarginBorder; -import org.jboss.tools.smooks.ui.gef.util.GraphicsConstants; - -/** - * - * @author Dart Peng - * - * @CreateTime Jul 21, 2008 - */ -public class TreeNodeContentFigure extends ExpandableGraphNodeContentFigure - implements ISelectableFigure { - - private boolean selected = false; - - /** - * @return the selected - */ - public boolean getSelected() { - return selected; - } - - /** - * @param selected - * the selected to set - */ - public void setSelected(boolean selected) { - this.selected = selected; - this.repaint(); - } - - /** - * @return the focus - */ - public boolean getFocus() { - return focus; - } - - /** - * @param focus - * the focus to set - */ - public void setFocus(boolean focus) { - this.focus = focus; - } - - private boolean focus = false; - - public IFigure getConnectionFigure() { - return outlinedArea; - } - - protected void createOutlinedArea(IFigure parent) { - super.createOutlinedArea(parent); - outlinedArea.setBorder(new MarginBorder(0, 2, 0, 2)); - } - - protected void fillShape(Graphics graphics) { - super.fillShape(graphics); - } - - public void paintFigure(Graphics graphics){ - super.paintFigure(graphics); - ContainerFigure figure = this.getIconArea(); - if (this.selected) { - figure.setFill(true); - figure.setBackgroundColor(GraphicsConstants.groupHeaderColor); - } else { - figure.setFill(false); - figure.setBackgroundColor(ColorConstants.white); - } - } -} Deleted: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/model/DataObjectContainerModel.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/model/DataObjectContainerModel.java 2008-10-21 03:41:10 UTC (rev 11024) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/model/DataObjectContainerModel.java 2008-10-21 03:42:46 UTC (rev 11025) @@ -1,41 +0,0 @@ -package org.jboss.tools.smooks.ui.gef.model; - -import org.eclipse.draw2d.geometry.Rectangle; - -/** - * @deprecated - * - */ -public class DataObjectContainerModel extends AbstractStructuredDataModel { - - public static final int SOURCE_DATA_OBJECT_CONTAINER = 1; - public static final int TARGET_DATA_OBJECT_CIBTAUBER = 2; - - private String name; - private Rectangle constraint; - private int category = -1; - - public int getCategory() { - return category; - } - - public void setCategory(int category) { - this.category = category; - } - - public Rectangle getConstraint() { - return constraint; - } - - public void setConstraint(Rectangle constraint) { - this.constraint = constraint; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } -} \ No newline at end of file Deleted: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/model/HiddenAreaModel.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/model/HiddenAreaModel.java 2008-10-21 03:41:10 UTC (rev 11024) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/model/HiddenAreaModel.java 2008-10-21 03:42:46 UTC (rev 11025) @@ -1,27 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 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 - * - * Contributors: - * Red Hat, Inc. - initial API and implementation - ******************************************************************************/ -package org.jboss.tools.smooks.ui.gef.model; - -import java.util.Collections; -import java.util.List; - -/** - * @author Dart Peng - * - */ -public class HiddenAreaModel extends AbstractStructuredDataModel { - - @Override - public List getChildren() { - return Collections.EMPTY_LIST; - } - -} Deleted: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/policy/NodeSelectionHandlesEditPolicyImpl.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/policy/NodeSelectionHandlesEditPolicyImpl.java 2008-10-21 03:41:10 UTC (rev 11024) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/policy/NodeSelectionHandlesEditPolicyImpl.java 2008-10-21 03:42:46 UTC (rev 11025) @@ -1,32 +0,0 @@ -package org.jboss.tools.smooks.ui.gef.policy; - -import java.util.ArrayList; -import java.util.List; - -import org.eclipse.draw2d.IFigure; -import org.eclipse.gef.EditPart; -import org.eclipse.gef.GraphicalEditPart; -import org.eclipse.gef.editpolicies.SelectionHandlesEditPolicy; -import org.eclipse.gef.handles.MoveHandle; -import org.eclipse.gef.handles.MoveHandleLocator; -import org.jboss.tools.smooks.ui.gef.editparts.StructuredDataContentEditPart; - -public class NodeSelectionHandlesEditPolicyImpl extends SelectionHandlesEditPolicy { - - protected List createSelectionHandles() { - - List list = new ArrayList(); - EditPart editPart = getHost(); - - if ( editPart instanceof GraphicalEditPart ) { - GraphicalEditPart graphicalEditPart = (GraphicalEditPart)editPart; - IFigure figure = (graphicalEditPart instanceof StructuredDataContentEditPart ) ? - ((StructuredDataContentEditPart)graphicalEditPart).getSelectionFigure() : graphicalEditPart.getFigure(); - - MoveHandleLocator loc = new MoveHandleLocator(figure); - MoveHandle moveHandle = new MoveHandle(graphicalEditPart, loc); - list.add(moveHandle); - } - return list; - } -} \ No newline at end of file Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/policy/RootGraphicsXYLayoutEditPolicy.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/policy/RootGraphicsXYLayoutEditPolicy.java 2008-10-21 03:41:10 UTC (rev 11024) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/policy/RootGraphicsXYLayoutEditPolicy.java 2008-10-21 03:42:46 UTC (rev 11025) @@ -1,91 +1,89 @@ -package org.jboss.tools.smooks.ui.gef.policy; - -import org.eclipse.draw2d.geometry.Rectangle; -import org.eclipse.gef.EditPart; -import org.eclipse.gef.EditPolicy; -import org.eclipse.gef.GraphicalEditPart; -import org.eclipse.gef.Request; -import org.eclipse.gef.commands.Command; -import org.eclipse.gef.editpolicies.NonResizableEditPolicy; -import org.eclipse.gef.editpolicies.XYLayoutEditPolicy; -import org.eclipse.gef.requests.ChangeBoundsRequest; -import org.eclipse.gef.requests.CreateRequest; -import org.jboss.tools.smooks.ui.gef.commands.ChangeConstraintCommand; -import org.jboss.tools.smooks.ui.gef.commands.CommandMappingFactory; -import org.jboss.tools.smooks.ui.gef.commands.ICommandMappingFactory; -import org.jboss.tools.smooks.ui.gef.model.IGraphicalModel; - - - -/** - * @deprecated - * @author Dart - * - */ -public class RootGraphicsXYLayoutEditPolicy extends XYLayoutEditPolicy { - - private ICommandMappingFactory mappingFactory = null; - - /** - * @return the mappingFactory - */ - public ICommandMappingFactory getMappingFactory() { - if (mappingFactory == null) - mappingFactory = createMappingFactory(); - return mappingFactory; - } - - /** - * @return the mappingFactory - */ - public ICommandMappingFactory createMappingFactory() { - return new CommandMappingFactory(); - } - - protected Command createAddCommand(EditPart child, Object constraint) { - return null; - } - - /* - * (non-Javadoc) - * - * @seeorg.eclipse.gef.editpolicies.ConstrainedLayoutEditPolicy# - * createChangeConstraintCommand(org.eclipse.gef.EditPart, java.lang.Object) - */ - @Override - protected Command createChangeConstraintCommand(EditPart child, - Object constraint) { - Rectangle con = (Rectangle) constraint; - Object model = child.getModel(); - ChangeConstraintCommand command = null; - if (model instanceof IGraphicalModel) { - command = new ChangeConstraintCommand(); - command.setConstraint(con); - command.setGraphicalModel((IGraphicalModel) model); - } - return command; - } - - @Override - protected Command getResizeChildrenCommand(ChangeBoundsRequest request) { - return super.getResizeChildrenCommand(request); - } - - protected Command getCreateCommand(CreateRequest request) { - GraphicalEditPart rootEditPart = (GraphicalEditPart) this.getHost(); - ICommandMappingFactory factory = getMappingFactory(); - if (factory != null) { - return factory.createCreationStructuredModelCommand(request, - rootEditPart); - } - return null; - } - - protected Command getDeleteDependantCommand(Request request) { - return null; - } - - protected EditPolicy createChildEditPolicy(EditPart child) { - return new NonResizableEditPolicy(); - } +package org.jboss.tools.smooks.ui.gef.policy; + +import org.eclipse.gef.EditPart; +import org.eclipse.gef.EditPolicy; +import org.eclipse.gef.GraphicalEditPart; +import org.eclipse.gef.Request; +import org.eclipse.gef.commands.Command; +import org.eclipse.gef.editpolicies.NonResizableEditPolicy; +import org.eclipse.gef.editpolicies.XYLayoutEditPolicy; +import org.eclipse.gef.requests.ChangeBoundsRequest; +import org.eclipse.gef.requests.CreateRequest; +import org.jboss.tools.smooks.ui.gef.commands.CommandMappingFactory; +import org.jboss.tools.smooks.ui.gef.commands.ICommandMappingFactory; + + + +/** + * @deprecated + * @author Dart + * + */ +public class RootGraphicsXYLayoutEditPolicy extends XYLayoutEditPolicy { + + private ICommandMappingFactory mappingFactory = null; + + /** + * @return the mappingFactory + */ + public ICommandMappingFactory getMappingFactory() { + if (mappingFactory == null) + mappingFactory = createMappingFactory(); + return mappingFactory; + } + + /** + * @return the mappingFactory + */ + public ICommandMappingFactory createMappingFactory() { + return new CommandMappingFactory(); + } + + protected Command createAddCommand(EditPart child, Object constraint) { + return null; + } + + /* + * (non-Javadoc) + * + * @seeorg.eclipse.gef.editpolicies.ConstrainedLayoutEditPolicy# + * createChangeConstraintCommand(org.eclipse.gef.EditPart, java.lang.Object) + */ + @Override + protected Command createChangeConstraintCommand(EditPart child, + Object constraint) { +// Rectangle con = (Rectangle) constraint; +// Object model = child.getModel(); +// ChangeConstraintCommand command = null; +// if (model instanceof IGraphicalModel) { +// command = new ChangeConstraintCommand(); +// command.setConstraint(con); +// command.setGraphicalModel((IGraphicalModel) model); +// } +// return command; + return null; + } + + @Override + protected Command getResizeChildrenCommand(ChangeBoundsRequest request) { + return super.getResizeChildrenCommand(request); + } + + protected Command getCreateCommand(CreateRequest request) { + GraphicalEditPart rootEditPart = (GraphicalEditPart) this.getHost(); + ICommandMappingFactory factory = getMappingFactory(); + if (factory != null) { + return factory.createCreationStructuredModelCommand(request, + rootEditPart); + } + return null; + } + + protected Command getDeleteDependantCommand(Request request) { + return null; + } + + protected EditPolicy createChildEditPolicy(EditPart child) { + return new NonResizableEditPolicy(); + } } \ No newline at end of file Deleted: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/util/editparts/InteractorHelper.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/util/editparts/InteractorHelper.java 2008-10-21 03:41:10 UTC (rev 11024) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/util/editparts/InteractorHelper.java 2008-10-21 03:42:46 UTC (rev 11025) @@ -1,119 +0,0 @@ -package org.jboss.tools.smooks.ui.gef.util.editparts; - -import java.util.Iterator; -import java.util.List; - -import org.eclipse.draw2d.IFigure; -import org.eclipse.draw2d.LayoutManager; -import org.eclipse.draw2d.MouseEvent; -import org.eclipse.draw2d.MouseListener; -import org.eclipse.gef.EditPart; -import org.eclipse.gef.editparts.AbstractGraphicalEditPart; -import org.jboss.tools.smooks.ui.gef.editparts.StructuredDataContentEditPart; -import org.jboss.tools.smooks.ui.gef.figures.IExpandable; -import org.jboss.tools.smooks.ui.gef.util.figures.Interactor; - -/** - * @deprecated - * - */ -public class InteractorHelper implements MouseListener { - - protected boolean needToPerformDefaultExpansion = true; - - protected EditPart editPart; - - protected Interactor interactor; - - protected IExpandable expandable; - - public InteractorHelper(EditPart editPart, Interactor interactor, - IExpandable expandable) { - this.editPart = editPart; - this.interactor = interactor; - this.expandable = expandable; - interactor.addMouseListener(this); - expandable.setExpanded(interactor.isExpanded()); - } - - public void setExpanded(boolean isExpanded) { - interactor.setExpanded(isExpanded); - interactorExpansionChanged(isExpanded); - } - - protected void interactorExpansionChanged(boolean isInteractorExpanded) { - expandable.setExpanded(isInteractorExpanded); - expandable.setVisible(isInteractorExpanded); - - editPart.refresh(); - ((StructuredDataContentEditPart) editPart).setExpanded(!expandable - .isExpanded()); - expandChildrenLinesToMe(editPart, expandable.isExpanded()); - - EditPart root = editPart.getRoot(); - - if (root instanceof AbstractGraphicalEditPart) { - IFigure rootFigure = ((AbstractGraphicalEditPart) root).getFigure(); - invalidateAll(rootFigure); - rootFigure.validate(); - rootFigure.repaint(); - } - } - - private void expandChildrenLinesToMe(EditPart parentEditPart, - boolean expanded) { - List children = parentEditPart.getChildren(); - for (Iterator iter = children.iterator(); iter.hasNext();) { - Object child = iter.next(); - if (child instanceof StructuredDataContentEditPart) { - if (!expanded) { - ((StructuredDataContentEditPart) child).notifyExpand(editPart); - } else { - EditPart part = null; - if (((StructuredDataContentEditPart) parentEditPart).isExpanded()) { - StructuredDataContentEditPart finalEditPart = (StructuredDataContentEditPart)parentEditPart; - while(finalEditPart.isExpanded()){ - Object myParent = finalEditPart.getParent(); - part = finalEditPart; - if(myParent instanceof StructuredDataContentEditPart){ - finalEditPart = (StructuredDataContentEditPart)myParent; - } - } - } - ((StructuredDataContentEditPart) child).notifyExpand(part); - - } - if (!((StructuredDataContentEditPart) child).getChildren().isEmpty()) { - expandChildrenLinesToMe((StructuredDataContentEditPart) child, - expanded); - } - } - } - } - - protected void invalidateAll(IFigure figure) { - figure.invalidate(); - LayoutManager manager = figure.getLayoutManager(); - - if (manager != null) { - manager.invalidate(); - } - - for (Iterator i = figure.getChildren().iterator(); i.hasNext();) { - IFigure child = (IFigure) i.next(); - invalidateAll(child); - } - } - - public void mousePressed(MouseEvent me) { - boolean newExpansionState = !interactor.isExpanded(); - interactor.setExpanded(newExpansionState); - interactorExpansionChanged(newExpansionState); - } - - public void mouseReleased(MouseEvent me) { - } - - public void mouseDoubleClicked(MouseEvent me) { - } -} \ No newline at end of file Deleted: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/util/figures/ContainerLayout.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/util/figures/ContainerLayout.java 2008-10-21 03:41:10 UTC (rev 11024) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/util/figures/ContainerLayout.java 2008-10-21 03:42:46 UTC (rev 11025) @@ -1,247 +0,0 @@ -package org.jboss.tools.smooks.ui.gef.util.figures; - -import java.util.Iterator; -import java.util.List; - -import org.eclipse.draw2d.AbstractLayout; -import org.eclipse.draw2d.IFigure; -import org.eclipse.draw2d.PositionConstants; -import org.eclipse.draw2d.geometry.Dimension; -import org.eclipse.draw2d.geometry.Rectangle; -import org.jboss.tools.smooks.ui.gef.figures.IExpandable; -import org.jboss.tools.smooks.ui.gef.figures.SpacingFigure; -/** - * @deprecated - */ -public class ContainerLayout extends AbstractLayout { - protected boolean isHorizontal; - - private int align = PositionConstants.LEFT; - - protected int spacing = 0; - - protected int border = 0; - - public ContainerLayout() { - this(true, 0); - } - - public int getAlign() { - return align; - } - - public void setAlign(int align) { - this.align = align; - } - - public ContainerLayout(boolean isHorizontal, int spacing) { - this.isHorizontal = isHorizontal; - this.spacing = spacing; - } - - public void setHorizontal(boolean isHorizontal) { - this.isHorizontal = isHorizontal; - } - - public void setSpacing(int spacing) { - this.spacing = spacing; - } - - public void setBorder(int border) { - this.border = border; - } - - protected int alignFigure(IFigure parent, IFigure child) { - return -1; - } - - /** - * Calculates and returns the preferred size of the container given as - * input. - * - * @param figure - * Figure whose preferred size is required. - * @return The preferred size of the passed Figure. - */ - protected Dimension calculatePreferredSizeHelper(IFigure parent) { - Dimension preferred = new Dimension(); - List children = parent.getChildren(); - - for (int i = 0; i < children.size(); i++) { - IFigure child = (IFigure) children.get(i); - - Dimension childSize = child.getPreferredSize(); - - if (isHorizontal) { - preferred.width += childSize.width; - preferred.height = Math.max(preferred.height, childSize.height); - } else { - preferred.height += childSize.height; - preferred.width = Math.max(preferred.width, childSize.width); - } - } - - int childrenSize = children.size(); - if (childrenSize > 1) { - if (isHorizontal) { - preferred.width += spacing * (childrenSize - 1); - } else { - preferred.height += spacing * (childrenSize - 1); - } - } - - preferred.width += border * 2; - preferred.height += border * 2; - preferred.width += parent.getInsets().getWidth(); - preferred.height += parent.getInsets().getHeight(); - - return preferred; - } - - protected Dimension calculatePreferredSize(IFigure parent, int width, - int height) { - Dimension preferred = null; - - // Here we ensure that an unexpanded container is given a size of (0,0) - // - if (parent instanceof IExpandable) { - IExpandable expandableFigure = (IExpandable) parent; - if (!expandableFigure.isExpanded()) { - preferred = new Dimension(); - } - } - - if (preferred == null) { - preferred = calculatePreferredSizeHelper(parent); - } - - return preferred; - } - - protected void adjustLayoutLocation(IFigure parent, Dimension dimension) { - } - - public void layout(IFigure parent) { - List children = parent.getChildren(); - - int rx = 0; - - Dimension dimension = new Dimension(); - - for (int i = 0; i < children.size(); i++) { - IFigure child = (IFigure) children.get(i); - Dimension childSize = child.getPreferredSize(); - if (isHorizontal) { - dimension.height = Math.max(dimension.height, childSize.height); - rx += childSize.width; - } else { - dimension.width = Math.max(dimension.width, childSize.width); - } - } - - int tempwidth = rx; - - // dimension.width += parent.getInsets().left; - // dimension.height += parent.getInsets().top; - - if (isHorizontal) { - dimension.height += border * 2; - dimension.width += border; - } else { - dimension.width += border * 2; - dimension.height += border; - } - - - int maxChildWidth = 0; - for (Iterator iterator = children.iterator(); iterator.hasNext();) { - IFigure childf = (IFigure) iterator.next(); - maxChildWidth = Math.max(childf.getPreferredSize().width, maxChildWidth); - } - adjustLayoutLocation(parent, dimension); - // Add by DartPeng Jul 16 2008 - int myh = 0; -// if (isHorizontal && align == PositionConstants.RIGHT) { -// for (int i = children.size() - 1; i >= 0; i--) { -// IFigure child = (IFigure) children.get(i); -// Dimension childSize = child.getPreferredSize(); -// -// if (isHorizontal) { -// int y = -1; -// -// y = alignFigure(parent, child); -// -// if (y == -1) { -// y = (dimension.height - childSize.height) / 2; -// } -// myh += childSize.width; -// myh += spacing; -// Rectangle rectangle = new Rectangle( -// parent.getClientArea().width - myh, y, -// childSize.width, childSize.height); -// rectangle.translate(parent.getClientArea().getLocation()); -// -// child.setBounds(rectangle); -// dimension.width += childSize.width; -// dimension.width += spacing; -// if (child instanceof SpacingFigure) { -// int availableHorizontalSpace = parent.getClientArea().width -// - rx; -// dimension.width += availableHorizontalSpace; -// myh += availableHorizontalSpace; -// } -// } -// } -// return; -// } - - for (int i = 0; i < children.size(); i++) { - IFigure child = (IFigure) children.get(i); - Dimension childSize = child.getPreferredSize(); - - if (isHorizontal) { - int y = -1; - - y = alignFigure(parent, child); - - if (y == -1) { - y = (dimension.height - childSize.height) / 2; - } - - int adjust = dimension.width; - - Rectangle rectangle = new Rectangle(adjust, y, childSize.width, - childSize.height); - rectangle.translate(parent.getClientArea().getLocation()); - - child.setBounds(rectangle); - dimension.width += childSize.width; - dimension.width += spacing; - tempwidth -= childSize.width; - if (child instanceof SpacingFigure) { - int availableHorizontalSpace = parent.getClientArea().width - - rx; - dimension.width += availableHorizontalSpace; - tempwidth -= availableHorizontalSpace; - } - } else { - int adjust = 0; - // Modify by Dart 2008.7.17 -// switch (this.align) { -// case PositionConstants.LEFT: -// break; -// case PositionConstants.RIGHT: -// adjust = parent.getClientArea().width - dimension.width; -// } - - Rectangle rectangle = new Rectangle(adjust, dimension.height, - maxChildWidth, childSize.height); - rectangle.translate(parent.getClientArea().getLocation()); - - child.setBounds(rectangle); - dimension.height += childSize.height; - dimension.height += spacing; - } - } - } -} \ No newline at end of file Deleted: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/util/figures/FillLayout.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/util/figures/FillLayout.java 2008-10-21 03:41:10 UTC (rev 11024) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/util/figures/FillLayout.java 2008-10-21 03:42:46 UTC (rev 11025) @@ -1,138 +0,0 @@ -package org.jboss.tools.smooks.ui.gef.util.figures; - -import java.util.Iterator; -import java.util.List; - -import org.eclipse.draw2d.AbstractLayout; -import org.eclipse.draw2d.IFigure; -import org.eclipse.draw2d.geometry.Dimension; -import org.eclipse.draw2d.geometry.Rectangle; - -/** - * @deprecated - * @author dart - * - */ -public class FillLayout extends AbstractLayout { - - protected boolean isHorizontal = false; - - protected int spacing = 0; - - public Dimension min; - - public FillLayout() { - } - - public FillLayout(int spacing) { - this.spacing = spacing; - } - - public void setHorizontal(boolean isHorizontal) { - this.isHorizontal = isHorizontal; - } - - /** - * Calculates and returns the preferred size of the input container. This is - * the size of the largest child of the container, as all other children fit - * into this size. - * - * @param figure - * Container figure for which preferred size is required. - * @return The preferred size of the input figure. - */ - - protected Dimension calculatePreferredSize(IFigure figure, int width, - int height) { - Dimension d = calculatePreferredClientAreaSize(figure); - d.expand(figure.getInsets().getWidth(), figure.getInsets().getHeight()); - d.union(getBorderPreferredSize(figure)); - return d; - } - - protected Dimension calculatePreferredClientAreaSize(IFigure figure) { - Dimension d = new Dimension(); - List children = figure.getChildren(); - - for (Iterator i = children.iterator(); i.hasNext();) { - IFigure child = (IFigure) i.next(); - Dimension childSize = child.getPreferredSize(); - - if (isHorizontal) { - d.width += childSize.width; - d.height = Math.max(childSize.height, d.height); - } else { - d.height += childSize.height; - d.width = Math.max(childSize.width, d.width); - } - } - - int childrenSize = children.size(); - if (childrenSize > 0) { - if (isHorizontal) { - d.width += spacing * (childrenSize - 1); - } else { - d.height += spacing * (childrenSize - 1); - } - } - - if (min != null) { - d.width = Math.max(d.width, min.width); - d.height = Math.max(d.height, min.height); - } - return d; - } - - /* - * Returns the minimum size required by the input container. This is the - * size of the largest child of the container, as all other children fit - * into this size. - */ - public Dimension getMinimumSize(IFigure figure, int width, int height) { - Dimension d = new Dimension(); - List children = figure.getChildren(); - IFigure child; - - for (int i = 0; i < children.size(); i++) { - child = (IFigure) children.get(i); - d.union(child.getMinimumSize()); - } - d.expand(figure.getInsets().getWidth(), figure.getInsets().getHeight()); - return d; - } - - public Dimension getPreferredSize(IFigure figure, int width, int height) { - return calculatePreferredSize(figure, width, height); - } - - /* - * Lays out the children on top of each other with their sizes equal to that - * of the available paintable area of the input container figure. - */ - public void layout(IFigure figure) { - Dimension preferredSize = calculatePreferredClientAreaSize(figure); - Rectangle r = figure.getClientArea().getCopy(); - List children = figure.getChildren(); - - int nChildren = children.size(); - int extraHorizontalSpace = r.width - preferredSize.width; - - for (Iterator i = children.iterator(); i.hasNext();) { - IFigure child = (IFigure) i.next(); - Dimension preferredChildSize = child.getPreferredSize(); - - if (isHorizontal) { - int w = preferredChildSize.width - + (extraHorizontalSpace / nChildren); - child.setBounds(new Rectangle(r.x, r.y, w, Math.max( - preferredSize.height, r.height))); - r.x += w + spacing; - } else { - child.setBounds(new Rectangle(r.x, r.y, Math.max( - preferredSize.width, r.width), - preferredChildSize.height)); - r.y += preferredChildSize.height + spacing; - } - } - } -} Deleted: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/util/figures/IConnectedFigure.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/util/figures/IConnectedFigure.java 2008-10-21 03:41:10 UTC (rev 11024) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/util/figures/IConnectedFigure.java 2008-10-21 03:42:46 UTC (rev 11025) @@ -1,10 +0,0 @@ -package org.jboss.tools.smooks.ui.gef.util.figures; - -import org.eclipse.draw2d.IFigure; -/** - * @deprecated - * - */ -public interface IConnectedFigure extends IFigure { - public IFigure getConnectionFigure(); -} Deleted: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/util/figures/Interactor.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/util/figures/Interactor.java 2008-10-21 03:41:10 UTC (rev 11024) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/util/figures/Interactor.java 2008-10-21 03:42:46 UTC (rev 11025) @@ -1,41 +0,0 @@ -package org.jboss.tools.smooks.ui.gef.util.figures; - -import org.eclipse.draw2d.Graphics; -import org.eclipse.draw2d.RectangleFigure; -import org.eclipse.draw2d.geometry.Dimension; -import org.eclipse.draw2d.geometry.Rectangle; - -/** - * @deprecated - */ -public class Interactor extends RectangleFigure { - - protected boolean isExpanded = true; - - public Interactor() { - super(); - setPreferredSize(new Dimension(9, 9)); - } - - public void setExpanded(boolean isExpanded) { - this.isExpanded = isExpanded; - repaint(); - } - - public boolean isExpanded() { - return isExpanded; - } - - protected void fillShape(Graphics g) { - super.fillShape(g); - Rectangle r = getBounds(); - int mx = r.x + r.width / 2; - int my = r.y + r.height / 2; - int s = 2; - g.drawLine(r.x + s, my, r.x + r.width - s - 1, my); - - if (!isExpanded) { - g.drawLine(mx, r.y + s, mx, r.y + r.height - s - 1); - } - } -} \ No newline at end of file Deleted: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/util/figures/Placeholder.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/util/figures/Placeholder.java 2008-10-21 03:41:10 UTC (rev 11024) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/util/figures/Placeholder.java 2008-10-21 03:42:46 UTC (rev 11025) @@ -1,17 +0,0 @@ -package org.jboss.tools.smooks.ui.gef.util.figures; - -import org.eclipse.draw2d.RectangleFigure; -import org.eclipse.draw2d.geometry.Dimension; - -/** - * @deprecated - * - */ -public class Placeholder extends RectangleFigure { - - public Placeholder() { - super(); - setPreferredSize(new Dimension(9, 9)); - this.setVisible(false); - } -}

17 years, 2 months

1
0
0 / 0

JBoss Tools SVN: r11024 - in branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui: src/org/jboss/tools/smooks/ui/gef/commands and 5 other directories.

by jbosstools-commits＠lists.jboss.org

Author: DartPeng Date: 2008-10-20 23:41:10 -0400 (Mon, 20 Oct 2008) New Revision: 11024 Removed: branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/commands/ChangeConstraintCommand.java branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/editparts/HiddenEditPart.java branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/editparts/StructuredDataContentEditPart.java branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/editparts/StructuredDataEditPart.java branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/figures/ConnectionPointFiguresLocationCaculator.java branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/figures/ContainerBoxFigure.java branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/figures/ContainerFigure.java branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/figures/ContainerLeftEdgeAnchor.java branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/figures/ContainerRightEdgeAnchor.java branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/figures/ExpandableGraphNodeContentFigure.java branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/figures/GraphNodeContentFigure.java branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/figures/GroupFigure.java branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/figures/IExpandable.java branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/figures/ITreeContainer.java branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/figures/IconAreaFigure.java branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/figures/LabelAreaFigure.java branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/figures/RightAlignContainerLayout.java branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/figures/RoundedLineBorder.java branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/figures/SourceConnectionDecoration.java branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/figures/SpacingFigure.java branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/figures/TreeNodeContentFigure.java branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/model/DataObjectContainerModel.java branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/model/HiddenAreaModel.java branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/policy/NodeSelectionHandlesEditPolicyImpl.java branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/util/editparts/ branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/util/figures/ Modified: branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/META-INF/MANIFEST.MF branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/commands/CreateStructuredDataModelCommand.java branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/editparts/SmooksEditPartFactory.java branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/policy/RootGraphicsXYLayoutEditPolicy.java Log: JBIDE-2942 Delete some needless codes Modified: branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/META-INF/MANIFEST.MF =================================================================== --- branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/META-INF/MANIFEST.MF 2008-10-20 23:12:16 UTC (rev 11023) +++ branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/META-INF/MANIFEST.MF 2008-10-21 03:41:10 UTC (rev 11024) @@ -49,8 +49,6 @@ org.jboss.tools.smooks.ui.gef.policy, org.jboss.tools.smooks.ui.gef.tools, org.jboss.tools.smooks.ui.gef.util, - org.jboss.tools.smooks.ui.gef.util.editparts, - org.jboss.tools.smooks.ui.gef.util.figures, org.jboss.tools.smooks.ui.modelparser, org.jboss.tools.smooks.ui.wizards, org.jboss.tools.smooks.utils, Deleted: branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/commands/ChangeConstraintCommand.java =================================================================== --- branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/commands/ChangeConstraintCommand.java 2008-10-20 23:12:16 UTC (rev 11023) +++ branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/commands/ChangeConstraintCommand.java 2008-10-21 03:41:10 UTC (rev 11024) @@ -1,85 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 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 - * - * Contributors: - * Red Hat, Inc. - initial API and implementation - ******************************************************************************/ -package org.jboss.tools.smooks.ui.gef.commands; - -import org.eclipse.draw2d.geometry.Rectangle; -import org.eclipse.gef.commands.Command; -import org.jboss.tools.smooks.ui.gef.model.IGraphicalModel; - -/** - * @deprecated - * @author Dart Peng - * - */ -public class ChangeConstraintCommand extends Command { - Rectangle constraint = null; - - IGraphicalModel graphicalModel = null; - - /** - * @return the graphicalModel - */ - public IGraphicalModel getGraphicalModel() { - return graphicalModel; - } - - /** - * @param graphicalModel the graphicalModel to set - */ - public void setGraphicalModel(IGraphicalModel graphicalModel) { - this.graphicalModel = graphicalModel; - } - - Rectangle prevConstraint = null; - - /** - * @return the constraint - */ - public Rectangle getConstraint() { - return constraint; - } - - /** - * @param constraint - * the constraint to set - */ - public void setConstraint(Rectangle constraint) { - this.constraint = constraint; - } - - @Override - public void execute() { - if (constraint != null && graphicalModel != null) { - graphicalModel.setConstraint(constraint); - } - } - - /* (non-Javadoc) - * @see org.eclipse.gef.commands.Command#redo() - */ - @Override - public void redo() { - // TODO Auto-generated method stub - super.redo(); - } - - /* (non-Javadoc) - * @see org.eclipse.gef.commands.Command#undo() - */ - @Override - public void undo() { - // TODO Auto-generated method stub - super.undo(); - } - - - -} Modified: branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/commands/CreateStructuredDataModelCommand.java =================================================================== --- branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/commands/CreateStructuredDataModelCommand.java 2008-10-20 23:12:16 UTC (rev 11023) +++ branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/commands/CreateStructuredDataModelCommand.java 2008-10-21 03:41:10 UTC (rev 11024) @@ -22,6 +22,7 @@ * @author Dart Peng * * @CreateTime Jul 22, 2008 + * @deprecated */ public class CreateStructuredDataModelCommand extends Command { private AbstractStructuredDataModel parent; Deleted: branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/editparts/HiddenEditPart.java =================================================================== --- branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/editparts/HiddenEditPart.java 2008-10-20 23:12:16 UTC (rev 11023) +++ branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/editparts/HiddenEditPart.java 2008-10-21 03:41:10 UTC (rev 11024) @@ -1,57 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 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 - * - * Contributors: - * Red Hat, Inc. - initial API and implementation - ******************************************************************************/ -package org.jboss.tools.smooks.ui.gef.editparts; - -import org.eclipse.draw2d.Figure; -import org.eclipse.draw2d.IFigure; -import org.eclipse.draw2d.geometry.Dimension; -import org.eclipse.gef.editparts.AbstractGraphicalEditPart; - -/** - * @author Dart Peng - * - */ -public class HiddenEditPart extends AbstractGraphicalEditPart { - - /* (non-Javadoc) - * @see org.eclipse.gef.editparts.AbstractGraphicalEditPart#createFigure() - */ - @Override - protected IFigure createFigure() { - Figure figure = new Figure(){ - - @Override - public Dimension getPreferredSize(int hint, int hint2) { - // TODO Auto-generated method stub - return new Dimension(200,300); - } - - @Override - public Dimension getMaximumSize() { - // TODO Auto-generated method stub - return new Dimension(100,300); - } - - - - }; - return figure; - } - - /* (non-Javadoc) - * @see org.eclipse.gef.editparts.AbstractEditPart#createEditPolicies() - */ - @Override - protected void createEditPolicies() { - - } - -} Modified: branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/editparts/SmooksEditPartFactory.java =================================================================== --- branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/editparts/SmooksEditPartFactory.java 2008-10-20 23:12:16 UTC (rev 11023) +++ branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/editparts/SmooksEditPartFactory.java 2008-10-21 03:41:10 UTC (rev 11024) @@ -3,12 +3,8 @@ import org.eclipse.gef.EditPart; import org.eclipse.gef.EditPartFactory; import org.jboss.tools.smooks.ui.gef.model.GraphRootModel; -import org.jboss.tools.smooks.ui.gef.model.HiddenAreaModel; import org.jboss.tools.smooks.ui.gef.model.LineConnectionModel; -import org.jboss.tools.smooks.ui.gef.model.RootModel; import org.jboss.tools.smooks.ui.gef.model.SourceModel; -import org.jboss.tools.smooks.ui.gef.model.StructuredDataContentModel; -import org.jboss.tools.smooks.ui.gef.model.StructuredDataModel; import org.jboss.tools.smooks.ui.gef.model.TargetModel; /** @@ -25,8 +21,9 @@ /* * (non-Javadoc) * - * @see org.eclipse.gef.EditPartFactory#createEditPart(org.eclipse.gef.EditPart, - * java.lang.Object) + * @see + * org.eclipse.gef.EditPartFactory#createEditPart(org.eclipse.gef.EditPart, + * java.lang.Object) */ public EditPart createEditPart(EditPart context, Object model) { EditPart part = getPartForElement(model); @@ -43,15 +40,7 @@ */ private EditPart getPartForElement(Object modelElement) { - if (modelElement instanceof RootModel) { - return new RootModelEditPart(); - } else if (modelElement instanceof HiddenAreaModel) { - return new HiddenEditPart(); - } else if (modelElement instanceof StructuredDataModel) { - return new StructuredDataEditPart(); - } else if (modelElement instanceof StructuredDataContentModel) { - return new StructuredDataContentEditPart(); - } else if (modelElement instanceof LineConnectionModel) { + if (modelElement instanceof LineConnectionModel) { return new StructuredDataConnectionEditPart(); } else if (modelElement instanceof GraphRootModel) { return new RootModelEditPart(); Deleted: branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/editparts/StructuredDataContentEditPart.java =================================================================== --- branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/editparts/StructuredDataContentEditPart.java 2008-10-20 23:12:16 UTC (rev 11023) +++ branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/editparts/StructuredDataContentEditPart.java 2008-10-21 03:41:10 UTC (rev 11024) @@ -1,267 +0,0 @@ -package org.jboss.tools.smooks.ui.gef.editparts; - -import java.beans.PropertyChangeEvent; -import java.util.Collections; -import java.util.Iterator; -import java.util.List; - -import org.eclipse.draw2d.ColorConstants; -import org.eclipse.draw2d.ConnectionAnchor; -import org.eclipse.draw2d.IFigure; -import org.eclipse.draw2d.Label; -import org.eclipse.draw2d.MarginBorder; -import org.eclipse.draw2d.PositionConstants; -import org.eclipse.draw2d.RectangleFigure; -import org.eclipse.draw2d.geometry.Dimension; -import org.eclipse.draw2d.geometry.Rectangle; -import org.eclipse.gef.ConnectionEditPart; -import org.eclipse.gef.EditPart; -import org.eclipse.gef.EditPolicy; -import org.eclipse.gef.GraphicalEditPart; -import org.eclipse.gef.Request; -import org.eclipse.gef.editparts.AbstractConnectionEditPart; -import org.eclipse.swt.graphics.Color; -import org.jboss.tools.smooks.ui.gef.figures.ContainerFigure; -import org.jboss.tools.smooks.ui.gef.figures.ContainerLeftEdgeAnchor; -import org.jboss.tools.smooks.ui.gef.figures.ContainerRightEdgeAnchor; -import org.jboss.tools.smooks.ui.gef.figures.LabelAreaFigure; -import org.jboss.tools.smooks.ui.gef.figures.TreeNodeContentFigure; -import org.jboss.tools.smooks.ui.gef.model.AbstractStructuredDataModel; -import org.jboss.tools.smooks.ui.gef.model.StructuredDataContentModel; -import org.jboss.tools.smooks.ui.gef.policy.ConnectFeedbackEditPolicy; -import org.jboss.tools.smooks.ui.gef.policy.CustomGraphicalNodeEditPolicy; -import org.jboss.tools.smooks.ui.gef.policy.NonResizableSelectionEditPolicy; -import org.jboss.tools.smooks.ui.gef.util.GraphicsConstants; -import org.jboss.tools.smooks.ui.gef.util.LeftSourceAnchor; -import org.jboss.tools.smooks.ui.gef.util.RightSourceAnchor; -import org.jboss.tools.smooks.ui.gef.util.editparts.InteractorHelper; -import org.jboss.tools.smooks.ui.gef.util.figures.Interactor; -import org.jboss.tools.smooks.ui.gef.util.figures.Placeholder; - -/** - * - * @author Dart Peng - * - */ -public class StructuredDataContentEditPart extends - AbstractStructuredDataEditPart implements GraphicsConstants, - IConnectableEditPart { - - protected static final Color label2ForegroundColor = new Color(null, 82, - 82, 158); - - protected Label propertyName; - protected Label javaTypeLabel; - protected ContainerFigure labelHolder = new ContainerFigure(); - protected TreeNodeContentFigure contentFigure; - protected InteractorHelper interactorHelper; - protected boolean isExpanded = false; - - private EditPart expandPart; - - public void propertyChange(PropertyChangeEvent event) { - - if (event.getPropertyName().equals( - StructuredDataContentModel.P_SOURCE_CONNECTION)) { - refreshSourceConnections(); - } else if (event.getPropertyName().equals( - StructuredDataContentModel.P_TARGET_CONNECTION)) { - refreshTargetConnections(); - } - } - - public IFigure getContentPane() { - return contentFigure.getInnerContentArea(); - } - - protected IFigure createFigure() { - createContentFigure(); - createFigureContent(); - return contentFigure; - } - - protected void createEditPolicies() { - installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, - new CustomGraphicalNodeEditPolicy()); - installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, - new NonResizableSelectionEditPolicy()); - installEditPolicy("CONNECTION_FEED_BACK", new ConnectFeedbackEditPolicy()); - } - - protected void createContentFigure() { - contentFigure = new TreeNodeContentFigure(); - contentFigure.setFill(true); - } - - protected void createFigureContent() { - - StructuredDataContentModel model = (StructuredDataContentModel) getModel(); - - // add a bit of space between the interactor and icon - // - - RectangleFigure space = new RectangleFigure(); - space.setVisible(false); - space.setPreferredSize(new Dimension(5, 5)); - - labelHolder = new LabelAreaFigure(); - labelHolder.setFill(true); - - IFigure interactor = null; - - if (model.getChildren() != null - && !model.getChildren().equals(Collections.EMPTY_LIST)) { - - interactor = new Interactor(); - interactor.setBorder(new MarginBorder(0, 0, 0, 5)); - interactor.setForegroundColor(ColorConstants.black); - interactor.setBackgroundColor(ColorConstants.white); - } else { - interactor = new Placeholder(); - interactor.setBorder(new MarginBorder(0, 0, 0, 5)); - interactor.setForegroundColor(ColorConstants.white); - } - - // contentFigure.getIconArea().getContainerLayout().setAlign( - // PositionConstants.RIGHT); - //contentFigure.getIconArea().getContainerLayout().setHorizontal(false); - if (!((AbstractStructuredDataModel) getModel()).isLeft()) { - contentFigure.getIconArea().getContainerLayout().setAlign( - PositionConstants.RIGHT); - contentFigure.getIconArea().add(space); - contentFigure.getIconArea().add(labelHolder); - contentFigure.setInteractor(interactor); - } else { - contentFigure.getIconArea().getContainerLayout().setAlign( - PositionConstants.LEFT); - contentFigure.setInteractor(interactor); - contentFigure.getIconArea().add(space); - contentFigure.getIconArea().add(labelHolder); - } - - propertyName = new Label(model.getLabelName()); - propertyName.setForegroundColor(ColorConstants.black); -// propertyName.setTextAlignment(PositionConstants.RIGHT); - // propertyName.setBackgroundColor(ColorConstants.red); - // propertyName.setOpaque(true); - - // if ( model.isRootNode() ) { - // propertyName.setIcon(SDPlugin.getImageDescriptor(IImagePaths. - // IMAGE_XSD_ALL).createImage()); - // } else if ( model.isListType() ) { - // propertyName.setIcon(SDPlugin.getImageDescriptor(IImagePaths. - // IMAGE_XSD_CHOICE).createImage()); - // } else if ( !model.isListType() && model.isComplexType() ) { - // propertyName.setIcon(SDPlugin.getImageDescriptor(IImagePaths. - // IMAGE_XSD_COMPLEX_TYPE).createImage()); - // } else if ( !model.isListType() && !model.isComplexType() ) { - // propertyName.setIcon(SDPlugin.getImageDescriptor(IImagePaths. - // IMAGE_XSD_SIMPLE_TYPE).createImage()); - // } - // contentFigure.getIconArea().setFill(true); - // contentFigure.getIconArea().setBackgroundColor(ColorConstants.black); - labelHolder.add(propertyName); - - if (model.getChildren() != null - && !model.getChildren().equals(Collections.EMPTY_LIST)) { - interactorHelper = new InteractorHelper(this, contentFigure - .getInteractor(), contentFigure.getInnerContentArea()); - } - - javaTypeLabel = new Label(); - javaTypeLabel.setBorder(new MarginBorder(0, 5, 0, 0)); - javaTypeLabel.setForegroundColor(label2ForegroundColor); - // javaTypeLabel.setIcon(SDPlugin.getImageDescriptor( - // "icons/XSDSimpleType.gif").createImage()); - - if (model.getTypeString() != null) { - javaTypeLabel.setText("- (" + model.getTypeString() + ")"); - } - labelHolder.add(javaTypeLabel); - } - - protected void refreshVisuals() { - Rectangle constraint = ((StructuredDataContentModel) getModel()) - .getConstraint(); - - ((GraphicalEditPart) getParent()).setLayoutConstraint(this, - getFigure(), constraint); - - super.refreshVisuals(); - } - - public void notifyExpand(EditPart part) { - expandPart = part; - List sourceConnections = this.getSourceConnections(); - for (Iterator iter = sourceConnections.iterator(); iter.hasNext();) { - AbstractConnectionEditPart sourceC = (AbstractConnectionEditPart) iter - .next(); - sourceC.refresh(); - } - List targetConnections = this.getTargetConnections(); - for (Iterator iter = targetConnections.iterator(); iter.hasNext();) { - AbstractConnectionEditPart sourceC = (AbstractConnectionEditPart) iter - .next(); - sourceC.refresh(); - } - - } - - public IFigure getSelectionFigure() { - return ((TreeNodeContentFigure) getFigure()).getIconArea(); - } - - public IFigure getAnchroFigure() { - if (expandPart == null) - return ((TreeNodeContentFigure) getFigure()).getIconArea(); - - if (expandPart instanceof StructuredDataContentEditPart) { - IFigure figure = ((StructuredDataContentEditPart) expandPart) - .getFigure(); - if (figure instanceof TreeNodeContentFigure) { - return ((TreeNodeContentFigure) figure).getIconArea(); - } - } - return ((GraphicalEditPart) expandPart).getFigure(); - } - - protected List getModelChildren() { - return ((AbstractStructuredDataModel) getModel()).getChildren(); - } - - public ConnectionAnchor getSourceConnectionAnchor( - ConnectionEditPart connection) { - return new ContainerRightEdgeAnchor(getAnchroFigure()); - } - - public ConnectionAnchor getTargetConnectionAnchor( - ConnectionEditPart connection) { - return new ContainerLeftEdgeAnchor(getAnchroFigure()); - } - - public ConnectionAnchor getSourceConnectionAnchor(Request request) { - return new RightSourceAnchor(getAnchroFigure()); - } - - public ConnectionAnchor getTargetConnectionAnchor(Request request) { - return new LeftSourceAnchor(getAnchroFigure()); - } - - public List getModelSourceConnections() { - return ((StructuredDataContentModel) getModel()) - .getModelSourceConnections(); - } - - public List getModelTargetConnections() { - return ((StructuredDataContentModel) getModel()) - .getModelTargetConnections(); - } - - public boolean isExpanded() { - return isExpanded; - } - - public void setExpanded(boolean isExpanded) { - this.isExpanded = isExpanded; - } -} \ No newline at end of file Deleted: branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/editparts/StructuredDataEditPart.java =================================================================== --- branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/editparts/StructuredDataEditPart.java 2008-10-20 23:12:16 UTC (rev 11023) +++ branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/editparts/StructuredDataEditPart.java 2008-10-21 03:41:10 UTC (rev 11024) @@ -1,274 +0,0 @@ -package org.jboss.tools.smooks.ui.gef.editparts; - -import java.beans.PropertyChangeEvent; -import java.util.List; - -import org.eclipse.draw2d.ColorConstants; -import org.eclipse.draw2d.ConnectionAnchor; -import org.eclipse.draw2d.Graphics; -import org.eclipse.draw2d.IFigure; -import org.eclipse.draw2d.Label; -import org.eclipse.draw2d.MarginBorder; -import org.eclipse.draw2d.PositionConstants; -import org.eclipse.draw2d.RectangleFigure; -import org.eclipse.draw2d.ScrollPane; -import org.eclipse.draw2d.Viewport; -import org.eclipse.draw2d.ViewportLayout; -import org.eclipse.draw2d.geometry.Dimension; -import org.eclipse.draw2d.geometry.Rectangle; -import org.eclipse.gef.ConnectionEditPart; -import org.eclipse.gef.EditPolicy; -import org.eclipse.gef.GraphicalEditPart; -import org.eclipse.gef.Request; -import org.eclipse.gef.commands.Command; -import org.eclipse.gef.editpolicies.ContainerEditPolicy; -import org.eclipse.gef.requests.CreateRequest; -import org.jboss.tools.smooks.ui.gef.figures.ContainerBoxFigure; -import org.jboss.tools.smooks.ui.gef.figures.ContainerFigure; -import org.jboss.tools.smooks.ui.gef.figures.ContainerLeftEdgeAnchor; -import org.jboss.tools.smooks.ui.gef.figures.ContainerRightEdgeAnchor; -import org.jboss.tools.smooks.ui.gef.figures.RoundedLineBorder; -import org.jboss.tools.smooks.ui.gef.model.AbstractStructuredDataModel; -import org.jboss.tools.smooks.ui.gef.model.IConnectableModel; -import org.jboss.tools.smooks.ui.gef.model.StructuredDataContentModel; -import org.jboss.tools.smooks.ui.gef.model.StructuredDataModel; -import org.jboss.tools.smooks.ui.gef.policy.CustomGraphicalNodeEditPolicy; -import org.jboss.tools.smooks.ui.gef.util.GraphicsConstants; -import org.jboss.tools.smooks.ui.gef.util.LeftSourceAnchor; -import org.jboss.tools.smooks.ui.gef.util.RightSourceAnchor; -import org.jboss.tools.smooks.ui.gef.util.figures.ContainerLayout; -import org.jboss.tools.smooks.ui.gef.util.figures.FillLayout; - -/** - * - */ -public class StructuredDataEditPart extends AbstractStructuredDataEditPart - implements GraphicsConstants, IConnectableEditPart { - - protected ScrollPane scrollpane; - protected Label label; - protected ContainerFigure outerPane; - - public IFigure getContentPane() { - return scrollpane.getContents(); - } - - /* - * (non-Javadoc) - * - * @seejava.beans.PropertyChangeListener#propertyChange(java.beans. - * PropertyChangeEvent) - */ - public void propertyChange(PropertyChangeEvent evt) { - String pname = evt.getPropertyName(); - if (AbstractStructuredDataModel.P_CHILDREN.equals(pname)) { - refreshChildren(); - } - if (AbstractStructuredDataModel.P_BOUNDS_CHANGE.equals(pname)) { - refresh(); - } - - if (StructuredDataContentModel.P_SOURCE_CONNECTION.equals(pname)) { - refreshSourceConnections(); - } else if (StructuredDataContentModel.P_TARGET_CONNECTION.equals(pname)) { - refreshTargetConnections(); - } - } - - /* - * (non-Javadoc) - * - * @see org.eclipse.gef.editparts.AbstractGraphicalEditPart#createFigure() - */ - protected IFigure createFigure() { - - AbstractStructuredDataModel model = (AbstractStructuredDataModel) getModel(); - - outerPane = new ContainerBoxFigure(); - outerPane.setMinimumSize(new Dimension(100, 100)); - outerPane.setBorder(new RoundedLineBorder(1, 5)); - outerPane.setForegroundColor(groupBorderColor); - outerPane.setFill(true); - outerPane.setBackgroundColor(ColorConstants.white); - ContainerFigure titleFigure = new ContainerFigure(){ - @Override - protected void fillShape(Graphics graphics) { - graphics.pushState(); - graphics.setForegroundColor(graphics.getBackgroundColor()); - graphics.setBackgroundColor(ColorConstants.white); - graphics.fillGradient(getBounds(), true); - graphics.popState(); - } - }; - // r.setCornerDimensions(new Dimension(4, 4)); - titleFigure.setOutline(false); - titleFigure.setMinimumSize(new Dimension(0, 0)); - - titleFigure.setFill(true); - - titleFigure.setBackgroundColor(groupHeaderColor); - outerPane.add(titleFigure); - - label = new Label(); - label.setForegroundColor(ColorConstants.black); - label.setBorder(new MarginBorder(2, 4, 2, 4)); - titleFigure.add(label); // Holder); - - RectangleFigure line = new RectangleFigure(); - line.setPreferredSize(20, 1); - outerPane.add(line); - - int minHeight = 400; - final int theMinHeight = minHeight; - FillLayout outerLayout = new FillLayout() { - protected Dimension calculatePreferredSize(IFigure parent, - int width, int height) { - Dimension d = super.calculatePreferredSize(parent, width, - height); - d.union(new Dimension(250, theMinHeight)); - return d; - } - }; - - outerLayout.setHorizontal(false); - // layout.setSpacing(5); - outerPane.setLayoutManager(outerLayout); - - scrollpane = new ScrollPane(); - scrollpane.setForegroundColor(ColorConstants.black); - scrollpane.setVerticalScrollBarVisibility(ScrollPane.AUTOMATIC); - scrollpane.setHorizontalScrollBarVisibility(ScrollPane.AUTOMATIC); - scrollpane.scrollHorizontalTo(scrollpane.getBounds().width / 2); - scrollpane.scrollVerticalTo(scrollpane.getBounds().height / 2); - outerPane.add(scrollpane); - - ContainerFigure pane = new ContainerFigure(); - pane.setBorder(new MarginBorder(5, 8, 5, 8)); - ContainerLayout layout = new ContainerLayout(); - layout.setHorizontal(false); - layout.setSpacing(0); - AbstractStructuredDataModel currentModel = (AbstractStructuredDataModel) this - .getModel(); - if (!currentModel.isLeft()) { - layout.setAlign(PositionConstants.RIGHT); - } - pane.setLayoutManager(layout); - // pane.setBackgroundColor(ColorConstants.black); - // pane.setFill(true); - - Viewport viewport = new Viewport(); - viewport.setContentsTracksHeight(true); - ViewportLayout viewportLayout = new ViewportLayout() { - protected Dimension calculatePreferredSize(IFigure parent, - int width, int height) { - Dimension d = super.calculatePreferredSize(parent, width, - height); - d.height = Math.min(d.height, theMinHeight - 25); - return d; - } - }; - - viewport.setLayoutManager(viewportLayout); - - scrollpane.setViewport(viewport); - scrollpane.setContents(pane); - if (model instanceof StructuredDataModel) { - label.setText(((StructuredDataModel) model).getLabelName()); - } - return outerPane; - } - - /* - * (non-Javadoc) - * - * @see org.eclipse.gef.editparts.AbstractEditPart#createEditPolicies() - */ - protected void createEditPolicies() { - this.installEditPolicy(EditPolicy.CONTAINER_ROLE, - new ContainerEditPolicy() { - - @Override - protected Command getCreateCommand(CreateRequest arg0) { - return null; - } - - }); - - this.installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, - new CustomGraphicalNodeEditPolicy()); - - } - - /* - * (non-Javadoc) - * - * @see - * org.eclipse.gef.editparts.AbstractGraphicalEditPart#getModelSourceConnections - * () - */ - @Override - protected List getModelSourceConnections() { - return ((IConnectableModel) getModel()).getModelSourceConnections(); - } - - /* - * (non-Javadoc) - * - * @see - * org.eclipse.gef.editparts.AbstractGraphicalEditPart#getModelTargetConnections - * () - */ - @Override - protected List getModelTargetConnections() { - return ((IConnectableModel) getModel()).getModelTargetConnections(); - } - - /* - * (non-Javadoc) - * - * @see org.eclipse.gef.editparts.AbstractEditPart#getModelChildren() - */ - protected List getModelChildren() { - return ((AbstractStructuredDataModel) getModel()).getChildren(); - } - - /* - * (non-Javadoc) - * - * @see org.eclipse.gef.editparts.AbstractEditPart#refreshVisuals() - */ - protected void refreshVisuals() { - Rectangle constraint = null; - AbstractStructuredDataModel model = (AbstractStructuredDataModel) getModel(); - - if (model instanceof StructuredDataModel) { - constraint = ((StructuredDataModel) model).getConstraint(); - } - if (constraint == null) - constraint = new Rectangle(0, 0, -1, -1); - ((GraphicalEditPart) getParent()).setLayoutConstraint(this, - getFigure(), constraint); - - super.refreshVisuals(); - } - - public ConnectionAnchor getSourceConnectionAnchor(ConnectionEditPart arg0) { - return new ContainerRightEdgeAnchor(label); - } - - public ConnectionAnchor getSourceConnectionAnchor(Request arg0) { - return new RightSourceAnchor(label); - } - - public ConnectionAnchor getTargetConnectionAnchor(ConnectionEditPart arg0) { - return new ContainerLeftEdgeAnchor(label); - } - - public ConnectionAnchor getTargetConnectionAnchor(Request arg0) { - return new LeftSourceAnchor(label); - } - - public IFigure getAnchroFigure() { - return label; - } -} \ No newline at end of file Deleted: branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/figures/ConnectionPointFiguresLocationCaculator.java =================================================================== --- branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/figures/ConnectionPointFiguresLocationCaculator.java 2008-10-20 23:12:16 UTC (rev 11023) +++ branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/figures/ConnectionPointFiguresLocationCaculator.java 2008-10-21 03:41:10 UTC (rev 11024) @@ -1,19 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2008 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 - * - * Contributors: - * Red Hat, Inc. - initial API and implementation - ******************************************************************************/ -package org.jboss.tools.smooks.ui.gef.figures; - -/** - * @author Dart Peng - * @Date Jul 30, 2008 - */ -public class ConnectionPointFiguresLocationCaculator { - int itemY = 0; -} Deleted: branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/figures/ContainerBoxFigure.java =================================================================== --- branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/figures/ContainerBoxFigure.java 2008-10-20 23:12:16 UTC (rev 11023) +++ branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/figures/ContainerBoxFigure.java 2008-10-21 03:41:10 UTC (rev 11024) @@ -1,20 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 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 - * - * Contributors: - * Red Hat, Inc. - initial API and implementation - ******************************************************************************/ -package org.jboss.tools.smooks.ui.gef.figures; - -/** - * @author Dart Peng - * - */ -public class ContainerBoxFigure extends ContainerFigure implements - ITreeContainer { - -} Deleted: branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/figures/ContainerFigure.java =================================================================== --- branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/figures/ContainerFigure.java 2008-10-20 23:12:16 UTC (rev 11023) +++ branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/figures/ContainerFigure.java 2008-10-21 03:41:10 UTC (rev 11024) @@ -1,52 +0,0 @@ -package org.jboss.tools.smooks.ui.gef.figures; - -import org.eclipse.draw2d.Graphics; -import org.eclipse.draw2d.RectangleFigure; -import org.jboss.tools.smooks.ui.gef.util.figures.ContainerLayout; - - -public class ContainerFigure extends RectangleFigure implements IExpandable { - - protected boolean isOutlined = false; - - protected boolean isExpanded = true; - - public ContainerFigure() { - setLayoutManager(new ContainerLayout()); - setFill(false); - } - - public void doLayout() { - layout(); - setValid(true); - } - - public ContainerLayout getContainerLayout() { - return (ContainerLayout) getLayoutManager(); - } - - public void setOutlined(boolean isOutlined) { - this.isOutlined = isOutlined; - } - - protected void outlineShape(Graphics graphics) { - if (isOutlined) { - super.outlineShape(graphics); - } - } - - - - /* (non-Javadoc) - * @see org.eclipse.draw2d.RectangleFigure#fillShape(org.eclipse.draw2d.Graphics) - */ - - public boolean isExpanded() { - return isExpanded; - } - - public void setExpanded(boolean isExpanded) { - this.isExpanded = isExpanded; - } - -} \ No newline at end of file Deleted: branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/figures/ContainerLeftEdgeAnchor.java =================================================================== --- branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/figures/ContainerLeftEdgeAnchor.java 2008-10-20 23:12:16 UTC (rev 11023) +++ branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/figures/ContainerLeftEdgeAnchor.java 2008-10-21 03:41:10 UTC (rev 11024) @@ -1,62 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 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 - * - * Contributors: - * Red Hat, Inc. - initial API and implementation - ******************************************************************************/ -package org.jboss.tools.smooks.ui.gef.figures; - -import org.eclipse.draw2d.ChopboxAnchor; -import org.eclipse.draw2d.IFigure; -import org.eclipse.draw2d.geometry.Point; - -/** - * @author Dart Peng - * - */ -public class ContainerLeftEdgeAnchor extends ChopboxAnchor { - - public ContainerLeftEdgeAnchor(IFigure owner) { - super(owner); - } - - /* - * (non-Javadoc) - * - * @see - * org.eclipse.draw2d.ChopboxAnchor#getLocation(org.eclipse.draw2d.geometry - * .Point) - */ - @Override - public Point getLocation(Point reference) { - Point p; - IFigure figure = getOwner(); - IFigure parent = findTheTreeContainerFigure(figure); - // caculate the right edge of parent figure - if (parent == null) - return getOwner().getBounds().getLeft(); - p = getOwner().getBounds().getCenter(); - getOwner().translateToAbsolute(p); - p = getOwner().getBounds().getLeft(); - getOwner().translateToAbsolute(p); - return new Point(parent.getBounds().x , p.y); - } - - protected IFigure findTheTreeContainerFigure(IFigure figure) { - if (figure == null) - return null; - IFigure parent = figure.getParent(); - if (parent == null) - return null; - if (parent instanceof ITreeContainer) { - return parent; - } else { - return findTheTreeContainerFigure(parent); - } - } - -} Deleted: branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/figures/ContainerRightEdgeAnchor.java =================================================================== --- branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/figures/ContainerRightEdgeAnchor.java 2008-10-20 23:12:16 UTC (rev 11023) +++ branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/figures/ContainerRightEdgeAnchor.java 2008-10-21 03:41:10 UTC (rev 11024) @@ -1,62 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 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 - * - * Contributors: - * Red Hat, Inc. - initial API and implementation - ******************************************************************************/ -package org.jboss.tools.smooks.ui.gef.figures; - -import org.eclipse.draw2d.ChopboxAnchor; -import org.eclipse.draw2d.IFigure; -import org.eclipse.draw2d.geometry.Point; - -/** - * @author Dart Peng - * - */ -public class ContainerRightEdgeAnchor extends ChopboxAnchor { - - public ContainerRightEdgeAnchor(IFigure owner) { - super(owner); - } - - /* - * (non-Javadoc) - * - * @see - * org.eclipse.draw2d.ChopboxAnchor#getLocation(org.eclipse.draw2d.geometry - * .Point) - */ - @Override - public Point getLocation(Point reference) { - Point p; - IFigure figure = getOwner(); - IFigure parent = findTheTreeContainerFigure(figure); - // caculate the right edge of parent figure - if (parent == null) - return getOwner().getBounds().getRight(); - p = getOwner().getBounds().getCenter(); - getOwner().translateToAbsolute(p); - p = getOwner().getBounds().getRight(); - getOwner().translateToAbsolute(p); - return new Point(parent.getBounds().x + parent.getBounds().width, p.y); - } - - protected IFigure findTheTreeContainerFigure(IFigure figure) { - if (figure == null) - return null; - IFigure parent = figure.getParent(); - if (parent == null) - return null; - if (parent instanceof ITreeContainer) { - return parent; - } else { - return findTheTreeContainerFigure(parent); - } - } - -} Deleted: branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/figures/ExpandableGraphNodeContentFigure.java =================================================================== --- branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/figures/ExpandableGraphNodeContentFigure.java 2008-10-20 23:12:16 UTC (rev 11023) +++ branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/figures/ExpandableGraphNodeContentFigure.java 2008-10-21 03:41:10 UTC (rev 11024) @@ -1,73 +0,0 @@ -package org.jboss.tools.smooks.ui.gef.figures; - -import org.eclipse.draw2d.IFigure; -import org.eclipse.draw2d.MarginBorder; -import org.eclipse.draw2d.RectangleFigure; -import org.eclipse.draw2d.geometry.Dimension; -import org.jboss.tools.smooks.ui.gef.util.figures.Interactor; - - -//-------------------------------------------- -//| ExpandableGraphNodeContentFigure | -//| | -//| ---------------------------------- | -//| | verticalGroup | | -//| | | | -//| | ----------------------------- | | -//| | | horizontalGroup | | | -//| | | | | | -//| | | --------------------- | | | -//| | | | outlinedArea | | | | -//| | | | ----------------- | | | | -//| | | | |[+]iconArea | | | | | -//| | | | ----------------- | | | | -//| | | | ----------------- | | | | -//| | | | | innerContent | | | | | -//| | | | ----------------- | | | | -//| | | --------------------- | | | -//| | ----------------------------- | | -//| | | | -//| ---------------------------------- | -//-------------------------------------------- - -public class ExpandableGraphNodeContentFigure extends GraphNodeContentFigure { - - protected IFigure interactor; - - public ExpandableGraphNodeContentFigure() { - super(); - } - - public Interactor getInteractor() { - return (Interactor)interactor; - } - - protected void createFigure() { - createVerticalGroup(this); - createOutlinedArea(verticalGroup); -// createInteractor(iconArea); - innerContentArea.setBorder(new MarginBorder(0, 10, 0, 0)); - } - - protected void createInteractor(IFigure parent) { -// interactor = new Interactor(); -// interactor.setBorder(new MarginBorder(0, 0, 0, 5)); -// interactor.setForegroundColor(ColorConstants.black); -// interactor.setBackgroundColor(ColorConstants.white); -// parent.add(interactor); - } - - protected void createPreceedingSpace(IFigure parent) { - RectangleFigure space = new RectangleFigure(); - space.setVisible(false); - space.setPreferredSize(new Dimension(10, 10)); - parent.add(space); - } - - /** - */ - public void setInteractor(IFigure interactor) { - this.interactor = interactor; - iconArea.add(interactor); - } -} \ No newline at end of file Deleted: branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/figures/GraphNodeContentFigure.java =================================================================== --- branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/figures/GraphNodeContentFigure.java 2008-10-20 23:12:16 UTC (rev 11023) +++ branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/figures/GraphNodeContentFigure.java 2008-10-21 03:41:10 UTC (rev 11024) @@ -1,79 +0,0 @@ -package org.jboss.tools.smooks.ui.gef.figures; - -import org.eclipse.draw2d.IFigure; -import org.jboss.tools.smooks.ui.gef.util.figures.IConnectedFigure; - - -//------------------------------ -//| GraphNodeContentFigure | -//| | -//| ------------------------- | -//| | vertical group | | -//| | --------------------- | | -//| | | outlined area | | | -//| | | ----------------- | | | -//| | | | icon area | | | | -//| | | ----------------- | | | -//| | | ----------------- | | | -//| | | | inner content | | | | -//| | | ----------------- | | | -//| | --------------------- | | -//| ------------------------- | -//------------------------------ - -public class GraphNodeContentFigure extends ContainerFigure implements IConnectedFigure { - - protected ContainerFigure verticalGroup; - protected ContainerFigure outlinedArea; - protected ContainerFigure iconArea; - protected ContainerFigure innerContentArea; - - public GraphNodeContentFigure() { - createFigure(); - } - - public IFigure getConnectionFigure() { - return outlinedArea; - } - - public ContainerFigure getIconArea() { - return iconArea; - } - - public ContainerFigure getOutlinedArea() { - return outlinedArea; - } - - public ContainerFigure getInnerContentArea() { - return innerContentArea; - } - - protected void createFigure() { - createVerticalGroup(this); - createOutlinedArea(verticalGroup); - } - - protected void createVerticalGroup(IFigure parent) { - verticalGroup = new ContainerFigure(); - verticalGroup.getContainerLayout().setHorizontal(false); - parent.add(verticalGroup); - } - - protected void createOutlinedArea(IFigure parent) { - outlinedArea = new ContainerFigure(); - outlinedArea.getContainerLayout().setHorizontal(false); -// outlinedArea.setBackgroundColor(ColorConstants.red); -// outlinedArea.setFill(true); - parent.add(outlinedArea); - - iconArea = new IconAreaFigure(); - iconArea.getContainerLayout().setHorizontal(true); - outlinedArea.add(iconArea); - - innerContentArea = new ContainerFigure(); - innerContentArea.getContainerLayout().setHorizontal(false); -// innerContentArea.setBackgroundColor(ColorConstants.red); -// innerContentArea.setFill(true); - outlinedArea.add(innerContentArea); - } -} \ No newline at end of file Deleted: branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/figures/GroupFigure.java =================================================================== --- branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/figures/GroupFigure.java 2008-10-20 23:12:16 UTC (rev 11023) +++ branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/figures/GroupFigure.java 2008-10-21 03:41:10 UTC (rev 11024) @@ -1,153 +0,0 @@ -package org.jboss.tools.smooks.ui.gef.figures; - -import org.eclipse.draw2d.ColorConstants; -import org.eclipse.draw2d.IFigure; -import org.eclipse.draw2d.Label; -import org.eclipse.draw2d.MarginBorder; -import org.eclipse.draw2d.PositionConstants; -import org.eclipse.draw2d.RectangleFigure; -import org.eclipse.draw2d.ScrollPane; -import org.eclipse.draw2d.Viewport; -import org.eclipse.draw2d.ViewportLayout; -import org.eclipse.draw2d.geometry.Dimension; -import org.eclipse.swt.SWT; -import org.jboss.tools.smooks.ui.gef.util.GraphicsConstants; -import org.jboss.tools.smooks.ui.gef.util.figures.ContainerLayout; -import org.jboss.tools.smooks.ui.gef.util.figures.FillLayout; - - -//---------------------------------- -//| GroupFigure Head Area | -//| | -//| ----------------------------- | -//| | | | -//| | GroupFigure Client Area | | -//| | | | -//| | | | -//| | | | -//| | | | -//| | | | -//| | | | -//| ----------------------------- | -//---------------------------------- -public class GroupFigure extends RectangleFigure implements GraphicsConstants { - - private static final int DEFAULT_MIN_HEIGHT = 250; - - protected ScrollPane scrollpane; - /** - * Text Name - */ - protected Label label; - protected ContainerFigure outerPane; - - public GroupFigure() { - - FillLayout outerLayout = new FillLayout() { - protected Dimension calculatePreferredSize(IFigure parent, - int width, int height) { - Dimension d = super.calculatePreferredSize(parent, width, - height); - d.union(new Dimension(100, DEFAULT_MIN_HEIGHT)); - return d; - } - }; - setLayoutManager(outerLayout); - setFill(false); - createFigure(); - } - - public void doLayout() { - layout(); - setValid(true); - } - - public FillLayout getFillLayout() { - return (FillLayout)getLayoutManager(); - } - - protected void createFigure() { - outerPane = new ContainerFigure(); - outerPane.setBorder(new RoundedLineBorder(1, 6)); - outerPane.setForegroundColor(groupBorderColor); - - ContainerFigure r = new ContainerFigure(); - //r.setCornerDimensions(new Dimension(4, 4)); - r.setOutline(false); - r.setMinimumSize(new Dimension(0, 0)); - - r.setFill(true); - - r.setBackgroundColor(groupHeaderColor); - outerPane.add(r); - - //ContainerFigure labelHolder = new ContainerFigure(); - //labelHolder.add(label); - label = new Label(); - label.setForegroundColor(ColorConstants.black); - label.setBorder(new MarginBorder(2, 4, 2, 4)); - r.add(label); //Holder); -// label.setTextAlignment(PositionConstants.RIGHT); - RectangleFigure line = new RectangleFigure(); - line.setPreferredSize(20, 1); - outerPane.add(line); - - int minHeight = 250; - final int theMinHeight = minHeight; - FillLayout outerLayout = new FillLayout() { - protected Dimension calculatePreferredSize(IFigure parent, - int width, int height) { - Dimension d = super.calculatePreferredSize(parent, width, - height); - d.union(new Dimension(100, theMinHeight)); - return d; - } - }; - - outerLayout.setHorizontal(false); -// outerLayout.setSpacing(10); - outerPane.setLayoutManager(outerLayout); - - scrollpane = new ScrollPane(); - scrollpane.setForegroundColor(ColorConstants.black); - scrollpane.setVerticalScrollBarVisibility(ScrollPane.AUTOMATIC); //ScrollPane.ALWAYS); - outerPane.add(scrollpane); - - ContainerFigure pane = new ContainerFigure(); - pane.setBorder(new MarginBorder(5, 8, 5, 8)); - ContainerLayout layout = new ContainerLayout(); - layout.setHorizontal(false); - layout.setSpacing(0); - pane.setLayoutManager(layout); - - Viewport viewport = new Viewport(); - viewport.setContentsTracksHeight(true); - ViewportLayout viewportLayout = new ViewportLayout() { - protected Dimension calculatePreferredSize(IFigure parent, - int width, int height) { - Dimension d = super.calculatePreferredSize(parent, width, - height); - d.height = Math.min(d.height, theMinHeight - 25); // getViewer().getControl().getBounds().height); - return d; - } - }; - - viewport.setLayoutManager(viewportLayout); - - scrollpane.setViewport(viewport); - scrollpane.setContents(pane); - - this.add(outerPane); - } - - public void setTextName(String name) { - label.setText(name); - } - - /** - * @return - */ - public String getTextName() { - return label == null ? null : label.getText(); - } -} \ No newline at end of file Deleted: branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/figures/IExpandable.java =================================================================== --- branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/figures/IExpandable.java 2008-10-20 23:12:16 UTC (rev 11023) +++ branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/figures/IExpandable.java 2008-10-21 03:41:10 UTC (rev 11024) @@ -1,9 +0,0 @@ -package org.jboss.tools.smooks.ui.gef.figures; - -import org.eclipse.draw2d.IFigure; - -public interface IExpandable extends IFigure { - boolean isExpanded(); - - void setExpanded(boolean isExpanded); -} Deleted: branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/figures/ITreeContainer.java =================================================================== --- branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/figures/ITreeContainer.java 2008-10-20 23:12:16 UTC (rev 11023) +++ branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/figures/ITreeContainer.java 2008-10-21 03:41:10 UTC (rev 11024) @@ -1,19 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 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 - * - * Contributors: - * Red Hat, Inc. - initial API and implementation - ******************************************************************************/ -package org.jboss.tools.smooks.ui.gef.figures; - -/** - * @author Dart Peng - * - */ -public interface ITreeContainer { - -} Deleted: branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/figures/IconAreaFigure.java =================================================================== --- branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/figures/IconAreaFigure.java 2008-10-20 23:12:16 UTC (rev 11023) +++ branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/figures/IconAreaFigure.java 2008-10-21 03:41:10 UTC (rev 11024) @@ -1,25 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 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 - * - * Contributors: - * Red Hat, Inc. - initial API and implementation - ******************************************************************************/ -package org.jboss.tools.smooks.ui.gef.figures; - - -/** - * @author Dart Peng - * - */ -public class IconAreaFigure extends ContainerFigure { - - public IconAreaFigure() { - setLayoutManager(new RightAlignContainerLayout()); - setFill(false); - } - -} Deleted: branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/figures/LabelAreaFigure.java =================================================================== --- branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/figures/LabelAreaFigure.java 2008-10-20 23:12:16 UTC (rev 11023) +++ branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/figures/LabelAreaFigure.java 2008-10-21 03:41:10 UTC (rev 11024) @@ -1,20 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 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 - * - * Contributors: - * Red Hat, Inc. - initial API and implementation - ******************************************************************************/ -package org.jboss.tools.smooks.ui.gef.figures; - -/** - * @author Dart Peng - * - * @CreateTime Jul 21, 2008 - */ -public class LabelAreaFigure extends ContainerFigure { - -} Deleted: branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/figures/RightAlignContainerLayout.java =================================================================== --- branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/figures/RightAlignContainerLayout.java 2008-10-20 23:12:16 UTC (rev 11023) +++ branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/figures/RightAlignContainerLayout.java 2008-10-21 03:41:10 UTC (rev 11024) @@ -1,34 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 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 - * - * Contributors: - * Red Hat, Inc. - initial API and implementation - ******************************************************************************/ -package org.jboss.tools.smooks.ui.gef.figures; - -import org.eclipse.draw2d.IFigure; -import org.eclipse.draw2d.PositionConstants; -import org.jboss.tools.smooks.ui.gef.util.figures.ContainerLayout; - -/** - * @author Dart Peng - * - */ -public class RightAlignContainerLayout extends ContainerLayout { - - public RightAlignContainerLayout() { - super(); - this.setAlign(PositionConstants.RIGHT); - this.setHorizontal(false); - } - - @Override - public void layout(IFigure parent) { - super.layout(parent); - } - -} Deleted: branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/figures/RoundedLineBorder.java =================================================================== --- branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/figures/RoundedLineBorder.java 2008-10-20 23:12:16 UTC (rev 11023) +++ branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/figures/RoundedLineBorder.java 2008-10-21 03:41:10 UTC (rev 11024) @@ -1,51 +0,0 @@ -package org.jboss.tools.smooks.ui.gef.figures; - -import org.eclipse.draw2d.Graphics; -import org.eclipse.draw2d.IFigure; -import org.eclipse.draw2d.LineBorder; -import org.eclipse.draw2d.geometry.Insets; -import org.eclipse.swt.graphics.Color; - -public class RoundedLineBorder extends LineBorder { - protected int arcLength; - - protected int lineStyle = Graphics.LINE_SOLID; - - public RoundedLineBorder(Color c, int width, int arcLength) { - super(c, width); - this.arcLength = arcLength; - } - - public RoundedLineBorder(int width, int arcLength) { - super(width); - this.arcLength = arcLength; - } - - public RoundedLineBorder(Color c, int width, int arcLength, int lineStyle) { - super(c, width); - this.arcLength = arcLength; - this.lineStyle = lineStyle; - } - - public RoundedLineBorder(int width, int arcLength, int lineStyle) { - super(width); - this.arcLength = arcLength; - this.lineStyle = lineStyle; - } - - public void paint(IFigure figure, Graphics graphics, Insets insets) { - tempRect.setBounds(getPaintRectangle(figure, insets)); - int width = getWidth(); - Color color = getColor(); - if (width % 2 == 1) { - tempRect.width--; - tempRect.height--; - } - tempRect.shrink(width / 2, width / 2); - graphics.setLineWidth(width); - graphics.setLineStyle(lineStyle); - if (color != null) - graphics.setForegroundColor(color); - graphics.drawRoundRectangle(tempRect, arcLength, arcLength); - } -} Deleted: branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/figures/SourceConnectionDecoration.java =================================================================== --- branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/figures/SourceConnectionDecoration.java 2008-10-20 23:12:16 UTC (rev 11023) +++ branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/figures/SourceConnectionDecoration.java 2008-10-21 03:41:10 UTC (rev 11024) @@ -1,21 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 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 - * - * Contributors: - * Red Hat, Inc. - initial API and implementation - ******************************************************************************/ -package org.jboss.tools.smooks.ui.gef.figures; - -import org.eclipse.draw2d.Figure; - -/** - * @author Dart Peng - * - */ -public class SourceConnectionDecoration extends Figure { - -} Deleted: branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/figures/SpacingFigure.java =================================================================== --- branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/figures/SpacingFigure.java 2008-10-20 23:12:16 UTC (rev 11023) +++ branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/figures/SpacingFigure.java 2008-10-21 03:41:10 UTC (rev 11024) @@ -1,11 +0,0 @@ -package org.jboss.tools.smooks.ui.gef.figures; - -import org.eclipse.draw2d.RectangleFigure; -import org.eclipse.draw2d.geometry.Dimension; - -public class SpacingFigure extends RectangleFigure { - public SpacingFigure() { - setFill(false); - setPreferredSize(new Dimension(0, 0)); - } -} Deleted: branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/figures/TreeNodeContentFigure.java =================================================================== --- branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/figures/TreeNodeContentFigure.java 2008-10-20 23:12:16 UTC (rev 11023) +++ branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/figures/TreeNodeContentFigure.java 2008-10-21 03:41:10 UTC (rev 11024) @@ -1,77 +0,0 @@ -package org.jboss.tools.smooks.ui.gef.figures; - -import org.eclipse.draw2d.ColorConstants; -import org.eclipse.draw2d.Graphics; -import org.eclipse.draw2d.IFigure; -import org.eclipse.draw2d.MarginBorder; -import org.jboss.tools.smooks.ui.gef.util.GraphicsConstants; - -/** - * - * @author Dart Peng - * - * @CreateTime Jul 21, 2008 - */ -public class TreeNodeContentFigure extends ExpandableGraphNodeContentFigure - implements ISelectableFigure { - - private boolean selected = false; - - /** - * @return the selected - */ - public boolean getSelected() { - return selected; - } - - /** - * @param selected - * the selected to set - */ - public void setSelected(boolean selected) { - this.selected = selected; - this.repaint(); - } - - /** - * @return the focus - */ - public boolean getFocus() { - return focus; - } - - /** - * @param focus - * the focus to set - */ - public void setFocus(boolean focus) { - this.focus = focus; - } - - private boolean focus = false; - - public IFigure getConnectionFigure() { - return outlinedArea; - } - - protected void createOutlinedArea(IFigure parent) { - super.createOutlinedArea(parent); - outlinedArea.setBorder(new MarginBorder(0, 2, 0, 2)); - } - - protected void fillShape(Graphics graphics) { - super.fillShape(graphics); - } - - public void paintFigure(Graphics graphics){ - super.paintFigure(graphics); - ContainerFigure figure = this.getIconArea(); - if (this.selected) { - figure.setFill(true); - figure.setBackgroundColor(GraphicsConstants.groupHeaderColor); - } else { - figure.setFill(false); - figure.setBackgroundColor(ColorConstants.white); - } - } -} Deleted: branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/model/DataObjectContainerModel.java =================================================================== --- branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/model/DataObjectContainerModel.java 2008-10-20 23:12:16 UTC (rev 11023) +++ branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/model/DataObjectContainerModel.java 2008-10-21 03:41:10 UTC (rev 11024) @@ -1,41 +0,0 @@ -package org.jboss.tools.smooks.ui.gef.model; - -import org.eclipse.draw2d.geometry.Rectangle; - -/** - * @deprecated - * - */ -public class DataObjectContainerModel extends AbstractStructuredDataModel { - - public static final int SOURCE_DATA_OBJECT_CONTAINER = 1; - public static final int TARGET_DATA_OBJECT_CIBTAUBER = 2; - - private String name; - private Rectangle constraint; - private int category = -1; - - public int getCategory() { - return category; - } - - public void setCategory(int category) { - this.category = category; - } - - public Rectangle getConstraint() { - return constraint; - } - - public void setConstraint(Rectangle constraint) { - this.constraint = constraint; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } -} \ No newline at end of file Deleted: branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/model/HiddenAreaModel.java =================================================================== --- branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/model/HiddenAreaModel.java 2008-10-20 23:12:16 UTC (rev 11023) +++ branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/model/HiddenAreaModel.java 2008-10-21 03:41:10 UTC (rev 11024) @@ -1,27 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 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 - * - * Contributors: - * Red Hat, Inc. - initial API and implementation - ******************************************************************************/ -package org.jboss.tools.smooks.ui.gef.model; - -import java.util.Collections; -import java.util.List; - -/** - * @author Dart Peng - * - */ -public class HiddenAreaModel extends AbstractStructuredDataModel { - - @Override - public List getChildren() { - return Collections.EMPTY_LIST; - } - -} Deleted: branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/policy/NodeSelectionHandlesEditPolicyImpl.java =================================================================== --- branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/policy/NodeSelectionHandlesEditPolicyImpl.java 2008-10-20 23:12:16 UTC (rev 11023) +++ branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/policy/NodeSelectionHandlesEditPolicyImpl.java 2008-10-21 03:41:10 UTC (rev 11024) @@ -1,32 +0,0 @@ -package org.jboss.tools.smooks.ui.gef.policy; - -import java.util.ArrayList; -import java.util.List; - -import org.eclipse.draw2d.IFigure; -import org.eclipse.gef.EditPart; -import org.eclipse.gef.GraphicalEditPart; -import org.eclipse.gef.editpolicies.SelectionHandlesEditPolicy; -import org.eclipse.gef.handles.MoveHandle; -import org.eclipse.gef.handles.MoveHandleLocator; -import org.jboss.tools.smooks.ui.gef.editparts.StructuredDataContentEditPart; - -public class NodeSelectionHandlesEditPolicyImpl extends SelectionHandlesEditPolicy { - - protected List createSelectionHandles() { - - List list = new ArrayList(); - EditPart editPart = getHost(); - - if ( editPart instanceof GraphicalEditPart ) { - GraphicalEditPart graphicalEditPart = (GraphicalEditPart)editPart; - IFigure figure = (graphicalEditPart instanceof StructuredDataContentEditPart ) ? - ((StructuredDataContentEditPart)graphicalEditPart).getSelectionFigure() : graphicalEditPart.getFigure(); - - MoveHandleLocator loc = new MoveHandleLocator(figure); - MoveHandle moveHandle = new MoveHandle(graphicalEditPart, loc); - list.add(moveHandle); - } - return list; - } -} \ No newline at end of file Modified: branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/policy/RootGraphicsXYLayoutEditPolicy.java =================================================================== --- branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/policy/RootGraphicsXYLayoutEditPolicy.java 2008-10-20 23:12:16 UTC (rev 11023) +++ branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/gef/policy/RootGraphicsXYLayoutEditPolicy.java 2008-10-21 03:41:10 UTC (rev 11024) @@ -1,6 +1,5 @@ package org.jboss.tools.smooks.ui.gef.policy; -import org.eclipse.draw2d.geometry.Rectangle; import org.eclipse.gef.EditPart; import org.eclipse.gef.EditPolicy; import org.eclipse.gef.GraphicalEditPart; @@ -10,10 +9,8 @@ import org.eclipse.gef.editpolicies.XYLayoutEditPolicy; import org.eclipse.gef.requests.ChangeBoundsRequest; import org.eclipse.gef.requests.CreateRequest; -import org.jboss.tools.smooks.ui.gef.commands.ChangeConstraintCommand; import org.jboss.tools.smooks.ui.gef.commands.CommandMappingFactory; import org.jboss.tools.smooks.ui.gef.commands.ICommandMappingFactory; -import org.jboss.tools.smooks.ui.gef.model.IGraphicalModel; @@ -55,15 +52,16 @@ @Override protected Command createChangeConstraintCommand(EditPart child, Object constraint) { - Rectangle con = (Rectangle) constraint; - Object model = child.getModel(); - ChangeConstraintCommand command = null; - if (model instanceof IGraphicalModel) { - command = new ChangeConstraintCommand(); - command.setConstraint(con); - command.setGraphicalModel((IGraphicalModel) model); - } - return command; +// Rectangle con = (Rectangle) constraint; +// Object model = child.getModel(); +// ChangeConstraintCommand command = null; +// if (model instanceof IGraphicalModel) { +// command = new ChangeConstraintCommand(); +// command.setConstraint(con); +// command.setGraphicalModel((IGraphicalModel) model); +// } +// return command; + return null; } @Override

17 years, 2 months

1
0
0 / 0

JBoss Tools SVN: r11023 - branches/jbosstools-3.0.0.Beta1/tests/tests/org.jboss.tools.test/src/org/jboss/tools/test/util.

by jbosstools-commits＠lists.jboss.org

Author: dgolovin Date: 2008-10-20 19:12:16 -0400 (Mon, 20 Oct 2008) New Revision: 11023 Modified: branches/jbosstools-3.0.0.Beta1/tests/tests/org.jboss.tools.test/src/org/jboss/tools/test/util/ResourcesUtils.java Log: https://jira.jboss.org/jira/browse/JBIDE-2424 fixed Modified: branches/jbosstools-3.0.0.Beta1/tests/tests/org.jboss.tools.test/src/org/jboss/tools/test/util/ResourcesUtils.java =================================================================== --- branches/jbosstools-3.0.0.Beta1/tests/tests/org.jboss.tools.test/src/org/jboss/tools/test/util/ResourcesUtils.java 2008-10-20 23:10:54 UTC (rev 11022) +++ branches/jbosstools-3.0.0.Beta1/tests/tests/org.jboss.tools.test/src/org/jboss/tools/test/util/ResourcesUtils.java 2008-10-20 23:12:16 UTC (rev 11023) @@ -123,7 +123,7 @@ do { line = contentReader.readLine(); if(line!=null && !patternIsFound) { - patternIsFound = line.matches(pattern); + patternIsFound = line.trim().matches(pattern); } } while (line != null && !patternIsFound); return patternIsFound;

17 years, 2 months

1
0
0 / 0

JBoss Tools SVN: r11022 - trunk/tests/tests/org.jboss.tools.test/src/org/jboss/tools/test/util.

by jbosstools-commits＠lists.jboss.org

Author: dgolovin Date: 2008-10-20 19:10:54 -0400 (Mon, 20 Oct 2008) New Revision: 11022 Modified: trunk/tests/tests/org.jboss.tools.test/src/org/jboss/tools/test/util/ResourcesUtils.java Log: https://jira.jboss.org/jira/browse/JBIDE-2424 fixed Modified: trunk/tests/tests/org.jboss.tools.test/src/org/jboss/tools/test/util/ResourcesUtils.java =================================================================== --- trunk/tests/tests/org.jboss.tools.test/src/org/jboss/tools/test/util/ResourcesUtils.java 2008-10-20 22:45:41 UTC (rev 11021) +++ trunk/tests/tests/org.jboss.tools.test/src/org/jboss/tools/test/util/ResourcesUtils.java 2008-10-20 23:10:54 UTC (rev 11022) @@ -123,7 +123,7 @@ do { line = contentReader.readLine(); if(line!=null && !patternIsFound) { - patternIsFound = line.matches(pattern); + patternIsFound = line.trim().matches(pattern); } } while (line != null && !patternIsFound); return patternIsFound;

17 years, 2 months

1
0
0 / 0

JBoss Tools SVN: r11021 - branches/jbosstools-3.0.0.Beta1/as.

by jbosstools-commits＠lists.jboss.org

Author: rob.stryker(a)jboss.com Date: 2008-10-20 18:45:41 -0400 (Mon, 20 Oct 2008) New Revision: 11021 Added: branches/jbosstools-3.0.0.Beta1/as/as/ Log: merging AS Tools Copied: branches/jbosstools-3.0.0.Beta1/as/as (from rev 11020, trunk/as)

17 years, 2 months

1
0
0 / 0

JBoss Tools SVN: r11020 - branches/jbosstools-3.0.0.Beta1/archives.

by jbosstools-commits＠lists.jboss.org

Author: rob.stryker(a)jboss.com Date: 2008-10-20 18:45:17 -0400 (Mon, 20 Oct 2008) New Revision: 11020 Added: branches/jbosstools-3.0.0.Beta1/archives/archives/ Log: merging all Copied: branches/jbosstools-3.0.0.Beta1/archives/archives (from rev 11019, trunk/archives)

17 years, 2 months

1
0
0 / 0

JBoss Tools SVN: r11019 - in trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui: dialogs and 1 other directories.

by jbosstools-commits＠lists.jboss.org

Author: rob.stryker(a)jboss.com Date: 2008-10-20 18:30:16 -0400 (Mon, 20 Oct 2008) New Revision: 11019 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.java trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.properties trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/dialogs/ChangePortDialog.java trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/PortSection.java Log: JBIDE-2235 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.java 2008-10-20 22:05:56 UTC (rev 11018) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.java 2008-10-20 22:30:16 UTC (rev 11019) @@ -221,10 +221,11 @@ public static String EditorCPD_Value; public static String EditorCPD_DefaultShellTitle; public static String EditorCPD_DefaultDescription; + public static String EditorCPD_RestoreDefault; - public static String Customize; + public static String Configure; // misc public static String ServerSaveFailed; Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.properties =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.properties 2008-10-20 22:05:56 UTC (rev 11018) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.properties 2008-10-20 22:30:16 UTC (rev 11019) @@ -199,7 +199,8 @@ EditorCPD_Value=Current Value EditorCPD_DefaultShellTitle=Edit Port EditorCPD_DefaultDescription=This wizard allows you to edit which xpath is used to locate a port used by the tooling.\nThis will not change any server files, only what ports are used to interact with it. -Customize=Customize... +EditorCPD_RestoreDefault=Restore Default +Configure=Configure... # misc ServerSaveFailed=Server save failed Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/dialogs/ChangePortDialog.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/dialogs/ChangePortDialog.java 2008-10-20 22:05:56 UTC (rev 11018) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/dialogs/ChangePortDialog.java 2008-10-20 22:30:16 UTC (rev 11019) @@ -34,7 +34,7 @@ import org.jboss.ide.eclipse.as.ui.dialogs.XPathDialogs.XPathDialog; public class ChangePortDialog extends TitleAreaDialog { - + private static final int RESTORE_DEFAULT = 35; public static class ChangePortDialogInfo { public String port; public String defaultValue; @@ -71,6 +71,7 @@ : Messages.EditorCPD_DefaultDescription); getShell().setText(info.shellTitle != null ? info.shellTitle : Messages.EditorCPD_DefaultShellTitle); + selectionChanged(); return c; } @@ -118,7 +119,7 @@ String[] stuff = (String[]) list.toArray(new String[list.size()]); listWidget.setItems(stuff); for( int i = 0; i < stuff.length; i++ ) - if( stuff[i] == info.currentXPath) + if( stuff[i].equals(info.currentXPath)) listWidget.select(i); } @@ -223,4 +224,21 @@ public String getSelection() { return selected; } + + protected void createButtonsForButtonBar(Composite parent) { + super.createButtonsForButtonBar(parent); + createButton(parent, RESTORE_DEFAULT, Messages.EditorCPD_RestoreDefault, false); + } + + protected void buttonPressed(int buttonId) { + super.buttonPressed(buttonId); + if( RESTORE_DEFAULT == buttonId) { + String[] items = listWidget.getItems(); + for( int i = 0; i < items.length; i++ ) + if( items[i].equals(info.defaultValue)) { + listWidget.select(i); + return; + } + } + } } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/PortSection.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/PortSection.java 2008-10-20 22:05:56 UTC (rev 11018) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/PortSection.java 2008-10-20 22:30:16 UTC (rev 11019) @@ -91,7 +91,7 @@ return new SetPortCommand(helper.getWorkingCopy(), helper, Messages.EditorChangeJNDICommandName, IJBossServerConstants.JNDI_PORT, IJBossServerConstants.JNDI_PORT_DETECT, IJBossServerConstants.JNDI_PORT_DETECT_XPATH, IJBossServerConstants.JNDI_PORT_DEFAULT_XPATH, - text, detect, currentXPath, listener); + this); } protected ChangePortDialogInfo getDialogInfo() { ChangePortDialogInfo info = new ChangePortDialogInfo(); @@ -114,7 +114,7 @@ return new SetPortCommand(helper.getWorkingCopy(), helper, Messages.EditorChangeWebCommandName, IJBossServerConstants.WEB_PORT, IJBossServerConstants.WEB_PORT_DETECT, IJBossServerConstants.WEB_PORT_DETECT_XPATH, IJBossServerConstants.WEB_PORT_DEFAULT_XPATH, - text, detect, currentXPath, listener); + this); } protected ChangePortDialogInfo getDialogInfo() { ChangePortDialogInfo info = new ChangePortDialogInfo(); @@ -187,12 +187,13 @@ label.setText(labelText); detect.setText(Messages.EditorAutomaticallyDetectPort); - link.setText("<a href=\"\">" + Messages.Customize + "</a>"); + link.setText("<a href=\"\">" + Messages.Configure + "</a>"); return child; } protected void initialize() { boolean shouldDetect = helper.getAttribute(detectXPathKey, true); detect.setSelection(shouldDetect); + link.setEnabled(shouldDetect); text.setEnabled(!shouldDetect); text.setEditable(!shouldDetect); currentXPath = helper.getAttribute(currentXPathKey, defaultXPath); @@ -315,19 +316,21 @@ Button button; Listener listener; String xpath; + Link link; public SetPortCommand(IServerWorkingCopy server, ServerAttributeHelper helper, String name, String textAttribute, String overrideAttribute, String overridePathAttribute, - String pathDefault, Text text, Button button, String xpath, Listener listener) { + String pathDefault, PortEditorExtension ext) { //Text text, Button button, String xpath, Listener listener) { super(server, name); this.helper = helper; this.textAttribute = textAttribute; this.overrideAttribute = overrideAttribute; this.overridePathAttribute = overridePathAttribute; this.defaultPath = pathDefault; - this.text = text; - this.button = button; - this.listener = listener; - this.xpath = xpath; + this.text = ext.text; + this.button = ext.detect; + this.listener = ext.listener; + this.xpath = ext.currentXPath; + this.link = ext.link; } public void execute() { @@ -338,6 +341,7 @@ preOverride = helper.getAttribute(overrideAttribute, true); helper.setAttribute(textAttribute, text.getText()); helper.setAttribute(overrideAttribute, button.getSelection()); + link.setEnabled(button.getSelection()); helper.setAttribute(overridePathAttribute, xpath); text.setEnabled(!button.getSelection()); @@ -353,8 +357,9 @@ // set new values helper.setAttribute(textAttribute, preText); helper.setAttribute(overrideAttribute, preOverride); + link.setEnabled(preOverride); helper.setAttribute(overridePathAttribute, prePath); - + // update ui text.removeListener(SWT.Modify, listener); button.removeListener(SWT.Selection, listener);

17 years, 2 months

1
0
0 / 0

JBoss Tools SVN: r11018 - in trunk/common/tests/org.jboss.tools.common.text.ext.test: src/org/jboss/tools/common/text/ext/test and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: dgolovin Date: 2008-10-20 18:05:56 -0400 (Mon, 20 Oct 2008) New Revision: 11018 Added: trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/WebContent/xhtmlStyleClassHiperlinkTests.xhtml Modified: trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/WebContent/beanHyperlinkTests.jsp trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/WebContent/jspXmlFormatTests.jsp trunk/common/tests/org.jboss.tools.common.text.ext.test/src/org/jboss/tools/common/text/ext/test/OpenOnsTest.java Log: https://jira.jboss.org/jira/browse/JBIDE-2890 fixed, JUnit Test added Modified: trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/WebContent/beanHyperlinkTests.jsp =================================================================== --- trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/WebContent/beanHyperlinkTests.jsp 2008-10-20 21:14:12 UTC (rev 11017) +++ trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/WebContent/beanHyperlinkTests.jsp 2008-10-20 22:05:56 UTC (rev 11018) @@ -4,10 +4,8 @@ <jsp:getProperty property="property1" name="b1"/> <jsp:setProperty property="property2" name="b1"/> <html> - <head> - <link rel="" > - </head> - -<a href="classHyperlinkTests.jsp">test</a> +<body> + <a href="classHyperlinkTests.jsp">${b1.property2}</a> +</body> +</html> - Modified: trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/WebContent/jspXmlFormatTests.jsp =================================================================== --- trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/WebContent/jspXmlFormatTests.jsp 2008-10-20 21:14:12 UTC (rev 11017) +++ trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/WebContent/jspXmlFormatTests.jsp 2008-10-20 22:05:56 UTC (rev 11018) @@ -15,7 +15,7 @@ </head> <body> <f:view> - + <jsp:attribute name="locale">ru</jsp:attribute> </f:view> </body> </html> Added: trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/WebContent/xhtmlStyleClassHiperlinkTests.xhtml =================================================================== --- trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/WebContent/xhtmlStyleClassHiperlinkTests.xhtml (rev 0) +++ trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/WebContent/xhtmlStyleClassHiperlinkTests.xhtml 2008-10-20 22:05:56 UTC (rev 11018) @@ -0,0 +1,19 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:s="http://jboss.com/products/seam/taglib"> +<head> + <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> + <title>s1</title> + <link href="stylesheet/style1.css" rel="stylesheet" type="text/css" /> +</head> + +<body> + <f:view> + <h:outputText value="test" styleClass="style-class1" /> + </f:view> +</body> +</html> \ No newline at end of file Property changes on: trunk/common/tests/org.jboss.tools.common.text.ext.test/projects/HiperlinksTestProject/WebContent/xhtmlStyleClassHiperlinkTests.xhtml ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/common/tests/org.jboss.tools.common.text.ext.test/src/org/jboss/tools/common/text/ext/test/OpenOnsTest.java =================================================================== --- trunk/common/tests/org.jboss.tools.common.text.ext.test/src/org/jboss/tools/common/text/ext/test/OpenOnsTest.java 2008-10-20 21:14:12 UTC (rev 11017) +++ trunk/common/tests/org.jboss.tools.common.text.ext.test/src/org/jboss/tools/common/text/ext/test/OpenOnsTest.java 2008-10-20 22:05:56 UTC (rev 11018) @@ -533,4 +533,28 @@ ITextSelection selection = (ITextSelection)viewer.getSelectionProvider().getSelection(); assertEquals("<name>", selection.getText()); } + + public static final String XHTML_STYLE_CLASS_NAME_TEST_FILE = OPENON_TEST_PROJECT + "/WebContent/xhtmlStyleClassHiperlinkTests.xhtml"; + + + public void testFacletsStyleClassOpenOnJbide2890() throws BadLocationException { + IEditorPart editor = WorkbenchUtils.openEditor(XHTML_STYLE_CLASS_NAME_TEST_FILE); + assertTrue(editor instanceof JSPMultiPageEditor); + JSPMultiPageEditor jspMultyPageEditor = (JSPMultiPageEditor) editor; + ISourceViewer viewer = jspMultyPageEditor.getSourceEditor().getTextViewer(); + + IRegion reg = new FindReplaceDocumentAdapter(jspMultyPageEditor.getSourceEditor().getTextViewer().getDocument()).find(0, + "style-class1", true, true, false, false); + IHyperlink[] links = HyperlinkDetector.getInstance().detectHyperlinks(viewer, reg, false); + assertNotNull(links); + assertTrue(links.length!=0); + //assertNotNull(links[0].getHyperlinkText()); + assertNotNull(links[0].toString()); + links[0].open(); + JobUtils.waitForIdle(); + editor = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor(); + + String fileName = editor.getEditorInput().getName(); + assertTrue("style1.css".equals(fileName)); + } }

17 years, 2 months

1
0
0 / 0

JBoss Tools SVN: r11017 - trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/providers/descriptors.

by jbosstools-commits＠lists.jboss.org

Author: rob.stryker(a)jboss.com Date: 2008-10-20 17:14:12 -0400 (Mon, 20 Oct 2008) New Revision: 11017 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/providers/descriptors/XPathPropertyLabelProvider.java Log: JBIDE-2214 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/providers/descriptors/XPathPropertyLabelProvider.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/providers/descriptors/XPathPropertyLabelProvider.java 2008-10-20 19:55:38 UTC (rev 11016) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/providers/descriptors/XPathPropertyLabelProvider.java 2008-10-20 21:14:12 UTC (rev 11017) @@ -64,7 +64,7 @@ if( element instanceof XPathResultNode ) { XPathResultNode element2 = (XPathResultNode)element; if( columnIndex == 0 ) return Messages.DescriptorXPathMatch + element2.getIndex(); - if( columnIndex == 1 ) return element2.getText(); + if( columnIndex == 1 ) return element2.getText().trim(); } return null;

17 years, 2 months

1
0
0 / 0

JBoss Tools SVN: r11016 - branches/jbosstools-3.0.0.Beta1/common/plugins/org.jboss.tools.common.text.ext.

by jbosstools-commits＠lists.jboss.org

Author: dgolovin Date: 2008-10-20 15:55:38 -0400 (Mon, 20 Oct 2008) New Revision: 11016 Modified: branches/jbosstools-3.0.0.Beta1/common/plugins/org.jboss.tools.common.text.ext/plugin.xml Log: https://jira.jboss.org/jira/browse/JBIDE-2890 fixed Modified: branches/jbosstools-3.0.0.Beta1/common/plugins/org.jboss.tools.common.text.ext/plugin.xml =================================================================== --- branches/jbosstools-3.0.0.Beta1/common/plugins/org.jboss.tools.common.text.ext/plugin.xml 2008-10-20 19:45:28 UTC (rev 11015) +++ branches/jbosstools-3.0.0.Beta1/common/plugins/org.jboss.tools.common.text.ext/plugin.xml 2008-10-20 19:55:38 UTC (rev 11016) @@ -761,6 +761,12 @@ <contenttypeidentifier id="org.eclipse.jst.jsp.core.jspsource"> <partitiontype id="org.jboss.tools.common.text.ext.jsp.JSP_CSS_CLASS" /> </contenttypeidentifier> + <contenttypeidentifier + id="org.eclipse.wst.html.core.htmlsource"> + <partitiontype + id="org.jboss.tools.common.text.ext.jsp.JSP_CSS_CLASS"> + </partitiontype> + </contenttypeidentifier> </hyperlink> <hyperlink

17 years, 2 months

1
0
0 / 0

JBoss Tools SVN: r11015 - trunk/common/plugins/org.jboss.tools.common.text.ext.

by jbosstools-commits＠lists.jboss.org

Author: dgolovin Date: 2008-10-20 15:45:28 -0400 (Mon, 20 Oct 2008) New Revision: 11015 Modified: trunk/common/plugins/org.jboss.tools.common.text.ext/plugin.xml Log: https://jira.jboss.org/jira/browse/JBIDE-2890 fixed Modified: trunk/common/plugins/org.jboss.tools.common.text.ext/plugin.xml =================================================================== --- trunk/common/plugins/org.jboss.tools.common.text.ext/plugin.xml 2008-10-20 19:45:16 UTC (rev 11014) +++ trunk/common/plugins/org.jboss.tools.common.text.ext/plugin.xml 2008-10-20 19:45:28 UTC (rev 11015) @@ -761,6 +761,9 @@ <contenttypeidentifier id="org.eclipse.jst.jsp.core.jspsource"> <partitiontype id="org.jboss.tools.common.text.ext.jsp.JSP_CSS_CLASS" /> </contenttypeidentifier> + <contenttypeidentifier id="org.eclipse.wst.html.core.htmlsource"> + <partitiontype id="org.jboss.tools.common.text.ext.jsp.JSP_CSS_CLASS" /> + </contenttypeidentifier> </hyperlink> <hyperlink

17 years, 2 months

1
0
0 / 0

JBoss Tools SVN: r11014 - trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/eclipse/org/jboss/ide/eclipse/archives/core.

by jbosstools-commits＠lists.jboss.org

Author: rob.stryker(a)jboss.com Date: 2008-10-20 15:45:16 -0400 (Mon, 20 Oct 2008) New Revision: 11014 Modified: trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/eclipse/org/jboss/ide/eclipse/archives/core/WorkspaceChangeListener.java Log: JBIDE-2746 - NPE when workspace root is the changed resource Modified: trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/eclipse/org/jboss/ide/eclipse/archives/core/WorkspaceChangeListener.java =================================================================== --- trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/eclipse/org/jboss/ide/eclipse/archives/core/WorkspaceChangeListener.java 2008-10-20 19:37:59 UTC (rev 11013) +++ trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/eclipse/org/jboss/ide/eclipse/archives/core/WorkspaceChangeListener.java 2008-10-20 19:45:16 UTC (rev 11014) @@ -69,7 +69,8 @@ // TODO modify to make sure this file is a descriptor in use / registered if( delta.getResource() != null && delta.getResource().getLocation() != null && delta.getResource().getLocation().lastSegment().equals(IArchiveModel.DEFAULT_PACKAGES_FILE)) { - projects.add(delta.getResource().getProject()); + if( delta.getResource().getProject() != null ) + projects.add(delta.getResource().getProject()); } return true; }

17 years, 2 months

1
0
0 / 0

JBoss Tools SVN: r11013 - in trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui: wizards/pages and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: rob.stryker(a)jboss.com Date: 2008-10-20 15:37:59 -0400 (Mon, 20 Oct 2008) New Revision: 11013 Modified: trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/util/composites/ArchiveSourceDestinationComposite.java trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/wizards/pages/ArchiveInfoWizardPage.java trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/wizards/pages/FilesetInfoWizardPage.java Log: JBIDE-2649 - warnings and errors now (again) in title area dialog Modified: trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/util/composites/ArchiveSourceDestinationComposite.java =================================================================== --- trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/util/composites/ArchiveSourceDestinationComposite.java 2008-10-20 19:16:34 UTC (rev 11012) +++ trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/util/composites/ArchiveSourceDestinationComposite.java 2008-10-20 19:37:59 UTC (rev 11013) @@ -60,7 +60,7 @@ */ public class ArchiveSourceDestinationComposite extends Composite { private Text text; - private Label pathImage, translatedPath, translatedPathImage, relativeTo; + private Label pathImage, relativeTo; private Button workspaceButton, filesystemButton, variablesButton, wsRadioButton, fsRadioButton; @@ -68,8 +68,8 @@ private boolean workspaceRelative = false; private IArchiveNode destinationNode; private String path; - private boolean error; - private String errorString; + private int statusType; + private String message; private double version; private ArrayList<ChangeListener> listeners = new ArrayList<ChangeListener>(); @@ -87,8 +87,6 @@ protected void createWidgets() { text = new Text(this, SWT.SINGLE | SWT.BORDER); pathImage = new Label(this, SWT.NONE); - translatedPath = new Label(this, SWT.NONE); - translatedPathImage = new Label(this, SWT.NONE); workspaceButton = new Button(this, SWT.PUSH); filesystemButton = new Button(this, SWT.PUSH); variablesButton = new Button(this, SWT.PUSH); @@ -106,8 +104,6 @@ fsRadioButton.setLayoutData(createFormData(text,5,null,0,null,0,variablesButton,-5)); wsRadioButton.setLayoutData(createFormData(text,5,null,0,null,0,fsRadioButton,-5)); relativeTo.setLayoutData(createFormData(text,8,null,0,null,0,wsRadioButton,-5)); - translatedPathImage.setLayoutData(createFormData(filesystemButton,5,null,0,0,0,0,20)); - translatedPath.setLayoutData(createFormData(filesystemButton,5,null,0,translatedPathImage,5,100,-5)); } protected void setWidgetData() { @@ -118,12 +114,6 @@ fsRadioButton.setText(ArchivesUIMessages.Filesystem2); relativeTo.setText(ArchivesUIMessages.RelativeTo); pathImage.setImage(PlatformUI.getWorkbench().getSharedImages().getImage(ISharedImages.IMG_OBJ_FOLDER)); - FontData[] translatedPathData = translatedPath.getFont().getFontData(); - for( int i = 0; i < translatedPathData.length; i++ ) - translatedPathData[i].setHeight(7); - Font newFont = new Font(Display.getDefault(), translatedPathData); - translatedPath.setFont(newFont); - translatedPathImage.setImage(PlatformUI.getWorkbench().getSharedImages().getImage(ISharedImages.IMG_OBJS_ERROR_TSK)); } protected void addListeners() { @@ -225,8 +215,8 @@ protected void validateAndUpdateWidgets() { // clear old status - error = false; - errorString = null; + statusType = IStatus.OK; + message = null; wsRadioButton.setEnabled(destinationNode == null); @@ -254,6 +244,8 @@ if( translated == null || !new Path(translated).toFile().exists()) { translated= NLS.bind(ArchivesUIMessages.PathDoesNotExistInFilesystem,translated); img = PlatformUI.getWorkbench().getSharedImages().getImage(ISharedImages.IMG_OBJS_WARN_TSK); + statusType = IStatus.WARNING; + message = translated; } else { img = null; } @@ -262,14 +254,17 @@ translated = ce.getMessage(); if( ce.getStatus().getSeverity() == IStatus.ERROR) { img = PlatformUI.getWorkbench().getSharedImages().getImage(ISharedImages.IMG_OBJS_ERROR_TSK); - error = true; - errorString = ce.getMessage(); - } else if( ce.getStatus().getSeverity() == IStatus.WARNING) + statusType = IStatus.ERROR; + message = ce.getMessage(); + } else if( ce.getStatus().getSeverity() == IStatus.WARNING) { img = PlatformUI.getWorkbench().getSharedImages().getImage(ISharedImages.IMG_OBJS_WARN_TSK); + statusType = IStatus.WARNING; + message = ce.getMessage(); + } } - translatedPathImage.setImage(img); - translatedPath.setText(translated); +// translatedPathImage.setImage(img); +// translatedPath.setText(translated); fireChange(); } @@ -354,13 +349,17 @@ } public boolean isValid() { - return !error; + return statusType != IStatus.ERROR; } - public String getErrorMessage() { - return errorString; + public String getMessage() { + return message; } + public int getStatusType() { + return statusType; + } + public boolean isWorkspaceRelative() { return workspaceRelative; } Modified: trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/wizards/pages/ArchiveInfoWizardPage.java =================================================================== --- trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/wizards/pages/ArchiveInfoWizardPage.java 2008-10-20 19:16:34 UTC (rev 11012) +++ trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/wizards/pages/ArchiveInfoWizardPage.java 2008-10-20 19:37:59 UTC (rev 11013) @@ -16,6 +16,7 @@ import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.IPath; +import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Path; import org.eclipse.swt.SWT; import org.eclipse.swt.events.ModifyEvent; @@ -30,7 +31,6 @@ import org.eclipse.swt.widgets.Group; import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Text; -import org.jboss.ide.eclipse.archives.core.ArchivesCore; import org.jboss.ide.eclipse.archives.core.model.ArchiveNodeFactory; import org.jboss.ide.eclipse.archives.core.model.ArchivesModel; import org.jboss.ide.eclipse.archives.core.model.IArchive; @@ -176,12 +176,15 @@ } private boolean validate () { - String errorMessage = null; - if (packageNameText.getText() == null || packageNameText.getText().length() == 0) - errorMessage = ArchivesUIMessages.PackageInfoWizardPage_error_noPackageName; - else if( !destinationComposite.isValid() ) - errorMessage = destinationComposite.getErrorMessage(); - else if( destinationComposite.getDestinationNode() != null ) { + String message = null; + int messageType = IStatus.OK; + if (packageNameText.getText() == null || packageNameText.getText().length() == 0) { + message = ArchivesUIMessages.PackageInfoWizardPage_error_noPackageName; + messageType = IStatus.ERROR; + } else if( destinationComposite.getMessage() != null ) { + message = destinationComposite.getMessage(); + messageType = destinationComposite.getStatusType(); + } else if( destinationComposite.getDestinationNode() != null ) { IArchiveNode parentNode = destinationComposite.getDestinationNode(); // verify no child has the same name IArchiveNode subPackages[] = parentNode.getChildren(IArchiveNode.TYPE_ARCHIVE); @@ -189,9 +192,10 @@ IArchive subPackage = (IArchive) subPackages[i]; if (subPackage.getName().equals(packageNameText.getText()) && (!subPackage.equals(this.archive))) { - errorMessage = ArchivesUIMessages.bind( + message = ArchivesUIMessages.bind( ArchivesUIMessages.PackageInfoWizardPage_error_packageAlreadyExists, packageNameText.getText()); + messageType = IStatus.ERROR; } } } else if( destinationComposite.getPath() != null ) { @@ -213,18 +217,19 @@ if (pkg.getName().equals(packageNameText.getText()) && (PathUtils.getGlobalLocation(pkg)!= null && PathUtils.getGlobalLocation(pkg).equals(destinationLocation)) && (!pkg.equals(this.archive))) { - errorMessage = ArchivesUIMessages.bind( + message = ArchivesUIMessages.bind( ArchivesUIMessages.PackageInfoWizardPage_error_packageAlreadyExists, packageNameText.getText()); + messageType = IStatus.ERROR; } } } } else { - errorMessage = (ArchivesUIMessages.PackageInfoWizardPage_error_noDestination); + message = (ArchivesUIMessages.PackageInfoWizardPage_error_noDestination); } - setErrorMessage(errorMessage); - setPageComplete(errorMessage == null); - return errorMessage == null; + setPageComplete(message == null || messageType <= IStatus.WARNING); + setMessage(message, messageType); + return messageType <= IStatus.WARNING; } Modified: trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/wizards/pages/FilesetInfoWizardPage.java =================================================================== --- trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/wizards/pages/FilesetInfoWizardPage.java 2008-10-20 19:16:34 UTC (rev 11012) +++ trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/wizards/pages/FilesetInfoWizardPage.java 2008-10-20 19:37:59 UTC (rev 11013) @@ -11,12 +11,10 @@ package org.jboss.ide.eclipse.archives.ui.wizards.pages; import java.util.ArrayList; -import java.util.Arrays; -import org.eclipse.core.resources.IProject; -import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IPath; +import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Path; import org.eclipse.jface.wizard.WizardPage; import org.eclipse.swt.SWT; @@ -38,12 +36,9 @@ import org.eclipse.swt.widgets.Text; import org.jboss.ide.eclipse.archives.core.ArchivesCore; import org.jboss.ide.eclipse.archives.core.model.DirectoryScannerFactory; -import org.jboss.ide.eclipse.archives.core.model.IArchive; import org.jboss.ide.eclipse.archives.core.model.IArchiveFileSet; import org.jboss.ide.eclipse.archives.core.model.IArchiveNode; import org.jboss.ide.eclipse.archives.core.model.DirectoryScannerFactory.DirectoryScannerExtension; -import org.jboss.ide.eclipse.archives.core.util.ModelUtil; -import org.jboss.ide.eclipse.archives.core.util.PathUtils; import org.jboss.ide.eclipse.archives.ui.ArchivesSharedImages; import org.jboss.ide.eclipse.archives.ui.ArchivesUIMessages; import org.jboss.ide.eclipse.archives.ui.util.composites.ArchiveFilesetDestinationComposite; @@ -254,12 +249,12 @@ } private boolean validate () { - String errorMessage = null; - if( !srcDestComposite.isValid() ) - errorMessage = srcDestComposite.getErrorMessage(); - setErrorMessage(errorMessage); - setPageComplete(errorMessage == null); - return errorMessage == null; + String message = srcDestComposite.getMessage(); + int messageType = srcDestComposite.getStatusType(); + + setMessage(message, messageType); + setPageComplete(messageType <= IStatus.WARNING); + return messageType <= IStatus.WARNING; }

17 years, 2 months

1
0
0 / 0

JBoss Tools SVN: r11012 - trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules.

by jbosstools-commits＠lists.jboss.org

Author: rob.stryker(a)jboss.com Date: 2008-10-20 15:16:34 -0400 (Mon, 20 Oct 2008) New Revision: 11012 Modified: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/PackageModuleFactory.java Log: JBIDE-2844 Modified: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/PackageModuleFactory.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/PackageModuleFactory.java 2008-10-20 19:09:37 UTC (rev 11011) +++ trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/PackageModuleFactory.java 2008-10-20 19:16:34 UTC (rev 11012) @@ -287,8 +287,10 @@ public void addFilesetAsChild(IArchiveFileSet fs) { FileWrapper[] files = fs.findMatchingPaths(); // file-system based source paths - for( int i = 0; i < files.length; i++ ) { - addFilesetPathAsChild(fs, files[i]); + if( files != null ) { + for( int i = 0; i < files.length; i++ ) { + addFilesetPathAsChild(fs, files[i]); + } } }

17 years, 2 months

1
0
0 / 0

JBoss Tools SVN: r11011 - in trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui: src/main/org/jboss/ide/eclipse/archives/ui and 2 other directories.

by jbosstools-commits＠lists.jboss.org

Author: rob.stryker(a)jboss.com Date: 2008-10-20 15:09:37 -0400 (Mon, 20 Oct 2008) New Revision: 11011 Modified: trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/plugin.xml trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/ArchivesUIMessages.java trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/ArchivesUIMessages.properties trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/ExtensionManager.java trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/PrefsInitializer.java trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/preferences/MainPreferencePage.java trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/providers/ArchivesRootBridgeContentProvider.java Log: JBIDE-2826 Modified: trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/plugin.xml =================================================================== --- trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/plugin.xml 2008-10-20 18:35:49 UTC (rev 11010) +++ trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/plugin.xml 2008-10-20 19:09:37 UTC (rev 11011) @@ -54,7 +54,7 @@ <page class="org.jboss.ide.eclipse.archives.ui.preferences.MainPreferencePage" id="org.jboss.ide.eclipse.archives.ui.archivesPreferencePage" - name="Packaging Archives"/> + name="Project Archives"/> </extension> @@ -63,12 +63,12 @@ <page class="org.jboss.ide.eclipse.archives.ui.preferences.MainPreferencePage" id="org.jboss.ide.eclipse.archives.ui.projectProperties" - name="Packaging Archives" + name="Project Archives" objectClass="org.eclipse.core.resources.IProject"/> <page class="org.jboss.ide.eclipse.archives.ui.preferences.MainPreferencePage" id="org.jboss.ide.eclipse.archives.ui.projectProperties2" - name="Packaging Archives" + name="Project Archives" objectClass="org.eclipse.jdt.core.IJavaProject"/> </extension> <extension Modified: trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/ArchivesUIMessages.java =================================================================== --- trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/ArchivesUIMessages.java 2008-10-20 18:35:49 UTC (rev 11010) +++ trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/ArchivesUIMessages.java 2008-10-20 19:09:37 UTC (rev 11011) @@ -127,9 +127,10 @@ public static String PreferencePageTitle; public static String ProjectSpecificSettings; public static String CorePreferences; + public static String ProjectExplorerPreferences; public static String EnableIncrementalBuilder; public static String ShowBuildErrorDialog; - + public static String EnableNodeAlways; public static String ProjectPackagesView; public static String ShowFullOutputPath; public static String ShowFullRootDirectory; Modified: trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/ArchivesUIMessages.properties =================================================================== --- trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/ArchivesUIMessages.properties 2008-10-20 18:35:49 UTC (rev 11010) +++ trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/ArchivesUIMessages.properties 2008-10-20 19:09:37 UTC (rev 11011) @@ -108,12 +108,14 @@ PackageNodeDestinationDialog_folderLabel=folder PackageNodeDestinationDialog_title=Select a destination -PreferencePageTitle=Packaging Archives +PreferencePageTitle=Project Archives ProjectSpecificSettings=Enable Project Specific Settings CorePreferences=Core Preferences +ProjectExplorerPreferences=Core Preferences EnableIncrementalBuilder=Enable incremental builder ShowBuildErrorDialog=Show build error dialog -ProjectPackagesView=Project Packages View +EnableNodeAlways=Show node in all projects +ProjectPackagesView=Project Archives View ShowFullOutputPath=Show full output path next to packages. ShowFullRootDirectory=Show the full root directory of filesets. ShowRootProject=Show project at the root Modified: trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/ExtensionManager.java =================================================================== --- trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/ExtensionManager.java 2008-10-20 18:35:49 UTC (rev 11010) +++ trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/ExtensionManager.java 2008-10-20 19:09:37 UTC (rev 11011) @@ -50,11 +50,13 @@ public static NodeContribution[] findNodePopupMenuContributions () { ArrayList<NodeContribution> contributions = new ArrayList<NodeContribution>(); IExtension[] extensions = findExtension(NODE_POPUP_MENUS_EXTENSION_ID); - + NodeContribution tmp; for (int i = 0; i < extensions.length; i++) { IConfigurationElement[] elements = extensions[i].getConfigurationElements(); for (int j = 0; j < elements.length; j++) { - contributions.add(new NodeContribution(elements[j])); + tmp = new NodeContribution(elements[j]); + if( tmp.getActionDelegate() != null ) + contributions.add(tmp); } } @@ -64,11 +66,13 @@ public static NewArchiveAction[] findNewArchiveActions () { ArrayList<NewArchiveAction> contributions = new ArrayList<NewArchiveAction>(); IExtension[] extensions = findExtension(NEW_PACKAGE_ACTIONS_EXTENSION_ID); - + NewArchiveAction tmp; for (int i = 0; i < extensions.length; i++) { IConfigurationElement[] elements = extensions[i].getConfigurationElements(); for (int j = 0; j < elements.length; j++) { - contributions.add(new NewArchiveAction(elements[j])); + tmp = new NewArchiveAction(elements[j]); + if( tmp.getAction() != null) + contributions.add(tmp); } } Modified: trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/PrefsInitializer.java =================================================================== --- trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/PrefsInitializer.java 2008-10-20 18:35:49 UTC (rev 11010) +++ trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/PrefsInitializer.java 2008-10-20 19:09:37 UTC (rev 11011) @@ -32,6 +32,7 @@ public static final String PREF_SHOW_PROJECT_ROOT = "showProjectRoot";//$NON-NLS-1$ public static final String PREF_SHOW_ALL_PROJECTS = "showAllProjects";//$NON-NLS-1$ public static final String PREF_SHOW_BUILD_ERROR_DIALOG = "showBuildErrorDialog";//$NON-NLS-1$ + public static final String PREF_ALWAYS_SHOW_PROJECT_EXPLORER_NODE = "alwaysShowProjectExplorerNode";//$NON-NLS-1$ public static final ArrayList<IArchivesPreferenceListener> listeners = new ArrayList<IArchivesPreferenceListener>(); public static interface IArchivesPreferenceListener { @@ -45,6 +46,7 @@ prefs.putBoolean(PREF_SHOW_PROJECT_ROOT, true); prefs.putBoolean(PREF_SHOW_ALL_PROJECTS, false); prefs.putBoolean(PREF_SHOW_BUILD_ERROR_DIALOG, true); + prefs.putBoolean(PREF_ALWAYS_SHOW_PROJECT_EXPLORER_NODE, false); try { prefs.flush(); } catch (org.osgi.service.prefs.BackingStoreException e) { Modified: trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/preferences/MainPreferencePage.java =================================================================== --- trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/preferences/MainPreferencePage.java 2008-10-20 18:35:49 UTC (rev 11010) +++ trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/preferences/MainPreferencePage.java 2008-10-20 19:09:37 UTC (rev 11011) @@ -43,7 +43,8 @@ private Button showPackageOutputPath, showFullFilesetRootDir; private Button showProjectRoot, showAllProjects; private Button automaticBuilder, showErrorDialog, overrideButton; - private Group corePrefGroup, viewPrefGroup; + private Button showNodeOnAllProjects; + private Group corePrefGroup, viewPrefGroup, packageExplorerGroup; private Composite overrideComp; @@ -60,6 +61,7 @@ createOverridePrefs(main); createCorePrefs(main); createViewPrefs(main); + createProjectExplorerPrefs(main); fillValues(); return main; } @@ -136,7 +138,17 @@ showErrorDialog = new Button(corePrefGroup, SWT.CHECK); showErrorDialog.setText(ArchivesUIMessages.ShowBuildErrorDialog); } + + protected void createProjectExplorerPrefs(Composite main) { + packageExplorerGroup = new Group(main, SWT.NONE); + packageExplorerGroup.setText(ArchivesUIMessages.ProjectExplorerPreferences); + packageExplorerGroup.setLayout(new GridLayout(1, false)); + packageExplorerGroup.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); + showNodeOnAllProjects = new Button(packageExplorerGroup, SWT.CHECK); + showNodeOnAllProjects.setText(ArchivesUIMessages.EnableNodeAlways); + } + protected void createViewPrefs(Composite main) { viewPrefGroup = new Group(main, SWT.NONE); @@ -185,6 +197,7 @@ showFullFilesetRootDir.setSelection(true); showProjectRoot.setSelection(true); showAllProjects.setSelection(false); + showNodeOnAllProjects.setSelection(false); if( getResourceLocationIfExists() != null ) { overrideButton.setSelection(false); setWidgetsEnabled(overrideButton.getSelection()); @@ -203,6 +216,7 @@ PrefsInitializer.setBoolean(PrefsInitializer.PREF_SHOW_FULL_FILESET_ROOT_DIR, showFullFilesetRootDir.getSelection(), getElement()); PrefsInitializer.setBoolean(PrefsInitializer.PREF_SHOW_PROJECT_ROOT, showProjectRoot.getSelection(), getElement()); PrefsInitializer.setBoolean(PrefsInitializer.PREF_SHOW_ALL_PROJECTS, showAllProjects.getSelection(), getElement()); + PrefsInitializer.setBoolean(PrefsInitializer.PREF_ALWAYS_SHOW_PROJECT_EXPLORER_NODE, showNodeOnAllProjects.getSelection(), getElement()); return true; } } Modified: trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/providers/ArchivesRootBridgeContentProvider.java =================================================================== --- trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/providers/ArchivesRootBridgeContentProvider.java 2008-10-20 18:35:49 UTC (rev 11010) +++ trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/providers/ArchivesRootBridgeContentProvider.java 2008-10-20 19:09:37 UTC (rev 11011) @@ -13,6 +13,7 @@ import org.eclipse.core.resources.IProject; import org.eclipse.jface.viewers.ITreeContentProvider; import org.eclipse.jface.viewers.Viewer; +import org.jboss.ide.eclipse.archives.core.model.ArchivesModel; import org.jboss.ide.eclipse.archives.ui.PrefsInitializer; import org.jboss.ide.eclipse.archives.ui.PrefsInitializer.IArchivesPreferenceListener; import org.jboss.ide.eclipse.archives.ui.providers.ArchivesContentProviderDelegate.WrappedProject; @@ -36,7 +37,10 @@ public Object[] getChildren(Object parentElement) { if( parentElement instanceof IProject) { if( ((IProject)parentElement).isOpen()) - return new Object[] { new WrappedProject((IProject)parentElement, WrappedProject.CATEGORY) }; + if( PrefsInitializer.getBoolean(PrefsInitializer.PREF_ALWAYS_SHOW_PROJECT_EXPLORER_NODE) || + ArchivesModel.instance().canReregister(((IProject)parentElement).getLocation())) { + return new Object[] { new WrappedProject((IProject)parentElement, WrappedProject.CATEGORY) }; + } return new Object[]{}; } return delegate.getChildren(parentElement);

17 years, 2 months

1
0
0 / 0

JBoss Tools SVN: r11010 - in trunk: jst/plugins/org.jboss.tools.jst.jsp/schema and 2 other directories.

by jbosstools-commits＠lists.jboss.org

Author: mareshkau Date: 2008-10-20 14:35:49 -0400 (Mon, 20 Oct 2008) New Revision: 11010 Added: trunk/jst/plugins/org.jboss.tools.jst.jsp/schema/ trunk/jst/plugins/org.jboss.tools.jst.jsp/schema/visual_editors.exsd trunk/jst/plugins/org.jboss.tools.jst.jsp/schema/visulaEditorImplementations.exsd Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/plugin.xml trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPMultiPageEditor.java trunk/vpe/plugins/org.jboss.tools.vpe/plugin.xml Log: =JBIDE-2674, visual editor implementations extension point was added Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/plugin.xml =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/plugin.xml 2008-10-20 18:24:50 UTC (rev 11009) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/plugin.xml 2008-10-20 18:35:49 UTC (rev 11010) @@ -3,7 +3,9 @@ <plugin> <extension-point id="occurrenceStructureProviders" - name="%occurrenceStructureProvidersExtensionPoint" /> + name="%occurrenceStructureProvidersExtensionPoint" /> + <extension-point id="visulaEditorImplementations" name="Visual Editor Implementations" schema="schema/visulaEditorImplementations.exsd"> + </extension-point> <extension point="org.eclipse.wst.sse.ui.editorConfiguration"> <sourceViewerConfiguration @@ -401,4 +403,4 @@ </extension> -</plugin> \ No newline at end of file +</plugin> Added: trunk/jst/plugins/org.jboss.tools.jst.jsp/schema/visual_editors.exsd =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/schema/visual_editors.exsd (rev 0) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/schema/visual_editors.exsd 2008-10-20 18:35:49 UTC (rev 11010) @@ -0,0 +1,84 @@ +<?xml version='1.0' encoding='UTF-8'?> + +<schema targetNamespace="org.jboss.tools.jst.jsp" xmlns="http://www.w3.org/2001/XMLSchema"> +<annotation> + <appinfo> + <meta.schema plugin="org.jboss.tools.jst.jsp" id="visual_editors" name="VisualEditors"/> + </appinfo> + <documentation> + [Enter description of this extension point.] + </documentation> + </annotation> + + <element name="extension"> + <annotation> + <appinfo> + <meta.element /> + </appinfo> + </annotation> + <complexType> + <attribute name="point" type="string" use="required"> + <annotation> + <documentation> + + </documentation> + </annotation> + </attribute> + <attribute name="id" type="string"> + <annotation> + <documentation> + + </documentation> + </annotation> + </attribute> + <attribute name="name" type="string"> + <annotation> + <documentation> + + </documentation> + <appinfo> + <meta.attribute translatable="true"/> + </appinfo> + </annotation> + </attribute> + </complexType> + </element> + + <annotation> + <appinfo> + <meta.section type="since"/> + </appinfo> + <documentation> + [Enter the first release in which this extension point appears.] + </documentation> + </annotation> + + <annotation> + <appinfo> + <meta.section type="examples"/> + </appinfo> + <documentation> + [Enter extension point usage example here.] + </documentation> + </annotation> + + <annotation> + <appinfo> + <meta.section type="apiinfo"/> + </appinfo> + <documentation> + [Enter API information here.] + </documentation> + </annotation> + + <annotation> + <appinfo> + <meta.section type="implementation"/> + </appinfo> + <documentation> + [Enter information about supplied implementation of this extension point.] + </documentation> + </annotation> + + +</schema> Added: trunk/jst/plugins/org.jboss.tools.jst.jsp/schema/visulaEditorImplementations.exsd =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/schema/visulaEditorImplementations.exsd (rev 0) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/schema/visulaEditorImplementations.exsd 2008-10-20 18:35:49 UTC (rev 11010) @@ -0,0 +1,115 @@ +<?xml version='1.0' encoding='UTF-8'?> + +<schema targetNamespace="org.jboss.tools.jst.jsp" xmlns="http://www.w3.org/2001/XMLSchema"> +<annotation> + <appinfo> + <meta.schema plugin="org.jboss.tools.jst.jsp" id="visulaEditorImplementations" name="Visual Editor Implementations"/> + </appinfo> + <documentation> + [Enter description of this extension point.] + </documentation> + </annotation> + + <element name="extension"> + <annotation> + <appinfo> + <meta.element /> + </appinfo> + </annotation> + <complexType> + <sequence> + <element ref="visualEditorImplementation"/> + </sequence> + <attribute name="point" type="string" use="required"> + <annotation> + <documentation> + + </documentation> + </annotation> + </attribute> + <attribute name="id" type="string" use="required"> + <annotation> + <documentation> + + </documentation> + <appinfo> + <meta.attribute kind="identifier"/> + </appinfo> + </annotation> + </attribute> + <attribute name="name" type="string"> + <annotation> + <documentation> + + </documentation> + <appinfo> + <meta.attribute translatable="true"/> + </appinfo> + </annotation> + </attribute> + </complexType> + </element> + + <element name="visualEditorImplementation"> + <complexType> + <attribute name="name" type="string"> + <annotation> + <documentation> + The name of visual editor implementation + </documentation> + <appinfo> + <meta.attribute translatable="true"/> + </appinfo> + </annotation> + </attribute> + <attribute name="class" type="string" use="required"> + <annotation> + <documentation> + Class which implement visual editor factory + </documentation> + <appinfo> + <meta.attribute kind="java" basedOn=":org.jboss.tools.jst.jsp.editor.IVisualEditorFactory"/> + </appinfo> + </annotation> + </attribute> + </complexType> + </element> + + <annotation> + <appinfo> + <meta.section type="since"/> + </appinfo> + <documentation> + [Enter the first release in which this extension point appears.] + </documentation> + </annotation> + + <annotation> + <appinfo> + <meta.section type="examples"/> + </appinfo> + <documentation> + [Enter extension point usage example here.] + </documentation> + </annotation> + + <annotation> + <appinfo> + <meta.section type="apiinfo"/> + </appinfo> + <documentation> + [Enter API information here.] + </documentation> + </annotation> + + <annotation> + <appinfo> + <meta.section type="implementation"/> + </appinfo> + <documentation> + [Enter information about supplied implementation of this extension point.] + </documentation> + </annotation> + + +</schema> Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPMultiPageEditor.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPMultiPageEditor.java 2008-10-20 18:24:50 UTC (rev 11009) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPMultiPageEditor.java 2008-10-20 18:35:49 UTC (rev 11010) @@ -19,6 +19,8 @@ import org.eclipse.core.resources.IResourceDelta; import org.eclipse.core.resources.IWorkspace; import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IConfigurationElement; +import org.eclipse.core.runtime.IExtension; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.Platform; @@ -80,7 +82,6 @@ import org.jboss.tools.jst.jsp.preferences.VpePreference; import org.jboss.tools.jst.web.tld.VpeTaglibManager; import org.jboss.tools.jst.web.tld.VpeTaglibManagerProvider; -import org.osgi.framework.Bundle; // Fix for EXIN-232: The IMultiPageEditor interface implementation is added. public class JSPMultiPageEditor extends JSPMultiPageEditorPart implements @@ -101,8 +102,12 @@ private static final String PREVIEW_TAB="Preview"; //$NON-NLS-1$ //visual tab private static final String VISUAL_SOURCE_TAB="Visual/Source"; //$NON-NLS-1$ + + private static final String VPE_VISUAL_EDITOR_IMPL_ID="org.jboss.tools.vpe.org.jboss.tools.vpe.editor.VpeEditorPartFactory"; //$NON-NLS-1$ //source tab private static final String SOURCE_TAB="Source"; //$NON-NLS-1$ + + private static final String VISUAL_EDITOR_IMPL_EXTENSION_POINT_NAME="visulaEditorImplementations"; //$NON-NLS-1$ private IVisualEditor visualEditor; @@ -137,19 +142,32 @@ static IVisualEditorFactory visualEditorFactory; static { + //Fix For JBIDE-2674 try { - Bundle b = Platform.getBundle("org.jboss.tools.vpe"); //$NON-NLS-1$ - //FIX for JBIDE-2248 - if(b!=null) { - Class cls = b - .loadClass("org.jboss.tools.vpe.editor.VpeEditorPartFactory"); //$NON-NLS-1$ - visualEditorFactory = (IVisualEditorFactory) cls.newInstance(); + IExtension visualEditorExtension = Platform.getExtensionRegistry() + .getExtension(JspEditorPlugin.PLUGIN_ID, + VISUAL_EDITOR_IMPL_EXTENSION_POINT_NAME, + VPE_VISUAL_EDITOR_IMPL_ID); + if (visualEditorExtension != null) { + IConfigurationElement[] configurationElements = visualEditorExtension + .getConfigurationElements(); + if (configurationElements != null + && configurationElements.length == 1) { + visualEditorFactory = (IVisualEditorFactory) configurationElements[0] + .createExecutableExtension("class"); //$NON-NLS-1$ + } else { + JspEditorPlugin + .getPluginLog() + .logError( + "Visual Editor Extension Point not configured correctly"); //$NON-NLS-1$ + } } else { - JspEditorPlugin.getPluginLog().logError("Plugin org.jboss.tools.vpe not available," + //$NON-NLS-1$ - " visual page editor will be not available"); //$NON-NLS-1$ + JspEditorPlugin.getPluginLog().logError( + "Visual Editor Implementation not available"); //$NON-NLS-1$ } - } catch (Exception e) { - JspEditorPlugin.getPluginLog().logError("Error in loading visual editor factory", e); //$NON-NLS-1$ + } catch (CoreException e) { + JspEditorPlugin.getPluginLog().logError( + "Visual Editor Implementation not available" + e); //$NON-NLS-1$ } } Modified: trunk/vpe/plugins/org.jboss.tools.vpe/plugin.xml =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/plugin.xml 2008-10-20 18:24:50 UTC (rev 11009) +++ trunk/vpe/plugins/org.jboss.tools.vpe/plugin.xml 2008-10-20 18:35:49 UTC (rev 11010) @@ -71,4 +71,8 @@ contextId="org.jboss.tools.vpe.editorContext" sequence="M1+M2+Tab"/> </extension> + <extension + point="org.jboss.tools.jst.jsp.visulaEditorImplementations" id="org.jboss.tools.vpe.editor.VpeEditorPartFactory"> + <visualEditorImplementation name="XulRunner Visual Editor" class="org.jboss.tools.vpe.editor.VpeEditorPartFactory"/> + </extension> </plugin>

17 years, 2 months

1
0
0 / 0

JBoss Tools SVN: r11009 - trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui.

by jbosstools-commits＠lists.jboss.org

Author: rob.stryker(a)jboss.com Date: 2008-10-20 14:24:50 -0400 (Mon, 20 Oct 2008) New Revision: 11009 Modified: trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/ArchivesUIBuildListener.java trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/ArchivesUIMessages.java trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/ArchivesUIMessages.properties Log: JBIDE-2932 - error dialog shows node Modified: trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/ArchivesUIBuildListener.java =================================================================== --- trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/ArchivesUIBuildListener.java 2008-10-20 18:09:23 UTC (rev 11008) +++ trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/ArchivesUIBuildListener.java 2008-10-20 18:24:50 UTC (rev 11009) @@ -15,6 +15,7 @@ import org.eclipse.jface.dialogs.ErrorDialog; import org.eclipse.jface.dialogs.IDialogConstants; import org.eclipse.jface.resource.JFaceResources; +import org.eclipse.osgi.util.NLS; import org.eclipse.swt.SWT; import org.eclipse.swt.accessibility.AccessibleAdapter; import org.eclipse.swt.accessibility.AccessibleEvent; @@ -40,7 +41,7 @@ */ public class ArchivesUIBuildListener extends AbstractBuildListener { - public void error(IArchiveNode node, final IStatus[] multi) { + public void error(final IArchiveNode node, final IStatus[] multi) { final MultiStatus ms = new MultiStatus(ArchivesCore.PLUGIN_ID, 0, ArchivesUIMessages.BuildError, null); for( int i = 0; i < multi.length; i++ ) { ms.add(multi[i]); @@ -48,7 +49,10 @@ if( PrefsInitializer.getBoolean(PrefsInitializer.PREF_SHOW_BUILD_ERROR_DIALOG)) { Display.getDefault().asyncExec(new Runnable() { public void run() { - ErrorDialog ed = new ErrorDialogWithPreference(new Shell(), ArchivesUIMessages.BuildError, ArchivesUIMessages.BuildError, ms, IStatus.ERROR ); + ErrorDialog ed = new ErrorDialogWithPreference( + new Shell(), ArchivesUIMessages.BuildError, + NLS.bind(ArchivesUIMessages.BuildError2, node.toString()), + ms, IStatus.ERROR ); ed.open(); } } ); Modified: trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/ArchivesUIMessages.java =================================================================== --- trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/ArchivesUIMessages.java 2008-10-20 18:09:23 UTC (rev 11008) +++ trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/ArchivesUIMessages.java 2008-10-20 18:24:50 UTC (rev 11009) @@ -14,6 +14,7 @@ public class ArchivesUIMessages extends NLS { public static String BuildError; + public static String BuildError2; public static String DoNotShowThisAgain; public static String BuildArchivesNode; public static String SelectAProject; Modified: trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/ArchivesUIMessages.properties =================================================================== --- trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/ArchivesUIMessages.properties 2008-10-20 18:09:23 UTC (rev 11008) +++ trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/ArchivesUIMessages.properties 2008-10-20 18:24:50 UTC (rev 11009) @@ -1,4 +1,5 @@ BuildError=Error building project archives +BuildError2=Error building project archives node {0} DoNotShowThisAgain=Do not show this message again. BuildArchivesNode=Build Archive Node SelectAProject=Please select a project

17 years, 2 months

1
0
0 / 0

JBoss Tools SVN: r11008 - trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/util/internal.

by jbosstools-commits＠lists.jboss.org

Author: rob.stryker(a)jboss.com Date: 2008-10-20 14:09:23 -0400 (Mon, 20 Oct 2008) New Revision: 11008 Modified: trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/util/internal/ModelTruezipBridge.java Log: JBIDE-2852 - line numbers have changed but I've tried to NPE-proof it. Modified: trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/util/internal/ModelTruezipBridge.java =================================================================== --- trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/util/internal/ModelTruezipBridge.java 2008-10-20 17:11:39 UTC (rev 11007) +++ trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/util/internal/ModelTruezipBridge.java 2008-10-20 18:09:23 UTC (rev 11008) @@ -232,11 +232,14 @@ private static File[] getFiles(FileWrapper[] inputFiles, IArchiveFileSet fs ) { String filesetRelative; File fsFile = getFile(fs); - if( fsFile == null ) + if( fs == null || fsFile == null ) return new File[]{}; - File[] returnFiles = new File[inputFiles.length]; + ArrayList<File> returnFiles = new ArrayList<File>(); for( int i = 0; i < inputFiles.length; i++ ) { + if( inputFiles[i] == null ) + continue; + if( fs.isFlattened() ) filesetRelative = inputFiles[i].getOutputName(); else @@ -251,9 +254,9 @@ } else { parentFile = fsFile; } - returnFiles[i] = new File(parentFile, new Path(filesetRelative).lastSegment(), ArchiveDetector.DEFAULT); + returnFiles.add(new File(parentFile, new Path(filesetRelative).lastSegment(), ArchiveDetector.DEFAULT)); } - return returnFiles; + return (File[]) returnFiles.toArray(new File[returnFiles.size()]); }

17 years, 2 months

1
0
0 / 0

JBoss Tools SVN: r11007 - trunk/birt/docs/en/modules.

by jbosstools-commits＠lists.jboss.org

Author: abogachuk Date: 2008-10-20 13:11:39 -0400 (Mon, 20 Oct 2008) New Revision: 11007 Modified: trunk/birt/docs/en/modules/birt_designer.xml Log: https://jira.jboss.org/jira/browse/JBDS-388 - birt designer features and UI updated Modified: trunk/birt/docs/en/modules/birt_designer.xml =================================================================== --- trunk/birt/docs/en/modules/birt_designer.xml 2008-10-20 15:55:25 UTC (rev 11006) +++ trunk/birt/docs/en/modules/birt_designer.xml 2008-10-20 17:11:39 UTC (rev 11007) @@ -29,13 +29,13 @@ <para>The next part of user interface is different <property>Views</property> that can be arranged around the Layout Editor area the way you like:</para> <itemizedlist> - <listitem><para><emphasis role="bold">Palette</emphasis> - BIRT View that shows the standard report items you can add to your report using drag and drop.</para></listitem> - <listitem><para><emphasis role="bold">Outline</emphasis> - BIRT View that shows the structure of your report as a tree view.</para></listitem> - <listitem><para><emphasis role="bold">Navigator</emphasis> - Standard Eclipse view that shows your projects, and the reports within your projects.</para></listitem> - <listitem><para><emphasis role="bold">Data Explorer</emphasis> - BIRT View that shows your data sources (connections), data sets (queries) and report parameters. You also use this view to add data set columns to your report layout.</para></listitem> - <listitem><para><emphasis role="bold">Property Editor</emphasis> - BIRT View that displays properties for many report items. It has tabs and groupings that organize properties into categories.</para></listitem> - <listitem><para><emphasis role="bold">Properties View</emphasis> - Standard Eclipse view that shows all properties for a report item as a simple list. This view is optional, and we will not use it in this tutorial.</para></listitem> - <listitem><para><emphasis role="bold">Library Explorer View</emphasis> - BIRT allows the reuse of report objects, such as tables, data sources and styles. Objects created for reuse are stored in a library file. The Library Explorer will display Libraries that exist in the resource folder. Developed libraries can be added to the resource folder by selecting File→Publish Library to Resource Folder or by right clicking in Library Explorer and selecting add. The resource folder location can be configured. </para></listitem> + <listitem><para><emphasis role="bold">Palette</emphasis> - shows the standard report items you can add to your report using drag and drop.</para></listitem> + <listitem><para><emphasis role="bold">Outline</emphasis> - shows the structure of your report as a tree view.</para></listitem> + <listitem><para><emphasis role="bold">Navigator</emphasis> - shows your projects and reports within the projects.</para></listitem> + <listitem><para><emphasis role="bold">Data Explorer</emphasis> - shows your data sources, data sets and report parameters. You also can use this view to add data set columns to your report layout.</para></listitem> + <listitem><para><emphasis role="bold">Property Editor</emphasis> - displays properties for many report items.</para></listitem> + <listitem><para><emphasis role="bold">Properties View</emphasis> - shows all properties for a report item as a simple list.</para></listitem> + <listitem><para><emphasis role="bold">Library Explorer View</emphasis> - allows the reuse of report objects, such as tables, data sources and styles. Objects created for reuse are stored in a library file. The Library Explorer will display Libraries that exist in the Resource folder. Developed libraries can be added to the resource folder by selecting <emphasis>File→Publish Library in Resource Folder</emphasis>. The resource folder location can be configured. </para></listitem> @@ -60,23 +60,12 @@ <listitem><para><emphasis role="bold">Report Preview</emphasis> - Report Preview is used to test your newly created report with some real data.</para></listitem> <listitem><para><emphasis role="bold">Chart Builder</emphasis> - using the Chart Builder you can add any charts to the design of your report. Just select a chart type, then data and, finally, format the chart.</para></listitem> <listitem><para><emphasis role="bold">Expression Builder </emphasis> - expressions are simple scripts that return a value. They are used to assign data values to report elements, build image locations, hyperlinks, parameter default values etc.</para></listitem> - <listitem><para><emphasis role="bold">Cheat Sheets</emphasis> - Cheat sheets are small pices of useful dosumentation that lead you through a report creation process. Just select when you need and then follow the instructions.</para></listitem> + <listitem><para><emphasis role="bold">Cheat Sheets</emphasis> - Cheat sheets are small pices of useful documentation that lead you through a report creation process. Just select what you need and then follow the instructions.</para></listitem> <listitem><para><emphasis role="bold">Outline</emphasis> - this view provides a compact overview of the entire report structure.</para></listitem> </itemizedlist> - <para>There are a number of ways we can improve the report's appearance: </para> - - <itemizedlist> - <listitem><para>Add a title to the top of the report;</para></listitem> - <listitem><para> Add a title to the top of the report. </para></listitem> - <listitem><para> Add some color to enhance the column headings. </para></listitem> - <listitem><para> Shrink the size of the city and state columns. </para></listitem> - <listitem><para>Add some color to make the state and city group headers stand out. </para></listitem> - <listitem><para>Format the phone numbers. </para></listitem> - <listitem><para>Sort customers by name.</para></listitem> - </itemizedlist> - </section> + </section> </chapter>

17 years, 2 months

1
0
0 / 0

JBoss Tools SVN: r11006 - /.

by jbosstools-commits＠lists.jboss.org

Author: yradtsevich Date: 2008-10-20 11:55:25 -0400 (Mon, 20 Oct 2008) New Revision: 11006 Added: org.jboss.ide.eclipse.core/ Log: Initial import.

17 years, 2 months

1
0
0 / 0

JBoss Tools SVN: r11005 - branches/jbosstools-3.0.0.Beta1/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/commands.

by jbosstools-commits＠lists.jboss.org

Author: scabanovich Date: 2008-10-20 11:20:16 -0400 (Mon, 20 Oct 2008) New Revision: 11005 Modified: branches/jbosstools-3.0.0.Beta1/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/commands/AddExceptionOnDiagramHandler.java Log: JBIDE-2770 Modified: branches/jbosstools-3.0.0.Beta1/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/commands/AddExceptionOnDiagramHandler.java =================================================================== --- branches/jbosstools-3.0.0.Beta1/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/commands/AddExceptionOnDiagramHandler.java 2008-10-20 15:18:32 UTC (rev 11004) +++ branches/jbosstools-3.0.0.Beta1/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/commands/AddExceptionOnDiagramHandler.java 2008-10-20 15:20:16 UTC (rev 11005) @@ -52,7 +52,7 @@ e.addChild(c); m.addChild(e); m.setModified(true); - String pp = e.getPathPart(); + String pp = "exception:" + e.getPathPart(); XModelObject created = diagram.getChildByPath(pp); String shape = AddExceptionHandler.getShape(p); if(created != null && shape != null) created.setAttributeValue("shape", shape);

17 years, 2 months

1
0
0 / 0

JBoss Tools SVN: r11004 - trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/commands.

by jbosstools-commits＠lists.jboss.org

Author: scabanovich Date: 2008-10-20 11:18:32 -0400 (Mon, 20 Oct 2008) New Revision: 11004 Modified: trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/commands/AddExceptionOnDiagramHandler.java Log: JBIDE-2770 Modified: trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/commands/AddExceptionOnDiagramHandler.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/commands/AddExceptionOnDiagramHandler.java 2008-10-20 15:01:18 UTC (rev 11003) +++ trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/commands/AddExceptionOnDiagramHandler.java 2008-10-20 15:18:32 UTC (rev 11004) @@ -52,7 +52,7 @@ e.addChild(c); m.addChild(e); m.setModified(true); - String pp = e.getPathPart(); + String pp = "exception:" + e.getPathPart(); XModelObject created = diagram.getChildByPath(pp); String shape = AddExceptionHandler.getShape(p); if(created != null && shape != null) created.setAttributeValue("shape", shape);

17 years, 2 months

1
0
0 / 0

JBoss Tools SVN: r11003 - in branches/jbosstools-3.0.0.Beta1/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam: internal/core and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: scabanovich Date: 2008-10-20 11:01:18 -0400 (Mon, 20 Oct 2008) New Revision: 11003 Modified: branches/jbosstools-3.0.0.Beta1/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/BijectedAttributeType.java branches/jbosstools-3.0.0.Beta1/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/BijectedAttribute.java Log: JBIDE-2928 Modified: branches/jbosstools-3.0.0.Beta1/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/BijectedAttributeType.java =================================================================== --- branches/jbosstools-3.0.0.Beta1/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/BijectedAttributeType.java 2008-10-20 14:57:43 UTC (rev 11002) +++ branches/jbosstools-3.0.0.Beta1/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/BijectedAttributeType.java 2008-10-20 15:01:18 UTC (rev 11003) @@ -17,17 +17,19 @@ * @author Alexey Kazakov */ public enum BijectedAttributeType implements SeamAnnotations { - IN(IN_ANNOTATION_TYPE, true), - OUT(OUT_ANNOTATION_TYPE, true), - DATA_BINDER(DATA_MODEL_ANNOTATION_TYPE, true), - DATA_MODEL_SELECTION(DATA_MODEL_SELECTION_ANNOTATION_TYPE, false), - DATA_MODEL_SELECTION_INDEX(DATA_MODEL_SELECTION_INDEX_ANNOTATION_TYPE, false); + IN(IN_ANNOTATION_TYPE, true, false), + OUT(OUT_ANNOTATION_TYPE, true, true), + DATA_BINDER(DATA_MODEL_ANNOTATION_TYPE, true, true), + DATA_MODEL_SELECTION(DATA_MODEL_SELECTION_ANNOTATION_TYPE, false, true), + DATA_MODEL_SELECTION_INDEX(DATA_MODEL_SELECTION_INDEX_ANNOTATION_TYPE, false, true); boolean isUsingMemberName; + boolean isOutjection; - BijectedAttributeType(String annotationType, boolean isUsingMemberName) { + BijectedAttributeType(String annotationType, boolean isUsingMemberName, boolean isOutjection) { this.annotationType = annotationType; this.isUsingMemberName = isUsingMemberName; + this.isOutjection = isOutjection; } String annotationType; @@ -43,4 +45,8 @@ return isUsingMemberName; } -} \ No newline at end of file + public boolean isOut() { + return isOutjection; + } + +} Modified: branches/jbosstools-3.0.0.Beta1/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/BijectedAttribute.java =================================================================== --- branches/jbosstools-3.0.0.Beta1/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/BijectedAttribute.java 2008-10-20 14:57:43 UTC (rev 11002) +++ branches/jbosstools-3.0.0.Beta1/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/BijectedAttribute.java 2008-10-20 15:01:18 UTC (rev 11003) @@ -43,9 +43,11 @@ } public boolean isContextVariable() { - //TODO which else? - return isOfType(BijectedAttributeType.OUT) - || isOfType(BijectedAttributeType.DATA_BINDER); + if(types == null || types.length == 0) return false; + for (int i = 0; i < types.length; i++) { + if(types[i].isOut()) return true; + } + return false; } public void setTypes(BijectedAttributeType[] types) {

17 years, 2 months

1
0
0 / 0

JBoss Tools SVN: r11002 - in trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam: internal/core and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: scabanovich Date: 2008-10-20 10:57:43 -0400 (Mon, 20 Oct 2008) New Revision: 11002 Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/BijectedAttributeType.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/BijectedAttribute.java Log: JBIDE-2928 Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/BijectedAttributeType.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/BijectedAttributeType.java 2008-10-20 14:47:54 UTC (rev 11001) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/BijectedAttributeType.java 2008-10-20 14:57:43 UTC (rev 11002) @@ -17,17 +17,19 @@ * @author Alexey Kazakov */ public enum BijectedAttributeType implements SeamAnnotations { - IN(IN_ANNOTATION_TYPE, true), - OUT(OUT_ANNOTATION_TYPE, true), - DATA_BINDER(DATA_MODEL_ANNOTATION_TYPE, true), - DATA_MODEL_SELECTION(DATA_MODEL_SELECTION_ANNOTATION_TYPE, false), - DATA_MODEL_SELECTION_INDEX(DATA_MODEL_SELECTION_INDEX_ANNOTATION_TYPE, false); + IN(IN_ANNOTATION_TYPE, true, false), + OUT(OUT_ANNOTATION_TYPE, true, true), + DATA_BINDER(DATA_MODEL_ANNOTATION_TYPE, true, true), + DATA_MODEL_SELECTION(DATA_MODEL_SELECTION_ANNOTATION_TYPE, false, true), + DATA_MODEL_SELECTION_INDEX(DATA_MODEL_SELECTION_INDEX_ANNOTATION_TYPE, false, true); boolean isUsingMemberName; + boolean isOutjection; - BijectedAttributeType(String annotationType, boolean isUsingMemberName) { + BijectedAttributeType(String annotationType, boolean isUsingMemberName, boolean isOutjection) { this.annotationType = annotationType; this.isUsingMemberName = isUsingMemberName; + this.isOutjection = isOutjection; } String annotationType; @@ -43,4 +45,8 @@ return isUsingMemberName; } -} \ No newline at end of file + public boolean isOut() { + return isOutjection; + } + +} Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/BijectedAttribute.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/BijectedAttribute.java 2008-10-20 14:47:54 UTC (rev 11001) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/BijectedAttribute.java 2008-10-20 14:57:43 UTC (rev 11002) @@ -43,9 +43,11 @@ } public boolean isContextVariable() { - //TODO which else? - return isOfType(BijectedAttributeType.OUT) - || isOfType(BijectedAttributeType.DATA_BINDER); + if(types == null || types.length == 0) return false; + for (int i = 0; i < types.length; i++) { + if(types[i].isOut()) return true; + } + return false; } public void setTypes(BijectedAttributeType[] types) {

17 years, 2 months

1
0
0 / 0

JBoss Tools SVN: r11001 - in trunk/jsf: tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent and 2 other directories.

by jbosstools-commits＠lists.jboss.org

Author: yradtsevich Date: 2008-10-20 10:47:54 -0400 (Mon, 20 Oct 2008) New Revision: 11001 Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/subTable.xhtml trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/subTable.xhtml.xml Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesDataTableTemplate.java trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesSubTableTemplate.java trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/index.html trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesComponentTest.java Log: - Bug fix https://jira.jboss.org/jira/browse/JBIDE-2879 . - A little refactoring made. Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesDataTableTemplate.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesDataTableTemplate.java 2008-10-20 14:46:20 UTC (rev 11000) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesDataTableTemplate.java 2008-10-20 14:47:54 UTC (rev 11001) @@ -342,7 +342,28 @@ return Math.max(currentLength,count); } + + + /** + * @see org.jboss.tools.vpe.editor.template.VpeAbstractTemplate#validate(org.jboss.tools.vpe.editor.context.VpePageContext, org.w3c.dom.Node, org.mozilla.interfaces.nsIDOMDocument, org.jboss.tools.vpe.editor.template.VpeCreationData) + */ @Override + public void validate(VpePageContext pageContext, Node sourceNode, + nsIDOMDocument visualDocument, VpeCreationData data) { + Element sourceElement = (Element) sourceNode; + List<Node> children = ComponentUtil.getChildren(sourceElement); + if (children != null) { + for (Node child : children) { + if (child.getNodeName().endsWith(RichFaces.TAG_SUB_TABLE)) { + RichFacesSubTableTemplate.DEFAULT_INSTANCE.validate(pageContext, child, visualDocument, data); + } + } + } + + super.validate(pageContext, sourceNode, visualDocument, data); + } + + @Override public void removeAttribute(VpePageContext pageContext, Element sourceElement, nsIDOMDocument visualDocument, nsIDOMNode visualNode, Object data, String name) { nsIDOMElement visualElement = (nsIDOMElement)visualNode.queryInterface(nsIDOMElement.NS_IDOMELEMENT_IID); visualElement.removeAttribute(name); @@ -353,5 +374,4 @@ nsIDOMElement visualElement = (nsIDOMElement)visualNode.queryInterface(nsIDOMElement.NS_IDOMELEMENT_IID); visualElement.setAttribute(name, value); } - } \ No newline at end of file Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesSubTableTemplate.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesSubTableTemplate.java 2008-10-20 14:46:20 UTC (rev 11000) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesSubTableTemplate.java 2008-10-20 14:47:54 UTC (rev 11001) @@ -7,27 +7,55 @@ * * Contributors: * Exadel, Inc. and Red Hat, Inc. - initial API and implementation - ******************************************************************************/ + ******************************************************************************/ package org.jboss.tools.jsf.vpe.richfaces.template; import java.util.ArrayList; import java.util.List; import org.jboss.tools.jsf.vpe.richfaces.ComponentUtil; +import org.jboss.tools.jsf.vpe.richfaces.template.util.RichFaces; import org.jboss.tools.vpe.editor.context.VpePageContext; import org.jboss.tools.vpe.editor.template.VpeAbstractTemplate; import org.jboss.tools.vpe.editor.template.VpeChildrenInfo; import org.jboss.tools.vpe.editor.template.VpeCreationData; +import org.jboss.tools.vpe.editor.template.expression.VpeExpression; +import org.jboss.tools.vpe.editor.template.expression.VpeExpressionBuilder; +import org.jboss.tools.vpe.editor.template.expression.VpeExpressionBuilderException; +import org.jboss.tools.vpe.editor.template.expression.VpeExpressionException; +import org.jboss.tools.vpe.editor.util.HTML; +import org.jboss.tools.vpe.editor.util.VpeClassUtil; import org.mozilla.interfaces.nsIDOMDocument; import org.mozilla.interfaces.nsIDOMElement; import org.mozilla.interfaces.nsIDOMNode; +import org.mozilla.interfaces.nsIDOMNodeList; import org.w3c.dom.Element; import org.w3c.dom.Node; public class RichFacesSubTableTemplate extends VpeAbstractTemplate { + /** + * + */ + private static final String VAL_TRUE = "true"; + /** + * + */ + private static final String ATTR_BREAK_BEFORE = "breakBefore"; //$NON-NLS-1$ + /** + * + */ + private static final String COLUMN_CLASSES_EXPRESSION = "{@columnClasses}"; //$NON-NLS-1$ + /** + * + */ + private static final String ROW_CLASSES_EXPRESSION = "{@rowClasses}"; //$NON-NLS-1$ + private static final String DEAFAULT_CELL_CLASS = "dr-subtable-cell rich-subtable-cell"; //$NON-NLS-1$ + private static List<String> rowClasses; + private static List<String> columnClasses; public static RichFacesSubTableTemplate DEFAULT_INSTANCE = new RichFacesSubTableTemplate(); + public RichFacesSubTableTemplate() { super(); } @@ -41,67 +69,79 @@ * @param parentVisualNode * @return */ - public VpeCreationData encode(VpeCreationData creationData, Element sourceElement, nsIDOMDocument visualDocument, nsIDOMElement parentVisualNode) { + public VpeCreationData encode(VpeCreationData creationData, final Element sourceElement, final nsIDOMDocument visualDocument, final nsIDOMElement parentVisualNode) { if(creationData!=null) { // Encode header encodeHeader(creationData, sourceElement, visualDocument, parentVisualNode); } - nsIDOMElement tr = visualDocument.createElement("tr"); - ComponentUtil.copyAttributes(sourceElement, tr); + initClasses(sourceElement, null); + nsIDOMElement curTr = visualDocument.createElement(HTML.TAG_TR); + ComponentUtil.copyAttributes(sourceElement, curTr); + boolean header = false; boolean footer = false; + int curRow = 0; + int curColumn = 0; + if(isHeader(sourceElement)) { - tr.setAttribute("class", getHeaderClass()); - String style = getHeaderBackgoundImgStyle(); + curTr.setAttribute(HTML.ATTR_CLASS, getHeaderClass()); + final String style = getHeaderBackgoundImgStyle(); if(style!=null) { - tr.setAttribute("style", style); + curTr.setAttribute(HTML.ATTR_STYLE, style); } header = true; } else if(isFooter(sourceElement)) { - tr.setAttribute("class", getFooterClass()); + curTr.setAttribute(HTML.ATTR_CLASS, getFooterClass()); footer = true; } else { - tr.setAttribute("class", getCellClass()); + curTr.setAttribute(HTML.ATTR_CLASS, getRowClass(curRow)); } if(creationData==null) { // Method was called from create() - creationData = new VpeCreationData(tr); + creationData = new VpeCreationData(curTr); } else { // Method was called from dataTable - parentVisualNode.appendChild(tr); + parentVisualNode.appendChild(curTr); } // Create mapping to Encode body - VpeChildrenInfo trInfo = new VpeChildrenInfo(tr); - creationData.addChildrenInfo(trInfo); - List<Node> children = ComponentUtil.getChildren(sourceElement); - for (Node child : children) { - if(child.getNodeName().endsWith(":column")) { - String breakBefore = ((Element)child).getAttribute("breakBefore"); - if(breakBefore!=null && breakBefore.equalsIgnoreCase("true")) { - // Start new TR - tr = visualDocument.createElement("tr"); + VpeChildrenInfo trChildrenInfo = new VpeChildrenInfo(curTr); + final List<Node> children = ComponentUtil.getChildren(sourceElement); + for (final Node child : children) { + if (child.getNodeName().endsWith(':' + RichFaces.TAG_COLUMN)) { + final boolean breakBefore = VAL_TRUE.equals( ((Element)child).getAttribute(ATTR_BREAK_BEFORE) ); + if (breakBefore) { + curRow++; + curColumn = 0; + curTr = visualDocument.createElement(HTML.TAG_TR); + ComponentUtil.copyAttributes(sourceElement, curTr); + if(header) { - tr.setAttribute("class", getHeaderContinueClass()); + curTr.setAttribute(HTML.ATTR_CLASS, getHeaderContinueClass()); } else if(footer) { - tr.setAttribute("class", getFooterContinueClass()); + curTr.setAttribute(HTML.ATTR_CLASS, getFooterContinueClass()); } else { - tr.setAttribute("class", getCellClass()); + curTr.setAttribute(HTML.ATTR_CLASS, getRowClass(curRow)); } - ComponentUtil.copyAttributes(sourceElement, tr); - if(parentVisualNode!=null) { - parentVisualNode.appendChild(tr); - } - trInfo = new VpeChildrenInfo(tr); - creationData.addChildrenInfo(trInfo); + + parentVisualNode.appendChild(curTr); + trChildrenInfo = new VpeChildrenInfo(curTr); + creationData.addChildrenInfo(trChildrenInfo); } + + final VpeChildrenInfo innerTdChildrenInfo = new VpeChildrenInfo(curTr); + creationData.addChildrenInfo(innerTdChildrenInfo); + innerTdChildrenInfo.addSourceChild(child); + curColumn++; + } else { + trChildrenInfo.addSourceChild(child); } - trInfo.addSourceChild(child); } + if(parentVisualNode!=null) { // Encode footer encodeFooter(creationData, sourceElement, visualDocument, parentVisualNode); @@ -110,48 +150,84 @@ return creationData; } - public VpeCreationData create(VpePageContext pageContext, Node sourceNode, nsIDOMDocument visualDocument) { - Element sourceElement = (Element)sourceNode; + /** Adds necessary attributes to its children.*/ + @Override + public void validate(final VpePageContext pageContext, final Node sourceNode, + final nsIDOMDocument visualDocument, final VpeCreationData creationData) { + initClasses(sourceNode, pageContext); + final List<VpeChildrenInfo> childrenInfoList = creationData.getChildrenInfoList(); + if (childrenInfoList != null) { + for (final VpeChildrenInfo childrenInfo : childrenInfoList) { + final List<Node> sourceChildren = childrenInfo.getSourceChildren(); + if (sourceChildren != null + && sourceChildren.size() > 0 + && sourceChildren.get(0).getParentNode() == sourceNode) { + final nsIDOMNodeList visualChildren = childrenInfo.getVisualParent().getChildNodes(); + addStylesToCells(visualDocument, visualChildren); + } + } + } + } + + /** Adds HTML style classes names to all TDs from the list <code>visualChildren</code> + * according to <code>columnClasses</code> attribute of the tag. */ + private void addStylesToCells(nsIDOMDocument visualDocument, nsIDOMNodeList visualChildren) { + int column = 0; + for (int i = 0; i < visualChildren.getLength(); i++) { + final nsIDOMNode visualChild = visualChildren.item(i); + if ( visualChild.getNodeType() == nsIDOMNode.ELEMENT_NODE && HTML.TAG_TD.equalsIgnoreCase(visualChild.getNodeName()) ) { + final nsIDOMNode tableCell = visualChild; + nsIDOMNode columnStyle = tableCell.getAttributes().getNamedItem(HTML.ATTR_CLASS); + if (columnStyle == null) { + columnStyle = visualDocument.createAttribute(HTML.ATTR_CLASS); + } + columnStyle.setNodeValue(columnStyle.getNodeValue() + ' ' + getColumnClass(column)); + column++; + } + } + } - VpeCreationData creationData = encode(null, sourceElement, visualDocument, null); + public VpeCreationData create(final VpePageContext pageContext, final Node sourceNode, final nsIDOMDocument visualDocument) { + final Element sourceElement = (Element)sourceNode; + final VpeCreationData creationData = encode(null, sourceElement, visualDocument, null); return creationData; } - protected void encodeHeader(VpeCreationData creationData, Element sourceElement, nsIDOMDocument visualDocument, nsIDOMElement parentVisualNode) { + protected void encodeHeader(final VpeCreationData creationData, final Element sourceElement, final nsIDOMDocument visualDocument, final nsIDOMElement parentVisualNode) { encodeHeaderOrFooter(creationData, sourceElement, visualDocument, parentVisualNode, "header", "dr-subtable-header rich-subtable-header", "dr-subtable-headercell rich-subtable-headercell"); } - protected void encodeFooter(VpeCreationData creationData, Element sourceElement, nsIDOMDocument visualDocument, nsIDOMElement parentVisualNode) { + protected void encodeFooter(final VpeCreationData creationData, final Element sourceElement, final nsIDOMDocument visualDocument, final nsIDOMElement parentVisualNode) { encodeHeaderOrFooter(creationData, sourceElement, visualDocument, parentVisualNode, "footer", "dr-subtable-footer rich-subtable-footer", "dr-subtable-footercell rich-subtable-footercell"); } - protected void encodeHeaderOrFooter(VpeCreationData creationData, Element sourceElement, nsIDOMDocument visualDocument, nsIDOMElement parentVisualNode, String facetName, String trClass, String tdClass) { - ArrayList<Element> columns = RichFacesDataTableTemplate.getColumns(sourceElement); - ArrayList<Element> columnsHeaders = RichFacesDataTableTemplate.getColumnsWithFacet(columns, facetName); + protected void encodeHeaderOrFooter(final VpeCreationData creationData, final Element sourceElement, final nsIDOMDocument visualDocument, final nsIDOMElement parentVisualNode, final String facetName, final String trClass, final String tdClass) { + final ArrayList<Element> columns = RichFacesDataTableTemplate.getColumns(sourceElement); + final ArrayList<Element> columnsHeaders = RichFacesDataTableTemplate.getColumnsWithFacet(columns, facetName); if(!columnsHeaders.isEmpty()) { - nsIDOMElement tr = visualDocument.createElement("tr"); + final nsIDOMElement tr = visualDocument.createElement(HTML.TAG_TR); parentVisualNode.appendChild(tr); - String styleClass = trClass; + final String styleClass = trClass; if(styleClass!=null) { - tr.setAttribute("class", styleClass); + tr.setAttribute(HTML.ATTR_CLASS, styleClass); } RichFacesDataTableTemplate.encodeHeaderOrFooterFacets(creationData, tr, visualDocument, columnsHeaders, tdClass, - null, facetName, "td"); + null, facetName, HTML.TAG_TD); } } - private boolean isHeader(Element sourceElement) { + private boolean isHeader(final Element sourceElement) { return icludedInFacet(sourceElement, "header"); } - private boolean isFooter(Element sourceElement) { + private boolean isFooter(final Element sourceElement) { return icludedInFacet(sourceElement, "footer"); } - private boolean icludedInFacet(Element sourceElement, String facetName) { - Node parent = sourceElement.getParentNode(); + private boolean icludedInFacet(final Element sourceElement, final String facetName) { + final Node parent = sourceElement.getParentNode(); return parent!=null && ComponentUtil.isFacet(parent, facetName); } @@ -171,23 +247,64 @@ return "dr-subtable-footer-continue rich-subtable-footer-continue"; } - protected String getCellClass() { - return "dr-subtable-cell rich-subtable-cell"; + private String getRowClass(final int row) { + StringBuffer rowClass = new StringBuffer(DEAFAULT_CELL_CLASS); + + if (rowClasses != null) { + final int rowClassesSize = rowClasses.size(); + if(rowClassesSize > 0) { + rowClass = new StringBuffer(rowClasses.get(row % rowClassesSize)); + } + } + + return rowClass.toString(); } + private String getColumnClass(final int column) { + StringBuffer columnClass = new StringBuffer(DEAFAULT_CELL_CLASS); + if (columnClasses != null) { + final int columnClassesSize = columnClasses.size(); + if (columnClassesSize > 0) { + columnClass = new StringBuffer(columnClasses.get(column % columnClassesSize)); + } + } + return columnClass.toString(); + } + + private void initClasses(final Node sourceNode, final VpePageContext pageContext) { + VpeExpression rowClassesExpr; + VpeExpression columnClassesExpr; + try { + rowClassesExpr = VpeExpressionBuilder + .buildCompletedExpression(ROW_CLASSES_EXPRESSION, caseSensitive).getExpression(); + columnClassesExpr = VpeExpressionBuilder + .buildCompletedExpression(COLUMN_CLASSES_EXPRESSION, caseSensitive).getExpression(); + } catch (final VpeExpressionBuilderException e) { + throw new RuntimeException(e); + } + + try { + rowClasses = VpeClassUtil.getClasses(rowClassesExpr, sourceNode, + pageContext); + columnClasses = VpeClassUtil.getClasses(columnClassesExpr, sourceNode, + pageContext); + } catch (final VpeExpressionException e) { + throw new RuntimeException(e); + } + } + protected String getHeaderBackgoundImgStyle() { return null; } - @Override - public void removeAttribute(VpePageContext pageContext, Element sourceElement, nsIDOMDocument visualDocument, nsIDOMNode visualNode, Object data, String name) { - nsIDOMElement visualElement = (nsIDOMElement)visualNode.queryInterface(nsIDOMElement.NS_IDOMELEMENT_IID); - visualElement.removeAttribute(name); - } + /* (non-Javadoc) + * @see org.jboss.tools.vpe.editor.template.VpeAbstractTemplate#isRecreateAtAttrChange(org.jboss.tools.vpe.editor.context.VpePageContext, org.w3c.dom.Element, org.mozilla.interfaces.nsIDOMDocument, org.mozilla.interfaces.nsIDOMElement, java.lang.Object, java.lang.String, java.lang.String) + */ @Override - public void setAttribute(VpePageContext pageContext, Element sourceElement, nsIDOMDocument visualDocument, nsIDOMNode visualNode, Object data, String name, String value) { - nsIDOMElement visualElement = (nsIDOMElement)visualNode.queryInterface(nsIDOMElement.NS_IDOMELEMENT_IID); - visualElement.setAttribute(name, value); + public boolean isRecreateAtAttrChange(final VpePageContext pageContext, + final Element sourceElement, final nsIDOMDocument visualDocument, + final nsIDOMElement visualNode, final Object data, final String name, final String value) { + return true; } } \ No newline at end of file Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/index.html =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/index.html 2008-10-20 14:46:20 UTC (rev 11000) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/index.html 2008-10-20 14:47:54 UTC (rev 11001) @@ -7,7 +7,7 @@ <a href="jsf2test/pages/components/head2.xhtml">h:head (2nd)</a> <a href="jsf2test/pages/components/body1.xhtml">h:body (1st)</a> <a href="jsf2test/pages/components/body2.xhtml">h:body (2st)</a> - <a href="jsf2test/pages/components/outputScript.xhtml">h:outputScript</a> - <a href="jsf2test/pages/components/outputStylesheet.xhtml">h:outputStylesheet</a> + <a href="jsf2test/pages/components/outputScript.xhtml">h:outputScript</a> + <a href="jsf2test/pages/components/outputStylesheet.xhtml">h:outputStylesheet</a> </body> </html> Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/subTable.xhtml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/subTable.xhtml (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/subTable.xhtml 2008-10-20 14:47:54 UTC (rev 11001) @@ -0,0 +1,96 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:a4j="http://richfaces.org/a4j" + xmlns:rich="http://richfaces.org/rich"> + +<f:loadBundle basename="jsftraining.messages" var="msg" /> + +<head> +<style type="text/css"> + .redText { + color:red; + background: yellow + } + .blueText { + color:blue; + background: lime; + font-weight: bold; + } +</style> +<title></title> +<link rel="stylesheet" + href="${facesContext.externalContext.requestContextPath}/pages/main.css" /> +</head> +<body> + <f:view> + <h:form> + <rich:dataTable id="dataTableID" value="#{bookList.label}" var="label"> + <rich:subTable value="#{bookList.bookList}" var="book" rowClasses="redText, blueText" columnClasses="redText, blueText"> + <rich:column rowspan="2"> + <h:outputText value="#{book.price}" /> + </rich:column> + <rich:column> + <h:outputText value="#{book.numOfCopies}" /> + </rich:column> + <rich:column> + <h:outputText value="#{book.numOfCopies}" /> + </rich:column> + <rich:column breakBefore="true"> + <h:outputText value="#{book.numOfCopies}" /> + </rich:column> + <rich:column rowspan="2" > + <h:outputText value="#{book.numOfCopies}"/> + </rich:column> + <rich:column breakBefore="true"> + <h:outputText value="#{book.numOfCopies}" /> + </rich:column> + <rich:column> + <h:outputText value="#{book.numOfCopies}" /> + </rich:column> + <rich:column colspan="2" breakBefore="true"> + <h:outputText value="#{book.numOfCopies}" /> + </rich:column> + <rich:column> + <h:outputText value="#{book.numOfCopies}" /> + </rich:column> + </rich:subTable> + <rich:column colspan="3"> + <h:outputText value="#{book.price}" /> + </rich:column> + <rich:subTable value="#{bookList.bookList}" var="book" rowClasses="redText, blueText" columnClasses="redText, blueText"> + <rich:column rowspan="2"> + <h:outputText value="#{book.price}" /> + </rich:column> + <rich:column> + <h:outputText value="#{book.numOfCopies}" /> + </rich:column> + <rich:column> + <h:outputText value="#{book.numOfCopies}" /> + </rich:column> + <rich:column breakBefore="true"> + <h:outputText value="#{book.numOfCopies}" /> + </rich:column> + <rich:column rowspan="2" > + <h:outputText value="#{book.numOfCopies}"/> + </rich:column> + <rich:column breakBefore="true"> + <h:outputText value="#{book.numOfCopies}" /> + </rich:column> + <rich:column> + <h:outputText value="#{book.numOfCopies}" /> + </rich:column> + <rich:column colspan="2" breakBefore="true"> + <h:outputText value="#{book.numOfCopies}" /> + </rich:column> + <rich:column> + <h:outputText value="#{book.numOfCopies}" /> + </rich:column> + </rich:subTable> + </rich:dataTable> + </h:form> + </f:view> +</body> +</html> \ No newline at end of file Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/subTable.xhtml.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/subTable.xhtml.xml (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/subTable.xhtml.xml 2008-10-20 14:47:54 UTC (rev 11001) @@ -0,0 +1,100 @@ +<tests> + <test id="dataTableID"> + <colgroup span="3"></colgroup> + <tbody> + <tr value="#{bookList.bookList}" var="book" rowclasses="redText, blueText" + columnclasses="redText, blueText" class="redText"> + <td class="dr-table-cell rich-table-cell redText redText redText" + rowspan="2"> + #{book.price} + </td> + <td class="dr-table-cell rich-table-cell blueText blueText blueText"> + #{book.numOfCopies} + </td> + <td class="dr-table-cell rich-table-cell redText redText redText"> + #{book.numOfCopies} + </td> + </tr> + <tr value="#{bookList.bookList}" var="book" rowclasses="redText, blueText" + columnclasses="redText, blueText" class="blueText"> + <td class="dr-table-cell rich-table-cell redText redText" + breakbefore="true"> + #{book.numOfCopies} + </td> + <td class="dr-table-cell rich-table-cell blueText blueText" + rowspan="2"> + #{book.numOfCopies} + </td> + </tr> + <tr value="#{bookList.bookList}" var="book" rowclasses="redText, blueText" + columnclasses="redText, blueText" class="redText"> + <td class="dr-table-cell rich-table-cell redText redText" + breakbefore="true"> + #{book.numOfCopies} + </td> + <td class="dr-table-cell rich-table-cell blueText blueText"> + #{book.numOfCopies} + </td> + </tr> + <tr value="#{bookList.bookList}" var="book" rowclasses="redText, blueText" + columnclasses="redText, blueText" class="blueText"> + <td class="dr-table-cell rich-table-cell redText redText" + colspan="2" breakbefore="true"> + #{book.numOfCopies} + </td> + <td class="dr-table-cell rich-table-cell blueText blueText"> + #{book.numOfCopies} + </td> + </tr> + <tr class="dr-table-firstrow rich-table-firstrow"> + <td class="dr-table-cell rich-table-cell" colspan="3"> + #{book.price} + </td> + </tr> + <tr value="#{bookList.bookList}" var="book" rowclasses="redText, blueText" + columnclasses="redText, blueText" class="redText"> + <td class="dr-table-cell rich-table-cell redText redText redText" + rowspan="2"> + #{book.price} + </td> + <td class="dr-table-cell rich-table-cell blueText blueText blueText"> + #{book.numOfCopies} + </td> + <td class="dr-table-cell rich-table-cell redText redText redText"> + #{book.numOfCopies} + </td> + </tr> + <tr value="#{bookList.bookList}" var="book" rowclasses="redText, blueText" + columnclasses="redText, blueText" class="blueText"> + <td class="dr-table-cell rich-table-cell redText redText" + breakbefore="true"> + #{book.numOfCopies} + </td> + <td class="dr-table-cell rich-table-cell blueText blueText" + rowspan="2"> + #{book.numOfCopies} + </td> + </tr> + <tr value="#{bookList.bookList}" var="book" rowclasses="redText, blueText" + columnclasses="redText, blueText" class="redText"> + <td class="dr-table-cell rich-table-cell redText redText" + breakbefore="true"> + #{book.numOfCopies} + </td> + <td class="dr-table-cell rich-table-cell blueText blueText"> + #{book.numOfCopies} + </td> + </tr> + <tr value="#{bookList.bookList}" var="book" rowclasses="redText, blueText" + columnclasses="redText, blueText" class="blueText"> + <td class="dr-table-cell rich-table-cell redText redText" + colspan="2" breakbefore="true"> + #{book.numOfCopies} + </td> + <td class="dr-table-cell rich-table-cell blueText blueText"> + #{book.numOfCopies} + </td> + </tr> + </tbody> + </test> +</tests> \ No newline at end of file Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesComponentTest.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesComponentTest.java 2008-10-20 14:46:20 UTC (rev 11000) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesComponentTest.java 2008-10-20 14:47:54 UTC (rev 11001) @@ -213,4 +213,9 @@ performTestForVpeComponent((IFile) TestUtil.getComponentPath( "components/listShuttle.xhtml", RichFacesAllTests.IMPORT_PROJECT_NAME)); //$NON-NLS-1$ } + + public void testSubTable() throws Throwable { + performTestForVpeComponent((IFile) TestUtil.getComponentPath( + "components/subTable.xhtml", RichFacesAllTests.IMPORT_PROJECT_NAME)); //$NON-NLS-1$ + } }

17 years, 2 months

1
0
0 / 0

JBoss Tools SVN: r11000 - branches/jbosstools-3.0.0.Beta1/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/process.

by jbosstools-commits＠lists.jboss.org

Author: vyemialyanchyk Date: 2008-10-20 10:46:20 -0400 (Mon, 20 Oct 2008) New Revision: 11000 Modified: branches/jbosstools-3.0.0.Beta1/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/process/ProcessEntityInfo.java Log: JBIDE-2930 Modified: branches/jbosstools-3.0.0.Beta1/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/process/ProcessEntityInfo.java =================================================================== --- branches/jbosstools-3.0.0.Beta1/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/process/ProcessEntityInfo.java 2008-10-20 14:45:26 UTC (rev 10999) +++ branches/jbosstools-3.0.0.Beta1/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/process/ProcessEntityInfo.java 2008-10-20 14:46:20 UTC (rev 11000) @@ -145,7 +145,7 @@ } public boolean visit(FieldDeclaration node) { - if (node.getType().isSimpleType()) { + if (node.getType().isSimpleType() || node.getType().isPrimitiveType()) { if (entityInfo.isAddGeneratedValueFlag()) { String primaryIdName = entityInfo.getPrimaryIdName(); Iterator itVarNames = node.fragments().iterator();

17 years, 2 months

1
0
0 / 0

JBoss Tools SVN: r10999 - branches/jbosstools-3.0.0.Beta1/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/collect.

by jbosstools-commits＠lists.jboss.org

Author: vyemialyanchyk Date: 2008-10-20 10:45:26 -0400 (Mon, 20 Oct 2008) New Revision: 10999 Modified: branches/jbosstools-3.0.0.Beta1/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/collect/CollectEntityInfo.java Log: JBIDE-2930 Modified: branches/jbosstools-3.0.0.Beta1/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/collect/CollectEntityInfo.java =================================================================== --- branches/jbosstools-3.0.0.Beta1/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/collect/CollectEntityInfo.java 2008-10-20 14:31:24 UTC (rev 10998) +++ branches/jbosstools-3.0.0.Beta1/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/collect/CollectEntityInfo.java 2008-10-20 14:45:26 UTC (rev 10999) @@ -264,7 +264,15 @@ public boolean visit(FieldDeclaration node) { if (node.getType().isPrimitiveType()) { PrimitiveType pt = (PrimitiveType)node.getType(); - ITypeBinding tb = pt.resolveBinding(); + if (!pt.getPrimitiveTypeCode().equals(PrimitiveType.BOOLEAN)) { + // this is candidate for primary id + Iterator itVarNames = node.fragments().iterator(); + while (itVarNames.hasNext()) { + VariableDeclarationFragment var = (VariableDeclarationFragment)itVarNames.next(); + String name = var.getName().getIdentifier(); + entityInfo.addPrimaryIdCandidate(name); + } + } } else if (node.getType().isSimpleType()) { SimpleType st = (SimpleType)node.getType(); ITypeBinding tb = st.resolveBinding();

17 years, 2 months

1
0
0 / 0

JBoss Tools SVN: r10998 - in trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test: src/org/jboss/tools/jsf/vpe/richfaces/test and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: dmaliarevich Date: 2008-10-20 10:31:24 -0400 (Mon, 20 Oct 2008) New Revision: 10998 Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/dragListener.xhtml trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/dropDownMenu.xhtml trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/extendedDataTable.xhtml.xml trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/menuItem.xhtml trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/menuItem.xhtml.xml Removed: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/dropDawnMenu.xhtml Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesAllTests.java trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesComponentContentTest.java trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesComponentTest.java Log: https://jira.jboss.org/jira/browse/JBIDE-2810, tests for rich:dropDownMenu, rich:menuGroup, rich:menuItem, rich:dropListener, rich:dragListener, rich:extendedDataTable. Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/dragListener.xhtml =================================================================== (Binary files differ) Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/dragListener.xhtml ___________________________________________________________________ Name: svn:mime-type + application/xhtml+xml Deleted: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/dropDawnMenu.xhtml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/dropDawnMenu.xhtml 2008-10-20 14:27:16 UTC (rev 10997) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/dropDawnMenu.xhtml 2008-10-20 14:31:24 UTC (rev 10998) @@ -1,26 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" - xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:a4j="http://richfaces.org/a4j" - xmlns:rich="http://richfaces.org/rich"> - -<head> -</head> -<body> -  - <rich:dropDownMenu value="File"> - <rich:menuItem submitMode="ajax" value="New"> - </rich:menuItem> - <rich:menuItem submitMode="ajax" value="Open" /> - <rich:menuGroup value="Save As..."> - <rich:menuItem submitMode="ajax" value="Text File" /> - <rich:menuItem submitMode="ajax" value="PDF File" /> - </rich:menuGroup> - <rich:menuItem submitMode="ajax" value="Close" /> - <rich:menuSeparator id="menuSeparator11" /> - <rich:menuItem submitMode="ajax" value="Exit" /> - </rich:dropDownMenu> -</body> -</html> \ No newline at end of file Copied: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/dropDownMenu.xhtml (from rev 10890, trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/dropDawnMenu.xhtml) =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/dropDownMenu.xhtml (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/dropDownMenu.xhtml 2008-10-20 14:31:24 UTC (rev 10998) @@ -0,0 +1,37 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:a4j="http://richfaces.org/a4j" + xmlns:rich="http://richfaces.org/rich"> + +<head> +</head> +<body> +<f:view> + <h:form> + <rich:dropDownMenu id="dropDownMenu" + value="Menu 1" + direction="bottom-right" + disabled="false" + horizontalOffset="5" + jointPoint="br" + submitMode="server"> + <rich:menuItem id="menuItem"> + <h:outputText value="Item 1" /> + </rich:menuItem> + <rich:menuGroup id="menuGroup" value="Group 2"> + <rich:menuItem> + <h:outputText value="Item 2" /> + </rich:menuItem> + </rich:menuGroup> + <rich:menuSeparator /> + <rich:menuItem> + <h:outputText value="Item 3" /> + </rich:menuItem> + </rich:dropDownMenu> + </h:form> +</f:view> +</body> +</html> \ No newline at end of file Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/extendedDataTable.xhtml.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/extendedDataTable.xhtml.xml (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/extendedDataTable.xhtml.xml 2008-10-20 14:31:24 UTC (rev 10998) @@ -0,0 +1,205 @@ +<tests> + <test id="extendedDataTable"> + <TABLE> + <TR> + <TD> + <DIV CLASS="dr-table-hidden" STYLE="width: 100%; height: 500px;"> + <TABLE WIDTH="580" ID="table" VALUE="#{capitalsBean.capitals}" + VAR="cap" SORTMODE="#{extendedTableBean.sortMode}" SELECTIONMODE="#{extendedTableBean.selectionMode}" + CLASS="dr-table rich-table"> + <COLGROUP SPAN="4"> + </COLGROUP> + <THEAD> + <TR CLASS="dr-table-subheader rich-table-subheader"> + <TD CLASS="dr-table-subheadercell rich-table-subheadercell" + SCOP="col"> + <TABLE CELLSPACING="0" CELLPADDING="0" BORDER="0"> + <TR> + <TD> + Flag + </TD> + <TD> + + </TD> + </TR> + </TABLE> + </TD> + <TD CLASS="dr-table-subheadercell rich-table-subheadercell" + SCOP="col"> + <TABLE CELLSPACING="0" CELLPADDING="0" BORDER="0"> + <TR> + <TD> + State Name + </TD> + <TD> + <IMG + SRC="/.*org.jboss.tools.jsf.vpe.richfaces/resources/extendedDataTable/sortable.gif/"/> + </TD> + </TR> + </TABLE> + </TD> + <TD CLASS="dr-table-subheadercell rich-table-subheadercell" + SCOP="col"> + <TABLE CELLSPACING="0" CELLPADDING="0" BORDER="0"> + <TR> + <TD> + State Capital + </TD> + <TD> + <IMG + SRC="/.*org.jboss.tools.jsf.vpe.richfaces/resources/extendedDataTable/sortable.gif/"/> + </TD> + </TR> + </TABLE> + </TD> + <TD CLASS="dr-table-subheadercell rich-table-subheadercell" + SCOP="col"> + <TABLE CELLSPACING="0" CELLPADDING="0" BORDER="0"> + <TR> + <TD> + Time Zone + </TD> + <TD> + + </TD> + </TR> + </TABLE> + </TD> + </TR> + <TR CLASS="dr-table-subheader rich-table-subheader"> + <TD CLASS="dr-table-subheadercell rich-table-subheadercell" + SCOP="col"> + + </TD> + <TD CLASS="dr-table-subheadercell rich-table-subheadercell" + SCOP="col"> + <DIV STYLE="padding: 4px;"> + <INPUT TYPE="text" CLASS="extendedTable-input"/> + </DIV> + </TD> + <TD CLASS="dr-table-subheadercell rich-table-subheadercell" + SCOP="col"> + <DIV STYLE="padding: 4px;"> + <INPUT TYPE="text" CLASS="extendedTable-input"/> + </DIV> + </TD> + <TD CLASS="dr-table-subheadercell rich-table-subheadercell" + SCOP="col"> + + </TD> + </TR> + </THEAD> + <TBODY> + <TR CLASS="dr-table-firstrow rich-table-firstrow"> + <TD CLASS="dr-table-cell rich-table-cell" SORTABLE="false"> + <IMG + SRC="/.*org.jboss.tools.vpe/ve/unresolved_image.gif/" + STYLE="-moz-user-modify: read-write;"/> + </TD> + <TD WIDTH="170" CLASS="dr-table-cell rich-table-cell" + SORTABLE="true" SORTBY="#{cap.state}" FILTERBY="#{cap.state}" + FILTEREVENT="onkeyup"> + #{cap.state} + </TD> + <TD WIDTH="170" CLASS="dr-table-cell rich-table-cell" + SORTABLE="true" SORTBY="#{cap.name}" FILTERBY="#{cap.state}" + FILTEREVENT="onkeyup"> + #{cap.name} + </TD> + <TD CLASS="dr-table-cell rich-table-cell" SORTABLE="false"> + #{cap.timeZone} + </TD> + </TR> + <TR CLASS="dr-table-firstrow rich-table-firstrow"> + <TD CLASS="dr-table-cell rich-table-cell" SORTABLE="false"> + <IMG + SRC="/.*org.jboss.tools.vpe/ve/unresolved_image.gif/" + STYLE="-moz-user-modify: read-write;"/> + </TD> + <TD WIDTH="170" CLASS="dr-table-cell rich-table-cell" + SORTABLE="true" SORTBY="#{cap.state}" FILTERBY="#{cap.state}" + FILTEREVENT="onkeyup"> + #{cap.state} + </TD> + <TD WIDTH="170" CLASS="dr-table-cell rich-table-cell" + SORTABLE="true" SORTBY="#{cap.name}" FILTERBY="#{cap.state}" + FILTEREVENT="onkeyup"> + #{cap.name} + </TD> + <TD CLASS="dr-table-cell rich-table-cell" SORTABLE="false"> + #{cap.timeZone} + </TD> + </TR> + <TR CLASS="dr-table-firstrow rich-table-firstrow"> + <TD CLASS="dr-table-cell rich-table-cell" SORTABLE="false"> + <IMG + SRC="/.*org.jboss.tools.vpe/ve/unresolved_image.gif/" + STYLE="-moz-user-modify: read-write;"/> + </TD> + <TD WIDTH="170" CLASS="dr-table-cell rich-table-cell" + SORTABLE="true" SORTBY="#{cap.state}" FILTERBY="#{cap.state}" + FILTEREVENT="onkeyup"> + #{cap.state} + </TD> + <TD WIDTH="170" CLASS="dr-table-cell rich-table-cell" + SORTABLE="true" SORTBY="#{cap.name}" FILTERBY="#{cap.state}" + FILTEREVENT="onkeyup"> + #{cap.name} + </TD> + <TD CLASS="dr-table-cell rich-table-cell" SORTABLE="false"> + #{cap.timeZone} + </TD> + </TR> + <TR CLASS="dr-table-firstrow rich-table-firstrow"> + <TD CLASS="dr-table-cell rich-table-cell" SORTABLE="false"> + <IMG + SRC="/.*org.jboss.tools.vpe/ve/unresolved_image.gif/" + STYLE="-moz-user-modify: read-write;"/> + </TD> + <TD WIDTH="170" CLASS="dr-table-cell rich-table-cell" + SORTABLE="true" SORTBY="#{cap.state}" FILTERBY="#{cap.state}" + FILTEREVENT="onkeyup"> + #{cap.state} + </TD> + <TD WIDTH="170" CLASS="dr-table-cell rich-table-cell" + SORTABLE="true" SORTBY="#{cap.name}" FILTERBY="#{cap.state}" + FILTEREVENT="onkeyup"> + #{cap.name} + </TD> + <TD CLASS="dr-table-cell rich-table-cell" SORTABLE="false"> + #{cap.timeZone} + </TD> + </TR> + <TR CLASS="dr-table-firstrow rich-table-firstrow"> + <TD CLASS="dr-table-cell rich-table-cell" SORTABLE="false"> + <IMG + SRC="/.*org.jboss.tools.vpe/ve/unresolved_image.gif/" + STYLE="-moz-user-modify: read-write;"/> + </TD> + <TD WIDTH="170" CLASS="dr-table-cell rich-table-cell" + SORTABLE="true" SORTBY="#{cap.state}" FILTERBY="#{cap.state}" + FILTEREVENT="onkeyup"> + #{cap.state} + </TD> + <TD WIDTH="170" CLASS="dr-table-cell rich-table-cell" + SORTABLE="true" SORTBY="#{cap.name}" FILTERBY="#{cap.state}" + FILTEREVENT="onkeyup"> + #{cap.name} + </TD> + <TD CLASS="dr-table-cell rich-table-cell" SORTABLE="false"> + #{cap.timeZone} + </TD> + </TR> + </TBODY> + </TABLE> + </DIV> + </TD> + <TD STYLE="height: 100%; width: 17px;"> + <DIV STYLE="height: 100%; overflow-y: scroll;"> + </DIV> + + </TD> + </TR> + </TABLE> + </test> +</tests> \ No newline at end of file Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/extendedDataTable.xhtml.xml ___________________________________________________________________ Name: svn:mime-type + text/xml Name: svn:eol-style + native Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/menuItem.xhtml =================================================================== (Binary files differ) Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/menuItem.xhtml ___________________________________________________________________ Name: svn:mime-type + application/xhtml+xml Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/menuItem.xhtml.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/menuItem.xhtml.xml (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/menuItem.xhtml.xml 2008-10-20 14:31:24 UTC (rev 10998) @@ -0,0 +1,19 @@ +<tests> + <test id="menuItem"> + +<LI VPE-DDM-MENU-LI="" CLASS="rich-menu-item" STYLE="" > +<DIV CLASS="dr-menu-item-top-div" > + +<IMG SRC="/.*org.jboss.tools.jsf.vpe.richfaces/resources/menuItem/spacer.gif/" /> + + + + +Item 1 + + +</DIV> +</LI> + + </test> +</tests> \ No newline at end of file Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/menuItem.xhtml.xml ___________________________________________________________________ Name: svn:mime-type + text/xml Name: svn:eol-style + native Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesAllTests.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesAllTests.java 2008-10-20 14:27:16 UTC (rev 10997) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesAllTests.java 2008-10-20 14:31:24 UTC (rev 10998) @@ -45,25 +45,25 @@ TestSuite suite = new TestSuite("Tests for Vpe RichFaces components"); // $NON //$NON-NLS-1$ // $JUnit-BEGIN$ - suite.addTestSuite(RichFacesComponentTest.class); - suite.addTestSuite(JBIDE1579Test.class); - suite.addTestSuite(Jbide1580Test.class); - suite.addTestSuite(JBIDE1613Test.class); - suite.addTestSuite(Jbide1614Test.class); - suite.addTestSuite(Jbide1639Test.class); - suite.addTestSuite(Jbide1682Test.class); - suite.addTestSuite(Jbide1548Test.class); - suite.addTestSuite(JBIDE1713Test.class); - suite.addTestSuite(RichFacesJBIDE1169Test.class); - suite.addTestSuite(RichFacesComboBoxTemplateTestCase.class); - suite.addTestSuite(RichFacesInplaceInputTemplateTestCase.class); - suite.addTestSuite(RichFacesInplaceSelectTemplateTestCase.class); - suite.addTestSuite(RichFacesProgressBarTemplateTestCase.class); - suite.addTestSuite(RichFacesFileUploadTemplateTestCase.class); - suite.addTestSuite(RichFacesColumnsTemplateTestCase.class); - suite.addTestSuite(RichFacesPickListTemplateTestCase.class); - suite.addTestSuite(JBIDE1605Test.class); - suite.addTestSuite(JBIDE1606Test.class); +// suite.addTestSuite(RichFacesComponentTest.class); +// suite.addTestSuite(JBIDE1579Test.class); +// suite.addTestSuite(Jbide1580Test.class); +// suite.addTestSuite(JBIDE1613Test.class); +// suite.addTestSuite(Jbide1614Test.class); +// suite.addTestSuite(Jbide1639Test.class); +// suite.addTestSuite(Jbide1682Test.class); +// suite.addTestSuite(Jbide1548Test.class); +// suite.addTestSuite(JBIDE1713Test.class); +// suite.addTestSuite(RichFacesJBIDE1169Test.class); +// suite.addTestSuite(RichFacesComboBoxTemplateTestCase.class); +// suite.addTestSuite(RichFacesInplaceInputTemplateTestCase.class); +// suite.addTestSuite(RichFacesInplaceSelectTemplateTestCase.class); +// suite.addTestSuite(RichFacesProgressBarTemplateTestCase.class); +// suite.addTestSuite(RichFacesFileUploadTemplateTestCase.class); +// suite.addTestSuite(RichFacesColumnsTemplateTestCase.class); +// suite.addTestSuite(RichFacesPickListTemplateTestCase.class); +// suite.addTestSuite(JBIDE1605Test.class); +// suite.addTestSuite(JBIDE1606Test.class); suite.addTestSuite(RichFacesComponentContentTest.class); // $JUnit-END$ Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesComponentContentTest.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesComponentContentTest.java 2008-10-20 14:27:16 UTC (rev 10997) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesComponentContentTest.java 2008-10-20 14:31:24 UTC (rev 10998) @@ -124,27 +124,27 @@ } public void testDragListener() throws Throwable { - assertTrue("it is necessary to add a body of the test ", false);//$NON-NLS-1$ + performInvisibleTagTest("components/dragListener.xhtml", "dragListener"); //$NON-NLS-1$ //$NON-NLS-2$ } public void testDropListener() throws Throwable { - assertTrue("it is necessary to add a body of the test ", false);//$NON-NLS-1$ + performInvisibleTagTest("components/dropListener.xhtml", "dropListener"); //$NON-NLS-1$ //$NON-NLS-2$ } public void testDropDownMenu() throws Throwable { - assertTrue("it is necessary to add a body of the test ", false);//$NON-NLS-1$ + performContentTest("components/dropDownMenu.xhtml");//$NON-NLS-1$ } public void testExtendedDataTable() throws Throwable { - assertTrue("it is necessary to add a body of the test ", false);//$NON-NLS-1$ + performContentTest("components/extendedDataTable.xhtml");//$NON-NLS-1$ } public void testMenuGroup() throws Throwable { - assertTrue("it is necessary to add a body of the test ", false);//$NON-NLS-1$ + performContentTest("components/menuGroup.xhtml");//$NON-NLS-1$ } public void testMenuItem() throws Throwable { - assertTrue("it is necessary to add a body of the test ", false);//$NON-NLS-1$ + performContentTest("components/menuItem.xhtml");//$NON-NLS-1$ } public void testMenuSeparator() throws Throwable { Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesComponentTest.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesComponentTest.java 2008-10-20 14:27:16 UTC (rev 10997) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesComponentTest.java 2008-10-20 14:31:24 UTC (rev 10998) @@ -79,9 +79,9 @@ "components/dragAndDrop.xhtml", RichFacesAllTests.IMPORT_PROJECT_NAME)); //$NON-NLS-1$ } - public void testDropDawnMenu() throws PartInitException, Throwable { + public void testDropDownMenu() throws PartInitException, Throwable { performTestForVpeComponent((IFile) TestUtil.getComponentPath( - "components/dropDawnMenu.xhtml", RichFacesAllTests.IMPORT_PROJECT_NAME)); //$NON-NLS-1$ + "components/dropDownMenu.xhtml", RichFacesAllTests.IMPORT_PROJECT_NAME)); //$NON-NLS-1$ } public void testEffect() throws PartInitException, Throwable {

17 years, 2 months

1
0
0 / 0

JBoss Tools SVN: r10997 - in trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor: util and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: dmaliarevich Date: 2008-10-20 10:27:16 -0400 (Mon, 20 Oct 2008) New Revision: 10997 Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunctionSrc.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/VpeStyleUtil.java Log: https://jira.jboss.org/jira/browse/JBIDE-2936, creating uri was updated. Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunctionSrc.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunctionSrc.java 2008-10-20 14:27:12 UTC (rev 10996) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunctionSrc.java 2008-10-20 14:27:16 UTC (rev 10997) @@ -179,7 +179,7 @@ } protected String getUnresolved() { - return IMG_PREFIX + getAbsoluteResourcePath(IMG_UNRESOLVED); + return IMG_PREFIX + getAbsoluteResourcePath(IMG_UNRESOLVED).replace('\\', '/'); } protected String getPrefix() { 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 2008-10-20 14:27:12 UTC (rev 10996) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/VpeStyleUtil.java 2008-10-20 14:27:16 UTC (rev 10997) @@ -281,7 +281,7 @@ sourceElement.setAttribute(ATTRIBUTE_STYLE, style); } - // selets parameter from atribute style + // selects parameter from attribute style public static String deleteFromString(String data, String begin, String end) { int startPosition = data.indexOf(begin); @@ -317,7 +317,7 @@ value = getFilePath(input, value); } - value = FILE_PROTOCOL + SLASH + SLASH + value; + value = FILE_PROTOCOL + SLASH + SLASH + value.replace('\\', '/'); URL url = null; try { url = new URL(value); @@ -371,7 +371,7 @@ filePath = getFilePath(input, filePath); } - filePath = FILE_PROTOCOL + SLASH + SLASH + filePath; + filePath = FILE_PROTOCOL + SLASH + SLASH + filePath.replace('\\', '/'); URL url = null; try { url = new URL(filePath); @@ -491,7 +491,7 @@ if (!new File(filePath).isAbsolute()) { filePath = getFilePath(href_val, filePath); } else { - filePath = FILE_PROTOCOL + SLASH + SLASH + filePath; + filePath = FILE_PROTOCOL + SLASH + SLASH + filePath.replace('\\', '/'); } URL url = null; @@ -530,9 +530,9 @@ if (tagPath.isEmpty()) { if (showUnresolvedImage) { return FILE_PROTOCOL + SLASH + SLASH - + getAbsoluteResourcePath(UNRESOLVED_IMAGE_PATH); + + getAbsoluteResourcePath(UNRESOLVED_IMAGE_PATH).replace('\\', '/'); } else { - return path; + return path.replace('\\', '/'); } } @@ -545,16 +545,16 @@ .equalsIgnoreCase(device))) { if (showUnresolvedImage) { return FILE_PROTOCOL + SLASH + SLASH - + getAbsoluteResourcePath(UNRESOLVED_IMAGE_PATH); + + getAbsoluteResourcePath(UNRESOLVED_IMAGE_PATH).replace('\\', '/'); } else { - return path; + return path.replace('\\', '/'); } } File locFile = tagPath.toFile(); if (locFile.exists()) { return FILE_PROTOCOL + SLASH + SLASH + SLASH - + locFile.getAbsolutePath(); + + locFile.getAbsolutePath().replace('\\', '/'); } IEditorInput input = pageContext.getEditPart().getEditorInput(); @@ -603,16 +603,16 @@ File f = new File(location + File.separator + pathCopy); if (f.exists()) { return FILE_PROTOCOL + SLASH + SLASH + SLASH - + f.getPath(); + + f.getPath().replace('\\', '/'); } } } } if (showUnresolvedImage) { return FILE_PROTOCOL + SLASH + SLASH - + getAbsoluteResourcePath(UNRESOLVED_IMAGE_PATH); + + getAbsoluteResourcePath(UNRESOLVED_IMAGE_PATH).replace('\\', '/'); } else { - return path; + return path.replace('\\', '/'); } }

17 years, 2 months

1
0
0 / 0

JBoss Tools SVN: r10996 - trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces.

by jbosstools-commits＠lists.jboss.org

Author: dmaliarevich Date: 2008-10-20 10:27:12 -0400 (Mon, 20 Oct 2008) New Revision: 10996 Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/ComponentUtil.java Log: https://jira.jboss.org/jira/browse/JBIDE-2936, creating uri was updated. Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/ComponentUtil.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/ComponentUtil.java 2008-10-20 14:26:19 UTC (rev 10995) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/ComponentUtil.java 2008-10-20 14:27:12 UTC (rev 10996) @@ -26,6 +26,7 @@ import org.jboss.tools.jsf.vpe.richfaces.template.util.RichFaces; import org.jboss.tools.vpe.editor.context.VpePageContext; import org.jboss.tools.vpe.editor.util.ElService; +import org.jboss.tools.vpe.editor.util.HTML; import org.mozilla.interfaces.nsIDOMElement; import org.mozilla.interfaces.nsIDOMNode; import org.mozilla.interfaces.nsIDOMNodeList; @@ -171,7 +172,7 @@ IPath pluginFile = new Path(pluginPath); File cssFile = pluginFile.append(cssHref).toFile(); if (cssFile.exists()) { - String cssPath = "file:///" + cssFile.getPath(); //$NON-NLS-1$ + String cssPath = "file:///" + cssFile.getPath().replace('\\', '/'); //$NON-NLS-1$ pageContext.getVisualBuilder().replaceLinkNodeToHead(cssPath, ext, true); } } @@ -202,8 +203,8 @@ * @param fileImageName the file image name */ public static void setImg(nsIDOMElement img, String fileImageName) { - img.setAttribute("src", "file://" //$NON-NLS-1$//$NON-NLS-2$ - + getAbsoluteResourcePath(fileImageName)); + img.setAttribute(HTML.ATTR_SRC, "file://" //$NON-NLS-1$//$NON-NLS-2$ + + getAbsoluteResourcePath(fileImageName).replace('\\', '/')); } /** @@ -456,9 +457,9 @@ } /** - * Adds image as attribute to IMG tag from users worcpace. + * Adds image as attribute to IMG tag from users workspace. * - * @param img img element to which set picture + * @param img image element to set picture to * @param pageContext Page Context * @param undefinedImgName default image when image is undefined * @param fileImageName image name @@ -469,10 +470,10 @@ String path = ElService.getInstance().replaceEl(pageContext.getVisualBuilder().getCurrentIncludeInfo().getFile(), fileImageName); File file = new File(inputPath.toOSString() + File.separator + path); if (file.exists()) { - img.setAttribute(HtmlComponentUtil.HTML_ATR_SRC, HtmlComponentUtil.FILE_PROTOCOL + inputPath.toOSString() + File.separator - + path); + img.setAttribute(HtmlComponentUtil.HTML_ATR_SRC, HtmlComponentUtil.FILE_PROTOCOL + inputPath.toString() + "/" //$NON-NLS-1$ + + path.replace('\\', '/')); } else { - img.setAttribute(HtmlComponentUtil.HTML_ATR_SRC, undefinedImgName); + img.setAttribute(HtmlComponentUtil.HTML_ATR_SRC, undefinedImgName.replace('\\', '/')); } } @@ -615,7 +616,7 @@ Integer rst = null; if ((value == null) || (value.trim().length() == 0)) { - throw new NumberFormatException("Passed value is empty "); + throw new NumberFormatException("Passed value is empty "); //$NON-NLS-1$ } if (value.endsWith(PX_SUFFIX)) {

17 years, 2 months

1
0
0 / 0

JBoss Tools SVN: r10995 - branches/jbosstools-3.0.0.Beta1/esb/plugins/org.jboss.tools.esb.core/schemas.

by jbosstools-commits＠lists.jboss.org

Author: scabanovich Date: 2008-10-20 10:26:19 -0400 (Mon, 20 Oct 2008) New Revision: 10995 Modified: branches/jbosstools-3.0.0.Beta1/esb/plugins/org.jboss.tools.esb.core/schemas/jbossesb-1.0.1.xsd Log: JBIDE-2360 Modified: branches/jbosstools-3.0.0.Beta1/esb/plugins/org.jboss.tools.esb.core/schemas/jbossesb-1.0.1.xsd =================================================================== --- branches/jbosstools-3.0.0.Beta1/esb/plugins/org.jboss.tools.esb.core/schemas/jbossesb-1.0.1.xsd 2008-10-20 14:25:01 UTC (rev 10994) +++ branches/jbosstools-3.0.0.Beta1/esb/plugins/org.jboss.tools.esb.core/schemas/jbossesb-1.0.1.xsd 2008-10-20 14:26:19 UTC (rev 10995) @@ -198,7 +198,7 @@ <xsd:documentation xml:lang="en">Schedule frequency time units.</xsd:documentation> </xsd:annotation> </xsd:attribute> - <xsd:attribute default="-1" name="execCount" type="xsd:int" use="optional"> + <xsd:attribute default="-1" name="execCount" type="jesb:int" use="optional"> <xsd:annotation> <xsd:documentation xml:lang="en"> Schedule execution count. -1 to execute indefinitely. @@ -431,7 +431,7 @@ </xsd:documentation> </xsd:annotation> </xsd:attribute> - <xsd:attribute default="1" name="maxThreads" type="xsd:int" + <xsd:attribute default="1" name="maxThreads" type="jesb:int" use="optional"> <xsd:annotation> <xsd:documentation xml:lang="en"> @@ -463,7 +463,7 @@ <xsd:complexContent> <xsd:extension base="jesb:listener"> <xsd:attribute default="-1" - name="poll-frequency-seconds" type="xsd:int" use="optional"> + name="poll-frequency-seconds" type="jesb:int" use="optional">  <xsd:annotation> <xsd:documentation xml:lang="en"> @@ -475,7 +475,7 @@ </xsd:annotation> </xsd:attribute> <xsd:attribute default="-1" name="schedule-frequency" - type="xsd:int" use="optional"> + type="jesb:int" use="optional">  <xsd:annotation> <xsd:documentation xml:lang="en"> @@ -1532,7 +1532,7 @@ <xsd:complexType> <xsd:complexContent> <xsd:extension base="jesb:bus"> - <xsd:attribute name="port" type="xsd:int" + <xsd:attribute name="port" type="jesb:int" use="required"> <xsd:annotation> <xsd:documentation xml:lang="en"> @@ -1624,4 +1624,25 @@ </xsd:complexType> </xsd:element> + <xsd:simpleType name="elType1"> + <xsd:restriction base="xsd:string"> + <xsd:pattern value="\#\{.+\}"/> + </xsd:restriction> + </xsd:simpleType> + + <xsd:simpleType name="elType2"> + <xsd:restriction base="xsd:string"> + <xsd:pattern value="\$\{.+\}"/> + </xsd:restriction> + </xsd:simpleType> + + <xsd:simpleType name="expressionType"> + <xsd:union memberTypes="jesb:elType1 jesb:elType2"/> + </xsd:simpleType> + + <xsd:simpleType name="int"> + <xsd:union memberTypes="xsd:int jesb:expressionType"/> + </xsd:simpleType> + + </xsd:schema>

17 years, 2 months

1
0
0 / 0

JBoss Tools SVN: r10994 - trunk/esb/plugins/org.jboss.tools.esb.core/schemas.

by jbosstools-commits＠lists.jboss.org

Author: scabanovich Date: 2008-10-20 10:25:01 -0400 (Mon, 20 Oct 2008) New Revision: 10994 Modified: trunk/esb/plugins/org.jboss.tools.esb.core/schemas/jbossesb-1.0.1.xsd Log: JBIDE-2360 Modified: trunk/esb/plugins/org.jboss.tools.esb.core/schemas/jbossesb-1.0.1.xsd =================================================================== --- trunk/esb/plugins/org.jboss.tools.esb.core/schemas/jbossesb-1.0.1.xsd 2008-10-20 14:02:02 UTC (rev 10993) +++ trunk/esb/plugins/org.jboss.tools.esb.core/schemas/jbossesb-1.0.1.xsd 2008-10-20 14:25:01 UTC (rev 10994) @@ -198,7 +198,7 @@ <xsd:documentation xml:lang="en">Schedule frequency time units.</xsd:documentation> </xsd:annotation> </xsd:attribute> - <xsd:attribute default="-1" name="execCount" type="xsd:int" use="optional"> + <xsd:attribute default="-1" name="execCount" type="jesb:int" use="optional"> <xsd:annotation> <xsd:documentation xml:lang="en"> Schedule execution count. -1 to execute indefinitely. @@ -431,7 +431,7 @@ </xsd:documentation> </xsd:annotation> </xsd:attribute> - <xsd:attribute default="1" name="maxThreads" type="xsd:int" + <xsd:attribute default="1" name="maxThreads" type="jesb:int" use="optional"> <xsd:annotation> <xsd:documentation xml:lang="en"> @@ -463,7 +463,7 @@ <xsd:complexContent> <xsd:extension base="jesb:listener"> <xsd:attribute default="-1" - name="poll-frequency-seconds" type="xsd:int" use="optional"> + name="poll-frequency-seconds" type="jesb:int" use="optional">  <xsd:annotation> <xsd:documentation xml:lang="en"> @@ -475,7 +475,7 @@ </xsd:annotation> </xsd:attribute> <xsd:attribute default="-1" name="schedule-frequency" - type="xsd:int" use="optional"> + type="jesb:int" use="optional">  <xsd:annotation> <xsd:documentation xml:lang="en"> @@ -1532,7 +1532,7 @@ <xsd:complexType> <xsd:complexContent> <xsd:extension base="jesb:bus"> - <xsd:attribute name="port" type="xsd:int" + <xsd:attribute name="port" type="jesb:int" use="required"> <xsd:annotation> <xsd:documentation xml:lang="en"> @@ -1624,4 +1624,25 @@ </xsd:complexType> </xsd:element> + <xsd:simpleType name="elType1"> + <xsd:restriction base="xsd:string"> + <xsd:pattern value="\#\{.+\}"/> + </xsd:restriction> + </xsd:simpleType> + + <xsd:simpleType name="elType2"> + <xsd:restriction base="xsd:string"> + <xsd:pattern value="\$\{.+\}"/> + </xsd:restriction> + </xsd:simpleType> + + <xsd:simpleType name="expressionType"> + <xsd:union memberTypes="jesb:elType1 jesb:elType2"/> + </xsd:simpleType> + + <xsd:simpleType name="int"> + <xsd:union memberTypes="xsd:int jesb:expressionType"/> + </xsd:simpleType> + + </xsd:schema>

17 years, 2 months

1
0
0 / 0

JBoss Tools SVN: r10993 - trunk/jsf/docs/userguide/en/images/visual_page.

by jbosstools-commits＠lists.jboss.org

Author: ochikvina Date: 2008-10-20 10:02:02 -0400 (Mon, 20 Oct 2008) New Revision: 10993 Modified: trunk/jsf/docs/userguide/en/images/visual_page/visual_page_7.png Log: https://jira.jboss.org/jira/browse/JBDS-375 - updating the screenshot; Modified: trunk/jsf/docs/userguide/en/images/visual_page/visual_page_7.png =================================================================== (Binary files differ)

17 years, 2 months

1
0
0 / 0

JBoss Tools SVN: r10992 - trunk/jsf/docs/userguide/en/images/visual_page.

by jbosstools-commits＠lists.jboss.org

Author: ochikvina Date: 2008-10-20 10:01:37 -0400 (Mon, 20 Oct 2008) New Revision: 10992 Added: trunk/jsf/docs/userguide/en/images/visual_page/visual_page_17.png trunk/jsf/docs/userguide/en/images/visual_page/visual_page_18.png trunk/jsf/docs/userguide/en/images/visual_page/visual_page_19.png trunk/jsf/docs/userguide/en/images/visual_page/visual_page_20.png trunk/jsf/docs/userguide/en/images/visual_page/visual_page_21.png trunk/jsf/docs/userguide/en/images/visual_page/visual_page_22.png Log: https://jira.jboss.org/jira/browse/JBDS-375 - adding new screenshots; Added: trunk/jsf/docs/userguide/en/images/visual_page/visual_page_17.png =================================================================== (Binary files differ) Property changes on: trunk/jsf/docs/userguide/en/images/visual_page/visual_page_17.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/jsf/docs/userguide/en/images/visual_page/visual_page_18.png =================================================================== (Binary files differ) Property changes on: trunk/jsf/docs/userguide/en/images/visual_page/visual_page_18.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/jsf/docs/userguide/en/images/visual_page/visual_page_19.png =================================================================== (Binary files differ) Property changes on: trunk/jsf/docs/userguide/en/images/visual_page/visual_page_19.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/jsf/docs/userguide/en/images/visual_page/visual_page_20.png =================================================================== (Binary files differ) Property changes on: trunk/jsf/docs/userguide/en/images/visual_page/visual_page_20.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/jsf/docs/userguide/en/images/visual_page/visual_page_21.png =================================================================== (Binary files differ) Property changes on: trunk/jsf/docs/userguide/en/images/visual_page/visual_page_21.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/jsf/docs/userguide/en/images/visual_page/visual_page_22.png =================================================================== (Binary files differ) Property changes on: trunk/jsf/docs/userguide/en/images/visual_page/visual_page_22.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream

17 years, 2 months

1
0
0 / 0

JBoss Tools SVN: r10991 - trunk/jsf/docs/userguide/en/modules.

by jbosstools-commits＠lists.jboss.org

Author: ochikvina Date: 2008-10-20 10:00:43 -0400 (Mon, 20 Oct 2008) New Revision: 10991 Modified: trunk/jsf/docs/userguide/en/modules/editors.xml Log: https://jira.jboss.org/jira/browse/JBDS-375 - creating new section "Pages Styling", adding info about css classes; Modified: trunk/jsf/docs/userguide/en/modules/editors.xml =================================================================== --- trunk/jsf/docs/userguide/en/modules/editors.xml 2008-10-20 13:47:26 UTC (rev 10990) +++ trunk/jsf/docs/userguide/en/modules/editors.xml 2008-10-20 14:00:43 UTC (rev 10991) @@ -839,13 +839,22 @@ <para>When working in JBoss Tools JSP editor you are constantly provided with feedback and contextual error checking as you type.</para> </section> + </section> + <section id="pages_styling"> + <title>Pages Styling</title> + + <para>Most web pages use the cascading style sheets (CSS) to control the way they look. + With <property>Visual Page Editor</property> you can easily stylise your pages. In + this section we are going to introduce you to a powerful mechanism that <property>VPE</property> provides for + a complete control over pages styling. </para> + <section id="inline_styling"> <title>Inline Style Editing</title> - <para>In the Visual part of the VPE there is a graphical toolbar, use it to add - inline styling to JSF and Struts tags on your page. The toolbar can be hidden by - clicking on arrow sign in the upper left corner.</para> + <para>In the Visual part of the <property>VPE</property> there is a graphical + toolbar, use it to add inline styling to JSF and Struts tags on your page. The + toolbar can be hidden by clicking on arrow sign in the upper left corner.</para> <figure> <title>Text Formatting</title> @@ -856,8 +865,8 @@ </mediaobject> </figure> - <para>For editing inline styles for DOM elements VPE also provides <property>CSS - Dialog</property>. It can be called from <emphasis> + <para>For editing inline styles for DOM elements <property>VPE</property> also + provides <property>CSS Dialog</property>. It can be called from <emphasis> <property>style</property> </emphasis> line in the <property>Properties view</property> for a currently selected element.</para> @@ -873,7 +882,7 @@ <para id="css_dialog"><property>CSS Dialog</property> has four tabs where css properties for text, background, borders and others can be specified. A simple - preview which is generated at the bottom of the <property>CSS Dialog</property> + preview which is generated at the top of the <property>CSS Dialog</property> allows you to see the changes before you apply them.</para> <figure> @@ -886,68 +895,167 @@ </figure> </section> - <section id="vpe_templating"> - <title>Templating</title> + <section id="external_stylesheets"> + <title>External Stylesheets</title> + <para>The pages you are working with in <property>VPE</property> can use external + stylesheets. <property>VPE</property> allows you to create new style classes in + existing stylesheets and/or edit them as well. For these purposes <property>CSS + Style Class Dialog</property> is provided.</para> + <para>Select the element for which you need to create or edit style class and press + button next to <emphasis> + <property>styleClass</property> + </emphasis> field in <property>Properties view</property>.</para> - <para>The VPE also makes it possible to create templates for unknown tags.</para> + <figure> + <title>Calling the CSS Style Class Dialog</title> + <mediaobject> + <imageobject> + <imagedata fileref="images/visual_page/visual_page_17.png"/> + </imageobject> + </mediaobject> + </figure> - <para>To call the <property>Template dialog</property> for a tag, right-click on it - in Visual mode and select <emphasis> - <property>Template</property> - </emphasis> option.</para> - + <para>It'll pick up the <property>CSS Style Class Dialog</property> which + looks like on the figure below.</para> <figure> - <title>Calling Template Dialog</title> + <title>CSS Style Class Dialog</title> <mediaobject> <imageobject> - <imagedata fileref="images/visual_page/visual_page_7a.png"/> + <imagedata fileref="images/visual_page/visual_page_18.png"/> </imageobject> </mediaobject> </figure> + <para>First, you should specify the CSS file where you are going to put your style + class. Do this by pressing button next to the <emphasis> + <property>CSS file</property> + </emphasis> field.</para> + <figure> + <title>CSS File Selection</title> + <mediaobject> + <imageobject> + <imagedata fileref="images/visual_page/visual_page_19.png"/> + </imageobject> + </mediaobject> + </figure> - <para id="template_dialog">Here is what the <property>Template dialog</property> looks like.</para> - + <para>To create new CSS class write its name in the <emphasis> + <property>Style class</property> + </emphasis> field and then configure style settings switching between the tabs: <emphasis> + <property>Text/Font</property>, </emphasis> + <emphasis> + <property>Background</property>, </emphasis> + <emphasis> + <property>Boxes</property>, </emphasis> + <emphasis> + <property>Property Sheet</property>. </emphasis>To add existing styling to + the chosen element expand the list of the existed style classes and point to the + necessary one.</para> + <figure> - <title>Template Dialog</title> + <title>Style Class Selection</title> <mediaobject> <imageobject> - <imagedata fileref="images/visual_page/visual_page_7b.png"/> + <imagedata fileref="images/visual_page/visual_page_20.png"/> </imageobject> </mediaobject> </figure> - + <para><emphasis> - <property>Tag for Display</property> - </emphasis> field in the <property>Template dialog</property> requires - specifying a type of tag. It can be SPAN, DIV, TABLE or any other html element. - Here it's also possible to mark weather the tag is children or not (by checking <emphasis> - <property>Children</property></emphasis>), whether it contains an IMG tag (by checking <emphasis> - <property>Icon</property></emphasis>) and - specify a value for it.</para> + <property>Quick Edit</property> + </emphasis> gives a preview of the properties which are set for the existing + style class. You can easily modify them with the help of this wizard.</para> - <para>What comes to the <emphasis> - <property>Style</property></emphasis> field, you can fill it out manually or make use of the button - next to the field to bring the <link linkend="css_dialog">CSS Dialog</link> for - editing styles.</para> + <figure> + <title>Quick Edit</title> + <mediaobject> + <imageobject> + <imagedata fileref="images/visual_page/visual_page_21.png"/> + </imageobject> + </mediaobject> + </figure> - <para>You can observe all defined templates in the <link linkend="VisualPageEditor2" - >VPE Preferences</link> on the Templates tab which you can quickly access by - pressing <link linkend="AdvancedSettings954">Preferences button</link>.</para> + <para>Preview at the top of the <property>CSS Style Class Dialog</property> + visualizes the result.</para> + + <para>The dialog for creating a new CSS class, which is called from <emphasis> + <property>New > Other... > JBoss Tools Web > CSS Class</property>, + </emphasis> looks the same.</para> <figure> - <title>Templates Tab of the VPE Preferences Page</title> + <title>New CSS Class Dialog</title> <mediaobject> <imageobject> - <imagedata fileref="images/visual_page/visual_page_7c.png"/> + <imagedata fileref="images/visual_page/visual_page_22.png"/> </imageobject> </mediaobject> </figure> - - <para>Here it's possible to edit or remove any listed in the table template.</para> - </section> </section> + <section id="vpe_templating"> + <title>Templating</title> + + <para>The VPE also makes it possible to create templates for unknown tags.</para> + + <para>To call the <property>Template dialog</property> for a tag, right-click on it in + Visual mode and select <emphasis> + <property>Template</property> + </emphasis> option.</para> + + <figure> + <title>Calling Template Dialog</title> + <mediaobject> + <imageobject> + <imagedata fileref="images/visual_page/visual_page_7a.png"/> + </imageobject> + </mediaobject> + </figure> + + <para id="template_dialog">Here is what the <property>Template dialog</property> looks + like.</para> + + <figure> + <title>Template Dialog</title> + <mediaobject> + <imageobject> + <imagedata fileref="images/visual_page/visual_page_7b.png"/> + </imageobject> + </mediaobject> + </figure> + + <para><emphasis> + <property>Tag for Display</property> + </emphasis> field in the <property>Template dialog</property> requires specifying a + type of tag. It can be SPAN, DIV, TABLE or any other html element. Here + it's also possible to mark weather the tag is children or not (by checking <emphasis> + <property>Children</property> + </emphasis>), whether it contains an IMG tag (by checking <emphasis> + <property>Icon</property> + </emphasis>) and specify a value for it.</para> + + <para>What comes to the <emphasis> + <property>Style</property> + </emphasis> field, you can fill it out manually or make use of the button next to + the field to bring the <link linkend="css_dialog">CSS Dialog</link> for editing + styles.</para> + + <para>You can observe all defined templates in the <link linkend="VisualPageEditor2">VPE + Preferences</link> on the Templates tab which you can quickly access by pressing + <link linkend="AdvancedSettings954">Preferences button</link>.</para> + + <figure> + <title>Templates Tab of the VPE Preferences Page</title> + <mediaobject> + <imageobject> + <imagedata fileref="images/visual_page/visual_page_7c.png"/> + </imageobject> + </mediaobject> + </figure> + + <para>Here it's possible to edit or remove any listed in the table template.</para> + + </section> + <section id="AdvancedSettings954"> <title>Advanced Settings</title>

17 years, 2 months

1
0
0 / 0

JBoss Tools SVN: r10990 - branches/jbosstools-3.0.0.Beta1/seam/plugins/org.jboss.tools.seam.xml/src/org/jboss/tools/seam/xml/components/model/constraint.

by jbosstools-commits＠lists.jboss.org

Author: scabanovich Date: 2008-10-20 09:47:26 -0400 (Mon, 20 Oct 2008) New Revision: 10990 Modified: branches/jbosstools-3.0.0.Beta1/seam/plugins/org.jboss.tools.seam.xml/src/org/jboss/tools/seam/xml/components/model/constraint/ELConstraint.java Log: Added '${' EL start Modified: branches/jbosstools-3.0.0.Beta1/seam/plugins/org.jboss.tools.seam.xml/src/org/jboss/tools/seam/xml/components/model/constraint/ELConstraint.java =================================================================== --- branches/jbosstools-3.0.0.Beta1/seam/plugins/org.jboss.tools.seam.xml/src/org/jboss/tools/seam/xml/components/model/constraint/ELConstraint.java 2008-10-20 13:44:30 UTC (rev 10989) +++ branches/jbosstools-3.0.0.Beta1/seam/plugins/org.jboss.tools.seam.xml/src/org/jboss/tools/seam/xml/components/model/constraint/ELConstraint.java 2008-10-20 13:47:26 UTC (rev 10990) @@ -12,7 +12,7 @@ public boolean accepts(String value) { if(value != null) { - if(value.startsWith("#{") && value.endsWith("}")) { + if((value.startsWith("#{") || value.startsWith("${")) && value.endsWith("}")) { return true; } if(value.length() >= 2 && value.startsWith("@") && value.endsWith("@")) { @@ -27,7 +27,7 @@ */ public String getError(String value) { if(accepts(value)) return null; - if(value.startsWith("#{")) { + if(value.startsWith("#{") || value.startsWith("${")) { return "value is not a correct EL."; } if(value.startsWith("@")) {

17 years, 2 months

1
0
0 / 0

JBoss Tools SVN: r10989 - branches/jbosstools-3.0.0.Beta1/esb/plugins/org.jboss.tools.esb.core/resources/meta.

by jbosstools-commits＠lists.jboss.org

Author: scabanovich Date: 2008-10-20 09:44:30 -0400 (Mon, 20 Oct 2008) New Revision: 10989 Modified: branches/jbosstools-3.0.0.Beta1/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb.meta Log: JBIDE-2360 Modified: branches/jbosstools-3.0.0.Beta1/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb.meta =================================================================== --- branches/jbosstools-3.0.0.Beta1/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb.meta 2008-10-20 13:42:10 UTC (rev 10988) +++ branches/jbosstools-3.0.0.Beta1/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb.meta 2008-10-20 13:44:30 UTC (rev 10989) @@ -408,6 +408,14 @@ </Constraint> <Editor name="ListString"/> </XModelAttribute> + <XModelAttribute PROPERTIES="category=advanced" name="post rename" xmlname="post-rename"> + <Constraint loader="ListString"> + <value/> + <value name="true"/> + <value name="false"/> + </Constraint> + <Editor name="ListString"/> + </XModelAttribute> <XModelAttribute PROPERTIES="category=advanced" name="post directory" xmlname="post-directory"/> <XModelAttribute PROPERTIES="category=advanced" name="post suffix" xmlname="post-suffix"/> <XModelAttribute PROPERTIES="category=advanced" name="error delete" xmlname="error-delete"> @@ -599,6 +607,10 @@ </XModelAttribute> <XModelAttribute PROPERTIES="category=advanced" name="certificate url" xmlname="certificate-url"/> + <XModelAttribute PROPERTIES="category=advanced" + name="certificate name" xmlname="certificate-name"/> + <XModelAttribute PROPERTIES="category=advanced" + name="certificate passphrase" xmlname="certificate-passphrase"/> <XModelAttribute PROPERTIES="category=advanced" name="read only" xmlname="read-only"> <Constraint loader="ListString"> <value/> @@ -897,6 +909,7 @@ name="id" xmlname="busid"/> <XModelAttribute PROPERTIES="category=general;save=always" name="port" xmlname="port"> + <Constraint loader="%IntEL%"/> </XModelAttribute> <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment"> <Editor name="Note"/> @@ -971,7 +984,9 @@ default="http" name="protocol" xmlname="protocol"> <Constraint loader="List"> <value name="http"/> + <value name="https"/> <value name="socket"/> + <value name="sslsocket"/> </Constraint> <Editor name="List"/> </XModelAttribute> @@ -1055,6 +1070,7 @@ <XChildEntity name="ESBProperty"/> <XChildEntity name="ESBBus"/> <XChildEntity name="ESBJMSBus101"/> + <XChildEntity maxCount="1" name="ESBActivationConfig101" required="yes"/> </XChildrenEntities> <XEntityRenderer> <ICONS> @@ -1079,7 +1095,16 @@ <Editor name="AccessibleJava"/> </XModelAttribute> <XModelAttribute PROPERTIES="category=advanced;id=true" - name="transacted" xmlname="transacted"/> + name="transacted" xmlname="transacted"> + <Constraint loader="List"> + <value/> + <value name="true"/> + <value name="false"/> + </Constraint> + <Editor name="Lit"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="category=advanced" + name="provider adapter JNDI" xmlname="providerAdapterJNDI"/> <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment"> <Editor name="Note"/> </XModelAttribute> @@ -1214,6 +1239,15 @@ name="jms security principal" xmlname="jms-security-principal"/> <XModelAttribute PROPERTIES="category=advanced" name="jms security credential" xmlname="jms-security-credential"/> + <XModelAttribute PROPERTIES="category=advanced;id=true" + name="transacted" xmlname="transacted"> + <Constraint loader="List"> + <value/> + <value name="true"/> + <value name="false"/> + </Constraint> + <Editor name="Lit"/> + </XModelAttribute> <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment"> <Editor name="Note"/> </XModelAttribute> @@ -1305,7 +1339,9 @@ <Constraint loader="ListString"/> <Editor name="ESBBusList"/> </XModelAttribute> - <XModelAttribute PROPERTIES="category=general" name="max threads" xmlname="maxThreads"/> + <XModelAttribute PROPERTIES="category=general" name="max threads" xmlname="maxThreads"> + <Constraint loader="%IntEL%"/> + </XModelAttribute> <XModelAttribute PROPERTIES="category=general" name="is gateway" xmlname="is-gateway"> <Constraint loader="ListString"> <value/> @@ -1915,9 +1951,13 @@ attributes="name,channel id ref,max threads,is gateway" entity="ESBListener101" name="listener"/> <XModelAttribute PROPERTIES="category=advanced" - name="poll frequency seconds" xmlname="poll-frequency-seconds"/> + name="poll frequency seconds" xmlname="poll-frequency-seconds"> + <Constraint loader="%IntEL%"/> + </XModelAttribute> <XModelAttribute PROPERTIES="category=advanced" - name="schedule frequency" xmlname="schedule-frequency"/> + name="schedule frequency" xmlname="schedule-frequency"> + <Constraint loader="%IntEL%"/> + </XModelAttribute> <XModelAttribute PROPERTIES="category=advanced" name="schedule id ref" xmlname="scheduleidref"/> <XModelAttribute PROPERTIES="category=general;save=always" @@ -1947,9 +1987,10 @@ <XDependencies/> </XModelEntity> <XModelEntity ImplementingClass="%ESB%" - PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData" + PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData;children=%ESBOrdered%" XMLSUBPATH="service" name="ESBService101"> <XChildrenEntities> + <XChildEntity name="ESBProperty"/> <XChildEntity maxCount="1" name="ESBListeners101" required="yes"/> <XChildEntity maxCount="1" name="ESBActions101" required="yes"/> </XChildrenEntities> @@ -1967,6 +2008,14 @@ name="category" xmlname="category"/> <XModelAttribute PROPERTIES="category=general;save=always" name="description" xmlname="description"/> + <XModelAttribute PROPERTIES="category=advanced" name="invm scope" xmlname="invmScope"> + <Constraint loader="ListString"> + <value/> + <value name="NONE"/> + <value name="GLOBAL"/> + </Constraint> + <Editor name="ListString"/> + </XModelAttribute> <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment"> <Editor name="Note"/> </XModelAttribute> @@ -2057,7 +2106,17 @@ <XModelAttribute PROPERTIES="category=general" name="start date" xmlname="startDate"/> <XModelAttribute PROPERTIES="category=general" name="end date" xmlname="endDate"/> <XModelAttribute PROPERTIES="category=general" name="frequency" xmlname="frequency"/> - <XModelAttribute name="exec count" xmlname="execCount"/> + <XModelAttribute PROPERTIES="category=general" name="frequency units" xmlname="frequencyUnits"> + <Constraint loader="List"> + <value/> + <value name="seconds"/> + <value name="milliseconds"/> + </Constraint> + <Editor name="List"/> + </XModelAttribute> + <XModelAttribute name="exec count" xmlname="execCount"> + <Constraint loader="%IntEL%"/> + </XModelAttribute> <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment"> <Editor name="Note"/> </XModelAttribute>

17 years, 2 months

1
0
0 / 0

JBoss Tools SVN: r10988 - branches/jbosstools-3.0.0.Beta1/esb/plugins/org.jboss.tools.esb.core/schemas.

by jbosstools-commits＠lists.jboss.org

Author: scabanovich Date: 2008-10-20 09:42:10 -0400 (Mon, 20 Oct 2008) New Revision: 10988 Modified: branches/jbosstools-3.0.0.Beta1/esb/plugins/org.jboss.tools.esb.core/schemas/jbossesb-1.0.1.xsd Log: JBIDE-2360 Modified: branches/jbosstools-3.0.0.Beta1/esb/plugins/org.jboss.tools.esb.core/schemas/jbossesb-1.0.1.xsd =================================================================== --- branches/jbosstools-3.0.0.Beta1/esb/plugins/org.jboss.tools.esb.core/schemas/jbossesb-1.0.1.xsd 2008-10-20 13:38:43 UTC (rev 10987) +++ branches/jbosstools-3.0.0.Beta1/esb/plugins/org.jboss.tools.esb.core/schemas/jbossesb-1.0.1.xsd 2008-10-20 13:42:10 UTC (rev 10988) @@ -188,29 +188,36 @@ <xsd:complexType> <xsd:complexContent> <xsd:extension base="jesb:schedule"> - <xsd:attribute default="10" name="frequency" - type="xsd:long" use="optional"> + <xsd:attribute name="frequency" use="optional" type="xsd:long" default="10"> + <xsd:annotation> + <xsd:documentation xml:lang="en">Schedule frequency.</xsd:documentation> + </xsd:annotation> + </xsd:attribute> + <xsd:attribute name="frequencyUnits" use="optional" type="jesb:frequency-unit" default="seconds"> + <xsd:annotation> + <xsd:documentation xml:lang="en">Schedule frequency time units.</xsd:documentation> + </xsd:annotation> + </xsd:attribute> + <xsd:attribute default="-1" name="execCount" type="xsd:int" use="optional"> <xsd:annotation> <xsd:documentation xml:lang="en"> - Schedule frequency, in seconds. + Schedule execution count. -1 to execute indefinitely. </xsd:documentation> </xsd:annotation> </xsd:attribute> - <xsd:attribute default="-1" name="execCount" - type="xsd:int" use="optional"> - <xsd:annotation> - <xsd:documentation xml:lang="en"> - Schedule execution count. -1 to execute - indefinitely. - </xsd:documentation> - </xsd:annotation> - </xsd:attribute> </xsd:extension> </xsd:complexContent> </xsd:complexType> </xsd:element> - <xsd:element name="cron-schedule" + <xsd:simpleType name="frequency-unit"> + <xsd:restriction base="xsd:NMTOKEN"> + <xsd:enumeration value="seconds"/> + <xsd:enumeration value="milliseconds"/> + </xsd:restriction> + </xsd:simpleType> + + <xsd:element name="cron-schedule" substitutionGroup="jesb:schedule"> <xsd:complexType> <xsd:complexContent> @@ -254,7 +261,9 @@ </xsd:annotation> <xsd:complexType> <xsd:sequence> - <xsd:element maxOccurs="1" minOccurs="1" + <xsd:element maxOccurs="unbounded" minOccurs="0" + ref="jesb:property" /> + <xsd:element maxOccurs="1" minOccurs="0" ref="jesb:listeners" /> <xsd:element maxOccurs="1" minOccurs="0" ref="jesb:actions" /> @@ -287,10 +296,33 @@ </xsd:documentation> </xsd:annotation> </xsd:attribute> + <xsd:attribute name="invmScope" type="jesb:invmScope" use="optional"> + <xsd:annotation> + <xsd:documentation xml:lang="en"> + All services are locally invokable over an "in VM" transport. Invokability + can be scoped using this attribute. An "invmScope" value of "NONE" means that + the Service should not be locally invokable over the "in VM" transport. + More fine grained scoping will be added in the future. + </xsd:documentation> + </xsd:annotation> + </xsd:attribute> </xsd:complexType> </xsd:element> - <xsd:simpleType name="mepType"> + <xsd:simpleType name="invmScope"> + <xsd:restriction base="xsd:NMTOKEN"> +  + <xsd:enumeration value="NONE" /> + +  +  + +  + <xsd:enumeration value="GLOBAL" /> + </xsd:restriction> + </xsd:simpleType> + + <xsd:simpleType name="mepType"> <xsd:restriction base="xsd:string"> <xsd:enumeration value="RequestResponse" /> <xsd:enumeration value="OneWay" /> @@ -626,6 +658,15 @@ </xsd:documentation> </xsd:annotation> </xsd:attribute> + <xsd:attribute default="false" name="transacted" + type="xsd:boolean" use="optional"> + <xsd:annotation> + <xsd:documentation xml:lang="en"> + If true, JMS sessions will be transaction aware. + Default is false. + </xsd:documentation> + </xsd:annotation> + </xsd:attribute> </xsd:complexType> </xsd:element> <xsd:element name="jms-bus" substitutionGroup="jesb:bus"> @@ -705,6 +746,10 @@ <xsd:complexType> <xsd:complexContent> <xsd:extension base="jesb:jms-provider-type"> + <xsd:sequence> + <xsd:element maxOccurs="1" minOccurs="0" + ref="jesb:activation-config" /> + </xsd:sequence> <xsd:attribute name="adapter" type="xsd:string"> <xsd:annotation> <xsd:documentation xml:lang="en"> @@ -745,6 +790,13 @@ </xsd:documentation> </xsd:annotation> </xsd:attribute> + <xsd:attribute name="providerAdapterJNDI" type="xsd:string"> + <xsd:annotation> + <xsd:documentation xml:lang="en"> + The JNDI location of an alternate provider adapter + </xsd:documentation> + </xsd:annotation> + </xsd:attribute> </xsd:extension> </xsd:complexContent> </xsd:complexType> @@ -788,7 +840,7 @@ </xsd:annotation> </xsd:attribute> <xsd:attribute name="input-suffix" type="xsd:string" - use="required"> + use="optional"> <xsd:annotation> <xsd:documentation xml:lang="en"> The file suffix used to filter files targeted @@ -817,6 +869,16 @@ </xsd:documentation> </xsd:annotation> </xsd:attribute> + <xsd:attribute default="true" name="post-rename" + type="xsd:boolean" use="optional"> + <xsd:annotation> + <xsd:documentation xml:lang="en"> + If true, the file will be renamed after it is + processed. Note that in that case post-directory + and post-suffix have no effect. + </xsd:documentation> + </xsd:annotation> + </xsd:attribute> <xsd:attribute default="processed" name="post-directory" type="xsd:string" use="optional"> <xsd:annotation> @@ -941,8 +1003,7 @@ </xsd:documentation> </xsd:annotation> </xsd:attribute> - <xsd:attribute name="password" type="xsd:string" - use="required"> + <xsd:attribute name="password" type="xsd:string"> <xsd:annotation> <xsd:documentation xml:lang="en"> The password used to access the ftp server. @@ -1056,11 +1117,29 @@ use="optional"> <xsd:annotation> <xsd:documentation xml:lang="en"> - The url to a certificate, which can be needed - for secure protocols (sftp and ftps). + The url to a public server certificate for ftps, or to a + private certificate for sftp client verification. sftp certificate + can be located via a resource. </xsd:documentation> </xsd:annotation> </xsd:attribute> + <xsd:attribute name="certificate-name" type="xsd:string" + use="optional"> + <xsd:annotation> + <xsd:documentation xml:lang="en"> + The common name of a certificate, which may be needed + for ftps. + </xsd:documentation> + </xsd:annotation> + </xsd:attribute> + <xsd:attribute name="certificate-passphrase" type="xsd:string" + use="optional"> + <xsd:annotation> + <xsd:documentation xml:lang="en"> + The passphrase of the private key, if necessary, for sftp client verification. + </xsd:documentation> + </xsd:annotation> + </xsd:attribute> <xsd:attribute default="false" name="read-only" type="xsd:boolean" use="optional"> <xsd:annotation> @@ -1156,24 +1235,24 @@ </xsd:documentation> </xsd:annotation> </xsd:attribute> - <xsd:attribute default="message_id" name="message-id-column" - type="xsd:string" use="optional"> + <xsd:attribute name="message-id-column" + type="xsd:string" use="required"> <xsd:annotation> <xsd:documentation xml:lang="en"> A unique key (PK) in the table. </xsd:documentation> </xsd:annotation> </xsd:attribute> - <xsd:attribute default="message" name="message-column" - type="xsd:string" use="optional"> + <xsd:attribute name="message-column" + type="xsd:string" use="required"> <xsd:annotation> <xsd:documentation xml:lang="en"> The field that holds the serialized message. </xsd:documentation> </xsd:annotation> </xsd:attribute> - <xsd:attribute default="status" name="status-column" - type="xsd:string" use="optional"> + <xsd:attribute name="status-column" + type="xsd:string" use="required"> <xsd:annotation> <xsd:documentation xml:lang="en"> This column contents ('P', 'W', 'E' or 'D') @@ -1203,7 +1282,7 @@ </xsd:annotation> </xsd:attribute> <xsd:attribute name="insert-timestamp-column" use="optional" - type="xsd:string" default="insert_timestamp"> + type="xsd:string"> <xsd:annotation> <xsd:documentation xml:lang="en"> Holds the timestamp when the record was @@ -1484,7 +1563,9 @@ <xsd:simpleType> <xsd:restriction base="xsd:NMTOKEN"> <xsd:enumeration value="http" /> + <xsd:enumeration value="https" /> <xsd:enumeration value="socket" /> + <xsd:enumeration value="sslsocket" /> </xsd:restriction> </xsd:simpleType> </xsd:attribute>

17 years, 2 months

1
0
0 / 0

JBoss Tools SVN: r10987 - in trunk/esb/plugins/org.jboss.tools.esb.core: schemas and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: scabanovich Date: 2008-10-20 09:38:43 -0400 (Mon, 20 Oct 2008) New Revision: 10987 Modified: trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb.meta trunk/esb/plugins/org.jboss.tools.esb.core/schemas/jbossesb-1.0.1.xsd Log: JBIDE-2360 Modified: trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb.meta =================================================================== --- trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb.meta 2008-10-20 13:37:37 UTC (rev 10986) +++ trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb.meta 2008-10-20 13:38:43 UTC (rev 10987) @@ -408,6 +408,14 @@ </Constraint> <Editor name="ListString"/> </XModelAttribute> + <XModelAttribute PROPERTIES="category=advanced" name="post rename" xmlname="post-rename"> + <Constraint loader="ListString"> + <value/> + <value name="true"/> + <value name="false"/> + </Constraint> + <Editor name="ListString"/> + </XModelAttribute> <XModelAttribute PROPERTIES="category=advanced" name="post directory" xmlname="post-directory"/> <XModelAttribute PROPERTIES="category=advanced" name="post suffix" xmlname="post-suffix"/> <XModelAttribute PROPERTIES="category=advanced" name="error delete" xmlname="error-delete"> @@ -599,6 +607,10 @@ </XModelAttribute> <XModelAttribute PROPERTIES="category=advanced" name="certificate url" xmlname="certificate-url"/> + <XModelAttribute PROPERTIES="category=advanced" + name="certificate name" xmlname="certificate-name"/> + <XModelAttribute PROPERTIES="category=advanced" + name="certificate passphrase" xmlname="certificate-passphrase"/> <XModelAttribute PROPERTIES="category=advanced" name="read only" xmlname="read-only"> <Constraint loader="ListString"> <value/> @@ -897,6 +909,7 @@ name="id" xmlname="busid"/> <XModelAttribute PROPERTIES="category=general;save=always" name="port" xmlname="port"> + <Constraint loader="%IntEL%"/> </XModelAttribute> <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment"> <Editor name="Note"/> @@ -971,7 +984,9 @@ default="http" name="protocol" xmlname="protocol"> <Constraint loader="List"> <value name="http"/> + <value name="https"/> <value name="socket"/> + <value name="sslsocket"/> </Constraint> <Editor name="List"/> </XModelAttribute> @@ -1055,6 +1070,7 @@ <XChildEntity name="ESBProperty"/> <XChildEntity name="ESBBus"/> <XChildEntity name="ESBJMSBus101"/> + <XChildEntity maxCount="1" name="ESBActivationConfig101" required="yes"/> </XChildrenEntities> <XEntityRenderer> <ICONS> @@ -1079,7 +1095,16 @@ <Editor name="AccessibleJava"/> </XModelAttribute> <XModelAttribute PROPERTIES="category=advanced;id=true" - name="transacted" xmlname="transacted"/> + name="transacted" xmlname="transacted"> + <Constraint loader="List"> + <value/> + <value name="true"/> + <value name="false"/> + </Constraint> + <Editor name="Lit"/> + </XModelAttribute> + <XModelAttribute PROPERTIES="category=advanced" + name="provider adapter JNDI" xmlname="providerAdapterJNDI"/> <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment"> <Editor name="Note"/> </XModelAttribute> @@ -1214,6 +1239,15 @@ name="jms security principal" xmlname="jms-security-principal"/> <XModelAttribute PROPERTIES="category=advanced" name="jms security credential" xmlname="jms-security-credential"/> + <XModelAttribute PROPERTIES="category=advanced;id=true" + name="transacted" xmlname="transacted"> + <Constraint loader="List"> + <value/> + <value name="true"/> + <value name="false"/> + </Constraint> + <Editor name="Lit"/> + </XModelAttribute> <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment"> <Editor name="Note"/> </XModelAttribute> @@ -1305,7 +1339,9 @@ <Constraint loader="ListString"/> <Editor name="ESBBusList"/> </XModelAttribute> - <XModelAttribute PROPERTIES="category=general" name="max threads" xmlname="maxThreads"/> + <XModelAttribute PROPERTIES="category=general" name="max threads" xmlname="maxThreads"> + <Constraint loader="%IntEL%"/> + </XModelAttribute> <XModelAttribute PROPERTIES="category=general" name="is gateway" xmlname="is-gateway"> <Constraint loader="ListString"> <value/> @@ -1915,9 +1951,13 @@ attributes="name,channel id ref,max threads,is gateway" entity="ESBListener101" name="listener"/> <XModelAttribute PROPERTIES="category=advanced" - name="poll frequency seconds" xmlname="poll-frequency-seconds"/> + name="poll frequency seconds" xmlname="poll-frequency-seconds"> + <Constraint loader="%IntEL%"/> + </XModelAttribute> <XModelAttribute PROPERTIES="category=advanced" - name="schedule frequency" xmlname="schedule-frequency"/> + name="schedule frequency" xmlname="schedule-frequency"> + <Constraint loader="%IntEL%"/> + </XModelAttribute> <XModelAttribute PROPERTIES="category=advanced" name="schedule id ref" xmlname="scheduleidref"/> <XModelAttribute PROPERTIES="category=general;save=always" @@ -1947,9 +1987,10 @@ <XDependencies/> </XModelEntity> <XModelEntity ImplementingClass="%ESB%" - PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData" + PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.esb.ui.editor.form.ESBXMLFormLayoutData;children=%ESBOrdered%" XMLSUBPATH="service" name="ESBService101"> <XChildrenEntities> + <XChildEntity name="ESBProperty"/> <XChildEntity maxCount="1" name="ESBListeners101" required="yes"/> <XChildEntity maxCount="1" name="ESBActions101" required="yes"/> </XChildrenEntities> @@ -1967,6 +2008,14 @@ name="category" xmlname="category"/> <XModelAttribute PROPERTIES="category=general;save=always" name="description" xmlname="description"/> + <XModelAttribute PROPERTIES="category=advanced" name="invm scope" xmlname="invmScope"> + <Constraint loader="ListString"> + <value/> + <value name="NONE"/> + <value name="GLOBAL"/> + </Constraint> + <Editor name="ListString"/> + </XModelAttribute> <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment"> <Editor name="Note"/> </XModelAttribute> @@ -2057,7 +2106,17 @@ <XModelAttribute PROPERTIES="category=general" name="start date" xmlname="startDate"/> <XModelAttribute PROPERTIES="category=general" name="end date" xmlname="endDate"/> <XModelAttribute PROPERTIES="category=general" name="frequency" xmlname="frequency"/> - <XModelAttribute name="exec count" xmlname="execCount"/> + <XModelAttribute PROPERTIES="category=general" name="frequency units" xmlname="frequencyUnits"> + <Constraint loader="List"> + <value/> + <value name="seconds"/> + <value name="milliseconds"/> + </Constraint> + <Editor name="List"/> + </XModelAttribute> + <XModelAttribute name="exec count" xmlname="execCount"> + <Constraint loader="%IntEL%"/> + </XModelAttribute> <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment"> <Editor name="Note"/> </XModelAttribute> Modified: trunk/esb/plugins/org.jboss.tools.esb.core/schemas/jbossesb-1.0.1.xsd =================================================================== --- trunk/esb/plugins/org.jboss.tools.esb.core/schemas/jbossesb-1.0.1.xsd 2008-10-20 13:37:37 UTC (rev 10986) +++ trunk/esb/plugins/org.jboss.tools.esb.core/schemas/jbossesb-1.0.1.xsd 2008-10-20 13:38:43 UTC (rev 10987) @@ -188,29 +188,36 @@ <xsd:complexType> <xsd:complexContent> <xsd:extension base="jesb:schedule"> - <xsd:attribute default="10" name="frequency" - type="xsd:long" use="optional"> + <xsd:attribute name="frequency" use="optional" type="xsd:long" default="10"> + <xsd:annotation> + <xsd:documentation xml:lang="en">Schedule frequency.</xsd:documentation> + </xsd:annotation> + </xsd:attribute> + <xsd:attribute name="frequencyUnits" use="optional" type="jesb:frequency-unit" default="seconds"> + <xsd:annotation> + <xsd:documentation xml:lang="en">Schedule frequency time units.</xsd:documentation> + </xsd:annotation> + </xsd:attribute> + <xsd:attribute default="-1" name="execCount" type="xsd:int" use="optional"> <xsd:annotation> <xsd:documentation xml:lang="en"> - Schedule frequency, in seconds. + Schedule execution count. -1 to execute indefinitely. </xsd:documentation> </xsd:annotation> </xsd:attribute> - <xsd:attribute default="-1" name="execCount" - type="xsd:int" use="optional"> - <xsd:annotation> - <xsd:documentation xml:lang="en"> - Schedule execution count. -1 to execute - indefinitely. - </xsd:documentation> - </xsd:annotation> - </xsd:attribute> </xsd:extension> </xsd:complexContent> </xsd:complexType> </xsd:element> - <xsd:element name="cron-schedule" + <xsd:simpleType name="frequency-unit"> + <xsd:restriction base="xsd:NMTOKEN"> + <xsd:enumeration value="seconds"/> + <xsd:enumeration value="milliseconds"/> + </xsd:restriction> + </xsd:simpleType> + + <xsd:element name="cron-schedule" substitutionGroup="jesb:schedule"> <xsd:complexType> <xsd:complexContent> @@ -254,7 +261,9 @@ </xsd:annotation> <xsd:complexType> <xsd:sequence> - <xsd:element maxOccurs="1" minOccurs="1" + <xsd:element maxOccurs="unbounded" minOccurs="0" + ref="jesb:property" /> + <xsd:element maxOccurs="1" minOccurs="0" ref="jesb:listeners" /> <xsd:element maxOccurs="1" minOccurs="0" ref="jesb:actions" /> @@ -287,10 +296,33 @@ </xsd:documentation> </xsd:annotation> </xsd:attribute> + <xsd:attribute name="invmScope" type="jesb:invmScope" use="optional"> + <xsd:annotation> + <xsd:documentation xml:lang="en"> + All services are locally invokable over an "in VM" transport. Invokability + can be scoped using this attribute. An "invmScope" value of "NONE" means that + the Service should not be locally invokable over the "in VM" transport. + More fine grained scoping will be added in the future. + </xsd:documentation> + </xsd:annotation> + </xsd:attribute> </xsd:complexType> </xsd:element> - <xsd:simpleType name="mepType"> + <xsd:simpleType name="invmScope"> + <xsd:restriction base="xsd:NMTOKEN"> +  + <xsd:enumeration value="NONE" /> + +  +  + +  + <xsd:enumeration value="GLOBAL" /> + </xsd:restriction> + </xsd:simpleType> + + <xsd:simpleType name="mepType"> <xsd:restriction base="xsd:string"> <xsd:enumeration value="RequestResponse" /> <xsd:enumeration value="OneWay" /> @@ -626,6 +658,15 @@ </xsd:documentation> </xsd:annotation> </xsd:attribute> + <xsd:attribute default="false" name="transacted" + type="xsd:boolean" use="optional"> + <xsd:annotation> + <xsd:documentation xml:lang="en"> + If true, JMS sessions will be transaction aware. + Default is false. + </xsd:documentation> + </xsd:annotation> + </xsd:attribute> </xsd:complexType> </xsd:element> <xsd:element name="jms-bus" substitutionGroup="jesb:bus"> @@ -705,6 +746,10 @@ <xsd:complexType> <xsd:complexContent> <xsd:extension base="jesb:jms-provider-type"> + <xsd:sequence> + <xsd:element maxOccurs="1" minOccurs="0" + ref="jesb:activation-config" /> + </xsd:sequence> <xsd:attribute name="adapter" type="xsd:string"> <xsd:annotation> <xsd:documentation xml:lang="en"> @@ -745,6 +790,13 @@ </xsd:documentation> </xsd:annotation> </xsd:attribute> + <xsd:attribute name="providerAdapterJNDI" type="xsd:string"> + <xsd:annotation> + <xsd:documentation xml:lang="en"> + The JNDI location of an alternate provider adapter + </xsd:documentation> + </xsd:annotation> + </xsd:attribute> </xsd:extension> </xsd:complexContent> </xsd:complexType> @@ -788,7 +840,7 @@ </xsd:annotation> </xsd:attribute> <xsd:attribute name="input-suffix" type="xsd:string" - use="required"> + use="optional"> <xsd:annotation> <xsd:documentation xml:lang="en"> The file suffix used to filter files targeted @@ -817,6 +869,16 @@ </xsd:documentation> </xsd:annotation> </xsd:attribute> + <xsd:attribute default="true" name="post-rename" + type="xsd:boolean" use="optional"> + <xsd:annotation> + <xsd:documentation xml:lang="en"> + If true, the file will be renamed after it is + processed. Note that in that case post-directory + and post-suffix have no effect. + </xsd:documentation> + </xsd:annotation> + </xsd:attribute> <xsd:attribute default="processed" name="post-directory" type="xsd:string" use="optional"> <xsd:annotation> @@ -941,8 +1003,7 @@ </xsd:documentation> </xsd:annotation> </xsd:attribute> - <xsd:attribute name="password" type="xsd:string" - use="required"> + <xsd:attribute name="password" type="xsd:string"> <xsd:annotation> <xsd:documentation xml:lang="en"> The password used to access the ftp server. @@ -1056,11 +1117,29 @@ use="optional"> <xsd:annotation> <xsd:documentation xml:lang="en"> - The url to a certificate, which can be needed - for secure protocols (sftp and ftps). + The url to a public server certificate for ftps, or to a + private certificate for sftp client verification. sftp certificate + can be located via a resource. </xsd:documentation> </xsd:annotation> </xsd:attribute> + <xsd:attribute name="certificate-name" type="xsd:string" + use="optional"> + <xsd:annotation> + <xsd:documentation xml:lang="en"> + The common name of a certificate, which may be needed + for ftps. + </xsd:documentation> + </xsd:annotation> + </xsd:attribute> + <xsd:attribute name="certificate-passphrase" type="xsd:string" + use="optional"> + <xsd:annotation> + <xsd:documentation xml:lang="en"> + The passphrase of the private key, if necessary, for sftp client verification. + </xsd:documentation> + </xsd:annotation> + </xsd:attribute> <xsd:attribute default="false" name="read-only" type="xsd:boolean" use="optional"> <xsd:annotation> @@ -1156,24 +1235,24 @@ </xsd:documentation> </xsd:annotation> </xsd:attribute> - <xsd:attribute default="message_id" name="message-id-column" - type="xsd:string" use="optional"> + <xsd:attribute name="message-id-column" + type="xsd:string" use="required"> <xsd:annotation> <xsd:documentation xml:lang="en"> A unique key (PK) in the table. </xsd:documentation> </xsd:annotation> </xsd:attribute> - <xsd:attribute default="message" name="message-column" - type="xsd:string" use="optional"> + <xsd:attribute name="message-column" + type="xsd:string" use="required"> <xsd:annotation> <xsd:documentation xml:lang="en"> The field that holds the serialized message. </xsd:documentation> </xsd:annotation> </xsd:attribute> - <xsd:attribute default="status" name="status-column" - type="xsd:string" use="optional"> + <xsd:attribute name="status-column" + type="xsd:string" use="required"> <xsd:annotation> <xsd:documentation xml:lang="en"> This column contents ('P', 'W', 'E' or 'D') @@ -1203,7 +1282,7 @@ </xsd:annotation> </xsd:attribute> <xsd:attribute name="insert-timestamp-column" use="optional" - type="xsd:string" default="insert_timestamp"> + type="xsd:string"> <xsd:annotation> <xsd:documentation xml:lang="en"> Holds the timestamp when the record was @@ -1484,7 +1563,9 @@ <xsd:simpleType> <xsd:restriction base="xsd:NMTOKEN"> <xsd:enumeration value="http" /> + <xsd:enumeration value="https" /> <xsd:enumeration value="socket" /> + <xsd:enumeration value="sslsocket" /> </xsd:restriction> </xsd:simpleType> </xsd:attribute>

17 years, 2 months

1
0
0 / 0

JBoss Tools SVN: r10986 - in trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa: process and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: vyemialyanchyk Date: 2008-10-20 09:37:37 -0400 (Mon, 20 Oct 2008) New Revision: 10986 Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/collect/CollectEntityInfo.java trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/process/ProcessEntityInfo.java Log: JBIDE-2930 Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/collect/CollectEntityInfo.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/collect/CollectEntityInfo.java 2008-10-20 13:34:17 UTC (rev 10985) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/collect/CollectEntityInfo.java 2008-10-20 13:37:37 UTC (rev 10986) @@ -264,7 +264,15 @@ public boolean visit(FieldDeclaration node) { if (node.getType().isPrimitiveType()) { PrimitiveType pt = (PrimitiveType)node.getType(); - ITypeBinding tb = pt.resolveBinding(); + if (!pt.getPrimitiveTypeCode().equals(PrimitiveType.BOOLEAN)) { + // this is candidate for primary id + Iterator itVarNames = node.fragments().iterator(); + while (itVarNames.hasNext()) { + VariableDeclarationFragment var = (VariableDeclarationFragment)itVarNames.next(); + String name = var.getName().getIdentifier(); + entityInfo.addPrimaryIdCandidate(name); + } + } } else if (node.getType().isSimpleType()) { SimpleType st = (SimpleType)node.getType(); ITypeBinding tb = st.resolveBinding(); Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/process/ProcessEntityInfo.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/process/ProcessEntityInfo.java 2008-10-20 13:34:17 UTC (rev 10985) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/process/ProcessEntityInfo.java 2008-10-20 13:37:37 UTC (rev 10986) @@ -145,7 +145,7 @@ } public boolean visit(FieldDeclaration node) { - if (node.getType().isSimpleType()) { + if (node.getType().isSimpleType() || node.getType().isPrimitiveType()) { if (entityInfo.isAddGeneratedValueFlag()) { String primaryIdName = entityInfo.getPrimaryIdName(); Iterator itVarNames = node.fragments().iterator();

17 years, 2 months

1
0
0 / 0

JBoss Tools SVN: r10985 - trunk/seam/plugins/org.jboss.tools.seam.xml/src/org/jboss/tools/seam/xml/components/model/constraint.

by jbosstools-commits＠lists.jboss.org

Author: scabanovich Date: 2008-10-20 09:34:17 -0400 (Mon, 20 Oct 2008) New Revision: 10985 Modified: trunk/seam/plugins/org.jboss.tools.seam.xml/src/org/jboss/tools/seam/xml/components/model/constraint/ELConstraint.java Log: Added '${' EL start Modified: trunk/seam/plugins/org.jboss.tools.seam.xml/src/org/jboss/tools/seam/xml/components/model/constraint/ELConstraint.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.xml/src/org/jboss/tools/seam/xml/components/model/constraint/ELConstraint.java 2008-10-20 13:11:52 UTC (rev 10984) +++ trunk/seam/plugins/org.jboss.tools.seam.xml/src/org/jboss/tools/seam/xml/components/model/constraint/ELConstraint.java 2008-10-20 13:34:17 UTC (rev 10985) @@ -12,7 +12,7 @@ public boolean accepts(String value) { if(value != null) { - if(value.startsWith("#{") && value.endsWith("}")) { + if((value.startsWith("#{") || value.startsWith("${")) && value.endsWith("}")) { return true; } if(value.length() >= 2 && value.startsWith("@") && value.endsWith("@")) { @@ -27,7 +27,7 @@ */ public String getError(String value) { if(accepts(value)) return null; - if(value.startsWith("#{")) { + if(value.startsWith("#{") || value.startsWith("${")) { return "value is not a correct EL."; } if(value.startsWith("@")) {

17 years, 2 months

1
0
0 / 0

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

by jbosstools-commits＠lists.jboss.org

Author: dsakovich Date: 2008-10-20 09:11:52 -0400 (Mon, 20 Oct 2008) New Revision: 10984 Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/DocTypeUtil.java Log: Code adjustment Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/DocTypeUtil.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/DocTypeUtil.java 2008-10-20 13:06:59 UTC (rev 10983) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/DocTypeUtil.java 2008-10-20 13:11:52 UTC (rev 10984) @@ -12,6 +12,8 @@ package org.jboss.tools.vpe.editor.util; import java.io.File; +import java.net.URI; +import java.net.URISyntaxException; import java.util.ArrayList; import java.util.List; @@ -336,13 +338,18 @@ Attr attr = element.getAttributeNode(attributeName); - File file = new File(attr.getValue()); - if (!file.exists()) { - // corrected path - attr.setValue(Constants.FILE_PREFIX + initFile.getParent() - + File.separator + attr.getValue()); + try { + URI uri = new URI(attr.getValue()); + if (!uri.isAbsolute()) { + // corrected path + attr.setValue(Constants.FILE_PREFIX + initFile.getParent() + + File.separator + attr.getValue()); + } + } catch (URISyntaxException e) { + VpePlugin.getPluginLog().logError(e.getMessage()); } + } }

17 years, 2 months

1
0
0 / 0

JBoss Tools SVN: r10983 - trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/ecore/pages/impl.

by jbosstools-commits＠lists.jboss.org

Author: dazarov Date: 2008-10-20 09:06:59 -0400 (Mon, 20 Oct 2008) New Revision: 10983 Modified: trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/ecore/pages/impl/PagesModelImpl.java Log: https://jira.jboss.org/jira/browse/JBIDE-2925 Modified: trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/ecore/pages/impl/PagesModelImpl.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/ecore/pages/impl/PagesModelImpl.java 2008-10-20 12:47:39 UTC (rev 10982) +++ trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/ecore/pages/impl/PagesModelImpl.java 2008-10-20 13:06:59 UTC (rev 10983) @@ -342,13 +342,30 @@ link.dataChanged(); } } + + /** + *  + *  + * @generated NOT + */ + public void structureChanged(final XModelTreeEvent event) { + if(Display.getCurrent() != null){ + structureChangedInternal(event); + }else{ + Display.getDefault().asyncExec(new Runnable(){ + public void run(){ + structureChangedInternal(event); + } + }); + } + } /** *  *  * @generated NOT */ - public void structureChanged(XModelTreeEvent event) { + public void structureChangedInternal(XModelTreeEvent event) { if(getData() == null) return; XModelObject diagramXML = (XModelObject)getData(); XModelObject target = event.getModelObject();

17 years, 2 months

1
0
0 / 0

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

by jbosstools-commits＠lists.jboss.org

Author: dsakovich Date: 2008-10-20 08:47:39 -0400 (Mon, 20 Oct 2008) New Revision: 10982 Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/Constants.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/DocTypeUtil.java Log: Code adjustment Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/Constants.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/Constants.java 2008-10-20 10:32:11 UTC (rev 10981) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/Constants.java 2008-10-20 12:47:39 UTC (rev 10982) @@ -24,4 +24,5 @@ public static final String PIXEL = "px"; //$NON-NLS-1$ public static final String PERCENT = "%"; //$NON-NLS-1$ public static final String COMMA = ","; //$NON-NLS-1$ + public static final String FILE_PREFIX = "file://"; //$NON-NLS-1$ } Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/DocTypeUtil.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/DocTypeUtil.java 2008-10-20 10:32:11 UTC (rev 10981) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/DocTypeUtil.java 2008-10-20 12:47:39 UTC (rev 10982) @@ -339,7 +339,7 @@ File file = new File(attr.getValue()); if (!file.exists()) { // corrected path - attr.setValue(initFile.getParent() + attr.setValue(Constants.FILE_PREFIX + initFile.getParent() + File.separator + attr.getValue()); }

17 years, 2 months

1
0
0 / 0

JBoss Tools SVN: r10981 - in branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.core: icons and 3 other directories.

by jbosstools-commits＠lists.jboss.org

Author: DartPeng Date: 2008-10-20 06:32:11 -0400 (Mon, 20 Oct 2008) New Revision: 10981 Added: branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.core/icons/ branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.core/icons/full/ branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.core/icons/full/ctool16/ branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.core/icons/full/ctool16/CreateDocumentRoot_condition_ConditionType.gif branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.core/icons/full/ctool16/CreateDocumentRoot_import_ImportType.gif branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.core/icons/full/ctool16/CreateDocumentRoot_param_ParamType.gif branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.core/icons/full/ctool16/CreateDocumentRoot_profile_ProfileType.gif branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.core/icons/full/ctool16/CreateDocumentRoot_profiles_ProfilesType.gif branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.core/icons/full/ctool16/CreateDocumentRoot_resourceConfig_ResourceConfigType.gif branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.core/icons/full/ctool16/CreateDocumentRoot_resource_ResourceType.gif branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.core/icons/full/ctool16/CreateDocumentRoot_smooksResourceList_SmooksResourceListType.gif branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.core/icons/full/ctool16/CreateProfilesType_profile_ProfileType.gif branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.core/icons/full/ctool16/CreateResourceConfigType_condition_ConditionType.gif branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.core/icons/full/ctool16/CreateResourceConfigType_param_ParamType.gif branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.core/icons/full/ctool16/CreateResourceConfigType_resource_ResourceType.gif branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.core/icons/full/ctool16/CreateSmooksResourceListType_profiles_ProfilesType.gif branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.core/icons/full/obj16/ branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.core/icons/full/obj16/ConditionType.gif branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.core/icons/full/obj16/DocumentRoot.gif branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.core/icons/full/obj16/ImportType.gif branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.core/icons/full/obj16/ParamType.gif branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.core/icons/full/obj16/ProfileType.gif branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.core/icons/full/obj16/ProfilesType.gif branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.core/icons/full/obj16/ResourceConfigType.gif branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.core/icons/full/obj16/ResourceType.gif branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.core/icons/full/obj16/SmooksResourceListType.gif Log: JBIDE-2835 Forget that there are some icons need to added Added: branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.core/icons/full/ctool16/CreateDocumentRoot_condition_ConditionType.gif =================================================================== (Binary files differ) Property changes on: branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.core/icons/full/ctool16/CreateDocumentRoot_condition_ConditionType.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.core/icons/full/ctool16/CreateDocumentRoot_import_ImportType.gif =================================================================== (Binary files differ) Property changes on: branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.core/icons/full/ctool16/CreateDocumentRoot_import_ImportType.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.core/icons/full/ctool16/CreateDocumentRoot_param_ParamType.gif =================================================================== (Binary files differ) Property changes on: branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.core/icons/full/ctool16/CreateDocumentRoot_param_ParamType.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.core/icons/full/ctool16/CreateDocumentRoot_profile_ProfileType.gif =================================================================== (Binary files differ) Property changes on: branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.core/icons/full/ctool16/CreateDocumentRoot_profile_ProfileType.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.core/icons/full/ctool16/CreateDocumentRoot_profiles_ProfilesType.gif =================================================================== (Binary files differ) Property changes on: branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.core/icons/full/ctool16/CreateDocumentRoot_profiles_ProfilesType.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.core/icons/full/ctool16/CreateDocumentRoot_resourceConfig_ResourceConfigType.gif =================================================================== (Binary files differ) Property changes on: branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.core/icons/full/ctool16/CreateDocumentRoot_resourceConfig_ResourceConfigType.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.core/icons/full/ctool16/CreateDocumentRoot_resource_ResourceType.gif =================================================================== (Binary files differ) Property changes on: branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.core/icons/full/ctool16/CreateDocumentRoot_resource_ResourceType.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.core/icons/full/ctool16/CreateDocumentRoot_smooksResourceList_SmooksResourceListType.gif =================================================================== (Binary files differ) Property changes on: branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.core/icons/full/ctool16/CreateDocumentRoot_smooksResourceList_SmooksResourceListType.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.core/icons/full/ctool16/CreateProfilesType_profile_ProfileType.gif =================================================================== (Binary files differ) Property changes on: branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.core/icons/full/ctool16/CreateProfilesType_profile_ProfileType.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.core/icons/full/ctool16/CreateResourceConfigType_condition_ConditionType.gif =================================================================== (Binary files differ) Property changes on: branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.core/icons/full/ctool16/CreateResourceConfigType_condition_ConditionType.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.core/icons/full/ctool16/CreateResourceConfigType_param_ParamType.gif =================================================================== (Binary files differ) Property changes on: branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.core/icons/full/ctool16/CreateResourceConfigType_param_ParamType.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.core/icons/full/ctool16/CreateResourceConfigType_resource_ResourceType.gif =================================================================== (Binary files differ) Property changes on: branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.core/icons/full/ctool16/CreateResourceConfigType_resource_ResourceType.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.core/icons/full/ctool16/CreateSmooksResourceListType_profiles_ProfilesType.gif =================================================================== (Binary files differ) Property changes on: branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.core/icons/full/ctool16/CreateSmooksResourceListType_profiles_ProfilesType.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.core/icons/full/obj16/ConditionType.gif =================================================================== (Binary files differ) Property changes on: branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.core/icons/full/obj16/ConditionType.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.core/icons/full/obj16/DocumentRoot.gif =================================================================== (Binary files differ) Property changes on: branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.core/icons/full/obj16/DocumentRoot.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.core/icons/full/obj16/ImportType.gif =================================================================== (Binary files differ) Property changes on: branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.core/icons/full/obj16/ImportType.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.core/icons/full/obj16/ParamType.gif =================================================================== (Binary files differ) Property changes on: branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.core/icons/full/obj16/ParamType.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.core/icons/full/obj16/ProfileType.gif =================================================================== (Binary files differ) Property changes on: branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.core/icons/full/obj16/ProfileType.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.core/icons/full/obj16/ProfilesType.gif =================================================================== (Binary files differ) Property changes on: branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.core/icons/full/obj16/ProfilesType.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.core/icons/full/obj16/ResourceConfigType.gif =================================================================== (Binary files differ) Property changes on: branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.core/icons/full/obj16/ResourceConfigType.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.core/icons/full/obj16/ResourceType.gif =================================================================== (Binary files differ) Property changes on: branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.core/icons/full/obj16/ResourceType.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.core/icons/full/obj16/SmooksResourceListType.gif =================================================================== (Binary files differ) Property changes on: branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.core/icons/full/obj16/SmooksResourceListType.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream

17 years, 2 months

1
0
0 / 0

JBoss Tools SVN: r10980 - branches/jbosstools-3.0.0.Beta1/smooks/plugins.

by jbosstools-commits＠lists.jboss.org

Author: DartPeng Date: 2008-10-20 06:28:27 -0400 (Mon, 20 Oct 2008) New Revision: 10980 Removed: branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.javabean/ branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.model.edit/ branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.model/ branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.xml/ Log: JBIDE-2835 Delete them , they are unusable

17 years, 2 months

1
0
0 / 0

JBoss Tools SVN: r10979 - trunk/smooks/plugins.

by jbosstools-commits＠lists.jboss.org

Author: DartPeng Date: 2008-10-20 06:26:07 -0400 (Mon, 20 Oct 2008) New Revision: 10979 Removed: trunk/smooks/plugins/org.jboss.tools.smooks.javabean/ trunk/smooks/plugins/org.jboss.tools.smooks.model.edit/ trunk/smooks/plugins/org.jboss.tools.smooks.model/ trunk/smooks/plugins/org.jboss.tools.smooks.xml/ Log: JBIDE-2835 Delete them , they are unusable

17 years, 2 months

1
0
0 / 0

JBoss Tools SVN: r10978 - trunk/smooks/plugins/org.jboss.tools.smooks.ui/icons/full/obj16.

by jbosstools-commits＠lists.jboss.org

Author: DartPeng Date: 2008-10-20 06:23:58 -0400 (Mon, 20 Oct 2008) New Revision: 10978 Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/icons/full/obj16/att_obj.gif trunk/smooks/plugins/org.jboss.tools.smooks.ui/icons/full/obj16/attribute_obj.gif trunk/smooks/plugins/org.jboss.tools.smooks.ui/icons/full/obj16/class_obj.gif trunk/smooks/plugins/org.jboss.tools.smooks.ui/icons/full/obj16/element_obj.gif trunk/smooks/plugins/org.jboss.tools.smooks.ui/icons/full/obj16/javaarraymodel.gif trunk/smooks/plugins/org.jboss.tools.smooks.ui/icons/full/obj16/javalistmodel.gif Log: JBIDE-2835 add the icons Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/icons/full/obj16/att_obj.gif =================================================================== (Binary files differ) Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/icons/full/obj16/att_obj.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/icons/full/obj16/attribute_obj.gif =================================================================== (Binary files differ) Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/icons/full/obj16/attribute_obj.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/icons/full/obj16/class_obj.gif =================================================================== (Binary files differ) Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/icons/full/obj16/class_obj.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/icons/full/obj16/element_obj.gif =================================================================== (Binary files differ) Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/icons/full/obj16/element_obj.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/icons/full/obj16/javaarraymodel.gif =================================================================== (Binary files differ) Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/icons/full/obj16/javaarraymodel.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/icons/full/obj16/javalistmodel.gif =================================================================== (Binary files differ) Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/icons/full/obj16/javalistmodel.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream

17 years, 2 months

1
0
0 / 0

JBoss Tools SVN: r10977 - in trunk/smooks/plugins/org.jboss.tools.smooks.core/icons: full and 2 other directories.

by jbosstools-commits＠lists.jboss.org

Author: DartPeng Date: 2008-10-20 06:18:18 -0400 (Mon, 20 Oct 2008) New Revision: 10977 Added: trunk/smooks/plugins/org.jboss.tools.smooks.core/icons/full/ trunk/smooks/plugins/org.jboss.tools.smooks.core/icons/full/ctool16/ trunk/smooks/plugins/org.jboss.tools.smooks.core/icons/full/ctool16/CreateDocumentRoot_condition_ConditionType.gif trunk/smooks/plugins/org.jboss.tools.smooks.core/icons/full/ctool16/CreateDocumentRoot_import_ImportType.gif trunk/smooks/plugins/org.jboss.tools.smooks.core/icons/full/ctool16/CreateDocumentRoot_param_ParamType.gif trunk/smooks/plugins/org.jboss.tools.smooks.core/icons/full/ctool16/CreateDocumentRoot_profile_ProfileType.gif trunk/smooks/plugins/org.jboss.tools.smooks.core/icons/full/ctool16/CreateDocumentRoot_profiles_ProfilesType.gif trunk/smooks/plugins/org.jboss.tools.smooks.core/icons/full/ctool16/CreateDocumentRoot_resourceConfig_ResourceConfigType.gif trunk/smooks/plugins/org.jboss.tools.smooks.core/icons/full/ctool16/CreateDocumentRoot_resource_ResourceType.gif trunk/smooks/plugins/org.jboss.tools.smooks.core/icons/full/ctool16/CreateDocumentRoot_smooksResourceList_SmooksResourceListType.gif trunk/smooks/plugins/org.jboss.tools.smooks.core/icons/full/ctool16/CreateProfilesType_profile_ProfileType.gif trunk/smooks/plugins/org.jboss.tools.smooks.core/icons/full/ctool16/CreateResourceConfigType_condition_ConditionType.gif trunk/smooks/plugins/org.jboss.tools.smooks.core/icons/full/ctool16/CreateResourceConfigType_param_ParamType.gif trunk/smooks/plugins/org.jboss.tools.smooks.core/icons/full/ctool16/CreateResourceConfigType_resource_ResourceType.gif trunk/smooks/plugins/org.jboss.tools.smooks.core/icons/full/ctool16/CreateSmooksResourceListType_profiles_ProfilesType.gif trunk/smooks/plugins/org.jboss.tools.smooks.core/icons/full/obj16/ trunk/smooks/plugins/org.jboss.tools.smooks.core/icons/full/obj16/ConditionType.gif trunk/smooks/plugins/org.jboss.tools.smooks.core/icons/full/obj16/DocumentRoot.gif trunk/smooks/plugins/org.jboss.tools.smooks.core/icons/full/obj16/ImportType.gif trunk/smooks/plugins/org.jboss.tools.smooks.core/icons/full/obj16/ParamType.gif trunk/smooks/plugins/org.jboss.tools.smooks.core/icons/full/obj16/ProfileType.gif trunk/smooks/plugins/org.jboss.tools.smooks.core/icons/full/obj16/ProfilesType.gif trunk/smooks/plugins/org.jboss.tools.smooks.core/icons/full/obj16/ResourceConfigType.gif trunk/smooks/plugins/org.jboss.tools.smooks.core/icons/full/obj16/ResourceType.gif trunk/smooks/plugins/org.jboss.tools.smooks.core/icons/full/obj16/SmooksResourceListType.gif Log: JBIDE-2835 For resolve the beta1 bug JBIDE-2835 , and merge the alterations to the trunk Added: trunk/smooks/plugins/org.jboss.tools.smooks.core/icons/full/ctool16/CreateDocumentRoot_condition_ConditionType.gif =================================================================== (Binary files differ) Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.core/icons/full/ctool16/CreateDocumentRoot_condition_ConditionType.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/smooks/plugins/org.jboss.tools.smooks.core/icons/full/ctool16/CreateDocumentRoot_import_ImportType.gif =================================================================== (Binary files differ) Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.core/icons/full/ctool16/CreateDocumentRoot_import_ImportType.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/smooks/plugins/org.jboss.tools.smooks.core/icons/full/ctool16/CreateDocumentRoot_param_ParamType.gif =================================================================== (Binary files differ) Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.core/icons/full/ctool16/CreateDocumentRoot_param_ParamType.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/smooks/plugins/org.jboss.tools.smooks.core/icons/full/ctool16/CreateDocumentRoot_profile_ProfileType.gif =================================================================== (Binary files differ) Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.core/icons/full/ctool16/CreateDocumentRoot_profile_ProfileType.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/smooks/plugins/org.jboss.tools.smooks.core/icons/full/ctool16/CreateDocumentRoot_profiles_ProfilesType.gif =================================================================== (Binary files differ) Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.core/icons/full/ctool16/CreateDocumentRoot_profiles_ProfilesType.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/smooks/plugins/org.jboss.tools.smooks.core/icons/full/ctool16/CreateDocumentRoot_resourceConfig_ResourceConfigType.gif =================================================================== (Binary files differ) Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.core/icons/full/ctool16/CreateDocumentRoot_resourceConfig_ResourceConfigType.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/smooks/plugins/org.jboss.tools.smooks.core/icons/full/ctool16/CreateDocumentRoot_resource_ResourceType.gif =================================================================== (Binary files differ) Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.core/icons/full/ctool16/CreateDocumentRoot_resource_ResourceType.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/smooks/plugins/org.jboss.tools.smooks.core/icons/full/ctool16/CreateDocumentRoot_smooksResourceList_SmooksResourceListType.gif =================================================================== (Binary files differ) Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.core/icons/full/ctool16/CreateDocumentRoot_smooksResourceList_SmooksResourceListType.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/smooks/plugins/org.jboss.tools.smooks.core/icons/full/ctool16/CreateProfilesType_profile_ProfileType.gif =================================================================== (Binary files differ) Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.core/icons/full/ctool16/CreateProfilesType_profile_ProfileType.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/smooks/plugins/org.jboss.tools.smooks.core/icons/full/ctool16/CreateResourceConfigType_condition_ConditionType.gif =================================================================== (Binary files differ) Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.core/icons/full/ctool16/CreateResourceConfigType_condition_ConditionType.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/smooks/plugins/org.jboss.tools.smooks.core/icons/full/ctool16/CreateResourceConfigType_param_ParamType.gif =================================================================== (Binary files differ) Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.core/icons/full/ctool16/CreateResourceConfigType_param_ParamType.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/smooks/plugins/org.jboss.tools.smooks.core/icons/full/ctool16/CreateResourceConfigType_resource_ResourceType.gif =================================================================== (Binary files differ) Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.core/icons/full/ctool16/CreateResourceConfigType_resource_ResourceType.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/smooks/plugins/org.jboss.tools.smooks.core/icons/full/ctool16/CreateSmooksResourceListType_profiles_ProfilesType.gif =================================================================== (Binary files differ) Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.core/icons/full/ctool16/CreateSmooksResourceListType_profiles_ProfilesType.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/smooks/plugins/org.jboss.tools.smooks.core/icons/full/obj16/ConditionType.gif =================================================================== (Binary files differ) Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.core/icons/full/obj16/ConditionType.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/smooks/plugins/org.jboss.tools.smooks.core/icons/full/obj16/DocumentRoot.gif =================================================================== (Binary files differ) Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.core/icons/full/obj16/DocumentRoot.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/smooks/plugins/org.jboss.tools.smooks.core/icons/full/obj16/ImportType.gif =================================================================== (Binary files differ) Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.core/icons/full/obj16/ImportType.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/smooks/plugins/org.jboss.tools.smooks.core/icons/full/obj16/ParamType.gif =================================================================== (Binary files differ) Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.core/icons/full/obj16/ParamType.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/smooks/plugins/org.jboss.tools.smooks.core/icons/full/obj16/ProfileType.gif =================================================================== (Binary files differ) Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.core/icons/full/obj16/ProfileType.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/smooks/plugins/org.jboss.tools.smooks.core/icons/full/obj16/ProfilesType.gif =================================================================== (Binary files differ) Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.core/icons/full/obj16/ProfilesType.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/smooks/plugins/org.jboss.tools.smooks.core/icons/full/obj16/ResourceConfigType.gif =================================================================== (Binary files differ) Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.core/icons/full/obj16/ResourceConfigType.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/smooks/plugins/org.jboss.tools.smooks.core/icons/full/obj16/ResourceType.gif =================================================================== (Binary files differ) Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.core/icons/full/obj16/ResourceType.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/smooks/plugins/org.jboss.tools.smooks.core/icons/full/obj16/SmooksResourceListType.gif =================================================================== (Binary files differ) Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.core/icons/full/obj16/SmooksResourceListType.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream

17 years, 2 months

1
0
0 / 0

JBoss Tools SVN: r10976 - trunk/smooks/plugins/org.jboss.tools.smooks.core.

by jbosstools-commits＠lists.jboss.org

Author: DartPeng Date: 2008-10-20 06:13:46 -0400 (Mon, 20 Oct 2008) New Revision: 10976 Added: trunk/smooks/plugins/org.jboss.tools.smooks.core/icons/ Log:

17 years, 2 months

1
0
0 / 0

JBoss Tools SVN: r10975 - trunk/smooks/plugins/org.jboss.tools.smooks.model.edit.

by jbosstools-commits＠lists.jboss.org

Author: DartPeng Date: 2008-10-20 06:12:48 -0400 (Mon, 20 Oct 2008) New Revision: 10975 Removed: trunk/smooks/plugins/org.jboss.tools.smooks.model.edit/icons/ Log:

17 years, 2 months

1
0
0 / 0

JBoss Tools SVN: r10974 - in trunk/smooks: plugins/org.jboss.tools.smooks.ui and 23 other directories.

by jbosstools-commits＠lists.jboss.org

Author: DartPeng Date: 2008-10-20 06:10:26 -0400 (Mon, 20 Oct 2008) New Revision: 10974 Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/libs/dom4j-1.6.1.jar trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/java2xml/ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/java2xml/analyzer/ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/java2xml/analyzer/DOM2FreeMarkerTransformor.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/java2xml/analyzer/FreeMarkerContentReplacer.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/java2xml/analyzer/Java2XMLAnalyzer.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/java2xml/utils/ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/java2xml/utils/XMLConstants.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/analyzer/ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/analyzer/JavaBeanAnalyzer.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/commandprocessor/ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/commandprocessor/JavaBeanModelCommandProcessor.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/model/ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/model/BeanContentProvider.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/model/BeanlabelProvider.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/model/JavaBeanModel.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/model/JavaBeanModelFactory.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/model/JavaBeanParser.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/model/JavaStructuredDataModel.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/model/JavabeanStructuredContentsModel.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/ui/ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/ui/JavaBeanConfigWizardPage.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/ui/JavaBeanModelCreationDialog.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/ui/JavaBeanModelGraphUIProvider.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/ui/JavaBeanModelLoadComposite.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/ui/JavaImageConstants.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/ui/NewJavaBeanStrucutredDataWizard.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/uitils/ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/uitils/JavaPropertyUtils.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml/ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml/AbstractFileSelectionWizardPage.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml/AbstractStructuredDdataWizard.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml/XMLImageConstants.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml/model/ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml/model/AbstractXMLObject.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml/model/DocumentObject.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml/model/TagObject.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml/model/TagPropertyObject.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml/model/XMLObjectAnalyzer.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml/model/XMLStructuredModel.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml/model/XMLStrucutredModelParser.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml/ui/ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml/ui/XMLStructuredDataContentProvider.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml/ui/XMLStructuredDataLabelProvider.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml/ui/XMLStructuredDataWizard.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml/ui/XMLStructuredDataWizardPage.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml2java/ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml2java/analyzer/ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml2java/analyzer/XML2JavaAnalyzer.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml2java/analyzer/XMLSourceModelAnalyzer.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml2xml/ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml2xml/XML2XMLAnalyzer.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xsd/ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xsd/model/ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xsd/model/XSDStructuredModelContentProvider.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xsd/model/XSDStructuredModelLabelProvider.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xsd/ui/ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xsd/ui/XSDStructuredDataWizard.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xsd/ui/XSDStructuredDataWizardPage.java Modified: trunk/smooks/features/org.jboss.tools.smooks.feature/feature.xml trunk/smooks/plugins/org.jboss.tools.smooks.ui/.classpath trunk/smooks/plugins/org.jboss.tools.smooks.ui/META-INF/MANIFEST.MF trunk/smooks/plugins/org.jboss.tools.smooks.ui/build.properties trunk/smooks/plugins/org.jboss.tools.smooks.ui/plugin.xml trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/SmooksUIActivator.java trunk/smooks/tests/org.jboss.tools.smooks.test/META-INF/MANIFEST.MF Log: JBIDE-2835 For resolve the beta1 bug JBIDE-2835 , and merge the alterations to the trunk Modified: trunk/smooks/features/org.jboss.tools.smooks.feature/feature.xml =================================================================== --- trunk/smooks/features/org.jboss.tools.smooks.feature/feature.xml 2008-10-20 10:08:30 UTC (rev 10973) +++ trunk/smooks/features/org.jboss.tools.smooks.feature/feature.xml 2008-10-20 10:10:26 UTC (rev 10974) @@ -219,38 +219,17 @@ </license> <plugin - id="org.jboss.tools.smooks.javabean" + id="org.jboss.tools.smooks.core" download-size="0" install-size="0" version="0.0.0" unpack="false"/> <plugin - id="org.jboss.tools.smooks.model" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.jboss.tools.smooks.model.edit" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin id="org.jboss.tools.smooks.ui" download-size="0" install-size="0" version="0.0.0" unpack="false"/> - <plugin - id="org.jboss.tools.smooks.xml" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - </feature> Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/.classpath =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/.classpath 2008-10-20 10:08:30 UTC (rev 10973) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/.classpath 2008-10-20 10:10:26 UTC (rev 10974) @@ -4,5 +4,6 @@ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry kind="src" path="src_test"/> + <classpathentry kind="lib" path="libs/dom4j-1.6.1.jar"/> <classpathentry kind="output" path="bin"/> </classpath> Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/META-INF/MANIFEST.MF =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/META-INF/MANIFEST.MF 2008-10-20 10:08:30 UTC (rev 10973) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/META-INF/MANIFEST.MF 2008-10-20 10:10:26 UTC (rev 10974) @@ -4,32 +4,40 @@ Bundle-SymbolicName: org.jboss.tools.smooks.ui; singleton:=true Bundle-Version: 1.0.0 Bundle-Activator: org.jboss.tools.smooks.ui.SmooksUIActivator -Require-Bundle: org.eclipse.ui, +Require-Bundle: org.junit, + org.eclipse.ui, + org.eclipse.ui.views.properties.tabbed, + org.eclipse.ui.editors, + org.eclipse.ui.ide, + org.eclipse.ui.forms, org.eclipse.core.runtime, org.eclipse.jface.text, org.eclipse.core.resources, - org.eclipse.ui.editors, - org.eclipse.ui.ide, org.eclipse.gef, - org.junit, org.eclipse.jdt.core, org.eclipse.jdt.ui, org.eclipse.xsd, - org.eclipse.ui.forms, - org.jboss.tools.smooks.model, org.eclipse.emf, org.eclipse.emf.edit, - org.jboss.tools.smooks.model.edit, - org.eclipse.ui.views.properties.tabbed, - org.eclipse.emf.edit.ui + org.eclipse.emf.edit.ui, + org.eclipse.xsd.edit, + org.jboss.tools.smooks.core Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.5 -Bundle-ClassPath: . +Bundle-ClassPath: ., + libs/dom4j-1.6.1.jar Bundle-Vendor: JBoss Export-Package: org.jboss.tools.smooks.analyzer, org.jboss.tools.smooks.graphical, org.jboss.tools.smooks.graphical.impl, org.jboss.tools.smooks.graphical.util, + org.jboss.tools.smooks.java2xml.analyzer, + org.jboss.tools.smooks.java2xml.utils, + org.jboss.tools.smooks.javabean.analyzer, + org.jboss.tools.smooks.javabean.commandprocessor, + org.jboss.tools.smooks.javabean.model, + org.jboss.tools.smooks.javabean.ui, + org.jboss.tools.smooks.javabean.uitils, org.jboss.tools.smooks.ui, org.jboss.tools.smooks.ui.editors, org.jboss.tools.smooks.ui.gef, @@ -45,4 +53,11 @@ org.jboss.tools.smooks.ui.gef.util.figures, org.jboss.tools.smooks.ui.modelparser, org.jboss.tools.smooks.ui.wizards, - org.jboss.tools.smooks.utils + org.jboss.tools.smooks.utils, + org.jboss.tools.smooks.xml, + org.jboss.tools.smooks.xml.model, + org.jboss.tools.smooks.xml.ui, + org.jboss.tools.smooks.xml2java.analyzer, + org.jboss.tools.smooks.xml2xml, + org.jboss.tools.smooks.xsd.model, + org.jboss.tools.smooks.xsd.ui Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/build.properties =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/build.properties 2008-10-20 10:08:30 UTC (rev 10973) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/build.properties 2008-10-20 10:10:26 UTC (rev 10974) @@ -4,4 +4,5 @@ META-INF/,\ .,\ icons/,\ - libs/ + libs/,\ + libs/dom4j-1.6.1.jar Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/libs/dom4j-1.6.1.jar =================================================================== (Binary files differ) Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/libs/dom4j-1.6.1.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/plugin.xml =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/plugin.xml 2008-10-20 10:08:30 UTC (rev 10973) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/plugin.xml 2008-10-20 10:10:26 UTC (rev 10974) @@ -68,4 +68,94 @@ name="Smooks Configuration File"> </wizard> </extension> + + <extension + point="org.jboss.tools.smooks.ui.viewerInitor"> + <viewerInitor + contentProvider="org.jboss.tools.smooks.xml.ui.XMLStructuredDataContentProvider" + creationWizard="org.jboss.tools.smooks.xml.ui.XMLStructuredDataWizard" + description="XML data type comes from any .xml file." + labelProvider="org.jboss.tools.smooks.xml.ui.XMLStructuredDataLabelProvider" + name="XML Data Type" + typeID="org.jboss.tools.smooks.xml.viewerInitor.xml"> + </viewerInitor> + </extension> + <extension + point="org.jboss.tools.smooks.ui.analyzer"> + <mappingAnalyzer + class="org.jboss.tools.smooks.xml2xml.XML2XMLAnalyzer" + name="XML2XML Analyzer" + typeID="org.jboss.tools.smooks.xml.viewerInitor.xml"> + <targetSourceType + id="org.jboss.tools.smooks.xml.viewerInitor.xml" + name="XML"> + </targetSourceType> + </mappingAnalyzer> + </extension> + <extension + point="org.jboss.tools.smooks.ui.viewerInitor"> + <viewerInitor + contentProvider="org.jboss.tools.smooks.javabean.model.BeanContentProvider" + creationWizard="org.jboss.tools.smooks.javabean.ui.NewJavaBeanStrucutredDataWizard" + description="This data type can get from any Java .class." + labelProvider="org.jboss.tools.smooks.javabean.model.BeanlabelProvider" + name="JavaBean Data Type" + typeID="org.jboss.tools.smooks.ui.viewerInitor.javabean"> + </viewerInitor> + </extension> + <extension + point="org.jboss.tools.smooks.ui.analyzer"> + <mappingAnalyzer + class="org.jboss.tools.smooks.javabean.analyzer.JavaBeanAnalyzer" + name="JavaBean Analyzer" + typeID="org.jboss.tools.smooks.ui.viewerInitor.javabean"> + <targetSourceType + id="org.jboss.tools.smooks.ui.viewerInitor.javabean" + name="java2java"> + </targetSourceType> + </mappingAnalyzer> + <sourceModelAnalyzer + class="org.jboss.tools.smooks.javabean.analyzer.JavaBeanAnalyzer" + level="0" + name="JavaBean SourceModel Analyzer" + typeID="org.jboss.tools.smooks.ui.viewerInitor.javabean"> + </sourceModelAnalyzer> + <targetModelAnalyzer + class="org.jboss.tools.smooks.javabean.analyzer.JavaBeanAnalyzer" + level="0" + name="JavaBean TargetModel Analyzer" + typeID="org.jboss.tools.smooks.ui.viewerInitor.javabean"> + </targetModelAnalyzer> + </extension> + + <extension + point="org.jboss.tools.smooks.ui.analyzer"> + <mappingAnalyzer + class="org.jboss.tools.smooks.java2xml.analyzer.Java2XMLAnalyzer" + name="Java Bean" + typeID="org.jboss.tools.smooks.ui.viewerInitor.javabean"> + <targetSourceType + id="org.jboss.tools.smooks.xml.viewerInitor.xml" + name="XML"> + </targetSourceType> + </mappingAnalyzer> + </extension> + + <extension + point="org.jboss.tools.smooks.ui.analyzer"> + <mappingAnalyzer + class="org.jboss.tools.smooks.xml2java.analyzer.XML2JavaAnalyzer" + name="XML2Java" + typeID="org.jboss.tools.smooks.xml.viewerInitor.xml"> + <targetSourceType + id="org.jboss.tools.smooks.ui.viewerInitor.javabean" + name="JavaBean"> + </targetSourceType> + </mappingAnalyzer> + <sourceModelAnalyzer + class="org.jboss.tools.smooks.xml2java.analyzer.XMLSourceModelAnalyzer" + name="XML" + typeID="org.jboss.tools.smooks.xml.viewerInitor.xml"> + </sourceModelAnalyzer> + </extension> </plugin> Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/java2xml/analyzer/DOM2FreeMarkerTransformor.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/java2xml/analyzer/DOM2FreeMarkerTransformor.java (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/java2xml/analyzer/DOM2FreeMarkerTransformor.java 2008-10-20 10:10:26 UTC (rev 10974) @@ -0,0 +1,91 @@ +/******************************************************************************* + * Copyright (c) 2008 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 + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.smooks.java2xml.analyzer; + +import java.util.Iterator; +import java.util.List; + +import org.dom4j.Attribute; +import org.dom4j.Document; +import org.dom4j.Element; +import org.jboss.tools.smooks.java2xml.utils.XMLConstants; + +/** + * @author Dart Peng + * @Date : Sep 25, 2008 + */ +public class DOM2FreeMarkerTransformor { + + public String transformDOM(Document document) { + Element element = document.getRootElement(); + StringBuffer buffer = new StringBuffer(); + transform(element, buffer); + return buffer.toString(); + } + + protected void transform(Element element, StringBuffer buffer) { + String name = element.getName(); + if (XMLConstants.REPLACE_FREEMARKER_FOR_EXPRESS_ELEMENT_NAME + .equals(name)) { + String desc = element + .attributeValue(XMLConstants.REPLACE_FREEMARKER_FOR_EXPRESS_ELEMENT_ATTRIBUTE); + name = "#" + desc; + } + String attributesString = ""; + if(!isFreeMarkerExpression(name)){ + attributesString = buildAttributeString(element); + } + List children = element.elements(); + if (children.isEmpty()) { + buffer.append("<" + name + " " +attributesString + "/>"); + return; + } else { + buffer.append("<" + name + " " +attributesString + "/>"); + for (Iterator iterator = children.iterator(); iterator.hasNext();) { + Element child = (Element) iterator.next(); + transform(child, buffer); + } + if(isFreeMarkerExpression(name)){ + name = name.trim(); + int index = name.indexOf(" "); + if(index != -1){ + name = name.substring(0,index); + } + } + buffer.append("</" + name + ">"); + } + } + + private String buildAttributeString(Element element) { + List list = element.attributes(); + StringBuffer buffer = new StringBuffer(""); + for (Iterator iterator = list.iterator(); iterator.hasNext();) { + Attribute att = (Attribute) iterator.next(); + String name = att.getName(); + String value = att.getValue(); + if(value == null) value = ""; + if(name != null){ + buffer.append(name); + buffer.append("="); + buffer.append("\""); + buffer.append(value); + buffer.append("\""); + buffer.append(" "); + } + } + return buffer.toString(); + } + + private boolean isFreeMarkerExpression(String str){ + return str.startsWith("#"); + } + +} Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/java2xml/analyzer/DOM2FreeMarkerTransformor.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/java2xml/analyzer/FreeMarkerContentReplacer.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/java2xml/analyzer/FreeMarkerContentReplacer.java (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/java2xml/analyzer/FreeMarkerContentReplacer.java 2008-10-20 10:10:26 UTC (rev 10974) @@ -0,0 +1,76 @@ +/******************************************************************************* + * Copyright (c) 2008 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 + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.smooks.java2xml.analyzer; + +import java.io.IOException; +import java.io.Reader; +import java.io.StringReader; + +/** + * @author Dart Peng + * @Date : Sep 25, 2008 + */ +public class FreeMarkerContentReplacer { + + public String replaceFreeMarkerTemplate(Reader reader) throws IOException { + StringBuffer buffer = new StringBuffer(); +// Configuration fmConfiguration = new Configuration(); +// fmConfiguration.setTagSyntax(Configuration.AUTO_DETECT_TAG_SYNTAX); +// +// Template template; +// template = new Template("XML2Java_FreeMarker", reader, fmConfiguration); +// TemplateElement root = template.getRootTreeNode(); +// visitTemplateElement(root, buffer); + return buffer.toString(); + } + + public String replaceFreeMarkerTemplate(String templateContents) + throws IOException { + Reader reader = new StringReader(templateContents); + return replaceFreeMarkerTemplate(reader); + } + +// private void visitTemplateElement(TemplateElement model, StringBuffer buffer) { + +// Enumeration children = ((TemplateElement) model).children(); +// if (!"MixedContent".equals(model.getNodeName())) { +// buffer +// .append("<" +// + XMLConstants.REPLACE_FREEMARKER_FOR_EXPRESS_ELEMENT_NAME +// + " " +// + XMLConstants.REPLACE_FREEMARKER_FOR_EXPRESS_ELEMENT_ATTRIBUTE +// + "= \"" + model.getDescription() + "\">"); +// } +// while (children.hasMoreElements()) { +// Object obj = children.nextElement(); +// if (!(obj instanceof TextBlock)) { +// TemplateElement child = (TemplateElement) obj; +// String str = child.getSource(); +// if (child.isLeaf()) { +// if (child.getNodeName().equals("DollarVariable")) { +// buffer.append(child.getSource()); +// } else { +// buffer.append(child.getDescription()); +// } +// continue; +// } +// visitTemplateElement(child, buffer); +// } else { +// buffer.append(obj); +// } +// } +// if (!"MixedContent".equals(model.getNodeName())) { +// buffer.append("</" +// + XMLConstants.REPLACE_FREEMARKER_FOR_EXPRESS_ELEMENT_NAME +// + ">"); +// } +// } +} Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/java2xml/analyzer/FreeMarkerContentReplacer.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/java2xml/analyzer/Java2XMLAnalyzer.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/java2xml/analyzer/Java2XMLAnalyzer.java (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/java2xml/analyzer/Java2XMLAnalyzer.java 2008-10-20 10:10:26 UTC (rev 10974) @@ -0,0 +1,183 @@ +/******************************************************************************* + * Copyright (c) 2008 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 + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.smooks.java2xml.analyzer; + +import java.util.Iterator; +import java.util.List; + +import org.dom4j.Document; +import org.dom4j.DocumentHelper; +import org.dom4j.Element; +import org.eclipse.jface.dialogs.MessageDialog; +import org.eclipse.swt.widgets.Shell; +import org.jboss.tools.smooks.analyzer.AbstractAnalyzer; +import org.jboss.tools.smooks.analyzer.DesignTimeAnalyzeResult; +import org.jboss.tools.smooks.analyzer.MappingResourceConfigList; +import org.jboss.tools.smooks.analyzer.SmooksAnalyzerException; +import org.jboss.tools.smooks.javabean.model.JavaBeanModel; +import org.jboss.tools.smooks.model.ParamType; +import org.jboss.tools.smooks.model.ResourceConfigType; +import org.jboss.tools.smooks.model.SmooksFactory; +import org.jboss.tools.smooks.model.SmooksResourceListType; +import org.jboss.tools.smooks.model.util.SmooksModelUtils; +import org.jboss.tools.smooks.ui.gef.model.AbstractStructuredDataModel; +import org.jboss.tools.smooks.ui.gef.model.GraphRootModel; +import org.jboss.tools.smooks.ui.gef.model.LineConnectionModel; +import org.jboss.tools.smooks.ui.gef.model.SourceModel; +import org.jboss.tools.smooks.ui.gef.model.TargetModel; +import org.jboss.tools.smooks.ui.modelparser.SmooksConfigurationFileGenerateContext; +import org.jboss.tools.smooks.utils.UIUtils; +import org.jboss.tools.smooks.xml.model.AbstractXMLObject; +import org.jboss.tools.smooks.xml.model.DocumentObject; +import org.jboss.tools.smooks.xml.model.TagObject; +import org.jboss.tools.smooks.xml.model.TagPropertyObject; + +/** + * + * @author <a href="mailto:dpeng@redhat.com">Dart Peng</a> + * @Date 2008-9-22 + */ +public class Java2XMLAnalyzer extends AbstractAnalyzer { + + /* + * (non-Javadoc) + * + * @see org.jboss.tools.smooks.analyzer.IMappingAnalyzer#analyzeMappingGraphModel(org.jboss.tools.smooks.ui.modelparser.SmooksConfigurationFileGenerateContext) + */ + public void analyzeMappingGraphModel( + SmooksConfigurationFileGenerateContext context) + throws SmooksAnalyzerException { + // TODO will modify soon + + if(true){ + Shell shell = context.getShell(); + MessageDialog.openWarning(shell, "Warning", "The java2xml can't be generate to config file currently."); + return; + } + + GraphRootModel rootModel = context.getGraphicalRootModel(); + List<SourceModel> sourceModelList = rootModel.loadSourceModelList(); + List<TargetModel> targetModelList = rootModel.loadTargetModelList(); + + // Element rootElement = DocumentHelper.createElement(name); + TagObject root = null; + for (Iterator iterator = targetModelList.iterator(); iterator.hasNext();) { + TargetModel targetModel = (TargetModel) iterator.next(); + AbstractXMLObject tag = (AbstractXMLObject) targetModel + .getReferenceEntityModel(); + root = findTheRootTagObject(tag); + break; + } + + if (root == null) + throw new SmooksAnalyzerException("can't find the root element"); + Document document = DocumentHelper.createDocument(); + Element rootElement = generateXMLContents(rootModel, root); + document.setRootElement(rootElement); + + String string = document.asXML(); + + ResourceConfigType resource = SmooksFactory.eINSTANCE + .createResourceConfigType(); + ParamType param = SmooksFactory.eINSTANCE.createParamType(); + resource.getParam().add(param); + SmooksModelUtils.appendTextToSmooksType(param, string); + context.getGeneratorResourceList().add(resource); + System.out.println(string); + } + + protected Element generateXMLContents(GraphRootModel graph, TagObject tag) { + Element element = DocumentHelper.createElement(tag.getName()); + AbstractStructuredDataModel dataModel = UIUtils.findGraphModel(graph, + tag); + generateElementAttribute(graph, element, tag.getProperties()); + List children = tag.getChildren(); + for (Iterator iterator = children.iterator(); iterator.hasNext();) { + TagObject child = (TagObject) iterator.next(); + element.add(generateXMLContents(graph, child)); + } + + if (dataModel != null) { + LineConnectionModel connection = UIUtils + .getFirstTargetModelViaConnection(dataModel); + if (connection != null) { + SourceModel source = (SourceModel) connection.getSource(); + element + .add(DocumentHelper + .createCDATA(getTheJavaBeanString((JavaBeanModel) source + .getReferenceEntityModel()))); + } + } + + return element; + } + + protected void generateElementAttribute(GraphRootModel graph, + Element element, List<TagPropertyObject> properties) { + for (Iterator iterator = properties.iterator(); iterator.hasNext();) { + TagPropertyObject tagPropertyObject = (TagPropertyObject) iterator + .next(); + + AbstractStructuredDataModel dataModel = UIUtils.findGraphModel( + graph, tagPropertyObject); + LineConnectionModel connect = UIUtils + .getFirstTargetModelViaConnection(dataModel); + if (connect == null) + continue; + + SourceModel source = (SourceModel) connect.getSource(); + + element.addAttribute(tagPropertyObject.getName(), + getTheJavaBeanString((JavaBeanModel) source + .getReferenceEntityModel())); + } + } + + protected TagObject findTheRootTagObject(AbstractXMLObject obj) { + AbstractXMLObject parent = obj.getParent(); + if (parent instanceof DocumentObject && obj instanceof TagObject) + return (TagObject) obj; + return (TagObject) findTheRootTagObject(parent); + } + + /* + * (non-Javadoc) + * + * @see org.jboss.tools.smooks.analyzer.IMappingAnalyzer#analyzeMappingSmooksModel(org.jboss.tools.smooks.model.SmooksResourceListType, + * java.lang.Object, java.lang.Object) + */ + public MappingResourceConfigList analyzeMappingSmooksModel( + SmooksResourceListType listType, Object sourceObject, + Object targetObject) { + // TODO Auto-generated method stub + return null; + } + + protected String getTheJavaBeanString(JavaBeanModel currentModel) { + String name = currentModel.getName(); + JavaBeanModel parent = currentModel.getParent(); + while (parent != null ) { + String pn = parent.getName(); + if (pn != null) { + name = parent.getName() + "." + name; + } + parent = parent.getParent(); + } + return "${" + name + "}"; + } + + public DesignTimeAnalyzeResult analyzeGraphModel( + SmooksConfigurationFileGenerateContext context) { + // TODO Auto-generated method stub + return null; + } + +} Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/java2xml/analyzer/Java2XMLAnalyzer.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/java2xml/utils/XMLConstants.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/java2xml/utils/XMLConstants.java (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/java2xml/utils/XMLConstants.java 2008-10-20 10:10:26 UTC (rev 10974) @@ -0,0 +1,22 @@ +/******************************************************************************* + * Copyright (c) 2008 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 + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.smooks.java2xml.utils; + +/** + * @author Dart Peng + * @Date : Sep 25, 2008 + */ +public class XMLConstants { + public static final String REPLACE_FREEMARKER_FOR_EXPRESS_ELEMENT_NAME = "replaceElementNameForFreeMarker"; + + public static final String REPLACE_FREEMARKER_FOR_EXPRESS_ELEMENT_ATTRIBUTE = "desc"; + +} Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/java2xml/utils/XMLConstants.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/analyzer/JavaBeanAnalyzer.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/analyzer/JavaBeanAnalyzer.java (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/analyzer/JavaBeanAnalyzer.java 2008-10-20 10:10:26 UTC (rev 10974) @@ -0,0 +1,1014 @@ +/******************************************************************************* + * Copyright (c) 2008 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 + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.smooks.javabean.analyzer; + +import java.lang.reflect.InvocationTargetException; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; + +import org.eclipse.core.resources.IFile; +import org.eclipse.core.resources.IProject; +import org.eclipse.emf.common.command.BasicCommandStack; +import org.eclipse.emf.common.command.CommandStack; +import org.eclipse.emf.ecore.EStructuralFeature; +import org.eclipse.emf.ecore.resource.Resource; +import org.eclipse.emf.ecore.util.ExtendedMetaData; +import org.eclipse.emf.ecore.util.FeatureMap; +import org.eclipse.emf.ecore.xml.type.AnyType; +import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain; +import org.eclipse.emf.edit.provider.ComposedAdapterFactory; +import org.eclipse.emf.edit.provider.resource.ResourceItemProviderAdapterFactory; +import org.eclipse.jdt.core.JavaCore; +import org.eclipse.jdt.core.JavaModelException; +import org.eclipse.jface.dialogs.MessageDialog; +import org.eclipse.swt.widgets.Shell; +import org.jboss.tools.smooks.analyzer.DesignTimeAnalyzeResult; +import org.jboss.tools.smooks.analyzer.IMappingAnalyzer; +import org.jboss.tools.smooks.analyzer.ISourceModelAnalyzer; +import org.jboss.tools.smooks.analyzer.ITargetModelAnalyzer; +import org.jboss.tools.smooks.analyzer.MappingModel; +import org.jboss.tools.smooks.analyzer.MappingResourceConfigList; +import org.jboss.tools.smooks.analyzer.SmooksAnalyzerException; +import org.jboss.tools.smooks.graphical.GraphInformations; +import org.jboss.tools.smooks.javabean.model.JavaBeanModel; +import org.jboss.tools.smooks.javabean.model.JavaBeanModelFactory; +import org.jboss.tools.smooks.model.AbstractResourceConfig; +import org.jboss.tools.smooks.model.ParamType; +import org.jboss.tools.smooks.model.ResourceConfigType; +import org.jboss.tools.smooks.model.ResourceType; +import org.jboss.tools.smooks.model.SmooksFactory; +import org.jboss.tools.smooks.model.SmooksResourceListType; +import org.jboss.tools.smooks.model.provider.SmooksItemProviderAdapterFactory; +import org.jboss.tools.smooks.model.util.SmooksModelUtils; +import org.jboss.tools.smooks.ui.gef.model.AbstractStructuredDataModel; +import org.jboss.tools.smooks.ui.gef.model.GraphRootModel; +import org.jboss.tools.smooks.ui.gef.model.IConnectableModel; +import org.jboss.tools.smooks.ui.gef.model.LineConnectionModel; +import org.jboss.tools.smooks.ui.gef.model.PropertyModel; +import org.jboss.tools.smooks.ui.gef.model.TreeItemRelationModel; +import org.jboss.tools.smooks.ui.modelparser.SmooksConfigurationFileGenerateContext; +import org.jboss.tools.smooks.utils.ProjectClassLoader; +import org.jboss.tools.smooks.utils.UIUtils; + +/** + * @author Dart Peng + * + */ +public class JavaBeanAnalyzer implements IMappingAnalyzer, + ISourceModelAnalyzer, ITargetModelAnalyzer { + + public static final String BEANPOPULATOR = "org.milyn.javabean.BeanPopulator"; + + public static final String PRO_CLASS_NAME = "__pro_class_name_"; + + public static final Object PRO_PROJECT_NAME = "__pro_project_name_"; + + public static final String SPACE_STRING = " "; + + private List usedConnectionList = new ArrayList(); + + private ComposedAdapterFactory adapterFactory; + + private AdapterFactoryEditingDomain editingDomain; + + private HashMap userdResourceTypeMap = new HashMap(); + + private HashMap usedBeanIDMap = new HashMap(); + + public JavaBeanAnalyzer() { + + adapterFactory = new ComposedAdapterFactory( + ComposedAdapterFactory.Descriptor.Registry.INSTANCE); + adapterFactory + .addAdapterFactory(new ResourceItemProviderAdapterFactory()); + adapterFactory + .addAdapterFactory(new SmooksItemProviderAdapterFactory()); + + editingDomain = new AdapterFactoryEditingDomain(adapterFactory, + createCommandStack(), new HashMap<Resource, Boolean>()); + } + + protected CommandStack createCommandStack() { + return new BasicCommandStack(); + } + + public void analyzeGraphicalModel(AbstractStructuredDataModel root, + List resouceList) { + + List children = root.getChildren(); + for (Iterator iterator = children.iterator(); iterator.hasNext();) { + TreeItemRelationModel dataModel = (TreeItemRelationModel) iterator + .next(); + List targetConnections = dataModel.getModelTargetConnections(); + if (targetConnections != null && !targetConnections.isEmpty()) { + this.analyzeStructuredDataModel(resouceList, root, dataModel, + null, null); + } + } + } + + protected void setSelectorIsUsed(String selector) { + userdResourceTypeMap.put(selector, new Object()); + } + + protected boolean beanIDIsUsed(String beanID) { + return (usedBeanIDMap.get(beanID) != null); + } + + protected void setBeanIDIsUsed(String beanID) { + usedBeanIDMap.put(beanID, new Object()); + } + + protected boolean isSelectorIsUsed(String resourceType) { + return (userdResourceTypeMap.get(resourceType) != null); + } + + private boolean connectionIsUsed(Object connection) { + return (usedConnectionList.indexOf(connection) != -1); + } + + private void setConnectionUsed(Object connection) { + usedConnectionList.add(connection); + } + + /** + * + * @param resourceList + * @param root + * @param dataModel + * @param parentResourceConfigType + * @param beanId + */ + protected void analyzeStructuredDataModel(List resourceList, + AbstractStructuredDataModel root, + AbstractStructuredDataModel dataModel, + ResourceConfigType parentResourceConfigType, String beanId) { + if (dataModel instanceof IConnectableModel) { + // if the mode have no target connections, return + if (((IConnectableModel) dataModel).getModelTargetConnections() + .isEmpty()) + return; + // if the datamodel is a root structured data model + if (dataModel instanceof IConnectableModel) { + List targetConnections = ((IConnectableModel) dataModel) + .getModelTargetConnections(); + for (Iterator iterator = targetConnections.iterator(); iterator + .hasNext();) { + LineConnectionModel connection = (LineConnectionModel) iterator + .next(); + if (connectionIsUsed(connection)) + continue; + Object source = connection.getSource(); + Object target = connection.getTarget(); + if (target != dataModel) { + continue; + } + // create the first smooks resource fragment + + JavaBeanModel sourceJavaBean = (JavaBeanModel) ((AbstractStructuredDataModel) source) + .getReferenceEntityModel(); + JavaBeanModel targetJavaBean = (JavaBeanModel) ((AbstractStructuredDataModel) target) + .getReferenceEntityModel(); + String sourceClassName = sourceJavaBean.getBeanClass() + .getName(); + + ResourceConfigType resourceConfig = SmooksFactory.eINSTANCE + .createResourceConfigType(); + resourceList.add(resourceConfig); + // Command addResourceConfigCommand = AddCommand + // .create( + // editingDomain, + // resourceList, + // SmooksPackage.eINSTANCE + // .getSmooksResourceListType_AbstractResourceConfig(), + // resourceConfig); + // addResourceConfigCommand.execute(); + // resouceConfig. + resourceConfig + .setSelector(getSourceBeanSelectorString((AbstractStructuredDataModel) source)); + setConnectionUsed(connection); + + ResourceType resource = SmooksFactory.eINSTANCE + .createResourceType(); + resource.setValue(BEANPOPULATOR); + resourceConfig.setResource(resource); + + ParamType beanIdParam = SmooksFactory.eINSTANCE + .createParamType(); + beanIdParam.setName("beanId"); + if (beanId == null) + beanId = targetJavaBean.getName(); + if (beanId.startsWith("${")) { + beanId = beanId.substring(2, beanId.indexOf("}")); + } + SmooksModelUtils + .appendTextToSmooksType(beanIdParam, beanId); + resourceConfig.getParam().add(beanIdParam); + + ParamType beanClassParam = SmooksFactory.eINSTANCE + .createParamType(); + beanClassParam.setName("beanClass"); + SmooksModelUtils.appendTextToSmooksType(beanClassParam, + targetJavaBean.getBeanClassString()); + resourceConfig.getParam().add(beanClassParam); + + ParamType bindingsParam = SmooksFactory.eINSTANCE + .createParamType(); + bindingsParam.setName("bindings"); + resourceConfig.getParam().add(bindingsParam); + + // to dispatch the target's children (Order processing) + + List children = targetJavaBean.getProperties(); + for (Iterator iterator2 = children.iterator(); iterator2 + .hasNext();) { + JavaBeanModel childJavaBean = (JavaBeanModel) iterator2 + .next(); + AbstractStructuredDataModel child = UIUtils + .findGraphModel( + (AbstractStructuredDataModel) root, + childJavaBean); + if (child == null) + continue; + if (child instanceof IConnectableModel) { + if (((IConnectableModel) child) + .getModelTargetConnections().isEmpty()) + continue; + // how dispatch more than one connection??? + List<Object> targetConnectionModelList = ((IConnectableModel) child) + .getModelTargetConnections(); + for (Iterator iterator3 = targetConnectionModelList + .iterator(); iterator3.hasNext();) { + LineConnectionModel childConnection = (LineConnectionModel) iterator3 + .next(); + if (connectionIsUsed(childConnection)) + continue; + Object[] properties = childConnection + .getPropertyArray(); + JavaBeanModel jbean = (JavaBeanModel) child + .getReferenceEntityModel(); + String currentSelectorName = getSelectorString( + (AbstractStructuredDataModel) childConnection + .getTarget(), + (AbstractStructuredDataModel) childConnection + .getSource(), + (AbstractStructuredDataModel) source); + AnyType binding = SmooksModelUtils + .addBindingTypeToParamType( + bindingsParam, jbean.getName(), + currentSelectorName, null, null); + for (int i = 0; i < properties.length; i++) { + PropertyModel property = (PropertyModel) properties[i]; + String pname = property.getName(); + String pvalue = property.getValue(); + binding.getAnyAttribute().add( + ExtendedMetaData.INSTANCE + .demandFeature(null, pname, + false), pvalue); + } + + if (!jbean.isPrimitive()) { + analyzeStructuredDataModel( + resourceList, + root, + (AbstractStructuredDataModel) child, + resourceConfig, currentSelectorName); + } + this.setConnectionUsed(childConnection); + } + } + + } + } + } + } + } + + /** + * + * @param target + * @param source + * @param currentRootModel + * @return + */ + protected String getSelectorString(AbstractStructuredDataModel target, + AbstractStructuredDataModel source, + AbstractStructuredDataModel currentRootModel) { + JavaBeanModel sourcebean = (JavaBeanModel) source + .getReferenceEntityModel(); + JavaBeanModel rootbean = (JavaBeanModel) currentRootModel + .getReferenceEntityModel(); + JavaBeanModel currentbean = (JavaBeanModel) target + .getReferenceEntityModel(); + if (sourcebean.getParent() == currentRootModel + .getReferenceEntityModel()) { + if (!currentbean.isPrimitive()) { + return "${" + currentbean.getName() + "}"; + } else { + return rootbean.getBeanClassString() + " " + + sourcebean.getName(); + } + } else { + JavaBeanModel jbParent = ((JavaBeanModel) source + .getReferenceEntityModel()).getParent(); + AbstractStructuredDataModel parent = UIUtils.findGraphModel( + currentRootModel.getParent(), jbParent); + String returnString = sourcebean.getName(); + while (parent != currentRootModel && parent != null) { + JavaBeanModel jbm = (JavaBeanModel) parent + .getReferenceEntityModel(); + if (jbm != null) + returnString = jbm.getName() + " " + returnString; + + JavaBeanModel jb = ((JavaBeanModel) parent + .getReferenceEntityModel()).getParent(); + parent = UIUtils.findGraphModel(currentRootModel.getParent(), + jb); + } + // if no property + if (returnString.equals(sourcebean.getName())) { + returnString = ((JavaBeanModel) parent + .getReferenceEntityModel()).getBeanClassString() + + " " + returnString; + } + return returnString; + } + } + + protected String getSourceBeanSelectorString( + AbstractStructuredDataModel sourceModel) { + JavaBeanModel source = (JavaBeanModel) sourceModel + .getReferenceEntityModel(); + if(source.getBeanClass().isArray()){ + return source.getName(); + } + if (Collection.class.isAssignableFrom(source.getBeanClass())) { + return source.getName(); + } + return source.getBeanClassString(); + + } + + private DesignTimeAnalyzeResult checkOtherNodeConnected( + SmooksConfigurationFileGenerateContext context) { + GraphRootModel root = context.getGraphicalRootModel(); + List sourceList = root.loadSourceModelList(); + List targetList = root.loadTargetModelList(); + StringBuffer buffer = new StringBuffer(); + for (Iterator iterator = targetList.iterator(); iterator.hasNext();) { + AbstractStructuredDataModel targetm = (AbstractStructuredDataModel) iterator + .next(); + if (targetm instanceof IConnectableModel) { + if (((IConnectableModel) targetm).getModelTargetConnections() + .isEmpty()) { + continue; + } + + JavaBeanModel javaModel = (JavaBeanModel) targetm + .getReferenceEntityModel(); + JavaBeanModel parent = javaModel.getParent(); + if (parent != null) { + AbstractStructuredDataModel pgm = UIUtils.findGraphModel( + root, parent); + if (pgm != null && pgm instanceof IConnectableModel) { + if (((IConnectableModel) pgm) + .getModelTargetConnections().isEmpty()) { + buffer + .append("The parent of Java node \"" + + javaModel.getName() + + "\" : \"" + + parent.getName() + + "\" doesn't be connected by any source node!\n"); + } + } + } + } + } + String result = buffer.toString(); + if ("".equals(result)) { + return null; + } + DesignTimeAnalyzeResult dr = new DesignTimeAnalyzeResult(); + dr.setErrorMessage(result); + return dr; + } + + /** + * If root node don't connect , it will ask user to connect them . + * + * @param context + */ + private void checkRootNodeConnected( + SmooksConfigurationFileGenerateContext context) { + GraphRootModel root = context.getGraphicalRootModel(); + List sourceList = root.loadSourceModelList(); + List targetList = root.loadTargetModelList(); + + JavaBeanModel rootSource = null; + JavaBeanModel rootTarget = null; + boolean needCheck = false; + + for (Iterator iterator = sourceList.iterator(); iterator.hasNext();) { + AbstractStructuredDataModel sourcegm = (AbstractStructuredDataModel) iterator + .next(); + if (sourcegm instanceof IConnectableModel) { + if (!((IConnectableModel) sourcegm).getModelSourceConnections() + .isEmpty() + || !((IConnectableModel) sourcegm) + .getModelTargetConnections().isEmpty()) { + needCheck = true; + break; + } + } + } + + if (needCheck) { + for (Iterator iterator = sourceList.iterator(); iterator.hasNext();) { + AbstractStructuredDataModel sourceGraphModel = (AbstractStructuredDataModel) iterator + .next(); + JavaBeanModel source = (JavaBeanModel) sourceGraphModel + .getReferenceEntityModel(); + if (source.isRoot()) { + rootSource = source; + break; + } + } + + for (Iterator iterator = targetList.iterator(); iterator.hasNext();) { + AbstractStructuredDataModel targetGraphModel = (AbstractStructuredDataModel) iterator + .next(); + JavaBeanModel target = (JavaBeanModel) targetGraphModel + .getReferenceEntityModel(); + if (target.isRoot()) { + rootTarget = target; + break; + } + } + if (rootSource != null && rootTarget != null) { + AbstractStructuredDataModel rootSourceGraphModel = UIUtils + .findGraphModel(root, rootSource); + AbstractStructuredDataModel rootTargetGraphModel = UIUtils + .findGraphModel(root, rootTarget); + if (rootSourceGraphModel instanceof IConnectableModel + && rootTargetGraphModel instanceof IConnectableModel) { + if (((IConnectableModel) rootSourceGraphModel) + .isSourceConnectWith((IConnectableModel) rootTargetGraphModel)) { + // do nothing + } else { + // ask user if they want to connect the root model + Shell displayParent = context.getShell(); + boolean connectAuto = MessageDialog + .openQuestion( + displayParent, + "Connection Question", + "The root models don't be connected , it will make some errors with the generation config file contents.\nDo you wan to connect them?"); + if (connectAuto) { + // connect root model + LineConnectionModel connectionModel = new LineConnectionModel(); + connectionModel + .setSource((IConnectableModel) rootSourceGraphModel); + connectionModel + .setTarget((IConnectableModel) rootTargetGraphModel); + connectionModel.connect(); + } + } + } + } + } + } + + /* + * (non-Javadoc) + * + * @see org.jboss.tools.smooks.analyzer.IMappingAnalyzer#analyzeMappingGraphModel(org.jboss.tools.smooks.ui.modelparser.SmooksConfigurationFileGenerateContext) + */ + public void analyzeMappingGraphModel( + SmooksConfigurationFileGenerateContext context) + throws SmooksAnalyzerException { + GraphRootModel root = context.getGraphicalRootModel(); + this.analyzeGraphicalModel(root, context.getGeneratorResourceList()); + } + + public MappingResourceConfigList analyzeMappingSmooksModel( + SmooksResourceListType listType, Object sourceObject, + Object targetObject) { + if (sourceObject instanceof List) { + if (!((List) sourceObject).isEmpty()) { + sourceObject = (JavaBeanModel) ((List) sourceObject).get(0); + } + } + if (targetObject instanceof List) { + if (!((List) targetObject).isEmpty()) { + targetObject = (JavaBeanModel) ((List) targetObject).get(0); + } + } + if (!(sourceObject instanceof JavaBeanModel) + || !(targetObject instanceof JavaBeanModel)) { + return MappingResourceConfigList.createEmptyList(); + } + MappingResourceConfigList resourceConfigList = new MappingResourceConfigList(); + JavaBeanModel source = (JavaBeanModel) sourceObject; + JavaBeanModel target = (JavaBeanModel) targetObject; + List<MappingModel> mappingModelList = new ArrayList<MappingModel>(); + List<AbstractResourceConfig> rcl = listType.getAbstractResourceConfig(); + for (Iterator iterator = rcl.iterator(); iterator.hasNext();) { + ResourceConfigType rc = (ResourceConfigType) iterator.next(); + ResourceType rt = rc.getResource(); + // find the first BeanPopulator resource config , this is the root. + if (rt != null && BEANPOPULATOR.equals(rt.getValue())) { + String sourceName = source.getName(); + Class sourceClazz = source.getBeanClass(); + if (sourceClazz != null) { + sourceName = sourceClazz.getName(); + } + String selector = rc.getSelector(); + if (sourceName.equals(selector)) { + String targetName = target.getName(); + Class targetClazz = target.getBeanClass(); + if (targetClazz != null) { + targetName = targetClazz.getName(); + } + String beanClass = SmooksModelUtils.getParmaText( + "beanClass", rc); + if (targetName!=null && targetName.trim().equals(beanClass)) { + setSelectorIsUsed(sourceName); + // create the first connection + mappingModelList.add(new MappingModel(source, target)); + resourceConfigList.addResourceConfig(rc); + analyzeMappingModelFromResourceConfig(mappingModelList, + resourceConfigList, listType, rc, source, + target); + } + } + } + } + resourceConfigList.setMappingModelList(mappingModelList); + return resourceConfigList; + } + + protected boolean isReferenceSelector(String selector) { + return (selector.startsWith("${") && selector.endsWith("}")); + } + + protected String getBeanIdWithRawSelectorString(String selector) { + selector = selector.substring(2, selector.length() - 1); + return selector; + } + + protected void analyzeMappingModelFromResourceConfig( + List<MappingModel> mappingModelList, + MappingResourceConfigList mappingResourceConfigList, + SmooksResourceListType resourceList, + ResourceConfigType resourceConfig, JavaBeanModel source, + JavaBeanModel target) { + List bindingList = this + .getBindingListFromResourceConfigType(resourceConfig); + if (bindingList == null) + return; + for (Iterator iterator = bindingList.iterator(); iterator.hasNext();) { + AnyType binding = (AnyType) iterator.next(); + String property = SmooksModelUtils.getAttributeValueFromAnyType( + binding, SmooksModelUtils.ATTRIBUTE_PROPERTY); + String selector = SmooksModelUtils.getAttributeValueFromAnyType( + binding, SmooksModelUtils.ATTRIBUTE_SELECTOR); + JavaBeanModel targetModel = findTheChildJavaBeanModel(property, + target); + JavaBeanModel sourceModel = null; + if (targetModel == null) + continue; + if (isReferenceSelector(selector)) { + ResourceConfigType rc = this + .findResourceConfigTypeWithSelector(selector, + resourceList); + if (rc != null) { + String newSelector = rc.getSelector(); + sourceModel = findTheChildJavaBeanModel(newSelector, source); + if (sourceModel != null) { + setSelectorIsUsed(newSelector); + mappingResourceConfigList.addResourceConfig(rc); + analyzeMappingModelFromResourceConfig(mappingModelList, + mappingResourceConfigList, resourceList, rc, + sourceModel, targetModel); + } + } + } else { + sourceModel = findModelWithSelectorString(selector, source); + } + if (sourceModel != null) { + MappingModel model = new MappingModel(sourceModel, targetModel); + FeatureMap it = binding.getAnyAttribute(); + for (int i = 0; i < it.size(); i++) { + EStructuralFeature feature = it.getEStructuralFeature(i); + if (feature.equals(SmooksModelUtils.ATTRIBUTE_PROPERTY) + || feature + .equals(SmooksModelUtils.ATTRIBUTE_SELECTOR)) + continue; + String pname = feature.getName(); + String pvalue = it.get(feature, false).toString(); + PropertyModel pmodel = new PropertyModel(); + pmodel.setName(pname); + pmodel.setValue(pvalue); + model.getProperties().add(pmodel); + } + mappingModelList.add(model); + } + } + } + + protected JavaBeanModel findModelWithSelectorString(String selector, + JavaBeanModel parentModel) { + String[] s = selector.trim().split(" "); + String pname = parentModel.getName(); + Class clazz = parentModel.getBeanClass(); + JavaBeanModel current = parentModel; + if (clazz != null) + pname = clazz.getName(); + if (s != null) { + for (int i = 0; i < s.length; i++) { + String p = s[i]; + if (p.equals(pname)) + continue; + JavaBeanModel child = findTheChildJavaBeanModel(p, current); + if (child == null) + return null; + current = child; + } + return current; + } + return null; + } + + public Object buildSourceInputObjects(GraphInformations graphInfo, + SmooksResourceListType listType, IFile sourceFile, + ClassLoader classLoader) throws InvocationTargetException { + List resourceConfigList = listType.getAbstractResourceConfig(); + String rootClassName = null; + ResourceConfigType current = null; + for (Iterator iterator = resourceConfigList.iterator(); iterator + .hasNext();) { + AbstractResourceConfig ar = (AbstractResourceConfig) iterator + .next(); + if (ar instanceof ResourceConfigType) { + ResourceConfigType rc = (ResourceConfigType) ar; + ResourceType resourceType = rc.getResource(); + if (resourceType == null) + continue; + String resource = resourceType.getValue(); + if (BEANPOPULATOR.equals(resource)) { + // create root beanmodel + rootClassName = rc.getSelector(); + current = rc; + break; + } + } + } + + if (rootClassName == null) + return null; + + boolean isWarning = false; + boolean isError = false; + Class clazz = null; + try { + if (classLoader == null) { + IProject project = sourceFile.getProject(); + classLoader = new ProjectClassLoader(JavaCore.create(project)); + } + + clazz = classLoader.loadClass(rootClassName); + } catch (Exception e) { + // ignore + } + JavaBeanModel model = null; + if (clazz != null) { + model = JavaBeanModelFactory.getJavaBeanModelWithLazyLoad(clazz); + } else { + model = new JavaBeanModel(null, rootClassName); + model.setRootClassModel(true); + model.setError("Can't find the class : " + rootClassName); + model.setProperties(new ArrayList()); + isError = true; + } + if (model != null) { + this.setSelectorIsUsed(rootClassName); + buildSourceInputProperties(listType, model, false, isError, + current, classLoader); + } + List list = new ArrayList(); + if (model != null) + list.add(model); + return list; + } + + public Object buildSourceInputObjects(GraphInformations graphInfo, + SmooksResourceListType listType, IFile sourceFile) + throws InvocationTargetException { + return this.buildSourceInputObjects(graphInfo, listType, sourceFile, + null); + } + + public Object buildTargetInputObjects(GraphInformations graphInfo, + SmooksResourceListType listType, IFile sourceFile) + throws InvocationTargetException { + return this.buildTargetInputObjects(graphInfo, listType, sourceFile, + null); + } + + public Object buildTargetInputObjects(GraphInformations graphInfo, + SmooksResourceListType listType, IFile sourceFile, + ClassLoader loader) throws InvocationTargetException { + if (loader == null) { + try { + loader = new ProjectClassLoader(JavaCore.create(sourceFile + .getProject())); + } catch (JavaModelException e) { + // ignore + } + } + List resourceConfigList = listType.getAbstractResourceConfig(); + String rootClassName = null; + ResourceConfigType current = null; + for (Iterator iterator = resourceConfigList.iterator(); iterator + .hasNext();) { + AbstractResourceConfig ar = (AbstractResourceConfig) iterator + .next(); + if (ar instanceof ResourceConfigType) { + ResourceConfigType rc = (ResourceConfigType) ar; + ResourceType resourceType = rc.getResource(); + if (resourceType == null) + continue; + String resource = resourceType.getValue(); + if (BEANPOPULATOR.equals(resource)) { + // create root beanmodel + current = rc; + break; + } + } + } + if (current == null) + return null; + Class rootClass = null; + rootClassName = SmooksModelUtils.getParmaText("beanClass", current); + if (rootClassName != null && loader != null) { + try { + rootClass = loader.loadClass(rootClassName); + } catch (ClassNotFoundException e) { + // ignore + } + } + boolean rootIsError = false; + JavaBeanModel rootModel = null; + if (rootClass != null) { + rootModel = JavaBeanModelFactory + .getJavaBeanModelWithLazyLoad(rootClass); + rootIsError = true; + } else { + rootModel = new JavaBeanModel(null, rootClassName); + } + setSelectorIsUsed(rootClassName); + buildChildrenOfTargetInputModel(listType, rootModel, false, + rootIsError, current, loader); + List list = new ArrayList(); + list.add(rootModel); + return list; + } + + protected void buildChildrenOfTargetInputModel( + SmooksResourceListType listType, JavaBeanModel beanModel, + boolean rootIsWarning, boolean rootIsError, + ResourceConfigType currentResourceConfigType, + ClassLoader classLoader) { + if (currentResourceConfigType != null) { + List bindingList = getBindingListFromResourceConfigType(currentResourceConfigType); + if (bindingList == null) + return; + for (Iterator iterator = bindingList.iterator(); iterator.hasNext();) { + AnyType binding = (AnyType) iterator.next(); + String property = SmooksModelUtils + .getAttributeValueFromAnyType(binding, + SmooksModelUtils.ATTRIBUTE_PROPERTY); + String selector = SmooksModelUtils + .getAttributeValueFromAnyType(binding, + SmooksModelUtils.ATTRIBUTE_SELECTOR); + // if(property == null){ + // continue; + // } + processBindingPropertyFromTargetModel(listType, property, + selector, beanModel, classLoader); + } + } + + } + + protected void processBindingPropertyFromTargetModel( + SmooksResourceListType listType, String property, String selector, + JavaBeanModel parentModel, ClassLoader classLoader) { + parentModel.getProperties(); + JavaBeanModel model = this.findTheChildJavaBeanModel(property, + parentModel); + if (model == null) { + model = new JavaBeanModel(null, property); + parentModel.addProperty(model); + model.setError("don't exist"); + } + + if (isReferenceSelector(selector)) { + selector = selector.substring(2, selector.length() - 1); + ResourceConfigType resourceConfig = findResourceConfigTypeWithSelector( + selector, listType); + if (resourceConfig != null) { + this.buildChildrenOfTargetInputModel(listType, model, false, + false, resourceConfig, classLoader); + } + } + } + + protected List getBindingListFromResourceConfigType( + ResourceConfigType resourceConfig) { + List paramList = resourceConfig.getParam(); + for (Iterator iterator = paramList.iterator(); iterator.hasNext();) { + ParamType param = (ParamType) iterator.next(); + if ("bindings".equals(param.getName())) { + if (param.eContents().isEmpty()) + continue; + List bindingList = (List) param.getMixed().get( + SmooksModelUtils.ELEMENT_BINDING, false); + return bindingList; + } + } + return null; + } + + protected void buildSourceInputProperties(SmooksResourceListType listType, + JavaBeanModel beanModel, boolean rootIsWarning, + boolean rootIsError, ResourceConfigType currentResourceConfigType, + ClassLoader classLoader) { + if (currentResourceConfigType != null) { + List bindingList = this + .getBindingListFromResourceConfigType(currentResourceConfigType); + if (bindingList == null) + return; + for (Iterator iterator2 = bindingList.iterator(); iterator2 + .hasNext();) { + AnyType binding = (AnyType) iterator2.next(); + String selector = SmooksModelUtils + .getAttributeValueFromAnyType(binding, + SmooksModelUtils.ATTRIBUTE_SELECTOR); + setSelectorIsUsed(currentResourceConfigType.getSelector()); + analyzeBindingSelector(selector, beanModel, listType, + classLoader); + } + } + } + + protected ResourceConfigType findResourceConfigTypeWithSelector( + String selector, SmooksResourceListType listType) { + if (isReferenceSelector(selector)) { + selector = this.getBeanIdWithRawSelectorString(selector); + } + List rl = listType.getAbstractResourceConfig(); + ResourceConfigType resourceConfig = null; + for (Iterator iterator = rl.iterator(); iterator.hasNext();) { + ResourceConfigType rct = (ResourceConfigType) iterator.next(); + if (this.isSelectorIsUsed(rct.getSelector())) + continue; + String beanId = getBeanIDFromParam(rct); + if (selector.equals(beanId)) { + resourceConfig = rct; + break; + } + } + return resourceConfig; + } + + protected void analyzeBindingSelector(String selector, + JavaBeanModel currentModel, SmooksResourceListType listType, + ClassLoader classLoader) { + if (selector.startsWith("${") && selector.endsWith("}")) { + // should get the bean properties + // memory out??? + currentModel.getProperties(); + selector = this.getBeanIdWithRawSelectorString(selector); + ResourceConfigType resourceConfig = findResourceConfigTypeWithSelector( + selector, listType); + if (resourceConfig != null) { + String referenceSelector = resourceConfig.getSelector(); + JavaBeanModel model = findTheChildJavaBeanModel( + referenceSelector, currentModel); + // try to test the selector is can be loaded by classloader?? + Class clazz = null; + try { + if (classLoader != null) { + clazz = classLoader.loadClass(referenceSelector); + if (clazz != null && model == null) + model = JavaBeanModelFactory + .getJavaBeanModelWithLazyLoad(clazz); + } + } catch (Exception e) { + // ignore + } + // something wrong + if (model == null) { + model = new JavaBeanModel(null, referenceSelector); + model.setError("don't exist"); + model.setProperties(new ArrayList()); + } + if (currentModel.getError() != null) { + currentModel.addProperty(model); + } + buildSourceInputProperties(listType, model, false, true, + resourceConfig, classLoader); + } + } else { + selector = selector.trim(); + String[] properties = selector.split(SPACE_STRING); + if (properties != null) { + JavaBeanModel currentParent = currentModel; + for (int i = 0; i < properties.length; i++) { + String property = properties[i].trim(); + Class currentClazz = currentParent.getBeanClass(); + if (currentClazz != null + && property.equals(currentClazz.getName())) { + + } else { + JavaBeanModel pm = findTheChildJavaBeanModel(property, + currentParent); + if (pm != null) { + + } else { + pm = new JavaBeanModel(null, property); + pm.setProperties(new ArrayList()); + pm.setError("don't exist"); + currentParent.addProperty(pm); + } + currentParent = pm; + } + } + } else { + // if properties is null , how to process? + } + } + } + + protected String getBeanIDFromParam(ResourceConfigType config) { + List list = config.getParam(); + for (Iterator iterator = list.iterator(); iterator.hasNext();) { + ParamType p = (ParamType) iterator.next(); + if ("beanId".equals(p.getName())) { + return SmooksModelUtils.getAnyTypeText(p); + } + + } + return null; + } + + /** + * Find the child JavaBeanModel from parent with the child name + * If the parent JavabeanModel is "Collection" or "Array" , the child + * JavabeanModel is the first child of the parent model,it means that the + * param "name" is useless with the status. + * + * TODO The method need to improve!!!!! + * + * @param name + * @param parentModel + * @return + */ + public static JavaBeanModel findTheChildJavaBeanModel(String name, + JavaBeanModel parentModel) { + List list = parentModel.getProperties(); + if (list == null) + return null; + if (parentModel.isList() || parentModel.isArray()) { + if (list.size() >= 1 && parentModel.hasGenericType()) { + JavaBeanModel m = (JavaBeanModel) list.get(0); + return m; + } + } + + for (Iterator iterator = list.iterator(); iterator.hasNext();) { + JavaBeanModel child = (JavaBeanModel) iterator.next(); + if (name.equals(child.getName())) { + return child; + } + } + return null; + } + + public DesignTimeAnalyzeResult analyzeGraphModel( + SmooksConfigurationFileGenerateContext context) { + checkRootNodeConnected(context); + return checkOtherNodeConnected(context); + } +} Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/analyzer/JavaBeanAnalyzer.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/commandprocessor/JavaBeanModelCommandProcessor.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/commandprocessor/JavaBeanModelCommandProcessor.java (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/commandprocessor/JavaBeanModelCommandProcessor.java 2008-10-20 10:10:26 UTC (rev 10974) @@ -0,0 +1,54 @@ +/******************************************************************************* + * Copyright (c) 2007 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 + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.smooks.javabean.commandprocessor; + +import org.eclipse.gef.DefaultEditDomain; +import org.eclipse.gef.GraphicalEditPart; +import org.eclipse.gef.GraphicalViewer; +import org.eclipse.gef.requests.CreateRequest; +import org.eclipse.jface.window.Window; +import org.eclipse.swt.widgets.Shell; +import org.eclipse.ui.IEditorPart; +import org.jboss.tools.smooks.javabean.ui.JavaBeanModelCreationDialog; +import org.jboss.tools.smooks.ui.gef.commandprocessor.ICommandProcessor; +import org.jboss.tools.smooks.utils.UIUtils; + +/** + * @author Dart Peng + * + * @CreateTime Jul 22, 2008 + */ +public class JavaBeanModelCommandProcessor implements ICommandProcessor { + + /* + * (non-Javadoc) + * + * @see + * org.jboss.tools.smooks.ui.gef.commandprocessor.ICommandProcessor#getNewModel + * (java.lang.Object, java.lang.Object, org.eclipse.gef.GraphicalEditPart) + */ + public Object getNewModel(CreateRequest request, + GraphicalEditPart rootEditPart) { + DefaultEditDomain domain = (DefaultEditDomain) ((GraphicalViewer) rootEditPart + .getViewer()).getEditDomain(); + // rootEditPart.getg + IEditorPart editorPart = domain.getEditorPart(); + Shell shell = editorPart.getSite().getShell(); + JavaBeanModelCreationDialog dialog = new JavaBeanModelCreationDialog( + shell, UIUtils + .getJavaProjectFromEditorPart(editorPart)); + if(dialog.open() == Window.OK){ + return dialog.getCheckedJavaBeanModel(); + } + return null; + } + +} Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/commandprocessor/JavaBeanModelCommandProcessor.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/model/BeanContentProvider.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/model/BeanContentProvider.java (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/model/BeanContentProvider.java 2008-10-20 10:10:26 UTC (rev 10974) @@ -0,0 +1,52 @@ +package org.jboss.tools.smooks.javabean.model; + +import java.util.List; + +import org.eclipse.jface.viewers.IStructuredContentProvider; +import org.eclipse.jface.viewers.ITreeContentProvider; +import org.eclipse.jface.viewers.Viewer; +/** + * + * @author Dart Peng + * + */ +public class BeanContentProvider implements ITreeContentProvider, + IStructuredContentProvider { + + public Object[] getChildren(Object arg0) { + if (arg0 instanceof JavaBeanModel) { + return ((JavaBeanModel) arg0).getProperties().toArray(); + } + return new Object[] {}; + } + + public Object getParent(Object arg0) { + if(arg0 instanceof JavaBeanModel){ + return ((JavaBeanModel)arg0).getParent(); + } + return null; + } + + public boolean hasChildren(Object bean) { + if (bean instanceof JavaBeanModel) { + return !((JavaBeanModel) bean).isPrimitive(); + } + return false; + } + + public Object[] getElements(Object arg0) { + if (arg0 instanceof List) { + return ((List) arg0).toArray(); + } + return new Object[]{arg0}; + } + + public void dispose() { + + } + + public void inputChanged(Viewer arg0, Object arg1, Object arg2) { + + } + +} \ No newline at end of file Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/model/BeanContentProvider.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/model/BeanlabelProvider.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/model/BeanlabelProvider.java (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/model/BeanlabelProvider.java 2008-10-20 10:10:26 UTC (rev 10974) @@ -0,0 +1,68 @@ +package org.jboss.tools.smooks.javabean.model; + +import org.eclipse.jface.viewers.LabelProvider; +import org.eclipse.swt.graphics.Image; +import org.jboss.tools.smooks.javabean.ui.JavaImageConstants; +import org.jboss.tools.smooks.ui.SmooksUIActivator; +import org.jboss.tools.smooks.utils.SmooksGraphConstants; + +public class BeanlabelProvider extends LabelProvider { + + public Image getJavaObjectImage() { + return SmooksUIActivator.getDefault().getImageRegistry().get( + JavaImageConstants.IMAGE_JAVA_OBJECT); + } + + public Image getJavaAttributeImage() { + return SmooksUIActivator.getDefault().getImageRegistry().get( + JavaImageConstants.IMAGE_JAVA_ATTRIBUTE); + } + + public String getText(Object element) { + if (element instanceof JavaBeanModel) { + String name = ((JavaBeanModel) element).getName(); + if (name == null) + name = "<nonamed>"; + + Object error = ((JavaBeanModel) element).getError(); + if (error != null) { + name = name + " " + "<" + error.toString() + ">"; + return name; + } + + Class typeRef = ((JavaBeanModel) element).getBeanClass(); + String typeStr = ""; + if (typeRef != null) { + if (typeRef.isArray()) { + typeRef = typeRef.getComponentType(); + typeStr = typeRef.getName() + "[]"; + } else { + typeStr = typeRef.getName(); + } + } + if (!typeStr.equals("")) { + name = name + " " + typeStr; + } + + return name; + } + return super.getText(element); + } + + @Override + public Image getImage(Object element) { + if (element instanceof JavaBeanModel) { + Object error = ((JavaBeanModel) element).getError(); + if (error != null) { + return SmooksUIActivator.getDefault().getImageRegistry().get( + SmooksGraphConstants.IMAGE_ERROR); + } + if (((JavaBeanModel) element).isPrimitive()) { + return this.getJavaAttributeImage(); + } else { + return this.getJavaObjectImage(); + } + } + return super.getImage(element); + } +} \ No newline at end of file Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/model/BeanlabelProvider.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/model/JavaBeanModel.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/model/JavaBeanModel.java (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/model/JavaBeanModel.java 2008-10-20 10:10:26 UTC (rev 10974) @@ -0,0 +1,373 @@ +/******************************************************************************* + * Copyright (c) 2007 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 + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.smooks.javabean.model; + +import java.beans.PropertyDescriptor; +import java.lang.reflect.Method; +import java.lang.reflect.ParameterizedType; +import java.lang.reflect.Type; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Iterator; +import java.util.List; + +import org.jboss.tools.smooks.analyzer.IValidatable; +import org.jboss.tools.smooks.javabean.uitils.JavaPropertyUtils; + +/** + * @author Dart Peng + * + */ +public class JavaBeanModel implements IValidatable { + + private Object waring = null; + + private Object error = null; + + private String name = ""; + + private Class typeRef = null; + + private boolean many = false; + + private boolean collection = false; + + private boolean isPrimitive = false; + + private boolean hasGenericType = false; + + private Class<? extends Object> beanClass = null; + + private JavaBeanModel parent = null; + + public Class getBeanClass() { + return beanClass; + } + + private Class parentClass = null; + + private boolean isRoot = false; + + private boolean isRootClassModel = false; + + /** + * @return the isRootClassModel + */ + public boolean isRootClassModel() { + return isRootClassModel; + } + + /** + * @param isRootClassModel + * the isRootClassModel to set + */ + public void setRootClassModel(boolean isRootClassModel) { + this.isRootClassModel = isRootClassModel; + } + + /** + * @return the isRoot + */ + public boolean isRoot() { + return isRoot; + } + + public String getBeanClassString() { + Class clazz = this.getBeanClass(); + if (clazz == null) + return "<null>"; + + if (clazz.isArray()) { + String s = clazz.getComponentType().getName(); + return s + "[]"; + } + + return clazz.getName(); + } + + /** + * @param isRoot + * the isRoot to set + */ + public void setRoot(boolean isRoot) { + this.isRoot = isRoot; + } + + private boolean isList = false; + + private Class componentClass = null; + + private boolean lazyLoadProperties = true; + + public boolean isList() { + if(beanClass == null) return false; + if (Collection.class.isAssignableFrom(beanClass)) { + if (this.propertyDescriptor != null) { + Method rmethod = propertyDescriptor.getReadMethod(); + if (rmethod != null) { + Type returnType = rmethod.getGenericReturnType(); + if (returnType instanceof ParameterizedType) { + Type gtype = ((ParameterizedType) returnType) + .getActualTypeArguments()[0]; + Class beanType = (Class) gtype; + componentClass = beanType; + setGenericType(true); + } + } + } + setList(true); + } + return isList; + } + + public void setList(boolean isList) { + this.isList = isList; + } + + private PropertyDescriptor propertyDescriptor; + + public PropertyDescriptor getPropertyDescriptor() { + return propertyDescriptor; + } + + public void setPropertyDescriptor(PropertyDescriptor propertyDescriptor) { + this.propertyDescriptor = propertyDescriptor; + } + + JavaBeanModel(Class beanClass, String beanName, + PropertyDescriptor propertyDescriptor, Class parentClass, + boolean lazyLoadProperties) { + this.lazyLoadProperties = lazyLoadProperties; + this.beanClass = beanClass; + this.name = beanName; + if (beanClass == null) + return; + if(this.name == null){ + this.name = beanClass.getSimpleName(); + } + + + if (propertyDescriptor == null) + isRoot = true; + this.propertyDescriptor = propertyDescriptor; + Class beanType = beanClass; + if (beanClass.isArray()) { + beanType = beanClass.getComponentType(); + setMany(true); + componentClass = beanType; + } + + if (Collection.class.isAssignableFrom(beanClass)) { + if (this.propertyDescriptor != null) { + Method rmethod = propertyDescriptor.getReadMethod(); + if (rmethod != null) { + Type returnType = rmethod.getGenericReturnType(); + if (returnType instanceof ParameterizedType) { + Type gtype = ((ParameterizedType) returnType) + .getActualTypeArguments()[0]; + beanType = (Class) gtype; + componentClass = beanType; + } + } + } + setList(true); + } + + if (beanType.isPrimitive() + || JavaBeanModelFactory.isPrimitiveObject(beanType)) { + setTypeRef(beanType); + this.parentClass = parentClass; + + if (!isArray() && !isList()) + setPrimitive(true); + return; + } + this.parentClass = parentClass; + + if (!lazyLoadProperties) + this.getProperties(); + } + + JavaBeanModel(Class beanClass, String beanName, + PropertyDescriptor propertyDescriptor) { + this(beanClass, beanName, propertyDescriptor, null, true); + } + + public JavaBeanModel(Class beanClass) { + this(beanClass, null, null, null, true); + } + + public JavaBeanModel(Class beanClass, String name) { + this(beanClass, name, null, null, true); + } + + JavaBeanModel(Class beanClass, boolean lazyLoadProperties) { + this(beanClass, null, null, null, lazyLoadProperties); + } + + public boolean isPrimitive() { + return isPrimitive; + } + + public void setPrimitive(boolean isPrimitive) { + this.isPrimitive = isPrimitive; + } + + public boolean isArray() { + if(beanClass == null) return false; + if (beanClass.isArray()) { + Class beanType = beanClass.getComponentType(); + setMany(true); + componentClass = beanType; + setGenericType(true); + } + return many; + } + + public void setMany(boolean many) { + this.many = many; + } + + public boolean isCollection() { + return collection; + } + + public void setCollection(boolean collection) { + this.collection = collection; + } + + public Class getTypeRef() { + return typeRef; + } + + public void setTypeRef(Class typeRef) { + this.typeRef = typeRef; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public void addProperty(JavaBeanModel property) { + if (properties != null) { + properties.add(property); + property.setParent(this); + } + } + + private List properties; + + public List getProperties() { + + if (properties == null) { + properties = new ArrayList(); + Class beanType = beanClass; + + if (this.componentClass != null) { + if (isArray() || isList()) { + JavaBeanModel proxyModel = new JavaBeanModel( + componentClass, componentClass.getSimpleName(), + null, beanClass, this.lazyLoadProperties); + beanType = componentClass; + + addProperty(proxyModel); + + return properties; + } + } + if(beanType == null) return null; + PropertyDescriptor[] pds = JavaPropertyUtils.getPropertyDescriptor(beanType); + + for (int i = 0; i < pds.length; i++) { + PropertyDescriptor pd = pds[i]; + if ("class".equals(pd.getName())) + continue; + JavaBeanModel jbm = new JavaBeanModel(pd.getPropertyType(), pd + .getName(), pd, beanClass, this.lazyLoadProperties); + addProperty(jbm); + } + } + return properties; + } + + public void setProperties(List properties) { + this.properties = properties; + } + + public boolean propertiesHasBeenLoaded() { + return properties != null; + } + + /** + * @return the parent + */ + public JavaBeanModel getParent() { + return parent; + } + + /** + * @param parent + * the parent to set + */ + public void setParent(JavaBeanModel parent) { + this.parent = parent; + } + + public Object getWarning() { + return waring; + } + + public void setWarning(Object waring) { + this.waring = waring; + } + + public Object getError() { + return error; + } + + public void setError(Object error) { + this.error = error; + } + + /* + * (non-Javadoc) + * + * @see java.lang.Object#toString() + */ + public String toString() { + StringBuffer buffer = new StringBuffer("JavaBean Name : " + name); + if (beanClass != null) + buffer.append(";Class : " + this.beanClass.getName()); + if (this.properties != null) { + buffer.append("\n"); + for (Iterator iterator = properties.iterator(); iterator.hasNext();) { + JavaBeanModel child = (JavaBeanModel) iterator.next(); + buffer.append("\t"); + buffer.append(child.toString()); + buffer.append("\n"); + } + } + return buffer.toString(); + } + + public boolean hasGenericType() { + return hasGenericType; + } + + public void setGenericType(boolean hasGenericType) { + this.hasGenericType = hasGenericType; + } + +} Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/model/JavaBeanModel.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/model/JavaBeanModelFactory.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/model/JavaBeanModelFactory.java (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/model/JavaBeanModelFactory.java 2008-10-20 10:10:26 UTC (rev 10974) @@ -0,0 +1,65 @@ +/******************************************************************************* + * Copyright (c) 2007 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 + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.smooks.javabean.model; + +import java.math.BigDecimal; +import java.math.BigInteger; +import java.util.ArrayList; +import java.util.List; + + +/** + * @author Dart Peng + * + */ +public class JavaBeanModelFactory { + + + private static final List PRIMITIVE_CLASSES = new ArrayList(); + static{ + PRIMITIVE_CLASSES.add(Integer.class); + PRIMITIVE_CLASSES.add(Double.class); + PRIMITIVE_CLASSES.add(Float.class); + PRIMITIVE_CLASSES.add(String.class); + PRIMITIVE_CLASSES.add(Long.class); + PRIMITIVE_CLASSES.add(java.util.Date.class); + PRIMITIVE_CLASSES.add(Character.class); + PRIMITIVE_CLASSES.add(BigInteger.class); + PRIMITIVE_CLASSES.add(BigDecimal.class); + PRIMITIVE_CLASSES.add(Byte.class); + } + + /** + * @param beanClass + * @param modelName + * @return + */ + public synchronized static JavaBeanModel getJavaBeanModelWithLazyLoad(Class beanClass ) { + JavaBeanModel m = new JavaBeanModel(beanClass,true); + m.setRootClassModel(true); + return m; + } + + public synchronized static JavaBeanModel getJavaBeanModel(Class beanClass ) { + JavaBeanModel m = new JavaBeanModel(beanClass,false); + m.setRootClassModel(true); + return m; + } + + public static boolean isPrimitiveObject(Class clazz) { + return (PRIMITIVE_CLASSES.indexOf(clazz) != -1); + } + + public static void main(String[] args) throws SecurityException, NoSuchFieldException { +// JavaBeanModel jbm = getJavaBeanModel(LineOrder.class); +// System.out.println(jbm); + } +} Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/model/JavaBeanModelFactory.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/model/JavaBeanParser.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/model/JavaBeanParser.java (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/model/JavaBeanParser.java 2008-10-20 10:10:26 UTC (rev 10974) @@ -0,0 +1,38 @@ +package org.jboss.tools.smooks.javabean.model; + +import org.jboss.tools.smooks.ui.gef.model.AbstractStructuredDataModel; +import org.jboss.tools.smooks.ui.modelparser.IStructuredModelParser; + +/** + * + * @author Dart Peng + * + */ +public class JavaBeanParser implements IStructuredModelParser { + /* + * (non-Javadoc) + * + * @see + * org.jboss.tools.smooks.ui.modelparser.IStructuredModelParser#parse(java + * .lang.Object) + */ + public AbstractStructuredDataModel parse(Object customModel) { + if (customModel instanceof JavaBeanModel) { + AbstractStructuredDataModel model = null; + String name = ((JavaBeanModel) customModel).getName(); + + if (((JavaBeanModel) customModel).isRootClassModel()) { + model = new JavaStructuredDataModel(); + ((JavaStructuredDataModel) model).setLabelName(name); + } else { + model = new JavabeanStructuredContentsModel(); + ((JavabeanStructuredContentsModel) model).setName(name); + ((JavabeanStructuredContentsModel) model).setTypeString(((JavaBeanModel) customModel).getBeanClass().getName()); + } + model.setReferenceEntityModel(customModel); + return model; + } + return null; + } + +} Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/model/JavaBeanParser.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/model/JavaStructuredDataModel.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/model/JavaStructuredDataModel.java (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/model/JavaStructuredDataModel.java 2008-10-20 10:10:26 UTC (rev 10974) @@ -0,0 +1,6 @@ +package org.jboss.tools.smooks.javabean.model; + +import org.jboss.tools.smooks.ui.gef.model.StructuredDataModel; + +public class JavaStructuredDataModel extends StructuredDataModel { +} Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/model/JavaStructuredDataModel.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/model/JavabeanStructuredContentsModel.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/model/JavabeanStructuredContentsModel.java (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/model/JavabeanStructuredContentsModel.java 2008-10-20 10:10:26 UTC (rev 10974) @@ -0,0 +1,28 @@ +/******************************************************************************* + * Copyright (c) 2007 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 + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.smooks.javabean.model; + +import org.jboss.tools.smooks.ui.gef.model.StructuredDataContentModel; + +/** + * @author Dart Peng + * + */ +public class JavabeanStructuredContentsModel extends StructuredDataContentModel { + + /* (non-Javadoc) + * @see org.jboss.tools.smooks.ui.gef.model.StructuredDataContentModel#getName() + */ + @Override + public String getName() { + return super.getName(); + } +} Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/model/JavabeanStructuredContentsModel.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/ui/JavaBeanConfigWizardPage.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/ui/JavaBeanConfigWizardPage.java (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/ui/JavaBeanConfigWizardPage.java 2008-10-20 10:10:26 UTC (rev 10974) @@ -0,0 +1,137 @@ +/******************************************************************************* + * Copyright (c) 2007 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 + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.smooks.javabean.ui; + +import org.eclipse.jdt.core.IJavaProject; +import org.eclipse.jface.viewers.TreeViewer; +import org.eclipse.jface.wizard.IWizardNode; +import org.eclipse.jface.wizard.IWizardPage; +import org.eclipse.jface.wizard.WizardPage; +import org.eclipse.swt.SWT; +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.Text; +import org.jboss.tools.smooks.javabean.model.JavaBeanModel; + +/** + * @author Dart Peng + * + * @CreateTime Jul 21, 2008 + */ +public class JavaBeanConfigWizardPage extends WizardPage implements + SelectionListener { + + TreeViewer treeViewer; + + Text classText = null; + + Button classBrowseButton = null; + + IJavaProject project = null; + + private JavaBeanModelLoadComposite javaPropertySelectComposite; + + public JavaBeanModel getJavaBeanModel(){ + return javaPropertySelectComposite.getCheckedJavaBeanModel(); + } + + public JavaBeanConfigWizardPage(IJavaProject selection) { + super("beansearchwizardpage"); + this.project = selection; + setPageComplete(true); + setTitle("JavaBean Class selection page"); + setDescription("Select the JavaBean class"); + } + + protected void initilize() { + } + + /* + * (non-Javadoc) + * + * @see + * org.ecSclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt + * .widgets.Composite) + */ + public void createControl(Composite parent) { + initilize(); +// Composite cc = new Composite(parent,SWT.NONE); +// cc.setLayout(new GridLayout()); + try { + javaPropertySelectComposite = new JavaBeanModelLoadComposite( + parent, SWT.NONE, getContainer(), project); + +// Button button = new Button(cc, SWT.BORDER); +// +// final TreeViewer vi = new TreeViewer(cc, SWT.NONE); +// GridData gd = new GridData(GridData.FILL_BOTH); +// gd.grabExcessHorizontalSpace = true; +// gd.grabExcessVerticalSpace = true; +// vi.setContentProvider(new BeanContentProvider()); +// vi.setLabelProvider(new BeanlabelProvider()); +// vi.getTree().setLayoutData(gd); +// +// javaPropertySelectComposite.setLayoutData(gd); +// button.addSelectionListener(new SelectionAdapter() { +// +// /* +// * (non-Javadoc) +// * +// * @see +// * org.eclipse.swt.events.SelectionAdapter#widgetSelected(org +// * .eclipse.swt.events.SelectionEvent) +// */ +// @Override +// public void widgetSelected(SelectionEvent e) { +// // TODO Auto-generated method stub +// super.widgetSelected(e); +// List l = new ArrayList(); +// l.add(javaPropertySelectComposite.getCheckedJavaBeanModel()); +// vi.setInput(l); +// } +// +// }); + } catch (Exception e) { + throw new RuntimeException(e); + } + this.setControl(javaPropertySelectComposite); + this.updatePage(); + } + + protected void updatePage() { + String error = null; + if (project == null) { + error = "Please select a Java project."; + } + setPageComplete(error == null); + this.setErrorMessage(error); + } + +// public JavaBeanConfigWizardPage(String pageName, String title, +// ImageDescriptor titleImage) { +// super(pageName, title, titleImage); +// } + + public JavaBeanConfigWizardPage(String pageName) { + super(pageName); + } + + public void widgetDefaultSelected(SelectionEvent arg0) { + widgetSelected(arg0); + } + + public void widgetSelected(SelectionEvent arg0) { + + } + +} Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/ui/JavaBeanConfigWizardPage.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/ui/JavaBeanModelCreationDialog.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/ui/JavaBeanModelCreationDialog.java (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/ui/JavaBeanModelCreationDialog.java 2008-10-20 10:10:26 UTC (rev 10974) @@ -0,0 +1,100 @@ +/******************************************************************************* + * Copyright (c) 2007 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 + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.smooks.javabean.ui; + +import org.eclipse.jdt.core.IJavaProject; +import org.eclipse.jface.dialogs.TitleAreaDialog; +import org.eclipse.swt.SWT; +import org.eclipse.swt.layout.GridData; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Control; +import org.eclipse.swt.widgets.Shell; +import org.jboss.tools.smooks.javabean.model.JavaBeanModel; + +/** + * @author Dart Peng + * + * @CreateTime Jul 22, 2008 + */ +public class JavaBeanModelCreationDialog extends TitleAreaDialog { + + IJavaProject project = null; + private JavaBeanModelLoadComposite jc; + + private JavaBeanModel returnModel; + + /** + * + * @return + */ + public JavaBeanModel getCheckedJavaBeanModel() { + return returnModel; + } + + public JavaBeanModelCreationDialog(Shell parentShell, IJavaProject project) { + super(parentShell); + this.project = project; + } + + public int open(){ + return super.open(); + } + + + + /* (non-Javadoc) + * @see org.eclipse.jface.dialogs.Dialog#okPressed() + */ + @Override + protected void okPressed() { + returnModel = jc.getCheckedJavaBeanModel(); + super.okPressed(); +// returnModel = jc.getCheckedJavaBeanModel(); + } + + /* + * (non-Javadoc) + * + * @see + * org.eclipse.jface.dialogs.TitleAreaDialog#createDialogArea(org.eclipse + * .swt.widgets.Composite) + */ + @Override + protected Control createDialogArea(Composite parent) { + Control area = super.createDialogArea(parent); + try { + this.createJavaBeanDialog(area, project); + } catch (Exception e) { + e.printStackTrace(); + } + return area; + } + + /** + * + * @param area + * @param project + * @return + * @throws Exception + */ + protected Control createJavaBeanDialog(Control area, IJavaProject project) + throws Exception { + jc = new JavaBeanModelLoadComposite((Composite) area, SWT.NONE, null, + project); + GridData gd = new GridData(GridData.FILL_BOTH); + gd.grabExcessHorizontalSpace = true; + gd.grabExcessVerticalSpace = true; + jc.setLayoutData(gd); + gd.heightHint = 400; + return area; + } + +} Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/ui/JavaBeanModelCreationDialog.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/ui/JavaBeanModelGraphUIProvider.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/ui/JavaBeanModelGraphUIProvider.java (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/ui/JavaBeanModelGraphUIProvider.java 2008-10-20 10:10:26 UTC (rev 10974) @@ -0,0 +1,40 @@ +/******************************************************************************* + * Copyright (c) 2008 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 + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.smooks.javabean.ui; + +import org.eclipse.jface.viewers.LabelProvider; +import org.eclipse.swt.graphics.Color; +import org.jboss.tools.smooks.ui.gef.IGraphUIProvider; + +/** + * @author Dart Peng + * @Date Jul 25, 2008 + */ +public class JavaBeanModelGraphUIProvider extends LabelProvider implements + IGraphUIProvider { + + /* (non-Javadoc) + * @see org.jboss.tools.smooks.ui.gef.GraphLabelProvider#getBackgroundColor() + */ + public Color getBackgroundColor() { + // TODO Auto-generated method stub + return null; + } + + /* (non-Javadoc) + * @see org.jboss.tools.smooks.ui.gef.GraphLabelProvider#getTypeText(java.lang.Object) + */ + public String getTypeText(Object model) { + // TODO Auto-generated method stub + return null; + } + +} Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/ui/JavaBeanModelGraphUIProvider.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/ui/JavaBeanModelLoadComposite.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/ui/JavaBeanModelLoadComposite.java (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/ui/JavaBeanModelLoadComposite.java 2008-10-20 10:10:26 UTC (rev 10974) @@ -0,0 +1,222 @@ +/******************************************************************************* + * Copyright (c) 2007 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 + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.smooks.javabean.ui; + +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; + +import org.eclipse.jdt.core.IJavaProject; +import org.eclipse.jdt.core.IType; +import org.eclipse.jdt.core.search.IJavaSearchScope; +import org.eclipse.jdt.internal.corext.util.JavaModelUtil; +import org.eclipse.jdt.internal.ui.search.JavaSearchScopeFactory; +import org.eclipse.jdt.ui.IJavaElementSearchConstants; +import org.eclipse.jdt.ui.JavaUI; +import org.eclipse.jface.operation.IRunnableContext; +import org.eclipse.jface.viewers.CheckboxTreeViewer; +import org.eclipse.jface.window.Window; +import org.eclipse.swt.SWT; +import org.eclipse.swt.events.ModifyEvent; +import org.eclipse.swt.events.ModifyListener; +import org.eclipse.swt.events.SelectionEvent; +import org.eclipse.swt.events.SelectionListener; +import org.eclipse.swt.layout.FillLayout; +import org.eclipse.swt.layout.GridData; +import org.eclipse.swt.layout.GridLayout; +import org.eclipse.swt.widgets.Button; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Control; +import org.eclipse.swt.widgets.Label; +import org.eclipse.swt.widgets.Text; +import org.eclipse.ui.dialogs.SelectionDialog; +import org.jboss.tools.smooks.javabean.model.JavaBeanModel; +import org.jboss.tools.smooks.javabean.model.JavaBeanModelFactory; +import org.jboss.tools.smooks.ui.SmooksUIActivator; +import org.jboss.tools.smooks.utils.ProjectClassLoader; + +/** + * @author Dart Peng + * + * @CreateTime Jul 22, 2008 + */ +public class JavaBeanModelLoadComposite extends Composite implements + SelectionListener { + + protected Text classText; + private Button classBrowseButton; + protected String classFullName; + protected boolean loadAtomic; + protected IJavaProject javaProject; + protected IRunnableContext runnableContext; + protected JavaBeanModel currentRootJavaBeanModel = null; + protected JavaBeanModel returnJavaBeanModel = null; + + protected ProjectClassLoader loader = null; + + public JavaBeanModelLoadComposite(Composite parent, int style, + IRunnableContext runnableContext, IJavaProject project, + boolean loadJavapropertiesAtomic) throws Exception { + super(parent, style); + loadAtomic = loadJavapropertiesAtomic; + this.runnableContext = runnableContext; + if (this.runnableContext == null) { + this.runnableContext = SmooksUIActivator.getDefault() + .getWorkbench().getActiveWorkbenchWindow(); + // this.runnableContext = new + // ProgressMonitorDialog(parent.getShell()); + if (this.runnableContext == null) + throw new Exception("Can't init IRunnableContent"); + } + + if (project != null) { + javaProject = project; + loader = new ProjectClassLoader(javaProject); + } + + createCompositeContent(); + } + + public JavaBeanModelLoadComposite(Composite parent, int style, + IRunnableContext runnableContext, IJavaProject project) + throws Exception { + this(parent, style, runnableContext, project, true); + } + + protected Control createCompositeContent() { + Composite parent = this; + parent.setLayout(new FillLayout()); + Composite com = new Composite(parent, SWT.NULL); + GridLayout layout = new GridLayout(); + layout.numColumns = 2; + com.setLayout(layout); + + Label classLabel = new Label(com, SWT.NULL); + classLabel.setText("Class Name:"); + + Composite classTextContainer = new Composite(com, SWT.NONE); + GridData gd = new GridData(GridData.FILL_HORIZONTAL); + gd.grabExcessHorizontalSpace = true; + classTextContainer.setLayoutData(gd); + + GridLayout gl = new GridLayout(); + gl.numColumns = 2; + classTextContainer.setLayout(gl); + + { + classText = new Text(classTextContainer, SWT.BORDER); + gd = new GridData(GridData.FILL_HORIZONTAL); + gd.grabExcessHorizontalSpace = true; + classText.setLayoutData(gd); + classText.addModifyListener(new ModifyListener() { + public void modifyText(ModifyEvent arg0) { + classFullName = classText.getText(); + } + }); + + classBrowseButton = new Button(classTextContainer, SWT.NONE); + classBrowseButton.addSelectionListener(this); + classBrowseButton.setText("Browse..."); + } + return com; + } + + protected void recordModel() { + // this.currentRootJavaBeanModel.setProperties(null); + // this.fillCheckStateModel(this.currentRootJavaBeanModel); + } + + protected void fillTheModelWithCheckStatus(JavaBeanModel javaBeanModel, + CheckboxTreeViewer viewer) { + ArrayList clist = new ArrayList(); + if (javaBeanModel.propertiesHasBeenLoaded()) { + List children = javaBeanModel.getProperties(); + for (Iterator iterator = children.iterator(); iterator.hasNext();) { + JavaBeanModel child = (JavaBeanModel) iterator.next(); + boolean checked = viewer.getChecked(child); + if (checked) { + clist.add(child); + fillTheModelWithCheckStatus(child, viewer); + } + } + } + javaBeanModel.setProperties(clist); + } + + /** + * + * @return + */ + public JavaBeanModel getCheckedJavaBeanModel() { + return this.fillCheckStateModel(currentRootJavaBeanModel); + } + + /** + * + * @return + */ + public JavaBeanModel fillCheckStateModel(JavaBeanModel rootJavaBean) { + if (rootJavaBean == null) { + // List list = (List) treeViewer.getInput(); + // if (list != null) + // rootJavaBean = (JavaBeanModel) list.get(0); + try { + ProjectClassLoader loader = new ProjectClassLoader(javaProject); + Class clazz = loader.loadClass(this.classText.getText()); + rootJavaBean = JavaBeanModelFactory + .getJavaBeanModelWithLazyLoad(clazz); + } catch (Exception e) { + + } + } + // if (rootJavaBean != null) + // this.fillTheModelWithCheckStatus(rootJavaBean, treeViewer); + return rootJavaBean; + } + + public void widgetDefaultSelected(SelectionEvent arg0) { + this.widgetSelected(arg0); + + } + + public void widgetSelected(SelectionEvent arg0) { + IJavaSearchScope scope = JavaSearchScopeFactory.getInstance() + .createJavaProjectSearchScope(javaProject, true); + SelectionDialog dialog; + try { + dialog = JavaUI.createTypeDialog(this.getShell(), runnableContext, + scope, IJavaElementSearchConstants.CONSIDER_CLASSES, false); + dialog.setMessage("Source Java Bean:"); + dialog.setTitle("Search java bean"); + + if (dialog.open() == Window.OK) { + Object[] results = dialog.getResult(); + if (results.length > 0) { + Object result = results[0]; + String packageFullName = JavaModelUtil + .getTypeContainerName((IType) result); + if (packageFullName == null + || packageFullName.length() <= 0) { + classText.setText(((IType) result).getElementName()); + } else { + classText.setText(packageFullName + "." + + ((IType) result).getElementName()); + } + } + } + } catch (Exception e) { + // this.setErrorMessage("Error occurs!please see log file"); + e.printStackTrace(); + } + + } + +} Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/ui/JavaBeanModelLoadComposite.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/ui/JavaImageConstants.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/ui/JavaImageConstants.java (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/ui/JavaImageConstants.java 2008-10-20 10:10:26 UTC (rev 10974) @@ -0,0 +1,6 @@ +package org.jboss.tools.smooks.javabean.ui; + +public class JavaImageConstants { + public static final String IMAGE_JAVA_ATTRIBUTE = "java_attribute"; + public static final String IMAGE_JAVA_OBJECT = "java_object"; +} Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/ui/JavaImageConstants.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/ui/NewJavaBeanStrucutredDataWizard.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/ui/NewJavaBeanStrucutredDataWizard.java (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/ui/NewJavaBeanStrucutredDataWizard.java 2008-10-20 10:10:26 UTC (rev 10974) @@ -0,0 +1,109 @@ +/******************************************************************************* + * Copyright (c) 2008 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 + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.smooks.javabean.ui; + +import java.util.ArrayList; +import java.util.List; +import java.util.Properties; + +import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.IResource; +import org.eclipse.core.runtime.IAdaptable; +import org.eclipse.jdt.core.IJavaProject; +import org.eclipse.jdt.core.JavaCore; +import org.eclipse.jdt.internal.core.JavaProject; +import org.eclipse.jface.viewers.IStructuredSelection; +import org.eclipse.jface.wizard.Wizard; +import org.eclipse.ui.IEditorInput; +import org.eclipse.ui.IEditorSite; +import org.eclipse.ui.IFileEditorInput; +import org.eclipse.ui.INewWizard; +import org.eclipse.ui.IWorkbench; +import org.jboss.tools.smooks.ui.IStructuredDataCreationWizard; +import org.jboss.tools.smooks.ui.SmooksUIActivator; + +/** + * @author Dart Peng + * @Date Aug 5, 2008 + */ +public class NewJavaBeanStrucutredDataWizard extends Wizard implements IStructuredDataCreationWizard,INewWizard{ + JavaBeanConfigWizardPage page = null; + IJavaProject project = null; + Object result = null; + Properties properties = new Properties(); + /* (non-Javadoc) + * @see org.eclipse.jface.wizard.Wizard#addPages() + */ + @Override + public void addPages() { + super.addPages(); + if(page == null){ + page = new JavaBeanConfigWizardPage(project); + this.addPage(page); + } + } + + /* (non-Javadoc) + * @see org.eclipse.jface.wizard.Wizard#performFinish() + */ + @Override + public boolean performFinish() { + result = page.getJavaBeanModel(); + return true; + } + + public Object getTreeViewerInputContents() { + List<Object> list = new ArrayList<Object>(); + list.add(result); + return list; + } + + public void init(IEditorSite site, IEditorInput input) { + if(input != null && input instanceof IFileEditorInput){ + IFileEditorInput fi = (IFileEditorInput)input; + IProject project = fi.getFile().getProject(); + if(project instanceof IJavaProject){ + this.project = (IJavaProject)project; + }else{ + this.project = JavaCore.create(project); + } + } + } + + public String getInputDataTypeID() { + return SmooksUIActivator.DATA_TYPE_ID_JAVABEAN; + } + + public Properties getProperties() { + return this.properties; + } + + public void init(IWorkbench workbench, IStructuredSelection selection) { + if(selection != null){ + Object obj = selection.getFirstElement(); + if(obj instanceof JavaProject){ + this.project = (JavaProject)obj; + } + if(obj instanceof IResource){ + IProject project = ((IResource)obj).getProject(); + this.project = JavaCore.create(project); + } + + if(project == null){ + if(obj instanceof IAdaptable){ + IResource relateResource =(IResource) ((IAdaptable)obj).getAdapter(IResource.class); + IProject project = relateResource.getProject(); + this.project = JavaCore.create(project); + } + } + } + } +} Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/ui/NewJavaBeanStrucutredDataWizard.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/uitils/JavaPropertyUtils.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/uitils/JavaPropertyUtils.java (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/uitils/JavaPropertyUtils.java 2008-10-20 10:10:26 UTC (rev 10974) @@ -0,0 +1,45 @@ +package org.jboss.tools.smooks.javabean.uitils; + +import java.beans.IntrospectionException; +import java.beans.Introspector; +import java.beans.PropertyDescriptor; + +/** + * + * @author Dart Peng + * Date : Sep 10, 2008 + */ +public class JavaPropertyUtils { + + private static JavaPropertyUtils instace = null; + + public static PropertyDescriptor[] getPropertyDescriptor(Class clazz) { + try { + return getInstace().getPropertyDescriptorArray(clazz); + } catch (Exception e) { + // ignore + return new PropertyDescriptor[]{}; + } + } + + /** + * + * @param clazz + * @return + * @throws IntrospectionException + */ + public PropertyDescriptor[] getPropertyDescriptorArray(Class clazz) + throws IntrospectionException { + // TODO should improve (use some catch to store the BeanInfo , right?) + return Introspector + .getBeanInfo(clazz, Introspector.IGNORE_ALL_BEANINFO) + .getPropertyDescriptors(); + } + + public static JavaPropertyUtils getInstace() { + if (instace == null) { + instace = new JavaPropertyUtils(); + } + return instace; + } +} Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/uitils/JavaPropertyUtils.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/SmooksUIActivator.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/SmooksUIActivator.java 2008-10-20 10:08:30 UTC (rev 10973) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/SmooksUIActivator.java 2008-10-20 10:10:26 UTC (rev 10974) @@ -4,7 +4,9 @@ import org.eclipse.jface.resource.ImageRegistry; import org.eclipse.swt.graphics.Image; import org.eclipse.ui.plugin.AbstractUIPlugin; +import org.jboss.tools.smooks.javabean.ui.JavaImageConstants; import org.jboss.tools.smooks.utils.SmooksGraphConstants; +import org.jboss.tools.smooks.xml.XMLImageConstants; import org.osgi.framework.BundleContext; /** @@ -14,7 +16,15 @@ // The plug-in ID public static final String PLUGIN_ID = "org.jboss.tools.smooks.ui"; + + public static final String TYPE_ID_XSD = "org.jboss.tools.smooks.xml.viewerInitor.xsd"; + + public static final String TYPE_ID_XML = "org.jboss.tools.smooks.xml.viewerInitor.xml"; + + public static final String DATA_TYPE_ID_JAVABEAN = "org.jboss.tools.smooks.ui.viewerInitor.javabean"; + + // The shared instance private static SmooksUIActivator plugin; @@ -48,6 +58,16 @@ reg.put(SmooksGraphConstants.IMAGE_EMPTY, getImageDescriptor(SmooksGraphConstants.IMAGE_PATH_BLANK)); reg.put(SmooksGraphConstants.IMAGE_ERROR, getImageDescriptor(SmooksGraphConstants.IMAGE_PATH_ERROR)); reg.put(SmooksGraphConstants.IMAGE_WARNING, getImageDescriptor(SmooksGraphConstants.IMAGE_PATH_WARNING)); + reg.put(XMLImageConstants.IMAGE_XML_ATTRIBUTE, + imageDescriptorFromPlugin(PLUGIN_ID, + "icons/full/obj16/attribute_obj.gif")); + reg.put(XMLImageConstants.IMAGE_XML_ELEMENT, + imageDescriptorFromPlugin(PLUGIN_ID, + "icons/full/obj16/element_obj.gif")); + reg.put(JavaImageConstants.IMAGE_JAVA_ATTRIBUTE, + imageDescriptorFromPlugin(PLUGIN_ID, "icons/full/obj16/att_obj.gif")); + reg.put(JavaImageConstants.IMAGE_JAVA_OBJECT, + imageDescriptorFromPlugin(PLUGIN_ID, "icons/full/obj16/class_obj.gif")); } /** Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml/AbstractFileSelectionWizardPage.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml/AbstractFileSelectionWizardPage.java (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml/AbstractFileSelectionWizardPage.java 2008-10-20 10:10:26 UTC (rev 10974) @@ -0,0 +1,328 @@ +/** + * + */ +package org.jboss.tools.smooks.xml; + +import java.io.File; +import java.util.Collections; + +import org.eclipse.core.resources.IFile; +import org.eclipse.emf.common.ui.dialogs.WorkspaceResourceDialog; +import org.eclipse.jface.viewers.CheckboxTableViewer; +import org.eclipse.jface.viewers.IStructuredSelection; +import org.eclipse.jface.wizard.IWizard; +import org.eclipse.jface.wizard.IWizardNode; +import org.eclipse.jface.wizard.IWizardPage; +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.events.SelectionAdapter; +import org.eclipse.swt.events.SelectionEvent; +import org.eclipse.swt.events.SelectionListener; +import org.eclipse.swt.layout.GridData; +import org.eclipse.swt.layout.GridLayout; +import org.eclipse.swt.widgets.Button; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Control; +import org.eclipse.swt.widgets.FileDialog; +import org.eclipse.swt.widgets.Label; +import org.eclipse.swt.widgets.Text; +import org.eclipse.ui.INewWizard; + +/** + * + * @author Dart Peng Date : 2008-8-13 + */ +public abstract class AbstractFileSelectionWizardPage extends WizardPage + implements SelectionListener { + protected IStructuredSelection selection; + protected Object returnObject = null; + protected Text fileText; + protected Composite fileTextComposite; + protected CheckboxTableViewer tableViewer = null; + protected Button fileSystemBrowseButton; + protected boolean reasourceLoaded = false; + private Button workspaceBrowseButton; + + public AbstractFileSelectionWizardPage(String pageName) { + super(pageName); + // TODO Auto-generated constructor stub + } + + public Object getReturnValue() { + try { + returnObject = this.loadedTheObject(fileText.getText()); + } catch (Exception e) { + e.printStackTrace(); + } + return returnObject; + } + + public String getFilePath(){ + return fileText.getText(); + } + /* + * (non-Javadoc) + * + * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite) + */ + public void createControl(Composite parent) { + + Composite mainComposite = new Composite(parent, SWT.NONE); + GridLayout layout = new GridLayout(); + layout.numColumns = 1; + mainComposite.setLayout(layout); + + GridData gd = new GridData(GridData.FILL_BOTH); + gd.grabExcessHorizontalSpace = true; + gd.grabExcessVerticalSpace = true; + mainComposite.setLayoutData(gd); + + // xmlButton = new Button(mainComposite, SWT.RADIO); + // xmlButton.setText("Select a XML file"); + // + // Composite xmlComposite = this + // .createXMLFileSelectionComposite(mainComposite); + // + // Label sp = new Label(mainComposite, SWT.HORIZONTAL | SWT.SEPARATOR); + // gd = new GridData(GridData.FILL_HORIZONTAL); + // sp.setLayoutData(gd); + // + // xsdButton = new Button(mainComposite, SWT.RADIO); + // xsdButton.setText("Select a XSD file"); + + Composite xsdComposite = this + .createFileSelectionComposite(mainComposite); + + // init the panel status (XSD file selection composite is disabled) + // xsdButton.setSelection(true); + // + // setCompositeChildrenEnabled(xmlComposite, false); + + // registe the listener for controls + hookBrowseButtonSelectionAdapter(); + hookFileTextModifyListener(); + this.setControl(mainComposite); + } + + protected void hookFileTextModifyListener() { + final ModifyListener modifyListener = new ModifyListener() { + public void modifyText(ModifyEvent e) { + changeWizardPageStatus(); + } + }; + // xmlFileText.addModifyListener(modifyListener); + fileText.addModifyListener(modifyListener); + } + + protected void hookRadioButtonSelectionAdapter() { + // xsdButton.addSelectionListener(this); + } + + protected void hookBrowseButtonSelectionAdapter() { + SelectionAdapter browseButtonSelectionAdapter = new SelectionAdapter() { + public void widgetSelected(SelectionEvent e) { + Text relationT = null; + if (e.getSource() == fileSystemBrowseButton) { + relationT = fileText; + } + openFileSelection(relationT); + } + }; + SelectionAdapter wbrowseButtonSelectionAdapter = new SelectionAdapter() { + public void widgetSelected(SelectionEvent e) { + Text relationT = null; + if (e.getSource() == workspaceBrowseButton) { + relationT = fileText; + } + openWorkSpaceSelection(relationT); + } + + }; + + workspaceBrowseButton + .addSelectionListener(wbrowseButtonSelectionAdapter); + // xmlFileSystemBrowseButton + // .addSelectionListener(browseButtonSelectionAdapter); + fileSystemBrowseButton + .addSelectionListener(browseButtonSelectionAdapter); + } + + protected void openWorkSpaceSelection(Text relationT) { + IFile[] files = WorkspaceResourceDialog.openFileSelection(getShell(), + "", "", false, null, Collections.EMPTY_LIST); + // dialog.setInitialSelections(selectedResources); + if (files.length > 0) { + IFile file = files[0]; + String s = file.getLocation().toOSString(); + relationT.setText(s); + } + } + + protected Composite createFileSelectionComposite(Composite parent) { + Composite xsdComposite = new Composite(parent, SWT.NONE); + GridData gd = new GridData(GridData.FILL_HORIZONTAL); + xsdComposite.setLayoutData(gd); + GridLayout xsdLayout = new GridLayout(); + xsdLayout.numColumns = 2; + xsdLayout.marginWidth = 0; + xsdComposite.setLayout(xsdLayout); + + Label nfileLanel = new Label(xsdComposite, SWT.NONE); + nfileLanel.setText("XML File Path :"); + fileTextComposite = new Composite(xsdComposite, SWT.NONE); + gd = new GridData(GridData.FILL_HORIZONTAL); + gd.grabExcessHorizontalSpace = true; + fileTextComposite.setLayoutData(gd); + GridLayout xsdtgl = new GridLayout(); + xsdtgl.marginWidth = 0; + xsdtgl.marginHeight = 0; + xsdtgl.numColumns = 1; + fileTextComposite.setLayout(xsdtgl); + + fileText = new Text(fileTextComposite, SWT.BORDER); + gd = new GridData(GridData.FILL_HORIZONTAL); + fileText.setLayoutData(gd); + gd.grabExcessHorizontalSpace = true; + +// final Button loadXSDButton = new Button(fileTextComposite, SWT.NONE); +// loadXSDButton.setText("Load"); +// loadXSDButton.addSelectionListener(new SelectionAdapter() { +// +// @Override +// public void widgetSelected(SelectionEvent e) { +// super.widgetSelected(e); +// reasourceLoaded = false; +// try { +// returnObject = loadedTheObject(fileText.getText()); +// reasourceLoaded = true; +// } catch (Throwable e2) { +// // ignore +// e2.printStackTrace(); +// } +// changeWizardPageStatus(); +// } +// +// }); + + Composite browseButtonComposite = new Composite(xsdComposite, SWT.NONE); + gd = new GridData(GridData.FILL_HORIZONTAL); + gd.horizontalSpan = 2; + browseButtonComposite.setLayoutData(gd); + + GridLayout bg = new GridLayout(); + bg.numColumns = 2; + bg.marginHeight = 0; + bg.marginWidth = 0; + bg.makeColumnsEqualWidth = false; + browseButtonComposite.setLayout(bg); + + fileSystemBrowseButton = new Button(browseButtonComposite, SWT.NONE); + fileSystemBrowseButton.setText("Browse File System..."); + + workspaceBrowseButton = new Button(browseButtonComposite, SWT.NONE); + workspaceBrowseButton.setText("Browse workspace file.."); + gd = new GridData(); + gd.horizontalAlignment = GridData.END; + workspaceBrowseButton.setLayoutData(gd); + + gd = new GridData(); + gd.grabExcessHorizontalSpace = true; + gd.horizontalAlignment = GridData.END; + fileSystemBrowseButton.setLayoutData(gd); + + return xsdComposite; + } + + abstract protected Object loadedTheObject(String path) throws Exception; + + protected void initTableViewer() { +// tableViewer.addCheckStateListener(new ICheckStateListener() { +// boolean flag = true; +// +// public void checkStateChanged(CheckStateChangedEvent event) { +// if (flag) { +// Object checkObject = event.getElement(); +// boolean check = event.getChecked(); +// flag = false; +// tableViewer.setAllChecked(false); +// tableViewer.setChecked(checkObject, check); +// flag = true; +// changeWizardPageStatus(); +// } +// } +// }); +// tableViewer.setContentProvider(new XSDStructuredModelContentProvider()); +// tableViewer.setLabelProvider(new XSDStructuredModelLabelProvider()); + } + + protected void setCompositeChildrenEnabled(Composite composite, + boolean enabled) { + Control[] children = composite.getChildren(); + for (int i = 0; i < children.length; i++) { + Control child = children[i]; + if (child instanceof Text) { + child.setEnabled(enabled); + } + if (child instanceof Button) { + child.setEnabled(enabled); + } + if (child instanceof Composite) { + setCompositeChildrenEnabled((Composite) child, enabled); + } + } + } + + protected void openFileSelection(Text relationText) { + FileDialog dialog = new FileDialog(this.getShell()); + String path = dialog.open(); + if (path != null) { + relationText.setText(path); + } + } + + protected void changeWizardPageStatus() { + String text = this.fileText.getText(); + String error = null; + if (text == null || "".equals(text)) + error = "Please Select a file"; + + File tempFile = new File(text); + if(!tempFile.exists()){ + error = "Can't find the file , please select another one."; + } + +// if (!reasourceLoaded) { +// error = "Resource must be loaded"; +// } + this.setErrorMessage(error); + this.setPageComplete(error == null); + + } + + public void widgetDefaultSelected(SelectionEvent e) { + widgetSelected(e); + } + + public void widgetSelected(SelectionEvent e) { + changeWizardPageStatus(); + } + + public CheckboxTableViewer getTableViewer() { + return tableViewer; + } + + public void setTableViewer(CheckboxTableViewer tableViewer) { + this.tableViewer = tableViewer; + } + + public IStructuredSelection getSelection() { + return selection; + } + + public void setSelection(IStructuredSelection selection) { + this.selection = selection; + } + +} Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml/AbstractFileSelectionWizardPage.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml/AbstractStructuredDdataWizard.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml/AbstractStructuredDdataWizard.java (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml/AbstractStructuredDdataWizard.java 2008-10-20 10:10:26 UTC (rev 10974) @@ -0,0 +1,70 @@ +/** + * + */ +package org.jboss.tools.smooks.xml; + +import org.eclipse.jface.viewers.IStructuredSelection; +import org.eclipse.jface.wizard.IWizardNode; +import org.eclipse.jface.wizard.Wizard; +import org.eclipse.ui.IEditorInput; +import org.eclipse.ui.IEditorSite; +import org.eclipse.ui.INewWizard; +import org.eclipse.ui.IWorkbench; +import org.jboss.tools.smooks.ui.IStructuredDataCreationWizard; + +/** + * @author Dart + * + */ +public abstract class AbstractStructuredDdataWizard extends Wizard implements + IStructuredDataCreationWizard ,INewWizard{ + protected IWorkbench workbench; + + protected IStructuredSelection selection; + + protected AbstractFileSelectionWizardPage page = null; + protected Object xsdElement = null; + protected IWizardNode strucutredDataCreationWizardNode; + /** + * + */ + public AbstractStructuredDdataWizard() { + // TODO Auto-generated constructor stub + } + + @Override + public void addPages() { + if(page == null){ + page = createAbstractFileSelectionWizardPage(); + page.setSelection(this.selection); + } + this.addPage(page); + } + + abstract protected AbstractFileSelectionWizardPage createAbstractFileSelectionWizardPage() ; + + /* + * (non-Javadoc) + * + * @see org.eclipse.jface.wizard.Wizard#performFinish() + */ + @Override + public boolean performFinish() { + xsdElement = this.page.getReturnValue(); + return true; + } + public Object getTreeViewerInputContents() { + return xsdElement; + } + + public void init(IEditorSite site, IEditorInput input) { + + } + + public void init(IWorkbench workbench, IStructuredSelection selection) { + this.workbench = workbench; + this.selection = selection; + } + + +} Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml/AbstractStructuredDdataWizard.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml/XMLImageConstants.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml/XMLImageConstants.java (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml/XMLImageConstants.java 2008-10-20 10:10:26 UTC (rev 10974) @@ -0,0 +1,14 @@ +/** + * + */ +package org.jboss.tools.smooks.xml; + +/** + * @author Dart Peng + * Date : 2008-8-21 + */ +public class XMLImageConstants { + public static final String IMAGE_XML_ELEMENT = "xml_element"; + + public static final String IMAGE_XML_ATTRIBUTE = "xml_attribute"; +} Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml/XMLImageConstants.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml/model/AbstractXMLObject.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml/model/AbstractXMLObject.java (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml/model/AbstractXMLObject.java 2008-10-20 10:10:26 UTC (rev 10974) @@ -0,0 +1,59 @@ +/******************************************************************************* + * Copyright (c) 2008 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 + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.smooks.xml.model; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author Dart Peng + * @Date Jul 25, 2008 + */ +public class AbstractXMLObject { + + protected AbstractXMLObject parent; + + protected String name; + + protected List<AbstractXMLObject> children = new ArrayList<AbstractXMLObject>(); + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public List<AbstractXMLObject> getChildren() { + return children; + } + + public void setChildren(List<AbstractXMLObject> children) { + this.children = children; + } + + /** + * @return the parent + */ + public AbstractXMLObject getParent() { + return parent; + } + + /** + * @param parent the parent to set + */ + public void setParent(AbstractXMLObject parent) { + this.parent = parent; + } + + +} Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml/model/AbstractXMLObject.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml/model/DocumentObject.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml/model/DocumentObject.java (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml/model/DocumentObject.java 2008-10-20 10:10:26 UTC (rev 10974) @@ -0,0 +1,46 @@ +/******************************************************************************* + * Copyright (c) 2008 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 + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.smooks.xml.model; + +/** + * @author Dart Peng + * @Date Jul 26, 2008 + */ +public class DocumentObject extends AbstractXMLObject { + TagObject rootTag; + + public TagObject getRootTag() { + return rootTag; + } + + public void setRootTag(TagObject rootTag) { + this.rootTag = rootTag; + if(rootTag != null) rootTag.setParent(this); + } + + public String toString(){ + if(rootTag != null) + return "Document : " + getName() + "\n" + getRootTag().toString(); + + return "Docuement Object : " +getName(); + } + + /* (non-Javadoc) + * @see org.jboss.tools.smooks.xml.model.AbstractXMLObject#getParent() + */ + @Override + public AbstractXMLObject getParent() { + return null; + } + + + +} Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml/model/DocumentObject.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml/model/TagObject.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml/model/TagObject.java (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml/model/TagObject.java 2008-10-20 10:10:26 UTC (rev 10974) @@ -0,0 +1,76 @@ +/******************************************************************************* + * Copyright (c) 2008 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 + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.smooks.xml.model; + +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; + +/** + * @author Dart Peng + * @Date Jul 25, 2008 + */ +public class TagObject extends AbstractXMLObject { + protected List<TagPropertyObject> properties = new ArrayList<TagPropertyObject>(); + + public List<TagPropertyObject> getProperties() { + return properties; + } + + public void setProperties(List<TagPropertyObject> properties) { + this.properties = properties; + } + + public void addProperty(TagPropertyObject pro) { + this.getProperties().add(pro); + if (pro != null) + pro.setParent(this); + } + + public void removeProperty(TagPropertyObject pro) { + this.getProperties().remove(pro); + if (pro != null) + pro.setParent(null); + } + + public void addChildTag(TagObject tag) { + this.getChildren().add(tag); + if (tag != null) + tag.setParent(this); + } + + public void removeChildTag(TagObject tag) { + this.getChildren().remove(tag); + if (tag != null) + tag.setParent(null); + } + + public String toString() { + StringBuffer buffer = new StringBuffer(getName()); + buffer.append("\n"); + for (Iterator iterator = properties.iterator(); iterator.hasNext();) { + TagPropertyObject pro = (TagPropertyObject) iterator.next(); + buffer.append("\t"); + buffer.append(pro.getName()); + buffer.append("\n"); + } + + List l = getChildren(); + for (Iterator iterator = l.iterator(); iterator.hasNext();) { + TagObject tag = (TagObject) iterator.next(); + buffer.append("\t"); + buffer.append(tag.toString()); + buffer.append("\n"); + } + return buffer.toString(); + } + +} Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml/model/TagObject.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml/model/TagPropertyObject.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml/model/TagPropertyObject.java (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml/model/TagPropertyObject.java 2008-10-20 10:10:26 UTC (rev 10974) @@ -0,0 +1,38 @@ +/******************************************************************************* + * Copyright (c) 2008 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 + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.smooks.xml.model; + +import java.util.List; + +/** + * @author Dart Peng + * @Date Jul 25, 2008 + */ +public class TagPropertyObject extends AbstractXMLObject { + + protected String type = "string"; + + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } + + @Override + public List<AbstractXMLObject> getChildren() { + return null; + } + @Override + public void setChildren(List<AbstractXMLObject> children) { + } +} Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml/model/TagPropertyObject.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml/model/XMLObjectAnalyzer.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml/model/XMLObjectAnalyzer.java (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml/model/XMLObjectAnalyzer.java 2008-10-20 10:10:26 UTC (rev 10974) @@ -0,0 +1,104 @@ +/******************************************************************************* + * Copyright (c) 2008 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 + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.smooks.xml.model; + +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.InputStream; +import java.util.Iterator; +import java.util.List; + +import org.dom4j.Attribute; +import org.dom4j.Document; +import org.dom4j.DocumentException; +import org.dom4j.Element; +import org.dom4j.io.SAXReader; + +/** + * @author Dart Peng + * @Date Jul 25, 2008 + */ +public class XMLObjectAnalyzer { + public DocumentObject analyze(String xmlFilePath) + throws FileNotFoundException, DocumentException { + FileInputStream stream = new FileInputStream(xmlFilePath); + return this.analyze(stream); + } + + public DocumentObject analyze(InputStream stream) throws DocumentException { + SAXReader reader = new SAXReader(); + Document doc = reader.read(stream); + Element rootElement = doc.getRootElement(); + DocumentObject dco = new DocumentObject(); + dco.setName("Docuement"); + dco.setRootTag( parseElement(rootElement, null)); + return dco; + } + + protected TagObject getChildTagByName(String name, TagObject tag) { + if (tag == null) + return null; + List list = tag.getChildren(); + for (Iterator iterator = list.iterator(); iterator.hasNext();) { + TagObject tagc = (TagObject) iterator.next(); + if (tagc.getName().equals(name)) + return tagc; + } + return null; + } + + protected TagObject parseElement(Element element, TagObject parentTag) { + boolean canAdd = false; + TagObject tag = getChildTagByName(element.getName(), parentTag); + if (tag == null) { + tag = new TagObject(); + canAdd = true; + } + tag.setName(element.getName()); + fillProperties(element, tag); + + List list = element.elements(); + for (Iterator iterator = list.iterator(); iterator.hasNext();) { + Element childElement = (Element) iterator.next(); + TagObject t = parseElement(childElement, tag); + if (t != null) + tag.addChildTag(t); + } + if (canAdd) + return tag; + else + return null; + } + + protected boolean hasSameNameProperty(String proName, TagObject tag) { + List pros = tag.getProperties(); + for (Iterator iterator = pros.iterator(); iterator.hasNext();) { + TagPropertyObject tp = (TagPropertyObject) iterator.next(); + if (tp.getName().equals(proName)) + return true; + } + return false; + } + + protected void fillProperties(Element element, TagObject tag) { + Iterator it = element.attributeIterator(); + for (Iterator iterator = it; iterator.hasNext();) { + Attribute attr = (Attribute) iterator.next(); + if (hasSameNameProperty(attr.getName(), tag)) { + continue; + } + TagPropertyObject pro = new TagPropertyObject(); + pro.setName(attr.getName()); + + tag.addProperty(pro); + } + } +} Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml/model/XMLObjectAnalyzer.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml/model/XMLStructuredModel.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml/model/XMLStructuredModel.java (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml/model/XMLStructuredModel.java 2008-10-20 10:10:26 UTC (rev 10974) @@ -0,0 +1,30 @@ +/******************************************************************************* + * Copyright (c) 2007 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 + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.smooks.xml.model; + +import org.eclipse.core.runtime.IAdaptable; + +/** + * @author Dart Peng + * + * @CreateTime Jul 24, 2008 + */ +public class XMLStructuredModel implements IAdaptable { + + /* (non-Javadoc) + * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class) + */ + public Object getAdapter(Class arg0) { + // TODO Auto-generated method stub + return null; + } + +} Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml/model/XMLStructuredModel.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml/model/XMLStrucutredModelParser.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml/model/XMLStrucutredModelParser.java (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml/model/XMLStrucutredModelParser.java 2008-10-20 10:10:26 UTC (rev 10974) @@ -0,0 +1,98 @@ +/******************************************************************************* + * Copyright (c) 2008 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 + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.smooks.xml.model; + +import org.eclipse.xsd.XSDAttributeDeclaration; +import org.eclipse.xsd.XSDElementDeclaration; +import org.eclipse.xsd.XSDSchema; +import org.eclipse.xsd.XSDSimpleTypeDefinition; +import org.eclipse.xsd.XSDTypeDefinition; +import org.jboss.tools.smooks.ui.gef.model.AbstractStructuredDataModel; +import org.jboss.tools.smooks.ui.gef.model.StructuredDataContentModel; +import org.jboss.tools.smooks.ui.gef.model.StructuredDataModel; +import org.jboss.tools.smooks.ui.modelparser.IStructuredModelParser; + +/** + * + * @author Dart Peng + * @Date Jul 25, 2008 + */ +public class XMLStrucutredModelParser implements IStructuredModelParser { + + public AbstractStructuredDataModel parse(Object customModel) { + AbstractStructuredDataModel model = null; + // for AbstractXMLObject (come from xml file fragment) + if(customModel instanceof DocumentObject){ + model = new StructuredDataModel(); + model.setLabelName(((DocumentObject)customModel).getName()); + } + + if(customModel instanceof TagObject){ + model = new StructuredDataContentModel(); + model.setLabelName(((TagObject)customModel).getName()); + } + if(customModel instanceof TagPropertyObject){ + model = new StructuredDataContentModel(); + model.setLabelName(((TagPropertyObject)customModel).getName()); + model.setTypeString(((TagPropertyObject)customModel).getType()); + } + + // for XSD (come from XML Schema file) + if (customModel instanceof XSDSchema) { + model = new StructuredDataModel(); + StructuredDataModel sm = (StructuredDataModel) model; + sm.setLabelName("Schema"); + } + if (customModel instanceof XSDElementDeclaration) { + model = new StructuredDataContentModel(); + model.setLabelName(((XSDElementDeclaration) customModel) + .getAliasName()); + model + .setTypeString(getElementTypeString((XSDElementDeclaration) customModel)); + } + if (customModel instanceof XSDAttributeDeclaration) { + model = new StructuredDataContentModel(); + model.setLabelName(((XSDAttributeDeclaration) customModel) + .getAliasName()); + model.setTypeString(((XSDAttributeDeclaration) customModel) + .getTypeDefinition().getQName()); + } + if (model != null) { + model.setReferenceEntityModel(customModel); + } + return model; + } + + protected boolean isSimpleElement(XSDElementDeclaration element) { + return this.getSimpleType(element) != null; + } + + protected String getElementTypeString(XSDElementDeclaration element) { + if (isSimpleElement(element)) { + XSDSimpleTypeDefinition simple = getSimpleType(element); + return simple.getQName(); + } else { + return null; + } + } + + /** + * + * @param element + * @return + */ + protected XSDSimpleTypeDefinition getSimpleType( + XSDElementDeclaration element) { + XSDTypeDefinition type = element.getType(); + return type.getSimpleType(); + } + +} Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml/model/XMLStrucutredModelParser.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml/ui/XMLStructuredDataContentProvider.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml/ui/XMLStructuredDataContentProvider.java (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml/ui/XMLStructuredDataContentProvider.java 2008-10-20 10:10:26 UTC (rev 10974) @@ -0,0 +1,116 @@ +/******************************************************************************* + * Copyright (c) 2008 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 + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.smooks.xml.ui; + +import java.util.ArrayList; +import java.util.List; + +import org.eclipse.jface.viewers.ITreeContentProvider; +import org.eclipse.jface.viewers.Viewer; +import org.jboss.tools.smooks.xml.model.AbstractXMLObject; +import org.jboss.tools.smooks.xml.model.DocumentObject; +import org.jboss.tools.smooks.xml.model.TagObject; + +/** + * @author Dart Peng + * @Date Aug 18, 2008 + */ +public class XMLStructuredDataContentProvider implements ITreeContentProvider { + + /* (non-Javadoc) + * @see org.eclipse.jface.viewers.ITreeContentProvider#getChildren(java.lang.Object) + */ + public Object[] getChildren(Object obj) { + // for AbstractXMLObject (come from xml file fragment) + if(obj instanceof DocumentObject){ + return new Object[]{((DocumentObject)obj).getRootTag()}; + } + + if(obj instanceof TagObject){ + List c = new ArrayList(); + List pros = ((TagObject)obj).getProperties(); + c.addAll(pros); + c.addAll(((TagObject)obj).getChildren()); + + return c.toArray(); + } + return new Object[] {}; + } + + /* + * (non-Javadoc) + * + * @see org.eclipse.jface.viewers.ITreeContentProvider#getParent(java.lang.Object ) + */ + public Object getParent(Object arg0) { + if(arg0 instanceof AbstractXMLObject){ + return ((AbstractXMLObject)arg0).getParent(); + } + return null; + } + + /* + * (non-Javadoc) + * + * @see org.eclipse.jface.viewers.ITreeContentProvider#hasChildren(java.lang. + * Object) + */ + public boolean hasChildren(Object obj) { + + // for AbstractXMLObject (come from xml file fragment) + if(obj instanceof DocumentObject){ + return true; + } + if(obj instanceof TagObject){ + List pros = ((TagObject)obj).getProperties(); + List c = (((TagObject)obj).getChildren()); + return !pros.isEmpty() || !c.isEmpty(); + } + return false; + } + + /* + * (non-Javadoc) + * + * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java + * .lang.Object) + */ + public Object[] getElements(Object arg0) { + if (arg0 instanceof List) { + return ((List) arg0).toArray(); + } + if(arg0 instanceof DocumentObject){ + return new Object[]{((DocumentObject)arg0).getRootTag()}; + } + return new Object[] {}; + } + + /* + * (non-Javadoc) + * + * @see org.eclipse.jface.viewers.IContentProvider#dispose() + */ + public void dispose() { + + } + + /* + * (non-Javadoc) + * + * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface + * .viewers.Viewer, java.lang.Object, java.lang.Object) + */ + public void inputChanged(Viewer arg0, Object arg1, Object arg2) { + + } + + +} Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml/ui/XMLStructuredDataContentProvider.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml/ui/XMLStructuredDataLabelProvider.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml/ui/XMLStructuredDataLabelProvider.java (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml/ui/XMLStructuredDataLabelProvider.java 2008-10-20 10:10:26 UTC (rev 10974) @@ -0,0 +1,71 @@ +/******************************************************************************* + * Copyright (c) 2008 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 + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.smooks.xml.ui; + +import org.eclipse.jface.viewers.LabelProvider; +import org.eclipse.swt.graphics.Image; +import org.jboss.tools.smooks.ui.SmooksUIActivator; +import org.jboss.tools.smooks.xml.XMLImageConstants; +import org.jboss.tools.smooks.xml.model.AbstractXMLObject; +import org.jboss.tools.smooks.xml.model.DocumentObject; +import org.jboss.tools.smooks.xml.model.TagObject; +import org.jboss.tools.smooks.xml.model.TagPropertyObject; + +/** + * @author Dart Peng + * @Date Aug 18, 2008 + */ +public class XMLStructuredDataLabelProvider extends LabelProvider { + + public Image getXmlElementImage() { + return SmooksUIActivator.getDefault().getImageRegistry().get( + XMLImageConstants.IMAGE_XML_ELEMENT); + + } + + public Image getXmlAttributeImage() { + return SmooksUIActivator.getDefault().getImageRegistry().get( + XMLImageConstants.IMAGE_XML_ATTRIBUTE); + } + + /* + * (non-Javadoc) + * + * @see org.eclipse.jface.viewers.LabelProvider#getImage(java.lang.Object) + */ + @Override + public Image getImage(Object element) { + if (element instanceof TagObject) { + return getXmlElementImage(); + } + if (element instanceof TagPropertyObject) { + return getXmlAttributeImage(); + } + return super.getImage(element); + } + + /* + * (non-Javadoc) + * + * @see org.eclipse.jface.viewers.LabelProvider#getText(java.lang.Object) + */ + @Override + public String getText(Object element) { + if (element instanceof DocumentObject) { + return "Root"; + } + if (element instanceof AbstractXMLObject) { + return ((AbstractXMLObject) element).getName(); + } + return super.getText(element); + } + +} Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml/ui/XMLStructuredDataLabelProvider.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml/ui/XMLStructuredDataWizard.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml/ui/XMLStructuredDataWizard.java (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml/ui/XMLStructuredDataWizard.java 2008-10-20 10:10:26 UTC (rev 10974) @@ -0,0 +1,54 @@ +/******************************************************************************* + * Copyright (c) 2008 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 + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.smooks.xml.ui; + +import java.util.Properties; + +import org.jboss.tools.smooks.ui.SmooksUIActivator; +import org.jboss.tools.smooks.xml.AbstractFileSelectionWizardPage; +import org.jboss.tools.smooks.xml.AbstractStructuredDdataWizard; + +/** + * @author Dart Peng + * @Date Aug 18, 2008 + */ +public class XMLStructuredDataWizard extends AbstractStructuredDdataWizard { + + + Properties properties = new Properties(); + String filePath = null; + + public static final String XML_FILE = "xmlFile"; + + @Override + protected AbstractFileSelectionWizardPage createAbstractFileSelectionWizardPage() { + return new XMLStructuredDataWizardPage("XML"); + } + + public boolean performFinish() { + filePath = page.getFilePath(); + properties.put(XML_FILE, filePath); + return super.performFinish(); + } + + /* + * (non-Javadoc) + * + * @see org.jboss.tools.smooks.ui.IStrucutredDataCreationWizard#getInputDataTypeID() + */ + public String getInputDataTypeID() { + return SmooksUIActivator.TYPE_ID_XML; + } + + public Properties getProperties() { + return properties; + } +} Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml/ui/XMLStructuredDataWizard.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml/ui/XMLStructuredDataWizardPage.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml/ui/XMLStructuredDataWizardPage.java (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml/ui/XMLStructuredDataWizardPage.java 2008-10-20 10:10:26 UTC (rev 10974) @@ -0,0 +1,39 @@ +/** + * + */ +package org.jboss.tools.smooks.xml.ui; + +import org.jboss.tools.smooks.xml.AbstractFileSelectionWizardPage; +import org.jboss.tools.smooks.xml.model.DocumentObject; +import org.jboss.tools.smooks.xml.model.XMLObjectAnalyzer; + +/** + * @author Dart Peng Date : 2008-8-16 + */ +public class XMLStructuredDataWizardPage extends + AbstractFileSelectionWizardPage { + + + public XMLStructuredDataWizardPage(String pageName) { + super(pageName); + setPageText(); + } + + private void setPageText() { + this.setTitle("Select xml file"); + this.setDescription("Select a .xml file to be the source/target data"); + + } + + /* + * (non-Javadoc) + * + * @see org.jboss.tools.smooks.xml.ui.AbstractFileSelectionWizardPage#loadedTheObject(java.lang.String) + */ + @Override + protected Object loadedTheObject(String path) throws Exception { + XMLObjectAnalyzer analyzer = new XMLObjectAnalyzer(); + DocumentObject doc = analyzer.analyze(path); + return doc; + } +} Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml/ui/XMLStructuredDataWizardPage.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml2java/analyzer/XML2JavaAnalyzer.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml2java/analyzer/XML2JavaAnalyzer.java (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml2java/analyzer/XML2JavaAnalyzer.java 2008-10-20 10:10:26 UTC (rev 10974) @@ -0,0 +1,400 @@ +/******************************************************************************* + * Copyright (c) 2008 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 + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.smooks.xml2java.analyzer; + +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; + +import javax.swing.text.html.HTMLDocument.HTMLReader.TagAction; + +import org.eclipse.emf.ecore.xml.type.AnyType; +import org.jboss.tools.smooks.analyzer.AbstractAnalyzer; +import org.jboss.tools.smooks.analyzer.DesignTimeAnalyzeResult; +import org.jboss.tools.smooks.analyzer.MappingModel; +import org.jboss.tools.smooks.analyzer.MappingResourceConfigList; +import org.jboss.tools.smooks.analyzer.SmooksAnalyzerException; +import org.jboss.tools.smooks.javabean.analyzer.JavaBeanAnalyzer; +import org.jboss.tools.smooks.javabean.model.JavaBeanModel; +import org.jboss.tools.smooks.model.ParamType; +import org.jboss.tools.smooks.model.ResourceConfigType; +import org.jboss.tools.smooks.model.ResourceType; +import org.jboss.tools.smooks.model.SmooksFactory; +import org.jboss.tools.smooks.model.SmooksResourceListType; +import org.jboss.tools.smooks.model.util.SmooksModelConstants; +import org.jboss.tools.smooks.model.util.SmooksModelUtils; +import org.jboss.tools.smooks.ui.gef.model.AbstractStructuredDataModel; +import org.jboss.tools.smooks.ui.gef.model.GraphRootModel; +import org.jboss.tools.smooks.ui.gef.model.IConnectableModel; +import org.jboss.tools.smooks.ui.gef.model.LineConnectionModel; +import org.jboss.tools.smooks.ui.gef.model.SourceModel; +import org.jboss.tools.smooks.ui.gef.model.TreeItemRelationModel; +import org.jboss.tools.smooks.ui.modelparser.SmooksConfigurationFileGenerateContext; +import org.jboss.tools.smooks.utils.UIUtils; +import org.jboss.tools.smooks.xml.model.AbstractXMLObject; +import org.jboss.tools.smooks.xml.model.DocumentObject; +import org.jboss.tools.smooks.xml.model.TagObject; +import org.jboss.tools.smooks.xml.model.TagPropertyObject; + +/** + * @author Dart Peng + * @Date Aug 20, 2008 + */ +public class XML2JavaAnalyzer extends AbstractAnalyzer { + + /* + * (non-Javadoc) + * + * @see org.jboss.tools.smooks.analyzer.IAnalyzer#analyzeMappingGraphModel(org.jboss.tools.smooks.ui.modelparser.SmooksConfigurationFileGenerateContext) + */ + public void analyzeMappingGraphModel( + SmooksConfigurationFileGenerateContext context) + throws SmooksAnalyzerException { + + SmooksResourceListType listType = context.getSmooksResourceListModel(); + GraphRootModel rootModel = context.getGraphicalRootModel(); + List children = rootModel.getChildren(); + for (Iterator iterator = children.iterator(); iterator.hasNext();) { + TreeItemRelationModel dataModel = (TreeItemRelationModel) iterator + .next(); + if (dataModel.getClass() == SourceModel.class) { + List sourceConnections = dataModel.getModelSourceConnections(); + if (sourceConnections.isEmpty()) + continue; + processSourceConnections(sourceConnections, context, listType, + (SourceModel) dataModel); + } + } + } + + protected void processSourceConnections(List sourceConnections, + SmooksConfigurationFileGenerateContext context, + SmooksResourceListType listType, SourceModel sourceModel) { + for (Iterator iterator = sourceConnections.iterator(); iterator + .hasNext();) { + LineConnectionModel connection = (LineConnectionModel) iterator + .next(); + processLineConnection(connection, context, listType, sourceModel, + null); + } + } + + protected void processLineConnection(LineConnectionModel connection, + SmooksConfigurationFileGenerateContext context, + SmooksResourceListType listType, SourceModel sourceModel, + String beanID) { + if (this.connectionIsUsed(connection)) + return; + setConnectionUsed(connection); + IConnectableModel sourceg = connection.getSource(); + if (sourceg != sourceModel) + return; + IConnectableModel targetg = connection.getTarget(); + AbstractXMLObject source = (AbstractXMLObject) sourceModel + .getReferenceEntityModel(); + JavaBeanModel target = (JavaBeanModel) ((AbstractStructuredDataModel) targetg) + .getReferenceEntityModel(); + ResourceConfigType resourceConfigType = SmooksFactory.eINSTANCE + .createResourceConfigType(); + context.getGeneratorResourceList().add(resourceConfigType); + // addResourceConfigType(listType, resourceConfigType); + // set the selector string value + resourceConfigType.setSelector(source.getName()); + // create a resource and add it to resourceConfig + ResourceType resourceType = SmooksFactory.eINSTANCE + .createResourceType(); + resourceType.setValue(SmooksModelConstants.BEAN_POPULATOR); + resourceConfigType.setResource(resourceType); + + // create param for resourceConfig + if (beanID == null) { + beanID = getBeanID(target); + } else { + if (beanID.startsWith("${") && beanID.endsWith("}")) { + beanID = beanID.substring(2, beanID.length() - 1); + } + } + + addParamTypeToResourceConfig(resourceConfigType, + SmooksModelConstants.BEAN_ID, beanID); + + // add beanClass param + addParamTypeToResourceConfig(resourceConfigType, + SmooksModelConstants.BEAN_CLASS, target.getBeanClassString()); + + // add bindings param + ParamType bindingsParam = addParamTypeToResourceConfig( + resourceConfigType, SmooksModelConstants.BINDINGS, null); + processBindingsParam(bindingsParam, target, source, context, listType); + // + } + + protected void processBindingsParam(ParamType bindingsParam, + JavaBeanModel javaBean, AbstractXMLObject source, + SmooksConfigurationFileGenerateContext context, + SmooksResourceListType listType) { + List properties = javaBean.getProperties(); + for (Iterator iterator = properties.iterator(); iterator.hasNext();) { + boolean isComplex = true; + JavaBeanModel child = (JavaBeanModel) iterator.next(); + AbstractStructuredDataModel graphModel = UIUtils.findGraphModel( + context.getGraphicalRootModel(), child); + LineConnectionModel connection = UIUtils + .getFirstTargetModelViaConnection(graphModel); + if (connection == null) + continue; + AbstractStructuredDataModel sourceModel = (AbstractStructuredDataModel) connection + .getSource(); + + if (child.isPrimitive() || child.getProperties().isEmpty()) { + isComplex = false; + } + + String selector = getSelectorID(child); + if (!isComplex) { + selector = getSelectorIDViaXMLObject( + (AbstractXMLObject) sourceModel + .getReferenceEntityModel(), source); + } + SmooksModelUtils.addBindingTypeToParamType(bindingsParam, child + .getName(), selector, null, null); + if (isComplex) { + processLineConnection(connection, context, listType, + (SourceModel) sourceModel, selector); + } else { + setConnectionUsed(connection); + continue; + } + } + } + + protected String getSelectorIDViaXMLObject(AbstractXMLObject sourceModel, + AbstractXMLObject currentRoot) { + String name = sourceModel.getName(); + if (sourceModel instanceof TagPropertyObject) { + name = "@" + name; + } + AbstractXMLObject parent = sourceModel.getParent(); + while (parent != null && parent.getName() != null) { + name = parent.getName() + " " + name; + if (parent == currentRoot) + break; + parent = parent.getParent(); + } + return name; + } + + private String getSelectorID(JavaBeanModel javaBean) { + String selectorName = javaBean.getName(); + return "${" + selectorName + "}"; + } + + protected String getBeanID(JavaBeanModel target) { + return target.getName(); + } + + public MappingResourceConfigList analyzeMappingSmooksModel( + SmooksResourceListType listType, Object sourceObject, + Object targetObject) { + if(sourceObject instanceof DocumentObject){ + sourceObject = ((DocumentObject)sourceObject).getRootTag(); + } + if(targetObject instanceof List){ + targetObject = (JavaBeanModel) ((List)targetObject).get(0); + } + if (!(sourceObject instanceof AbstractXMLObject) + || !(targetObject instanceof JavaBeanModel)) { + return MappingResourceConfigList.createEmptyList(); + } + AbstractXMLObject sourceRoot = (AbstractXMLObject) sourceObject; + JavaBeanModel sourceTarget = (JavaBeanModel) targetObject; + + ResourceConfigType rootResourceConfig = findFirstMappingResourceConfig(listType); + String xmlName = rootResourceConfig.getSelector(); + AbstractXMLObject source = findXMLObjectByName(xmlName, sourceRoot); + if (source == null) + return MappingResourceConfigList.createEmptyList(); + + MappingResourceConfigList rcl = new MappingResourceConfigList(); + this.createMappingResourceConfigList(rcl, listType, rootResourceConfig, + source, sourceTarget); + return rcl; + } + + public static AbstractXMLObject findXMLObjectByName(String selector, + AbstractXMLObject root) { + if (selector == null) + return null; + if (selector.equals(root.getName())) { + return root; + } + if (root instanceof TagObject) { + List properties = ((TagObject) root).getProperties(); + for (Iterator iterator = properties.iterator(); iterator.hasNext();) { + TagPropertyObject pro = (TagPropertyObject) iterator.next(); + if (selector.equals(pro.getName())) + return pro; + } + List<AbstractXMLObject> tags = ((TagObject) root).getChildren(); + for (Iterator iterator = tags.iterator(); iterator.hasNext();) { + AbstractXMLObject tagChild = (AbstractXMLObject) iterator + .next(); + AbstractXMLObject result = findXMLObjectByName(selector, + tagChild); + if (result != null) + return result; + } + } + return null; + + } + + protected void createMappingResourceConfigList( + MappingResourceConfigList configList, SmooksResourceListType list, + ResourceConfigType config, AbstractXMLObject sourceRoot, + JavaBeanModel targetJavaBean) { + String selector = config.getSelector(); + String beanID = SmooksModelUtils.getParmaText( + SmooksModelConstants.BEAN_ID, config); + String beanClass = SmooksModelUtils.getParmaText( + SmooksModelConstants.BEAN_CLASS, config); + + MappingModel mapping = new MappingModel(sourceRoot, targetJavaBean); + configList.getMappingModelList().add(mapping); + configList.addResourceConfig(config); + this.setSelectorIsUsed(config.getSelector()); + + List<ParamType> paramList = config.getParam(); + ParamType bindingParam = null; + for (Iterator iterator = paramList.iterator(); iterator.hasNext();) { + ParamType paramType = (ParamType) iterator.next(); + String name = paramType.getName(); + if (SmooksModelConstants.BINDINGS.equals(name)) { + bindingParam = paramType; + break; + } + } + + if (bindingParam != null) { + List bindings = (List) bindingParam.getMixed().get( + SmooksModelUtils.ELEMENT_BINDING, true); + if (bindings != null) { + for (Iterator iterator = bindings.iterator(); iterator + .hasNext();) { + AnyType binding = (AnyType) iterator.next(); + String property = SmooksModelUtils + .getAttributeValueFromAnyType(binding, + SmooksModelUtils.ATTRIBUTE_PROPERTY); + String selectorStr = SmooksModelUtils + .getAttributeValueFromAnyType(binding, + SmooksModelUtils.ATTRIBUTE_SELECTOR); + JavaBeanModel childBean = JavaBeanAnalyzer + .findTheChildJavaBeanModel(property, targetJavaBean); + processXMLSelector(configList, config, sourceRoot, + childBean, list, selectorStr); + } + } + } + } + + protected void processXMLSelector(MappingResourceConfigList configList, + ResourceConfigType resourceConfig, AbstractXMLObject root, + JavaBeanModel targetBean, SmooksResourceListType listType, + String selector) { + if (isReferenceSelector(selector)) { + ResourceConfigType resourceConfig1 = this + .findResourceConfigTypeWithSelector(selector, listType); + String newSelector = resourceConfig1.getSelector(); + if (newSelector == null) + return; + AbstractXMLObject newRoot = findXMLObjectByName(newSelector, root); + createMappingResourceConfigList(configList, listType, + resourceConfig1, newRoot, targetBean); + } else { + AbstractXMLObject source = findXMLObjectWithSelectorString( + selector, root); + if (source != null) { + MappingModel mapping = new MappingModel(source, targetBean); + configList.getMappingModelList().add(mapping); + configList.addResourceConfig(resourceConfig); + this.setSelectorIsUsed(selector); + } + } + } + + public static AbstractXMLObject findXMLObjectWithSelectorString( + String selector, AbstractXMLObject parent) { + if (selector == null) + return null; + selector = selector.trim(); + String[] names = selector.split(" "); + if (names == null) + return null; + AbstractXMLObject current = parent; + for (int i = 0; i < names.length; i++) { + String name = names[i].trim(); + if (current instanceof TagObject && isXMLAttributeObject(name)) { + List properties = ((TagObject) current).getProperties(); + name = name.substring(1); + for (Iterator iterator = properties.iterator(); iterator + .hasNext();) { + TagPropertyObject property = (TagPropertyObject) iterator + .next(); + if (name.equals(property.getName())) { + current = property; + } + } + } else { + List list = parent.getChildren(); + for (Iterator iterator = list.iterator(); iterator.hasNext();) { + AbstractXMLObject child = (AbstractXMLObject) iterator + .next(); + if (name.equals(child.getName())) { + current = child; + break; + } + } + } + } + if (current == parent) + return null; + return current; + } + + public static boolean isXMLAttributeObject(String name) { + if (name != null && name.startsWith("@")) + return true; + return false; + } + + private ResourceConfigType findFirstMappingResourceConfig( + SmooksResourceListType listType) { + List list = listType.getAbstractResourceConfig(); + for (Iterator iterator = list.iterator(); iterator.hasNext();) { + ResourceConfigType resource = (ResourceConfigType) iterator.next(); + ResourceType rt = resource.getResource(); + if (rt == null) + continue; + String value = rt.getValue(); + if (SmooksModelConstants.BEAN_POPULATOR.equals(value)) { + return resource; + } + } + return null; + } + + public DesignTimeAnalyzeResult analyzeGraphModel( + SmooksConfigurationFileGenerateContext context) { + // TODO Auto-generated method stub + return null; + } + +} Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml2java/analyzer/XML2JavaAnalyzer.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml2java/analyzer/XMLSourceModelAnalyzer.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml2java/analyzer/XMLSourceModelAnalyzer.java (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml2java/analyzer/XMLSourceModelAnalyzer.java 2008-10-20 10:10:26 UTC (rev 10974) @@ -0,0 +1,72 @@ +/******************************************************************************* + * Copyright (c) 2008 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 + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.smooks.xml2java.analyzer; + +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.lang.reflect.InvocationTargetException; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; + +import org.dom4j.DocumentException; +import org.eclipse.core.resources.IFile; +import org.jboss.tools.smooks.analyzer.ISourceModelAnalyzer; +import org.jboss.tools.smooks.graphical.GraphInformations; +import org.jboss.tools.smooks.graphical.Param; +import org.jboss.tools.smooks.graphical.Params; +import org.jboss.tools.smooks.model.SmooksResourceListType; +import org.jboss.tools.smooks.xml.model.AbstractXMLObject; +import org.jboss.tools.smooks.xml.model.DocumentObject; +import org.jboss.tools.smooks.xml.model.XMLObjectAnalyzer; + +/** + * @author Dart Peng + * Date : Sep 23, 2008 + */ +public class XMLSourceModelAnalyzer implements ISourceModelAnalyzer { + + public static final String XML_FILE = "xmlFile"; + + public Object buildSourceInputObjects(GraphInformations graphInfo, + SmooksResourceListType listType, IFile sourceFile) + throws InvocationTargetException { + Params params = graphInfo.getParams(); + String path = null; + if (params != null) { + List<Param> paramList = graphInfo.getParams().getParam(); + for (Iterator<Param> iterator = paramList.iterator(); iterator + .hasNext();) { + Param param = (Param) iterator.next(); + if (param.getName().equals(XML_FILE)) { + path = param.getValue(); + break; + } + } + } + if (path == null) { + // TODO tell user the filepath can't find or not ? + return null; +// throw new InvocationTargetException(new Exception( +// "xml file path can't find in the graphInfo file")); + } + XMLObjectAnalyzer objectBuilder = new XMLObjectAnalyzer(); + try { + FileInputStream stream = new FileInputStream(path); + DocumentObject document = objectBuilder.analyze(stream); + return document; + } catch (FileNotFoundException e) { + throw new InvocationTargetException(e); + } catch (DocumentException e) { + throw new InvocationTargetException(e); + } + } +} Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml2java/analyzer/XMLSourceModelAnalyzer.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml2xml/XML2XMLAnalyzer.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml2xml/XML2XMLAnalyzer.java (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml2xml/XML2XMLAnalyzer.java 2008-10-20 10:10:26 UTC (rev 10974) @@ -0,0 +1,55 @@ +/** + * + */ +package org.jboss.tools.smooks.xml2xml; + +import org.eclipse.jface.dialogs.MessageDialog; +import org.eclipse.swt.widgets.Shell; +import org.jboss.tools.smooks.analyzer.AbstractAnalyzer; +import org.jboss.tools.smooks.analyzer.DesignTimeAnalyzeResult; +import org.jboss.tools.smooks.analyzer.MappingResourceConfigList; +import org.jboss.tools.smooks.analyzer.SmooksAnalyzerException; +import org.jboss.tools.smooks.model.SmooksResourceListType; +import org.jboss.tools.smooks.ui.modelparser.SmooksConfigurationFileGenerateContext; + +/** + * @author dart + * + */ +public class XML2XMLAnalyzer extends AbstractAnalyzer { + + /* + * (non-Javadoc) + * + * @see org.jboss.tools.smooks.analyzer.IMappingAnalyzer#analyzeMappingGraphModel(org.jboss.tools.smooks.ui.modelparser.SmooksConfigurationFileGenerateContext) + */ + public void analyzeMappingGraphModel( + SmooksConfigurationFileGenerateContext context) + throws SmooksAnalyzerException { + if (true) { + Shell shell = context.getShell(); + MessageDialog.openWarning(shell, "Warning", + "The xml2xml can't be generate to config file currently."); + return; + } + } + + /* + * (non-Javadoc) + * + * @see org.jboss.tools.smooks.analyzer.IMappingAnalyzer#analyzeMappingSmooksModel(org.jboss.tools.smooks.model.SmooksResourceListType, + * java.lang.Object, java.lang.Object) + */ + public MappingResourceConfigList analyzeMappingSmooksModel( + SmooksResourceListType listType, Object sourceObject, + Object targetObject) { + return null; + } + + public DesignTimeAnalyzeResult analyzeGraphModel( + SmooksConfigurationFileGenerateContext context) { + // TODO Auto-generated method stub + return null; + } + +} Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml2xml/XML2XMLAnalyzer.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xsd/model/XSDStructuredModelContentProvider.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xsd/model/XSDStructuredModelContentProvider.java (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xsd/model/XSDStructuredModelContentProvider.java 2008-10-20 10:10:26 UTC (rev 10974) @@ -0,0 +1,26 @@ +/******************************************************************************* + * Copyright (c) 2007 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 + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.smooks.xsd.model; + +import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider; +import org.eclipse.xsd.provider.XSDItemProviderAdapterFactory; + + +/** + * @author Dart Peng + * + * @CreateTime Jul 24, 2008 + */ +public class XSDStructuredModelContentProvider extends AdapterFactoryContentProvider { + public XSDStructuredModelContentProvider() { + super(new XSDItemProviderAdapterFactory()); + } +} Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xsd/model/XSDStructuredModelContentProvider.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xsd/model/XSDStructuredModelLabelProvider.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xsd/model/XSDStructuredModelLabelProvider.java (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xsd/model/XSDStructuredModelLabelProvider.java 2008-10-20 10:10:26 UTC (rev 10974) @@ -0,0 +1,26 @@ +/******************************************************************************* + * Copyright (c) 2008 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 + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.smooks.xsd.model; + +import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider; +import org.eclipse.xsd.provider.XSDItemProviderAdapterFactory; + +/** + * @author Dart Peng + * @Date Jul 30, 2008 + */ +public class XSDStructuredModelLabelProvider extends AdapterFactoryLabelProvider { + + public XSDStructuredModelLabelProvider() { + super(new XSDItemProviderAdapterFactory()); + } + +} Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xsd/model/XSDStructuredModelLabelProvider.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xsd/ui/XSDStructuredDataWizard.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xsd/ui/XSDStructuredDataWizard.java (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xsd/ui/XSDStructuredDataWizard.java 2008-10-20 10:10:26 UTC (rev 10974) @@ -0,0 +1,44 @@ +/******************************************************************************* + * Copyright (c) 2008 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 + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.smooks.xsd.ui; + +import java.util.Properties; + +import org.eclipse.jface.wizard.IWizardNode; +import org.jboss.tools.smooks.ui.SmooksUIActivator; +import org.jboss.tools.smooks.xml.AbstractFileSelectionWizardPage; +import org.jboss.tools.smooks.xml.AbstractStructuredDdataWizard; + +/** + * @author Dart Peng + * @Date Aug 18, 2008 + */ +public class XSDStructuredDataWizard extends AbstractStructuredDdataWizard { + IWizardNode wizard; + Properties properties = new Properties(); + /* (non-Javadoc) + * @see org.jboss.tools.smooks.xml.AbstractStructuredDdataWizard#createAbstractFileSelectionWizardPage() + */ + @Override + protected AbstractFileSelectionWizardPage createAbstractFileSelectionWizardPage() { + return new XSDStructuredDataWizardPage("XSD"); + } + + /* (non-Javadoc) + * @see org.jboss.tools.smooks.ui.IStrucutredDataCreationWizard#getInputDataTypeID() + */ + public String getInputDataTypeID() { + return SmooksUIActivator.TYPE_ID_XSD; + } + public Properties getProperties() { + return this.properties; + } +} Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xsd/ui/XSDStructuredDataWizard.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xsd/ui/XSDStructuredDataWizardPage.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xsd/ui/XSDStructuredDataWizardPage.java (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xsd/ui/XSDStructuredDataWizardPage.java 2008-10-20 10:10:26 UTC (rev 10974) @@ -0,0 +1,40 @@ +/** + * + */ +package org.jboss.tools.smooks.xsd.ui; + +import java.util.Collections; + +import org.eclipse.emf.common.util.URI; +import org.eclipse.emf.ecore.resource.Resource; +import org.eclipse.jface.resource.ImageDescriptor; +import org.eclipse.xsd.XSDSchema; +import org.eclipse.xsd.util.XSDResourceFactoryImpl; +import org.jboss.tools.smooks.xml.AbstractFileSelectionWizardPage; + +/** + * @author Dart Peng + * Date : 2008-8-16 + */ +public class XSDStructuredDataWizardPage extends + AbstractFileSelectionWizardPage { + +// public XSDStructuredDataWizardPage(String pageName, String title, +// ImageDescriptor titleImage) { +// super(pageName, title, titleImage); +// // TODO Auto-generated constructor stub +// } + + public XSDStructuredDataWizardPage(String pageName) { + super(pageName); + this.setTitle("XSD File Selection"); + this.setMessage("Select a *.xsd file to loaded "); + } + protected Object loadedTheObject(String path) throws Exception { + Resource resource = new XSDResourceFactoryImpl().createResource(URI + .createFileURI(path)); + resource.load(Collections.EMPTY_MAP); + XSDSchema schema = (XSDSchema) resource.getContents().get(0); + return schema; + } +} Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xsd/ui/XSDStructuredDataWizardPage.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/smooks/tests/org.jboss.tools.smooks.test/META-INF/MANIFEST.MF =================================================================== --- trunk/smooks/tests/org.jboss.tools.smooks.test/META-INF/MANIFEST.MF 2008-10-20 10:08:30 UTC (rev 10973) +++ trunk/smooks/tests/org.jboss.tools.smooks.test/META-INF/MANIFEST.MF 2008-10-20 10:10:26 UTC (rev 10974) @@ -4,20 +4,17 @@ Bundle-SymbolicName: org.jboss.tools.smooks.test Bundle-Version: 1.0.0 Bundle-Activator: org.jboss.tools.smooks.test.Activator -Require-Bundle: org.eclipse.ui, +Require-Bundle: org.junit, + org.eclipse.ui, org.eclipse.core.runtime, - org.jboss.tools.smooks.javabean, - org.jboss.tools.smooks.model, - org.jboss.tools.smooks.model.edit, - org.jboss.tools.smooks.ui, - org.jboss.tools.smooks.xml, - org.junit, org.eclipse.core.resources, org.eclipse.xsd, org.eclipse.xsd.edit, org.eclipse.emf, org.eclipse.emf.ecore.edit, - org.eclipse.emf.edit.ui + org.eclipse.emf.edit.ui, + org.jboss.tools.smooks.ui, + org.jboss.tools.smooks.core Eclipse-LazyStart: true Bundle-ClassPath: lib/dom4j-1.6.1.jar, .

17 years, 2 months

1
0
0 / 0

JBoss Tools SVN: r10972 - trunk/smooks/plugins.

by jbosstools-commits＠lists.jboss.org

Author: DartPeng Date: 2008-10-20 06:07:40 -0400 (Mon, 20 Oct 2008) New Revision: 10972 Added: trunk/smooks/plugins/org.jboss.tools.smooks.core/ Log: Share project "org.jboss.tools.smooks.core" into "https://svn.jboss.org/repos/jbosstools/trunk/smooks/plugins"

17 years, 2 months

1
0
0 / 0

JBoss Tools SVN: r10971 - branches/jbosstools-3.0.0.Beta1/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/wizard.

by jbosstools-commits＠lists.jboss.org

Author: dgeraskov Date: 2008-10-20 06:06:06 -0400 (Mon, 20 Oct 2008) New Revision: 10971 Modified: branches/jbosstools-3.0.0.Beta1/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/wizard/GenerateInitWizardPage.java Log: http://jira.jboss.com/jira/browse/JBIDE-2345 http://jira.jboss.com/jira/browse/JBIDE-2344 Modified: branches/jbosstools-3.0.0.Beta1/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/wizard/GenerateInitWizardPage.java =================================================================== --- branches/jbosstools-3.0.0.Beta1/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/wizard/GenerateInitWizardPage.java 2008-10-20 10:05:24 UTC (rev 10970) +++ branches/jbosstools-3.0.0.Beta1/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/wizard/GenerateInitWizardPage.java 2008-10-20 10:06:06 UTC (rev 10971) @@ -101,7 +101,7 @@ selectMethod = new Button(container, SWT.CHECK); selectMethod.setText("Use Console Configuration"); selectMethod.setSelection(true); - selectMethod.setEnabled(false); + //selectMethod.setEnabled(false); selectMethod.addSelectionListener(new SelectionListener(){ public void widgetDefaultSelected(SelectionEvent e) { @@ -112,6 +112,9 @@ consoleConfigurationName.setEnabled(selectMethod.getSelection()); connectionProfileName.setEnabled(!selectMethod.getSelection()); schemaName.setEnabled(!selectMethod.getSelection()); + if (!selectMethod.getSelection()){ + setMessage("Hibernate dialect is not specified", WARNING); + } dialogChanged(); }}); GridData gd = new GridData(GridData.FILL_HORIZONTAL);

17 years, 2 months

1
0
0 / 0

JBoss Tools SVN: r10970 - trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/wizard.

by jbosstools-commits＠lists.jboss.org

Author: dgeraskov Date: 2008-10-20 06:05:24 -0400 (Mon, 20 Oct 2008) New Revision: 10970 Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/wizard/GenerateInitWizardPage.java Log: http://jira.jboss.com/jira/browse/JBIDE-2345 http://jira.jboss.com/jira/browse/JBIDE-2344 Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/wizard/GenerateInitWizardPage.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/wizard/GenerateInitWizardPage.java 2008-10-20 09:58:30 UTC (rev 10969) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/wizard/GenerateInitWizardPage.java 2008-10-20 10:05:24 UTC (rev 10970) @@ -101,7 +101,7 @@ selectMethod = new Button(container, SWT.CHECK); selectMethod.setText("Use Console Configuration"); selectMethod.setSelection(true); - selectMethod.setEnabled(false); + //selectMethod.setEnabled(false); selectMethod.addSelectionListener(new SelectionListener(){ public void widgetDefaultSelected(SelectionEvent e) { @@ -112,6 +112,9 @@ consoleConfigurationName.setEnabled(selectMethod.getSelection()); connectionProfileName.setEnabled(!selectMethod.getSelection()); schemaName.setEnabled(!selectMethod.getSelection()); + if (!selectMethod.getSelection()){ + setMessage("Hibernate dialect is not specified", WARNING); + } dialogChanged(); }}); GridData gd = new GridData(GridData.FILL_HORIZONTAL);

17 years, 2 months

1
0
0 / 0

JBoss Tools SVN: r10968 - branches/jbosstools-3.0.0.Beta1/smooks/plugins.

by jbosstools-commits＠lists.jboss.org

Author: DartPeng Date: 2008-10-20 05:57:38 -0400 (Mon, 20 Oct 2008) New Revision: 10968 Added: branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.core/ Log: Share project "org.jboss.tools.smooks.core" into "https://svn.jboss.org/repos/jbosstools/branches/jbosstools-3.0.0.Beta1/sm..." In the fact , the plugin comes from org.jboss.tools.smooks.model

17 years, 2 months

1
0
0 / 0

JBoss Tools SVN: r10967 - branches/jbosstools-3.0.0.Beta1/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch.

by jbosstools-commits＠lists.jboss.org

Author: dgeraskov Date: 2008-10-20 05:44:15 -0400 (Mon, 20 Oct 2008) New Revision: 10967 Modified: branches/jbosstools-3.0.0.Beta1/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/CodeGenerationLaunchDelegate.java branches/jbosstools-3.0.0.Beta1/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/ExporterAttributes.java Log: http://jira.jboss.com/jira/browse/JBIDE-1178 Reveng filter storage moved from launch configuration to xml file. File stored in .settings dir of the project. Modified: branches/jbosstools-3.0.0.Beta1/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/CodeGenerationLaunchDelegate.java =================================================================== --- branches/jbosstools-3.0.0.Beta1/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/CodeGenerationLaunchDelegate.java 2008-10-20 09:44:10 UTC (rev 10966) +++ branches/jbosstools-3.0.0.Beta1/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/CodeGenerationLaunchDelegate.java 2008-10-20 09:44:15 UTC (rev 10967) @@ -266,7 +266,6 @@ final String reverseEngineeringStrategy = attributes.getRevengStrategy(); final boolean preferBasicCompositeids = attributes.isPreferBasicCompositeIds(); final IResource revengres = PathHelper.findMember( root, attributes.getRevengSettings()); - final String revengTables = attributes.getRevengTables(); if(reveng) { Configuration configuration = null; @@ -291,12 +290,7 @@ OverrideRepository repository = null; - if (revengTables != null){ - repository = new OverrideRepository(); - repository.addInputStream(new ByteArrayInputStream(revengTables.getBytes())); - } else if(revengres!=null) { - /*Configuration configuration = cc.buildWith(new Configuration(), false);*/ - /*Settings settings = cc.getSettings(configuration);*/ + if(revengres!=null) { File file = PathHelper.getLocation( revengres ).toFile(); repository = new OverrideRepository(); repository.addFile(file); Modified: branches/jbosstools-3.0.0.Beta1/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/ExporterAttributes.java =================================================================== --- branches/jbosstools-3.0.0.Beta1/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/ExporterAttributes.java 2008-10-20 09:44:10 UTC (rev 10966) +++ branches/jbosstools-3.0.0.Beta1/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/ExporterAttributes.java 2008-10-20 09:44:15 UTC (rev 10967) @@ -74,7 +74,6 @@ private String templatePath; private List exporterFactories; // if set then build reveng strategy relying on the list of tables - private String revengTables; private boolean autoManyToManyDetection; private boolean autoVersioning; @@ -110,7 +109,6 @@ } exporterFactories = readExporterFactories(configuration); - revengTables = configuration.getAttribute(HibernateLaunchConstants.ATTR_REVENG_TABLES, (String)null); } catch (CoreException e) { throw new CoreException(HibernateConsolePlugin.throwableToStatus(e, 666)); } @@ -347,19 +345,12 @@ return exporterFactories; } -public boolean detectManyToMany() { - return autoManyToManyDetection; -} + public boolean detectManyToMany() { + return autoManyToManyDetection; + } public boolean detectOptimisticLock() { return autoVersioning; } - public String getRevengTables() { - return revengTables; - } - - - - }

17 years, 2 months

1
0
0 / 0

JBoss Tools SVN: r10966 - branches/jbosstools-3.0.0.Beta1/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard.

by jbosstools-commits＠lists.jboss.org

Author: dgeraskov Date: 2008-10-20 05:44:10 -0400 (Mon, 20 Oct 2008) New Revision: 10966 Modified: branches/jbosstools-3.0.0.Beta1/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamGenerateEnitiesWizard.java Log: http://jira.jboss.com/jira/browse/JBIDE-1178 Reveng filter storage moved from launch configuration to xml file. File stored in .settings dir of the project. Modified: branches/jbosstools-3.0.0.Beta1/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamGenerateEnitiesWizard.java =================================================================== --- branches/jbosstools-3.0.0.Beta1/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamGenerateEnitiesWizard.java 2008-10-20 09:40:54 UTC (rev 10965) +++ branches/jbosstools-3.0.0.Beta1/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamGenerateEnitiesWizard.java 2008-10-20 09:44:10 UTC (rev 10966) @@ -10,6 +10,7 @@ ******************************************************************************/ package org.jboss.tools.seam.ui.wizard; +import java.io.File; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -21,6 +22,7 @@ import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IAdaptable; +import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; @@ -317,7 +319,11 @@ wc.doSave(); if (params.containsKey(HibernateLaunchConstants.ATTR_REVENG_TABLES)){ - wc.setAttribute(HibernateLaunchConstants.ATTR_REVENG_TABLES, params.get(HibernateLaunchConstants.ATTR_REVENG_TABLES)); + //create reveng.xml file + IPath revengPath = project.getLocation().append(".settings").append("gen-entities.hibernate.reveng.xml"); //$NON-NLS-1$ //$NON-NLS-2$ + File location = revengPath.toFile(); + org.jboss.tools.common.util.FileUtil.writeFile(location, params.get(HibernateLaunchConstants.ATTR_REVENG_TABLES)); + wc.setAttribute(HibernateLaunchConstants.ATTR_REVERSE_ENGINEER_SETTINGS, revengPath.toString()); } launchManager.addLaunch(wc.launch(ILaunchManager.RUN_MODE, monitor));

17 years, 2 months

1
0
0 / 0

JBoss Tools SVN: r10965 - branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.model.edit.

by jbosstools-commits＠lists.jboss.org

Author: DartPeng Date: 2008-10-20 05:40:54 -0400 (Mon, 20 Oct 2008) New Revision: 10965 Removed: branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.model.edit/icons/ Log: JBIDE-2835 Change the structure of the smooks tools again , only keep two main plugins. If there will be some new feature plugins , they will be named "ui.ext" ?(maybe not)

17 years, 2 months

1
0
0 / 0

JBoss Tools SVN: r10963 - trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla.

by jbosstools-commits＠lists.jboss.org

Author: sdzmitrovich Date: 2008-10-20 05:06:55 -0400 (Mon, 20 Oct 2008) New Revision: 10963 Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaEditor.java Log: repaired dump source Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaEditor.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaEditor.java 2008-10-20 08:30:04 UTC (rev 10962) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaEditor.java 2008-10-20 09:06:55 UTC (rev 10963) @@ -729,6 +729,7 @@ addSelectionListener(); xulRunnerEditor.addResizerListener(); controller.reinit(); + setDomDocument(xulRunnerEditor.getDOMDocument()); }

17 years, 2 months

1
0
0 / 0

JBoss Tools SVN: r10962 - trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard.

by jbosstools-commits＠lists.jboss.org

Author: dgeraskov Date: 2008-10-20 04:30:04 -0400 (Mon, 20 Oct 2008) New Revision: 10962 Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamGenerateEnitiesWizard.java Log: http://jira.jboss.com/jira/browse/JBIDE-1178 Reveng filter storage moved from launch configuration to xml file. File stored in .settings dir of the project. Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamGenerateEnitiesWizard.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamGenerateEnitiesWizard.java 2008-10-20 08:29:59 UTC (rev 10961) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamGenerateEnitiesWizard.java 2008-10-20 08:30:04 UTC (rev 10962) @@ -10,6 +10,7 @@ ******************************************************************************/ package org.jboss.tools.seam.ui.wizard; +import java.io.File; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -21,6 +22,7 @@ import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IAdaptable; +import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; @@ -317,7 +319,11 @@ wc.doSave(); if (params.containsKey(HibernateLaunchConstants.ATTR_REVENG_TABLES)){ - wc.setAttribute(HibernateLaunchConstants.ATTR_REVENG_TABLES, params.get(HibernateLaunchConstants.ATTR_REVENG_TABLES)); + //create reveng.xml file + IPath revengPath = project.getLocation().append(".settings").append("gen-entities.hibernate.reveng.xml"); //$NON-NLS-1$ //$NON-NLS-2$ + File location = revengPath.toFile(); + org.jboss.tools.common.util.FileUtil.writeFile(location, params.get(HibernateLaunchConstants.ATTR_REVENG_TABLES)); + wc.setAttribute(HibernateLaunchConstants.ATTR_REVERSE_ENGINEER_SETTINGS, revengPath.toString()); } launchManager.addLaunch(wc.launch(ILaunchManager.RUN_MODE, monitor));

17 years, 2 months

1
0
0 / 0

JBoss Tools SVN: r10961 - trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch.

by jbosstools-commits＠lists.jboss.org

Author: dgeraskov Date: 2008-10-20 04:29:59 -0400 (Mon, 20 Oct 2008) New Revision: 10961 Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/CodeGenerationLaunchDelegate.java trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/ExporterAttributes.java Log: http://jira.jboss.com/jira/browse/JBIDE-1178 Reveng filter storage moved from launch configuration to xml file. File stored in .settings dir of the project. Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/CodeGenerationLaunchDelegate.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/CodeGenerationLaunchDelegate.java 2008-10-20 08:23:31 UTC (rev 10960) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/CodeGenerationLaunchDelegate.java 2008-10-20 08:29:59 UTC (rev 10961) @@ -266,7 +266,6 @@ final String reverseEngineeringStrategy = attributes.getRevengStrategy(); final boolean preferBasicCompositeids = attributes.isPreferBasicCompositeIds(); final IResource revengres = PathHelper.findMember( root, attributes.getRevengSettings()); - final String revengTables = attributes.getRevengTables(); if(reveng) { Configuration configuration = null; @@ -291,12 +290,7 @@ OverrideRepository repository = null; - if (revengTables != null){ - repository = new OverrideRepository(); - repository.addInputStream(new ByteArrayInputStream(revengTables.getBytes())); - } else if(revengres!=null) { - /*Configuration configuration = cc.buildWith(new Configuration(), false);*/ - /*Settings settings = cc.getSettings(configuration);*/ + if(revengres!=null) { File file = PathHelper.getLocation( revengres ).toFile(); repository = new OverrideRepository(); repository.addFile(file); Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/ExporterAttributes.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/ExporterAttributes.java 2008-10-20 08:23:31 UTC (rev 10960) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/ExporterAttributes.java 2008-10-20 08:29:59 UTC (rev 10961) @@ -74,7 +74,6 @@ private String templatePath; private List exporterFactories; // if set then build reveng strategy relying on the list of tables - private String revengTables; private boolean autoManyToManyDetection; private boolean autoVersioning; @@ -110,7 +109,6 @@ } exporterFactories = readExporterFactories(configuration); - revengTables = configuration.getAttribute(HibernateLaunchConstants.ATTR_REVENG_TABLES, (String)null); } catch (CoreException e) { throw new CoreException(HibernateConsolePlugin.throwableToStatus(e, 666)); } @@ -347,19 +345,12 @@ return exporterFactories; } -public boolean detectManyToMany() { - return autoManyToManyDetection; -} + public boolean detectManyToMany() { + return autoManyToManyDetection; + } public boolean detectOptimisticLock() { return autoVersioning; } - public String getRevengTables() { - return revengTables; - } - - - - }

17 years, 2 months

1
0
0 / 0

JBoss Tools SVN: r10960 - branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.javabean/src/org/jboss/tools/smooks/xml2java/analyzer.

by jbosstools-commits＠lists.jboss.org

Author: DartPeng Date: 2008-10-20 04:23:31 -0400 (Mon, 20 Oct 2008) New Revision: 10960 Modified: branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.javabean/src/org/jboss/tools/smooks/xml2java/analyzer/XML2JavaAnalyzer.java Log: JBIDE-2935 When the analyzer to parse the model , it can't understand the input data type. Now I modify some codes to make it can know the input data type to parse that, Modified: branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.javabean/src/org/jboss/tools/smooks/xml2java/analyzer/XML2JavaAnalyzer.java =================================================================== --- branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.javabean/src/org/jboss/tools/smooks/xml2java/analyzer/XML2JavaAnalyzer.java 2008-10-20 08:16:32 UTC (rev 10959) +++ branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.javabean/src/org/jboss/tools/smooks/xml2java/analyzer/XML2JavaAnalyzer.java 2008-10-20 08:23:31 UTC (rev 10960) @@ -40,6 +40,7 @@ import org.jboss.tools.smooks.ui.modelparser.SmooksConfigurationFileGenerateContext; import org.jboss.tools.smooks.utils.UIUtils; import org.jboss.tools.smooks.xml.model.AbstractXMLObject; +import org.jboss.tools.smooks.xml.model.DocumentObject; import org.jboss.tools.smooks.xml.model.TagObject; import org.jboss.tools.smooks.xml.model.TagPropertyObject; @@ -203,6 +204,9 @@ public MappingResourceConfigList analyzeMappingSmooksModel( SmooksResourceListType listType, Object sourceObject, Object targetObject) { + if(sourceObject instanceof DocumentObject){ + sourceObject = ((DocumentObject)sourceObject).getRootTag(); + } if(targetObject instanceof List){ targetObject = (JavaBeanModel) ((List)targetObject).get(0); }

17 years, 2 months

1
0
0 / 0

JBoss Tools SVN: r10959 - trunk/smooks/plugins.

by jbosstools-commits＠lists.jboss.org

Author: DartPeng Date: 2008-10-20 04:16:32 -0400 (Mon, 20 Oct 2008) New Revision: 10959 Removed: trunk/smooks/plugins/org.jboss.tools.smooks.graphicalInfo/ trunk/smooks/plugins/org.jboss.tools.smooks.java2xml/ trunk/smooks/plugins/org.jboss.tools.smooks.xml2java/ Log: JBIDE-2935 those plugins should be deleted , because they are merged into other plugins.

17 years, 2 months

1
0
0 / 0

JBoss Tools SVN: r10958 - branches/jbosstools-3.0.0.Beta1/smooks/plugins.

by jbosstools-commits＠lists.jboss.org

Author: DartPeng Date: 2008-10-20 04:11:49 -0400 (Mon, 20 Oct 2008) New Revision: 10958 Removed: branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.graphicalInfo/ branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.java2xml/ branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.xml2java/ Log: JBIDE-2835 Those plugins have been merged into other plugins , so they are unusable now and they should be deleted.

17 years, 2 months

1
0
0 / 0

JBoss Tools SVN: r10957 - in trunk/smooks: plugins/org.jboss.tools.smooks.javabean and 17 other directories.

by jbosstools-commits＠lists.jboss.org

Author: DartPeng Date: 2008-10-20 04:08:29 -0400 (Mon, 20 Oct 2008) New Revision: 10957 Added: trunk/smooks/plugins/org.jboss.tools.smooks.javabean/libs/dom4j-1.6.1.jar trunk/smooks/plugins/org.jboss.tools.smooks.javabean/src/org/jboss/tools/smooks/java2xml/ trunk/smooks/plugins/org.jboss.tools.smooks.javabean/src/org/jboss/tools/smooks/java2xml/analyzer/ trunk/smooks/plugins/org.jboss.tools.smooks.javabean/src/org/jboss/tools/smooks/java2xml/analyzer/DOM2FreeMarkerTransformor.java trunk/smooks/plugins/org.jboss.tools.smooks.javabean/src/org/jboss/tools/smooks/java2xml/analyzer/FreeMarkerContentReplacer.java trunk/smooks/plugins/org.jboss.tools.smooks.javabean/src/org/jboss/tools/smooks/java2xml/analyzer/Java2XMLAnalyzer.java trunk/smooks/plugins/org.jboss.tools.smooks.javabean/src/org/jboss/tools/smooks/java2xml/utils/ trunk/smooks/plugins/org.jboss.tools.smooks.javabean/src/org/jboss/tools/smooks/java2xml/utils/XMLConstants.java trunk/smooks/plugins/org.jboss.tools.smooks.javabean/src/org/jboss/tools/smooks/xml2java/ trunk/smooks/plugins/org.jboss.tools.smooks.javabean/src/org/jboss/tools/smooks/xml2java/analyzer/ trunk/smooks/plugins/org.jboss.tools.smooks.javabean/src/org/jboss/tools/smooks/xml2java/analyzer/XML2JavaAnalyzer.java trunk/smooks/plugins/org.jboss.tools.smooks.javabean/src/org/jboss/tools/smooks/xml2java/analyzer/XMLSourceModelAnalyzer.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/GraphInformations.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/GraphicalFactory.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/GraphicalPackage.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/MappingDataType.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/Param.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/Params.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/impl/ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/impl/GraphInformationsImpl.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/impl/GraphicalFactoryImpl.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/impl/GraphicalPackageImpl.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/impl/MappingDataTypeImpl.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/impl/ParamImpl.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/impl/ParamsImpl.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/util/GraphicalAdapterFactory.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/util/GraphicalSwitch.java Modified: trunk/smooks/features/org.jboss.tools.smooks.feature/feature.xml trunk/smooks/plugins/org.jboss.tools.smooks.javabean/.classpath trunk/smooks/plugins/org.jboss.tools.smooks.javabean/META-INF/MANIFEST.MF trunk/smooks/plugins/org.jboss.tools.smooks.javabean/build.properties trunk/smooks/plugins/org.jboss.tools.smooks.javabean/plugin.xml trunk/smooks/plugins/org.jboss.tools.smooks.javabean/src/org/jboss/tools/smooks/javabean/analyzer/JavaBeanAnalyzer.java trunk/smooks/plugins/org.jboss.tools.smooks.javabean/src/org/jboss/tools/smooks/javabean/model/JavaBeanModel.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/META-INF/MANIFEST.MF trunk/smooks/plugins/org.jboss.tools.smooks.ui/plugin.xml trunk/smooks/tests/org.jboss.tools.smooks.test/META-INF/MANIFEST.MF trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/java2java/SmooksAnalyzerTester.java Log: JBIDE-2835 For resolve the beta1 bug JBIDE-2835 , and merge the alterations to the trunk 1.org.jboss.tools.smooks.graphicalInfo merge into the org.jboss.tools.smooks.ui 2.org.jboss.tools.smooks.xml2java merge into the org.jboss.tools.smooks.javabean 3.org.jboss.tools.smooks.java2xml merge into the org.jboss,tools.smooks.javabean Now there are 5 plugins for smooks tools : javabean xml ui model model.edit Modified: trunk/smooks/features/org.jboss.tools.smooks.feature/feature.xml =================================================================== --- trunk/smooks/features/org.jboss.tools.smooks.feature/feature.xml 2008-10-20 07:59:03 UTC (rev 10956) +++ trunk/smooks/features/org.jboss.tools.smooks.feature/feature.xml 2008-10-20 08:08:29 UTC (rev 10957) @@ -1,25 +1,25 @@ -<?xml version="1.0" encoding="UTF-8"?> -<feature - id="org.jboss.tools.smooks.feature" - label="Smooks Tools" - version="1.0.0" - provider-name="JBoss, a division of Red Hat"> - - <description url="http://www.example.com/description"> - Smooks Tools - </description> - - <copyright url="http://www.example.com/copyright"> +<?xml version="1.0" encoding="UTF-8"?> +<feature + id="org.jboss.tools.smooks.feature" + label="Smooks Tools" + version="1.0.0" + provider-name="JBoss, a division of Red Hat"> + + <description url="http://www.example.com/description"> + Smooks Tools + </description> + + <copyright url="http://www.example.com/copyright"> Copyright (c) 2008 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 Contributors: -Red Hat, Inc. - initial API and implementation - </copyright> - - <license url="http://www.example.com/license"> +Red Hat, Inc. - initial API and implementation + </copyright> + + <license url="http://www.example.com/license"> Eclipse Public License - v 1.0 THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR @@ -215,63 +215,42 @@ No party to this Agreement will bring a legal action under this Agreement more than one year after the cause of action arose. Each party waives its rights to a jury trial in any resulting -litigation. - </license> - - <plugin - id="org.jboss.tools.smooks.graphicalInfo" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.jboss.tools.smooks.javabean" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.jboss.tools.smooks.model" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.jboss.tools.smooks.model.edit" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.jboss.tools.smooks.ui" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.jboss.tools.smooks.xml" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.jboss.tools.smooks.xml2java" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.jboss.tools.smooks.java2xml" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - -</feature> +litigation. + </license> + + <plugin + id="org.jboss.tools.smooks.javabean" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.jboss.tools.smooks.model" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.jboss.tools.smooks.model.edit" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.jboss.tools.smooks.ui" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.jboss.tools.smooks.xml" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + +</feature> Modified: trunk/smooks/plugins/org.jboss.tools.smooks.javabean/.classpath =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.javabean/.classpath 2008-10-20 07:59:03 UTC (rev 10956) +++ trunk/smooks/plugins/org.jboss.tools.smooks.javabean/.classpath 2008-10-20 08:08:29 UTC (rev 10957) @@ -3,5 +3,6 @@ <classpathentry kind="src" path="src"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> + <classpathentry kind="lib" path="libs/dom4j-1.6.1.jar"/> <classpathentry kind="output" path="bin"/> </classpath> Modified: trunk/smooks/plugins/org.jboss.tools.smooks.javabean/META-INF/MANIFEST.MF =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.javabean/META-INF/MANIFEST.MF 2008-10-20 07:59:03 UTC (rev 10956) +++ trunk/smooks/plugins/org.jboss.tools.smooks.javabean/META-INF/MANIFEST.MF 2008-10-20 08:08:29 UTC (rev 10957) @@ -17,11 +17,16 @@ org.jboss.tools.smooks.model, org.jboss.tools.smooks.model.edit, org.eclipse.ui.ide, - org.jboss.tools.smooks.graphicalInfo + org.jboss.tools.smooks.xml;bundle-version="1.0.0" Eclipse-LazyStart: true -Export-Package: org.jboss.tools.smooks.javabean, +Export-Package: org.jboss.tools.smooks.java2xml.analyzer, + org.jboss.tools.smooks.java2xml.utils, + org.jboss.tools.smooks.javabean, org.jboss.tools.smooks.javabean.analyzer, org.jboss.tools.smooks.javabean.commandprocessor, org.jboss.tools.smooks.javabean.model, - org.jboss.tools.smooks.javabean.ui -Bundle-ClassPath: . + org.jboss.tools.smooks.javabean.ui, + org.jboss.tools.smooks.javabean.uitils, + org.jboss.tools.smooks.xml2java.analyzer +Bundle-ClassPath: ., + libs/dom4j-1.6.1.jar Modified: trunk/smooks/plugins/org.jboss.tools.smooks.javabean/build.properties =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.javabean/build.properties 2008-10-20 07:59:03 UTC (rev 10956) +++ trunk/smooks/plugins/org.jboss.tools.smooks.javabean/build.properties 2008-10-20 08:08:29 UTC (rev 10957) @@ -2,7 +2,8 @@ bin.includes = META-INF/,\ plugin.xml,\ icons/,\ - . + .,\ + libs/dom4j-1.6.1.jar jars.compile.order = smooks-javabean.jar output.smooks-javabean.jar = bin/ src.includes = src/,\ Added: trunk/smooks/plugins/org.jboss.tools.smooks.javabean/libs/dom4j-1.6.1.jar =================================================================== (Binary files differ) Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.javabean/libs/dom4j-1.6.1.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/smooks/plugins/org.jboss.tools.smooks.javabean/plugin.xml =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.javabean/plugin.xml 2008-10-20 07:59:03 UTC (rev 10956) +++ trunk/smooks/plugins/org.jboss.tools.smooks.javabean/plugin.xml 2008-10-20 08:08:29 UTC (rev 10957) @@ -36,4 +36,35 @@ typeID="org.jboss.tools.smooks.ui.viewerInitor.javabean"> </targetModelAnalyzer> </extension> + + <extension + point="org.jboss.tools.smooks.ui.analyzer"> + <mappingAnalyzer + class="org.jboss.tools.smooks.java2xml.analyzer.Java2XMLAnalyzer" + name="Java Bean" + typeID="org.jboss.tools.smooks.ui.viewerInitor.javabean"> + <targetSourceType + id="org.jboss.tools.smooks.xml.viewerInitor.xml" + name="XML"> + </targetSourceType> + </mappingAnalyzer> + </extension> + + <extension + point="org.jboss.tools.smooks.ui.analyzer"> + <mappingAnalyzer + class="org.jboss.tools.smooks.xml2java.analyzer.XML2JavaAnalyzer" + name="XML2Java" + typeID="org.jboss.tools.smooks.xml.viewerInitor.xml"> + <targetSourceType + id="org.jboss.tools.smooks.ui.viewerInitor.javabean" + name="JavaBean"> + </targetSourceType> + </mappingAnalyzer> + <sourceModelAnalyzer + class="org.jboss.tools.smooks.xml2java.analyzer.XMLSourceModelAnalyzer" + name="XML" + typeID="org.jboss.tools.smooks.xml.viewerInitor.xml"> + </sourceModelAnalyzer> + </extension> </plugin> Added: trunk/smooks/plugins/org.jboss.tools.smooks.javabean/src/org/jboss/tools/smooks/java2xml/analyzer/DOM2FreeMarkerTransformor.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.javabean/src/org/jboss/tools/smooks/java2xml/analyzer/DOM2FreeMarkerTransformor.java (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.javabean/src/org/jboss/tools/smooks/java2xml/analyzer/DOM2FreeMarkerTransformor.java 2008-10-20 08:08:29 UTC (rev 10957) @@ -0,0 +1,91 @@ +/******************************************************************************* + * Copyright (c) 2008 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 + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.smooks.java2xml.analyzer; + +import java.util.Iterator; +import java.util.List; + +import org.dom4j.Attribute; +import org.dom4j.Document; +import org.dom4j.Element; +import org.jboss.tools.smooks.java2xml.utils.XMLConstants; + +/** + * @author Dart Peng + * @Date : Sep 25, 2008 + */ +public class DOM2FreeMarkerTransformor { + + public String transformDOM(Document document) { + Element element = document.getRootElement(); + StringBuffer buffer = new StringBuffer(); + transform(element, buffer); + return buffer.toString(); + } + + protected void transform(Element element, StringBuffer buffer) { + String name = element.getName(); + if (XMLConstants.REPLACE_FREEMARKER_FOR_EXPRESS_ELEMENT_NAME + .equals(name)) { + String desc = element + .attributeValue(XMLConstants.REPLACE_FREEMARKER_FOR_EXPRESS_ELEMENT_ATTRIBUTE); + name = "#" + desc; + } + String attributesString = ""; + if(!isFreeMarkerExpression(name)){ + attributesString = buildAttributeString(element); + } + List children = element.elements(); + if (children.isEmpty()) { + buffer.append("<" + name + " " +attributesString + "/>"); + return; + } else { + buffer.append("<" + name + " " +attributesString + "/>"); + for (Iterator iterator = children.iterator(); iterator.hasNext();) { + Element child = (Element) iterator.next(); + transform(child, buffer); + } + if(isFreeMarkerExpression(name)){ + name = name.trim(); + int index = name.indexOf(" "); + if(index != -1){ + name = name.substring(0,index); + } + } + buffer.append("</" + name + ">"); + } + } + + private String buildAttributeString(Element element) { + List list = element.attributes(); + StringBuffer buffer = new StringBuffer(""); + for (Iterator iterator = list.iterator(); iterator.hasNext();) { + Attribute att = (Attribute) iterator.next(); + String name = att.getName(); + String value = att.getValue(); + if(value == null) value = ""; + if(name != null){ + buffer.append(name); + buffer.append("="); + buffer.append("\""); + buffer.append(value); + buffer.append("\""); + buffer.append(" "); + } + } + return buffer.toString(); + } + + private boolean isFreeMarkerExpression(String str){ + return str.startsWith("#"); + } + +} Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.javabean/src/org/jboss/tools/smooks/java2xml/analyzer/DOM2FreeMarkerTransformor.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/smooks/plugins/org.jboss.tools.smooks.javabean/src/org/jboss/tools/smooks/java2xml/analyzer/FreeMarkerContentReplacer.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.javabean/src/org/jboss/tools/smooks/java2xml/analyzer/FreeMarkerContentReplacer.java (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.javabean/src/org/jboss/tools/smooks/java2xml/analyzer/FreeMarkerContentReplacer.java 2008-10-20 08:08:29 UTC (rev 10957) @@ -0,0 +1,76 @@ +/******************************************************************************* + * Copyright (c) 2008 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 + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.smooks.java2xml.analyzer; + +import java.io.IOException; +import java.io.Reader; +import java.io.StringReader; + +/** + * @author Dart Peng + * @Date : Sep 25, 2008 + */ +public class FreeMarkerContentReplacer { + + public String replaceFreeMarkerTemplate(Reader reader) throws IOException { + StringBuffer buffer = new StringBuffer(); +// Configuration fmConfiguration = new Configuration(); +// fmConfiguration.setTagSyntax(Configuration.AUTO_DETECT_TAG_SYNTAX); +// +// Template template; +// template = new Template("XML2Java_FreeMarker", reader, fmConfiguration); +// TemplateElement root = template.getRootTreeNode(); +// visitTemplateElement(root, buffer); + return buffer.toString(); + } + + public String replaceFreeMarkerTemplate(String templateContents) + throws IOException { + Reader reader = new StringReader(templateContents); + return replaceFreeMarkerTemplate(reader); + } + +// private void visitTemplateElement(TemplateElement model, StringBuffer buffer) { + +// Enumeration children = ((TemplateElement) model).children(); +// if (!"MixedContent".equals(model.getNodeName())) { +// buffer +// .append("<" +// + XMLConstants.REPLACE_FREEMARKER_FOR_EXPRESS_ELEMENT_NAME +// + " " +// + XMLConstants.REPLACE_FREEMARKER_FOR_EXPRESS_ELEMENT_ATTRIBUTE +// + "= \"" + model.getDescription() + "\">"); +// } +// while (children.hasMoreElements()) { +// Object obj = children.nextElement(); +// if (!(obj instanceof TextBlock)) { +// TemplateElement child = (TemplateElement) obj; +// String str = child.getSource(); +// if (child.isLeaf()) { +// if (child.getNodeName().equals("DollarVariable")) { +// buffer.append(child.getSource()); +// } else { +// buffer.append(child.getDescription()); +// } +// continue; +// } +// visitTemplateElement(child, buffer); +// } else { +// buffer.append(obj); +// } +// } +// if (!"MixedContent".equals(model.getNodeName())) { +// buffer.append("</" +// + XMLConstants.REPLACE_FREEMARKER_FOR_EXPRESS_ELEMENT_NAME +// + ">"); +// } +// } +} Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.javabean/src/org/jboss/tools/smooks/java2xml/analyzer/FreeMarkerContentReplacer.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/smooks/plugins/org.jboss.tools.smooks.javabean/src/org/jboss/tools/smooks/java2xml/analyzer/Java2XMLAnalyzer.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.javabean/src/org/jboss/tools/smooks/java2xml/analyzer/Java2XMLAnalyzer.java (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.javabean/src/org/jboss/tools/smooks/java2xml/analyzer/Java2XMLAnalyzer.java 2008-10-20 08:08:29 UTC (rev 10957) @@ -0,0 +1,183 @@ +/******************************************************************************* + * Copyright (c) 2008 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 + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.smooks.java2xml.analyzer; + +import java.util.Iterator; +import java.util.List; + +import org.dom4j.Document; +import org.dom4j.DocumentHelper; +import org.dom4j.Element; +import org.eclipse.jface.dialogs.MessageDialog; +import org.eclipse.swt.widgets.Shell; +import org.jboss.tools.smooks.analyzer.AbstractAnalyzer; +import org.jboss.tools.smooks.analyzer.DesignTimeAnalyzeResult; +import org.jboss.tools.smooks.analyzer.MappingResourceConfigList; +import org.jboss.tools.smooks.analyzer.SmooksAnalyzerException; +import org.jboss.tools.smooks.javabean.model.JavaBeanModel; +import org.jboss.tools.smooks.model.ParamType; +import org.jboss.tools.smooks.model.ResourceConfigType; +import org.jboss.tools.smooks.model.SmooksFactory; +import org.jboss.tools.smooks.model.SmooksResourceListType; +import org.jboss.tools.smooks.model.util.SmooksModelUtils; +import org.jboss.tools.smooks.ui.gef.model.AbstractStructuredDataModel; +import org.jboss.tools.smooks.ui.gef.model.GraphRootModel; +import org.jboss.tools.smooks.ui.gef.model.LineConnectionModel; +import org.jboss.tools.smooks.ui.gef.model.SourceModel; +import org.jboss.tools.smooks.ui.gef.model.TargetModel; +import org.jboss.tools.smooks.ui.modelparser.SmooksConfigurationFileGenerateContext; +import org.jboss.tools.smooks.utils.UIUtils; +import org.jboss.tools.smooks.xml.model.AbstractXMLObject; +import org.jboss.tools.smooks.xml.model.DocumentObject; +import org.jboss.tools.smooks.xml.model.TagObject; +import org.jboss.tools.smooks.xml.model.TagPropertyObject; + +/** + * + * @author <a href="mailto:dpeng@redhat.com">Dart Peng</a> + * @Date 2008-9-22 + */ +public class Java2XMLAnalyzer extends AbstractAnalyzer { + + /* + * (non-Javadoc) + * + * @see org.jboss.tools.smooks.analyzer.IMappingAnalyzer#analyzeMappingGraphModel(org.jboss.tools.smooks.ui.modelparser.SmooksConfigurationFileGenerateContext) + */ + public void analyzeMappingGraphModel( + SmooksConfigurationFileGenerateContext context) + throws SmooksAnalyzerException { + // TODO will modify soon + + if(true){ + Shell shell = context.getShell(); + MessageDialog.openWarning(shell, "Warning", "The java2xml can't be generate to config file currently."); + return; + } + + GraphRootModel rootModel = context.getGraphicalRootModel(); + List<SourceModel> sourceModelList = rootModel.loadSourceModelList(); + List<TargetModel> targetModelList = rootModel.loadTargetModelList(); + + // Element rootElement = DocumentHelper.createElement(name); + TagObject root = null; + for (Iterator iterator = targetModelList.iterator(); iterator.hasNext();) { + TargetModel targetModel = (TargetModel) iterator.next(); + AbstractXMLObject tag = (AbstractXMLObject) targetModel + .getReferenceEntityModel(); + root = findTheRootTagObject(tag); + break; + } + + if (root == null) + throw new SmooksAnalyzerException("can't find the root element"); + Document document = DocumentHelper.createDocument(); + Element rootElement = generateXMLContents(rootModel, root); + document.setRootElement(rootElement); + + String string = document.asXML(); + + ResourceConfigType resource = SmooksFactory.eINSTANCE + .createResourceConfigType(); + ParamType param = SmooksFactory.eINSTANCE.createParamType(); + resource.getParam().add(param); + SmooksModelUtils.appendTextToSmooksType(param, string); + context.getGeneratorResourceList().add(resource); + System.out.println(string); + } + + protected Element generateXMLContents(GraphRootModel graph, TagObject tag) { + Element element = DocumentHelper.createElement(tag.getName()); + AbstractStructuredDataModel dataModel = UIUtils.findGraphModel(graph, + tag); + generateElementAttribute(graph, element, tag.getProperties()); + List children = tag.getChildren(); + for (Iterator iterator = children.iterator(); iterator.hasNext();) { + TagObject child = (TagObject) iterator.next(); + element.add(generateXMLContents(graph, child)); + } + + if (dataModel != null) { + LineConnectionModel connection = UIUtils + .getFirstTargetModelViaConnection(dataModel); + if (connection != null) { + SourceModel source = (SourceModel) connection.getSource(); + element + .add(DocumentHelper + .createCDATA(getTheJavaBeanString((JavaBeanModel) source + .getReferenceEntityModel()))); + } + } + + return element; + } + + protected void generateElementAttribute(GraphRootModel graph, + Element element, List<TagPropertyObject> properties) { + for (Iterator iterator = properties.iterator(); iterator.hasNext();) { + TagPropertyObject tagPropertyObject = (TagPropertyObject) iterator + .next(); + + AbstractStructuredDataModel dataModel = UIUtils.findGraphModel( + graph, tagPropertyObject); + LineConnectionModel connect = UIUtils + .getFirstTargetModelViaConnection(dataModel); + if (connect == null) + continue; + + SourceModel source = (SourceModel) connect.getSource(); + + element.addAttribute(tagPropertyObject.getName(), + getTheJavaBeanString((JavaBeanModel) source + .getReferenceEntityModel())); + } + } + + protected TagObject findTheRootTagObject(AbstractXMLObject obj) { + AbstractXMLObject parent = obj.getParent(); + if (parent instanceof DocumentObject && obj instanceof TagObject) + return (TagObject) obj; + return (TagObject) findTheRootTagObject(parent); + } + + /* + * (non-Javadoc) + * + * @see org.jboss.tools.smooks.analyzer.IMappingAnalyzer#analyzeMappingSmooksModel(org.jboss.tools.smooks.model.SmooksResourceListType, + * java.lang.Object, java.lang.Object) + */ + public MappingResourceConfigList analyzeMappingSmooksModel( + SmooksResourceListType listType, Object sourceObject, + Object targetObject) { + // TODO Auto-generated method stub + return null; + } + + protected String getTheJavaBeanString(JavaBeanModel currentModel) { + String name = currentModel.getName(); + JavaBeanModel parent = currentModel.getParent(); + while (parent != null ) { + String pn = parent.getName(); + if (pn != null) { + name = parent.getName() + "." + name; + } + parent = parent.getParent(); + } + return "${" + name + "}"; + } + + public DesignTimeAnalyzeResult analyzeGraphModel( + SmooksConfigurationFileGenerateContext context) { + // TODO Auto-generated method stub + return null; + } + +} Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.javabean/src/org/jboss/tools/smooks/java2xml/analyzer/Java2XMLAnalyzer.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/smooks/plugins/org.jboss.tools.smooks.javabean/src/org/jboss/tools/smooks/java2xml/utils/XMLConstants.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.javabean/src/org/jboss/tools/smooks/java2xml/utils/XMLConstants.java (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.javabean/src/org/jboss/tools/smooks/java2xml/utils/XMLConstants.java 2008-10-20 08:08:29 UTC (rev 10957) @@ -0,0 +1,22 @@ +/******************************************************************************* + * Copyright (c) 2008 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 + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.smooks.java2xml.utils; + +/** + * @author Dart Peng + * @Date : Sep 25, 2008 + */ +public class XMLConstants { + public static final String REPLACE_FREEMARKER_FOR_EXPRESS_ELEMENT_NAME = "replaceElementNameForFreeMarker"; + + public static final String REPLACE_FREEMARKER_FOR_EXPRESS_ELEMENT_ATTRIBUTE = "desc"; + +} Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.javabean/src/org/jboss/tools/smooks/java2xml/utils/XMLConstants.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/smooks/plugins/org.jboss.tools.smooks.javabean/src/org/jboss/tools/smooks/javabean/analyzer/JavaBeanAnalyzer.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.javabean/src/org/jboss/tools/smooks/javabean/analyzer/JavaBeanAnalyzer.java 2008-10-20 07:59:03 UTC (rev 10956) +++ trunk/smooks/plugins/org.jboss.tools.smooks.javabean/src/org/jboss/tools/smooks/javabean/analyzer/JavaBeanAnalyzer.java 2008-10-20 08:08:29 UTC (rev 10957) @@ -350,6 +350,9 @@ AbstractStructuredDataModel sourceModel) { JavaBeanModel source = (JavaBeanModel) sourceModel .getReferenceEntityModel(); + if(source.getBeanClass().isArray()){ + return source.getName(); + } if (Collection.class.isAssignableFrom(source.getBeanClass())) { return source.getName(); } @@ -538,7 +541,7 @@ } String beanClass = SmooksModelUtils.getParmaText( "beanClass", rc); - if (targetName.equals(beanClass)) { + if (targetName!=null && targetName.trim().equals(beanClass)) { setSelectorIsUsed(sourceName); // create the first connection mappingModelList.add(new MappingModel(source, target)); Modified: trunk/smooks/plugins/org.jboss.tools.smooks.javabean/src/org/jboss/tools/smooks/javabean/model/JavaBeanModel.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.javabean/src/org/jboss/tools/smooks/javabean/model/JavaBeanModel.java 2008-10-20 07:59:03 UTC (rev 10956) +++ trunk/smooks/plugins/org.jboss.tools.smooks.javabean/src/org/jboss/tools/smooks/javabean/model/JavaBeanModel.java 2008-10-20 08:08:29 UTC (rev 10957) @@ -227,6 +227,7 @@ Class beanType = beanClass.getComponentType(); setMany(true); componentClass = beanType; + setGenericType(true); } return many; } Added: trunk/smooks/plugins/org.jboss.tools.smooks.javabean/src/org/jboss/tools/smooks/xml2java/analyzer/XML2JavaAnalyzer.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.javabean/src/org/jboss/tools/smooks/xml2java/analyzer/XML2JavaAnalyzer.java (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.javabean/src/org/jboss/tools/smooks/xml2java/analyzer/XML2JavaAnalyzer.java 2008-10-20 08:08:29 UTC (rev 10957) @@ -0,0 +1,396 @@ +/******************************************************************************* + * Copyright (c) 2008 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 + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.smooks.xml2java.analyzer; + +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; + +import javax.swing.text.html.HTMLDocument.HTMLReader.TagAction; + +import org.eclipse.emf.ecore.xml.type.AnyType; +import org.jboss.tools.smooks.analyzer.AbstractAnalyzer; +import org.jboss.tools.smooks.analyzer.DesignTimeAnalyzeResult; +import org.jboss.tools.smooks.analyzer.MappingModel; +import org.jboss.tools.smooks.analyzer.MappingResourceConfigList; +import org.jboss.tools.smooks.analyzer.SmooksAnalyzerException; +import org.jboss.tools.smooks.javabean.analyzer.JavaBeanAnalyzer; +import org.jboss.tools.smooks.javabean.model.JavaBeanModel; +import org.jboss.tools.smooks.model.ParamType; +import org.jboss.tools.smooks.model.ResourceConfigType; +import org.jboss.tools.smooks.model.ResourceType; +import org.jboss.tools.smooks.model.SmooksFactory; +import org.jboss.tools.smooks.model.SmooksResourceListType; +import org.jboss.tools.smooks.model.util.SmooksModelConstants; +import org.jboss.tools.smooks.model.util.SmooksModelUtils; +import org.jboss.tools.smooks.ui.gef.model.AbstractStructuredDataModel; +import org.jboss.tools.smooks.ui.gef.model.GraphRootModel; +import org.jboss.tools.smooks.ui.gef.model.IConnectableModel; +import org.jboss.tools.smooks.ui.gef.model.LineConnectionModel; +import org.jboss.tools.smooks.ui.gef.model.SourceModel; +import org.jboss.tools.smooks.ui.gef.model.TreeItemRelationModel; +import org.jboss.tools.smooks.ui.modelparser.SmooksConfigurationFileGenerateContext; +import org.jboss.tools.smooks.utils.UIUtils; +import org.jboss.tools.smooks.xml.model.AbstractXMLObject; +import org.jboss.tools.smooks.xml.model.TagObject; +import org.jboss.tools.smooks.xml.model.TagPropertyObject; + +/** + * @author Dart Peng + * @Date Aug 20, 2008 + */ +public class XML2JavaAnalyzer extends AbstractAnalyzer { + + /* + * (non-Javadoc) + * + * @see org.jboss.tools.smooks.analyzer.IAnalyzer#analyzeMappingGraphModel(org.jboss.tools.smooks.ui.modelparser.SmooksConfigurationFileGenerateContext) + */ + public void analyzeMappingGraphModel( + SmooksConfigurationFileGenerateContext context) + throws SmooksAnalyzerException { + + SmooksResourceListType listType = context.getSmooksResourceListModel(); + GraphRootModel rootModel = context.getGraphicalRootModel(); + List children = rootModel.getChildren(); + for (Iterator iterator = children.iterator(); iterator.hasNext();) { + TreeItemRelationModel dataModel = (TreeItemRelationModel) iterator + .next(); + if (dataModel.getClass() == SourceModel.class) { + List sourceConnections = dataModel.getModelSourceConnections(); + if (sourceConnections.isEmpty()) + continue; + processSourceConnections(sourceConnections, context, listType, + (SourceModel) dataModel); + } + } + } + + protected void processSourceConnections(List sourceConnections, + SmooksConfigurationFileGenerateContext context, + SmooksResourceListType listType, SourceModel sourceModel) { + for (Iterator iterator = sourceConnections.iterator(); iterator + .hasNext();) { + LineConnectionModel connection = (LineConnectionModel) iterator + .next(); + processLineConnection(connection, context, listType, sourceModel, + null); + } + } + + protected void processLineConnection(LineConnectionModel connection, + SmooksConfigurationFileGenerateContext context, + SmooksResourceListType listType, SourceModel sourceModel, + String beanID) { + if (this.connectionIsUsed(connection)) + return; + setConnectionUsed(connection); + IConnectableModel sourceg = connection.getSource(); + if (sourceg != sourceModel) + return; + IConnectableModel targetg = connection.getTarget(); + AbstractXMLObject source = (AbstractXMLObject) sourceModel + .getReferenceEntityModel(); + JavaBeanModel target = (JavaBeanModel) ((AbstractStructuredDataModel) targetg) + .getReferenceEntityModel(); + ResourceConfigType resourceConfigType = SmooksFactory.eINSTANCE + .createResourceConfigType(); + context.getGeneratorResourceList().add(resourceConfigType); + // addResourceConfigType(listType, resourceConfigType); + // set the selector string value + resourceConfigType.setSelector(source.getName()); + // create a resource and add it to resourceConfig + ResourceType resourceType = SmooksFactory.eINSTANCE + .createResourceType(); + resourceType.setValue(SmooksModelConstants.BEAN_POPULATOR); + resourceConfigType.setResource(resourceType); + + // create param for resourceConfig + if (beanID == null) { + beanID = getBeanID(target); + } else { + if (beanID.startsWith("${") && beanID.endsWith("}")) { + beanID = beanID.substring(2, beanID.length() - 1); + } + } + + addParamTypeToResourceConfig(resourceConfigType, + SmooksModelConstants.BEAN_ID, beanID); + + // add beanClass param + addParamTypeToResourceConfig(resourceConfigType, + SmooksModelConstants.BEAN_CLASS, target.getBeanClassString()); + + // add bindings param + ParamType bindingsParam = addParamTypeToResourceConfig( + resourceConfigType, SmooksModelConstants.BINDINGS, null); + processBindingsParam(bindingsParam, target, source, context, listType); + // + } + + protected void processBindingsParam(ParamType bindingsParam, + JavaBeanModel javaBean, AbstractXMLObject source, + SmooksConfigurationFileGenerateContext context, + SmooksResourceListType listType) { + List properties = javaBean.getProperties(); + for (Iterator iterator = properties.iterator(); iterator.hasNext();) { + boolean isComplex = true; + JavaBeanModel child = (JavaBeanModel) iterator.next(); + AbstractStructuredDataModel graphModel = UIUtils.findGraphModel( + context.getGraphicalRootModel(), child); + LineConnectionModel connection = UIUtils + .getFirstTargetModelViaConnection(graphModel); + if (connection == null) + continue; + AbstractStructuredDataModel sourceModel = (AbstractStructuredDataModel) connection + .getSource(); + + if (child.isPrimitive() || child.getProperties().isEmpty()) { + isComplex = false; + } + + String selector = getSelectorID(child); + if (!isComplex) { + selector = getSelectorIDViaXMLObject( + (AbstractXMLObject) sourceModel + .getReferenceEntityModel(), source); + } + SmooksModelUtils.addBindingTypeToParamType(bindingsParam, child + .getName(), selector, null, null); + if (isComplex) { + processLineConnection(connection, context, listType, + (SourceModel) sourceModel, selector); + } else { + setConnectionUsed(connection); + continue; + } + } + } + + protected String getSelectorIDViaXMLObject(AbstractXMLObject sourceModel, + AbstractXMLObject currentRoot) { + String name = sourceModel.getName(); + if (sourceModel instanceof TagPropertyObject) { + name = "@" + name; + } + AbstractXMLObject parent = sourceModel.getParent(); + while (parent != null && parent.getName() != null) { + name = parent.getName() + " " + name; + if (parent == currentRoot) + break; + parent = parent.getParent(); + } + return name; + } + + private String getSelectorID(JavaBeanModel javaBean) { + String selectorName = javaBean.getName(); + return "${" + selectorName + "}"; + } + + protected String getBeanID(JavaBeanModel target) { + return target.getName(); + } + + public MappingResourceConfigList analyzeMappingSmooksModel( + SmooksResourceListType listType, Object sourceObject, + Object targetObject) { + if(targetObject instanceof List){ + targetObject = (JavaBeanModel) ((List)targetObject).get(0); + } + if (!(sourceObject instanceof AbstractXMLObject) + || !(targetObject instanceof JavaBeanModel)) { + return MappingResourceConfigList.createEmptyList(); + } + AbstractXMLObject sourceRoot = (AbstractXMLObject) sourceObject; + JavaBeanModel sourceTarget = (JavaBeanModel) targetObject; + + ResourceConfigType rootResourceConfig = findFirstMappingResourceConfig(listType); + String xmlName = rootResourceConfig.getSelector(); + AbstractXMLObject source = findXMLObjectByName(xmlName, sourceRoot); + if (source == null) + return MappingResourceConfigList.createEmptyList(); + + MappingResourceConfigList rcl = new MappingResourceConfigList(); + this.createMappingResourceConfigList(rcl, listType, rootResourceConfig, + source, sourceTarget); + return rcl; + } + + public static AbstractXMLObject findXMLObjectByName(String selector, + AbstractXMLObject root) { + if (selector == null) + return null; + if (selector.equals(root.getName())) { + return root; + } + if (root instanceof TagObject) { + List properties = ((TagObject) root).getProperties(); + for (Iterator iterator = properties.iterator(); iterator.hasNext();) { + TagPropertyObject pro = (TagPropertyObject) iterator.next(); + if (selector.equals(pro.getName())) + return pro; + } + List<AbstractXMLObject> tags = ((TagObject) root).getChildren(); + for (Iterator iterator = tags.iterator(); iterator.hasNext();) { + AbstractXMLObject tagChild = (AbstractXMLObject) iterator + .next(); + AbstractXMLObject result = findXMLObjectByName(selector, + tagChild); + if (result != null) + return result; + } + } + return null; + + } + + protected void createMappingResourceConfigList( + MappingResourceConfigList configList, SmooksResourceListType list, + ResourceConfigType config, AbstractXMLObject sourceRoot, + JavaBeanModel targetJavaBean) { + String selector = config.getSelector(); + String beanID = SmooksModelUtils.getParmaText( + SmooksModelConstants.BEAN_ID, config); + String beanClass = SmooksModelUtils.getParmaText( + SmooksModelConstants.BEAN_CLASS, config); + + MappingModel mapping = new MappingModel(sourceRoot, targetJavaBean); + configList.getMappingModelList().add(mapping); + configList.addResourceConfig(config); + this.setSelectorIsUsed(config.getSelector()); + + List<ParamType> paramList = config.getParam(); + ParamType bindingParam = null; + for (Iterator iterator = paramList.iterator(); iterator.hasNext();) { + ParamType paramType = (ParamType) iterator.next(); + String name = paramType.getName(); + if (SmooksModelConstants.BINDINGS.equals(name)) { + bindingParam = paramType; + break; + } + } + + if (bindingParam != null) { + List bindings = (List) bindingParam.getMixed().get( + SmooksModelUtils.ELEMENT_BINDING, true); + if (bindings != null) { + for (Iterator iterator = bindings.iterator(); iterator + .hasNext();) { + AnyType binding = (AnyType) iterator.next(); + String property = SmooksModelUtils + .getAttributeValueFromAnyType(binding, + SmooksModelUtils.ATTRIBUTE_PROPERTY); + String selectorStr = SmooksModelUtils + .getAttributeValueFromAnyType(binding, + SmooksModelUtils.ATTRIBUTE_SELECTOR); + JavaBeanModel childBean = JavaBeanAnalyzer + .findTheChildJavaBeanModel(property, targetJavaBean); + processXMLSelector(configList, config, sourceRoot, + childBean, list, selectorStr); + } + } + } + } + + protected void processXMLSelector(MappingResourceConfigList configList, + ResourceConfigType resourceConfig, AbstractXMLObject root, + JavaBeanModel targetBean, SmooksResourceListType listType, + String selector) { + if (isReferenceSelector(selector)) { + ResourceConfigType resourceConfig1 = this + .findResourceConfigTypeWithSelector(selector, listType); + String newSelector = resourceConfig1.getSelector(); + if (newSelector == null) + return; + AbstractXMLObject newRoot = findXMLObjectByName(newSelector, root); + createMappingResourceConfigList(configList, listType, + resourceConfig1, newRoot, targetBean); + } else { + AbstractXMLObject source = findXMLObjectWithSelectorString( + selector, root); + if (source != null) { + MappingModel mapping = new MappingModel(source, targetBean); + configList.getMappingModelList().add(mapping); + configList.addResourceConfig(resourceConfig); + this.setSelectorIsUsed(selector); + } + } + } + + public static AbstractXMLObject findXMLObjectWithSelectorString( + String selector, AbstractXMLObject parent) { + if (selector == null) + return null; + selector = selector.trim(); + String[] names = selector.split(" "); + if (names == null) + return null; + AbstractXMLObject current = parent; + for (int i = 0; i < names.length; i++) { + String name = names[i].trim(); + if (current instanceof TagObject && isXMLAttributeObject(name)) { + List properties = ((TagObject) current).getProperties(); + name = name.substring(1); + for (Iterator iterator = properties.iterator(); iterator + .hasNext();) { + TagPropertyObject property = (TagPropertyObject) iterator + .next(); + if (name.equals(property.getName())) { + current = property; + } + } + } else { + List list = parent.getChildren(); + for (Iterator iterator = list.iterator(); iterator.hasNext();) { + AbstractXMLObject child = (AbstractXMLObject) iterator + .next(); + if (name.equals(child.getName())) { + current = child; + break; + } + } + } + } + if (current == parent) + return null; + return current; + } + + public static boolean isXMLAttributeObject(String name) { + if (name != null && name.startsWith("@")) + return true; + return false; + } + + private ResourceConfigType findFirstMappingResourceConfig( + SmooksResourceListType listType) { + List list = listType.getAbstractResourceConfig(); + for (Iterator iterator = list.iterator(); iterator.hasNext();) { + ResourceConfigType resource = (ResourceConfigType) iterator.next(); + ResourceType rt = resource.getResource(); + if (rt == null) + continue; + String value = rt.getValue(); + if (SmooksModelConstants.BEAN_POPULATOR.equals(value)) { + return resource; + } + } + return null; + } + + public DesignTimeAnalyzeResult analyzeGraphModel( + SmooksConfigurationFileGenerateContext context) { + // TODO Auto-generated method stub + return null; + } + +} Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.javabean/src/org/jboss/tools/smooks/xml2java/analyzer/XML2JavaAnalyzer.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/smooks/plugins/org.jboss.tools.smooks.javabean/src/org/jboss/tools/smooks/xml2java/analyzer/XMLSourceModelAnalyzer.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.javabean/src/org/jboss/tools/smooks/xml2java/analyzer/XMLSourceModelAnalyzer.java (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.javabean/src/org/jboss/tools/smooks/xml2java/analyzer/XMLSourceModelAnalyzer.java 2008-10-20 08:08:29 UTC (rev 10957) @@ -0,0 +1,72 @@ +/******************************************************************************* + * Copyright (c) 2008 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 + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.smooks.xml2java.analyzer; + +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.lang.reflect.InvocationTargetException; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; + +import org.dom4j.DocumentException; +import org.eclipse.core.resources.IFile; +import org.jboss.tools.smooks.analyzer.ISourceModelAnalyzer; +import org.jboss.tools.smooks.graphical.GraphInformations; +import org.jboss.tools.smooks.graphical.Param; +import org.jboss.tools.smooks.graphical.Params; +import org.jboss.tools.smooks.model.SmooksResourceListType; +import org.jboss.tools.smooks.xml.model.AbstractXMLObject; +import org.jboss.tools.smooks.xml.model.DocumentObject; +import org.jboss.tools.smooks.xml.model.XMLObjectAnalyzer; + +/** + * @author Dart Peng + * Date : Sep 23, 2008 + */ +public class XMLSourceModelAnalyzer implements ISourceModelAnalyzer { + + public static final String XML_FILE = "xmlFile"; + + public Object buildSourceInputObjects(GraphInformations graphInfo, + SmooksResourceListType listType, IFile sourceFile) + throws InvocationTargetException { + Params params = graphInfo.getParams(); + String path = null; + if (params != null) { + List<Param> paramList = graphInfo.getParams().getParam(); + for (Iterator<Param> iterator = paramList.iterator(); iterator + .hasNext();) { + Param param = (Param) iterator.next(); + if (param.getName().equals(XML_FILE)) { + path = param.getValue(); + break; + } + } + } + if (path == null) { + // TODO tell user the filepath can't find or not ? + return null; +// throw new InvocationTargetException(new Exception( +// "xml file path can't find in the graphInfo file")); + } + XMLObjectAnalyzer objectBuilder = new XMLObjectAnalyzer(); + try { + FileInputStream stream = new FileInputStream(path); + DocumentObject document = objectBuilder.analyze(stream); + return document; + } catch (FileNotFoundException e) { + throw new InvocationTargetException(e); + } catch (DocumentException e) { + throw new InvocationTargetException(e); + } + } +} Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.javabean/src/org/jboss/tools/smooks/xml2java/analyzer/XMLSourceModelAnalyzer.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/META-INF/MANIFEST.MF =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/META-INF/MANIFEST.MF 2008-10-20 07:59:03 UTC (rev 10956) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/META-INF/MANIFEST.MF 2008-10-20 08:08:29 UTC (rev 10957) @@ -20,7 +20,6 @@ org.eclipse.emf, org.eclipse.emf.edit, org.jboss.tools.smooks.model.edit, - org.jboss.tools.smooks.graphicalInfo, org.eclipse.ui.views.properties.tabbed, org.eclipse.emf.edit.ui Bundle-ActivationPolicy: lazy @@ -28,6 +27,9 @@ Bundle-ClassPath: . Bundle-Vendor: JBoss Export-Package: org.jboss.tools.smooks.analyzer, + org.jboss.tools.smooks.graphical, + org.jboss.tools.smooks.graphical.impl, + org.jboss.tools.smooks.graphical.util, org.jboss.tools.smooks.ui, org.jboss.tools.smooks.ui.editors, org.jboss.tools.smooks.ui.gef, Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/plugin.xml =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/plugin.xml 2008-10-20 07:59:03 UTC (rev 10956) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/plugin.xml 2008-10-20 08:08:29 UTC (rev 10957) @@ -3,6 +3,12 @@ <plugin> <extension-point id="viewerInitor" name="viewerInitor" schema="schema/viewerInitor.exsd"/> <extension-point id="analyzer" name="analyzer" schema="schema/analyzer.exsd"/> + <extension point="org.eclipse.emf.ecore.generated_package"> + <package + uri = "http://www.jboss.org/tools/smooks/graphicalInformation" + class = "org.jboss.tools.smooks.graphical.GraphicalPackage" + genModel = "model/graphical.genmodel" /> + </extension> <extension point="org.eclipse.ui.editors"> Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/GraphInformations.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/GraphInformations.java (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/GraphInformations.java 2008-10-20 08:08:29 UTC (rev 10957) @@ -0,0 +1,81 @@ +/** + * <copyright> + * </copyright> + * + * $Id$ + */ +package org.jboss.tools.smooks.graphical; + +import org.eclipse.emf.ecore.EObject; + +/** + *  + * A representation of the model object 'Graph Informations'. + *  + * + * + * The following features are supported: + * <ul> + * <li>{@link org.jboss.tools.smooks.graphical.GraphInformations#getMappingType Mapping Type}</li> + * <li>{@link org.jboss.tools.smooks.graphical.GraphInformations#getParams Params}</li> + * </ul> + * + * + * @see org.jboss.tools.smooks.graphical.GraphicalPackage#getGraphInformations() + * @model + * @generated + */ +public interface GraphInformations extends EObject { + /** + * Returns the value of the 'Mapping Type' containment reference. + *  + * + * If the meaning of the 'Mapping Type' containment reference isn't clear, + * there really should be more of a description here... + * + *  + * @return the value of the 'Mapping Type' containment reference. + * @see #setMappingType(MappingDataType) + * @see org.jboss.tools.smooks.graphical.GraphicalPackage#getGraphInformations_MappingType() + * @model containment="true" + * @generated + */ + MappingDataType getMappingType(); + + /** + * Sets the value of the '{@link org.jboss.tools.smooks.graphical.GraphInformations#getMappingType Mapping Type}' containment reference. + *  + *  + * @param value the new value of the 'Mapping Type' containment reference. + * @see #getMappingType() + * @generated + */ + void setMappingType(MappingDataType value); + + /** + * Returns the value of the 'Params' containment reference. + *  + * + * If the meaning of the 'Params' containment reference isn't clear, + * there really should be more of a description here... + * + *  + * @return the value of the 'Params' containment reference. + * @see #setParams(Params) + * @see org.jboss.tools.smooks.graphical.GraphicalPackage#getGraphInformations_Params() + * @model containment="true" + * @generated + */ + Params getParams(); + + /** + * Sets the value of the '{@link org.jboss.tools.smooks.graphical.GraphInformations#getParams Params}' containment reference. + *  + *  + * @param value the new value of the 'Params' containment reference. + * @see #getParams() + * @generated + */ + void setParams(Params value); + +} // GraphInformations Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/GraphInformations.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/GraphicalFactory.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/GraphicalFactory.java (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/GraphicalFactory.java 2008-10-20 08:08:29 UTC (rev 10957) @@ -0,0 +1,73 @@ +/** + * <copyright> + * </copyright> + * + * $Id$ + */ +package org.jboss.tools.smooks.graphical; + +import org.eclipse.emf.ecore.EFactory; + +/** + *  + * The Factory for the model. + * It provides a create method for each non-abstract class of the model. + *  + * @see org.jboss.tools.smooks.graphical.GraphicalPackage + * @generated + */ +public interface GraphicalFactory extends EFactory { + /** + * The singleton instance of the factory. + *  + *  + * @generated + */ + GraphicalFactory eINSTANCE = org.jboss.tools.smooks.graphical.impl.GraphicalFactoryImpl.init(); + + /** + * Returns a new object of class 'Graph Informations'. + *  + *  + * @return a new object of class 'Graph Informations'. + * @generated + */ + GraphInformations createGraphInformations(); + + /** + * Returns a new object of class 'Mapping Data Type'. + *  + *  + * @return a new object of class 'Mapping Data Type'. + * @generated + */ + MappingDataType createMappingDataType(); + + /** + * Returns a new object of class 'Params'. + *  + *  + * @return a new object of class 'Params'. + * @generated + */ + Params createParams(); + + /** + * Returns a new object of class 'Param'. + *  + *  + * @return a new object of class 'Param'. + * @generated + */ + Param createParam(); + + /** + * Returns the package supported by this factory. + *  + *  + * @return the package supported by this factory. + * @generated + */ + GraphicalPackage getGraphicalPackage(); + +} //GraphicalFactory Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/GraphicalFactory.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/GraphicalPackage.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/GraphicalPackage.java (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/GraphicalPackage.java 2008-10-20 08:08:29 UTC (rev 10957) @@ -0,0 +1,439 @@ +/** + * <copyright> + * </copyright> + * + * $Id$ + */ +package org.jboss.tools.smooks.graphical; + +import org.eclipse.emf.ecore.EAttribute; +import org.eclipse.emf.ecore.EClass; +import org.eclipse.emf.ecore.EPackage; +import org.eclipse.emf.ecore.EReference; + +/** + *  + * The Package for the model. + * It contains accessors for the meta objects to represent + * <ul> + * <li>each class,</li> + * <li>each feature of each class,</li> + * <li>each enum,</li> + * <li>and each data type</li> + * </ul> + *  + * @see org.jboss.tools.smooks.graphical.GraphicalFactory + * @model kind="package" + * @generated + */ +public interface GraphicalPackage extends EPackage { + /** + * The package name. + *  + *  + * @generated + */ + String eNAME = "graphical"; + + /** + * The package namespace URI. + *  + *  + * @generated + */ + String eNS_URI = "http://www.jboss.org/tools/smooks/graphicalInformation"; + + /** + * The package namespace name. + *  + *  + * @generated + */ + String eNS_PREFIX = ""; + + /** + * The singleton instance of the package. + *  + *  + * @generated + */ + GraphicalPackage eINSTANCE = org.jboss.tools.smooks.graphical.impl.GraphicalPackageImpl.init(); + + /** + * The meta object id for the '{@link org.jboss.tools.smooks.graphical.impl.GraphInformationsImpl Graph Informations}' class. + *  + *  + * @see org.jboss.tools.smooks.graphical.impl.GraphInformationsImpl + * @see org.jboss.tools.smooks.graphical.impl.GraphicalPackageImpl#getGraphInformations() + * @generated + */ + int GRAPH_INFORMATIONS = 0; + + /** + * The feature id for the 'Mapping Type' containment reference. + *  + *  + * @generated + * @ordered + */ + int GRAPH_INFORMATIONS__MAPPING_TYPE = 0; + + /** + * The feature id for the 'Params' containment reference. + *  + *  + * @generated + * @ordered + */ + int GRAPH_INFORMATIONS__PARAMS = 1; + + /** + * The number of structural features of the 'Graph Informations' class. + *  + *  + * @generated + * @ordered + */ + int GRAPH_INFORMATIONS_FEATURE_COUNT = 2; + + /** + * The meta object id for the '{@link org.jboss.tools.smooks.graphical.impl.MappingDataTypeImpl Mapping Data Type}' class. + *  + *  + * @see org.jboss.tools.smooks.graphical.impl.MappingDataTypeImpl + * @see org.jboss.tools.smooks.graphical.impl.GraphicalPackageImpl#getMappingDataType() + * @generated + */ + int MAPPING_DATA_TYPE = 1; + + /** + * The feature id for the 'Target Type ID' attribute. + *  + *  + * @generated + * @ordered + */ + int MAPPING_DATA_TYPE__TARGET_TYPE_ID = 0; + + /** + * The feature id for the 'Source Type ID' attribute. + *  + *  + * @generated + * @ordered + */ + int MAPPING_DATA_TYPE__SOURCE_TYPE_ID = 1; + + /** + * The number of structural features of the 'Mapping Data Type' class. + *  + *  + * @generated + * @ordered + */ + int MAPPING_DATA_TYPE_FEATURE_COUNT = 2; + + /** + * The meta object id for the '{@link org.jboss.tools.smooks.graphical.impl.ParamsImpl Params}' class. + *  + *  + * @see org.jboss.tools.smooks.graphical.impl.ParamsImpl + * @see org.jboss.tools.smooks.graphical.impl.GraphicalPackageImpl#getParams() + * @generated + */ + int PARAMS = 2; + + /** + * The feature id for the 'Param' containment reference list. + *  + *  + * @generated + * @ordered + */ + int PARAMS__PARAM = 0; + + /** + * The number of structural features of the 'Params' class. + *  + *  + * @generated + * @ordered + */ + int PARAMS_FEATURE_COUNT = 1; + + /** + * The meta object id for the '{@link org.jboss.tools.smooks.graphical.impl.ParamImpl Param}' class. + *  + *  + * @see org.jboss.tools.smooks.graphical.impl.ParamImpl + * @see org.jboss.tools.smooks.graphical.impl.GraphicalPackageImpl#getParam() + * @generated + */ + int PARAM = 3; + + /** + * The feature id for the 'Name' attribute. + *  + *  + * @generated + * @ordered + */ + int PARAM__NAME = 0; + + /** + * The feature id for the 'Value' attribute. + *  + *  + * @generated + * @ordered + */ + int PARAM__VALUE = 1; + + /** + * The number of structural features of the 'Param' class. + *  + *  + * @generated + * @ordered + */ + int PARAM_FEATURE_COUNT = 2; + + + /** + * Returns the meta object for class '{@link org.jboss.tools.smooks.graphical.GraphInformations Graph Informations}'. + *  + *  + * @return the meta object for class 'Graph Informations'. + * @see org.jboss.tools.smooks.graphical.GraphInformations + * @generated + */ + EClass getGraphInformations(); + + /** + * Returns the meta object for the containment reference '{@link org.jboss.tools.smooks.graphical.GraphInformations#getMappingType Mapping Type}'. + *  + *  + * @return the meta object for the containment reference 'Mapping Type'. + * @see org.jboss.tools.smooks.graphical.GraphInformations#getMappingType() + * @see #getGraphInformations() + * @generated + */ + EReference getGraphInformations_MappingType(); + + /** + * Returns the meta object for the containment reference '{@link org.jboss.tools.smooks.graphical.GraphInformations#getParams Params}'. + *  + *  + * @return the meta object for the containment reference 'Params'. + * @see org.jboss.tools.smooks.graphical.GraphInformations#getParams() + * @see #getGraphInformations() + * @generated + */ + EReference getGraphInformations_Params(); + + /** + * Returns the meta object for class '{@link org.jboss.tools.smooks.graphical.MappingDataType Mapping Data Type}'. + *  + *  + * @return the meta object for class 'Mapping Data Type'. + * @see org.jboss.tools.smooks.graphical.MappingDataType + * @generated + */ + EClass getMappingDataType(); + + /** + * Returns the meta object for the attribute '{@link org.jboss.tools.smooks.graphical.MappingDataType#getTargetTypeID Target Type ID}'. + *  + *  + * @return the meta object for the attribute 'Target Type ID'. + * @see org.jboss.tools.smooks.graphical.MappingDataType#getTargetTypeID() + * @see #getMappingDataType() + * @generated + */ + EAttribute getMappingDataType_TargetTypeID(); + + /** + * Returns the meta object for the attribute '{@link org.jboss.tools.smooks.graphical.MappingDataType#getSourceTypeID Source Type ID}'. + *  + *  + * @return the meta object for the attribute 'Source Type ID'. + * @see org.jboss.tools.smooks.graphical.MappingDataType#getSourceTypeID() + * @see #getMappingDataType() + * @generated + */ + EAttribute getMappingDataType_SourceTypeID(); + + /** + * Returns the meta object for class '{@link org.jboss.tools.smooks.graphical.Params Params}'. + *  + *  + * @return the meta object for class 'Params'. + * @see org.jboss.tools.smooks.graphical.Params + * @generated + */ + EClass getParams(); + + /** + * Returns the meta object for the containment reference list '{@link org.jboss.tools.smooks.graphical.Params#getParam Param}'. + *  + *  + * @return the meta object for the containment reference list 'Param'. + * @see org.jboss.tools.smooks.graphical.Params#getParam() + * @see #getParams() + * @generated + */ + EReference getParams_Param(); + + /** + * Returns the meta object for class '{@link org.jboss.tools.smooks.graphical.Param Param}'. + *  + *  + * @return the meta object for class 'Param'. + * @see org.jboss.tools.smooks.graphical.Param + * @generated + */ + EClass getParam(); + + /** + * Returns the meta object for the attribute '{@link org.jboss.tools.smooks.graphical.Param#getName Name}'. + *  + *  + * @return the meta object for the attribute 'Name'. + * @see org.jboss.tools.smooks.graphical.Param#getName() + * @see #getParam() + * @generated + */ + EAttribute getParam_Name(); + + /** + * Returns the meta object for the attribute '{@link org.jboss.tools.smooks.graphical.Param#getValue Value}'. + *  + *  + * @return the meta object for the attribute 'Value'. + * @see org.jboss.tools.smooks.graphical.Param#getValue() + * @see #getParam() + * @generated + */ + EAttribute getParam_Value(); + + /** + * Returns the factory that creates the instances of the model. + *  + *  + * @return the factory that creates the instances of the model. + * @generated + */ + GraphicalFactory getGraphicalFactory(); + + /** + *  + * Defines literals for the meta objects that represent + * <ul> + * <li>each class,</li> + * <li>each feature of each class,</li> + * <li>each enum,</li> + * <li>and each data type</li> + * </ul> + *  + * @generated + */ + interface Literals { + /** + * The meta object literal for the '{@link org.jboss.tools.smooks.graphical.impl.GraphInformationsImpl Graph Informations}' class. + *  + *  + * @see org.jboss.tools.smooks.graphical.impl.GraphInformationsImpl + * @see org.jboss.tools.smooks.graphical.impl.GraphicalPackageImpl#getGraphInformations() + * @generated + */ + EClass GRAPH_INFORMATIONS = eINSTANCE.getGraphInformations(); + + /** + * The meta object literal for the 'Mapping Type' containment reference feature. + *  + *  + * @generated + */ + EReference GRAPH_INFORMATIONS__MAPPING_TYPE = eINSTANCE.getGraphInformations_MappingType(); + + /** + * The meta object literal for the 'Params' containment reference feature. + *  + *  + * @generated + */ + EReference GRAPH_INFORMATIONS__PARAMS = eINSTANCE.getGraphInformations_Params(); + + /** + * The meta object literal for the '{@link org.jboss.tools.smooks.graphical.impl.MappingDataTypeImpl Mapping Data Type}' class. + *  + *  + * @see org.jboss.tools.smooks.graphical.impl.MappingDataTypeImpl + * @see org.jboss.tools.smooks.graphical.impl.GraphicalPackageImpl#getMappingDataType() + * @generated + */ + EClass MAPPING_DATA_TYPE = eINSTANCE.getMappingDataType(); + + /** + * The meta object literal for the 'Target Type ID' attribute feature. + *  + *  + * @generated + */ + EAttribute MAPPING_DATA_TYPE__TARGET_TYPE_ID = eINSTANCE.getMappingDataType_TargetTypeID(); + + /** + * The meta object literal for the 'Source Type ID' attribute feature. + *  + *  + * @generated + */ + EAttribute MAPPING_DATA_TYPE__SOURCE_TYPE_ID = eINSTANCE.getMappingDataType_SourceTypeID(); + + /** + * The meta object literal for the '{@link org.jboss.tools.smooks.graphical.impl.ParamsImpl Params}' class. + *  + *  + * @see org.jboss.tools.smooks.graphical.impl.ParamsImpl + * @see org.jboss.tools.smooks.graphical.impl.GraphicalPackageImpl#getParams() + * @generated + */ + EClass PARAMS = eINSTANCE.getParams(); + + /** + * The meta object literal for the 'Param' containment reference list feature. + *  + *  + * @generated + */ + EReference PARAMS__PARAM = eINSTANCE.getParams_Param(); + + /** + * The meta object literal for the '{@link org.jboss.tools.smooks.graphical.impl.ParamImpl Param}' class. + *  + *  + * @see org.jboss.tools.smooks.graphical.impl.ParamImpl + * @see org.jboss.tools.smooks.graphical.impl.GraphicalPackageImpl#getParam() + * @generated + */ + EClass PARAM = eINSTANCE.getParam(); + + /** + * The meta object literal for the 'Name' attribute feature. + *  + *  + * @generated + */ + EAttribute PARAM__NAME = eINSTANCE.getParam_Name(); + + /** + * The meta object literal for the 'Value' attribute feature. + *  + *  + * @generated + */ + EAttribute PARAM__VALUE = eINSTANCE.getParam_Value(); + + } + +} //GraphicalPackage Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/GraphicalPackage.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/MappingDataType.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/MappingDataType.java (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/MappingDataType.java 2008-10-20 08:08:29 UTC (rev 10957) @@ -0,0 +1,81 @@ +/** + * <copyright> + * </copyright> + * + * $Id$ + */ +package org.jboss.tools.smooks.graphical; + +import org.eclipse.emf.ecore.EObject; + +/** + *  + * A representation of the model object 'Mapping Data Type'. + *  + * + * + * The following features are supported: + * <ul> + * <li>{@link org.jboss.tools.smooks.graphical.MappingDataType#getTargetTypeID Target Type ID}</li> + * <li>{@link org.jboss.tools.smooks.graphical.MappingDataType#getSourceTypeID Source Type ID}</li> + * </ul> + * + * + * @see org.jboss.tools.smooks.graphical.GraphicalPackage#getMappingDataType() + * @model + * @generated + */ +public interface MappingDataType extends EObject { + /** + * Returns the value of the 'Target Type ID' attribute. + *  + * + * If the meaning of the 'Target Type ID' attribute isn't clear, + * there really should be more of a description here... + * + *  + * @return the value of the 'Target Type ID' attribute. + * @see #setTargetTypeID(String) + * @see org.jboss.tools.smooks.graphical.GraphicalPackage#getMappingDataType_TargetTypeID() + * @model + * @generated + */ + String getTargetTypeID(); + + /** + * Sets the value of the '{@link org.jboss.tools.smooks.graphical.MappingDataType#getTargetTypeID Target Type ID}' attribute. + *  + *  + * @param value the new value of the 'Target Type ID' attribute. + * @see #getTargetTypeID() + * @generated + */ + void setTargetTypeID(String value); + + /** + * Returns the value of the 'Source Type ID' attribute. + *  + * + * If the meaning of the 'Source Type ID' attribute isn't clear, + * there really should be more of a description here... + * + *  + * @return the value of the 'Source Type ID' attribute. + * @see #setSourceTypeID(String) + * @see org.jboss.tools.smooks.graphical.GraphicalPackage#getMappingDataType_SourceTypeID() + * @model + * @generated + */ + String getSourceTypeID(); + + /** + * Sets the value of the '{@link org.jboss.tools.smooks.graphical.MappingDataType#getSourceTypeID Source Type ID}' attribute. + *  + *  + * @param value the new value of the 'Source Type ID' attribute. + * @see #getSourceTypeID() + * @generated + */ + void setSourceTypeID(String value); + +} // MappingDataType Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/MappingDataType.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/Param.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/Param.java (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/Param.java 2008-10-20 08:08:29 UTC (rev 10957) @@ -0,0 +1,81 @@ +/** + * <copyright> + * </copyright> + * + * $Id$ + */ +package org.jboss.tools.smooks.graphical; + +import org.eclipse.emf.ecore.EObject; + +/** + *  + * A representation of the model object 'Param'. + *  + * + * + * The following features are supported: + * <ul> + * <li>{@link org.jboss.tools.smooks.graphical.Param#getName Name}</li> + * <li>{@link org.jboss.tools.smooks.graphical.Param#getValue Value}</li> + * </ul> + * + * + * @see org.jboss.tools.smooks.graphical.GraphicalPackage#getParam() + * @model + * @generated + */ +public interface Param extends EObject { + /** + * Returns the value of the 'Name' attribute. + *  + * + * If the meaning of the 'Name' attribute isn't clear, + * there really should be more of a description here... + * + *  + * @return the value of the 'Name' attribute. + * @see #setName(String) + * @see org.jboss.tools.smooks.graphical.GraphicalPackage#getParam_Name() + * @model + * @generated + */ + String getName(); + + /** + * Sets the value of the '{@link org.jboss.tools.smooks.graphical.Param#getName Name}' attribute. + *  + *  + * @param value the new value of the 'Name' attribute. + * @see #getName() + * @generated + */ + void setName(String value); + + /** + * Returns the value of the 'Value' attribute. + *  + * + * If the meaning of the 'Value' attribute isn't clear, + * there really should be more of a description here... + * + *  + * @return the value of the 'Value' attribute. + * @see #setValue(String) + * @see org.jboss.tools.smooks.graphical.GraphicalPackage#getParam_Value() + * @model + * @generated + */ + String getValue(); + + /** + * Sets the value of the '{@link org.jboss.tools.smooks.graphical.Param#getValue Value}' attribute. + *  + *  + * @param value the new value of the 'Value' attribute. + * @see #getValue() + * @generated + */ + void setValue(String value); + +} // Param Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/Param.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/Params.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/Params.java (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/Params.java 2008-10-20 08:08:29 UTC (rev 10957) @@ -0,0 +1,46 @@ +/** + * <copyright> + * </copyright> + * + * $Id$ + */ +package org.jboss.tools.smooks.graphical; + +import org.eclipse.emf.common.util.EList; + +import org.eclipse.emf.ecore.EObject; + +/** + *  + * A representation of the model object 'Params'. + *  + * + * + * The following features are supported: + * <ul> + * <li>{@link org.jboss.tools.smooks.graphical.Params#getParam Param}</li> + * </ul> + * + * + * @see org.jboss.tools.smooks.graphical.GraphicalPackage#getParams() + * @model + * @generated + */ +public interface Params extends EObject { + /** + * Returns the value of the 'Param' containment reference list. + * The list contents are of type {@link org.jboss.tools.smooks.graphical.Param}. + *  + * + * If the meaning of the 'Param' containment reference list isn't clear, + * there really should be more of a description here... + * + *  + * @return the value of the 'Param' containment reference list. + * @see org.jboss.tools.smooks.graphical.GraphicalPackage#getParams_Param() + * @model containment="true" + * @generated + */ + EList<Param> getParam(); + +} // Params Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/Params.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/impl/GraphInformationsImpl.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/impl/GraphInformationsImpl.java (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/impl/GraphInformationsImpl.java 2008-10-20 08:08:29 UTC (rev 10957) @@ -0,0 +1,247 @@ +/** + * <copyright> + * </copyright> + * + * $Id$ + */ +package org.jboss.tools.smooks.graphical.impl; + +import org.eclipse.emf.common.notify.Notification; +import org.eclipse.emf.common.notify.NotificationChain; + +import org.eclipse.emf.ecore.EClass; +import org.eclipse.emf.ecore.InternalEObject; + +import org.eclipse.emf.ecore.impl.ENotificationImpl; +import org.eclipse.emf.ecore.impl.EObjectImpl; + +import org.jboss.tools.smooks.graphical.GraphInformations; +import org.jboss.tools.smooks.graphical.GraphicalPackage; +import org.jboss.tools.smooks.graphical.MappingDataType; +import org.jboss.tools.smooks.graphical.Params; + +/** + *  + * An implementation of the model object 'Graph Informations'. + *  + * + * The following features are implemented: + * <ul> + * <li>{@link org.jboss.tools.smooks.graphical.impl.GraphInformationsImpl#getMappingType Mapping Type}</li> + * <li>{@link org.jboss.tools.smooks.graphical.impl.GraphInformationsImpl#getParams Params}</li> + * </ul> + * + * + * @generated + */ +public class GraphInformationsImpl extends EObjectImpl implements GraphInformations { + /** + * The cached value of the '{@link #getMappingType() Mapping Type}' containment reference. + *  + *  + * @see #getMappingType() + * @generated + * @ordered + */ + protected MappingDataType mappingType; + + /** + * The cached value of the '{@link #getParams() Params}' containment reference. + *  + *  + * @see #getParams() + * @generated + * @ordered + */ + protected Params params; + + /** + *  + *  + * @generated + */ + protected GraphInformationsImpl() { + super(); + } + + /** + *  + *  + * @generated + */ + @Override + protected EClass eStaticClass() { + return GraphicalPackage.Literals.GRAPH_INFORMATIONS; + } + + /** + *  + *  + * @generated + */ + public MappingDataType getMappingType() { + return mappingType; + } + + /** + *  + *  + * @generated + */ + public NotificationChain basicSetMappingType(MappingDataType newMappingType, NotificationChain msgs) { + MappingDataType oldMappingType = mappingType; + mappingType = newMappingType; + if (eNotificationRequired()) { + ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, GraphicalPackage.GRAPH_INFORMATIONS__MAPPING_TYPE, oldMappingType, newMappingType); + if (msgs == null) msgs = notification; else msgs.add(notification); + } + return msgs; + } + + /** + *  + *  + * @generated + */ + public void setMappingType(MappingDataType newMappingType) { + if (newMappingType != mappingType) { + NotificationChain msgs = null; + if (mappingType != null) + msgs = ((InternalEObject)mappingType).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - GraphicalPackage.GRAPH_INFORMATIONS__MAPPING_TYPE, null, msgs); + if (newMappingType != null) + msgs = ((InternalEObject)newMappingType).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - GraphicalPackage.GRAPH_INFORMATIONS__MAPPING_TYPE, null, msgs); + msgs = basicSetMappingType(newMappingType, msgs); + if (msgs != null) msgs.dispatch(); + } + else if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, GraphicalPackage.GRAPH_INFORMATIONS__MAPPING_TYPE, newMappingType, newMappingType)); + } + + /** + *  + *  + * @generated + */ + public Params getParams() { + return params; + } + + /** + *  + *  + * @generated + */ + public NotificationChain basicSetParams(Params newParams, NotificationChain msgs) { + Params oldParams = params; + params = newParams; + if (eNotificationRequired()) { + ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, GraphicalPackage.GRAPH_INFORMATIONS__PARAMS, oldParams, newParams); + if (msgs == null) msgs = notification; else msgs.add(notification); + } + return msgs; + } + + /** + *  + *  + * @generated + */ + public void setParams(Params newParams) { + if (newParams != params) { + NotificationChain msgs = null; + if (params != null) + msgs = ((InternalEObject)params).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - GraphicalPackage.GRAPH_INFORMATIONS__PARAMS, null, msgs); + if (newParams != null) + msgs = ((InternalEObject)newParams).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - GraphicalPackage.GRAPH_INFORMATIONS__PARAMS, null, msgs); + msgs = basicSetParams(newParams, msgs); + if (msgs != null) msgs.dispatch(); + } + else if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, GraphicalPackage.GRAPH_INFORMATIONS__PARAMS, newParams, newParams)); + } + + /** + *  + *  + * @generated + */ + @Override + public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) { + switch (featureID) { + case GraphicalPackage.GRAPH_INFORMATIONS__MAPPING_TYPE: + return basicSetMappingType(null, msgs); + case GraphicalPackage.GRAPH_INFORMATIONS__PARAMS: + return basicSetParams(null, msgs); + } + return super.eInverseRemove(otherEnd, featureID, msgs); + } + + /** + *  + *  + * @generated + */ + @Override + public Object eGet(int featureID, boolean resolve, boolean coreType) { + switch (featureID) { + case GraphicalPackage.GRAPH_INFORMATIONS__MAPPING_TYPE: + return getMappingType(); + case GraphicalPackage.GRAPH_INFORMATIONS__PARAMS: + return getParams(); + } + return super.eGet(featureID, resolve, coreType); + } + + /** + *  + *  + * @generated + */ + @Override + public void eSet(int featureID, Object newValue) { + switch (featureID) { + case GraphicalPackage.GRAPH_INFORMATIONS__MAPPING_TYPE: + setMappingType((MappingDataType)newValue); + return; + case GraphicalPackage.GRAPH_INFORMATIONS__PARAMS: + setParams((Params)newValue); + return; + } + super.eSet(featureID, newValue); + } + + /** + *  + *  + * @generated + */ + @Override + public void eUnset(int featureID) { + switch (featureID) { + case GraphicalPackage.GRAPH_INFORMATIONS__MAPPING_TYPE: + setMappingType((MappingDataType)null); + return; + case GraphicalPackage.GRAPH_INFORMATIONS__PARAMS: + setParams((Params)null); + return; + } + super.eUnset(featureID); + } + + /** + *  + *  + * @generated + */ + @Override + public boolean eIsSet(int featureID) { + switch (featureID) { + case GraphicalPackage.GRAPH_INFORMATIONS__MAPPING_TYPE: + return mappingType != null; + case GraphicalPackage.GRAPH_INFORMATIONS__PARAMS: + return params != null; + } + return super.eIsSet(featureID); + } + +} //GraphInformationsImpl Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/impl/GraphInformationsImpl.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/impl/GraphicalFactoryImpl.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/impl/GraphicalFactoryImpl.java (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/impl/GraphicalFactoryImpl.java 2008-10-20 08:08:29 UTC (rev 10957) @@ -0,0 +1,132 @@ +/** + * <copyright> + * </copyright> + * + * $Id$ + */ +package org.jboss.tools.smooks.graphical.impl; + +import org.eclipse.emf.ecore.EClass; +import org.eclipse.emf.ecore.EObject; +import org.eclipse.emf.ecore.EPackage; + +import org.eclipse.emf.ecore.impl.EFactoryImpl; + +import org.eclipse.emf.ecore.plugin.EcorePlugin; + +import org.jboss.tools.smooks.graphical.*; + +/** + *  + * An implementation of the model Factory. + *  + * @generated + */ +public class GraphicalFactoryImpl extends EFactoryImpl implements GraphicalFactory { + /** + * Creates the default factory implementation. + *  + *  + * @generated + */ + public static GraphicalFactory init() { + try { + GraphicalFactory theGraphicalFactory = (GraphicalFactory)EPackage.Registry.INSTANCE.getEFactory("http://www.jboss.org/tools/smooks"); + if (theGraphicalFactory != null) { + return theGraphicalFactory; + } + } + catch (Exception exception) { + EcorePlugin.INSTANCE.log(exception); + } + return new GraphicalFactoryImpl(); + } + + /** + * Creates an instance of the factory. + *  + *  + * @generated + */ + public GraphicalFactoryImpl() { + super(); + } + + /** + *  + *  + * @generated + */ + @Override + public EObject create(EClass eClass) { + switch (eClass.getClassifierID()) { + case GraphicalPackage.GRAPH_INFORMATIONS: return createGraphInformations(); + case GraphicalPackage.MAPPING_DATA_TYPE: return createMappingDataType(); + case GraphicalPackage.PARAMS: return createParams(); + case GraphicalPackage.PARAM: return createParam(); + default: + throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); + } + } + + /** + *  + *  + * @generated + */ + public GraphInformations createGraphInformations() { + GraphInformationsImpl graphInformations = new GraphInformationsImpl(); + return graphInformations; + } + + /** + *  + *  + * @generated + */ + public MappingDataType createMappingDataType() { + MappingDataTypeImpl mappingDataType = new MappingDataTypeImpl(); + return mappingDataType; + } + + /** + *  + *  + * @generated + */ + public Params createParams() { + ParamsImpl params = new ParamsImpl(); + return params; + } + + /** + *  + *  + * @generated + */ + public Param createParam() { + ParamImpl param = new ParamImpl(); + return param; + } + + /** + *  + *  + * @generated + */ + public GraphicalPackage getGraphicalPackage() { + return (GraphicalPackage)getEPackage(); + } + + /** + *  + *  + * @deprecated + * @generated + */ + @Deprecated + public static GraphicalPackage getPackage() { + return GraphicalPackage.eINSTANCE; + } + +} //GraphicalFactoryImpl Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/impl/GraphicalFactoryImpl.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/impl/GraphicalPackageImpl.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/impl/GraphicalPackageImpl.java (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/impl/GraphicalPackageImpl.java 2008-10-20 08:08:29 UTC (rev 10957) @@ -0,0 +1,318 @@ +/** + * <copyright> + * </copyright> + * + * $Id$ + */ +package org.jboss.tools.smooks.graphical.impl; + +import org.eclipse.emf.ecore.EAttribute; +import org.eclipse.emf.ecore.EClass; +import org.eclipse.emf.ecore.EPackage; +import org.eclipse.emf.ecore.EReference; + +import org.eclipse.emf.ecore.impl.EPackageImpl; + +import org.jboss.tools.smooks.graphical.GraphInformations; +import org.jboss.tools.smooks.graphical.GraphicalFactory; +import org.jboss.tools.smooks.graphical.GraphicalPackage; +import org.jboss.tools.smooks.graphical.MappingDataType; +import org.jboss.tools.smooks.graphical.Param; +import org.jboss.tools.smooks.graphical.Params; + +/** + *  + * An implementation of the model Package. + *  + * @generated + */ +public class GraphicalPackageImpl extends EPackageImpl implements GraphicalPackage { + /** + *  + *  + * @generated + */ + private EClass graphInformationsEClass = null; + + /** + *  + *  + * @generated + */ + private EClass mappingDataTypeEClass = null; + + /** + *  + *  + * @generated + */ + private EClass paramsEClass = null; + + /** + *  + *  + * @generated + */ + private EClass paramEClass = null; + + /** + * Creates an instance of the model Package, registered with + * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package + * package URI value. + * Note: the correct way to create the package is via the static + * factory method {@link #init init()}, which also performs + * initialization of the package, or returns the registered package, + * if one already exists. + *  + *  + * @see org.eclipse.emf.ecore.EPackage.Registry + * @see org.jboss.tools.smooks.graphical.GraphicalPackage#eNS_URI + * @see #init() + * @generated + */ + private GraphicalPackageImpl() { + super(eNS_URI, GraphicalFactory.eINSTANCE); + } + + /** + *  + *  + * @generated + */ + private static boolean isInited = false; + + /** + * Creates, registers, and initializes the Package for this + * model, and for any others upon which it depends. Simple + * dependencies are satisfied by calling this method on all + * dependent packages before doing anything else. This method drives + * initialization for interdependent packages directly, in parallel + * with this package, itself. + * Of this package and its interdependencies, all packages which + * have not yet been registered by their URI values are first created + * and registered. The packages are then initialized in two steps: + * meta-model objects for all of the packages are created before any + * are initialized, since one package's meta-model objects may refer to + * those of another. + * Invocation of this method will not affect any packages that have + * already been initialized. + *  + *  + * @see #eNS_URI + * @see #createPackageContents() + * @see #initializePackageContents() + * @generated + */ + public static GraphicalPackage init() { + if (isInited) return (GraphicalPackage)EPackage.Registry.INSTANCE.getEPackage(GraphicalPackage.eNS_URI); + + // Obtain or create and register package + GraphicalPackageImpl theGraphicalPackage = (GraphicalPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof GraphicalPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new GraphicalPackageImpl()); + + isInited = true; + + // Create package meta-data objects + theGraphicalPackage.createPackageContents(); + + // Initialize created meta-data + theGraphicalPackage.initializePackageContents(); + + // Mark meta-data to indicate it can't be changed + theGraphicalPackage.freeze(); + + return theGraphicalPackage; + } + + /** + *  + *  + * @generated + */ + public EClass getGraphInformations() { + return graphInformationsEClass; + } + + /** + *  + *  + * @generated + */ + public EReference getGraphInformations_MappingType() { + return (EReference)graphInformationsEClass.getEStructuralFeatures().get(0); + } + + /** + *  + *  + * @generated + */ + public EReference getGraphInformations_Params() { + return (EReference)graphInformationsEClass.getEStructuralFeatures().get(1); + } + + /** + *  + *  + * @generated + */ + public EClass getMappingDataType() { + return mappingDataTypeEClass; + } + + /** + *  + *  + * @generated + */ + public EAttribute getMappingDataType_TargetTypeID() { + return (EAttribute)mappingDataTypeEClass.getEStructuralFeatures().get(0); + } + + /** + *  + *  + * @generated + */ + public EAttribute getMappingDataType_SourceTypeID() { + return (EAttribute)mappingDataTypeEClass.getEStructuralFeatures().get(1); + } + + /** + *  + *  + * @generated + */ + public EClass getParams() { + return paramsEClass; + } + + /** + *  + *  + * @generated + */ + public EReference getParams_Param() { + return (EReference)paramsEClass.getEStructuralFeatures().get(0); + } + + /** + *  + *  + * @generated + */ + public EClass getParam() { + return paramEClass; + } + + /** + *  + *  + * @generated + */ + public EAttribute getParam_Name() { + return (EAttribute)paramEClass.getEStructuralFeatures().get(0); + } + + /** + *  + *  + * @generated + */ + public EAttribute getParam_Value() { + return (EAttribute)paramEClass.getEStructuralFeatures().get(1); + } + + /** + *  + *  + * @generated + */ + public GraphicalFactory getGraphicalFactory() { + return (GraphicalFactory)getEFactoryInstance(); + } + + /** + *  + *  + * @generated + */ + private boolean isCreated = false; + + /** + * Creates the meta-model objects for the package. This method is + * guarded to have no affect on any invocation but its first. + *  + *  + * @generated + */ + public void createPackageContents() { + if (isCreated) return; + isCreated = true; + + // Create classes and their features + graphInformationsEClass = createEClass(GRAPH_INFORMATIONS); + createEReference(graphInformationsEClass, GRAPH_INFORMATIONS__MAPPING_TYPE); + createEReference(graphInformationsEClass, GRAPH_INFORMATIONS__PARAMS); + + mappingDataTypeEClass = createEClass(MAPPING_DATA_TYPE); + createEAttribute(mappingDataTypeEClass, MAPPING_DATA_TYPE__TARGET_TYPE_ID); + createEAttribute(mappingDataTypeEClass, MAPPING_DATA_TYPE__SOURCE_TYPE_ID); + + paramsEClass = createEClass(PARAMS); + createEReference(paramsEClass, PARAMS__PARAM); + + paramEClass = createEClass(PARAM); + createEAttribute(paramEClass, PARAM__NAME); + createEAttribute(paramEClass, PARAM__VALUE); + } + + /** + *  + *  + * @generated + */ + private boolean isInitialized = false; + + /** + * Complete the initialization of the package and its meta-model. This + * method is guarded to have no affect on any invocation but its first. + *  + *  + * @generated + */ + public void initializePackageContents() { + if (isInitialized) return; + isInitialized = true; + + // Initialize package + setName(eNAME); + setNsPrefix(eNS_PREFIX); + setNsURI(eNS_URI); + + // Create type parameters + + // Set bounds for type parameters + + // Add supertypes to classes + + // Initialize classes and features; add operations and parameters + initEClass(graphInformationsEClass, GraphInformations.class, "GraphInformations", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEReference(getGraphInformations_MappingType(), this.getMappingDataType(), null, "mappingType", null, 0, 1, GraphInformations.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getGraphInformations_Params(), this.getParams(), null, "params", null, 0, 1, GraphInformations.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + + initEClass(mappingDataTypeEClass, MappingDataType.class, "MappingDataType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEAttribute(getMappingDataType_TargetTypeID(), ecorePackage.getEString(), "targetTypeID", null, 0, 1, MappingDataType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getMappingDataType_SourceTypeID(), ecorePackage.getEString(), "sourceTypeID", null, 0, 1, MappingDataType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + + initEClass(paramsEClass, Params.class, "Params", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEReference(getParams_Param(), this.getParam(), null, "param", null, 0, -1, Params.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + + initEClass(paramEClass, Param.class, "Param", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEAttribute(getParam_Name(), ecorePackage.getEString(), "name", null, 0, 1, Param.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getParam_Value(), ecorePackage.getEString(), "value", null, 0, 1, Param.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + + // Create resource + createResource(eNS_URI); + } + +} //GraphicalPackageImpl Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/impl/GraphicalPackageImpl.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/impl/MappingDataTypeImpl.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/impl/MappingDataTypeImpl.java (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/impl/MappingDataTypeImpl.java 2008-10-20 08:08:29 UTC (rev 10957) @@ -0,0 +1,221 @@ +/** + * <copyright> + * </copyright> + * + * $Id$ + */ +package org.jboss.tools.smooks.graphical.impl; + +import org.eclipse.emf.common.notify.Notification; + +import org.eclipse.emf.ecore.EClass; + +import org.eclipse.emf.ecore.impl.ENotificationImpl; +import org.eclipse.emf.ecore.impl.EObjectImpl; + +import org.jboss.tools.smooks.graphical.GraphicalPackage; +import org.jboss.tools.smooks.graphical.MappingDataType; + +/** + *  + * An implementation of the model object 'Mapping Data Type'. + *  + * + * The following features are implemented: + * <ul> + * <li>{@link org.jboss.tools.smooks.graphical.impl.MappingDataTypeImpl#getTargetTypeID Target Type ID}</li> + * <li>{@link org.jboss.tools.smooks.graphical.impl.MappingDataTypeImpl#getSourceTypeID Source Type ID}</li> + * </ul> + * + * + * @generated + */ +public class MappingDataTypeImpl extends EObjectImpl implements MappingDataType { + /** + * The default value of the '{@link #getTargetTypeID() Target Type ID}' attribute. + *  + *  + * @see #getTargetTypeID() + * @generated + * @ordered + */ + protected static final String TARGET_TYPE_ID_EDEFAULT = null; + + /** + * The cached value of the '{@link #getTargetTypeID() Target Type ID}' attribute. + *  + *  + * @see #getTargetTypeID() + * @generated + * @ordered + */ + protected String targetTypeID = TARGET_TYPE_ID_EDEFAULT; + + /** + * The default value of the '{@link #getSourceTypeID() Source Type ID}' attribute. + *  + *  + * @see #getSourceTypeID() + * @generated + * @ordered + */ + protected static final String SOURCE_TYPE_ID_EDEFAULT = null; + + /** + * The cached value of the '{@link #getSourceTypeID() Source Type ID}' attribute. + *  + *  + * @see #getSourceTypeID() + * @generated + * @ordered + */ + protected String sourceTypeID = SOURCE_TYPE_ID_EDEFAULT; + + /** + *  + *  + * @generated + */ + protected MappingDataTypeImpl() { + super(); + } + + /** + *  + *  + * @generated + */ + @Override + protected EClass eStaticClass() { + return GraphicalPackage.Literals.MAPPING_DATA_TYPE; + } + + /** + *  + *  + * @generated + */ + public String getTargetTypeID() { + return targetTypeID; + } + + /** + *  + *  + * @generated + */ + public void setTargetTypeID(String newTargetTypeID) { + String oldTargetTypeID = targetTypeID; + targetTypeID = newTargetTypeID; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, GraphicalPackage.MAPPING_DATA_TYPE__TARGET_TYPE_ID, oldTargetTypeID, targetTypeID)); + } + + /** + *  + *  + * @generated + */ + public String getSourceTypeID() { + return sourceTypeID; + } + + /** + *  + *  + * @generated + */ + public void setSourceTypeID(String newSourceTypeID) { + String oldSourceTypeID = sourceTypeID; + sourceTypeID = newSourceTypeID; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, GraphicalPackage.MAPPING_DATA_TYPE__SOURCE_TYPE_ID, oldSourceTypeID, sourceTypeID)); + } + + /** + *  + *  + * @generated + */ + @Override + public Object eGet(int featureID, boolean resolve, boolean coreType) { + switch (featureID) { + case GraphicalPackage.MAPPING_DATA_TYPE__TARGET_TYPE_ID: + return getTargetTypeID(); + case GraphicalPackage.MAPPING_DATA_TYPE__SOURCE_TYPE_ID: + return getSourceTypeID(); + } + return super.eGet(featureID, resolve, coreType); + } + + /** + *  + *  + * @generated + */ + @Override + public void eSet(int featureID, Object newValue) { + switch (featureID) { + case GraphicalPackage.MAPPING_DATA_TYPE__TARGET_TYPE_ID: + setTargetTypeID((String)newValue); + return; + case GraphicalPackage.MAPPING_DATA_TYPE__SOURCE_TYPE_ID: + setSourceTypeID((String)newValue); + return; + } + super.eSet(featureID, newValue); + } + + /** + *  + *  + * @generated + */ + @Override + public void eUnset(int featureID) { + switch (featureID) { + case GraphicalPackage.MAPPING_DATA_TYPE__TARGET_TYPE_ID: + setTargetTypeID(TARGET_TYPE_ID_EDEFAULT); + return; + case GraphicalPackage.MAPPING_DATA_TYPE__SOURCE_TYPE_ID: + setSourceTypeID(SOURCE_TYPE_ID_EDEFAULT); + return; + } + super.eUnset(featureID); + } + + /** + *  + *  + * @generated + */ + @Override + public boolean eIsSet(int featureID) { + switch (featureID) { + case GraphicalPackage.MAPPING_DATA_TYPE__TARGET_TYPE_ID: + return TARGET_TYPE_ID_EDEFAULT == null ? targetTypeID != null : !TARGET_TYPE_ID_EDEFAULT.equals(targetTypeID); + case GraphicalPackage.MAPPING_DATA_TYPE__SOURCE_TYPE_ID: + return SOURCE_TYPE_ID_EDEFAULT == null ? sourceTypeID != null : !SOURCE_TYPE_ID_EDEFAULT.equals(sourceTypeID); + } + return super.eIsSet(featureID); + } + + /** + *  + *  + * @generated + */ + @Override + public String toString() { + if (eIsProxy()) return super.toString(); + + StringBuffer result = new StringBuffer(super.toString()); + result.append(" (targetTypeID: "); + result.append(targetTypeID); + result.append(", sourceTypeID: "); + result.append(sourceTypeID); + result.append(')'); + return result.toString(); + } + +} //MappingDataTypeImpl Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/impl/MappingDataTypeImpl.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/impl/ParamImpl.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/impl/ParamImpl.java (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/impl/ParamImpl.java 2008-10-20 08:08:29 UTC (rev 10957) @@ -0,0 +1,221 @@ +/** + * <copyright> + * </copyright> + * + * $Id$ + */ +package org.jboss.tools.smooks.graphical.impl; + +import org.eclipse.emf.common.notify.Notification; + +import org.eclipse.emf.ecore.EClass; + +import org.eclipse.emf.ecore.impl.ENotificationImpl; +import org.eclipse.emf.ecore.impl.EObjectImpl; + +import org.jboss.tools.smooks.graphical.GraphicalPackage; +import org.jboss.tools.smooks.graphical.Param; + +/** + *  + * An implementation of the model object 'Param'. + *  + * + * The following features are implemented: + * <ul> + * <li>{@link org.jboss.tools.smooks.graphical.impl.ParamImpl#getName Name}</li> + * <li>{@link org.jboss.tools.smooks.graphical.impl.ParamImpl#getValue Value}</li> + * </ul> + * + * + * @generated + */ +public class ParamImpl extends EObjectImpl implements Param { + /** + * The default value of the '{@link #getName() Name}' attribute. + *  + *  + * @see #getName() + * @generated + * @ordered + */ + protected static final String NAME_EDEFAULT = null; + + /** + * The cached value of the '{@link #getName() Name}' attribute. + *  + *  + * @see #getName() + * @generated + * @ordered + */ + protected String name = NAME_EDEFAULT; + + /** + * The default value of the '{@link #getValue() Value}' attribute. + *  + *  + * @see #getValue() + * @generated + * @ordered + */ + protected static final String VALUE_EDEFAULT = null; + + /** + * The cached value of the '{@link #getValue() Value}' attribute. + *  + *  + * @see #getValue() + * @generated + * @ordered + */ + protected String value = VALUE_EDEFAULT; + + /** + *  + *  + * @generated + */ + protected ParamImpl() { + super(); + } + + /** + *  + *  + * @generated + */ + @Override + protected EClass eStaticClass() { + return GraphicalPackage.Literals.PARAM; + } + + /** + *  + *  + * @generated + */ + public String getName() { + return name; + } + + /** + *  + *  + * @generated + */ + public void setName(String newName) { + String oldName = name; + name = newName; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, GraphicalPackage.PARAM__NAME, oldName, name)); + } + + /** + *  + *  + * @generated + */ + public String getValue() { + return value; + } + + /** + *  + *  + * @generated + */ + public void setValue(String newValue) { + String oldValue = value; + value = newValue; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, GraphicalPackage.PARAM__VALUE, oldValue, value)); + } + + /** + *  + *  + * @generated + */ + @Override + public Object eGet(int featureID, boolean resolve, boolean coreType) { + switch (featureID) { + case GraphicalPackage.PARAM__NAME: + return getName(); + case GraphicalPackage.PARAM__VALUE: + return getValue(); + } + return super.eGet(featureID, resolve, coreType); + } + + /** + *  + *  + * @generated + */ + @Override + public void eSet(int featureID, Object newValue) { + switch (featureID) { + case GraphicalPackage.PARAM__NAME: + setName((String)newValue); + return; + case GraphicalPackage.PARAM__VALUE: + setValue((String)newValue); + return; + } + super.eSet(featureID, newValue); + } + + /** + *  + *  + * @generated + */ + @Override + public void eUnset(int featureID) { + switch (featureID) { + case GraphicalPackage.PARAM__NAME: + setName(NAME_EDEFAULT); + return; + case GraphicalPackage.PARAM__VALUE: + setValue(VALUE_EDEFAULT); + return; + } + super.eUnset(featureID); + } + + /** + *  + *  + * @generated + */ + @Override + public boolean eIsSet(int featureID) { + switch (featureID) { + case GraphicalPackage.PARAM__NAME: + return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name); + case GraphicalPackage.PARAM__VALUE: + return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals(value); + } + return super.eIsSet(featureID); + } + + /** + *  + *  + * @generated + */ + @Override + public String toString() { + if (eIsProxy()) return super.toString(); + + StringBuffer result = new StringBuffer(super.toString()); + result.append(" (name: "); + result.append(name); + result.append(", value: "); + result.append(value); + result.append(')'); + return result.toString(); + } + +} //ParamImpl Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/impl/ParamImpl.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/impl/ParamsImpl.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/impl/ParamsImpl.java (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/impl/ParamsImpl.java 2008-10-20 08:08:29 UTC (rev 10957) @@ -0,0 +1,156 @@ +/** + * <copyright> + * </copyright> + * + * $Id$ + */ +package org.jboss.tools.smooks.graphical.impl; + +import java.util.Collection; + +import org.eclipse.emf.common.notify.NotificationChain; + +import org.eclipse.emf.common.util.EList; + +import org.eclipse.emf.ecore.EClass; +import org.eclipse.emf.ecore.InternalEObject; + +import org.eclipse.emf.ecore.impl.EObjectImpl; + +import org.eclipse.emf.ecore.util.EObjectContainmentEList; +import org.eclipse.emf.ecore.util.InternalEList; + +import org.jboss.tools.smooks.graphical.GraphicalPackage; +import org.jboss.tools.smooks.graphical.Param; +import org.jboss.tools.smooks.graphical.Params; + +/** + *  + * An implementation of the model object 'Params'. + *  + * + * The following features are implemented: + * <ul> + * <li>{@link org.jboss.tools.smooks.graphical.impl.ParamsImpl#getParam Param}</li> + * </ul> + * + * + * @generated + */ +public class ParamsImpl extends EObjectImpl implements Params { + /** + * The cached value of the '{@link #getParam() Param}' containment reference list. + *  + *  + * @see #getParam() + * @generated + * @ordered + */ + protected EList<Param> param; + + /** + *  + *  + * @generated + */ + protected ParamsImpl() { + super(); + } + + /** + *  + *  + * @generated + */ + @Override + protected EClass eStaticClass() { + return GraphicalPackage.Literals.PARAMS; + } + + /** + *  + *  + * @generated + */ + public EList<Param> getParam() { + if (param == null) { + param = new EObjectContainmentEList<Param>(Param.class, this, GraphicalPackage.PARAMS__PARAM); + } + return param; + } + + /** + *  + *  + * @generated + */ + @Override + public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) { + switch (featureID) { + case GraphicalPackage.PARAMS__PARAM: + return ((InternalEList<?>)getParam()).basicRemove(otherEnd, msgs); + } + return super.eInverseRemove(otherEnd, featureID, msgs); + } + + /** + *  + *  + * @generated + */ + @Override + public Object eGet(int featureID, boolean resolve, boolean coreType) { + switch (featureID) { + case GraphicalPackage.PARAMS__PARAM: + return getParam(); + } + return super.eGet(featureID, resolve, coreType); + } + + /** + *  + *  + * @generated + */ + @SuppressWarnings("unchecked") + @Override + public void eSet(int featureID, Object newValue) { + switch (featureID) { + case GraphicalPackage.PARAMS__PARAM: + getParam().clear(); + getParam().addAll((Collection<? extends Param>)newValue); + return; + } + super.eSet(featureID, newValue); + } + + /** + *  + *  + * @generated + */ + @Override + public void eUnset(int featureID) { + switch (featureID) { + case GraphicalPackage.PARAMS__PARAM: + getParam().clear(); + return; + } + super.eUnset(featureID); + } + + /** + *  + *  + * @generated + */ + @Override + public boolean eIsSet(int featureID) { + switch (featureID) { + case GraphicalPackage.PARAMS__PARAM: + return param != null && !param.isEmpty(); + } + return super.eIsSet(featureID); + } + +} //ParamsImpl Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/impl/ParamsImpl.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/util/GraphicalAdapterFactory.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/util/GraphicalAdapterFactory.java (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/util/GraphicalAdapterFactory.java 2008-10-20 08:08:29 UTC (rev 10957) @@ -0,0 +1,178 @@ +/** + * <copyright> + * </copyright> + * + * $Id$ + */ +package org.jboss.tools.smooks.graphical.util; + +import org.eclipse.emf.common.notify.Adapter; +import org.eclipse.emf.common.notify.Notifier; + +import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl; + +import org.eclipse.emf.ecore.EObject; + +import org.jboss.tools.smooks.graphical.*; + +/** + *  + * The Adapter Factory for the model. + * It provides an adapter <code>createXXX</code> method for each class of the model. + *  + * @see org.jboss.tools.smooks.graphical.GraphicalPackage + * @generated + */ +public class GraphicalAdapterFactory extends AdapterFactoryImpl { + /** + * The cached model package. + *  + *  + * @generated + */ + protected static GraphicalPackage modelPackage; + + /** + * Creates an instance of the adapter factory. + *  + *  + * @generated + */ + public GraphicalAdapterFactory() { + if (modelPackage == null) { + modelPackage = GraphicalPackage.eINSTANCE; + } + } + + /** + * Returns whether this factory is applicable for the type of the object. + *  + * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model. + *  + * @return whether this factory is applicable for the type of the object. + * @generated + */ + @Override + public boolean isFactoryForType(Object object) { + if (object == modelPackage) { + return true; + } + if (object instanceof EObject) { + return ((EObject)object).eClass().getEPackage() == modelPackage; + } + return false; + } + + /** + * The switch the delegates to the <code>createXXX</code> methods. + *  + *  + * @generated + */ + protected GraphicalSwitch<Adapter> modelSwitch = + new GraphicalSwitch<Adapter>() { + @Override + public Adapter caseGraphInformations(GraphInformations object) { + return createGraphInformationsAdapter(); + } + @Override + public Adapter caseMappingDataType(MappingDataType object) { + return createMappingDataTypeAdapter(); + } + @Override + public Adapter caseParams(Params object) { + return createParamsAdapter(); + } + @Override + public Adapter caseParam(Param object) { + return createParamAdapter(); + } + @Override + public Adapter defaultCase(EObject object) { + return createEObjectAdapter(); + } + }; + + /** + * Creates an adapter for the <code>target</code>. + *  + *  + * @param target the object to adapt. + * @return the adapter for the <code>target</code>. + * @generated + */ + @Override + public Adapter createAdapter(Notifier target) { + return modelSwitch.doSwitch((EObject)target); + } + + + /** + * Creates a new adapter for an object of class '{@link org.jboss.tools.smooks.graphical.GraphInformations Graph Informations}'. + *  + * This default implementation returns null so that we can easily ignore cases; + * it's useful to ignore a case when inheritance will catch all the cases anyway. + *  + * @return the new adapter. + * @see org.jboss.tools.smooks.graphical.GraphInformations + * @generated + */ + public Adapter createGraphInformationsAdapter() { + return null; + } + + /** + * Creates a new adapter for an object of class '{@link org.jboss.tools.smooks.graphical.MappingDataType Mapping Data Type}'. + *  + * This default implementation returns null so that we can easily ignore cases; + * it's useful to ignore a case when inheritance will catch all the cases anyway. + *  + * @return the new adapter. + * @see org.jboss.tools.smooks.graphical.MappingDataType + * @generated + */ + public Adapter createMappingDataTypeAdapter() { + return null; + } + + /** + * Creates a new adapter for an object of class '{@link org.jboss.tools.smooks.graphical.Params Params}'. + *  + * This default implementation returns null so that we can easily ignore cases; + * it's useful to ignore a case when inheritance will catch all the cases anyway. + *  + * @return the new adapter. + * @see org.jboss.tools.smooks.graphical.Params + * @generated + */ + public Adapter createParamsAdapter() { + return null; + } + + /** + * Creates a new adapter for an object of class '{@link org.jboss.tools.smooks.graphical.Param Param}'. + *  + * This default implementation returns null so that we can easily ignore cases; + * it's useful to ignore a case when inheritance will catch all the cases anyway. + *  + * @return the new adapter. + * @see org.jboss.tools.smooks.graphical.Param + * @generated + */ + public Adapter createParamAdapter() { + return null; + } + + /** + * Creates a new adapter for the default case. + *  + * This default implementation returns null. + *  + * @return the new adapter. + * @generated + */ + public Adapter createEObjectAdapter() { + return null; + } + +} //GraphicalAdapterFactory Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/util/GraphicalAdapterFactory.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/util/GraphicalSwitch.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/util/GraphicalSwitch.java (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/util/GraphicalSwitch.java 2008-10-20 08:08:29 UTC (rev 10957) @@ -0,0 +1,193 @@ +/** + * <copyright> + * </copyright> + * + * $Id$ + */ +package org.jboss.tools.smooks.graphical.util; + +import java.util.List; + +import org.eclipse.emf.ecore.EClass; +import org.eclipse.emf.ecore.EObject; + +import org.jboss.tools.smooks.graphical.*; + +/** + *  + * The Switch for the model's inheritance hierarchy. + * It supports the call {@link #doSwitch(EObject) doSwitch(object)} + * to invoke the <code>caseXXX</code> method for each class of the model, + * starting with the actual class of the object + * and proceeding up the inheritance hierarchy + * until a non-null result is returned, + * which is the result of the switch. + *  + * @see org.jboss.tools.smooks.graphical.GraphicalPackage + * @generated + */ +public class GraphicalSwitch<T> { + /** + * The cached model package + *  + *  + * @generated + */ + protected static GraphicalPackage modelPackage; + + /** + * Creates an instance of the switch. + *  + *  + * @generated + */ + public GraphicalSwitch() { + if (modelPackage == null) { + modelPackage = GraphicalPackage.eINSTANCE; + } + } + + /** + * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result. + *  + *  + * @return the first non-null result returned by a <code>caseXXX</code> call. + * @generated + */ + public T doSwitch(EObject theEObject) { + return doSwitch(theEObject.eClass(), theEObject); + } + + /** + * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result. + *  + *  + * @return the first non-null result returned by a <code>caseXXX</code> call. + * @generated + */ + protected T doSwitch(EClass theEClass, EObject theEObject) { + if (theEClass.eContainer() == modelPackage) { + return doSwitch(theEClass.getClassifierID(), theEObject); + } + else { + List<EClass> eSuperTypes = theEClass.getESuperTypes(); + return + eSuperTypes.isEmpty() ? + defaultCase(theEObject) : + doSwitch(eSuperTypes.get(0), theEObject); + } + } + + /** + * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result. + *  + *  + * @return the first non-null result returned by a <code>caseXXX</code> call. + * @generated + */ + protected T doSwitch(int classifierID, EObject theEObject) { + switch (classifierID) { + case GraphicalPackage.GRAPH_INFORMATIONS: { + GraphInformations graphInformations = (GraphInformations)theEObject; + T result = caseGraphInformations(graphInformations); + if (result == null) result = defaultCase(theEObject); + return result; + } + case GraphicalPackage.MAPPING_DATA_TYPE: { + MappingDataType mappingDataType = (MappingDataType)theEObject; + T result = caseMappingDataType(mappingDataType); + if (result == null) result = defaultCase(theEObject); + return result; + } + case GraphicalPackage.PARAMS: { + Params params = (Params)theEObject; + T result = caseParams(params); + if (result == null) result = defaultCase(theEObject); + return result; + } + case GraphicalPackage.PARAM: { + Param param = (Param)theEObject; + T result = caseParam(param); + if (result == null) result = defaultCase(theEObject); + return result; + } + default: return defaultCase(theEObject); + } + } + + /** + * Returns the result of interpreting the object as an instance of 'Graph Informations'. + *  + * This implementation returns null; + * returning a non-null result will terminate the switch. + *  + * @param object the target of the switch. + * @return the result of interpreting the object as an instance of 'Graph Informations'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public T caseGraphInformations(GraphInformations object) { + return null; + } + + /** + * Returns the result of interpreting the object as an instance of 'Mapping Data Type'. + *  + * This implementation returns null; + * returning a non-null result will terminate the switch. + *  + * @param object the target of the switch. + * @return the result of interpreting the object as an instance of 'Mapping Data Type'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public T caseMappingDataType(MappingDataType object) { + return null; + } + + /** + * Returns the result of interpreting the object as an instance of 'Params'. + *  + * This implementation returns null; + * returning a non-null result will terminate the switch. + *  + * @param object the target of the switch. + * @return the result of interpreting the object as an instance of 'Params'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public T caseParams(Params object) { + return null; + } + + /** + * Returns the result of interpreting the object as an instance of 'Param'. + *  + * This implementation returns null; + * returning a non-null result will terminate the switch. + *  + * @param object the target of the switch. + * @return the result of interpreting the object as an instance of 'Param'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public T caseParam(Param object) { + return null; + } + + /** + * Returns the result of interpreting the object as an instance of 'EObject'. + *  + * This implementation returns null; + * returning a non-null result will terminate the switch, but this is the last case anyway. + *  + * @param object the target of the switch. + * @return the result of interpreting the object as an instance of 'EObject'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) + * @generated + */ + public T defaultCase(EObject object) { + return null; + } + +} //GraphicalSwitch Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/util/GraphicalSwitch.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/smooks/tests/org.jboss.tools.smooks.test/META-INF/MANIFEST.MF =================================================================== --- trunk/smooks/tests/org.jboss.tools.smooks.test/META-INF/MANIFEST.MF 2008-10-20 07:59:03 UTC (rev 10956) +++ trunk/smooks/tests/org.jboss.tools.smooks.test/META-INF/MANIFEST.MF 2008-10-20 08:08:29 UTC (rev 10957) @@ -6,21 +6,18 @@ Bundle-Activator: org.jboss.tools.smooks.test.Activator Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, - org.jboss.tools.smooks.graphicalInfo, org.jboss.tools.smooks.javabean, org.jboss.tools.smooks.model, org.jboss.tools.smooks.model.edit, org.jboss.tools.smooks.ui, org.jboss.tools.smooks.xml, - org.jboss.tools.smooks.xml2java, org.junit, org.eclipse.core.resources, org.eclipse.xsd, org.eclipse.xsd.edit, org.eclipse.emf, org.eclipse.emf.ecore.edit, - org.eclipse.emf.edit.ui, - org.jboss.tools.smooks.java2xml + org.eclipse.emf.edit.ui Eclipse-LazyStart: true Bundle-ClassPath: lib/dom4j-1.6.1.jar, . Modified: trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/java2java/SmooksAnalyzerTester.java =================================================================== --- trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/java2java/SmooksAnalyzerTester.java 2008-10-20 07:59:03 UTC (rev 10956) +++ trunk/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/java2java/SmooksAnalyzerTester.java 2008-10-20 08:08:29 UTC (rev 10957) @@ -1,145 +1,145 @@ -/******************************************************************************* - * Copyright (c) 2008 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 - * - * Contributors: - * Red Hat, Inc. - initial API and implementation - ******************************************************************************/ -package org.jboss.tools.smooks.test.java2java; - -import java.io.IOException; -import java.io.InputStream; -import java.lang.reflect.InvocationTargetException; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; - -import junit.framework.Assert; -import junit.framework.TestCase; - -import org.eclipse.emf.common.command.BasicCommandStack; -import org.eclipse.emf.common.command.CommandStack; -import org.eclipse.emf.ecore.EPackage.Registry; -import org.eclipse.emf.ecore.resource.Resource; -import org.eclipse.emf.ecore.xmi.impl.XMLResourceFactoryImpl; -import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain; -import org.eclipse.emf.edit.provider.ComposedAdapterFactory; -import org.eclipse.emf.edit.provider.resource.ResourceItemProviderAdapterFactory; -import org.jboss.tools.smooks.analyzer.MappingResourceConfigList; -import org.jboss.tools.smooks.analyzer.NormalSmooksModelBuilder; -import org.jboss.tools.smooks.analyzer.NormalSmooksModelPackage; -import org.jboss.tools.smooks.analyzer.ResourceConfigEraser; -import org.jboss.tools.smooks.graphical.GraphInformations; -import org.jboss.tools.smooks.graphical.GraphicalPackage; -import org.jboss.tools.smooks.javabean.analyzer.JavaBeanAnalyzer; -import org.jboss.tools.smooks.model.DocumentRoot; -import org.jboss.tools.smooks.model.SmooksPackage; -import org.jboss.tools.smooks.model.SmooksResourceListType; -import org.jboss.tools.smooks.model.provider.SmooksItemProviderAdapterFactory; -import org.jboss.tools.smooks.model.util.SmooksResourceFactoryImpl; - -/** - * @author Dart Peng Date : 2008-9-1 - */ -public class SmooksAnalyzerTester extends TestCase { - - private GraphInformations graph; - private Resource resource; - private ComposedAdapterFactory adapterFactory; - private AdapterFactoryEditingDomain editingDomain; - private Resource smooksResource; - protected CommandStack createCommandStack() { - return new BasicCommandStack(); - } - public SmooksAnalyzerTester() throws IOException { - super(); - adapterFactory = new ComposedAdapterFactory( - ComposedAdapterFactory.Descriptor.Registry.INSTANCE); - adapterFactory - .addAdapterFactory(new ResourceItemProviderAdapterFactory()); - adapterFactory - .addAdapterFactory(new SmooksItemProviderAdapterFactory()); - editingDomain = new AdapterFactoryEditingDomain(adapterFactory, - createCommandStack(), new HashMap<Resource, Boolean>()); - - - ClassLoader classLoader = SmooksAnalyzerTester.class.getClassLoader(); - Registry.INSTANCE.put(GraphicalPackage.eNS_URI, - GraphicalPackage.eINSTANCE); - Registry.INSTANCE.put(SmooksPackage.eNS_URI, SmooksPackage.eINSTANCE); - - resource = editingDomain.getResourceSet().createResource(null); - Resource gr = new XMLResourceFactoryImpl().createResource(null); - InputStream stream1 = classLoader - .getResourceAsStream("org/jboss/tools/smooks/test/java2java/Test.xml"); - InputStream stream2 = classLoader - .getResourceAsStream("org/jboss/tools/smooks/test/java2java/Test.smooks.graph"); - gr.load(stream2, Collections.EMPTY_MAP); - graph = (GraphInformations) gr.getContents().get(0); - - resource.load(stream1, Collections.EMPTY_MAP); - } - - public MappingResourceConfigList analyzeGraphical() { - try { - ClassLoader classLoader = SmooksAnalyzerTester.class - .getClassLoader(); - JavaBeanAnalyzer sourceModelAnalyzer = new JavaBeanAnalyzer(); - JavaBeanAnalyzer targetModelAnalyzer = new JavaBeanAnalyzer(); - JavaBeanAnalyzer connectionsAnalyzer = new JavaBeanAnalyzer(); - SmooksResourceListType listType = ((DocumentRoot) resource - .getContents().get(0)).getSmooksResourceList(); - Object source = sourceModelAnalyzer.buildSourceInputObjects(graph, - listType, null, classLoader); - Object target = targetModelAnalyzer.buildTargetInputObjects(graph, - listType, null, classLoader); - MappingResourceConfigList configList = connectionsAnalyzer - .analyzeMappingSmooksModel(listType, source, target); - List connections = configList.getMappingModelList(); - List relationgConnection = configList - .getRelationgResourceConfigList(); - Assert.assertTrue(!connections.isEmpty()); - Assert.assertTrue(!relationgConnection.isEmpty()); - System.out.println(connections); - return configList; - } catch (InvocationTargetException e) { - e.printStackTrace(); - } - return null; - } - - public void eraserMappingResourceConfig() { - ResourceConfigEraser eraser = new ResourceConfigEraser(); - SmooksResourceListType listType = ((DocumentRoot) resource - .getContents().get(0)).getSmooksResourceList(); - int oldCount = listType.getAbstractResourceConfig().size(); - MappingResourceConfigList configList = analyzeGraphical(); - eraser.cleanMappingResourceConfig(listType, configList, null); - int newCount = listType.getAbstractResourceConfig().size(); - Assert.assertTrue(oldCount >= newCount); - } - - public void testEraser() { - eraserMappingResourceConfig(); - } - - public void testAnalyzer() { - MappingResourceConfigList configList = analyzeGraphical(); - } - - public void generateNormalInforPackage() { - SmooksResourceListType listType = ((DocumentRoot) resource - .getContents().get(0)).getSmooksResourceList(); - NormalSmooksModelPackage modePackage = NormalSmooksModelBuilder - .getInstance().buildNormalSmooksModelPackage(listType); - - } - - public void testGenerateNormalInforPackage(){ - eraserMappingResourceConfig(); - generateNormalInforPackage(); - } -} +/******************************************************************************* + * Copyright (c) 2008 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 + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.smooks.test.java2java; + +import java.io.IOException; +import java.io.InputStream; +import java.lang.reflect.InvocationTargetException; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; + +import junit.framework.Assert; +import junit.framework.TestCase; + +import org.eclipse.emf.common.command.BasicCommandStack; +import org.eclipse.emf.common.command.CommandStack; +import org.eclipse.emf.ecore.EPackage.Registry; +import org.eclipse.emf.ecore.resource.Resource; +import org.eclipse.emf.ecore.xmi.impl.XMLResourceFactoryImpl; +import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain; +import org.eclipse.emf.edit.provider.ComposedAdapterFactory; +import org.eclipse.emf.edit.provider.resource.ResourceItemProviderAdapterFactory; +import org.jboss.tools.smooks.analyzer.MappingResourceConfigList; +import org.jboss.tools.smooks.analyzer.NormalSmooksModelBuilder; +import org.jboss.tools.smooks.analyzer.NormalSmooksModelPackage; +import org.jboss.tools.smooks.analyzer.ResourceConfigEraser; +import org.jboss.tools.smooks.graphical.GraphInformations; +import org.jboss.tools.smooks.graphical.GraphicalPackage; +import org.jboss.tools.smooks.javabean.analyzer.JavaBeanAnalyzer; +import org.jboss.tools.smooks.model.DocumentRoot; +import org.jboss.tools.smooks.model.SmooksPackage; +import org.jboss.tools.smooks.model.SmooksResourceListType; +import org.jboss.tools.smooks.model.provider.SmooksItemProviderAdapterFactory; +import org.jboss.tools.smooks.model.util.SmooksResourceFactoryImpl; + +/** + * @author Dart Peng Date : 2008-9-1 + */ +public class SmooksAnalyzerTester extends TestCase { + + private GraphInformations graph; + private Resource resource; + private ComposedAdapterFactory adapterFactory; + private AdapterFactoryEditingDomain editingDomain; + private Resource smooksResource; + protected CommandStack createCommandStack() { + return new BasicCommandStack(); + } + public SmooksAnalyzerTester() throws IOException { +// super(); + adapterFactory = new ComposedAdapterFactory( + ComposedAdapterFactory.Descriptor.Registry.INSTANCE); + adapterFactory + .addAdapterFactory(new ResourceItemProviderAdapterFactory()); + adapterFactory + .addAdapterFactory(new SmooksItemProviderAdapterFactory()); + editingDomain = new AdapterFactoryEditingDomain(adapterFactory, + createCommandStack(), new HashMap<Resource, Boolean>()); + + + ClassLoader classLoader = SmooksAnalyzerTester.class.getClassLoader(); + Registry.INSTANCE.put(GraphicalPackage.eNS_URI, + GraphicalPackage.eINSTANCE); + Registry.INSTANCE.put(SmooksPackage.eNS_URI, SmooksPackage.eINSTANCE); + + resource = new SmooksResourceFactoryImpl().createResource(null); + Resource gr = new XMLResourceFactoryImpl().createResource(null); + InputStream stream1 = classLoader + .getResourceAsStream("org/jboss/tools/smooks/test/java2java/Test.xml"); + InputStream stream2 = classLoader + .getResourceAsStream("org/jboss/tools/smooks/test/java2java/Test.smooks.graph"); + gr.load(stream2, Collections.EMPTY_MAP); + graph = (GraphInformations) gr.getContents().get(0); + + resource.load(stream1, Collections.EMPTY_MAP); + } + + public MappingResourceConfigList analyzeGraphical() { + try { + ClassLoader classLoader = SmooksAnalyzerTester.class + .getClassLoader(); + JavaBeanAnalyzer sourceModelAnalyzer = new JavaBeanAnalyzer(); + JavaBeanAnalyzer targetModelAnalyzer = new JavaBeanAnalyzer(); + JavaBeanAnalyzer connectionsAnalyzer = new JavaBeanAnalyzer(); + SmooksResourceListType listType = ((DocumentRoot) resource + .getContents().get(0)).getSmooksResourceList(); + Object source = sourceModelAnalyzer.buildSourceInputObjects(graph, + listType, null, classLoader); + Object target = targetModelAnalyzer.buildTargetInputObjects(graph, + listType, null, classLoader); + MappingResourceConfigList configList = connectionsAnalyzer + .analyzeMappingSmooksModel(listType, source, target); + List connections = configList.getMappingModelList(); + List relationgConnection = configList + .getRelationgResourceConfigList(); + Assert.assertTrue(!connections.isEmpty()); + Assert.assertTrue(!relationgConnection.isEmpty()); + System.out.println(connections); + return configList; + } catch (InvocationTargetException e) { + e.printStackTrace(); + } + return null; + } + + public void eraserMappingResourceConfig() { + ResourceConfigEraser eraser = new ResourceConfigEraser(); + SmooksResourceListType listType = ((DocumentRoot) resource + .getContents().get(0)).getSmooksResourceList(); + int oldCount = listType.getAbstractResourceConfig().size(); + MappingResourceConfigList configList = analyzeGraphical(); + eraser.cleanMappingResourceConfig(listType, configList, null); + int newCount = listType.getAbstractResourceConfig().size(); + Assert.assertTrue(oldCount >= newCount); + } + + public void testEraser() { + eraserMappingResourceConfig(); + } + + public void testAnalyzer() { + MappingResourceConfigList configList = analyzeGraphical(); + } + + public void generateNormalInforPackage() { + SmooksResourceListType listType = ((DocumentRoot) resource + .getContents().get(0)).getSmooksResourceList(); + NormalSmooksModelPackage modePackage = NormalSmooksModelBuilder + .getInstance().buildNormalSmooksModelPackage(listType); + + } + + public void testGenerateNormalInforPackage(){ + eraserMappingResourceConfig(); + generateNormalInforPackage(); + } +}

17 years, 2 months

1
0
0 / 0

JBoss Tools SVN: r10956 - in branches/jbosstools-3.0.0.Beta1/smooks: plugins/org.jboss.tools.smooks.javabean and 17 other directories.

by jbosstools-commits＠lists.jboss.org

Author: DartPeng Date: 2008-10-20 03:59:03 -0400 (Mon, 20 Oct 2008) New Revision: 10956 Added: branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.javabean/libs/dom4j-1.6.1.jar branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.javabean/src/org/jboss/tools/smooks/java2xml/ branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.javabean/src/org/jboss/tools/smooks/java2xml/analyzer/ branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.javabean/src/org/jboss/tools/smooks/java2xml/analyzer/DOM2FreeMarkerTransformor.java branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.javabean/src/org/jboss/tools/smooks/java2xml/analyzer/FreeMarkerContentReplacer.java branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.javabean/src/org/jboss/tools/smooks/java2xml/analyzer/Java2XMLAnalyzer.java branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.javabean/src/org/jboss/tools/smooks/java2xml/utils/ branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.javabean/src/org/jboss/tools/smooks/java2xml/utils/XMLConstants.java branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.javabean/src/org/jboss/tools/smooks/xml2java/ branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.javabean/src/org/jboss/tools/smooks/xml2java/analyzer/ branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.javabean/src/org/jboss/tools/smooks/xml2java/analyzer/XML2JavaAnalyzer.java branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.javabean/src/org/jboss/tools/smooks/xml2java/analyzer/XMLSourceModelAnalyzer.java branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/GraphInformations.java branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/GraphicalFactory.java branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/GraphicalPackage.java branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/MappingDataType.java branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/Param.java branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/Params.java branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/impl/ branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/impl/GraphInformationsImpl.java branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/impl/GraphicalFactoryImpl.java branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/impl/GraphicalPackageImpl.java branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/impl/MappingDataTypeImpl.java branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/impl/ParamImpl.java branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/impl/ParamsImpl.java branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/util/GraphicalAdapterFactory.java branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/util/GraphicalSwitch.java Modified: branches/jbosstools-3.0.0.Beta1/smooks/features/org.jboss.tools.smooks.feature/feature.xml branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.javabean/.classpath branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.javabean/META-INF/MANIFEST.MF branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.javabean/build.properties branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.javabean/plugin.xml branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.javabean/src/org/jboss/tools/smooks/javabean/analyzer/JavaBeanAnalyzer.java branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.javabean/src/org/jboss/tools/smooks/javabean/model/JavaBeanModel.java branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/META-INF/MANIFEST.MF branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/plugin.xml branches/jbosstools-3.0.0.Beta1/smooks/tests/org.jboss.tools.smooks.test/META-INF/MANIFEST.MF branches/jbosstools-3.0.0.Beta1/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/java2java/SmooksAnalyzerTester.java Log: JBIDE-2835 1.org.jboss.tools.smooks.graphicalInfo merge into the org.jboss.tools.smooks.ui 2.org.jboss.tools.smooks.xml2java merge into the org.jboss.tools.smooks.javabean 3.org.jboss.tools.smooks.java2xml merge into the org.jboss,tools.smooks.javabean Now there are 5 plugins for smooks tools : javabean xml ui model model.edit Modified: branches/jbosstools-3.0.0.Beta1/smooks/features/org.jboss.tools.smooks.feature/feature.xml =================================================================== --- branches/jbosstools-3.0.0.Beta1/smooks/features/org.jboss.tools.smooks.feature/feature.xml 2008-10-18 22:02:22 UTC (rev 10955) +++ branches/jbosstools-3.0.0.Beta1/smooks/features/org.jboss.tools.smooks.feature/feature.xml 2008-10-20 07:59:03 UTC (rev 10956) @@ -1,25 +1,25 @@ -<?xml version="1.0" encoding="UTF-8"?> -<feature - id="org.jboss.tools.smooks.feature" - label="Smooks Tools" - version="1.0.0" - provider-name="JBoss, a division of Red Hat"> - - <description url="http://www.example.com/description"> - Smooks Tools - </description> - - <copyright url="http://www.example.com/copyright"> +<?xml version="1.0" encoding="UTF-8"?> +<feature + id="org.jboss.tools.smooks.feature" + label="Smooks Tools" + version="1.0.0" + provider-name="JBoss, a division of Red Hat"> + + <description url="http://www.example.com/description"> + Smooks Tools + </description> + + <copyright url="http://www.example.com/copyright"> Copyright (c) 2008 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 Contributors: -Red Hat, Inc. - initial API and implementation - </copyright> - - <license url="http://www.example.com/license"> +Red Hat, Inc. - initial API and implementation + </copyright> + + <license url="http://www.example.com/license"> Eclipse Public License - v 1.0 THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR @@ -215,63 +215,42 @@ No party to this Agreement will bring a legal action under this Agreement more than one year after the cause of action arose. Each party waives its rights to a jury trial in any resulting -litigation. - </license> - - <plugin - id="org.jboss.tools.smooks.graphicalInfo" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.jboss.tools.smooks.javabean" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.jboss.tools.smooks.model" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.jboss.tools.smooks.model.edit" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.jboss.tools.smooks.ui" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.jboss.tools.smooks.xml" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.jboss.tools.smooks.xml2java" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.jboss.tools.smooks.java2xml" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - -</feature> +litigation. + </license> + + <plugin + id="org.jboss.tools.smooks.javabean" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.jboss.tools.smooks.model" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.jboss.tools.smooks.model.edit" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.jboss.tools.smooks.ui" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.jboss.tools.smooks.xml" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + +</feature> Modified: branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.javabean/.classpath =================================================================== --- branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.javabean/.classpath 2008-10-18 22:02:22 UTC (rev 10955) +++ branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.javabean/.classpath 2008-10-20 07:59:03 UTC (rev 10956) @@ -3,5 +3,6 @@ <classpathentry kind="src" path="src"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> + <classpathentry kind="lib" path="libs/dom4j-1.6.1.jar"/> <classpathentry kind="output" path="bin"/> </classpath> Modified: branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.javabean/META-INF/MANIFEST.MF =================================================================== --- branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.javabean/META-INF/MANIFEST.MF 2008-10-18 22:02:22 UTC (rev 10955) +++ branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.javabean/META-INF/MANIFEST.MF 2008-10-20 07:59:03 UTC (rev 10956) @@ -17,11 +17,16 @@ org.jboss.tools.smooks.model, org.jboss.tools.smooks.model.edit, org.eclipse.ui.ide, - org.jboss.tools.smooks.graphicalInfo + org.jboss.tools.smooks.xml;bundle-version="1.0.0" Eclipse-LazyStart: true -Export-Package: org.jboss.tools.smooks.javabean, +Export-Package: org.jboss.tools.smooks.java2xml.analyzer, + org.jboss.tools.smooks.java2xml.utils, + org.jboss.tools.smooks.javabean, org.jboss.tools.smooks.javabean.analyzer, org.jboss.tools.smooks.javabean.commandprocessor, org.jboss.tools.smooks.javabean.model, - org.jboss.tools.smooks.javabean.ui -Bundle-ClassPath: . + org.jboss.tools.smooks.javabean.ui, + org.jboss.tools.smooks.javabean.uitils, + org.jboss.tools.smooks.xml2java.analyzer +Bundle-ClassPath: ., + libs/dom4j-1.6.1.jar Modified: branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.javabean/build.properties =================================================================== --- branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.javabean/build.properties 2008-10-18 22:02:22 UTC (rev 10955) +++ branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.javabean/build.properties 2008-10-20 07:59:03 UTC (rev 10956) @@ -2,7 +2,8 @@ bin.includes = META-INF/,\ plugin.xml,\ icons/,\ - . + .,\ + libs/dom4j-1.6.1.jar jars.compile.order = smooks-javabean.jar output.smooks-javabean.jar = bin/ src.includes = src/,\ Added: branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.javabean/libs/dom4j-1.6.1.jar =================================================================== (Binary files differ) Property changes on: branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.javabean/libs/dom4j-1.6.1.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.javabean/plugin.xml =================================================================== --- branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.javabean/plugin.xml 2008-10-18 22:02:22 UTC (rev 10955) +++ branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.javabean/plugin.xml 2008-10-20 07:59:03 UTC (rev 10956) @@ -36,4 +36,35 @@ typeID="org.jboss.tools.smooks.ui.viewerInitor.javabean"> </targetModelAnalyzer> </extension> + + <extension + point="org.jboss.tools.smooks.ui.analyzer"> + <mappingAnalyzer + class="org.jboss.tools.smooks.java2xml.analyzer.Java2XMLAnalyzer" + name="Java Bean" + typeID="org.jboss.tools.smooks.ui.viewerInitor.javabean"> + <targetSourceType + id="org.jboss.tools.smooks.xml.viewerInitor.xml" + name="XML"> + </targetSourceType> + </mappingAnalyzer> + </extension> + + <extension + point="org.jboss.tools.smooks.ui.analyzer"> + <mappingAnalyzer + class="org.jboss.tools.smooks.xml2java.analyzer.XML2JavaAnalyzer" + name="XML2Java" + typeID="org.jboss.tools.smooks.xml.viewerInitor.xml"> + <targetSourceType + id="org.jboss.tools.smooks.ui.viewerInitor.javabean" + name="JavaBean"> + </targetSourceType> + </mappingAnalyzer> + <sourceModelAnalyzer + class="org.jboss.tools.smooks.xml2java.analyzer.XMLSourceModelAnalyzer" + name="XML" + typeID="org.jboss.tools.smooks.xml.viewerInitor.xml"> + </sourceModelAnalyzer> + </extension> </plugin> Added: branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.javabean/src/org/jboss/tools/smooks/java2xml/analyzer/DOM2FreeMarkerTransformor.java =================================================================== --- branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.javabean/src/org/jboss/tools/smooks/java2xml/analyzer/DOM2FreeMarkerTransformor.java (rev 0) +++ branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.javabean/src/org/jboss/tools/smooks/java2xml/analyzer/DOM2FreeMarkerTransformor.java 2008-10-20 07:59:03 UTC (rev 10956) @@ -0,0 +1,91 @@ +/******************************************************************************* + * Copyright (c) 2008 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 + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.smooks.java2xml.analyzer; + +import java.util.Iterator; +import java.util.List; + +import org.dom4j.Attribute; +import org.dom4j.Document; +import org.dom4j.Element; +import org.jboss.tools.smooks.java2xml.utils.XMLConstants; + +/** + * @author Dart Peng + * @Date : Sep 25, 2008 + */ +public class DOM2FreeMarkerTransformor { + + public String transformDOM(Document document) { + Element element = document.getRootElement(); + StringBuffer buffer = new StringBuffer(); + transform(element, buffer); + return buffer.toString(); + } + + protected void transform(Element element, StringBuffer buffer) { + String name = element.getName(); + if (XMLConstants.REPLACE_FREEMARKER_FOR_EXPRESS_ELEMENT_NAME + .equals(name)) { + String desc = element + .attributeValue(XMLConstants.REPLACE_FREEMARKER_FOR_EXPRESS_ELEMENT_ATTRIBUTE); + name = "#" + desc; + } + String attributesString = ""; + if(!isFreeMarkerExpression(name)){ + attributesString = buildAttributeString(element); + } + List children = element.elements(); + if (children.isEmpty()) { + buffer.append("<" + name + " " +attributesString + "/>"); + return; + } else { + buffer.append("<" + name + " " +attributesString + "/>"); + for (Iterator iterator = children.iterator(); iterator.hasNext();) { + Element child = (Element) iterator.next(); + transform(child, buffer); + } + if(isFreeMarkerExpression(name)){ + name = name.trim(); + int index = name.indexOf(" "); + if(index != -1){ + name = name.substring(0,index); + } + } + buffer.append("</" + name + ">"); + } + } + + private String buildAttributeString(Element element) { + List list = element.attributes(); + StringBuffer buffer = new StringBuffer(""); + for (Iterator iterator = list.iterator(); iterator.hasNext();) { + Attribute att = (Attribute) iterator.next(); + String name = att.getName(); + String value = att.getValue(); + if(value == null) value = ""; + if(name != null){ + buffer.append(name); + buffer.append("="); + buffer.append("\""); + buffer.append(value); + buffer.append("\""); + buffer.append(" "); + } + } + return buffer.toString(); + } + + private boolean isFreeMarkerExpression(String str){ + return str.startsWith("#"); + } + +} Property changes on: branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.javabean/src/org/jboss/tools/smooks/java2xml/analyzer/DOM2FreeMarkerTransformor.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.javabean/src/org/jboss/tools/smooks/java2xml/analyzer/FreeMarkerContentReplacer.java =================================================================== --- branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.javabean/src/org/jboss/tools/smooks/java2xml/analyzer/FreeMarkerContentReplacer.java (rev 0) +++ branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.javabean/src/org/jboss/tools/smooks/java2xml/analyzer/FreeMarkerContentReplacer.java 2008-10-20 07:59:03 UTC (rev 10956) @@ -0,0 +1,76 @@ +/******************************************************************************* + * Copyright (c) 2008 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 + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.smooks.java2xml.analyzer; + +import java.io.IOException; +import java.io.Reader; +import java.io.StringReader; + +/** + * @author Dart Peng + * @Date : Sep 25, 2008 + */ +public class FreeMarkerContentReplacer { + + public String replaceFreeMarkerTemplate(Reader reader) throws IOException { + StringBuffer buffer = new StringBuffer(); +// Configuration fmConfiguration = new Configuration(); +// fmConfiguration.setTagSyntax(Configuration.AUTO_DETECT_TAG_SYNTAX); +// +// Template template; +// template = new Template("XML2Java_FreeMarker", reader, fmConfiguration); +// TemplateElement root = template.getRootTreeNode(); +// visitTemplateElement(root, buffer); + return buffer.toString(); + } + + public String replaceFreeMarkerTemplate(String templateContents) + throws IOException { + Reader reader = new StringReader(templateContents); + return replaceFreeMarkerTemplate(reader); + } + +// private void visitTemplateElement(TemplateElement model, StringBuffer buffer) { + +// Enumeration children = ((TemplateElement) model).children(); +// if (!"MixedContent".equals(model.getNodeName())) { +// buffer +// .append("<" +// + XMLConstants.REPLACE_FREEMARKER_FOR_EXPRESS_ELEMENT_NAME +// + " " +// + XMLConstants.REPLACE_FREEMARKER_FOR_EXPRESS_ELEMENT_ATTRIBUTE +// + "= \"" + model.getDescription() + "\">"); +// } +// while (children.hasMoreElements()) { +// Object obj = children.nextElement(); +// if (!(obj instanceof TextBlock)) { +// TemplateElement child = (TemplateElement) obj; +// String str = child.getSource(); +// if (child.isLeaf()) { +// if (child.getNodeName().equals("DollarVariable")) { +// buffer.append(child.getSource()); +// } else { +// buffer.append(child.getDescription()); +// } +// continue; +// } +// visitTemplateElement(child, buffer); +// } else { +// buffer.append(obj); +// } +// } +// if (!"MixedContent".equals(model.getNodeName())) { +// buffer.append("</" +// + XMLConstants.REPLACE_FREEMARKER_FOR_EXPRESS_ELEMENT_NAME +// + ">"); +// } +// } +} Property changes on: branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.javabean/src/org/jboss/tools/smooks/java2xml/analyzer/FreeMarkerContentReplacer.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.javabean/src/org/jboss/tools/smooks/java2xml/analyzer/Java2XMLAnalyzer.java =================================================================== --- branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.javabean/src/org/jboss/tools/smooks/java2xml/analyzer/Java2XMLAnalyzer.java (rev 0) +++ branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.javabean/src/org/jboss/tools/smooks/java2xml/analyzer/Java2XMLAnalyzer.java 2008-10-20 07:59:03 UTC (rev 10956) @@ -0,0 +1,183 @@ +/******************************************************************************* + * Copyright (c) 2008 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 + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.smooks.java2xml.analyzer; + +import java.util.Iterator; +import java.util.List; + +import org.dom4j.Document; +import org.dom4j.DocumentHelper; +import org.dom4j.Element; +import org.eclipse.jface.dialogs.MessageDialog; +import org.eclipse.swt.widgets.Shell; +import org.jboss.tools.smooks.analyzer.AbstractAnalyzer; +import org.jboss.tools.smooks.analyzer.DesignTimeAnalyzeResult; +import org.jboss.tools.smooks.analyzer.MappingResourceConfigList; +import org.jboss.tools.smooks.analyzer.SmooksAnalyzerException; +import org.jboss.tools.smooks.javabean.model.JavaBeanModel; +import org.jboss.tools.smooks.model.ParamType; +import org.jboss.tools.smooks.model.ResourceConfigType; +import org.jboss.tools.smooks.model.SmooksFactory; +import org.jboss.tools.smooks.model.SmooksResourceListType; +import org.jboss.tools.smooks.model.util.SmooksModelUtils; +import org.jboss.tools.smooks.ui.gef.model.AbstractStructuredDataModel; +import org.jboss.tools.smooks.ui.gef.model.GraphRootModel; +import org.jboss.tools.smooks.ui.gef.model.LineConnectionModel; +import org.jboss.tools.smooks.ui.gef.model.SourceModel; +import org.jboss.tools.smooks.ui.gef.model.TargetModel; +import org.jboss.tools.smooks.ui.modelparser.SmooksConfigurationFileGenerateContext; +import org.jboss.tools.smooks.utils.UIUtils; +import org.jboss.tools.smooks.xml.model.AbstractXMLObject; +import org.jboss.tools.smooks.xml.model.DocumentObject; +import org.jboss.tools.smooks.xml.model.TagObject; +import org.jboss.tools.smooks.xml.model.TagPropertyObject; + +/** + * + * @author <a href="mailto:dpeng@redhat.com">Dart Peng</a> + * @Date 2008-9-22 + */ +public class Java2XMLAnalyzer extends AbstractAnalyzer { + + /* + * (non-Javadoc) + * + * @see org.jboss.tools.smooks.analyzer.IMappingAnalyzer#analyzeMappingGraphModel(org.jboss.tools.smooks.ui.modelparser.SmooksConfigurationFileGenerateContext) + */ + public void analyzeMappingGraphModel( + SmooksConfigurationFileGenerateContext context) + throws SmooksAnalyzerException { + // TODO will modify soon + + if(true){ + Shell shell = context.getShell(); + MessageDialog.openWarning(shell, "Warning", "The java2xml can't be generate to config file currently."); + return; + } + + GraphRootModel rootModel = context.getGraphicalRootModel(); + List<SourceModel> sourceModelList = rootModel.loadSourceModelList(); + List<TargetModel> targetModelList = rootModel.loadTargetModelList(); + + // Element rootElement = DocumentHelper.createElement(name); + TagObject root = null; + for (Iterator iterator = targetModelList.iterator(); iterator.hasNext();) { + TargetModel targetModel = (TargetModel) iterator.next(); + AbstractXMLObject tag = (AbstractXMLObject) targetModel + .getReferenceEntityModel(); + root = findTheRootTagObject(tag); + break; + } + + if (root == null) + throw new SmooksAnalyzerException("can't find the root element"); + Document document = DocumentHelper.createDocument(); + Element rootElement = generateXMLContents(rootModel, root); + document.setRootElement(rootElement); + + String string = document.asXML(); + + ResourceConfigType resource = SmooksFactory.eINSTANCE + .createResourceConfigType(); + ParamType param = SmooksFactory.eINSTANCE.createParamType(); + resource.getParam().add(param); + SmooksModelUtils.appendTextToSmooksType(param, string); + context.getGeneratorResourceList().add(resource); + System.out.println(string); + } + + protected Element generateXMLContents(GraphRootModel graph, TagObject tag) { + Element element = DocumentHelper.createElement(tag.getName()); + AbstractStructuredDataModel dataModel = UIUtils.findGraphModel(graph, + tag); + generateElementAttribute(graph, element, tag.getProperties()); + List children = tag.getChildren(); + for (Iterator iterator = children.iterator(); iterator.hasNext();) { + TagObject child = (TagObject) iterator.next(); + element.add(generateXMLContents(graph, child)); + } + + if (dataModel != null) { + LineConnectionModel connection = UIUtils + .getFirstTargetModelViaConnection(dataModel); + if (connection != null) { + SourceModel source = (SourceModel) connection.getSource(); + element + .add(DocumentHelper + .createCDATA(getTheJavaBeanString((JavaBeanModel) source + .getReferenceEntityModel()))); + } + } + + return element; + } + + protected void generateElementAttribute(GraphRootModel graph, + Element element, List<TagPropertyObject> properties) { + for (Iterator iterator = properties.iterator(); iterator.hasNext();) { + TagPropertyObject tagPropertyObject = (TagPropertyObject) iterator + .next(); + + AbstractStructuredDataModel dataModel = UIUtils.findGraphModel( + graph, tagPropertyObject); + LineConnectionModel connect = UIUtils + .getFirstTargetModelViaConnection(dataModel); + if (connect == null) + continue; + + SourceModel source = (SourceModel) connect.getSource(); + + element.addAttribute(tagPropertyObject.getName(), + getTheJavaBeanString((JavaBeanModel) source + .getReferenceEntityModel())); + } + } + + protected TagObject findTheRootTagObject(AbstractXMLObject obj) { + AbstractXMLObject parent = obj.getParent(); + if (parent instanceof DocumentObject && obj instanceof TagObject) + return (TagObject) obj; + return (TagObject) findTheRootTagObject(parent); + } + + /* + * (non-Javadoc) + * + * @see org.jboss.tools.smooks.analyzer.IMappingAnalyzer#analyzeMappingSmooksModel(org.jboss.tools.smooks.model.SmooksResourceListType, + * java.lang.Object, java.lang.Object) + */ + public MappingResourceConfigList analyzeMappingSmooksModel( + SmooksResourceListType listType, Object sourceObject, + Object targetObject) { + // TODO Auto-generated method stub + return null; + } + + protected String getTheJavaBeanString(JavaBeanModel currentModel) { + String name = currentModel.getName(); + JavaBeanModel parent = currentModel.getParent(); + while (parent != null ) { + String pn = parent.getName(); + if (pn != null) { + name = parent.getName() + "." + name; + } + parent = parent.getParent(); + } + return "${" + name + "}"; + } + + public DesignTimeAnalyzeResult analyzeGraphModel( + SmooksConfigurationFileGenerateContext context) { + // TODO Auto-generated method stub + return null; + } + +} Property changes on: branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.javabean/src/org/jboss/tools/smooks/java2xml/analyzer/Java2XMLAnalyzer.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.javabean/src/org/jboss/tools/smooks/java2xml/utils/XMLConstants.java =================================================================== --- branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.javabean/src/org/jboss/tools/smooks/java2xml/utils/XMLConstants.java (rev 0) +++ branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.javabean/src/org/jboss/tools/smooks/java2xml/utils/XMLConstants.java 2008-10-20 07:59:03 UTC (rev 10956) @@ -0,0 +1,22 @@ +/******************************************************************************* + * Copyright (c) 2008 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 + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.smooks.java2xml.utils; + +/** + * @author Dart Peng + * @Date : Sep 25, 2008 + */ +public class XMLConstants { + public static final String REPLACE_FREEMARKER_FOR_EXPRESS_ELEMENT_NAME = "replaceElementNameForFreeMarker"; + + public static final String REPLACE_FREEMARKER_FOR_EXPRESS_ELEMENT_ATTRIBUTE = "desc"; + +} Property changes on: branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.javabean/src/org/jboss/tools/smooks/java2xml/utils/XMLConstants.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.javabean/src/org/jboss/tools/smooks/javabean/analyzer/JavaBeanAnalyzer.java =================================================================== --- branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.javabean/src/org/jboss/tools/smooks/javabean/analyzer/JavaBeanAnalyzer.java 2008-10-18 22:02:22 UTC (rev 10955) +++ branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.javabean/src/org/jboss/tools/smooks/javabean/analyzer/JavaBeanAnalyzer.java 2008-10-20 07:59:03 UTC (rev 10956) @@ -350,6 +350,9 @@ AbstractStructuredDataModel sourceModel) { JavaBeanModel source = (JavaBeanModel) sourceModel .getReferenceEntityModel(); + if(source.getBeanClass().isArray()){ + return source.getName(); + } if (Collection.class.isAssignableFrom(source.getBeanClass())) { return source.getName(); } @@ -538,7 +541,7 @@ } String beanClass = SmooksModelUtils.getParmaText( "beanClass", rc); - if (targetName.equals(beanClass)) { + if (targetName!=null && targetName.trim().equals(beanClass)) { setSelectorIsUsed(sourceName); // create the first connection mappingModelList.add(new MappingModel(source, target)); Modified: branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.javabean/src/org/jboss/tools/smooks/javabean/model/JavaBeanModel.java =================================================================== --- branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.javabean/src/org/jboss/tools/smooks/javabean/model/JavaBeanModel.java 2008-10-18 22:02:22 UTC (rev 10955) +++ branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.javabean/src/org/jboss/tools/smooks/javabean/model/JavaBeanModel.java 2008-10-20 07:59:03 UTC (rev 10956) @@ -227,6 +227,7 @@ Class beanType = beanClass.getComponentType(); setMany(true); componentClass = beanType; + setGenericType(true); } return many; } Added: branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.javabean/src/org/jboss/tools/smooks/xml2java/analyzer/XML2JavaAnalyzer.java =================================================================== --- branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.javabean/src/org/jboss/tools/smooks/xml2java/analyzer/XML2JavaAnalyzer.java (rev 0) +++ branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.javabean/src/org/jboss/tools/smooks/xml2java/analyzer/XML2JavaAnalyzer.java 2008-10-20 07:59:03 UTC (rev 10956) @@ -0,0 +1,396 @@ +/******************************************************************************* + * Copyright (c) 2008 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 + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.smooks.xml2java.analyzer; + +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; + +import javax.swing.text.html.HTMLDocument.HTMLReader.TagAction; + +import org.eclipse.emf.ecore.xml.type.AnyType; +import org.jboss.tools.smooks.analyzer.AbstractAnalyzer; +import org.jboss.tools.smooks.analyzer.DesignTimeAnalyzeResult; +import org.jboss.tools.smooks.analyzer.MappingModel; +import org.jboss.tools.smooks.analyzer.MappingResourceConfigList; +import org.jboss.tools.smooks.analyzer.SmooksAnalyzerException; +import org.jboss.tools.smooks.javabean.analyzer.JavaBeanAnalyzer; +import org.jboss.tools.smooks.javabean.model.JavaBeanModel; +import org.jboss.tools.smooks.model.ParamType; +import org.jboss.tools.smooks.model.ResourceConfigType; +import org.jboss.tools.smooks.model.ResourceType; +import org.jboss.tools.smooks.model.SmooksFactory; +import org.jboss.tools.smooks.model.SmooksResourceListType; +import org.jboss.tools.smooks.model.util.SmooksModelConstants; +import org.jboss.tools.smooks.model.util.SmooksModelUtils; +import org.jboss.tools.smooks.ui.gef.model.AbstractStructuredDataModel; +import org.jboss.tools.smooks.ui.gef.model.GraphRootModel; +import org.jboss.tools.smooks.ui.gef.model.IConnectableModel; +import org.jboss.tools.smooks.ui.gef.model.LineConnectionModel; +import org.jboss.tools.smooks.ui.gef.model.SourceModel; +import org.jboss.tools.smooks.ui.gef.model.TreeItemRelationModel; +import org.jboss.tools.smooks.ui.modelparser.SmooksConfigurationFileGenerateContext; +import org.jboss.tools.smooks.utils.UIUtils; +import org.jboss.tools.smooks.xml.model.AbstractXMLObject; +import org.jboss.tools.smooks.xml.model.TagObject; +import org.jboss.tools.smooks.xml.model.TagPropertyObject; + +/** + * @author Dart Peng + * @Date Aug 20, 2008 + */ +public class XML2JavaAnalyzer extends AbstractAnalyzer { + + /* + * (non-Javadoc) + * + * @see org.jboss.tools.smooks.analyzer.IAnalyzer#analyzeMappingGraphModel(org.jboss.tools.smooks.ui.modelparser.SmooksConfigurationFileGenerateContext) + */ + public void analyzeMappingGraphModel( + SmooksConfigurationFileGenerateContext context) + throws SmooksAnalyzerException { + + SmooksResourceListType listType = context.getSmooksResourceListModel(); + GraphRootModel rootModel = context.getGraphicalRootModel(); + List children = rootModel.getChildren(); + for (Iterator iterator = children.iterator(); iterator.hasNext();) { + TreeItemRelationModel dataModel = (TreeItemRelationModel) iterator + .next(); + if (dataModel.getClass() == SourceModel.class) { + List sourceConnections = dataModel.getModelSourceConnections(); + if (sourceConnections.isEmpty()) + continue; + processSourceConnections(sourceConnections, context, listType, + (SourceModel) dataModel); + } + } + } + + protected void processSourceConnections(List sourceConnections, + SmooksConfigurationFileGenerateContext context, + SmooksResourceListType listType, SourceModel sourceModel) { + for (Iterator iterator = sourceConnections.iterator(); iterator + .hasNext();) { + LineConnectionModel connection = (LineConnectionModel) iterator + .next(); + processLineConnection(connection, context, listType, sourceModel, + null); + } + } + + protected void processLineConnection(LineConnectionModel connection, + SmooksConfigurationFileGenerateContext context, + SmooksResourceListType listType, SourceModel sourceModel, + String beanID) { + if (this.connectionIsUsed(connection)) + return; + setConnectionUsed(connection); + IConnectableModel sourceg = connection.getSource(); + if (sourceg != sourceModel) + return; + IConnectableModel targetg = connection.getTarget(); + AbstractXMLObject source = (AbstractXMLObject) sourceModel + .getReferenceEntityModel(); + JavaBeanModel target = (JavaBeanModel) ((AbstractStructuredDataModel) targetg) + .getReferenceEntityModel(); + ResourceConfigType resourceConfigType = SmooksFactory.eINSTANCE + .createResourceConfigType(); + context.getGeneratorResourceList().add(resourceConfigType); + // addResourceConfigType(listType, resourceConfigType); + // set the selector string value + resourceConfigType.setSelector(source.getName()); + // create a resource and add it to resourceConfig + ResourceType resourceType = SmooksFactory.eINSTANCE + .createResourceType(); + resourceType.setValue(SmooksModelConstants.BEAN_POPULATOR); + resourceConfigType.setResource(resourceType); + + // create param for resourceConfig + if (beanID == null) { + beanID = getBeanID(target); + } else { + if (beanID.startsWith("${") && beanID.endsWith("}")) { + beanID = beanID.substring(2, beanID.length() - 1); + } + } + + addParamTypeToResourceConfig(resourceConfigType, + SmooksModelConstants.BEAN_ID, beanID); + + // add beanClass param + addParamTypeToResourceConfig(resourceConfigType, + SmooksModelConstants.BEAN_CLASS, target.getBeanClassString()); + + // add bindings param + ParamType bindingsParam = addParamTypeToResourceConfig( + resourceConfigType, SmooksModelConstants.BINDINGS, null); + processBindingsParam(bindingsParam, target, source, context, listType); + // + } + + protected void processBindingsParam(ParamType bindingsParam, + JavaBeanModel javaBean, AbstractXMLObject source, + SmooksConfigurationFileGenerateContext context, + SmooksResourceListType listType) { + List properties = javaBean.getProperties(); + for (Iterator iterator = properties.iterator(); iterator.hasNext();) { + boolean isComplex = true; + JavaBeanModel child = (JavaBeanModel) iterator.next(); + AbstractStructuredDataModel graphModel = UIUtils.findGraphModel( + context.getGraphicalRootModel(), child); + LineConnectionModel connection = UIUtils + .getFirstTargetModelViaConnection(graphModel); + if (connection == null) + continue; + AbstractStructuredDataModel sourceModel = (AbstractStructuredDataModel) connection + .getSource(); + + if (child.isPrimitive() || child.getProperties().isEmpty()) { + isComplex = false; + } + + String selector = getSelectorID(child); + if (!isComplex) { + selector = getSelectorIDViaXMLObject( + (AbstractXMLObject) sourceModel + .getReferenceEntityModel(), source); + } + SmooksModelUtils.addBindingTypeToParamType(bindingsParam, child + .getName(), selector, null, null); + if (isComplex) { + processLineConnection(connection, context, listType, + (SourceModel) sourceModel, selector); + } else { + setConnectionUsed(connection); + continue; + } + } + } + + protected String getSelectorIDViaXMLObject(AbstractXMLObject sourceModel, + AbstractXMLObject currentRoot) { + String name = sourceModel.getName(); + if (sourceModel instanceof TagPropertyObject) { + name = "@" + name; + } + AbstractXMLObject parent = sourceModel.getParent(); + while (parent != null && parent.getName() != null) { + name = parent.getName() + " " + name; + if (parent == currentRoot) + break; + parent = parent.getParent(); + } + return name; + } + + private String getSelectorID(JavaBeanModel javaBean) { + String selectorName = javaBean.getName(); + return "${" + selectorName + "}"; + } + + protected String getBeanID(JavaBeanModel target) { + return target.getName(); + } + + public MappingResourceConfigList analyzeMappingSmooksModel( + SmooksResourceListType listType, Object sourceObject, + Object targetObject) { + if(targetObject instanceof List){ + targetObject = (JavaBeanModel) ((List)targetObject).get(0); + } + if (!(sourceObject instanceof AbstractXMLObject) + || !(targetObject instanceof JavaBeanModel)) { + return MappingResourceConfigList.createEmptyList(); + } + AbstractXMLObject sourceRoot = (AbstractXMLObject) sourceObject; + JavaBeanModel sourceTarget = (JavaBeanModel) targetObject; + + ResourceConfigType rootResourceConfig = findFirstMappingResourceConfig(listType); + String xmlName = rootResourceConfig.getSelector(); + AbstractXMLObject source = findXMLObjectByName(xmlName, sourceRoot); + if (source == null) + return MappingResourceConfigList.createEmptyList(); + + MappingResourceConfigList rcl = new MappingResourceConfigList(); + this.createMappingResourceConfigList(rcl, listType, rootResourceConfig, + source, sourceTarget); + return rcl; + } + + public static AbstractXMLObject findXMLObjectByName(String selector, + AbstractXMLObject root) { + if (selector == null) + return null; + if (selector.equals(root.getName())) { + return root; + } + if (root instanceof TagObject) { + List properties = ((TagObject) root).getProperties(); + for (Iterator iterator = properties.iterator(); iterator.hasNext();) { + TagPropertyObject pro = (TagPropertyObject) iterator.next(); + if (selector.equals(pro.getName())) + return pro; + } + List<AbstractXMLObject> tags = ((TagObject) root).getChildren(); + for (Iterator iterator = tags.iterator(); iterator.hasNext();) { + AbstractXMLObject tagChild = (AbstractXMLObject) iterator + .next(); + AbstractXMLObject result = findXMLObjectByName(selector, + tagChild); + if (result != null) + return result; + } + } + return null; + + } + + protected void createMappingResourceConfigList( + MappingResourceConfigList configList, SmooksResourceListType list, + ResourceConfigType config, AbstractXMLObject sourceRoot, + JavaBeanModel targetJavaBean) { + String selector = config.getSelector(); + String beanID = SmooksModelUtils.getParmaText( + SmooksModelConstants.BEAN_ID, config); + String beanClass = SmooksModelUtils.getParmaText( + SmooksModelConstants.BEAN_CLASS, config); + + MappingModel mapping = new MappingModel(sourceRoot, targetJavaBean); + configList.getMappingModelList().add(mapping); + configList.addResourceConfig(config); + this.setSelectorIsUsed(config.getSelector()); + + List<ParamType> paramList = config.getParam(); + ParamType bindingParam = null; + for (Iterator iterator = paramList.iterator(); iterator.hasNext();) { + ParamType paramType = (ParamType) iterator.next(); + String name = paramType.getName(); + if (SmooksModelConstants.BINDINGS.equals(name)) { + bindingParam = paramType; + break; + } + } + + if (bindingParam != null) { + List bindings = (List) bindingParam.getMixed().get( + SmooksModelUtils.ELEMENT_BINDING, true); + if (bindings != null) { + for (Iterator iterator = bindings.iterator(); iterator + .hasNext();) { + AnyType binding = (AnyType) iterator.next(); + String property = SmooksModelUtils + .getAttributeValueFromAnyType(binding, + SmooksModelUtils.ATTRIBUTE_PROPERTY); + String selectorStr = SmooksModelUtils + .getAttributeValueFromAnyType(binding, + SmooksModelUtils.ATTRIBUTE_SELECTOR); + JavaBeanModel childBean = JavaBeanAnalyzer + .findTheChildJavaBeanModel(property, targetJavaBean); + processXMLSelector(configList, config, sourceRoot, + childBean, list, selectorStr); + } + } + } + } + + protected void processXMLSelector(MappingResourceConfigList configList, + ResourceConfigType resourceConfig, AbstractXMLObject root, + JavaBeanModel targetBean, SmooksResourceListType listType, + String selector) { + if (isReferenceSelector(selector)) { + ResourceConfigType resourceConfig1 = this + .findResourceConfigTypeWithSelector(selector, listType); + String newSelector = resourceConfig1.getSelector(); + if (newSelector == null) + return; + AbstractXMLObject newRoot = findXMLObjectByName(newSelector, root); + createMappingResourceConfigList(configList, listType, + resourceConfig1, newRoot, targetBean); + } else { + AbstractXMLObject source = findXMLObjectWithSelectorString( + selector, root); + if (source != null) { + MappingModel mapping = new MappingModel(source, targetBean); + configList.getMappingModelList().add(mapping); + configList.addResourceConfig(resourceConfig); + this.setSelectorIsUsed(selector); + } + } + } + + public static AbstractXMLObject findXMLObjectWithSelectorString( + String selector, AbstractXMLObject parent) { + if (selector == null) + return null; + selector = selector.trim(); + String[] names = selector.split(" "); + if (names == null) + return null; + AbstractXMLObject current = parent; + for (int i = 0; i < names.length; i++) { + String name = names[i].trim(); + if (current instanceof TagObject && isXMLAttributeObject(name)) { + List properties = ((TagObject) current).getProperties(); + name = name.substring(1); + for (Iterator iterator = properties.iterator(); iterator + .hasNext();) { + TagPropertyObject property = (TagPropertyObject) iterator + .next(); + if (name.equals(property.getName())) { + current = property; + } + } + } else { + List list = parent.getChildren(); + for (Iterator iterator = list.iterator(); iterator.hasNext();) { + AbstractXMLObject child = (AbstractXMLObject) iterator + .next(); + if (name.equals(child.getName())) { + current = child; + break; + } + } + } + } + if (current == parent) + return null; + return current; + } + + public static boolean isXMLAttributeObject(String name) { + if (name != null && name.startsWith("@")) + return true; + return false; + } + + private ResourceConfigType findFirstMappingResourceConfig( + SmooksResourceListType listType) { + List list = listType.getAbstractResourceConfig(); + for (Iterator iterator = list.iterator(); iterator.hasNext();) { + ResourceConfigType resource = (ResourceConfigType) iterator.next(); + ResourceType rt = resource.getResource(); + if (rt == null) + continue; + String value = rt.getValue(); + if (SmooksModelConstants.BEAN_POPULATOR.equals(value)) { + return resource; + } + } + return null; + } + + public DesignTimeAnalyzeResult analyzeGraphModel( + SmooksConfigurationFileGenerateContext context) { + // TODO Auto-generated method stub + return null; + } + +} Property changes on: branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.javabean/src/org/jboss/tools/smooks/xml2java/analyzer/XML2JavaAnalyzer.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.javabean/src/org/jboss/tools/smooks/xml2java/analyzer/XMLSourceModelAnalyzer.java =================================================================== --- branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.javabean/src/org/jboss/tools/smooks/xml2java/analyzer/XMLSourceModelAnalyzer.java (rev 0) +++ branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.javabean/src/org/jboss/tools/smooks/xml2java/analyzer/XMLSourceModelAnalyzer.java 2008-10-20 07:59:03 UTC (rev 10956) @@ -0,0 +1,72 @@ +/******************************************************************************* + * Copyright (c) 2008 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 + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.smooks.xml2java.analyzer; + +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.lang.reflect.InvocationTargetException; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; + +import org.dom4j.DocumentException; +import org.eclipse.core.resources.IFile; +import org.jboss.tools.smooks.analyzer.ISourceModelAnalyzer; +import org.jboss.tools.smooks.graphical.GraphInformations; +import org.jboss.tools.smooks.graphical.Param; +import org.jboss.tools.smooks.graphical.Params; +import org.jboss.tools.smooks.model.SmooksResourceListType; +import org.jboss.tools.smooks.xml.model.AbstractXMLObject; +import org.jboss.tools.smooks.xml.model.DocumentObject; +import org.jboss.tools.smooks.xml.model.XMLObjectAnalyzer; + +/** + * @author Dart Peng + * Date : Sep 23, 2008 + */ +public class XMLSourceModelAnalyzer implements ISourceModelAnalyzer { + + public static final String XML_FILE = "xmlFile"; + + public Object buildSourceInputObjects(GraphInformations graphInfo, + SmooksResourceListType listType, IFile sourceFile) + throws InvocationTargetException { + Params params = graphInfo.getParams(); + String path = null; + if (params != null) { + List<Param> paramList = graphInfo.getParams().getParam(); + for (Iterator<Param> iterator = paramList.iterator(); iterator + .hasNext();) { + Param param = (Param) iterator.next(); + if (param.getName().equals(XML_FILE)) { + path = param.getValue(); + break; + } + } + } + if (path == null) { + // TODO tell user the filepath can't find or not ? + return null; +// throw new InvocationTargetException(new Exception( +// "xml file path can't find in the graphInfo file")); + } + XMLObjectAnalyzer objectBuilder = new XMLObjectAnalyzer(); + try { + FileInputStream stream = new FileInputStream(path); + DocumentObject document = objectBuilder.analyze(stream); + return document; + } catch (FileNotFoundException e) { + throw new InvocationTargetException(e); + } catch (DocumentException e) { + throw new InvocationTargetException(e); + } + } +} Property changes on: branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.javabean/src/org/jboss/tools/smooks/xml2java/analyzer/XMLSourceModelAnalyzer.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/META-INF/MANIFEST.MF =================================================================== --- branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/META-INF/MANIFEST.MF 2008-10-18 22:02:22 UTC (rev 10955) +++ branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/META-INF/MANIFEST.MF 2008-10-20 07:59:03 UTC (rev 10956) @@ -20,7 +20,6 @@ org.eclipse.emf, org.eclipse.emf.edit, org.jboss.tools.smooks.model.edit, - org.jboss.tools.smooks.graphicalInfo, org.eclipse.ui.views.properties.tabbed, org.eclipse.emf.edit.ui Bundle-ActivationPolicy: lazy @@ -28,6 +27,9 @@ Bundle-ClassPath: . Bundle-Vendor: JBoss Export-Package: org.jboss.tools.smooks.analyzer, + org.jboss.tools.smooks.graphical, + org.jboss.tools.smooks.graphical.impl, + org.jboss.tools.smooks.graphical.util, org.jboss.tools.smooks.ui, org.jboss.tools.smooks.ui.editors, org.jboss.tools.smooks.ui.gef, Modified: branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/plugin.xml =================================================================== --- branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/plugin.xml 2008-10-18 22:02:22 UTC (rev 10955) +++ branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/plugin.xml 2008-10-20 07:59:03 UTC (rev 10956) @@ -3,6 +3,12 @@ <plugin> <extension-point id="viewerInitor" name="viewerInitor" schema="schema/viewerInitor.exsd"/> <extension-point id="analyzer" name="analyzer" schema="schema/analyzer.exsd"/> + <extension point="org.eclipse.emf.ecore.generated_package"> + <package + uri = "http://www.jboss.org/tools/smooks/graphicalInformation" + class = "org.jboss.tools.smooks.graphical.GraphicalPackage" + genModel = "model/graphical.genmodel" /> + </extension> <extension point="org.eclipse.ui.editors"> Added: branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/GraphInformations.java =================================================================== --- branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/GraphInformations.java (rev 0) +++ branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/GraphInformations.java 2008-10-20 07:59:03 UTC (rev 10956) @@ -0,0 +1,81 @@ +/** + * <copyright> + * </copyright> + * + * $Id$ + */ +package org.jboss.tools.smooks.graphical; + +import org.eclipse.emf.ecore.EObject; + +/** + *  + * A representation of the model object 'Graph Informations'. + *  + * + * + * The following features are supported: + * <ul> + * <li>{@link org.jboss.tools.smooks.graphical.GraphInformations#getMappingType Mapping Type}</li> + * <li>{@link org.jboss.tools.smooks.graphical.GraphInformations#getParams Params}</li> + * </ul> + * + * + * @see org.jboss.tools.smooks.graphical.GraphicalPackage#getGraphInformations() + * @model + * @generated + */ +public interface GraphInformations extends EObject { + /** + * Returns the value of the 'Mapping Type' containment reference. + *  + * + * If the meaning of the 'Mapping Type' containment reference isn't clear, + * there really should be more of a description here... + * + *  + * @return the value of the 'Mapping Type' containment reference. + * @see #setMappingType(MappingDataType) + * @see org.jboss.tools.smooks.graphical.GraphicalPackage#getGraphInformations_MappingType() + * @model containment="true" + * @generated + */ + MappingDataType getMappingType(); + + /** + * Sets the value of the '{@link org.jboss.tools.smooks.graphical.GraphInformations#getMappingType Mapping Type}' containment reference. + *  + *  + * @param value the new value of the 'Mapping Type' containment reference. + * @see #getMappingType() + * @generated + */ + void setMappingType(MappingDataType value); + + /** + * Returns the value of the 'Params' containment reference. + *  + * + * If the meaning of the 'Params' containment reference isn't clear, + * there really should be more of a description here... + * + *  + * @return the value of the 'Params' containment reference. + * @see #setParams(Params) + * @see org.jboss.tools.smooks.graphical.GraphicalPackage#getGraphInformations_Params() + * @model containment="true" + * @generated + */ + Params getParams(); + + /** + * Sets the value of the '{@link org.jboss.tools.smooks.graphical.GraphInformations#getParams Params}' containment reference. + *  + *  + * @param value the new value of the 'Params' containment reference. + * @see #getParams() + * @generated + */ + void setParams(Params value); + +} // GraphInformations Property changes on: branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/GraphInformations.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/GraphicalFactory.java =================================================================== --- branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/GraphicalFactory.java (rev 0) +++ branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/GraphicalFactory.java 2008-10-20 07:59:03 UTC (rev 10956) @@ -0,0 +1,73 @@ +/** + * <copyright> + * </copyright> + * + * $Id$ + */ +package org.jboss.tools.smooks.graphical; + +import org.eclipse.emf.ecore.EFactory; + +/** + *  + * The Factory for the model. + * It provides a create method for each non-abstract class of the model. + *  + * @see org.jboss.tools.smooks.graphical.GraphicalPackage + * @generated + */ +public interface GraphicalFactory extends EFactory { + /** + * The singleton instance of the factory. + *  + *  + * @generated + */ + GraphicalFactory eINSTANCE = org.jboss.tools.smooks.graphical.impl.GraphicalFactoryImpl.init(); + + /** + * Returns a new object of class 'Graph Informations'. + *  + *  + * @return a new object of class 'Graph Informations'. + * @generated + */ + GraphInformations createGraphInformations(); + + /** + * Returns a new object of class 'Mapping Data Type'. + *  + *  + * @return a new object of class 'Mapping Data Type'. + * @generated + */ + MappingDataType createMappingDataType(); + + /** + * Returns a new object of class 'Params'. + *  + *  + * @return a new object of class 'Params'. + * @generated + */ + Params createParams(); + + /** + * Returns a new object of class 'Param'. + *  + *  + * @return a new object of class 'Param'. + * @generated + */ + Param createParam(); + + /** + * Returns the package supported by this factory. + *  + *  + * @return the package supported by this factory. + * @generated + */ + GraphicalPackage getGraphicalPackage(); + +} //GraphicalFactory Property changes on: branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/GraphicalFactory.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/GraphicalPackage.java =================================================================== --- branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/GraphicalPackage.java (rev 0) +++ branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/GraphicalPackage.java 2008-10-20 07:59:03 UTC (rev 10956) @@ -0,0 +1,439 @@ +/** + * <copyright> + * </copyright> + * + * $Id$ + */ +package org.jboss.tools.smooks.graphical; + +import org.eclipse.emf.ecore.EAttribute; +import org.eclipse.emf.ecore.EClass; +import org.eclipse.emf.ecore.EPackage; +import org.eclipse.emf.ecore.EReference; + +/** + *  + * The Package for the model. + * It contains accessors for the meta objects to represent + * <ul> + * <li>each class,</li> + * <li>each feature of each class,</li> + * <li>each enum,</li> + * <li>and each data type</li> + * </ul> + *  + * @see org.jboss.tools.smooks.graphical.GraphicalFactory + * @model kind="package" + * @generated + */ +public interface GraphicalPackage extends EPackage { + /** + * The package name. + *  + *  + * @generated + */ + String eNAME = "graphical"; + + /** + * The package namespace URI. + *  + *  + * @generated + */ + String eNS_URI = "http://www.jboss.org/tools/smooks/graphicalInformation"; + + /** + * The package namespace name. + *  + *  + * @generated + */ + String eNS_PREFIX = ""; + + /** + * The singleton instance of the package. + *  + *  + * @generated + */ + GraphicalPackage eINSTANCE = org.jboss.tools.smooks.graphical.impl.GraphicalPackageImpl.init(); + + /** + * The meta object id for the '{@link org.jboss.tools.smooks.graphical.impl.GraphInformationsImpl Graph Informations}' class. + *  + *  + * @see org.jboss.tools.smooks.graphical.impl.GraphInformationsImpl + * @see org.jboss.tools.smooks.graphical.impl.GraphicalPackageImpl#getGraphInformations() + * @generated + */ + int GRAPH_INFORMATIONS = 0; + + /** + * The feature id for the 'Mapping Type' containment reference. + *  + *  + * @generated + * @ordered + */ + int GRAPH_INFORMATIONS__MAPPING_TYPE = 0; + + /** + * The feature id for the 'Params' containment reference. + *  + *  + * @generated + * @ordered + */ + int GRAPH_INFORMATIONS__PARAMS = 1; + + /** + * The number of structural features of the 'Graph Informations' class. + *  + *  + * @generated + * @ordered + */ + int GRAPH_INFORMATIONS_FEATURE_COUNT = 2; + + /** + * The meta object id for the '{@link org.jboss.tools.smooks.graphical.impl.MappingDataTypeImpl Mapping Data Type}' class. + *  + *  + * @see org.jboss.tools.smooks.graphical.impl.MappingDataTypeImpl + * @see org.jboss.tools.smooks.graphical.impl.GraphicalPackageImpl#getMappingDataType() + * @generated + */ + int MAPPING_DATA_TYPE = 1; + + /** + * The feature id for the 'Target Type ID' attribute. + *  + *  + * @generated + * @ordered + */ + int MAPPING_DATA_TYPE__TARGET_TYPE_ID = 0; + + /** + * The feature id for the 'Source Type ID' attribute. + *  + *  + * @generated + * @ordered + */ + int MAPPING_DATA_TYPE__SOURCE_TYPE_ID = 1; + + /** + * The number of structural features of the 'Mapping Data Type' class. + *  + *  + * @generated + * @ordered + */ + int MAPPING_DATA_TYPE_FEATURE_COUNT = 2; + + /** + * The meta object id for the '{@link org.jboss.tools.smooks.graphical.impl.ParamsImpl Params}' class. + *  + *  + * @see org.jboss.tools.smooks.graphical.impl.ParamsImpl + * @see org.jboss.tools.smooks.graphical.impl.GraphicalPackageImpl#getParams() + * @generated + */ + int PARAMS = 2; + + /** + * The feature id for the 'Param' containment reference list. + *  + *  + * @generated + * @ordered + */ + int PARAMS__PARAM = 0; + + /** + * The number of structural features of the 'Params' class. + *  + *  + * @generated + * @ordered + */ + int PARAMS_FEATURE_COUNT = 1; + + /** + * The meta object id for the '{@link org.jboss.tools.smooks.graphical.impl.ParamImpl Param}' class. + *  + *  + * @see org.jboss.tools.smooks.graphical.impl.ParamImpl + * @see org.jboss.tools.smooks.graphical.impl.GraphicalPackageImpl#getParam() + * @generated + */ + int PARAM = 3; + + /** + * The feature id for the 'Name' attribute. + *  + *  + * @generated + * @ordered + */ + int PARAM__NAME = 0; + + /** + * The feature id for the 'Value' attribute. + *  + *  + * @generated + * @ordered + */ + int PARAM__VALUE = 1; + + /** + * The number of structural features of the 'Param' class. + *  + *  + * @generated + * @ordered + */ + int PARAM_FEATURE_COUNT = 2; + + + /** + * Returns the meta object for class '{@link org.jboss.tools.smooks.graphical.GraphInformations Graph Informations}'. + *  + *  + * @return the meta object for class 'Graph Informations'. + * @see org.jboss.tools.smooks.graphical.GraphInformations + * @generated + */ + EClass getGraphInformations(); + + /** + * Returns the meta object for the containment reference '{@link org.jboss.tools.smooks.graphical.GraphInformations#getMappingType Mapping Type}'. + *  + *  + * @return the meta object for the containment reference 'Mapping Type'. + * @see org.jboss.tools.smooks.graphical.GraphInformations#getMappingType() + * @see #getGraphInformations() + * @generated + */ + EReference getGraphInformations_MappingType(); + + /** + * Returns the meta object for the containment reference '{@link org.jboss.tools.smooks.graphical.GraphInformations#getParams Params}'. + *  + *  + * @return the meta object for the containment reference 'Params'. + * @see org.jboss.tools.smooks.graphical.GraphInformations#getParams() + * @see #getGraphInformations() + * @generated + */ + EReference getGraphInformations_Params(); + + /** + * Returns the meta object for class '{@link org.jboss.tools.smooks.graphical.MappingDataType Mapping Data Type}'. + *  + *  + * @return the meta object for class 'Mapping Data Type'. + * @see org.jboss.tools.smooks.graphical.MappingDataType + * @generated + */ + EClass getMappingDataType(); + + /** + * Returns the meta object for the attribute '{@link org.jboss.tools.smooks.graphical.MappingDataType#getTargetTypeID Target Type ID}'. + *  + *  + * @return the meta object for the attribute 'Target Type ID'. + * @see org.jboss.tools.smooks.graphical.MappingDataType#getTargetTypeID() + * @see #getMappingDataType() + * @generated + */ + EAttribute getMappingDataType_TargetTypeID(); + + /** + * Returns the meta object for the attribute '{@link org.jboss.tools.smooks.graphical.MappingDataType#getSourceTypeID Source Type ID}'. + *  + *  + * @return the meta object for the attribute 'Source Type ID'. + * @see org.jboss.tools.smooks.graphical.MappingDataType#getSourceTypeID() + * @see #getMappingDataType() + * @generated + */ + EAttribute getMappingDataType_SourceTypeID(); + + /** + * Returns the meta object for class '{@link org.jboss.tools.smooks.graphical.Params Params}'. + *  + *  + * @return the meta object for class 'Params'. + * @see org.jboss.tools.smooks.graphical.Params + * @generated + */ + EClass getParams(); + + /** + * Returns the meta object for the containment reference list '{@link org.jboss.tools.smooks.graphical.Params#getParam Param}'. + *  + *  + * @return the meta object for the containment reference list 'Param'. + * @see org.jboss.tools.smooks.graphical.Params#getParam() + * @see #getParams() + * @generated + */ + EReference getParams_Param(); + + /** + * Returns the meta object for class '{@link org.jboss.tools.smooks.graphical.Param Param}'. + *  + *  + * @return the meta object for class 'Param'. + * @see org.jboss.tools.smooks.graphical.Param + * @generated + */ + EClass getParam(); + + /** + * Returns the meta object for the attribute '{@link org.jboss.tools.smooks.graphical.Param#getName Name}'. + *  + *  + * @return the meta object for the attribute 'Name'. + * @see org.jboss.tools.smooks.graphical.Param#getName() + * @see #getParam() + * @generated + */ + EAttribute getParam_Name(); + + /** + * Returns the meta object for the attribute '{@link org.jboss.tools.smooks.graphical.Param#getValue Value}'. + *  + *  + * @return the meta object for the attribute 'Value'. + * @see org.jboss.tools.smooks.graphical.Param#getValue() + * @see #getParam() + * @generated + */ + EAttribute getParam_Value(); + + /** + * Returns the factory that creates the instances of the model. + *  + *  + * @return the factory that creates the instances of the model. + * @generated + */ + GraphicalFactory getGraphicalFactory(); + + /** + *  + * Defines literals for the meta objects that represent + * <ul> + * <li>each class,</li> + * <li>each feature of each class,</li> + * <li>each enum,</li> + * <li>and each data type</li> + * </ul> + *  + * @generated + */ + interface Literals { + /** + * The meta object literal for the '{@link org.jboss.tools.smooks.graphical.impl.GraphInformationsImpl Graph Informations}' class. + *  + *  + * @see org.jboss.tools.smooks.graphical.impl.GraphInformationsImpl + * @see org.jboss.tools.smooks.graphical.impl.GraphicalPackageImpl#getGraphInformations() + * @generated + */ + EClass GRAPH_INFORMATIONS = eINSTANCE.getGraphInformations(); + + /** + * The meta object literal for the 'Mapping Type' containment reference feature. + *  + *  + * @generated + */ + EReference GRAPH_INFORMATIONS__MAPPING_TYPE = eINSTANCE.getGraphInformations_MappingType(); + + /** + * The meta object literal for the 'Params' containment reference feature. + *  + *  + * @generated + */ + EReference GRAPH_INFORMATIONS__PARAMS = eINSTANCE.getGraphInformations_Params(); + + /** + * The meta object literal for the '{@link org.jboss.tools.smooks.graphical.impl.MappingDataTypeImpl Mapping Data Type}' class. + *  + *  + * @see org.jboss.tools.smooks.graphical.impl.MappingDataTypeImpl + * @see org.jboss.tools.smooks.graphical.impl.GraphicalPackageImpl#getMappingDataType() + * @generated + */ + EClass MAPPING_DATA_TYPE = eINSTANCE.getMappingDataType(); + + /** + * The meta object literal for the 'Target Type ID' attribute feature. + *  + *  + * @generated + */ + EAttribute MAPPING_DATA_TYPE__TARGET_TYPE_ID = eINSTANCE.getMappingDataType_TargetTypeID(); + + /** + * The meta object literal for the 'Source Type ID' attribute feature. + *  + *  + * @generated + */ + EAttribute MAPPING_DATA_TYPE__SOURCE_TYPE_ID = eINSTANCE.getMappingDataType_SourceTypeID(); + + /** + * The meta object literal for the '{@link org.jboss.tools.smooks.graphical.impl.ParamsImpl Params}' class. + *  + *  + * @see org.jboss.tools.smooks.graphical.impl.ParamsImpl + * @see org.jboss.tools.smooks.graphical.impl.GraphicalPackageImpl#getParams() + * @generated + */ + EClass PARAMS = eINSTANCE.getParams(); + + /** + * The meta object literal for the 'Param' containment reference list feature. + *  + *  + * @generated + */ + EReference PARAMS__PARAM = eINSTANCE.getParams_Param(); + + /** + * The meta object literal for the '{@link org.jboss.tools.smooks.graphical.impl.ParamImpl Param}' class. + *  + *  + * @see org.jboss.tools.smooks.graphical.impl.ParamImpl + * @see org.jboss.tools.smooks.graphical.impl.GraphicalPackageImpl#getParam() + * @generated + */ + EClass PARAM = eINSTANCE.getParam(); + + /** + * The meta object literal for the 'Name' attribute feature. + *  + *  + * @generated + */ + EAttribute PARAM__NAME = eINSTANCE.getParam_Name(); + + /** + * The meta object literal for the 'Value' attribute feature. + *  + *  + * @generated + */ + EAttribute PARAM__VALUE = eINSTANCE.getParam_Value(); + + } + +} //GraphicalPackage Property changes on: branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/GraphicalPackage.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/MappingDataType.java =================================================================== --- branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/MappingDataType.java (rev 0) +++ branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/MappingDataType.java 2008-10-20 07:59:03 UTC (rev 10956) @@ -0,0 +1,81 @@ +/** + * <copyright> + * </copyright> + * + * $Id$ + */ +package org.jboss.tools.smooks.graphical; + +import org.eclipse.emf.ecore.EObject; + +/** + *  + * A representation of the model object 'Mapping Data Type'. + *  + * + * + * The following features are supported: + * <ul> + * <li>{@link org.jboss.tools.smooks.graphical.MappingDataType#getTargetTypeID Target Type ID}</li> + * <li>{@link org.jboss.tools.smooks.graphical.MappingDataType#getSourceTypeID Source Type ID}</li> + * </ul> + * + * + * @see org.jboss.tools.smooks.graphical.GraphicalPackage#getMappingDataType() + * @model + * @generated + */ +public interface MappingDataType extends EObject { + /** + * Returns the value of the 'Target Type ID' attribute. + *  + * + * If the meaning of the 'Target Type ID' attribute isn't clear, + * there really should be more of a description here... + * + *  + * @return the value of the 'Target Type ID' attribute. + * @see #setTargetTypeID(String) + * @see org.jboss.tools.smooks.graphical.GraphicalPackage#getMappingDataType_TargetTypeID() + * @model + * @generated + */ + String getTargetTypeID(); + + /** + * Sets the value of the '{@link org.jboss.tools.smooks.graphical.MappingDataType#getTargetTypeID Target Type ID}' attribute. + *  + *  + * @param value the new value of the 'Target Type ID' attribute. + * @see #getTargetTypeID() + * @generated + */ + void setTargetTypeID(String value); + + /** + * Returns the value of the 'Source Type ID' attribute. + *  + * + * If the meaning of the 'Source Type ID' attribute isn't clear, + * there really should be more of a description here... + * + *  + * @return the value of the 'Source Type ID' attribute. + * @see #setSourceTypeID(String) + * @see org.jboss.tools.smooks.graphical.GraphicalPackage#getMappingDataType_SourceTypeID() + * @model + * @generated + */ + String getSourceTypeID(); + + /** + * Sets the value of the '{@link org.jboss.tools.smooks.graphical.MappingDataType#getSourceTypeID Source Type ID}' attribute. + *  + *  + * @param value the new value of the 'Source Type ID' attribute. + * @see #getSourceTypeID() + * @generated + */ + void setSourceTypeID(String value); + +} // MappingDataType Property changes on: branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/MappingDataType.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/Param.java =================================================================== --- branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/Param.java (rev 0) +++ branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/Param.java 2008-10-20 07:59:03 UTC (rev 10956) @@ -0,0 +1,81 @@ +/** + * <copyright> + * </copyright> + * + * $Id$ + */ +package org.jboss.tools.smooks.graphical; + +import org.eclipse.emf.ecore.EObject; + +/** + *  + * A representation of the model object 'Param'. + *  + * + * + * The following features are supported: + * <ul> + * <li>{@link org.jboss.tools.smooks.graphical.Param#getName Name}</li> + * <li>{@link org.jboss.tools.smooks.graphical.Param#getValue Value}</li> + * </ul> + * + * + * @see org.jboss.tools.smooks.graphical.GraphicalPackage#getParam() + * @model + * @generated + */ +public interface Param extends EObject { + /** + * Returns the value of the 'Name' attribute. + *  + * + * If the meaning of the 'Name' attribute isn't clear, + * there really should be more of a description here... + * + *  + * @return the value of the 'Name' attribute. + * @see #setName(String) + * @see org.jboss.tools.smooks.graphical.GraphicalPackage#getParam_Name() + * @model + * @generated + */ + String getName(); + + /** + * Sets the value of the '{@link org.jboss.tools.smooks.graphical.Param#getName Name}' attribute. + *  + *  + * @param value the new value of the 'Name' attribute. + * @see #getName() + * @generated + */ + void setName(String value); + + /** + * Returns the value of the 'Value' attribute. + *  + * + * If the meaning of the 'Value' attribute isn't clear, + * there really should be more of a description here... + * + *  + * @return the value of the 'Value' attribute. + * @see #setValue(String) + * @see org.jboss.tools.smooks.graphical.GraphicalPackage#getParam_Value() + * @model + * @generated + */ + String getValue(); + + /** + * Sets the value of the '{@link org.jboss.tools.smooks.graphical.Param#getValue Value}' attribute. + *  + *  + * @param value the new value of the 'Value' attribute. + * @see #getValue() + * @generated + */ + void setValue(String value); + +} // Param Property changes on: branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/Param.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/Params.java =================================================================== --- branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/Params.java (rev 0) +++ branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/Params.java 2008-10-20 07:59:03 UTC (rev 10956) @@ -0,0 +1,46 @@ +/** + * <copyright> + * </copyright> + * + * $Id$ + */ +package org.jboss.tools.smooks.graphical; + +import org.eclipse.emf.common.util.EList; + +import org.eclipse.emf.ecore.EObject; + +/** + *  + * A representation of the model object 'Params'. + *  + * + * + * The following features are supported: + * <ul> + * <li>{@link org.jboss.tools.smooks.graphical.Params#getParam Param}</li> + * </ul> + * + * + * @see org.jboss.tools.smooks.graphical.GraphicalPackage#getParams() + * @model + * @generated + */ +public interface Params extends EObject { + /** + * Returns the value of the 'Param' containment reference list. + * The list contents are of type {@link org.jboss.tools.smooks.graphical.Param}. + *  + * + * If the meaning of the 'Param' containment reference list isn't clear, + * there really should be more of a description here... + * + *  + * @return the value of the 'Param' containment reference list. + * @see org.jboss.tools.smooks.graphical.GraphicalPackage#getParams_Param() + * @model containment="true" + * @generated + */ + EList<Param> getParam(); + +} // Params Property changes on: branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/Params.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/impl/GraphInformationsImpl.java =================================================================== --- branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/impl/GraphInformationsImpl.java (rev 0) +++ branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/impl/GraphInformationsImpl.java 2008-10-20 07:59:03 UTC (rev 10956) @@ -0,0 +1,247 @@ +/** + * <copyright> + * </copyright> + * + * $Id$ + */ +package org.jboss.tools.smooks.graphical.impl; + +import org.eclipse.emf.common.notify.Notification; +import org.eclipse.emf.common.notify.NotificationChain; + +import org.eclipse.emf.ecore.EClass; +import org.eclipse.emf.ecore.InternalEObject; + +import org.eclipse.emf.ecore.impl.ENotificationImpl; +import org.eclipse.emf.ecore.impl.EObjectImpl; + +import org.jboss.tools.smooks.graphical.GraphInformations; +import org.jboss.tools.smooks.graphical.GraphicalPackage; +import org.jboss.tools.smooks.graphical.MappingDataType; +import org.jboss.tools.smooks.graphical.Params; + +/** + *  + * An implementation of the model object 'Graph Informations'. + *  + * + * The following features are implemented: + * <ul> + * <li>{@link org.jboss.tools.smooks.graphical.impl.GraphInformationsImpl#getMappingType Mapping Type}</li> + * <li>{@link org.jboss.tools.smooks.graphical.impl.GraphInformationsImpl#getParams Params}</li> + * </ul> + * + * + * @generated + */ +public class GraphInformationsImpl extends EObjectImpl implements GraphInformations { + /** + * The cached value of the '{@link #getMappingType() Mapping Type}' containment reference. + *  + *  + * @see #getMappingType() + * @generated + * @ordered + */ + protected MappingDataType mappingType; + + /** + * The cached value of the '{@link #getParams() Params}' containment reference. + *  + *  + * @see #getParams() + * @generated + * @ordered + */ + protected Params params; + + /** + *  + *  + * @generated + */ + protected GraphInformationsImpl() { + super(); + } + + /** + *  + *  + * @generated + */ + @Override + protected EClass eStaticClass() { + return GraphicalPackage.Literals.GRAPH_INFORMATIONS; + } + + /** + *  + *  + * @generated + */ + public MappingDataType getMappingType() { + return mappingType; + } + + /** + *  + *  + * @generated + */ + public NotificationChain basicSetMappingType(MappingDataType newMappingType, NotificationChain msgs) { + MappingDataType oldMappingType = mappingType; + mappingType = newMappingType; + if (eNotificationRequired()) { + ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, GraphicalPackage.GRAPH_INFORMATIONS__MAPPING_TYPE, oldMappingType, newMappingType); + if (msgs == null) msgs = notification; else msgs.add(notification); + } + return msgs; + } + + /** + *  + *  + * @generated + */ + public void setMappingType(MappingDataType newMappingType) { + if (newMappingType != mappingType) { + NotificationChain msgs = null; + if (mappingType != null) + msgs = ((InternalEObject)mappingType).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - GraphicalPackage.GRAPH_INFORMATIONS__MAPPING_TYPE, null, msgs); + if (newMappingType != null) + msgs = ((InternalEObject)newMappingType).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - GraphicalPackage.GRAPH_INFORMATIONS__MAPPING_TYPE, null, msgs); + msgs = basicSetMappingType(newMappingType, msgs); + if (msgs != null) msgs.dispatch(); + } + else if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, GraphicalPackage.GRAPH_INFORMATIONS__MAPPING_TYPE, newMappingType, newMappingType)); + } + + /** + *  + *  + * @generated + */ + public Params getParams() { + return params; + } + + /** + *  + *  + * @generated + */ + public NotificationChain basicSetParams(Params newParams, NotificationChain msgs) { + Params oldParams = params; + params = newParams; + if (eNotificationRequired()) { + ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, GraphicalPackage.GRAPH_INFORMATIONS__PARAMS, oldParams, newParams); + if (msgs == null) msgs = notification; else msgs.add(notification); + } + return msgs; + } + + /** + *  + *  + * @generated + */ + public void setParams(Params newParams) { + if (newParams != params) { + NotificationChain msgs = null; + if (params != null) + msgs = ((InternalEObject)params).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - GraphicalPackage.GRAPH_INFORMATIONS__PARAMS, null, msgs); + if (newParams != null) + msgs = ((InternalEObject)newParams).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - GraphicalPackage.GRAPH_INFORMATIONS__PARAMS, null, msgs); + msgs = basicSetParams(newParams, msgs); + if (msgs != null) msgs.dispatch(); + } + else if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, GraphicalPackage.GRAPH_INFORMATIONS__PARAMS, newParams, newParams)); + } + + /** + *  + *  + * @generated + */ + @Override + public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) { + switch (featureID) { + case GraphicalPackage.GRAPH_INFORMATIONS__MAPPING_TYPE: + return basicSetMappingType(null, msgs); + case GraphicalPackage.GRAPH_INFORMATIONS__PARAMS: + return basicSetParams(null, msgs); + } + return super.eInverseRemove(otherEnd, featureID, msgs); + } + + /** + *  + *  + * @generated + */ + @Override + public Object eGet(int featureID, boolean resolve, boolean coreType) { + switch (featureID) { + case GraphicalPackage.GRAPH_INFORMATIONS__MAPPING_TYPE: + return getMappingType(); + case GraphicalPackage.GRAPH_INFORMATIONS__PARAMS: + return getParams(); + } + return super.eGet(featureID, resolve, coreType); + } + + /** + *  + *  + * @generated + */ + @Override + public void eSet(int featureID, Object newValue) { + switch (featureID) { + case GraphicalPackage.GRAPH_INFORMATIONS__MAPPING_TYPE: + setMappingType((MappingDataType)newValue); + return; + case GraphicalPackage.GRAPH_INFORMATIONS__PARAMS: + setParams((Params)newValue); + return; + } + super.eSet(featureID, newValue); + } + + /** + *  + *  + * @generated + */ + @Override + public void eUnset(int featureID) { + switch (featureID) { + case GraphicalPackage.GRAPH_INFORMATIONS__MAPPING_TYPE: + setMappingType((MappingDataType)null); + return; + case GraphicalPackage.GRAPH_INFORMATIONS__PARAMS: + setParams((Params)null); + return; + } + super.eUnset(featureID); + } + + /** + *  + *  + * @generated + */ + @Override + public boolean eIsSet(int featureID) { + switch (featureID) { + case GraphicalPackage.GRAPH_INFORMATIONS__MAPPING_TYPE: + return mappingType != null; + case GraphicalPackage.GRAPH_INFORMATIONS__PARAMS: + return params != null; + } + return super.eIsSet(featureID); + } + +} //GraphInformationsImpl Property changes on: branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/impl/GraphInformationsImpl.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/impl/GraphicalFactoryImpl.java =================================================================== --- branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/impl/GraphicalFactoryImpl.java (rev 0) +++ branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/impl/GraphicalFactoryImpl.java 2008-10-20 07:59:03 UTC (rev 10956) @@ -0,0 +1,132 @@ +/** + * <copyright> + * </copyright> + * + * $Id$ + */ +package org.jboss.tools.smooks.graphical.impl; + +import org.eclipse.emf.ecore.EClass; +import org.eclipse.emf.ecore.EObject; +import org.eclipse.emf.ecore.EPackage; + +import org.eclipse.emf.ecore.impl.EFactoryImpl; + +import org.eclipse.emf.ecore.plugin.EcorePlugin; + +import org.jboss.tools.smooks.graphical.*; + +/** + *  + * An implementation of the model Factory. + *  + * @generated + */ +public class GraphicalFactoryImpl extends EFactoryImpl implements GraphicalFactory { + /** + * Creates the default factory implementation. + *  + *  + * @generated + */ + public static GraphicalFactory init() { + try { + GraphicalFactory theGraphicalFactory = (GraphicalFactory)EPackage.Registry.INSTANCE.getEFactory("http://www.jboss.org/tools/smooks"); + if (theGraphicalFactory != null) { + return theGraphicalFactory; + } + } + catch (Exception exception) { + EcorePlugin.INSTANCE.log(exception); + } + return new GraphicalFactoryImpl(); + } + + /** + * Creates an instance of the factory. + *  + *  + * @generated + */ + public GraphicalFactoryImpl() { + super(); + } + + /** + *  + *  + * @generated + */ + @Override + public EObject create(EClass eClass) { + switch (eClass.getClassifierID()) { + case GraphicalPackage.GRAPH_INFORMATIONS: return createGraphInformations(); + case GraphicalPackage.MAPPING_DATA_TYPE: return createMappingDataType(); + case GraphicalPackage.PARAMS: return createParams(); + case GraphicalPackage.PARAM: return createParam(); + default: + throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); + } + } + + /** + *  + *  + * @generated + */ + public GraphInformations createGraphInformations() { + GraphInformationsImpl graphInformations = new GraphInformationsImpl(); + return graphInformations; + } + + /** + *  + *  + * @generated + */ + public MappingDataType createMappingDataType() { + MappingDataTypeImpl mappingDataType = new MappingDataTypeImpl(); + return mappingDataType; + } + + /** + *  + *  + * @generated + */ + public Params createParams() { + ParamsImpl params = new ParamsImpl(); + return params; + } + + /** + *  + *  + * @generated + */ + public Param createParam() { + ParamImpl param = new ParamImpl(); + return param; + } + + /** + *  + *  + * @generated + */ + public GraphicalPackage getGraphicalPackage() { + return (GraphicalPackage)getEPackage(); + } + + /** + *  + *  + * @deprecated + * @generated + */ + @Deprecated + public static GraphicalPackage getPackage() { + return GraphicalPackage.eINSTANCE; + } + +} //GraphicalFactoryImpl Property changes on: branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/impl/GraphicalFactoryImpl.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/impl/GraphicalPackageImpl.java =================================================================== --- branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/impl/GraphicalPackageImpl.java (rev 0) +++ branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/impl/GraphicalPackageImpl.java 2008-10-20 07:59:03 UTC (rev 10956) @@ -0,0 +1,318 @@ +/** + * <copyright> + * </copyright> + * + * $Id$ + */ +package org.jboss.tools.smooks.graphical.impl; + +import org.eclipse.emf.ecore.EAttribute; +import org.eclipse.emf.ecore.EClass; +import org.eclipse.emf.ecore.EPackage; +import org.eclipse.emf.ecore.EReference; + +import org.eclipse.emf.ecore.impl.EPackageImpl; + +import org.jboss.tools.smooks.graphical.GraphInformations; +import org.jboss.tools.smooks.graphical.GraphicalFactory; +import org.jboss.tools.smooks.graphical.GraphicalPackage; +import org.jboss.tools.smooks.graphical.MappingDataType; +import org.jboss.tools.smooks.graphical.Param; +import org.jboss.tools.smooks.graphical.Params; + +/** + *  + * An implementation of the model Package. + *  + * @generated + */ +public class GraphicalPackageImpl extends EPackageImpl implements GraphicalPackage { + /** + *  + *  + * @generated + */ + private EClass graphInformationsEClass = null; + + /** + *  + *  + * @generated + */ + private EClass mappingDataTypeEClass = null; + + /** + *  + *  + * @generated + */ + private EClass paramsEClass = null; + + /** + *  + *  + * @generated + */ + private EClass paramEClass = null; + + /** + * Creates an instance of the model Package, registered with + * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package + * package URI value. + * Note: the correct way to create the package is via the static + * factory method {@link #init init()}, which also performs + * initialization of the package, or returns the registered package, + * if one already exists. + *  + *  + * @see org.eclipse.emf.ecore.EPackage.Registry + * @see org.jboss.tools.smooks.graphical.GraphicalPackage#eNS_URI + * @see #init() + * @generated + */ + private GraphicalPackageImpl() { + super(eNS_URI, GraphicalFactory.eINSTANCE); + } + + /** + *  + *  + * @generated + */ + private static boolean isInited = false; + + /** + * Creates, registers, and initializes the Package for this + * model, and for any others upon which it depends. Simple + * dependencies are satisfied by calling this method on all + * dependent packages before doing anything else. This method drives + * initialization for interdependent packages directly, in parallel + * with this package, itself. + * Of this package and its interdependencies, all packages which + * have not yet been registered by their URI values are first created + * and registered. The packages are then initialized in two steps: + * meta-model objects for all of the packages are created before any + * are initialized, since one package's meta-model objects may refer to + * those of another. + * Invocation of this method will not affect any packages that have + * already been initialized. + *  + *  + * @see #eNS_URI + * @see #createPackageContents() + * @see #initializePackageContents() + * @generated + */ + public static GraphicalPackage init() { + if (isInited) return (GraphicalPackage)EPackage.Registry.INSTANCE.getEPackage(GraphicalPackage.eNS_URI); + + // Obtain or create and register package + GraphicalPackageImpl theGraphicalPackage = (GraphicalPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof GraphicalPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new GraphicalPackageImpl()); + + isInited = true; + + // Create package meta-data objects + theGraphicalPackage.createPackageContents(); + + // Initialize created meta-data + theGraphicalPackage.initializePackageContents(); + + // Mark meta-data to indicate it can't be changed + theGraphicalPackage.freeze(); + + return theGraphicalPackage; + } + + /** + *  + *  + * @generated + */ + public EClass getGraphInformations() { + return graphInformationsEClass; + } + + /** + *  + *  + * @generated + */ + public EReference getGraphInformations_MappingType() { + return (EReference)graphInformationsEClass.getEStructuralFeatures().get(0); + } + + /** + *  + *  + * @generated + */ + public EReference getGraphInformations_Params() { + return (EReference)graphInformationsEClass.getEStructuralFeatures().get(1); + } + + /** + *  + *  + * @generated + */ + public EClass getMappingDataType() { + return mappingDataTypeEClass; + } + + /** + *  + *  + * @generated + */ + public EAttribute getMappingDataType_TargetTypeID() { + return (EAttribute)mappingDataTypeEClass.getEStructuralFeatures().get(0); + } + + /** + *  + *  + * @generated + */ + public EAttribute getMappingDataType_SourceTypeID() { + return (EAttribute)mappingDataTypeEClass.getEStructuralFeatures().get(1); + } + + /** + *  + *  + * @generated + */ + public EClass getParams() { + return paramsEClass; + } + + /** + *  + *  + * @generated + */ + public EReference getParams_Param() { + return (EReference)paramsEClass.getEStructuralFeatures().get(0); + } + + /** + *  + *  + * @generated + */ + public EClass getParam() { + return paramEClass; + } + + /** + *  + *  + * @generated + */ + public EAttribute getParam_Name() { + return (EAttribute)paramEClass.getEStructuralFeatures().get(0); + } + + /** + *  + *  + * @generated + */ + public EAttribute getParam_Value() { + return (EAttribute)paramEClass.getEStructuralFeatures().get(1); + } + + /** + *  + *  + * @generated + */ + public GraphicalFactory getGraphicalFactory() { + return (GraphicalFactory)getEFactoryInstance(); + } + + /** + *  + *  + * @generated + */ + private boolean isCreated = false; + + /** + * Creates the meta-model objects for the package. This method is + * guarded to have no affect on any invocation but its first. + *  + *  + * @generated + */ + public void createPackageContents() { + if (isCreated) return; + isCreated = true; + + // Create classes and their features + graphInformationsEClass = createEClass(GRAPH_INFORMATIONS); + createEReference(graphInformationsEClass, GRAPH_INFORMATIONS__MAPPING_TYPE); + createEReference(graphInformationsEClass, GRAPH_INFORMATIONS__PARAMS); + + mappingDataTypeEClass = createEClass(MAPPING_DATA_TYPE); + createEAttribute(mappingDataTypeEClass, MAPPING_DATA_TYPE__TARGET_TYPE_ID); + createEAttribute(mappingDataTypeEClass, MAPPING_DATA_TYPE__SOURCE_TYPE_ID); + + paramsEClass = createEClass(PARAMS); + createEReference(paramsEClass, PARAMS__PARAM); + + paramEClass = createEClass(PARAM); + createEAttribute(paramEClass, PARAM__NAME); + createEAttribute(paramEClass, PARAM__VALUE); + } + + /** + *  + *  + * @generated + */ + private boolean isInitialized = false; + + /** + * Complete the initialization of the package and its meta-model. This + * method is guarded to have no affect on any invocation but its first. + *  + *  + * @generated + */ + public void initializePackageContents() { + if (isInitialized) return; + isInitialized = true; + + // Initialize package + setName(eNAME); + setNsPrefix(eNS_PREFIX); + setNsURI(eNS_URI); + + // Create type parameters + + // Set bounds for type parameters + + // Add supertypes to classes + + // Initialize classes and features; add operations and parameters + initEClass(graphInformationsEClass, GraphInformations.class, "GraphInformations", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEReference(getGraphInformations_MappingType(), this.getMappingDataType(), null, "mappingType", null, 0, 1, GraphInformations.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getGraphInformations_Params(), this.getParams(), null, "params", null, 0, 1, GraphInformations.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + + initEClass(mappingDataTypeEClass, MappingDataType.class, "MappingDataType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEAttribute(getMappingDataType_TargetTypeID(), ecorePackage.getEString(), "targetTypeID", null, 0, 1, MappingDataType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getMappingDataType_SourceTypeID(), ecorePackage.getEString(), "sourceTypeID", null, 0, 1, MappingDataType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + + initEClass(paramsEClass, Params.class, "Params", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEReference(getParams_Param(), this.getParam(), null, "param", null, 0, -1, Params.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + + initEClass(paramEClass, Param.class, "Param", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEAttribute(getParam_Name(), ecorePackage.getEString(), "name", null, 0, 1, Param.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getParam_Value(), ecorePackage.getEString(), "value", null, 0, 1, Param.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + + // Create resource + createResource(eNS_URI); + } + +} //GraphicalPackageImpl Property changes on: branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/impl/GraphicalPackageImpl.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/impl/MappingDataTypeImpl.java =================================================================== --- branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/impl/MappingDataTypeImpl.java (rev 0) +++ branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/impl/MappingDataTypeImpl.java 2008-10-20 07:59:03 UTC (rev 10956) @@ -0,0 +1,221 @@ +/** + * <copyright> + * </copyright> + * + * $Id$ + */ +package org.jboss.tools.smooks.graphical.impl; + +import org.eclipse.emf.common.notify.Notification; + +import org.eclipse.emf.ecore.EClass; + +import org.eclipse.emf.ecore.impl.ENotificationImpl; +import org.eclipse.emf.ecore.impl.EObjectImpl; + +import org.jboss.tools.smooks.graphical.GraphicalPackage; +import org.jboss.tools.smooks.graphical.MappingDataType; + +/** + *  + * An implementation of the model object 'Mapping Data Type'. + *  + * + * The following features are implemented: + * <ul> + * <li>{@link org.jboss.tools.smooks.graphical.impl.MappingDataTypeImpl#getTargetTypeID Target Type ID}</li> + * <li>{@link org.jboss.tools.smooks.graphical.impl.MappingDataTypeImpl#getSourceTypeID Source Type ID}</li> + * </ul> + * + * + * @generated + */ +public class MappingDataTypeImpl extends EObjectImpl implements MappingDataType { + /** + * The default value of the '{@link #getTargetTypeID() Target Type ID}' attribute. + *  + *  + * @see #getTargetTypeID() + * @generated + * @ordered + */ + protected static final String TARGET_TYPE_ID_EDEFAULT = null; + + /** + * The cached value of the '{@link #getTargetTypeID() Target Type ID}' attribute. + *  + *  + * @see #getTargetTypeID() + * @generated + * @ordered + */ + protected String targetTypeID = TARGET_TYPE_ID_EDEFAULT; + + /** + * The default value of the '{@link #getSourceTypeID() Source Type ID}' attribute. + *  + *  + * @see #getSourceTypeID() + * @generated + * @ordered + */ + protected static final String SOURCE_TYPE_ID_EDEFAULT = null; + + /** + * The cached value of the '{@link #getSourceTypeID() Source Type ID}' attribute. + *  + *  + * @see #getSourceTypeID() + * @generated + * @ordered + */ + protected String sourceTypeID = SOURCE_TYPE_ID_EDEFAULT; + + /** + *  + *  + * @generated + */ + protected MappingDataTypeImpl() { + super(); + } + + /** + *  + *  + * @generated + */ + @Override + protected EClass eStaticClass() { + return GraphicalPackage.Literals.MAPPING_DATA_TYPE; + } + + /** + *  + *  + * @generated + */ + public String getTargetTypeID() { + return targetTypeID; + } + + /** + *  + *  + * @generated + */ + public void setTargetTypeID(String newTargetTypeID) { + String oldTargetTypeID = targetTypeID; + targetTypeID = newTargetTypeID; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, GraphicalPackage.MAPPING_DATA_TYPE__TARGET_TYPE_ID, oldTargetTypeID, targetTypeID)); + } + + /** + *  + *  + * @generated + */ + public String getSourceTypeID() { + return sourceTypeID; + } + + /** + *  + *  + * @generated + */ + public void setSourceTypeID(String newSourceTypeID) { + String oldSourceTypeID = sourceTypeID; + sourceTypeID = newSourceTypeID; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, GraphicalPackage.MAPPING_DATA_TYPE__SOURCE_TYPE_ID, oldSourceTypeID, sourceTypeID)); + } + + /** + *  + *  + * @generated + */ + @Override + public Object eGet(int featureID, boolean resolve, boolean coreType) { + switch (featureID) { + case GraphicalPackage.MAPPING_DATA_TYPE__TARGET_TYPE_ID: + return getTargetTypeID(); + case GraphicalPackage.MAPPING_DATA_TYPE__SOURCE_TYPE_ID: + return getSourceTypeID(); + } + return super.eGet(featureID, resolve, coreType); + } + + /** + *  + *  + * @generated + */ + @Override + public void eSet(int featureID, Object newValue) { + switch (featureID) { + case GraphicalPackage.MAPPING_DATA_TYPE__TARGET_TYPE_ID: + setTargetTypeID((String)newValue); + return; + case GraphicalPackage.MAPPING_DATA_TYPE__SOURCE_TYPE_ID: + setSourceTypeID((String)newValue); + return; + } + super.eSet(featureID, newValue); + } + + /** + *  + *  + * @generated + */ + @Override + public void eUnset(int featureID) { + switch (featureID) { + case GraphicalPackage.MAPPING_DATA_TYPE__TARGET_TYPE_ID: + setTargetTypeID(TARGET_TYPE_ID_EDEFAULT); + return; + case GraphicalPackage.MAPPING_DATA_TYPE__SOURCE_TYPE_ID: + setSourceTypeID(SOURCE_TYPE_ID_EDEFAULT); + return; + } + super.eUnset(featureID); + } + + /** + *  + *  + * @generated + */ + @Override + public boolean eIsSet(int featureID) { + switch (featureID) { + case GraphicalPackage.MAPPING_DATA_TYPE__TARGET_TYPE_ID: + return TARGET_TYPE_ID_EDEFAULT == null ? targetTypeID != null : !TARGET_TYPE_ID_EDEFAULT.equals(targetTypeID); + case GraphicalPackage.MAPPING_DATA_TYPE__SOURCE_TYPE_ID: + return SOURCE_TYPE_ID_EDEFAULT == null ? sourceTypeID != null : !SOURCE_TYPE_ID_EDEFAULT.equals(sourceTypeID); + } + return super.eIsSet(featureID); + } + + /** + *  + *  + * @generated + */ + @Override + public String toString() { + if (eIsProxy()) return super.toString(); + + StringBuffer result = new StringBuffer(super.toString()); + result.append(" (targetTypeID: "); + result.append(targetTypeID); + result.append(", sourceTypeID: "); + result.append(sourceTypeID); + result.append(')'); + return result.toString(); + } + +} //MappingDataTypeImpl Property changes on: branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/impl/MappingDataTypeImpl.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/impl/ParamImpl.java =================================================================== --- branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/impl/ParamImpl.java (rev 0) +++ branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/impl/ParamImpl.java 2008-10-20 07:59:03 UTC (rev 10956) @@ -0,0 +1,221 @@ +/** + * <copyright> + * </copyright> + * + * $Id$ + */ +package org.jboss.tools.smooks.graphical.impl; + +import org.eclipse.emf.common.notify.Notification; + +import org.eclipse.emf.ecore.EClass; + +import org.eclipse.emf.ecore.impl.ENotificationImpl; +import org.eclipse.emf.ecore.impl.EObjectImpl; + +import org.jboss.tools.smooks.graphical.GraphicalPackage; +import org.jboss.tools.smooks.graphical.Param; + +/** + *  + * An implementation of the model object 'Param'. + *  + * + * The following features are implemented: + * <ul> + * <li>{@link org.jboss.tools.smooks.graphical.impl.ParamImpl#getName Name}</li> + * <li>{@link org.jboss.tools.smooks.graphical.impl.ParamImpl#getValue Value}</li> + * </ul> + * + * + * @generated + */ +public class ParamImpl extends EObjectImpl implements Param { + /** + * The default value of the '{@link #getName() Name}' attribute. + *  + *  + * @see #getName() + * @generated + * @ordered + */ + protected static final String NAME_EDEFAULT = null; + + /** + * The cached value of the '{@link #getName() Name}' attribute. + *  + *  + * @see #getName() + * @generated + * @ordered + */ + protected String name = NAME_EDEFAULT; + + /** + * The default value of the '{@link #getValue() Value}' attribute. + *  + *  + * @see #getValue() + * @generated + * @ordered + */ + protected static final String VALUE_EDEFAULT = null; + + /** + * The cached value of the '{@link #getValue() Value}' attribute. + *  + *  + * @see #getValue() + * @generated + * @ordered + */ + protected String value = VALUE_EDEFAULT; + + /** + *  + *  + * @generated + */ + protected ParamImpl() { + super(); + } + + /** + *  + *  + * @generated + */ + @Override + protected EClass eStaticClass() { + return GraphicalPackage.Literals.PARAM; + } + + /** + *  + *  + * @generated + */ + public String getName() { + return name; + } + + /** + *  + *  + * @generated + */ + public void setName(String newName) { + String oldName = name; + name = newName; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, GraphicalPackage.PARAM__NAME, oldName, name)); + } + + /** + *  + *  + * @generated + */ + public String getValue() { + return value; + } + + /** + *  + *  + * @generated + */ + public void setValue(String newValue) { + String oldValue = value; + value = newValue; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, GraphicalPackage.PARAM__VALUE, oldValue, value)); + } + + /** + *  + *  + * @generated + */ + @Override + public Object eGet(int featureID, boolean resolve, boolean coreType) { + switch (featureID) { + case GraphicalPackage.PARAM__NAME: + return getName(); + case GraphicalPackage.PARAM__VALUE: + return getValue(); + } + return super.eGet(featureID, resolve, coreType); + } + + /** + *  + *  + * @generated + */ + @Override + public void eSet(int featureID, Object newValue) { + switch (featureID) { + case GraphicalPackage.PARAM__NAME: + setName((String)newValue); + return; + case GraphicalPackage.PARAM__VALUE: + setValue((String)newValue); + return; + } + super.eSet(featureID, newValue); + } + + /** + *  + *  + * @generated + */ + @Override + public void eUnset(int featureID) { + switch (featureID) { + case GraphicalPackage.PARAM__NAME: + setName(NAME_EDEFAULT); + return; + case GraphicalPackage.PARAM__VALUE: + setValue(VALUE_EDEFAULT); + return; + } + super.eUnset(featureID); + } + + /** + *  + *  + * @generated + */ + @Override + public boolean eIsSet(int featureID) { + switch (featureID) { + case GraphicalPackage.PARAM__NAME: + return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name); + case GraphicalPackage.PARAM__VALUE: + return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals(value); + } + return super.eIsSet(featureID); + } + + /** + *  + *  + * @generated + */ + @Override + public String toString() { + if (eIsProxy()) return super.toString(); + + StringBuffer result = new StringBuffer(super.toString()); + result.append(" (name: "); + result.append(name); + result.append(", value: "); + result.append(value); + result.append(')'); + return result.toString(); + } + +} //ParamImpl Property changes on: branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/impl/ParamImpl.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/impl/ParamsImpl.java =================================================================== --- branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/impl/ParamsImpl.java (rev 0) +++ branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/impl/ParamsImpl.java 2008-10-20 07:59:03 UTC (rev 10956) @@ -0,0 +1,156 @@ +/** + * <copyright> + * </copyright> + * + * $Id$ + */ +package org.jboss.tools.smooks.graphical.impl; + +import java.util.Collection; + +import org.eclipse.emf.common.notify.NotificationChain; + +import org.eclipse.emf.common.util.EList; + +import org.eclipse.emf.ecore.EClass; +import org.eclipse.emf.ecore.InternalEObject; + +import org.eclipse.emf.ecore.impl.EObjectImpl; + +import org.eclipse.emf.ecore.util.EObjectContainmentEList; +import org.eclipse.emf.ecore.util.InternalEList; + +import org.jboss.tools.smooks.graphical.GraphicalPackage; +import org.jboss.tools.smooks.graphical.Param; +import org.jboss.tools.smooks.graphical.Params; + +/** + *  + * An implementation of the model object 'Params'. + *  + * + * The following features are implemented: + * <ul> + * <li>{@link org.jboss.tools.smooks.graphical.impl.ParamsImpl#getParam Param}</li> + * </ul> + * + * + * @generated + */ +public class ParamsImpl extends EObjectImpl implements Params { + /** + * The cached value of the '{@link #getParam() Param}' containment reference list. + *  + *  + * @see #getParam() + * @generated + * @ordered + */ + protected EList<Param> param; + + /** + *  + *  + * @generated + */ + protected ParamsImpl() { + super(); + } + + /** + *  + *  + * @generated + */ + @Override + protected EClass eStaticClass() { + return GraphicalPackage.Literals.PARAMS; + } + + /** + *  + *  + * @generated + */ + public EList<Param> getParam() { + if (param == null) { + param = new EObjectContainmentEList<Param>(Param.class, this, GraphicalPackage.PARAMS__PARAM); + } + return param; + } + + /** + *  + *  + * @generated + */ + @Override + public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) { + switch (featureID) { + case GraphicalPackage.PARAMS__PARAM: + return ((InternalEList<?>)getParam()).basicRemove(otherEnd, msgs); + } + return super.eInverseRemove(otherEnd, featureID, msgs); + } + + /** + *  + *  + * @generated + */ + @Override + public Object eGet(int featureID, boolean resolve, boolean coreType) { + switch (featureID) { + case GraphicalPackage.PARAMS__PARAM: + return getParam(); + } + return super.eGet(featureID, resolve, coreType); + } + + /** + *  + *  + * @generated + */ + @SuppressWarnings("unchecked") + @Override + public void eSet(int featureID, Object newValue) { + switch (featureID) { + case GraphicalPackage.PARAMS__PARAM: + getParam().clear(); + getParam().addAll((Collection<? extends Param>)newValue); + return; + } + super.eSet(featureID, newValue); + } + + /** + *  + *  + * @generated + */ + @Override + public void eUnset(int featureID) { + switch (featureID) { + case GraphicalPackage.PARAMS__PARAM: + getParam().clear(); + return; + } + super.eUnset(featureID); + } + + /** + *  + *  + * @generated + */ + @Override + public boolean eIsSet(int featureID) { + switch (featureID) { + case GraphicalPackage.PARAMS__PARAM: + return param != null && !param.isEmpty(); + } + return super.eIsSet(featureID); + } + +} //ParamsImpl Property changes on: branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/impl/ParamsImpl.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/util/GraphicalAdapterFactory.java =================================================================== --- branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/util/GraphicalAdapterFactory.java (rev 0) +++ branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/util/GraphicalAdapterFactory.java 2008-10-20 07:59:03 UTC (rev 10956) @@ -0,0 +1,178 @@ +/** + * <copyright> + * </copyright> + * + * $Id$ + */ +package org.jboss.tools.smooks.graphical.util; + +import org.eclipse.emf.common.notify.Adapter; +import org.eclipse.emf.common.notify.Notifier; + +import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl; + +import org.eclipse.emf.ecore.EObject; + +import org.jboss.tools.smooks.graphical.*; + +/** + *  + * The Adapter Factory for the model. + * It provides an adapter <code>createXXX</code> method for each class of the model. + *  + * @see org.jboss.tools.smooks.graphical.GraphicalPackage + * @generated + */ +public class GraphicalAdapterFactory extends AdapterFactoryImpl { + /** + * The cached model package. + *  + *  + * @generated + */ + protected static GraphicalPackage modelPackage; + + /** + * Creates an instance of the adapter factory. + *  + *  + * @generated + */ + public GraphicalAdapterFactory() { + if (modelPackage == null) { + modelPackage = GraphicalPackage.eINSTANCE; + } + } + + /** + * Returns whether this factory is applicable for the type of the object. + *  + * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model. + *  + * @return whether this factory is applicable for the type of the object. + * @generated + */ + @Override + public boolean isFactoryForType(Object object) { + if (object == modelPackage) { + return true; + } + if (object instanceof EObject) { + return ((EObject)object).eClass().getEPackage() == modelPackage; + } + return false; + } + + /** + * The switch the delegates to the <code>createXXX</code> methods. + *  + *  + * @generated + */ + protected GraphicalSwitch<Adapter> modelSwitch = + new GraphicalSwitch<Adapter>() { + @Override + public Adapter caseGraphInformations(GraphInformations object) { + return createGraphInformationsAdapter(); + } + @Override + public Adapter caseMappingDataType(MappingDataType object) { + return createMappingDataTypeAdapter(); + } + @Override + public Adapter caseParams(Params object) { + return createParamsAdapter(); + } + @Override + public Adapter caseParam(Param object) { + return createParamAdapter(); + } + @Override + public Adapter defaultCase(EObject object) { + return createEObjectAdapter(); + } + }; + + /** + * Creates an adapter for the <code>target</code>. + *  + *  + * @param target the object to adapt. + * @return the adapter for the <code>target</code>. + * @generated + */ + @Override + public Adapter createAdapter(Notifier target) { + return modelSwitch.doSwitch((EObject)target); + } + + + /** + * Creates a new adapter for an object of class '{@link org.jboss.tools.smooks.graphical.GraphInformations Graph Informations}'. + *  + * This default implementation returns null so that we can easily ignore cases; + * it's useful to ignore a case when inheritance will catch all the cases anyway. + *  + * @return the new adapter. + * @see org.jboss.tools.smooks.graphical.GraphInformations + * @generated + */ + public Adapter createGraphInformationsAdapter() { + return null; + } + + /** + * Creates a new adapter for an object of class '{@link org.jboss.tools.smooks.graphical.MappingDataType Mapping Data Type}'. + *  + * This default implementation returns null so that we can easily ignore cases; + * it's useful to ignore a case when inheritance will catch all the cases anyway. + *  + * @return the new adapter. + * @see org.jboss.tools.smooks.graphical.MappingDataType + * @generated + */ + public Adapter createMappingDataTypeAdapter() { + return null; + } + + /** + * Creates a new adapter for an object of class '{@link org.jboss.tools.smooks.graphical.Params Params}'. + *  + * This default implementation returns null so that we can easily ignore cases; + * it's useful to ignore a case when inheritance will catch all the cases anyway. + *  + * @return the new adapter. + * @see org.jboss.tools.smooks.graphical.Params + * @generated + */ + public Adapter createParamsAdapter() { + return null; + } + + /** + * Creates a new adapter for an object of class '{@link org.jboss.tools.smooks.graphical.Param Param}'. + *  + * This default implementation returns null so that we can easily ignore cases; + * it's useful to ignore a case when inheritance will catch all the cases anyway. + *  + * @return the new adapter. + * @see org.jboss.tools.smooks.graphical.Param + * @generated + */ + public Adapter createParamAdapter() { + return null; + } + + /** + * Creates a new adapter for the default case. + *  + * This default implementation returns null. + *  + * @return the new adapter. + * @generated + */ + public Adapter createEObjectAdapter() { + return null; + } + +} //GraphicalAdapterFactory Property changes on: branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/util/GraphicalAdapterFactory.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/util/GraphicalSwitch.java =================================================================== --- branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/util/GraphicalSwitch.java (rev 0) +++ branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/util/GraphicalSwitch.java 2008-10-20 07:59:03 UTC (rev 10956) @@ -0,0 +1,193 @@ +/** + * <copyright> + * </copyright> + * + * $Id$ + */ +package org.jboss.tools.smooks.graphical.util; + +import java.util.List; + +import org.eclipse.emf.ecore.EClass; +import org.eclipse.emf.ecore.EObject; + +import org.jboss.tools.smooks.graphical.*; + +/** + *  + * The Switch for the model's inheritance hierarchy. + * It supports the call {@link #doSwitch(EObject) doSwitch(object)} + * to invoke the <code>caseXXX</code> method for each class of the model, + * starting with the actual class of the object + * and proceeding up the inheritance hierarchy + * until a non-null result is returned, + * which is the result of the switch. + *  + * @see org.jboss.tools.smooks.graphical.GraphicalPackage + * @generated + */ +public class GraphicalSwitch<T> { + /** + * The cached model package + *  + *  + * @generated + */ + protected static GraphicalPackage modelPackage; + + /** + * Creates an instance of the switch. + *  + *  + * @generated + */ + public GraphicalSwitch() { + if (modelPackage == null) { + modelPackage = GraphicalPackage.eINSTANCE; + } + } + + /** + * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result. + *  + *  + * @return the first non-null result returned by a <code>caseXXX</code> call. + * @generated + */ + public T doSwitch(EObject theEObject) { + return doSwitch(theEObject.eClass(), theEObject); + } + + /** + * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result. + *  + *  + * @return the first non-null result returned by a <code>caseXXX</code> call. + * @generated + */ + protected T doSwitch(EClass theEClass, EObject theEObject) { + if (theEClass.eContainer() == modelPackage) { + return doSwitch(theEClass.getClassifierID(), theEObject); + } + else { + List<EClass> eSuperTypes = theEClass.getESuperTypes(); + return + eSuperTypes.isEmpty() ? + defaultCase(theEObject) : + doSwitch(eSuperTypes.get(0), theEObject); + } + } + + /** + * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result. + *  + *  + * @return the first non-null result returned by a <code>caseXXX</code> call. + * @generated + */ + protected T doSwitch(int classifierID, EObject theEObject) { + switch (classifierID) { + case GraphicalPackage.GRAPH_INFORMATIONS: { + GraphInformations graphInformations = (GraphInformations)theEObject; + T result = caseGraphInformations(graphInformations); + if (result == null) result = defaultCase(theEObject); + return result; + } + case GraphicalPackage.MAPPING_DATA_TYPE: { + MappingDataType mappingDataType = (MappingDataType)theEObject; + T result = caseMappingDataType(mappingDataType); + if (result == null) result = defaultCase(theEObject); + return result; + } + case GraphicalPackage.PARAMS: { + Params params = (Params)theEObject; + T result = caseParams(params); + if (result == null) result = defaultCase(theEObject); + return result; + } + case GraphicalPackage.PARAM: { + Param param = (Param)theEObject; + T result = caseParam(param); + if (result == null) result = defaultCase(theEObject); + return result; + } + default: return defaultCase(theEObject); + } + } + + /** + * Returns the result of interpreting the object as an instance of 'Graph Informations'. + *  + * This implementation returns null; + * returning a non-null result will terminate the switch. + *  + * @param object the target of the switch. + * @return the result of interpreting the object as an instance of 'Graph Informations'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public T caseGraphInformations(GraphInformations object) { + return null; + } + + /** + * Returns the result of interpreting the object as an instance of 'Mapping Data Type'. + *  + * This implementation returns null; + * returning a non-null result will terminate the switch. + *  + * @param object the target of the switch. + * @return the result of interpreting the object as an instance of 'Mapping Data Type'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public T caseMappingDataType(MappingDataType object) { + return null; + } + + /** + * Returns the result of interpreting the object as an instance of 'Params'. + *  + * This implementation returns null; + * returning a non-null result will terminate the switch. + *  + * @param object the target of the switch. + * @return the result of interpreting the object as an instance of 'Params'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public T caseParams(Params object) { + return null; + } + + /** + * Returns the result of interpreting the object as an instance of 'Param'. + *  + * This implementation returns null; + * returning a non-null result will terminate the switch. + *  + * @param object the target of the switch. + * @return the result of interpreting the object as an instance of 'Param'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public T caseParam(Param object) { + return null; + } + + /** + * Returns the result of interpreting the object as an instance of 'EObject'. + *  + * This implementation returns null; + * returning a non-null result will terminate the switch, but this is the last case anyway. + *  + * @param object the target of the switch. + * @return the result of interpreting the object as an instance of 'EObject'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) + * @generated + */ + public T defaultCase(EObject object) { + return null; + } + +} //GraphicalSwitch Property changes on: branches/jbosstools-3.0.0.Beta1/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/util/GraphicalSwitch.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: branches/jbosstools-3.0.0.Beta1/smooks/tests/org.jboss.tools.smooks.test/META-INF/MANIFEST.MF =================================================================== --- branches/jbosstools-3.0.0.Beta1/smooks/tests/org.jboss.tools.smooks.test/META-INF/MANIFEST.MF 2008-10-18 22:02:22 UTC (rev 10955) +++ branches/jbosstools-3.0.0.Beta1/smooks/tests/org.jboss.tools.smooks.test/META-INF/MANIFEST.MF 2008-10-20 07:59:03 UTC (rev 10956) @@ -6,21 +6,18 @@ Bundle-Activator: org.jboss.tools.smooks.test.Activator Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, - org.jboss.tools.smooks.graphicalInfo, org.jboss.tools.smooks.javabean, org.jboss.tools.smooks.model, org.jboss.tools.smooks.model.edit, org.jboss.tools.smooks.ui, org.jboss.tools.smooks.xml, - org.jboss.tools.smooks.xml2java, org.junit, org.eclipse.core.resources, org.eclipse.xsd, org.eclipse.xsd.edit, org.eclipse.emf, org.eclipse.emf.ecore.edit, - org.eclipse.emf.edit.ui, - org.jboss.tools.smooks.java2xml + org.eclipse.emf.edit.ui Eclipse-LazyStart: true Bundle-ClassPath: lib/dom4j-1.6.1.jar, . Modified: branches/jbosstools-3.0.0.Beta1/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/java2java/SmooksAnalyzerTester.java =================================================================== --- branches/jbosstools-3.0.0.Beta1/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/java2java/SmooksAnalyzerTester.java 2008-10-18 22:02:22 UTC (rev 10955) +++ branches/jbosstools-3.0.0.Beta1/smooks/tests/org.jboss.tools.smooks.test/src/org/jboss/tools/smooks/test/java2java/SmooksAnalyzerTester.java 2008-10-20 07:59:03 UTC (rev 10956) @@ -55,7 +55,7 @@ return new BasicCommandStack(); } public SmooksAnalyzerTester() throws IOException { - super(); +// super(); adapterFactory = new ComposedAdapterFactory( ComposedAdapterFactory.Descriptor.Registry.INSTANCE); adapterFactory @@ -71,7 +71,7 @@ GraphicalPackage.eINSTANCE); Registry.INSTANCE.put(SmooksPackage.eNS_URI, SmooksPackage.eINSTANCE); - resource = editingDomain.getResourceSet().createResource(null); + resource = new SmooksResourceFactoryImpl().createResource(null); Resource gr = new XMLResourceFactoryImpl().createResource(null); InputStream stream1 = classLoader .getResourceAsStream("org/jboss/tools/smooks/test/java2java/Test.xml");

17 years, 2 months

1
0
0 / 0

JBoss Tools SVN: r10955 - branches/jbosstools-3.0.0.Beta1/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/src/org/hibernate/eclipse/jdt/ui/test.

by jbosstools-commits＠lists.jboss.org

Author: snjeza Date: 2008-10-18 18:02:22 -0400 (Sat, 18 Oct 2008) New Revision: 10955 Modified: branches/jbosstools-3.0.0.Beta1/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/src/org/hibernate/eclipse/jdt/ui/test/HibernateErrorsTest2.java Log: Checking the hibernate tests. Modified: branches/jbosstools-3.0.0.Beta1/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/src/org/hibernate/eclipse/jdt/ui/test/HibernateErrorsTest2.java =================================================================== --- branches/jbosstools-3.0.0.Beta1/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/src/org/hibernate/eclipse/jdt/ui/test/HibernateErrorsTest2.java 2008-10-18 15:32:18 UTC (rev 10954) +++ branches/jbosstools-3.0.0.Beta1/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/src/org/hibernate/eclipse/jdt/ui/test/HibernateErrorsTest2.java 2008-10-18 22:02:22 UTC (rev 10955) @@ -175,7 +175,14 @@ } }, new NullProgressMonitor()); } + if (!deleted) { + proj.delete(false, true,null); + } waitForJobs(); + try { + delete(file); + } catch (Throwable e) { + } delete(file); } public void testDummy() throws JavaModelException { @@ -212,9 +219,14 @@ buffer.append("Cannot remove the "); buffer.append(file.getAbsolutePath()); buffer.append(" file. "); - if (file.exists() && file.isDirectory()) { - buffer.append("List="); - buffer.append(file.list()); + if (file.exists()) { + if (file.isDirectory()) { + buffer.append(" ;List="); + buffer.append(file.list()); + } else { + buffer.append(" ;length="); + buffer.append(file.length()); + } } return buffer.toString(); }

17 years, 2 months

1
0
0 / 0

JBoss Tools SVN: r10954 - branches/jbosstools-3.0.0.Beta1/common/tests/org.jboss.tools.common.test/src/org/jboss/tools/common/test/util.

by jbosstools-commits＠lists.jboss.org

Author: dgolovin Date: 2008-10-18 11:32:18 -0400 (Sat, 18 Oct 2008) New Revision: 10954 Modified: branches/jbosstools-3.0.0.Beta1/common/tests/org.jboss.tools.common.test/src/org/jboss/tools/common/test/util/TestProjectProvider.java Log: fix for JUnit Tests errors Modified: branches/jbosstools-3.0.0.Beta1/common/tests/org.jboss.tools.common.test/src/org/jboss/tools/common/test/util/TestProjectProvider.java =================================================================== --- branches/jbosstools-3.0.0.Beta1/common/tests/org.jboss.tools.common.test/src/org/jboss/tools/common/test/util/TestProjectProvider.java 2008-10-18 15:23:45 UTC (rev 10953) +++ branches/jbosstools-3.0.0.Beta1/common/tests/org.jboss.tools.common.test/src/org/jboss/tools/common/test/util/TestProjectProvider.java 2008-10-18 15:32:18 UTC (rev 10954) @@ -79,6 +79,7 @@ try { oldAutoBuilding = ResourcesUtils.setBuildAutomatically(false); JobUtils.waitForIdle(); + project.close(null); project.delete(true, null); JobUtils.waitForIdle(); } finally {

17 years, 2 months

1
0
0 / 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

jbosstools-commits October 2008