JBoss Tools SVN: r11108 - in trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test: src/org/jboss/tools/jsf/vpe/richfaces/test and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dmaliarevich
Date: 2008-10-23 09:38:58 -0400 (Thu, 23 Oct 2008)
New Revision: 11108
Added:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/tab.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/tab.xhtml.xml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/tabPanel.xhtml.xml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/toggleControl.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/toggleControl.xhtml.xml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/togglePanel.xhtml.xml
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/inputNumberSlider.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/inputNumberSpinner.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/simpleTogglePanel.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/simpleTogglePanel.xhtml.xml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/spacer.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/tabPanel.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/togglePanel.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesComponentContentTest.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-2810, tests for rich:tabPanel, rich:tab, rich:togglePanel, rich:toggleControl. Other tests were updated.
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/inputNumberSlider.xhtml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/inputNumberSlider.xhtml 2008-10-23 13:27:19 UTC (rev 11107)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/inputNumberSlider.xhtml 2008-10-23 13:38:58 UTC (rev 11108)
@@ -9,7 +9,9 @@
<head>
</head>
<body>
+<f:view>
<rich:inputNumberSlider id="inputNumberSlider" value="50">
</rich:inputNumberSlider>
+</f:view>
</body>
</html>
\ No newline at end of file
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/inputNumberSpinner.xhtml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/inputNumberSpinner.xhtml 2008-10-23 13:27:19 UTC (rev 11107)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/inputNumberSpinner.xhtml 2008-10-23 13:38:58 UTC (rev 11108)
@@ -9,7 +9,9 @@
<head>
</head>
<body>
+<f:view>
<rich:inputNumberSpinner id="inputNumberSpinner" value="50">
</rich:inputNumberSpinner>
+</f:view>
</body>
</html>
\ No newline at end of file
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/simpleTogglePanel.xhtml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/simpleTogglePanel.xhtml 2008-10-23 13:27:19 UTC (rev 11107)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/simpleTogglePanel.xhtml 2008-10-23 13:38:58 UTC (rev 11108)
@@ -12,17 +12,7 @@
<body>
<f:view>
<rich:simpleTogglePanel id="simpleTogglePanel" switchType="client"
- label="Add AJAX capability to existing JSF applications">
- The framework is implemented by using a component library. The library
- set Ajax functionality into existing pages, so there is no need to write
- any JavaScript code or to replace existing components with new Ajax one.
- Ajax4jsf enables page-wide Ajax support instead of the traditional
- component-wide support and it gives the opportunity to define the event
- on the page. An event invokes an Ajax request and areas of the page
- which are synchronized with the JSF Component Tree after changing the
- data on the server by Ajax request in accordance with events fired on
- the client.
- </rich:simpleTogglePanel>
+ label="Add AJAX capability to existing JSF applications">The framework is implemented by using a component library.</rich:simpleTogglePanel>
</f:view>
</body>
</html>
\ No newline at end of file
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/simpleTogglePanel.xhtml.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/simpleTogglePanel.xhtml.xml 2008-10-23 13:27:19 UTC (rev 11107)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/simpleTogglePanel.xhtml.xml 2008-10-23 13:38:58 UTC (rev 11108)
@@ -6,22 +6,13 @@
VPE-USER-TOGGLE-ID="false">
Add AJAX capability to existing JSF applications
<DIV STYLE="position: absolute; top: 0px; right: 5px;"
- VPE-USER-TOGGLE-ID="false" VPE-USER-TOGGLE-LOOKUP-PARENT="true"> «</DIV>
+ VPE-USER-TOGGLE-ID="false" VPE-USER-TOGGLE-LOOKUP-PARENT="true">«</DIV>
</DIV>
<DIV STYLE="overflow: hidden; width: 100%;">
<TABLE CELLPADDING="0" STYLE="width: 100%;">
<TR>
<TD CLASS="dr-stglpnl-b rich-stglpanel-body">
- <SPAN> The framework is implemented by using a component library.
- The library set Ajax functionality into existing pages, so there
- is no need to write any JavaScript code or to replace existing
- components with new Ajax one. Ajax4jsf enables page-wide Ajax
- support instead of the traditional component-wide support and it
- gives the opportunity to define the event on the page. An event
- invokes an Ajax request and areas of the page which are
- synchronized with the JSF Component Tree after changing the data
- on the server by Ajax request in accordance with events fired on
- the client.</SPAN>
+ <SPAN> The framework is implemented by using a component library.</SPAN>
</TD>
</TR>
</TABLE>
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/spacer.xhtml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/spacer.xhtml 2008-10-23 13:27:19 UTC (rev 11107)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/spacer.xhtml 2008-10-23 13:38:58 UTC (rev 11108)
@@ -12,7 +12,7 @@
<body>
<f:view>
line1
- <rich:spacer width="1" height="5" title="Here is a spacer..." />
+ <rich:spacer id="spacer" width="1" height="5" title="Here is a spacer..." />
line2
</f:view>
</body>
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/tab.xhtml
===================================================================
(Binary files differ)
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/tab.xhtml
___________________________________________________________________
Name: svn:mime-type
+ application/xhtml+xml
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/tab.xhtml.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/tab.xhtml.xml (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/tab.xhtml.xml 2008-10-23 13:38:58 UTC (rev 11108)
@@ -0,0 +1,6 @@
+<tests>
+ <test id="tab">
+ <!-- rich:tab is rendered inside RichFacesTabPanelTempalte -->
+ <!-- so it can't be found on its own account -->
+ </test>
+</tests>
\ No newline at end of file
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/tab.xhtml.xml
___________________________________________________________________
Name: svn:mime-type
+ text/xml
Name: svn:eol-style
+ native
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/tabPanel.xhtml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/tabPanel.xhtml 2008-10-23 13:27:19 UTC (rev 11107)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/tabPanel.xhtml 2008-10-23 13:38:58 UTC (rev 11108)
@@ -1,27 +1,26 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml"
- xmlns:ui="http://java.sun.com/jsf/facelets"
- xmlns:h="http://java.sun.com/jsf/html"
- xmlns:f="http://java.sun.com/jsf/core"
- xmlns:a4j="http://richfaces.org/a4j"
- xmlns:rich="http://richfaces.org/rich">
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:a4j="http://richfaces.org/a4j"
+ xmlns:rich="http://richfaces.org/rich">
<head>
</head>
-
<body>
-<!-- Tab panel component -->
-<rich:tabPanel>
- <!-- Tab component -->
- <rich:tab label="First">
+<f:view>
+ <rich:tabPanel id="tabPanel" switchType="ajax">
+ <rich:tab label="First">
Here is tab #1
</rich:tab>
- <rich:tab label="Second">
+ <rich:tab label="Second" disabled="true">
Here is tab #2
</rich:tab>
- <rich:tab label="Third">
+ <rich:tab label="Third">
Here is tab #3
</rich:tab>
-</rich:tabPanel>
+ </rich:tabPanel>
+</f:view>
</body>
</html>
\ No newline at end of file
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/tabPanel.xhtml.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/tabPanel.xhtml.xml (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/tabPanel.xhtml.xml 2008-10-23 13:38:58 UTC (rev 11108)
@@ -0,0 +1,167 @@
+<tests>
+ <test id="tabPanel">
+ <TABLE CELLSPACING="0" CELLPADDING="0" BORDER="0" CLASS="rich-tabpanel"
+ STYLE="width: 100%;">
+ <TBODY>
+ <TR>
+ <TD ALIGN="left" CLASS="">
+ <TABLE CELLSPACING="0" CELLPADDING="0" BORDER="0">
+ <TR>
+ <TD>
+ <IMG WIDTH="2" HEIGHT="1" BORDER="0"
+ SRC="/.*org.jboss.tools.jsf.vpe.richfaces/resources/common/spacer.gif/"/>
+ </TD>
+ <TD>
+ <IMG HEIGHT="1" BORDER="0"
+ SRC="/.*org.jboss.tools.jsf.vpe.richfaces/resources/common/spacer.gif/"
+ STYLE="width: 1px;"/>
+ </TD>
+ <TD STYLE="height: 100%; vertical-align: bottom;" CLASS="rich-tabhdr-cell-active"
+ VPE-USER-TOGGLE-ID="0">
+ <TABLE CELLSPACING="0" CELLPADDING="0" BORDER="0"
+ STYLE="height: 100%; position: relative; z-index: 2;"
+ VPE-USER-TOGGLE-ID="0" VPE-USER-TOGGLE-LOOKUP-PARENT="true">
+ <TR VPE-USER-TOGGLE-ID="0" VPE-USER-TOGGLE-LOOKUP-PARENT="true">
+ <TD CLASS="rich-tabhdr-side-cell rich-tabhdr-side-border"
+ STYLE="/background-image: url\(.*org.jboss.tools.jsf.vpe.richfaces/resources/tabPanel/border.gif\);/"
+ VPE-USER-TOGGLE-ID="0" VPE-USER-TOGGLE-LOOKUP-PARENT="true">
+ <IMG WIDTH="1" HEIGHT="1" BORDER="0"
+ SRC="/.*org.jboss.tools.jsf.vpe.richfaces/resources/common/spacer.gif/"
+ VPE-USER-TOGGLE-ID="0" VPE-USER-TOGGLE-LOOKUP-PARENT="true"/>
+ </TD>
+ <TD VPE-USER-TOGGLE-ID="0" VPE-USER-TOGGLE-LOOKUP-PARENT="true">
+ <TABLE CELLSPACING="0" CELLPADDING="0" BORDER="0"
+ STYLE="height: 100%; width: 100%;" VPE-USER-TOGGLE-ID="0"
+ VPE-USER-TOGGLE-LOOKUP-PARENT="true">
+ <TR VPE-USER-TOGGLE-ID="0"
+ VPE-USER-TOGGLE-LOOKUP-PARENT="true">
+ <TD
+ CLASS="rich-tab-header rich-tab-label rich-tab-active rich-tabhdr-cell-active"
+ VPE-USER-TOGGLE-ID="0" VPE-USER-TOGGLE-LOOKUP-PARENT="true">
+ First </TD>
+ </TR>
+ </TABLE>
+ </TD>
+ <TD CLASS="rich-tabhdr-side-cell rich-tabhdr-side-border"
+ STYLE="/background-image: url\(.*org.jboss.tools.jsf.vpe.richfaces/resources/tabPanel/border.gif\);/"
+ VPE-USER-TOGGLE-ID="0" VPE-USER-TOGGLE-LOOKUP-PARENT="true">
+ <IMG WIDTH="1" HEIGHT="1" BORDER="0"
+ SRC="/.*org.jboss.tools.jsf.vpe.richfaces/resources/common/spacer.gif/"
+ VPE-USER-TOGGLE-ID="0" VPE-USER-TOGGLE-LOOKUP-PARENT="true"/>
+ </TD>
+ </TR>
+ </TABLE>
+ </TD>
+ <TD>
+ <IMG HEIGHT="1" BORDER="0"
+ SRC="/.*org.jboss.tools.jsf.vpe.richfaces/resources/common/spacer.gif/"
+ STYLE="width: 1px;"/>
+ </TD>
+ <TD STYLE="height: 100%; vertical-align: bottom;" CLASS="rich-tabhdr-cell-disabled rich-tab-disabled"
+ VPE-USER-TOGGLE-ID="1">
+ <TABLE CELLSPACING="0" CELLPADDING="0" BORDER="0"
+ STYLE="height: 100%; position: relative; z-index: 2;"
+ VPE-USER-TOGGLE-ID="1" VPE-USER-TOGGLE-LOOKUP-PARENT="true">
+ <TR VPE-USER-TOGGLE-ID="1" VPE-USER-TOGGLE-LOOKUP-PARENT="true">
+ <TD CLASS="rich-tabhdr-side-cell rich-tabhdr-side-border"
+ STYLE="/background-image: url\(.*org.jboss.tools.jsf.vpe.richfaces/resources/tabPanel/border.gif\);/"
+ VPE-USER-TOGGLE-ID="1" VPE-USER-TOGGLE-LOOKUP-PARENT="true">
+ <IMG WIDTH="1" HEIGHT="1" BORDER="0"
+ SRC="/.*org.jboss.tools.jsf.vpe.richfaces/resources/common/spacer.gif/"
+ VPE-USER-TOGGLE-ID="1" VPE-USER-TOGGLE-LOOKUP-PARENT="true"/>
+ </TD>
+ <TD VPE-USER-TOGGLE-ID="1" VPE-USER-TOGGLE-LOOKUP-PARENT="true">
+ <TABLE CELLSPACING="0" CELLPADDING="0" BORDER="0"
+ STYLE="height: 100%; width: 100%;" VPE-USER-TOGGLE-ID="1"
+ VPE-USER-TOGGLE-LOOKUP-PARENT="true">
+ <TR VPE-USER-TOGGLE-ID="1"
+ VPE-USER-TOGGLE-LOOKUP-PARENT="true">
+ <TD
+ CLASS="rich-tab-header rich-tab-label rich-tab-disabled rich-tabhdr-cell-disabled"
+ VPE-USER-TOGGLE-ID="1" VPE-USER-TOGGLE-LOOKUP-PARENT="true">
+ Second </TD>
+ </TR>
+ </TABLE>
+ </TD>
+ <TD CLASS="rich-tabhdr-side-cell rich-tabhdr-side-border"
+ STYLE="/background-image: url\(.*org.jboss.tools.jsf.vpe.richfaces/resources/tabPanel/border.gif\);/"
+ VPE-USER-TOGGLE-ID="1" VPE-USER-TOGGLE-LOOKUP-PARENT="true">
+ <IMG WIDTH="1" HEIGHT="1" BORDER="0"
+ SRC="/.*org.jboss.tools.jsf.vpe.richfaces/resources/common/spacer.gif/"
+ VPE-USER-TOGGLE-ID="1" VPE-USER-TOGGLE-LOOKUP-PARENT="true"/>
+ </TD>
+ </TR>
+ </TABLE>
+ </TD>
+ <TD>
+ <IMG HEIGHT="1" BORDER="0"
+ SRC="/.*org.jboss.tools.jsf.vpe.richfaces/resources/common/spacer.gif/"
+ STYLE="width: 1px;"/>
+ </TD>
+ <TD STYLE="height: 100%; vertical-align: bottom;" CLASS="rich-tabhdr-cell-inactive"
+ VPE-USER-TOGGLE-ID="2">
+ <TABLE CELLSPACING="0" CELLPADDING="0" BORDER="0"
+ STYLE="height: 100%; position: relative; z-index: 2;"
+ VPE-USER-TOGGLE-ID="2" VPE-USER-TOGGLE-LOOKUP-PARENT="true">
+ <TR VPE-USER-TOGGLE-ID="2" VPE-USER-TOGGLE-LOOKUP-PARENT="true">
+ <TD CLASS="rich-tabhdr-side-cell rich-tabhdr-side-border"
+ STYLE="/background-image: url\(.*org.jboss.tools.jsf.vpe.richfaces/resources/tabPanel/border.gif\);/"
+ VPE-USER-TOGGLE-ID="2" VPE-USER-TOGGLE-LOOKUP-PARENT="true">
+ <IMG WIDTH="1" HEIGHT="1" BORDER="0"
+ SRC="/.*org.jboss.tools.jsf.vpe.richfaces/resources/common/spacer.gif/"
+ VPE-USER-TOGGLE-ID="2" VPE-USER-TOGGLE-LOOKUP-PARENT="true"/>
+ </TD>
+ <TD VPE-USER-TOGGLE-ID="2" VPE-USER-TOGGLE-LOOKUP-PARENT="true">
+ <TABLE CELLSPACING="0" CELLPADDING="0" BORDER="0"
+ STYLE="height: 100%; width: 100%;" VPE-USER-TOGGLE-ID="2"
+ VPE-USER-TOGGLE-LOOKUP-PARENT="true">
+ <TR VPE-USER-TOGGLE-ID="2"
+ VPE-USER-TOGGLE-LOOKUP-PARENT="true">
+ <TD
+ CLASS="rich-tab-header rich-tab-label rich-tab-inactive rich-tabhdr-cell-inactive"
+ VPE-USER-TOGGLE-ID="2" VPE-USER-TOGGLE-LOOKUP-PARENT="true">
+ Third </TD>
+ </TR>
+ </TABLE>
+ </TD>
+ <TD CLASS="rich-tabhdr-side-cell rich-tabhdr-side-border"
+ STYLE="/background-image: url\(.*org.jboss.tools.jsf.vpe.richfaces/resources/tabPanel/border.gif\);/"
+ VPE-USER-TOGGLE-ID="2" VPE-USER-TOGGLE-LOOKUP-PARENT="true">
+ <IMG WIDTH="1" HEIGHT="1" BORDER="0"
+ SRC="/.*org.jboss.tools.jsf.vpe.richfaces/resources/common/spacer.gif/"
+ VPE-USER-TOGGLE-ID="2" VPE-USER-TOGGLE-LOOKUP-PARENT="true"/>
+ </TD>
+ </TR>
+ </TABLE>
+ </TD>
+ <TD>
+ <IMG HEIGHT="1" BORDER="0"
+ SRC="/.*org.jboss.tools.jsf.vpe.richfaces/resources/common/spacer.gif/"
+ STYLE="width: 1px;"/>
+ </TD>
+ <TD>
+ <IMG WIDTH="1" HEIGHT="1" BORDER="0"
+ SRC="/.*org.jboss.tools.jsf.vpe.richfaces/resources/common/spacer.gif/"/>
+ </TD>
+ </TR>
+ </TABLE>
+ </TD>
+ </TR>
+ <TR>
+ <TD HEIGHT="100%">
+ <TABLE WIDTH="100%" CELLSPACING="0" CELLPADDING="10" BORDER="0"
+ CLASS="rich-tabpanel-content-position" STYLE="position: relative; z-index: 1;">
+ <TR>
+ <TD
+ CLASS="rich-tabpanel rich-tabpanel-content rich-tabpanel-content-position"
+ STYLE="">
+ <SPAN> Here is tab #1 </SPAN>
+ </TD>
+ </TR>
+ </TABLE>
+ </TD>
+ </TR>
+ </TBODY>
+ </TABLE>
+ </test>
+</tests>
\ No newline at end of file
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/tabPanel.xhtml.xml
___________________________________________________________________
Name: svn:mime-type
+ text/xml
Name: svn:eol-style
+ native
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/toggleControl.xhtml
===================================================================
(Binary files differ)
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/toggleControl.xhtml
___________________________________________________________________
Name: svn:mime-type
+ application/xhtml+xml
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/toggleControl.xhtml.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/toggleControl.xhtml.xml (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/toggleControl.xhtml.xml 2008-10-23 13:38:58 UTC (rev 11108)
@@ -0,0 +1,8 @@
+<tests>
+ <test id="toggleControl">
+ <SPAN STYLE="color: blue; text-decoration: underline;"
+ VPE-USER-TOGGLE-ID="">
+ <SPAN> CLOSED </SPAN>
+ </SPAN>
+ </test>
+</tests>
\ No newline at end of file
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/toggleControl.xhtml.xml
___________________________________________________________________
Name: svn:mime-type
+ text/xml
Name: svn:eol-style
+ native
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/togglePanel.xhtml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/togglePanel.xhtml 2008-10-23 13:27:19 UTC (rev 11107)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/togglePanel.xhtml 2008-10-23 13:38:58 UTC (rev 11108)
@@ -1,58 +1,38 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml"
- xmlns:ui="http://java.sun.com/jsf/facelets"
- xmlns:h="http://java.sun.com/jsf/html"
- xmlns:f="http://java.sun.com/jsf/core"
- xmlns:a4j="http://richfaces.org/a4j"
- xmlns:rich="http://richfaces.org/rich">
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:a4j="http://richfaces.org/a4j"
+ xmlns:rich="http://richfaces.org/rich">
<head>
</head>
-
<body>
-<!-- Toggle Panel component -->
-<rich:togglePanel value="#{toggleBean.skinChooserState1}"
- switchType="client" stateOrder="closed,tip1, tip2,tip3">
-
- <f:facet name="closed">
- <!-- Toggle Control component-->
- <rich:toggleControl>
- <h:graphicImage id="pic" style="border-width:0"
- value="/pictures/clickme.gif" />
- </rich:toggleControl>
- </f:facet>
-
- <f:facet name="tip1">
- <ui:include src="/templetes/tipBlock.xhtml">
- <ui:param name="tip"
- value="rich:toggleControl might bre located inside of outside
- of the rich:toogleControl it works for. In case of outside location, the control
- attribute 'for' should refer to the toggle panel id." />
- <ui:param name="next" value="tip2" />
- </ui:include>
- </f:facet>
-
- <f:facet name="tip2">
- <ui:include src="/templetes/tipBlock.xhtml">
- <ui:param name="tip"
- value="Attribute initialState defines the first state appear
- when the page is loaded. If this attribute is not specified, the first state
- mentioned in the attribute stateOrder will be the first" />
- <ui:param name="previous" value="tip1" />
- <ui:param name="next" value="tip3" />
- </ui:include>
- </f:facet>
-
- <f:facet name="tip3">
- <ui:include src="/templetes/tipBlock.xhtml">
- <ui:param name="tip"
- value="Note that rich:toggleControl similar to
- h:commandLink for 'server' mode and smilar to a4j:commandLink for 'ajax' mode.
- Set immediate attribute to true if jsf form has other input field that might
- cause the validation error. Otherwize, the state switched will not perform" />
- <ui:param name="previous" value="tip2" />
- </ui:include>
- </f:facet>
-</rich:togglePanel>
+<f:view>
+ <rich:togglePanel id="togglePanel" value="togglePanelValue" switchType="client"
+ stateOrder="closed,tip1,tip2">
+ <f:facet name="closed">
+ <rich:toggleControl>
+ <h:outputText value="CLOSED" />
+ </rich:toggleControl>
+ </f:facet>
+ <f:facet name="tip1">
+ <h:outputText value="TIP 1" />
+ <h:panelGrid columns="2">
+ <rich:toggleControl switchToState="closed" value="x Close" />
+ <rich:toggleControl switchToState="tip2" value="Next >>" />
+ </h:panelGrid>
+ </f:facet>
+ <f:facet name="tip2">
+ <h:outputText value="TIP 2" />
+ <h:panelGrid columns="2">
+ <rich:toggleControl switchToState="closed" value="x Close" />
+ <rich:toggleControl switchToState="tip1" value="« Previous" />
+ <rich:toggleControl switchToState="tip2" value="Next >>" />
+ </h:panelGrid>
+ </f:facet>
+ </rich:togglePanel>
+</f:view>
</body>
</html>
\ No newline at end of file
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/togglePanel.xhtml.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/togglePanel.xhtml.xml (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/togglePanel.xhtml.xml 2008-10-23 13:38:58 UTC (rev 11108)
@@ -0,0 +1,10 @@
+<tests>
+ <test id="togglePanel">
+ <DIV>
+ <SPAN STYLE="color: blue; text-decoration: underline;"
+ VPE-USER-TOGGLE-ID="">
+ <SPAN> CLOSED </SPAN>
+ </SPAN>
+ </DIV>
+ </test>
+</tests>
\ No newline at end of file
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/togglePanel.xhtml.xml
___________________________________________________________________
Name: svn:mime-type
+ text/xml
Name: svn:eol-style
+ native
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesComponentContentTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesComponentContentTest.java 2008-10-23 13:27:19 UTC (rev 11107)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesComponentContentTest.java 2008-10-23 13:38:58 UTC (rev 11108)
@@ -272,19 +272,19 @@
}
public void testTabPanel() throws Throwable {
- assertTrue("it is necessary to add a body of the test ", false);//$NON-NLS-1$
+ performContentTest("components/tabPanel.xhtml");//$NON-NLS-1$
}
public void testTab() throws Throwable {
- assertTrue("it is necessary to add a body of the test ", false);//$NON-NLS-1$
+ performContentTest("components/tab.xhtml");//$NON-NLS-1$
}
public void testTogglePanel() throws Throwable {
- assertTrue("it is necessary to add a body of the test ", false);//$NON-NLS-1$
+ performContentTest("components/togglePanel.xhtml");//$NON-NLS-1$
}
public void testToggleControl() throws Throwable {
- assertTrue("it is necessary to add a body of the test ", false);//$NON-NLS-1$
+ performContentTest("components/toggleControl.xhtml");//$NON-NLS-1$
}
public void testToolBar() throws Throwable {
16 years, 2 months
- 1
- 0
JBoss Tools SVN: r11107 - in branches/jbosstools-3.0.0.Beta1/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui: internal/project/facet and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2008-10-23 09:27:19 -0400 (Thu, 23 Oct 2008)
New Revision: 11107
Modified:
branches/jbosstools-3.0.0.Beta1/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/SeamUIMessages.java
branches/jbosstools-3.0.0.Beta1/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/DataModelValidatorDelegate.java
branches/jbosstools-3.0.0.Beta1/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/IValidator.java
branches/jbosstools-3.0.0.Beta1/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/SeamInstallWizardPage.java
branches/jbosstools-3.0.0.Beta1/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/ValidatorFactory.java
branches/jbosstools-3.0.0.Beta1/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/messages.properties
branches/jbosstools-3.0.0.Beta1/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamGenerateEnitiesWizardPage.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-2959 Fixed in trunk (cr1) and brunch (beta1)
Modified: branches/jbosstools-3.0.0.Beta1/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/SeamUIMessages.java
===================================================================
--- branches/jbosstools-3.0.0.Beta1/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/SeamUIMessages.java 2008-10-23 13:22:32 UTC (rev 11106)
+++ branches/jbosstools-3.0.0.Beta1/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/SeamUIMessages.java 2008-10-23 13:27:19 UTC (rev 11107)
@@ -113,6 +113,8 @@
public static String SEAM_FORM_WIZARD_PAGE1_JAVA_INTERFACE_SLSB_AND_KEY_SEAMEJB3_ANNOTATIONS_WILL_BE_CREATED;
+ public static String SEAM_INSTALL_WIZARD_PROJECT_NAME_WITH_UPPERCASE;
+
public static String SEAM_FORM_WIZARD_PAGE1_SEAM_FORM;
public static String SEAM_FORM_WIZARD_PAGE1_SELECT_THE_NAME_OF_THE_NEW_SEAM_FORM;
Modified: branches/jbosstools-3.0.0.Beta1/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/DataModelValidatorDelegate.java
===================================================================
--- branches/jbosstools-3.0.0.Beta1/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/DataModelValidatorDelegate.java 2008-10-23 13:22:32 UTC (rev 11106)
+++ branches/jbosstools-3.0.0.Beta1/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/DataModelValidatorDelegate.java 2008-10-23 13:27:19 UTC (rev 11107)
@@ -15,6 +15,8 @@
import java.util.List;
import java.util.Map;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.jface.dialogs.DialogPage;
import org.eclipse.jface.wizard.WizardPage;
import org.eclipse.swt.widgets.Display;
import org.eclipse.wst.common.frameworks.datamodel.DataModelEvent;
@@ -84,25 +86,40 @@
*
*/
public void validateUntillError() {
- page.setErrorMessage(getFirstValidationError());
+ IStatus message = getFirstValidationError();
+ if(message == null) {
+ page.setMessage(null);
+ page.setErrorMessage(null);
+ } else {
+ if(message.getSeverity()==IStatus.ERROR) {
+ page.setErrorMessage(message.getMessage());
+ } else {
+ page.setErrorMessage(null);
+ page.setMessage(message.getMessage(), DialogPage.WARNING);
+ }
+ }
page.setPageComplete(page.getErrorMessage()==null);
- if(page.getErrorMessage()==null) page.setMessage(null);
}
/**
*
* @return
*/
- public String getFirstValidationError() {
+ public IStatus getFirstValidationError() {
+ IStatus firstWarning = null;
for (String validatorName : validationOrder) {
- Map<String,String> errors = getValidator(validatorName).validate(
+ Map<String,IStatus> errors = getValidator(validatorName).validate(
model.getProperty(validatorName),model);
- String message = errors.get(validatorName);
+ IStatus message = errors.get(validatorName);
if(message!=null) {
- return message;
+ if(message.getSeverity()==IStatus.ERROR) {
+ return message;
+ } else if(message.getSeverity()==IStatus.WARNING && firstWarning==null) {
+ firstWarning = message;
+ }
}
}
- return null;
+ return firstWarning;
}
/**
Modified: branches/jbosstools-3.0.0.Beta1/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/IValidator.java
===================================================================
--- branches/jbosstools-3.0.0.Beta1/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/IValidator.java 2008-10-23 13:22:32 UTC (rev 11106)
+++ branches/jbosstools-3.0.0.Beta1/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/IValidator.java 2008-10-23 13:27:19 UTC (rev 11107)
@@ -12,6 +12,8 @@
import java.util.Map;
+import org.eclipse.core.runtime.IStatus;
+
/**
* Simple validator interface
* @author eskimo
@@ -27,5 +29,5 @@
* @param context - a contextual data that can be used during validation
* @return map from editor name to error text
*/
- Map<String,String> validate(Object value, Object context);
+ Map<String, IStatus> validate(Object value, Object context);
}
Modified: branches/jbosstools-3.0.0.Beta1/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/SeamInstallWizardPage.java
===================================================================
--- branches/jbosstools-3.0.0.Beta1/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/SeamInstallWizardPage.java 2008-10-23 13:22:32 UTC (rev 11106)
+++ branches/jbosstools-3.0.0.Beta1/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/SeamInstallWizardPage.java 2008-10-23 13:27:19 UTC (rev 11107)
@@ -20,11 +20,13 @@
import org.eclipse.core.resources.IProject;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
import org.eclipse.datatools.connectivity.IConnectionProfile;
import org.eclipse.datatools.connectivity.ProfileManager;
import org.eclipse.jdt.core.JavaConventions;
import org.eclipse.jdt.internal.compiler.impl.CompilerOptions;
import org.eclipse.jface.dialogs.Dialog;
+import org.eclipse.jface.dialogs.DialogPage;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.wizard.IWizard;
@@ -98,7 +100,7 @@
// Database group
private IFieldEditor connProfileSelEditor = SeamWizardFactory.createConnectionProfileSelectionFieldEditor(getConnectionProfileDefaultValue(), new IValidator() {
- public Map<String, String> validate(Object value, Object context) {
+ public Map<String, IStatus> validate(Object value, Object context) {
SeamInstallWizardPage.this.validate();
return ValidatorFactory.NO_ERRORS;
}
@@ -379,6 +381,12 @@
validatorDelegate.addValidatorForProperty(
ISeamFacetDataModelProperties.JBOSS_AS_DEPLOY_AS,
getDeploymentTypeValidator(getWizard()));
+ validatorDelegate.addValidatorForProperty(
+ IFacetDataModelProperties.FACET_PROJECT_NAME,
+ new ProjectNamesDuplicationValidator(
+ IFacetDataModelProperties.FACET_PROJECT_NAME));
+ validatorDelegate.addValidatorForProperty(IFacetDataModelProperties.FACET_PROJECT_NAME,
+ new ProjectNameValidator(IFacetDataModelProperties.FACET_PROJECT_NAME));
}
jBossHibernateDbTypeEditor
@@ -479,11 +487,24 @@
}
private void validate() {
- final String message = validatorDelegate.getFirstValidationError();
+ final IStatus message = validatorDelegate.getFirstValidationError();
Display.getDefault().syncExec(new Runnable() {
public void run() {
- setPageComplete(message == null);
- setErrorMessage(message);
+ if(message==null) {
+ setMessage(null);
+ setErrorMessage(null);
+ setPageComplete(true);
+ return;
+ }
+ if(message.getSeverity()==IStatus.ERROR) {
+ setErrorMessage(message.getMessage());
+ setPageComplete(false);
+ return;
+ }
+ setErrorMessage(null);
+ setMessage(message.getMessage(), DialogPage.WARNING);
+ setPageComplete(true);
+ return;
}
});
}
@@ -505,18 +526,45 @@
/**
* @see IValidator#validate(Object, Object)
*/
- public Map<String, String> validate(Object value, Object context) {
+ public Map<String, IStatus> validate(Object value, Object context) {
IStatus status = JavaConventions.validatePackageName(value
.toString(), CompilerOptions.VERSION_1_5,
CompilerOptions.VERSION_1_5);
- if (!status.isOK()) {
+ if (status.getSeverity()==IStatus.ERROR) {
return ValidatorFactory.createErrormessage(fieldName,
- SeamUIMessages.SEAM_INSTALL_WIZARD_PAGE_PACKAGE_NAME_FOR + targetName + SeamUIMessages.SEAM_INSTALL_WIZARD_PAGE_IS_NOT_VALID);
+ new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, SeamUIMessages.SEAM_INSTALL_WIZARD_PAGE_PACKAGE_NAME_FOR + targetName + SeamUIMessages.SEAM_INSTALL_WIZARD_PAGE_IS_NOT_VALID));
+ } else if (status.getSeverity()==IStatus.WARNING) {
+ return ValidatorFactory.createErrormessage(fieldName,
+ new Status(IStatus.WARNING, SeamCorePlugin.PLUGIN_ID, SeamUIMessages.SEAM_INSTALL_WIZARD_PAGE_PACKAGE_NAME_FOR + targetName + SeamUIMessages.SEAM_INSTALL_WIZARD_PAGE_IS_NOT_VALID));
}
return ValidatorFactory.NO_ERRORS;
}
}
+ class ProjectNameValidator implements IValidator {
+ String propertyName;
+
+ public ProjectNameValidator(String propertyName) {
+ this.propertyName = propertyName;
+ }
+
+ public Map<String, IStatus> validate(Object value, Object context) {
+ if(value==null) {
+ return ValidatorFactory.NO_ERRORS;
+ }
+ final String projectName = (String)value;
+ if(projectName.length()==0) {
+ return ValidatorFactory.NO_ERRORS;
+ }
+ char firstLetter = projectName.charAt(0);
+ if(Character.isUpperCase(firstLetter)) {
+ return ValidatorFactory.createErrormessage(propertyName,
+ new Status(IStatus.WARNING, SeamCorePlugin.PLUGIN_ID, SeamUIMessages.SEAM_INSTALL_WIZARD_PROJECT_NAME_WITH_UPPERCASE));
+ }
+ return ValidatorFactory.NO_ERRORS;
+ }
+ }
+
class ProjectNamesDuplicationValidator implements IValidator {
String propertyName;
@@ -529,35 +577,52 @@
/**
* @see IValidator#validate(Object, Object)
*/
- public Map<String, String> validate(Object value, Object context) {
+ public Map<String, IStatus> validate(Object value, Object context) {
final String projectName = (String)value;
final String deployAs = model.getStringProperty(
ISeamFacetDataModelProperties.JBOSS_AS_DEPLOY_AS);
final String testProjectName = projectName + "-test"; //$NON-NLS-1$
IStatus status = ProjectCreationDataModelProviderNew.validateName(testProjectName);
- if (!status.isOK())
+ if (status.getSeverity()==IStatus.ERROR) {
return ValidatorFactory.createErrormessage(propertyName,
- SeamUIMessages.VALIDATOR_FACTORY_TEST_PROJECT +
- testProjectName +
- SeamUIMessages.VALIDATOR_FACTORY_PROJECT_ALREADY_EXISTS);
-
+ new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, SeamUIMessages.VALIDATOR_FACTORY_TEST_PROJECT +
+ testProjectName +
+ SeamUIMessages.VALIDATOR_FACTORY_PROJECT_ALREADY_EXISTS));
+ } else if (status.getSeverity()==IStatus.WARNING) {
+ return ValidatorFactory.createErrormessage(propertyName,
+ new Status(IStatus.WARNING, SeamCorePlugin.PLUGIN_ID, SeamUIMessages.VALIDATOR_FACTORY_TEST_PROJECT +
+ testProjectName +
+ SeamUIMessages.VALIDATOR_FACTORY_PROJECT_ALREADY_EXISTS));
+ }
if (ISeamFacetDataModelProperties.DEPLOY_AS_EAR.equals(deployAs)) {
final String earProjectName = projectName + "-ear"; //$NON-NLS-1$
status = ProjectCreationDataModelProviderNew.validateName(earProjectName);
- if (!status.isOK())
+ if (status.getSeverity()==IStatus.ERROR) {
return ValidatorFactory.createErrormessage(propertyName,
- SeamUIMessages.VALIDATOR_FACTORY_EAR_PROJECT +
+ new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, SeamUIMessages.VALIDATOR_FACTORY_EAR_PROJECT +
earProjectName +
- SeamUIMessages.VALIDATOR_FACTORY_PROJECT_ALREADY_EXISTS);
+ SeamUIMessages.VALIDATOR_FACTORY_PROJECT_ALREADY_EXISTS));
+ } else if (status.getSeverity()==IStatus.WARNING) {
+ return ValidatorFactory.createErrormessage(propertyName,
+ new Status(IStatus.WARNING, SeamCorePlugin.PLUGIN_ID, SeamUIMessages.VALIDATOR_FACTORY_EAR_PROJECT +
+ earProjectName +
+ SeamUIMessages.VALIDATOR_FACTORY_PROJECT_ALREADY_EXISTS));
+ }
final String ejbProjectName = projectName + "-ejb"; //$NON-NLS-1$
status = ProjectCreationDataModelProviderNew.validateName(ejbProjectName);
- if (!status.isOK())
+ if (status.getSeverity()==IStatus.ERROR) {
return ValidatorFactory.createErrormessage(propertyName,
- SeamUIMessages.VALIDATOR_FACTORY_EJB_PROJECT +
+ new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, SeamUIMessages.VALIDATOR_FACTORY_EJB_PROJECT +
ejbProjectName +
- SeamUIMessages.VALIDATOR_FACTORY_PROJECT_ALREADY_EXISTS);
+ SeamUIMessages.VALIDATOR_FACTORY_PROJECT_ALREADY_EXISTS));
+ } else if (status.getSeverity()==IStatus.WARNING) {
+ return ValidatorFactory.createErrormessage(propertyName,
+ new Status(IStatus.WARNING, SeamCorePlugin.PLUGIN_ID, SeamUIMessages.VALIDATOR_FACTORY_EJB_PROJECT +
+ ejbProjectName +
+ SeamUIMessages.VALIDATOR_FACTORY_PROJECT_ALREADY_EXISTS));
+ }
}
return ValidatorFactory.NO_ERRORS;
}
@@ -569,7 +634,7 @@
}
// return new DeploymentTypeValidator(ISeamFacetDataModelProperties.JBOSS_AS_DEPLOY_AS, model);
return new IValidator() {
- public Map<String, String> validate(Object value, Object context) {
+ public Map<String, IStatus> validate(Object value, Object context) {
return ValidatorFactory.NO_ERRORS;
}
};
@@ -599,7 +664,7 @@
/**
* @see IValidator#validate(Object, Object)
*/
- public Map<String, String> validate(Object value, Object context) {
+ public Map<String, IStatus> validate(Object value, Object context) {
final String deploymentType = value.toString();
if(!ISeamFacetDataModelProperties.DEPLOY_AS_WAR.equals(deploymentType)) {
Object runtimeName = model.getProperty(IFacetProjectCreationDataModelProperties.FACET_RUNTIME);
@@ -608,7 +673,7 @@
if(!rt.supports(EJB_30) || !rt.supports(EAR_50)) {
return ValidatorFactory.createErrormessage(
propertyName,
- NLS.bind(SeamUIMessages.SEAM_INSTALL_WIZARD_PAGE_CANNOT_USE_SELECTED_DEPLOYMENT6 , new String[]{deploymentType.toUpperCase(),runtimeName.toString()}));
+ new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, NLS.bind(SeamUIMessages.SEAM_INSTALL_WIZARD_PAGE_CANNOT_USE_SELECTED_DEPLOYMENT6 , new String[]{deploymentType.toUpperCase(),runtimeName.toString()})));
}
}
}
Modified: branches/jbosstools-3.0.0.Beta1/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/ValidatorFactory.java
===================================================================
--- branches/jbosstools-3.0.0.Beta1/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/ValidatorFactory.java 2008-10-23 13:22:32 UTC (rev 11106)
+++ branches/jbosstools-3.0.0.Beta1/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/ValidatorFactory.java 2008-10-23 13:27:19 UTC (rev 11107)
@@ -21,6 +21,7 @@
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
import org.eclipse.datatools.connectivity.IConnectionProfile;
import org.eclipse.datatools.connectivity.ProfileManager;
import org.eclipse.jdt.core.IJavaProject;
@@ -56,14 +57,14 @@
/**
*
*/
- static public final Map<String, String> NO_ERRORS = Collections
- .unmodifiableMap(new HashMap<String, String>());
+ static public final Map<String, IStatus> NO_ERRORS = Collections
+ .unmodifiableMap(new HashMap<String, IStatus>());
/**
*
*/
static public IValidator NO_ERRORS_VALIDATOR = new IValidator() {
- public Map<String, String> validate(Object value, Object context) {
+ public Map<String, IStatus> validate(Object value, Object context) {
return NO_ERRORS;
}
};
@@ -82,8 +83,8 @@
*
* @return
*/
- public static Map<String, String> createErrorMap() {
- return new HashMap<String, String>();
+ public static Map<String, IStatus> createErrorMap() {
+ return new HashMap<String, IStatus>();
}
/**
@@ -91,9 +92,9 @@
* @param text
* @return
*/
- public static Map<String, String> createErrormessage(String text) {
- Map<String, String> map = createErrorMap();
- map.put(IValidator.DEFAULT_ERROR, text);
+ public static Map<String, IStatus> createErrormessage(IStatus message) {
+ Map<String, IStatus> map = createErrorMap();
+ map.put(IValidator.DEFAULT_ERROR, message);
return map;
}
@@ -102,10 +103,10 @@
* @param text
* @return
*/
- public static Map<String, String> createErrormessage(String propertyName,
- String text) {
- Map<String, String> map = createErrorMap();
- map.put(propertyName, text);
+ public static Map<String, IStatus> createErrormessage(String propertyName,
+ IStatus message) {
+ Map<String, IStatus> map = createErrorMap();
+ map.put(propertyName, message);
return map;
}
@@ -114,7 +115,7 @@
*/
public static final IValidator FILE_SYSTEM_FOLDER_EXISTS = new IValidator() {
- public Map<String, String> validate(Object value, Object context) {
+ public Map<String, IStatus> validate(Object value, Object context) {
if (value == null)
throw new IllegalArgumentException(
SeamUIMessages.VALIDATOR_FACTORY_PATH_TO_A_FOLDER_CANNOT_BE_NULL);
@@ -122,13 +123,13 @@
File folder = new File(folderPath);
if (!folder.exists())
- return createErrormessage(SeamUIMessages.VALIDATOR_FACTORY_FOLDER
+ return createErrormessage(new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, SeamUIMessages.VALIDATOR_FACTORY_FOLDER
+ folderPath
- + SeamUIMessages.VALIDATOR_FACTORY_DOES_NOT_EXISTS);
+ + SeamUIMessages.VALIDATOR_FACTORY_DOES_NOT_EXISTS));
if (!folder.isDirectory())
- return createErrormessage(SeamUIMessages.VALIDATOR_FACTORY_PATH
+ return createErrormessage(new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, SeamUIMessages.VALIDATOR_FACTORY_PATH
+ folderPath
- + SeamUIMessages.VALIDATOR_FACTORY_POINTS_TO_FILE);
+ + SeamUIMessages.VALIDATOR_FACTORY_POINTS_TO_FILE));
return NO_ERRORS;
}
};
@@ -137,15 +138,13 @@
*
*/
public static final IValidator JBOSS_SEAM_HOME_FOLDER_VALIDATOR = new IValidator() {
- public Map<String, String> validate(Object value, Object context) {
- Map<String, String> errors = FILE_SYSTEM_FOLDER_EXISTS.validate(
+ public Map<String, IStatus> validate(Object value, Object context) {
+ Map<String, IStatus> errors = FILE_SYSTEM_FOLDER_EXISTS.validate(
value, context);
if (errors.size() > 0) {
errors = createErrorMap();
- errors
- .put(
- ISeamFacetDataModelProperties.JBOSS_SEAM_HOME,
- SeamUIMessages.VALIDATOR_FACTORY_SEAM_HOME_FOLDER_DOES_NOT_EXISTS);
+ errors.put(ISeamFacetDataModelProperties.JBOSS_SEAM_HOME, new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID,
+ SeamUIMessages.VALIDATOR_FACTORY_SEAM_HOME_FOLDER_DOES_NOT_EXISTS));
return errors;
}
String version = (String) context;
@@ -155,21 +154,19 @@
"lib/jboss-seam.jar"); //$NON-NLS-1$
if (!seamJarFile.isFile()) {
errors = createErrorMap();
- errors
- .put(
- ISeamFacetDataModelProperties.JBOSS_SEAM_HOME,
+ errors.put(ISeamFacetDataModelProperties.JBOSS_SEAM_HOME,
+ new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID,
SeamUIMessages.VALIDATOR_FACTORY_HOME_FOLDER_POINTS_TO
- + SeamUIMessages.VALIDATOR_FACTORY_LOCATION_THAT_DOES_NOT_LOOK_LIKE_SEAM_HOME_FOLDER);
+ + SeamUIMessages.VALIDATOR_FACTORY_LOCATION_THAT_DOES_NOT_LOOK_LIKE_SEAM_HOME_FOLDER));
}
} else {
File seamJarFile = new File(value.toString(), "jboss-seam.jar"); //$NON-NLS-1$
if (!seamJarFile.isFile()) {
errors = createErrorMap();
- errors
- .put(
- ISeamFacetDataModelProperties.JBOSS_SEAM_HOME,
+ errors.put(ISeamFacetDataModelProperties.JBOSS_SEAM_HOME,
+ new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID,
SeamUIMessages.VALIDATOR_FACTORY_HOME_FOLDER_POINTS_TO
- + SeamUIMessages.VALIDATOR_FACTORY_LOCATION_THAT_DOES_NOT_LOOK_LIKE_SEAM_HOME_FOLDER);
+ + SeamUIMessages.VALIDATOR_FACTORY_LOCATION_THAT_DOES_NOT_LOOK_LIKE_SEAM_HOME_FOLDER));
}
}
@@ -181,23 +178,21 @@
*
*/
public static final IValidator JBOSS_AS_HOME_FOLDER_VALIDATOR = new IValidator() {
- public Map<String, String> validate(Object value, Object context) {
- Map<String, String> errors = FILE_SYSTEM_FOLDER_EXISTS.validate(
+ public Map<String, IStatus> validate(Object value, Object context) {
+ Map<String, IStatus> errors = FILE_SYSTEM_FOLDER_EXISTS.validate(
value, context);
if (errors.size() > 0) {
errors = createErrorMap();
- errors
- .put(
- ISeamFacetDataModelProperties.JBOSS_AS_HOME,
- SeamUIMessages.VALIDATOR_FACTORY_JBOSS_AS_HOME_FOLDER_DOES_NOT_EXIST);
+ errors.put(ISeamFacetDataModelProperties.JBOSS_AS_HOME,
+ new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID,
+ SeamUIMessages.VALIDATOR_FACTORY_JBOSS_AS_HOME_FOLDER_DOES_NOT_EXIST));
return errors;
}
if (!new File(value.toString(), "bin/twiddle.jar").isFile()) { //$NON-NLS-1$
- errors
- .put(
- ISeamFacetDataModelProperties.JBOSS_AS_HOME,
- SeamUIMessages.VALIDATOR_FACTORY_JBOSS_AS_HOME_FOLDER_POINT_TO_LOCATION_THAT_DOES_NOT
- + SeamUIMessages.VALIDATOR_FACTORY_LOOK_LIKE_JBOSS_AS_HOME_FOLDER);
+ errors.put(ISeamFacetDataModelProperties.JBOSS_AS_HOME,
+ new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID,
+ SeamUIMessages.VALIDATOR_FACTORY_JBOSS_AS_HOME_FOLDER_POINT_TO_LOCATION_THAT_DOES_NOT
+ + SeamUIMessages.VALIDATOR_FACTORY_LOOK_LIKE_JBOSS_AS_HOME_FOLDER));
}
return errors;
}
@@ -207,34 +202,29 @@
*
*/
public static final IValidator CLASS_QNAME_VALIDATOR = new IValidator() {
- public Map<String, String> validate(Object value, Object context) {
+ public Map<String, IStatus> validate(Object value, Object context) {
String classDecl = "class " + value.toString() + " {}"; //$NON-NLS-1$ //$NON-NLS-2$
ASTParser parser = ASTParser.newParser(AST.JLS3);
parser.setSource(classDecl.toCharArray());
parser.setProject((IJavaProject) context);
- CompilationUnit compilationUnit = (CompilationUnit) parser
- .createAST(null);
+ CompilationUnit compilationUnit = (CompilationUnit)parser.createAST(null);
IProblem[] problems = compilationUnit.getProblems();
if (problems.length > 0) {
- return createErrormessage(Messages
- .format(
- SeamUIMessages.VALIDATOR_FACTORY_COMPONENT_NAME_IS_NOT_VALID,
- problems[0].getMessage()));
+ return createErrormessage(new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID,
+ Messages.format(SeamUIMessages.VALIDATOR_FACTORY_COMPONENT_NAME_IS_NOT_VALID,
+ problems[0].getMessage())));
}
return ValidatorFactory.NO_ERRORS;
}
};
public static final IValidator PACKAGE_NAME_VALIDATOR = new IValidator() {
- public Map<String, String> validate(Object value, Object context) {
+ public Map<String, IStatus> validate(Object value, Object context) {
IStatus status = JavaConventions.validatePackageName(value
.toString(), CompilerOptions.VERSION_1_5,
CompilerOptions.VERSION_1_5);
if (status.getSeverity() == IStatus.ERROR) {
- return createErrormessage((Messages
- .format(
- NewWizardMessages.NewTypeWizardPage_error_InvalidPackageName,
- status.getMessage())));
+ return createErrormessage(new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, Messages.format(NewWizardMessages.NewTypeWizardPage_error_InvalidPackageName, status.getMessage())));
}
return ValidatorFactory.NO_ERRORS;
@@ -245,7 +235,7 @@
*
*/
public static final IValidator FILESYSTEM_FILE_EXISTS_VALIDATOR = new IValidator() {
- public java.util.Map<String, String> validate(Object value,
+ public java.util.Map<String, IStatus> validate(Object value,
Object context) {
return ValidatorFactory.NO_ERRORS;
};
@@ -258,14 +248,14 @@
*/
public static final IValidator SEAM_COMPONENT_NAME_VALIDATOR = new IValidator() {
- public Map<String, String> validate(Object value, Object context) {
+ public Map<String, IStatus> validate(Object value, Object context) {
IStatus status = JavaConventions.validateClassFileName(value
.toString()
+ ".class", "5.0", "5.0"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
if (status.isOK()) {
return NO_ERRORS;
} else {
- return createErrormessage(SeamUIMessages.VALIDATOR_FACTORY_NAME_IS_NOT_VALID);
+ return createErrormessage(new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, SeamUIMessages.VALIDATOR_FACTORY_NAME_IS_NOT_VALID));
}
}
};
@@ -277,7 +267,7 @@
*/
public static final IValidator SEAM_JAVA_INTEFACE_NAME_CONVENTION_VALIDATOR = new IValidator() {
- public Map<String, String> validate(Object value, Object context) {
+ public Map<String, IStatus> validate(Object value, Object context) {
if (!(context instanceof Object[])) {
throw new IllegalArgumentException(
"Context parameter should be instance of Object[]"); //$NON-NLS-1$
@@ -295,8 +285,8 @@
IStatus status = JavaConventions.validateJavaTypeName(value
.toString(), sourceLevel, compliance);
if (status.getSeverity() == IStatus.WARNING) {
- return createErrormessage(SeamUIMessages.VALIDATOR_FACTORY_LOCAL_INTERFACE_NAME_IS_NOT_VALID
- + status.getMessage());
+ return createErrormessage(new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, SeamUIMessages.VALIDATOR_FACTORY_LOCAL_INTERFACE_NAME_IS_NOT_VALID
+ + status.getMessage()));
}
return NO_ERRORS;
}
@@ -304,7 +294,7 @@
public static final IValidator SEAM_METHOD_NAME_VALIDATOR = new IValidator() {
- public Map<String, String> validate(Object value, Object context) {
+ public Map<String, IStatus> validate(Object value, Object context) {
if (!(context instanceof Object[])) {
throw new IllegalArgumentException(
"Context parameter should be instance of Object[]"); //$NON-NLS-1$
@@ -321,8 +311,8 @@
IProblem[] problems = compilationUnit.getProblems();
if (problems.length > 0) {
- return createErrormessage(targetName
- + SeamUIMessages.VALIDATOR_FACTORY_NAME_IS_NOT_VALID2);
+ return createErrormessage(new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, targetName
+ + SeamUIMessages.VALIDATOR_FACTORY_NAME_IS_NOT_VALID2));
}
return NO_ERRORS;
@@ -331,7 +321,7 @@
public static final IValidator FILE_NAME_VALIDATOR = new IValidator() {
- public Map<String, String> validate(Object value, Object context) {
+ public Map<String, IStatus> validate(Object value, Object context) {
if (!(context instanceof Object[])) {
throw new IllegalArgumentException(
"Context parameter should be instance of Object[]"); //$NON-NLS-1$
@@ -343,27 +333,27 @@
if ("".equals(value) //$NON-NLS-1$
|| !project.getLocation().isValidSegment(value.toString()))
- return createErrormessage(targetName
- + SeamUIMessages.VALIDATOR_FACTORY_NAME_IS_NOT_VALID2);
+ return createErrormessage(new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, targetName
+ + SeamUIMessages.VALIDATOR_FACTORY_NAME_IS_NOT_VALID2));
return NO_ERRORS;
}
};
public static final IValidator SEAM_PROJECT_NAME_VALIDATOR = new IValidator() {
- public Map<String, String> validate(Object value, Object context) {
+ public Map<String, IStatus> validate(Object value, Object context) {
if (value == null || "".equals(value)) { //$NON-NLS-1$
- return createErrormessage(SeamUIMessages.VALIDATOR_FACTORY_PRJ_NOT_SELECTED);
+ return createErrormessage(new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, SeamUIMessages.VALIDATOR_FACTORY_PRJ_NOT_SELECTED));
}
IResource project = ResourcesPlugin.getWorkspace().getRoot()
.findMember(value.toString());
if (project == null || !(project instanceof IProject)
|| !project.exists()) {
- return createErrormessage(SeamUIMessages.VALIDATOR_FACTORY_PROJECT
+ return createErrormessage(new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, SeamUIMessages.VALIDATOR_FACTORY_PROJECT
+ value
- + SeamUIMessages.VALIDATOR_FACTORY_DOES_NOT_EXIST);
+ + SeamUIMessages.VALIDATOR_FACTORY_DOES_NOT_EXIST));
} else {
IProject selection = (IProject) project;
try {
@@ -376,19 +366,19 @@
// .class)).hasProjectFacet(ProjectFacetsManager
// .getProjectFacet("jst.web"))
|| "" .equals(SeamCorePlugin.getSeamPreferences(selection).get(ISeamFacetDataModelProperties.JBOSS_AS_DEPLOY_AS, ""))) { //$NON-NLS-1$
- return createErrormessage(SeamUIMessages.VALIDATOR_FACTORY_SELECTED_PROJECT
+ return createErrormessage(new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, SeamUIMessages.VALIDATOR_FACTORY_SELECTED_PROJECT
+ project.getName()
- + SeamUIMessages.VALIDATOR_FACTORY_IS_NOT_A_SEAM_WEB_PROJECT);
+ + SeamUIMessages.VALIDATOR_FACTORY_IS_NOT_A_SEAM_WEB_PROJECT));
} else {
// TODO validate project(s) structure
}
} catch (CoreException e) {
// it might happen only if project is closed and project
// name typed by hand
- return createErrormessage(NLS
+ return createErrormessage(new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, NLS
.bind(
SeamUIMessages.VALIDATOR_FACTORY_SELECTED_PRJ_IS_CLOSED,
- project.getName()));
+ project.getName())));
}
}
return NO_ERRORS;
@@ -403,11 +393,11 @@
this.allowEmptyConnection = allowEmptyConnection;
}
- public Map<String, String> validate(Object value, Object context) {
+ public Map<String, IStatus> validate(Object value, Object context) {
if (!allowEmptyConnection && (value == null || "".equals(value.toString().trim()))) { //$NON-NLS-1$
return createErrormessage(
ISeamFacetDataModelProperties.SEAM_CONNECTION_PROFILE,
- SeamUIMessages.VALIDATOR_FACTORY_CONNECTION_PROFILE_IS_NOT_SELECTED);
+ new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, SeamUIMessages.VALIDATOR_FACTORY_CONNECTION_PROFILE_IS_NOT_SELECTED));
} else {
IConnectionProfile connProfile = ProfileManager.getInstance()
.getProfileByName(value.toString());
@@ -418,9 +408,9 @@
if (driverClass == null || "".equals(driverClass)) { //$NON-NLS-1$
return createErrormessage(
ISeamFacetDataModelProperties.SEAM_CONNECTION_PROFILE,
- SeamUIMessages.VALIDATOR_FACTORY_DRIVER_CLASS_PROPERTY_IS_EMPTY_FOR_SELECTED
+ new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, SeamUIMessages.VALIDATOR_FACTORY_DRIVER_CLASS_PROPERTY_IS_EMPTY_FOR_SELECTED
+ value
- + SeamUIMessages.VALIDATOR_FACTORY_CONNECTION_PROFILE);
+ + SeamUIMessages.VALIDATOR_FACTORY_CONNECTION_PROFILE));
}
}
return NO_ERRORS;
@@ -432,58 +422,58 @@
public static final IValidator CONNECTION_DRIVER_VALIDATOR = new ConnectionProfileValidator(true);
public static final IValidator SEAM_RUNTIME_NAME_VALIDATOR = new IValidator() {
- public Map<String, String> validate(Object value, Object context) {
+ public Map<String, IStatus> validate(Object value, Object context) {
- Map<String, String> errors = NO_ERRORS;
+ Map<String, IStatus> errors = NO_ERRORS;
if (value == null || "".equals(value.toString().trim())) { //$NON-NLS-1$
errors = createErrormessage(
ISeamFacetDataModelProperties.SEAM_RUNTIME_NAME,
- SeamUIMessages.VALIDATOR_FACTORY_SEAM_RUNTIME_IS_NOT_SELECTED);
+ new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, SeamUIMessages.VALIDATOR_FACTORY_SEAM_RUNTIME_IS_NOT_SELECTED));
} else {
SeamRuntime rt = SeamRuntimeManager.getInstance()
.findRuntimeByName(value.toString());
if (rt == null) {
errors = createErrormessage(
ISeamFacetDataModelProperties.SEAM_RUNTIME_NAME,
- NLS
+ new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, NLS
.bind(
SeamUIMessages.VALIDATOR_FACTORY_CANNOT_FIND_SEAM_RUNTIME,
- value));
+ value)));
} else if (!new File(rt.getHomeDir()).exists()) {
errors = createErrormessage(
ISeamFacetDataModelProperties.SEAM_RUNTIME_NAME,
- NLS
+ new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, NLS
.bind(
SeamUIMessages.VALIDATOR_FACTORY_SEAM_RT_HOME_DIR_IS_MISSING,
- value));
+ value)));
} else if (!new File(rt.getSeamGenDir()).exists()) {
errors = createErrormessage(
ISeamFacetDataModelProperties.SEAM_RUNTIME_NAME,
- NLS
+ new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, NLS
.bind(
SeamUIMessages.VALIDATOR_FACTORY_SEAM_RT_TEMPLATES_DIR_IS_MISSING,
- value));
+ value)));
} else if (!new File(rt.getSrcTemplatesDir()).exists()) {
errors = createErrormessage(
ISeamFacetDataModelProperties.SEAM_RUNTIME_NAME,
- NLS
+ new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, NLS
.bind(
SeamUIMessages.VALIDATOR_FACTORY_SEAM_RT_SRC_DIR_IS_MISSING,
- value));
+ value)));
} else if (!new File(rt.getViewTemplatesDir()).exists()) {
errors = createErrormessage(
ISeamFacetDataModelProperties.SEAM_RUNTIME_NAME,
- NLS
+ new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, NLS
.bind(
SeamUIMessages.VALIDATOR_FACTORY_SEAM_RT_VIEW_DIR_IS_MISSING,
- value));
+ value)));
} else if (!new File(rt.getResourceTemplatesDir()).exists()) {
errors = createErrormessage(
ISeamFacetDataModelProperties.SEAM_RUNTIME_NAME,
- NLS
+ new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, NLS
.bind(
SeamUIMessages.VALIDATOR_FACTORY_SEAM_RT_RESOURCES_DIR_IS_MISSING,
- value));
+ value)));
}
}
return errors;
@@ -491,41 +481,41 @@
};
public static final IValidator SEAM_RUNTIME_VALIDATOR = new IValidator() {
- public java.util.Map<String, String> validate(Object value,
+ public java.util.Map<String, IStatus> validate(Object value,
Object context) {
- Map<String, String> errors = NO_ERRORS;
+ Map<String, IStatus> errors = NO_ERRORS;
String rtName = value.toString();
if (value == null || "".equals(value)) { //$NON-NLS-1$
- errors = createErrormessage(SeamUIMessages.VALIDATOR_FACTORY_SEAM_RT_NOT_CONFIGURED);
+ errors = createErrormessage(new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, SeamUIMessages.VALIDATOR_FACTORY_SEAM_RT_NOT_CONFIGURED));
} else {
SeamRuntime rt = SeamRuntimeManager.getInstance()
.findRuntimeByName(value.toString());
if (rt == null) {
- errors = createErrormessage(NLS
+ errors = createErrormessage(new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, NLS
.bind(
SeamUIMessages.VALIDATOR_FACTORY_SEAM_RT_CANNOT_BE_FOUND,
- value));
+ value)));
} else if (!new File(rt.getHomeDir()).exists()) {
- errors = createErrormessage(NLS
+ errors = createErrormessage(new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, NLS
.bind(
SeamUIMessages.VALIDATOR_FACTORY_SEAM_RT_HOME_DIR_DOES_NOT_EXIST,
- value));
+ value)));
} else if (!new File(rt.getSeamGenDir()).exists()) {
- errors = createErrormessage(NLS
+ errors = createErrormessage(new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, NLS
.bind(
SeamUIMessages.VALIDATOR_FACTORY_SEAM_RT_TEMPLATES_DIR_DOES_NOT_EXIST,
- value));
+ value)));
} else if (!new File(rt.getSrcTemplatesDir()).exists()) {
- errors = createErrormessage(NLS
+ errors = createErrormessage(new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, NLS
.bind(
SeamUIMessages.VALIDATOR_FACTORY_SEAM_RT_SOURCE_TEMPLATES_DIR_DOES_NOT_EXIST,
- value));
+ value)));
} else if (!new File(rt.getViewTemplatesDir()).exists()) {
- errors = createErrormessage(NLS
+ errors = createErrormessage(new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, NLS
.bind(
SeamUIMessages.VALIDATOR_FACTORY_SEAM_RT_VIE_TEMPLATE_DIR_DOES_NOT_EXIST,
- value));
+ value)));
// } else if(!new
// File(rt.getResourceTemplatesDir()).exists()) {
// errors = createErrormessage(NLS.bind(
Modified: branches/jbosstools-3.0.0.Beta1/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/messages.properties
===================================================================
--- branches/jbosstools-3.0.0.Beta1/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/messages.properties 2008-10-23 13:22:32 UTC (rev 11106)
+++ branches/jbosstools-3.0.0.Beta1/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/messages.properties 2008-10-23 13:27:19 UTC (rev 11107)
@@ -107,6 +107,7 @@
SEAM_WIZARD_FACTORY_METHOD_NAME=Method name:
SEAM_INSTALL_WIZARD_PAGE_NEW=New...
SEAM_INSTALL_WIZARD_PAGE_PACKAGE_NAME_FOR=Package name for
+SEAM_INSTALL_WIZARD_PROJECT_NAME_WITH_UPPERCASE=Project names which start with a capital letter may break Seam/JSF applications; use lower case.
SEAM_INSTALL_WIZARD_PAGE_IS_NOT_VALID=\ is not valid
SEAM_BASE_WIZARD_PAGE_POJO_CLASS_NAME=POJO class name:
SEAM_BASE_WIZARD_PAGE_SEAM_COMPONENTS=Seam component
Modified: branches/jbosstools-3.0.0.Beta1/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamGenerateEnitiesWizardPage.java
===================================================================
--- branches/jbosstools-3.0.0.Beta1/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamGenerateEnitiesWizardPage.java 2008-10-23 13:22:32 UTC (rev 11106)
+++ branches/jbosstools-3.0.0.Beta1/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamGenerateEnitiesWizardPage.java 2008-10-23 13:27:19 UTC (rev 11107)
@@ -14,12 +14,12 @@
import java.beans.PropertyChangeListener;
import java.util.ArrayList;
import java.util.HashMap;
-import java.util.List;
import java.util.Map;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.preferences.IEclipsePreferences;
import org.eclipse.jdt.core.IJavaProject;
import org.eclipse.jface.wizard.IWizardPage;
@@ -67,10 +67,15 @@
projectEditor = SeamWizardFactory.createSeamProjectSelectionFieldEditor(projectName);
projectEditor.addPropertyChangeListener(this);
if(projectName!=null && projectName.length()>0) {
- Map<String, String> errors = ValidatorFactory.SEAM_PROJECT_NAME_VALIDATOR.validate(projectEditor.getValue(), null);
+ Map<String, IStatus> errors = ValidatorFactory.SEAM_PROJECT_NAME_VALIDATOR.validate(projectEditor.getValue(), null);
if(errors.size()>0) {
- setErrorMessage(errors.get(IValidator.DEFAULT_ERROR).toString());
- setPageComplete(false);
+ IStatus message = errors.get(IValidator.DEFAULT_ERROR);
+ if(message.getSeverity()==IStatus.ERROR) {
+ setErrorMessage(message.getMessage());
+ setPageComplete(false);
+ } else {
+ setMessage(message.getMessage());
+ }
} else {
setMessage(null);
}
@@ -202,15 +207,20 @@
}
private void validate() {
- Map<String, String> errors = ValidatorFactory.SEAM_PROJECT_NAME_VALIDATOR.validate(projectEditor.getValue(), null);
+ Map<String, IStatus> errors = ValidatorFactory.SEAM_PROJECT_NAME_VALIDATOR.validate(projectEditor.getValue(), null);
if(errors.size()>0 || !isProjectSettingsOk()) {
- Object errorMessage = errors.get(IValidator.DEFAULT_ERROR);
+ IStatus errorMessage = errors.get(IValidator.DEFAULT_ERROR);
if(errorMessage==null) {
- errorMessage = SeamUIMessages.VALIDATOR_INVALID_SETTINGS;
+ setErrorMessage(SeamUIMessages.VALIDATOR_INVALID_SETTINGS);
}
- setErrorMessage(errorMessage.toString());
- setPageComplete(false);
+ if(errorMessage.getSeverity()==IStatus.ERROR) {
+ setErrorMessage(errorMessage.getMessage());
+ setPageComplete(false);
+ } else {
+ setMessage(errorMessage.getMessage());
+ }
+
return;
}
String config = (String)configEditor.getValue();
16 years, 2 months
- 1
- 0
JBoss Tools SVN: r11106 - branches/jbosstools-3.0.0.Beta1/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/actions.
by jbosstools-commits＠lists.jboss.org
Author: vyemialyanchyk
Date: 2008-10-23 09:22:32 -0400 (Thu, 23 Oct 2008)
New Revision: 11106
Modified:
branches/jbosstools-3.0.0.Beta1/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/actions/JPAMapToolActor.java
Log:
JBIDE-2956
Modified: branches/jbosstools-3.0.0.Beta1/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/actions/JPAMapToolActor.java
===================================================================
--- branches/jbosstools-3.0.0.Beta1/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/actions/JPAMapToolActor.java 2008-10-23 13:21:42 UTC (rev 11105)
+++ branches/jbosstools-3.0.0.Beta1/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/actions/JPAMapToolActor.java 2008-10-23 13:22:32 UTC (rev 11106)
@@ -29,6 +29,7 @@
import org.eclipse.jdt.core.dom.AST;
import org.eclipse.jdt.core.dom.ASTParser;
import org.eclipse.jdt.core.dom.AbstractTypeDeclaration;
+import org.eclipse.jdt.core.dom.TypeDeclaration;
import org.eclipse.jdt.internal.core.JavaElement;
import org.eclipse.jdt.internal.core.JavaElementInfo;
import org.eclipse.jdt.internal.core.JavaProject;
@@ -182,6 +183,10 @@
if (tmp instanceof AbstractTypeDeclaration) {
fullyQualifiedName += ((AbstractTypeDeclaration)tmp).getName();
}
+ if (!(tmp instanceof TypeDeclaration)) {
+ // ignore EnumDeclaration & AnnotationTypeDeclaration
+ fullyQualifiedName = ""; //$NON-NLS-1$
+ }
}
} catch (IllegalArgumentException e) {
HibernateConsolePlugin.getDefault().logErrorMessage("IllegalArgumentException: ", e); //$NON-NLS-1$
16 years, 2 months
- 1
- 0
JBoss Tools SVN: r11105 - trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/actions.
by jbosstools-commits＠lists.jboss.org
Author: vyemialyanchyk
Date: 2008-10-23 09:21:42 -0400 (Thu, 23 Oct 2008)
New Revision: 11105
Modified:
trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/actions/JPAMapToolActor.java
Log:
JBIDE-2956
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/actions/JPAMapToolActor.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/actions/JPAMapToolActor.java 2008-10-23 13:20:58 UTC (rev 11104)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/actions/JPAMapToolActor.java 2008-10-23 13:21:42 UTC (rev 11105)
@@ -29,6 +29,7 @@
import org.eclipse.jdt.core.dom.AST;
import org.eclipse.jdt.core.dom.ASTParser;
import org.eclipse.jdt.core.dom.AbstractTypeDeclaration;
+import org.eclipse.jdt.core.dom.TypeDeclaration;
import org.eclipse.jdt.internal.core.JavaElement;
import org.eclipse.jdt.internal.core.JavaElementInfo;
import org.eclipse.jdt.internal.core.JavaProject;
@@ -182,6 +183,10 @@
if (tmp instanceof AbstractTypeDeclaration) {
fullyQualifiedName += ((AbstractTypeDeclaration)tmp).getName();
}
+ if (!(tmp instanceof TypeDeclaration)) {
+ // ignore EnumDeclaration & AnnotationTypeDeclaration
+ fullyQualifiedName = ""; //$NON-NLS-1$
+ }
}
} catch (IllegalArgumentException e) {
HibernateConsolePlugin.getDefault().logErrorMessage("IllegalArgumentException: ", e); //$NON-NLS-1$
16 years, 2 months
- 1
- 0
JBoss Tools SVN: r11104 - in trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui: internal/project/facet and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2008-10-23 09:20:58 -0400 (Thu, 23 Oct 2008)
New Revision: 11104
Modified:
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/SeamUIMessages.java
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/DataModelValidatorDelegate.java
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/IValidator.java
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/SeamInstallWizardPage.java
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/ValidatorFactory.java
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/messages.properties
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamGenerateEnitiesWizardPage.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-2959 Fixed in trunk (cr1) and brunch (beta1)
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/SeamUIMessages.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/SeamUIMessages.java 2008-10-23 12:22:25 UTC (rev 11103)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/SeamUIMessages.java 2008-10-23 13:20:58 UTC (rev 11104)
@@ -113,6 +113,8 @@
public static String SEAM_FORM_WIZARD_PAGE1_JAVA_INTERFACE_SLSB_AND_KEY_SEAMEJB3_ANNOTATIONS_WILL_BE_CREATED;
+ public static String SEAM_INSTALL_WIZARD_PROJECT_NAME_WITH_UPPERCASE;
+
public static String SEAM_FORM_WIZARD_PAGE1_SEAM_FORM;
public static String SEAM_FORM_WIZARD_PAGE1_SELECT_THE_NAME_OF_THE_NEW_SEAM_FORM;
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/DataModelValidatorDelegate.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/DataModelValidatorDelegate.java 2008-10-23 12:22:25 UTC (rev 11103)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/DataModelValidatorDelegate.java 2008-10-23 13:20:58 UTC (rev 11104)
@@ -15,6 +15,8 @@
import java.util.List;
import java.util.Map;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.jface.dialogs.DialogPage;
import org.eclipse.jface.wizard.WizardPage;
import org.eclipse.swt.widgets.Display;
import org.eclipse.wst.common.frameworks.datamodel.DataModelEvent;
@@ -84,25 +86,40 @@
*
*/
public void validateUntillError() {
- page.setErrorMessage(getFirstValidationError());
+ IStatus message = getFirstValidationError();
+ if(message == null) {
+ page.setMessage(null);
+ page.setErrorMessage(null);
+ } else {
+ if(message.getSeverity()==IStatus.ERROR) {
+ page.setErrorMessage(message.getMessage());
+ } else {
+ page.setErrorMessage(null);
+ page.setMessage(message.getMessage(), DialogPage.WARNING);
+ }
+ }
page.setPageComplete(page.getErrorMessage()==null);
- if(page.getErrorMessage()==null) page.setMessage(null);
}
/**
*
* @return
*/
- public String getFirstValidationError() {
+ public IStatus getFirstValidationError() {
+ IStatus firstWarning = null;
for (String validatorName : validationOrder) {
- Map<String,String> errors = getValidator(validatorName).validate(
+ Map<String,IStatus> errors = getValidator(validatorName).validate(
model.getProperty(validatorName),model);
- String message = errors.get(validatorName);
+ IStatus message = errors.get(validatorName);
if(message!=null) {
- return message;
+ if(message.getSeverity()==IStatus.ERROR) {
+ return message;
+ } else if(message.getSeverity()==IStatus.WARNING && firstWarning==null) {
+ firstWarning = message;
+ }
}
}
- return null;
+ return firstWarning;
}
/**
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/IValidator.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/IValidator.java 2008-10-23 12:22:25 UTC (rev 11103)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/IValidator.java 2008-10-23 13:20:58 UTC (rev 11104)
@@ -12,6 +12,8 @@
import java.util.Map;
+import org.eclipse.core.runtime.IStatus;
+
/**
* Simple validator interface
* @author eskimo
@@ -27,5 +29,5 @@
* @param context - a contextual data that can be used during validation
* @return map from editor name to error text
*/
- Map<String,String> validate(Object value, Object context);
+ Map<String, IStatus> validate(Object value, Object context);
}
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/SeamInstallWizardPage.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/SeamInstallWizardPage.java 2008-10-23 12:22:25 UTC (rev 11103)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/SeamInstallWizardPage.java 2008-10-23 13:20:58 UTC (rev 11104)
@@ -20,11 +20,13 @@
import org.eclipse.core.resources.IProject;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
import org.eclipse.datatools.connectivity.IConnectionProfile;
import org.eclipse.datatools.connectivity.ProfileManager;
import org.eclipse.jdt.core.JavaConventions;
import org.eclipse.jdt.internal.compiler.impl.CompilerOptions;
import org.eclipse.jface.dialogs.Dialog;
+import org.eclipse.jface.dialogs.DialogPage;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.wizard.IWizard;
@@ -98,7 +100,7 @@
// Database group
private IFieldEditor connProfileSelEditor = SeamWizardFactory.createConnectionProfileSelectionFieldEditor(getConnectionProfileDefaultValue(), new IValidator() {
- public Map<String, String> validate(Object value, Object context) {
+ public Map<String, IStatus> validate(Object value, Object context) {
SeamInstallWizardPage.this.validate();
return ValidatorFactory.NO_ERRORS;
}
@@ -379,6 +381,12 @@
validatorDelegate.addValidatorForProperty(
ISeamFacetDataModelProperties.JBOSS_AS_DEPLOY_AS,
getDeploymentTypeValidator(getWizard()));
+ validatorDelegate.addValidatorForProperty(
+ IFacetDataModelProperties.FACET_PROJECT_NAME,
+ new ProjectNamesDuplicationValidator(
+ IFacetDataModelProperties.FACET_PROJECT_NAME));
+ validatorDelegate.addValidatorForProperty(IFacetDataModelProperties.FACET_PROJECT_NAME,
+ new ProjectNameValidator(IFacetDataModelProperties.FACET_PROJECT_NAME));
}
jBossHibernateDbTypeEditor
@@ -479,11 +487,24 @@
}
private void validate() {
- final String message = validatorDelegate.getFirstValidationError();
+ final IStatus message = validatorDelegate.getFirstValidationError();
Display.getDefault().syncExec(new Runnable() {
public void run() {
- setPageComplete(message == null);
- setErrorMessage(message);
+ if(message==null) {
+ setMessage(null);
+ setErrorMessage(null);
+ setPageComplete(true);
+ return;
+ }
+ if(message.getSeverity()==IStatus.ERROR) {
+ setErrorMessage(message.getMessage());
+ setPageComplete(false);
+ return;
+ }
+ setErrorMessage(null);
+ setMessage(message.getMessage(), DialogPage.WARNING);
+ setPageComplete(true);
+ return;
}
});
}
@@ -505,18 +526,45 @@
/**
* @see IValidator#validate(Object, Object)
*/
- public Map<String, String> validate(Object value, Object context) {
+ public Map<String, IStatus> validate(Object value, Object context) {
IStatus status = JavaConventions.validatePackageName(value
.toString(), CompilerOptions.VERSION_1_5,
CompilerOptions.VERSION_1_5);
- if (!status.isOK()) {
+ if (status.getSeverity()==IStatus.ERROR) {
return ValidatorFactory.createErrormessage(fieldName,
- SeamUIMessages.SEAM_INSTALL_WIZARD_PAGE_PACKAGE_NAME_FOR + targetName + SeamUIMessages.SEAM_INSTALL_WIZARD_PAGE_IS_NOT_VALID);
+ new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, SeamUIMessages.SEAM_INSTALL_WIZARD_PAGE_PACKAGE_NAME_FOR + targetName + SeamUIMessages.SEAM_INSTALL_WIZARD_PAGE_IS_NOT_VALID));
+ } else if (status.getSeverity()==IStatus.WARNING) {
+ return ValidatorFactory.createErrormessage(fieldName,
+ new Status(IStatus.WARNING, SeamCorePlugin.PLUGIN_ID, SeamUIMessages.SEAM_INSTALL_WIZARD_PAGE_PACKAGE_NAME_FOR + targetName + SeamUIMessages.SEAM_INSTALL_WIZARD_PAGE_IS_NOT_VALID));
}
return ValidatorFactory.NO_ERRORS;
}
}
+ class ProjectNameValidator implements IValidator {
+ String propertyName;
+
+ public ProjectNameValidator(String propertyName) {
+ this.propertyName = propertyName;
+ }
+
+ public Map<String, IStatus> validate(Object value, Object context) {
+ if(value==null) {
+ return ValidatorFactory.NO_ERRORS;
+ }
+ final String projectName = (String)value;
+ if(projectName.length()==0) {
+ return ValidatorFactory.NO_ERRORS;
+ }
+ char firstLetter = projectName.charAt(0);
+ if(Character.isUpperCase(firstLetter)) {
+ return ValidatorFactory.createErrormessage(propertyName,
+ new Status(IStatus.WARNING, SeamCorePlugin.PLUGIN_ID, SeamUIMessages.SEAM_INSTALL_WIZARD_PROJECT_NAME_WITH_UPPERCASE));
+ }
+ return ValidatorFactory.NO_ERRORS;
+ }
+ }
+
class ProjectNamesDuplicationValidator implements IValidator {
String propertyName;
@@ -529,35 +577,52 @@
/**
* @see IValidator#validate(Object, Object)
*/
- public Map<String, String> validate(Object value, Object context) {
+ public Map<String, IStatus> validate(Object value, Object context) {
final String projectName = (String)value;
final String deployAs = model.getStringProperty(
ISeamFacetDataModelProperties.JBOSS_AS_DEPLOY_AS);
final String testProjectName = projectName + "-test"; //$NON-NLS-1$
IStatus status = ProjectCreationDataModelProviderNew.validateName(testProjectName);
- if (!status.isOK())
+ if (status.getSeverity()==IStatus.ERROR) {
return ValidatorFactory.createErrormessage(propertyName,
- SeamUIMessages.VALIDATOR_FACTORY_TEST_PROJECT +
- testProjectName +
- SeamUIMessages.VALIDATOR_FACTORY_PROJECT_ALREADY_EXISTS);
-
+ new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, SeamUIMessages.VALIDATOR_FACTORY_TEST_PROJECT +
+ testProjectName +
+ SeamUIMessages.VALIDATOR_FACTORY_PROJECT_ALREADY_EXISTS));
+ } else if (status.getSeverity()==IStatus.WARNING) {
+ return ValidatorFactory.createErrormessage(propertyName,
+ new Status(IStatus.WARNING, SeamCorePlugin.PLUGIN_ID, SeamUIMessages.VALIDATOR_FACTORY_TEST_PROJECT +
+ testProjectName +
+ SeamUIMessages.VALIDATOR_FACTORY_PROJECT_ALREADY_EXISTS));
+ }
if (ISeamFacetDataModelProperties.DEPLOY_AS_EAR.equals(deployAs)) {
final String earProjectName = projectName + "-ear"; //$NON-NLS-1$
status = ProjectCreationDataModelProviderNew.validateName(earProjectName);
- if (!status.isOK())
+ if (status.getSeverity()==IStatus.ERROR) {
return ValidatorFactory.createErrormessage(propertyName,
- SeamUIMessages.VALIDATOR_FACTORY_EAR_PROJECT +
+ new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, SeamUIMessages.VALIDATOR_FACTORY_EAR_PROJECT +
earProjectName +
- SeamUIMessages.VALIDATOR_FACTORY_PROJECT_ALREADY_EXISTS);
+ SeamUIMessages.VALIDATOR_FACTORY_PROJECT_ALREADY_EXISTS));
+ } else if (status.getSeverity()==IStatus.WARNING) {
+ return ValidatorFactory.createErrormessage(propertyName,
+ new Status(IStatus.WARNING, SeamCorePlugin.PLUGIN_ID, SeamUIMessages.VALIDATOR_FACTORY_EAR_PROJECT +
+ earProjectName +
+ SeamUIMessages.VALIDATOR_FACTORY_PROJECT_ALREADY_EXISTS));
+ }
final String ejbProjectName = projectName + "-ejb"; //$NON-NLS-1$
status = ProjectCreationDataModelProviderNew.validateName(ejbProjectName);
- if (!status.isOK())
+ if (status.getSeverity()==IStatus.ERROR) {
return ValidatorFactory.createErrormessage(propertyName,
- SeamUIMessages.VALIDATOR_FACTORY_EJB_PROJECT +
+ new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, SeamUIMessages.VALIDATOR_FACTORY_EJB_PROJECT +
ejbProjectName +
- SeamUIMessages.VALIDATOR_FACTORY_PROJECT_ALREADY_EXISTS);
+ SeamUIMessages.VALIDATOR_FACTORY_PROJECT_ALREADY_EXISTS));
+ } else if (status.getSeverity()==IStatus.WARNING) {
+ return ValidatorFactory.createErrormessage(propertyName,
+ new Status(IStatus.WARNING, SeamCorePlugin.PLUGIN_ID, SeamUIMessages.VALIDATOR_FACTORY_EJB_PROJECT +
+ ejbProjectName +
+ SeamUIMessages.VALIDATOR_FACTORY_PROJECT_ALREADY_EXISTS));
+ }
}
return ValidatorFactory.NO_ERRORS;
}
@@ -569,7 +634,7 @@
}
// return new DeploymentTypeValidator(ISeamFacetDataModelProperties.JBOSS_AS_DEPLOY_AS, model);
return new IValidator() {
- public Map<String, String> validate(Object value, Object context) {
+ public Map<String, IStatus> validate(Object value, Object context) {
return ValidatorFactory.NO_ERRORS;
}
};
@@ -599,7 +664,7 @@
/**
* @see IValidator#validate(Object, Object)
*/
- public Map<String, String> validate(Object value, Object context) {
+ public Map<String, IStatus> validate(Object value, Object context) {
final String deploymentType = value.toString();
if(!ISeamFacetDataModelProperties.DEPLOY_AS_WAR.equals(deploymentType)) {
Object runtimeName = model.getProperty(IFacetProjectCreationDataModelProperties.FACET_RUNTIME);
@@ -608,7 +673,7 @@
if(!rt.supports(EJB_30) || !rt.supports(EAR_50)) {
return ValidatorFactory.createErrormessage(
propertyName,
- NLS.bind(SeamUIMessages.SEAM_INSTALL_WIZARD_PAGE_CANNOT_USE_SELECTED_DEPLOYMENT6 , new String[]{deploymentType.toUpperCase(),runtimeName.toString()}));
+ new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, NLS.bind(SeamUIMessages.SEAM_INSTALL_WIZARD_PAGE_CANNOT_USE_SELECTED_DEPLOYMENT6 , new String[]{deploymentType.toUpperCase(),runtimeName.toString()})));
}
}
}
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/ValidatorFactory.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/ValidatorFactory.java 2008-10-23 12:22:25 UTC (rev 11103)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/ValidatorFactory.java 2008-10-23 13:20:58 UTC (rev 11104)
@@ -21,6 +21,7 @@
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
import org.eclipse.datatools.connectivity.IConnectionProfile;
import org.eclipse.datatools.connectivity.ProfileManager;
import org.eclipse.jdt.core.IJavaProject;
@@ -56,14 +57,14 @@
/**
*
*/
- static public final Map<String, String> NO_ERRORS = Collections
- .unmodifiableMap(new HashMap<String, String>());
+ static public final Map<String, IStatus> NO_ERRORS = Collections
+ .unmodifiableMap(new HashMap<String, IStatus>());
/**
*
*/
static public IValidator NO_ERRORS_VALIDATOR = new IValidator() {
- public Map<String, String> validate(Object value, Object context) {
+ public Map<String, IStatus> validate(Object value, Object context) {
return NO_ERRORS;
}
};
@@ -82,8 +83,8 @@
*
* @return
*/
- public static Map<String, String> createErrorMap() {
- return new HashMap<String, String>();
+ public static Map<String, IStatus> createErrorMap() {
+ return new HashMap<String, IStatus>();
}
/**
@@ -91,9 +92,9 @@
* @param text
* @return
*/
- public static Map<String, String> createErrormessage(String text) {
- Map<String, String> map = createErrorMap();
- map.put(IValidator.DEFAULT_ERROR, text);
+ public static Map<String, IStatus> createErrormessage(IStatus message) {
+ Map<String, IStatus> map = createErrorMap();
+ map.put(IValidator.DEFAULT_ERROR, message);
return map;
}
@@ -102,10 +103,10 @@
* @param text
* @return
*/
- public static Map<String, String> createErrormessage(String propertyName,
- String text) {
- Map<String, String> map = createErrorMap();
- map.put(propertyName, text);
+ public static Map<String, IStatus> createErrormessage(String propertyName,
+ IStatus message) {
+ Map<String, IStatus> map = createErrorMap();
+ map.put(propertyName, message);
return map;
}
@@ -114,7 +115,7 @@
*/
public static final IValidator FILE_SYSTEM_FOLDER_EXISTS = new IValidator() {
- public Map<String, String> validate(Object value, Object context) {
+ public Map<String, IStatus> validate(Object value, Object context) {
if (value == null)
throw new IllegalArgumentException(
SeamUIMessages.VALIDATOR_FACTORY_PATH_TO_A_FOLDER_CANNOT_BE_NULL);
@@ -122,13 +123,13 @@
File folder = new File(folderPath);
if (!folder.exists())
- return createErrormessage(SeamUIMessages.VALIDATOR_FACTORY_FOLDER
+ return createErrormessage(new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, SeamUIMessages.VALIDATOR_FACTORY_FOLDER
+ folderPath
- + SeamUIMessages.VALIDATOR_FACTORY_DOES_NOT_EXISTS);
+ + SeamUIMessages.VALIDATOR_FACTORY_DOES_NOT_EXISTS));
if (!folder.isDirectory())
- return createErrormessage(SeamUIMessages.VALIDATOR_FACTORY_PATH
+ return createErrormessage(new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, SeamUIMessages.VALIDATOR_FACTORY_PATH
+ folderPath
- + SeamUIMessages.VALIDATOR_FACTORY_POINTS_TO_FILE);
+ + SeamUIMessages.VALIDATOR_FACTORY_POINTS_TO_FILE));
return NO_ERRORS;
}
};
@@ -137,15 +138,13 @@
*
*/
public static final IValidator JBOSS_SEAM_HOME_FOLDER_VALIDATOR = new IValidator() {
- public Map<String, String> validate(Object value, Object context) {
- Map<String, String> errors = FILE_SYSTEM_FOLDER_EXISTS.validate(
+ public Map<String, IStatus> validate(Object value, Object context) {
+ Map<String, IStatus> errors = FILE_SYSTEM_FOLDER_EXISTS.validate(
value, context);
if (errors.size() > 0) {
errors = createErrorMap();
- errors
- .put(
- ISeamFacetDataModelProperties.JBOSS_SEAM_HOME,
- SeamUIMessages.VALIDATOR_FACTORY_SEAM_HOME_FOLDER_DOES_NOT_EXISTS);
+ errors.put(ISeamFacetDataModelProperties.JBOSS_SEAM_HOME, new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID,
+ SeamUIMessages.VALIDATOR_FACTORY_SEAM_HOME_FOLDER_DOES_NOT_EXISTS));
return errors;
}
String version = (String) context;
@@ -155,21 +154,19 @@
"lib/jboss-seam.jar"); //$NON-NLS-1$
if (!seamJarFile.isFile()) {
errors = createErrorMap();
- errors
- .put(
- ISeamFacetDataModelProperties.JBOSS_SEAM_HOME,
+ errors.put(ISeamFacetDataModelProperties.JBOSS_SEAM_HOME,
+ new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID,
SeamUIMessages.VALIDATOR_FACTORY_HOME_FOLDER_POINTS_TO
- + SeamUIMessages.VALIDATOR_FACTORY_LOCATION_THAT_DOES_NOT_LOOK_LIKE_SEAM_HOME_FOLDER);
+ + SeamUIMessages.VALIDATOR_FACTORY_LOCATION_THAT_DOES_NOT_LOOK_LIKE_SEAM_HOME_FOLDER));
}
} else {
File seamJarFile = new File(value.toString(), "jboss-seam.jar"); //$NON-NLS-1$
if (!seamJarFile.isFile()) {
errors = createErrorMap();
- errors
- .put(
- ISeamFacetDataModelProperties.JBOSS_SEAM_HOME,
+ errors.put(ISeamFacetDataModelProperties.JBOSS_SEAM_HOME,
+ new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID,
SeamUIMessages.VALIDATOR_FACTORY_HOME_FOLDER_POINTS_TO
- + SeamUIMessages.VALIDATOR_FACTORY_LOCATION_THAT_DOES_NOT_LOOK_LIKE_SEAM_HOME_FOLDER);
+ + SeamUIMessages.VALIDATOR_FACTORY_LOCATION_THAT_DOES_NOT_LOOK_LIKE_SEAM_HOME_FOLDER));
}
}
@@ -181,23 +178,21 @@
*
*/
public static final IValidator JBOSS_AS_HOME_FOLDER_VALIDATOR = new IValidator() {
- public Map<String, String> validate(Object value, Object context) {
- Map<String, String> errors = FILE_SYSTEM_FOLDER_EXISTS.validate(
+ public Map<String, IStatus> validate(Object value, Object context) {
+ Map<String, IStatus> errors = FILE_SYSTEM_FOLDER_EXISTS.validate(
value, context);
if (errors.size() > 0) {
errors = createErrorMap();
- errors
- .put(
- ISeamFacetDataModelProperties.JBOSS_AS_HOME,
- SeamUIMessages.VALIDATOR_FACTORY_JBOSS_AS_HOME_FOLDER_DOES_NOT_EXIST);
+ errors.put(ISeamFacetDataModelProperties.JBOSS_AS_HOME,
+ new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID,
+ SeamUIMessages.VALIDATOR_FACTORY_JBOSS_AS_HOME_FOLDER_DOES_NOT_EXIST));
return errors;
}
if (!new File(value.toString(), "bin/twiddle.jar").isFile()) { //$NON-NLS-1$
- errors
- .put(
- ISeamFacetDataModelProperties.JBOSS_AS_HOME,
- SeamUIMessages.VALIDATOR_FACTORY_JBOSS_AS_HOME_FOLDER_POINT_TO_LOCATION_THAT_DOES_NOT
- + SeamUIMessages.VALIDATOR_FACTORY_LOOK_LIKE_JBOSS_AS_HOME_FOLDER);
+ errors.put(ISeamFacetDataModelProperties.JBOSS_AS_HOME,
+ new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID,
+ SeamUIMessages.VALIDATOR_FACTORY_JBOSS_AS_HOME_FOLDER_POINT_TO_LOCATION_THAT_DOES_NOT
+ + SeamUIMessages.VALIDATOR_FACTORY_LOOK_LIKE_JBOSS_AS_HOME_FOLDER));
}
return errors;
}
@@ -207,34 +202,29 @@
*
*/
public static final IValidator CLASS_QNAME_VALIDATOR = new IValidator() {
- public Map<String, String> validate(Object value, Object context) {
+ public Map<String, IStatus> validate(Object value, Object context) {
String classDecl = "class " + value.toString() + " {}"; //$NON-NLS-1$ //$NON-NLS-2$
ASTParser parser = ASTParser.newParser(AST.JLS3);
parser.setSource(classDecl.toCharArray());
parser.setProject((IJavaProject) context);
- CompilationUnit compilationUnit = (CompilationUnit) parser
- .createAST(null);
+ CompilationUnit compilationUnit = (CompilationUnit)parser.createAST(null);
IProblem[] problems = compilationUnit.getProblems();
if (problems.length > 0) {
- return createErrormessage(Messages
- .format(
- SeamUIMessages.VALIDATOR_FACTORY_COMPONENT_NAME_IS_NOT_VALID,
- problems[0].getMessage()));
+ return createErrormessage(new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID,
+ Messages.format(SeamUIMessages.VALIDATOR_FACTORY_COMPONENT_NAME_IS_NOT_VALID,
+ problems[0].getMessage())));
}
return ValidatorFactory.NO_ERRORS;
}
};
public static final IValidator PACKAGE_NAME_VALIDATOR = new IValidator() {
- public Map<String, String> validate(Object value, Object context) {
+ public Map<String, IStatus> validate(Object value, Object context) {
IStatus status = JavaConventions.validatePackageName(value
.toString(), CompilerOptions.VERSION_1_5,
CompilerOptions.VERSION_1_5);
if (status.getSeverity() == IStatus.ERROR) {
- return createErrormessage((Messages
- .format(
- NewWizardMessages.NewTypeWizardPage_error_InvalidPackageName,
- status.getMessage())));
+ return createErrormessage(new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, Messages.format(NewWizardMessages.NewTypeWizardPage_error_InvalidPackageName, status.getMessage())));
}
return ValidatorFactory.NO_ERRORS;
@@ -245,7 +235,7 @@
*
*/
public static final IValidator FILESYSTEM_FILE_EXISTS_VALIDATOR = new IValidator() {
- public java.util.Map<String, String> validate(Object value,
+ public java.util.Map<String, IStatus> validate(Object value,
Object context) {
return ValidatorFactory.NO_ERRORS;
};
@@ -258,14 +248,14 @@
*/
public static final IValidator SEAM_COMPONENT_NAME_VALIDATOR = new IValidator() {
- public Map<String, String> validate(Object value, Object context) {
+ public Map<String, IStatus> validate(Object value, Object context) {
IStatus status = JavaConventions.validateClassFileName(value
.toString()
+ ".class", "5.0", "5.0"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
if (status.isOK()) {
return NO_ERRORS;
} else {
- return createErrormessage(SeamUIMessages.VALIDATOR_FACTORY_NAME_IS_NOT_VALID);
+ return createErrormessage(new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, SeamUIMessages.VALIDATOR_FACTORY_NAME_IS_NOT_VALID));
}
}
};
@@ -277,7 +267,7 @@
*/
public static final IValidator SEAM_JAVA_INTEFACE_NAME_CONVENTION_VALIDATOR = new IValidator() {
- public Map<String, String> validate(Object value, Object context) {
+ public Map<String, IStatus> validate(Object value, Object context) {
if (!(context instanceof Object[])) {
throw new IllegalArgumentException(
"Context parameter should be instance of Object[]"); //$NON-NLS-1$
@@ -295,8 +285,8 @@
IStatus status = JavaConventions.validateJavaTypeName(value
.toString(), sourceLevel, compliance);
if (status.getSeverity() == IStatus.WARNING) {
- return createErrormessage(SeamUIMessages.VALIDATOR_FACTORY_LOCAL_INTERFACE_NAME_IS_NOT_VALID
- + status.getMessage());
+ return createErrormessage(new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, SeamUIMessages.VALIDATOR_FACTORY_LOCAL_INTERFACE_NAME_IS_NOT_VALID
+ + status.getMessage()));
}
return NO_ERRORS;
}
@@ -304,7 +294,7 @@
public static final IValidator SEAM_METHOD_NAME_VALIDATOR = new IValidator() {
- public Map<String, String> validate(Object value, Object context) {
+ public Map<String, IStatus> validate(Object value, Object context) {
if (!(context instanceof Object[])) {
throw new IllegalArgumentException(
"Context parameter should be instance of Object[]"); //$NON-NLS-1$
@@ -321,8 +311,8 @@
IProblem[] problems = compilationUnit.getProblems();
if (problems.length > 0) {
- return createErrormessage(targetName
- + SeamUIMessages.VALIDATOR_FACTORY_NAME_IS_NOT_VALID2);
+ return createErrormessage(new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, targetName
+ + SeamUIMessages.VALIDATOR_FACTORY_NAME_IS_NOT_VALID2));
}
return NO_ERRORS;
@@ -331,7 +321,7 @@
public static final IValidator FILE_NAME_VALIDATOR = new IValidator() {
- public Map<String, String> validate(Object value, Object context) {
+ public Map<String, IStatus> validate(Object value, Object context) {
if (!(context instanceof Object[])) {
throw new IllegalArgumentException(
"Context parameter should be instance of Object[]"); //$NON-NLS-1$
@@ -343,27 +333,27 @@
if ("".equals(value) //$NON-NLS-1$
|| !project.getLocation().isValidSegment(value.toString()))
- return createErrormessage(targetName
- + SeamUIMessages.VALIDATOR_FACTORY_NAME_IS_NOT_VALID2);
+ return createErrormessage(new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, targetName
+ + SeamUIMessages.VALIDATOR_FACTORY_NAME_IS_NOT_VALID2));
return NO_ERRORS;
}
};
public static final IValidator SEAM_PROJECT_NAME_VALIDATOR = new IValidator() {
- public Map<String, String> validate(Object value, Object context) {
+ public Map<String, IStatus> validate(Object value, Object context) {
if (value == null || "".equals(value)) { //$NON-NLS-1$
- return createErrormessage(SeamUIMessages.VALIDATOR_FACTORY_PRJ_NOT_SELECTED);
+ return createErrormessage(new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, SeamUIMessages.VALIDATOR_FACTORY_PRJ_NOT_SELECTED));
}
IResource project = ResourcesPlugin.getWorkspace().getRoot()
.findMember(value.toString());
if (project == null || !(project instanceof IProject)
|| !project.exists()) {
- return createErrormessage(SeamUIMessages.VALIDATOR_FACTORY_PROJECT
+ return createErrormessage(new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, SeamUIMessages.VALIDATOR_FACTORY_PROJECT
+ value
- + SeamUIMessages.VALIDATOR_FACTORY_DOES_NOT_EXIST);
+ + SeamUIMessages.VALIDATOR_FACTORY_DOES_NOT_EXIST));
} else {
IProject selection = (IProject) project;
try {
@@ -376,19 +366,19 @@
// .class)).hasProjectFacet(ProjectFacetsManager
// .getProjectFacet("jst.web"))
|| "" .equals(SeamCorePlugin.getSeamPreferences(selection).get(ISeamFacetDataModelProperties.JBOSS_AS_DEPLOY_AS, ""))) { //$NON-NLS-1$
- return createErrormessage(SeamUIMessages.VALIDATOR_FACTORY_SELECTED_PROJECT
+ return createErrormessage(new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, SeamUIMessages.VALIDATOR_FACTORY_SELECTED_PROJECT
+ project.getName()
- + SeamUIMessages.VALIDATOR_FACTORY_IS_NOT_A_SEAM_WEB_PROJECT);
+ + SeamUIMessages.VALIDATOR_FACTORY_IS_NOT_A_SEAM_WEB_PROJECT));
} else {
// TODO validate project(s) structure
}
} catch (CoreException e) {
// it might happen only if project is closed and project
// name typed by hand
- return createErrormessage(NLS
+ return createErrormessage(new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, NLS
.bind(
SeamUIMessages.VALIDATOR_FACTORY_SELECTED_PRJ_IS_CLOSED,
- project.getName()));
+ project.getName())));
}
}
return NO_ERRORS;
@@ -403,11 +393,11 @@
this.allowEmptyConnection = allowEmptyConnection;
}
- public Map<String, String> validate(Object value, Object context) {
+ public Map<String, IStatus> validate(Object value, Object context) {
if (!allowEmptyConnection && (value == null || "".equals(value.toString().trim()))) { //$NON-NLS-1$
return createErrormessage(
ISeamFacetDataModelProperties.SEAM_CONNECTION_PROFILE,
- SeamUIMessages.VALIDATOR_FACTORY_CONNECTION_PROFILE_IS_NOT_SELECTED);
+ new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, SeamUIMessages.VALIDATOR_FACTORY_CONNECTION_PROFILE_IS_NOT_SELECTED));
} else {
IConnectionProfile connProfile = ProfileManager.getInstance()
.getProfileByName(value.toString());
@@ -418,9 +408,9 @@
if (driverClass == null || "".equals(driverClass)) { //$NON-NLS-1$
return createErrormessage(
ISeamFacetDataModelProperties.SEAM_CONNECTION_PROFILE,
- SeamUIMessages.VALIDATOR_FACTORY_DRIVER_CLASS_PROPERTY_IS_EMPTY_FOR_SELECTED
+ new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, SeamUIMessages.VALIDATOR_FACTORY_DRIVER_CLASS_PROPERTY_IS_EMPTY_FOR_SELECTED
+ value
- + SeamUIMessages.VALIDATOR_FACTORY_CONNECTION_PROFILE);
+ + SeamUIMessages.VALIDATOR_FACTORY_CONNECTION_PROFILE));
}
}
return NO_ERRORS;
@@ -432,58 +422,58 @@
public static final IValidator CONNECTION_DRIVER_VALIDATOR = new ConnectionProfileValidator(true);
public static final IValidator SEAM_RUNTIME_NAME_VALIDATOR = new IValidator() {
- public Map<String, String> validate(Object value, Object context) {
+ public Map<String, IStatus> validate(Object value, Object context) {
- Map<String, String> errors = NO_ERRORS;
+ Map<String, IStatus> errors = NO_ERRORS;
if (value == null || "".equals(value.toString().trim())) { //$NON-NLS-1$
errors = createErrormessage(
ISeamFacetDataModelProperties.SEAM_RUNTIME_NAME,
- SeamUIMessages.VALIDATOR_FACTORY_SEAM_RUNTIME_IS_NOT_SELECTED);
+ new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, SeamUIMessages.VALIDATOR_FACTORY_SEAM_RUNTIME_IS_NOT_SELECTED));
} else {
SeamRuntime rt = SeamRuntimeManager.getInstance()
.findRuntimeByName(value.toString());
if (rt == null) {
errors = createErrormessage(
ISeamFacetDataModelProperties.SEAM_RUNTIME_NAME,
- NLS
+ new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, NLS
.bind(
SeamUIMessages.VALIDATOR_FACTORY_CANNOT_FIND_SEAM_RUNTIME,
- value));
+ value)));
} else if (!new File(rt.getHomeDir()).exists()) {
errors = createErrormessage(
ISeamFacetDataModelProperties.SEAM_RUNTIME_NAME,
- NLS
+ new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, NLS
.bind(
SeamUIMessages.VALIDATOR_FACTORY_SEAM_RT_HOME_DIR_IS_MISSING,
- value));
+ value)));
} else if (!new File(rt.getSeamGenDir()).exists()) {
errors = createErrormessage(
ISeamFacetDataModelProperties.SEAM_RUNTIME_NAME,
- NLS
+ new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, NLS
.bind(
SeamUIMessages.VALIDATOR_FACTORY_SEAM_RT_TEMPLATES_DIR_IS_MISSING,
- value));
+ value)));
} else if (!new File(rt.getSrcTemplatesDir()).exists()) {
errors = createErrormessage(
ISeamFacetDataModelProperties.SEAM_RUNTIME_NAME,
- NLS
+ new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, NLS
.bind(
SeamUIMessages.VALIDATOR_FACTORY_SEAM_RT_SRC_DIR_IS_MISSING,
- value));
+ value)));
} else if (!new File(rt.getViewTemplatesDir()).exists()) {
errors = createErrormessage(
ISeamFacetDataModelProperties.SEAM_RUNTIME_NAME,
- NLS
+ new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, NLS
.bind(
SeamUIMessages.VALIDATOR_FACTORY_SEAM_RT_VIEW_DIR_IS_MISSING,
- value));
+ value)));
} else if (!new File(rt.getResourceTemplatesDir()).exists()) {
errors = createErrormessage(
ISeamFacetDataModelProperties.SEAM_RUNTIME_NAME,
- NLS
+ new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, NLS
.bind(
SeamUIMessages.VALIDATOR_FACTORY_SEAM_RT_RESOURCES_DIR_IS_MISSING,
- value));
+ value)));
}
}
return errors;
@@ -491,41 +481,41 @@
};
public static final IValidator SEAM_RUNTIME_VALIDATOR = new IValidator() {
- public java.util.Map<String, String> validate(Object value,
+ public java.util.Map<String, IStatus> validate(Object value,
Object context) {
- Map<String, String> errors = NO_ERRORS;
+ Map<String, IStatus> errors = NO_ERRORS;
String rtName = value.toString();
if (value == null || "".equals(value)) { //$NON-NLS-1$
- errors = createErrormessage(SeamUIMessages.VALIDATOR_FACTORY_SEAM_RT_NOT_CONFIGURED);
+ errors = createErrormessage(new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, SeamUIMessages.VALIDATOR_FACTORY_SEAM_RT_NOT_CONFIGURED));
} else {
SeamRuntime rt = SeamRuntimeManager.getInstance()
.findRuntimeByName(value.toString());
if (rt == null) {
- errors = createErrormessage(NLS
+ errors = createErrormessage(new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, NLS
.bind(
SeamUIMessages.VALIDATOR_FACTORY_SEAM_RT_CANNOT_BE_FOUND,
- value));
+ value)));
} else if (!new File(rt.getHomeDir()).exists()) {
- errors = createErrormessage(NLS
+ errors = createErrormessage(new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, NLS
.bind(
SeamUIMessages.VALIDATOR_FACTORY_SEAM_RT_HOME_DIR_DOES_NOT_EXIST,
- value));
+ value)));
} else if (!new File(rt.getSeamGenDir()).exists()) {
- errors = createErrormessage(NLS
+ errors = createErrormessage(new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, NLS
.bind(
SeamUIMessages.VALIDATOR_FACTORY_SEAM_RT_TEMPLATES_DIR_DOES_NOT_EXIST,
- value));
+ value)));
} else if (!new File(rt.getSrcTemplatesDir()).exists()) {
- errors = createErrormessage(NLS
+ errors = createErrormessage(new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, NLS
.bind(
SeamUIMessages.VALIDATOR_FACTORY_SEAM_RT_SOURCE_TEMPLATES_DIR_DOES_NOT_EXIST,
- value));
+ value)));
} else if (!new File(rt.getViewTemplatesDir()).exists()) {
- errors = createErrormessage(NLS
+ errors = createErrormessage(new Status(IStatus.ERROR, SeamCorePlugin.PLUGIN_ID, NLS
.bind(
SeamUIMessages.VALIDATOR_FACTORY_SEAM_RT_VIE_TEMPLATE_DIR_DOES_NOT_EXIST,
- value));
+ value)));
// } else if(!new
// File(rt.getResourceTemplatesDir()).exists()) {
// errors = createErrormessage(NLS.bind(
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/messages.properties
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/messages.properties 2008-10-23 12:22:25 UTC (rev 11103)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/messages.properties 2008-10-23 13:20:58 UTC (rev 11104)
@@ -107,6 +107,7 @@
SEAM_WIZARD_FACTORY_METHOD_NAME=Method name:
SEAM_INSTALL_WIZARD_PAGE_NEW=New...
SEAM_INSTALL_WIZARD_PAGE_PACKAGE_NAME_FOR=Package name for
+SEAM_INSTALL_WIZARD_PROJECT_NAME_WITH_UPPERCASE=Project names which start with a capital letter may break Seam/JSF applications; use lower case.
SEAM_INSTALL_WIZARD_PAGE_IS_NOT_VALID=\ is not valid
SEAM_BASE_WIZARD_PAGE_POJO_CLASS_NAME=POJO class name:
SEAM_BASE_WIZARD_PAGE_SEAM_COMPONENTS=Seam component
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamGenerateEnitiesWizardPage.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamGenerateEnitiesWizardPage.java 2008-10-23 12:22:25 UTC (rev 11103)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamGenerateEnitiesWizardPage.java 2008-10-23 13:20:58 UTC (rev 11104)
@@ -14,12 +14,12 @@
import java.beans.PropertyChangeListener;
import java.util.ArrayList;
import java.util.HashMap;
-import java.util.List;
import java.util.Map;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.preferences.IEclipsePreferences;
import org.eclipse.jdt.core.IJavaProject;
import org.eclipse.jface.wizard.IWizardPage;
@@ -67,10 +67,15 @@
projectEditor = SeamWizardFactory.createSeamProjectSelectionFieldEditor(projectName);
projectEditor.addPropertyChangeListener(this);
if(projectName!=null && projectName.length()>0) {
- Map<String, String> errors = ValidatorFactory.SEAM_PROJECT_NAME_VALIDATOR.validate(projectEditor.getValue(), null);
+ Map<String, IStatus> errors = ValidatorFactory.SEAM_PROJECT_NAME_VALIDATOR.validate(projectEditor.getValue(), null);
if(errors.size()>0) {
- setErrorMessage(errors.get(IValidator.DEFAULT_ERROR).toString());
- setPageComplete(false);
+ IStatus message = errors.get(IValidator.DEFAULT_ERROR);
+ if(message.getSeverity()==IStatus.ERROR) {
+ setErrorMessage(message.getMessage());
+ setPageComplete(false);
+ } else {
+ setMessage(message.getMessage());
+ }
} else {
setMessage(null);
}
@@ -202,15 +207,20 @@
}
private void validate() {
- Map<String, String> errors = ValidatorFactory.SEAM_PROJECT_NAME_VALIDATOR.validate(projectEditor.getValue(), null);
+ Map<String, IStatus> errors = ValidatorFactory.SEAM_PROJECT_NAME_VALIDATOR.validate(projectEditor.getValue(), null);
if(errors.size()>0 || !isProjectSettingsOk()) {
- Object errorMessage = errors.get(IValidator.DEFAULT_ERROR);
+ IStatus errorMessage = errors.get(IValidator.DEFAULT_ERROR);
if(errorMessage==null) {
- errorMessage = SeamUIMessages.VALIDATOR_INVALID_SETTINGS;
+ setErrorMessage(SeamUIMessages.VALIDATOR_INVALID_SETTINGS);
}
- setErrorMessage(errorMessage.toString());
- setPageComplete(false);
+ if(errorMessage.getSeverity()==IStatus.ERROR) {
+ setErrorMessage(errorMessage.getMessage());
+ setPageComplete(false);
+ } else {
+ setMessage(errorMessage.getMessage());
+ }
+
return;
}
String config = (String)configEditor.getValue();
16 years, 2 months
- 1
- 0
JBoss Tools SVN: r11103 - trunk/seam/plugins/org.jboss.tools.seam.xml/resources/help.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2008-10-23 08:22:25 -0400 (Thu, 23 Oct 2008)
New Revision: 11103
Modified:
trunk/seam/plugins/org.jboss.tools.seam.xml/resources/help/keys-seam.properties
Log:
Keys to new seam components added.
Modified: trunk/seam/plugins/org.jboss.tools.seam.xml/resources/help/keys-seam.properties
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.xml/resources/help/keys-seam.properties 2008-10-23 12:10:42 UTC (rev 11102)
+++ trunk/seam/plugins/org.jboss.tools.seam.xml/resources/help/keys-seam.properties 2008-10-23 12:22:25 UTC (rev 11103)
@@ -185,7 +185,7 @@
SeamCoreActor_Properties.Title=Seam Core Actor
SeamCoreBundleNames_AddEntry.WindowTitle=Add Entry
-SeamCoreBundleNames_AddEntry.Title=Entry
+SeamCoreBundleNames_AddEntry.Title=Seam Bundle Name
SeamCoreBundleNames_Properties.Title=Seam Core Bundle Names
@@ -198,7 +198,7 @@
SeamCoreFilter_Properties.Title=Seam Core Filter
SeamCoreFilters_AddEntry.WindowTitle=Add Entry
-SeamCoreFilters_AddEntry.Title=Entry
+SeamCoreFilters_AddEntry.Title=Seam Core Filter
SeamCoreFilters_Properties.Title=Seam Core Filters
@@ -215,151 +215,151 @@
SeamCoreMicrocontainer_Properties.Title=Seam Core Microcontainer
SeamCorePageflowDefinitions_AddEntry.WindowTitle=Add Entry
-SeamCorePageflowDefinitions_AddEntry.Title=Entry
+SeamCorePageflowDefinitions_AddEntry.Title=Seam Pageflow Definition
SeamCorePageflowDefinitions_Properties.Title=Seam Core Pageflow Definitions
SeamCorePages_Properties.Title=Seam Core Pages
SeamCoreParameters_AddEntry.WindowTitle=Add Entry
-SeamCoreParameters_AddEntry.Title=Entry
+SeamCoreParameters_AddEntry.Title=Seam Map Entry
SeamCoreParameters_Properties.Title=Seam Core Parameters
SeamCorePersistenceUnitProperties_AddEntry.WindowTitle=Add Entry
-SeamCorePersistenceUnitProperties_AddEntry.Title=Entry
+SeamCorePersistenceUnitProperties_AddEntry.Title=Seam Map Entry
-SeamCorePersistenceUnitProperties_Properties.Title=Seam Core Persistence Unit
+SeamCorePersistenceUnitProperties_Properties.Title=Seam Core Persistence Unit Properties
SeamCorePojoCache_Properties.Title=Seam Core POJO Cache
SeamCoreProcessDefinitions_AddEntry.WindowTitle=Add Entry
-SeamCoreProcessDefinitions_AddEntry.Title=Entry
+SeamCoreProcessDefinitions_AddEntry.Title=Seam Process Definition
SeamCoreProcessDefinitions_Properties.Title=Seam Core Process Definitions
SeamCoreResourceBundle_Properties.Title=Seam Core Resource Bundle
-SeamCoreTimeZoneSelector_Properties.Title=Seam Core TimeZone Selector
+SeamCoreTimeZoneSelector_Properties.Title=Seam Core Time Zone Selector
SeamCoreTransactionListener_Properties.Title=Seam Core Transaction Listener
FileSeamComponents12_AddActor.WindowTitle=Add Actor
-FileSeamComponents12_AddActor.Title=Actor
+FileSeamComponents12_AddActor.Title=Seam Core Actor
FileSeamComponents12_AddDispatcher.WindowTitle=Add Dispatcher
-FileSeamComponents12_AddDispatcher.Title=Dispatcher
+FileSeamComponents12_AddDispatcher.Title=Seam Core Dispatcher
FileSeamComponents12_AddTransactionListener.WindowTitle=Add Transaction Listener
-FileSeamComponents12_AddTransactionListener.Title=Transaction Listener
+FileSeamComponents12_AddTransactionListener.Title=Seam Core Transaction Listener
FileSeamComponents12_AddEJB.WindowTitle=Add EJB
-FileSeamComponents12_AddEJB.Title=EJB
+FileSeamComponents12_AddEJB.Title=Seam Core EJB
FileSeamComponents12_AddInit.WindowTitle=Add Init
-FileSeamComponents12_AddInit.Title=Init
+FileSeamComponents12_AddInit.Title=Seam Core Init
FileSeamComponents12_AddJBPM.WindowTitle=Add JBPM
-FileSeamComponents12_AddJBPM.Title=JBPM
+FileSeamComponents12_AddJBPM.Title=Seam Core JBPM
FileSeamComponents12_AddLocaleSelector.WindowTitle=Add Locale Selector
-FileSeamComponents12_AddLocaleSelector.Title=Locale Selector
+FileSeamComponents12_AddLocaleSelector.Title=Seam Core Locale Selector
FileSeamComponents12_AddManager.WindowTitle=Add Manager
-FileSeamComponents12_AddManager.Title=Manager
+FileSeamComponents12_AddManager.Title=Seam Core Manager
FileSeamComponents12_AddMicrocontainer.WindowTitle=Add Microcontainer
-FileSeamComponents12_AddMicrocontainer.Title=Microcontainer
+FileSeamComponents12_AddMicrocontainer.Title=Seam Core Microcontainer
FileSeamComponents12_AddPages.WindowTitle=Add Pages
-FileSeamComponents12_AddPages.Title=Pages
+FileSeamComponents12_AddPages.Title=Seam Core Pages
FileSeamComponents12_AddPojoCache.WindowTitle=Add POJO Cache
-FileSeamComponents12_AddPojoCache.Title=POJO Cache
+FileSeamComponents12_AddPojoCache.Title=Seam Core POJO Cache
FileSeamComponents12_AddResourceBundle.WindowTitle=Add Resource Bundle
-FileSeamComponents12_AddResourceBundle.Title=Resource Bundle
+FileSeamComponents12_AddResourceBundle.Title=Seam Core Resource Bundle
FileSeamComponents12_AddTimeZoneSelector.WindowTitle=Add Time Zone Selector
-FileSeamComponents12_AddTimeZoneSelector.Title=Time Zone Selector
+FileSeamComponents12_AddTimeZoneSelector.Title=Seam Core Time Zone Selector
FileSeamComponents12_AddManagedPersistenceContext.WindowTitle=Add Managed Persistence Context
-FileSeamComponents12_AddManagedPersistenceContext.Title=Managed Persistence Context
+FileSeamComponents12_AddManagedPersistenceContext.Title=Seam Core Managed Persistence Context
FileSeamComponents12_AddEntityManagerFactory.WindowTitle=Add Entity Manager Factory
-FileSeamComponents12_AddEntityManagerFactory.Title=Entity Manager Factory
+FileSeamComponents12_AddEntityManagerFactory.Title=Seam Core Entity Manager Factory
FileSeamComponents12_AddFilter.WindowTitle=Add Filter
-FileSeamComponents12_AddFilter.Title=Filter
+FileSeamComponents12_AddFilter.Title=Seam Core Filter
FileSeamComponents12_EditorActionList_AddActor.WindowTitle=Add Actor
-FileSeamComponents12_EditorActionList_AddActor.Title=Actor
+FileSeamComponents12_EditorActionList_AddActor.Title=Seam Core Actor
FileSeamComponents12_EditorActionList_AddDispatcher.WindowTitle=Add Dispatcher
-FileSeamComponents12_EditorActionList_AddDispatcher.Title=Dispatcher
+FileSeamComponents12_EditorActionList_AddDispatcher.Title=Seam Core Dispatcher
FileSeamComponents12_EditorActionList_AddTransactionListener.WindowTitle=Add Transaction Listener
-FileSeamComponents12_EditorActionList_AddTransactionListener.Title=Transaction Listener
+FileSeamComponents12_EditorActionList_AddTransactionListener.Title=Seam Core Transaction Listener
FileSeamComponents12_EditorActionList_AddEJB.WindowTitle=Add EJB
-FileSeamComponents12_EditorActionList_AddEJB.Title=EJB
+FileSeamComponents12_EditorActionList_AddEJB.Title=Seam Core EJB
FileSeamComponents12_EditorActionList_AddInit.WindowTitle=Add Init
-FileSeamComponents12_EditorActionList_AddInit.Title=Init
+FileSeamComponents12_EditorActionList_AddInit.Title=Seam Core Init
FileSeamComponents12_EditorActionList_AddJBPM.WindowTitle=Add JBPM
-FileSeamComponents12_EditorActionList_AddJBPM.Title=JBPM
+FileSeamComponents12_EditorActionList_AddJBPM.Title=Seam Core JBPM
FileSeamComponents12_EditorActionList_AddLocaleSelector.WindowTitle=Add Locale Selector
-FileSeamComponents12_EditorActionList_AddLocaleSelector.Title=Locale Selector
+FileSeamComponents12_EditorActionList_AddLocaleSelector.Title=Seam Core Locale Selector
FileSeamComponents12_EditorActionList_AddManager.WindowTitle=Add Manager
-FileSeamComponents12_EditorActionList_AddManager.Title=Manager
+FileSeamComponents12_EditorActionList_AddManager.Title=Seam Core Manager
FileSeamComponents12_EditorActionList_AddMicrocontainer.WindowTitle=Add Microcontainer
-FileSeamComponents12_EditorActionList_AddMicrocontainer.Title=Microcontainer
+FileSeamComponents12_EditorActionList_AddMicrocontainer.Title=Seam Core Microcontainer
FileSeamComponents12_EditorActionList_AddPages.WindowTitle=Add Pages
-FileSeamComponents12_EditorActionList_AddPages.Title=Pages
+FileSeamComponents12_EditorActionList_AddPages.Title=Seam Core Pages
FileSeamComponents12_EditorActionList_AddPojoCache.WindowTitle=Add POJO Cache
-FileSeamComponents12_EditorActionList_AddPojoCache.Title=POJO Cache
+FileSeamComponents12_EditorActionList_AddPojoCache.Title=Seam Core POJO Cache
FileSeamComponents12_EditorActionList_AddResourceBundle.WindowTitle=Add Resource Bundle
-FileSeamComponents12_EditorActionList_AddResourceBundle.Title=Resource Bundle
+FileSeamComponents12_EditorActionList_AddResourceBundle.Title=Seam Core Resource Bundle
FileSeamComponents12_EditorActionList_AddTimeZoneSelector.WindowTitle=Add Time Zone Selector
-FileSeamComponents12_EditorActionList_AddTimeZoneSelector.Title=Time Zone Selector
+FileSeamComponents12_EditorActionList_AddTimeZoneSelector.Title=Seam Core Time Zone Selector
FileSeamComponents12_EditorActionList_AddManagedPersistenceContext.WindowTitle=Add Managed Persistence Context
-FileSeamComponents12_EditorActionList_AddManagedPersistenceContext.Title=Managed Persistence Context
+FileSeamComponents12_EditorActionList_AddManagedPersistenceContext.Title=Seam Core Managed Persistence Context
FileSeamComponents12_EditorActionList_AddEntityManagerFactory.WindowTitle=Add Entity Manager Factory
-FileSeamComponents12_EditorActionList_AddEntityManagerFactory.Title=Entity Manager Factory
+FileSeamComponents12_EditorActionList_AddEntityManagerFactory.Title=Seam Core Entity Manager Factory
FileSeamComponents12_EditorActionList_AddFilter.WindowTitle=Add Filter
-FileSeamComponents12_EditorActionList_AddFilter.Title=Filter
+FileSeamComponents12_EditorActionList_AddFilter.Title=Seam Core Filter
SeamDroolsManagedWorkingMemory_Properties.Title=Seam Drools Managed Working Memory
SeamDroolsRuleBase_Properties.Title=Seam Drools Rule Base
SeamDroolsRuleFiles_AddEntry.WindowTitle=Add Entry
-SeamDroolsRuleFiles_AddEntry.Title=Entry
+SeamDroolsRuleFiles_AddEntry.Title=Seam Drools Rule File
SeamDroolsRuleFiles_Properties.Title=Seam Drools Rule Files
FileSeamComponents12_AddManagedWorkingMemory.WindowTitle=Add Managed Working Memory
-FileSeamComponents12_AddManagedWorkingMemory.Title=Managed Working Memory
+FileSeamComponents12_AddManagedWorkingMemory.Title=Seam Drools Managed Working Memory
FileSeamComponents12_AddRuleBase.WindowTitle=Add Rule Base
-FileSeamComponents12_AddRuleBase.Title=Rule Base
+FileSeamComponents12_AddRuleBase.Title=Seam Drools Rule Base
FileSeamComponents12_EditorActionList_AddManagedWorkingMemory.WindowTitle=Add Managed Working Memory
-FileSeamComponents12_EditorActionList_AddManagedWorkingMemory.Title=Managed Working Memory
+FileSeamComponents12_EditorActionList_AddManagedWorkingMemory.Title=Seam Drools Managed Working Memory
FileSeamComponents12_EditorActionList_AddRuleBase.WindowTitle=Add Rule Base
-FileSeamComponents12_EditorActionList_AddRuleBase.Title=Rule Base
+FileSeamComponents12_EditorActionList_AddRuleBase.Title=Seam Drools Rule Base
SeamFrameworkEntityHome_Properties.WindowTitle=Seam Framework Entity Home
@@ -370,136 +370,136 @@
SeamFrameworkHibernateEntityQuery_Properties.WindowTitle=Seam Framework Hibernate Entity Query
SeamFrameworkHints_AddEntry.WindowTitle=Add Entry
-SeamFrameworkHints_AddEntry.Title=Entry
+SeamFrameworkHints_AddEntry.Title=Seam Framework Hint
SeamFrameworkHints_Properties.Title=Seam Framework Hints
SeamFrameworkRestrictions_AddEntry.WindowTitle=Add Entry
-SeamFrameworkRestrictions_AddEntry.Title=Entry
+SeamFrameworkRestrictions_AddEntry.Title=Seam Framework Restriction
SeamFrameworkRestrictions_Properties.Title=Seam Framework Restrictions
FileSeamComponents12_AddEntityQuery.WindowTitle=Add Entity Query
-FileSeamComponents12_AddEntityQuery.Title=Entity Query
+FileSeamComponents12_AddEntityQuery.Title=Seam Framework Entity Query
FileSeamComponents12_AddHibernateEntityQuery.WindowTitle=Add Hibernate Entity Query
-FileSeamComponents12_AddHibernateEntityQuery.Title=Hibernate Entity Query
+FileSeamComponents12_AddHibernateEntityQuery.Title=Seam Framework Hibernate Entity Query
FileSeamComponents12_AddEntityHome.WindowTitle=Add Entity Home
-FileSeamComponents12_AddEntityHome.Title=Entity Home
+FileSeamComponents12_AddEntityHome.Title=Seam Framework Entity Home
FileSeamComponents12_AddHibernateEntityHome.WindowTitle=Add Hibernate Entity Home
-FileSeamComponents12_AddHibernateEntityHome.Title=Hibernate Entity Home
+FileSeamComponents12_AddHibernateEntityHome.Title=Seam Framework Hibernate Entity Home
FileSeamComponents12_EditorActionList_AddEntityQuery.WindowTitle=Add Entity Query
-FileSeamComponents12_EditorActionList_AddEntityQuery.Title=Entity Query
+FileSeamComponents12_EditorActionList_AddEntityQuery.Title=Seam Framework Entity Query
FileSeamComponents12_EditorActionList_AddHibernateEntityQuery.WindowTitle=Add Hibernate Entity Query
-FileSeamComponents12_EditorActionList_AddHibernateEntityQuery.Title=Hibernate Entity Query
+FileSeamComponents12_EditorActionList_AddHibernateEntityQuery.Title=Seam Framework Hibernate Entity Query
FileSeamComponents12_EditorActionList_AddEntityHome.WindowTitle=Add Entity Home
-FileSeamComponents12_EditorActionList_AddEntityHome.Title=Entity Home
+FileSeamComponents12_EditorActionList_AddEntityHome.Title=Seam Framework Entity Home
FileSeamComponents12_EditorActionList_AddHibernateEntityHome.WindowTitle=Add Hibernate Entity Home
-FileSeamComponents12_EditorActionList_AddHibernateEntityHome.Title=Hibernate Entity Home
+FileSeamComponents12_EditorActionList_AddHibernateEntityHome.Title=Seam Framework Hibernate Entity Home
-SeamJmsQueueConnection_Properties.Title=Seam JMS Queue Connection
+SeamJmsQueueConnection_Properties.Title=Seam Jms Queue Connection
-SeamJmsQueueSender_Properties.Title=Seam JMS Queue Sender
+SeamJmsQueueSender_Properties.Title=Seam Jms Queue Sender
-SeamJmsTopicConnection_Properties.Title=Seam JMS Topic Connection
+SeamJmsTopicConnection_Properties.Title=Seam Jms Topic Connection
-SeamJmsTopicPublisher_Properties.Title=Seam JMS Topic Publisher
+SeamJmsTopicPublisher_Properties.Title=Seam Jms Topic Publisher
FileSeamComponents12_AddQueueConnection.WindowTitle=Add Queue Connection
-FileSeamComponents12_AddQueueConnection.Title=Queue Connection
+FileSeamComponents12_AddQueueConnection.Title=Seam Jms Queue Connection
FileSeamComponents12_AddTopicConnection.WindowTitle=Add Topic Connection
-FileSeamComponents12_AddTopicConnection.Title=Topic Connection
+FileSeamComponents12_AddTopicConnection.Title=Seam Jms Topic Connection
FileSeamComponents12_AddTopicPublisher.WindowTitle=Add Managed Topic Publisher
-FileSeamComponents12_AddTopicPublisher.Title=Managed Topic Publisher
+FileSeamComponents12_AddTopicPublisher.Title=Seam Jms Topic Publisher
FileSeamComponents12_AddQueueSender.WindowTitle=Add Managed Queue Sender
-FileSeamComponents12_AddQueueSender.Title=Managed Queue Sender
+FileSeamComponents12_AddQueueSender.Title=Seam Jms Queue Sender
FileSeamComponents12_EditorActionList_AddQueueConnection.WindowTitle=Add Queue Connection
-FileSeamComponents12_EditorActionList_AddQueueConnection.Title=Queue Connection
+FileSeamComponents12_EditorActionList_AddQueueConnection.Title=Seam Jms Queue Connection
FileSeamComponents12_EditorActionList_AddTopicConnection.WindowTitle=Add Topic Connection
-FileSeamComponents12_EditorActionList_AddTopicConnection.Title=Topic Connection
+FileSeamComponents12_EditorActionList_AddTopicConnection.Title=Seam Jms Topic Connection
FileSeamComponents12_EditorActionList_AddTopicPublisher.WindowTitle=Add Managed Topic Publisher
-FileSeamComponents12_EditorActionList_AddTopicPublisher.Title=Managed Topic Publisher
+FileSeamComponents12_EditorActionList_AddTopicPublisher.Title=Seam Jms Topic Publisher
FileSeamComponents12_EditorActionList_AddQueueSender.WindowTitle=Add Managed Queue Sender
-FileSeamComponents12_EditorActionList_AddQueueSender.Title=Managed Queue Sender
+FileSeamComponents12_EditorActionList_AddQueueSender.Title=Seam Jms Queue Sender
SeamMailSession_Properties.Title=Seam Mail Session
FileSeamComponents12_AddMailSession.WindowTitle=Add Mail Session
-FileSeamComponents12_AddMailSession.Title=Mail Session
+FileSeamComponents12_AddMailSession.Title=Seam Mail Session
FileSeamComponents12_EditorActionList_AddMailSession.WindowTitle=Add Mail Session
-FileSeamComponents12_EditorActionList_AddMailSession.Title=Mail Session
+FileSeamComponents12_EditorActionList_AddMailSession.Title=Seam Mail Session
SeamPdfDocumentStore_Properties.Title=Seam PDF Document Store
SeamPdfKeyStoreConfig_Properties.Title=Seam PDF Key Store Config
FileSeamComponents12_AddDocumentStore.WindowTitle=Add Document Store
-FileSeamComponents12_AddDocumentStore.Title=Document Store
+FileSeamComponents12_AddDocumentStore.Title=Seam PDF Document Store
FileSeamComponents12_AddKeyStoreConfig.WindowTitle=Add Key Store Config
-FileSeamComponents12_AddKeyStoreConfig.Title=Key Store Config
+FileSeamComponents12_AddKeyStoreConfig.Title=Seam PDF Key Store Config
FileSeamComponents12_EditorActionList_AddDocumentStore.WindowTitle=Add Document Store
-FileSeamComponents12_EditorActionList_AddDocumentStore.Title=Document Store
+FileSeamComponents12_EditorActionList_AddDocumentStore.Title=Seam PDF Document Store
FileSeamComponents12_EditorActionList_AddKeyStoreConfig.WindowTitle=Add Key Store Config
-FileSeamComponents12_EditorActionList_AddKeyStoreConfig.Title=Key Store Config
+FileSeamComponents12_EditorActionList_AddKeyStoreConfig.Title=Seam PDF Key Store Config
SeamRemotingConfig_Properties.Title=Seam Remoting Config
-FileSeamComponents12_AddRemotingConfig.WindowTitle=Add Remoting Config
-FileSeamComponents12_AddRemotingConfig.Title=Remoting Config
+FileSeamComponents12_AddRemotingConfig.WindowTitle=Add Config
+FileSeamComponents12_AddRemotingConfig.Title=Seam Remoting Config
-FileSeamComponents12_EditorActionList_AddRemotingConfig.WindowTitle=Add Remoting Config
-FileSeamComponents12_EditorActionList_AddRemotingConfig.Title=Remoting Config
+FileSeamComponents12_EditorActionList_AddRemotingConfig.WindowTitle=Add Config
+FileSeamComponents12_EditorActionList_AddRemotingConfig.Title=Seam Remoting Config
SeamSecurityIdentity_Properties.Title=Seam Security Identity
FileSeamComponents12_AddIdentity.WindowTitle=Add Identity
-FileSeamComponents12_AddIdentity.Title=Identity
+FileSeamComponents12_AddIdentity.Title=Seam Security Identity
FileSeamComponents12_EditorActionList_AddIdentity.WindowTitle=Add Identity
-FileSeamComponents12_EditorActionList_AddIdentity.Title=Identity
+FileSeamComponents12_EditorActionList_AddIdentity.Title=Seam Security Identity
SeamSpringConfigLocations_AddEntry.WindowTitle=Add Entry
-SeamSpringConfigLocations_AddEntry.Title=Entry
+SeamSpringConfigLocations_AddEntry.Title=Seam Spring Config Location
SeamSpringConfigLocations_Properties.Title=Seam Spring Config Locations
SeamSpringContextLoader_Properties.Title=Seam Spring Context Loader
FileSeamComponents12_AddContextLoader.WindowTitle=Add Context Loader
-FileSeamComponents12_AddContextLoader.Title=Context Loader
+FileSeamComponents12_AddContextLoader.Title=Seam Spring Context Loader
FileSeamComponents12_EditorActionList_AddContextLoader.WindowTitle=Add Context Loader
-FileSeamComponents12_EditorActionList_AddContextLoader.Title=Context Loader
+FileSeamComponents12_EditorActionList_AddContextLoader.Title=Seam Spring Context Loader
SeamThemeAvailableThemes_AddEntry.WindowTitle=Add Entry
-SeamThemeAvailableThemes_AddEntry.Title=Entry
+SeamThemeAvailableThemes_AddEntry.Title=Available Theme
SeamThemeAvailableThemes_Properties.Title=Seam Available Themes
-SeamThemeSelector_Properties.Title=Theme Selector
+SeamThemeSelector_Properties.Title=Seam Theme Selector
FileSeamComponents12_AddThemeSelector.WindowTitle=Add Theme Selector
-FileSeamComponents12_AddThemeSelector.Title=Theme Selector
+FileSeamComponents12_AddThemeSelector.Title=Seam Theme Selector
FileSeamComponents12_EditorActionList_AddThemeSelector.WindowTitle=Add Theme Selector
-FileSeamComponents12_EditorActionList_AddThemeSelector.Title=Theme Selector
+FileSeamComponents12_EditorActionList_AddThemeSelector.Title=Seam Theme Selector
SeamWebContextFilter_Properties.Title=Seam Web Context Filter
@@ -510,28 +510,28 @@
SeamWebRedirectFilter_Properties.Title=Seam Web Redirect Filter
FileSeamComponents12_AddContextFilter.WindowTitle=Add Context Filter
-FileSeamComponents12_AddContextFilter.Title=Context Filter
+FileSeamComponents12_AddContextFilter.Title=Seam Web Context Filter
FileSeamComponents12_AddExceptionFilter.WindowTitle=Add Exception Filter
-FileSeamComponents12_AddExceptionFilter.Title=Exception Filter
+FileSeamComponents12_AddExceptionFilter.Title=Seam Web Exception Filter
FileSeamComponents12_AddMultipartFilter.WindowTitle=Add Multipart Filter
-FileSeamComponents12_AddMultipartFilter.Title=Multipart Filter
+FileSeamComponents12_AddMultipartFilter.Title=Seam Web Multipart Filter
FileSeamComponents12_AddRedirectFilter.WindowTitle=Add Redirect Filter
-FileSeamComponents12_AddRedirectFilter.Title=Redirect Filter
+FileSeamComponents12_AddRedirectFilter.Title=Seam Web Redirect Filter
FileSeamComponents12_EditorActionList_AddContextFilter.WindowTitle=Add Context Filter
-FileSeamComponents12_EditorActionList_AddContextFilter.Title=Context Filter
+FileSeamComponents12_EditorActionList_AddContextFilter.Title=Seam Web Context Filter
FileSeamComponents12_EditorActionList_AddExceptionFilter.WindowTitle=Add Exception Filter
-FileSeamComponents12_EditorActionList_AddExceptionFilter.Title=Exception Filter
+FileSeamComponents12_EditorActionList_AddExceptionFilter.Title=Seam Web Exception Filter
FileSeamComponents12_EditorActionList_AddMultipartFilter.WindowTitle=Add Multipart Filter
-FileSeamComponents12_EditorActionList_AddMultipartFilter.Title=Multipart Filter
+FileSeamComponents12_EditorActionList_AddMultipartFilter.Title=Seam Web Multipart Filter
FileSeamComponents12_EditorActionList_AddRedirectFilter.WindowTitle=Add Redirect Filter
-FileSeamComponents12_EditorActionList_AddRedirectFilter.Title=Redirect Filter
+FileSeamComponents12_EditorActionList_AddRedirectFilter.Title=Seam Web Redirect Filter
SeamBPMActor20_Properties.Title=Seam BPM Actor
@@ -547,166 +547,8 @@
SeamBPMProcessDefinitions20_Properties.Title=Seam Process Definitions
-SeamCoreActor_Properties.Title=Seam Core Actor
-
-SeamCoreBundleNames_AddEntry.WindowTitle=Add Entry
-SeamCoreBundleNames_AddEntry.Title=Seam Bundle Name
-
-SeamCoreBundleNames_Properties.Title=Seam Core Bundle Names
-
-SeamCoreDispatcher_Properties.Title=Seam Core Dispatcher
-
-SeamCoreEJB_Properties.Title=Seam Core EJB
-
-SeamCoreEntityManagerFactory_Properties.Title=Seam Core Entity Manager Factory
-
-SeamCoreFilter_Properties.Title=Seam Core Filter
-
-SeamCoreFilters_AddEntry.WindowTitle=Add Entry
-SeamCoreFilters_AddEntry.Title=Seam Core Filter
-
-SeamCoreFilters_Properties.Title=Seam Core Filters
-
-SeamCoreInit_Properties.Title=Seam Core Init
-
-SeamCoreJBPM_Properties.Title=Seam Core JBPM
-
-SeamCoreLocaleSelector_Properties.Title=Seam Core Locale Selector
-
-SeamCoreManagedPersistenceContext_Properties.Title=Seam Core Managed Persistence Context
-
-SeamCoreManager_Properties.Title=Seam Core Manager
-
-SeamCoreMicrocontainer_Properties.Title=Seam Core Microcontainer
-
-SeamCorePageflowDefinitions_AddEntry.WindowTitle=Add Entry
-SeamCorePageflowDefinitions_AddEntry.Title=Seam Pageflow Definition
-
-SeamCorePageflowDefinitions_Properties.Title=Seam Core Pageflow Definitions
-
-SeamCorePages_Properties.Title=Seam Core Pages
-
-SeamCoreParameters_AddEntry.WindowTitle=Add Entry
-SeamCoreParameters_AddEntry.Title=Seam Map Entry
-
-SeamCoreParameters_Properties.Title=Seam Core Parameters
-
-SeamCorePersistenceUnitProperties_AddEntry.WindowTitle=Add Entry
-SeamCorePersistenceUnitProperties_AddEntry.Title=Seam Map Entry
-
-SeamCorePersistenceUnitProperties_Properties.Title=Seam Core Persistence Unit Properties
-
-SeamCorePojoCache_Properties.Title=Seam Core POJO Cache
-
-SeamCoreProcessDefinitions_AddEntry.WindowTitle=Add Entry
-SeamCoreProcessDefinitions_AddEntry.Title=Seam Process Definition
-
-SeamCoreProcessDefinitions_Properties.Title=Seam Core Process Definitions
-
-SeamCoreResourceBundle_Properties.Title=Seam Core Resource Bundle
-
SeamCoreResourceLoader20_Properties.Title=Seam Core Resource Loader
-SeamCoreTimeZoneSelector_Properties.Title=Seam Core Time Zone Selector
-
-SeamCoreTransactionListener_Properties.Title=Seam Core Transaction Listener
-
-FileSeamComponents12_AddActor.WindowTitle=Add Actor
-FileSeamComponents12_AddActor.Title=Seam Core Actor
-
-FileSeamComponents12_AddDispatcher.WindowTitle=Add Dispatcher
-FileSeamComponents12_AddDispatcher.Title=Seam Core Dispatcher
-
-FileSeamComponents12_AddTransactionListener.WindowTitle=Add Transaction Listener
-FileSeamComponents12_AddTransactionListener.Title=Seam Core Transaction Listener
-
-FileSeamComponents12_AddEJB.WindowTitle=Add EJB
-FileSeamComponents12_AddEJB.Title=Seam Core EJB
-
-FileSeamComponents12_AddInit.WindowTitle=Add Init
-FileSeamComponents12_AddInit.Title=Seam Core Init
-
-FileSeamComponents12_AddJBPM.WindowTitle=Add JBPM
-FileSeamComponents12_AddJBPM.Title=Seam Core JBPM
-
-FileSeamComponents12_AddLocaleSelector.WindowTitle=Add Locale Selector
-FileSeamComponents12_AddLocaleSelector.Title=Seam Core Locale Selector
-
-FileSeamComponents12_AddManager.WindowTitle=Add Manager
-FileSeamComponents12_AddManager.Title=Seam Core Manager
-
-FileSeamComponents12_AddMicrocontainer.WindowTitle=Add Microcontainer
-FileSeamComponents12_AddMicrocontainer.Title=Seam Core Microcontainer
-
-FileSeamComponents12_AddPages.WindowTitle=Add Pages
-FileSeamComponents12_AddPages.Title=Seam Core Pages
-
-FileSeamComponents12_AddPojoCache.WindowTitle=Add POJO Cache
-FileSeamComponents12_AddPojoCache.Title=Seam Core POJO Cache
-
-FileSeamComponents12_AddResourceBundle.WindowTitle=Add Resource Bundle
-FileSeamComponents12_AddResourceBundle.Title=Seam Core Resource Bundle
-
-FileSeamComponents12_AddTimeZoneSelector.WindowTitle=Add Time Zone Selector
-FileSeamComponents12_AddTimeZoneSelector.Title=Seam Core Time Zone Selector
-
-FileSeamComponents12_AddManagedPersistenceContext.WindowTitle=Add Managed Persistence Context
-FileSeamComponents12_AddManagedPersistenceContext.Title=Seam Core Managed Persistence Context
-
-FileSeamComponents12_AddEntityManagerFactory.WindowTitle=Add Entity Manager Factory
-FileSeamComponents12_AddEntityManagerFactory.Title=Seam Core Entity Manager Factory
-
-FileSeamComponents12_AddFilter.WindowTitle=Add Filter
-FileSeamComponents12_AddFilter.Title=Seam Core Filter
-
-FileSeamComponents12_EditorActionList_AddActor.WindowTitle=Add Actor
-FileSeamComponents12_EditorActionList_AddActor.Title=Seam Core Actor
-
-FileSeamComponents12_EditorActionList_AddDispatcher.WindowTitle=Add Dispatcher
-FileSeamComponents12_EditorActionList_AddDispatcher.Title=Seam Core Dispatcher
-
-FileSeamComponents12_EditorActionList_AddTransactionListener.WindowTitle=Add Transaction Listener
-FileSeamComponents12_EditorActionList_AddTransactionListener.Title=Seam Core Transaction Listener
-
-FileSeamComponents12_EditorActionList_AddEJB.WindowTitle=Add EJB
-FileSeamComponents12_EditorActionList_AddEJB.Title=Seam Core EJB
-
-FileSeamComponents12_EditorActionList_AddInit.WindowTitle=Add Init
-FileSeamComponents12_EditorActionList_AddInit.Title=Seam Core Init
-
-FileSeamComponents12_EditorActionList_AddJBPM.WindowTitle=Add JBPM
-FileSeamComponents12_EditorActionList_AddJBPM.Title=Seam Core JBPM
-
-FileSeamComponents12_EditorActionList_AddLocaleSelector.WindowTitle=Add Locale Selector
-FileSeamComponents12_EditorActionList_AddLocaleSelector.Title=Seam Core Locale Selector
-
-FileSeamComponents12_EditorActionList_AddManager.WindowTitle=Add Manager
-FileSeamComponents12_EditorActionList_AddManager.Title=Seam Core Manager
-
-FileSeamComponents12_EditorActionList_AddMicrocontainer.WindowTitle=Add Microcontainer
-FileSeamComponents12_EditorActionList_AddMicrocontainer.Title=Seam Core Microcontainer
-
-FileSeamComponents12_EditorActionList_AddPages.WindowTitle=Add Pages
-FileSeamComponents12_EditorActionList_AddPages.Title=Seam Core Pages
-
-FileSeamComponents12_EditorActionList_AddPojoCache.WindowTitle=Add POJO Cache
-FileSeamComponents12_EditorActionList_AddPojoCache.Title=Seam Core POJO Cache
-
-FileSeamComponents12_EditorActionList_AddResourceBundle.WindowTitle=Add Resource Bundle
-FileSeamComponents12_EditorActionList_AddResourceBundle.Title=Seam Core Resource Bundle
-
-FileSeamComponents12_EditorActionList_AddTimeZoneSelector.WindowTitle=Add Time Zone Selector
-FileSeamComponents12_EditorActionList_AddTimeZoneSelector.Title=Seam Core Time Zone Selector
-
-FileSeamComponents12_EditorActionList_AddManagedPersistenceContext.WindowTitle=Add Managed Persistence Context
-FileSeamComponents12_EditorActionList_AddManagedPersistenceContext.Title=Seam Core Managed Persistence Context
-
-FileSeamComponents12_EditorActionList_AddEntityManagerFactory.WindowTitle=Add Entity Manager Factory
-FileSeamComponents12_EditorActionList_AddEntityManagerFactory.Title=Seam Core Entity Manager Factory
-
-FileSeamComponents12_EditorActionList_AddFilter.WindowTitle=Add Filter
-FileSeamComponents12_EditorActionList_AddFilter.Title=Seam Core Filter
-
FileSeamComponents20_AddInit.WindowTitle=Add Init
FileSeamComponents20_AddInit.Title=Seam Core Init
@@ -743,28 +585,8 @@
FileSeamComponents20_EditorActionList_AddJBPM.WindowTitle=Add JBPM
FileSeamComponents20_EditorActionList_AddJBPM.Title=Seam BPMJBPM
-SeamDroolsManagedWorkingMemory_Properties.Title=Seam Drools Managed Working Memory
-
SeamDroolsRuleAgent_Properties.Title=Seam Drools Rule Agent
-SeamDroolsRuleBase_Properties.Title=Seam Drools Rule Base
-
-SeamDroolsRuleFiles_AddEntry.Title=Seam Drools Rule File
-
-SeamDroolsRuleFiles_Properties.Title=Seam Drools Rule Files
-
-FileSeamComponents12_AddManagedWorkingMemory.WindowTitle=Add Managed Working Memory
-FileSeamComponents12_AddManagedWorkingMemory.Title=Seam Drools Managed Working Memory
-
-FileSeamComponents12_AddRuleBase.WindowTitle=Add Rule Base
-FileSeamComponents12_AddRuleBase.Title=Seam Drools Rule Base
-
-FileSeamComponents12_EditorActionList_AddManagedWorkingMemory.WindowTitle=Add Managed Working Memory
-FileSeamComponents12_EditorActionList_AddManagedWorkingMemory.Title=Seam Drools Managed Working Memory
-
-FileSeamComponents12_EditorActionList_AddRuleBase.WindowTitle=Add Rule Base
-FileSeamComponents12_EditorActionList_AddRuleBase.Title=Seam Drools Rule Base
-
FileSeamComponents20_AddManagedWorkingMemory.WindowTitle=Add Managed Working Memory
FileSeamComponents20_AddManagedWorkingMemory.Title=Seam Drools Managed Working Memory
@@ -791,72 +613,6 @@
SeamFrameworkHibernateEntityQuery_Properties.Title=Seam Framework Hibernate Entity Query
-SeamFrameworkHints_AddEntry.WindowTitle=Add Entry
-SeamFrameworkHints_AddEntry.Title=Seam Framework Hint
-
-SeamFrameworkHints_Properties.Title=Seam Framework Hints
-
-SeamFrameworkRestrictions_AddEntry.WindowTitle=Add Entry
-SeamFrameworkRestrictions_AddEntry.Title=Seam Framework Restriction
-
-SeamFrameworkRestrictions_Properties.Title=Seam Framework Restrictions
-
-FileSeamComponents12_AddEntityQuery.WindowTitle=Add Entity Query
-FileSeamComponents12_AddEntityQuery.Title=Seam Framework Entity Query
-
-FileSeamComponents12_AddHibernateEntityQuery.WindowTitle=Add Hibernate Entity Query
-FileSeamComponents12_AddHibernateEntityQuery.Title=Seam Framework Hibernate Entity Query
-
-FileSeamComponents12_AddEntityHome.WindowTitle=Add Entity Home
-FileSeamComponents12_AddEntityHome.Title=Seam Framework Entity Home
-
-FileSeamComponents12_AddHibernateEntityHome.WindowTitle=Add Hibernate Entity Home
-FileSeamComponents12_AddHibernateEntityHome.Title=Seam Framework Hibernate Entity Home
-
-FileSeamComponents12_EditorActionList_AddEntityQuery.WindowTitle=Add Entity Query
-FileSeamComponents12_EditorActionList_AddEntityQuery.Title=Seam Framework Entity Query
-
-FileSeamComponents12_EditorActionList_AddHibernateEntityQuery.WindowTitle=Add Hibernate Entity Query
-FileSeamComponents12_EditorActionList_AddHibernateEntityQuery.Title=Seam Framework Hibernate Entity Query
-
-FileSeamComponents12_EditorActionList_AddEntityHome.WindowTitle=Add Entity Home
-FileSeamComponents12_EditorActionList_AddEntityHome.Title=Seam Framework Entity Home
-
-FileSeamComponents12_EditorActionList_AddHibernateEntityHome.WindowTitle=Add Hibernate Entity Home
-FileSeamComponents12_EditorActionList_AddHibernateEntityHome.Title=Seam Framework Hibernate Entity Home
-
-SeamJmsQueueConnection_Properties.Title=Seam Jms Queue Connection
-
-SeamJmsQueueSender_Properties.Title=Seam Jms Queue Sender
-
-SeamJmsTopicConnection_Properties.Title=Seam Jms Topic Connection
-
-SeamJmsTopicPublisher_Properties.Title=Seam Jms Topic Publisher
-
-FileSeamComponents12_AddQueueConnection.WindowTitle=Add Queue Connection
-FileSeamComponents12_AddQueueConnection.Title=Seam Jms Queue Connection
-
-FileSeamComponents12_AddTopicConnection.WindowTitle=Add Topic Connection
-FileSeamComponents12_AddTopicConnection.Title=Seam Jms Topic Connection
-
-FileSeamComponents12_AddTopicPublisher.WindowTitle=Add Managed Topic Publisher
-FileSeamComponents12_AddTopicPublisher.Title=Seam Jms Topic Publisher
-
-FileSeamComponents12_AddQueueSender.WindowTitle=Add Managed Queue Sender
-FileSeamComponents12_AddQueueSender.Title=Seam Jms Queue Sender
-
-FileSeamComponents12_EditorActionList_AddQueueConnection.WindowTitle=Add Queue Connection
-FileSeamComponents12_EditorActionList_AddQueueConnection.Title=Seam Jms Queue Connection
-
-FileSeamComponents12_EditorActionList_AddTopicConnection.WindowTitle=Add Topic Connection
-FileSeamComponents12_EditorActionList_AddTopicConnection.Title=Seam Jms Topic Connection
-
-FileSeamComponents12_EditorActionList_AddTopicPublisher.WindowTitle=Add Managed Topic Publisher
-FileSeamComponents12_EditorActionList_AddTopicPublisher.Title=Seam Jms Topic Publisher
-
-FileSeamComponents12_EditorActionList_AddQueueSender.WindowTitle=Add Managed Queue Sender
-FileSeamComponents12_EditorActionList_AddQueueSender.Title=Seam Jms Queue Sender
-
SeamMailAliases_AddEntry.WindowTitle=Add Entry
SeamMailAliases_AddEntry.Title=Seam List Entry
@@ -866,19 +622,11 @@
SeamMailMeldwareUser_Properties.Title=Seam Mail Meldware User
-SeamMailSession_Properties.Title=Seam Mail Session
-
SeamMailUsers_AddEntry.WindowTitle=Add Entry
SeamMailUsers_AddEntry.Title=Seam Mail User
SeamMailUsers_Properties.Title=Seam Mail Users
-FileSeamComponents12_AddMailSession.WindowTitle=Add Mail Session
-FileSeamComponents12_AddMailSession.Title=Seam Mail Session
-
-FileSeamComponents12_EditorActionList_AddMailSession.WindowTitle=Add Mail Session
-FileSeamComponents12_EditorActionList_AddMailSession.Title=Seam Mail Session
-
FileSeamComponents20_AddMailSession.WindowTitle=Add Mail Session
FileSeamComponents20_AddMailSession.Title=Seam Mail Session
@@ -897,55 +645,10 @@
FileSeamComponents20_EditorActionList_AddMeldwareUser.WindowTitle=Add Meldware User
FileSeamComponents20_EditorActionList_AddMeldwareUser.Title=Seam Mail Meldware User
-SeamPdfDocumentStore_Properties.Title=Seam PDF Document Store
-
-SeamPdfKeyStoreConfig_Properties.Title=Seam PDF Key Store Config
-
-FileSeamComponents12_AddDocumentStore.WindowTitle=Add Document Store
-FileSeamComponents12_AddDocumentStore.Title=Seam PDF Document Store
-
-FileSeamComponents12_AddKeyStoreConfig.WindowTitle=Add Key Store Config
-FileSeamComponents12_AddKeyStoreConfig.Title=Seam PDF Key Store Config
-
-FileSeamComponents12_EditorActionList_AddDocumentStore.WindowTitle=Add Document Store
-FileSeamComponents12_EditorActionList_AddDocumentStore.Title=Seam PDF Document Store
-
-FileSeamComponents12_EditorActionList_AddKeyStoreConfig.WindowTitle=Add Key Store Config
-FileSeamComponents12_EditorActionList_AddKeyStoreConfig.Title=Seam PDF Key Store Config
-
-SeamRemotingConfig_Properties.Title=Seam Remoting Config
-
-FileSeamComponents12_AddRemotingConfig.WindowTitle=Add Config
-FileSeamComponents12_AddRemotingConfig.Title=Seam Remoting Config
-
-FileSeamComponents12_EditorActionList_AddRemotingConfig.WindowTitle=Add Config
-FileSeamComponents12_EditorActionList_AddRemotingConfig.Title=Seam Remoting Config
-
-SeamSecurityIdentity_Properties.Title=Seam Security Identity
-
-FileSeamComponents12_AddIdentity.WindowTitle=Add Identity
-FileSeamComponents12_AddIdentity.Title=Seam Security Identity
-
-FileSeamComponents12_EditorActionList_AddIdentity.WindowTitle=Add Identity
-FileSeamComponents12_EditorActionList_AddIdentity.Title=Seam Security Identity
-
-SeamSpringConfigLocations_AddEntry.WindowTitle=Add Entry
-SeamSpringConfigLocations_AddEntry.Title=Seam Spring Config Location
-
-SeamSpringConfigLocations_Properties.Title=Seam Spring Config Locations
-
-SeamSpringContextLoader_Properties.Title=Seam Spring Context Loader
-
SeamSpringTaskDispatcher20_Properties.Title=Seam Spring Task Dispatcher
SeamSpringTransaction20_Properties.Title=Seam Spring Transaction
-FileSeamComponents12_AddContextLoader.WindowTitle=Add Context Loader
-FileSeamComponents12_AddContextLoader.Title=Seam Spring Context Loader
-
-FileSeamComponents12_EditorActionList_AddContextLoader.WindowTitle=Add Context Loader
-FileSeamComponents12_EditorActionList_AddContextLoader.Title=Seam Spring Context Loader
-
FileSeamComponents20_AddContextLoader.WindowTitle=Add Context Loader
FileSeamComponents20_AddContextLoader.Title=Seam Spring Context Loader
@@ -964,20 +667,6 @@
FileSeamComponents20_EditorActionList_AddTransaction.WindowTitle=Add Transaction
FileSeamComponents20_EditorActionList_AddTransaction.Title=Seam Spring Transaction
-
-SeamThemeAvailableThemes_AddEntry.WindowTitle=Add Entry
-SeamThemeAvailableThemes_AddEntry.Title=Available Theme
-
-SeamThemeAvailableThemes_Properties.Title=Seam Available Themes
-
-SeamThemeSelector_Properties.Title=Seam Theme Selector
-
-FileSeamComponents12_AddThemeSelector.WindowTitle=Add Theme Selector
-FileSeamComponents12_AddThemeSelector.Title=Seam Theme Selector
-
-FileSeamComponents12_EditorActionList_AddThemeSelector.WindowTitle=Add Theme Selector
-FileSeamComponents12_EditorActionList_AddThemeSelector.Title=Seam Theme Selector
-
SeamNoTransaction_Properties.Title=Seam No Transaction
SeamTransactionEjb_Properties.Title=Seam Transaction EJB
@@ -1016,42 +705,10 @@
SeamWebCharacterFilter20_Properties.Title=Seam Web Character Filter
-SeamWebContextFilter_Properties.Title=Seam Web Context Filter
-
-SeamWebExceptionFilter_Properties.Title=Seam Web Exception Filter
-
SeamWebLoggingFilter20_Properties.Title=Seam Web Logging Filter
-SeamWebMultipartFilter_Properties.Title=Seam Web Multipart Filter
-
-SeamWebRedirectFilter_Properties.Title=Seam Web Redirect Filter
-
SeamWebServletSession20_Properties.Title=Seam Web Servlet Session
-FileSeamComponents12_AddContextFilter.WindowTitle=Add Context Filter
-FileSeamComponents12_AddContextFilter.Title=Seam Web Context Filter
-
-FileSeamComponents12_AddExceptionFilter.WindowTitle=Add Exception Filter
-FileSeamComponents12_AddExceptionFilter.Title=Seam Web Exception Filter
-
-FileSeamComponents12_AddMultipartFilter.WindowTitle=Add Multipart Filter
-FileSeamComponents12_AddMultipartFilter.Title=Seam Web Multipart Filter
-
-FileSeamComponents12_AddRedirectFilter.WindowTitle=Add Redirect Filter
-FileSeamComponents12_AddRedirectFilter.Title=Seam Web Redirect Filter
-
-FileSeamComponents12_EditorActionList_AddContextFilter.WindowTitle=Add Context Filter
-FileSeamComponents12_EditorActionList_AddContextFilter.Title=Seam Web Context Filter
-
-FileSeamComponents12_EditorActionList_AddExceptionFilter.WindowTitle=Add Exception Filter
-FileSeamComponents12_EditorActionList_AddExceptionFilter.Title=Seam Web Exception Filter
-
-FileSeamComponents12_EditorActionList_AddMultipartFilter.WindowTitle=Add Multipart Filter
-FileSeamComponents12_EditorActionList_AddMultipartFilter.Title=Seam Web Multipart Filter
-
-FileSeamComponents12_EditorActionList_AddRedirectFilter.WindowTitle=Add Redirect Filter
-FileSeamComponents12_EditorActionList_AddRedirectFilter.Title=Seam Web Redirect Filter
-
FileSeamComponents20_AddContextFilter.WindowTitle=Add Context Filter
FileSeamComponents20_AddContextFilter.Title=Seam Web Context Filter
@@ -1106,9 +763,6 @@
FileSeamComponents20_EditorActionList_AddServletSession.WindowTitle=Add Servlet Session
FileSeamComponents20_EditorActionList_AddServletSession.Title=Seam Web Servlet Session
-FileSeamComponents20_EditorActionList_AddServletSession.WindowTitle=Add Servlet Session
-FileSeamComponents20_EditorActionList_AddServletSession.Title=Seam Web Servlet Session
-
SeamAsyncPool_Properties.Title=Seam Async Pool
SeamAsyncQuartz_Properties.Title=Seam Async Quartz
@@ -1319,3 +973,266 @@
FileSeamComponents20_EditorActionList_AddThemeSelector.WindowTitle=Add Theme Selector
FileSeamComponents20_EditorActionList_AddThemeSelector.Title=Seam Theme Selector
+
+FileSeamComponents21_AddTimer.WindowTitle=Add Timer Service Dispatcher
+FileSeamComponents21_AddTimer.Title=Seam Async Timer
+
+FileSeamComponents21_AddQuartz.WindowTitle=Add Quartz Dispatcher
+FileSeamComponents21_AddQuartz.Title=Seam Async Quartz
+
+FileSeamComponents21_AddPool.WindowTitle=Add Thread Pool Dispatcher
+FileSeamComponents21_AddPool.Title=Seam Async Pool
+
+FileSeamComponent12_AddAnyProperty.WindowTitle=Add Property
+FileSeamComponent12_AddAnyProperty.Title=Property
+
+FileSeamComponent12_EditorActionList_AddAnyProperty.WindowTitle=Add Property
+FileSeamComponent12_EditorActionList_AddAnyProperty.Title=Property
+
+FileSeamComponent12_EditorActionList_Properties.Title=File Seam Component_ Editor Action List
+FileSeamComponent20_Rename.Message=
+
+FileSeamComponent20_AddAnyProperty.WindowTitle=Add Property
+FileSeamComponent20_AddAnyProperty.Title=Property
+
+FileSeamComponents11_Rename.Message=
+
+FileSeamComponents11_EditorActionList_Properties.Title=File Seam Components_ Editor Action List
+FileSeamComponents12_Rename.Message=
+
+FileSeamComponents12_Properties.Title=File Seam Components
+FileSeamComponents12_EditorActionList_Properties.Title=File Seam Components_ Editor Action List
+
+FileSeamComponents20_Rename.Message=
+FileSeamComponents21_AddComponent.WindowTitle=Add Component
+
+FileSeamComponents21_AddComponent.Title=Seam Component
+FileSeamComponents21_AddFactory.WindowTitle=Add Factory
+
+FileSeamComponents21_AddFactory.Title=Seam Factory
+FileSeamComponents21_AddEvent.WindowTitle=Add Event
+
+FileSeamComponents21_AddEvent.Title=Seam Event
+FileSeamComponents21_AddImport.WindowTitle=Add Import
+
+FileSeamComponents21_AddImport.Title=Seam Import
+SeamComponent_AddAnyProperty.WindowTitle=Add Property
+
+SeamComponent_AddAnyProperty.Title=Property
+SeamComponent20_AddProperty.WindowTitle=Add Simple Property
+
+SeamComponent20_AddProperty.Title=Seam Property
+SeamComponent20_AddListProperty.WindowTitle=Add List Property
+
+SeamComponent20_AddListProperty.Title=Seam Property List
+SeamComponent20_AddMapProperty.WindowTitle=Add Map Property
+
+SeamComponent20_AddMapProperty.Title=Seam Property Map
+SeamComponent20_AddAnyProperty.WindowTitle=Add Property
+
+SeamComponent20_AddAnyProperty.Title=Property
+SeamComponent21_AddProperty.WindowTitle=Add Simple Property
+
+SeamComponent21_AddProperty.Title=Seam Property
+SeamComponent21_AddListProperty.WindowTitle=Add List Property
+
+SeamComponent21_AddListProperty.Title=Seam Property List
+SeamComponent21_AddMapProperty.WindowTitle=Add Map Property
+
+SeamComponent21_AddMapProperty.Title=Seam Property Map
+SeamComponent21_AddAnyProperty.WindowTitle=Add Property
+
+SeamComponent21_AddAnyProperty.Title=Property
+FileFolder_CreateFileSeamComponentsV.WindowTitle=Add Seam Components File
+
+FileFolder_CreateFileSeamComponentsV.Title=Seam Components File
+FileSystemFolder_CreateFileSeamComponentsV.WindowTitle=Add Seam Components File
+
+FileSystemFolder_CreateFileSeamComponentsV.Title=Seam Components File
+SeamCoreInit20_Properties.Title=Seam Core Init
+
+FileSeamComponents21_AddInit.WindowTitle=Add Init
+FileSeamComponents21_AddInit.Title=Seam Core Init
+
+FileSeamComponents21_AddManager.WindowTitle=Add Manager
+FileSeamComponents21_AddManager.Title=Seam Core Manager
+
+FileSeamComponents21_AddPojoCache.WindowTitle=Add Pojo Cache
+FileSeamComponents21_AddPojoCache.Title=Seam Core Pojo Cache
+
+FileSeamComponents21_AddResourceLoader.WindowTitle=Add Resource Loader
+FileSeamComponents21_AddResourceLoader.Title=Seam Core Resource Loader
+
+FileSeamComponents21_AddActor.WindowTitle=Add Actor
+FileSeamComponents21_AddActor.Title=Seam BPM Actor
+
+FileSeamComponents21_AddJBPM.WindowTitle=Add JBPM
+FileSeamComponents21_AddJBPM.Title=Seam JBPM
+
+FileSeamComponents21_AddManagedWorkingMemory.WindowTitle=Add Managed Working Memory
+FileSeamComponents21_AddManagedWorkingMemory.Title=Seam Drools Managed Working Memory
+
+FileSeamComponents21_AddRuleBase.WindowTitle=Add Rule Base
+FileSeamComponents21_AddRuleBase.Title=Seam Drools Rule Base
+
+FileSeamComponents21_AddRuleAgent.WindowTitle=Add Rule Agent
+FileSeamComponents21_AddRuleAgent.Title=Seam Drools Rule Agent
+
+FileSeamComponents21_AddEntityQuery.WindowTitle=Add Entity Query
+FileSeamComponents21_AddEntityQuery.Title=Seam Framework Entity Query
+
+FileSeamComponents21_AddHibernateEntityQuery.WindowTitle=Add Hibernate Entity Query
+FileSeamComponents21_AddHibernateEntityQuery.Title=Seam Framework Hibernate Entity Query
+
+FileSeamComponents21_AddEntityHome.WindowTitle=Add Entity Home
+FileSeamComponents21_AddEntityHome.Title=Seam Framework Entity Home
+
+FileSeamComponents21_AddHibernateEntityHome.WindowTitle=Add Hibernate Entity Home
+FileSeamComponents21_AddHibernateEntityHome.Title=Seam Framework Hibernate Entity Home
+
+FileSeamComponents21_AddLocaleSelector.WindowTitle=Add Locale Selector
+FileSeamComponents21_AddLocaleSelector.Title=Seam Core Locale Selector
+
+FileSeamComponents21_AddTimeZoneSelector.WindowTitle=Add Time Zone Selector
+FileSeamComponents21_AddTimeZoneSelector.Title=Seam Core Time Zone Selector
+
+FileSeamComponents21_AddLocaleConfig.WindowTitle=Add Locale Config
+FileSeamComponents21_AddLocaleConfig.Title=Seam International Locale Config
+
+FileSeamComponents21_AddQueueConnection.WindowTitle=Add Queue Connection
+FileSeamComponents21_AddQueueConnection.Title=Seam Jms Queue Connection
+
+FileSeamComponents21_AddTopicConnection.WindowTitle=Add Topic Connection
+FileSeamComponents21_AddTopicConnection.Title=Seam Jms Topic Connection
+
+FileSeamComponents21_AddTopicPublisher.WindowTitle=Add Managed Topic Publisher
+FileSeamComponents21_AddTopicPublisher.Title=Seam Jms Topic Publisher
+
+FileSeamComponents21_AddQueueSender.WindowTitle=Add Managed Queue Sender
+FileSeamComponents21_AddQueueSender.Title=Seam Jms Queue Sender
+
+FileSeamComponents21_AddMailSession.WindowTitle=Add Mail Session
+FileSeamComponents21_AddMailSession.Title=Seam Mail Session
+
+FileSeamComponents21_AddMeldware.WindowTitle=Add Meldware
+FileSeamComponents21_AddMeldware.Title=Seam Mail Meldware
+
+FileSeamComponents21_AddMeldwareUser.WindowTitle=Add Meldware User
+FileSeamComponents21_AddMeldwareUser.Title=Seam Mail Meldware User
+
+FileSeamComponents21_AddDocumentStore.WindowTitle=Add Document Store
+FileSeamComponents21_AddDocumentStore.Title=Seam Pdf Document Store
+
+FileSeamComponents21_AddKeyStoreConfig.WindowTitle=Add Key Store Config
+FileSeamComponents21_AddKeyStoreConfig.Title=Seam Pdf Key Store Config
+
+FileSeamComponents21_AddManagedPersistenceContext.WindowTitle=Add Managed Persistence Context
+FileSeamComponents21_AddManagedPersistenceContext.Title=Seam Persistence Managed Context
+
+FileSeamComponents21_AddEntityManagerFactory.WindowTitle=Add Entity Manager Factory
+FileSeamComponents21_AddEntityManagerFactory.Title=Seam Persistence Entity Manager Factory
+
+FileSeamComponents21_AddFilter.WindowTitle=Add Filter
+FileSeamComponents21_AddFilter.Title=Seam Persistence Filter
+
+FileSeamComponents21_AddManagedHibernateSession.WindowTitle=Add Managed Hibernate Session
+FileSeamComponents21_AddManagedHibernateSession.Title=Seam Persistence Managed Hibernate Session
+
+FileSeamComponents21_AddHibernateSessionFactory.WindowTitle=Add Hibernate Session Factory
+FileSeamComponents21_AddHibernateSessionFactory.Title=Seam Persistence Hibernate Session Factory
+
+SeamRemotingConfig20_Properties.Title=Seam Remoting Config
+FileSeamComponents21_AddRemotingConfig.WindowTitle=Add Config
+
+FileSeamComponents21_AddRemotingConfig.Title=Seam Remoting
+SeamFacesSecurityEvents20_Properties.Title=Seam Faces Security Events
+
+FileSeamComponents20_AddFacesSecurityEvents.WindowTitle=Add Faces Security Events
+FileSeamComponents20_AddFacesSecurityEvents.Title=Seam Faces Security Events
+
+FileSeamComponents21_AddIdentity.WindowTitle=Add Identity
+FileSeamComponents21_AddIdentity.Title=Seam Security Identity
+
+FileSeamComponents21_AddFacesSecurityEvents.WindowTitle=Add Faces Security Events
+FileSeamComponents21_AddFacesSecurityEvents.Title=Seam Faces Security Events
+
+FileSeamComponents21_AddIdentityManager.WindowTitle=Add Identity Manager
+FileSeamComponents21_AddIdentityManager.Title=Seam Security Identity Manager
+
+FileSeamComponents21_AddJPAIdentityStore.WindowTitle=Add JPA Identity Store
+FileSeamComponents21_AddJPAIdentityStore.Title=Seam Security JPAIdentity Store
+
+FileSeamComponents21_AddLDAPIdentityStore.WindowTitle=Add LDAP Identity Store
+FileSeamComponents21_AddLDAPIdentityStore.Title=Seam Security LDAPIdentity Store
+
+FileSeamComponents21_AddPermissionManager.WindowTitle=Add Permission Manager
+FileSeamComponents21_AddPermissionManager.Title=Seam Security Permission Manager
+
+FileSeamComponents21_AddJPAPermissionStore.WindowTitle=Add JPA Permission Store
+FileSeamComponents21_AddJPAPermissionStore.Title=Seam Security JPAPermission Store
+
+FileSeamComponents21_AddRuleBasedPermissionResolver.WindowTitle=Add Rule Based Permission Resolver
+FileSeamComponents21_AddRuleBasedPermissionResolver.Title=Seam Security Rule Based Permission Resolver
+
+FileSeamComponents21_AddPersistentPermissionResolver.WindowTitle=Add Persistent Permission Resolver
+FileSeamComponents21_AddPersistentPermissionResolver.Title=Seam Security Persistent Permission Resolver
+
+FileSeamComponents21_AddThemeSelector.WindowTitle=Add Theme Selector
+FileSeamComponents21_AddThemeSelector.Title=Seam Theme Selector
+
+FileSeamComponents21_AddEjb.WindowTitle=Add Ejb
+FileSeamComponents21_AddEjb.Title=Seam Transaction Ejb
+
+FileSeamComponents21_AddEntity.WindowTitle=Add Entity
+FileSeamComponents21_AddEntity.Title=Seam Transaction Entity
+
+FileSeamComponents21_AddHibernate.WindowTitle=Add Hibernate
+FileSeamComponents21_AddHibernate.Title=Seam Transaction Hibernate
+
+FileSeamComponents21_AddNo.WindowTitle=Add No Transaction
+FileSeamComponents21_AddNo.Title=Seam No Transaction
+
+FileSeamComponents21_AddJPAEntityLoader.WindowTitle=Add JPA Entity Loader
+FileSeamComponents21_AddJPAEntityLoader.Title=Seam UIJPA
+
+FileSeamComponents21_AddHibernateEntityLoader.WindowTitle=Add Hibernate Entity Loader
+FileSeamComponents21_AddHibernateEntityLoader.Title=Seam UIHibernate
+
+FileSeamComponents21_AddEntityConverter.WindowTitle=Add Entity Converter
+FileSeamComponents21_AddEntityConverter.Title=Seam UIEntity Converter
+
+FileSeamComponents21_AddContextFilter.WindowTitle=Add Context Filter
+FileSeamComponents21_AddContextFilter.Title=Seam Web Context Filter
+
+FileSeamComponents21_AddExceptionFilter.WindowTitle=Add Exception Filter
+FileSeamComponents21_AddExceptionFilter.Title=Seam Web Exception Filter
+
+FileSeamComponents21_AddMultipartFilter.WindowTitle=Add Multipart Filter
+FileSeamComponents21_AddMultipartFilter.Title=Seam Web Multipart Filter
+
+FileSeamComponents21_AddRedirectFilter.WindowTitle=Add Redirect Filter
+FileSeamComponents21_AddRedirectFilter.Title=Seam Web Redirect Filter
+
+FileSeamComponents21_AddAuthenticationFilter.WindowTitle=Add Authentication Filter
+FileSeamComponents21_AddAuthenticationFilter.Title=Seam Web Authentication Filter
+
+FileSeamComponents21_AddCharacterFilter.WindowTitle=Add Character Encoding Filter
+FileSeamComponents21_AddCharacterFilter.Title=Seam Web Character Filter
+
+FileSeamComponents21_AddAjaxFilter.WindowTitle=Add Ajax For JSF Filter
+FileSeamComponents21_AddAjaxFilter.Title=Seam Web Ajax Filter
+
+FileSeamComponents21_AddLoggingFilter.WindowTitle=Add Logging Filter
+FileSeamComponents21_AddLoggingFilter.Title=Seam Web Logging Filter
+
+FileSeamComponents21_AddSession.WindowTitle=Add Session
+FileSeamComponents21_AddSession.Title=Seam Web Session
+
+FileSeamComponents21_AddIdentityFilter.WindowTitle=Add Identity Filter
+FileSeamComponents21_AddIdentityFilter.Title=Seam Web Identity Filter
+
+FileSeamComponents21_AddWicketFilter.WindowTitle=Add Wicket Filter
+FileSeamComponents21_AddWicketFilter.Title=Seam Web Wicket Filter
+
+FileSeamComponents21_AddWebApplication.WindowTitle=Add Web Application
+FileSeamComponents21_AddWebApplication.Title=Seam Wicket Web App
16 years, 2 months
- 1
- 0
JBoss Tools SVN: r11102 - in workspace: mareshkau and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: mareshkau
Date: 2008-10-23 08:10:42 -0400 (Thu, 23 Oct 2008)
New Revision: 11102
Added:
workspace/mareshkau/xulrunner_1.9.0.3/
Removed:
workspace/xulrunner_1.9.0.3/
Log:
Move XulRunner 1.9.0.3 to mareshkau workspace
Copied: workspace/mareshkau/xulrunner_1.9.0.3 (from rev 11101, workspace/xulrunner_1.9.0.3)
16 years, 2 months
- 1
- 0
JBoss Tools SVN: r11101 - workspace.
by jbosstools-commits＠lists.jboss.org
Author: mareshkau
Date: 2008-10-23 08:03:28 -0400 (Thu, 23 Oct 2008)
New Revision: 11101
Added:
workspace/mareshkau/
Log:
Mareshkau workspace
16 years, 2 months
- 1
- 0
JBoss Tools SVN: r11099 - in trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test: src/org/jboss/tools/jsf/vpe/richfaces/test and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dmaliarevich
Date: 2008-10-23 07:37:29 -0400 (Thu, 23 Oct 2008)
New Revision: 11099
Added:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/separator.xhtml.xml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/simpleTogglePanel.xhtml.xml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/spacer.xhtml.xml
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/separator.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/simpleTogglePanel.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/spacer.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/suggestionbox.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesComponentContentTest.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-2810, tests for rich:separator, rich:spacer, rich:simpleTogglePanel, rich:suggestionbox.
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/separator.xhtml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/separator.xhtml 2008-10-23 10:32:10 UTC (rev 11098)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/separator.xhtml 2008-10-23 11:37:29 UTC (rev 11099)
@@ -10,7 +10,8 @@
</head>
<body>
-<!-- Separator component -->
- <rich:separator height="20"/>
+<f:view>
+ <rich:separator id="separator" height="4" lineType="double" />
+</f:view>
</body>
</html>
\ No newline at end of file
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/separator.xhtml.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/separator.xhtml.xml (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/separator.xhtml.xml 2008-10-23 11:37:29 UTC (rev 11099)
@@ -0,0 +1,9 @@
+<tests>
+ <test id="separator">
+ <DIV ALIGN="left" CLASS="td-parentdiv">
+ <DIV CLASS="separator-color"
+ STYLE="border-style: double; width: 100%;">
+ </DIV>
+ </DIV>
+ </test>
+</tests>
\ No newline at end of file
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/separator.xhtml.xml
___________________________________________________________________
Name: svn:mime-type
+ text/xml
Name: svn:eol-style
+ native
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/simpleTogglePanel.xhtml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/simpleTogglePanel.xhtml 2008-10-23 10:32:10 UTC (rev 11098)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/simpleTogglePanel.xhtml 2008-10-23 11:37:29 UTC (rev 11099)
@@ -10,10 +10,19 @@
</head>
<body>
-<!-- Simple Toggle Panel component -->
-<rich:simpleTogglePanel switchType="client"
- label="Test simple toggle panel">
- This is simple toggle panel
+<f:view>
+ <rich:simpleTogglePanel id="simpleTogglePanel" switchType="client"
+ label="Add AJAX capability to existing JSF applications">
+ The framework is implemented by using a component library. The library
+ set Ajax functionality into existing pages, so there is no need to write
+ any JavaScript code or to replace existing components with new Ajax one.
+ Ajax4jsf enables page-wide Ajax support instead of the traditional
+ component-wide support and it gives the opportunity to define the event
+ on the page. An event invokes an Ajax request and areas of the page
+ which are synchronized with the JSF Component Tree after changing the
+ data on the server by Ajax request in accordance with events fired on
+ the client.
</rich:simpleTogglePanel>
+</f:view>
</body>
</html>
\ No newline at end of file
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/simpleTogglePanel.xhtml.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/simpleTogglePanel.xhtml.xml (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/simpleTogglePanel.xhtml.xml 2008-10-23 11:37:29 UTC (rev 11099)
@@ -0,0 +1,31 @@
+<tests>
+ <test id="simpleTogglePanel">
+ <DIV CLASS="dr-stglpnl rich-stglpanel" STYLE="">
+ <DIV CLASS="dr-stglpnl-h rich-stglpanel-header"
+ STYLE="/position: relative; background-image: url\(.*org.jboss.tools.jsf.vpe.richfaces/resources/common/background.gif\);/"
+ VPE-USER-TOGGLE-ID="false">
+ Add AJAX capability to existing JSF applications
+ <DIV STYLE="position: absolute; top: 0px; right: 5px;"
+ VPE-USER-TOGGLE-ID="false" VPE-USER-TOGGLE-LOOKUP-PARENT="true"> «</DIV>
+ </DIV>
+ <DIV STYLE="overflow: hidden; width: 100%;">
+ <TABLE CELLPADDING="0" STYLE="width: 100%;">
+ <TR>
+ <TD CLASS="dr-stglpnl-b rich-stglpanel-body">
+ <SPAN> The framework is implemented by using a component library.
+ The library set Ajax functionality into existing pages, so there
+ is no need to write any JavaScript code or to replace existing
+ components with new Ajax one. Ajax4jsf enables page-wide Ajax
+ support instead of the traditional component-wide support and it
+ gives the opportunity to define the event on the page. An event
+ invokes an Ajax request and areas of the page which are
+ synchronized with the JSF Component Tree after changing the data
+ on the server by Ajax request in accordance with events fired on
+ the client.</SPAN>
+ </TD>
+ </TR>
+ </TABLE>
+ </DIV>
+ </DIV>
+ </test>
+</tests>
\ No newline at end of file
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/simpleTogglePanel.xhtml.xml
___________________________________________________________________
Name: svn:mime-type
+ text/xml
Name: svn:eol-style
+ native
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/spacer.xhtml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/spacer.xhtml 2008-10-23 10:32:10 UTC (rev 11098)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/spacer.xhtml 2008-10-23 11:37:29 UTC (rev 11099)
@@ -1,16 +1,19 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml"
- xmlns:ui="http://java.sun.com/jsf/facelets"
- xmlns:h="http://java.sun.com/jsf/html"
- xmlns:f="http://java.sun.com/jsf/core"
- xmlns:a4j="http://richfaces.org/a4j"
- xmlns:rich="http://richfaces.org/rich">
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:a4j="http://richfaces.org/a4j"
+ xmlns:rich="http://richfaces.org/rich">
<head>
</head>
<body>
-<!-- Spacer component -->
-<rich:spacer width="720" height="50" />
+<f:view>
+ line1
+ <rich:spacer width="1" height="5" title="Here is a spacer..." />
+ line2
+</f:view>
</body>
</html>
\ No newline at end of file
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/spacer.xhtml.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/spacer.xhtml.xml (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/spacer.xhtml.xml 2008-10-23 11:37:29 UTC (rev 11099)
@@ -0,0 +1,6 @@
+<tests>
+ <test id="spacer">
+ <IMG WIDTH="1" HEIGHT="5"
+ SRC="/.*org.jboss.tools.jsf.vpe.richfaces/resources/spacer/spacer.gif/" />
+ </test>
+</tests>
\ No newline at end of file
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/spacer.xhtml.xml
___________________________________________________________________
Name: svn:mime-type
+ text/xml
Name: svn:eol-style
+ native
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/suggestionbox.xhtml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/suggestionbox.xhtml 2008-10-23 10:32:10 UTC (rev 11098)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/suggestionbox.xhtml 2008-10-23 11:37:29 UTC (rev 11099)
@@ -10,21 +10,28 @@
</head>
<body>
-<!-- Suggestion Box component -->
-<h:inputText value="#{suggestionBox.property}" id="text" />
-<rich:suggestionbox id="suggestionBoxId" for="text" tokens=",["
+<rich:suggestionbox id="suggestionBox" for="text" tokens=",[]"
rules="#{suggestionBox.rules}"
- suggestionAction="#{suggestionBox.autocomplete}" var="result"
- fetchValue="#{result.text}" rows="#{suggestionBox.intRows}"
- first="#{suggestionBox.intFirst}" minChars="#{suggestionBox.minchars}"
+ suggestionAction="#{capitalsBean.autocomplete}" var="result"
+ fetchValue="#{result.name}" first="#{suggestionBox.intFirst}"
+ minChars="#{suggestionBox.minchars}"
shadowOpacity="#{suggestionBox.shadowOpacity}"
border="#{suggestionBox.border}" width="#{suggestionBox.width}"
height="#{suggestionBox.height}"
shadowDepth="#{suggestionBox.shadowDepth}"
- cellpadding="#{suggestionBox.cellpadding}">
+ cellpadding="#{suggestionBox.cellpadding}"
+ nothingLabel="No capitals found" usingSuggestObjects="true"
+ onobjectchange="processObjectsChange(suggestion)">
+
<h:column>
- <h:outputText value="#{result.text}" />
+ <h:graphicImage value="#{result.stateFlag}" />
</h:column>
+ <h:column>
+ <h:outputText value="#{result.name}" />
+ </h:column>
+ <h:column>
+ <h:outputText value="#{result.state}" style="font-style:italic" />
+ </h:column>
</rich:suggestionbox>
</body>
</html>
\ No newline at end of file
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesComponentContentTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesComponentContentTest.java 2008-10-23 10:32:10 UTC (rev 11098)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesComponentContentTest.java 2008-10-23 11:37:29 UTC (rev 11099)
@@ -256,19 +256,19 @@
}
public void testSeparator() throws Throwable {
- assertTrue("it is necessary to add a body of the test ", false);//$NON-NLS-1$
+ performContentTest("components/separator.xhtml");//$NON-NLS-1$
}
public void testSimpleTogglePanel() throws Throwable {
- assertTrue("it is necessary to add a body of the test ", false);//$NON-NLS-1$
+ performContentTest("components/simpleTogglePanel.xhtml");//$NON-NLS-1$
}
public void testSpacer() throws Throwable {
- assertTrue("it is necessary to add a body of the test ", false);//$NON-NLS-1$
+ performContentTest("components/spacer.xhtml");//$NON-NLS-1$
}
public void testSuggestionbox() throws Throwable {
- assertTrue("it is necessary to add a body of the test ", false);//$NON-NLS-1$
+ performInvisibleTagTest("components/suggestionbox.xhtml", "suggestionBox"); //$NON-NLS-1$ //$NON-NLS-2$
}
public void testTabPanel() throws Throwable {
16 years, 2 months
- 1
- 0
JBoss Tools SVN: r11098 - in branches/jbosstools-3.0.0.Beta1/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core: src/org/jboss/tools/hibernate/jpt/core/internal/context and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dgeraskov
Date: 2008-10-23 06:32:10 -0400 (Thu, 23 Oct 2008)
New Revision: 11098
Added:
branches/jbosstools-3.0.0.Beta1/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/Messages.java
branches/jbosstools-3.0.0.Beta1/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/messages.properties
Modified:
branches/jbosstools-3.0.0.Beta1/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/META-INF/MANIFEST.MF
branches/jbosstools-3.0.0.Beta1/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/HibernatePersistenceUnit.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-2976
Modified: branches/jbosstools-3.0.0.Beta1/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/META-INF/MANIFEST.MF
===================================================================
--- branches/jbosstools-3.0.0.Beta1/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/META-INF/MANIFEST.MF 2008-10-23 10:27:41 UTC (rev 11097)
+++ branches/jbosstools-3.0.0.Beta1/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/META-INF/MANIFEST.MF 2008-10-23 10:32:10 UTC (rev 11098)
@@ -7,7 +7,8 @@
org.eclipse.core.runtime,
org.eclipse.jpt.core,
org.eclipse.wst.validation,
- org.eclipse.jpt.utility;bundle-version="1.2.0"
+ org.eclipse.jpt.utility;bundle-version="1.2.0",
+ org.eclipse.core.resources;bundle-version="3.4.0"
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-Vendor: Hibernate Team
Export-Package: org.jboss.tools.hibernate.jpt.core.internal,
Modified: branches/jbosstools-3.0.0.Beta1/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/HibernatePersistenceUnit.java
===================================================================
--- branches/jbosstools-3.0.0.Beta1/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/HibernatePersistenceUnit.java 2008-10-23 10:27:41 UTC (rev 11097)
+++ branches/jbosstools-3.0.0.Beta1/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/HibernatePersistenceUnit.java 2008-10-23 10:32:10 UTC (rev 11098)
@@ -10,16 +10,27 @@
******************************************************************************/
package org.jboss.tools.hibernate.jpt.core.internal.context;
+import java.io.File;
+import java.util.List;
+
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.Path;
import org.eclipse.jpt.core.context.persistence.Persistence;
+import org.eclipse.jpt.core.context.persistence.Property;
import org.eclipse.jpt.core.internal.context.persistence.GenericPersistenceUnit;
import org.eclipse.jpt.core.resource.persistence.XmlPersistenceUnit;
+import org.eclipse.wst.validation.internal.core.Message;
+import org.eclipse.wst.validation.internal.provisional.core.IMessage;
import org.jboss.tools.hibernate.jpt.core.internal.context.basic.BasicHibernateProperties;
/**
* @author Dmitry Geraskov
*
*/
-public class HibernatePersistenceUnit extends GenericPersistenceUnit {
+public class HibernatePersistenceUnit extends GenericPersistenceUnit
+ implements Messages{
private HibernateProperties hibernateProperties;
@@ -42,4 +53,53 @@
return this.hibernateProperties.getBasicHibernate();
}
+ // ********** Validation ***********************************************
+ @Override
+ public void addToMessages(List<IMessage> messages) {
+ super.addToMessages(messages);
+ addFileNotExistsMessages(messages);
+ }
+
+ protected void addFileNotExistsMessages(List<IMessage> messages) {
+ String configFile = getBasicProperties().getConfigurationFile();
+ if (configFile != null && configFile.length() > 0){
+ IPath path = new Path(configFile);
+
+ if (new File(path.toOSString()).exists()) return;
+
+
+ IResource res= ResourcesPlugin.getWorkspace().getRoot().findMember(path);
+ if (res != null) {
+ int resType= res.getType();
+ if (resType != IResource.FILE) {
+ Property prop = getProperty(BasicHibernateProperties.HIBERNATE_CONFIG_FILE);
+ IMessage message = new HibernateMessage(IMessage.HIGH_SEVERITY,
+ NOT_A_FILE, new String[]{configFile}, getResource());
+ message.setLineNo(prop.getValidationTextRange().getLineNumber());
+ messages.add(message);
+ }
+ } else {
+ Property prop = getProperty(BasicHibernateProperties.HIBERNATE_CONFIG_FILE);
+ IMessage message = new HibernateMessage(IMessage.HIGH_SEVERITY,
+ FILE_NOT_FOUND, new String[]{configFile}, getResource());
+ message.setLineNo(prop.getValidationTextRange().getLineNumber());
+ messages.add(message);
+ }
+ }
+ }
}
+
+/*Fixes the problem with class loader*/
+class HibernateMessage extends Message {
+
+ /**
+ * @param aSeverity
+ * @param anId
+ * @param aParams
+ * @param aTargetObject
+ */
+ public HibernateMessage(int aSeverity, String anId, String[] aParams, Object aTargetObject) {
+ super(Messages.class.getName(), aSeverity, anId, aParams, aTargetObject);
+ }
+
+}
Added: branches/jbosstools-3.0.0.Beta1/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/Messages.java
===================================================================
--- branches/jbosstools-3.0.0.Beta1/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/Messages.java (rev 0)
+++ branches/jbosstools-3.0.0.Beta1/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/Messages.java 2008-10-23 10:32:10 UTC (rev 11098)
@@ -0,0 +1,23 @@
+/*******************************************************************************
+ * Copyright (c) 2007-2008 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributor:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.hibernate.jpt.core.internal.context;
+
+/**
+ * @author Dmitry Geraskov
+ *
+ */
+public interface Messages {
+
+ String NOT_A_FILE = "not_a_file";
+
+ String FILE_NOT_FOUND = "file_not_found";
+
+}
Property changes on: branches/jbosstools-3.0.0.Beta1/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/Messages.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ Author Id Revision Date
Name: svn:eol-style
+ native
Added: branches/jbosstools-3.0.0.Beta1/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/messages.properties
===================================================================
--- branches/jbosstools-3.0.0.Beta1/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/messages.properties (rev 0)
+++ branches/jbosstools-3.0.0.Beta1/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/messages.properties 2008-10-23 10:32:10 UTC (rev 11098)
@@ -0,0 +1,2 @@
+not_a_file= Resource \"{0}\" is not a file.
+file_not_found = File \"{0}\" not found.
\ No newline at end of file
Property changes on: branches/jbosstools-3.0.0.Beta1/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/messages.properties
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
16 years, 2 months
- 1
- 0