JBoss Tools SVN: r39529 - trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/dialogs.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2012-03-15 09:03:58 -0400 (Thu, 15 Mar 2012)
New Revision: 39529
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/dialogs/ModifyDeploymentScannerIntervalDialog.java
Log:
Override tag (the bane of my existence) causing build errors.
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/dialogs/ModifyDeploymentScannerIntervalDialog.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/dialogs/ModifyDeploymentScannerIntervalDialog.java 2012-03-15 12:22:46 UTC (rev 39528)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/dialogs/ModifyDeploymentScannerIntervalDialog.java 2012-03-15 13:03:58 UTC (rev 39529)
@@ -268,8 +268,6 @@
}
private class ScannerCellModifier implements ICellModifier {
-
- @Override
public boolean canModify(Object element, String property) {
return property.equals(headings[1]);
}
12 years, 8 months
JBoss Tools SVN: r39528 - trunk/build/aggregate/bottests-site/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tools/drools/ui/bot/test/smoke.
by jbosstools-commits＠lists.jboss.org
Author: jgargula
Date: 2012-03-15 08:22:46 -0400 (Thu, 15 Mar 2012)
New Revision: 39528
Modified:
trunk/build/aggregate/bottests-site/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tools/drools/ui/bot/test/smoke/GuvnorRepositoriesTest.java
Log:
Improved waiting for generating repository.
Modified: trunk/build/aggregate/bottests-site/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tools/drools/ui/bot/test/smoke/GuvnorRepositoriesTest.java
===================================================================
--- trunk/build/aggregate/bottests-site/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tools/drools/ui/bot/test/smoke/GuvnorRepositoriesTest.java 2012-03-15 11:12:38 UTC (rev 39527)
+++ trunk/build/aggregate/bottests-site/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tools/drools/ui/bot/test/smoke/GuvnorRepositoriesTest.java 2012-03-15 12:22:46 UTC (rev 39528)
@@ -154,7 +154,12 @@
bot.sleep(Timing.time1S());
KeyboardHelper.pressKeyCodeUsingAWT(KeyEvent.VK_ENTER);
KeyboardHelper.releaseKeyCodeUsingAWT(KeyEvent.VK_ENTER);
- bot.sleep(Timing.time30S()); // so long because of NFS filesystem on remote machines
+ for (int i = 0; i < 60; i++) {
+ bot.sleep(Timing.time2S());
+ if (console.getConsoleText(1000L,1000L,true).trim().endsWith("Session closed")) {
+ break;
+ }
+ }
KeyboardHelper.pressKeyCodeUsingAWT(KeyEvent.VK_ENTER);
KeyboardHelper.releaseKeyCodeUsingAWT(KeyEvent.VK_ENTER);
}
12 years, 8 months
JBoss Tools SVN: r39527 - trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test.
by jbosstools-commits＠lists.jboss.org
Author: jpeterka
Date: 2012-03-15 07:12:38 -0400 (Thu, 15 Mar 2012)
New Revision: 39527
Removed:
trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/db/
trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/hbbot-via-maven.launch
trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/hibernate.cfg.xml
trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/launchers/
trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/launchers35/
trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/lib/
Modified:
trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/.classpath
trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/.project
trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/build.properties
Log:
hb bot test cleanup
Modified: trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/.classpath
===================================================================
--- trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/.classpath 2012-03-15 11:12:05 UTC (rev 39526)
+++ trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/.classpath 2012-03-15 11:12:38 UTC (rev 39527)
@@ -3,6 +3,6 @@
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
- <classpathentry exported="true" kind="lib" path="lib/hsqldb.jar"/>
+ <classpathentry kind="lib" path="/home/jpeterka/lib/hamcrest/hamcrest-core-1.2.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Modified: trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/.project
===================================================================
--- trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/.project 2012-03-15 11:12:05 UTC (rev 39526)
+++ trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/.project 2012-03-15 11:12:38 UTC (rev 39527)
@@ -37,4 +37,21 @@
<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
</natures>
+ <linkedResources>
+ <link>
+ <name>lib-org.jboss.tools.common.text.ext_3.3.0.v20111208-2036-H34-M5</name>
+ <type>2</type>
+ <location>/home/jpeterka/ide/test/jbds5m5h62/studio/plugins/org.jboss.tools.common.text.ext_3.3.0.v20111208-2036-H34-M5</location>
+ </link>
+ <link>
+ <name>lib-org.jboss.tools.common.text.xml_3.3.0.v20111208-2036-H34-M5</name>
+ <type>2</type>
+ <location>/home/jpeterka/ide/test/jbds5m5h62/studio/plugins/org.jboss.tools.common.text.xml_3.3.0.v20111208-2036-H34-M5</location>
+ </link>
+ <link>
+ <name>lib-org.jboss.tools.common_3.3.0.v20111208-2036-H34-M5</name>
+ <type>2</type>
+ <location>/home/jpeterka/ide/test/jbds5m5h62/studio/plugins/org.jboss.tools.common_3.3.0.v20111208-2036-H34-M5</location>
+ </link>
+ </linkedResources>
</projectDescription>
Modified: trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/build.properties
===================================================================
--- trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/build.properties 2012-03-15 11:12:05 UTC (rev 39526)
+++ trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/build.properties 2012-03-15 11:12:38 UTC (rev 39527)
@@ -2,4 +2,6 @@
output.. = bin/
bin.includes = META-INF/,\
.,\
- lib/hsqldb.jar
+ lib/hsqldb.jar,\
+ resources/src/org.jboss.hibernate.test/,\
+ resources/prj/
Deleted: trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/hbbot-via-maven.launch
===================================================================
--- trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/hbbot-via-maven.launch 2012-03-15 11:12:05 UTC (rev 39526)
+++ trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/hbbot-via-maven.launch 2012-03-15 11:12:38 UTC (rev 39527)
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.m2e.Maven2LaunchConfigurationType">
-<booleanAttribute key="M2_DEBUG_OUTPUT" value="false"/>
-<stringAttribute key="M2_GOALS" value="integration-test"/>
-<booleanAttribute key="M2_NON_RECURSIVE" value="false"/>
-<booleanAttribute key="M2_OFFLINE" value="false"/>
-<stringAttribute key="M2_PROFILES" value=""/>
-<listAttribute key="M2_PROPERTIES">
-<listEntry value="swt.test.skip=false"/>
-</listAttribute>
-<stringAttribute key="M2_RUNTIME" value="EMBEDDED"/>
-<booleanAttribute key="M2_SKIP_TESTS" value="false"/>
-<booleanAttribute key="M2_UPDATE_SNAPSHOTS" value="false"/>
-<booleanAttribute key="M2_WORKSPACE_RESOLUTION" value="false"/>
-<mapAttribute key="org.eclipse.debug.core.environmentVariables">
-<mapEntry key="DISPLAY" value=":0"/>
-</mapAttribute>
-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.6.0_27"/>
-<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:/org.jboss.tools.hibernate.ui.bot.test}"/>
-</launchConfiguration>
Deleted: trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/hibernate.cfg.xml
===================================================================
--- trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/hibernate.cfg.xml 2012-03-15 11:12:05 UTC (rev 39526)
+++ trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/hibernate.cfg.xml 2012-03-15 11:12:38 UTC (rev 39527)
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE hibernate-configuration PUBLIC
- "-//Hibernate/Hibernate Configuration DTD 3.0//EN"
- "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd">
-<hibernate-configuration>
- <session-factory>
- </session-factory>
-</hibernate-configuration>
12 years, 8 months
JBoss Tools SVN: r39526 - in trunk: birt/features/org.jboss.tools.birt.feature and 3 other directories.
by jbosstools-commits＠lists.jboss.org
Author: mickael_istria
Date: 2012-03-15 07:12:05 -0400 (Thu, 15 Mar 2012)
New Revision: 39526
Removed:
trunk/birt/features/org.jboss.tools.birt.source.feature/
trunk/birt/features/org.jboss.tools.birt.test.source.feature/
Modified:
trunk/birt/features/org.jboss.tools.birt.feature/pom.xml
trunk/birt/features/org.jboss.tools.birt.test.feature/pom.xml
trunk/birt/features/pom.xml
trunk/birt/site/category.xml
trunk/build/parent/pom.xml
Log:
JBIDE-8838
* Change parent to add a tychoExtrasVersion
* Tentative on birt
-> Remove previous source features
-> Generate feature with tycho-source-feature-plugin
-> reference generated features in category.xml and removed previous manual source features (s/source.feature/feature.source)
Modified: trunk/birt/features/org.jboss.tools.birt.feature/pom.xml
===================================================================
--- trunk/birt/features/org.jboss.tools.birt.feature/pom.xml 2012-03-15 07:45:30 UTC (rev 39525)
+++ trunk/birt/features/org.jboss.tools.birt.feature/pom.xml 2012-03-15 11:12:05 UTC (rev 39526)
@@ -9,4 +9,37 @@
<groupId>org.jboss.tools.birt.features</groupId>
<artifactId>org.jboss.tools.birt.feature</artifactId>
<packaging>eclipse-feature</packaging>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho.extras</groupId>
+ <artifactId>tycho-source-feature-plugin</artifactId>
+ <version>${tychoExtrasVersion}</version>
+ <executions>
+ <execution>
+ <id>source-feature</id>
+ <phase>package</phase>
+ <goals>
+ <goal>source-feature</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-p2-plugin</artifactId>
+ <version>${tychoVersion}</version>
+ <executions>
+ <execution>
+ <id>attached-p2-metadata</id>
+ <phase>package</phase>
+ <goals>
+ <goal>p2-metadata</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
Modified: trunk/birt/features/org.jboss.tools.birt.test.feature/pom.xml
===================================================================
--- trunk/birt/features/org.jboss.tools.birt.test.feature/pom.xml 2012-03-15 07:45:30 UTC (rev 39525)
+++ trunk/birt/features/org.jboss.tools.birt.test.feature/pom.xml 2012-03-15 11:12:05 UTC (rev 39526)
@@ -9,4 +9,37 @@
<groupId>org.jboss.tools.birt.features</groupId>
<artifactId>org.jboss.tools.birt.test.feature</artifactId>
<packaging>eclipse-feature</packaging>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho.extras</groupId>
+ <artifactId>tycho-source-feature-plugin</artifactId>
+ <version>${tychoExtrasVersion}</version>
+ <executions>
+ <execution>
+ <id>source-feature</id>
+ <phase>package</phase>
+ <goals>
+ <goal>source-feature</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-p2-plugin</artifactId>
+ <version>${tychoVersion}</version>
+ <executions>
+ <execution>
+ <id>attached-p2-metadata</id>
+ <phase>package</phase>
+ <goals>
+ <goal>p2-metadata</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
Modified: trunk/birt/features/pom.xml
===================================================================
--- trunk/birt/features/pom.xml 2012-03-15 07:45:30 UTC (rev 39525)
+++ trunk/birt/features/pom.xml 2012-03-15 11:12:05 UTC (rev 39526)
@@ -13,9 +13,7 @@
<packaging>pom</packaging>
<modules>
<module>org.jboss.tools.birt.feature</module>
- <module>org.jboss.tools.birt.source.feature</module>
<module>org.jboss.tools.birt.test.feature</module>
- <module>org.jboss.tools.birt.test.source.feature</module>
</modules>
</project>
Modified: trunk/birt/site/category.xml
===================================================================
--- trunk/birt/site/category.xml 2012-03-15 07:45:30 UTC (rev 39525)
+++ trunk/birt/site/category.xml 2012-03-15 11:12:05 UTC (rev 39526)
@@ -8,13 +8,13 @@
<feature url="features/org.jboss.tools.birt.feature_0.0.0.jar" id="org.jboss.tools.birt.feature" version="0.0.0">
<category name="JBoss Tools birt Nightly Build Update Site"/>
</feature>
- <feature url="features/org.jboss.tools.birt.source.feature_0.0.0.jar" id="org.jboss.tools.birt.source.feature" version="0.0.0">
+ <feature url="features/org.jboss.tools.birt.feature.source_0.0.0.jar" id="org.jboss.tools.birt.feature.source" version="0.0.0">
<category name="JBoss Tools birt Nightly Build Update Site"/>
</feature>
<feature url="features/org.jboss.tools.birt.test.feature_0.0.0.jar" id="org.jboss.tools.birt.test.feature" version="0.0.0">
<category name="JBoss Tools birt Nightly Build Update Site"/>
</feature>
- <feature url="features/org.jboss.tools.birt.test.source.feature_0.0.0.jar" id="org.jboss.tools.birt.test.source.feature" version="0.0.0">
+ <feature url="features/org.jboss.tools.birt.test.feature.source_0.0.0.jar" id="org.jboss.tools.birt.test.feature.source" version="0.0.0">
<category name="JBoss Tools birt Nightly Build Update Site"/>
</feature>
Modified: trunk/build/parent/pom.xml
===================================================================
--- trunk/build/parent/pom.xml 2012-03-15 07:45:30 UTC (rev 39525)
+++ trunk/build/parent/pom.xml 2012-03-15 11:12:05 UTC (rev 39526)
@@ -14,6 +14,7 @@
<properties>
<!-- to build w/ latest 0.15.0-SNAPSHOT, run `mvn install -DtychoVersion=0.15.0-SNAPSHOT` -->
<tychoVersion>0.14.1</tychoVersion>
+ <tychoExtrasVersion>0.14.0</tychoExtrasVersion>
<scmBranch>trunk</scmBranch>
<JBT_VERSION>3.3.0</JBT_VERSION>
<JBDS_VERSION>5.0.0</JBDS_VERSION>
12 years, 8 months
JBoss Tools SVN: r39525 - trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/utils.
by jbosstools-commits＠lists.jboss.org
Author: dgeraskov
Date: 2012-03-15 03:45:30 -0400 (Thu, 15 Mar 2012)
New Revision: 39525
Modified:
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/utils/ProjectUtils.java
Log:
https://issues.jboss.org/browse/JBIDE-11103
return only opened java projects
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/utils/ProjectUtils.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/utils/ProjectUtils.java 2012-03-15 00:59:20 UTC (rev 39524)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/utils/ProjectUtils.java 2012-03-15 07:45:30 UTC (rev 39525)
@@ -315,7 +315,7 @@
List<IJavaProject> res = new ArrayList<IJavaProject>();
for (int i = 0; i < projects.size(); i++) {
try {
- if (projects.get(i).hasNature(JavaCore.NATURE_ID)){
+ if (projects.get(i).isOpen() && projects.get(i).hasNature(JavaCore.NATURE_ID)){
res.add(JavaCore.create(projects.get(i)));
}
} catch (CoreException e) {
12 years, 8 months
JBoss Tools SVN: r39524 - in trunk/jst/plugins/org.jboss.tools.jst.web: src/org/jboss/tools/jst/web/server and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2012-03-14 20:59:20 -0400 (Wed, 14 Mar 2012)
New Revision: 39524
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web/META-INF/MANIFEST.MF
trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/server/ServerManager.java
trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/server/ServerManagerListener.java
Log:
JBIDE-11306
https://issues.jboss.org/browse/JBIDE-11306
'Run on Server' on struts/jsf objects. - removed dependence of jst on as.
Modified: trunk/jst/plugins/org.jboss.tools.jst.web/META-INF/MANIFEST.MF
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web/META-INF/MANIFEST.MF 2012-03-15 00:23:00 UTC (rev 39523)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/META-INF/MANIFEST.MF 2012-03-15 00:59:20 UTC (rev 39524)
@@ -11,7 +11,6 @@
Require-Bundle: org.jboss.tools.common.model;visibility:=reexport,
org.jboss.tools.common.projecttemplates;visibility:=reexport,
org.jboss.tools.common.validation,
- org.jboss.ide.eclipse.as.ui;visibility:=reexport,
org.eclipse.ui;bundle-version="3.7.0",
org.eclipse.jdt.launching;bundle-version="3.6.0",
org.eclipse.debug.ui;bundle-version="3.7.0",
Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/server/ServerManager.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/server/ServerManager.java 2012-03-15 00:23:00 UTC (rev 39523)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/server/ServerManager.java 2012-03-15 00:59:20 UTC (rev 39524)
@@ -10,5 +10,179 @@
******************************************************************************/
package org.jboss.tools.jst.web.server;
-public class ServerManager extends org.jboss.ide.eclipse.as.ui.actions.ServerManager {
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.core.runtime.preferences.DefaultScope;
+import org.eclipse.core.runtime.preferences.IEclipsePreferences;
+import org.eclipse.core.runtime.preferences.InstanceScope;
+import org.eclipse.wst.server.core.IRuntime;
+import org.eclipse.wst.server.core.IRuntimeLifecycleListener;
+import org.eclipse.wst.server.core.IServer;
+import org.eclipse.wst.server.core.IServerLifecycleListener;
+import org.eclipse.wst.server.core.IServerListener;
+import org.eclipse.wst.server.core.ServerCore;
+import org.eclipse.wst.server.core.ServerEvent;
+
+public class ServerManager {
+ private static ServerManager instance;
+
+ public static synchronized ServerManager getInstance() {
+ if(instance == null) {
+ instance = new ServerManager();
+ }
+ return instance;
+ }
+
+ private List<ServerManagerListener> listeners = new ArrayList<ServerManagerListener>();
+ private IServerListener serverListener;
+ protected IServer[] servers = new IServer[0];
+
+ IServer selected = null;
+
+ public ServerManager() {
+ serverListener = new ServerListenerImpl();
+ load();
+ }
+
+ void load() {
+ servers = (IServer[])ServerCore.getServers().clone();
+ loadSelectedServer();
+ ServerResourceListenerImpl listener = new ServerResourceListenerImpl();
+ ServerCore.addRuntimeLifecycleListener(listener);
+ ServerCore.addServerLifecycleListener(listener);
+ }
+
+ private void loadSelectedServer() {
+ if(servers == null || servers.length == 0) return;
+ String ds = getDefaultWebServer();
+ IServer s = getServer(ds);
+ if(s == null && servers.length > 0) {
+ s = servers[0];
+ setDefaultWebServer(servers[0].getId());
+ }
+ setSelectedServerInternal(s);
+ }
+
+ public IServer[] getServers() {
+ return servers;
+ }
+
+ public IServer getServer(String serverId) {
+ for (int i = 0; i < servers.length; i++) {
+ if(servers[i].getId().equals(serverId)) {
+ return servers[i];
+ }
+ }
+ return null;
+ }
+
+ public void addListener(ServerManagerListener listener) {
+ if(!listeners.contains(listener)) listeners.add(listener);
+ }
+
+ public void removeListener(ServerManagerListener listener) {
+ listeners.remove(listener);
+ }
+
+ void fire() {
+ ServerManagerListener[] ls = (ServerManagerListener[])listeners.toArray(new ServerManagerListener[0]);
+ for (int i = 0; i < ls.length; i++) {
+ ls[i].serverManagerChanged();
+ }
+ }
+
+ public void setSelectedServer(String id) {
+ IServer server = getServer(id);
+ if(server == selected) return;
+ setSelectedServerInternal(server);
+ setDefaultWebServer(id);
+ fire();
+ }
+
+ private void setSelectedServerInternal(IServer server) {
+ if(selected == server) return;
+ if(selected != null) selected.removeServerListener(serverListener);
+ selected = server;
+ if(selected != null) selected.addServerListener(serverListener);
+ }
+
+ public String getSelectedServerId() {
+ String result = getDefaultWebServer();
+ return result == null ? "" : result; //$NON-NLS-1$
+ }
+
+ public IServer getSelectedServer() {
+ return selected;
+ }
+
+ class ServerResourceListenerImpl implements IRuntimeLifecycleListener, IServerLifecycleListener {
+ public void serverAdded(IServer server) {
+ IServer[] ss = new IServer[servers.length + 1];
+ System.arraycopy(servers, 0, ss, 0, servers.length);
+ ss[servers.length] = server;
+ servers = ss;
+ loadSelectedServer();
+ fire();
+ }
+ public void serverChanged(IServer server) {
+ fire();
+ }
+ public void serverRemoved(IServer server) {
+ List<IServer> l = new ArrayList<IServer>();
+ for (int i = 0; i < servers.length; i++) {
+ if(servers[i] != server) l.add(servers[i]);
+ }
+ if(l.size() == servers.length) return;
+ servers = l.toArray(new IServer[0]);
+ loadSelectedServer();
+ fire();
+ }
+ public void runtimeAdded(IRuntime runtime) {
+ fire();
+ }
+ public void runtimeChanged(IRuntime runtime) {
+ fire();
+ }
+ public void runtimeRemoved(IRuntime runtime) {
+ fire();
+ }
+ }
+
+ class ServerListenerImpl implements IServerListener {
+ public void serverChanged(ServerEvent arg0) {
+ fire();
+ }
+ }
+
+ static String DEFAULT_WEB_SERVER = "org.jboss.ide.eclipse.as.ui" + ".defaultWebServer"; //$NON-NLS-1$
+
+ static String getDefaultWebServer() {
+ String result = getInstancePreference(DEFAULT_WEB_SERVER);
+ return result;
+ }
+
+ static void setDefaultWebServer(String value) {
+ getInstancePreferences().put(DEFAULT_WEB_SERVER, value);
+ }
+
+ static IEclipsePreferences getInstancePreferences() {
+ return new InstanceScope().getNode("org.jboss.ide.eclipse.as.ui");
+ }
+
+ static IEclipsePreferences getDefaultPreferences() {
+ return new DefaultScope().getNode("org.jboss.ide.eclipse.as.ui");
+ }
+
+ static String getInstancePreference(String key) {
+ IEclipsePreferences p = getInstancePreferences();
+ String value = p == null ? null : p.get(key, null);
+ return value != null ? value : getDefaultPreference(key);
+ }
+
+ static String getDefaultPreference(String key) {
+ IEclipsePreferences p = getDefaultPreferences();
+ return p == null ? null : p.get(key, null);
+ }
+
}
Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/server/ServerManagerListener.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/server/ServerManagerListener.java 2012-03-15 00:23:00 UTC (rev 39523)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/server/ServerManagerListener.java 2012-03-15 00:59:20 UTC (rev 39524)
@@ -10,5 +10,6 @@
******************************************************************************/
package org.jboss.tools.jst.web.server;
-public interface ServerManagerListener extends org.jboss.ide.eclipse.as.ui.actions.ServerManagerListener {
+public interface ServerManagerListener {
+ public void serverManagerChanged();
}
12 years, 8 months
JBoss Tools SVN: r39523 - trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2012-03-14 20:23:00 -0400 (Wed, 14 Mar 2012)
New Revision: 39523
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/ObjectMultiPageEditor.java
Log:
fix for getSourceEditor method to return sourceEditor even it is not activated
Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/ObjectMultiPageEditor.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/ObjectMultiPageEditor.java 2012-03-15 00:13:16 UTC (rev 39522)
+++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/ObjectMultiPageEditor.java 2012-03-15 00:23:00 UTC (rev 39523)
@@ -660,11 +660,11 @@
}
public StructuredTextEditor getSourceEditor() {
- IEditorPart activePageEditor = getActiveEditor();
- if (activePageEditor instanceof StructuredTextEditor) {
- return (StructuredTextEditor)activePageEditor;
+ if(textEditor instanceof StructuredTextEditor) {
+ return (StructuredTextEditor)textEditor;
}
return null;
+
}
TextSelectionProvider textSelectionProvider = new TextSelectionProvider();
12 years, 8 months
JBoss Tools SVN: r39522 - trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2012-03-14 20:13:16 -0400 (Wed, 14 Mar 2012)
New Revision: 39522
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDICoreTestSetup.java
Log:
clean up removed to fix correlation between tests
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDICoreTestSetup.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDICoreTestSetup.java 2012-03-15 00:11:51 UTC (rev 39521)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDICoreTestSetup.java 2012-03-15 00:13:16 UTC (rev 39522)
@@ -15,6 +15,7 @@
import org.eclipse.core.resources.IProject;
import org.jboss.tools.cdi.core.test.tck.TCKTest;
+import org.jboss.tools.test.util.JobUtils;
import org.jboss.tools.test.util.ResourcesUtils;
/**
@@ -38,17 +39,4 @@
projects = TCKTest.importPreparedProjects();
tckProject = projects[1];
}
-
- /*
- * (non-Javadoc)
- * @see junit.extensions.TestSetup#tearDown()
- */
- @Override
- protected void tearDown() throws Exception {
- boolean saveAutoBuild = ResourcesUtils.setBuildAutomatically(false);
- for (IProject project : projects) {
- project.delete(true, true, null);
- }
- ResourcesUtils.setBuildAutomatically(saveAutoBuild);
- }
}
\ No newline at end of file
12 years, 8 months
JBoss Tools SVN: r39521 - workspace/dgolovin/org.jboss.tools.cdi.test.launcher/src/org/jboss/tools/cdi/test/launcher.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2012-03-14 20:11:51 -0400 (Wed, 14 Mar 2012)
New Revision: 39521
Modified:
workspace/dgolovin/org.jboss.tools.cdi.test.launcher/src/org/jboss/tools/cdi/test/launcher/CDIAllTests.java
Log:
enable all tests for cdi at once to have them running 30% faster
Modified: workspace/dgolovin/org.jboss.tools.cdi.test.launcher/src/org/jboss/tools/cdi/test/launcher/CDIAllTests.java
===================================================================
--- workspace/dgolovin/org.jboss.tools.cdi.test.launcher/src/org/jboss/tools/cdi/test/launcher/CDIAllTests.java 2012-03-14 23:36:25 UTC (rev 39520)
+++ workspace/dgolovin/org.jboss.tools.cdi.test.launcher/src/org/jboss/tools/cdi/test/launcher/CDIAllTests.java 2012-03-15 00:11:51 UTC (rev 39521)
@@ -28,12 +28,12 @@
TestSuite suiteAll = new TestSuite("CDI Core Tests");
suiteAll.addTest(CdiSeamConfigUIAllTests.suite());
- suiteAll.addTest(CDICoreAllTests.suite());
suiteAll.addTest(CDISeamConfigCoreAllTests.suite());
suiteAll.addTest(CDISeamCoreAllTests.suite());
suiteAll.addTest(CDISeamSolderCoreAllTests.suite());
suiteAll.addTest(CdiSeamTextExtAllTests.suite());
suiteAll.addTest(CdiTextExtAllTests.suite());
+ suiteAll.addTest(CDICoreAllTests.suite());
suiteAll.addTest(CDIUIAllTests.suite());
return suiteAll;
}
12 years, 8 months
JBoss Tools SVN: r39520 - in trunk/jsf/tests/org.jboss.tools.jsf.ui.test: src/org/jboss/tools/jsf/jsp/ca/test and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2012-03-14 19:36:25 -0400 (Wed, 14 Mar 2012)
New Revision: 39520
Added:
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/testJSFProject/WebContent/pages/inputname.html
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/testJSFProject/WebContent/pages/inputname.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/CAInEventAttributesTest.java
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/testJSFProject/WebContent/pages/inputUserName.jsp
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/JsfUiAllTests.java
Log:
JBIDE-11303
https://issues.jboss.org/browse/JBIDE-11303
Content assist in event attributes is fixed.
Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/testJSFProject/WebContent/pages/inputUserName.jsp
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/testJSFProject/WebContent/pages/inputUserName.jsp 2012-03-14 23:33:48 UTC (rev 39519)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/testJSFProject/WebContent/pages/inputUserName.jsp 2012-03-14 23:36:25 UTC (rev 39520)
@@ -24,5 +24,6 @@
</h:form>
</f:view>
+ <p onclick="#{}"></p>
</body>
</html>
\ No newline at end of file
Added: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/testJSFProject/WebContent/pages/inputname.html
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/testJSFProject/WebContent/pages/inputname.html (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/testJSFProject/WebContent/pages/inputname.html 2012-03-14 23:36:25 UTC (rev 39520)
@@ -0,0 +1,7 @@
+<html>
+ <head>
+ </head>
+ <body>
+ <p onclick="#{}"></p>
+ </body>
+</html>
\ No newline at end of file
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/testJSFProject/WebContent/pages/inputname.html
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/testJSFProject/WebContent/pages/inputname.xhtml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/testJSFProject/WebContent/pages/inputname.xhtml (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/projects/testJSFProject/WebContent/pages/inputname.xhtml 2012-03-14 23:36:25 UTC (rev 39520)
@@ -0,0 +1,27 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:c="http://java.sun.com/jstl/core">
+
+ <f:loadBundle basename="resources" var="msg" />
+
+ <ui:composition template="/templates/common.xhtml">
+
+ <ui:define name="pageTitle">Input User Name</ui:define>
+
+ <ui:define name="pageHeader">Facelets Hello Application</ui:define>
+
+ <ui:define name="body">
+ <h:message showSummary="true" showDetail="false" style="color: red; font-weight: bold;" for="name" />
+ <form jsfc="h:form" id="helloForm">
+ ${msg.prompt}
+ <input label="Name" jsfc="h:inputText" required="true" id="name" value="#{person.name}" />
+ <input type="submit" jsfc="h:commandButton" id="submit"
+ action="greeting" value="Say Hello" />
+ </form>
+ <p onclick="#{}"></p>
+ </ui:define>
+ </ui:composition>
+</html>
Added: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/CAInEventAttributesTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/CAInEventAttributesTest.java (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/CAInEventAttributesTest.java 2012-03-14 23:36:25 UTC (rev 39520)
@@ -0,0 +1,59 @@
+/*******************************************************************************
+ * 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.jsf.jsp.ca.test;
+
+import org.jboss.tools.jst.jsp.test.ca.ContentAssistantTestCase;
+import org.jboss.tools.test.util.TestProjectProvider;
+
+public class CAInEventAttributesTest extends ContentAssistantTestCase{
+ TestProjectProvider provider = null;
+ boolean makeCopy = true;
+ private static final String PROJECT_NAME = "testJSFProject"; //$NON-NLS-1$
+ private static final String JSP_PAGE_NAME = "/WebContent/pages/inputUserName.jsp"; //$NON-NLS-1$
+ private static final String XHTML_PAGE_NAME = "/WebContent/pages/inputname.xhtml"; //$NON-NLS-1$
+ private static final String HTML_PAGE_NAME = "/WebContent/pages/inputname.html"; //$NON-NLS-1$
+
+ public void setUp() throws Exception {
+ provider = new TestProjectProvider("org.jboss.tools.jsf.ui.test", null, PROJECT_NAME, makeCopy); //$NON-NLS-1$
+ project = provider.getProject();
+ }
+
+ protected void tearDown() throws Exception {
+ if(provider != null) {
+ provider.dispose();
+ }
+ }
+
+ public void testCAInOnclickInJSP(){
+ String[] proposals = {
+ "user", //$NON-NLS-1$
+ };
+
+ checkProposals(JSP_PAGE_NAME, "<p onclick=\"#{}\">", 14, proposals, false, false);
+ }
+
+ public void testCAInOnclickInXHTML(){
+ String[] proposals = {
+ "user", //$NON-NLS-1$
+ };
+
+ checkProposals(XHTML_PAGE_NAME, "<p onclick=\"#{}\">", 14, proposals, false, false);
+ }
+
+ public void testCAInOnclickInHTML(){
+ String[] proposals = {
+ "user", //$NON-NLS-1$
+ };
+
+ checkProposals(HTML_PAGE_NAME, "<p onclick=\"#{}\">", 14, proposals, false, false);
+ }
+
+}
\ No newline at end of file
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/CAInEventAttributesTest.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/JsfUiAllTests.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/JsfUiAllTests.java 2012-03-14 23:33:48 UTC (rev 39519)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/JsfUiAllTests.java 2012-03-14 23:36:25 UTC (rev 39520)
@@ -26,6 +26,7 @@
import org.jboss.tools.jsf.jsp.ca.test.CAForJSF2BeansInJavaTest;
import org.jboss.tools.jsf.jsp.ca.test.CAForJSF2BeansTest;
import org.jboss.tools.jsf.jsp.ca.test.CAForUnclosedELTest;
+import org.jboss.tools.jsf.jsp.ca.test.CAInEventAttributesTest;
import org.jboss.tools.jsf.jsp.ca.test.CAJsfAddInfoInELMessagesTest;
import org.jboss.tools.jsf.jsp.ca.test.CAJsfMessagesProposalsFilteringTest;
import org.jboss.tools.jsf.jsp.ca.test.CAJsfMessagesProposalsTest;
@@ -74,6 +75,7 @@
suite.addTestSuite(JsfJspJbide1704Test.class);
suite.addTestSuite(JsfJspJbide1717Test.class);
suite.addTestSuite(JsfJBide3845Test.class);
+ suite.addTestSuite(CAInEventAttributesTest.class);
suite.addTest(
new ProjectImportTestSetup(JsfJspLongResourceBundlePropertyNamesTest.suite(),
12 years, 8 months