JBoss Tools SVN: r23907 - in trunk/vpe: plugins/org.jboss.tools.vpe.spring/src/org/jboss/tools/vpe/spring/template/util and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dmaliarevich
Date: 2010-08-04 03:48:17 -0400 (Wed, 04 Aug 2010)
New Revision: 23907
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe.spring/src/org/jboss/tools/vpe/spring/template/SpringTextAreaTemplate.java
trunk/vpe/plugins/org.jboss.tools.vpe.spring/src/org/jboss/tools/vpe/spring/template/util/Spring.java
trunk/vpe/plugins/org.jboss.tools.vpe.spring/templates/vpe-templates-spring.xml
trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/hidden.jsp
trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/input.jsp
trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/label.jsp
trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/textarea.jsp
trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/textarea.jsp.xml
Log:
https://jira.jboss.org/browse/JBIDE-6711 , some templates and tests were updated.
Modified: trunk/vpe/plugins/org.jboss.tools.vpe.spring/src/org/jboss/tools/vpe/spring/template/SpringTextAreaTemplate.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.spring/src/org/jboss/tools/vpe/spring/template/SpringTextAreaTemplate.java 2010-08-04 07:11:10 UTC (rev 23906)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.spring/src/org/jboss/tools/vpe/spring/template/SpringTextAreaTemplate.java 2010-08-04 07:48:17 UTC (rev 23907)
@@ -52,26 +52,16 @@
(sourceElement.hasAttribute(Spring.ATTR_CSS_STYLE)
? sourceElement.getAttribute(Spring.ATTR_CSS_STYLE)
: Constants.EMPTY));
-
/*
- * Add text children to the text area
+ * Add value of the 'path' attribute to the textarea.
+ * No children are allowed for the form:textarea.
*/
- final NodeList childNodes = sourceNode.getChildNodes();
- final int childNodesLength = childNodes.getLength();
- for (int i = 0; i < childNodesLength; i++) {
- final Node child = childNodes.item(i);
- if (child.getNodeType() == Node.TEXT_NODE) {
- final nsIDOMNode text = visualDocument.createTextNode(child.getNodeValue());
- textarea.appendChild(text);
- }
+ if (sourceElement.hasAttribute(Spring.ATTR_PATH)) {
+ textarea.appendChild(visualDocument.createTextNode(sourceElement
+ .getAttribute(Spring.ATTR_PATH)));
}
final VpeCreationData creationData = new VpeCreationData(textarea);
-
- final VpeElementData textElementsData = new VpeElementData();
- textElementsData.addNodeData(new NodeData(sourceNode.getLastChild(), textarea));
- creationData.setElementData(textElementsData);
-
return creationData;
}
Modified: trunk/vpe/plugins/org.jboss.tools.vpe.spring/src/org/jboss/tools/vpe/spring/template/util/Spring.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.spring/src/org/jboss/tools/vpe/spring/template/util/Spring.java 2010-08-04 07:11:10 UTC (rev 23906)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.spring/src/org/jboss/tools/vpe/spring/template/util/Spring.java 2010-08-04 07:48:17 UTC (rev 23907)
@@ -22,6 +22,7 @@
public static final String ATTR_ID = "id"; //$NON-NLS-1$
public static final String ATTR_ITEMS = "items"; //$NON-NLS-1$
public static final String ATTR_ITEM_LABEL = "itemLabel"; //$NON-NLS-1$
+ public static final String ATTR_PATH = "path"; //$NON-NLS-1$
public static final String ATTR_MULTIPLE = "multiple"; //$NON-NLS-1$
public static final String VALUE_TRUE = "true"; //$NON-NLS-1$
Modified: trunk/vpe/plugins/org.jboss.tools.vpe.spring/templates/vpe-templates-spring.xml
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.spring/templates/vpe-templates-spring.xml 2010-08-04 07:11:10 UTC (rev 23906)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.spring/templates/vpe-templates-spring.xml 2010-08-04 07:48:17 UTC (rev 23907)
@@ -127,7 +127,7 @@
<vpe:if test="@disabled='true'">
<vpe:template children="no" modify="no">
<input type="text" id="{@id}" class="{@cssClass}" style="{@cssStyle}"
- size="{@size}" dir="{@dir}" value="{@value}"
+ size="{@size}" dir="{@dir}" value="{@path}"
disabled="disabled" />
<vpe:resize>
<vpe:width width-attr="cssStyle.width" />
@@ -142,7 +142,7 @@
</vpe:if>
<vpe:template children="no" modify="no">
<input type="text" id="{@id}" class="{@cssClass}" style="{@cssStyle}"
- size="{@size}" dir="{@dir}" value="{@value}"/>
+ size="{@size}" dir="{@dir}" value="{@path}"/>
<vpe:resize>
<vpe:width width-attr="cssStyle.width" />
<vpe:height height-attr="cssStyle.height" />
@@ -393,7 +393,7 @@
</vpe:tag>
<vpe:tag name="form:textarea" case-sensitive="yes">
- <vpe:template children="yes" modify="yes"
+ <vpe:template children="no" modify="no"
class="org.jboss.tools.vpe.spring.template.SpringTextAreaTemplate">
<vpe:resize>
<vpe:width width-attr="cssStyle.width" />
Modified: trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/hidden.jsp
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/hidden.jsp 2010-08-04 07:11:10 UTC (rev 23906)
+++ trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/hidden.jsp 2010-08-04 07:48:17 UTC (rev 23907)
@@ -1,6 +1,6 @@
<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
<html>
<body>
-<form:hidden id="hidden" value="hidden"/>
+<form:hidden id="hidden" path="hidden"/>
</body>
</html>
Modified: trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/input.jsp
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/input.jsp 2010-08-04 07:11:10 UTC (rev 23906)
+++ trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/input.jsp 2010-08-04 07:48:17 UTC (rev 23907)
@@ -1,7 +1,7 @@
<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
<html>
<body>
-<form:input id="input1" value="input"/>
-<form:input id="input2" value="input" disabled="true"/>
+<form:input id="input1" path="input"/>
+<form:input id="input2" path="input" disabled="true"/>
</body>
</html>
Modified: trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/label.jsp
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/label.jsp 2010-08-04 07:11:10 UTC (rev 23906)
+++ trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/label.jsp 2010-08-04 07:48:17 UTC (rev 23907)
@@ -16,10 +16,10 @@
</style>
</head>
<body>
-<form:label id="label1" cssClass="green" cssStyle="font-weight: bold;">
+<form:label id="label1" cssClass="green" cssStyle="font-weight: bold;" path="label1">
Label 1
</form:label>
-<form:label id="label2" for="text" cssClass="blue" cssStyle="font-style: italic;">
+<form:label id="label2" for="text" cssClass="blue" cssStyle="font-style: italic;" path="label2">
Label 2
</form:label>
<input type="text" id="text" />
Modified: trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/textarea.jsp
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/textarea.jsp 2010-08-04 07:11:10 UTC (rev 23906)
+++ trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/textarea.jsp 2010-08-04 07:48:17 UTC (rev 23907)
@@ -15,9 +15,7 @@
</style>
</head>
<body>
-<form:textarea id="textArea1" cssClass="green" cssStyle="font-weight: bold;">
-textArea 1
-</form:textarea>
-<form:textarea id="textArea2" value="textArea 2" cssClass="blue" cssStyle="font-style: italic;"/>
+<form:textarea id="textArea1" cssClass="green" cssStyle="font-weight: bold;" path="textarea1" />
+<form:textarea id="textArea2" cssClass="blue" cssStyle="font-style: italic;" path="textarea2"/>
</body>
</html>
Modified: trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/textarea.jsp.xml
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/textarea.jsp.xml 2010-08-04 07:11:10 UTC (rev 23906)
+++ trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/textarea.jsp.xml 2010-08-04 07:48:17 UTC (rev 23907)
@@ -1,16 +1,12 @@
<tests>
<test id="textArea1">
<TEXTAREA ID="textArea1" CSSCLASS="green" CSSSTYLE="font-weight: bold;"
- CLASS="green" STYLE="font-weight: bold;">
- textArea 1
- <SPAN CLASS="vpe-text">
- textArea 1
- </SPAN>
+ PATH="textarea1" CLASS="green" STYLE="font-weight: bold;">
</TEXTAREA>
</test>
<test id="textArea2">
- <TEXTAREA ID="textArea2" VALUE="textArea 2" CSSCLASS="blue"
- CSSSTYLE="font-style: italic;" CLASS="blue" STYLE="font-style: italic;">
+ <TEXTAREA ID="textArea2" CSSCLASS="blue" CSSSTYLE="font-style: italic;"
+ PATH="textarea2" CLASS="blue" STYLE="font-style: italic;">
</TEXTAREA>
</test>
15 years, 4 months
JBoss Tools SVN: r23906 - in trunk/vpe/tests/org.jboss.tools.vpe.spring.test: resources/SpringTest/src/main/webapp/WEB-INF and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dvinnichek
Date: 2010-08-04 03:11:10 -0400 (Wed, 04 Aug 2010)
New Revision: 23906
Added:
trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/bind.jsp
trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/bind.jsp.xml
Modified:
trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/springapp-servlet.xml
trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/index.jsp
trunk/vpe/tests/org.jboss.tools.vpe.spring.test/src/org/jboss/tools/vpe/spring/test/SpringComponentContentTest.java
Log:
add tests for spring:bind (https://jira.jboss.org/browse/JBIDE-6711)
Added: trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/bind.jsp
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/bind.jsp (rev 0)
+++ trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/bind.jsp 2010-08-04 07:11:10 UTC (rev 23906)
@@ -0,0 +1,61 @@
+<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form"%>
+<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%>
+<%@ taglib prefix="c" uri="http://java.sun.com/jstl/core"%>
+<html>
+<head>
+<style>
+.tall-radiobutton {
+ -moz-appearance: none;
+ height: 30px;
+}
+</style>
+</head>
+<body>
+<h1>Test of spring:bind</h1>
+
+<form:form modelAttribute="formBean">
+ <table>
+ <tr>
+ <td>First Name:</td>
+ <td><form:input path="user.firstName" /></td>
+ <td>
+ <spring:bind path="user.firstName">
+ <font color="red">
+ <b>${status.errorMessage}</b>
+ </font>
+ </spring:bind>
+ </td>
+ </tr>
+ <tr>
+ <td>Last Name:</td>
+ <td><form:input path="user.lastName" /></td>
+ <td>
+ <div id="validationBinding">
+ <spring:bind path="user.lastName">
+ <font color="red">
+ <b>${status.errorMessage}</b>
+ </font>
+ </spring:bind>
+ </div>
+ </td>
+ </tr>
+ <tr>
+ <td colspan="2" align="right"><input type="submit" value="Test" /></td>
+ </tr>
+ </table>
+
+ <div id="outputBinding">
+ <spring:bind path="selectedCategory">
+ ${status.value}
+ </spring:bind>
+ </div><br/>
+
+ <div id="inputBinding">
+ <spring:bind path="selectedCategory">
+ <input type="text" name="${status.expression}" value="${status.value}" />
+ </spring:bind>
+ </div>
+
+</form:form>
+</body>
+</html>
Property changes on: trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/bind.jsp
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Added: trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/bind.jsp.xml
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/bind.jsp.xml (rev 0)
+++ trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/bind.jsp.xml 2010-08-04 07:11:10 UTC (rev 23906)
@@ -0,0 +1,34 @@
+<tests>
+ <test id="validationBinding">
+ <div id="validationBinding">
+ <span class="vpe-text">
+ user.lastName<=
+ <font color="red">
+ <b>
+ <span class="vpe-text">
+ ${status.errorMessage}
+ </span>
+ </b>
+ </font>
+ </span>
+ </div>
+ </test>
+ <test id="outputBinding">
+ <div id="outputBinding">
+ <span class="vpe-text">
+ selectedCategory<=
+ <span class="vpe-text">
+ ${status.value}
+ </span>
+ </span>
+ </div>
+ </test>
+ <test id="inputBinding">
+ <div id="inputBinding">
+ <span class="vpe-text">
+ selectedCategory<=
+ <input type="text" value="${status.value}" />
+ </span>
+ </div>
+ </test>
+</tests>
\ No newline at end of file
Property changes on: trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/bind.jsp.xml
___________________________________________________________________
Name: svn:mime-type
+ text/xml
Name: svn:eol-style
+ native
Modified: trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/springapp-servlet.xml
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/springapp-servlet.xml 2010-08-04 06:49:58 UTC (rev 23905)
+++ trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/springapp-servlet.xml 2010-08-04 07:11:10 UTC (rev 23906)
@@ -17,6 +17,9 @@
<bean name="/errors.htm" class="org.jboss.tools.vpe.spring.test.springtest.controller.ErrorsController">
<property name="validator" ref="fieldValidator"/>
</bean>
+ <bean name="/bind.htm" class="org.jboss.tools.vpe.spring.test.springtest.controller.ErrorsController">
+ <property name="validator" ref="fieldValidator"/>
+ </bean>
<bean name="/select.htm" class="org.jboss.tools.vpe.spring.test.springtest.FormController"/>
<bean name="/escapeBody.htm" class="org.jboss.tools.vpe.spring.test.springtest.FormController"/>
<bean id="fieldValidator" class="org.jboss.tools.vpe.spring.test.springtest.validator.FieldValidator"/>
Modified: trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/index.jsp
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/index.jsp 2010-08-04 06:49:58 UTC (rev 23905)
+++ trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/index.jsp 2010-08-04 07:11:10 UTC (rev 23906)
@@ -14,6 +14,8 @@
<br/>
<a href="errors.htm">errors.htm</a>
<br/>
-<a href="select.htm">errors.htm</a>
+<a href="bind.htm">bind.htm</a>
<br/>
+<a href="select.htm">select.htm</a>
+<br/>
Modified: trunk/vpe/tests/org.jboss.tools.vpe.spring.test/src/org/jboss/tools/vpe/spring/test/SpringComponentContentTest.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.spring.test/src/org/jboss/tools/vpe/spring/test/SpringComponentContentTest.java 2010-08-04 06:49:58 UTC (rev 23905)
+++ trunk/vpe/tests/org.jboss.tools.vpe.spring.test/src/org/jboss/tools/vpe/spring/test/SpringComponentContentTest.java 2010-08-04 07:11:10 UTC (rev 23906)
@@ -56,6 +56,10 @@
public void testErrors() throws Throwable {
performContentTestByFullPath("src/main/webapp/WEB-INF/jsp/errors.jsp"); //$NON-NLS-1$
}
+
+ public void testBind() throws Throwable {
+ performContentTestByFullPath("src/main/webapp/WEB-INF/jsp/bind.jsp"); //$NON-NLS-1$
+ }
public void testSelect() throws Throwable {
performContentTestByFullPath("src/main/webapp/WEB-INF/jsp/select.jsp"); //$NON-NLS-1$
15 years, 4 months
JBoss Tools SVN: r23905 - in trunk/vpe: tests/org.jboss.tools.vpe.spring.test/resources/SpringTest and 3 other directories.
by jbosstools-commits＠lists.jboss.org
Author: yradtsevich
Date: 2010-08-04 02:49:58 -0400 (Wed, 04 Aug 2010)
New Revision: 23905
Added:
trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/escapeBody.jsp
trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/escapeBody.jsp.xml
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe.spring/templates/vpe-templates-spring.xml
trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/
trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/springapp-servlet.xml
trunk/vpe/tests/org.jboss.tools.vpe.spring.test/src/org/jboss/tools/vpe/spring/test/SpringComponentContentTest.java
Log:
https://jira.jboss.org/browse/JBIDE-6711 :
Spring templates for VPE
- spring:escapeBody - template is updated, JUnit is created
Modified: trunk/vpe/plugins/org.jboss.tools.vpe.spring/templates/vpe-templates-spring.xml
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.spring/templates/vpe-templates-spring.xml 2010-08-04 02:05:37 UTC (rev 23904)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.spring/templates/vpe-templates-spring.xml 2010-08-04 06:49:58 UTC (rev 23905)
@@ -438,7 +438,7 @@
<vpe:tag name="spring:escapeBody" case-sensitive="yes">
<vpe:template children="yes" modify="yes">
- <div/>
+ <span class="vpe-text"/>
</vpe:template>
</vpe:tag>
Property changes on: trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest
___________________________________________________________________
Name: svn:ignore
+ target
Added: trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/escapeBody.jsp
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/escapeBody.jsp (rev 0)
+++ trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/escapeBody.jsp 2010-08-04 06:49:58 UTC (rev 23905)
@@ -0,0 +1,23 @@
+<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
+<html>
+<head>
+ <style>
+ .yellow-text {
+ color: yellow
+ }
+ </style>
+</head>
+<body>
+ <h1>Test of spring:escapeBody</h1>
+
+ Must be 3 buttons in one row:
+ <span id="escapeBody">
+ <spring:escapeBody>
+ <input type="button" value="button1"/><input type="button" value="button2"/>
+ </spring:escapeBody>
+ <spring:escapeBody>
+ <input type="button" value="button3"/>
+ </spring:escapeBody>
+ </span>
+</body>
+</html>
Added: trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/escapeBody.jsp.xml
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/escapeBody.jsp.xml (rev 0)
+++ trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/jsp/escapeBody.jsp.xml 2010-08-04 06:49:58 UTC (rev 23905)
@@ -0,0 +1,13 @@
+<tests>
+ <test id="escapeBody">
+ <SPAN ID="escapeBody">
+ <SPAN CLASS="vpe-text">
+ <INPUT TYPE="button" VALUE="button1"/>
+ <INPUT TYPE="button" VALUE="button2"/>
+ </SPAN>
+ <SPAN CLASS="vpe-text">
+ <INPUT TYPE="button" VALUE="button3"/>
+ </SPAN>
+ </SPAN>
+ </test>
+</tests>
\ No newline at end of file
Modified: trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/springapp-servlet.xml
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/springapp-servlet.xml 2010-08-04 02:05:37 UTC (rev 23904)
+++ trunk/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/src/main/webapp/WEB-INF/springapp-servlet.xml 2010-08-04 06:49:58 UTC (rev 23905)
@@ -18,6 +18,7 @@
<property name="validator" ref="fieldValidator"/>
</bean>
<bean name="/select.htm" class="org.jboss.tools.vpe.spring.test.springtest.FormController"/>
+ <bean name="/escapeBody.htm" class="org.jboss.tools.vpe.spring.test.springtest.FormController"/>
<bean id="fieldValidator" class="org.jboss.tools.vpe.spring.test.springtest.validator.FieldValidator"/>
<bean id="viewResolver" class="org.springframework.web.servlet.view.InternalResourceViewResolver">
Modified: trunk/vpe/tests/org.jboss.tools.vpe.spring.test/src/org/jboss/tools/vpe/spring/test/SpringComponentContentTest.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.spring.test/src/org/jboss/tools/vpe/spring/test/SpringComponentContentTest.java 2010-08-04 02:05:37 UTC (rev 23904)
+++ trunk/vpe/tests/org.jboss.tools.vpe.spring.test/src/org/jboss/tools/vpe/spring/test/SpringComponentContentTest.java 2010-08-04 06:49:58 UTC (rev 23905)
@@ -89,6 +89,10 @@
performContentTestByFullPath("src/main/webapp/WEB-INF/jsp/theme.jsp"); //$NON-NLS-1$
}
+ public void testEscapeBody() throws Throwable {
+ performContentTestByFullPath("src/main/webapp/WEB-INF/jsp/escapeBody.jsp"); //$NON-NLS-1$
+ }
+
@Override
protected String getTestProjectName() {
return SpringAllTests.IMPORT_PROJECT_NAME;
15 years, 4 months
JBoss Tools SVN: r23904 - in trunk/drools/plugins: org.drools.eclipse.task and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-08-03 22:05:37 -0400 (Tue, 03 Aug 2010)
New Revision: 23904
Modified:
trunk/drools/plugins/org.drools.eclipse.task/pom.xml
trunk/drools/plugins/org.drools.eclipse/pom.xml
trunk/drools/plugins/org.guvnor.tools/pom.xml
Log:
because source is 5.1.0, not 5.1.0-SNAPSHOT, switch pom.xml to use correct <version>
Modified: trunk/drools/plugins/org.drools.eclipse/pom.xml
===================================================================
--- trunk/drools/plugins/org.drools.eclipse/pom.xml 2010-08-03 23:48:49 UTC (rev 23903)
+++ trunk/drools/plugins/org.drools.eclipse/pom.xml 2010-08-04 02:05:37 UTC (rev 23904)
@@ -9,6 +9,6 @@
</parent>
<groupId>org.jboss.tools</groupId>
<artifactId>org.drools.eclipse</artifactId>
- <version>5.1.0-SNAPSHOT</version>
+ <version>5.1.0</version>
<packaging>eclipse-plugin</packaging>
</project>
Modified: trunk/drools/plugins/org.drools.eclipse.task/pom.xml
===================================================================
--- trunk/drools/plugins/org.drools.eclipse.task/pom.xml 2010-08-03 23:48:49 UTC (rev 23903)
+++ trunk/drools/plugins/org.drools.eclipse.task/pom.xml 2010-08-04 02:05:37 UTC (rev 23904)
@@ -9,6 +9,6 @@
</parent>
<groupId>org.jboss.tools</groupId>
<artifactId>org.drools.eclipse.task</artifactId>
- <version>5.1.0-SNAPSHOT</version>
+ <version>5.1.0</version>
<packaging>eclipse-plugin</packaging>
</project>
Modified: trunk/drools/plugins/org.guvnor.tools/pom.xml
===================================================================
--- trunk/drools/plugins/org.guvnor.tools/pom.xml 2010-08-03 23:48:49 UTC (rev 23903)
+++ trunk/drools/plugins/org.guvnor.tools/pom.xml 2010-08-04 02:05:37 UTC (rev 23904)
@@ -9,6 +9,6 @@
</parent>
<groupId>org.jboss.tools</groupId>
<artifactId>org.guvnor.tools</artifactId>
- <version>5.1.0-SNAPSHOT</version>
+ <version>5.1.0</version>
<packaging>eclipse-plugin</packaging>
</project>
15 years, 4 months
JBoss Tools SVN: r23902 - trunk/build.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-08-03 19:39:57 -0400 (Tue, 03 Aug 2010)
New Revision: 23902
Modified:
trunk/build/build.xml
Log:
fix pattern match used to unpack drools pre-built plugins into drools svn tree; add three new tests
Modified: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml 2010-08-03 23:29:29 UTC (rev 23901)
+++ trunk/build/build.xml 2010-08-03 23:39:57 UTC (rev 23902)
@@ -1329,7 +1329,7 @@
<propertyregex property="artifact.id"
defaultvalue="${artifact.jarfile}"
input="${artifact.jarfile}"
- regexp="([^_]+)_(\d+\.\d+\.\d+.+)\.jar"
+ regexp="([^_]+)_(\d+\.\d+\.\d+)\.jar"
replace="\1"
override="true"
/>
@@ -1347,6 +1347,13 @@
replace="\1"
override="true"
/>
+ <propertyregex property="artifact.id"
+ defaultvalue="${artifact.id}"
+ input="${artifact.id}"
+ regexp="([^_]+)_(\d+\.\d+\.\d+)\.jar"
+ replace="\1"
+ override="true"
+ />
<var name="artifactJar" unset="true" />
</target>
@@ -1696,6 +1703,15 @@
<property name="get.artifact.id.expected.drools/plugins/org.drools.eclipse.task_5.1.0.SNAPSHOT.jar"
value="org.drools.eclipse.task"
/>
+ <property name="get.artifact.id.expected.drools/plugins/org.guvnor.tools_5.1.0.jar"
+ value="org.guvnor.tools"
+ />
+ <property name="get.artifact.id.expected.drools/plugins/org.drools.eclipse_5.1.0.jar"
+ value="org.drools.eclipse"
+ />
+ <property name="get.artifact.id.expected.drools/plugins/org.drools.eclipse.task_5.1.0.jar"
+ value="org.drools.eclipse.task"
+ />
</target>
15 years, 4 months
JBoss Tools SVN: r23901 - trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/preferences.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2010-08-03 19:29:29 -0400 (Tue, 03 Aug 2010)
New Revision: 23901
Modified:
trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/preferences/SeverityPreferencePage.java
Log:
https://jira.jboss.org/browse/JBIDE-6772 The method widgetDefaultSelected(SelectionEvent) of type new SelectionListener(){} must override a superclass method
@Override annotations were removed
Modified: trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/preferences/SeverityPreferencePage.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/preferences/SeverityPreferencePage.java 2010-08-03 22:57:35 UTC (rev 23900)
+++ trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/preferences/SeverityPreferencePage.java 2010-08-03 23:29:29 UTC (rev 23901)
@@ -60,12 +60,10 @@
severityConfigurationBlock.setLayoutData(gd);
checkBox.addSelectionListener(new SelectionListener() {
- @Override
public void widgetSelected(SelectionEvent e) {
enableMainPreferenceContent(checkBox.getSelection());
getPreferenceStore().setValue(SeverityPreferences.ENABLE_BLOCK_PREFERENCE_NAME, checkBox.getSelection());
}
- @Override
public void widgetDefaultSelected(SelectionEvent e) {
}
});
15 years, 4 months
JBoss Tools SVN: r23900 - trunk/build/target-platform.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-08-03 18:57:35 -0400 (Tue, 03 Aug 2010)
New Revision: 23900
Modified:
trunk/build/target-platform/e36-wtp32.target
Log:
comment out oro and try teiid build again
Modified: trunk/build/target-platform/e36-wtp32.target
===================================================================
--- trunk/build/target-platform/e36-wtp32.target 2010-08-03 22:50:00 UTC (rev 23899)
+++ trunk/build/target-platform/e36-wtp32.target 2010-08-03 22:57:35 UTC (rev 23900)
@@ -4,7 +4,7 @@
<target includeMode="feature" name="e36-wtp32">
<locations>
<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
-<unit id="org.maven.ide.eclipse.feature.feature.group" version="0.10.0.20100209-0800"/>
+<unit id="org.maven.ide.eclipse.feature.feature.group" version="0.10.2.20100623-1649"/>
<repository location="http://m2eclipse.sonatype.org/sites/m2e/"/>
</location>
<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
@@ -39,7 +39,7 @@
</location>
<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
<unit id="javax.wsdl" version="1.6.2.v201005080631"/>
-<unit id="org.apache.oro" version="2.0.8.v201005080400"/>
+<!-- <unit id="org.apache.oro" version="2.0.8.v201005080400"/> -->
<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20100519200754/r..."/>
</location>
<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
15 years, 4 months
JBoss Tools SVN: r23899 - in trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core: src/org/jboss/tools/deltacloud/core and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: jjohnstn
Date: 2010-08-03 18:50:00 -0400 (Tue, 03 Aug 2010)
New Revision: 23899
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/ChangeLog
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudManager.java
Log:
2010-08-03 Jeff Johnston <jjohnstn(a)redhat.com>
* src/org/jboss/tools/deltacloud/core/DeltaCloudManager.java (getClouds): Remove default
cloud connection that was set up for testing.
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/ChangeLog
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/ChangeLog 2010-08-03 22:49:08 UTC (rev 23898)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/ChangeLog 2010-08-03 22:50:00 UTC (rev 23899)
@@ -1,3 +1,8 @@
+2010-08-03 Jeff Johnston <jjohnstn(a)redhat.com>
+
+ * src/org/jboss/tools/deltacloud/core/DeltaCloudManager.java (getClouds): Remove default
+ cloud connection that was set up for testing.
+
2010-07-29 Jeff Johnston <jjohnstn(a)redhat.com>
* src/org/jboss/tools/deltacloud/core/client/DeltaCloudClient.java (buildHardwareProfile): XML
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudManager.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudManager.java 2010-08-03 22:49:08 UTC (rev 23898)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudManager.java 2010-08-03 22:50:00 UTC (rev 23899)
@@ -23,15 +23,15 @@
public DeltaCloud[] getClouds() {
// FIXME: testing only
- if (clouds.size() == 0) {
- try {
- DeltaCloud x = new DeltaCloud("Red Hat Cloud", new URL("http://localhost:3001/api"), "mockuser", "mockpassword");
- addCloud(x);
- } catch (MalformedURLException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
- }
+// if (clouds.size() == 0) {
+// try {
+// DeltaCloud x = new DeltaCloud("Red Hat Cloud", new URL("http://localhost:3001/api"), "mockuser", "mockpassword");
+// addCloud(x);
+// } catch (MalformedURLException e) {
+// // TODO Auto-generated catch block
+// e.printStackTrace();
+// }
+// }
return clouds.toArray(new DeltaCloud[clouds.size()]);
}
15 years, 4 months
JBoss Tools SVN: r23898 - in trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui: src/org/jboss/tools/deltacloud/ui and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: jjohnstn
Date: 2010-08-03 18:49:08 -0400 (Tue, 03 Aug 2010)
New Revision: 23898
Added:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstance.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstancePage.java
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/SWTImagesFactory.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CVMessages.properties
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/DeltaCloudView.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewCloudConnectionPage.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/WizardMessages.properties
Log:
2010-08-03 Jeff Johnston <jjohnstn(a)redhat.com>
* src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstance.java: New file.
* src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstancePage.java: New file.
* src/org/jboss/tools/deltacloud/ui/SWTImagesFactory.java: Add Delta icon.
* src/org/jboss/tools/deltacloud/ui/views/CVMessages.properties: Add new messages
for create instance.
* src/org/jboss/tools/deltacloud/ui/views/DeltaCloudView.java (handleSelection): Store
the selected element for use in setting context menus and actions.
(makeActions): Add create instance action.
(.run): New run method for create instance.
(fillContextMenu): Set create instance action for CVImageElement.
* src/org/jboss/tools/deltacloud/ui/wizards/WizardMessages.properties: Add new message
for NewInstance wizard.
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog 2010-08-03 21:57:53 UTC (rev 23897)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog 2010-08-03 22:49:08 UTC (rev 23898)
@@ -1,5 +1,20 @@
2010-08-03 Jeff Johnston <jjohnstn(a)redhat.com>
+ * src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstance.java: New file.
+ * src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstancePage.java: New file.
+ * src/org/jboss/tools/deltacloud/ui/SWTImagesFactory.java: Add Delta icon.
+ * src/org/jboss/tools/deltacloud/ui/views/CVMessages.properties: Add new messages
+ for create instance.
+ * src/org/jboss/tools/deltacloud/ui/views/DeltaCloudView.java (handleSelection): Store
+ the selected element for use in setting context menus and actions.
+ (makeActions): Add create instance action.
+ (.run): New run method for create instance.
+ (fillContextMenu): Set create instance action for CVImageElement.
+ * src/org/jboss/tools/deltacloud/ui/wizards/WizardMessages.properties: Add new message
+ for NewInstance wizard.
+
+2010-08-03 Jeff Johnston <jjohnstn(a)redhat.com>
+
* src/org/jboss/tools/internal/deltacloud/ui/wizards/NewCloudConnectionPage.java (getURLValid): New
method.
(setURLValid): Ditto.
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/SWTImagesFactory.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/SWTImagesFactory.java 2010-08-03 21:57:53 UTC (rev 23897)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/SWTImagesFactory.java 2010-08-03 22:49:08 UTC (rev 23898)
@@ -29,11 +29,13 @@
public static final String IMG_INSTANCE= NAME_PREFIX + "instance.gif"; //$NON-NLS-1$
public static final String IMG_IMAGE= NAME_PREFIX + "image.gif"; //$NON-NLS-1$
public static final String IMG_COLLAPSE_ALL= NAME_PREFIX + "collapseall.gif"; //$NON-NLS-1$
+ public static final String IMG_DELTA= NAME_PREFIX + "delta.gif"; //$NON-NLS-1$
public static final ImageDescriptor DESC_CLOUD= createManaged("", IMG_CLOUD);
public static final ImageDescriptor DESC_FOLDER= createManaged("", IMG_FOLDER);
public static final ImageDescriptor DESC_INSTANCE= createManaged("", IMG_INSTANCE);
public static final ImageDescriptor DESC_IMAGE= createManaged("", IMG_IMAGE);
public static final ImageDescriptor DESC_COLLAPSE_ALL= createManaged("", IMG_COLLAPSE_ALL);
+ public static final ImageDescriptor DESC_DELTA= createManaged("", IMG_DELTA);
private static ImageDescriptor createManaged(String prefix, String name) {
return createManaged(imageRegistry, prefix, name);
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CVMessages.properties
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CVMessages.properties 2010-08-03 21:57:53 UTC (rev 23897)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CVMessages.properties 2010-08-03 22:49:08 UTC (rev 23898)
@@ -17,4 +17,5 @@
CollapseAll.label=Collapse All
RemoveCloud.label=Disconnect Cloud
-Refresh.label=Refresh View
\ No newline at end of file
+Refresh.label=Refresh View
+CreateInstance.label=Create Instance
\ No newline at end of file
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/DeltaCloudView.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/DeltaCloudView.java 2010-08-03 21:57:53 UTC (rev 23897)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/DeltaCloudView.java 2010-08-03 22:49:08 UTC (rev 23898)
@@ -15,19 +15,24 @@
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.viewers.SelectionChangedEvent;
import org.eclipse.jface.viewers.TreeViewer;
+import org.eclipse.jface.wizard.IWizard;
+import org.eclipse.jface.wizard.WizardDialog;
import org.eclipse.swt.SWT;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Menu;
+import org.eclipse.swt.widgets.Shell;
import org.eclipse.ui.IActionBars;
import org.eclipse.ui.ISharedImages;
import org.eclipse.ui.IWorkbenchActionConstants;
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.part.ViewPart;
import org.jboss.tools.deltacloud.core.DeltaCloud;
+import org.jboss.tools.deltacloud.core.DeltaCloudImage;
import org.jboss.tools.deltacloud.core.DeltaCloudManager;
import org.jboss.tools.deltacloud.core.ICloudManagerListener;
import org.jboss.tools.deltacloud.ui.SWTImagesFactory;
+import org.jboss.tools.internal.deltacloud.ui.wizards.NewInstance;
public class DeltaCloudView extends ViewPart implements ICloudManagerListener {
@@ -39,6 +44,7 @@
private static final String REMOVE_CLOUD = "RemoveCloud.label"; //$NON-NLS-1$
private static final String REFRESH = "Refresh.label"; //$NON-NLS-1$
+ private static final String CREATE_INSTANCE = "CreateInstance.label"; //$NON-NLS-1$
public static final String COLLAPSE_ALL = "CollapseAll.label"; //$NON-NLS-1$
@@ -49,6 +55,9 @@
private Action refreshAction;
private Action collapseall;
private Action doubleClickAction;
+ private Action createInstance;
+
+ private CloudViewElement selectedElement;
/**
* The constructor.
@@ -108,8 +117,7 @@
private void handleSelection() {
IStructuredSelection selection = (IStructuredSelection) viewer.getSelection();
- CloudViewElement element = (CloudViewElement)selection.getFirstElement();
- // FIXME: add context menus here based on element type
+ selectedElement = (CloudViewElement)selection.getFirstElement();
}
private void fillLocalPullDown(IMenuManager manager) {
@@ -120,8 +128,12 @@
}
private void fillContextMenu(IMenuManager manager) {
- manager.add(action1);
- manager.add(action2);
+ if (selectedElement instanceof CVImageElement) {
+ manager.add(createInstance);
+ } else {
+ manager.add(action1);
+ manager.add(action2);
+ }
// Other plug-ins can contribute there actions here
manager.add(new Separator(IWorkbenchActionConstants.MB_ADDITIONS));
}
@@ -158,6 +170,28 @@
removeCloud.setImageDescriptor(PlatformUI.getWorkbench().getSharedImages().
getImageDescriptor(ISharedImages.IMG_ELCL_REMOVE));
+ createInstance = new Action() {
+ public void run() {
+ ISelection selection = viewer.getSelection();
+ Shell shell = viewer.getControl().getShell();
+ Object obj = ((IStructuredSelection)selection).getFirstElement();
+ if (obj instanceof CVImageElement) {
+ CVImageElement imageElement = (CVImageElement)obj;
+ DeltaCloudImage image = (DeltaCloudImage)imageElement.getElement();
+ CVCategoryElement images = (CVCategoryElement)imageElement.getParent();
+ CVCloudElement cloudElement = (CVCloudElement)images.getParent();
+ DeltaCloud cloud = (DeltaCloud)cloudElement.getElement();
+ IWizard wizard = new NewInstance(cloud, image);
+ WizardDialog dialog = new WizardDialog(shell, wizard);
+ dialog.create();
+ dialog.open();
+ }
+ }
+ };
+ createInstance.setText(CVMessages.getString(CREATE_INSTANCE));
+ createInstance.setToolTipText(CVMessages.getString(CREATE_INSTANCE));
+ createInstance.setImageDescriptor(SWTImagesFactory.DESC_INSTANCE);
+
refreshAction = new Action() {
public void run() {
viewer.setInput(getViewSite());
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewCloudConnectionPage.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewCloudConnectionPage.java 2010-08-03 21:57:53 UTC (rev 23897)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewCloudConnectionPage.java 2010-08-03 22:49:08 UTC (rev 23898)
@@ -256,7 +256,6 @@
@Override
public void createControl(Composite parent) {
- // TODO Auto-generated method stub
final Composite container = new Composite(parent, SWT.NULL);
FormLayout layout = new FormLayout();
layout.marginHeight = 5;
Added: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstance.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstance.java (rev 0)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstance.java 2010-08-03 22:49:08 UTC (rev 23898)
@@ -0,0 +1,38 @@
+package org.jboss.tools.internal.deltacloud.ui.wizards;
+
+import org.eclipse.jface.wizard.Wizard;
+import org.jboss.tools.deltacloud.core.DeltaCloud;
+import org.jboss.tools.deltacloud.core.DeltaCloudImage;
+
+public class NewInstance extends Wizard {
+
+ private final static String MAINPAGE_NAME = "NewInstance.name"; //$NON-NLS-1$
+ private NewInstancePage mainPage;
+
+ private DeltaCloud cloud;
+ private DeltaCloudImage image;
+
+ public NewInstance(DeltaCloud cloud, DeltaCloudImage image) {
+ this.cloud = cloud;
+ this.image = image;
+ }
+
+ @Override
+ public void addPages() {
+ // TODO Auto-generated method stub
+ mainPage = new NewInstancePage(cloud, image);
+ addPage(mainPage);
+ }
+
+ @Override
+ public boolean canFinish() {
+ return mainPage.isPageComplete();
+ }
+
+ @Override
+ public boolean performFinish() {
+ // TODO Auto-generated method stub
+ return false;
+ }
+
+}
Added: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstancePage.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstancePage.java (rev 0)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstancePage.java 2010-08-03 22:49:08 UTC (rev 23898)
@@ -0,0 +1,39 @@
+package org.jboss.tools.internal.deltacloud.ui.wizards;
+
+import org.eclipse.jface.wizard.WizardPage;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.layout.FormLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.jboss.tools.deltacloud.core.DeltaCloud;
+import org.jboss.tools.deltacloud.core.DeltaCloudImage;
+import org.jboss.tools.deltacloud.ui.SWTImagesFactory;
+
+public class NewInstancePage extends WizardPage {
+
+ private final static String NAME = "NewInstance.name"; //$NON-NLS-1$
+ private final static String DESCRIPTION = "NewInstance.desc"; //$NON-NLS-1$
+ private final static String TITLE = "NewInstance.title"; //$NON-NLS-1$
+
+ private DeltaCloud cloud;
+ private DeltaCloudImage image;
+
+ public NewInstancePage(DeltaCloud cloud, DeltaCloudImage image) {
+ super(WizardMessages.getString(NAME));
+ this.cloud = cloud;
+ this.image = image;
+ setDescription(WizardMessages.getString(DESCRIPTION));
+ setTitle(WizardMessages.getString(TITLE));
+ setPageComplete(false);
+ }
+
+ @Override
+ public void createControl(Composite parent) {
+ final Composite container = new Composite(parent, SWT.NULL);
+ FormLayout layout = new FormLayout();
+ layout.marginHeight = 5;
+ layout.marginWidth = 5;
+ container.setLayout(layout);
+ setControl(container);
+ }
+
+}
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/WizardMessages.properties
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/WizardMessages.properties 2010-08-03 21:57:53 UTC (rev 23897)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/WizardMessages.properties 2010-08-03 22:49:08 UTC (rev 23898)
@@ -14,5 +14,9 @@
EC2PasswordLink.text=For EC2 use the <a href="https://console.aws.amazon.com/ec2/home">Access Secret Key</a>
ErrorNameInUse.text=Error: the name chosen is already in use
-ErrorInvalidURL.text=Error: the URL specified is invalid
-ErrorNonCloudURL.text=URL specified is not a valid Delta-cloud address
\ No newline at end of file
+ErrorInvalidURL.text=URL specified is invalid
+ErrorNonCloudURL.text=URL specified is not a valid Delta-cloud address
+
+NewInstance.desc=Specify details for a new instance you wish to create based on an image
+NewInstance.title=Create Instance
+NewInstance.name=Create Instance
\ No newline at end of file
15 years, 4 months