JBoss Tools SVN: r16858 - in trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1704Test: WebContent/WEB-INF and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2009-07-29 06:51:16 -0400 (Wed, 29 Jul 2009)
New Revision: 16858
Added:
trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1704Test/JavaSource/demo/MyBean.java
trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1704Test/JavaSource/demo/User.java
Removed:
trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1704Test/JavaSource/demo/Person.java
trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1704Test/WebContent/pages/greeting1.xhtml
Modified:
trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1704Test/WebContent/WEB-INF/faces-config.xml
trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1704Test/WebContent/pages/greeting.jsp
Log:
https://jira.jboss.org/jira/browse/JBIDE-2016
Test created.
Added: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1704Test/JavaSource/demo/MyBean.java
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1704Test/JavaSource/demo/MyBean.java (rev 0)
+++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1704Test/JavaSource/demo/MyBean.java 2009-07-29 10:51:16 UTC (rev 16858)
@@ -0,0 +1,29 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Exadel, Inc. and Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Exadel, Inc. and Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package demo;
+
+import java.util.List;
+
+/**
+ * Created by JBoss Developer Studio
+ *
+ */
+public class MyBean {
+ private List<User> users;
+
+ public MyBean() {
+ }
+
+ public List<User> getUsers() {
+ return users;
+ }
+
+}
\ No newline at end of file
Property changes on: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1704Test/JavaSource/demo/MyBean.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Deleted: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1704Test/JavaSource/demo/Person.java
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1704Test/JavaSource/demo/Person.java 2009-07-29 10:50:00 UTC (rev 16857)
+++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1704Test/JavaSource/demo/Person.java 2009-07-29 10:51:16 UTC (rev 16858)
@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Exadel, Inc. and Red Hat, Inc.
- * Distributed under license by Red Hat, Inc. All rights reserved.
- * This program is made available under the terms of the
- * Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Exadel, Inc. and Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
-package demo;
-
-/**
- * Created by JBoss Developer Studio
-*
- */
-public class Person {
- private String name;
-
- public Person() {
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-}
\ No newline at end of file
Added: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1704Test/JavaSource/demo/User.java
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1704Test/JavaSource/demo/User.java (rev 0)
+++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1704Test/JavaSource/demo/User.java 2009-07-29 10:51:16 UTC (rev 16858)
@@ -0,0 +1,23 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Exadel, Inc. and Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Exadel, Inc. and Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package demo;
+
+public class User {
+ private MyBean name;
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+}
\ No newline at end of file
Property changes on: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1704Test/JavaSource/demo/User.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1704Test/WebContent/WEB-INF/faces-config.xml
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1704Test/WebContent/WEB-INF/faces-config.xml 2009-07-29 10:50:00 UTC (rev 16857)
+++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1704Test/WebContent/WEB-INF/faces-config.xml 2009-07-29 10:51:16 UTC (rev 16858)
@@ -3,13 +3,9 @@
xmlns:xi="http://www.w3.org/2001/XInclude"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_1_2.xsd">
<managed-bean>
- <managed-bean-name>person</managed-bean-name>
- <managed-bean-class>demo.Person</managed-bean-class>
+ <managed-bean-name>myBean</managed-bean-name>
+ <managed-bean-class>demo.MyBean</managed-bean-class>
<managed-bean-scope>request</managed-bean-scope>
- <managed-property>
- <property-name>name</property-name>
- <value/>
- </managed-property>
</managed-bean>
<navigation-rule>
<from-view-id>/pages/greeting.jsp</from-view-id>
Modified: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1704Test/WebContent/pages/greeting.jsp
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1704Test/WebContent/pages/greeting.jsp 2009-07-29 10:50:00 UTC (rev 16857)
+++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1704Test/WebContent/pages/greeting.jsp 2009-07-29 10:51:16 UTC (rev 16858)
@@ -7,14 +7,12 @@
</head>
<body>
<f:view>
- <f:loadBundle basename="resources" var="msg" />
-
- <strong>
- <h:outputText value="#{msg.greeting}" />
-
- <h:outputText value="#{person.name}" />
- <h:outputText value="!" />
- </strong>
+ <h:dataTable value="#{myBean.users}" var="user">
+ <h:column>
+ <h:outputText value="#{user.}" />
+ </h:column>
+ </h:dataTable>
+
</f:view>
</body>
</html>
\ No newline at end of file
Deleted: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1704Test/WebContent/pages/greeting1.xhtml
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1704Test/WebContent/pages/greeting1.xhtml 2009-07-29 10:50:00 UTC (rev 16857)
+++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1704Test/WebContent/pages/greeting1.xhtml 2009-07-29 10:51:16 UTC (rev 16858)
@@ -1,16 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"
- xmlns:ui="http://java.sun.com/jsf/facelets"
- xmlns:h="http://java.sun.com/jsf/html"
- xmlns:f="http://java.sun.com/jsf/core">
-
- <f:loadBundle basename="resources" var="msg" />
- <ui:composition template="/templates/common.xhtml">
- <ui:define name="pageTitle">Greeting to User</ui:define>
- <ui:define name="pageHeader">Facelets Greeting Page</ui:define>
- <ui:define name="body">
- <h:outputText value="#{msg.greeting}" />
- #{msg.greeting} #{person.name}!
- </ui:define>
- </ui:composition>
-</html>
\ No newline at end of file
14 years, 9 months
JBoss Tools SVN: r16857 - trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1704Test/.settings.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2009-07-29 06:50:00 -0400 (Wed, 29 Jul 2009)
New Revision: 16857
Removed:
trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1704Test/.settings/org.jboss.tools.jst.web.xml
Log:
https://jira.jboss.org/jira/browse/JBIDE-2016
Test created.
Deleted: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1704Test/.settings/org.jboss.tools.jst.web.xml
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1704Test/.settings/org.jboss.tools.jst.web.xml 2009-07-29 10:49:14 UTC (rev 16856)
+++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1704Test/.settings/org.jboss.tools.jst.web.xml 2009-07-29 10:50:00 UTC (rev 16857)
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<file-systems VERSION="2.0.0" application-name="JsfJbide1704Test"
- model-entity="FileSystems" workspace-home="./WebContent/WEB-INF">
- <file-system NAME="WEB-INF" location="%workspace.home%" model-entity="FileSystemFolder"/>
- <file-system NAME="WEB-ROOT" info="Content-Type=Web"
- location="%workspace.home%/.." model-entity="FileSystemFolder"/>
- <file-system NAME="src" location="%workspace.home%/../../JavaSource" model-entity="FileSystemFolder"/>
- <file-system NAME="lib" location="%workspace.home%/lib" model-entity="FileSystemFolder"/>
- <file-system NAME="classes" location="%workspace.home%/classes" model-entity="FileSystemFolder"/>
- <file-system NAME="lib-commons-beanutils.jar" info="hidden=yes"
- location="%workspace.home%/lib/commons-beanutils.jar" model-entity="FileSystemJar"/>
- <file-system NAME="lib-commons-collections.jar" info="hidden=yes"
- location="%workspace.home%/lib/commons-collections.jar" model-entity="FileSystemJar"/>
- <file-system NAME="lib-commons-digester.jar" info="hidden=yes"
- location="%workspace.home%/lib/commons-digester.jar" model-entity="FileSystemJar"/>
- <file-system NAME="lib-commons-logging.jar" info="hidden=yes"
- location="%workspace.home%/lib/commons-logging.jar" model-entity="FileSystemJar"/>
- <file-system NAME="lib-jstl.jar" info="hidden=yes"
- location="%workspace.home%/lib/jstl.jar" model-entity="FileSystemJar"/>
- <file-system NAME="lib-standard.jar" info="hidden=yes"
- location="%workspace.home%/lib/standard.jar" model-entity="FileSystemJar"/>
- <file-system NAME="lib-jsf-facelets.jar"
- location="%workspace.home%/lib/jsf-facelets.jar" model-entity="FileSystemJar"/>
- <file-system NAME="flet001" location="%eclipse.project%" model-entity="FileSystemFolder"/>
- <file-system NAME="lib-common-annotations.jar" info="hidden=yes"
- location="%workspace.home%/lib/common-annotations.jar" model-entity="FileSystemJar"/>
- <file-system NAME="lib-jsf-tlds.jar" info="hidden=yes"
- location="%workspace.home%/lib/jsf-tlds.jar" model-entity="FileSystemJar"/>
- <web SERVLET_VERSION="2.5" model-entity="JstWeb" model-path="/web.xml">
- <module URI="/WEB-INF/faces-config.xml" model-entity="WebJSFModule"
- model-path="/faces-config.xml" root="WEB-ROOT" src="src"/>
- </web>
-</file-systems>
14 years, 9 months
JBoss Tools SVN: r16856 - in workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test: src/org/jboss/tools/vpe/ui/bot/test/editor and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: yzhishko
Date: 2009-07-29 06:49:14 -0400 (Wed, 29 Jul 2009)
New Revision: 16856
Added:
workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/BlockCommentTestLinesToggle.xml
workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/BlockCommentTestToggle.xml
workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/CommentTestUntoggle.xml
workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/BlockCommentTest.java
Removed:
workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/ToggleCommentTestLinesToggle.xml
workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/ToggleCommentTestLinesUntoggle.xml
workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/ToggleCommentTestUntoggle.xml
Modified:
workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/ToggleCommentTest.java
Log:
Tests for comments in VPE were updated. For some reasons SWTBot doesn't support key event under windows correctly.
Added: workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/BlockCommentTestLinesToggle.xml
===================================================================
--- workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/BlockCommentTestLinesToggle.xml (rev 0)
+++ workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/BlockCommentTestLinesToggle.xml 2009-07-29 10:49:14 UTC (rev 16856)
@@ -0,0 +1,34 @@
+<tests>
+ <test id="bodyId">
+ <DIV ID="bodyId">
+<TABLE STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px; width: 100%;">
+<TR>
+<TD>
+<DIV>
+<H1 STYLE="-moz-user-modify: read-write;">
+<SPAN CLASS="vpe-text">
+Hello Demo Application
+</SPAN>
+</H1>
+<UL STYLE="color: red; -moz-user-modify: read-only;">
+<LI>
+Error Messages
+</LI>
+</UL>
+<FORM STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px;">
+<SPAN CLASS="vpe-text">
+Name:
+</SPAN>
+<!--<h:inputText value="#{user.name}" required="true">
+ <f:validateLength maximum="30" minimum="3"/>
+ </h:inputText>-->
+<INPUT TYPE="button" VALUE="Say Hello!" STYLE="-moz-user-modify: read-only;"/>
+
+</FORM>
+</DIV>
+</TD>
+</TR>
+</TABLE>
+</DIV>
+ </test>
+</tests>
\ No newline at end of file
Added: workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/BlockCommentTestToggle.xml
===================================================================
--- workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/BlockCommentTestToggle.xml (rev 0)
+++ workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/BlockCommentTestToggle.xml 2009-07-29 10:49:14 UTC (rev 16856)
@@ -0,0 +1,36 @@
+<tests>
+ <test id="bodyId">
+ <DIV ID="bodyId">
+<TABLE STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px; width: 100%;">
+<TR>
+<TD>
+<DIV>
+<H1 STYLE="-moz-user-modify: read-write;">
+<SPAN CLASS="vpe-text">
+Hello Demo Application
+</SPAN>
+</H1>
+<UL STYLE="color: red; -moz-user-modify: read-only;">
+<LI>
+Error Messages
+</LI>
+</UL>
+<FORM STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px;">
+<SPAN CLASS="vpe-text">
+Name:
+</SPAN>
+<SPAN CLASS="vpe-text">
+<SPAN CLASS="vpe-text">
+</SPAN>
+<INPUT VALUE="#{user.name}"/>
+
+</SPAN>
+<!--<h:commandButton action="hello" value="Say Hello!" />-->
+</FORM>
+</DIV>
+</TD>
+</TR>
+</TABLE>
+</DIV>
+ </test>
+</tests>
\ No newline at end of file
Copied: workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/CommentTestUntoggle.xml (from rev 16840, workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/ToggleCommentTestLinesUntoggle.xml)
===================================================================
--- workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/CommentTestUntoggle.xml (rev 0)
+++ workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/CommentTestUntoggle.xml 2009-07-29 10:49:14 UTC (rev 16856)
@@ -0,0 +1,37 @@
+<tests>
+ <test id="bodyId">
+ <DIV ID="bodyId">
+<TABLE STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px; width: 100%;">
+<TR>
+<TD>
+<DIV>
+<H1 STYLE="-moz-user-modify: read-write;">
+<SPAN CLASS="vpe-text">
+Hello Demo Application
+</SPAN>
+</H1>
+<UL STYLE="color: red; -moz-user-modify: read-only;">
+<LI>
+Error Messages
+</LI>
+</UL>
+<FORM STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px;">
+<SPAN CLASS="vpe-text">
+Name:
+</SPAN>
+<SPAN CLASS="vpe-text">
+<SPAN CLASS="vpe-text">
+</SPAN>
+<INPUT VALUE="#{user.name}"/>
+
+</SPAN>
+<INPUT TYPE="button" VALUE="Say Hello!" STYLE="-moz-user-modify: read-only;"/>
+
+</FORM>
+</DIV>
+</TD>
+</TR>
+</TABLE>
+</DIV>
+ </test>
+</tests>
\ No newline at end of file
Deleted: workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/ToggleCommentTestLinesToggle.xml
===================================================================
--- workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/ToggleCommentTestLinesToggle.xml 2009-07-29 10:48:20 UTC (rev 16855)
+++ workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/ToggleCommentTestLinesToggle.xml 2009-07-29 10:49:14 UTC (rev 16856)
@@ -1,34 +0,0 @@
-<tests>
- <test id="bodyId">
- <DIV id="bodyId">
-<TABLE STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px; width: 100%;">
-<TR>
-<TD>
-<DIV>
-<H1 STYLE="-moz-user-modify: read-write;">
-<SPAN CLASS="vpe-text">
-Hello Demo Application
-</SPAN>
-</H1>
-<UL STYLE="color: red; -moz-user-modify: read-only;">
-<LI>
-Error Messages
-</LI>
-</UL>
-<FORM STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px;">
-<SPAN CLASS="vpe-text">
-Name:
-</SPAN>
-<!-- <h:inputText value="#{user.name}" required="true">-->
-<!-- <f:validateLength maximum="30" minimum="3"/>-->
-<!-- </h:inputText>-->
-<INPUT TYPE="button" VALUE="Say Hello!" STYLE="-moz-user-modify: read-only;"/>
-
-</FORM>
-</DIV>
-</TD>
-</TR>
-</TABLE>
-</DIV>
- </test>
-</tests>
\ No newline at end of file
Deleted: workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/ToggleCommentTestLinesUntoggle.xml
===================================================================
--- workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/ToggleCommentTestLinesUntoggle.xml 2009-07-29 10:48:20 UTC (rev 16855)
+++ workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/ToggleCommentTestLinesUntoggle.xml 2009-07-29 10:49:14 UTC (rev 16856)
@@ -1,37 +0,0 @@
-<tests>
- <test id="bodyId">
- <DIV ID="bodyId">
-<TABLE STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px; width: 100%;">
-<TR>
-<TD>
-<DIV>
-<H1 STYLE="-moz-user-modify: read-write;">
-<SPAN CLASS="vpe-text">
-Hello Demo Application
-</SPAN>
-</H1>
-<UL STYLE="color: red; -moz-user-modify: read-only;">
-<LI>
-Error Messages
-</LI>
-</UL>
-<FORM STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px;">
-<SPAN CLASS="vpe-text">
-Name:
-</SPAN>
-<SPAN CLASS="vpe-text">
-<SPAN CLASS="vpe-text">
-</SPAN>
-<INPUT VALUE="#{user.name}"/>
-
-</SPAN>
-<INPUT TYPE="button" VALUE="Say Hello!" STYLE="-moz-user-modify: read-only;"/>
-
-</FORM>
-</DIV>
-</TD>
-</TR>
-</TABLE>
-</DIV>
- </test>
-</tests>
\ No newline at end of file
Deleted: workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/ToggleCommentTestUntoggle.xml
===================================================================
--- workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/ToggleCommentTestUntoggle.xml 2009-07-29 10:48:20 UTC (rev 16855)
+++ workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/ToggleCommentTestUntoggle.xml 2009-07-29 10:49:14 UTC (rev 16856)
@@ -1,37 +0,0 @@
-<tests>
- <test id="bodyId">
- <DIV ID="bodyId">
-<TABLE STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px; width: 100%;">
-<TR>
-<TD>
-<DIV>
-<H1 STYLE="-moz-user-modify: read-write;">
-<SPAN CLASS="vpe-text">
-Hello Demo Application
-</SPAN>
-</H1>
-<UL STYLE="color: red; -moz-user-modify: read-only;">
-<LI>
-Error Messages
-</LI>
-</UL>
-<FORM STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px;">
-<SPAN CLASS="vpe-text">
-Name:
-</SPAN>
-<SPAN CLASS="vpe-text">
-<SPAN CLASS="vpe-text">
-</SPAN>
-<INPUT VALUE="#{user.name}"/>
-
-</SPAN>
-<INPUT TYPE="button" VALUE="Say Hello!" STYLE="-moz-user-modify: read-only;"/>
-
-</FORM>
-</DIV>
-</TD>
-</TR>
-</TABLE>
-</DIV>
- </test>
-</tests>
\ No newline at end of file
Added: workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/BlockCommentTest.java
===================================================================
--- workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/BlockCommentTest.java (rev 0)
+++ workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/BlockCommentTest.java 2009-07-29 10:49:14 UTC (rev 16856)
@@ -0,0 +1,193 @@
+package org.jboss.tools.vpe.ui.bot.test.editor;
+
+import java.util.List;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Event;
+import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotEclipseEditor;
+import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotEditor;
+import org.eclipse.swtbot.swt.finder.SWTBot;
+import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree;
+import org.jboss.tools.ui.bot.test.WidgetVariables;
+import org.jboss.tools.vpe.ui.bot.test.VPEAutoTestCase;
+
+public class BlockCommentTest extends VPEAutoTestCase{
+
+ private static String textEditor;
+ private static SWTBotEclipseEditor editor;
+
+ public void testBlockComment() throws Throwable{
+
+ //Test open page
+
+ SWTBot innerBot = bot.viewByTitle(WidgetVariables.PACKAGE_EXPLORER).bot();
+ SWTBotTree tree = innerBot.tree();
+ try {
+ List<? extends SWTBotEditor> editors = bot.editors();
+ for (int i = 0; i < editors.size(); i++) {
+ editors.get(i).close();
+ }
+
+ } catch (Exception e) {
+ }
+ try {
+ tree.expandNode(projectProperties.getProperty("JSFProjectName"))
+ .expandNode("WebContent").expandNode("pages").getNode(TEST_PAGE).doubleClick();
+ } catch (Exception e) {
+ }
+
+ editor = bot.editorByTitle(TEST_PAGE).toTextEditor();
+ textEditor = editor.getText();
+
+ //Test add block comment from Source menu
+
+ editor.navigateTo(22,22);
+ bot.menu("Source").menu("Add Block Comment").click();
+ waitForJobs();
+ checkVPE("BlockCommentTestToggle.xml");
+
+ //Test add block comment with CTRL+SHIFT+/ hot keys
+
+ editor.navigateTo(22,22);
+ pressBlockCommentHotKeys();
+ waitForJobs();
+ checkVPE("BlockCommentTestToggle.xml");
+
+ //Test remove block comment with CTRL+SHIFT+\ hot keys
+
+ editor.navigateTo(22,22);
+ pressUnBlockCommentHotKeys();
+ waitForJobs();
+ checkVPE("CommentTestUntoggle.xml");
+
+ //Test add block comment lines from Source menu
+
+ editor.navigateTo(18,22);
+ bot.menu("Source").menu("Add Block Comment").click();
+ waitForJobs();
+ checkVPE("BlockCommentTestLinesToggle.xml");
+
+ //Test remove block comment lines from Source menu
+
+ editor.navigateTo(18,22);
+ bot.menu("Source").menu("Remove Block Comment").click();
+ waitForJobs();
+ checkVPE("CommentTestUntoggle.xml");
+
+ //Test add block comment lines with CTRL+SHIFT+/ hot keys
+
+ editor.navigateTo(18,22);
+ bot.menu("Source").menu("Add Block Comment").click();
+ waitForJobs();
+ checkVPE("BlockCommentTestLinesToggle.xml");
+
+ //Test remove block comment lines with CTRL+SHIFT+/ hot keys
+
+ editor.navigateTo(18,22);
+ bot.menu("Source").menu("Remove Block Comment").click();
+ waitForJobs();
+ checkVPE("CommentTestUntoggle.xml");
+
+ }
+
+
+ @Override
+ protected void closeUnuseDialogs() {
+ }
+
+ @Override
+ protected boolean isUnuseDialogOpened() {
+ return false;
+ }
+
+ private void checkVPE(String testPage) throws Throwable{
+ editor.selectLine(9);
+ if (!"<body id=\"bodyId\">".equals(editor.getTextOnCurrentLine().trim())) {
+ editor.insertText("<body id=\"bodyId\">");
+ }
+ editor.save();
+ waitForJobs();
+ performContentTest(testPage, bot.multiPageEditorByTitle(TEST_PAGE));
+ }
+
+ private void pressBlockCommentHotKeys(){
+ bot.getDisplay().syncExec(new Runnable() {
+ public void run() {
+ Display display = bot.getDisplay();
+ Event event = new Event();
+ event.type = SWT.KeyDown;
+ event.keyCode = SWT.CTRL;
+ display.post(event);
+ event = new Event();
+ event.type = SWT.KeyDown;
+ event.keyCode = SWT.SHIFT;
+ display.post(event);
+ event = new Event();
+ event.type = SWT.KeyDown;
+ event.character = '/';
+ display.post(event);
+ event = new Event();
+ event.type = SWT.KeyUp;
+ event.character = '/';
+ display.post(event);
+ event = new Event();
+ event.type = SWT.KeyUp;
+ event.keyCode = SWT.SHIFT;
+ display.post(event);
+ event = new Event();
+ event.type = SWT.KeyUp;
+ event.keyCode = SWT.CTRL;
+ display.post(event);
+ }
+ });
+ }
+
+ private void pressUnBlockCommentHotKeys(){
+ bot.getDisplay().syncExec(new Runnable() {
+ public void run() {
+ Display display = bot.getDisplay();
+ Event event = new Event();
+ event.type = SWT.KeyDown;
+ event.keyCode = SWT.CTRL;
+ display.post(event);
+ event = new Event();
+ event.type = SWT.KeyDown;
+ event.keyCode = SWT.SHIFT;
+ display.post(event);
+ event = new Event();
+ event.type = SWT.KeyDown;
+ event.character = '\\';
+ display.post(event);
+ event = new Event();
+ event.type = SWT.KeyUp;
+ event.character = '\\';
+ display.post(event);
+ event = new Event();
+ event.type = SWT.KeyUp;
+ event.keyCode = SWT.SHIFT;
+ display.post(event);
+ event = new Event();
+ event.type = SWT.KeyUp;
+ event.keyCode = SWT.CTRL;
+ display.post(event);
+ }
+ });
+ }
+
+ @Override
+ protected void tearDown() throws Exception {
+
+ //Restore page state before tests
+
+ editor.setFocus();
+ bot.menu("Edit").menu("Select All").click();
+ bot.menu("Edit").menu("Delete").click();
+ editor.setText(textEditor);
+ editor.save();
+ waitForJobs();
+ editor.close();
+ super.tearDown();
+ }
+
+
+}
Modified: workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/ToggleCommentTest.java
===================================================================
--- workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/ToggleCommentTest.java 2009-07-29 10:48:20 UTC (rev 16855)
+++ workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/ToggleCommentTest.java 2009-07-29 10:49:14 UTC (rev 16856)
@@ -1,15 +1,12 @@
package org.jboss.tools.vpe.ui.bot.test.editor;
import java.util.List;
-
-import org.eclipse.jface.bindings.keys.KeyStroke;
import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Event;
import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotEclipseEditor;
import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotEditor;
import org.eclipse.swtbot.swt.finder.SWTBot;
-import org.eclipse.swtbot.swt.finder.keyboard.Keystrokes;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree;
import org.jboss.tools.ui.bot.test.WidgetVariables;
import org.jboss.tools.vpe.ui.bot.test.VPEAutoTestCase;
@@ -39,10 +36,12 @@
} catch (Exception e) {
}
- //Test toggle comment from Source menu
editor = bot.editorByTitle(TEST_PAGE).toTextEditor();
textEditor = editor.getText();
+
+ //Test toggle comment from Source menu
+
editor.navigateTo(22,22);
bot.menu("Source").menu("Toggle Comment").click();
waitForJobs();
@@ -55,7 +54,7 @@
bot.menu("Source").menu("Toggle Comment").click();
waitForJobs();
checkSelectionBar("h:commandButton");
- checkVPE("ToggleCommentTestUntoggle.xml");
+ checkVPE("CommentTestUntoggle.xml");
//Test toggle comment with CTRL+SHIFT+C hot keys
@@ -71,51 +70,8 @@
pressToggleCommentHotKeys();
waitForJobs();
checkSelectionBar("h:commandButton");
- checkVPE("ToggleCommentTestUntoggle.xml");
+ checkVPE("CommentTestUntoggle.xml");
- //Test toggle comment with three lines from Source menu
-
- editor.selectLine(18);
- editor.pressShortcut(Keystrokes.SHIFT, KeyStroke.getInstance(SWT.ARROW_DOWN));
- shortDelay();
- editor.pressShortcut(Keystrokes.SHIFT, KeyStroke.getInstance(SWT.ARROW_DOWN));
- bot.menu("Source").menu("Toggle Comment").click();
- editor.navigateTo(19, 22);
- waitForJobs();
- checkSelectionBar("#comment");
- checkVPE("ToggleCommentTestLinesToggle.xml");
-
- //Test untoggle comment with three lines from Source menu
-
- editor.selectLine(18);
- editor.pressShortcut(Keystrokes.SHIFT, KeyStroke.getInstance(SWT.ARROW_DOWN));
- shortDelay();
- editor.pressShortcut(Keystrokes.SHIFT, KeyStroke.getInstance(SWT.ARROW_DOWN));
- bot.menu("Source").menu("Toggle Comment").click();
- waitForJobs();
- checkVPE("ToggleCommentTestLinesUntoggle.xml");
-
- //Test toggle comment with three lines using hot keys
-
- editor.selectLine(18);
- editor.pressShortcut(Keystrokes.SHIFT, KeyStroke.getInstance(SWT.ARROW_DOWN));
- shortDelay();
- editor.pressShortcut(Keystrokes.SHIFT, KeyStroke.getInstance(SWT.ARROW_DOWN));
- pressToggleCommentHotKeys();
- waitForJobs();
- checkSelectionBar("#comment");
- checkVPE("ToggleCommentTestLinesToggle.xml");
-
- //Test untoggle comment with three lines using hot keys
-
- editor.selectLine(18);
- editor.pressShortcut(Keystrokes.SHIFT, KeyStroke.getInstance(SWT.ARROW_DOWN));
- shortDelay();
- editor.pressShortcut(Keystrokes.SHIFT, KeyStroke.getInstance(SWT.ARROW_DOWN));
- pressToggleCommentHotKeys();
- waitForJobs();
- checkVPE("ToggleCommentTestLinesUntoggle.xml");
-
}
private void checkVPE(String testPage) throws Throwable{
@@ -159,7 +115,7 @@
}
});
}
-
+
@Override
protected void closeUnuseDialogs() {
@@ -185,15 +141,10 @@
super.tearDown();
}
- @Override
- protected void shortDelay() {
- bot.sleep(500);
- }
-
private void checkSelectionBar (String... args){
for (int i = 0; i < args.length; i++) {
bot.toolbarButton(args[i]).click();
}
}
-
+
}
14 years, 9 months
JBoss Tools SVN: r16855 - in trunk/jst/tests/org.jboss.tools.jst.jsp.test: projects/JsfJbide2016Test and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2009-07-29 06:48:20 -0400 (Wed, 29 Jul 2009)
New Revision: 16855
Added:
trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide2016Test/
trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide2016Test/.classpath
trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide2016Test/.project
trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JsfJspJbide2016Test.java
Modified:
trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/JstJspAllTests.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-2016
Test created.
Added: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide2016Test/.classpath
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide2016Test/.classpath (rev 0)
+++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide2016Test/.classpath 2009-07-29 10:48:20 UTC (rev 16855)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="JavaSource"/>
+ <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
+ <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="output" path="WebContent/WEB-INF/classes"/>
+</classpath>
Property changes on: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide2016Test/.classpath
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide2016Test/.project
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide2016Test/.project (rev 0)
+++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide2016Test/.project 2009-07-29 10:48:20 UTC (rev 16855)
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>JsfJbide2016Test</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.wst.common.project.facet.core.builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
+ <nature>org.jboss.tools.jsf.jsfnature</nature>
+ <nature>org.eclipse.wst.common.project.facet.core.nature</nature>
+ </natures>
+</projectDescription>
Property changes on: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide2016Test/.project
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/JstJspAllTests.java
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/JstJspAllTests.java 2009-07-29 06:39:50 UTC (rev 16854)
+++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/JstJspAllTests.java 2009-07-29 10:48:20 UTC (rev 16855)
@@ -8,6 +8,7 @@
import org.jboss.tools.jst.jsp.test.ca.JsfJspJbide1717Test;
import org.jboss.tools.jst.jsp.test.ca.JsfJspJbide1807Test;
import org.jboss.tools.jst.jsp.test.ca.JsfJspJbide1813Test;
+import org.jboss.tools.jst.jsp.test.ca.JsfJspJbide2016Test;
import org.jboss.tools.jst.jsp.test.ca.JsfJspJbide2437Test;
import org.jboss.tools.jst.jsp.test.ca.JstJspJbide1585Test;
import org.jboss.tools.jst.jsp.test.ca.JstJspJbide1641Test;
@@ -30,6 +31,7 @@
suite.addTestSuite(Jbide1791Test.class);
suite.addTestSuite(JsfJspJbide2437Test.class);
suite.addTestSuite(JspPreferencesPageTest.class);
+ suite.addTestSuite(JsfJspJbide2016Test.class);
return suite;
}
Added: trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JsfJspJbide2016Test.java
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JsfJspJbide2016Test.java (rev 0)
+++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JsfJspJbide2016Test.java 2009-07-29 10:48:20 UTC (rev 16855)
@@ -0,0 +1,29 @@
+package org.jboss.tools.jst.jsp.test.ca;
+
+import org.jboss.tools.common.test.util.TestProjectProvider;
+
+public class JsfJspJbide2016Test extends ContentAssistantTestCase{
+ TestProjectProvider provider = null;
+ boolean makeCopy = false;
+ private static final String PROJECT_NAME = "JsfJbide2016Test";
+ private static final String PAGE_NAME = "/WebContent/pages/greeting.jsp";
+
+ public void setUp() throws Exception {
+ provider = new TestProjectProvider("org.jboss.tools.jst.jsp.test", null, PROJECT_NAME, makeCopy);
+ project = provider.getProject();
+ }
+
+ protected void tearDown() throws Exception {
+ if(provider != null) {
+ provider.dispose();
+ }
+ }
+
+ public void testJsfJspJbide2016Test(){
+ String[] proposals = {
+ "user.name",
+ };
+
+ checkProposals(PAGE_NAME, "value=\"#{user.}\"", 14, proposals, false);
+ }
+}
\ No newline at end of file
Property changes on: trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JsfJspJbide2016Test.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
14 years, 9 months
JBoss Tools SVN: r16854 - trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts.
by jbosstools-commits＠lists.jboss.org
Author: Grid.Qian
Date: 2009-07-29 02:39:50 -0400 (Wed, 29 Jul 2009)
New Revision: 16854
Modified:
trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/BPELTrayCategoryEditPart.java
trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/BPELTrayCategoryEntryEditPart.java
Log:
JBIDE-4625: java.lang.ArrayIndexOutOfBoundsException: 0 when switch from 'From import' to 'From project' in the Choose Partnerlink type wizard
Modified: trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/BPELTrayCategoryEditPart.java
===================================================================
--- trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/BPELTrayCategoryEditPart.java 2009-07-29 01:25:07 UTC (rev 16853)
+++ trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/BPELTrayCategoryEditPart.java 2009-07-29 06:39:50 UTC (rev 16854)
@@ -1,18 +1,32 @@
package org.eclipse.bpel.ui.editparts;
import org.eclipse.bpel.common.ui.tray.TrayCategoryEditPart;
-import org.eclipse.bpel.model.Scope;
import org.eclipse.bpel.ui.BPELEditor;
import org.eclipse.bpel.ui.editparts.policies.TrayContainerEditPolicy;
import org.eclipse.bpel.ui.util.ModelHelper;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.gef.AccessibleEditPart;
import org.eclipse.gef.EditPart;
+import org.eclipse.gef.EditPartViewer;
import org.eclipse.gef.EditPolicy;
+import org.eclipse.gef.RootEditPart;
import org.eclipse.jface.viewers.StructuredSelection;
public abstract class BPELTrayCategoryEditPart extends TrayCategoryEditPart{
+ // added by Grid.Qian
+ // use the variable to hold the root of the editpart
+ // because when we delete a correlationSets from scope
+ // the editpart parent will be null
+ private RootEditPart holdRoot;
+
+ // added by Grid.Qian
+ // use the variable to hold the parent's of the model
+ // that will be a scope or a process
+ // because when we delete a correlationSets from scope
+ // the eContainer will be null
+ private EObject eObj;
+
@Override
protected void createEditPolicies() {
super.createEditPolicies();
@@ -40,13 +54,54 @@
selectEditPart(getModelChildren().get(0));
} else {
// if we are executing this method we are dealing with scoped variables
- Scope scope = (Scope)((EObject)getModel()).eContainer();
- BPELEditor editor = ModelHelper.getBPELEditor(scope);
- EditPart editPart = (EditPart)editor.getGraphicalViewer().getEditPartRegistry().get(scope);
+
+ // delete the line by Grid.Qian because the econtainer maybe null
+ // when the model is deleted from the scope
+ // Scope scope = (Scope)((EObject)getModel()).eContainer();
+ BPELEditor editor = ModelHelper.getBPELEditor(eObj);
+ EditPart editPart = (EditPart)editor.getGraphicalViewer().getEditPartRegistry().get(eObj);
if (editPart != null) {
getViewer().setSelection(new StructuredSelection(editPart));
}
}
}
+
+ /**
+ * Overwrite the method by Grid.Qian to get the viewer
+ * when the editpart's parent == null
+ */
+ public EditPartViewer getViewer() {
+ try {
+ return super.getViewer();
+ } catch (Exception e) {
+ return holdRoot.getViewer();
+ }
+ }
+
+ /**
+ * Overwrite the method by Grid.Qian
+ * Hold the editpart's root editpart
+ */
+ public void setParent(EditPart parent) {
+ if (this.getParent() == parent)
+ return;
+ if (parent != null) {
+ holdRoot = parent.getRoot();
+ }
+ super.setParent(parent);
+ }
+
+
+ /**
+ * Overwrite the method by Grid.Qian
+ * Hold the scope or process that the model belong to
+ */
+ public void setModel(Object model) {
+ if (getModel() == model)
+ return;
+ eObj = ((EObject) model).eContainer();
+ super.setModel(model);
+ }
+
}
Modified: trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/BPELTrayCategoryEntryEditPart.java
===================================================================
--- trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/BPELTrayCategoryEntryEditPart.java 2009-07-29 01:25:07 UTC (rev 16853)
+++ trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/editparts/BPELTrayCategoryEntryEditPart.java 2009-07-29 06:39:50 UTC (rev 16854)
@@ -23,7 +23,9 @@
import org.eclipse.emf.ecore.EObject;
import org.eclipse.gef.AccessibleEditPart;
import org.eclipse.gef.EditPart;
+import org.eclipse.gef.EditPartViewer;
import org.eclipse.gef.EditPolicy;
+import org.eclipse.gef.RootEditPart;
/**
* Tray category edit part.
@@ -38,6 +40,12 @@
protected MouseMotionListener mouseMotionListener;
+ // added by Grid.Qian
+ // use the variable to hold the root of the editpart
+ // because when we delete a correlationSet from scope
+ // the editpart parent will be null
+ private RootEditPart holdRoot;
+
@Override
protected AccessibleEditPart createAccessible() {
return new BPELTrayAccessibleEditPart(this);
@@ -134,7 +142,11 @@
@Override
public void removeNotify() {
// we only do the following hack if we are dealing with scoped variables
- if (!(((EObject)getParent().getModel()).eContainer() instanceof Scope)) {
+
+ // when we delete a variable from scope, the variables parent will
+ // be null, so we need to filter this
+ EObject eObj = ((EObject) getParent().getModel()).eContainer();
+ if (eObj != null && !(eObj instanceof Scope)) {
super.removeNotify();
return;
}
@@ -152,4 +164,30 @@
children.get(i).removeNotify();
unregister();
}
+
+ /**
+ * Overwrite the method by Grid.Qian to get the viewer
+ * when the editpart's parent == null
+ */
+ public EditPartViewer getViewer() {
+ try {
+ return super.getViewer();
+ } catch (Exception e) {
+ return holdRoot.getViewer();
+ }
+
+ }
+
+ /**
+ * Overwrite the method by Grid.Qian
+ * Hold the editpart's root editpart
+ */
+ public void setParent(EditPart parent) {
+ if (this.getParent() == parent)
+ return;
+ if (parent != null) {
+ holdRoot = parent.getRoot();
+ }
+ super.setParent(parent);
+ }
}
14 years, 9 months
JBoss Tools SVN: r16853 - trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/mapping/details.
by jbosstools-commits＠lists.jboss.org
Author: sflanigan
Date: 2009-07-28 21:25:07 -0400 (Tue, 28 Jul 2009)
New Revision: 16853
Modified:
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/mapping/details/ParametersComposite.java
Log:
Fixed compilation error apparently related to r16835.
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/mapping/details/ParametersComposite.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/mapping/details/ParametersComposite.java 2009-07-28 23:15:35 UTC (rev 16852)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/mapping/details/ParametersComposite.java 2009-07-29 01:25:07 UTC (rev 16853)
@@ -38,8 +38,8 @@
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Table;
import org.eclipse.swt.widgets.TableItem;
-import org.jboss.tools.hibernate.jpt.core.internal.context.Parameter;
import org.jboss.tools.hibernate.jpt.core.internal.context.java.GenericGenerator;
+import org.jboss.tools.hibernate.jpt.core.internal.context.java.Parameter;
/**
* @author Dmitry Geraskov
14 years, 9 months
JBoss Tools SVN: r16852 - trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2009-07-28 19:15:35 -0400 (Tue, 28 Jul 2009)
New Revision: 16852
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/JBossServerCorePlugin.java
Log:
added utility method
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/JBossServerCorePlugin.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/JBossServerCorePlugin.java 2009-07-28 22:59:34 UTC (rev 16851)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/JBossServerCorePlugin.java 2009-07-28 23:15:35 UTC (rev 16852)
@@ -84,5 +84,11 @@
public static IPath getServerStateLocation(String serverID) {
return ServerUtil.getServerStateLocation(serverID);
}
+
+ public static IPath getGlobalSettingsLocation() {
+ return JBossServerCorePlugin.getDefault().getStateLocation().append(".global"); //$NON-NLS-1$
+ }
+
+
}
14 years, 9 months
JBoss Tools SVN: r16851 - trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/ui.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2009-07-28 18:59:34 -0400 (Tue, 28 Jul 2009)
New Revision: 16851
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/ui/Fileset.java
trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/ui/FilesetActionProvider.java
trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/ui/FilesetContentProvider.java
trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/ui/FilesetDialog.java
trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/ui/FilesetLabelProvider.java
Log:
JBIDE-4674
Modified: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/ui/Fileset.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/ui/Fileset.java 2009-07-28 22:16:55 UTC (rev 16850)
+++ trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/ui/Fileset.java 2009-07-28 22:59:34 UTC (rev 16851)
@@ -10,11 +10,16 @@
******************************************************************************/
package org.jboss.ide.eclipse.archives.webtools.ui;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.wst.server.core.IServer;
+
public class Fileset implements Cloneable {
private static final String HASH_SEPARATOR = "::_::"; //$NON-NLS-1$
private static final String SEP = "\n"; //$NON-NLS-1$
private String name, folder, includesPattern, excludesPattern;
+ private IServer server;
public Fileset() {
}
public Fileset(String string) {
@@ -41,8 +46,19 @@
* @return the folder
*/
public String getFolder() {
+ String tmp = folder == null ? "" : folder; //$NON-NLS-1$
+ IPath p = new Path(tmp);
+ if( !p.isAbsolute() && server != null ) {
+ if( server.getRuntime() != null )
+ p = server.getRuntime().getLocation().append(p);
+ }
+ return p.toString();
+ }
+
+ public String getRawFolder() {
return folder == null ? "" : folder; //$NON-NLS-1$
}
+
/**
* @return the name
*/
@@ -89,6 +105,9 @@
public void setName(String name) {
this.name = name;
}
+
+ public IServer getServer() { return this.server; }
+ public void setServer(IServer server) { this.server = server; }
public Object clone() {
try {
Modified: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/ui/FilesetActionProvider.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/ui/FilesetActionProvider.java 2009-07-28 22:16:55 UTC (rev 16850)
+++ trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/ui/FilesetActionProvider.java 2009-07-28 22:59:34 UTC (rev 16851)
@@ -17,6 +17,7 @@
import org.eclipse.core.filesystem.IFileStore;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.Path;
@@ -50,7 +51,9 @@
import org.jboss.ide.eclipse.archives.webtools.ui.FilesetContentProvider.PathWrapper;
import org.jboss.ide.eclipse.archives.webtools.ui.FilesetContentProvider.ServerWrapper;
import org.jboss.ide.eclipse.as.core.server.IDeployableServer;
+import org.jboss.ide.eclipse.as.core.server.IJBossServerRuntime;
import org.jboss.ide.eclipse.as.core.util.FileUtil;
+import org.jboss.ide.eclipse.as.core.util.IConstants;
import org.jboss.ide.eclipse.as.ui.JBossServerUIPlugin;
public class FilesetActionProvider extends CommonActionProvider implements IDoubleClickListener {
@@ -194,13 +197,18 @@
.loadAdapter(IDeployableServer.class,
new NullProgressMonitor());
String location = null;
- if (server != null)
- location = server.getConfigDirectory();
- else
+ if (server != null && server.getServer().getRuntime() != null ) {
+ IJBossServerRuntime runtime = (IJBossServerRuntime)
+ server.getServer().getRuntime().loadAdapter(IJBossServerRuntime.class, null);
+ if( runtime != null ) {
+ location = IConstants.SERVER + IPath.SEPARATOR + runtime.getJBossConfiguration();
+ }
+ }
+ if( location == null )
location = iserver.getRuntime().getLocation().toOSString();
if (location != null) {
- FilesetDialog d = new FilesetDialog(new Shell(), location);
+ FilesetDialog d = new FilesetDialog(new Shell(), location, iserver);
if (d.open() == Window.OK) {
Fileset fs = d.getFileset();
wrapper.addFileset(fs);
@@ -231,7 +239,7 @@
if (d.open() == Window.OK) {
Fileset ret = d.getFileset();
sel.setName(ret.getName());
- sel.setFolder(ret.getFolder());
+ sel.setFolder(ret.getRawFolder());
sel.setIncludesPattern(ret.getIncludesPattern());
sel.setExcludesPattern(ret.getExcludesPattern());
wrapper.saveFilesets();
Modified: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/ui/FilesetContentProvider.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/ui/FilesetContentProvider.java 2009-07-28 22:16:55 UTC (rev 16850)
+++ trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/ui/FilesetContentProvider.java 2009-07-28 22:59:34 UTC (rev 16851)
@@ -173,6 +173,7 @@
filesets = new Fileset[asStrings.length];
for (int i = 0; i < asStrings.length; i++) {
filesets[i] = new Fileset(asStrings[i]);
+ filesets[i].setServer(server);
}
}
return filesets;
@@ -197,6 +198,7 @@
includes = categoryMementos[i].getString("includes");//$NON-NLS-1$
excludes = categoryMementos[i].getString("excludes");//$NON-NLS-1$
filesets[i] = new Fileset(name, folder, includes, excludes);
+ filesets[i].setServer(server);
}
} catch( IOException ioe) {
// TODO LOG
@@ -210,7 +212,7 @@
for( int i = 0; i < sets.length; i++ ) {
XMLMemento child = (XMLMemento)memento.createChild("fileset");//$NON-NLS-1$
child.putString("name", sets[i].getName());//$NON-NLS-1$
- child.putString("folder", sets[i].getFolder());//$NON-NLS-1$
+ child.putString("folder", sets[i].getRawFolder());//$NON-NLS-1$
child.putString("includes", sets[i].getIncludesPattern());//$NON-NLS-1$
child.putString("excludes", sets[i].getExcludesPattern());//$NON-NLS-1$
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/ui/FilesetDialog.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/ui/FilesetDialog.java 2009-07-28 22:16:55 UTC (rev 16850)
+++ trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/ui/FilesetDialog.java 2009-07-28 22:59:34 UTC (rev 16851)
@@ -34,6 +34,7 @@
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.swt.widgets.Text;
+import org.eclipse.wst.server.core.IServer;
import org.jboss.ide.eclipse.archives.core.asf.DirectoryScanner;
import org.jboss.ide.eclipse.archives.core.model.DirectoryScannerFactory;
import org.jboss.ide.eclipse.archives.core.model.DirectoryScannerFactory.DirectoryScannerExtension.FileWrapper;
@@ -47,15 +48,19 @@
private Text includesText, excludesText, folderText, nameText;
private Composite main;
private FilesetPreviewComposite preview;
- protected FilesetDialog(Shell parentShell, String defaultLocation) {
+ private IServer server;
+ protected FilesetDialog(Shell parentShell, String defaultLocation, IServer server) {
super(parentShell);
this.fileset = new Fileset();
this.fileset.setFolder(defaultLocation);
-
+ this.fileset.setServer(server);
+ this.fileset.setIncludesPattern("**/*.xml"); //$NON-NLS-1$
+ this.server = server;
}
protected FilesetDialog(Shell parentShell, Fileset fileset) {
super(parentShell);
this.fileset = (Fileset)fileset.clone();
+ this.server = fileset.getServer();
}
protected Point getInitialSize() {
//return new Point(400, 150);
@@ -82,11 +87,13 @@
fillArea(main);
nameText.setText(fileset.getName());
- folderText.setText(fileset.getFolder());
+ folderText.setText(fileset.getRawFolder());
includesText.setText(fileset.getIncludesPattern());
excludesText.setText(fileset.getExcludesPattern());
addListeners();
+ getShell().layout();
+ textModified();
return sup;
}
@@ -106,14 +113,28 @@
}
public void widgetSelected(SelectionEvent e) {
DirectoryDialog d = new DirectoryDialog(new Shell());
- d.setFilterPath(folderText.getText());
+ String txt = folderText.getText();
+ if( !new Path(txt).isAbsolute() && server != null && server.getRuntime() != null)
+ txt = server.getRuntime().getLocation().append(txt).toString();
+ d.setFilterPath(txt);
String x = d.open();
- if( x != null )
- folderText.setText(x);
+ if( x != null ) {
+ folderText.setText(makeRelative(x));
+ }
}
});
}
+ protected String makeRelative(String path) {
+ if( server != null && server.getRuntime() != null ) {
+ if( server.getRuntime().getLocation().isPrefixOf(new Path(path))) {
+ String p2 = path.substring(server.getRuntime().getLocation().toString().length());
+ return new Path(p2).makeRelative().toString();
+ }
+ }
+ return path;
+ }
+
protected void textModified() {
name = nameText.getText();
dir = folderText.getText();
@@ -170,7 +191,7 @@
}
private void updatePreview() {
- preview.setInput(findPaths(dir, includes, excludes));
+ preview.setInput(findPaths(fileset.getFolder(), includes, excludes));
}
public String getDir() {
Modified: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/ui/FilesetLabelProvider.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/ui/FilesetLabelProvider.java 2009-07-28 22:16:55 UTC (rev 16850)
+++ trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/ui/FilesetLabelProvider.java 2009-07-28 22:59:34 UTC (rev 16851)
@@ -64,7 +64,7 @@
public String getText(Object element) {
if( element instanceof PathWrapper ) return ((PathWrapper)element).getLocalizedResourceName();
- if( element instanceof Fileset ) return ((Fileset)element).getName() + " " + ((Fileset)element).getFolder(); //$NON-NLS-1$
+ if( element instanceof Fileset ) return ((Fileset)element).getName() + " " + ((Fileset)element).getRawFolder(); //$NON-NLS-1$
if( element instanceof ServerWrapper ) return "Filesets"; //$NON-NLS-1$
return null;
}
14 years, 9 months
JBoss Tools SVN: r16850 - trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/ui.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2009-07-28 18:16:55 -0400 (Tue, 28 Jul 2009)
New Revision: 16850
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/ui/FilesetActionProvider.java
Log:
JBIDE-4673
Modified: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/ui/FilesetActionProvider.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/ui/FilesetActionProvider.java 2009-07-28 21:19:28 UTC (rev 16849)
+++ trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/ui/FilesetActionProvider.java 2009-07-28 22:16:55 UTC (rev 16850)
@@ -204,6 +204,7 @@
if (d.open() == Window.OK) {
Fileset fs = d.getFileset();
wrapper.addFileset(fs);
+ actionSite.getStructuredViewer().refresh(wrapper);
}
}
}
@@ -214,8 +215,10 @@
public void run() {
Fileset fs = (Fileset)selected[0];
ServerWrapper wrapper = getServerWrapper(fs);
- if( wrapper != null )
+ if( wrapper != null ) {
wrapper.removeFileset(fs);
+ actionSite.getStructuredViewer().refresh(wrapper);
+ }
}
};
deleteFilter.setText(Messages.FilesetsDeleteFilter);
@@ -232,6 +235,7 @@
sel.setIncludesPattern(ret.getIncludesPattern());
sel.setExcludesPattern(ret.getExcludesPattern());
wrapper.saveFilesets();
+ actionSite.getStructuredViewer().refresh(wrapper);
}
}
};
14 years, 9 months
JBoss Tools SVN: r16849 - workspace/snjeza/cont/container.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2009-07-28 17:19:28 -0400 (Tue, 28 Jul 2009)
New Revision: 16849
Modified:
workspace/snjeza/cont/container/pom.xml
Log:
Modified: workspace/snjeza/cont/container/pom.xml
===================================================================
--- workspace/snjeza/cont/container/pom.xml 2009-07-28 21:05:36 UTC (rev 16848)
+++ workspace/snjeza/cont/container/pom.xml 2009-07-28 21:19:28 UTC (rev 16849)
@@ -20,4 +20,15 @@
<module>prj-jar</module>
<module>prj-ear</module>
</modules>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
\ No newline at end of file
14 years, 9 months