JBoss Tools SVN: r31302 - trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/templates.
by jbosstools-commits＠lists.jboss.org
Author: dmaliarevich
Date: 2011-05-13 13:07:21 -0400 (Fri, 13 May 2011)
New Revision: 31302
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/templates/vpe-templates-richfaces.xml
Log:
https://issues.jboss.org/browse/JBIDE-8453 , rf4 templates were renamed, re-ordered.
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/templates/vpe-templates-richfaces.xml
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/templates/vpe-templates-richfaces.xml 2011-05-13 16:23:20 UTC (rev 31301)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/templates/vpe-templates-richfaces.xml 2011-05-13 17:07:21 UTC (rev 31302)
@@ -197,6 +197,11 @@
</vpe:template>
</vpe:tag>
+ <vpe:tag name="rich:modalPanel" case-sensitive="yes">
+ <vpe:template children="no" modify="yes" >
+ </vpe:template>
+ </vpe:tag>
+
<vpe:tag name="rich:dataDefinitionList" case-sensitive="yes">
<vpe:template children="yes" modify="yes"
class="org.jboss.tools.jsf.vpe.richfaces.template.RichFacesDataDefinitionListTemplate">
@@ -210,32 +215,152 @@
</vpe:dnd>
</vpe:template>
</vpe:tag>
-
- <vpe:tag name="rich:modalPanel" case-sensitive="yes">
- <vpe:template children="no" modify="yes" >
+
+ <vpe:tag name="rich:dataFilterSlider" case-sensitive="yes">
+ <vpe:template children="yes" modify="no"
+ class="org.jboss.tools.jsf.vpe.richfaces.template.RichFacesDataFilterSliderTemplate">
+ <vpe:resize>
+ <vpe:width width-attr="width" />
+ </vpe:resize>
+ <vpe:dnd>
+ <vpe:drag start-enable="yes" />
+ <vpe:drop container="no" />
+ </vpe:dnd>
</vpe:template>
</vpe:tag>
+
+ <vpe:tag name="rich:dataGrid" case-sensitive="yes">
+ <vpe:template children="yes" modify="yes" class="org.jboss.tools.jsf.vpe.richfaces.template.RichFacesDataGridTemplate">
+ </vpe:template>
+ </vpe:tag>
- <vpe:tag name="rich:spacer" case-sensitive="yes">
+ <vpe:tag name="rich:dataList" case-sensitive="yes" >
+ <vpe:template class="org.jboss.tools.jsf.vpe.richfaces.template.RichFacesDataListTemplate"
+ children="yes" modify="no">
+ <vpe:dnd>
+ <vpe:drag start-enable="yes"/>
+ <vpe:drop container="no"/>
+ </vpe:dnd>
+ </vpe:template>
+ </vpe:tag>
+
+ <vpe:tag name="rich:dataOrderedList" case-sensitive="yes" >
+ <vpe:template class="org.jboss.tools.jsf.vpe.richfaces.template.RichFacesDataOrderedListTemplate"
+ children="yes" modify="no">
+ <vpe:dnd>
+ <vpe:drag start-enable="yes"/>
+ <vpe:drop container="no"/>
+ </vpe:dnd>
+ </vpe:template>
+ </vpe:tag>
+
+ <!-- keep in mind that there is the same template for RF 4.0 rich:dataScroller (below)-->
+ <vpe:tag name="rich:dataScroller" case-sensitive="yes">
<vpe:template children="yes" modify="yes"
- class="org.jboss.tools.jsf.vpe.richfaces.template.RichFacesSpacerTemplate">
+ class="org.jboss.tools.jsf.vpe.richfaces.template.RichFacesDataTableScrollerTemplate">
<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="no" />
+ <vpe:drop container="yes">
+ <vpe:container-child tag-name="f:facet" />
+ </vpe:drop>
</vpe:dnd>
- <vpe:textFormatting>
- <vpe:format type="BackgroundColorFormat">
- <vpe:formatAttribute type="style" />
- </vpe:format>
+ </vpe:template>
+ </vpe:tag>
+
+ <vpe:tag name="rich:datascroller" case-sensitive="yes">
+ <vpe:template children="yes" modify="yes"
+ class="org.jboss.tools.jsf.vpe.richfaces.template.RichFacesDataTableScrollerTemplate">
+ <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:container-child tag-name="f:facet" />
+ </vpe:drop>
+ </vpe:dnd>
+ </vpe:template>
+ </vpe:tag>
+
+ <vpe:tag name="rich:dataTable" case-sensitive="yes">
+ <vpe:template children="yes" modify="no" class="org.jboss.tools.jsf.vpe.richfaces.template.RichFacesDataTableTemplate">
+ <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:container-child tag-name="column"/>
+ </vpe:drop>
+ </vpe:dnd>
+ <vpe:textFormatting use-default-formats="yes">
+ <vpe:format type="BlockFormat" addChildren="deny"/>
</vpe:textFormatting>
- <vpe:pseudoContent defaultText="no"/>
+ <vpe:pseudoContent defaultText="yes"/>
</vpe:template>
+ </vpe:tag>
+
+ <vpe:tag name="rich:dndParam" case-sensitive="yes">
+ <vpe:template children="no" modify="no" />
</vpe:tag>
+ <vpe:tag name="rich:dragIndicator" case-sensitive="yes">
+ <vpe:template children="no" modify="no" />
+ </vpe:tag>
+
+ <vpe:tag name="rich:dragListener" case-sensitive="yes">
+ <vpe:template children="no" modify="yes" >
+ </vpe:template>
+ </vpe:tag>
+
+ <vpe:tag name="rich:dragSupport" case-sensitive="yes">
+ <vpe:template children="no" modify="no" />
+ </vpe:tag>
+
+ <vpe:tag name="rich:dropDownMenu" case-sensitive="yes" >
+ <vpe:template class="org.jboss.tools.jsf.vpe.richfaces.template.RichFacesDropDownMenuTemplate"
+ children="yes" modify="no">
+ <vpe:dnd>
+ <vpe:drag start-enable="yes"/>
+ <vpe:drop container="no"/>
+ </vpe:dnd>
+ </vpe:template>
+ </vpe:tag>
+
+ <vpe:tag name="rich:dropListener" case-sensitive="yes">
+ <vpe:template children="no" modify="yes" >
+ </vpe:template>
+ </vpe:tag>
+
+ <vpe:tag name="rich:dropSupport" case-sensitive="yes">
+ <vpe:template children="no" modify="no" />
+ </vpe:tag>
+
+ <vpe:tag name="rich:scrollableDataTable" case-sensitive="yes">
+ <vpe:template children="yes" modify="no" class="org.jboss.tools.jsf.vpe.richfaces.template.RichFacesScrollableDataTableTemplate">
+ <vpe:resize>
+ <vpe:width width-attr="width" />
+ <vpe:height height-attr="height" />
+ </vpe:resize>
+ <vpe:dnd>
+ <vpe:drag start-enable="yes" />
+ <vpe:drop container="yes">
+ <vpe:container-child tag-name="column"/>
+ </vpe:drop>
+ </vpe:dnd>
+ <vpe:textFormatting use-default-formats="yes">
+ <vpe:format type="BlockFormat" addChildren="deny"/>
+ </vpe:textFormatting>
+ <vpe:pseudoContent defaultText="yes"/>
+ </vpe:template>
+ </vpe:tag>
+
<vpe:tag name="rich:separator" case-sensitive="yes">
<vpe:template children="no" modify="no"
class="org.jboss.tools.jsf.vpe.richfaces.template.RichFacesSeparatorTemplate">
@@ -250,37 +375,92 @@
</vpe:template>
</vpe:tag>
+ <vpe:tag name="rich:simpleTogglePanel" case-sensitive="yes">
+ <vpe:template children="yes" modify="yes" class="org.jboss.tools.jsf.vpe.richfaces.template.RichFacesSimpleTogglePanelTemplate">
+ <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>
- <!-- keep in mind that there is the same template for RF 4.0 rich:dataScroller (below)-->
- <vpe:tag name="rich:datascroller" case-sensitive="yes">
+ <vpe:tag name="rich:spacer" case-sensitive="yes">
<vpe:template children="yes" modify="yes"
- class="org.jboss.tools.jsf.vpe.richfaces.template.RichFacesDataTableScrollerTemplate">
+ class="org.jboss.tools.jsf.vpe.richfaces.template.RichFacesSpacerTemplate">
<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:container-child tag-name="f:facet" />
- </vpe:drop>
+ <vpe:drop container="no" />
</vpe:dnd>
+ <vpe:textFormatting>
+ <vpe:format type="BackgroundColorFormat">
+ <vpe:formatAttribute type="style" />
+ </vpe:format>
+ </vpe:textFormatting>
+ <vpe:pseudoContent defaultText="no"/>
</vpe:template>
</vpe:tag>
- <vpe:tag name="rich:dataFilterSlider" case-sensitive="yes">
- <vpe:template children="yes" modify="no"
- class="org.jboss.tools.jsf.vpe.richfaces.template.RichFacesDataFilterSliderTemplate">
+ <vpe:tag name="rich:subTable" case-sensitive="yes">
+ <vpe:template children="yes" modify="yes" class="org.jboss.tools.jsf.vpe.richfaces.template.RichFacesSubTableTemplate">
+ </vpe:template>
+ </vpe:tag>
+
+ <vpe:tag name="rich:suggestionbox" case-sensitive="yes" >
+ <vpe:template children="no" modify="no" />
+ </vpe:tag>
+
+ <vpe:tag name="rich:tabPanel" case-sensitive="yes">
+ <vpe:template children="yes" modify="yes" class="org.jboss.tools.jsf.vpe.richfaces.template.RichFacesTabPanelTemplate">
<vpe:resize>
- <vpe:width width-attr="width" />
+ <vpe:width width-attr="style.width" />
+ <vpe:height height-attr="style.height" />
</vpe:resize>
<vpe:dnd>
- <vpe:drag start-enable="yes" />
- <vpe:drop container="no" />
+ <vpe:drag start-enable="yes"/>
+ <vpe:drop container="no"/>
+ </vpe:dnd>
+ </vpe:template>
+ </vpe:tag>
+
+ <vpe:tag name="rich:toggleControl" case-sensitive="yes">
+ <vpe:template children="yes" modify="yes" class="org.jboss.tools.jsf.vpe.richfaces.template.RichFacesToggleControlTemplate">
+ <vpe:dnd>
+ <vpe:drag start-enable="yes"/>
+ <vpe:drop container="yes"/>
+ </vpe:dnd>
+ </vpe:template>
+ </vpe:tag>
+
+ <vpe:tag name="rich:togglePanel" case-sensitive="yes">
+ <vpe:template children="yes" modify="yes" class="org.jboss.tools.jsf.vpe.richfaces.template.RichFacesTogglePanelTemplate">
+ <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="rich:togglePanelItem" case-sensitive="yes">
+ <vpe:template children="yes" modify="yes" class="org.jboss.tools.jsf.vpe.richfaces.template.RichFacesTogglePanelItemTemplate">
+ <vpe:dnd>
+ <vpe:drag start-enable="yes"/>
+ <vpe:drop container="yes"/>
+ </vpe:dnd>
+ </vpe:template>
+ </vpe:tag>
+
<vpe:tag name="rich:toolBar" case-sensitive="yes" >
<vpe:template class="org.jboss.tools.jsf.vpe.richfaces.template.RichFacesToolBarTemplate"
children="yes" modify="no">
@@ -295,9 +475,13 @@
</vpe:template>
</vpe:tag>
- <vpe:tag name="rich:toolBarGroup" case-sensitive="yes" >
- <vpe:template class="org.jboss.tools.jsf.vpe.richfaces.template.RichFacesToolBarGroupTemplate"
+ <vpe:tag name="rich:toolbar" case-sensitive="yes" >
+ <vpe:template class="org.jboss.tools.jsf.vpe.richfaces.template.RichFacesToolBarTemplate"
children="yes" modify="no">
+ <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="no"/>
@@ -305,13 +489,8 @@
</vpe:template>
</vpe:tag>
- <vpe:tag name="rich:toolBarSeparator" case-sensitive="yes" >
- <vpe:template children="no" modify="no" >
- </vpe:template>
- </vpe:tag>
-
- <vpe:tag name="rich:dataList" case-sensitive="yes" >
- <vpe:template class="org.jboss.tools.jsf.vpe.richfaces.template.RichFacesDataListTemplate"
+ <vpe:tag name="rich:toolBarGroup" case-sensitive="yes" >
+ <vpe:template class="org.jboss.tools.jsf.vpe.richfaces.template.RichFacesToolBarGroupTemplate"
children="yes" modify="no">
<vpe:dnd>
<vpe:drag start-enable="yes"/>
@@ -320,8 +499,8 @@
</vpe:template>
</vpe:tag>
- <vpe:tag name="rich:dataOrderedList" case-sensitive="yes" >
- <vpe:template class="org.jboss.tools.jsf.vpe.richfaces.template.RichFacesDataOrderedListTemplate"
+ <vpe:tag name="rich:toolbarGroup" case-sensitive="yes" >
+ <vpe:template class="org.jboss.tools.jsf.vpe.richfaces.template.RichFacesToolBarGroupTemplate"
children="yes" modify="no">
<vpe:dnd>
<vpe:drag start-enable="yes"/>
@@ -330,43 +509,20 @@
</vpe:template>
</vpe:tag>
- <vpe:tag name="rich:dataTable" case-sensitive="yes">
- <vpe:template children="yes" modify="no" class="org.jboss.tools.jsf.vpe.richfaces.template.RichFacesDataTableTemplate">
- <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:container-child tag-name="column"/>
- </vpe:drop>
- </vpe:dnd>
- <vpe:textFormatting use-default-formats="yes">
- <vpe:format type="BlockFormat" addChildren="deny"/>
- </vpe:textFormatting>
- <vpe:pseudoContent defaultText="yes"/>
+ <vpe:tag name="rich:toolBarSeparator" case-sensitive="yes" >
+ <vpe:template children="no" modify="no" >
</vpe:template>
- </vpe:tag>
-
- <vpe:tag name="rich:scrollableDataTable" case-sensitive="yes">
- <vpe:template children="yes" modify="no" class="org.jboss.tools.jsf.vpe.richfaces.template.RichFacesScrollableDataTableTemplate">
- <vpe:resize>
- <vpe:width width-attr="width" />
- <vpe:height height-attr="height" />
- </vpe:resize>
- <vpe:dnd>
- <vpe:drag start-enable="yes" />
- <vpe:drop container="yes">
- <vpe:container-child tag-name="column"/>
- </vpe:drop>
- </vpe:dnd>
- <vpe:textFormatting use-default-formats="yes">
- <vpe:format type="BlockFormat" addChildren="deny"/>
- </vpe:textFormatting>
- <vpe:pseudoContent defaultText="yes"/>
+ </vpe:tag>
+
+ <vpe:tag name="rich:toolTip" case-sensitive="yes">
+ <vpe:template children="no" modify="yes" >
</vpe:template>
- </vpe:tag>
+ </vpe:tag>
+
+ <vpe:tag name="rich:tooltip" case-sensitive="yes">
+ <vpe:template children="no" modify="yes" >
+ </vpe:template>
+ </vpe:tag>
<vpe:tag name="rich:extendedDataTable" case-sensitive="yes">
<vpe:template children="yes" modify="no" class="org.jboss.tools.jsf.vpe.richfaces.template.RichFacesExtendedDataTableTemplate">
@@ -412,16 +568,6 @@
</vpe:template>
</vpe:tag>
- <vpe:tag name="rich:subTable" case-sensitive="yes">
- <vpe:template children="yes" modify="yes" class="org.jboss.tools.jsf.vpe.richfaces.template.RichFacesSubTableTemplate">
- </vpe:template>
- </vpe:tag>
-
- <vpe:tag name="rich:dataGrid" case-sensitive="yes">
- <vpe:template children="yes" modify="yes" class="org.jboss.tools.jsf.vpe.richfaces.template.RichFacesDataGridTemplate">
- </vpe:template>
- </vpe:tag>
-
<vpe:tag name="rich:collapsiblePanel" case-sensitive="yes">
<vpe:template children="yes" modify="yes" class="org.jboss.tools.jsf.vpe.richfaces.template.RichFacesPanelTemplate">
<vpe:resize>
@@ -492,64 +638,6 @@
</vpe:template>
</vpe:tag>
- <vpe:tag name="rich:simpleTogglePanel" case-sensitive="yes">
- <vpe:template children="yes" modify="yes" class="org.jboss.tools.jsf.vpe.richfaces.template.RichFacesSimpleTogglePanelTemplate">
- <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="rich:togglePanel" case-sensitive="yes">
- <vpe:template children="yes" modify="yes" class="org.jboss.tools.jsf.vpe.richfaces.template.RichFacesTogglePanelTemplate">
- <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="rich:toggleControl" case-sensitive="yes">
- <vpe:template children="yes" modify="yes" class="org.jboss.tools.jsf.vpe.richfaces.template.RichFacesToggleControlTemplate">
- <vpe:dnd>
- <vpe:drag start-enable="yes"/>
- <vpe:drop container="yes"/>
- </vpe:dnd>
- </vpe:template>
- </vpe:tag>
-
- <vpe:tag name="rich:togglePanelItem" case-sensitive="yes">
- <vpe:template children="yes" modify="yes" class="org.jboss.tools.jsf.vpe.richfaces.template.RichFacesTogglePanelItemTemplate">
- <vpe:dnd>
- <vpe:drag start-enable="yes"/>
- <vpe:drop container="yes"/>
- </vpe:dnd>
- </vpe:template>
- </vpe:tag>
-
-
- <vpe:tag name="rich:tabPanel" case-sensitive="yes">
- <vpe:template children="yes" modify="yes" class="org.jboss.tools.jsf.vpe.richfaces.template.RichFacesTabPanelTemplate">
- <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="no"/>
- </vpe:dnd>
- </vpe:template>
- </vpe:tag>
-
<vpe:tag name="rich:tab" case-sensitive="yes">
<vpe:template children="yes" modify="yes" class="org.jboss.tools.jsf.vpe.richfaces.template.RichFacesTabTemplate">
<vpe:dnd>
@@ -559,36 +647,6 @@
</vpe:template>
</vpe:tag>
- <vpe:tag name="rich:dndParam" case-sensitive="yes">
- <vpe:template children="no" modify="no" />
- </vpe:tag>
-
- <vpe:tag name="rich:dragIndicator" case-sensitive="yes">
- <vpe:template children="no" modify="no" />
- </vpe:tag>
-
- <vpe:tag name="rich:dragSupport" case-sensitive="yes">
- <vpe:template children="no" modify="no" />
- </vpe:tag>
-
- <vpe:tag name="rich:dropSupport" case-sensitive="yes">
- <vpe:template children="no" modify="no" />
- </vpe:tag>
-
- <vpe:tag name="rich:suggestionbox" case-sensitive="yes" >
- <vpe:template children="no" modify="no" />
- </vpe:tag>
-
- <vpe:tag name="rich:dropDownMenu" case-sensitive="yes" >
- <vpe:template class="org.jboss.tools.jsf.vpe.richfaces.template.RichFacesDropDownMenuTemplate"
- children="yes" modify="no">
- <vpe:dnd>
- <vpe:drag start-enable="yes"/>
- <vpe:drop container="no"/>
- </vpe:dnd>
- </vpe:template>
- </vpe:tag>
-
<vpe:tag name="rich:menuItem" case-sensitive="yes" >
<vpe:template class="org.jboss.tools.jsf.vpe.richfaces.template.RichFacesMenuItemTemplate"
children="yes" modify="no">
@@ -674,11 +732,6 @@
</vpe:dnd>
</vpe:template>
</vpe:tag>
-
- <vpe:tag name="rich:toolTip" case-sensitive="yes">
- <vpe:template children="no" modify="yes" >
- </vpe:template>
- </vpe:tag>
<vpe:tag name="rich:effect" case-sensitive="yes">
<vpe:template children="no" modify="yes" >
@@ -719,16 +772,7 @@
<vpe:template children="no" modify="yes" >
</vpe:template>
</vpe:tag>
-
- <vpe:tag name="rich:dragListener" case-sensitive="yes">
- <vpe:template children="no" modify="yes" >
- </vpe:template>
- </vpe:tag>
- <vpe:tag name="rich:dropListener" case-sensitive="yes">
- <vpe:template children="no" modify="yes" >
- </vpe:template>
- </vpe:tag>
-
+
<vpe:tag name="rich:panelMenuItem" case-sensitive="yes">
<vpe:template children="yes" modify="yes" class="org.jboss.tools.jsf.vpe.richfaces.template.RichFacesPanelMenuItemTemplate">
<vpe:dnd>
@@ -919,4 +963,8 @@
</vpe:template>
</vpe:tag>
+ <!-- RF4 templates w/corected names -->
+
+
+
</vpe:templates>
\ No newline at end of file
14 years, 11 months
- 1
- 0
JBoss Tools SVN: r31301 - in branches/jbosstools-3.2.x/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner: browser and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dmaliarevich
Date: 2011-05-13 12:23:20 -0400 (Fri, 13 May 2011)
New Revision: 31301
Modified:
branches/jbosstools-3.2.x/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/VpeXulrunnerMessages.java
branches/jbosstools-3.2.x/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/browser/XulRunnerBrowser.java
branches/jbosstools-3.2.x/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/messages.properties
Log:
https://issues.jboss.org/browse/JBIDE-7308 , error message was updated
Modified: branches/jbosstools-3.2.x/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/VpeXulrunnerMessages.java
===================================================================
--- branches/jbosstools-3.2.x/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/VpeXulrunnerMessages.java 2011-05-13 16:04:23 UTC (rev 31300)
+++ branches/jbosstools-3.2.x/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/VpeXulrunnerMessages.java 2011-05-13 16:23:20 UTC (rev 31301)
@@ -9,6 +9,7 @@
public static String XulRunnerBrowser_cannotGetPathToXulrunner;
public static String XulRunnerBrowser_notAvailable;
public static String XulRunnerBrowser_wrongVersion;
+ public static String CURRENT_PLATFORM_IS_NOT_SUPPORTED;
static {
// initialize resource bundle
NLS.initializeMessages(BUNDLE_NAME, VpeXulrunnerMessages.class);
Modified: branches/jbosstools-3.2.x/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/browser/XulRunnerBrowser.java
===================================================================
--- branches/jbosstools-3.2.x/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/browser/XulRunnerBrowser.java 2011-05-13 16:04:23 UTC (rev 31300)
+++ branches/jbosstools-3.2.x/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/browser/XulRunnerBrowser.java 2011-05-13 16:23:20 UTC (rev 31301)
@@ -205,55 +205,55 @@
//this function should be call
String xulRunnerPath = System.getProperty(XULRUNNER_PATH);
if (xulRunnerPath == null) {
-
GREVersionRange[] greRanges = {new GREVersionRange(XULRUNNER_LOWER_VERSION, true, XULRUNNER_HIGHER_VERSION, true)};
File xulRunnerFile = null;
// JBIDE-1222 begin
/*try {
if(!XULRUNNER_LOADING_INDICATOR) {
-
+
XULRUNNER_LOADING_INDICATOR=true;
//this function should be call
xulRunnerFile = Mozilla.getGREPathWithProperties(greRanges, null);
} else {
-
+
xulRunnerFile = null;
}
} catch (FileNotFoundException fnfe) {
// Ignre this exception. Will try to get XULRunner from plugin
}*/
// JBIDE-1222 end
-
- Bundle xulRunnerBundle = Platform.getBundle(getXulRunnerBundle());
- if (xulRunnerBundle == null) {
- throw new XulRunnerException(MessageFormat.format(VpeXulrunnerMessages.XulRunnerBrowser_bundleNotFound,getXulRunnerBundle())); //$NON-NLS-2$
+ Bundle xulRunnerBundle = Platform.getBundle(getXulRunnerBundle());
+ if (xulRunnerBundle == null) {
+ if (!XulRunnerBrowser.isCurrentPlatformOfficiallySupported()) {
+ throw new XulRunnerException(MessageFormat.format(
+ VpeXulrunnerMessages.CURRENT_PLATFORM_IS_NOT_SUPPORTED,
+ XulRunnerBrowser.CURRENT_PLATFORM_ID));
+ } else {
+ throw new XulRunnerException(MessageFormat.format(
+ VpeXulrunnerMessages.XulRunnerBrowser_bundleNotFound,
+ getXulRunnerBundle()));
}
+ }
- String xulRunnerVersion = (String) xulRunnerBundle.getHeaders().get("Bundle-Version"); //$NON-NLS-1$
- if (!greRanges[0].check(xulRunnerVersion)) {
- throw new XulRunnerException(MessageFormat.format(VpeXulrunnerMessages.XulRunnerBrowser_wrongVersion, xulRunnerBundle.getLocation() ,XulRunnerBrowser.XULRUNNER_LOWER_VERSION,XulRunnerBrowser.XULRUNNER_HIGHER_VERSION) );
- }
-
-
- URL url = xulRunnerBundle.getEntry(XULRUNNER_ENTRY);
- if (url == null) {
- throw new XulRunnerException(MessageFormat.format(VpeXulrunnerMessages.XulRunnerBrowser_bundleDoesNotContainXulrunner, getXulRunnerBundle(),XULRUNNER_ENTRY));
- }
-
- try {
- URL url1 = FileLocator.resolve(url);
- xulRunnerFile = new File(FileLocator.toFileURL(url1).getFile());
- } catch (IOException ioe) {
- throw new XulRunnerException(MessageFormat.format(VpeXulrunnerMessages.XulRunnerBrowser_cannotGetPathToXulrunner,getXulRunnerBundle()), ioe);
- }
-
+ String xulRunnerVersion = (String) xulRunnerBundle.getHeaders().get("Bundle-Version"); //$NON-NLS-1$
+ if (!greRanges[0].check(xulRunnerVersion)) {
+ throw new XulRunnerException(MessageFormat.format(VpeXulrunnerMessages.XulRunnerBrowser_wrongVersion, xulRunnerBundle.getLocation() ,XulRunnerBrowser.XULRUNNER_LOWER_VERSION,XulRunnerBrowser.XULRUNNER_HIGHER_VERSION) );
+ }
+ URL url = xulRunnerBundle.getEntry(XULRUNNER_ENTRY);
+ if (url == null) {
+ throw new XulRunnerException(MessageFormat.format(VpeXulrunnerMessages.XulRunnerBrowser_bundleDoesNotContainXulrunner, getXulRunnerBundle(),XULRUNNER_ENTRY));
+ }
+ try {
+ URL url1 = FileLocator.resolve(url);
+ xulRunnerFile = new File(FileLocator.toFileURL(url1).getFile());
+ } catch (IOException ioe) {
+ throw new XulRunnerException(MessageFormat.format(VpeXulrunnerMessages.XulRunnerBrowser_cannotGetPathToXulrunner,getXulRunnerBundle()), ioe);
+ }
xulRunnerPath = xulRunnerFile.getAbsolutePath();
System.setProperty(XULRUNNER_PATH, xulRunnerPath);
}
-
-
return xulRunnerPath;
}
Modified: branches/jbosstools-3.2.x/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/messages.properties
===================================================================
--- branches/jbosstools-3.2.x/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/messages.properties 2011-05-13 16:04:23 UTC (rev 31300)
+++ branches/jbosstools-3.2.x/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/messages.properties 2011-05-13 16:23:20 UTC (rev 31301)
@@ -3,3 +3,4 @@
XulRunnerBrowser_cannotGetPathToXulrunner=Cannot get path to XULRunner from bundle {0}
XulRunnerBrowser_notAvailable=nsIWebBrowser is not available
XulRunnerBrowser_wrongVersion=the version of the bundled XULRunner {0} must be >= {1} and <= {2}
+CURRENT_PLATFORM_IS_NOT_SUPPORTED=Current platform ''{0}'' is not supported.
14 years, 11 months
- 1
- 0
JBoss Tools SVN: r31300 - in trunk/jsf/plugins/org.jboss.tools.jsf: src/org/jboss/tools/jsf/web and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dmaliarevich
Date: 2011-05-13 12:04:23 -0400 (Fri, 13 May 2011)
New Revision: 31300
Added:
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/commands/
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/commands/CreateJSF2CompositeCommandHandler.java
Removed:
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/jsf2/action/CreateJSF2CompositeAction.java
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/jsf2/action/CreateJSF2CompositeContributionItem.java
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf/plugin.properties
trunk/jsf/plugins/org.jboss.tools.jsf/plugin.xml
Log:
https://issues.jboss.org/browse/JBIDE-8620 , created eclipse command, works for jsf2 projects only.
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/plugin.properties
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/plugin.properties 2011-05-13 16:00:30 UTC (rev 31299)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/plugin.properties 2011-05-13 16:04:23 UTC (rev 31300)
@@ -13,4 +13,6 @@
KBProblemName=JSF EL Problem
-KB_REQUIRED_FOR_JSF=JSF
\ No newline at end of file
+KB_REQUIRED_FOR_JSF=JSF
+
+CreateJSF2Composite=Create JSF2 composite...
\ No newline at end of file
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/plugin.xml
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/plugin.xml 2011-05-13 16:00:30 UTC (rev 31299)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/plugin.xml 2011-05-13 16:04:23 UTC (rev 31300)
@@ -808,17 +808,15 @@
</menuContribution>
<menuContribution
locationURI="popup:org.jboss.tools.jst.jsp.jspeditor.JSPTextEditor.source.EditorContext?before=org.jboss.tools.jst.jsp.i18n.ExternalizeAllStringsContributionItem">
- <dynamic
- class="org.jboss.tools.jsf.web.validation.jsf2.action.CreateJSF2CompositeContributionItem"
- id="org.jboss.tools.jsf.web.validation.jsf2.action.JSF2CreateCompositeContributionItem">
- </dynamic>
+ <command
+ commandId="org.jboss.tools.jsf.web.commands.CreateJSF2CompositeCommand"
+ style="toggle" />
</menuContribution>
<menuContribution
locationURI="popup:org.jboss.tools.jst.jsp.jspeditor.HTMLTextEditor.source.EditorContext?before=org.jboss.tools.jst.jsp.i18n.ExternalizeAllStringsContributionItem">
- <dynamic
- class="org.jboss.tools.jsf.web.validation.jsf2.action.CreateJSF2CompositeContributionItem"
- id="org.jboss.tools.jsf.web.validation.jsf2.action.JSF2CreateCompositeContributionItem">
- </dynamic>
+ <command
+ commandId="org.jboss.tools.jsf.web.commands.CreateJSF2CompositeCommand"
+ style="toggle" />
</menuContribution>
</extension>
<extension
@@ -873,5 +871,15 @@
forNature="org.jboss.tools.jsf.jsfnature">
</require>
</extension>
+
+ <extension
+ point="org.eclipse.ui.commands">
+ <command
+ categoryId="org.jboss.tools.jsf.commands.category"
+ id="org.jboss.tools.jsf.web.commands.CreateJSF2CompositeCommand"
+ description="%CreateJSF2Composite"
+ name="%CreateJSF2Composite"
+ defaultHandler="org.jboss.tools.jsf.web.commands.CreateJSF2CompositeCommandHandler"/>
+ </extension>
</plugin>
Added: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/commands/CreateJSF2CompositeCommandHandler.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/commands/CreateJSF2CompositeCommandHandler.java (rev 0)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/commands/CreateJSF2CompositeCommandHandler.java 2011-05-13 16:04:23 UTC (rev 31300)
@@ -0,0 +1,312 @@
+/*******************************************************************************
+ * Copyright (c) 2007-2011 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.jsf.web.commands;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+import java.util.Set;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import org.eclipse.core.commands.AbstractHandler;
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.expressions.IEvaluationContext;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IFolder;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.jface.dialogs.IInputValidator;
+import org.eclipse.jface.dialogs.InputDialog;
+import org.eclipse.jface.text.BadLocationException;
+import org.eclipse.jface.text.IDocument;
+import org.eclipse.jface.text.TextSelection;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.window.Window;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.ui.IEditorInput;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.ISources;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.handlers.HandlerUtil;
+import org.eclipse.ui.part.EditorPart;
+import org.eclipse.ui.part.FileEditorInput;
+import org.eclipse.ui.texteditor.ITextEditor;
+import org.eclipse.wst.sse.core.StructuredModelManager;
+import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
+import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
+import org.eclipse.wst.sse.ui.StructuredTextEditor;
+import org.eclipse.wst.xml.core.internal.document.NodeImpl;
+import org.eclipse.wst.xml.core.internal.document.TextImpl;
+import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument;
+import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
+import org.jboss.tools.common.model.XModelObjectConstants;
+import org.jboss.tools.jsf.JSFModelPlugin;
+import org.jboss.tools.jsf.jsf2.util.JSF2ResourceUtil;
+import org.jboss.tools.jsf.project.JSF2Util;
+import org.jboss.tools.jst.jsp.editor.IVisualContext;
+import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor;
+import org.jboss.tools.jst.jsp.jspeditor.JSPTextEditor;
+import org.jboss.tools.jst.jsp.jspeditor.SourceEditorPageContext;
+import org.jboss.tools.jst.jsp.jspeditor.dnd.JSPPaletteInsertHelper;
+import org.jboss.tools.jst.jsp.jspeditor.dnd.PaletteTaglibInserter;
+import org.jboss.tools.jst.web.tld.TaglibData;
+import org.jboss.tools.jst.web.tld.URIConstants;
+import org.w3c.dom.Element;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.NodeList;
+
+public class CreateJSF2CompositeCommandHandler extends AbstractHandler {
+
+ private final String IMPLEMENTATION = "composite:implementation"; //$NON-NLS-1$
+ private JSPMultiPageEditor editor;
+
+ @Override
+ public void setEnabled(Object evaluationContext) {
+ boolean enabled=false;
+ if (evaluationContext instanceof IEvaluationContext) {
+ IEvaluationContext context = (IEvaluationContext) evaluationContext;
+ Object activeEditor = context.getVariable(ISources.ACTIVE_EDITOR_NAME);
+ if (activeEditor instanceof ITextEditor) {
+ IEditorInput in = ((ITextEditor) activeEditor).getEditorInput();
+ if (in instanceof FileEditorInput) {
+ try {
+ enabled = JSF2Util.isJSF2(((FileEditorInput) in).getFile().getProject());
+ } catch (CoreException e) {
+ e.printStackTrace();
+ }
+ }
+ }
+ }
+ if (isEnabled() != enabled) {
+ setBaseEnabled(enabled);
+ }
+ }
+
+ @Override
+ public Object execute(ExecutionEvent event) throws ExecutionException {
+
+ IEditorPart ep = HandlerUtil.getActiveEditorChecked(event);
+ if (ep instanceof JSPMultiPageEditor) {
+ editor = (JSPMultiPageEditor) ep;
+ /*
+ * Get the selected text
+ */
+ ISelection selection = editor.getSelectionProvider().getSelection();
+ if ((selection instanceof TextSelection)
+ && (selection instanceof IStructuredSelection)) {
+ TextSelection textSelection = (TextSelection) selection;
+ IStructuredSelection ss = (IStructuredSelection) selection;
+ final IProject project = editor.getProject();
+ /*
+ * Correct marked text if some tags were partially selected.
+ */
+ int offset = 0;
+ int length = 0;
+ /*
+ * When there is only text node - use only selected text
+ */
+ if ((ss.size() == 1) && (ss.getFirstElement() instanceof TextImpl)) {
+ offset = textSelection.getOffset();
+ length = textSelection.getLength();
+ } else {
+ /*
+ * Otherwise selection will be expanded
+ * to the whole selected element with its children
+ */
+ Iterator it = ss.iterator();
+ boolean first = true;
+ while (it.hasNext()) {
+ Object ob = (Object) it.next();
+ if (ob instanceof NodeImpl) {
+ NodeImpl n = ((NodeImpl) ob);
+ if (first) {
+ offset = n.getStartOffset();
+ first = false;
+ }
+ length += n.getEndOffset() - n.getStartOffset();
+ }
+ }
+ /*
+ * Get composite's name and namespace from the popup dialog
+ */
+ InputDialog dlg = new InputDialog(Display.getCurrent().getActiveShell(),
+ "Creating composite component", //$NON-NLS-1$
+ "Enter component's namespace and name:", "namespace:name", //$NON-NLS-1$ //$NON-NLS-2$
+ new IInputValidator() {
+ public String isValid(String newText) {
+ String trim = newText.trim();
+ String result = null;
+ String[] split = trim.split(":", 2); //$NON-NLS-1$
+ Pattern p = Pattern.compile("([a-zA-Z]+\\d*)+"); //$NON-NLS-1$
+ /*
+ * Check the correct format.
+ * Matcher will accept only word characters with optional numbers.
+ */
+ if ((split.length != 2) || trim.startsWith(":") || trim.endsWith(":") //$NON-NLS-1$ //$NON-NLS-2$
+ || (split[0].length() == 0) || (split[1].length() == 0)) {
+ result = "Component's name should fit in the pattern \"namespace:name\""; //$NON-NLS-1$
+ } else if(!p.matcher(split[0]).matches()) {
+ result = "Namespace '"+split[0]+"' has wrong spelling, please correct"; //$NON-NLS-1$ //$NON-NLS-2$
+ } else if(!p.matcher(split[1]).matches()) {
+ result = "Name '"+split[1]+"' has wrong spelling, please correct"; //$NON-NLS-1$ //$NON-NLS-2$
+ } else {
+ String nameSpaceURI = JSF2ResourceUtil.JSF2_URI_PREFIX + "/" + split[0]; //$NON-NLS-1$
+ Object fld = JSF2ResourceUtil.findResourcesFolderContainerByNameSpace(project, nameSpaceURI);
+ if (fld instanceof IFolder) {
+ IResource res = ((IFolder) fld).findMember(split[1]+ ".xhtml"); //$NON-NLS-1$
+ if ((res instanceof IFile) && ((IFile)res).exists() ) {
+ result = "Component with the same name already exists"; //$NON-NLS-1$
+ }
+ }
+ }
+ return result;
+ }
+ });
+ if (dlg.open() == Window.OK) {
+ /*
+ * Create all required files
+ */
+ String componentName = dlg.getValue();
+ String[] split = componentName.split(":", 2); //$NON-NLS-1$
+ String path = ""; //$NON-NLS-1$
+ path = componentName.replaceAll(":", "/") + ".xhtml"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ if (project != null) {
+ IStructuredModel model = null;
+ try {
+ IFile createdFile = JSF2ResourceUtil
+ .createCompositeComponentFile(project, new Path(path));
+ /*
+ * Add selected text to the template
+ */
+ IModelManager manager = StructuredModelManager.getModelManager();
+ if (manager != null) {
+ model = manager.getModelForEdit(createdFile);
+ if (model instanceof IDOMModel) {
+ IDOMModel domModel = (IDOMModel) model;
+ IDOMDocument document = domModel.getDocument();
+ NodeList list = document.getElementsByTagName(IMPLEMENTATION);
+ if (list.getLength() == 1) {
+ IDocument doc = editor.getDocumentProvider().getDocument(editor.getEditorInput());
+ String replacedText = doc.get(offset, length);
+ String content = document.getStructuredDocument().getText();
+ int index = content.indexOf("<"+IMPLEMENTATION+">") + ("<"+IMPLEMENTATION+">").length(); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+ content = content.subSequence(0, index) + "\n" + replacedText + content.subSequence(index, content.length()); //$NON-NLS-1$
+ domModel.reload(new ByteArrayInputStream(content.getBytes()));
+ model.save();
+ /*
+ * Register JSF 2 composite on the current page
+ */
+ String replacement = "<" + componentName + "> </" + componentName + ">"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ doc.replace(offset, length, replacement);
+ /*
+ * Register the required taglib
+ */
+ StructuredTextEditor ed = ((JSPMultiPageEditor) editor).getSourceEditor();
+ if (ed instanceof JSPTextEditor) {
+ String libraryUri = JSF2ResourceUtil.JSF2_URI_PREFIX + "/" + split[0]; //$NON-NLS-1$
+ PaletteTaglibInserter PaletteTaglibInserter = new PaletteTaglibInserter();
+ Properties p = new Properties();
+ p.put("selectionProvider", editor.getSelectionProvider()); //$NON-NLS-1$
+ p.setProperty(URIConstants.LIBRARY_URI, libraryUri);
+ p.setProperty(URIConstants.LIBRARY_VERSION, ""); //$NON-NLS-1$
+ p.setProperty(URIConstants.DEFAULT_PREFIX, split[0]);
+ p.setProperty(JSPPaletteInsertHelper.PROPOPERTY_ADD_TAGLIB, "true"); //$NON-NLS-1$
+ p.setProperty(XModelObjectConstants.REFORMAT, "yes"); //$NON-NLS-1$
+ p.setProperty(XModelObjectConstants.START_TEXT,
+ "<%@ taglib uri=\""+libraryUri+"\" prefix=\"" +split[0]+ "\" %>\\n"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ PaletteTaglibInserter.inserTaglib(ed.getTextViewer().getDocument(), p);
+ }
+ /*
+ * Add required taglibs to the composite file
+ */
+ IVisualContext context = editor.getJspEditor().getPageContext();
+ List<TaglibData> tl = null;
+ if (context instanceof SourceEditorPageContext) {
+ SourceEditorPageContext sourcePageContext = (SourceEditorPageContext) context;
+ /*
+ * Get taglibs from the source file
+ */
+ tl = sourcePageContext.getTagLibs();
+ Map<String, String> sourceTaglibs = new HashMap<String, String>();
+ Map<String, String> requiredTaglibs = new HashMap<String, String>();
+ Set<String> compositeTaglibs = new HashSet<String>();
+ for (TaglibData taglibData : tl) {
+ sourceTaglibs.put(taglibData.getPrefix(), taglibData.getUri());
+ }
+ /*
+ * Parse selected fragment to find used taglibs
+ */
+ Pattern p = Pattern.compile("<([a-zA-Z]+\\d*)+:"); //$NON-NLS-1$
+ Matcher m = p.matcher(replacedText);
+ while (m.find()) {
+ if (sourceTaglibs.keySet().contains(m.group(1))
+ && !requiredTaglibs.keySet().contains(m.group(1))) {
+ requiredTaglibs.put(m.group(1), sourceTaglibs.get(m.group(1)));
+ }
+ }
+ /*
+ * Get the <html> tag of the created file
+ */
+ list = document.getElementsByTagName("html"); //$NON-NLS-1$
+ if (list.getLength() == 1) {
+ Element html = ((Element)list.item(0));
+ NamedNodeMap map = html.getAttributes();
+ for (int i = 0; i < map.getLength(); i++) {
+ compositeTaglibs.add(map.item(i).getNodeName());
+ }
+ for (String key : requiredTaglibs.keySet()) {
+ String xmlns = "xmlns:"+key; //$NON-NLS-1$
+ if (!compositeTaglibs.contains(xmlns)) {
+ html.setAttribute(xmlns, requiredTaglibs.get(key));
+ }
+ }
+ }
+ }
+ /*
+ * Open created file
+ */
+ FileEditorInput input = new FileEditorInput(createdFile);
+ JSPMultiPageEditor part = (JSPMultiPageEditor) PlatformUI
+ .getWorkbench().getActiveWorkbenchWindow().getActivePage()
+ .openEditor(input, "org.jboss.tools.jst.jsp.jspeditor.JSPTextEditor", true); //$NON-NLS-1$
+ }
+ }
+ }
+ } catch (CoreException e) {
+ JSFModelPlugin.getPluginLog().logError(e);
+ } catch (IOException e) {
+ JSFModelPlugin.getPluginLog().logError(e);
+ } catch (BadLocationException e) {
+ JSFModelPlugin.getPluginLog().logError(e);
+ } finally {
+ if (model != null) {
+ model.releaseFromEdit();
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ return null;
+ }
+
+}
Deleted: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/jsf2/action/CreateJSF2CompositeAction.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/jsf2/action/CreateJSF2CompositeAction.java 2011-05-13 16:00:30 UTC (rev 31299)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/jsf2/action/CreateJSF2CompositeAction.java 2011-05-13 16:04:23 UTC (rev 31300)
@@ -1,280 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007-2011 Exadel, Inc. and 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:
- * Exadel, Inc. and Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
-package org.jboss.tools.jsf.web.validation.jsf2.action;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-import java.util.Set;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.dialogs.IInputValidator;
-import org.eclipse.jface.dialogs.InputDialog;
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.TextSelection;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.window.Window;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.part.FileEditorInput;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.ui.StructuredTextEditor;
-import org.eclipse.wst.xml.core.internal.document.NodeImpl;
-import org.eclipse.wst.xml.core.internal.document.TextImpl;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.jboss.tools.common.model.XModelObjectConstants;
-import org.jboss.tools.jsf.JSFModelPlugin;
-import org.jboss.tools.jsf.jsf2.util.JSF2ResourceUtil;
-import org.jboss.tools.jst.jsp.editor.IVisualContext;
-import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor;
-import org.jboss.tools.jst.jsp.jspeditor.JSPTextEditor;
-import org.jboss.tools.jst.jsp.jspeditor.SourceEditorPageContext;
-import org.jboss.tools.jst.jsp.jspeditor.dnd.JSPPaletteInsertHelper;
-import org.jboss.tools.jst.jsp.jspeditor.dnd.PaletteTaglibInserter;
-import org.jboss.tools.jst.web.tld.TaglibData;
-import org.jboss.tools.jst.web.tld.URIConstants;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.NodeList;
-
-public class CreateJSF2CompositeAction extends Action {
-
- private final String IMPLEMENTATION = "composite:implementation"; //$NON-NLS-1$
-
- private JSPMultiPageEditor editor;
-
- public CreateJSF2CompositeAction() {
- super();
- }
-
- @Override
- public void run() {
- editor = (JSPMultiPageEditor) PlatformUI.getWorkbench()
- .getActiveWorkbenchWindow().getActivePage().getActiveEditor();
- /*
- * Get the selected text
- */
- ISelection selection = editor.getSelectionProvider().getSelection();
- if ((selection instanceof TextSelection)
- && (selection instanceof IStructuredSelection)) {
- TextSelection textSelection = (TextSelection) selection;
- IStructuredSelection ss = (IStructuredSelection) selection;
- final IProject project = editor.getProject();
- /*
- * Correct marked text if some tags were partially selected.
- */
- int offset = 0;
- int length = 0;
- /*
- * When there is only text node - use only selected text
- */
- if ((ss.size() == 1) && (ss.getFirstElement() instanceof TextImpl)) {
- offset = textSelection.getOffset();
- length = textSelection.getLength();
- } else {
- /*
- * Otherwise selection will be expanded
- * to the whole selected element with its children
- */
- Iterator it = ss.iterator();
- boolean first = true;
- while (it.hasNext()) {
- Object ob = (Object) it.next();
- if (ob instanceof NodeImpl) {
- NodeImpl n = ((NodeImpl) ob);
- if (first) {
- offset = n.getStartOffset();
- first = false;
- }
- length += n.getEndOffset() - n.getStartOffset();
- }
- }
- /*
- * Get composite's name and namespace from the popup dialog
- */
- InputDialog dlg = new InputDialog(Display.getCurrent().getActiveShell(),
- "Creating composite component", //$NON-NLS-1$
- "Enter component's namespace and name:", "namespace:name", //$NON-NLS-1$ //$NON-NLS-2$
- new IInputValidator() {
- public String isValid(String newText) {
- String trim = newText.trim();
- String result = null;
- String[] split = trim.split(":", 2); //$NON-NLS-1$
- Pattern p = Pattern.compile("([a-zA-Z]+\\d*)+"); //$NON-NLS-1$
- /*
- * Check the correct format.
- * Matcher will accept only word characters with optional numbers.
- */
- if ((split.length != 2) || trim.startsWith(":") || trim.endsWith(":") //$NON-NLS-1$ //$NON-NLS-2$
- || (split[0].length() == 0) || (split[1].length() == 0)) {
- result = "Component's name should fit in the pattern \"namespace:name\""; //$NON-NLS-1$
- } else if(!p.matcher(split[0]).matches()) {
- result = "Namespace '"+split[0]+"' has wrong spelling, please correct"; //$NON-NLS-1$ //$NON-NLS-2$
- } else if(!p.matcher(split[1]).matches()) {
- result = "Name '"+split[1]+"' has wrong spelling, please correct"; //$NON-NLS-1$ //$NON-NLS-2$
- } else {
- String nameSpaceURI = JSF2ResourceUtil.JSF2_URI_PREFIX + "/" + split[0]; //$NON-NLS-1$
- Object fld = JSF2ResourceUtil.findResourcesFolderContainerByNameSpace(project, nameSpaceURI);
- if (fld instanceof IFolder) {
- IResource res = ((IFolder) fld).findMember(split[1]+ ".xhtml"); //$NON-NLS-1$
- if ((res instanceof IFile) && ((IFile)res).exists() ) {
- result = "Component with the same name already exists"; //$NON-NLS-1$
- }
- }
- }
- return result;
- }
- });
- if (dlg.open() == Window.OK) {
- /*
- * Create all required files
- */
- String componentName = dlg.getValue();
- String[] split = componentName.split(":", 2); //$NON-NLS-1$
- String path = ""; //$NON-NLS-1$
- path = componentName.replaceAll(":", "/") + ".xhtml"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- if (project != null) {
- IStructuredModel model = null;
- try {
- IFile createdFile = JSF2ResourceUtil
- .createCompositeComponentFile(project, new Path(path));
- /*
- * Add selected text to the template
- */
- IModelManager manager = StructuredModelManager.getModelManager();
- if (manager != null) {
- model = manager.getModelForEdit(createdFile);
- if (model instanceof IDOMModel) {
- IDOMModel domModel = (IDOMModel) model;
- IDOMDocument document = domModel.getDocument();
- NodeList list = document.getElementsByTagName(IMPLEMENTATION);
- if (list.getLength() == 1) {
- IDocument doc = editor.getDocumentProvider().getDocument(editor.getEditorInput());
- String replacedText = doc.get(offset, length);
- String content = document.getStructuredDocument().getText();
- int index = content.indexOf("<"+IMPLEMENTATION+">") + ("<"+IMPLEMENTATION+">").length(); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
- content = content.subSequence(0, index) + "\n" + replacedText + content.subSequence(index, content.length()); //$NON-NLS-1$
- domModel.reload(new ByteArrayInputStream(content.getBytes()));
- model.save();
- /*
- * Register JSF 2 composite on the current page
- */
- String replacement = "<" + componentName + "> </" + componentName + ">"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- doc.replace(offset, length, replacement);
- /*
- * Register the required taglib
- */
- StructuredTextEditor ed = ((JSPMultiPageEditor) editor).getSourceEditor();
- if (ed instanceof JSPTextEditor) {
- String libraryUri = JSF2ResourceUtil.JSF2_URI_PREFIX + "/" + split[0]; //$NON-NLS-1$
- PaletteTaglibInserter PaletteTaglibInserter = new PaletteTaglibInserter();
- Properties p = new Properties();
- p.put("selectionProvider", editor.getSelectionProvider()); //$NON-NLS-1$
- p.setProperty(URIConstants.LIBRARY_URI, libraryUri);
- p.setProperty(URIConstants.LIBRARY_VERSION, ""); //$NON-NLS-1$
- p.setProperty(URIConstants.DEFAULT_PREFIX, split[0]);
- p.setProperty(JSPPaletteInsertHelper.PROPOPERTY_ADD_TAGLIB, "true"); //$NON-NLS-1$
- p.setProperty(XModelObjectConstants.REFORMAT, "yes"); //$NON-NLS-1$
- p.setProperty(XModelObjectConstants.START_TEXT,
- "<%@ taglib uri=\""+libraryUri+"\" prefix=\"" +split[0]+ "\" %>\\n"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- PaletteTaglibInserter.inserTaglib(ed.getTextViewer().getDocument(), p);
- }
- /*
- * Add required taglibs to the composite file
- */
- IVisualContext context = editor.getJspEditor().getPageContext();
- List<TaglibData> tl = null;
- if (context instanceof SourceEditorPageContext) {
- SourceEditorPageContext sourcePageContext = (SourceEditorPageContext) context;
- /*
- * Get taglibs from the source file
- */
- tl = sourcePageContext.getTagLibs();
- Map<String, String> sourceTaglibs = new HashMap<String, String>();
- Map<String, String> requiredTaglibs = new HashMap<String, String>();
- Set<String> compositeTaglibs = new HashSet<String>();
- for (TaglibData taglibData : tl) {
- sourceTaglibs.put(taglibData.getPrefix(), taglibData.getUri());
- }
- /*
- * Parse selected fragment to find used taglibs
- */
- Pattern p = Pattern.compile("<([a-zA-Z]+\\d*)+:"); //$NON-NLS-1$
- Matcher m = p.matcher(replacedText);
- while (m.find()) {
- if (sourceTaglibs.keySet().contains(m.group(1))
- && !requiredTaglibs.keySet().contains(m.group(1))) {
- requiredTaglibs.put(m.group(1), sourceTaglibs.get(m.group(1)));
- }
- }
- /*
- * Get the <html> tag of the created file
- */
- list = document.getElementsByTagName("html"); //$NON-NLS-1$
- if (list.getLength() == 1) {
- Element html = ((Element)list.item(0));
- NamedNodeMap map = html.getAttributes();
- for (int i = 0; i < map.getLength(); i++) {
- compositeTaglibs.add(map.item(i).getNodeName());
- }
- for (String key : requiredTaglibs.keySet()) {
- String xmlns = "xmlns:"+key; //$NON-NLS-1$
- if (!compositeTaglibs.contains(xmlns)) {
- html.setAttribute(xmlns, requiredTaglibs.get(key));
- }
- }
- }
- }
- /*
- * Open created file
- */
- FileEditorInput input = new FileEditorInput(createdFile);
- JSPMultiPageEditor part = (JSPMultiPageEditor) PlatformUI
- .getWorkbench().getActiveWorkbenchWindow().getActivePage()
- .openEditor(input, "org.jboss.tools.jst.jsp.jspeditor.JSPTextEditor", true); //$NON-NLS-1$
- }
- }
- }
- } catch (CoreException e) {
- JSFModelPlugin.getPluginLog().logError(e);
- } catch (IOException e) {
- JSFModelPlugin.getPluginLog().logError(e);
- } catch (BadLocationException e) {
- JSFModelPlugin.getPluginLog().logError(e);
- } finally {
- if (model != null) {
- model.releaseFromEdit();
- }
- }
- }
- }
- }
- }
- }
-}
\ No newline at end of file
Deleted: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/jsf2/action/CreateJSF2CompositeContributionItem.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/jsf2/action/CreateJSF2CompositeContributionItem.java 2011-05-13 16:00:30 UTC (rev 31299)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/jsf2/action/CreateJSF2CompositeContributionItem.java 2011-05-13 16:04:23 UTC (rev 31300)
@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007-2011 Exadel, Inc. and 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:
- * Exadel, Inc. and Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
-package org.jboss.tools.jsf.web.validation.jsf2.action;
-
-import org.eclipse.jface.action.ActionContributionItem;
-import org.eclipse.swt.widgets.Menu;
-import org.jboss.tools.jsf.messages.JSFUIMessages;
-
-public class CreateJSF2CompositeContributionItem extends ActionContributionItem {
-
- public CreateJSF2CompositeContributionItem() {
- super(new CreateJSF2CompositeAction());
- }
-
- @Override
- public void fill(Menu parent, int index) {
- getAction().setText(JSFUIMessages.CreateJSF2Composite);
- super.fill(parent, index);
- }
-}
14 years, 11 months
- 1
- 0
JBoss Tools SVN: r31299 - trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2011-05-13 12:00:30 -0400 (Fri, 13 May 2011)
New Revision: 31299
Modified:
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/pom.xml
Log:
restore changes from revision 31288
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/pom.xml
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/pom.xml 2011-05-13 15:54:09 UTC (rev 31298)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/pom.xml 2011-05-13 16:00:30 UTC (rev 31299)
@@ -2,12 +2,12 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.jboss.tools</groupId>
- <artifactId>org.jboss.tools.parent.pom</artifactId>
- <version>0.0.2-SNAPSHOT</version>
+ <groupId>org.jboss.tools.hibernatetools</groupId>
+ <artifactId>plugins</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.hibernatetools.plugins</groupId>
<artifactId>org.jboss.tools.hibernate.jpt.core</artifactId>
<version>3.4.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file
+</project>
14 years, 11 months
- 1
- 0
JBoss Tools SVN: r31298 - trunk/vpe/plugins/org.jboss.tools.vpe.html/templates.
by jbosstools-commits＠lists.jboss.org
Author: dmaliarevich
Date: 2011-05-13 11:54:09 -0400 (Fri, 13 May 2011)
New Revision: 31298
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe.html/templates/vpe-templates-html.xml
Log:
https://issues.jboss.org/browse/JBIDE-8479 , templates were added
Modified: trunk/vpe/plugins/org.jboss.tools.vpe.html/templates/vpe-templates-html.xml
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.html/templates/vpe-templates-html.xml 2011-05-13 15:32:15 UTC (rev 31297)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.html/templates/vpe-templates-html.xml 2011-05-13 15:54:09 UTC (rev 31298)
@@ -143,13 +143,28 @@
</vpe:dnd>
</vpe:template>
</vpe:tag>
-
- <vpe:tag name="audio" case-sensitive="no">
+
+ <vpe:tag name="article" case-sensitive="no">
<vpe:template children="yes" modify="yes">
- <vpe:copy attrs="id,style,class,dir,hidden,autoplay,controls,loop,preload,src" />
+ <vpe:copy />
+ <vpe:textFormatting use-default-formats="yes" />
</vpe:template>
</vpe:tag>
+ <vpe:tag name="aside" case-sensitive="no">
+ <vpe:template children="yes" modify="yes">
+ <vpe:copy />
+ <vpe:textFormatting use-default-formats="yes" />
+ </vpe:template>
+ </vpe:tag>
+
+ <vpe:tag name="audio" case-sensitive="no">
+ <vpe:template children="no" modify="no">
+ <vpe:copy
+ attrs="id,style,class,dir,hidden,autoplay,controls,loop,preload,src" />
+ </vpe:template>
+ </vpe:tag>
+
<vpe:tag name="b" case-sensitive="no">
<vpe:template children="yes" modify="yes">
<vpe:copy attrs="id,style,class,dir" />
@@ -437,6 +452,12 @@
</vpe:template>
</vpe:tag>
+ <vpe:tag name="canvas" case-sensitive="no">
+ <vpe:template children="no" modify="no">
+ <vpe:copy />
+ </vpe:template>
+ </vpe:tag>
+
<vpe:tag name="caption" case-sensitive="no">
<vpe:template children="yes" modify="yes">
<vpe:copy attrs="id,style,class,dir" />
@@ -563,6 +584,18 @@
</vpe:template>
</vpe:tag>
+ <vpe:tag name="command" case-sensitive="no">
+ <vpe:template children="yes" modify="yes">
+ <vpe:copy />
+ <vpe:textFormatting use-default-formats="yes" />
+ </vpe:template>
+ </vpe:tag>
+
+ <vpe:tag name="datalist" case-sensitive="no">
+ <vpe:template children="no" modify="no">
+ </vpe:template>
+ </vpe:tag>
+
<vpe:tag name="dd" case-sensitive="no">
<vpe:template children="yes" modify="yes">
<vpe:copy attrs="id,style,class,dir" />
@@ -625,6 +658,7 @@
<vpe:tag name="details" case-sensitive="no">
<vpe:template children="yes" modify="yes">
<vpe:copy attrs="id,style,class,dir,hidden,open" />
+ <vpe:textFormatting use-default-formats="yes" />
</vpe:template>
</vpe:tag>
@@ -819,6 +853,20 @@
</vpe:template>
</vpe:tag>
+ <vpe:tag name="figcaption" case-sensitive="no">
+ <vpe:template children="yes" modify="yes">
+ <vpe:copy />
+ <vpe:textFormatting use-default-formats="yes" />
+ </vpe:template>
+ </vpe:tag>
+
+ <vpe:tag name="figure" case-sensitive="no">
+ <vpe:template children="yes" modify="yes">
+ <vpe:copy />
+ <vpe:textFormatting use-default-formats="yes" />
+ </vpe:template>
+ </vpe:tag>
+
<vpe:tag name="font" case-sensitive="no">
<vpe:template children="yes" modify="yes">
<vpe:copy attrs="id,style,class,size,color,face,dir" />
@@ -866,7 +914,14 @@
<vpe:copy attrs="border,bordercolor,cols,frameborder,framespacing,rows" />
</vpe:template>
</vpe:tag>
-
+
+ <vpe:tag name="footer" case-sensitive="no">
+ <vpe:template children="yes" modify="yes">
+ <vpe:copy />
+ <vpe:textFormatting use-default-formats="yes" />
+ </vpe:template>
+ </vpe:tag>
+
<vpe:tag name="h1" case-sensitive="no">
<vpe:template children="yes" modify="yes">
<vpe:copy attrs="id,style,class,align,dir" />
@@ -1077,6 +1132,20 @@
</vpe:template>
</vpe:tag>
+ <vpe:tag name="header" case-sensitive="no">
+ <vpe:template children="yes" modify="yes">
+ <vpe:copy />
+ <vpe:textFormatting use-default-formats="yes" />
+ </vpe:template>
+ </vpe:tag>
+
+ <vpe:tag name="hgroup" case-sensitive="no">
+ <vpe:template children="yes" modify="yes">
+ <vpe:copy />
+ <vpe:textFormatting use-default-formats="yes" />
+ </vpe:template>
+ </vpe:tag>
+
<vpe:tag name="hr" case-sensitive="no">
<vpe:template children="no" modify="no">
<vpe:copy attrs="id,style,class,align,size,width,color,dir" />
@@ -1289,6 +1358,15 @@
</vpe:template>
</vpe:tag>
+ <vpe:tag name="keygen" case-sensitive="no">
+ <vpe:template children="no" modify="no">
+ <select>
+ <option>High Grade</option>
+ <option>Medium Grade</option>
+ </select>
+ </vpe:template>
+ </vpe:tag>
+
<vpe:tag name="kbd" case-sensitive="no">
<vpe:template children="yes" modify="yes">
<vpe:copy attrs="id,style,class,dir" />
@@ -1459,6 +1537,13 @@
<vpe:copy attrs="id,style,class,dir,hidden" />
</vpe:template>
</vpe:tag>
+
+ <vpe:tag name="marquee" case-sensitive="no">
+ <vpe:template children="yes" modify="no">
+ <vpe:copy
+ attrs="behavior,bgcolor,direction,height,hspace,loop,scrollamount,scrolldelay,truespeed,vspace,width" />
+ </vpe:template>
+ </vpe:tag>
<vpe:tag name="menu" case-sensitive="no">
<vpe:template children="yes" modify="no">
@@ -1490,6 +1575,11 @@
</vpe:template>
</vpe:tag>
+ <vpe:tag name="noembed" case-sensitive="no">
+ <vpe:template children="no" modify="no">
+ </vpe:template>
+ </vpe:tag>
+
<vpe:tag name="noframes" case-sensitive="no">
<vpe:template children="yes" modify="no" >
<vpe:copy />
@@ -2288,6 +2378,18 @@
</vpe:template>
</vpe:tag>
+ <vpe:tag name="wbr" case-sensitive="no">
+ <vpe:template children="no" modify="no">
+ <vpe:copy />
+ </vpe:template>
+ </vpe:tag>
+
+ <vpe:tag name="xmp" case-sensitive="no">
+ <vpe:template children="yes" modify="no">
+ <vpe:copy />
+ </vpe:template>
+ </vpe:tag>
+
<vpe:tag name="#comment" case-sensitive="no">
<vpe:template children="no" modify="yes"
class="org.jboss.tools.vpe.html.template.HtmlCommentTemplate">
@@ -2299,28 +2401,5 @@
class="org.jboss.tools.vpe.html.template.HtmlTextTemplate">
</vpe:template>
</vpe:tag>
-
- <vpe:tag name="marquee" case-sensitive="no">
- <vpe:template children="yes" modify="no">
- <vpe:copy
- attrs="behavior,bgcolor,direction,height,hspace,loop,scrollamount,scrolldelay,truespeed,vspace,width" />
- </vpe:template>
- </vpe:tag>
- <vpe:tag name="noembed" case-sensitive="no">
- <vpe:template children="no" modify="no">
- </vpe:template>
- </vpe:tag>
-
- <vpe:tag name="wbr" case-sensitive="no">
- <vpe:template children="no" modify="no">
- <vpe:copy />
- </vpe:template>
- </vpe:tag>
-
- <vpe:tag name="xmp" case-sensitive="no">
- <vpe:template children="yes" modify="no">
- <vpe:copy />
- </vpe:template>
- </vpe:tag>
</vpe:templates>
\ No newline at end of file
14 years, 11 months
- 1
- 0
JBoss Tools SVN: r31297 - in trunk/vpe/plugins: org.jboss.tools.vpe.html/templates and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: yradtsevich
Date: 2011-05-13 11:32:15 -0400 (Fri, 13 May 2011)
New Revision: 31297
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe.html/templates/vpe-templates-html.xml
trunk/vpe/plugins/org.jboss.tools.vpe/ve/EditorOverride.css
Log:
https://issues.jboss.org/browse/JBIDE-8480 : HTML 5 support in Visual Page Editor
- added ~15 new HTML5 templates
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/ve/EditorOverride.css
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/ve/EditorOverride.css 2011-05-13 15:04:10 UTC (rev 31296)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/ve/EditorOverride.css 2011-05-13 15:32:15 UTC (rev 31297)
@@ -362,8 +362,16 @@
a[\_moz_anonclass="mozTableRemoveRow"]:active {
background-image: url("resource://gre/res/table-remove-row-active.gif");
-}
+}
+mark {
+ background-color: yellow;/*the same color as in XULRunner 2.0*/
+}
+
+section {
+ display: block;
+}
+
/*JBIDE-3995 #1*/
select div {
display: inline;
Modified: trunk/vpe/plugins/org.jboss.tools.vpe.html/templates/vpe-templates-html.xml
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.html/templates/vpe-templates-html.xml 2011-05-13 15:04:10 UTC (rev 31296)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.html/templates/vpe-templates-html.xml 2011-05-13 15:32:15 UTC (rev 31297)
@@ -143,6 +143,12 @@
</vpe:dnd>
</vpe:template>
</vpe:tag>
+
+ <vpe:tag name="audio" case-sensitive="no">
+ <vpe:template children="yes" modify="yes">
+ <vpe:copy attrs="id,style,class,dir,hidden,autoplay,controls,loop,preload,src" />
+ </vpe:template>
+ </vpe:tag>
<vpe:tag name="b" case-sensitive="no">
<vpe:template children="yes" modify="yes">
@@ -615,6 +621,12 @@
</vpe:textFormatting>
</vpe:template>
</vpe:tag>
+
+ <vpe:tag name="details" case-sensitive="no">
+ <vpe:template children="yes" modify="yes">
+ <vpe:copy attrs="id,style,class,dir,hidden,open" />
+ </vpe:template>
+ </vpe:tag>
<vpe:tag name="dfn" case-sensitive="no">
<vpe:template children="yes" modify="yes">
@@ -1442,6 +1454,12 @@
</vpe:template>
</vpe:tag>
+ <vpe:tag name="mark" case-sensitive="no">
+ <vpe:template children="yes" modify="yes">
+ <vpe:copy attrs="id,style,class,dir,hidden" />
+ </vpe:template>
+ </vpe:tag>
+
<vpe:tag name="menu" case-sensitive="no">
<vpe:template children="yes" modify="no">
<vpe:copy attrs="id,style,class,dir" />
@@ -1453,7 +1471,19 @@
<vpe:tag name="meta" case-sensitive="no">
<vpe:template children="no" modify="no" />
</vpe:tag>
+
+ <vpe:tag name="meter" case-sensitive="no">
+ <vpe:template children="yes" modify="yes">
+ <vpe:copy attrs="id,style,class,dir,hidden,form,high,low,max,min,optimum,value" />
+ </vpe:template>
+ </vpe:tag>
+ <vpe:tag name="nav" case-sensitive="no">
+ <vpe:template children="yes" modify="yes">
+ <vpe:copy attrs="id,style,class,dir,hidden" />
+ </vpe:template>
+ </vpe:tag>
+
<vpe:tag name="nobr" case-sensitive="no">
<vpe:template children="yes" modify="no" >
<vpe:copy />
@@ -1522,6 +1552,12 @@
<vpe:copy attrs="id,style,class,value,label,dir,disabled,selected" />
</vpe:template>
</vpe:tag>
+
+ <vpe:tag name="output" case-sensitive="no">
+ <vpe:template children="yes" modify="yes">
+ <vpe:copy attrs="id,style,class,dir,hidden,for,form,name" />
+ </vpe:template>
+ </vpe:tag>
<vpe:tag name="p" case-sensitive="no">
<vpe:template children="yes" modify="yes">
@@ -1592,6 +1628,12 @@
</vpe:template>
</vpe:tag>
+ <vpe:tag name="progress" case-sensitive="no">
+ <vpe:template children="yes" modify="yes">
+ <vpe:copy attrs="id,style,class,dir,hidden,max,value" />
+ </vpe:template>
+ </vpe:tag>
+
<vpe:tag name="q" case-sensitive="no">
<vpe:template children="yes" modify="yes">
<vpe:copy attrs="id,style,class,dir" />
@@ -1613,6 +1655,24 @@
</vpe:textFormatting>
</vpe:template>
</vpe:tag>
+
+ <vpe:tag name="rp" case-sensitive="no">
+ <vpe:template children="yes" modify="yes">
+ <vpe:copy attrs="id,style,class,dir,hidden" />
+ </vpe:template>
+ </vpe:tag>
+
+ <vpe:tag name="rt" case-sensitive="no">
+ <vpe:template children="yes" modify="yes">
+ <vpe:copy attrs="id,style,class,dir,hidden" />
+ </vpe:template>
+ </vpe:tag>
+
+ <vpe:tag name="ruby" case-sensitive="no">
+ <vpe:template children="yes" modify="yes">
+ <vpe:copy attrs="id,style,class,dir,hidden" />
+ </vpe:template>
+ </vpe:tag>
<vpe:tag name="s" case-sensitive="no">
<vpe:template children="yes" modify="yes">
@@ -1676,6 +1736,12 @@
<vpe:tag name="script" case-sensitive="no">
<vpe:template children="no" modify="no" />
</vpe:tag>
+
+ <vpe:tag name="section" case-sensitive="no">
+ <vpe:template children="yes" modify="yes">
+ <vpe:copy attrs="id,style,class,dir,hidden" />
+ </vpe:template>
+ </vpe:tag>
<vpe:tag name="select" case-sensitive="no">
<vpe:template children="yes" modify="yes">
@@ -1744,6 +1810,12 @@
</vpe:textFormatting>
</vpe:template>
</vpe:tag>
+
+ <vpe:tag name="source" case-sensitive="no">
+ <vpe:template children="yes" modify="yes">
+ <vpe:copy attrs="id,style,class,dir,hidden,media,src,type" />
+ </vpe:template>
+ </vpe:tag>
<vpe:tag name="span" case-sensitive="no">
<vpe:template children="yes" modify="yes">
@@ -1849,6 +1921,12 @@
</vpe:textFormatting>
</vpe:template>
</vpe:tag>
+
+ <vpe:tag name="summary" case-sensitive="no">
+ <vpe:template children="yes" modify="yes">
+ <vpe:copy attrs="id,style,class,dir,hidden" />
+ </vpe:template>
+ </vpe:tag>
<vpe:tag name="sup" case-sensitive="no">
<vpe:template children="yes" modify="yes">
@@ -2076,6 +2154,12 @@
<vpe:tag name="title" case-sensitive="no">
<vpe:template children="no" modify="no" />
</vpe:tag>
+
+ <vpe:tag name="time" case-sensitive="no">
+ <vpe:template children="yes" modify="yes">
+ <vpe:copy attrs="id,style,class,dir,hidden,datetime,pubdate" />
+ </vpe:template>
+ </vpe:tag>
<vpe:tag name="tr" case-sensitive="no">
<vpe:template children="yes" modify="yes">
@@ -2197,6 +2281,12 @@
</vpe:textFormatting>
</vpe:template>
</vpe:tag>
+
+ <vpe:tag name="video" case-sensitive="no">
+ <vpe:template children="yes" modify="yes">
+ <vpe:copy attrs="id,style,class,dir,hidden,audio,autoplay,controls,height,loop,poster,preload,src,width" />
+ </vpe:template>
+ </vpe:tag>
<vpe:tag name="#comment" case-sensitive="no">
<vpe:template children="no" modify="yes"
14 years, 11 months
- 1
- 0
JBoss Tools SVN: r31296 - in trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core: src/org/jboss/tools/hibernate/jpt/core/internal and 3 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dgeraskov
Date: 2011-05-13 11:04:10 -0400 (Fri, 13 May 2011)
New Revision: 31296
Added:
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/definition/HibernateJavaManyToManyMappingDefinition.java
Removed:
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/jpa2/context/
Modified:
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/pom.xml
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/HibernateJpaAnnotationDefinitionProvider.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/HibernateJpaPlatformProvider.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/definition/HibernateJavaBasicMappingDefinition.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/definition/HibernateJavaIdMappingDefinition.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/definition/HibernateJavaManyToOneMappingDefinition.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/definition/HibernateJavaOneToOneMappingDefinition.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaQueryContainerImpl.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/JavaGenericGeneratorImpl.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/jpa2/HibernateJpa2_0PlatformProvider.java
Log:
https://issues.jboss.org/browse/JBIDE-8947
Revert changes for M7
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/pom.xml
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/pom.xml 2011-05-13 12:23:24 UTC (rev 31295)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/pom.xml 2011-05-13 15:04:10 UTC (rev 31296)
@@ -2,12 +2,12 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.jboss.tools.hibernatetools</groupId>
- <artifactId>plugins</artifactId>
- <version>0.0.1-SNAPSHOT</version>
+ <groupId>org.jboss.tools</groupId>
+ <artifactId>org.jboss.tools.parent.pom</artifactId>
+ <version>0.0.2-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.hibernatetools.plugins</groupId>
<artifactId>org.jboss.tools.hibernate.jpt.core</artifactId>
<version>3.4.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
-</project>
+</project>
\ No newline at end of file
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/HibernateJpaAnnotationDefinitionProvider.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/HibernateJpaAnnotationDefinitionProvider.java 2011-05-13 12:23:24 UTC (rev 31295)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/HibernateJpaAnnotationDefinitionProvider.java 2011-05-13 15:04:10 UTC (rev 31296)
@@ -85,7 +85,13 @@
@Override
protected void addPackageAnnotationDefinitionsTo(
ArrayList<AnnotationDefinition> definitions) {
- // TODO Auto-generated method stub
-
+ definitions.add(GenericGeneratorAnnotationDefinition.instance());
+ definitions.add(GenericGeneratorsAnnotationDefinition.instance());
+ definitions.add(HibernateNamedQueryAnnotationDefinition.instance());
+ definitions.add(HibernateNamedQueriesAnnotationDefinition.instance());
+ definitions.add(HibernateNamedNativeQueryAnnotationDefinition.instance());
+ definitions.add(HibernateNamedNativeQueriesAnnotationDefinition.instance());
+ definitions.add(TypeDefAnnotationDefinition.instance());
+ definitions.add(TypeDefsAnnotationDefinition.instance());
}
}
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/HibernateJpaPlatformProvider.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/HibernateJpaPlatformProvider.java 2011-05-13 12:23:24 UTC (rev 31295)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/HibernateJpaPlatformProvider.java 2011-05-13 15:04:10 UTC (rev 31296)
@@ -28,10 +28,10 @@
import org.eclipse.jpt.jpa.core.internal.JavaResourceModelProvider;
import org.eclipse.jpt.jpa.core.internal.OrmResourceModelProvider;
import org.eclipse.jpt.jpa.core.internal.PersistenceResourceModelProvider;
+import org.eclipse.jpt.jpa.core.internal.context.java.JavaBasicMappingDefinition;
import org.eclipse.jpt.jpa.core.internal.context.java.JavaEmbeddableDefinition;
import org.eclipse.jpt.jpa.core.internal.context.java.JavaEmbeddedIdMappingDefinition;
import org.eclipse.jpt.jpa.core.internal.context.java.JavaEmbeddedMappingDefinition;
-import org.eclipse.jpt.jpa.core.internal.context.java.JavaManyToManyMappingDefinition;
import org.eclipse.jpt.jpa.core.internal.context.java.JavaMappedSuperclassDefinition;
import org.eclipse.jpt.jpa.core.internal.context.java.JavaOneToManyMappingDefinition;
import org.eclipse.jpt.jpa.core.internal.context.java.JavaTransientMappingDefinition;
@@ -39,6 +39,7 @@
import org.jboss.tools.hibernate.jpt.core.internal.context.definition.HibernateJavaBasicMappingDefinition;
import org.jboss.tools.hibernate.jpt.core.internal.context.definition.HibernateJavaEntityDefinition;
import org.jboss.tools.hibernate.jpt.core.internal.context.definition.HibernateJavaIdMappingDefinition;
+import org.jboss.tools.hibernate.jpt.core.internal.context.definition.HibernateJavaManyToManyMappingDefinition;
import org.jboss.tools.hibernate.jpt.core.internal.context.definition.HibernateJavaManyToOneMappingDefinition;
import org.jboss.tools.hibernate.jpt.core.internal.context.definition.HibernateJavaOneToOneMappingDefinition;
import org.jboss.tools.hibernate.jpt.core.internal.context.orm.HibernateOrmXmlDefinition;
@@ -132,7 +133,7 @@
// order matches that used by the Reference Implementation (EclipseLink)
protected static final DefaultJavaAttributeMappingDefinition[] DEFAULT_JAVA_ATTRIBUTE_MAPPING_DEFINITIONS = new DefaultJavaAttributeMappingDefinition[] {
JavaEmbeddedMappingDefinition.instance(),
- HibernateJavaBasicMappingDefinition.instance()
+ JavaBasicMappingDefinition.instance()
};
@Override
@@ -148,7 +149,7 @@
HibernateJavaBasicMappingDefinition.instance(),
JavaEmbeddedMappingDefinition.instance(),
JavaEmbeddedIdMappingDefinition.instance(),
- JavaManyToManyMappingDefinition.instance(),
+ HibernateJavaManyToManyMappingDefinition.instance(),
HibernateJavaManyToOneMappingDefinition.instance(),
JavaOneToManyMappingDefinition.instance(),
HibernateJavaOneToOneMappingDefinition.instance(),
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/definition/HibernateJavaBasicMappingDefinition.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/definition/HibernateJavaBasicMappingDefinition.java 2011-05-13 12:23:24 UTC (rev 31295)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/definition/HibernateJavaBasicMappingDefinition.java 2011-05-13 15:04:10 UTC (rev 31296)
@@ -12,23 +12,14 @@
import org.eclipse.jpt.common.utility.internal.iterables.ArrayIterable;
import org.eclipse.jpt.common.utility.internal.iterables.CompositeIterable;
-import org.eclipse.jpt.jpa.core.JpaFactory;
-import org.eclipse.jpt.jpa.core.MappingKeys;
-import org.eclipse.jpt.jpa.core.context.java.DefaultJavaAttributeMappingDefinition;
-import org.eclipse.jpt.jpa.core.context.java.JavaAttributeMapping;
-import org.eclipse.jpt.jpa.core.context.java.JavaPersistentAttribute;
-import org.eclipse.jpt.jpa.core.resource.java.BasicAnnotation;
-import org.eclipse.jpt.jpa.core.resource.java.ColumnAnnotation;
-import org.eclipse.jpt.jpa.core.resource.java.EnumeratedAnnotation;
-import org.eclipse.jpt.jpa.core.resource.java.LobAnnotation;
-import org.eclipse.jpt.jpa.core.resource.java.TemporalAnnotation;
+import org.eclipse.jpt.jpa.core.internal.context.java.AbstractJavaBasicMappingDefinition;
import org.jboss.tools.hibernate.jpt.core.internal.context.basic.Hibernate;
/**
* @author Dmitry Geraskov (geraskov(a)gmail.com)
*
*/
-public class HibernateJavaBasicMappingDefinition implements DefaultJavaAttributeMappingDefinition
+public class HibernateJavaBasicMappingDefinition extends AbstractJavaBasicMappingDefinition
{
// singleton
private static final HibernateJavaBasicMappingDefinition INSTANCE = new HibernateJavaBasicMappingDefinition();
@@ -47,49 +38,15 @@
private HibernateJavaBasicMappingDefinition() {
super();
}
-
- public String getKey() {
- return MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY;
- }
- public String getAnnotationName() {
- return BasicAnnotation.ANNOTATION_NAME;
- }
-
- public boolean isSpecified(JavaPersistentAttribute persistentAttribute) {
- return persistentAttribute.getResourcePersistentAttribute().getAnnotation(this.getAnnotationName()) != null;
- }
-
protected static final String[] HIBERNATE_ANNOTATION_NAMES_ARRAY = new String[] {
Hibernate.GENERATED,
Hibernate.INDEX,
Hibernate.TYPE
};
-
- private static final String[] SUPPORTING_ANNOTATION_NAMES_ARRAY = new String[] {
- ColumnAnnotation.ANNOTATION_NAME,
- LobAnnotation.ANNOTATION_NAME,
- TemporalAnnotation.ANNOTATION_NAME,
- EnumeratedAnnotation.ANNOTATION_NAME
- };
- private static final Iterable<String> SUPPORTING_ANNOTATION_NAMES = new ArrayIterable<String>(SUPPORTING_ANNOTATION_NAMES_ARRAY);
-
@Override
public Iterable<String> getSupportingAnnotationNames() {
- return new CompositeIterable<String>(SUPPORTING_ANNOTATION_NAMES, new ArrayIterable<String>(HIBERNATE_ANNOTATION_NAMES_ARRAY));
+ return new CompositeIterable<String>(super.getSupportingAnnotationNames(), new ArrayIterable<String>(HIBERNATE_ANNOTATION_NAMES_ARRAY));
}
-
- public JavaAttributeMapping buildMapping(JavaPersistentAttribute persistentAttribute, JpaFactory factory) {
- return factory.buildJavaBasicMapping(persistentAttribute);
- }
-
- public boolean isDefault(JavaPersistentAttribute persistentAttribute) {
- return persistentAttribute.typeIsBasic();
- }
-
- @Override
- public String toString() {
- return this.getClass().getSimpleName();
- }
}
\ No newline at end of file
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/definition/HibernateJavaIdMappingDefinition.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/definition/HibernateJavaIdMappingDefinition.java 2011-05-13 12:23:24 UTC (rev 31295)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/definition/HibernateJavaIdMappingDefinition.java 2011-05-13 15:04:10 UTC (rev 31296)
@@ -12,24 +12,14 @@
import org.eclipse.jpt.common.utility.internal.iterables.ArrayIterable;
import org.eclipse.jpt.common.utility.internal.iterables.CompositeIterable;
-import org.eclipse.jpt.jpa.core.JpaFactory;
-import org.eclipse.jpt.jpa.core.MappingKeys;
-import org.eclipse.jpt.jpa.core.context.java.JavaAttributeMapping;
-import org.eclipse.jpt.jpa.core.context.java.JavaAttributeMappingDefinition;
-import org.eclipse.jpt.jpa.core.context.java.JavaPersistentAttribute;
-import org.eclipse.jpt.jpa.core.resource.java.ColumnAnnotation;
-import org.eclipse.jpt.jpa.core.resource.java.GeneratedValueAnnotation;
-import org.eclipse.jpt.jpa.core.resource.java.IdAnnotation;
-import org.eclipse.jpt.jpa.core.resource.java.SequenceGeneratorAnnotation;
-import org.eclipse.jpt.jpa.core.resource.java.TableGeneratorAnnotation;
-import org.eclipse.jpt.jpa.core.resource.java.TemporalAnnotation;
+import org.eclipse.jpt.jpa.core.internal.context.java.AbstractJavaIdMappingDefinition;
import org.jboss.tools.hibernate.jpt.core.internal.context.basic.Hibernate;
/**
* @author Dmitry Geraskov (geraskov(a)gmail.com)
*
*/
-public class HibernateJavaIdMappingDefinition implements JavaAttributeMappingDefinition
+public class HibernateJavaIdMappingDefinition extends AbstractJavaIdMappingDefinition
{
// singleton
private static final HibernateJavaIdMappingDefinition INSTANCE = new HibernateJavaIdMappingDefinition();
@@ -48,46 +38,14 @@
private HibernateJavaIdMappingDefinition() {
super();
}
-
- public String getKey() {
- return MappingKeys.ID_ATTRIBUTE_MAPPING_KEY;
- }
- public String getAnnotationName() {
- return IdAnnotation.ANNOTATION_NAME;
- }
-
- public boolean isSpecified(JavaPersistentAttribute persistentAttribute) {
- return persistentAttribute.getResourcePersistentAttribute().getAnnotation(this.getAnnotationName()) != null;
- }
-
protected static final String[] HIBERNATE_ANNOTATION_NAMES_ARRAY = new String[] {
Hibernate.INDEX,
Hibernate.TYPE
};
-
- private static final String[] SUPPORTING_ANNOTATION_NAMES_ARRAY = new String[] {
- ColumnAnnotation.ANNOTATION_NAME,
- GeneratedValueAnnotation.ANNOTATION_NAME,
- TemporalAnnotation.ANNOTATION_NAME,
- TableGeneratorAnnotation.ANNOTATION_NAME,
- SequenceGeneratorAnnotation.ANNOTATION_NAME
- };
- private static final Iterable<String> SUPPORTING_ANNOTATION_NAMES = new ArrayIterable<String>(SUPPORTING_ANNOTATION_NAMES_ARRAY);
@Override
public Iterable<String> getSupportingAnnotationNames() {
- return new CompositeIterable<String>(SUPPORTING_ANNOTATION_NAMES, new ArrayIterable<String>(HIBERNATE_ANNOTATION_NAMES_ARRAY));
+ return new CompositeIterable<String>(super.getSupportingAnnotationNames(), new ArrayIterable<String>(HIBERNATE_ANNOTATION_NAMES_ARRAY));
}
-
- @Override
- public JavaAttributeMapping buildMapping(JavaPersistentAttribute persistentAttribute, JpaFactory factory) {
- return factory.buildJavaIdMapping(persistentAttribute);
- }
-
- @Override
- public String toString() {
- return this.getClass().getSimpleName();
- }
-
}
Copied: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/definition/HibernateJavaManyToManyMappingDefinition.java (from rev 31291, trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/definition/HibernateJavaManyToManyMappingDefinition.java)
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/definition/HibernateJavaManyToManyMappingDefinition.java (rev 0)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/definition/HibernateJavaManyToManyMappingDefinition.java 2011-05-13 15:04:10 UTC (rev 31296)
@@ -0,0 +1,40 @@
+/*******************************************************************************
+ * Copyright (c) 2011 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributor:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.hibernate.jpt.core.internal.context.definition;
+
+import org.eclipse.jpt.jpa.core.internal.context.java.AbstractJavaManyToManyMappingDefinition;
+
+
+/**
+ * @author Dmitry Geraskov (geraskov(a)gmail.com)
+ *
+ */
+public class HibernateJavaManyToManyMappingDefinition extends AbstractJavaManyToManyMappingDefinition {
+
+ // singleton
+ private static final HibernateJavaManyToManyMappingDefinition INSTANCE = new HibernateJavaManyToManyMappingDefinition();
+
+ /**
+ * Return the singleton.
+ */
+ public static HibernateJavaManyToManyMappingDefinition instance() {
+ return INSTANCE;
+ }
+
+
+ /**
+ * Enforce singleton usage
+ */
+ private HibernateJavaManyToManyMappingDefinition() {
+ super();
+ }
+
+}
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/definition/HibernateJavaManyToOneMappingDefinition.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/definition/HibernateJavaManyToOneMappingDefinition.java 2011-05-13 12:23:24 UTC (rev 31295)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/definition/HibernateJavaManyToOneMappingDefinition.java 2011-05-13 15:04:10 UTC (rev 31296)
@@ -12,22 +12,15 @@
import org.eclipse.jpt.common.utility.internal.iterables.ArrayIterable;
import org.eclipse.jpt.common.utility.internal.iterables.CompositeIterable;
-import org.eclipse.jpt.jpa.core.JpaFactory;
-import org.eclipse.jpt.jpa.core.MappingKeys;
-import org.eclipse.jpt.jpa.core.context.java.JavaAttributeMapping;
import org.eclipse.jpt.jpa.core.context.java.JavaAttributeMappingDefinition;
-import org.eclipse.jpt.jpa.core.context.java.JavaPersistentAttribute;
-import org.eclipse.jpt.jpa.core.resource.java.JoinColumnAnnotation;
-import org.eclipse.jpt.jpa.core.resource.java.JoinColumnsAnnotation;
-import org.eclipse.jpt.jpa.core.resource.java.JoinTableAnnotation;
-import org.eclipse.jpt.jpa.core.resource.java.ManyToOneAnnotation;
+import org.eclipse.jpt.jpa.core.internal.context.java.AbstractJavaManyToOneMappingDefinition;
import org.jboss.tools.hibernate.jpt.core.internal.context.basic.Hibernate;
/**
* @author Dmitry Geraskov (geraskov(a)gmail.com)
*
*/
-public class HibernateJavaManyToOneMappingDefinition implements JavaAttributeMappingDefinition
+public class HibernateJavaManyToOneMappingDefinition extends AbstractJavaManyToOneMappingDefinition
{
// singleton
private static final HibernateJavaManyToOneMappingDefinition INSTANCE = new HibernateJavaManyToOneMappingDefinition();
@@ -46,41 +39,13 @@
private HibernateJavaManyToOneMappingDefinition() {
super();
}
-
- public String getKey() {
- return MappingKeys.MANY_TO_ONE_ATTRIBUTE_MAPPING_KEY;
- }
- public String getAnnotationName() {
- return ManyToOneAnnotation.ANNOTATION_NAME;
- }
-
- public boolean isSpecified(JavaPersistentAttribute persistentAttribute) {
- return persistentAttribute.getResourcePersistentAttribute().getAnnotation(this.getAnnotationName()) != null;
- }
-
protected static final String[] HIBERNATE_ANNOTATION_NAMES_ARRAY = new String[] {
Hibernate.FOREIGN_KEY,
};
-
- private static final String[] SUPPORTING_ANNOTATION_NAMES_ARRAY = new String[] {
- JoinTableAnnotation.ANNOTATION_NAME,
- JoinColumnAnnotation.ANNOTATION_NAME,
- JoinColumnsAnnotation.ANNOTATION_NAME
- };
- private static final Iterable<String> SUPPORTING_ANNOTATION_NAMES = new ArrayIterable<String>(SUPPORTING_ANNOTATION_NAMES_ARRAY);
@Override
public Iterable<String> getSupportingAnnotationNames() {
- return new CompositeIterable<String>(SUPPORTING_ANNOTATION_NAMES, new ArrayIterable<String>(HIBERNATE_ANNOTATION_NAMES_ARRAY));
+ return new CompositeIterable<String>(super.getSupportingAnnotationNames(), new ArrayIterable<String>(HIBERNATE_ANNOTATION_NAMES_ARRAY));
}
-
- public JavaAttributeMapping buildMapping(JavaPersistentAttribute persistentAttribute, JpaFactory factory) {
- return factory.buildJavaManyToOneMapping(persistentAttribute);
- }
-
- @Override
- public String toString() {
- return this.getClass().getSimpleName();
- }
}
\ No newline at end of file
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/definition/HibernateJavaOneToOneMappingDefinition.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/definition/HibernateJavaOneToOneMappingDefinition.java 2011-05-13 12:23:24 UTC (rev 31295)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/definition/HibernateJavaOneToOneMappingDefinition.java 2011-05-13 15:04:10 UTC (rev 31296)
@@ -12,24 +12,14 @@
import org.eclipse.jpt.common.utility.internal.iterables.ArrayIterable;
import org.eclipse.jpt.common.utility.internal.iterables.CompositeIterable;
-import org.eclipse.jpt.jpa.core.JpaFactory;
-import org.eclipse.jpt.jpa.core.MappingKeys;
-import org.eclipse.jpt.jpa.core.context.java.JavaAttributeMapping;
-import org.eclipse.jpt.jpa.core.context.java.JavaAttributeMappingDefinition;
-import org.eclipse.jpt.jpa.core.context.java.JavaPersistentAttribute;
-import org.eclipse.jpt.jpa.core.resource.java.JoinColumnAnnotation;
-import org.eclipse.jpt.jpa.core.resource.java.JoinColumnsAnnotation;
-import org.eclipse.jpt.jpa.core.resource.java.JoinTableAnnotation;
-import org.eclipse.jpt.jpa.core.resource.java.OneToOneAnnotation;
-import org.eclipse.jpt.jpa.core.resource.java.PrimaryKeyJoinColumnAnnotation;
-import org.eclipse.jpt.jpa.core.resource.java.PrimaryKeyJoinColumnsAnnotation;
+import org.eclipse.jpt.jpa.core.internal.context.java.AbstractJavaOneToOneMappingDefinition;
import org.jboss.tools.hibernate.jpt.core.internal.context.basic.Hibernate;
/**
* @author Dmitry Geraskov (geraskov(a)gmail.com)
*
*/
-public class HibernateJavaOneToOneMappingDefinition implements JavaAttributeMappingDefinition
+public class HibernateJavaOneToOneMappingDefinition extends AbstractJavaOneToOneMappingDefinition
{
// singleton
private static final HibernateJavaOneToOneMappingDefinition INSTANCE = new HibernateJavaOneToOneMappingDefinition();
@@ -49,44 +39,12 @@
super();
}
- public String getKey() {
- return MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY;
- }
-
- public String getAnnotationName() {
- return OneToOneAnnotation.ANNOTATION_NAME;
- }
-
- public boolean isSpecified(JavaPersistentAttribute persistentAttribute) {
- return persistentAttribute.getResourcePersistentAttribute().getAnnotation(this.getAnnotationName()) != null;
- }
-
protected static final String[] HIBERNATE_ANNOTATION_NAMES_ARRAY = new String[] {
Hibernate.FOREIGN_KEY,
};
- private static final String[] SUPPORTING_ANNOTATION_NAMES_ARRAY = new String[] {
- JoinTableAnnotation.ANNOTATION_NAME,
- JoinColumnAnnotation.ANNOTATION_NAME,
- JoinColumnsAnnotation.ANNOTATION_NAME,
- PrimaryKeyJoinColumnAnnotation.ANNOTATION_NAME,
- PrimaryKeyJoinColumnsAnnotation.ANNOTATION_NAME
- };
- private static final Iterable<String> SUPPORTING_ANNOTATION_NAMES = new ArrayIterable<String>(SUPPORTING_ANNOTATION_NAMES_ARRAY);
-
@Override
public Iterable<String> getSupportingAnnotationNames() {
- return new CompositeIterable<String>(SUPPORTING_ANNOTATION_NAMES, new ArrayIterable<String>(HIBERNATE_ANNOTATION_NAMES_ARRAY));
+ return new CompositeIterable<String>(super.getSupportingAnnotationNames(), new ArrayIterable<String>(HIBERNATE_ANNOTATION_NAMES_ARRAY));
}
-
- public JavaAttributeMapping buildMapping(JavaPersistentAttribute persistentAttribute, JpaFactory factory) {
- return factory.buildJavaOneToOneMapping(persistentAttribute);
- }
-
- @Override
- public String toString() {
- return this.getClass().getSimpleName();
- }
-
-
}
\ No newline at end of file
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaQueryContainerImpl.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaQueryContainerImpl.java 2011-05-13 12:23:24 UTC (rev 31295)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaQueryContainerImpl.java 2011-05-13 15:04:10 UTC (rev 31296)
@@ -305,10 +305,71 @@
}
}
+
+ // ********** validation **********
+
@Override
+ public void validate(List<IMessage> messages, IReporter reporter, CompilationUnit astRoot) {
+ super.validate(messages, reporter, astRoot);
+ this.validateQueries(messages, astRoot);
+ }
+
+ @Override
+ protected void validateQueries(List<IMessage> messages, CompilationUnit astRoot) {
+ for (Iterator<JavaQuery> localQueries = this.queries(); localQueries.hasNext(); ) {
+ JavaQuery localQuery = localQueries.next();
+ String name = localQuery.getName();
+ if (StringTools.stringIsEmpty(name)){
+ messages.add(
+ DefaultJpaValidationMessages.buildMessage(
+ IMessage.HIGH_SEVERITY,
+ JpaValidationMessages.QUERY_NAME_UNDEFINED,
+ new String[] {},
+ localQuery,
+ localQuery.getNameTextRange(astRoot)
+ )
+ );
+ } else {
+ List<String> reportedNames = new ArrayList<String>();
+ for (Iterator<Query> globalQueries = this.getPersistenceUnit().queries(); globalQueries.hasNext(); ) {
+ if (localQuery.duplicates(globalQueries.next()) && !reportedNames.contains(name)) {
+ messages.add(
+ DefaultJpaValidationMessages.buildMessage(
+ IMessage.HIGH_SEVERITY,
+ JpaValidationMessages.QUERY_DUPLICATE_NAME,
+ new String[] {name},
+ localQuery,
+ localQuery.getNameTextRange(astRoot)
+ )
+ );
+ reportedNames.add(name);
+ }
+ }
+ }
+ String query = localQuery.getQuery();
+ if (StringTools.stringIsEmpty(query)){
+ messages.add(
+ DefaultJpaValidationMessages.buildMessage(
+ IMessage.HIGH_SEVERITY,
+ JpaValidationMessages.QUERY_STATEMENT_UNDEFINED,
+ new String[] {name},
+ localQuery,
+ localQuery.getNameTextRange(astRoot)
+ )
+ );
+ }
+ }
+ }
+
+
+ @Override
@SuppressWarnings("unchecked")
public Iterator<JavaQuery> queries() {
- return new CompositeIterator<JavaQuery>(queries(), this.hibernateNamedNativeQueries(), this.hibernateNamedQueries());
+ return new CompositeIterator<JavaQuery>(this.hibernateNamedNativeQueries(), this.hibernateNamedQueries());
}
+ @Override
+ public TextRange getValidationTextRange(CompilationUnit astRoot) {
+ return this.owner.getResourceAnnotatedElement().getTextRange(astRoot);
+ }
}
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/JavaGenericGeneratorImpl.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/JavaGenericGeneratorImpl.java 2011-05-13 12:23:24 UTC (rev 31295)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/JavaGenericGeneratorImpl.java 2011-05-13 15:04:10 UTC (rev 31296)
@@ -101,6 +101,11 @@
}
@Override
+ public TextRange getSelectionTextRange(CompilationUnit astRoot) {
+ return this.generatorAnnotation.getTextRange(astRoot);
+ }
+
+ @Override
public TextRange getNameTextRange(CompilationUnit astRoot) {
return this.generatorAnnotation.getNameTextRange(astRoot);
}
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/jpa2/HibernateJpa2_0PlatformProvider.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/jpa2/HibernateJpa2_0PlatformProvider.java 2011-05-13 12:23:24 UTC (rev 31295)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/jpa2/HibernateJpa2_0PlatformProvider.java 2011-05-13 15:04:10 UTC (rev 31296)
@@ -28,24 +28,24 @@
import org.eclipse.jpt.jpa.core.internal.JavaResourceModelProvider;
import org.eclipse.jpt.jpa.core.internal.OrmResourceModelProvider;
import org.eclipse.jpt.jpa.core.internal.PersistenceResourceModelProvider;
+import org.eclipse.jpt.jpa.core.internal.context.java.JavaBasicMappingDefinition;
import org.eclipse.jpt.jpa.core.internal.context.java.JavaEmbeddableDefinition;
import org.eclipse.jpt.jpa.core.internal.context.java.JavaEmbeddedIdMappingDefinition;
+import org.eclipse.jpt.jpa.core.internal.context.java.JavaEntityDefinition;
import org.eclipse.jpt.jpa.core.internal.context.java.JavaMappedSuperclassDefinition;
import org.eclipse.jpt.jpa.core.internal.context.java.JavaTransientMappingDefinition;
import org.eclipse.jpt.jpa.core.internal.context.java.JavaVersionMappingDefinition;
import org.eclipse.jpt.jpa.core.internal.jpa2.context.java.JavaElementCollectionMappingDefinition2_0;
import org.eclipse.jpt.jpa.core.internal.jpa2.context.java.JavaEmbeddedMappingDefinition2_0;
+import org.eclipse.jpt.jpa.core.internal.jpa2.context.java.JavaIdMappingDefinition2_0;
import org.eclipse.jpt.jpa.core.internal.jpa2.context.java.JavaManyToManyMappingDefinition2_0;
+import org.eclipse.jpt.jpa.core.internal.jpa2.context.java.JavaManyToOneMappingDefinition2_0;
import org.eclipse.jpt.jpa.core.internal.jpa2.context.java.JavaOneToManyMappingDefinition2_0;
-import org.jboss.tools.hibernate.jpt.core.internal.context.definition.HibernateJavaBasicMappingDefinition;
-import org.jboss.tools.hibernate.jpt.core.internal.context.definition.HibernateJavaEntityDefinition;
+import org.eclipse.jpt.jpa.core.internal.jpa2.context.java.JavaOneToOneMappingDefinition2_0;
import org.jboss.tools.hibernate.jpt.core.internal.context.orm.HibernateOrmXmlDefinition;
import org.jboss.tools.hibernate.jpt.core.internal.context.orm.jpa2.HibernateOrmXml2_0Definition;
import org.jboss.tools.hibernate.jpt.core.internal.context.persistence.HibernatePersistenceXmlDefinition;
import org.jboss.tools.hibernate.jpt.core.internal.context.persistence.jpa2.Hibernate2_0PersistenceXmlDefinition;
-import org.jboss.tools.hibernate.jpt.core.internal.jpa2.context.definition.HibernateJavaIdMappingDefinition2_0;
-import org.jboss.tools.hibernate.jpt.core.internal.jpa2.context.definition.HibernateJavaManyToOneMappingDefinition2_0;
-import org.jboss.tools.hibernate.jpt.core.internal.jpa2.context.definition.HibernateJavaOneToOneMappingDefinition2_0;
/**
* @author Dmitry Geraskov
@@ -67,6 +67,7 @@
return INSTANCE;
}
+
/**
* Enforce singleton usage
*/
@@ -118,7 +119,7 @@
// order matches that used by the Reference Implementation (EclipseLink)
protected static final JavaTypeMappingDefinition[] JAVA_TYPE_MAPPING_DEFINITIONS = new JavaTypeMappingDefinition[] {
- HibernateJavaEntityDefinition.instance(),
+ JavaEntityDefinition.instance(),
JavaEmbeddableDefinition.instance(),
JavaMappedSuperclassDefinition.instance()
};
@@ -134,7 +135,7 @@
// order matches that used by the Reference Implementation (EclipseLink)
protected static final DefaultJavaAttributeMappingDefinition[] DEFAULT_JAVA_ATTRIBUTE_MAPPING_DEFINITIONS = new DefaultJavaAttributeMappingDefinition[] {
JavaEmbeddedMappingDefinition2_0.instance(),
- HibernateJavaBasicMappingDefinition.instance()
+ JavaBasicMappingDefinition.instance()
};
@Override
@@ -146,15 +147,15 @@
protected static final JavaAttributeMappingDefinition[] SPECIFIED_JAVA_ATTRIBUTE_MAPPING_DEFINITIONS = new JavaAttributeMappingDefinition[] {
JavaTransientMappingDefinition.instance(),
JavaElementCollectionMappingDefinition2_0.instance(),
- HibernateJavaIdMappingDefinition2_0.instance(),
+ JavaIdMappingDefinition2_0.instance(),
JavaVersionMappingDefinition.instance(),
- HibernateJavaBasicMappingDefinition.instance(),
+ JavaBasicMappingDefinition.instance(),
JavaEmbeddedMappingDefinition2_0.instance(),
JavaEmbeddedIdMappingDefinition.instance(),
JavaManyToManyMappingDefinition2_0.instance(),
- HibernateJavaManyToOneMappingDefinition2_0.instance(),
+ JavaManyToOneMappingDefinition2_0.instance(),
JavaOneToManyMappingDefinition2_0.instance(),
- HibernateJavaOneToOneMappingDefinition2_0.instance()
+ JavaOneToOneMappingDefinition2_0.instance()
};
14 years, 11 months
- 1
- 0
JBoss Tools SVN: r31295 - trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/jpa2/context/definition.
by jbosstools-commits＠lists.jboss.org
Author: dgeraskov
Date: 2011-05-13 08:23:24 -0400 (Fri, 13 May 2011)
New Revision: 31295
Added:
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/jpa2/context/definition/HibernateJavaIdMappingDefinition2_0.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/jpa2/context/definition/HibernateJavaManyToOneMappingDefinition2_0.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/jpa2/context/definition/HibernateJavaOneToOneMappingDefinition2_0.java
Log:
https://issues.jboss.org/browse/JBIDE-8947
Mode hibernate tools to Eclipse3.7M7
Added: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/jpa2/context/definition/HibernateJavaIdMappingDefinition2_0.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/jpa2/context/definition/HibernateJavaIdMappingDefinition2_0.java (rev 0)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/jpa2/context/definition/HibernateJavaIdMappingDefinition2_0.java 2011-05-13 12:23:24 UTC (rev 31295)
@@ -0,0 +1,68 @@
+package org.jboss.tools.hibernate.jpt.core.internal.jpa2.context.definition;
+
+import org.eclipse.jpt.jpa.core.context.java.JavaAttributeMappingDefinition;
+import org.eclipse.jpt.jpa.core.context.java.JavaPersistentAttribute;
+import org.eclipse.jpt.jpa.core.internal.context.java.JavaAttributeMappingDefinitionWrapper;
+import org.jboss.tools.hibernate.jpt.core.internal.context.definition.HibernateJavaIdMappingDefinition;
+
+public class HibernateJavaIdMappingDefinition2_0 extends JavaAttributeMappingDefinitionWrapper {
+
+ private static final HibernateJavaIdMappingDefinition DELEGATE = HibernateJavaIdMappingDefinition.instance();
+
+ // singleton
+ private static final HibernateJavaIdMappingDefinition2_0 INSTANCE = new HibernateJavaIdMappingDefinition2_0();
+
+ /**
+ * Return the singleton.
+ */
+ public static HibernateJavaIdMappingDefinition2_0 instance() {
+ return INSTANCE;
+ }
+
+ /**
+ * Enforce singleton usage
+ */
+ private HibernateJavaIdMappingDefinition2_0() {
+ super();
+ }
+
+
+ @Override
+ protected JavaAttributeMappingDefinition getDelegate() {
+ return DELEGATE;
+ }
+
+ /**
+ * The annotation is "specified" only if it is not "derived" (i.e.
+ * accompanied by a M-1 or 1-1 annotation).
+ */
+ @Override
+ public boolean isSpecified(JavaPersistentAttribute persistentAttribute) {
+ boolean idSpecified = super.isSpecified(persistentAttribute);
+ return idSpecified && ! this.isDerivedId(persistentAttribute);
+ }
+
+ /**
+ * Return whether the specified attribute's <code>Id</code> annotation is
+ * a supporting annotation for M-1 or 1-1 mapping, as opposed to a primary
+ * mapping annotation.
+ * <p>
+ * This might produce confusing behavior if the annotations look something
+ * like:<pre>
+ * @Id @Basic @ManyToOne private int foo;
+ * </pre>
+ */
+ private boolean isDerivedId(JavaPersistentAttribute persistentAttribute) {
+ return this.attributeHasManyToOneMapping(persistentAttribute) ||
+ this.attributeHasOneToOneMapping(persistentAttribute);
+ }
+
+ private boolean attributeHasManyToOneMapping(JavaPersistentAttribute persistentAttribute) {
+ return HibernateJavaManyToOneMappingDefinition2_0.instance().isSpecified(persistentAttribute);
+ }
+
+ private boolean attributeHasOneToOneMapping(JavaPersistentAttribute persistentAttribute) {
+ return HibernateJavaOneToOneMappingDefinition2_0.instance().isSpecified(persistentAttribute);
+ }
+
+}
Added: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/jpa2/context/definition/HibernateJavaManyToOneMappingDefinition2_0.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/jpa2/context/definition/HibernateJavaManyToOneMappingDefinition2_0.java (rev 0)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/jpa2/context/definition/HibernateJavaManyToOneMappingDefinition2_0.java 2011-05-13 12:23:24 UTC (rev 31295)
@@ -0,0 +1,55 @@
+package org.jboss.tools.hibernate.jpt.core.internal.jpa2.context.definition;
+
+import org.eclipse.jpt.common.utility.internal.iterables.ArrayIterable;
+import org.eclipse.jpt.common.utility.internal.iterables.CompositeIterable;
+import org.eclipse.jpt.jpa.core.context.java.JavaAttributeMappingDefinition;
+import org.eclipse.jpt.jpa.core.internal.context.java.JavaAttributeMappingDefinitionWrapper;
+import org.eclipse.jpt.jpa.core.jpa2.resource.java.MapsId2_0Annotation;
+import org.eclipse.jpt.jpa.core.resource.java.IdAnnotation;
+import org.jboss.tools.hibernate.jpt.core.internal.context.definition.HibernateJavaManyToOneMappingDefinition;
+
+public class HibernateJavaManyToOneMappingDefinition2_0 extends JavaAttributeMappingDefinitionWrapper
+{
+ private static final JavaAttributeMappingDefinition DELEGATE = HibernateJavaManyToOneMappingDefinition.instance();
+
+ // singleton
+ private static final JavaAttributeMappingDefinition INSTANCE = new HibernateJavaManyToOneMappingDefinition2_0();
+
+ /**
+ * Return the singleton.
+ */
+ public static JavaAttributeMappingDefinition instance() {
+ return INSTANCE;
+ }
+
+
+ /**
+ * Enforce singleton usage
+ */
+ private HibernateJavaManyToOneMappingDefinition2_0() {
+ super();
+ }
+
+ @Override
+ protected JavaAttributeMappingDefinition getDelegate() {
+ return DELEGATE;
+ }
+
+ @Override
+ public Iterable<String> getSupportingAnnotationNames() {
+ return COMBINED_SUPPORTING_ANNOTATION_NAMES;
+ }
+
+ public static final String[] SUPPORTING_ANNOTATION_NAMES_ARRAY_2_0 = new String[] {
+ IdAnnotation.ANNOTATION_NAME,
+ MapsId2_0Annotation.ANNOTATION_NAME
+ };
+ private static final Iterable<String> SUPPORTING_ANNOTATION_NAMES_2_0 = new ArrayIterable<String>(SUPPORTING_ANNOTATION_NAMES_ARRAY_2_0);
+
+ @SuppressWarnings("unchecked")
+ private static final Iterable<String> COMBINED_SUPPORTING_ANNOTATION_NAMES = new CompositeIterable<String>(
+ DELEGATE.getSupportingAnnotationNames(),
+ SUPPORTING_ANNOTATION_NAMES_2_0
+ );
+
+}
Added: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/jpa2/context/definition/HibernateJavaOneToOneMappingDefinition2_0.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/jpa2/context/definition/HibernateJavaOneToOneMappingDefinition2_0.java (rev 0)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/jpa2/context/definition/HibernateJavaOneToOneMappingDefinition2_0.java 2011-05-13 12:23:24 UTC (rev 31295)
@@ -0,0 +1,55 @@
+package org.jboss.tools.hibernate.jpt.core.internal.jpa2.context.definition;
+
+import org.eclipse.jpt.common.utility.internal.iterables.ArrayIterable;
+import org.eclipse.jpt.common.utility.internal.iterables.CompositeIterable;
+import org.eclipse.jpt.jpa.core.context.java.JavaAttributeMappingDefinition;
+import org.eclipse.jpt.jpa.core.internal.context.java.JavaAttributeMappingDefinitionWrapper;
+import org.eclipse.jpt.jpa.core.jpa2.resource.java.MapsId2_0Annotation;
+import org.eclipse.jpt.jpa.core.resource.java.IdAnnotation;
+import org.jboss.tools.hibernate.jpt.core.internal.context.definition.HibernateJavaOneToOneMappingDefinition;
+
+public class HibernateJavaOneToOneMappingDefinition2_0 extends JavaAttributeMappingDefinitionWrapper
+{
+ private static final JavaAttributeMappingDefinition DELEGATE = HibernateJavaOneToOneMappingDefinition.instance();
+
+ // singleton
+ private static final JavaAttributeMappingDefinition INSTANCE = new HibernateJavaOneToOneMappingDefinition2_0();
+
+ /**
+ * Return the singleton.
+ */
+ public static JavaAttributeMappingDefinition instance() {
+ return INSTANCE;
+ }
+
+
+ /**
+ * Enforce singleton usage
+ */
+ private HibernateJavaOneToOneMappingDefinition2_0() {
+ super();
+ }
+
+ @Override
+ protected JavaAttributeMappingDefinition getDelegate() {
+ return DELEGATE;
+ }
+
+ @Override
+ public Iterable<String> getSupportingAnnotationNames() {
+ return COMBINED_SUPPORTING_ANNOTATION_NAMES;
+ }
+
+ public static final String[] SUPPORTING_ANNOTATION_NAMES_ARRAY_2_0 = new String[] {
+ IdAnnotation.ANNOTATION_NAME,
+ MapsId2_0Annotation.ANNOTATION_NAME
+ };
+ private static final Iterable<String> SUPPORTING_ANNOTATION_NAMES_2_0 = new ArrayIterable<String>(SUPPORTING_ANNOTATION_NAMES_ARRAY_2_0);
+
+ @SuppressWarnings("unchecked")
+ private static final Iterable<String> COMBINED_SUPPORTING_ANNOTATION_NAMES = new CompositeIterable<String>(
+ DELEGATE.getSupportingAnnotationNames(),
+ SUPPORTING_ANNOTATION_NAMES_2_0
+ );
+}
+
14 years, 11 months
- 1
- 0
JBoss Tools SVN: r31294 - trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2011-05-13 07:47:14 -0400 (Fri, 13 May 2011)
New Revision: 31294
Modified:
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/AutoELContentAssistantProposal.java
Log:
JBIDE-8923
Escaped HTML code in proposal info window for EL code completion.
Issue is fixed
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/AutoELContentAssistantProposal.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/AutoELContentAssistantProposal.java 2011-05-13 11:22:31 UTC (rev 31293)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/AutoELContentAssistantProposal.java 2011-05-13 11:47:14 UTC (rev 31294)
@@ -145,13 +145,16 @@
break;
}
StringBuffer label= new StringBuffer(JavaElementLinks.getElementLabel(element, flags));
-
- StringBuffer buf= new StringBuffer();
- buf.append("<span style='word-wrap:break-word;'>"); //$NON-NLS-1$
- buf.append(label);
- buf.append("</span>"); //$NON-NLS-1$
+
+ // The following lines were commented out because of JBIDE-8923 faced in Eclipse 3.7
+ //
+// StringBuffer buf= new StringBuffer();
+// buf.append("<span style='word-wrap:break-word;'>"); //$NON-NLS-1$
+// buf.append(label);
+// buf.append("</span>"); //$NON-NLS-1$
- return buf.toString();
+// return buf.toString();
+ return label.toString();
}
/*
@@ -178,6 +181,7 @@
}
if (reader != null) {
+ buffer.append("<br/>"); //$NON-NLS-1$
buffer.append(HTMLPrinter.read(reader));
// HTMLPrinter.addParagraph(buffer, reader);
}
14 years, 11 months
- 1
- 0
JBoss Tools SVN: r31293 - in trunk/jst/tests/org.jboss.tools.jst.jsp.test: projects/Jbide6061Test and 4 other directories.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2011-05-13 07:22:31 -0400 (Fri, 13 May 2011)
New Revision: 31293
Added:
trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/Jbide6061Test/
trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/Jbide6061Test/.classpath
trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/Jbide6061Test/.project
trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/Jbide6061Test/WebContent/
trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/Jbide6061Test/WebContent/pages/
trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/Jbide6061Test/WebContent/pages/jsp_page.jsp
trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/Jbide6061Test/WebContent/pages/theme1.css
trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/Jbide6061Test/WebContent/pages/xhtml_page.xhtml
trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/Jbide6061Test.java
Modified:
trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/JstJspAllTests.java
Log:
JBIDE-6061
Incorrect Code assist proposals
issue is fixed. Junit Test Case is added
Added: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/Jbide6061Test/.classpath
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/Jbide6061Test/.classpath (rev 0)
+++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/Jbide6061Test/.classpath 2011-05-13 11:22:31 UTC (rev 31293)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="JavaSource"/>
+ <classpathentry exported="true" kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
+ <classpathentry exported="true" kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="output" path="WebContent/WEB-INF/classes"/>
+</classpath>
\ No newline at end of file
Property changes on: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/Jbide6061Test/.classpath
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/Jbide6061Test/.project
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/Jbide6061Test/.project (rev 0)
+++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/Jbide6061Test/.project 2011-05-13 11:22:31 UTC (rev 31293)
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>Jbide6061Test</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.wst.jsdt.core.javascriptValidator</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.wst.common.project.facet.core.builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.wst.validation.validationbuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.jboss.tools.jst.web.kb.kbbuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
+ <nature>org.jboss.tools.jsf.jsfnature</nature>
+ <nature>org.eclipse.wst.common.project.facet.core.nature</nature>
+ <nature>org.jboss.tools.jst.web.kb.kbnature</nature>
+ <nature>org.eclipse.wst.jsdt.core.jsNature</nature>
+ </natures>
+</projectDescription>
Property changes on: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/Jbide6061Test/.project
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/Jbide6061Test/WebContent/pages/jsp_page.jsp
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/Jbide6061Test/WebContent/pages/jsp_page.jsp (rev 0)
+++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/Jbide6061Test/WebContent/pages/jsp_page.jsp 2011-05-13 11:22:31 UTC (rev 31293)
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:h="http://java.sun.com/jsf/html">
+ <jsp:directive.page language="java"
+ contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" />
+ <jsp:text>
+ <![CDATA[ <?xml version="1.0" encoding="UTF-8" ?> ]]>
+ </jsp:text>
+ <jsp:text>
+ <![CDATA[ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> ]]>
+ </jsp:text>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+<title>Insert title here</title>
+<link rel="stylesheet" href="theme1.css" type="text/css" />
+</head>
+<body>
+<f:view>
+ <h:inputText value="" styleClass="" />
+</f:view>
+</body>
+</html>
+</jsp:root>
\ No newline at end of file
Property changes on: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/Jbide6061Test/WebContent/pages/jsp_page.jsp
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/Jbide6061Test/WebContent/pages/theme1.css
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/Jbide6061Test/WebContent/pages/theme1.css (rev 0)
+++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/Jbide6061Test/WebContent/pages/theme1.css 2011-05-13 11:22:31 UTC (rev 31293)
@@ -0,0 +1,49 @@
+.errors {
+ color: red;
+ vertical-align: middle;
+}
+
+h1 {
+ font-family: Arial, sans-serif;
+ color: #578888;
+ font-size: 1.6em;
+ margin-top: 0;
+}
+
+input.cls1[type=submit] {
+color: #FF0000;
+}
+input[type=submit].cls2 {
+color: #0000FF;
+}
+input[type=submit].cls3 {
+color: #00FF00;
+}
+
+a.cls4:link{ text-decoration: none;
+ color: gray;
+}
+
+a.cls4:visited{ text-decoration: none;
+ color: gray;
+}
+
+a.cls4:hover{ text-decoration: none;
+ color: green;
+ font-weight: bolder;
+ letter-spacing: 2px;
+}
+
+a:link.cls5{ text-decoration: none;
+ color: gray;
+}
+
+a:visited.cls5{ text-decoration: none;
+ color: gray;
+}
+
+a:hover.cls5{ text-decoration: none;
+ color: green;
+ font-weight: bolder;
+ letter-spacing: 2px;
+}
\ No newline at end of file
Property changes on: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/Jbide6061Test/WebContent/pages/theme1.css
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/Jbide6061Test/WebContent/pages/xhtml_page.xhtml
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/Jbide6061Test/WebContent/pages/xhtml_page.xhtml (rev 0)
+++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/Jbide6061Test/WebContent/pages/xhtml_page.xhtml 2011-05-13 11:22:31 UTC (rev 31293)
@@ -0,0 +1,12 @@
+<!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">
+<head>
+ <link rel="stylesheet" href="theme1.css" type="text/css" />
+</head>
+
+<body class="">
+</body>
+</html>
\ No newline at end of file
Property changes on: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/Jbide6061Test/WebContent/pages/xhtml_page.xhtml
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/JstJspAllTests.java
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/JstJspAllTests.java 2011-05-13 11:11:28 UTC (rev 31292)
+++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/JstJspAllTests.java 2011-05-13 11:22:31 UTC (rev 31293)
@@ -13,6 +13,7 @@
import junit.framework.Test;
import junit.framework.TestSuite;
+import org.jboss.tools.jst.jsp.test.ca.Jbide6061Test;
import org.jboss.tools.jst.jsp.test.ca.JstJspJbide1585Test;
import org.jboss.tools.jst.jsp.test.ca.JstJspJbide1641Test;
import org.jboss.tools.jst.jsp.test.selbar.SelectionBarTest;
@@ -21,6 +22,7 @@
public static Test suite() {
TestSuite suite = new TestSuite("Test for org.jboss.tools.jst.jsp.test"); //$NON-NLS-1$
+
suite.addTestSuite(JstJspJbide1585Test.class);
suite.addTestSuite(JstJspJbide1641Test.class);
@@ -31,6 +33,9 @@
*
suite.addTestSuite(Jbide1791Test.class);
*/
+
+ suite.addTestSuite(Jbide6061Test.class);
+
suite.addTestSuite(JspPreferencesPageTest.class);
suite.addTestSuite(SelectionBarTest.class);
Added: trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/Jbide6061Test.java
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/Jbide6061Test.java (rev 0)
+++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/Jbide6061Test.java 2011-05-13 11:22:31 UTC (rev 31293)
@@ -0,0 +1,119 @@
+/*******************************************************************************
+ * Copyright (c) 2011 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributor:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.jst.jsp.test.ca;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+import org.eclipse.jface.text.BadLocationException;
+import org.eclipse.jface.text.FindReplaceDocumentAdapter;
+import org.eclipse.jface.text.IRegion;
+import org.eclipse.jface.text.contentassist.ICompletionProposal;
+import org.jboss.tools.test.util.TestProjectProvider;
+
+/**
+ * Test cast testing http://jira.jboss.com/jira/browse/JBIDE-6061 issue.
+ *
+ * @author Victor V. Rubezhny
+ *
+ */
+public class Jbide6061Test extends ContentAssistantTestCase {
+ private static final String PROJECT_NAME = "Jbide6061Test"; //$NON-NLS-1$
+ private static final String JSP_PAGE_NAME = "/WebContent/pages/jsp_page.jsp"; //$NON-NLS-1$
+ private static final String XHTML_PAGE_NAME = "/WebContent/pages/xhtml_page.xhtml"; //$NON-NLS-1$
+ private TestProjectProvider provider = null;
+ private final String[] CSSCLASS_PROPOSALS = new String[]{
+ "errors", //$NON-NLS-1$
+ "cls1", //$NON-NLS-1$
+ "cls2", //$NON-NLS-1$
+ "cls3", //$NON-NLS-1$
+ "cls4", //$NON-NLS-1$
+ "cls5", //$NON-NLS-1$
+ };
+ private static final String STRING_TO_FIND_IN_JSP = "styleClass=\"";
+ private static final String STRING_TO_FIND_IN_XHTML = "class=\"";
+
+ public static Test suite() {
+ return new TestSuite(Jbide6061Test.class);
+ }
+
+ public void setUp() throws Exception {
+ provider = new TestProjectProvider("org.jboss.tools.jst.jsp.test", null, PROJECT_NAME,false); //$NON-NLS-1$
+ project = provider.getProject();
+ }
+
+ protected void tearDown() throws Exception {
+ if(provider != null) {
+ provider.dispose();
+ }
+ }
+
+ public void testJbide6061OnJspPage(){
+ openEditor(JSP_PAGE_NAME);
+ IRegion reg=null;
+ try {
+ reg = new FindReplaceDocumentAdapter(this.document).find(0, STRING_TO_FIND_IN_JSP, true, false, false, false); //$NON-NLS-1$
+ } catch (BadLocationException e) {
+ fail(e.getMessage());
+ }
+
+ assertNotNull("Cannot find a text region to test", reg);
+
+ final ICompletionProposal[] rst = checkProposals(JSP_PAGE_NAME,reg.getOffset() + STRING_TO_FIND_IN_JSP.length(), CSSCLASS_PROPOSALS, false);
+
+ checkResult(rst,CSSCLASS_PROPOSALS);
+ closeEditor();
+ }
+
+ public void testJbide6061OnXhtmlPage(){
+ openEditor(XHTML_PAGE_NAME);
+ IRegion reg=null;
+ try {
+ reg = new FindReplaceDocumentAdapter(this.document).find(0, STRING_TO_FIND_IN_XHTML, true, false, false, false); //$NON-NLS-1$
+ } catch (BadLocationException e) {
+ fail(e.getMessage());
+ }
+
+ assertNotNull("Cannot find a text region to test", reg);
+
+ final ICompletionProposal[] rst = checkProposals(XHTML_PAGE_NAME,reg.getOffset() + STRING_TO_FIND_IN_XHTML.length(), CSSCLASS_PROPOSALS, false);
+
+ checkResult(rst,CSSCLASS_PROPOSALS);
+ closeEditor();
+ }
+
+ /**
+ * @param rst
+ * @param proposals
+ */
+ private void checkResult(ICompletionProposal[] rst, String[] proposals) {
+ for ( int i = 0 ; i < proposals.length ; i ++ ){
+ assertTrue("Should be in proposals list",isInResultList(rst,proposals[i])); //$NON-NLS-1$
+ }
+
+ }
+ /**
+ * @param rst
+ * @param string
+ * @return
+ */
+ private boolean isInResultList(ICompletionProposal[] rst, String string) {
+ boolean r = false;
+
+ for(ICompletionProposal cp:rst){
+ if(cp.getDisplayString().equals(string)){
+ r = true;
+ break;
+ }
+ }
+ return r;
+ }
+}
Property changes on: trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/Jbide6061Test.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
14 years, 11 months
- 1
- 0