JBoss Tools SVN: r35592 - in trunk/build/aggregate: site and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-10-12 21:37:19 -0400 (Wed, 12 Oct 2011)
New Revision: 35592
Modified:
trunk/build/aggregate/bottests-site/site/site.xsl
trunk/build/aggregate/site/site.xsl
trunk/build/aggregate/soa-site/site.xsl
trunk/build/aggregate/webtools-site/site.xsl
Log:
JBIDE-9743 link to plugins folder from index.html
Modified: trunk/build/aggregate/bottests-site/site/site.xsl
===================================================================
--- trunk/build/aggregate/bottests-site/site/site.xsl 2011-10-13 00:43:44 UTC (rev 35591)
+++ trunk/build/aggregate/bottests-site/site/site.xsl 2011-10-13 01:37:19 UTC (rev 35592)
@@ -101,20 +101,21 @@
<tr style="background-color:#DDDDDD">
<th colspan="1" style="font-size:small">Metadata</th>
+ <th colspan="1" style="font-size:small">Plugins</th>
<th colspan="1" style="font-size:small"></th>
- <th colspan="1" style="font-size:small"></th>
</tr>
<tr style="background-color:#EEEEEE">
- <td class="rowLine">
+ <td class="rowLine" colspan="1">
<a href="site.xml" style="font-size:x-small">site.xml</a>
::
<a href="artifacts.jar" style="font-size:x-small">artifacts.jar</a>
::
<a href="content.jar" style="font-size:x-small">content.jar</a>
</td>
- <td class="rowLine">
+ <td class="rowLine" colspan="1">
+ <a href="plugins/" style="font-size:x-small">plugins</a>
</td>
- <td class="rowLine">
+ <td class="rowLine" colspan="1">
</td>
</tr>
</table>
Modified: trunk/build/aggregate/site/site.xsl
===================================================================
--- trunk/build/aggregate/site/site.xsl 2011-10-13 00:43:44 UTC (rev 35591)
+++ trunk/build/aggregate/site/site.xsl 2011-10-13 01:37:19 UTC (rev 35592)
@@ -101,20 +101,21 @@
<tr style="background-color:#DDDDDD">
<th colspan="1" style="font-size:small">Metadata</th>
+ <th colspan="1" style="font-size:small">Plugins</th>
<th colspan="1" style="font-size:small"></th>
- <th colspan="1" style="font-size:small"></th>
</tr>
<tr style="background-color:#EEEEEE">
- <td class="rowLine">
+ <td class="rowLine" colspan="1">
<a href="site.xml" style="font-size:x-small">site.xml</a>
::
<a href="artifacts.jar" style="font-size:x-small">artifacts.jar</a>
::
<a href="content.jar" style="font-size:x-small">content.jar</a>
</td>
- <td class="rowLine">
+ <td class="rowLine" colspan="1">
+ <a href="plugins/" style="font-size:x-small">plugins</a>
</td>
- <td class="rowLine">
+ <td class="rowLine" colspan="1">
</td>
</tr>
</table>
Modified: trunk/build/aggregate/soa-site/site.xsl
===================================================================
--- trunk/build/aggregate/soa-site/site.xsl 2011-10-13 00:43:44 UTC (rev 35591)
+++ trunk/build/aggregate/soa-site/site.xsl 2011-10-13 01:37:19 UTC (rev 35592)
@@ -101,20 +101,21 @@
<tr style="background-color:#DDDDDD">
<th colspan="1" style="font-size:small">Metadata</th>
+ <th colspan="1" style="font-size:small">Plugins</th>
<th colspan="1" style="font-size:small"></th>
- <th colspan="1" style="font-size:small"></th>
</tr>
<tr style="background-color:#EEEEEE">
- <td class="rowLine">
+ <td class="rowLine" colspan="1">
<a href="site.xml" style="font-size:x-small">site.xml</a>
::
<a href="artifacts.jar" style="font-size:x-small">artifacts.jar</a>
::
<a href="content.jar" style="font-size:x-small">content.jar</a>
</td>
- <td class="rowLine">
+ <td class="rowLine" colspan="1">
+ <a href="plugins/" style="font-size:x-small">plugins</a>
</td>
- <td class="rowLine">
+ <td class="rowLine" colspan="1">
</td>
</tr>
</table>
Modified: trunk/build/aggregate/webtools-site/site.xsl
===================================================================
--- trunk/build/aggregate/webtools-site/site.xsl 2011-10-13 00:43:44 UTC (rev 35591)
+++ trunk/build/aggregate/webtools-site/site.xsl 2011-10-13 01:37:19 UTC (rev 35592)
@@ -101,20 +101,21 @@
<tr style="background-color:#DDDDDD">
<th colspan="1" style="font-size:small">Metadata</th>
+ <th colspan="1" style="font-size:small">Plugins</th>
<th colspan="1" style="font-size:small"></th>
- <th colspan="1" style="font-size:small"></th>
</tr>
<tr style="background-color:#EEEEEE">
- <td class="rowLine">
+ <td class="rowLine" colspan="1">
<a href="site.xml" style="font-size:x-small">site.xml</a>
::
<a href="artifacts.jar" style="font-size:x-small">artifacts.jar</a>
::
<a href="content.jar" style="font-size:x-small">content.jar</a>
</td>
- <td class="rowLine">
+ <td class="rowLine" colspan="1">
+ <a href="plugins/" style="font-size:x-small">plugins</a>
</td>
- <td class="rowLine">
+ <td class="rowLine" colspan="1">
</td>
</tr>
</table>
13 years, 3 months
- 1
- 0
JBoss Tools SVN: r35591 - trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/el.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2011-10-12 20:43:44 -0400 (Wed, 12 Oct 2011)
New Revision: 35591
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/el/CdiElResolver.java
Log:
https://issues.jboss.org/browse/JBIDE-9897 There is no icon for CDI bean methods/fields in EL code completion
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/el/CdiElResolver.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/el/CdiElResolver.java 2011-10-13 00:35:57 UTC (rev 35590)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/el/CdiElResolver.java 2011-10-13 00:43:44 UTC (rev 35591)
@@ -51,7 +51,7 @@
*/
@Override
public Image getELProposalImage() {
- return null;
+ return CDIImages.BEAN_METHOD_IMAGE;
}
@Override
13 years, 3 months
- 1
- 0
JBoss Tools SVN: r35590 - in branches/jbosstools-3.2.x/ws/docs/reference/en-US: images/client and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: irooskov(a)redhat.com
Date: 2011-10-12 20:35:57 -0400 (Wed, 12 Oct 2011)
New Revision: 35590
Modified:
branches/jbosstools-3.2.x/ws/docs/reference/en-US/Book_Info.xml
branches/jbosstools-3.2.x/ws/docs/reference/en-US/images/client/jbossws_client_2.png
branches/jbosstools-3.2.x/ws/docs/reference/en-US/images/topdown/jbossws_ws_creation2.png
branches/jbosstools-3.2.x/ws/docs/reference/en-US/proc-jbt-generate_a_simple_web_service.xml
branches/jbosstools-3.2.x/ws/docs/reference/en-US/proc-jbt-web_service_test_view.xml
branches/jbosstools-3.2.x/ws/docs/reference/en-US/sample_web_service_wizards.xml
branches/jbosstools-3.2.x/ws/docs/reference/en-US/topdown.xml
Log:
updated for TOOLSDOC-263
Modified: branches/jbosstools-3.2.x/ws/docs/reference/en-US/Book_Info.xml
===================================================================
--- branches/jbosstools-3.2.x/ws/docs/reference/en-US/Book_Info.xml 2011-10-13 00:35:37 UTC (rev 35589)
+++ branches/jbosstools-3.2.x/ws/docs/reference/en-US/Book_Info.xml 2011-10-13 00:35:57 UTC (rev 35590)
@@ -7,7 +7,7 @@
<productname>JBoss Developer Studio</productname>
<productnumber>4.1</productnumber>
<edition>4.1.0</edition>
- <pubsnumber>12</pubsnumber>
+ <pubsnumber>13</pubsnumber>
<abstract>
<para>The JBoss Web Services User Guide explains how to use the JBoss Web Services module to implement web services in Java.</para>
</abstract>
Modified: branches/jbosstools-3.2.x/ws/docs/reference/en-US/images/client/jbossws_client_2.png
===================================================================
(Binary files differ)
Modified: branches/jbosstools-3.2.x/ws/docs/reference/en-US/images/topdown/jbossws_ws_creation2.png
===================================================================
(Binary files differ)
Modified: branches/jbosstools-3.2.x/ws/docs/reference/en-US/proc-jbt-generate_a_simple_web_service.xml
===================================================================
--- branches/jbosstools-3.2.x/ws/docs/reference/en-US/proc-jbt-generate_a_simple_web_service.xml 2011-10-13 00:35:37 UTC (rev 35589)
+++ branches/jbosstools-3.2.x/ws/docs/reference/en-US/proc-jbt-generate_a_simple_web_service.xml 2011-10-13 00:35:57 UTC (rev 35590)
@@ -111,7 +111,7 @@
<entry>Service details</entry>
<entry>Service name</entry>
<entry>yes</entry>
- <entry>Enter the name to for the web service.</entry>
+ <entry>Enter the name for the web service.</entry>
<entry>The web service name will be the URL for the service as mapped in the deployment descriptor (<filename>web.xml</filename>).</entry>
</row>
<row>
Modified: branches/jbosstools-3.2.x/ws/docs/reference/en-US/proc-jbt-web_service_test_view.xml
===================================================================
--- branches/jbosstools-3.2.x/ws/docs/reference/en-US/proc-jbt-web_service_test_view.xml 2011-10-13 00:35:37 UTC (rev 35589)
+++ branches/jbosstools-3.2.x/ws/docs/reference/en-US/proc-jbt-web_service_test_view.xml 2011-10-13 00:35:57 UTC (rev 35590)
@@ -85,7 +85,7 @@
<row>
<entry>Toolbar button - Get From WSDL</entry>
<entry>
- Click this button to display the <guilabel>Select WSDL</guilabel> dialog. Enter the <guibutton>URL</guibutton>, <guibutton>File system</guibutton> location or Eclipse <guibutton>Workspace</guibutton> location of the WSDL file. Given a vaild file, the dialog will allow selection of the <guilabel>Port</guilabel> and <guilabel>Operation</guilabel> to test. Once selected, the request details will be displayed in the <guilabel>Request Details</guilabel> panel.
+ Click this button to display the <guilabel>Select WSDL</guilabel> dialog. Enter the <guibutton>URL</guibutton>, <guibutton>File system</guibutton> location or Eclipse <guibutton>Workspace</guibutton> location of the WSDL file. Given a valid file, the dialog will allow selection of the <guilabel>Port</guilabel> and <guilabel>Operation</guilabel> to test. Once selected, the request details will be displayed in the <guilabel>Request Details</guilabel> panel.
</entry>
</row>
<row>
Modified: branches/jbosstools-3.2.x/ws/docs/reference/en-US/sample_web_service_wizards.xml
===================================================================
--- branches/jbosstools-3.2.x/ws/docs/reference/en-US/sample_web_service_wizards.xml 2011-10-13 00:35:37 UTC (rev 35589)
+++ branches/jbosstools-3.2.x/ws/docs/reference/en-US/sample_web_service_wizards.xml 2011-10-13 00:35:57 UTC (rev 35590)
@@ -11,12 +11,12 @@
<itemizedlist>
<listitem>
<para>
- <guilabel>Create a sample Web Service</guilabel> for a JAX-WS web service; and
+ <guilabel>Create a Sample Web Service</guilabel> for a JAX-WS web service; and
</para>
</listitem>
<listitem>
<para>
- <guilabel>Create a sample RESTful Web Service</guilabel> for a JAX-RS web service.
+ <guilabel>Create a Sample RESTful Web Service</guilabel> for a JAX-RS web service.
</para>
</listitem>
</itemizedlist>
Modified: branches/jbosstools-3.2.x/ws/docs/reference/en-US/topdown.xml
===================================================================
--- branches/jbosstools-3.2.x/ws/docs/reference/en-US/topdown.xml 2011-10-13 00:35:37 UTC (rev 35589)
+++ branches/jbosstools-3.2.x/ws/docs/reference/en-US/topdown.xml 2011-10-13 00:35:57 UTC (rev 35590)
@@ -304,9 +304,60 @@
</mediaobject>
</figure>
-
+ <itemizedlist>
+ <listitem>
+ <para>
+ <emphasis> <property>WSDL Service</property> </emphasis> : display the services in your WSDL file, you can select one to generate Web Service.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <emphasis> <property>Source Folder</property> </emphasis> : display the source codes folder in your web project, you can select one to generate java codes.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <emphasis> <property>Package name</property> </emphasis> : input a package name. You can click the Browse button to choose one. If you don't input a package name, system will generate one for you.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <emphasis> <property>JAX-WS specificaiton</property> </emphasis> : display the supported JAX-WS version, include, 2.0, 2.1, 2.2
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <emphasis> <property>Catalog file</property> </emphasis> : specify a catalog file.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <emphasis> <property>Binding files</property> </emphasis> : specify some binding files that are used by your WSDL file
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <emphasis> <property>Enable binding extension support (Only available for JBossWS 3.0 or later)</property> </emphasis> : select it if you need the binding extension support. Only work based on JBossWS 3.0 or later.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <emphasis> <property>Generate default Web Service Implementation classes</property> </emphasis> : select it if you want to generate empty implementation classes for the selected WSDL Service.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <emphasis> <property>Update the default Web.xml</property> </emphasis> : update the Web.xml file with your Web Service servlets configured.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <emphasis> <property>Additional Options</property> </emphasis> : the senior options for the generating process. Only for the senior user.
+ </para>
+ </listitem>
+ </itemizedlist>
<para>
- On this page, the default package name comes from the namespace of the WSDL document, you also can change it to any valid package name you want. JAX-WS specification should be set to 2.0 if your JBossWS runtime in JBoss Server is JBossWS native runtime. You can specify a catalog file and binding files if you have them. If you want the wizard to generate empty implementation classes for the Web Service, check the <guilabel>Generate default Web Service implementation classes</guilabel> check box. If you want to update the default <filename>Web.xml</filename> file with the Web Service servlets configured, check the <guilabel>Update the default Web.xml</guilabel> check box. Click on the <guibutton>Next</guibutton> or on the <guibutton>Finish</guibutton> button to generate code.
+ Click on the <emphasis> <property>Next</property> </emphasis> or on the <emphasis> <property>Finish</property> </emphasis> button to generate code.
</para>
<para>
13 years, 3 months
- 1
- 0
JBoss Tools SVN: r35589 - in trunk/ws/docs: reference/en-US/images/topdown and 3 other directories.
by jbosstools-commits＠lists.jboss.org
Author: irooskov(a)redhat.com
Date: 2011-10-12 20:35:37 -0400 (Wed, 12 Oct 2011)
New Revision: 35589
Modified:
trunk/ws/docs/reference/en-US/images/client/jbossws_client_2.png
trunk/ws/docs/reference/en-US/images/topdown/jbossws_ws_creation2.png
trunk/ws/docs/restful_reference/en-US/images/topdown/jbossws_ws_creation2.png
trunk/ws/docs/soap_reference/en-US/images/client/jbossws_client_2.png
trunk/ws/docs/soap_reference/en-US/images/topdown/jbossws_ws_creation2.png
Log:
updated for TOOLSDOC-263
Modified: trunk/ws/docs/reference/en-US/images/client/jbossws_client_2.png
===================================================================
(Binary files differ)
Modified: trunk/ws/docs/reference/en-US/images/topdown/jbossws_ws_creation2.png
===================================================================
(Binary files differ)
Modified: trunk/ws/docs/restful_reference/en-US/images/topdown/jbossws_ws_creation2.png
===================================================================
(Binary files differ)
Modified: trunk/ws/docs/soap_reference/en-US/images/client/jbossws_client_2.png
===================================================================
(Binary files differ)
Modified: trunk/ws/docs/soap_reference/en-US/images/topdown/jbossws_ws_creation2.png
===================================================================
(Binary files differ)
13 years, 3 months
- 1
- 0
JBoss Tools SVN: r35588 - trunk/documentation/guides/GettingStartedGuide/en-US.
by jbosstools-commits＠lists.jboss.org
Author: irooskov(a)redhat.com
Date: 2011-10-12 20:18:06 -0400 (Wed, 12 Oct 2011)
New Revision: 35588
Modified:
trunk/documentation/guides/GettingStartedGuide/en-US/first_seam.xml
trunk/documentation/guides/GettingStartedGuide/en-US/jsp_application.xml
trunk/documentation/guides/GettingStartedGuide/en-US/rad_jsf_application.xml
Log:
updated for TOOLSDOC-253
Modified: trunk/documentation/guides/GettingStartedGuide/en-US/first_seam.xml
===================================================================
--- trunk/documentation/guides/GettingStartedGuide/en-US/first_seam.xml 2011-10-13 00:17:50 UTC (rev 35587)
+++ trunk/documentation/guides/GettingStartedGuide/en-US/first_seam.xml 2011-10-13 00:18:06 UTC (rev 35588)
@@ -815,7 +815,7 @@
<programlisting><![CDATA[<rich:inputNumberSlider id="quantityOrdered" required="true"
value="#{orderdetailsHome.instance.quantityordered}"/>]]></programlisting>
<figure>
- <title>Manually coping Source Code</title>
+ <title>Manually copying Source Code</title>
<mediaobject>
<imageobject>
<imagedata fileref="images/first_seam/first_seam48.png"/>
Modified: trunk/documentation/guides/GettingStartedGuide/en-US/jsp_application.xml
===================================================================
--- trunk/documentation/guides/GettingStartedGuide/en-US/jsp_application.xml 2011-10-13 00:17:50 UTC (rev 35587)
+++ trunk/documentation/guides/GettingStartedGuide/en-US/jsp_application.xml 2011-10-13 00:18:06 UTC (rev 35588)
@@ -251,7 +251,7 @@
</programlisting>
<para>
- If you go back to <property>Tree</property> tab you will see that the changes made in the <property>Source</proeprty> tab are automatically reflected.
+ If you go back to <property>Tree</property> tab you will see that the changes made in the <property>Source</property> tab are automatically reflected.
</para>
<para>
@@ -347,7 +347,7 @@
</figure>
<figure>
- <title>Archive in Project Explorer View</title>
+ <title>Archive in Package Explorer</title>
<mediaobject>
<imageobject>
<imagedata fileref="images/jsp_application/jsp_application_12.png"/>
Modified: trunk/documentation/guides/GettingStartedGuide/en-US/rad_jsf_application.xml
===================================================================
--- trunk/documentation/guides/GettingStartedGuide/en-US/rad_jsf_application.xml 2011-10-13 00:17:50 UTC (rev 35587)
+++ trunk/documentation/guides/GettingStartedGuide/en-US/rad_jsf_application.xml 2011-10-13 00:18:06 UTC (rev 35588)
@@ -648,15 +648,6 @@
</figure>
<itemizedlist>
<listitem>
- <para>Switch to Source mode and insert a <code><br/></code> tag after the <code><h:outputText></code> component to make a new line.</para>
- </listitem>
- <listitem>
- <para>Click the <guibutton>Save</guibutton> button.</para>
- </listitem>
- <listitem>
- <para>On the Palette click on <emphasis><property>inputText</property>, </emphasis> drag the cursor over to the editor, and drop it inside the editor after the text.</para>
- </listitem>
- <listitem>
<para>Switch to Source mode and insert a <code><br/></code> tag after the <code><h:outputText></code> component to make a new line</para>
</listitem>
<listitem>
13 years, 3 months
- 1
- 0
JBoss Tools SVN: r35587 - branches/jbosstools-3.2.x/documentation/guides/GettingStartedGuide/en-US.
by jbosstools-commits＠lists.jboss.org
Author: irooskov(a)redhat.com
Date: 2011-10-12 20:17:50 -0400 (Wed, 12 Oct 2011)
New Revision: 35587
Modified:
branches/jbosstools-3.2.x/documentation/guides/GettingStartedGuide/en-US/Book_Info.xml
branches/jbosstools-3.2.x/documentation/guides/GettingStartedGuide/en-US/first_seam.xml
branches/jbosstools-3.2.x/documentation/guides/GettingStartedGuide/en-US/jsp_application.xml
branches/jbosstools-3.2.x/documentation/guides/GettingStartedGuide/en-US/rad_jsf_application.xml
Log:
updated for TOOLSDOC-253
Modified: branches/jbosstools-3.2.x/documentation/guides/GettingStartedGuide/en-US/Book_Info.xml
===================================================================
--- branches/jbosstools-3.2.x/documentation/guides/GettingStartedGuide/en-US/Book_Info.xml 2011-10-12 22:11:45 UTC (rev 35586)
+++ branches/jbosstools-3.2.x/documentation/guides/GettingStartedGuide/en-US/Book_Info.xml 2011-10-13 00:17:50 UTC (rev 35587)
@@ -8,7 +8,7 @@
<productname>JBoss Developer Studio</productname>
<productnumber>4.1</productnumber>
<edition>4.1.1</edition>
-<pubsnumber>17</pubsnumber>
+<pubsnumber>18</pubsnumber>
<abstract>
<para>The Getting Started Guide explains the JBoss Developer Studio.</para>
</abstract>
Modified: branches/jbosstools-3.2.x/documentation/guides/GettingStartedGuide/en-US/first_seam.xml
===================================================================
--- branches/jbosstools-3.2.x/documentation/guides/GettingStartedGuide/en-US/first_seam.xml 2011-10-12 22:11:45 UTC (rev 35586)
+++ branches/jbosstools-3.2.x/documentation/guides/GettingStartedGuide/en-US/first_seam.xml 2011-10-13 00:17:50 UTC (rev 35587)
@@ -815,7 +815,7 @@
<programlisting><![CDATA[<rich:inputNumberSlider id="quantityOrdered" required="true"
value="#{orderdetailsHome.instance.quantityordered}"/>]]></programlisting>
<figure>
- <title>Manually coping Source Code</title>
+ <title>Manually copying Source Code</title>
<mediaobject>
<imageobject>
<imagedata fileref="images/first_seam/first_seam48.png"/>
Modified: branches/jbosstools-3.2.x/documentation/guides/GettingStartedGuide/en-US/jsp_application.xml
===================================================================
--- branches/jbosstools-3.2.x/documentation/guides/GettingStartedGuide/en-US/jsp_application.xml 2011-10-12 22:11:45 UTC (rev 35586)
+++ branches/jbosstools-3.2.x/documentation/guides/GettingStartedGuide/en-US/jsp_application.xml 2011-10-13 00:17:50 UTC (rev 35587)
@@ -347,7 +347,7 @@
</figure>
<figure>
- <title>Archive in Project Explorer View</title>
+ <title>Archive in Package Explorer</title>
<mediaobject>
<imageobject>
<imagedata fileref="images/jsp_application/jsp_application_12.png"/>
Modified: branches/jbosstools-3.2.x/documentation/guides/GettingStartedGuide/en-US/rad_jsf_application.xml
===================================================================
--- branches/jbosstools-3.2.x/documentation/guides/GettingStartedGuide/en-US/rad_jsf_application.xml 2011-10-12 22:11:45 UTC (rev 35586)
+++ branches/jbosstools-3.2.x/documentation/guides/GettingStartedGuide/en-US/rad_jsf_application.xml 2011-10-13 00:17:50 UTC (rev 35587)
@@ -648,15 +648,6 @@
</figure>
<itemizedlist>
<listitem>
- <para>Switch to Source mode and insert a <code><br/></code> tag after the <code><h:outputText></code> component to make a new line.</para>
- </listitem>
- <listitem>
- <para>Click the <guibutton>Save</guibutton> button.</para>
- </listitem>
- <listitem>
- <para>On the Palette click on <emphasis><property>inputText</property>, </emphasis> drag the cursor over to the editor, and drop it inside the editor after the text.</para>
- </listitem>
- <listitem>
<para>Switch to Source mode and insert a <code><br/></code> tag after the <code><h:outputText></code> component to make a new line</para>
</listitem>
<listitem>
13 years, 3 months
- 1
- 0
JBoss Tools SVN: r35586 - trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-10-12 18:11:45 -0400 (Wed, 12 Oct 2011)
New Revision: 35586
Modified:
trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ImportProjectWizardModel.java
Log:
[JBIDE-9793] implementing user settable clone destination (folder) and branch to clone
Modified: trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ImportProjectWizardModel.java
===================================================================
--- trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ImportProjectWizardModel.java 2011-10-12 22:11:13 UTC (rev 35585)
+++ trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ImportProjectWizardModel.java 2011-10-12 22:11:45 UTC (rev 35586)
@@ -45,6 +45,8 @@
*/
public class ImportProjectWizardModel extends ObservableUIPojo {
+ private static final int CLONE_TIMEOUT = 10 * 1024;
+
private HashMap<String, Object> dataModel = new HashMap<String, Object>();
private static final String USER = "user";
@@ -155,8 +157,7 @@
RepositoryUtil repositoryUtil = Activator.getDefault().getRepositoryUtil();
CloneOperation cloneOperation =
-// new CloneOperation(gitUri, true, null, destination, Constants.HEAD, "origin", 10 * 1024);
- new CloneOperation(gitUri, true, null, destination, Constants.HEAD, "origin", 10 * 1024);
+ new CloneOperation(gitUri, true, null, destination, Constants.HEAD, "origin", CLONE_TIMEOUT);
cloneOperation.run(monitor);
repositoryUtil.addConfiguredRepository(new File(destination, Constants.DOT_GIT));
}
13 years, 3 months
- 1
- 0
JBoss Tools SVN: r35585 - trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-10-12 18:11:13 -0400 (Wed, 12 Oct 2011)
New Revision: 35585
Modified:
trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/AdapterWizardPage.java
trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/AdapterWizardPageModel.java
trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ImportProjectWizardModel.java
Log:
[JBIDE-9793] implementing user settable clone destination (folder) and branch to clone
Modified: trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/AdapterWizardPage.java
===================================================================
--- trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/AdapterWizardPage.java 2011-10-12 22:05:58 UTC (rev 35584)
+++ trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/AdapterWizardPage.java 2011-10-12 22:11:13 UTC (rev 35585)
@@ -12,12 +12,19 @@
import java.util.ArrayList;
import java.util.List;
+import java.util.regex.Pattern;
+import org.eclipse.core.databinding.Binding;
import org.eclipse.core.databinding.DataBindingContext;
+import org.eclipse.core.databinding.UpdateValueStrategy;
+import org.eclipse.core.databinding.beans.BeanProperties;
+import org.eclipse.core.databinding.validation.IValidator;
+import org.eclipse.core.databinding.validation.ValidationStatus;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.dialogs.Dialog;
+import org.eclipse.jface.databinding.fieldassist.ControlDecorationSupport;
+import org.eclipse.jface.databinding.swt.WidgetProperties;
import org.eclipse.jface.layout.GridDataFactory;
import org.eclipse.jface.layout.GridLayoutFactory;
import org.eclipse.jface.window.Window;
@@ -37,7 +44,6 @@
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Link;
import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.dialogs.ListDialog;
import org.eclipse.wst.server.core.IRuntime;
import org.eclipse.wst.server.core.IRuntimeType;
import org.eclipse.wst.server.core.IRuntimeWorkingCopy;
@@ -52,6 +58,7 @@
import org.eclipse.wst.server.ui.wizard.WizardFragment;
import org.jboss.ide.eclipse.as.core.util.IJBossToolingConstants;
import org.jboss.ide.eclipse.as.ui.UIUtil;
+import org.jboss.tools.common.ui.databinding.DataBindingUtils;
import org.jboss.tools.openshift.express.client.ICartridge;
import org.jboss.tools.openshift.express.client.OpenshiftException;
import org.jboss.tools.openshift.express.internal.ui.OpenshiftUIActivator;
@@ -102,9 +109,8 @@
Text cloneDirText = new Text(projectGroup, SWT.BORDER);
GridDataFactory.fillDefaults()
.align(SWT.LEFT, SWT.CENTER).align(SWT.FILL, SWT.CENTER).grab(true, false).applyTo(cloneDirText);
- // DataBindingUtils.bindMandatoryTextField(
- // cloneDirText, "Repository Destination",
- // AdapterWizardPageModel.PROPERTY_CLONEDIR, model, dbc);
+ DataBindingUtils.bindMandatoryTextField(
+ cloneDirText, "Repository Destination", AdapterWizardPageModel.PROPERTY_CLONEDIR, model, dbc);
Button browseDestinationButton = new Button(projectGroup, SWT.PUSH);
browseDestinationButton.setText("Browse");
GridDataFactory.fillDefaults()
@@ -114,18 +120,22 @@
Label branchLabel = new Label(projectGroup, SWT.NONE);
branchLabel.setText("Branch to clone");
GridDataFactory.fillDefaults().align(SWT.LEFT, SWT.CENTER).applyTo(branchLabel);
- Text branchText = new Text(projectGroup, SWT.NONE);
- branchText.setEditable(false);
- branchText.setBackground(projectGroup.getBackground());
+ Text branchText = new Text(projectGroup, SWT.BORDER);
GridDataFactory.fillDefaults()
.align(SWT.LEFT, SWT.CENTER).align(SWT.FILL, SWT.CENTER).grab(true, false)
.applyTo(branchText);
-
- Button selectBranchButton = new Button(projectGroup, SWT.PUSH);
- selectBranchButton.setText("Select Branch");
+ Binding branchNameBinding = dbc.bindValue(
+ WidgetProperties.text(SWT.Modify).observe(branchText)
+ , BeanProperties.value(AdapterWizardPageModel.PROPERTY_BRANCHNAME).observe(model)
+ , new UpdateValueStrategy().setAfterGetValidator(new BranchNameValidator())
+ , null);
+ ControlDecorationSupport.create(branchNameBinding, SWT.TOP | SWT.LEFT);
+
+ Button defaultBranchnameButton = new Button(projectGroup, SWT.PUSH);
+ defaultBranchnameButton.setText("Default");
GridDataFactory.fillDefaults()
- .align(SWT.LEFT, SWT.CENTER).hint(100, SWT.DEFAULT).applyTo(selectBranchButton);
- selectBranchButton.addSelectionListener(onSelectBranch());
+ .align(SWT.LEFT, SWT.CENTER).hint(100, SWT.DEFAULT).applyTo(defaultBranchnameButton);
+ defaultBranchnameButton.addSelectionListener(onBranchnameDefault());
return projectGroup;
}
@@ -138,28 +148,18 @@
DirectoryDialog dialog = new DirectoryDialog(getShell());
String cloneDir = dialog.open();
if (cloneDir != null) {
- model.setCloneDir(cloneDir);
+ model.setCloneDirectory(cloneDir);
}
}
};
}
- private SelectionListener onSelectBranch() {
+ private SelectionListener onBranchnameDefault() {
return new SelectionAdapter() {
@Override
public void widgetSelected(SelectionEvent e) {
- ListDialog branchesDialog = new ListDialog(getShell());
- branchesDialog.setContentProvider(new BranchNameContentProvider());
- branchesDialog.setTitle("Branches");
- if (Dialog.OK == branchesDialog.open()) {
- Object[] selectedBranches = branchesDialog.getResult();
- if (selectedBranches != null
- && selectedBranches.length >= 1
- && selectedBranches[1] instanceof String) {
- model.setBranch((String) selectedBranches[1]);
- }
- }
+ model.resetBranchname();
}
};
}
@@ -181,7 +181,7 @@
}
private void fillServerAdapterGroup(Group serverAdapterGroup) {
- Composite c = new Composite(serverAdapterGroup, SWT.BORDER);
+ Composite c = new Composite(serverAdapterGroup, SWT.NONE);
c.setLayout(new FormLayout());
Button serverAdapterCheckbox = new Button(c, SWT.CHECK);
serverAdapterCheckbox.setText("Create a JBoss server adapter");
@@ -337,4 +337,26 @@
return returnValue;
}
+ private static class BranchNameValidator implements IValidator {
+
+ private static final Pattern BRANCH_PATTERN = Pattern.compile(".+\\/.+");
+
+ @Override
+ public IStatus validate(Object value) {
+ if (value == null
+ || ((String) value).length() == 0) {
+ return ValidationStatus.error("you have to provide a branch to clone");
+ }
+
+ if (!isValidBranch((String) value)) {
+ return ValidationStatus.error("you have to provide a valid branch name (ex. origin/master)");
+ }
+ return ValidationStatus.ok();
+ }
+
+ private boolean isValidBranch(String branchname) {
+ return BRANCH_PATTERN.matcher(branchname).matches();
+ }
+ }
+
}
Modified: trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/AdapterWizardPageModel.java
===================================================================
--- trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/AdapterWizardPageModel.java 2011-10-12 22:05:58 UTC (rev 35584)
+++ trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/AdapterWizardPageModel.java 2011-10-12 22:11:13 UTC (rev 35585)
@@ -17,8 +17,11 @@
* @author Rob Stryker
*/
public class AdapterWizardPageModel extends ObservableUIPojo {
- public static final String PROPERTY_CLONEDIR = "cloneDir";
- public static final String PROPERTY_BRANCH = "branch";
+
+ private static final String BRANCHNAME_DEFAULT = "origin/master";
+
+ public static final String PROPERTY_CLONEDIR = "cloneDirectory";
+ public static final String PROPERTY_BRANCHNAME = "branchname";
public static final String CREATE_SERVER = "createServer";
public static final String MODE = "serverMode";
@@ -28,33 +31,39 @@
public static final String SERVER_TYPE = "serverType";
private String cloneDir;
- private String branch;
+ private String branchname;
private ImportProjectWizardModel wizardModel;
public AdapterWizardPageModel(ImportProjectWizardModel wizardModel) {
this.wizardModel = wizardModel;
+ this.branchname = BRANCHNAME_DEFAULT;
}
- public String getCloneDir() {
+ public String getCloneDirectory() {
return cloneDir;
}
- public void setCloneDir(String cloneDir) {
- firePropertyChange(PROPERTY_CLONEDIR, cloneDir, this.cloneDir = cloneDir);
+ public void setCloneDirectory(String cloneDir) {
+ firePropertyChange(PROPERTY_CLONEDIR, this.cloneDir, this.cloneDir = cloneDir);
+ wizardModel.setCloneDirectory(cloneDir);
}
- public String getBranch() {
- return branch;
+ public String getBranchname() {
+ return branchname;
}
- public void setBranch(String branch) {
- firePropertyChange(PROPERTY_BRANCH, branch, this.branch = branch);
+ public void setBranchname(String branchname) {
+ firePropertyChange(PROPERTY_BRANCHNAME, this.branchname, this.branchname = branchname);
+ wizardModel.setBranchname(branchname);
}
+ public void resetBranchname() {
+ setBranchname(BRANCHNAME_DEFAULT);
+ }
+
// TODO is this the best way? Or should we expose ONLY getters to the parent model?
public ImportProjectWizardModel getParentModel() {
return wizardModel;
}
-
}
Modified: trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ImportProjectWizardModel.java
===================================================================
--- trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ImportProjectWizardModel.java 2011-10-12 22:05:58 UTC (rev 35584)
+++ trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ImportProjectWizardModel.java 2011-10-12 22:11:13 UTC (rev 35585)
@@ -49,6 +49,8 @@
private static final String USER = "user";
private static final String APPLICATION = "application";
+ private static final String BRANCHNAME = "branchname";
+ private static final String CLONE_DIR = "cloneDir";
public void setProperty(String key, Object value) {
dataModel.put(key, value);
@@ -70,10 +72,26 @@
return (IApplication) dataModel.get(APPLICATION);
}
+ public void setBranchname(String branchname) {
+ dataModel.put(BRANCHNAME, branchname);
+ }
+
+ public String getBranchname() {
+ return (String) dataModel.get(BRANCHNAME);
+ }
+
+ public void setCloneDirectory(String cloneDir) {
+ dataModel.put(CLONE_DIR, cloneDir);
+ }
+
+ public String getCloneDirectory() {
+ return (String) dataModel.get(CLONE_DIR);
+ }
+
public void setApplication(IApplication application) {
dataModel.put(APPLICATION, application);
}
-
+
public void importProject(final File projectFolder, IProgressMonitor monitor) throws OpenshiftException,
CoreException,
InterruptedException {
@@ -119,8 +137,9 @@
public File cloneRepository(IProgressMonitor monitor) throws URISyntaxException, OpenshiftException,
InvocationTargetException,
InterruptedException {
- File destination = getDestinationDirectory(getApplication());
- cloneRepository(getApplication().getGitUri(), destination, monitor);
+ IApplication application = getApplication();
+ File destination = new File(getCloneDirectory(), application.getName());
+ cloneRepository(application.getGitUri(), destination, monitor);
return destination;
}
@@ -134,11 +153,12 @@
ensureEgitUIIsStarted();
URIish gitUri = new URIish(uri);
RepositoryUtil repositoryUtil = Activator.getDefault().getRepositoryUtil();
+
CloneOperation cloneOperation =
+// new CloneOperation(gitUri, true, null, destination, Constants.HEAD, "origin", 10 * 1024);
new CloneOperation(gitUri, true, null, destination, Constants.HEAD, "origin", 10 * 1024);
- cloneOperation.run(null);
- File gitDirectory = new File(destination, Constants.DOT_GIT);
- repositoryUtil.addConfiguredRepository(gitDirectory);
+ cloneOperation.run(monitor);
+ repositoryUtil.addConfiguredRepository(new File(destination, Constants.DOT_GIT));
}
/**
@@ -162,15 +182,6 @@
Activator.getDefault();
}
- private File getDestinationDirectory(IApplication application) {
- String applicationDirectory = application.getName();
- // File workspace =
- // ResourcesPlugin.getWorkspace().getRoot().getLocation().toFile();
- String userHome = System.getProperty("java.io.tmpdir");
- // File workDir = new File(workspace, applicationWorkingdir);
- return new File(userHome, applicationDirectory);
- }
-
private void createServerAdapterIfRequired() {
// TODO
}
13 years, 3 months
- 1
- 0
JBoss Tools SVN: r35584 - trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/builder.
by jbosstools-commits＠lists.jboss.org
Author: xcoulon
Date: 2011-10-12 18:05:58 -0400 (Wed, 12 Oct 2011)
New Revision: 35584
Modified:
trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/builder/JaxrsMetamodelBuilder.java
Log:
OPEN - issue JBIDE-9894: JAX-RS Builder: Errors running builder 'JAX-RS Builder' on project 'openshift-helloworld'.
https://issues.jboss.org/browse/JBIDE-9894
Modified: trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/builder/JaxrsMetamodelBuilder.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/builder/JaxrsMetamodelBuilder.java 2011-10-12 20:41:33 UTC (rev 35583)
+++ trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/builder/JaxrsMetamodelBuilder.java 2011-10-12 22:05:58 UTC (rev 35584)
@@ -145,6 +145,7 @@
public final boolean visit(final IResourceDelta delta) throws CoreException {
IResource resource = delta.getResource();
if (resource.getType() == IResource.FILE && getProject().getFullPath().isPrefixOf(resource.getFullPath())
+ && resource.getFullPath().getFileExtension() != null
&& resource.getFullPath().getFileExtension().equals("java")) {
Metamodel metamodel = Metamodel.get(resource.getProject());
if (metamodel == null) {
13 years, 3 months
- 1
- 0
JBoss Tools SVN: r35583 - in trunk/as/plugins/org.jboss.tools.openshift.express.ui: src/org/jboss/tools/openshift/express/internal/ui/behaviour and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-10-12 16:41:33 -0400 (Wed, 12 Oct 2011)
New Revision: 35583
Added:
trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/BranchNameContentProvider.java
trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ImportProjectWizard.java
trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ImportProjectWizardModel.java
Removed:
trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationWizard.java
trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationWizardModel.java
Modified:
trunk/as/plugins/org.jboss.tools.openshift.express.ui/plugin.xml
trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour/OpenshiftDeployUI.java
trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/AdapterWizardPage.java
trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/AdapterWizardPageModel.java
trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationWizardPage.java
trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationWizardPageModel.java
trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CredentialsWizardPage.java
trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CredentialsWizardPageModel.java
trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewDomainDialog.java
Log:
[JBIDE-9793] renamed ApplicationWizard to ImportProjectWizard, implementing AdapterWizardPage
Modified: trunk/as/plugins/org.jboss.tools.openshift.express.ui/plugin.xml
===================================================================
--- trunk/as/plugins/org.jboss.tools.openshift.express.ui/plugin.xml 2011-10-12 20:24:56 UTC (rev 35582)
+++ trunk/as/plugins/org.jboss.tools.openshift.express.ui/plugin.xml 2011-10-12 20:41:33 UTC (rev 35583)
@@ -9,7 +9,7 @@
</category>
<wizard
category="org.jboss.ide.eclipse.as.openshift.express.ui.wizard.category"
- class="org.jboss.tools.openshift.express.internal.ui.wizard.ApplicationWizard"
+ class="org.jboss.tools.openshift.express.internal.ui.wizard.ImportProjectWizard"
icon="icons/openshift-logo-white-icon.png"
id="org.jboss.ide.eclipse.as.openshift.express.ui.wizard.NewServerAdapter"
name="OpenShift Express Application">
Modified: trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour/OpenshiftDeployUI.java
===================================================================
--- trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour/OpenshiftDeployUI.java 2011-10-12 20:24:56 UTC (rev 35582)
+++ trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour/OpenshiftDeployUI.java 2011-10-12 20:41:33 UTC (rev 35583)
@@ -9,7 +9,6 @@
import org.eclipse.swt.widgets.Text;
import org.jboss.ide.eclipse.as.ui.UIUtil;
import org.jboss.ide.eclipse.as.ui.editor.IDeploymentTypeUI;
-import org.jboss.ide.eclipse.as.ui.editor.ServerModeSection;
import org.jboss.tools.openshift.express.internal.core.behaviour.ExpressServerUtils;
public class OpenshiftDeployUI implements IDeploymentTypeUI {
Modified: trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/AdapterWizardPage.java
===================================================================
--- trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/AdapterWizardPage.java 2011-10-12 20:24:56 UTC (rev 35582)
+++ trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/AdapterWizardPage.java 2011-10-12 20:41:33 UTC (rev 35583)
@@ -17,6 +17,7 @@
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
+import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.jface.layout.GridDataFactory;
import org.eclipse.jface.layout.GridLayoutFactory;
import org.eclipse.jface.window.Window;
@@ -31,10 +32,12 @@
import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Combo;
import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.DirectoryDialog;
import org.eclipse.swt.widgets.Group;
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Link;
import org.eclipse.swt.widgets.Text;
+import org.eclipse.ui.dialogs.ListDialog;
import org.eclipse.wst.server.core.IRuntime;
import org.eclipse.wst.server.core.IRuntimeType;
import org.eclipse.wst.server.core.IRuntimeWorkingCopy;
@@ -54,7 +57,7 @@
import org.jboss.tools.openshift.express.internal.ui.OpenshiftUIActivator;
public class AdapterWizardPage extends AbstractOpenshiftWizardPage implements IWizardPage {
-
+
private AdapterWizardPageModel model;
private Combo suitableRuntimes;
private IServerType serverTypeToCreate;
@@ -62,8 +65,13 @@
private Label domainLabel;
private Label modeLabel;
- public AdapterWizardPage(ApplicationWizard wizard, ApplicationWizardModel model) {
- super("Server Adapter", "...", "Server Adapter", wizard);
+ public AdapterWizardPage(ImportProjectWizard wizard, ImportProjectWizardModel model) {
+ super(
+ "Import Project",
+ "Please select the destination for your local copy of the OpenShift Express repository, "
+ + "what branch to clone and setup your server adapter, ",
+ "Server Adapter",
+ wizard);
this.model = new AdapterWizardPageModel(model);
}
@@ -71,41 +79,107 @@
protected void doCreateControls(Composite parent, DataBindingContext dbc) {
GridLayoutFactory.fillDefaults().applyTo(parent);
+ Group projectGroup = createProjectGroup(parent, dbc);
+ GridDataFactory.fillDefaults()
+ .align(SWT.LEFT, SWT.CENTER).align(SWT.FILL, SWT.FILL).grab(true, false).applyTo(projectGroup);
+
+ Group serverAdapterGroup = createAdapterGroup(parent);
+ GridDataFactory.fillDefaults()
+ .align(SWT.LEFT, SWT.CENTER).align(SWT.FILL, SWT.FILL).grab(true, false).applyTo(serverAdapterGroup);
+
+ }
+
+ private Group createProjectGroup(Composite parent, DataBindingContext dbc) {
Group projectGroup = new Group(parent, SWT.BORDER);
projectGroup.setText("Project setup");
GridDataFactory.fillDefaults()
.align(SWT.LEFT, SWT.CENTER).align(SWT.FILL, SWT.CENTER).grab(true, false).applyTo(projectGroup);
- GridLayoutFactory.fillDefaults().margins(6, 6).numColumns(2).applyTo(projectGroup);
+ GridLayoutFactory.fillDefaults().margins(6, 6).numColumns(3).applyTo(projectGroup);
- Label projectNameLabel = new Label(projectGroup, SWT.NONE);
- GridDataFactory.fillDefaults().align(SWT.LEFT, SWT.CENTER).applyTo(projectNameLabel);
- projectNameLabel.setText("Project name");
- Text projectNameText = new Text(projectGroup, SWT.BORDER);
+ Label cloneDirLabel = new Label(projectGroup, SWT.NONE);
+ GridDataFactory.fillDefaults().align(SWT.LEFT, SWT.CENTER).applyTo(cloneDirLabel);
+ cloneDirLabel.setText("Repository Destination");
+ Text cloneDirText = new Text(projectGroup, SWT.BORDER);
GridDataFactory.fillDefaults()
- .align(SWT.LEFT, SWT.CENTER).align(SWT.FILL, SWT.CENTER).grab(true, false).applyTo(projectNameText);
+ .align(SWT.LEFT, SWT.CENTER).align(SWT.FILL, SWT.CENTER).grab(true, false).applyTo(cloneDirText);
+ // DataBindingUtils.bindMandatoryTextField(
+ // cloneDirText, "Repository Destination",
+ // AdapterWizardPageModel.PROPERTY_CLONEDIR, model, dbc);
+ Button browseDestinationButton = new Button(projectGroup, SWT.PUSH);
+ browseDestinationButton.setText("Browse");
+ GridDataFactory.fillDefaults()
+ .align(SWT.LEFT, SWT.CENTER).hint(100, SWT.DEFAULT).applyTo(browseDestinationButton);
+ browseDestinationButton.addSelectionListener(onBrowseDestination());
- Label branchNameLabel = new Label(projectGroup, SWT.NONE);
- branchNameLabel.setText("Name of remote branch");
- GridDataFactory.fillDefaults().align(SWT.LEFT, SWT.CENTER).applyTo(branchNameLabel);
- Text branchNameText = new Text(projectGroup, SWT.BORDER);
+ Label branchLabel = new Label(projectGroup, SWT.NONE);
+ branchLabel.setText("Branch to clone");
+ GridDataFactory.fillDefaults().align(SWT.LEFT, SWT.CENTER).applyTo(branchLabel);
+ Text branchText = new Text(projectGroup, SWT.NONE);
+ branchText.setEditable(false);
+ branchText.setBackground(projectGroup.getBackground());
GridDataFactory.fillDefaults()
- .align(SWT.LEFT, SWT.CENTER).align(SWT.FILL, SWT.CENTER).grab(true, false).applyTo(branchNameText);
+ .align(SWT.LEFT, SWT.CENTER).align(SWT.FILL, SWT.CENTER).grab(true, false)
+ .applyTo(branchText);
+ Button selectBranchButton = new Button(projectGroup, SWT.PUSH);
+ selectBranchButton.setText("Select Branch");
+ GridDataFactory.fillDefaults()
+ .align(SWT.LEFT, SWT.CENTER).hint(100, SWT.DEFAULT).applyTo(selectBranchButton);
+ selectBranchButton.addSelectionListener(onSelectBranch());
+
+ return projectGroup;
+ }
+
+ private SelectionListener onBrowseDestination() {
+ return new SelectionAdapter() {
+
+ @Override
+ public void widgetSelected(SelectionEvent e) {
+ DirectoryDialog dialog = new DirectoryDialog(getShell());
+ String cloneDir = dialog.open();
+ if (cloneDir != null) {
+ model.setCloneDir(cloneDir);
+ }
+ }
+ };
+ }
+
+ private SelectionListener onSelectBranch() {
+ return new SelectionAdapter() {
+
+ @Override
+ public void widgetSelected(SelectionEvent e) {
+ ListDialog branchesDialog = new ListDialog(getShell());
+ branchesDialog.setContentProvider(new BranchNameContentProvider());
+ branchesDialog.setTitle("Branches");
+ if (Dialog.OK == branchesDialog.open()) {
+ Object[] selectedBranches = branchesDialog.getResult();
+ if (selectedBranches != null
+ && selectedBranches.length >= 1
+ && selectedBranches[1] instanceof String) {
+ model.setBranch((String) selectedBranches[1]);
+ }
+ }
+ }
+ };
+ }
+
+ private Group createAdapterGroup(Composite parent) {
Group serverAdapterGroup = new Group(parent, SWT.BORDER);
serverAdapterGroup.setText("JBoss Server adapter");
- GridDataFactory.fillDefaults()
- .align(SWT.LEFT, SWT.CENTER).align(SWT.FILL, SWT.FILL).grab(true, false).applyTo(serverAdapterGroup);
FillLayout fillLayout = new FillLayout();
fillLayout.marginHeight = 6;
fillLayout.marginWidth = 6;
serverAdapterGroup.setLayout(fillLayout);
fillServerAdapterGroup(serverAdapterGroup);
+
+ return serverAdapterGroup;
}
-
+
protected void enableServerWidgets(boolean enabled) {
suitableRuntimes.setEnabled(enabled);
}
-
+
private void fillServerAdapterGroup(Group serverAdapterGroup) {
Composite c = new Composite(serverAdapterGroup, SWT.BORDER);
c.setLayout(new FormLayout());
@@ -114,31 +188,34 @@
final Button serverAdapterCheckbox2 = serverAdapterCheckbox;
serverAdapterCheckbox.addSelectionListener(new SelectionListener() {
public void widgetSelected(SelectionEvent e) {
- model.getParentModel().setProperty(AdapterWizardPageModel.CREATE_SERVER, serverAdapterCheckbox2.getSelection());
+ model.getParentModel().setProperty(AdapterWizardPageModel.CREATE_SERVER,
+ serverAdapterCheckbox2.getSelection());
enableServerWidgets(serverAdapterCheckbox2.getSelection());
}
+
public void widgetDefaultSelected(SelectionEvent e) {
}
});
-
-
+
Label l = new Label(c, SWT.BORDER);
l.setText("Local Runtime: ");
-
+
suitableRuntimes = new Combo(c, SWT.READ_ONLY);
Link addRuntime = new Link(c, SWT.NONE);
addRuntime.setText("<a>" + Messages.addRuntime + "</a>");
-
+
domainLabel = new Label(c, SWT.NONE);
- //appLabel = new Label(c, SWT.NONE);
+ // appLabel = new Label(c, SWT.NONE);
modeLabel = new Label(c, SWT.NONE);
-
- suitableRuntimes.addSelectionListener(new SelectionListener(){
+
+ suitableRuntimes.addSelectionListener(new SelectionListener() {
public void widgetSelected(SelectionEvent e) {
updateSelectedRuntimeDelegate();
}
+
public void widgetDefaultSelected(SelectionEvent e) {
- }});
+ }
+ });
addRuntime.addSelectionListener(new SelectionAdapter() {
public void widgetSelected(SelectionEvent e) {
IRuntimeType type = getValidRuntimeType();
@@ -146,63 +223,65 @@
}
});
- serverAdapterCheckbox.setLayoutData(UIUtil.createFormData2(0,5,null,0,0,5,null,0));
- l.setLayoutData( UIUtil.createFormData2(serverAdapterCheckbox,5,null,0,0,5,null,0));
+ serverAdapterCheckbox.setLayoutData(UIUtil.createFormData2(0, 5, null, 0, 0, 5, null, 0));
+ l.setLayoutData(UIUtil.createFormData2(serverAdapterCheckbox, 5, null, 0, 0, 5, null, 0));
addRuntime.setLayoutData(UIUtil.createFormData2(serverAdapterCheckbox, 5, null, 0, null, 0, 100, -5));
- suitableRuntimes.setLayoutData(UIUtil.createFormData2(serverAdapterCheckbox,5,null,0,l,5,addRuntime,-5));
+ suitableRuntimes.setLayoutData(UIUtil.createFormData2(serverAdapterCheckbox, 5, null, 0, l, 5, addRuntime, -5));
domainLabel.setLayoutData(UIUtil.createFormData2(suitableRuntimes, 5, null, 0, 0, 5, 100, 0));
- //appLabel.setLayoutData(UIUtil.createFormData2(domainLabel, 5, null, 0, 0, 5, 100, 0));
+ // appLabel.setLayoutData(UIUtil.createFormData2(domainLabel, 5, null,
+ // 0, 0, 5, 100, 0));
modeLabel.setLayoutData(UIUtil.createFormData2(domainLabel, 5, null, 0, 0, 5, 100, 0));
-
+
}
-
+
private void updateSelectedRuntimeDelegate() {
- if( suitableRuntimes.getSelectionIndex() != -1) {
+ if (suitableRuntimes.getSelectionIndex() != -1) {
runtimeDelegate = ServerCore.findRuntime(suitableRuntimes.getItem(suitableRuntimes.getSelectionIndex()));
} else {
runtimeDelegate = null;
}
model.getParentModel().setProperty(AdapterWizardPageModel.RUNTIME_DELEGATE, runtimeDelegate);
}
+
private IRuntimeType getValidRuntimeType() {
String cartridgeName = model.getParentModel().getApplication().getCartridge().getName();
- if( ICartridge.JBOSSAS_7.getName().equals(cartridgeName)) {
+ if (ICartridge.JBOSSAS_7.getName().equals(cartridgeName)) {
return ServerCore.findRuntimeType(IJBossToolingConstants.AS_70);
}
return null;
}
+
private IServerType getServerTypeToCreate() {
String cartridgeName = model.getParentModel().getApplication().getCartridge().getName();
- if( ICartridge.JBOSSAS_7.getName().equals(cartridgeName)) {
+ if (ICartridge.JBOSSAS_7.getName().equals(cartridgeName)) {
return ServerCore.findServerType(IJBossToolingConstants.SERVER_AS_70);
}
return null;
}
-
private IRuntime[] getRuntimesOfType(String type) {
ArrayList<IRuntime> validRuntimes = new ArrayList<IRuntime>();
IRuntime[] allRuntimes = ServerCore.getRuntimes();
- for( int i = 0; i < allRuntimes.length; i++ ) {
- if( allRuntimes[i].getRuntimeType().getId().equals(type))
+ for (int i = 0; i < allRuntimes.length; i++) {
+ if (allRuntimes[i].getRuntimeType().getId().equals(type))
validRuntimes.add(allRuntimes[i]);
}
return validRuntimes.toArray(new IRuntime[validRuntimes.size()]);
}
-
+
private void fillRuntimeCombo(Combo combo, IRuntime[] runtimes) {
String[] names = new String[runtimes.length];
- for( int i = 0; i < runtimes.length; i++ ) {
+ for (int i = 0; i < runtimes.length; i++) {
names[i] = runtimes[i].getName();
}
combo.setItems(names);
}
-
+
protected void onPageActivated(DataBindingContext dbc) {
serverTypeToCreate = getServerTypeToCreate();
model.getParentModel().setProperty(AdapterWizardPageModel.SERVER_TYPE, serverTypeToCreate);
refreshValidRuntimes();
- if( suitableRuntimes.getItemCount() > 0 ) {
+ if (suitableRuntimes.getItemCount() > 0) {
suitableRuntimes.select(0);
updateSelectedRuntimeDelegate();
}
@@ -210,16 +289,17 @@
domainLabel.setText("Host: " + model.getParentModel().getApplication().getApplicationUrl());
modeLabel.setText("Mode: Source");
model.getParentModel().setProperty(AdapterWizardPageModel.MODE, AdapterWizardPageModel.MODE_SOURCE);
- } catch(OpenshiftException ose ) {
- OpenshiftUIActivator.getDefault().getLog().log(new Status(IStatus.ERROR, OpenshiftUIActivator.PLUGIN_ID, ose.getMessage(), ose));
+ } catch (OpenshiftException ose) {
+ OpenshiftUIActivator.getDefault().getLog()
+ .log(new Status(IStatus.ERROR, OpenshiftUIActivator.PLUGIN_ID, ose.getMessage(), ose));
}
}
-
+
protected void refreshValidRuntimes() {
IRuntime[] runtimes = getRuntimesOfType(getValidRuntimeType().getId());
fillRuntimeCombo(suitableRuntimes, runtimes);
}
-
+
/* Stolen from NewManualServerComposite */
protected int showRuntimeWizard(IRuntimeType runtimeType) {
WizardFragment fragment = null;
@@ -227,7 +307,7 @@
final WizardFragment fragment2 = ServerUIPlugin.getWizardFragment(runtimeType.getId());
if (fragment2 == null)
return Window.CANCEL;
-
+
try {
IRuntimeWorkingCopy runtimeWorkingCopy = runtimeType.createRuntime(null, null);
taskModel.putObject(TaskModel.TASK_RUNTIME, runtimeWorkingCopy);
@@ -249,11 +329,11 @@
int returnValue = dialog.open();
refreshValidRuntimes();
if (returnValue != Window.CANCEL) {
- IRuntime rt = (IRuntime)taskModel.getObject(TaskModel.TASK_RUNTIME);
+ IRuntime rt = (IRuntime) taskModel.getObject(TaskModel.TASK_RUNTIME);
if (rt != null && rt.getName() != null && suitableRuntimes.indexOf(rt.getName()) != -1) {
suitableRuntimes.select(suitableRuntimes.indexOf(rt.getName()));
}
- }
+ }
return returnValue;
}
Modified: trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/AdapterWizardPageModel.java
===================================================================
--- trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/AdapterWizardPageModel.java 2011-10-12 20:24:56 UTC (rev 35582)
+++ trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/AdapterWizardPageModel.java 2011-10-12 20:41:33 UTC (rev 35583)
@@ -13,9 +13,13 @@
import org.jboss.tools.common.ui.databinding.ObservableUIPojo;
/**
+ * @author André Dietisheim
* @author Rob Stryker
*/
public class AdapterWizardPageModel extends ObservableUIPojo {
+ public static final String PROPERTY_CLONEDIR = "cloneDir";
+ public static final String PROPERTY_BRANCH = "branch";
+
public static final String CREATE_SERVER = "createServer";
public static final String MODE = "serverMode";
public static final String MODE_SOURCE = "serverModeSource";
@@ -23,15 +27,33 @@
public static final String RUNTIME_DELEGATE = "runtimeDelegate";
public static final String SERVER_TYPE = "serverType";
+ private String cloneDir;
+ private String branch;
+
+ private ImportProjectWizardModel wizardModel;
- private ApplicationWizardModel wizardModel;
-
- public AdapterWizardPageModel(ApplicationWizardModel wizardModel) {
+ public AdapterWizardPageModel(ImportProjectWizardModel wizardModel) {
this.wizardModel = wizardModel;
}
+ public String getCloneDir() {
+ return cloneDir;
+ }
+
+ public void setCloneDir(String cloneDir) {
+ firePropertyChange(PROPERTY_CLONEDIR, cloneDir, this.cloneDir = cloneDir);
+ }
+
+ public String getBranch() {
+ return branch;
+ }
+
+ public void setBranch(String branch) {
+ firePropertyChange(PROPERTY_BRANCH, branch, this.branch = branch);
+ }
+
// TODO is this the best way? Or should we expose ONLY getters to the parent model?
- public ApplicationWizardModel getParentModel() {
+ public ImportProjectWizardModel getParentModel() {
return wizardModel;
}
Deleted: trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationWizard.java
===================================================================
--- trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationWizard.java 2011-10-12 20:24:56 UTC (rev 35582)
+++ trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationWizard.java 2011-10-12 20:41:33 UTC (rev 35583)
@@ -1,85 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011 Red Hat, Inc.
- * Distributed under license by Red Hat, Inc. All rights reserved.
- * This program is made available under the terms of the
- * Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
-package org.jboss.tools.openshift.express.internal.ui.wizard;
-
-import java.io.File;
-import java.net.URISyntaxException;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jface.dialogs.ErrorDialog;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.ui.INewWizard;
-import org.eclipse.ui.IWorkbench;
-import org.jboss.tools.common.ui.WizardUtils;
-import org.jboss.tools.openshift.express.client.OpenshiftException;
-import org.jboss.tools.openshift.express.internal.ui.OpenshiftUIActivator;
-
-/**
- * @author André Dietisheim
- */
-public class ApplicationWizard extends Wizard implements INewWizard {
-
- private ApplicationWizardModel model;
-
- public ApplicationWizard() {
- }
-
- @Override
- public void init(IWorkbench workbench, IStructuredSelection selection) {
- setWindowTitle("OpenShift application wizard");
- setNeedsProgressMonitor(true);
- }
-
- @Override
- public boolean performFinish() {
- try {
- WizardUtils.runInWizard(
- new Job("Creating local git repo...") {
-
- @Override
- protected IStatus run(IProgressMonitor monitor) {
- try {
- File repositoryFile = model.cloneRepository(monitor);
- model.importProject(repositoryFile, monitor);
- return Status.OK_STATUS;
- } catch (OpenshiftException e) {
- return new Status(IStatus.ERROR, OpenshiftUIActivator.PLUGIN_ID,
- "An exception occurred while creating local git repository.", e);
- } catch (URISyntaxException e) {
- return new Status(IStatus.ERROR, OpenshiftUIActivator.PLUGIN_ID,
- "The url of the remote git repository is not valid", e);
- } catch (Exception e) {
- return new Status(IStatus.ERROR, OpenshiftUIActivator.PLUGIN_ID,
- "An exception occurred while creating local git repository.", e);
- }
- }
- }, getContainer());
- return true;
- } catch (Exception e) {
- ErrorDialog.openError(getShell(), "Error", "Could not create local git repository.",
- new Status(IStatus.ERROR, OpenshiftUIActivator.PLUGIN_ID,
- "An exception occurred while creating local git repository.", e));
- return false;
- }
- }
-
- @Override
- public void addPages() {
- this.model = new ApplicationWizardModel();
- addPage(new CredentialsWizardPage(this, model));
- addPage(new ApplicationWizardPage(this, model));
- addPage(new AdapterWizardPage(this, model));
- }
-}
Deleted: trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationWizardModel.java
===================================================================
--- trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationWizardModel.java 2011-10-12 20:24:56 UTC (rev 35582)
+++ trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationWizardModel.java 2011-10-12 20:41:33 UTC (rev 35583)
@@ -1,177 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011 Red Hat, Inc.
- * Distributed under license by Red Hat, Inc. All rights reserved.
- * This program is made available under the terms of the
- * Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
-package org.jboss.tools.openshift.express.internal.ui.wizard;
-
-import java.io.File;
-import java.lang.reflect.InvocationTargetException;
-import java.net.URISyntaxException;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.WorkspaceJob;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.egit.core.RepositoryUtil;
-import org.eclipse.egit.core.op.CloneOperation;
-import org.eclipse.egit.core.op.ConnectProviderOperation;
-import org.eclipse.egit.ui.Activator;
-import org.eclipse.jgit.lib.Constants;
-import org.eclipse.jgit.transport.JschConfigSessionFactory;
-import org.eclipse.jgit.transport.URIish;
-import org.eclipse.osgi.util.NLS;
-import org.jboss.ide.eclipse.as.core.util.FileUtil;
-import org.jboss.tools.common.ui.databinding.ObservableUIPojo;
-import org.jboss.tools.openshift.express.client.IApplication;
-import org.jboss.tools.openshift.express.client.IUser;
-import org.jboss.tools.openshift.express.client.OpenshiftException;
-import org.jboss.tools.openshift.express.internal.ui.OpenshiftUIActivator;
-import org.jboss.tools.openshift.express.internal.ui.wizard.projectimport.GeneralProjectImportOperation;
-import org.jboss.tools.openshift.express.internal.ui.wizard.projectimport.MavenProjectImportOperation;
-
-/**
- * @author André Dietisheim <adietish(a)redhat.com>
- */
-public class ApplicationWizardModel extends ObservableUIPojo {
-
- private HashMap<String, Object> dataModel = new HashMap<String, Object>();
-
- private static final String USER = "user";
- private static final String APPLICATION = "application";
-
- public void setProperty(String key, Object value) {
- dataModel.put(key, value);
- }
-
- public Object getProperty(String key) {
- return dataModel.get(key);
- }
-
- public void setUser(IUser user) {
- dataModel.put(USER, user);
- }
-
- public IUser getUser() {
- return (IUser) dataModel.get(USER);
- }
-
- public IApplication getApplication() {
- return (IApplication) dataModel.get(APPLICATION);
- }
-
- public void setApplication(IApplication application) {
- dataModel.put(APPLICATION, application);
- }
-
- public void importProject(final File projectFolder, IProgressMonitor monitor) throws OpenshiftException,
- CoreException,
- InterruptedException {
- new WorkspaceJob(NLS.bind("Importing projects from {0}", projectFolder.getAbsolutePath())) {
-
- @Override
- public IStatus runInWorkspace(IProgressMonitor monitor) throws CoreException {
- try {
- MavenProjectImportOperation mavenImport = new MavenProjectImportOperation(projectFolder);
- List<IProject> importedProjects = Collections.emptyList();
- if (mavenImport.isMavenProject()) {
- importedProjects = mavenImport.importToWorkspace(monitor);
- } else {
- importedProjects = new GeneralProjectImportOperation(projectFolder).importToWorkspace(monitor);
- }
-
- File gitFolder = new File(projectFolder, Constants.DOT_GIT);
- connectToGitRepo(importedProjects, gitFolder, monitor);
-
- createServerAdapterIfRequired();
- return Status.OK_STATUS;
- } catch (Exception e) {
- IStatus status = new Status(IStatus.ERROR, OpenshiftUIActivator.PLUGIN_ID,
- NLS.bind("Could not import projects from {0}", projectFolder.getAbsolutePath()), e);
- OpenshiftUIActivator.log(status);
- return status;
- }
- }
- }.schedule();
- }
-
- private void connectToGitRepo(List<IProject> projects, File gitFolder, IProgressMonitor monitor)
- throws CoreException {
- for (IProject project : projects) {
- connectToGitRepo(project, gitFolder, monitor);
- }
- }
-
- private void connectToGitRepo(IProject project, File gitFolder, IProgressMonitor monitor) throws CoreException {
- new ConnectProviderOperation(project).execute(monitor);
- }
-
- public File cloneRepository(IProgressMonitor monitor) throws URISyntaxException, OpenshiftException,
- InvocationTargetException,
- InterruptedException {
- File destination = getDestinationDirectory(getApplication());
- cloneRepository(getApplication().getGitUri(), destination, monitor);
- return destination;
- }
-
- private void cloneRepository(String uri, File destination, IProgressMonitor monitor) throws URISyntaxException,
- OpenshiftException,
- InvocationTargetException,
- InterruptedException {
- if (destination.exists()) {
- FileUtil.completeDelete(destination);
- }
- ensureEgitUIIsStarted();
- URIish gitUri = new URIish(uri);
- RepositoryUtil repositoryUtil = Activator.getDefault().getRepositoryUtil();
- CloneOperation cloneOperation =
- new CloneOperation(gitUri, true, null, destination, Constants.HEAD, "origin", 10 * 1024);
- cloneOperation.run(null);
- File gitDirectory = new File(destination, Constants.DOT_GIT);
- repositoryUtil.addConfiguredRepository(gitDirectory);
- }
-
- /**
- * The EGit UI plugin initializes the ssh factory to present the user a
- * passphrase prompt if the ssh key was not read yet. If this initialization
- * is not executed, the ssh connection to the git repo would just fail with
- * an authentication error. We therefore have to make sure that the EGit UI
- * plugin is started and initializes the JSchConfigSessionFactory.
- * <p>
- * EGit initializes the SshSessionFactory with the EclipseSshSessionFactory.
- * The EclipseSshSessionFactory overrides JschConfigSessionFactory#configure
- * to present a UserInfoPrompter if the key passphrase was not entered
- * before.
- *
- * @see Activator#start(org.osgi.framework.BundleContext)
- * @see Activator#setupSSH
- * @see JschConfigSessionFactory#configure
- * @see EclipseSshSessionFactory#configure
- */
- private void ensureEgitUIIsStarted() {
- Activator.getDefault();
- }
-
- private File getDestinationDirectory(IApplication application) {
- String applicationDirectory = application.getName();
- // File workspace =
- // ResourcesPlugin.getWorkspace().getRoot().getLocation().toFile();
- String userHome = System.getProperty("java.io.tmpdir");
- // File workDir = new File(workspace, applicationWorkingdir);
- return new File(userHome, applicationDirectory);
- }
-
- private void createServerAdapterIfRequired() {
- // TODO
- }
-}
Modified: trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationWizardPage.java
===================================================================
--- trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationWizardPage.java 2011-10-12 20:24:56 UTC (rev 35582)
+++ trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationWizardPage.java 2011-10-12 20:41:33 UTC (rev 35583)
@@ -68,9 +68,9 @@
private TableViewer viewer;
private ApplicationWizardPageModel model;
- private ApplicationWizardModel wizardModel;
+ private ImportProjectWizardModel wizardModel;
- protected ApplicationWizardPage(IWizard wizard, ApplicationWizardModel wizardModel) {
+ protected ApplicationWizardPage(IWizard wizard, ImportProjectWizardModel wizardModel) {
super("Application selection", "Please select an Openshift Express application",
"Application selection", wizard);
this.wizardModel = wizardModel;
Modified: trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationWizardPageModel.java
===================================================================
--- trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationWizardPageModel.java 2011-10-12 20:24:56 UTC (rev 35582)
+++ trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationWizardPageModel.java 2011-10-12 20:41:33 UTC (rev 35583)
@@ -32,9 +32,9 @@
private String namespace;
private IDomain domain;
private IApplication selectedApplication;
- private ApplicationWizardModel wizardModel;
+ private ImportProjectWizardModel wizardModel;
- public ApplicationWizardPageModel(ApplicationWizardModel wizardModel) {
+ public ApplicationWizardPageModel(ImportProjectWizardModel wizardModel) {
this.wizardModel = wizardModel;
}
Added: trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/BranchNameContentProvider.java
===================================================================
--- trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/BranchNameContentProvider.java (rev 0)
+++ trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/BranchNameContentProvider.java 2011-10-12 20:41:33 UTC (rev 35583)
@@ -0,0 +1,48 @@
+/*******************************************************************************
+ * Copyright (c) 2011 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.openshift.express.internal.ui.wizard;
+
+import java.util.Set;
+
+import org.eclipse.jface.viewers.IStructuredContentProvider;
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.jgit.lib.Repository;
+
+/**
+ * @author André Dietisheim
+ */
+public class BranchNameContentProvider implements IStructuredContentProvider {
+
+ @Override
+ public void dispose() {
+
+ }
+
+ @Override
+ public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
+ }
+
+ @Override
+ public Object[] getElements(Object inputElement) {
+ if (!(inputElement instanceof Repository)) {
+ return new Object[] {};
+ }
+
+ return getBranches((Repository) inputElement);
+ }
+
+ private Object[] getBranches(Repository repository) {
+
+ Set<String> refNames = repository.getAllRefs().keySet();
+ return refNames.toArray(new String[refNames.size()]);
+ }
+
+}
Property changes on: trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/BranchNameContentProvider.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CredentialsWizardPage.java
===================================================================
--- trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CredentialsWizardPage.java 2011-10-12 20:24:56 UTC (rev 35582)
+++ trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CredentialsWizardPage.java 2011-10-12 20:41:33 UTC (rev 35583)
@@ -47,7 +47,7 @@
private CredentialsWizardPageModel model;
- public CredentialsWizardPage(IWizard wizard, ApplicationWizardModel wizardModel) {
+ public CredentialsWizardPage(IWizard wizard, ImportProjectWizardModel wizardModel) {
super("Server connetion", "Please provide the credentails of your user account on Openshift Express",
"Server Connection", wizard);
this.model = new CredentialsWizardPageModel(wizardModel);
@@ -71,8 +71,8 @@
// dbc.bindValue(
// WidgetProperties.text(SWT.Modify).observe(serverUrlText),
// BeanProperties.value(
- // ApplicationWizardModel.class,
- // ApplicationWizardModel.PROPERTY_SERVER_URL).observe(model),
+ // ImportProjectWizardModel.class,
+ // ImportProjectWizardModel.PROPERTY_SERVER_URL).observe(model),
// new UpdateValueStrategy()
// .setAfterGetValidator(new
// MandatoryStringValidator("You have to provide a value for the server url."))
Modified: trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CredentialsWizardPageModel.java
===================================================================
--- trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CredentialsWizardPageModel.java 2011-10-12 20:24:56 UTC (rev 35582)
+++ trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CredentialsWizardPageModel.java 2011-10-12 20:41:33 UTC (rev 35583)
@@ -44,9 +44,9 @@
private IUser user;
private StringPreferenceValue rhLoginPreferenceValue;
- private ApplicationWizardModel wizardModel;
+ private ImportProjectWizardModel wizardModel;
- public CredentialsWizardPageModel(ApplicationWizardModel model) {
+ public CredentialsWizardPageModel(ImportProjectWizardModel model) {
this.wizardModel = model;
this.serverUrl = IOpenshiftService.BASE_URL;
this.rhLoginPreferenceValue = new StringPreferenceValue(RHLOGIN_PREFS_KEY, OpenshiftUIActivator.PLUGIN_ID);
Copied: trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ImportProjectWizard.java (from rev 35581, trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationWizard.java)
===================================================================
--- trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ImportProjectWizard.java (rev 0)
+++ trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ImportProjectWizard.java 2011-10-12 20:41:33 UTC (rev 35583)
@@ -0,0 +1,85 @@
+/*******************************************************************************
+ * Copyright (c) 2011 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.openshift.express.internal.ui.wizard;
+
+import java.io.File;
+import java.net.URISyntaxException;
+
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.core.runtime.jobs.Job;
+import org.eclipse.jface.dialogs.ErrorDialog;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.wizard.Wizard;
+import org.eclipse.ui.INewWizard;
+import org.eclipse.ui.IWorkbench;
+import org.jboss.tools.common.ui.WizardUtils;
+import org.jboss.tools.openshift.express.client.OpenshiftException;
+import org.jboss.tools.openshift.express.internal.ui.OpenshiftUIActivator;
+
+/**
+ * @author André Dietisheim
+ */
+public class ImportProjectWizard extends Wizard implements INewWizard {
+
+ private ImportProjectWizardModel model;
+
+ public ImportProjectWizard() {
+ }
+
+ @Override
+ public void init(IWorkbench workbench, IStructuredSelection selection) {
+ setWindowTitle("OpenShift application wizard");
+ setNeedsProgressMonitor(true);
+ }
+
+ @Override
+ public boolean performFinish() {
+ try {
+ WizardUtils.runInWizard(
+ new Job("Creating local git repo...") {
+
+ @Override
+ protected IStatus run(IProgressMonitor monitor) {
+ try {
+ File repositoryFile = model.cloneRepository(monitor);
+ model.importProject(repositoryFile, monitor);
+ return Status.OK_STATUS;
+ } catch (OpenshiftException e) {
+ return new Status(IStatus.ERROR, OpenshiftUIActivator.PLUGIN_ID,
+ "An exception occurred while creating local git repository.", e);
+ } catch (URISyntaxException e) {
+ return new Status(IStatus.ERROR, OpenshiftUIActivator.PLUGIN_ID,
+ "The url of the remote git repository is not valid", e);
+ } catch (Exception e) {
+ return new Status(IStatus.ERROR, OpenshiftUIActivator.PLUGIN_ID,
+ "An exception occurred while creating local git repository.", e);
+ }
+ }
+ }, getContainer());
+ return true;
+ } catch (Exception e) {
+ ErrorDialog.openError(getShell(), "Error", "Could not create local git repository.",
+ new Status(IStatus.ERROR, OpenshiftUIActivator.PLUGIN_ID,
+ "An exception occurred while creating local git repository.", e));
+ return false;
+ }
+ }
+
+ @Override
+ public void addPages() {
+ this.model = new ImportProjectWizardModel();
+ addPage(new CredentialsWizardPage(this, model));
+ addPage(new ApplicationWizardPage(this, model));
+ addPage(new AdapterWizardPage(this, model));
+ }
+}
Property changes on: trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ImportProjectWizard.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Copied: trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ImportProjectWizardModel.java (from rev 35581, trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationWizardModel.java)
===================================================================
--- trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ImportProjectWizardModel.java (rev 0)
+++ trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ImportProjectWizardModel.java 2011-10-12 20:41:33 UTC (rev 35583)
@@ -0,0 +1,177 @@
+/*******************************************************************************
+ * Copyright (c) 2011 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.openshift.express.internal.ui.wizard;
+
+import java.io.File;
+import java.lang.reflect.InvocationTargetException;
+import java.net.URISyntaxException;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.WorkspaceJob;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.egit.core.RepositoryUtil;
+import org.eclipse.egit.core.op.CloneOperation;
+import org.eclipse.egit.core.op.ConnectProviderOperation;
+import org.eclipse.egit.ui.Activator;
+import org.eclipse.jgit.lib.Constants;
+import org.eclipse.jgit.transport.JschConfigSessionFactory;
+import org.eclipse.jgit.transport.URIish;
+import org.eclipse.osgi.util.NLS;
+import org.jboss.ide.eclipse.as.core.util.FileUtil;
+import org.jboss.tools.common.ui.databinding.ObservableUIPojo;
+import org.jboss.tools.openshift.express.client.IApplication;
+import org.jboss.tools.openshift.express.client.IUser;
+import org.jboss.tools.openshift.express.client.OpenshiftException;
+import org.jboss.tools.openshift.express.internal.ui.OpenshiftUIActivator;
+import org.jboss.tools.openshift.express.internal.ui.wizard.projectimport.GeneralProjectImportOperation;
+import org.jboss.tools.openshift.express.internal.ui.wizard.projectimport.MavenProjectImportOperation;
+
+/**
+ * @author André Dietisheim <adietish(a)redhat.com>
+ */
+public class ImportProjectWizardModel extends ObservableUIPojo {
+
+ private HashMap<String, Object> dataModel = new HashMap<String, Object>();
+
+ private static final String USER = "user";
+ private static final String APPLICATION = "application";
+
+ public void setProperty(String key, Object value) {
+ dataModel.put(key, value);
+ }
+
+ public Object getProperty(String key) {
+ return dataModel.get(key);
+ }
+
+ public void setUser(IUser user) {
+ dataModel.put(USER, user);
+ }
+
+ public IUser getUser() {
+ return (IUser) dataModel.get(USER);
+ }
+
+ public IApplication getApplication() {
+ return (IApplication) dataModel.get(APPLICATION);
+ }
+
+ public void setApplication(IApplication application) {
+ dataModel.put(APPLICATION, application);
+ }
+
+ public void importProject(final File projectFolder, IProgressMonitor monitor) throws OpenshiftException,
+ CoreException,
+ InterruptedException {
+ new WorkspaceJob(NLS.bind("Importing projects from {0}", projectFolder.getAbsolutePath())) {
+
+ @Override
+ public IStatus runInWorkspace(IProgressMonitor monitor) throws CoreException {
+ try {
+ MavenProjectImportOperation mavenImport = new MavenProjectImportOperation(projectFolder);
+ List<IProject> importedProjects = Collections.emptyList();
+ if (mavenImport.isMavenProject()) {
+ importedProjects = mavenImport.importToWorkspace(monitor);
+ } else {
+ importedProjects = new GeneralProjectImportOperation(projectFolder).importToWorkspace(monitor);
+ }
+
+ File gitFolder = new File(projectFolder, Constants.DOT_GIT);
+ connectToGitRepo(importedProjects, gitFolder, monitor);
+
+ createServerAdapterIfRequired();
+ return Status.OK_STATUS;
+ } catch (Exception e) {
+ IStatus status = new Status(IStatus.ERROR, OpenshiftUIActivator.PLUGIN_ID,
+ NLS.bind("Could not import projects from {0}", projectFolder.getAbsolutePath()), e);
+ OpenshiftUIActivator.log(status);
+ return status;
+ }
+ }
+ }.schedule();
+ }
+
+ private void connectToGitRepo(List<IProject> projects, File gitFolder, IProgressMonitor monitor)
+ throws CoreException {
+ for (IProject project : projects) {
+ connectToGitRepo(project, gitFolder, monitor);
+ }
+ }
+
+ private void connectToGitRepo(IProject project, File gitFolder, IProgressMonitor monitor) throws CoreException {
+ new ConnectProviderOperation(project).execute(monitor);
+ }
+
+ public File cloneRepository(IProgressMonitor monitor) throws URISyntaxException, OpenshiftException,
+ InvocationTargetException,
+ InterruptedException {
+ File destination = getDestinationDirectory(getApplication());
+ cloneRepository(getApplication().getGitUri(), destination, monitor);
+ return destination;
+ }
+
+ private void cloneRepository(String uri, File destination, IProgressMonitor monitor) throws URISyntaxException,
+ OpenshiftException,
+ InvocationTargetException,
+ InterruptedException {
+ if (destination.exists()) {
+ FileUtil.completeDelete(destination);
+ }
+ ensureEgitUIIsStarted();
+ URIish gitUri = new URIish(uri);
+ RepositoryUtil repositoryUtil = Activator.getDefault().getRepositoryUtil();
+ CloneOperation cloneOperation =
+ new CloneOperation(gitUri, true, null, destination, Constants.HEAD, "origin", 10 * 1024);
+ cloneOperation.run(null);
+ File gitDirectory = new File(destination, Constants.DOT_GIT);
+ repositoryUtil.addConfiguredRepository(gitDirectory);
+ }
+
+ /**
+ * The EGit UI plugin initializes the ssh factory to present the user a
+ * passphrase prompt if the ssh key was not read yet. If this initialization
+ * is not executed, the ssh connection to the git repo would just fail with
+ * an authentication error. We therefore have to make sure that the EGit UI
+ * plugin is started and initializes the JSchConfigSessionFactory.
+ * <p>
+ * EGit initializes the SshSessionFactory with the EclipseSshSessionFactory.
+ * The EclipseSshSessionFactory overrides JschConfigSessionFactory#configure
+ * to present a UserInfoPrompter if the key passphrase was not entered
+ * before.
+ *
+ * @see Activator#start(org.osgi.framework.BundleContext)
+ * @see Activator#setupSSH
+ * @see JschConfigSessionFactory#configure
+ * @see EclipseSshSessionFactory#configure
+ */
+ private void ensureEgitUIIsStarted() {
+ Activator.getDefault();
+ }
+
+ private File getDestinationDirectory(IApplication application) {
+ String applicationDirectory = application.getName();
+ // File workspace =
+ // ResourcesPlugin.getWorkspace().getRoot().getLocation().toFile();
+ String userHome = System.getProperty("java.io.tmpdir");
+ // File workDir = new File(workspace, applicationWorkingdir);
+ return new File(userHome, applicationDirectory);
+ }
+
+ private void createServerAdapterIfRequired() {
+ // TODO
+ }
+}
Property changes on: trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ImportProjectWizardModel.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewDomainDialog.java
===================================================================
--- trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewDomainDialog.java 2011-10-12 20:24:56 UTC (rev 35582)
+++ trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewDomainDialog.java 2011-10-12 20:41:33 UTC (rev 35583)
@@ -29,7 +29,7 @@
private String namespace;
private NewDomainWizardModel model;
- public NewDomainDialog(String namespace, ApplicationWizardModel wizardModel) {
+ public NewDomainDialog(String namespace, ImportProjectWizardModel wizardModel) {
this.namespace = namespace;
this.model = new NewDomainWizardModel(namespace, wizardModel.getUser());
setNeedsProgressMonitor(true);
13 years, 3 months
- 1
- 0