JBoss Tools SVN: r14220 - trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/collect.
by jbosstools-commits＠lists.jboss.org
Author: dgeraskov
Date: 2009-03-16 10:47:01 -0400 (Mon, 16 Mar 2009)
New Revision: 14220
Modified:
trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/collect/CollectEntityInfo.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-4028
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/collect/CollectEntityInfo.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/collect/CollectEntityInfo.java 2009-03-16 14:31:53 UTC (rev 14219)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/collect/CollectEntityInfo.java 2009-03-16 14:47:01 UTC (rev 14220)
@@ -317,15 +317,15 @@
return true;
}
// -) is it setter?
- if (node.getName().getIdentifier().startsWith("set")
- && node.parameters().size() == 1) { //$NON-NLS-1$
+ if (node.getName().getIdentifier().startsWith("set")//$NON-NLS-1$
+ && node.parameters().size() == 1) {
// setter - do not process it
return true;
}
// +) is it getter?
- if (!(node.getName().getIdentifier().startsWith("get")
- || node.getName().getIdentifier().startsWith("is"))
- || node.parameters().size() > 0) { //$NON-NLS-1$
+ if (!(node.getName().getIdentifier().startsWith("get")//$NON-NLS-1$
+ || node.getName().getIdentifier().startsWith("is"))//$NON-NLS-1$
+ || node.parameters().size() > 0) {
// not the getter - do not process it
return true;
}
@@ -335,7 +335,16 @@
// 5) try to define name
String returnIdentifier = getReturnIdentifier(node);
List<String> list = new ArrayList<String>();
- list.add(returnIdentifier);
+ if (returnIdentifier != null){
+ list.add(returnIdentifier);
+ } else {
+ //this need to do not lost primiry id
+ //and add references for interface
+ if (entityInfo.isInterfaceFlag()){
+ String probablyFieldName = Utils.getFieldNameByGetter(node);
+ list.add(probablyFieldName);
+ }
+ }
// process it as a field declaration
boolean res = processFieldOrGetter(type, list);
return res;
16 years, 9 months
- 1
- 0
JBoss Tools SVN: r14219 - trunk/common/plugins/org.jboss.tools.common.kb/schemas/tld.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2009-03-16 10:31:53 -0400 (Mon, 16 Mar 2009)
New Revision: 14219
Modified:
trunk/common/plugins/org.jboss.tools.common.kb/schemas/tld/JBossSeam2_0.xml
Log:
https://jira.jboss.org/jira/browse/JBIDE-4021
Modified: trunk/common/plugins/org.jboss.tools.common.kb/schemas/tld/JBossSeam2_0.xml
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.kb/schemas/tld/JBossSeam2_0.xml 2009-03-16 14:29:23 UTC (rev 14218)
+++ trunk/common/plugins/org.jboss.tools.common.kb/schemas/tld/JBossSeam2_0.xml 2009-03-16 14:31:53 UTC (rev 14219)
@@ -458,6 +458,9 @@
<proposal type="beanProperty"/>
<proposal type="bundleProperty"/>
<proposal type="jsfVariables"/>
+ <proposal type="file">
+ <param name="extensions" value="%page%"/>
+ </proposal>
</attribute-type>
<attribute type="template"/>
<attribute-type name="style" required="false">
16 years, 9 months
- 1
- 0
JBoss Tools SVN: r14218 - in trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test: src/org/jboss/tools/jsf/vpe/seam/test and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dmaliarevich
Date: 2009-03-16 10:29:23 -0400 (Mon, 16 Mar 2009)
New Revision: 14218
Added:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/resources/SeamTest/WebContent/pages/components/cache.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/resources/SeamTest/WebContent/pages/components/conversationId.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/resources/SeamTest/WebContent/pages/components/conversationPropagation.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/resources/SeamTest/WebContent/pages/components/convertDateTime.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/resources/SeamTest/WebContent/pages/components/convertEntity.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/resources/SeamTest/WebContent/pages/components/convertEnum.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/resources/SeamTest/WebContent/pages/components/defaultAction.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/resources/SeamTest/WebContent/pages/components/enumItem.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/resources/SeamTest/WebContent/pages/components/fileUpload.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/resources/SeamTest/WebContent/pages/components/fragment.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/resources/SeamTest/WebContent/pages/components/graphicImage.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/resources/SeamTest/WebContent/pages/components/remote.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/resources/SeamTest/WebContent/pages/components/selectItems.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/resources/SeamTest/WebContent/pages/components/validate.xhtml
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/resources/SeamTest/WebContent/pages/components/seamtest.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/src/org/jboss/tools/jsf/vpe/seam/test/SeamComponentTest.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-3697, JUnits for seam components.
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/resources/SeamTest/WebContent/pages/components/cache.xhtml
===================================================================
(Binary files differ)
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/resources/SeamTest/WebContent/pages/components/cache.xhtml
___________________________________________________________________
Name: svn:mime-type
+ application/xhtml+xml
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/resources/SeamTest/WebContent/pages/components/conversationId.xhtml
===================================================================
(Binary files differ)
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/resources/SeamTest/WebContent/pages/components/conversationId.xhtml
___________________________________________________________________
Name: svn:mime-type
+ application/xhtml+xml
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/resources/SeamTest/WebContent/pages/components/conversationPropagation.xhtml
===================================================================
(Binary files differ)
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/resources/SeamTest/WebContent/pages/components/conversationPropagation.xhtml
___________________________________________________________________
Name: svn:mime-type
+ application/xhtml+xml
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/resources/SeamTest/WebContent/pages/components/convertDateTime.xhtml
===================================================================
(Binary files differ)
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/resources/SeamTest/WebContent/pages/components/convertDateTime.xhtml
___________________________________________________________________
Name: svn:mime-type
+ application/xhtml+xml
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/resources/SeamTest/WebContent/pages/components/convertEntity.xhtml
===================================================================
(Binary files differ)
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/resources/SeamTest/WebContent/pages/components/convertEntity.xhtml
___________________________________________________________________
Name: svn:mime-type
+ application/xhtml+xml
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/resources/SeamTest/WebContent/pages/components/convertEnum.xhtml
===================================================================
(Binary files differ)
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/resources/SeamTest/WebContent/pages/components/convertEnum.xhtml
___________________________________________________________________
Name: svn:mime-type
+ application/xhtml+xml
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/resources/SeamTest/WebContent/pages/components/defaultAction.xhtml
===================================================================
(Binary files differ)
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/resources/SeamTest/WebContent/pages/components/defaultAction.xhtml
___________________________________________________________________
Name: svn:mime-type
+ application/xhtml+xml
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/resources/SeamTest/WebContent/pages/components/enumItem.xhtml
===================================================================
(Binary files differ)
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/resources/SeamTest/WebContent/pages/components/enumItem.xhtml
___________________________________________________________________
Name: svn:mime-type
+ application/xhtml+xml
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/resources/SeamTest/WebContent/pages/components/fileUpload.xhtml
===================================================================
(Binary files differ)
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/resources/SeamTest/WebContent/pages/components/fileUpload.xhtml
___________________________________________________________________
Name: svn:mime-type
+ application/xhtml+xml
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/resources/SeamTest/WebContent/pages/components/fragment.xhtml
===================================================================
(Binary files differ)
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/resources/SeamTest/WebContent/pages/components/fragment.xhtml
___________________________________________________________________
Name: svn:mime-type
+ application/xhtml+xml
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/resources/SeamTest/WebContent/pages/components/graphicImage.xhtml
===================================================================
(Binary files differ)
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/resources/SeamTest/WebContent/pages/components/graphicImage.xhtml
___________________________________________________________________
Name: svn:mime-type
+ application/xhtml+xml
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/resources/SeamTest/WebContent/pages/components/remote.xhtml
===================================================================
(Binary files differ)
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/resources/SeamTest/WebContent/pages/components/remote.xhtml
___________________________________________________________________
Name: svn:mime-type
+ application/xhtml+xml
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/resources/SeamTest/WebContent/pages/components/seamtest.xhtml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/resources/SeamTest/WebContent/pages/components/seamtest.xhtml 2009-03-16 14:01:22 UTC (rev 14217)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/resources/SeamTest/WebContent/pages/components/seamtest.xhtml 2009-03-16 14:29:23 UTC (rev 14218)
@@ -8,25 +8,164 @@
<body>
<s:button>
</s:button>
-
+
+<h1>s:cache</h1>
+<s:cache key="entry" region="pageFragments"
+ enabled="#{testClass.trueBoolean}">
+ <div class="blogEntry">
+ <h3>blogEntry.title</h3>
+ <div><s:formattedText value="blogEntry.body" /></div>
+ </div>
+</s:cache>
+
+<h1>s:conversationId</h1>
+<h:form>
+ <h:commandLink>
+ <h:outputText value="link" />
+ <s:conversationId>1</s:conversationId>
+ </h:commandLink>
+</h:form>
+<h1>s:conversationPropagation</h1>
+
+<h:commandButton value="Apply" action="personHome.update">
+ <s:conversationPropagation type="join" />
+</h:commandButton>
+
+<h1>s:convertDateTime</h1>
+<h:outputText value="#{testClass.date}">
+ <s:convertDateTime type="both" dateStyle="full" />
+</h:outputText>
+
+<h1>s:convertEntity</h1>
+
+<h:selectOneMenu>
+ <s:selectItems value="#{testClass.list}" var="item" label="item" />
+ <f:converter converterId="myEntityConverter" />
+</h:selectOneMenu>
+
+<h:selectOneMenu required="true">
+ <s:selectItems value="#{testClass.list}" var="item" label="item"
+ noSelectionLabel="Please Select..." />
+ <s:convertEntity />
+</h:selectOneMenu>
+
+<h1>s:convertEnum</h1>
+<h:selectOneMenu>
+ <s:selectItems value="#{testClass.list}" var="item " label="item"
+ noSelectionLabel="Please select" />
+ <s:enumItem enumValue="ONCE" label="Only Once" />
+ <s:enumItem enumValue="EVERY_MINUTE" label="Every Minute" />
+ <s:enumItem enumValue="HOURLY" label="Every Hour" />
+ <s:convertEnum />
+</h:selectOneMenu>
+
+<h1>s:decorate</h1>
<s:decorate template="insert.xhtml">
</s:decorate>
+<h1>s:div</h1>
<s:div>
- </s:div>
-
- <s:formattedText value="#{blog.text}"/>
-
- <s:label styleClass="#{invalid?'error':''}">
+</s:div>
+
+<h1>s:defaultAction</h1>
+<h:commandButton id="foo" value="Foo" action="#{testClass.someAction}">
+ <s:defaultAction />
+</h:commandButton>
+
+<h1>s:enumItem</h1>
+<h:selectOneRadio id="radioList" layout="lineDirection" value="ONCE">
+ <s:enumItem enumValue="ONCE" label="Only Once" />
+ <s:enumItem enumValue="EVERY_MINUTE" label="Every Minute" />
+ <s:enumItem enumValue="HOURLY" label="Every Hour" />
+ <s:enumItem enumValue="DAILY" label="Every Day" />
+ <s:enumItem enumValue="WEEKLY" label="Every Week" />
+ <s:enumItem itemValue="WEEKLY" itemLabel="Every Week2" />
+ <s:enumItem itemValue="WEEKLY" itemLabel="iL-Every Week"
+ enumValue="WEEKLY" label="l-Every Week" />
+ <s:enumItem itemValue="WEEKLY" enumValue="WEEKLY" label="l-Every Week" />
+ <s:enumItem enumValue="WEEKLY" label="l-Every Week" />
+ <s:enumItem enumValue="WEEKLY" />
+
+</h:selectOneRadio>
+
+<h:selectManyListbox id="radioList" layout="lineDirection" value="ONCE">
+ <s:enumItem itemValue="WEEKLY" itemLabel="iL-Every Week"
+ enumValue="WEEKLY" label="l-Every Week" />
+
+ <s:enumItem enumValue="ONCE" label="Only Once" />
+ <s:enumItem enumValue="EVERY_MINUTE" label="Every Minute" />
+ <s:enumItem enumValue="HOURLY" label="Every Hour" />
+ <s:enumItem enumValue="DAILY" label="Every Day" />
+ <s:enumItem enumValue="WEEKLY" label="Every Week" />
+</h:selectManyListbox>
+
+
+<h:selectManyCheckbox id="radioList" layout="lineDirection" value="ONCE">
+ <s:enumItem itemValue="WEEKLY" itemLabel="iL-Every Week"
+ enumValue="WEEKLY" label="l-Every Week" />
+
+ <s:enumItem enumValue="ONCE" label="Only Once" />
+ <s:enumItem enumValue="EVERY_MINUTE" label="Every Minute" />
+ <s:enumItem enumValue="HOURLY" label="Every Hour" />
+ <s:enumItem enumValue="DAILY" label="Every Day" />
+ <s:enumItem enumValue="WEEKLY" label="Every Week" />
+</h:selectManyCheckbox>
+
+<h1>s:fileUpload</h1>
+<s:fileUpload>
+</s:fileUpload>
+
+<h1>s:formattedText</h1>
+<s:formattedText value="#{blog.text}" />
+
+<h1>s:fragment</h1>
+<s:fragment rendered="tr">
+ Current bid:
+ </s:fragment>
+
+<h1>s:graphicImage</h1>
+<s:graphicImage rendered="#{testClass.trueBoolean}" value="some value">
+ <s:transformImageSize width="200" maintainRatio="true" />
+</s:graphicImage>
+
+<h1>s:label</h1>
+<s:label styleClass="#{invalid?'error':''}">
Label
</s:label>
+<h1>s:link</h1>
+<s:link view="/login.xhtml" value="Link" />
-<s:link view="/login.xhtml" value="Link"/>
-
+<h1>s:message</h1>
<s:message styleClass="error" />
+<h1>s:remote</h1>
+<s:remote include="customerAction,accountAction,com.acme.MyBean" />
+
+<h1>s:selectItems</h1>
+<h:selectOneMenu>
+ <s:selectItems value="#{testClass.list}" var="list" label="list" />
+</h:selectOneMenu>
+
+<h1>s:span</h1>
<s:span styleClass="required" rendered="#{required}">*</s:span>
-<s:validateAll></s:validateAll>
+<h1>s:selectDate</h1>
+<div class="row"><h:outputLabel for="dob">Date of birth<em>*</em>
+</h:outputLabel> <h:inputText id="dob" value="user.dob" required="true">
+ <s:convertDateTime pattern="MM/dd/yyyy" />
+</h:inputText> <s:selectDate for="dob" startYear="1910" endYear="2007">
+ <img src="img/datepicker.png" />
+</s:selectDate>
+<div class="validationError"><h:message for="dob" /></div>
+</div>
+
+<h1>s:validate</h1>
+<h:inputText id="userName" required="true" value="#{testClass.name}">
+ <s:validate />
+</h:inputText>
+
+<h1>s:validateAll</h1>
+<s:validateAll></s:validateAll>
+
</body>
</html>
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/resources/SeamTest/WebContent/pages/components/selectItems.xhtml
===================================================================
(Binary files differ)
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/resources/SeamTest/WebContent/pages/components/selectItems.xhtml
___________________________________________________________________
Name: svn:mime-type
+ application/xhtml+xml
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/resources/SeamTest/WebContent/pages/components/validate.xhtml
===================================================================
(Binary files differ)
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/resources/SeamTest/WebContent/pages/components/validate.xhtml
___________________________________________________________________
Name: svn:mime-type
+ application/xhtml+xml
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/src/org/jboss/tools/jsf/vpe/seam/test/SeamComponentTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/src/org/jboss/tools/jsf/vpe/seam/test/SeamComponentTest.java 2009-03-16 14:01:22 UTC (rev 14217)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/src/org/jboss/tools/jsf/vpe/seam/test/SeamComponentTest.java 2009-03-16 14:29:23 UTC (rev 14218)
@@ -23,56 +23,132 @@
public class SeamComponentTest extends VpeTest {
// import project name
- public static final String IMPORT_PROJECT_NAME = "SeamTest";
+ public static final String IMPORT_PROJECT_NAME = "SeamTest"; //$NON-NLS-1$
public SeamComponentTest(String name) {
super(name);
setCheckWarning(false);
}
- public void testButton() throws Throwable {
+ public void testCache() throws Throwable {
performTestForVpeComponent((IFile) TestUtil.getComponentPath(
- "components/button.xhtml", IMPORT_PROJECT_NAME)); // $NON-NLS-1$
+ "components/cache.xhtml", IMPORT_PROJECT_NAME)); //$NON-NLS-1$
}
+
+ public void testConversationId() throws Throwable {
+ performTestForVpeComponent((IFile) TestUtil.getComponentPath(
+ "components/conversationId.xhtml", IMPORT_PROJECT_NAME)); //$NON-NLS-1$
+ }
+
+ public void testConversationPropagation() throws Throwable {
+ performTestForVpeComponent((IFile) TestUtil.getComponentPath(
+ "components/conversationPropagation.xhtml", IMPORT_PROJECT_NAME)); //$NON-NLS-1$
+ }
+
+ public void testConvertDateTime() throws Throwable {
+ performTestForVpeComponent((IFile) TestUtil.getComponentPath(
+ "components/convertDateTime.xhtml", IMPORT_PROJECT_NAME)); //$NON-NLS-1$
+ }
+
+ public void testConvertEntity() throws Throwable {
+ performTestForVpeComponent((IFile) TestUtil.getComponentPath(
+ "components/convertEntity.xhtml", IMPORT_PROJECT_NAME)); //$NON-NLS-1$
+ }
+
+ public void testConvertEnum() throws Throwable {
+ performTestForVpeComponent((IFile) TestUtil.getComponentPath(
+ "components/convertEnum.xhtml", IMPORT_PROJECT_NAME)); //$NON-NLS-1$
+ }
public void testDecorate() throws Throwable {
performTestForVpeComponent((IFile) TestUtil.getComponentPath(
- "components/decorate.xhtml", IMPORT_PROJECT_NAME)); // $NON-NLS-1$
+ "components/decorate.xhtml", IMPORT_PROJECT_NAME)); //$NON-NLS-1$
}
public void testDiv() throws Throwable {
performTestForVpeComponent((IFile) TestUtil.getComponentPath(
- "components/div.xhtml", IMPORT_PROJECT_NAME)); // $NON-NLS-1$
+ "components/div.xhtml", IMPORT_PROJECT_NAME)); //$NON-NLS-1$
}
+
+ public void testDefaultAction() throws Throwable {
+ performTestForVpeComponent((IFile) TestUtil.getComponentPath(
+ "components/defaultAction.xhtml", IMPORT_PROJECT_NAME)); //$NON-NLS-1$
+ }
+
+ public void testEnumItem() throws Throwable {
+ performTestForVpeComponent((IFile) TestUtil.getComponentPath(
+ "components/enumItem.xhtml", IMPORT_PROJECT_NAME)); //$NON-NLS-1$
+ }
+
+ public void testFileUpload() throws Throwable {
+ performTestForVpeComponent((IFile) TestUtil.getComponentPath(
+ "components/fileUpload.xhtml", IMPORT_PROJECT_NAME)); //$NON-NLS-1$
+ }
+
public void testFormattedText() throws Throwable {
performTestForVpeComponent((IFile) TestUtil.getComponentPath(
- "components/formattedText.xhtml", IMPORT_PROJECT_NAME)); // $NON-NLS-1$
+ "components/formattedText.xhtml", IMPORT_PROJECT_NAME)); //$NON-NLS-1$
}
-
- public void testSpan() throws Throwable {
+
+ public void testFragment() throws Throwable {
performTestForVpeComponent((IFile) TestUtil.getComponentPath(
- "components/span.xhtml", IMPORT_PROJECT_NAME)); // $NON-NLS-1$
+ "components/fragment.xhtml", IMPORT_PROJECT_NAME)); //$NON-NLS-1$
}
-
+
+ public void testGraphicImage() throws Throwable {
+ performTestForVpeComponent((IFile) TestUtil.getComponentPath(
+ "components/graphicImage.xhtml", IMPORT_PROJECT_NAME)); //$NON-NLS-1$
+ }
+
public void testLabel() throws Throwable {
performTestForVpeComponent((IFile) TestUtil.getComponentPath(
- "components/label.xhtml", IMPORT_PROJECT_NAME)); // $NON-NLS-1$
+ "components/label.xhtml", IMPORT_PROJECT_NAME)); //$NON-NLS-1$
}
-
+
public void testLink() throws Throwable {
performTestForVpeComponent((IFile) TestUtil.getComponentPath(
- "components/link.xhtml", IMPORT_PROJECT_NAME)); // $NON-NLS-1$
+ "components/link.xhtml", IMPORT_PROJECT_NAME)); //$NON-NLS-1$
}
-
+
public void testMessage() throws Throwable {
performTestForVpeComponent((IFile) TestUtil.getComponentPath(
- "components/message.xhtml", IMPORT_PROJECT_NAME)); // $NON-NLS-1$
+ "components/message.xhtml", IMPORT_PROJECT_NAME)); //$NON-NLS-1$
}
+
+ public void testRemote() throws Throwable {
+ performTestForVpeComponent((IFile) TestUtil.getComponentPath(
+ "components/remote.xhtml", IMPORT_PROJECT_NAME)); //$NON-NLS-1$
+ }
+
+ public void testSelectDate() throws Throwable {
+ performTestForVpeComponent((IFile) TestUtil.getComponentPath(
+ "components/message.xhtml", IMPORT_PROJECT_NAME)); //$NON-NLS-1$
+ }
+
+ public void testSelectItems() throws Throwable {
+ performTestForVpeComponent((IFile) TestUtil.getComponentPath(
+ "components/message.xhtml", IMPORT_PROJECT_NAME)); //$NON-NLS-1$
+ }
+
+ public void testValidate() throws Throwable {
+ performTestForVpeComponent((IFile) TestUtil.getComponentPath(
+ "components/validate.xhtml", IMPORT_PROJECT_NAME)); //$NON-NLS-1$
+ }
+ public void testSpan() throws Throwable {
+ performTestForVpeComponent((IFile) TestUtil.getComponentPath(
+ "components/span.xhtml", IMPORT_PROJECT_NAME)); //$NON-NLS-1$
+ }
+
+ public void testValidateAll() throws Throwable {
+ performTestForVpeComponent((IFile) TestUtil.getComponentPath(
+ "components/validateAll.xhtml", IMPORT_PROJECT_NAME)); //$NON-NLS-1$
+ }
+
public void testAllComponentsOnSinglePage() throws Throwable {
performTestForVpeComponent((IFile) TestUtil.getComponentPath(
- "components/seamtest.xhtml", IMPORT_PROJECT_NAME)); // $NON-NLS-1$
+ "components/seamtest.xhtml", IMPORT_PROJECT_NAME)); //$NON-NLS-1$
}
}
16 years, 9 months
- 1
- 0
JBoss Tools SVN: r14217 - in trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa: common and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dgeraskov
Date: 2009-03-16 10:01:22 -0400 (Mon, 16 Mar 2009)
New Revision: 14217
Modified:
trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/collect/CollectEntityInfo.java
trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/common/Utils.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-4028
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/collect/CollectEntityInfo.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/collect/CollectEntityInfo.java 2009-03-16 12:51:31 UTC (rev 14216)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/collect/CollectEntityInfo.java 2009-03-16 14:01:22 UTC (rev 14217)
@@ -14,10 +14,11 @@
import java.util.Iterator;
import java.util.List;
+import org.eclipse.core.runtime.Assert;
import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.core.dom.Annotation;
import org.eclipse.jdt.core.dom.ASTNode;
import org.eclipse.jdt.core.dom.ASTVisitor;
+import org.eclipse.jdt.core.dom.Annotation;
import org.eclipse.jdt.core.dom.ArrayType;
import org.eclipse.jdt.core.dom.CompilationUnit;
import org.eclipse.jdt.core.dom.FieldAccess;
@@ -45,6 +46,7 @@
import org.hibernate.eclipse.jdt.ui.internal.jpa.common.EntityInfo;
import org.hibernate.eclipse.jdt.ui.internal.jpa.common.JPAConst;
import org.hibernate.eclipse.jdt.ui.internal.jpa.common.RefType;
+import org.hibernate.eclipse.jdt.ui.internal.jpa.common.Utils;
/**
* Visitor to collect information about JPA entity.
@@ -65,7 +67,7 @@
public boolean visit(CompilationUnit node) {
entityInfo.setFullyQualifiedName(
node.getTypeRoot().findPrimaryType().getFullyQualifiedName());
- if (node.getProblems().length > 0) {
+ if (node.getProblems().length > 0) {//this includes warnings too
entityInfo.setCompilerProblemsFlag(true);
}
return true;
@@ -262,6 +264,7 @@
while (it.hasNext()) {
Object obj = it.next();
if (obj instanceof SimpleType) {
+ //TODO process interfaces
SimpleType st = (SimpleType)obj;
String fullyQualifiedName = st.getName().getFullyQualifiedName();
if (JPAConst.IMPORT_SERIALIZABLE.compareTo(fullyQualifiedName) == 0) {
@@ -314,12 +317,15 @@
return true;
}
// -) is it setter?
- if (node.getName().getIdentifier().startsWith("set")) { //$NON-NLS-1$
+ if (node.getName().getIdentifier().startsWith("set")
+ && node.parameters().size() == 1) { //$NON-NLS-1$
// setter - do not process it
return true;
}
// +) is it getter?
- if (!node.getName().getIdentifier().startsWith("get")) { //$NON-NLS-1$
+ if (!(node.getName().getIdentifier().startsWith("get")
+ || node.getName().getIdentifier().startsWith("is"))
+ || node.parameters().size() > 0) { //$NON-NLS-1$
// not the getter - do not process it
return true;
}
@@ -392,15 +398,42 @@
}
} else if (type.isArrayType()) {
ArrayType at = (ArrayType)type;
- ITypeBinding tb = at.resolveBinding();
+ Type componentType = at;
+ while (componentType.isArrayType()){
+ componentType = ((ArrayType)componentType).getComponentType();
+ }
+ ITypeBinding tb = componentType.resolveBinding();
+ if (tb != null) {
+ if (tb.getJavaElement() instanceof SourceType) {
+ String entityFullyQualifiedName = ""; //$NON-NLS-1$
+ SourceType sourceT = (SourceType)tb.getJavaElement();
+ try {
+ entityFullyQualifiedName = sourceT.getFullyQualifiedParameterizedName();
+ } catch (JavaModelException e) {
+ HibernateConsolePlugin.getDefault().logErrorMessage("JavaModelException: ", e); //$NON-NLS-1$
+ }
+ entityInfo.addDependency(entityFullyQualifiedName);
+ Iterator itVarNames = list.iterator();
+ while (itVarNames.hasNext()) {
+ String name = (String)itVarNames.next();
+ entityInfo.addReference(name, entityFullyQualifiedName, RefType.ONE2MANY);
+ }
+ }
+ }
} else if (type.isParameterizedType()) {
ParameterizedType pt = (ParameterizedType)type;
Type typeP = (Type)pt.getType();
ITypeBinding tb = typeP.resolveBinding();
if (tb != null) {
- ITypeBinding[] interfaces = tb.getTypeDeclaration().getInterfaces();
+ ITypeBinding[] interfaces = Utils.getAllInterfaces(tb);
String fullyQualifiedNameTypeName = ""; //$NON-NLS-1$
- for (int i = 0; i < interfaces.length; i++) {
+ if (Utils.isImplementInterface(interfaces, "java.util.Collection")){//$NON-NLS-1$
+ fullyQualifiedNameTypeName = "java.util.Collection";//$NON-NLS-1$
+ }
+ if (Utils.isImplementInterface(interfaces, "java.util.Map")){//$NON-NLS-1$
+ fullyQualifiedNameTypeName = "java.util.Map";//$NON-NLS-1$
+ }
+ /*for (int i = 0; i < interfaces.length; i++) {
if (interfaces[i].getJavaElement() instanceof BinaryType) {
BinaryType binaryT = (BinaryType)interfaces[i].getJavaElement();
String tmp = binaryT.getFullyQualifiedName('.');
@@ -409,7 +442,7 @@
break;
}
}
- }
+ }*/
if (fullyQualifiedNameTypeName.length() > 0) {
Iterator typeArgsIt = pt.typeArguments().iterator();
while (typeArgsIt.hasNext()) {
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/common/Utils.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/common/Utils.java 2009-03-16 12:51:31 UTC (rev 14216)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/common/Utils.java 2009-03-16 14:01:22 UTC (rev 14217)
@@ -24,6 +24,8 @@
import org.eclipse.jdt.core.JavaModelException;
import org.eclipse.jdt.core.dom.AST;
import org.eclipse.jdt.core.dom.ASTParser;
+import org.eclipse.jdt.core.dom.ITypeBinding;
+import org.eclipse.jdt.core.dom.MethodDeclaration;
/**
* Compilation unit common functions
@@ -43,6 +45,15 @@
static public ICompilationUnit findCompilationUnit(IJavaProject javaProject,
String fullyQualifiedName) {
+ IType lwType = findType(javaProject, fullyQualifiedName);
+ if (lwType != null) {
+ return lwType.getCompilationUnit();
+ }
+ return null;
+ }
+
+ static public IType findType(IJavaProject javaProject,
+ String fullyQualifiedName) {
IType lwType = null;
try {
lwType = javaProject.findType(fullyQualifiedName);
@@ -50,11 +61,7 @@
// just ignore it!
//HibernateConsolePlugin.getDefault().logErrorMessage("JavaModelException: ", e); //$NON-NLS-1$
}
- ICompilationUnit resCompilationUnit = null;
- if (lwType != null) {
- resCompilationUnit = lwType.getCompilationUnit();
- }
- return resCompilationUnit;
+ return lwType;
}
static public ICompilationUnit findCompilationUnit(String fullyQualifiedName) {
@@ -154,4 +161,37 @@
}
return OwnerType.UNDEF;
}
+
+ public static boolean isImplementInterface(ITypeBinding[] interfaces, String parentInterface){
+ for (int i = 0; i < interfaces.length; i++) {
+ ITypeBinding typeBinding = interfaces[i];
+ if (parentInterface.equals(typeBinding.getBinaryName())) return true;
+ if (isImplementInterface(typeBinding.getInterfaces(), parentInterface)) return true;
+ }
+ return false;
+ }
+
+ public static ITypeBinding[] getAllInterfaces(ITypeBinding tb){
+ ITypeBinding[] interfaces = tb.getInterfaces();
+ if (tb.isInterface()) {
+ ITypeBinding[] allInterfaces = new ITypeBinding[interfaces.length + 1];
+ System.arraycopy(interfaces, 0, allInterfaces, 0, interfaces.length);
+ allInterfaces[interfaces.length] = tb;
+ interfaces = allInterfaces;
+ }
+ return interfaces;
+ }
+
+ public static String getFieldNameByGetter(MethodDeclaration node){
+ if (node.parameters().size() != 0) return null;
+ String methodName = node.getName().getIdentifier();
+ if (methodName.startsWith("get") && methodName.length() > 3){
+ methodName = methodName.substring(3);
+ return Character.toLowerCase(methodName.charAt(0)) + methodName.substring(1);
+ } else if (methodName.startsWith("is") && methodName.length() > 2){
+ methodName = methodName.substring(2);
+ return Character.toLowerCase(methodName.charAt(0)) + methodName.substring(1);
+ }
+ return null;
+ }
}
16 years, 9 months
- 1
- 0
JBoss Tools SVN: r14216 - in trunk/jsf/plugins: org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/selectitem and 3 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dmaliarevich
Date: 2009-03-16 08:51:31 -0400 (Mon, 16 Mar 2009)
New Revision: 14216
Added:
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/src/org/jboss/tools/jsf/vpe/seam/template/SeamCheckboxEnumItemTemplate.java
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/src/org/jboss/tools/jsf/vpe/seam/template/SeamOptionEnumItemTemplate.java
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/src/org/jboss/tools/jsf/vpe/seam/template/SeamRadioEnumItemTemplate.java
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/META-INF/MANIFEST.MF
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/selectitem/SelectItemType.java
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/META-INF/MANIFEST.MF
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/templates/vpe-templates-seam.xml
Log:
https://jira.jboss.org/jira/browse/JBIDE-3697, seam templates were added.
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/META-INF/MANIFEST.MF
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/META-INF/MANIFEST.MF 2009-03-16 08:03:35 UTC (rev 14215)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/META-INF/MANIFEST.MF 2009-03-16 12:51:31 UTC (rev 14216)
@@ -17,6 +17,7 @@
org.jboss.tools.vpe.html
Eclipse-LazyStart: true
Export-Package: org.jboss.tools.jsf.vpe.jsf.template,
+ org.jboss.tools.jsf.vpe.jsf.template.selectitem,
org.jboss.tools.jsf.vpe.jsf.template.util.model
Bundle-Localization: plugin
Import-Package: org.jboss.tools.jst.web.tld
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/selectitem/SelectItemType.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/selectitem/SelectItemType.java 2009-03-16 08:03:35 UTC (rev 14215)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/selectitem/SelectItemType.java 2009-03-16 12:51:31 UTC (rev 14216)
@@ -80,6 +80,46 @@
public boolean isDisabledItem(Element element) {
return false;
}
+ },
+
+ /**
+ * Reflects the tag-type {@code <s:enumItem>} and provides operations on it.
+ */
+ ENUM_ITEM {
+
+ private final String LABEL = "label"; //$NON-NLS-1$
+ private final String ENUM_VALUE = "enumValue"; //$NON-NLS-1$
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public Attr getOutputAttributeNode(Element element) {
+ Attr outputAttributeNode;
+
+ if (element.hasAttribute(JSF.ATTR_ITEM_LABEL)) {
+ outputAttributeNode = element.getAttributeNode(JSF.ATTR_ITEM_LABEL);
+ } else if (element.hasAttribute(LABEL)) {
+ outputAttributeNode = element.getAttributeNode(LABEL);
+ } else if (element.hasAttribute(JSF.ATTR_ITEM_VALUE)) {
+ outputAttributeNode = element.getAttributeNode(JSF.ATTR_ITEM_VALUE);
+ } else if (element.hasAttribute(ENUM_VALUE)) {
+ outputAttributeNode = element.getAttributeNode(ENUM_VALUE);
+ } else if (element.hasAttribute(JSF.ATTR_VALUE)) {
+ outputAttributeNode = element.getAttributeNode(JSF.ATTR_VALUE);
+ } else {
+ outputAttributeNode = null;
+ }
+ return outputAttributeNode;
+ }
+
+ /**
+ * Returns value of the attribute {@code disabledItem} of the {@code element}
+ */
+ @Override
+ public boolean isDisabledItem(Element element) {
+ return ComponentUtil.string2boolean(ComponentUtil
+ .getAttribute(element, JSF.ATTR_ITEM_DISABLED));
+ }
};
/**
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/META-INF/MANIFEST.MF
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/META-INF/MANIFEST.MF 2009-03-16 08:03:35 UTC (rev 14215)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/META-INF/MANIFEST.MF 2009-03-16 12:51:31 UTC (rev 14216)
@@ -13,7 +13,8 @@
org.eclipse.wst.sse.ui,
org.eclipse.ui.workbench.texteditor,
org.eclipse.ui.ide,
- org.mozilla.xpcom
+ org.mozilla.xpcom,
+ org.jboss.tools.jsf.vpe.jsf;bundle-version="2.1.0"
Bundle-Vendor: %Bundle-Vendor.0
Eclipse-LazyStart: true
Bundle-ClassPath: lib/antlr.jar,
Added: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/src/org/jboss/tools/jsf/vpe/seam/template/SeamCheckboxEnumItemTemplate.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/src/org/jboss/tools/jsf/vpe/seam/template/SeamCheckboxEnumItemTemplate.java (rev 0)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/src/org/jboss/tools/jsf/vpe/seam/template/SeamCheckboxEnumItemTemplate.java 2009-03-16 12:51:31 UTC (rev 14216)
@@ -0,0 +1,14 @@
+package org.jboss.tools.jsf.vpe.seam.template;
+
+import org.jboss.tools.jsf.vpe.jsf.template.selectitem.AbstractCheckboxSelectItemTemplate;
+import org.jboss.tools.jsf.vpe.jsf.template.selectitem.SelectItemType;
+
+public class SeamCheckboxEnumItemTemplate extends
+ AbstractCheckboxSelectItemTemplate {
+
+ public SeamCheckboxEnumItemTemplate() {
+ super(SelectItemType.ENUM_ITEM);
+ }
+
+
+}
Property changes on: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/src/org/jboss/tools/jsf/vpe/seam/template/SeamCheckboxEnumItemTemplate.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ Author Id Revision Date
Name: svn:eol-style
+ native
Added: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/src/org/jboss/tools/jsf/vpe/seam/template/SeamOptionEnumItemTemplate.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/src/org/jboss/tools/jsf/vpe/seam/template/SeamOptionEnumItemTemplate.java (rev 0)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/src/org/jboss/tools/jsf/vpe/seam/template/SeamOptionEnumItemTemplate.java 2009-03-16 12:51:31 UTC (rev 14216)
@@ -0,0 +1,13 @@
+package org.jboss.tools.jsf.vpe.seam.template;
+
+import org.jboss.tools.jsf.vpe.jsf.template.selectitem.AbstractOptionSelectItemTemplate;
+import org.jboss.tools.jsf.vpe.jsf.template.selectitem.SelectItemType;
+
+
+public class SeamOptionEnumItemTemplate extends AbstractOptionSelectItemTemplate {
+
+ public SeamOptionEnumItemTemplate() {
+ super(SelectItemType.ENUM_ITEM);
+ }
+
+}
Property changes on: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/src/org/jboss/tools/jsf/vpe/seam/template/SeamOptionEnumItemTemplate.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ Author Id Revision Date
Name: svn:eol-style
+ native
Added: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/src/org/jboss/tools/jsf/vpe/seam/template/SeamRadioEnumItemTemplate.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/src/org/jboss/tools/jsf/vpe/seam/template/SeamRadioEnumItemTemplate.java (rev 0)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/src/org/jboss/tools/jsf/vpe/seam/template/SeamRadioEnumItemTemplate.java 2009-03-16 12:51:31 UTC (rev 14216)
@@ -0,0 +1,13 @@
+package org.jboss.tools.jsf.vpe.seam.template;
+
+import org.jboss.tools.jsf.vpe.jsf.template.selectitem.AbstractRadioSelectItemTemplate;
+import org.jboss.tools.jsf.vpe.jsf.template.selectitem.SelectItemType;
+
+public class SeamRadioEnumItemTemplate extends AbstractRadioSelectItemTemplate {
+
+ public SeamRadioEnumItemTemplate() {
+ super(SelectItemType.ENUM_ITEM);
+ }
+
+
+}
Property changes on: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/src/org/jboss/tools/jsf/vpe/seam/template/SeamRadioEnumItemTemplate.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ Author Id Revision Date
Name: svn:eol-style
+ native
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/templates/vpe-templates-seam.xml
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/templates/vpe-templates-seam.xml 2009-03-16 08:03:35 UTC (rev 14215)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/templates/vpe-templates-seam.xml 2009-03-16 12:51:31 UTC (rev 14216)
@@ -1,148 +1,316 @@
<?xml version="1.0" encoding="UTF-8"?>
<vpe:templates xmlns:vpe="http://org.jboss.org/tools/vpe/template"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <vpe:template-taglib uri="http://jboss.com/products/seam/taglib"
- prefix="s" />
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <vpe:template-taglib uri="http://jboss.com/products/seam/taglib"
+ prefix="s" />
- <vpe:tag name="s:validateAll" case-sensitive="yes">
- <vpe:template children="yes" modify="yes">
- <div style="border: 1px dashed #2A7F00" />
- </vpe:template>
- </vpe:tag>
-
- <vpe:tag name="s:decorate" case-sensitive="yes">
- <vpe:template children="yes" modify="yes" namespaceIdentifier="org.jboss.tools.jsf.vpe.facelets" class="org.jboss.tools.jsf.vpe.facelets.template.VpeDecorateTemplate">
- </vpe:template>
- </vpe:tag>
-
- <vpe:tag name="s:label" case-sensitive="yes">
- <vpe:template children="yes" modify="yes">
- <label style="{@style}" class="{@styleClass}" title="{tagstring()}" for="{@for}">
- <vpe:value expr="{jsfvalue(@value)}"/>
- </label>
- <vpe:dnd>
- <vpe:drag start-enable="yes"/>
- <vpe:drop container="yes">
- <vpe:container-child tag-name="outputText"/>
- </vpe:drop>
- </vpe:dnd>
- <vpe:textFormatting use-default-formats="yes">
- <vpe:format type="BlockFormat" addChildren="deny" handler="org.jboss.tools.vpe.editor.toolbar.format.handler.BlockFormatHandler" />
- </vpe:textFormatting>
- </vpe:template>
- </vpe:tag>
+ <vpe:tag name="s:button" case-sensitive="yes">
+ <vpe:if test="not(attrpresent('image'))">
+ <vpe:if test="@type=''">
+ <vpe:template children="no" modify="no">
+ <input type="submit" value="{iif(@value='',' ',jsfvalue(@value))}" class="{@styleClass}" style="{@style}" title="{tagstring()}"/>
+ <vpe:resize>
+ <vpe:width width-attr="style.width" />
+ <vpe:height height-attr="style.height" />
+ </vpe:resize>
+ <vpe:dnd>
+ <vpe:drag start-enable="yes"/>
+ </vpe:dnd>
+ <vpe:textFormatting use-default-formats="yes">
+ </vpe:textFormatting>
+ </vpe:template>
+ </vpe:if>
+ <vpe:if test="(@type='button')|(@type='reset')|(@type='submit')">
+ <vpe:template children="no" modify="no">
+ <input type="{@type}" value="{jsfvalue(@value)}" class="{@styleClass}" style="{@style}" title="{tagstring()}"/>
+ <vpe:resize>
+ <vpe:width width-attr="style.width" />
+ <vpe:height height-attr="style.height" />
+ </vpe:resize>
+ <vpe:dnd>
+ <vpe:drag start-enable="yes"/>
+ </vpe:dnd>
+ <vpe:textFormatting use-default-formats="yes">
+ </vpe:textFormatting>
+ </vpe:template>
+ </vpe:if>
+ </vpe:if>
+ <vpe:if test="attrpresent('image')">
+ <vpe:template children="no" modify="no">
+ <input type="image" src="{src(@image)}" class="{@styleClass}" style="{@style}" title="{tagstring()}"/>
+ <vpe:resize>
+ <vpe:width width-attr="style.width" />
+ <vpe:height height-attr="style.height" />
+ </vpe:resize>
+ <vpe:textFormatting use-default-formats="yes">
+ </vpe:textFormatting>
+ </vpe:template>
+ </vpe:if>
+ </vpe:tag>
- <vpe:tag name="s:message" case-sensitive="yes">
- <vpe:template children="no" modify="no">
- <span class="{@styleClass}" style="{@style}">
- Error Messages
- </span>
- <vpe:dnd>
- <vpe:drag start-enable="yes" />
- <vpe:drop container="no"/>
- </vpe:dnd>
- <vpe:textFormatting use-default-formats="yes">
- <vpe:format type="BlockFormat" handler="org.jboss.tools.vpe.editor.toolbar.format.handler.BlockFormatHandler"/>
- </vpe:textFormatting>
- </vpe:template>
- </vpe:tag>
+ <vpe:tag name="s:cache" case-sensitive="yes">
+ <vpe:template children="yes" modify="yes">
+ <div />
+ </vpe:template>
+ </vpe:tag>
+
+ <vpe:tag name="s:conversationId" case-sensitive="yes">
+ <vpe:template children="no" modify="no" />
+ </vpe:tag>
+
+ <vpe:tag name="s:conversationPropagation" case-sensitive="yes">
+ <vpe:template children="no" modify="no" />
+ </vpe:tag>
+
+ <vpe:tag name="s:convertDateTime" case-sensitive="yes">
+ <vpe:template children="no" modify="no" />
+ </vpe:tag>
+
+ <vpe:tag name="s:convertEntity" case-sensitive="yes">
+ <vpe:template children="no" modify="no" />
+ </vpe:tag>
+
+ <vpe:tag name="s:convertEnum" case-sensitive="yes">
+ <vpe:template children="no" modify="no" />
+ </vpe:tag>
+
+ <vpe:tag name="s:decorate" case-sensitive="yes">
+ <vpe:template children="yes" modify="yes" namespaceIdentifier="org.jboss.tools.jsf.vpe.facelets" class="org.jboss.tools.jsf.vpe.facelets.template.VpeDecorateTemplate">
+ </vpe:template>
+ </vpe:tag>
+
+ <vpe:tag name="s:div" case-sensitive="yes">
+ <vpe:template children="yes" modify="yes">
+ <div style="{@style}" class="{@styleClass}" />
+ </vpe:template>
+ </vpe:tag>
+
+ <vpe:tag name="s:defaultAction">
+ <vpe:template children="no" modify="no" />
+ </vpe:tag>
+
+ <vpe:tag name="s:enumItem" case-sensitive="yes">
+ <vpe:if test="hasinparents('h:selectManyCheckbox')">
+ <vpe:template children="yes" modify="yes"
+ class="org.jboss.tools.jsf.vpe.seam.template.SeamCheckboxEnumItemTemplate">
+ </vpe:template>
+ </vpe:if>
+ <vpe:if
+ test="hasinparents('h:selectManyListbox')|hasinparents('h:selectManyMenu')|hasinparents('h:selectOneListbox')|hasinparents('h:selectOneMenu')|hasinparents('rich:pickList')">
+ <vpe:template children="yes" modify="yes"
+ class="org.jboss.tools.jsf.vpe.seam.template.SeamOptionEnumItemTemplate">
+ </vpe:template>
+ </vpe:if>
+ <vpe:if
+ test="hasinparents('h:selectOneRadio')|hasinparents('x:selectOneRadio')">
+ <vpe:template children="yes" modify="yes"
+ class="org.jboss.tools.jsf.vpe.seam.template.SeamRadioEnumItemTemplate">
+ </vpe:template>
+ </vpe:if>
+ <vpe:if
+ test="hasinparents('x:selectManyCheckbox')|hasinparents('t:selectManyCheckbox')">
+ <vpe:template children="no" modify="yes">
+ <span title="{tagstring()}">
+ <input type="checkbox" />
+ <vpe:value expr="{jsfvalue(@itemLabel)}" />
+ </span>
+ <vpe:dnd>
+ <vpe:drag start-enable="yes" />
+ </vpe:dnd>
+ <vpe:breaker type="selectItem" />
+ </vpe:template>
+ </vpe:if>
+ <vpe:if
+ test="hasinparents('t:selectManyMenu')|
+ hasinparents('x:selectOneRadio')|
+ hasinparents('x:selectOneMenu')">
+ <vpe:template children="no" modify="yes">
+ <option value="{@itemValue}" title="{tagstring()}">
+ <vpe:value expr="{jsfvalue(@itemLabel)}" />
+ </option>
+ </vpe:template>
+ </vpe:if>
+
+ </vpe:tag>
+
+ <vpe:tag name="s:fileUpload" case-sensitive="yes">
+ <vpe:template children="no" modify="no">
+ <div class="{@styleClass}" onclick="{@onclick}"
+ rendered="{@rendered}" title="{tagstring()}">
+ <vpe:value expr="{jsfvalue(@value)}" />
+ <input type="file" style="{@style}" />
+ </div>
+ <vpe:dnd>
+ <vpe:drag start-enable="yes" />
+ <vpe:drop container="no" />
+ </vpe:dnd>
+ <vpe:resize>
+ <vpe:width width-attr="style.width" />
+ <vpe:height height-attr="style.height" />
+ </vpe:resize>
+ <vpe:textFormatting use-default-formats="yes">
+ </vpe:textFormatting>
+ </vpe:template>
+ </vpe:tag>
+
+ <vpe:tag name="s:formattedText" case-sensitive="yes">
+ <vpe:template children="yes" modify="yes"
+ class="org.jboss.tools.jsf.vpe.seam.template.SeamFormattedTextTemplate">
+
+ </vpe:template>
+ </vpe:tag>
+
+ <vpe:tag name="s:fragment" case-sensitive="yes">
+ <vpe:template children="yes" modify="no" >
+ <div style="{iif(@rendered='true',' ','display: none;')}"/>
+ </vpe:template>
+ </vpe:tag>
+
+ <vpe:tag name="s:graphicImage" case-sensitive="yes">
+ <vpe:if test="attrpresent('value')">
+ <vpe:template children="no" modify="yes">
+ <img src="{src(jsfvalue(@value))}" width="{@width}"
+ height="{@height}" class="{@styleClass}" style="{@style}"
+ title="{tagstring()}" alt="{jsfvalue(@alt)}"/>
+ <vpe:dnd>
+ <vpe:drag start-enable="yes" />
+ </vpe:dnd>
+ <vpe:resize>
+ <vpe:width width-attr="style.width" />
+ <vpe:height height-attr="style.height" />
+ </vpe:resize>
+ </vpe:template>
+ </vpe:if>
+ <vpe:template children="no" modify="yes">
+ <img src="{src(jsfvalue(@url))}" width="{@width}"
+ height="{@height}" class="{@styleClass}" style="{@style}"
+ title="{tagstring()}" alt="{jsfvalue(@alt)}"/>
+ <vpe:resize>
+ <vpe:width width-attr="style.width" />
+ <vpe:height height-attr="style.height" />
+ </vpe:resize>
+ </vpe:template>
+ </vpe:tag>
+
+ <vpe:tag name="s:label" case-sensitive="yes">
+ <vpe:template children="yes" modify="yes">
+ <label style="{@style}" class="{@styleClass}" title="{tagstring()}" for="{@for}">
+ <vpe:value expr="{jsfvalue(@value)}"/>
+ </label>
+ <vpe:dnd>
+ <vpe:drag start-enable="yes"/>
+ <vpe:drop container="yes">
+ <vpe:container-child tag-name="outputText"/>
+ </vpe:drop>
+ </vpe:dnd>
+ <vpe:textFormatting use-default-formats="yes">
+ <vpe:format type="BlockFormat" addChildren="deny" handler="org.jboss.tools.vpe.editor.toolbar.format.handler.BlockFormatHandler" />
+ </vpe:textFormatting>
+ </vpe:template>
+ </vpe:tag>
+
+ <vpe:tag name="s:link" case-sensitive="yes">
+ <vpe:template children="yes" modify="yes">
+ <span class="{@styleClass}"
+ style="color:blue;text-decoration:underline;{@style}"
+ title="{tagstring()}">
+ <vpe:value expr="{@value}" />
+ </span>
+ </vpe:template>
+ </vpe:tag>
+ <vpe:tag name="s:message" case-sensitive="yes">
+ <vpe:template children="no" modify="no">
+ <span class="{@styleClass}" style="{@style}">
+ Error Messages
+ </span>
+ <vpe:dnd>
+ <vpe:drag start-enable="yes" />
+ <vpe:drop container="no"/>
+ </vpe:dnd>
+ <vpe:textFormatting use-default-formats="yes">
+ <vpe:format type="BlockFormat" handler="org.jboss.tools.vpe.editor.toolbar.format.handler.BlockFormatHandler"/>
+ </vpe:textFormatting>
+ </vpe:template>
+ </vpe:tag>
- <vpe:tag name="s:formattedText" case-sensitive="yes">
- <vpe:template children="yes" modify="yes"
- class="org.jboss.tools.jsf.vpe.seam.template.SeamFormattedTextTemplate">
- <div style="{@style}" class="{@styleClass}"
- title="{tagstring()}">
- <vpe:value expr="{jsfvalue(@value)}" />
- </div>
- </vpe:template>
- </vpe:tag>
+ <vpe:tag name="s:remote" case-sensitive="yes">
+ <vpe:template children="no" modify="no" />
+ </vpe:tag>
+ <vpe:tag name="s:selectDate" case-sensitive="yes">
+ <vpe:template children="yes" modify="yes"
+ namespaceIdentifier="org.jboss.tools.jsf.vpe.richfaces"
+ class="org.jboss.tools.jsf.vpe.richfaces.template.RichFacesCalendarTemplate">
+ </vpe:template>
+ </vpe:tag>
- <vpe:tag name="s:span" case-sensitive="yes">
- <vpe:template children="yes" modify="yes">
- <span style="{@style}" class="{@styleClass}" />
- </vpe:template>
- </vpe:tag>
+ <vpe:tag name="s:selectItems" case-sensitive="yes">
+ <vpe:if test="hasinparents('h:selectManyCheckbox')">
+ <vpe:template children="yes" modify="yes" namespaceIdentifier="org.jboss.tools.jsf.vpe.jsf"
+ class="org.jboss.tools.jsf.vpe.jsf.template.selectitem.JsfCheckboxSelectItemsTemplate">
+ </vpe:template>
+ </vpe:if>
+ <vpe:if
+ test="hasinparents('h:selectManyListbox')|hasinparents('h:selectManyMenu')|hasinparents('h:selectOneListbox')|hasinparents('h:selectOneMenu')|hasinparents('rich:pickList')">
+ <vpe:template children="yes" modify="yes" namespaceIdentifier="org.jboss.tools.jsf.vpe.jsf"
+ class="org.jboss.tools.jsf.vpe.jsf.template.selectitem.JsfOptionSelectItemsTemplate">
+ </vpe:template>
+ </vpe:if>
+ <vpe:if
+ test="hasinparents('h:selectOneRadio')|hasinparents('x:selectOneRadio')">
+ <vpe:template children="yes" modify="yes" namespaceIdentifier="org.jboss.tools.jsf.vpe.jsf"
+ class="org.jboss.tools.jsf.vpe.jsf.template.selectitem.JsfRadioSelectItemsTemplate">
+ </vpe:template>
+ </vpe:if>
+ <vpe:if
+ test="hasinparents('x:selectManyCheckbox')|hasinparents('t:selectManyCheckbox')">
+ <vpe:template children="no" modify="yes">
+ <span title="{tagstring()}">
+ <input type="checkbox" />
+ <vpe:value expr="{jsfvalue(@itemLabel)}" />
+ </span>
+ <vpe:dnd>
+ <vpe:drag start-enable="yes" />
+ </vpe:dnd>
+ <vpe:breaker type="selectItem" />
+ </vpe:template>
+ </vpe:if>
+ <vpe:if
+ test="hasinparents('t:selectManyMenu')|
+ hasinparents('x:selectOneRadio')|
+ hasinparents('x:selectOneMenu')">
+ <vpe:template children="no" modify="yes">
+ <option value="{@itemValue}" title="{tagstring()}">
+ <vpe:value expr="{jsfvalue(@itemLabel)}" />
+ </option>
+ </vpe:template>
+ </vpe:if>
+ </vpe:tag>
- <vpe:tag name="s:div" case-sensitive="yes">
- <vpe:template children="yes" modify="yes">
- <div style="{@style}" class="{@styleClass}" />
- </vpe:template>
- </vpe:tag>
-
- <vpe:tag name="s:button" case-sensitive="yes">
- <vpe:if test="not(attrpresent('image'))">
- <vpe:if test="@type=''">
- <vpe:template children="no" modify="no">
- <input type="submit" value="{iif(@value='',' ',jsfvalue(@value))}" class="{@styleClass}" style="{@style}" title="{tagstring()}"/>
- <vpe:resize>
- <vpe:width width-attr="style.width" />
- <vpe:height height-attr="style.height" />
- </vpe:resize>
- <vpe:dnd>
- <vpe:drag start-enable="yes"/>
- </vpe:dnd>
- <vpe:textFormatting use-default-formats="yes">
- </vpe:textFormatting>
- </vpe:template>
- </vpe:if>
- <vpe:if test="(@type='button')|(@type='reset')|(@type='submit')">
- <vpe:template children="no" modify="no">
- <input type="{@type}" value="{jsfvalue(@value)}" class="{@styleClass}" style="{@style}" title="{tagstring()}"/>
- <vpe:resize>
- <vpe:width width-attr="style.width" />
- <vpe:height height-attr="style.height" />
- </vpe:resize>
- <vpe:dnd>
- <vpe:drag start-enable="yes"/>
- </vpe:dnd>
- <vpe:textFormatting use-default-formats="yes">
- </vpe:textFormatting>
- </vpe:template>
- </vpe:if>
- </vpe:if>
- <vpe:if test="attrpresent('image')">
- <vpe:template children="no" modify="no">
- <input type="image" src="{src(@image)}" class="{@styleClass}" style="{@style}" title="{tagstring()}"/>
- <vpe:resize>
- <vpe:width width-attr="style.width" />
- <vpe:height height-attr="style.height" />
- </vpe:resize>
- <vpe:textFormatting use-default-formats="yes">
- </vpe:textFormatting>
- </vpe:template>
- </vpe:if>
+ <vpe:tag name="s:span" case-sensitive="yes">
+ <vpe:template children="yes" modify="yes">
+ <span style="{@style}" class="{@styleClass}" />
+ </vpe:template>
</vpe:tag>
-
- <vpe:tag name="s:link" case-sensitive="yes">
- <vpe:template children="yes" modify="yes">
- <span class="{@styleClass}"
- style="color:blue;text-decoration:underline;{@style}"
- title="{tagstring()}">
- <vpe:value expr="{@value}" />
- </span>
- </vpe:template>
- </vpe:tag>
-
- <vpe:tag name="s:fileUpload" case-sensitive="yes">
- <vpe:template children="no" modify="no">
- <div class="{@styleClass}" onclick="{@onclick}"
- rendered="{@rendered}" title="{tagstring()}">
- <vpe:value expr="{jsfvalue(@value)}" />
- <input type="file" style="{@style}" />
- </div>
- <vpe:dnd>
- <vpe:drag start-enable="yes" />
- <vpe:drop container="no" />
- </vpe:dnd>
- <vpe:resize>
- <vpe:width width-attr="style.width" />
- <vpe:height height-attr="style.height" />
- </vpe:resize>
- <vpe:textFormatting use-default-formats="yes">
- </vpe:textFormatting>
- </vpe:template>
- </vpe:tag>
-
+
+ <vpe:tag name="s:transformImageSize" case-sensitive="yes">
+ <vpe:template children="no" modify="no" />
+ </vpe:tag>
+
+ <vpe:tag name="s:transformImageBlur" case-sensitive="yes">
+ <vpe:template children="no" modify="no" />
+ </vpe:tag>
+
+ <vpe:tag name="s:transformImageType" case-sensitive="yes">
+ <vpe:template children="no" modify="no" />
+ </vpe:tag>
+
+ <vpe:tag name="s:validate" case-sensitive="yes">
+ <vpe:template children="no" modify="no" />
+ </vpe:tag>
+
+ <vpe:tag name="s:validateAll" case-sensitive="yes">
+ <vpe:template children="no" modify="no" />
+ </vpe:tag>
</vpe:templates>
16 years, 9 months
- 1
- 0
JBoss Tools SVN: r14215 - trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/as/wst/server/ui/xpl.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2009-03-16 04:03:35 -0400 (Mon, 16 Mar 2009)
New Revision: 14215
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/as/wst/server/ui/xpl/ServersView.java
Log:
small cleanup and removing outdated comment
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/as/wst/server/ui/xpl/ServersView.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/as/wst/server/ui/xpl/ServersView.java 2009-03-16 07:45:24 UTC (rev 14214)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/as/wst/server/ui/xpl/ServersView.java 2009-03-16 08:03:35 UTC (rev 14215)
@@ -11,16 +11,10 @@
*******************************************************************************/
package org.jboss.tools.as.wst.server.ui.xpl;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.dnd.DND;
-import org.eclipse.swt.widgets.Composite;
import org.eclipse.ui.IMemento;
import org.eclipse.ui.IViewSite;
import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.navigator.CommonDragAdapter;
-import org.eclipse.ui.navigator.CommonDropAdapter;
import org.eclipse.ui.navigator.CommonNavigator;
-import org.eclipse.ui.navigator.CommonViewer;
/**
* A view of servers, their modules, and status.
*/
@@ -33,12 +27,6 @@
super();
}
- /*
- * Stuff that shouldn't even be here but CNF is kinda lame
- * Must override currently to overcome the bug below:
- *
- * https://bugs.eclipse.org/bugs/show_bug.cgi?id=261606
- */
private IMemento memento;
public void init(IViewSite aSite, IMemento aMemento)
16 years, 9 months
- 1
- 0
JBoss Tools SVN: r14214 - in trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui: preferences and 3 other directories.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2009-03-16 03:45:24 -0400 (Mon, 16 Mar 2009)
New Revision: 14214
Modified:
trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/ArchivesUIMessages.java
trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/ArchivesUIMessages.properties
trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/PrefsInitializer.java
trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/preferences/MainPreferencePage.java
trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/providers/ArchivesRootBridgeContentProvider.java
trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/views/ProjectArchivesCommonView.java
trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/wizards/pages/FilesetInfoWizardPage.java
Log:
JBIDE-2095 - adding default excludes. This is a workspace preference however the default excludes are added to the "excludes" section of the fileset wizard and can be removed. If it's in the wizard's textbox at saving time, it will be persisted to the descriptor
Modified: trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/ArchivesUIMessages.java
===================================================================
--- trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/ArchivesUIMessages.java 2009-03-16 07:41:00 UTC (rev 14213)
+++ trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/ArchivesUIMessages.java 2009-03-16 07:45:24 UTC (rev 14214)
@@ -136,6 +136,9 @@
public static String ShowRootDirectory;
public static String ShowRootProject;
public static String ShowAllProjects;
+ public static String FilesetPreferences;
+ public static String EnableDefaultExcludes;
+
public static String ArchivesVariables;
public static String VariablesGroup;
public static String Add;
Modified: trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/ArchivesUIMessages.properties
===================================================================
--- trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/ArchivesUIMessages.properties 2009-03-16 07:41:00 UTC (rev 14213)
+++ trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/ArchivesUIMessages.properties 2009-03-16 07:45:24 UTC (rev 14214)
@@ -120,6 +120,8 @@
ShowRootDirectory=Show the root directory of filesets.
ShowRootProject=Show project at the root
ShowAllProjects=Show all projects that contain packages
+FilesetPreferences=Fileset Preferences
+EnableDefaultExcludes=Enable Default Excludes
ArchivesVariables=Archives Variables
VariablesGroup=Enabled Variables
Add=Add
Modified: trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/PrefsInitializer.java
===================================================================
--- trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/PrefsInitializer.java 2009-03-16 07:41:00 UTC (rev 14213)
+++ trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/PrefsInitializer.java 2009-03-16 07:45:24 UTC (rev 14214)
@@ -22,6 +22,7 @@
import org.eclipse.core.runtime.preferences.IEclipsePreferences;
import org.eclipse.core.runtime.preferences.InstanceScope;
import org.jboss.ide.eclipse.archives.core.ArchivesCore;
+import org.jboss.ide.eclipse.archives.core.asf.DirectoryScanner;
public class PrefsInitializer extends AbstractPreferenceInitializer {
@@ -33,10 +34,14 @@
public static final String PREF_SHOW_ALL_PROJECTS = "showAllProjects";//$NON-NLS-1$
public static final String PREF_SHOW_BUILD_ERROR_DIALOG = "showBuildErrorDialog";//$NON-NLS-1$
public static final String PREF_ALWAYS_SHOW_PROJECT_EXPLORER_NODE = "alwaysShowProjectExplorerNode";//$NON-NLS-1$
+ public static final String PREF_USE_DEFAULT_EXCLUDES = "useDefaultExcludes";//$NON-NLS-1$
+ public static final String PREF_DEFAULT_EXCLUDE_LIST = "defaultExcludesList";//$NON-NLS-1$
+
public static final ArrayList<IArchivesPreferenceListener> listeners = new ArrayList<IArchivesPreferenceListener>();
public static interface IArchivesPreferenceListener {
public void preferenceChanged(String key, boolean val);
+ public void preferenceChanged(String key, String val);
}
public void initializeDefaultPreferences() {
@@ -47,6 +52,9 @@
prefs.putBoolean(PREF_SHOW_ALL_PROJECTS, false);
prefs.putBoolean(PREF_SHOW_BUILD_ERROR_DIALOG, true);
prefs.putBoolean(PREF_ALWAYS_SHOW_PROJECT_EXPLORER_NODE, false);
+ prefs.putBoolean(PREF_USE_DEFAULT_EXCLUDES, true);
+ prefs.put(PREF_DEFAULT_EXCLUDE_LIST, DirectoryScanner.implodeStrings(DirectoryScanner.getDefaultExcludes()));
+
try {
prefs.flush();
} catch (org.osgi.service.prefs.BackingStoreException e) {
@@ -76,13 +84,45 @@
} catch (org.osgi.service.prefs.BackingStoreException e) { } // swallow
fireChanged(key, val);
}
+
+ public static void setString(String key, String val) {
+ setString(key, val, null);
+ }
+ public static void setString(String key, String val, IAdaptable adaptable) {
+ QualifiedName name = new QualifiedName(PackagesUIPlugin.PLUGIN_ID, key);
+ if( adaptable != null ) {
+ IResource project = (IResource)adaptable.getAdapter(IResource.class);
+ try {
+ if( project != null && project.getPersistentProperty(name) != null) {
+ project.setPersistentProperty(name, val);
+ return;
+ }
+ } catch(CoreException ce) {}
+ }
+ IEclipsePreferences prefs = new InstanceScope().getNode(PackagesUIPlugin.PLUGIN_ID);
+ prefs.put(key, val);
+ try {
+ prefs.flush();
+ } catch (org.osgi.service.prefs.BackingStoreException e) { } // swallow
+ fireChanged(key, val);
+ }
+
protected static void fireChanged(String key, boolean val) {
Iterator<IArchivesPreferenceListener> i = listeners.iterator();
while(i.hasNext()) {
i.next().preferenceChanged(key, val);
}
}
+
+ protected static void fireChanged(String key, String val) {
+ Iterator<IArchivesPreferenceListener> i = listeners.iterator();
+ while(i.hasNext()) {
+ i.next().preferenceChanged(key, val);
+ }
+ }
+
+
public static void addListener(IArchivesPreferenceListener listener) {
if( !listeners.contains(listener))
@@ -127,4 +167,26 @@
boolean defaultVal = new DefaultScope().getNode(PackagesUIPlugin.PLUGIN_ID).getBoolean(key, false);
return new InstanceScope().getNode(PackagesUIPlugin.PLUGIN_ID).getBoolean(key, defaultVal);
}
+
+ public static String getString(String key) {
+ return getString(key, null, true);
+ }
+
+ public static String getString(String key, IAdaptable adaptable, boolean effective ) {
+ QualifiedName name = new QualifiedName(PackagesUIPlugin.PLUGIN_ID, key);
+ if( adaptable != null ) {
+ IResource project = (IResource)adaptable.getAdapter(IResource.class);
+ boolean specific = ArchivesCore.getInstance().getPreferenceManager().areProjectSpecificPrefsEnabled(project.getLocation());
+ //if( adaptable != null && WorkspacePreferenceManager.areProjectSpecificPrefsEnabled(project.getLocation())) {
+ if( specific ) {
+ try {
+ if( project != null && project.getPersistentProperty(name) != null) {
+ return project.getPersistentProperty(name);
+ }
+ } catch(CoreException ce) {}
+ }
+ }
+ String defaultVal = new DefaultScope().getNode(PackagesUIPlugin.PLUGIN_ID).get(key, ""); //$NON-NLS-1$
+ return new InstanceScope().getNode(PackagesUIPlugin.PLUGIN_ID).get(key, defaultVal);
+ }
}
Modified: trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/preferences/MainPreferencePage.java
===================================================================
--- trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/preferences/MainPreferencePage.java 2009-03-16 07:41:00 UTC (rev 14213)
+++ trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/preferences/MainPreferencePage.java 2009-03-16 07:45:24 UTC (rev 14214)
@@ -17,16 +17,21 @@
import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.events.SelectionListener;
import org.eclipse.swt.layout.FillLayout;
+import org.eclipse.swt.layout.FormAttachment;
+import org.eclipse.swt.layout.FormData;
+import org.eclipse.swt.layout.FormLayout;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Group;
+import org.eclipse.swt.widgets.Text;
import org.eclipse.ui.IWorkbench;
import org.eclipse.ui.IWorkbenchPreferencePage;
import org.eclipse.ui.dialogs.PropertyPage;
import org.jboss.ide.eclipse.archives.core.ArchivesCore;
+import org.jboss.ide.eclipse.archives.core.asf.DirectoryScanner;
import org.jboss.ide.eclipse.archives.core.model.IPreferenceManager;
import org.jboss.ide.eclipse.archives.ui.ArchivesSharedImages;
import org.jboss.ide.eclipse.archives.ui.ArchivesUIMessages;
@@ -44,7 +49,9 @@
private Button showProjectRoot, showAllProjects;
private Button automaticBuilder, showErrorDialog, overrideButton;
private Button showNodeOnAllProjects;
- private Group corePrefGroup, viewPrefGroup, packageExplorerGroup;
+ private Button enableDefaultExcludes;
+ private Text defaultExcludes;
+ private Group corePrefGroup, viewPrefGroup, packageExplorerGroup, filesetGroup;
private Composite overrideComp;
@@ -62,6 +69,7 @@
createCorePrefs(main);
createViewPrefs(main);
createProjectExplorerPrefs(main);
+ createFilesetPrefs(main);
fillValues();
return main;
}
@@ -89,7 +97,8 @@
PrefsInitializer.getBoolean(PrefsInitializer.PREF_SHOW_FULL_FILESET_ROOT_DIR, getElement(), false));
showProjectRoot.setSelection(
PrefsInitializer.getBoolean(PrefsInitializer.PREF_SHOW_PROJECT_ROOT, getElement(), false));
-
+ enableDefaultExcludes.setSelection(PrefsInitializer.getBoolean(PrefsInitializer.PREF_USE_DEFAULT_EXCLUDES, getElement(), false));
+ defaultExcludes.setText(PrefsInitializer.getString(PrefsInitializer.PREF_DEFAULT_EXCLUDE_LIST, getElement(), true));
showAllProjects.setEnabled(showProjectRoot.getSelection());
if (!showProjectRoot.getSelection())
showAllProjects.setSelection(false);
@@ -148,6 +157,29 @@
showNodeOnAllProjects = new Button(packageExplorerGroup, SWT.CHECK);
showNodeOnAllProjects.setText(ArchivesUIMessages.EnableNodeAlways);
}
+
+ protected void createFilesetPrefs(Composite main) {
+ filesetGroup = new Group(main, SWT.NONE);
+ filesetGroup.setText(ArchivesUIMessages.FilesetPreferences);
+ filesetGroup.setLayout(new FormLayout());
+ filesetGroup.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+
+ enableDefaultExcludes = new Button(filesetGroup, SWT.CHECK);
+ enableDefaultExcludes.setText(ArchivesUIMessages.EnableDefaultExcludes);
+ defaultExcludes = new Text(filesetGroup, SWT.DEFAULT);
+ FormData fd = new FormData();
+ fd.top = new FormAttachment(0,5);
+ fd.left = new FormAttachment(0,5);
+ enableDefaultExcludes.setLayoutData(fd);
+
+ fd = new FormData();
+ fd.left = new FormAttachment(0,5);
+ fd.top = new FormAttachment(enableDefaultExcludes, 5);
+ fd.right = new FormAttachment(0,350);
+ fd.bottom = new FormAttachment(100,-10);
+ defaultExcludes.setLayoutData(fd);
+
+ }
protected void createViewPrefs(Composite main) {
@@ -198,6 +230,8 @@
showProjectRoot.setSelection(true);
showAllProjects.setSelection(false);
showNodeOnAllProjects.setSelection(false);
+ enableDefaultExcludes.setSelection(false);
+ defaultExcludes.setText(DirectoryScanner.implodeStrings(DirectoryScanner.getDefaultExcludes()));
if( getResourceLocationIfExists() != null ) {
overrideButton.setSelection(false);
setWidgetsEnabled(overrideButton.getSelection());
@@ -217,6 +251,8 @@
PrefsInitializer.setBoolean(PrefsInitializer.PREF_SHOW_PROJECT_ROOT, showProjectRoot.getSelection(), getElement());
PrefsInitializer.setBoolean(PrefsInitializer.PREF_SHOW_ALL_PROJECTS, showAllProjects.getSelection(), getElement());
PrefsInitializer.setBoolean(PrefsInitializer.PREF_ALWAYS_SHOW_PROJECT_EXPLORER_NODE, showNodeOnAllProjects.getSelection(), getElement());
+ PrefsInitializer.setBoolean(PrefsInitializer.PREF_USE_DEFAULT_EXCLUDES, enableDefaultExcludes.getSelection(), getElement());
+ PrefsInitializer.setString(PrefsInitializer.PREF_DEFAULT_EXCLUDE_LIST, defaultExcludes.getText(), getElement());
return true;
}
}
Modified: trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/providers/ArchivesRootBridgeContentProvider.java
===================================================================
--- trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/providers/ArchivesRootBridgeContentProvider.java 2009-03-16 07:41:00 UTC (rev 14213)
+++ trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/providers/ArchivesRootBridgeContentProvider.java 2009-03-16 07:45:24 UTC (rev 14214)
@@ -72,4 +72,7 @@
viewer.refresh();
}
+ public void preferenceChanged(String key, String val) {
+ viewer.refresh();
+ }
}
Modified: trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/views/ProjectArchivesCommonView.java
===================================================================
--- trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/views/ProjectArchivesCommonView.java 2009-03-16 07:41:00 UTC (rev 14213)
+++ trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/views/ProjectArchivesCommonView.java 2009-03-16 07:45:24 UTC (rev 14214)
@@ -167,4 +167,7 @@
public void preferenceChanged(String key, boolean val) {
jiggleViewerInput();
}
+ public void preferenceChanged(String key, String val) {
+ jiggleViewerInput();
+ }
}
Modified: trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/wizards/pages/FilesetInfoWizardPage.java
===================================================================
--- trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/wizards/pages/FilesetInfoWizardPage.java 2009-03-16 07:41:00 UTC (rev 14213)
+++ trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/wizards/pages/FilesetInfoWizardPage.java 2009-03-16 07:45:24 UTC (rev 14214)
@@ -44,6 +44,7 @@
import org.jboss.ide.eclipse.archives.core.model.DirectoryScannerFactory.DirectoryScannerExtension.FileWrapper;
import org.jboss.ide.eclipse.archives.ui.ArchivesSharedImages;
import org.jboss.ide.eclipse.archives.ui.ArchivesUIMessages;
+import org.jboss.ide.eclipse.archives.ui.PrefsInitializer;
import org.jboss.ide.eclipse.archives.ui.util.composites.ArchiveFilesetDestinationComposite;
import org.jboss.ide.eclipse.archives.ui.util.composites.ArchiveSourceDestinationComposite;
import org.jboss.ide.eclipse.archives.ui.util.composites.FilesetPreviewComposite;
@@ -96,9 +97,18 @@
mainComposite.setLayoutData(new GridData(GridData.FILL_BOTH));
mainComposite.setLayout(new FormLayout());
- Group info = createInfoGroup(mainComposite);
- createPreviewGroup(mainComposite, info);
-
+ Composite restrainer = new Composite(mainComposite, SWT.NONE);
+ restrainer.setLayout(new FormLayout());
+ FormData restrainerData = new FormData();
+ restrainerData.left = new FormAttachment(0,5);
+ restrainerData.top = new FormAttachment(0,5);
+ restrainerData.bottom = new FormAttachment(100,-5);
+ restrainerData.right = new FormAttachment(0,600);
+ restrainer.setLayoutData(restrainerData);
+
+ Group info = createInfoGroup(restrainer);
+ createPreviewGroup(restrainer, info);
+ mainComposite.layout();
fillDefaults();
addListeners();
changePreview();
@@ -322,6 +332,9 @@
flattenedNo.setSelection(!flattened);
includes = "**"; //$NON-NLS-1$
includesText.setText(includes);
+ boolean useDefaultExcludes = PrefsInitializer.getBoolean(PrefsInitializer.PREF_USE_DEFAULT_EXCLUDES);
+ if( useDefaultExcludes)
+ excludesText.setText(PrefsInitializer.getString(PrefsInitializer.PREF_DEFAULT_EXCLUDE_LIST));
}
}
16 years, 9 months
- 1
- 0
JBoss Tools SVN: r14213 - trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/asf.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2009-03-16 03:41:00 -0400 (Mon, 16 Mar 2009)
New Revision: 14213
Modified:
trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/asf/DirectoryScanner.java
Log:
added a utility method
Modified: trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/asf/DirectoryScanner.java
===================================================================
--- trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/asf/DirectoryScanner.java 2009-03-16 06:57:26 UTC (rev 14212)
+++ trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/asf/DirectoryScanner.java 2009-03-16 07:41:00 UTC (rev 14213)
@@ -402,6 +402,13 @@
new String[defaultExcludes.size()]);
}
+ public static String implodeStrings(String[] strings) {
+ StringBuffer buffer = new StringBuffer();
+ for( int i = 0; i < strings.length; i++ )
+ buffer.append(strings[i]).append(',');
+ return buffer.toString();
+ }
+
public static boolean addDefaultExclude(String s) {
if (defaultExcludes.indexOf(s) == -1) {
defaultExcludes.add(s);
16 years, 9 months
- 1
- 0
JBoss Tools SVN: r14212 - in trunk: common/tests/org.jboss.tools.common.verification.ui.test and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: sflanigan
Date: 2009-03-16 02:57:26 -0400 (Mon, 16 Mar 2009)
New Revision: 14212
Modified:
trunk/as/tests/org.jboss.ide.eclipse.as.ui.test/
trunk/common/tests/org.jboss.tools.common.verification.ui.test/
Log:
svn:ignore bin directory
Property changes on: trunk/as/tests/org.jboss.ide.eclipse.as.ui.test
___________________________________________________________________
Name: svn:ignore
+ bin
Property changes on: trunk/common/tests/org.jboss.tools.common.verification.ui.test
___________________________________________________________________
Name: svn:ignore
+ bin
16 years, 9 months
- 1
- 0
JBoss Tools SVN: r14211 - trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/css.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2009-03-13 16:13:21 -0400 (Fri, 13 Mar 2009)
New Revision: 14211
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/css/NewCSSClassWizard.java
Log:
fix null pointer in JUnitTests
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/css/NewCSSClassWizard.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/css/NewCSSClassWizard.java 2009-03-13 20:01:49 UTC (rev 14210)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/css/NewCSSClassWizard.java 2009-03-13 20:13:21 UTC (rev 14211)
@@ -163,7 +163,9 @@
if (status != null) {
applyToStatusLine(status);
}
- getWizard().getContainer().updateButtons();
+ if(getWizard().getContainer().getCurrentPage()!=null) {
+ getWizard().getContainer().updateButtons();
+ }
}
}
});
16 years, 9 months
- 1
- 0