JBoss Tools SVN: r40437 - trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils.
by jbosstools-commits＠lists.jboss.org
Author: jjankovi
Date: 2012-04-24 04:33:33 -0400 (Tue, 24 Apr 2012)
New Revision: 40437
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/CDIProjectHelper.java
Log:
method for configuration default runtime and jdk for project
Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/CDIProjectHelper.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/CDIProjectHelper.java 2012-04-24 08:32:35 UTC (rev 40436)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/CDIProjectHelper.java 2012-04-24 08:33:33 UTC (rev 40437)
@@ -13,6 +13,8 @@
import org.eclipse.swtbot.swt.finder.exceptions.WidgetNotFoundException;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotMenu;
+import org.eclipse.swtbot.swt.finder.widgets.SWTBotShell;
+import org.eclipse.swtbot.swt.finder.widgets.SWTBotTable;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem;
import org.jboss.tools.cdi.bot.test.CDIConstants;
@@ -20,6 +22,7 @@
import org.jboss.tools.cdi.bot.test.uiutils.actions.NewFileWizardAction;
import org.jboss.tools.cdi.bot.test.uiutils.wizards.DynamicWebProjectWizard;
import org.jboss.tools.ui.bot.ext.condition.ProgressInformationShellIsActiveCondition;
+import org.jboss.tools.ui.bot.ext.condition.ShellIsActiveCondition;
import org.jboss.tools.ui.bot.ext.condition.TaskDuration;
import org.jboss.tools.ui.bot.ext.helper.ContextMenuHelper;
import org.jboss.tools.ui.bot.ext.types.IDELabel;
@@ -82,8 +85,89 @@
}
return projectExists;
}
-
+
/**
+ * Add defined runtime into project as targeted runtime
+ * @param project
+ */
+ public void addConfiguredRuntimeIntoProject(String project,
+ String configuredRuntime) {
+ projectExplorer.selectProject(project);
+ bot.menu(IDELabel.Menu.FILE).menu(
+ IDELabel.Menu.PROPERTIES).click();
+ bot.waitForShell(IDELabel.Shell.PROPERTIES_FOR + " " + project);
+ SWTBotShell propertiesShell = bot.shell(
+ IDELabel.Shell.PROPERTIES_FOR + " " + project);
+ propertiesShell.activate();
+ SWTBotTreeItem item = bot.tree().getTreeItem("Targeted Runtimes");
+ item.select();
+ SWTBotTable runtimes = bot.table();
+ for (int i = 0; i < runtimes.rowCount(); i++) {
+ runtimes.getTableItem(i).uncheck();
+ }
+ for (int i = 0; i < runtimes.rowCount(); i++) {
+ if (runtimes.getTableItem(i).getText().equals(configuredRuntime)) {
+ runtimes.getTableItem(i).check();
+ }
+ }
+ bot.button(IDELabel.Button.OK).click();
+ bot.waitWhile(new ShellIsActiveCondition(propertiesShell),
+ TaskDuration.LONG.getTimeout());
+
+ }
+
+ /**
+ * Set system default jdk in the project
+ * @param projectName
+ */
+ public void addDefaultJDKIntoProject(String projectName) {
+
+ projectExplorer.selectProject(projectName);
+ bot.menu(IDELabel.Menu.FILE).menu(
+ IDELabel.Menu.PROPERTIES).click();
+ bot.waitForShell(IDELabel.Shell.PROPERTIES_FOR + " " + projectName);
+ SWTBotShell propertiesShell = bot.shell(
+ IDELabel.Shell.PROPERTIES_FOR + " " + projectName);
+ propertiesShell.activate();
+ SWTBotTreeItem item = bot.tree().getTreeItem(
+ IDELabel.JavaBuildPathPropertiesEditor.
+ JAVA_BUILD_PATH_TREE_ITEM_LABEL);
+ item.select();
+ bot.tabItem(IDELabel.JavaBuildPathPropertiesEditor.
+ LIBRARIES_TAB_LABEL).activate();
+ SWTBotTree librariesTree = bot.treeWithLabel(
+ "JARs and class folders on the build path:");
+ /** remove jdk currently configured on project */
+ for (int i = 0; i < librariesTree.rowCount(); i++) {
+ SWTBotTreeItem libraryItem = librariesTree.
+ getAllItems()[i];
+ if (libraryItem.getText().contains("JRE") ||
+ libraryItem.getText().contains("jdk")) {
+ libraryItem.select();
+ break;
+ }
+ }
+ bot.button(IDELabel.Button.REMOVE).click();
+
+ /** add default jdk of system */
+ bot.button(IDELabel.Button.ADD_LIBRARY).click();
+ bot.waitForShell(IDELabel.Shell.ADD_LIBRARY);
+ SWTBotShell libraryShell = bot.shell(
+ IDELabel.Shell.ADD_LIBRARY);
+ libraryShell.activate();
+ bot.list().select("JRE System Library");
+ bot.button(IDELabel.Button.NEXT).click();
+ bot.radio(2).click();
+ bot.button(IDELabel.Button.FINISH).click();
+ bot.waitWhile(new ShellIsActiveCondition(libraryShell),
+ TaskDuration.LONG.getTimeout());
+ bot.button(IDELabel.Button.OK).click();
+ bot.waitWhile(new ShellIsActiveCondition(propertiesShell),
+ TaskDuration.LONG.getTimeout());
+
+ }
+
+ /**
* Method creates new Dynamic Web Project
* @param projectName
*/
13 years, 8 months
JBoss Tools SVN: r40436 - trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/types.
by jbosstools-commits＠lists.jboss.org
Author: jjankovi
Date: 2012-04-24 04:32:35 -0400 (Tue, 24 Apr 2012)
New Revision: 40436
Modified:
trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/types/IDELabel.java
Log:
Shell, button label added
Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/types/IDELabel.java
===================================================================
--- trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/types/IDELabel.java 2012-04-24 00:55:15 UTC (rev 40435)
+++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/types/IDELabel.java 2012-04-24 08:32:35 UTC (rev 40436)
@@ -134,6 +134,7 @@
public static final String VARIABLE = "Variable...";
public static final String CONFIGURE_VARIABLES = "Configure Variables...";
public static final String BROWSE = "Browse...";
+ public static final String ADD_LIBRARY = "Add Library...";
}
public class Shell {
@@ -204,6 +205,7 @@
public static final String ADD_RENDER_KIT = "Add Render Kit";
public static final String ADD_RENDER_KIT_JSF2 = "Render Kit...";
public static final String ADD_VALIDATOR = "Add Validator";
+ public static final String ADD_LIBRARY = "Add Library";
public static final String NEW_VIEW = "New View";
public static final String AUTO_LAYOUT = "Auto Layout";
public static final String ADD_PROPERTY = "Add Property";
13 years, 8 months
JBoss Tools SVN: r40435 - trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2012-04-23 20:55:15 -0400 (Mon, 23 Apr 2012)
New Revision: 40435
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/DeploymentProblemsValidationTests.java
Log:
JBIDE-11623
Test is modified.
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/DeploymentProblemsValidationTests.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/DeploymentProblemsValidationTests.java 2012-04-24 00:54:14 UTC (rev 40434)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/DeploymentProblemsValidationTests.java 2012-04-24 00:55:15 UTC (rev 40435)
@@ -64,20 +64,20 @@
IInjectionPointField p = getInjectionPointField(path, "s5");
Set<IBean> bs = cdiProject.getBeans(false, p);
- assertEquals(4, bs.size());
+ assertEquals(3, bs.size());
Set<String> keys = new HashSet<String>();
for(IBean b: bs) {
keys.add(b.getElementName());
}
- assertTrue(keys.contains("TestNamed.foo4"));
+ assertTrue(!keys.contains("TestNamed.foo4"));
assertTrue(keys.contains("TestNamed.foo4()"));
assertTrue(keys.contains("TestNamed.foo5()"));
assertTrue(keys.contains("TestNamed.foo6()"));
IInjectionPointParameter pp = getInjectionPointParameter(path, "doSmth");
Set<IBean> bs2 = cdiProject.getBeans(false, pp);
- assertEquals(4, bs2.size());
+ assertEquals(3, bs2.size());
bs2.removeAll(bs);
assertTrue(bs2.isEmpty());
}
@@ -97,7 +97,7 @@
public void testUnsatisfiedDependencyWithNamed() throws Exception {
IFile file = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/lookup/duplicateName/TestNamed.java");
- AbstractResourceMarkerTest.assertMarkerIsCreated(file, CDIValidationMessages.UNSATISFIED_INJECTION_POINTS, 22, 23);
+ AbstractResourceMarkerTest.assertMarkerIsCreated(file, CDIValidationMessages.UNSATISFIED_INJECTION_POINTS, 22, 23, 19, 20);
int[] lines = {10, 11, 13, 14, 16, 17};
for (int i: lines) {
AbstractResourceMarkerTest.assertMarkerIsNotCreated(file, CDIValidationMessages.UNSATISFIED_INJECTION_POINTS, i);
13 years, 8 months
JBoss Tools SVN: r40434 - trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2012-04-23 20:54:14 -0400 (Mon, 23 Apr 2012)
New Revision: 40434
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/AbstractBeanElement.java
Log:
JBIDE-11623
Do not add annotation @Named declared in a stereotype to the list of bean qualifiers.
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/AbstractBeanElement.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/AbstractBeanElement.java 2012-04-24 00:40:33 UTC (rev 40433)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/AbstractBeanElement.java 2012-04-24 00:54:14 UTC (rev 40434)
@@ -145,7 +145,7 @@
}
public Set<IStereotypeDeclaration> getStereotypeDeclarations() {
- return getStereotypeDeclarations(false);
+ return getStereotypeDeclarations(true);
}
public Set<IStereotypeDeclaration> getStereotypeDeclarations(boolean includeInherited) {
@@ -167,7 +167,7 @@
Set<IStereotypeDeclaration> ds = s.getStereotypeDeclarations();
for (IStereotypeDeclaration d1: ds) {
IStereotype s1 = d1.getStereotype();
- if(s1 != null && s1.getInheritedDeclaration() != null) {
+ if(s1 != null/* && s1.getInheritedDeclaration() != null*/) {
if(!result.contains(d1) && !delta2.contains(d1)) delta2.add(d1);
}
}
@@ -203,10 +203,8 @@
result.add(d);
}
}
- IAnnotationDeclaration d = findNamedAnnotation();
- if(d instanceof IQualifierDeclaration && !result.contains(d)) {
- result.add((IQualifierDeclaration)d);
- }
+// JBIDE-11623 @Named in stereotype is not used as a bean qualifier.
+// Do not add it to the qualifier list.
}
return result;
}
13 years, 8 months
JBoss Tools SVN: r40433 - trunk/documentation/guides/MigrationGuide/en-US.
by jbosstools-commits＠lists.jboss.org
Author: irooskov(a)redhat.com
Date: 2012-04-23 20:40:33 -0400 (Mon, 23 Apr 2012)
New Revision: 40433
Modified:
trunk/documentation/guides/MigrationGuide/en-US/Book_Info.xml
Log:
updated for brew
Modified: trunk/documentation/guides/MigrationGuide/en-US/Book_Info.xml
===================================================================
--- trunk/documentation/guides/MigrationGuide/en-US/Book_Info.xml 2012-04-24 00:32:16 UTC (rev 40432)
+++ trunk/documentation/guides/MigrationGuide/en-US/Book_Info.xml 2012-04-24 00:40:33 UTC (rev 40433)
@@ -7,7 +7,7 @@
<productname>JBoss Developer Studio</productname>
<productnumber>5.0</productnumber>
<edition>5.0.0</edition>
- <pubsnumber>1</pubsnumber>
+ <pubsnumber>2</pubsnumber>
<abstract>
<para>The JBoss Developer Studio Migration Guide explains how to migrate from the previous version of the JBoss Developer Studio to the latest version.</para>
</abstract>
13 years, 8 months
JBoss Tools SVN: r40432 - trunk/documentation/guides/MigrationGuide/en-US.
by jbosstools-commits＠lists.jboss.org
Author: irooskov(a)redhat.com
Date: 2012-04-23 20:32:16 -0400 (Mon, 23 Apr 2012)
New Revision: 40432
Modified:
trunk/documentation/guides/MigrationGuide/en-US/migration.xml
Log:
updated for TOOLSDOC-273
Modified: trunk/documentation/guides/MigrationGuide/en-US/migration.xml
===================================================================
--- trunk/documentation/guides/MigrationGuide/en-US/migration.xml 2012-04-23 23:27:40 UTC (rev 40431)
+++ trunk/documentation/guides/MigrationGuide/en-US/migration.xml 2012-04-24 00:32:16 UTC (rev 40432)
@@ -15,25 +15,18 @@
<section id="sect-eclipse-versions">
<title>JBoss Developer Studio Eclipse Versions</title>
<para>
- JBoss Developer Studio (JBDS) 4.0x is based on Eclipse 3.6, while JBDS 5.0 is based on Eclipse 3.7. This prevents a direct upgrade from JBDS 4.0x to 5.0.
+ JBoss Developer Studio (JBDS) 4.x is based on Eclipse 3.6, while JBDS 5.0 is based on Eclipse 3.7. This prevents a direct upgrade from JBDS 4.x to 5.0.
</para>
<para>
- Workspaces created with JBDS 4.0x can generally be opened in JBDS 5.0, however this is not guaranteed. Always backup your existing workspaces (see <xref linkend="sect-backup-workspace"/> for more information) before attempting to use them with JBDS 5.0.
+ Workspaces created with JBDS 4.x can generally be opened in JBDS 5.0, however this is not guaranteed. Always backup your existing workspaces (see <xref linkend="sect-backup-workspace"/> for more information) before attempting to use them with JBDS 5.0.
</para>
-
- <!-- <note>
- <title>Tip</title>
- <para>
- The JBDS executable has changed in JBDS 4.0 from <filename>eclipse</filename> to <filename>jbdevstudio</filename>.
- </para>
- </note> -->
</section>
<section id="sect-backup-workspace">
<title>Back Up Existing Workspaces</title>
<para>
- It is recommended that existing workspaces created with JBDS 4.0x are backed up before attempting use them with JBDS 5.0. This can be done by copying the workspace directory to a backup location, or compressing it as an archive.
+ It is recommended that existing workspaces created with JBDS 4.x are backed up before attempting use them with JBDS 5.0. This can be done by copying the workspace directory to a backup location, or compressing it as an archive.
</para>
<para>To find the location of your workspace directory select <menuchoice><guimenuitem>File</guimenuitem>
<guimenuitem>Switch Workspace</guimenuitem></menuchoice>. The resulting list will show you the location of previously used workspaces.
13 years, 8 months
JBoss Tools SVN: r40431 - trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/ca.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2012-04-23 19:27:40 -0400 (Mon, 23 Apr 2012)
New Revision: 40431
Modified:
trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/ca/AbstractELCompletionEngine.java
Log:
JBIDE-11510
https://issues.jboss.org/browse/JBIDE-11510
Case #{a[|]} is fixed.
Modified: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/ca/AbstractELCompletionEngine.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/ca/AbstractELCompletionEngine.java 2012-04-23 23:24:18 UTC (rev 40430)
+++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/ca/AbstractELCompletionEngine.java 2012-04-23 23:27:40 UTC (rev 40431)
@@ -29,12 +29,14 @@
import org.eclipse.swt.graphics.Image;
import org.jboss.tools.common.el.core.ELCorePlugin;
import org.jboss.tools.common.el.core.ELReference;
+import org.jboss.tools.common.el.core.model.ELArgument;
import org.jboss.tools.common.el.core.model.ELArgumentInvocation;
import org.jboss.tools.common.el.core.model.ELExpression;
import org.jboss.tools.common.el.core.model.ELInstance;
import org.jboss.tools.common.el.core.model.ELInvocationExpression;
import org.jboss.tools.common.el.core.model.ELMethodInvocation;
import org.jboss.tools.common.el.core.model.ELModel;
+import org.jboss.tools.common.el.core.model.ELObject;
import org.jboss.tools.common.el.core.model.ELObjectType;
import org.jboss.tools.common.el.core.model.ELPropertyInvocation;
import org.jboss.tools.common.el.core.model.ELUtil;
@@ -1023,7 +1025,12 @@
if(!proposalsToFilter.isEmpty()) {
resolution.addSegment(segment);
if(expr instanceof ELArgumentInvocation) {
- segment.setToken(((ELArgumentInvocation)expr).getArgument().getArgument().getFirstToken());
+ ELArgument a = ((ELArgumentInvocation)expr).getArgument();
+ if(a.getArgument() == null) {
+ segment.setToken(((ELObject)a).getFirstToken());
+ } else {
+ segment.setToken(a.getArgument().getFirstToken());
+ }
}
}
13 years, 8 months
JBoss Tools SVN: r40430 - trunk/maven/plugins/org.jboss.tools.maven.gwt.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2012-04-23 19:24:18 -0400 (Mon, 23 Apr 2012)
New Revision: 40430
Modified:
trunk/maven/plugins/org.jboss.tools.maven.gwt/build.properties
Log:
https://issues.jboss.org/browse/JBIDE-11610 Wrong provider and plugin name for org.jboss.tools.maven.gwt
added plugin.properties to binaries
fixed
Modified: trunk/maven/plugins/org.jboss.tools.maven.gwt/build.properties
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.gwt/build.properties 2012-04-23 23:22:55 UTC (rev 40429)
+++ trunk/maven/plugins/org.jboss.tools.maven.gwt/build.properties 2012-04-23 23:24:18 UTC (rev 40430)
@@ -3,4 +3,5 @@
bin.includes = META-INF/,\
.,\
plugin.xml,\
- lifecycle-mapping-metadata.xml
+ lifecycle-mapping-metadata.xml,\
+ plugin.properties
13 years, 8 months
JBoss Tools SVN: r40429 - trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/JSF2Beans/src/test/beans.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2012-04-23 19:22:55 -0400 (Mon, 23 Apr 2012)
New Revision: 40429
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/JSF2Beans/src/test/beans/inputname.xhtml
Log:
JBIDE-11510
https://issues.jboss.org/browse/JBIDE-11510
Test is added.
Modified: trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/JSF2Beans/src/test/beans/inputname.xhtml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/JSF2Beans/src/test/beans/inputname.xhtml 2012-04-23 23:22:34 UTC (rev 40428)
+++ trunk/jsf/tests/org.jboss.tools.jsf.base.test/projects/JSF2Beans/src/test/beans/inputname.xhtml 2012-04-23 23:22:55 UTC (rev 40429)
@@ -10,4 +10,5 @@
<h:outputText value="#{mybean1}"/>
<h:outputText value="#{testA.addB(testB.addA(testA.addB(testB.addA())))}"/>
<h:outputText value="#{mybean2['10']}"/>
+<h:outputText value="#{mybean2[]}"/>
</html>
\ No newline at end of file
13 years, 8 months
JBoss Tools SVN: r40428 - trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2012-04-23 19:22:34 -0400 (Mon, 23 Apr 2012)
New Revision: 40428
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/CAForJSF2BeansTest.java
Log:
JBIDE-11510
https://issues.jboss.org/browse/JBIDE-11510
Test is added.
Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/CAForJSF2BeansTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/CAForJSF2BeansTest.java 2012-04-23 22:56:23 UTC (rev 40427)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/CAForJSF2BeansTest.java 2012-04-23 23:22:34 UTC (rev 40428)
@@ -56,7 +56,10 @@
public void testCAForPropertiesInBrakets() {
String[] properties = {"mybean2['100", "mybean2['101"};
- String text = "#{mybean2['10']}";
- checkProposals(PAGE_NAME, text, 13, properties, false);
+ String text1 = "#{mybean2['10']}";
+ checkProposals(PAGE_NAME, text1, 13, properties, false);
+
+ String text2 = "#{mybean2[]}";
+ checkProposals(PAGE_NAME, text2, 10, properties, false);
}
}
13 years, 8 months