JBoss Tools SVN: r40943 - in trunk/openshift/docs/reference/en-US: images/Creating_an_OpenShift_Express_Application and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: irooskov(a)redhat.com
Date: 2012-05-11 02:30:46 -0400 (Fri, 11 May 2012)
New Revision: 40943
Removed:
trunk/openshift/docs/reference/en-US/images/Creating_an_OpenShift_Express_Application/application_creation_04.png
trunk/openshift/docs/reference/en-US/images/Creating_an_OpenShift_Express_Application/application_creation_05a.png
Modified:
trunk/openshift/docs/reference/en-US/Creating_an_OpenShift_Express_Application.xml
trunk/openshift/docs/reference/en-US/images/Creating_an_OpenShift_Express_Application/application_creation_03.png
trunk/openshift/docs/reference/en-US/images/Creating_an_OpenShift_Express_Application/application_creation_05.png
trunk/openshift/docs/reference/en-US/images/Creating_an_OpenShift_Express_Application/application_creation_06.png
trunk/openshift/docs/reference/en-US/images/Creating_an_OpenShift_Express_Application/application_creation_07.png
Log:
update to new openshift tooling info in progress
Modified: trunk/openshift/docs/reference/en-US/Creating_an_OpenShift_Express_Application.xml
===================================================================
--- trunk/openshift/docs/reference/en-US/Creating_an_OpenShift_Express_Application.xml 2012-05-11 00:56:21 UTC (rev 40942)
+++ trunk/openshift/docs/reference/en-US/Creating_an_OpenShift_Express_Application.xml 2012-05-11 06:30:46 UTC (rev 40943)
@@ -35,51 +35,35 @@
</mediaobject>
</figure>
<para>
- If you have already signed up for an OpenShift account then you can input your <guilabel>Username</guilabel> and <guilabel>Password</guilabel> here and click the <guibutton>Next</guibutton> button. If validation is successful you will see the <guilabel>Setup OpenShift Application<guilabel> screen.
+ If you have already signed up for an OpenShift account then you can input your <guilabel>Username</guilabel> and <guilabel>Password</guilabel> here and click the <guibutton>Next</guibutton> button. If validation is successful you will see the <guilabel>Setup OpenShift Application</guilabel> screen.
</para>
<para>
If you do not have an OpenShift account, you can create one through the link at the top of the wizard screen. This will open the OpenShift sign-up page within your workbench. Once you have created an account you will need to relaunch the <guilabel>OpenShift Application</guilabel> wizard and input your new username and password.
</para>
<figure id="application_creation_03">
- <title>Setting the domain name</title>
+ <title>Creating a domain</title>
<mediaobject>
<imageobject>
<imagedata fileref="images/Creating_an_OpenShift_Express_Application/application_creation_03.png" format="PNG" />
</imageobject>
<textobject>
<phrase>
- Creating a domain name or inserting one that already exists for your OpenShift account.
+ Creating a domain for your OpenShift account.
</phrase>
</textobject>
</mediaobject>
</figure>
<para>
- If you already have a domain name then you can type this into the <guilabel>Domain name</guilabel> field.
+ If you need to create a domain, type the name you wish to have into the <guilabel>Domain name</guilabel> field. You will also need to provide your public SSH key. Ensure that the paired private key is listed within the SSH2 Preferences. If you are unsure, click the <guilabel>SSH2 Preferences</guilabel> link. Click <guibutton>Finish</guibutton> to complete domain creation.
</para>
<para>
- If you need to create a domain, type the name you wish to have into the <guilabel>Domain name</guilabel> field and click the <guibutton>Create</guibutton> button. After clicking <guibutton>Create</guibutton>, you will need to provide your public SSH key. You will need to ensure that the paired private key is listed within the SSH2 Preferences. If you are unsure, click the <guilabel>SSH2 Preferences</guilabel> link in the window. Click <guibutton>Finish</guibutton> to complete domain creation.
+ If you already have a domain name then you will not see the <guilabel>Domain Creation</guilabel> screen.
</para>
- <figure id="application_creation_04">
- <title>Creating a domain name</title>
- <mediaobject>
- <imageobject>
- <imagedata fileref="images/Creating_an_OpenShift_Express_Application/application_creation_04.png" format="PNG" />
- </imageobject>
- <textobject>
- <phrase>
- Going through the process of creating a domain name.
- </phrase>
- </textobject>
- </mediaobject>
- </figure>
<note>
<para>
- If you ever wish to rename your domain, you can do so by changing the name as it appears in the <guilabel>Domain name</guilabel> field and then click <guibutton>Rename</guibutton>.
+ If you ever wish to rename your domain, this can be done through the <guilabel>OpenShift Explorer</guilabel>. <!--put xref here -->
</para>
</note>
- <para>
- Click the <guibutton>New</guibutton> button in the <guilabel>Available Applications</guilabel> section of the wizard to begin creating your first OpenShift application, for the specified domain.
- </para>
<figure id="application_creation_05">
<title>Creating a new OpenShift application</title>
<mediaobject>
@@ -94,105 +78,55 @@
</mediaobject>
</figure>
<para>
- You will need to specify a name for the application and the platform to deploy for, from the <guilabel>Cartdige</guilabel> drop-down list. Click the <guibutton>Next</guibutton> to embedd cartridges or click <guibutton>Finish</guibutton> to create the application.
+ Now ready to create your OpenShift application, you will need to specify a name, the platform type to deploy for, from the <guilabel>Type</guilabel> drop-down list, and the <guilabel>Gear profile</guilabel> to be used. <!--Further gear profile information to go here-->
</para>
<note>
<para>
No underscores or special characters are allowed in the application name.
</para>
</note>
- <figure id="application_creation_05a">
- <title>Embed Cartridges</title>
- <mediaobject>
- <imageobject>
- <imagedata fileref="images/Creating_an_OpenShift_Express_Application/application_creation_05a.png" format="PNG" />
- </imageobject>
- <textobject>
- <phrase>
- Choosing which cartridges to embed within the application.
- </phrase>
- </textobject>
- </mediaobject>
- </figure>
<para>
- If you clicked <guibutton>Next</guibutton>, you will now see the <guilabel>Embed Cartridges</guilabel> screen. From here you can choose to embed any numbe rof cartridges, or none. Once you have finished your selection click <guibutton>Finish</guibutton>.
+ You can also select to embed cartridges into your applicaiton. By embedding a cartridge, you allow your application the ability to use the asociated technology. For example, embedding the <guilabel>mysql</guilabel> cartridge will grant your application the capability to use a MySQL database.
</para>
- <note>
- <para>
- The <guilabel>Embed Cartridges</guilabel> screen can also be access by highlighting a project in the <guilabel>Available Applications</guilabel> section of the <guilabel>Application Selection</guilabel> screen and clicking on the <guibutton>Edit</guibutton> button. To embed your application with a cartridge is to grant the capability to your application. For example, embedding the <guilabel>mysql</guilabel> cartridge will grant your application the capability to use a MySQL database.
- </para>
- </note>
<figure id="application_creation_06">
- <title>Created application availability</title>
+ <title>Application setup</title>
<mediaobject>
<imageobject>
<imagedata fileref="images/Creating_an_OpenShift_Express_Application/application_creation_06.png" format="PNG" />
</imageobject>
<textobject>
<phrase>
- The created application is now available in the Available Applications section.
+ Configuring the project and server adaptor settings.
</phrase>
</textobject>
</mediaobject>
</figure>
<para>
- You can select an available application by clicking on it in the <guilabel>Available Applications</guilabel> section of the window. Having selected an application, you can now <guibutton>Delete</guibutton> or view the details of the application by clicking the <guibutton>Details</guibutton>; try that now.
+ Since you are creating a new project, leave the <guilabel>Create a new project</guilabel> checkbox ticked.
</para>
- <figure id="application_creation_07">
- <title>Application details</title>
- <mediaobject>
- <imageobject>
- <imagedata fileref="images/Creating_an_OpenShift_Express_Application/application_creation_07.png" format="PNG" />
- </imageobject>
- <textobject>
- <phrase>
- The details screen for the application.
- </phrase>
- </textobject>
- </mediaobject>
- </figure>
<para>
- The <guilabel>Application Details</guilabel> will provide you with all the information available concenring the application. To close this window and return to the previous window, click <guibutton>OK</guibutton>.
+ For easy interaction with the OpenShift server and your domain it is recommended that you leave the <guilabel>Create and setup a server for easy publishing</guilabel> checkbox ticked. Doing so will create an OpenShift server instance in the <guilabel>Servers</guilabel> view, upon completing the wizard.
</para>
- <figure id="application_creation_06b">
- <title>Application availability</title>
- <mediaobject>
- <imageobject>
- <imagedata fileref="images/Creating_an_OpenShift_Express_Application/application_creation_06.png" format="PNG" />
- </imageobject>
- <textobject>
- <phrase>
- Having returned to the previous screen, we can see that the application is still available.
- </phrase>
- </textobject>
- </mediaobject>
- </figure>
<para>
- Click the <guibutton>Next</guibutton> to proceed to the next screen.
+ Click the <guibutton>Next</guibutton> button to progress in the wizard.
</para>
- <figure id="application_creation_08">
- <title>Cloned Git Repository</title>
+ <figure id="application_creation_07">
+ <title>Cloning settings</title>
<mediaobject>
<imageobject>
- <imagedata fileref="images/Creating_an_OpenShift_Express_Application/application_creation_08.png" format="PNG" />
+ <imagedata fileref="images/Creating_an_OpenShift_Express_Application/application_creation_07.png" format="PNG" />
</imageobject>
<textobject>
<phrase>
- Cloning the project from the Git repository and creating the JBoss Server adapter.
+ Clone settings for the project from the Git repository.
</phrase>
</textobject>
</mediaobject>
</figure>
<para>
- The final screen of the <guilabel>OpenShift application wizard</guilabel> specifies <guilabel>Git clone</guilabel> settings and <guilabel>JBoss Server adapter</guilabel> options.
+ The final screen of the <guilabel>OpenShift application wizard</guilabel> specifies <guilabel>Cloning settings</guilabel>. Here you can set the properties for creating a local copy of your application. The <guilabel>Location</guilabel> and <guilabel>Remote name</guilabel> options will be set to automatically, however you are able to change these by deselecting the <property>default</property> option and specifying custom settings in the fields provided.
</para>
<para>
- In the <guilabel>Git clone</guilabel> section of the window sets the properties for creating a local copy of your application for you to work with. The location of your application in the Git repository of your domain is present in the <guilabel>Cloning From</guilabel> field. The <guilabel>Destination</guilabel> and <guilabel>Remote name</guilabel> options will be set to default automatically, however you are able to change these by deselecting the <property>default</property> option and specifying custom settings in the fields provided.
- </para>
- <para>
- The <guilabel>JBoss Server adapter</guilabel> section of the window will have the option to <property>Create a JBoss server adapter</property> selected automatically. Creating a JBoss server adapter will allow you to publish changes you make to your application, back to your OpenShift domain.
- </para>
- <para>
Click the <guibutton>Finish</guibutton> to begin the cloning of the Git repository.
</para>
<figure id="application_creation_09">
@@ -209,7 +143,7 @@
</mediaobject>
</figure>
<para>
- After the Git repository has been cloned, you will see a new <guilabel>Git Repositories</guilabel> tab appear near the bottom of your workbench. If you do not see the tab you can open it manually by navigating to <menuchoice><guimenuitem>Window</guimenuitem><guimenuitem>Show View</guimenuitem><guimenuitem>Other</guimenuitem><guimenuitem>Git</guimenuitem><guimenuitem>Git Repositories</guimenuitem></menuchoice>. With the <guilabel>Git Repositories</guilabel> option selected, click <guibutton>OK</guibutton>.
+ After the Git repository has been cloned, it will be available through the <guilabel>Git Repositories</guilabel> view. You can open it by navigating to <menuchoice><guimenuitem>Window</guimenuitem><guimenuitem>Show View</guimenuitem><guimenuitem>Other</guimenuitem><guimenuitem>Git</guimenuitem><guimenuitem>Git Repositories</guimenuitem></menuchoice>. With the <guilabel>Git Repositories</guilabel> option selected, click <guibutton>OK</guibutton>.
</para>
<figure id="application_creation_10">
<title>Project in Package Explorer</title>
Modified: trunk/openshift/docs/reference/en-US/images/Creating_an_OpenShift_Express_Application/application_creation_03.png
===================================================================
(Binary files differ)
Deleted: trunk/openshift/docs/reference/en-US/images/Creating_an_OpenShift_Express_Application/application_creation_04.png
===================================================================
(Binary files differ)
Modified: trunk/openshift/docs/reference/en-US/images/Creating_an_OpenShift_Express_Application/application_creation_05.png
===================================================================
(Binary files differ)
Deleted: trunk/openshift/docs/reference/en-US/images/Creating_an_OpenShift_Express_Application/application_creation_05a.png
===================================================================
(Binary files differ)
Modified: trunk/openshift/docs/reference/en-US/images/Creating_an_OpenShift_Express_Application/application_creation_06.png
===================================================================
(Binary files differ)
Modified: trunk/openshift/docs/reference/en-US/images/Creating_an_OpenShift_Express_Application/application_creation_07.png
===================================================================
(Binary files differ)
13 years, 11 months
JBoss Tools SVN: r40942 - trunk/seam/tests/org.jboss.tools.seam230.core.test/src/org/jboss/tools/seam/core/test/project/facet.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2012-05-10 20:56:21 -0400 (Thu, 10 May 2012)
New Revision: 40942
Modified:
trunk/seam/tests/org.jboss.tools.seam230.core.test/src/org/jboss/tools/seam/core/test/project/facet/Seam230FacetInstallDelegateTest.java
Log:
https://issues.jboss.org/browse/JBIDE-11490 tests for Seam 2.3
Modified: trunk/seam/tests/org.jboss.tools.seam230.core.test/src/org/jboss/tools/seam/core/test/project/facet/Seam230FacetInstallDelegateTest.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam230.core.test/src/org/jboss/tools/seam/core/test/project/facet/Seam230FacetInstallDelegateTest.java 2012-05-11 00:52:37 UTC (rev 40941)
+++ trunk/seam/tests/org.jboss.tools.seam230.core.test/src/org/jboss/tools/seam/core/test/project/facet/Seam230FacetInstallDelegateTest.java 2012-05-11 00:56:21 UTC (rev 40942)
@@ -76,7 +76,7 @@
@Override
protected boolean shouldCheckTestProject() {
- return true;
+ return false;
}
@Override
13 years, 11 months
JBoss Tools SVN: r40941 - in trunk/seam/tests: org.jboss.tools.seam230.core.test/src/org/jboss/tools/seam/core/test/project/facet and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2012-05-10 20:52:37 -0400 (Thu, 10 May 2012)
New Revision: 40941
Modified:
trunk/seam/tests/org.jboss.tools.seam.base.test/src/org/jboss/tools/seam/core/test/project/facet/AbstractSeam2FacetInstallDelegateTest.java
trunk/seam/tests/org.jboss.tools.seam230.core.test/src/org/jboss/tools/seam/core/test/project/facet/Seam230FacetInstallDelegateTest.java
Log:
https://issues.jboss.org/browse/JBIDE-11490 tests for Seam 2.3
Modified: trunk/seam/tests/org.jboss.tools.seam.base.test/src/org/jboss/tools/seam/core/test/project/facet/AbstractSeam2FacetInstallDelegateTest.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.base.test/src/org/jboss/tools/seam/core/test/project/facet/AbstractSeam2FacetInstallDelegateTest.java 2012-05-11 00:50:41 UTC (rev 40940)
+++ trunk/seam/tests/org.jboss.tools.seam.base.test/src/org/jboss/tools/seam/core/test/project/facet/AbstractSeam2FacetInstallDelegateTest.java 2012-05-11 00:52:37 UTC (rev 40941)
@@ -262,7 +262,7 @@
return true;
}
- protected boolean checkTestProject() {
+ protected boolean shouldCheckTestProject() {
return true;
}
@@ -295,7 +295,7 @@
SeamProjectsSet seamProjectsSet = new SeamProjectsSet(war);
assertTrue(seamProjectsSet.getWarProject().exists());
- assertTrue(!checkTestProject() || seamProjectsSet.getTestProject().exists());
+ assertTrue(!shouldCheckTestProject() || seamProjectsSet.getTestProject().exists());
assertTrue(seamProjectsSet.getEjbProject().exists());
assertTrue(seamProjectsSet.getEarProject().exists());
@@ -355,7 +355,7 @@
assertOnlyContainsTheseFiles(onlyInWar, warLibs);
- if(checkTestProject()) {
+ if(shouldCheckTestProject()) {
assertOnlyContainsTheseFiles(onlyInTest, testLibs);
}
}else{
@@ -369,7 +369,7 @@
assertContainsNoneOfTheseFiles(onlyInWar, warLibs);
- if(checkTestProject()) {
+ if(shouldCheckTestProject()) {
assertContainsNoneOfTheseFiles(onlyInTest, testLibs);
}
}
Modified: trunk/seam/tests/org.jboss.tools.seam230.core.test/src/org/jboss/tools/seam/core/test/project/facet/Seam230FacetInstallDelegateTest.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam230.core.test/src/org/jboss/tools/seam/core/test/project/facet/Seam230FacetInstallDelegateTest.java 2012-05-11 00:50:41 UTC (rev 40940)
+++ trunk/seam/tests/org.jboss.tools.seam230.core.test/src/org/jboss/tools/seam/core/test/project/facet/Seam230FacetInstallDelegateTest.java 2012-05-11 00:52:37 UTC (rev 40941)
@@ -75,6 +75,11 @@
}
@Override
+ protected boolean shouldCheckTestProject() {
+ return true;
+ }
+
+ @Override
protected IDataModel createSeamDataModel(String deployType) {
IDataModel dataModel = super.createSeamDataModel(deployType);
dataModel.setStringProperty(
13 years, 11 months
JBoss Tools SVN: r40940 - trunk/seam/tests/org.jboss.tools.seam.base.test/src/org/jboss/tools/seam/core/test/project/facet.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2012-05-10 20:50:41 -0400 (Thu, 10 May 2012)
New Revision: 40940
Modified:
trunk/seam/tests/org.jboss.tools.seam.base.test/src/org/jboss/tools/seam/core/test/project/facet/AbstractSeam2FacetInstallDelegateTest.java
Log:
https://issues.jboss.org/browse/JBIDE-11490 tests for Seam 2.3
Modified: trunk/seam/tests/org.jboss.tools.seam.base.test/src/org/jboss/tools/seam/core/test/project/facet/AbstractSeam2FacetInstallDelegateTest.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.base.test/src/org/jboss/tools/seam/core/test/project/facet/AbstractSeam2FacetInstallDelegateTest.java 2012-05-11 00:46:14 UTC (rev 40939)
+++ trunk/seam/tests/org.jboss.tools.seam.base.test/src/org/jboss/tools/seam/core/test/project/facet/AbstractSeam2FacetInstallDelegateTest.java 2012-05-11 00:50:41 UTC (rev 40940)
@@ -262,6 +262,10 @@
return true;
}
+ protected boolean checkTestProject() {
+ return true;
+ }
+
protected void checkEarLibrariesInSeamProject(int caseNumber, String earName) throws CoreException{
IDataModel earModel = createSeamDataModel("ear");
@@ -291,7 +295,7 @@
SeamProjectsSet seamProjectsSet = new SeamProjectsSet(war);
assertTrue(seamProjectsSet.getWarProject().exists());
- assertTrue(seamProjectsSet.getTestProject().exists());
+ assertTrue(!checkTestProject() || seamProjectsSet.getTestProject().exists());
assertTrue(seamProjectsSet.getEjbProject().exists());
assertTrue(seamProjectsSet.getEarProject().exists());
@@ -350,8 +354,10 @@
assertOnlyContainsTheseFiles(onlyInEar, earLibs);
assertOnlyContainsTheseFiles(onlyInWar, warLibs);
-
- assertOnlyContainsTheseFiles(onlyInTest, testLibs);
+
+ if(checkTestProject()) {
+ assertOnlyContainsTheseFiles(onlyInTest, testLibs);
+ }
}else{
assertContainsNoneOfTheseFiles(onlyInEjbSrc, ejbSrc);
@@ -362,8 +368,10 @@
assertContainsNoneOfTheseFiles(onlyInEar, earLibs);
assertContainsNoneOfTheseFiles(onlyInWar, warLibs);
-
- assertContainsNoneOfTheseFiles(onlyInTest, testLibs);
+
+ if(checkTestProject()) {
+ assertContainsNoneOfTheseFiles(onlyInTest, testLibs);
+ }
}
}
13 years, 11 months
JBoss Tools SVN: r40939 - in trunk/common/tests/org.jboss.tools.common.el.core.test: src/org/jboss/tools/common/el/core/test/resolver and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2012-05-10 20:46:14 -0400 (Thu, 10 May 2012)
New Revision: 40939
Added:
trunk/common/tests/org.jboss.tools.common.el.core.test/projects/JavaProject2/src/test/TestD.java
Modified:
trunk/common/tests/org.jboss.tools.common.el.core.test/src/org/jboss/tools/common/el/core/test/resolver/TypeInfoCollectorTest.java
Log:
JBIDE-11837
https://issues.jboss.org/browse/JBIDE-11837
Test is added.
Added: trunk/common/tests/org.jboss.tools.common.el.core.test/projects/JavaProject2/src/test/TestD.java
===================================================================
--- trunk/common/tests/org.jboss.tools.common.el.core.test/projects/JavaProject2/src/test/TestD.java (rev 0)
+++ trunk/common/tests/org.jboss.tools.common.el.core.test/projects/JavaProject2/src/test/TestD.java 2012-05-11 00:46:14 UTC (rev 40939)
@@ -0,0 +1,5 @@
+package test;
+
+public class TestD implements MissingInterface {
+
+}
\ No newline at end of file
Property changes on: trunk/common/tests/org.jboss.tools.common.el.core.test/projects/JavaProject2/src/test/TestD.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/common/tests/org.jboss.tools.common.el.core.test/src/org/jboss/tools/common/el/core/test/resolver/TypeInfoCollectorTest.java
===================================================================
--- trunk/common/tests/org.jboss.tools.common.el.core.test/src/org/jboss/tools/common/el/core/test/resolver/TypeInfoCollectorTest.java 2012-05-11 00:45:32 UTC (rev 40938)
+++ trunk/common/tests/org.jboss.tools.common.el.core.test/src/org/jboss/tools/common/el/core/test/resolver/TypeInfoCollectorTest.java 2012-05-11 00:46:14 UTC (rev 40939)
@@ -95,6 +95,16 @@
}
}
+ public void testMissingInterface() throws CoreException {
+ IJavaProject jp = JavaCore.create(project2);
+ String className = "test.TestD";
+ IType bean = jp.findType(className);
+ TypeInfoCollector.TypeInfo typeInfo = new TypeInfoCollector.TypeInfo(bean, null, false);
+ TypeInfoCollector collector = typeInfo.getTypeCollector(false, false);
+ //NullPointerException is expected in TypeInfoCollector.initSuperinterfaces()
+ assertNotNull(collector);
+ }
+
private MemberInfo getMethod(TypeInfoCollector collector, String name) {
collector.collectInfo();
List<MemberInfo> mts = collector.getMethods();
13 years, 11 months
JBoss Tools SVN: r40938 - trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2012-05-10 20:45:32 -0400 (Thu, 10 May 2012)
New Revision: 40938
Modified:
trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/TypeInfoCollector.java
Log:
JBIDE-11837
https://issues.jboss.org/browse/JBIDE-11837
Super interface is checked for existence.
Modified: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/TypeInfoCollector.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/TypeInfoCollector.java 2012-05-11 00:28:41 UTC (rev 40937)
+++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/TypeInfoCollector.java 2012-05-11 00:45:32 UTC (rev 40938)
@@ -994,8 +994,10 @@
break;
}
IType superType = type.getJavaProject().findType(fullySuperclassName);
- result.add(superType);
- initSuperinterfaces(superType, result);
+ if(superType != null) {
+ result.add(superType);
+ initSuperinterfaces(superType, result);
+ }
}
}
}
13 years, 11 months
JBoss Tools SVN: r40937 - trunk/seam/tests/org.jboss.tools.seam.base.test/src/org/jboss/tools/seam/core/test/project/facet.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2012-05-10 20:28:41 -0400 (Thu, 10 May 2012)
New Revision: 40937
Modified:
trunk/seam/tests/org.jboss.tools.seam.base.test/src/org/jboss/tools/seam/core/test/project/facet/AbstractSeam2FacetInstallDelegateTest.java
Log:
https://issues.jboss.org/browse/JBIDE-11490 tests for Seam 2.3
Modified: trunk/seam/tests/org.jboss.tools.seam.base.test/src/org/jboss/tools/seam/core/test/project/facet/AbstractSeam2FacetInstallDelegateTest.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.base.test/src/org/jboss/tools/seam/core/test/project/facet/AbstractSeam2FacetInstallDelegateTest.java 2012-05-11 00:20:29 UTC (rev 40936)
+++ trunk/seam/tests/org.jboss.tools.seam.base.test/src/org/jboss/tools/seam/core/test/project/facet/AbstractSeam2FacetInstallDelegateTest.java 2012-05-11 00:28:41 UTC (rev 40937)
@@ -521,7 +521,9 @@
public boolean visit(IResourceProxy proxy) throws CoreException {
if (dir.getName().equals(proxy.getName()))
return true;
- foundFiles.add(proxy.getName());
+ if(proxy.isAccessible()) {
+ foundFiles.add(proxy.getName());
+ }
return false;
}
13 years, 11 months
JBoss Tools SVN: r40936 - trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2012-05-10 20:20:29 -0400 (Thu, 10 May 2012)
New Revision: 40936
Modified:
trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/TypeInfoCollector.java
Log:
JBIDE-11838
https://issues.jboss.org/browse/JBIDE-11838
Getter return type is checked to decide if it defines a Java property.
Modified: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/TypeInfoCollector.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/TypeInfoCollector.java 2012-05-11 00:18:47 UTC (rev 40935)
+++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/TypeInfoCollector.java 2012-05-11 00:20:29 UTC (rev 40936)
@@ -586,7 +586,7 @@
private String[] fParameterTypeNames;
private String[] fParameterTypeQualifiedNames;
private String[] fParameterNames;
- private IJavaElement fJavaElement;
+ private IMethod fJavaElement;
public MethodInfo(IType sourceType, String declaringTypeQualifiedName, String name,
int modifiers, String[] parameterTypeQualifiedNames,
@@ -674,7 +674,9 @@
}
public boolean isGetter() {
- return getType() != null && BeanUtil.isGetter(getName(), getNumberOfParameters());
+ return getType() != null
+ && BeanUtil.isGetter(getName(), getNumberOfParameters())
+ && BeanUtil.checkPropertyReturnType(getType().getName(), getName());
}
public boolean isSetter() {
13 years, 11 months
JBoss Tools SVN: r40935 - trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/util.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2012-05-10 20:18:47 -0400 (Thu, 10 May 2012)
New Revision: 40935
Modified:
trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/util/BeanUtil.java
Log:
JBIDE-11838
https://issues.jboss.org/browse/JBIDE-11838
Public util method for for checking getter return type is added.
Modified: trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/util/BeanUtil.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/util/BeanUtil.java 2012-05-11 00:13:13 UTC (rev 40934)
+++ trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/util/BeanUtil.java 2012-05-11 00:18:47 UTC (rev 40935)
@@ -38,15 +38,12 @@
&& checkPropertyReturnType(method);
}
- private static boolean checkPropertyReturnType(IMethod method) {
- if(method == null) {
- return false;
- }
- String typeName = EclipseJavaUtil.getMemberTypeAsString(method);
+
+ public static boolean checkPropertyReturnType(String typeName, String methodName) {
if(typeName == null || typeName.equals("void")) { //$NON-NLS-1$
return false;
}
- if(method.getElementName().startsWith(BeanUtil.IS)) {
+ if(methodName.startsWith(BeanUtil.IS)) {
if(!"boolean".equals(typeName) && !"java.lang.Boolean".equals(typeName)) { //$NON-NLS-1$ //$NON-NLS-2$
return false;
}
@@ -54,6 +51,10 @@
return true;
}
+ private static boolean checkPropertyReturnType(IMethod method) {
+ return method != null && checkPropertyReturnType(EclipseJavaUtil.getMemberTypeAsString(method), method.getElementName());
+ }
+
public static boolean isSetter(IMethod method) {
return method != null && isSetter(method.getElementName(), method.getNumberOfParameters());
}
13 years, 11 months
JBoss Tools SVN: r40934 - trunk/seam/tests/org.jboss.tools.seam230.core.test/src/org/jboss/tools/seam/core/test/project/facet.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2012-05-10 20:13:13 -0400 (Thu, 10 May 2012)
New Revision: 40934
Modified:
trunk/seam/tests/org.jboss.tools.seam230.core.test/src/org/jboss/tools/seam/core/test/project/facet/Seam20XFacetTestSuite230.java
trunk/seam/tests/org.jboss.tools.seam230.core.test/src/org/jboss/tools/seam/core/test/project/facet/Seam230FacetInstallDelegateTest.java
Log:
https://issues.jboss.org/browse/JBIDE-11490 tests for Seam 2.3
Modified: trunk/seam/tests/org.jboss.tools.seam230.core.test/src/org/jboss/tools/seam/core/test/project/facet/Seam20XFacetTestSuite230.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam230.core.test/src/org/jboss/tools/seam/core/test/project/facet/Seam20XFacetTestSuite230.java 2012-05-11 00:08:22 UTC (rev 40933)
+++ trunk/seam/tests/org.jboss.tools.seam230.core.test/src/org/jboss/tools/seam/core/test/project/facet/Seam20XFacetTestSuite230.java 2012-05-11 00:13:13 UTC (rev 40934)
@@ -30,7 +30,7 @@
public static class Seam23FacetInstallDelegateTestSetup extends TestSetup {
- AbstractSeam2FacetInstallDelegateTest delegate = new Seam230FacetInstallDelegateTest("Delegate");
+ Seam230FacetInstallDelegateTest delegate = new Seam230FacetInstallDelegateTest("Delegate");
@Override
protected void setUp() throws Exception {
delegate.setUp();
Modified: trunk/seam/tests/org.jboss.tools.seam230.core.test/src/org/jboss/tools/seam/core/test/project/facet/Seam230FacetInstallDelegateTest.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam230.core.test/src/org/jboss/tools/seam/core/test/project/facet/Seam230FacetInstallDelegateTest.java 2012-05-11 00:08:22 UTC (rev 40933)
+++ trunk/seam/tests/org.jboss.tools.seam230.core.test/src/org/jboss/tools/seam/core/test/project/facet/Seam230FacetInstallDelegateTest.java 2012-05-11 00:13:13 UTC (rev 40934)
@@ -70,6 +70,11 @@
}
@Override
+ protected void tearDown() throws Exception {
+ super.tearDown();
+ }
+
+ @Override
protected IDataModel createSeamDataModel(String deployType) {
IDataModel dataModel = super.createSeamDataModel(deployType);
dataModel.setStringProperty(
13 years, 11 months