JBoss Tools SVN: r42309 - branches/jbosstools-3.3.x/maven/features/org.jboss.tools.maven.jdt.feature.
by jbosstools-commits@lists.jboss.org
Author: nickboldt
Date: 2012-06-29 11:43:59 -0400 (Fri, 29 Jun 2012)
New Revision: 42309
Modified:
branches/jbosstools-3.3.x/maven/features/org.jboss.tools.maven.jdt.feature/feature.properties
Log:
typo - should be 'Configurator' to be consistent w/ all the others
Modified: branches/jbosstools-3.3.x/maven/features/org.jboss.tools.maven.jdt.feature/feature.properties
===================================================================
--- branches/jbosstools-3.3.x/maven/features/org.jboss.tools.maven.jdt.feature/feature.properties 2012-06-29 15:43:47 UTC (rev 42308)
+++ branches/jbosstools-3.3.x/maven/features/org.jboss.tools.maven.jdt.feature/feature.properties 2012-06-29 15:43:59 UTC (rev 42309)
@@ -15,7 +15,7 @@
# This file should be translated.
# "featureName" property - name of the feature
-featureName=JBoss Maven Endorsed Libraries configurator
+featureName=JBoss Maven Endorsed Libraries Configurator
# "providerName" property - name of the company that provides the feature
providerName=JBoss by Red Hat
13 years, 3 months
JBoss Tools SVN: r42308 - branches/jbosstools-3.3.x/build/aggregate/site.
by jbosstools-commits@lists.jboss.org
Author: nickboldt
Date: 2012-06-29 11:43:47 -0400 (Fri, 29 Jun 2012)
New Revision: 42308
Modified:
branches/jbosstools-3.3.x/build/aggregate/site/site.xml
Log:
tweak site name slightly - add 'Indigo'
Modified: branches/jbosstools-3.3.x/build/aggregate/site/site.xml
===================================================================
--- branches/jbosstools-3.3.x/build/aggregate/site/site.xml 2012-06-29 15:17:48 UTC (rev 42307)
+++ branches/jbosstools-3.3.x/build/aggregate/site/site.xml 2012-06-29 15:43:47 UTC (rev 42308)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<site>
- <description>JBoss Tools 3.3 Updates - Core</description>
+ <description>JBoss Tools 3.3 (Indigo) Updates - Core</description>
<!-- PLEASE NOTE!
When updating this file, please be sure that it parses as valid XML before committing it.
13 years, 3 months
JBoss Tools SVN: r42307 - trunk/build/aggregate.
by jbosstools-commits@lists.jboss.org
Author: nickboldt
Date: 2012-06-29 11:17:48 -0400 (Fri, 29 Jun 2012)
New Revision: 42307
Modified:
trunk/build/aggregate/index-template.html
Log:
JBIDE-12272
Modified: trunk/build/aggregate/index-template.html
===================================================================
--- trunk/build/aggregate/index-template.html 2012-06-29 15:04:44 UTC (rev 42306)
+++ trunk/build/aggregate/index-template.html 2012-06-29 15:17:48 UTC (rev 42307)
@@ -34,7 +34,7 @@
<blockquote style="border: 1px dashed #1778be; padding: 2px">
<ol>
<li>To <a class="link"
- href="http://www.jboss.org/tools/download/installation/update_3_3">install</a>
+ href="http://www.jboss.org/tools/download/installation/update_3_4">install</a>
from this site, start up Eclipse 4.2 (Juno), then do:
<ul>
<code><strong>Help > Install New Software... ></strong></code>
13 years, 3 months
JBoss Tools SVN: r42306 - trunk/build/aggregate.
by jbosstools-commits@lists.jboss.org
Author: nickboldt
Date: 2012-06-29 11:04:44 -0400 (Fri, 29 Jun 2012)
New Revision: 42306
Modified:
trunk/build/aggregate/index-template.html
Log:
JBIDE-12272
Modified: trunk/build/aggregate/index-template.html
===================================================================
--- trunk/build/aggregate/index-template.html 2012-06-29 14:43:28 UTC (rev 42305)
+++ trunk/build/aggregate/index-template.html 2012-06-29 15:04:44 UTC (rev 42306)
@@ -35,7 +35,7 @@
<ol>
<li>To <a class="link"
href="http://www.jboss.org/tools/download/installation/update_3_3">install</a>
- from this site, start up Eclipse 3.7, then do:
+ from this site, start up Eclipse 4.2 (Juno), then do:
<ul>
<code><strong>Help > Install New Software... ></strong></code>
</ul>
13 years, 3 months
JBoss Tools SVN: r42305 - trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui.
by jbosstools-commits@lists.jboss.org
Author: yradtsevich
Date: 2012-06-29 10:43:28 -0400 (Fri, 29 Jun 2012)
New Revision: 42305
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/BrowserSim.java
Log:
https://issues.jboss.org/browse/JBIDE-12191 : BrowserSim: automatically hide/customize scrollbars
Modified: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/BrowserSim.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/BrowserSim.java 2012-06-29 13:07:32 UTC (rev 42304)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/BrowserSim.java 2012-06-29 14:43:28 UTC (rev 42305)
@@ -243,57 +243,60 @@
}
});
- browser.addLocationListener(new LocationAdapter() {
- @Override
- public void changed(LocationEvent event) {
- Browser browser = (Browser) event.widget;
- setCustomScrollbarStyles(browser);
- }
-
- @SuppressWarnings("nls")
- private void setCustomScrollbarStyles(Browser browser) {
- browser.execute(
- "if (window._browserSim_customScrollBarStylesSetter === undefined) {"
- +"window._browserSim_customScrollBarStylesSetter = function () {"
- + "document.removeEventListener('DOMSubtreeModified', window._browserSim_customScrollBarStylesSetter, false);"
- + "var head = document.head;"
- + "var style = document.createElement('style');"
- + "style.type = 'text/css';"
- + "style.id='browserSimStyles';"
- + "head.appendChild(style);"
- + "style.innerText='"
- // The following two rules fix a problem with showing scrollbars in Google Mail and similar,
- // but autohiding of navigation bar stops to work with it. That is why they are commented.
- //+ "html {"
- //+ "overflow: hidden;"
- //+ "}"
- //+ "body {"
- //+ "position: absolute;"
- //+ "top: 0px;"
- //+ "left: 0px;"
- //+ "bottom: 0px;"
- //+ "right: 0px;"
- //+ "margin: 0px;"
- //+ "overflow-y: auto;"
- //+ "overflow-x: auto;"
- //+ "}"
- + "::-webkit-scrollbar {"
- + "width: 5px;"
- + "height: 5px;"
- + "}"
- + "::-webkit-scrollbar-thumb {"
- + "background: rgba(0,0,0,0.4); "
- + "}"
- + "::-webkit-scrollbar-corner, ::-webkit-scrollbar-thumb:window-inactive {"
- + "background: rgba(0,0,0,0.0);"
- + "};"
- + "';"
- +"};"
- + "document.addEventListener('DOMSubtreeModified', window._browserSim_customScrollBarStylesSetter, false);"
- + "}"
- );
- }
- });
+ //JBIDE-12191 - custom scrollbars work satisfactorily on windows only
+ if (PlatformUtil.OS_WIN32.equals(PlatformUtil.getOs())) {
+ browser.addLocationListener(new LocationAdapter() {
+ @Override
+ public void changed(LocationEvent event) {
+ Browser browser = (Browser) event.widget;
+ setCustomScrollbarStyles(browser);
+ }
+
+ @SuppressWarnings("nls")
+ private void setCustomScrollbarStyles(Browser browser) {
+ browser.execute(
+ "if (window._browserSim_customScrollBarStylesSetter === undefined) {"
+ +"window._browserSim_customScrollBarStylesSetter = function () {"
+ + "document.removeEventListener('DOMSubtreeModified', window._browserSim_customScrollBarStylesSetter, false);"
+ + "var head = document.head;"
+ + "var style = document.createElement('style');"
+ + "style.type = 'text/css';"
+ + "style.id='browserSimStyles';"
+ + "head.appendChild(style);"
+ + "style.innerText='"
+ // The following two rules fix a problem with showing scrollbars in Google Mail and similar,
+ // but autohiding of navigation bar stops to work with it. That is why they are commented.
+ //+ "html {"
+ //+ "overflow: hidden;"
+ //+ "}"
+ //+ "body {"
+ //+ "position: absolute;"
+ //+ "top: 0px;"
+ //+ "left: 0px;"
+ //+ "bottom: 0px;"
+ //+ "right: 0px;"
+ //+ "margin: 0px;"
+ //+ "overflow-y: auto;"
+ //+ "overflow-x: auto;"
+ //+ "}"
+ + "::-webkit-scrollbar {"
+ + "width: 5px;"
+ + "height: 5px;"
+ + "}"
+ + "::-webkit-scrollbar-thumb {"
+ + "background: rgba(0,0,0,0.4); "
+ + "}"
+ + "::-webkit-scrollbar-corner, ::-webkit-scrollbar-thumb:window-inactive {"
+ + "background: rgba(0,0,0,0.0);"
+ + "};"
+ + "';"
+ +"};"
+ + "document.addEventListener('DOMSubtreeModified', window._browserSim_customScrollBarStylesSetter, false);"
+ + "}"
+ );
+ }
+ });
+ };
browser.addLocationListener(new LocationListener() {
private BrowserFunction scrollListener = null;
13 years, 3 months
JBoss Tools SVN: r42304 - trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test.
by jbosstools-commits@lists.jboss.org
Author: apodhrad
Date: 2012-06-29 09:07:32 -0400 (Fri, 29 Jun 2012)
New Revision: 42304
Modified:
trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/BPELTest.java
trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/WizardTest.java
Log:
Bpel bot tests: correction of deploying bpel project
Modified: trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/BPELTest.java
===================================================================
--- trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/BPELTest.java 2012-06-29 11:50:28 UTC (rev 42303)
+++ trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/BPELTest.java 2012-06-29 13:07:32 UTC (rev 42304)
@@ -50,9 +50,15 @@
SWTBotTree tree = bot.viewByTitle("Servers").bot().tree();
bot.sleep(TIME_5S);
- SWTBotTreeItem server = tree.getAllItems()[0];
+ SWTBotTreeItem server = null;
+ SWTBotTreeItem[] servers = tree.getAllItems();
+ for (int i = 0; i < servers.length; i++) {
+ if(servers[i].getText().contains(serverName)) {
+ server = servers[i];
+ }
+ }
- assertContains(serverName, server.getText());
+ assertNotNull("Server " + serverName + " not found", server);
// assertEquals("", serverName + " [Started, Synchronized]", server.getText());
ContextMenuHelper.prepareTreeItemForContextMenu(tree, server);
Modified: trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/WizardTest.java
===================================================================
--- trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/WizardTest.java 2012-06-29 11:50:28 UTC (rev 42303)
+++ trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/WizardTest.java 2012-06-29 13:07:32 UTC (rev 42304)
@@ -3,15 +3,19 @@
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IProject;
import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotView;
+import org.eclipse.swtbot.swt.finder.SWTBot;
import org.eclipse.swtbot.swt.finder.utils.TableCollection;
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.SWTBotTableItem;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem;
import org.jboss.tools.ui.bot.ext.config.Annotations.Require;
import org.jboss.tools.ui.bot.ext.config.Annotations.Server;
import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState;
import org.jboss.tools.ui.bot.ext.config.Annotations.ServerType;
+import org.jboss.tools.ui.bot.ext.gen.ActionItem;
import org.jboss.tools.ui.bot.ext.helper.ContextMenuHelper;
import org.jboss.tools.ui.bot.ext.types.IDELabel;
import org.junit.Assert;
@@ -21,90 +25,90 @@
public class WizardTest extends BPELTest {
- @Test
- public void createNewSyncProcess() throws Exception {
- IProject project = createNewProject("SyncProcessProject");
- IFile process = createNewProcess("SyncProcessProject", "SyncProcess", BPELConstants.SYNC_PROCESS_LABEL, false);
-
- process.getFileExtension();
- String processContent = loadFile(process);
-
- Assert.assertTrue(processContent != null);
- Assert.assertTrue(processContent.contains("http://docs.oasis-open.org/wsbpel/2.0/process/executable"));
- Assert.assertTrue(processContent.contains("<bpel:import location=\"SyncProcessArtifacts.wsdl\""));
- Assert.assertTrue(processContent.contains("<bpel:receive name=\"receiveInput\""));
- Assert.assertTrue(processContent.contains("<bpel:reply name=\"replyOutput\""));
- Assert.assertTrue(isRuntimeSet("SyncProcessProject"));
- }
-
- @Test
- public void createNewAsyncProcess() throws Exception {
- IProject project = createNewProject("AsyncProcessProject");
- IFile process = createNewProcess("AsyncProcessProject", "AsyncProcess", BPELConstants.ASYNC_PROCESS_LABEL, false);
-
- process.getFileExtension();
- String processContent = loadFile(process);
-
- Assert.assertTrue(processContent != null);
- Assert.assertTrue(processContent.contains("http://docs.oasis-open.org/wsbpel/2.0/process/executable"));
- Assert.assertTrue(processContent.contains("<bpel:import location=\"AsyncProcessArtifacts.wsdl\""));
- Assert.assertTrue(processContent.contains("<bpel:receive name=\"receiveInput\""));
- Assert.assertTrue(processContent.contains("<bpel:invoke name=\"callbackClient\""));
- Assert.assertTrue(isRuntimeSet("AsyncProcessProject"));
- }
-
- @Test
- public void createNewEmptyProcess() throws Exception {
- IProject project = createNewProject("EmptyProcessProject");
- IFile process = createNewProcess("EmptyProcessProject", "EmptyProcess", BPELConstants.EMPTY_PROCESS_LABEL, false);
-
- process.getFileExtension();
- String processContent = loadFile(process);
-
- Assert.assertTrue(processContent != null);
- Assert.assertTrue(processContent.contains("http://docs.oasis-open.org/wsbpel/2.0/process/executable"));
- Assert.assertTrue(processContent.contains("<bpel:import location=\"EmptyProcessArtifacts.wsdl\""));
- Assert.assertTrue(processContent.contains("<bpel:sequence name=\"main\">"));
- Assert.assertTrue(processContent.contains("<bpel:empty name=\"Empty\"></bpel:empty>"));
-
- Assert.assertFalse(processContent.contains("<bpel:receive name=\"receiveInput\""));
-
- Assert.assertTrue(isRuntimeSet("EmptyProcessProject"));
- }
-
- @Test
- public void createNewAbstractSyncProcess() throws Exception {
- IProject project = createNewProject("AbstractProcessProject");
- IFile process = createNewProcess("AbstractProcessProject", "AbstractProcess", BPELConstants.SYNC_PROCESS_LABEL, true);
-
- process.getFileExtension();
- String processContent = loadFile(process);
-
- Assert.assertTrue(processContent != null);
- Assert.assertTrue(processContent.contains("http://docs.oasis-open.org/wsbpel/2.0/process/abstract"));
- Assert.assertTrue(processContent.contains("<bpel:import location=\"AbstractProcessArtifacts.wsdl\""));
- Assert.assertTrue(processContent.contains("<bpel:receive name=\"receiveInput\""));
- Assert.assertTrue(processContent.contains("<bpel:reply name=\"replyOutput\""));
- Assert.assertTrue(isRuntimeSet("AbstractProcessProject"));
- }
-
-
+// @Test
+// public void createNewSyncProcess() throws Exception {
+// IProject project = createNewProject("SyncProcessProject");
+// IFile process = createNewProcess("SyncProcessProject", "SyncProcess", BPELConstants.SYNC_PROCESS_LABEL, false);
+//
+// process.getFileExtension();
+// String processContent = loadFile(process);
+//
+// Assert.assertTrue(processContent != null);
+// Assert.assertTrue(processContent.contains("http://docs.oasis-open.org/wsbpel/2.0/process/executable"));
+// Assert.assertTrue(processContent.contains("<bpel:import location=\"SyncProcessArtifacts.wsdl\""));
+// Assert.assertTrue(processContent.contains("<bpel:receive name=\"receiveInput\""));
+// Assert.assertTrue(processContent.contains("<bpel:reply name=\"replyOutput\""));
+// Assert.assertTrue(isRuntimeSet("SyncProcessProject"));
+// }
+//
+// @Test
+// public void createNewAsyncProcess() throws Exception {
+// IProject project = createNewProject("AsyncProcessProject");
+// IFile process = createNewProcess("AsyncProcessProject", "AsyncProcess", BPELConstants.ASYNC_PROCESS_LABEL, false);
+//
+// process.getFileExtension();
+// String processContent = loadFile(process);
+//
+// Assert.assertTrue(processContent != null);
+// Assert.assertTrue(processContent.contains("http://docs.oasis-open.org/wsbpel/2.0/process/executable"));
+// Assert.assertTrue(processContent.contains("<bpel:import location=\"AsyncProcessArtifacts.wsdl\""));
+// Assert.assertTrue(processContent.contains("<bpel:receive name=\"receiveInput\""));
+// Assert.assertTrue(processContent.contains("<bpel:invoke name=\"callbackClient\""));
+// Assert.assertTrue(isRuntimeSet("AsyncProcessProject"));
+// }
+//
+// @Test
+// public void createNewEmptyProcess() throws Exception {
+// IProject project = createNewProject("EmptyProcessProject");
+// IFile process = createNewProcess("EmptyProcessProject", "EmptyProcess", BPELConstants.EMPTY_PROCESS_LABEL, false);
+//
+// process.getFileExtension();
+// String processContent = loadFile(process);
+//
+// Assert.assertTrue(processContent != null);
+// Assert.assertTrue(processContent.contains("http://docs.oasis-open.org/wsbpel/2.0/process/executable"));
+// Assert.assertTrue(processContent.contains("<bpel:import location=\"EmptyProcessArtifacts.wsdl\""));
+// Assert.assertTrue(processContent.contains("<bpel:sequence name=\"main\">"));
+// Assert.assertTrue(processContent.contains("<bpel:empty name=\"Empty\"></bpel:empty>"));
+//
+// Assert.assertFalse(processContent.contains("<bpel:receive name=\"receiveInput\""));
+//
+// Assert.assertTrue(isRuntimeSet("EmptyProcessProject"));
+// }
+//
+// @Test
+// public void createNewAbstractSyncProcess() throws Exception {
+// IProject project = createNewProject("AbstractProcessProject");
+// IFile process = createNewProcess("AbstractProcessProject", "AbstractProcess", BPELConstants.SYNC_PROCESS_LABEL, true);
+//
+// process.getFileExtension();
+// String processContent = loadFile(process);
+//
+// Assert.assertTrue(processContent != null);
+// Assert.assertTrue(processContent.contains("http://docs.oasis-open.org/wsbpel/2.0/process/abstract"));
+// Assert.assertTrue(processContent.contains("<bpel:import location=\"AbstractProcessArtifacts.wsdl\""));
+// Assert.assertTrue(processContent.contains("<bpel:receive name=\"receiveInput\""));
+// Assert.assertTrue(processContent.contains("<bpel:reply name=\"replyOutput\""));
+// Assert.assertTrue(isRuntimeSet("AbstractProcessProject"));
+// }
+//
+//
+// /**
+// * @author psrna
+// * @throws Exception
+// */
+// @Test
+// public void createNewDeployDescriptor() throws Exception {
+//
+// IProject project = createNewProject("ODEProject");
+// IFile deploy = createNewDeployDescriptor("ODEProject");
+//
+// String deployContent = loadFile(deploy);
+// Assert.assertTrue(deployContent != null);
+//
+// }
+//
/**
- * @author psrna
- * @throws Exception
- */
- @Test
- public void createNewDeployDescriptor() throws Exception {
-
- IProject project = createNewProject("ODEProject");
- IFile deploy = createNewDeployDescriptor("ODEProject");
-
- String deployContent = loadFile(deploy);
- Assert.assertTrue(deployContent != null);
-
- }
-
- /**
* @author apodhrad
*
* Test for JBIDE-11536
@@ -152,7 +156,7 @@
serversView.show();
serversView.setFocus();
- // check if the new server is avialable
+ // check if the new server is available
tree = serversView.bot().tree();
SWTBotTreeItem[] servers = tree.getAllItems();
SWTBotTreeItem server = null;
@@ -163,12 +167,21 @@
}
}
assertNotNull("The new server runtime not found", server);
+ log.info("New server runtime was created: " + serverName);
// delete the server
- ContextMenuHelper.prepareTreeItemForContextMenu(tree, server);
- new SWTBotMenu(ContextMenuHelper.getContextMenu(tree, IDELabel.Menu.DELETE, false)).click();
- SWTBotShell shell = bot.waitForShell("Delete Server");
- shell.bot().button("OK").click();
+ SWTBot wiz = open.preferenceOpen(ActionItem.Preference.ServerRuntimeEnvironments.LABEL);
+ SWTBotTable tbRuntimeEnvironments = wiz.table();
+ SWTBotTableItem serverRuntime = tbRuntimeEnvironments.getTableItem(serverName);
+ serverRuntime.select();
+ wiz.button("Remove").click();
+ wiz.button("OK").click();
+
+
+// ContextMenuHelper.prepareTreeItemForContextMenu(tree, server);
+// new SWTBotMenu(ContextMenuHelper.getContextMenu(tree, IDELabel.Menu.DELETE, false)).click();
+// SWTBotShell shell = bot.waitForShell("Delete Server");
+// shell.bot().button("OK").click();
server = null;
for (int i = 0; i < servers.length; i++) {
if(servers[i].getText().contains(serverName)) {
@@ -177,6 +190,7 @@
}
}
assertNull("The server wasn't deleted", server);
+ log.info("The server runtime was deleted: " + serverName);
}
boolean isRuntimeSet(String projectName) throws Exception {
13 years, 3 months
JBoss Tools SVN: r42303 - in trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test: el and 1 other directories.
by jbosstools-commits@lists.jboss.org
Author: dmaliarevich
Date: 2012-06-29 07:50:28 -0400 (Fri, 29 Jun 2012)
New Revision: 42303
Added:
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/el/
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/el/ElForBundleValueTest_Jbide10531.java
Modified:
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAllBotTests.java
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/tools/SWTBotWebBrowser.java
Log:
https://issues.jboss.org/browse/JBIDE-10531 - SWTBotTest was added.
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAllBotTests.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAllBotTests.java 2012-06-29 11:37:32 UTC (rev 42302)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAllBotTests.java 2012-06-29 11:50:28 UTC (rev 42303)
@@ -92,6 +92,7 @@
import org.jboss.tools.vpe.ui.bot.test.editor.tags.ToolbarAndToolbarGroupTagTest;
import org.jboss.tools.vpe.ui.bot.test.editor.tags.TreeTagTest;
import org.jboss.tools.vpe.ui.bot.test.editor.tags.VirtualEarthTagTest;
+import org.jboss.tools.vpe.ui.bot.test.el.ElForBundleValueTest_Jbide10531;
import org.jboss.tools.vpe.ui.bot.test.jbide.JBIDE4556Test;
import org.jboss.tools.vpe.ui.bot.test.jbide.JBIDE9445Test_DuplicateSourceMenu;
import org.jboss.tools.vpe.ui.bot.test.jbide.Jbide10020_TestHotKeyForVpeRefresh;
@@ -220,7 +221,8 @@
VpeToolbarTest.class,
MultiSelectionTest.class,
SelectionSynchronizationTest.class,
- ScrollingSynchronizationTest.class
+ ScrollingSynchronizationTest.class,
+ ElForBundleValueTest_Jbide10531.class
})
public class VPEAllBotTests extends SWTBotTestCase{
Added: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/el/ElForBundleValueTest_Jbide10531.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/el/ElForBundleValueTest_Jbide10531.java (rev 0)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/el/ElForBundleValueTest_Jbide10531.java 2012-06-29 11:50:28 UTC (rev 42303)
@@ -0,0 +1,97 @@
+/*******************************************************************************
+ * Copyright (c) 2012 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.vpe.ui.bot.test.el;
+
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.widgets.Display;
+import org.jboss.tools.ui.bot.ext.SWTBotExt;
+import org.jboss.tools.ui.bot.ext.helper.KeyboardHelper;
+import org.jboss.tools.ui.bot.ext.parts.SWTBotEditorExt;
+import org.jboss.tools.vpe.ui.bot.test.editor.VPEEditorTestCase;
+import org.jboss.tools.vpe.ui.bot.test.tools.SWTBotWebBrowser;
+import org.mozilla.interfaces.nsIDOMNode;
+
+public class ElForBundleValueTest_Jbide10531 extends VPEEditorTestCase {
+
+ private SWTBotExt botExt = null;
+ private SWTBotEditorExt jspTextEditor;
+ private SWTBotWebBrowser webBrowser;
+
+ private final String OUT1 = "<br> <h:outputText value=\"#{Message['prompt_message'}\" /> \n"; //$NON-NLS-1$
+ private final String OUT2 = "<br> <h:outputText value=\"#{Message[hello_message']}\" /> \n"; //$NON-NLS-1$
+ private final String OUT3 = "<br> <h:outputText value=\"#{Message'[prompt_message']}\" /> \n"; //$NON-NLS-1$
+ private final String OUT4 = "<br> <h:outputText value=\"#{Message[hello_message]}\" /> \n"; //$NON-NLS-1$
+
+ private final String OUT5 = "<br /> <h:outputText value=\"#{msg['prompt'}\" /> \n"; //$NON-NLS-1$
+ private final String OUT6 = "<br /> <h:outputText value=\"#{msg[greeting']}\" /> \n"; //$NON-NLS-1$
+ private final String OUT7 = "<br /> <h:outputText value=\"#{msg'[prompt']}\" /> \n"; //$NON-NLS-1$
+ private final String OUT8 = "<br /> <h:outputText value=\"#{msg[greeting]}\" /> \n"; //$NON-NLS-1$
+
+
+ public ElForBundleValueTest_Jbide10531() {
+ super();
+ botExt = new SWTBotExt();
+ }
+
+ public void testElForBundleValueInJSP() throws Throwable {
+ openPage();
+ util.waitForAll();
+ jspTextEditor = botExt.swtBotEditorExtByTitle(TEST_PAGE);
+ setEditor(jspTextEditor);
+ webBrowser = new SWTBotWebBrowser(TEST_PAGE, botExt);
+ setEditorText(jspTextEditor.getText());
+ jspTextEditor.setFocus();
+ Display d = bot.getDisplay();
+
+ jspTextEditor.insertText(13, 0, OUT4);
+ jspTextEditor.insertText(13, 0, OUT3);
+ jspTextEditor.insertText(13, 0, OUT2);
+ jspTextEditor.insertText(13, 0, OUT1);
+ util.sleep(TIME_1S);
+
+ KeyboardHelper.pressKeyCode(d, SWT.F5);
+ util.sleep(TIME_1S);
+ webBrowser.setFocus();
+ nsIDOMNode node = webBrowser.getDomNodeByTagName("TD", 0); //$NON-NLS-1$
+ util.sleep(TIME_1S);
+ webBrowser.containsNodeWithValue(node, "#{Message['prompt_message'}"); //$NON-NLS-1$
+ webBrowser.containsNodeWithValue(node, "#{Message[hello_message']}"); //$NON-NLS-1$
+ webBrowser.containsNodeWithValue(node, "#{Message'[prompt_message']}"); //$NON-NLS-1$
+ webBrowser.containsNodeWithValue(node, "#{Message[hello_message]}"); //$NON-NLS-1$
+ }
+
+ public void testElForBundleValueInXHTML() throws Throwable {
+ openPage(FACELETS_TEST_PAGE, FACELETS_TEST_PROJECT_NAME);
+ util.waitForAll();
+ jspTextEditor = botExt.swtBotEditorExtByTitle(FACELETS_TEST_PAGE);
+ setEditor(jspTextEditor);
+ webBrowser = new SWTBotWebBrowser(FACELETS_TEST_PAGE, botExt);
+ setEditorText(jspTextEditor.getText());
+ jspTextEditor.setFocus();
+ Display d = bot.getDisplay();
+
+ jspTextEditor.insertText(19, 0, OUT8);
+ jspTextEditor.insertText(19, 0, OUT7);
+ jspTextEditor.insertText(19, 0, OUT6);
+ jspTextEditor.insertText(19, 0, OUT5);
+ util.sleep(TIME_1S);
+
+ KeyboardHelper.pressKeyCode(d, SWT.F5);
+ util.sleep(TIME_1S);
+ webBrowser.setFocus();
+ nsIDOMNode node = webBrowser.getDomNodeByTagName("FORM", 0); //$NON-NLS-1$
+ util.sleep(TIME_1S);
+ webBrowser.containsNodeWithValue(node, "#{msg['prompt'}"); //$NON-NLS-1$
+ webBrowser.containsNodeWithValue(node, "#{msg[greeting']}"); //$NON-NLS-1$
+ webBrowser.containsNodeWithValue(node, "#{msg'[prompt']}"); //$NON-NLS-1$
+ webBrowser.containsNodeWithValue(node, "#{msg[greeting]}"); //$NON-NLS-1$
+ }
+}
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/tools/SWTBotWebBrowser.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/tools/SWTBotWebBrowser.java 2012-06-29 11:37:32 UTC (rev 42302)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/tools/SWTBotWebBrowser.java 2012-06-29 11:50:28 UTC (rev 42303)
@@ -467,31 +467,25 @@
* @return
*/
public boolean containsNodeWithValue(nsIDOMNode node, String searchText) {
- boolean result = false;
+ boolean result = false;
+ String nodeValue = node.getNodeValue();
- String nodeValue = node.getNodeValue();
-
- if (nodeValue != null && SWTBotWebBrowser.stripTextFromSpecChars(nodeValue).equals(searchText)) {
- result = true;
- }
- else {
- nsIDOMNodeList children = node.getChildNodes();
-
- for (int i = 0; i < children.getLength() && !result; i++) {
-
- nsIDOMNode child = children.item(i);
-
- // leave out empty text nodes in test dom model
- if ((child.getNodeType() == Node.TEXT_NODE)
- && ((child.getNodeValue() == null) || (child.getNodeValue().trim()
- .length() == 0)))
- continue;
-
- result = containsNodeWithValue(child, searchText);
- }
- }
-
- return result;
+ if (nodeValue != null && SWTBotWebBrowser.stripTextFromSpecChars(nodeValue).equals(searchText)) {
+ result = true;
+ } else {
+ nsIDOMNodeList children = node.getChildNodes();
+ for (int i = 0; i < children.getLength() && !result; i++) {
+ nsIDOMNode child = children.item(i);
+ // leave out empty text nodes in test dom model
+ if ((child.getNodeType() == Node.TEXT_NODE)
+ && ((child.getNodeValue() == null) ||
+ (child.getNodeValue().trim().length() == 0))) {
+ continue;
+ }
+ result = containsNodeWithValue(child, searchText);
+ }
+ }
+ return result;
}
/**
* Returns Palette Viewer associated to JBoss Tools Palette
13 years, 3 months
JBoss Tools SVN: r42302 - trunk/maven/plugins/org.jboss.tools.maven.sourcelookup.core/META-INF.
by jbosstools-commits@lists.jboss.org
Author: snjeza
Date: 2012-06-29 07:37:32 -0400 (Fri, 29 Jun 2012)
New Revision: 42302
Modified:
trunk/maven/plugins/org.jboss.tools.maven.sourcelookup.core/META-INF/MANIFEST.MF
Log:
JBIDE-12273 - The Source Lookup plugin is not compatible with m2e 1.1 (m2e Juno)
Modified: trunk/maven/plugins/org.jboss.tools.maven.sourcelookup.core/META-INF/MANIFEST.MF
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.sourcelookup.core/META-INF/MANIFEST.MF 2012-06-29 11:22:50 UTC (rev 42301)
+++ trunk/maven/plugins/org.jboss.tools.maven.sourcelookup.core/META-INF/MANIFEST.MF 2012-06-29 11:37:32 UTC (rev 42302)
@@ -10,9 +10,9 @@
org.jboss.ide.eclipse.as.core;visibility:=reexport,
org.eclipse.wst.server.core;bundle-version="1.1.302";visibility:=reexport,
org.eclipse.jdt.launching;bundle-version="3.6.0",
- org.eclipse.m2e.jdt;bundle-version="[1.0.0,1.1.0)";visibility:=reexport,
- org.eclipse.m2e.core;bundle-version="[1.0.0,1.1.0)";visibility:=reexport,
- org.eclipse.m2e.maven.runtime;bundle-version="[1.0.0,1.1.0)";visibility:=reexport,
+ org.eclipse.m2e.jdt;bundle-version="[1.0.0,1.2.0)";visibility:=reexport,
+ org.eclipse.m2e.core;bundle-version="[1.0.0,1.2.0)";visibility:=reexport,
+ org.eclipse.m2e.maven.runtime;bundle-version="[1.0.0,1.2.0)";visibility:=reexport,
org.apache.commons.codec;bundle-version="1.3.0",
org.eclipse.ui;bundle-version="3.7.0"
Bundle-ActivationPolicy: lazy
13 years, 3 months
JBoss Tools SVN: r42301 - trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/bundle.
by jbosstools-commits@lists.jboss.org
Author: dmaliarevich
Date: 2012-06-29 07:22:50 -0400 (Fri, 29 Jun 2012)
New Revision: 42301
Modified:
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/bundle/BundleMap.java
Log:
https://issues.jboss.org/browse/JBIDE-10531 - EL with no quotes cannot be used to determine the bundle value.
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/bundle/BundleMap.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/bundle/BundleMap.java 2012-06-29 07:41:18 UTC (rev 42300)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/bundle/BundleMap.java 2012-06-29 11:22:50 UTC (rev 42301)
@@ -514,16 +514,36 @@
String name = expr.getMemberName();
if(name == null || name.length() == 0) return null;
if(expr instanceof ELPropertyInvocation) {
+ /*
+ * Simple EL like #{bundle.key} goes here
+ */
return new String[]{left.getText(), name};
} else if(expr instanceof ELArgumentInvocation) {
+ /*
+ * EL like #{bundle['compound.key']} goes here
+ */
if(name.startsWith("\"") || name.startsWith("'")) { //$NON-NLS-1$ //$NON-NLS-2$
name = name.substring(1);
+ } else {
+ /*
+ * https://issues.jboss.org/browse/JBIDE-10531
+ * EL with no quotes cannot be used to determine the bundle value.
+ */
+ return null;
}
if(name.endsWith("\"") || name.endsWith("'")) { //$NON-NLS-1$ //$NON-NLS-2$
name = name.substring(0, name.length() - 1);
+ } else {
+ /*
+ * https://issues.jboss.org/browse/JBIDE-10531
+ * EL with no quotes cannot be used to determine the bundle value.
+ */
+ return null;
}
- if(name.length() == 0) return null;
- return new String[]{left.getText(), name};
+ if (name.length() == 0) {
+ return null;
+ }
+ return new String[] { left.getText(), name };
}
return null;
}
13 years, 3 months
JBoss Tools SVN: r42300 - trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/descriptors.
by jbosstools-commits@lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2012-06-29 03:41:18 -0400 (Fri, 29 Jun 2012)
New Revision: 42300
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/descriptors/XPathModel.java
Log:
JBIDE-12271 to trunk
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/descriptors/XPathModel.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/descriptors/XPathModel.java 2012-06-29 03:23:04 UTC (rev 42299)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/descriptors/XPathModel.java 2012-06-29 07:41:18 UTC (rev 42300)
@@ -180,6 +180,8 @@
saveCategory(categories[i], server, child);
}
File f = getFile(server);
+ if( !f.getParentFile().exists())
+ f.getParentFile().mkdirs();
try {
memento.save(new FileOutputStream(f));
} catch( IOException ioe) {
13 years, 3 months