JBoss Tools SVN: r27579 - trunk/usage/plugins/org.jboss.tools.usage/OSGI-INF/l10n.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2010-12-17 04:17:20 -0500 (Fri, 17 Dec 2010)
New Revision: 27579
Modified:
trunk/usage/plugins/org.jboss.tools.usage/OSGI-INF/l10n/bundle.properties
Log:
[JBIDE-7750] renamed preference page title
Modified: trunk/usage/plugins/org.jboss.tools.usage/OSGI-INF/l10n/bundle.properties
===================================================================
--- trunk/usage/plugins/org.jboss.tools.usage/OSGI-INF/l10n/bundle.properties 2010-12-17 09:15:52 UTC (rev 27578)
+++ trunk/usage/plugins/org.jboss.tools.usage/OSGI-INF/l10n/bundle.properties 2010-12-17 09:17:20 UTC (rev 27579)
@@ -1,4 +1,4 @@
#Properties file for org.jboss.tools.usage
page.name = Usage Reporting
bundle-name = JBoss Tools Usage Reporting
-bundle-vendor = JBoss by Red Hat
\ No newline at end of file
+bundle-vendor = JBoss by Red Hat
14 years
JBoss Tools SVN: r27578 - trunk/usage/plugins/org.jboss.tools.usage/OSGI-INF/l10n.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2010-12-17 04:15:52 -0500 (Fri, 17 Dec 2010)
New Revision: 27578
Modified:
trunk/usage/plugins/org.jboss.tools.usage/OSGI-INF/l10n/bundle.properties
Log:
[JBIDS-1453] renamed preference page title
Modified: trunk/usage/plugins/org.jboss.tools.usage/OSGI-INF/l10n/bundle.properties
===================================================================
--- trunk/usage/plugins/org.jboss.tools.usage/OSGI-INF/l10n/bundle.properties 2010-12-17 09:04:38 UTC (rev 27577)
+++ trunk/usage/plugins/org.jboss.tools.usage/OSGI-INF/l10n/bundle.properties 2010-12-17 09:15:52 UTC (rev 27578)
@@ -1,4 +1,4 @@
#Properties file for org.jboss.tools.usage
-page.name = Usage Reporting Preferences
+page.name = Usage Reporting
bundle-name = JBoss Tools Usage Reporting
bundle-vendor = JBoss by Red Hat
\ No newline at end of file
14 years
JBoss Tools SVN: r27577 - trunk/usage/tests/org.jboss.tools.usage.test.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2010-12-17 04:04:38 -0500 (Fri, 17 Dec 2010)
New Revision: 27577
Modified:
trunk/usage/tests/org.jboss.tools.usage.test/UsageBrandingTest.launch
Log:
Modified: trunk/usage/tests/org.jboss.tools.usage.test/UsageBrandingTest.launch
===================================================================
--- trunk/usage/tests/org.jboss.tools.usage.test/UsageBrandingTest.launch 2010-12-17 08:53:02 UTC (rev 27576)
+++ trunk/usage/tests/org.jboss.tools.usage.test/UsageBrandingTest.launch 2010-12-17 09:04:38 UTC (rev 27577)
@@ -12,7 +12,7 @@
<booleanAttribute key="clearwslog" value="false"/>
<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/>
<booleanAttribute key="default" value="false"/>
-<stringAttribute key="deselected_workspace_plugins" value="org.jboss.tools.common.text.xml,org.jboss.tools.common.meta.ui,org.jboss.tools.common,org.jboss.tools.common.verification.ui.test,org.jboss.tools.common.projecttemplates,org.jboss.tools.common.el.core,com.jboss.jbds.usage.branding,org.jboss.tools.common.verification.ui,org.mozilla.xulrunner.gtk.linux.x86,org.jboss.tools.common.gef,org.mozilla.xulrunner.carbon.macosx,org.jboss.tools.common.test,org.jboss.tools.common.verification.test,org.jboss.tools.common.verification,org.jboss.tools.common.model,org.jboss.tools.gwt.ui,org.jboss.tools.common.model.ui.capabilities,org.jboss.tools.common.resref.core,org.mozilla.xulrunner.cocoa.macosx,org.jboss.tools.common.ui,org.mozilla.xulrunner.gtk.linux.x86_64,org.jboss.tools.common.el.ui,org.mozilla.xulrunner.win32.win32.x86,org.jboss.tools.common.text.ext,org.jboss.tools.gwt.core,org.jboss.tools.common.resref.ui,org.jboss.tools.common.model.ui.test,org.jboss.tools.common.el.cor!
e.test,org.mozilla.xpcom,org.jboss.tools.tests,org.jboss.tools.common.model.ui,org.jboss.tools.common.model.test"/>
+<stringAttribute key="deselected_workspace_plugins" value="org.jboss.tools.gwt.ui,org.eclipse.epp.usagedata.recording,org.jboss.tools.deltacloud.core,org.jboss.tools.deltacloud.integration,org.eclipse.epp.usagedata.gathering,org.jboss.tools.deltacloud.docs,org.jboss.tools.deltacloud.test,org.jboss.tools.gwt.core,org.eclipse.epp.usagedata.ui,org.jboss.tools.deltacloud.ui,org.jboss.tools.tests"/>
<booleanAttribute key="includeOptional" value="true"/>
<stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/>
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
@@ -36,8 +36,8 @@
<stringAttribute key="pde.version" value="3.3"/>
<stringAttribute key="product" value="org.eclipse.sdk.ide"/>
<booleanAttribute key="run_in_ui_thread" value="true"/>
-<stringAttribute key="selected_target_plugins" value="org.eclipse.swt.gtk.linux.x86_64@default:false,org.eclipse.jface.databinding@default:default,com.ibm.icu@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.equinox.app@default:default,org.hamcrest.core@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,javax.servlet@default:default,org.eclipse.equinox.ds@default:true,org.junit4@default:default,org.eclipse.ui@default:default,org.eclipse.jface@default:default,org.jboss.tools.xulrunner.initializer@default:false,org.eclipse.equinox.preferences@default:default,org.eclipse.core.runtime@default:true,org.eclipse.equinox.util@default:default,org.eclipse.swt@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.core.expressions@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.osgi.services@default:default,org.eclipse.cor!
e.commands@default:default,org.eclipse.help@default:default,org.eclipse.core.databinding@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.equinox.common@2:true,org.eclipse.osgi@-1:true,org.eclipse.core.databinding.property@default:default,org.eclipse.core.jobs@default:default,org.junit*4.8.1.v4_8_1_v20100427-1100@default:default"/>
-<stringAttribute key="selected_workspace_plugins" value="org.jboss.tools.usage.test@default:default,org.jboss.tools.usage@default:default"/>
+<stringAttribute key="selected_target_plugins" value="org.eclipse.equinox.p2.core@default:default,org.eclipse.jem.util@default:default,org.eclipse.ui.forms@default:default,org.eclipse.ui.ide@default:default,org.eclipse.ui.views@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.core.expressions@default:default,org.eclipse.wst.common.emf@default:default,org.eclipse.help@default:default,org.eclipse.wst.common.project.facet.core@default:default,org.eclipse.ui@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.core.runtime@default:true,org.eclipse.core.databinding@default:default,org.eclipse.equinox.common@default:default,org.eclipse.core.net.linux.x86_64@default:false,org.eclipse.team.core@default:default,org.eclipse.ecf@default:default,org.eclipse.equinox.p2.metadata@default:default,com.ibm.icu@default:default,org.apache.xml.resolver@default:default,javax.xml@default:default,org.eclipse.wst.common.uriresolver@default:default,org.ecli!
pse.ltk.core.refactoring@default:default,org.eclipse.jface.text@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.debug.core@default:default,org.eclipse.ui.console@default:default,org.eclipse.emf.edit@default:default,org.eclipse.osgi.services@default:default,org.eclipse.wst.common.emfworkbench.integration@default:default,org.eclipse.equinox.security@default:default,org.eclipse.ui.navigator.resources@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.core.variables@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.jdt.compiler.apt@default:false,org.eclipse.emf.ecore.change@default:default,org.apache.commons.httpclient*3.1.0.v201005080502@default:default,org.eclipse.wst.common.environment@default:default,org.eclipse.core.commands@default:default,org.eclipse.ui.workbench.texteditor@default:default,org.eclipse.debug.ui@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.equinox.p2.reposit!
ory@default:default,org.eclipse.equinox.p2.engine@default:defa!
ult,org.
eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.jdt.launching@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.core.jobs@default:default,org.eclipse.ui.workbench@default:default,org.apache.xml.serializer@default:default,org.eclipse.ecf.provider.filetransfer@default:default,com.instantiations.designer.jdt.fragment@default:false,org.apache.commons.logging*1.0.4.v201005080501@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.jdt.compiler.tool@default:false,org.eclipse.search@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.jdt.debug@default:default,org.eclipse.jface@default:default,org.eclipse.compare@default:default,org.eclipse.jdt.core@default:default,org.eclipse.equinox.app@default:default,org.eclipse.swt@default:default,org.eclipse.wst.sse.core@default:default,org.eclipse.compare.core@default:default,org.junit*4.8.1.v4_8_1_v20100427-1100@default:default,org.eclipse.osgi!
,org.eclipse.ecf.ssl@default:false,org.apache.commons.codec*1.3.0.v20100518-1140@default:default,org.hamcrest.core@default:default,org.eclipse.emf.common@default:default,org.eclipse.equinox.registry@default:default,org.apache.xerces@default:default,org.junit4@default:default,org.eclipse.core.filebuffers@default:default,org.eclipse.wst.validation@default:default,org.eclipse.core.filesystem@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.equinox.concurrent@default:default,org.eclipse.text@default:default,org.eclipse.core.net@default:default,org.eclipse.wst.xml.core@default:default,org.jboss.tools.xulrunner.initializer@default:false,org.eclipse.ant.core@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.wst.common.core@default:default,org.eclipse.ltk.ui.refactoring@default:default,org.eclipse.core.filesystem.linux.x86_64@default:false,org.eclipse.jdt.ui@default:default,or!
g.eclipse.core.resources@default:default,org.eclipse.team.ui@d!
efault:d
efault,javax.servlet@default:default,org.eclipse.osgi.util@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.jdt.core.manipulation@default:default,org.eclipse.ui.editors@default:default,org.eclipse.swt.gtk.linux.x86_64@default:false,org.eclipse.wst.common.frameworks@default:default"/>
+<stringAttribute key="selected_workspace_plugins" value="org.jboss.tools.usage.test@default:default,org.jboss.tools.common@default:default,com.jboss.jbds.usage.branding@default:default,org.jboss.tools.usage@default:default"/>
<booleanAttribute key="show_selected_only" value="false"/>
<booleanAttribute key="tracing" value="false"/>
<booleanAttribute key="useCustomFeatures" value="false"/>
14 years
JBoss Tools SVN: r27576 - trunk/usage/features/org.jboss.tools.usage.test.feature.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2010-12-17 03:53:02 -0500 (Fri, 17 Dec 2010)
New Revision: 27576
Modified:
trunk/usage/features/org.jboss.tools.usage.test.feature/
Log:
Property changes on: trunk/usage/features/org.jboss.tools.usage.test.feature
___________________________________________________________________
Name: svn:ignore
+ .settings
14 years
JBoss Tools SVN: r27575 - trunk/usage/plugins/org.jboss.tools.usage.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2010-12-17 03:52:28 -0500 (Fri, 17 Dec 2010)
New Revision: 27575
Modified:
trunk/usage/plugins/org.jboss.tools.usage/build.properties
Log:
Modified: trunk/usage/plugins/org.jboss.tools.usage/build.properties
===================================================================
--- trunk/usage/plugins/org.jboss.tools.usage/build.properties 2010-12-17 08:50:20 UTC (rev 27574)
+++ trunk/usage/plugins/org.jboss.tools.usage/build.properties 2010-12-17 08:52:28 UTC (rev 27575)
@@ -6,8 +6,9 @@
pom.xml,\
src/,\
META-INF/,\
- OSGI-INF/
+ OSGI-INF/I10n/,\
+ .classpath,\
+ .project
src.includes = about.html,\
- pom.xml,\
- OSGI-INF/
+ pom.xml
source.. = src/
14 years
JBoss Tools SVN: r27574 - trunk/usage/features/org.jboss.tools.usage.feature.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2010-12-17 03:50:20 -0500 (Fri, 17 Dec 2010)
New Revision: 27574
Modified:
trunk/usage/features/org.jboss.tools.usage.feature/
Log:
Property changes on: trunk/usage/features/org.jboss.tools.usage.feature
___________________________________________________________________
Name: svn:ignore
+ .settings
14 years
JBoss Tools SVN: r27573 - trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/cloud.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2010-12-17 00:48:56 -0500 (Fri, 17 Dec 2010)
New Revision: 27573
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/cloud/InstanceItem.java
Log:
JBIDE-7929 - patch to InstanceItem
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/cloud/InstanceItem.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/cloud/InstanceItem.java 2010-12-17 05:36:35 UTC (rev 27572)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/cloud/InstanceItem.java 2010-12-17 05:48:56 UTC (rev 27573)
@@ -29,8 +29,9 @@
DeltaCloudInstance instance = getModel();
StringBuilder sb = new StringBuilder();
if (instance != null) {
+ sb.append(instance.getGivenName());
if (instance.getName() != null) {
- sb.append(instance.getName());
+ sb.append(" [").append(instance.getName()).append("]");
}
if (instance.getId() != null) {
sb.append(" [").append(instance.getId()).append("] ");
14 years
JBoss Tools SVN: r27572 - in trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/src/org/jboss/tools/deltacloud/integration: rse/util and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2010-12-17 00:36:35 -0500 (Fri, 17 Dec 2010)
New Revision: 27572
Added:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/src/org/jboss/tools/deltacloud/integration/messages.properties
Removed:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/src/org/jboss/tools/deltacloud/integration/messages.properties
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/src/org/jboss/tools/deltacloud/integration/Messages.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/src/org/jboss/tools/deltacloud/integration/rse/util/RSEUtils.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/src/org/jboss/tools/deltacloud/integration/wizard/RSEandASWizardPage.java
Log:
"JBIDE-7889 deltacloud integration stuff" messages were not resolving
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/src/org/jboss/tools/deltacloud/integration/Messages.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/src/org/jboss/tools/deltacloud/integration/Messages.java 2010-12-17 02:01:47 UTC (rev 27571)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/src/org/jboss/tools/deltacloud/integration/Messages.java 2010-12-17 05:36:35 UTC (rev 27572)
@@ -3,7 +3,7 @@
import org.eclipse.osgi.util.NLS;
public class Messages {
- private static final String BUNDLE_NAME = DeltaCloudIntegrationPlugin.PLUGIN_ID + ".Messages"; //$NON-NLS-1$
+ private static final String BUNDLE_NAME = DeltaCloudIntegrationPlugin.PLUGIN_ID + ".messages"; //$NON-NLS-1$
public static String ERROR;
public static String COULD_NOT_LAUNCH_RSE_EXPLORER;
Deleted: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/src/org/jboss/tools/deltacloud/integration/messages.properties
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/src/org/jboss/tools/deltacloud/integration/messages.properties 2010-12-17 02:01:47 UTC (rev 27571)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/src/org/jboss/tools/deltacloud/integration/messages.properties 2010-12-17 05:36:35 UTC (rev 27572)
@@ -1,4 +0,0 @@
-RSE_CONNECTING_MESSAGE=Connecting instance as: {0}
-COULD_NOT_LAUNCH_RSE_EXPLORER=Could not open remote system explorer
-COULD_NOT_LAUNCH_RSE_EXPLORER2=Could not launch remote system explorer for instance "{0}"
-ERROR=Error
\ No newline at end of file
Copied: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/src/org/jboss/tools/deltacloud/integration/messages.properties (from rev 27456, trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/src/org/jboss/tools/deltacloud/integration/messages.properties)
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/src/org/jboss/tools/deltacloud/integration/messages.properties (rev 0)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/src/org/jboss/tools/deltacloud/integration/messages.properties 2010-12-17 05:36:35 UTC (rev 27572)
@@ -0,0 +1,4 @@
+RSE_CONNECTING_MESSAGE=Connecting instance as: {0}
+COULD_NOT_LAUNCH_RSE_EXPLORER=Could not open remote system explorer
+COULD_NOT_LAUNCH_RSE_EXPLORER2=Could not launch remote system explorer for instance "{0}"
+ERROR=Error
\ No newline at end of file
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/src/org/jboss/tools/deltacloud/integration/rse/util/RSEUtils.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/src/org/jboss/tools/deltacloud/integration/rse/util/RSEUtils.java 2010-12-17 02:01:47 UTC (rev 27571)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/src/org/jboss/tools/deltacloud/integration/rse/util/RSEUtils.java 2010-12-17 05:36:35 UTC (rev 27572)
@@ -69,7 +69,6 @@
Assert.isLegal(instance != null, "Cannot get hostname: instance is not defined");
String hostName = instance.getHostName();
- System.out.println(instance.getHostName());
Assert.isTrue(hostName != null && hostName.length() > 0,
MessageFormat.format("Cannot get host name: not defined for instance {0}", instance.getName()));
return hostName;
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/src/org/jboss/tools/deltacloud/integration/wizard/RSEandASWizardPage.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/src/org/jboss/tools/deltacloud/integration/wizard/RSEandASWizardPage.java 2010-12-17 02:01:47 UTC (rev 27571)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/src/org/jboss/tools/deltacloud/integration/wizard/RSEandASWizardPage.java 2010-12-17 05:36:35 UTC (rev 27572)
@@ -49,9 +49,9 @@
private final static String CREATE_SERVER_PREF_KEY = "org.jboss.tools.deltacloud.integration.wizard.RSEandASWizard.CREATE_SERVER_PREF_KEY";
public RSEandASWizardPage() {
- super("Blah Wizard Page");
- setTitle("Blah Title");
- setDescription("Blah Desc");
+ super("Create RSE Connection and Server");
+ setTitle("Create RSE Connection and Server");
+ setDescription("Here you can choose to create a matching RSE connection and a Server adapter");
}
public void createControl(Composite parent) {
@@ -98,6 +98,7 @@
}
public AbstractInstanceJob getPerformFinishJob(final DeltaCloudInstance instance) {
+ System.out.println(instance.getHostName());
IEclipsePreferences prefs = new InstanceScope().getNode(DeltaCloudIntegrationPlugin.PLUGIN_ID);
prefs.putBoolean(CREATE_RSE_PREF_KEY, createRSE.getSelection());
prefs.putBoolean(CREATE_SERVER_PREF_KEY, createServer.getSelection());
14 years
JBoss Tools SVN: r27571 - in trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test: editor/pagedesign and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: vpakan(a)redhat.com
Date: 2010-12-16 21:01:47 -0500 (Thu, 16 Dec 2010)
New Revision: 27571
Added:
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/pagedesign/IncludedCssFilesJSPTest.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/editor/pagedesign/IncludedCssFilesTest.java
Log:
Added IncludedCssFilesJSPTest
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 2010-12-16 23:42:39 UTC (rev 27570)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAllBotTests.java 2010-12-17 02:01:47 UTC (rev 27571)
@@ -16,6 +16,7 @@
import org.jboss.tools.vpe.ui.bot.test.editor.XhtmlFilePerformanceTest;
import org.jboss.tools.vpe.ui.bot.test.editor.pagedesign.AddSubstitutedELExpressionFolderScopeTest;
import org.jboss.tools.vpe.ui.bot.test.editor.pagedesign.EditingELValueTest;
+import org.jboss.tools.vpe.ui.bot.test.editor.pagedesign.IncludedCssFilesJSPTest;
import org.jboss.tools.vpe.ui.bot.test.editor.pagedesign.IncludedCssFilesTest;
import org.jboss.tools.vpe.ui.bot.test.editor.pagedesign.IncludedTagLibsTest;
import org.jboss.tools.vpe.ui.bot.test.editor.pagedesign.ManipulatingELValueTest;
@@ -90,6 +91,7 @@
suite.addTestSuite(SelectionBarTest.class);
suite.addTestSuite(IncludedCssFilesTest.class);
suite.addTestSuite(GlobalELVariablesTest.class);
+ suite.addTestSuite(IncludedCssFilesJSPTest.class);
return new TestSetup(suite);
}
Added: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/pagedesign/IncludedCssFilesJSPTest.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/pagedesign/IncludedCssFilesJSPTest.java (rev 0)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/pagedesign/IncludedCssFilesJSPTest.java 2010-12-17 02:01:47 UTC (rev 27571)
@@ -0,0 +1,138 @@
+/*******************************************************************************
+
+ * Copyright (c) 2007-2010 Exadel, Inc. and 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:
+ * Exadel, Inc. and Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.vpe.ui.bot.test.editor.pagedesign;
+
+import java.io.File;
+import java.io.IOException;
+
+import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotEditor;
+import org.eclipse.swtbot.swt.finder.SWTBot;
+import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree;
+import org.jboss.tools.ui.bot.ext.SWTBotExt;
+import org.jboss.tools.ui.bot.ext.SWTUtilExt;
+import org.jboss.tools.ui.bot.ext.Timing;
+import org.jboss.tools.ui.bot.ext.gen.ActionItem;
+import org.jboss.tools.ui.bot.ext.types.IDELabel;
+import org.jboss.tools.ui.bot.ext.types.JobName;
+import org.jboss.tools.vpe.ui.bot.test.VPEAutoTestCase;
+import org.jboss.tools.vpe.ui.bot.test.tools.SWTBotWebBrowser;
+
+/**
+ * Tests functionality of Included CSS Files tab page of Page Design Options Dialog with JSP File
+ * @author vlado pakan
+ *
+ */
+public class IncludedCssFilesJSPTest extends PageDesignTestCase {
+
+ private static final String CSS_FILE_NAME = "includedCssFileJSPTest.css";
+ private static final String JSP_FILE_NAME = "includedCssFileJSPTest.jsp";
+
+ private SWTBot addCssReferenceDialogBot = null;
+ private SWTBot optionsDialogBot = null;
+
+ public void testIncludedCssFiles() throws IOException{
+ SWTBotTree tree = packageExplorer.show().bot().tree();
+ tree.expandNode(VPEAutoTestCase.JBT_TEST_PROJECT_NAME)
+ .expandNode("WebContent")
+ .getNode("pages")
+ .select();
+ // add CSS File
+ open.newObject(ActionItem.NewObject.WebCSS.LABEL);
+ bot.shell(IDELabel.Shell.NEW_CSS_FILE).activate(); //$NON-NLS-1$
+ bot.textWithLabel(IDELabel.NewCSSWizard.FILE_NAME).setText(IncludedCssFilesJSPTest.CSS_FILE_NAME); //$NON-NLS-1$
+ bot.button(IDELabel.Button.FINISH).click(); //$NON-NLS-1$
+ bot.sleep(Timing.time3S());
+ util.waitForJobs(JobName.BUILDING_WS);
+ SWTBotEditor cssEditor = bot.editorByTitle(IncludedCssFilesJSPTest.CSS_FILE_NAME);
+ cssEditor.toTextEditor().setText(".post-info {\n" +
+ " color: blue;\n" +
+ "}\n" +
+ ".post-info a {\n" +
+ " color: orange;\n" +
+ "}");
+ cssEditor.saveAndClose();
+ // add HTML File
+ open.newObject(ActionItem.NewObject.WebJSPFile.LABEL);
+ bot.shell(IDELabel.Shell.NEW_JSP_FILE).activate(); //$NON-NLS-1$
+ bot.textWithLabel(ActionItem.NewObject.WebJSPFile.TEXT_FILE_NAME).setText(IncludedCssFilesJSPTest.JSP_FILE_NAME); //$NON-NLS-1$
+ bot.button(IDELabel.Button.FINISH).click(); //$NON-NLS-1$
+ bot.sleep(Timing.time3S());
+ util.waitForJobs(JobName.BUILDING_WS);
+ SWTBotEditor jspEditor = bot.editorByTitle(IncludedCssFilesJSPTest.JSP_FILE_NAME);
+ jspEditor.toTextEditor().setText("<%@ taglib uri=\"http://java.sun.com/jsf/html\" prefix=\"h\"%>\n" +
+ " <body>\n" +
+ " <p class=\"post-info\">Posted by\n" +
+ " <a href=\"index.html\">a href</a>\n" +
+ " <br>\n" +
+ " <h:outputLink value=\"url\" value=\"/index.jsp\">h:outputLink</h:outputLink>\n" +
+ " <h:form>\n" +
+ " <h:commandLink value=\"h:commandLink\"/>\n" +
+ " </h:form>\n" +
+ " </p>\n" +
+ "</body>\n");
+ jspEditor.save();
+ bot.sleep(Timing.time3S());
+ util.waitForJobs(JobName.BUILDING_WS);
+ // add CSS File Reference
+ bot.toolbarButtonWithTooltip(PAGE_DESIGN).click();
+ optionsDialogBot = bot.shell(IDELabel.Shell.PAGE_DESIGN_OPTIONS).activate().bot();
+ optionsDialogBot.tabItem(IDELabel.PageDesignOptionsDialog.INCLUDED_CSS_FILES_TAB).activate();
+ optionsDialogBot.button(IDELabel.Button.ADD_WITHOUT_DOTS).click();
+ addCssReferenceDialogBot = optionsDialogBot.shell(IDELabel.Shell.ADD_CSS_REFERENCE).activate().bot();
+ addCssReferenceDialogBot.textWithLabel(IDELabel.PageDesignOptionsDialog.INCLUDED_CSS_FILES_CSS_FILE_PATH)
+ .setText(SWTUtilExt.getPathToProject(VPEAutoTestCase.JBT_TEST_PROJECT_NAME) + File.separator +
+ "WebContent" + File.separator +
+ "pages" + File.separator +
+ IncludedCssFilesJSPTest.CSS_FILE_NAME);
+ addCssReferenceDialogBot.button(IDELabel.Button.FINISH).click();
+ addCssReferenceDialogBot = null;
+ optionsDialogBot.button(IDELabel.Button.OK).click();
+ optionsDialogBot = null;
+ bot.sleep(Timing.time3S());
+ SWTBotWebBrowser webBrowser = new SWTBotWebBrowser(IncludedCssFilesJSPTest.JSP_FILE_NAME, new SWTBotExt());
+ assertVisualEditorContainsNodeWithValue(webBrowser,
+ "h1 { color: Red}.post-info { color: blue;}.post-info a { color: orange;}",
+ IncludedCssFilesJSPTest.JSP_FILE_NAME);
+ assertVisualEditorContains(webBrowser,
+ "P",
+ new String [] {"class"},
+ new String [] {"post-info"},
+ IncludedCssFilesJSPTest.JSP_FILE_NAME);
+ bot.toolbarButtonWithTooltip(PAGE_DESIGN).click();
+ optionsDialogBot = bot.shell(IDELabel.Shell.PAGE_DESIGN_OPTIONS).activate().bot();
+ optionsDialogBot.tabItem(IDELabel.PageDesignOptionsDialog.INCLUDED_CSS_FILES_TAB).activate();
+ optionsDialogBot.table().select(0);
+ optionsDialogBot.button(IDELabel.Button.REMOVE).click();
+ optionsDialogBot.button(IDELabel.Button.OK).click();
+ optionsDialogBot = null;
+ jspEditor.close();
+ }
+
+ @Override
+ protected void closeUnuseDialogs() {
+ if (addCssReferenceDialogBot != null){
+ addCssReferenceDialogBot.button(IDELabel.Button.CANCEL).click();
+ addCssReferenceDialogBot = null;
+ }
+ if (optionsDialogBot != null){
+ optionsDialogBot.button(IDELabel.Button.OK).click();
+ optionsDialogBot = null;
+ }
+ }
+
+ @Override
+ protected boolean isUnuseDialogOpened() {
+ return optionsDialogBot != null
+ || addCssReferenceDialogBot != null;
+ }
+
+}
Property changes on: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/pagedesign/IncludedCssFilesJSPTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/pagedesign/IncludedCssFilesTest.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/pagedesign/IncludedCssFilesTest.java 2010-12-16 23:42:39 UTC (rev 27570)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/pagedesign/IncludedCssFilesTest.java 2010-12-17 02:01:47 UTC (rev 27571)
@@ -11,7 +11,6 @@
******************************************************************************/
package org.jboss.tools.vpe.ui.bot.test.editor.pagedesign;
-import static org.eclipse.swtbot.swt.finder.matchers.WidgetMatcherFactory.allOf;
import static org.eclipse.swtbot.swt.finder.matchers.WidgetMatcherFactory.widgetOfType;
import java.io.File;
@@ -19,10 +18,8 @@
import java.util.List;
import org.eclipse.swt.browser.Browser;
-import org.eclipse.swt.widgets.Widget;
import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotEditor;
import org.eclipse.swtbot.swt.finder.SWTBot;
-import org.eclipse.swtbot.swt.finder.widgets.SWTBotBrowser;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree;
import org.hamcrest.Matcher;
import org.jboss.tools.ui.bot.ext.SWTBotExt;
@@ -99,6 +96,7 @@
SWTBotEditorExt botEditorExt = new SWTBotExt().swtBotEditorExtByTitle(IncludedCssFilesTest.HTML_FILE_NAME);
botEditorExt.selectPage(IDELabel.VisualPageEditor.PREVIEW_TAB_LABEL);
Matcher<Browser> matcher = widgetOfType(Browser.class);
+ @SuppressWarnings("unchecked")
List<Browser> browsers = ((List<Browser>)botEditorExt.bot().widgets(matcher));
Browser browser0 = browsers.get(0);
Browser browser1 = browsers.get(1);
14 years
JBoss Tools SVN: r27570 - trunk/build/target-platform.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-12-16 18:42:39 -0500 (Thu, 16 Dec 2010)
New Revision: 27570
Modified:
trunk/build/target-platform/jbds.target
Log:
refactor
Modified: trunk/build/target-platform/jbds.target
===================================================================
--- trunk/build/target-platform/jbds.target 2010-12-16 23:42:30 UTC (rev 27569)
+++ trunk/build/target-platform/jbds.target 2010-12-16 23:42:39 UTC (rev 27570)
@@ -140,4 +140,4 @@
<repository location="http://download.eclipse.org/releases/helios/"/>
</location>
</locations>
-</target>
\ No newline at end of file
+</target>
14 years