JBoss Tools SVN: r36204 - in trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard: xpl and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2011-11-07 14:17:04 -0500 (Mon, 07 Nov 2011)
New Revision: 36204
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/AbstractModifyInjectionPointWizard.java
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/xpl/AddQualifiersToBeanComposite.java
Log:
Quickfix and Wizard for fixing ambigious injection warning is confusing https://issues.jboss.org/browse/JBIDE-9940
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/AbstractModifyInjectionPointWizard.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/AbstractModifyInjectionPointWizard.java 2011-11-07 19:10:33 UTC (rev 36203)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/AbstractModifyInjectionPointWizard.java 2011-11-07 19:17:04 UTC (rev 36204)
@@ -13,8 +13,8 @@
import java.util.List;
import org.eclipse.ltk.core.refactoring.participants.ProcessorBasedRefactoring;
+import org.eclipse.ltk.internal.ui.refactoring.RefactoringWizardDialog;
import org.eclipse.ltk.ui.refactoring.RefactoringWizard;
-import org.eclipse.ltk.ui.refactoring.RefactoringWizardOpenOperation;
import org.eclipse.ui.IWorkbenchWindow;
import org.eclipse.ui.PlatformUI;
import org.jboss.tools.cdi.core.IBean;
@@ -28,12 +28,8 @@
public boolean showWizard() {
final IWorkbenchWindow win = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
- RefactoringWizardOpenOperation op = new RefactoringWizardOpenOperation(this);
- try {
- op.run(win.getShell(), getWindowTitle());
- } catch (final InterruptedException irex) {
- return false;
- }
+ RefactoringWizardDialog dialog = new RefactoringWizardDialog(win.getShell(),this);
+ dialog.open();
return true;
}
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/xpl/AddQualifiersToBeanComposite.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/xpl/AddQualifiersToBeanComposite.java 2011-11-07 19:10:33 UTC (rev 36203)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/xpl/AddQualifiersToBeanComposite.java 2011-11-07 19:17:04 UTC (rev 36204)
@@ -449,14 +449,14 @@
PlatformUI.getWorkbench().getProgressService().busyCursorWhile(new IRunnableWithProgress(){
public void run(IProgressMonitor monitor)
throws InvocationTargetException, InterruptedException {
- Job autoBuildJob = null;
- Job[] jobs = Job.getJobManager().find(ResourcesPlugin.FAMILY_AUTO_BUILD);
- for(Job j : jobs){
- autoBuildJob = j;
- }
- if(autoBuildJob != null && autoBuildJob.getState() == Job.RUNNING){
+// Job autoBuildJob = null;
+// Job[] jobs = Job.getJobManager().find(ResourcesPlugin.FAMILY_AUTO_BUILD);
+// for(Job j : jobs){
+// autoBuildJob = j;
+// }
+// if(autoBuildJob != null && autoBuildJob.getState() == Job.RUNNING){
Job.getJobManager().join(ResourcesPlugin.FAMILY_AUTO_BUILD, null);
- }
+// }
}
});
}catch(InterruptedException ie){
14 years, 2 months
JBoss Tools SVN: r36203 - in trunk/common: tests and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2011-11-07 14:10:33 -0500 (Mon, 07 Nov 2011)
New Revision: 36203
Added:
trunk/common/tests/org.jboss.tools.common.base.test/
Removed:
trunk/common/plugins/org.jboss.tools.common.base.test/
Modified:
trunk/common/plugins/pom.xml
trunk/common/tests/org.jboss.tools.common.base.test/pom.xml
trunk/common/tests/pom.xml
Log:
https://issues.jboss.org/browse/JBIDE-10107 (Move *.base.test from plugins folder to tests folder)
moved common.base.test plugin to tests to avoid confusion
Modified: trunk/common/plugins/pom.xml
===================================================================
--- trunk/common/plugins/pom.xml 2011-11-07 18:43:44 UTC (rev 36202)
+++ trunk/common/plugins/pom.xml 2011-11-07 19:10:33 UTC (rev 36203)
@@ -13,7 +13,6 @@
<packaging>pom</packaging>
<modules>
<module>org.jboss.tools.common</module>
- <module>org.jboss.tools.common.base.test</module>
<module>org.jboss.tools.common.el.core</module>
<module>org.jboss.tools.common.el.ui</module>
<module>org.jboss.tools.common.gef</module>
Modified: trunk/common/tests/org.jboss.tools.common.base.test/pom.xml
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.base.test/pom.xml 2011-11-07 16:04:17 UTC (rev 36195)
+++ trunk/common/tests/org.jboss.tools.common.base.test/pom.xml 2011-11-07 19:10:33 UTC (rev 36203)
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.jboss.tools.common</groupId>
- <artifactId>plugins</artifactId>
+ <artifactId>tests</artifactId>
<version>3.3.0-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.common.plugins</groupId>
Modified: trunk/common/tests/pom.xml
===================================================================
--- trunk/common/tests/pom.xml 2011-11-07 18:43:44 UTC (rev 36202)
+++ trunk/common/tests/pom.xml 2011-11-07 19:10:33 UTC (rev 36203)
@@ -36,6 +36,7 @@
</property>
</activation>
<modules>
+ <module>org.jboss.tools.common.base.test</module>
<module>org.jboss.tools.common.el.core.test</module>
<module>org.jboss.tools.common.model.test</module>
<module>org.jboss.tools.common.model.ui.test</module>
@@ -45,7 +46,7 @@
<module>org.jboss.tools.common.verification.ui.test</module>
<module>org.jboss.tools.common.ui.test</module>
<module>org.jboss.tools.common.mylyn.test</module>
- </modules>
+ </modules>
</profile>
<profile>
@@ -61,4 +62,4 @@
</profile>
</profiles>
</project>
-
+
14 years, 2 months
JBoss Tools SVN: r36202 - trunk/common/tests.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2011-11-07 13:43:44 -0500 (Mon, 07 Nov 2011)
New Revision: 36202
Modified:
trunk/common/tests/pom.xml
Log:
https://issues.jboss.org/browse/JBIDE-9351 provide mylyn connections for issues.jboss.org and bugzila.redhat.com via new plugin in "Common" component
Modified: trunk/common/tests/pom.xml
===================================================================
--- trunk/common/tests/pom.xml 2011-11-07 18:43:21 UTC (rev 36201)
+++ trunk/common/tests/pom.xml 2011-11-07 18:43:44 UTC (rev 36202)
@@ -44,6 +44,7 @@
<module>org.jboss.tools.common.verification.test</module>
<module>org.jboss.tools.common.verification.ui.test</module>
<module>org.jboss.tools.common.ui.test</module>
+ <module>org.jboss.tools.common.mylyn.test</module>
</modules>
</profile>
14 years, 2 months
JBoss Tools SVN: r36201 - trunk/common/plugins.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2011-11-07 13:43:21 -0500 (Mon, 07 Nov 2011)
New Revision: 36201
Modified:
trunk/common/plugins/pom.xml
Log:
https://issues.jboss.org/browse/JBIDE-9351 provide mylyn connections for issues.jboss.org and bugzila.redhat.com via new plugin in "Common" component
Modified: trunk/common/plugins/pom.xml
===================================================================
--- trunk/common/plugins/pom.xml 2011-11-07 18:42:58 UTC (rev 36200)
+++ trunk/common/plugins/pom.xml 2011-11-07 18:43:21 UTC (rev 36201)
@@ -34,6 +34,7 @@
<module>org.jboss.tools.common.jdt.debug.ui</module>
<module>org.jboss.tools.common.jdt</module>
<module>org.jboss.tools.common.jdt.ui</module>
+ <module>org.jboss.tools.common.mylyn</module>
</modules>
</project>
14 years, 2 months
JBoss Tools SVN: r36200 - in trunk/common/features: org.jboss.tools.common.mylyn.feature and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2011-11-07 13:42:58 -0500 (Mon, 07 Nov 2011)
New Revision: 36200
Modified:
trunk/common/features/org.jboss.tools.common.mylyn.feature/
trunk/common/features/pom.xml
Log:
https://issues.jboss.org/browse/JBIDE-9351 provide mylyn connections for issues.jboss.org and bugzila.redhat.com via new plugin in "Common" component
Property changes on: trunk/common/features/org.jboss.tools.common.mylyn.feature
___________________________________________________________________
Added: svn:ignore
+ target
Modified: trunk/common/features/pom.xml
===================================================================
--- trunk/common/features/pom.xml 2011-11-07 18:42:28 UTC (rev 36199)
+++ trunk/common/features/pom.xml 2011-11-07 18:42:58 UTC (rev 36200)
@@ -23,6 +23,7 @@
<module>org.jboss.tools.common.verification.feature</module>
<module>org.jboss.tools.common.jdt.feature</module>
<module>org.jboss.tools.common.jdt.source.feature</module>
+ <module>org.jboss.tools.common.mylyn.feature</module>
</modules>
</project>
14 years, 2 months
JBoss Tools SVN: r36199 - in trunk/common/features: org.jboss.tools.common.mylyn.feature and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2011-11-07 13:42:28 -0500 (Mon, 07 Nov 2011)
New Revision: 36199
Added:
trunk/common/features/org.jboss.tools.common.mylyn.feature/
trunk/common/features/org.jboss.tools.common.mylyn.feature/.project
trunk/common/features/org.jboss.tools.common.mylyn.feature/build.properties
trunk/common/features/org.jboss.tools.common.mylyn.feature/feature.properties
trunk/common/features/org.jboss.tools.common.mylyn.feature/feature.xml
trunk/common/features/org.jboss.tools.common.mylyn.feature/feature_ja.properties
trunk/common/features/org.jboss.tools.common.mylyn.feature/pom.xml
Log:
https://issues.jboss.org/browse/JBIDE-9351 provide mylyn connections for issues.jboss.org and bugzila.redhat.com via new plugin in "Common" component
Added: trunk/common/features/org.jboss.tools.common.mylyn.feature/.project
===================================================================
--- trunk/common/features/org.jboss.tools.common.mylyn.feature/.project (rev 0)
+++ trunk/common/features/org.jboss.tools.common.mylyn.feature/.project 2011-11-07 18:42:28 UTC (rev 36199)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.jboss.tools.common.mylyn.feature</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.pde.FeatureBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.pde.FeatureNature</nature>
+ </natures>
+</projectDescription>
Property changes on: trunk/common/features/org.jboss.tools.common.mylyn.feature/.project
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/common/features/org.jboss.tools.common.mylyn.feature/build.properties
===================================================================
--- trunk/common/features/org.jboss.tools.common.mylyn.feature/build.properties (rev 0)
+++ trunk/common/features/org.jboss.tools.common.mylyn.feature/build.properties 2011-11-07 18:42:28 UTC (rev 36199)
@@ -0,0 +1,2 @@
+bin.includes = feature.xml,\
+ feature.properties
Property changes on: trunk/common/features/org.jboss.tools.common.mylyn.feature/build.properties
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/common/features/org.jboss.tools.common.mylyn.feature/feature.properties
===================================================================
--- trunk/common/features/org.jboss.tools.common.mylyn.feature/feature.properties (rev 0)
+++ trunk/common/features/org.jboss.tools.common.mylyn.feature/feature.properties 2011-11-07 18:42:28 UTC (rev 36199)
@@ -0,0 +1,37 @@
+###############################################################################
+# Copyright (c) 2010-2011 Red Hat, Inc. and others.
+# All rights reserved. This program and the accompanying materials
+# are 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:
+# JBoss by Red Hat - Initial implementation.
+##############################################################################
+# feature.properties
+# contains externalized strings for feature.xml
+# "%foo" in feature.xml corresponds to the key "foo" in this file
+# java.io.Properties file (ISO 8859-1 with "\" escapes)
+# This file should be translated.
+
+# "featureName" property - name of the feature
+featureName=JBoss Tools Mylyn
+
+# "providerName" property - name of the company that provides the feature
+providerName=JBoss by Red Hat
+
+# "updateSiteName" property - label for the update site
+updateSiteName=JBossTools Update Site
+
+devUpdateSiteName=JBossTools Development Update Site
+
+# "description" property - description of the feature
+description=JBoss Tools Common Core plugins
+
+copyright=Copyright (c) 2011 Red Hat, Inc.\n\
+Distributed under license by Red Hat, Inc. All rights reserved.\n\
+This program is made available under the terms of the\n\
+Eclipse Public License v1.0 which accompanies this distribution,\n\
+and is available at http\://www.eclipse.org/legal/epl-v10.html\n\
+Contributors\:\n\
+Red Hat, Inc. - initial API and implementation
\ No newline at end of file
Property changes on: trunk/common/features/org.jboss.tools.common.mylyn.feature/feature.properties
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/common/features/org.jboss.tools.common.mylyn.feature/feature.xml
===================================================================
--- trunk/common/features/org.jboss.tools.common.mylyn.feature/feature.xml (rev 0)
+++ trunk/common/features/org.jboss.tools.common.mylyn.feature/feature.xml 2011-11-07 18:42:28 UTC (rev 36199)
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature id="org.jboss.tools.common.mylyn.feature" label="%featureName" version="3.3.0.qualifier" provider-name="%providerName">
+
+ <description url="http://www.jboss.org/tools">
+ %description
+ </description>
+
+ <copyright>
+ %copyright
+ </copyright>
+
+ <license>
+ Red Hat, Inc. licenses these features and plugins to you under
+certain open source licenses (or aggregations of such licenses), which
+in a particular case may include the Eclipse Public License, the GNU
+Lesser General Public License, and/or certain other open source
+licenses. For precise licensing details, consult the corresponding
+source code, or contact Red Hat Legal Affairs, 1801 Varsity Drive,
+Raleigh NC 27606 USA.
+ </license>
+
+ <plugin id="org.jboss.tools.common.mylyn" download-size="0" install-size="0" version="0.0.0" />
+</feature>
Property changes on: trunk/common/features/org.jboss.tools.common.mylyn.feature/feature.xml
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/common/features/org.jboss.tools.common.mylyn.feature/feature_ja.properties
===================================================================
--- trunk/common/features/org.jboss.tools.common.mylyn.feature/feature_ja.properties (rev 0)
+++ trunk/common/features/org.jboss.tools.common.mylyn.feature/feature_ja.properties 2011-11-07 18:42:28 UTC (rev 36199)
@@ -0,0 +1 @@
+providerName=JBoss by Red Hat
Property changes on: trunk/common/features/org.jboss.tools.common.mylyn.feature/feature_ja.properties
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/common/features/org.jboss.tools.common.mylyn.feature/pom.xml
===================================================================
--- trunk/common/features/org.jboss.tools.common.mylyn.feature/pom.xml (rev 0)
+++ trunk/common/features/org.jboss.tools.common.mylyn.feature/pom.xml 2011-11-07 18:42:28 UTC (rev 36199)
@@ -0,0 +1,13 @@
+<?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.common</groupId>
+ <artifactId>features</artifactId>
+ <version>3.3.0-SNAPSHOT</version>
+ </parent>
+ <groupId>org.jboss.tools.common.features</groupId>
+ <artifactId>org.jboss.tools.common.mylyn.feature</artifactId>
+
+ <packaging>eclipse-feature</packaging>
+</project>
Property changes on: trunk/common/features/org.jboss.tools.common.mylyn.feature/pom.xml
___________________________________________________________________
Added: svn:mime-type
+ text/plain
14 years, 2 months
JBoss Tools SVN: r36198 - in trunk/vpe/plugins/org.jboss.tools.vpe.jsp: src/org/jboss/tools/vpe/jsp and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2011-11-07 13:36:36 -0500 (Mon, 07 Nov 2011)
New Revision: 36198
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe.jsp/META-INF/MANIFEST.MF
trunk/vpe/plugins/org.jboss.tools.vpe.jsp/src/org/jboss/tools/vpe/jsp/JspTemplatePluign.java
Log:
fixed runtime settings in manifest
Modified: trunk/vpe/plugins/org.jboss.tools.vpe.jsp/META-INF/MANIFEST.MF
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.jsp/META-INF/MANIFEST.MF 2011-11-07 18:30:42 UTC (rev 36197)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.jsp/META-INF/MANIFEST.MF 2011-11-07 18:36:36 UTC (rev 36198)
@@ -15,3 +15,4 @@
Bundle-ActivationPolicy: lazy
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Export-Package: org.jboss.tools.vpe.jsp
Modified: trunk/vpe/plugins/org.jboss.tools.vpe.jsp/src/org/jboss/tools/vpe/jsp/JspTemplatePluign.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.jsp/src/org/jboss/tools/vpe/jsp/JspTemplatePluign.java 2011-11-07 18:30:42 UTC (rev 36197)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.jsp/src/org/jboss/tools/vpe/jsp/JspTemplatePluign.java 2011-11-07 18:36:36 UTC (rev 36198)
@@ -9,7 +9,7 @@
public class JspTemplatePluign extends BaseUIPlugin {
// The plug-in ID
- public static final String PLUGIN_ID = "org.jboss.tools.jst.vpe.jsp"; //$NON-NLS-1$
+ public static final String PLUGIN_ID = "org.jboss.tools.vpe.jsp"; //$NON-NLS-1$
// The shared instance
private static JspTemplatePluign plugin;
14 years, 2 months
JBoss Tools SVN: r36197 - in trunk/common: tests/org.jboss.tools.common.mylyn.test/META-INF and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2011-11-07 13:30:42 -0500 (Mon, 07 Nov 2011)
New Revision: 36197
Modified:
trunk/common/plugins/org.jboss.tools.common.mylyn/META-INF/MANIFEST.MF
trunk/common/tests/org.jboss.tools.common.mylyn.test/META-INF/MANIFEST.MF
trunk/common/tests/org.jboss.tools.common.mylyn.test/src/org/jboss/tools/common/mylyn/test/RepositoryTest.java
Log:
https://issues.jboss.org/browse/JBIDE-9351 provide mylyn connections for issues.jboss.org and bugzila.redhat.com via new plugin in "Common" component
Modified: trunk/common/plugins/org.jboss.tools.common.mylyn/META-INF/MANIFEST.MF
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.mylyn/META-INF/MANIFEST.MF 2011-11-07 18:20:01 UTC (rev 36196)
+++ trunk/common/plugins/org.jboss.tools.common.mylyn/META-INF/MANIFEST.MF 2011-11-07 18:30:42 UTC (rev 36197)
@@ -12,7 +12,7 @@
org.eclipse.mylyn.tasks.core;bundle-version="3.6.0",
org.eclipse.mylyn.tasks.ui;bundle-version="3.6.2",
org.eclipse.core.runtime;bundle-version="3.7.0",
- com.atlassian.connector.eclipse.commons.core;bundle-version="3.0.0",
- com.atlassian.connector.eclipse.commons.ui;bundle-version="3.0.0",
- com.atlassian.connector.eclipse.jira.core;bundle-version="3.0.0",
- com.atlassian.connector.eclipse.jira.ui;bundle-version="3.0.0"
+ com.atlassian.connector.eclipse.commons.core;bundle-version="3.0.0";resolution:=optional,
+ com.atlassian.connector.eclipse.commons.ui;bundle-version="3.0.0";resolution:=optional,
+ com.atlassian.connector.eclipse.jira.core;bundle-version="3.0.0";resolution:=optional,
+ com.atlassian.connector.eclipse.jira.ui;bundle-version="3.0.0";resolution:=optional
Modified: trunk/common/tests/org.jboss.tools.common.mylyn.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/common/tests/org.jboss.tools.common.mylyn.test/META-INF/MANIFEST.MF 2011-11-07 18:20:01 UTC (rev 36196)
+++ trunk/common/tests/org.jboss.tools.common.mylyn.test/META-INF/MANIFEST.MF 2011-11-07 18:30:42 UTC (rev 36197)
@@ -14,9 +14,9 @@
org.eclipse.mylyn.bugzilla.core;bundle-version="3.6.2",
org.eclipse.mylyn.bugzilla.ide;bundle-version="3.6.0",
org.eclipse.mylyn.bugzilla.ui;bundle-version="3.6.0",
- com.atlassian.connector.eclipse.commons.core;bundle-version="3.0.0",
- com.atlassian.connector.eclipse.commons.ui;bundle-version="3.0.0",
- com.atlassian.connector.eclipse.jira.core;bundle-version="3.0.0",
- com.atlassian.connector.eclipse.jira.ui;bundle-version="3.0.0"
+ com.atlassian.connector.eclipse.commons.core;bundle-version="3.0.0";resolution:=optional,
+ com.atlassian.connector.eclipse.commons.ui;bundle-version="3.0.0";resolution:=optional,
+ com.atlassian.connector.eclipse.jira.core;bundle-version="3.0.0";resolution:=optional,
+ com.atlassian.connector.eclipse.jira.ui;bundle-version="3.0.0";resolution:=optional
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-Vendor: %providerName
Modified: trunk/common/tests/org.jboss.tools.common.mylyn.test/src/org/jboss/tools/common/mylyn/test/RepositoryTest.java
===================================================================
--- trunk/common/tests/org.jboss.tools.common.mylyn.test/src/org/jboss/tools/common/mylyn/test/RepositoryTest.java 2011-11-07 18:20:01 UTC (rev 36196)
+++ trunk/common/tests/org.jboss.tools.common.mylyn.test/src/org/jboss/tools/common/mylyn/test/RepositoryTest.java 2011-11-07 18:30:42 UTC (rev 36197)
@@ -25,7 +25,8 @@
assertNotNull(repo);
}
- public void testJIRA() {
+ // FIXME Enable this test when JIRA connector plugins are added to TP & Update site
+ public void _testJIRA() {
TaskRepository repo = TasksUiPlugin.getRepositoryManager().getRepository("jira", "https://issues.jboss.org");
assertNotNull(repo);
}
14 years, 2 months
JBoss Tools SVN: r36196 - trunk/jsf/tests/org.jboss.tools.jsf.ui.test.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2011-11-07 13:20:01 -0500 (Mon, 07 Nov 2011)
New Revision: 36196
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/pom.xml
Log:
adjusted instrumented bundles and packages to include into coverage build to fix missing coverage data for org.jboss.tools.vpe.ui.palette package
Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/pom.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/pom.xml 2011-11-07 16:04:17 UTC (rev 36195)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/pom.xml 2011-11-07 18:20:01 UTC (rev 36196)
@@ -12,7 +12,7 @@
<packaging>eclipse-test-plugin</packaging>
<properties>
- <emma.filter>org.jboss.tools.jsf.ui*</emma.filter>
- <emma.instrument.bundles>org.jboss.tools.jsf.ui</emma.instrument.bundles>
+ <emma.filter>org.jboss.tools.jsf.ui*,org.jboss.tools.vpe.ui.palette*</emma.filter>
+ <emma.instrument.bundles>org.jboss.tools.jsf.ui,org.jboss.tools.vpe.ui.palette</emma.instrument.bundles>
</properties>
</project>
14 years, 2 months
JBoss Tools SVN: r36195 - trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-11-07 11:04:17 -0500 (Mon, 07 Nov 2011)
New Revision: 36195
Modified:
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/AbstractOpenShiftWizardPage.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CredentialsWizardPage.java
Log:
[JBIDE-10084] testing credentials only if credentials page will get activated as next page (corrected page chaning events to inform the correct page with the correct progress direction information so that the credentials page can avoid to check credentials on deactivation)
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/AbstractOpenShiftWizardPage.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/AbstractOpenShiftWizardPage.java 2011-11-07 15:40:28 UTC (rev 36194)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/AbstractOpenShiftWizardPage.java 2011-11-07 16:04:17 UTC (rev 36195)
@@ -32,6 +32,10 @@
*/
public abstract class AbstractOpenShiftWizardPage extends WizardPage {
+ protected enum Direction {
+ FORWARDS, BACKWARDS
+ }
+
private DataBindingContext dbc;
protected AbstractOpenShiftWizardPage(String title, String description, String pageName, IWizard wizard) {
@@ -80,9 +84,19 @@
@Override
public void handlePageChanging(PageChangingEvent event) {
if (event.getTargetPage() == AbstractOpenShiftWizardPage.this) {
- onPageWillGetActivated(event, dbc);
- } else {
- onPageWillGetDeactivated(event, dbc);
+ if (event.getCurrentPage() == null
+ || event.getCurrentPage().equals(getPreviousPage())) {
+ onPageWillGetActivated(Direction.FORWARDS, event, dbc);
+ } else {
+ onPageWillGetActivated(Direction.BACKWARDS, event, dbc);
+ }
+ } else if (event.getCurrentPage() == AbstractOpenShiftWizardPage.this){
+ if (event.getTargetPage() == null
+ || event.getTargetPage().equals(getNextPage())) {
+ onPageWillGetDeactivated(Direction.FORWARDS, event, dbc);
+ } else {
+ onPageWillGetDeactivated(Direction.BACKWARDS, event, dbc);
+ }
}
}
});
@@ -99,10 +113,17 @@
protected void onPageDeactivated(DataBindingContext dbc) {
}
- protected void onPageWillGetActivated(PageChangingEvent event, DataBindingContext dbc) {
+ protected void onPageWillGetActivated(Direction direction, PageChangingEvent event, DataBindingContext dbc) {
}
- protected void onPageWillGetDeactivated(PageChangingEvent event, DataBindingContext dbc) {
+ /**
+ * Callback that gets called when this page is going to be deactivated.
+ *
+ * @param progress the direction that the wizard is moving: backwards/forwards
+ * @param event the page changing event that may be use to veto the change
+ * @param dbc the current data binding context
+ */
+ protected void onPageWillGetDeactivated(Direction progress, PageChangingEvent event, DataBindingContext dbc) {
}
protected abstract void doCreateControls(Composite parent, DataBindingContext dbc);
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CredentialsWizardPage.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CredentialsWizardPage.java 2011-11-07 15:40:28 UTC (rev 36194)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CredentialsWizardPage.java 2011-11-07 16:04:17 UTC (rev 36195)
@@ -146,7 +146,11 @@
}
@Override
- protected void onPageWillGetDeactivated(PageChangingEvent event, DataBindingContext dbc) {
+ protected void onPageWillGetDeactivated(Direction direction, PageChangingEvent event, DataBindingContext dbc) {
+ if (direction == Direction.BACKWARDS) {
+ return;
+ }
+
if (!model.areCredentialsValidated()) {
try {
final ArrayBlockingQueue<IStatus> queue = new ArrayBlockingQueue<IStatus>(1);
14 years, 2 months