JBoss Tools SVN: r41072 - trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/views.
by jbosstools-commits@lists.jboss.org
Author: bfitzpat
Date: 2012-05-16 11:23:08 -0400 (Wed, 16 May 2012)
New Revision: 41072
Modified:
trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/views/JAXRSWSTestView2.java
Log:
JBIDE-11294 - working around URL issue in a separate spot
Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/views/JAXRSWSTestView2.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/views/JAXRSWSTestView2.java 2012-05-16 15:02:26 UTC (rev 41071)
+++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/views/JAXRSWSTestView2.java 2012-05-16 15:23:08 UTC (rev 41072)
@@ -1858,7 +1858,11 @@
JBossWSUIPlugin.PLUGIN_ID,
JBossWSUIMessages.JAXRSWSTestView_Exception_Status + e.getLocalizedMessage());
status.setResultsText(e.toString());
- JBossWSUIPlugin.log(e);
+ // this fix is to address JBIDE-11294 and the fact that we shouldn't actually log this exception from deep
+ // within the WS API.
+ if ((!e.getLocalizedMessage().contains("Unsupported endpoint address: REPLACE_WITH_ACTUAL_URL"))) { //$NON-NLS-1$
+ JBossWSUIPlugin.log(e);
+ }
return status;
}
12 years, 8 months
JBoss Tools SVN: r41071 - trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example.
by jbosstools-commits@lists.jboss.org
Author: ljelinko
Date: 2012-05-16 11:02:26 -0400 (Wed, 16 May 2012)
New Revision: 41071
Modified:
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/RichFacesPortletExampleGatein.java
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/SeamPortletExampleGatein.java
Log:
Removed code not needed any more.
Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/RichFacesPortletExampleGatein.java
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/RichFacesPortletExampleGatein.java 2012-05-16 14:25:30 UTC (rev 41070)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/RichFacesPortletExampleGatein.java 2012-05-16 15:02:26 UTC (rev 41071)
@@ -9,12 +9,8 @@
*/
public class RichFacesPortletExampleGatein extends AbstractPortletExampleGatein {
- private static final String PROJECT_NAME_IN_WIZARD = "RichFacesPortlet";
-
private static final String PROJECT_NAME_IN_WORKSPACE = "RichfacesPortlet";
- private int getProjectNameMethodCallCounter = 0;
-
@Override
public String getExampleName() {
return "JBoss Portlet Bridge - RichFaces Application";
@@ -22,11 +18,6 @@
@Override
public String[] getProjectNames() {
- // an ugly hack to pass the assert that the project name in wizard is the same as project name in workspace
- if (getProjectNameMethodCallCounter <= 1){
- getProjectNameMethodCallCounter++;
- return new String[]{PROJECT_NAME_IN_WIZARD};
- }
return new String[]{PROJECT_NAME_IN_WORKSPACE};
}
}
Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/SeamPortletExampleGatein.java
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/SeamPortletExampleGatein.java 2012-05-16 14:25:30 UTC (rev 41070)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/SeamPortletExampleGatein.java 2012-05-16 15:02:26 UTC (rev 41071)
@@ -17,16 +17,12 @@
@Require(db=@DB, seam=@Seam, server=@Server(version="5.0", operator=">", state=ServerState.Running, type=ServerType.EPP))
public class SeamPortletExampleGatein extends AbstractPortletExampleGatein {
- private static final String PROJECT_NAME_IN_WIZARD = "SeamPortlet";
-
private static final String PROJECT_NAME_EAR = "seam-portlet-ear";
private static final String PROJECT_NAME_EJB = "seam-portlet-ejb";
private static final String PROJECT_NAME_WAR = "seam-portlet-web";
- private int getProjectNameMethodCallCounter = 0;
-
@Override
public String getExampleName() {
return "JBoss Portlet Bridge - Seam Portlet";
@@ -34,11 +30,6 @@
@Override
public String[] getProjectNames() {
- // an ugly hack to pass the assert that the project name in wizard is the same as project name in workspace
- if (getProjectNameMethodCallCounter <= 1){
- getProjectNameMethodCallCounter++;
- return new String[]{PROJECT_NAME_IN_WIZARD};
- }
return new String[]{PROJECT_NAME_EAR, PROJECT_NAME_EJB, PROJECT_NAME_WAR};
}
}
12 years, 8 months
JBoss Tools SVN: r41070 - trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/src/org/jboss/tools/archives/ui/bot/test.
by jbosstools-commits@lists.jboss.org
Author: jjankovi
Date: 2012-05-16 10:25:30 -0400 (Wed, 16 May 2012)
New Revision: 41070
Modified:
trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/src/org/jboss/tools/archives/ui/bot/test/ArchivesAllBotTests.java
Log:
removing example test from archives test suite
Modified: trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/src/org/jboss/tools/archives/ui/bot/test/ArchivesAllBotTests.java
===================================================================
--- trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/src/org/jboss/tools/archives/ui/bot/test/ArchivesAllBotTests.java 2012-05-16 14:23:21 UTC (rev 41069)
+++ trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/src/org/jboss/tools/archives/ui/bot/test/ArchivesAllBotTests.java 2012-05-16 14:25:30 UTC (rev 41070)
@@ -20,7 +20,6 @@
*/
@RunWith(RequirementAwareSuite.class)
@SuiteClasses({
- ExampleTest.class
})
public class ArchivesAllBotTests {
12 years, 8 months
JBoss Tools SVN: r41069 - in trunk/archives/tests: org.jboss.tools.archives.ui.bot.test/src/org/jboss/tools/archives/ui/bot/test and 1 other directory.
by jbosstools-commits@lists.jboss.org
Author: jjankovi
Date: 2012-05-16 10:23:21 -0400 (Wed, 16 May 2012)
New Revision: 41069
Modified:
trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/src/org/jboss/tools/archives/ui/bot/test/Activator.java
trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/src/org/jboss/tools/archives/ui/bot/test/ArchivesAllBotTests.java
trunk/archives/tests/pom.xml
Log:
archives bot test is now included as module in tests' pom.xml
Modified: trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/src/org/jboss/tools/archives/ui/bot/test/Activator.java
===================================================================
--- trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/src/org/jboss/tools/archives/ui/bot/test/Activator.java 2012-05-16 14:21:40 UTC (rev 41068)
+++ trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/src/org/jboss/tools/archives/ui/bot/test/Activator.java 2012-05-16 14:23:21 UTC (rev 41069)
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2010-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.archives.ui.bot.test;
import org.osgi.framework.BundleActivator;
@@ -3,8 +13,16 @@
import org.osgi.framework.BundleContext;
+/**
+ *
+ * @author jjankovi
+ *
+ */
public class Activator implements BundleActivator {
private static BundleContext context;
+ // The plug-in ID
+ public static final String PLUGIN_ID = "org.jboss.tools.archives.ui.bot.test";
+
static BundleContext getContext() {
return context;
Modified: trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/src/org/jboss/tools/archives/ui/bot/test/ArchivesAllBotTests.java
===================================================================
--- trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/src/org/jboss/tools/archives/ui/bot/test/ArchivesAllBotTests.java 2012-05-16 14:21:40 UTC (rev 41068)
+++ trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/src/org/jboss/tools/archives/ui/bot/test/ArchivesAllBotTests.java 2012-05-16 14:23:21 UTC (rev 41069)
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2010-2011 Red Hat, Inc.
+ * Copyright (c) 2010-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,
@@ -20,7 +20,7 @@
*/
@RunWith(RequirementAwareSuite.class)
@SuiteClasses({
-
+ ExampleTest.class
})
public class ArchivesAllBotTests {
Modified: trunk/archives/tests/pom.xml
===================================================================
--- trunk/archives/tests/pom.xml 2012-05-16 14:21:40 UTC (rev 41068)
+++ trunk/archives/tests/pom.xml 2012-05-16 14:23:21 UTC (rev 41069)
@@ -13,6 +13,7 @@
<modules>
<module>org.jboss.ide.eclipse.archives.test</module>
<module>org.jboss.ide.eclipse.archives.ui.test</module>
+ <module>org.jboss.tools.archives.ui.bot.test</module>
</modules>
</project>
12 years, 8 months
JBoss Tools SVN: r41068 - trunk/archives/features/org.jboss.ide.eclipse.archives.test.feature.
by jbosstools-commits@lists.jboss.org
Author: jjankovi
Date: 2012-05-16 10:21:40 -0400 (Wed, 16 May 2012)
New Revision: 41068
Modified:
trunk/archives/features/org.jboss.ide.eclipse.archives.test.feature/feature.xml
Log:
archives.ui.bot.test is now included in archives.test.feature
Modified: trunk/archives/features/org.jboss.ide.eclipse.archives.test.feature/feature.xml
===================================================================
--- trunk/archives/features/org.jboss.ide.eclipse.archives.test.feature/feature.xml 2012-05-16 14:14:38 UTC (rev 41067)
+++ trunk/archives/features/org.jboss.ide.eclipse.archives.test.feature/feature.xml 2012-05-16 14:21:40 UTC (rev 41068)
@@ -21,4 +21,5 @@
<plugin id="org.jboss.ide.eclipse.archives.test" download-size="0" install-size="0" version="0.0.0" />
<plugin id="org.jboss.ide.eclipse.archives.ui.test" download-size="0" install-size="0" version="0.0.0" />
+ <plugin id="org.jboss.tools.archives.ui.bot.test" download-size="0" install-size="0" version="0.0.0" />
</feature>
12 years, 8 months
JBoss Tools SVN: r41067 - trunk/cdi/tests.
by jbosstools-commits@lists.jboss.org
Author: jjankovi
Date: 2012-05-16 10:14:38 -0400 (Wed, 16 May 2012)
New Revision: 41067
Modified:
trunk/cdi/tests/pom.xml
Log:
seam3 bot test is now included as module in tests' pom.xml
Modified: trunk/cdi/tests/pom.xml
===================================================================
--- trunk/cdi/tests/pom.xml 2012-05-16 14:00:51 UTC (rev 41066)
+++ trunk/cdi/tests/pom.xml 2012-05-16 14:14:38 UTC (rev 41067)
@@ -37,6 +37,7 @@
<modules>
<module>org.jboss.tools.cdi.bot.test</module>
<module>org.jboss.tools.cdi.core.test</module>
+ <module>org.jboss.tools.cdi.seam3.bot.test</module>
<module>org.jboss.tools.cdi.seam.config.core.test</module>
<module>org.jboss.tools.cdi.seam.config.ui.test</module>
<module>org.jboss.tools.cdi.seam.core.test</module>
12 years, 8 months
JBoss Tools SVN: r41066 - trunk/cdi/features/org.jboss.tools.cdi.seam.test.feature.
by jbosstools-commits@lists.jboss.org
Author: jjankovi
Date: 2012-05-16 10:00:51 -0400 (Wed, 16 May 2012)
New Revision: 41066
Modified:
trunk/cdi/features/org.jboss.tools.cdi.seam.test.feature/feature.xml
Log:
seam3.bot.test is now included in cdi.seam.test.feature
Modified: trunk/cdi/features/org.jboss.tools.cdi.seam.test.feature/feature.xml
===================================================================
--- trunk/cdi/features/org.jboss.tools.cdi.seam.test.feature/feature.xml 2012-05-16 13:35:07 UTC (rev 41065)
+++ trunk/cdi/features/org.jboss.tools.cdi.seam.test.feature/feature.xml 2012-05-16 14:00:51 UTC (rev 41066)
@@ -23,7 +23,8 @@
<import plugin="org.eclipse.debug.core" version="3.2.0" match="compatible" />
<import feature="org.jboss.tools.cdi.test.feature" version="1.0.0" match="compatible" />
</requires>
-
+
+ <plugin id="org.jboss.tools.cdi.seam3.bot.test" download-size="0" install-size="0" version="0.0.0" />
<plugin id="org.jboss.tools.cdi.seam.config.core.test" download-size="0" install-size="0" version="0.0.0" />
<plugin id="org.jboss.tools.cdi.seam.config.ui.test" download-size="0" install-size="0" version="0.0.0" />
<plugin id="org.jboss.tools.cdi.seam.core.test" download-size="0" install-size="0" version="0.0.0" />
12 years, 8 months
JBoss Tools SVN: r41065 - in trunk/build/aggregate/soatests-site/tests/org.jboss.tools.drools.ui.bot.test: META-INF and 2 other directories.
by jbosstools-commits@lists.jboss.org
Author: jgargula
Date: 2012-05-16 09:35:07 -0400 (Wed, 16 May 2012)
New Revision: 41065
Added:
trunk/build/aggregate/soatests-site/tests/org.jboss.tools.drools.ui.bot.test/resources/SWTBotTest.properties
Modified:
trunk/build/aggregate/soatests-site/tests/org.jboss.tools.drools.ui.bot.test/META-INF/MANIFEST.MF
trunk/build/aggregate/soatests-site/tests/org.jboss.tools.drools.ui.bot.test/pom.xml
trunk/build/aggregate/soatests-site/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tools/drools/ui/bot/test/smoke/DroolsViewsTest.java
Log:
Added support for lunching from maven.
Modified: trunk/build/aggregate/soatests-site/tests/org.jboss.tools.drools.ui.bot.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/build/aggregate/soatests-site/tests/org.jboss.tools.drools.ui.bot.test/META-INF/MANIFEST.MF 2012-05-16 13:28:31 UTC (rev 41064)
+++ trunk/build/aggregate/soatests-site/tests/org.jboss.tools.drools.ui.bot.test/META-INF/MANIFEST.MF 2012-05-16 13:35:07 UTC (rev 41065)
@@ -12,7 +12,7 @@
org.eclipse.swtbot.swt.finder;bundle-version="2.0.0",
org.junit4;bundle-version="4.5.0",
org.jboss.tools.ui.bot.ext,
- org.drools.eclipse;bundle-version="5.3.0",
+ org.drools.eclipse;bundle-version="5.3.1",
org.eclipse.swtbot.eclipse.gef.finder,
org.apache.log4j;bundle-version="1.2.13"
Bundle-ActivationPolicy: lazy
Modified: trunk/build/aggregate/soatests-site/tests/org.jboss.tools.drools.ui.bot.test/pom.xml
===================================================================
--- trunk/build/aggregate/soatests-site/tests/org.jboss.tools.drools.ui.bot.test/pom.xml 2012-05-16 13:28:31 UTC (rev 41064)
+++ trunk/build/aggregate/soatests-site/tests/org.jboss.tools.drools.ui.bot.test/pom.xml 2012-05-16 13:35:07 UTC (rev 41065)
@@ -1,27 +1,43 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.jboss.tools.soa-tooling</groupId>
- <artifactId>org.jboss.tools.soa-tooling.tests</artifactId>
- <version>0.0.1-SNAPSHOT</version>
- </parent>
- <groupId>org.jboss.tools</groupId>
- <artifactId>org.jboss.tools.drools.ui.bot.test</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- <packaging>eclipse-test-plugin</packaging>
- <build>
- <plugins>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-surefire-plugin</artifactId>
- <version>${tychoVersion}</version>
- <configuration>
- <useUIThread>false</useUIThread>
- <testSuite>org.jboss.tools.drools.ui.bot.test</testSuite>
- <testClass>org.jboss.tools.drools.ui.bot.test.DroolsAllBotTests</testClass>
- </configuration>
- </plugin>
- </plugins>
- </build>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.jboss.tools.soa-tooling</groupId>
+ <artifactId>org.jboss.tools.soa-tooling.tests</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ </parent>
+ <groupId>org.jboss.tools</groupId>
+ <artifactId>org.jboss.tools.drools.ui.bot.test</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <packaging>eclipse-test-plugin</packaging>
+ <properties>
+ <systemProperties>-Dswtbot.test.skip=false -Dtest.configurations.dir=resources/</systemProperties>
+ </properties>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-surefire-plugin</artifactId>
+ <version>${tychoVersion}</version>
+ <configuration>
+ <useUIThread>false</useUIThread>
+ <testSuite>org.jboss.tools.drools.ui.bot.test</testSuite>
+ <testClass>org.jboss.tools.drools.ui.bot.test.DroolsAllBotTests</testClass>
+ <dependencies combine.children="append">
+ <dependency>
+ <type>p2-installable-unit</type>
+ <artifactId>org.jboss.ide.eclipse.as.feature.feature.group</artifactId>
+ <version>0.0.0</version>
+ </dependency>
+ <dependency>
+ <type>p2-installable-unit</type>
+ <artifactId>org.guvnor.tools.feature.feature.group</artifactId>
+ <version>5.3.1</version>
+ </dependency>
+ </dependencies>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
Added: trunk/build/aggregate/soatests-site/tests/org.jboss.tools.drools.ui.bot.test/resources/SWTBotTest.properties
===================================================================
--- trunk/build/aggregate/soatests-site/tests/org.jboss.tools.drools.ui.bot.test/resources/SWTBotTest.properties (rev 0)
+++ trunk/build/aggregate/soatests-site/tests/org.jboss.tools.drools.ui.bot.test/resources/SWTBotTest.properties 2012-05-16 13:35:07 UTC (rev 41065)
@@ -0,0 +1,10 @@
+# SWTBotTest properties
+# all properties are optional, all defined paths should exist
+# <java version>,<jre/jdk home>
+# JAVA=1.6,/opt/sun-jdk-1.6.0.19/jre
+JAVA=1.6,/usr/lib/jvm/jre-1.6.0-openjdk.x86_64/
+# EAP|AS|EPP|SOA,<server version>,<jre version to run with>|default,<server home>,<optional remote system host>,<optional remote home>
+# note : when server is type of SOA, version is version of SOA (not the bundled EAP)
+# SERVER=EAP,5.0,1.6,/data/jboss/jboss-eap-5.0/jboss-as
+#SERVER=EAP,4.3,1.6,${jbosstools.test.jboss-eap.home}
+SERVER=EAP,4.3,1.6,/home/jgargula/Programs/jboss-eap-5.1/jboss-as
Modified: trunk/build/aggregate/soatests-site/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tools/drools/ui/bot/test/smoke/DroolsViewsTest.java
===================================================================
--- trunk/build/aggregate/soatests-site/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tools/drools/ui/bot/test/smoke/DroolsViewsTest.java 2012-05-16 13:28:31 UTC (rev 41064)
+++ trunk/build/aggregate/soatests-site/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tools/drools/ui/bot/test/smoke/DroolsViewsTest.java 2012-05-16 13:35:07 UTC (rev 41065)
@@ -68,7 +68,7 @@
}
bot.waitForNumberOfShells(1);
-
+
// waits for running debugging
while (!eclipse.isDebugging()) {
bot.sleep(Timing.time500MS());
@@ -166,6 +166,9 @@
/**
* Tests refreshing of Agenda view.
+ *
+ * This test is ignored because it's not a bug, it should be feature
+ * https://issues.jboss.org/browse/JBIDE-10682
*/
@Test
@Ignore
12 years, 8 months
JBoss Tools SVN: r41064 - trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action.
by jbosstools-commits@lists.jboss.org
Author: adietish
Date: 2012-05-16 09:28:31 -0400 (Wed, 16 May 2012)
New Revision: 41064
Modified:
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/CreateOrEditDomainAction.java
Log:
code cleanup
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/CreateOrEditDomainAction.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/CreateOrEditDomainAction.java 2012-05-16 12:54:06 UTC (rev 41063)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/CreateOrEditDomainAction.java 2012-05-16 13:28:31 UTC (rev 41064)
@@ -41,31 +41,30 @@
if (selection instanceof ITreeSelection
&& treeSelection.getFirstElement() instanceof UserDelegate) {
final UserDelegate user = (UserDelegate) treeSelection.getFirstElement();
- IWizard domainDialog = createDomainWizard(user);
- WizardDialog dialog = new WizardDialog(Display.getCurrent().getActiveShell(), domainDialog);
+ WizardDialog dialog = new WizardDialog(Display.getCurrent().getActiveShell(), createDomainWizard(user));
dialog.create();
dialog.open();
}
}
private IWizard createDomainWizard(final UserDelegate user) {
- IWizard domainDialog;
+ IWizard domainWizard;
try {
if (user.getDefaultDomain() == null || user.getDefaultDomain().getId() == null) {
- domainDialog = new NewDomainDialog(user);
+ domainWizard = new NewDomainDialog(user);
} else {
- domainDialog = new EditDomainDialog(user);
+ domainWizard = new EditDomainDialog(user);
}
} catch (OpenShiftException e) {
Logger.warn("Failed to retrieve User domain, prompting for creation", e);
// let's use the domain creation wizard, then.
- domainDialog = new NewDomainDialog(user);
- } catch (SocketTimeoutException e) {
+ domainWizard = new NewDomainDialog(user);
+ } catch (SocketTimeoutException e) {
Logger.warn("Failed to retrieve User domain, prompting for creation", e);
// let's use the domain creation wizard, then.
- domainDialog = new NewDomainDialog(user);
+ domainWizard = new NewDomainDialog(user);
}
- return domainDialog;
+ return domainWizard;
}
}
12 years, 8 months
JBoss Tools SVN: r41063 - in trunk/openshift/plugins/org.jboss.tools.openshift.express.ui: src/org/jboss/tools/openshift/express/internal/ui/action and 2 other directories.
by jbosstools-commits@lists.jboss.org
Author: xcoulon
Date: 2012-05-16 08:54:06 -0400 (Wed, 16 May 2012)
New Revision: 41063
Added:
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/ShowDetailsAction.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/actionProvider/ShowDetailsActionProvider.java
Modified:
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/plugin.xml
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/messages/OpenShiftExpressUIMessages.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/messages/OpenShiftExpressUIMessages.properties
Log:
Fixed - JBIDE-11629
Make "Details..." available from OpenShift Explorer
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/plugin.xml
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/plugin.xml 2012-05-16 12:43:18 UTC (rev 41062)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/plugin.xml 2012-05-16 12:54:06 UTC (rev 41063)
@@ -506,7 +506,17 @@
</enablement>
</actionProvider>
<actionProvider
- appearsBefore="org.jboss.tools.openshift.express.internal.ui.viewer.actionProvider.showPropertiesActionProvider"
+ class="org.jboss.tools.openshift.express.internal.ui.viewer.actionProvider.ShowDetailsActionProvider"
+ id="org.jboss.tools.openshift.express.internal.ui.viewer.actionProvider.showDetailsActionProvider">
+ <enablement>
+ <or>
+ <instanceof
+ value="com.openshift.client.IApplication">
+ </instanceof>
+ </or>
+ </enablement>
+ </actionProvider>
+ <actionProvider
class="org.jboss.tools.openshift.express.internal.ui.viewer.actionProvider.ShowEnvironmentActionProvider"
id="org.jboss.tools.openshift.express.internal.ui.viewer.actionProvider.showEnvironmentActionProvider">
<enablement>
Added: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/ShowDetailsAction.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/ShowDetailsAction.java (rev 0)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/ShowDetailsAction.java 2012-05-16 12:54:06 UTC (rev 41063)
@@ -0,0 +1,48 @@
+/*******************************************************************************
+ * Copyright (c) 2011 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.openshift.express.internal.ui.action;
+
+import org.eclipse.jface.viewers.ITreeSelection;
+import org.eclipse.swt.widgets.Display;
+import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator;
+import org.jboss.tools.openshift.express.internal.ui.messages.OpenShiftExpressUIMessages;
+import org.jboss.tools.openshift.express.internal.ui.wizard.ApplicationDetailsDialog;
+
+import com.openshift.client.IApplication;
+
+/**
+ * @author Xavier Coulon
+ */
+public class ShowDetailsAction extends AbstractAction {
+
+ public ShowDetailsAction() {
+ super(OpenShiftExpressUIMessages.SHOW_DETAILS_ACTION, true);
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see org.eclipse.jface.action.Action#run()
+ */
+ @Override
+ public void run() {
+ try {
+ final ITreeSelection treeSelection = (ITreeSelection) selection;
+ if (selection instanceof ITreeSelection && treeSelection.getFirstElement() instanceof IApplication) {
+ final IApplication application = (IApplication) treeSelection.getFirstElement();
+ new ApplicationDetailsDialog(application, Display.getDefault().getActiveShell()).open();
+ }
+ } catch (Exception e) {
+ OpenShiftUIActivator.createErrorStatus("Failed to display application details", e);
+ }
+
+ }
+
+}
Property changes on: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/ShowDetailsAction.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/messages/OpenShiftExpressUIMessages.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/messages/OpenShiftExpressUIMessages.java 2012-05-16 12:43:18 UTC (rev 41062)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/messages/OpenShiftExpressUIMessages.java 2012-05-16 12:54:06 UTC (rev 41063)
@@ -43,6 +43,8 @@
public static String SHOW_ENVIRONMENT_ACTION;
+ public static String SHOW_DETAILS_ACTION;
+
public static String REFRESH_VIEWER_ACTION;
public static String REFRESH_USER_ACTION;
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/messages/OpenShiftExpressUIMessages.properties
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/messages/OpenShiftExpressUIMessages.properties 2012-05-16 12:43:18 UTC (rev 41062)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/messages/OpenShiftExpressUIMessages.properties 2012-05-16 12:54:06 UTC (rev 41063)
@@ -14,7 +14,9 @@
EDIT_CARTRIDGES_ACTION=Edit Embedded Cartridges...
MAKE_SNAPSHOT_ACTION=Pull down Application Snapshot
-SHOW_PROPERTIES_VIEW_ACTION=Properties
+SHOW_PROPERTIES_VIEW_ACTION=Show Properties
+SHOW_DETAILS_ACTION=Show Details...
+
REFRESH_VIEWER_ACTION=Refresh
REFRESH_USER_ACTION=Refresh
SHOW_ENVIRONMENT_ACTION=Show Environment Variables
Added: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/actionProvider/ShowDetailsActionProvider.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/actionProvider/ShowDetailsActionProvider.java (rev 0)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/actionProvider/ShowDetailsActionProvider.java 2012-05-16 12:54:06 UTC (rev 41063)
@@ -0,0 +1,24 @@
+/*******************************************************************************
+ * Copyright (c) 2011 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.openshift.express.internal.ui.viewer.actionProvider;
+
+import org.jboss.tools.openshift.express.internal.ui.action.ShowDetailsAction;
+
+/**
+ * @author Xavier Coulon
+ */
+public class ShowDetailsActionProvider extends AbstractActionProvider {
+
+ public ShowDetailsActionProvider() {
+ super(new ShowDetailsAction(), "group.properties");
+ }
+
+}
Property changes on: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/actionProvider/ShowDetailsActionProvider.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
12 years, 8 months