JBoss Tools SVN: r42732 - in trunk/tests: features and 18 other directories.
by jbosstools-commits＠lists.jboss.org
Author: vpakan(a)redhat.com
Date: 2012-07-26 05:22:31 -0400 (Thu, 26 Jul 2012)
New Revision: 42732
Modified:
trunk/tests/features/org.jboss.tools.test.feature/feature.xml
trunk/tests/features/org.jboss.tools.test.feature/pom.xml
trunk/tests/features/pom.xml
trunk/tests/plugins/org.jboss.tools.tests.installation/META-INF/MANIFEST.MF
trunk/tests/plugins/org.jboss.tools.tests.installation/pom.xml
trunk/tests/plugins/org.jboss.tools.tests.performance/META-INF/MANIFEST.MF
trunk/tests/plugins/org.jboss.tools.tests.performance/pom.xml
trunk/tests/plugins/org.jboss.tools.tests/META-INF/MANIFEST.MF
trunk/tests/plugins/org.jboss.tools.tests/pom.xml
trunk/tests/plugins/org.jboss.tools.ui.bot.ext/META-INF/MANIFEST.MF
trunk/tests/plugins/org.jboss.tools.ui.bot.ext/pom.xml
trunk/tests/plugins/pom.xml
trunk/tests/pom.xml
trunk/tests/scripts/installation-updates/pom.xml
trunk/tests/scripts/pom.xml
trunk/tests/site/pom.xml
trunk/tests/tests/org.jboss.tools.tests.test/META-INF/MANIFEST.MF
trunk/tests/tests/org.jboss.tools.tests.test/pom.xml
trunk/tests/tests/org.jboss.tools.ui.bot.ext.test/META-INF/MANIFEST.MF
trunk/tests/tests/org.jboss.tools.ui.bot.ext.test/pom.xml
trunk/tests/tests/pom.xml
Log:
Update to version 3.4.0.
Modified: trunk/tests/features/org.jboss.tools.test.feature/feature.xml
===================================================================
--- trunk/tests/features/org.jboss.tools.test.feature/feature.xml 2012-07-26 09:20:36 UTC (rev 42731)
+++ trunk/tests/features/org.jboss.tools.test.feature/feature.xml 2012-07-26 09:22:31 UTC (rev 42732)
@@ -2,7 +2,7 @@
<feature
id="org.jboss.tools.test.feature"
label="%featureName"
- version="3.3.0.qualifier"
+ version="3.4.0.qualifier"
provider-name="%providerName">
<description url="http://www.jboss.org/tools">
@@ -22,7 +22,7 @@
download-size="0"
install-size="0"
version="0.0.0"/>
-
+
<plugin
id="org.jboss.tools.tests.installation"
download-size="0"
Modified: trunk/tests/features/org.jboss.tools.test.feature/pom.xml
===================================================================
--- trunk/tests/features/org.jboss.tools.test.feature/pom.xml 2012-07-26 09:20:36 UTC (rev 42731)
+++ trunk/tests/features/org.jboss.tools.test.feature/pom.xml 2012-07-26 09:22:31 UTC (rev 42732)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.jboss.tools.tests</groupId>
<artifactId>features</artifactId>
- <version>3.3.0-SNAPSHOT</version>
+ <version>3.4.0-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.tests.features</groupId>
<artifactId>org.jboss.tools.test.feature</artifactId>
Modified: trunk/tests/features/pom.xml
===================================================================
--- trunk/tests/features/pom.xml 2012-07-26 09:20:36 UTC (rev 42731)
+++ trunk/tests/features/pom.xml 2012-07-26 09:22:31 UTC (rev 42732)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>tests</artifactId>
- <version>3.3.0-SNAPSHOT</version>
+ <version>3.4.0-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.tests</groupId>
<artifactId>features</artifactId>
Modified: trunk/tests/plugins/org.jboss.tools.tests/META-INF/MANIFEST.MF
===================================================================
--- trunk/tests/plugins/org.jboss.tools.tests/META-INF/MANIFEST.MF 2012-07-26 09:20:36 UTC (rev 42731)
+++ trunk/tests/plugins/org.jboss.tools.tests/META-INF/MANIFEST.MF 2012-07-26 09:22:31 UTC (rev 42732)
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name.0
Bundle-SymbolicName: org.jboss.tools.tests;singleton:=true
-Bundle-Version: 3.3.0.qualifier
+Bundle-Version: 3.4.0.qualifier
Bundle-Vendor: %Bundle-Vendor.0
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
Modified: trunk/tests/plugins/org.jboss.tools.tests/pom.xml
===================================================================
--- trunk/tests/plugins/org.jboss.tools.tests/pom.xml 2012-07-26 09:20:36 UTC (rev 42731)
+++ trunk/tests/plugins/org.jboss.tools.tests/pom.xml 2012-07-26 09:22:31 UTC (rev 42732)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.jboss.tools.tests</groupId>
<artifactId>plugins</artifactId>
- <version>3.3.0-SNAPSHOT</version>
+ <version>3.4.0-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.tests.plugins</groupId>
<artifactId>org.jboss.tools.tests</artifactId>
Modified: trunk/tests/plugins/org.jboss.tools.tests.installation/META-INF/MANIFEST.MF
===================================================================
--- trunk/tests/plugins/org.jboss.tools.tests.installation/META-INF/MANIFEST.MF 2012-07-26 09:20:36 UTC (rev 42731)
+++ trunk/tests/plugins/org.jboss.tools.tests.installation/META-INF/MANIFEST.MF 2012-07-26 09:22:31 UTC (rev 42732)
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: Tests for Installation and Updates
Bundle-SymbolicName: org.jboss.tools.tests.installation
-Bundle-Version: 3.3.0.qualifier
+Bundle-Version: 3.4.0.qualifier
Bundle-Vendor: JBoss, by Red Hat
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Require-Bundle: org.junit;bundle-version="4.0.0",
Modified: trunk/tests/plugins/org.jboss.tools.tests.installation/pom.xml
===================================================================
--- trunk/tests/plugins/org.jboss.tools.tests.installation/pom.xml 2012-07-26 09:20:36 UTC (rev 42731)
+++ trunk/tests/plugins/org.jboss.tools.tests.installation/pom.xml 2012-07-26 09:22:31 UTC (rev 42732)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.jboss.tools.tests</groupId>
<artifactId>plugins</artifactId>
- <version>3.3.0-SNAPSHOT</version>
+ <version>3.4.0-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.tests</groupId>
Modified: trunk/tests/plugins/org.jboss.tools.tests.performance/META-INF/MANIFEST.MF
===================================================================
--- trunk/tests/plugins/org.jboss.tools.tests.performance/META-INF/MANIFEST.MF 2012-07-26 09:20:36 UTC (rev 42731)
+++ trunk/tests/plugins/org.jboss.tools.tests.performance/META-INF/MANIFEST.MF 2012-07-26 09:22:31 UTC (rev 42732)
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: Performance tests
Bundle-SymbolicName: org.jboss.tools.tests.performance
-Bundle-Version: 3.3.0.qualifier
+Bundle-Version: 3.4.0.qualifier
Bundle-Activator: org.jboss.tools.tests.performance.Activator
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime
Modified: trunk/tests/plugins/org.jboss.tools.tests.performance/pom.xml
===================================================================
--- trunk/tests/plugins/org.jboss.tools.tests.performance/pom.xml 2012-07-26 09:20:36 UTC (rev 42731)
+++ trunk/tests/plugins/org.jboss.tools.tests.performance/pom.xml 2012-07-26 09:22:31 UTC (rev 42732)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.jboss.tools.tests</groupId>
<artifactId>plugins</artifactId>
- <version>3.3.0-SNAPSHOT</version>
+ <version>3.4.0-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.tests.plugins</groupId>
<artifactId>org.jboss.tools.tests.performance</artifactId>
Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/META-INF/MANIFEST.MF
===================================================================
--- trunk/tests/plugins/org.jboss.tools.ui.bot.ext/META-INF/MANIFEST.MF 2012-07-26 09:20:36 UTC (rev 42731)
+++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/META-INF/MANIFEST.MF 2012-07-26 09:22:31 UTC (rev 42732)
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: Ext
Bundle-SymbolicName: org.jboss.tools.ui.bot.ext
-Bundle-Version: 3.3.0.qualifier
+Bundle-Version: 3.4.0.qualifier
Bundle-ClassPath: .,
resources/drv/hsqldb.jar
Bundle-Activator: org.jboss.tools.ui.bot.ext.Activator
Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/pom.xml
===================================================================
--- trunk/tests/plugins/org.jboss.tools.ui.bot.ext/pom.xml 2012-07-26 09:20:36 UTC (rev 42731)
+++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/pom.xml 2012-07-26 09:22:31 UTC (rev 42732)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.jboss.tools.tests</groupId>
<artifactId>plugins</artifactId>
- <version>3.3.0-SNAPSHOT</version>
+ <version>3.4.0-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.tests.plugins</groupId>
<artifactId>org.jboss.tools.ui.bot.ext</artifactId>
Modified: trunk/tests/plugins/pom.xml
===================================================================
--- trunk/tests/plugins/pom.xml 2012-07-26 09:20:36 UTC (rev 42731)
+++ trunk/tests/plugins/pom.xml 2012-07-26 09:22:31 UTC (rev 42732)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>tests</artifactId>
- <version>3.3.0-SNAPSHOT</version>
+ <version>3.4.0-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.tests</groupId>
<artifactId>plugins</artifactId>
Modified: trunk/tests/pom.xml
===================================================================
--- trunk/tests/pom.xml 2012-07-26 09:20:36 UTC (rev 42731)
+++ trunk/tests/pom.xml 2012-07-26 09:22:31 UTC (rev 42732)
@@ -10,7 +10,7 @@
<groupId>org.jboss.tools</groupId>
<artifactId>tests</artifactId>
<name>tests.all</name>
- <version>3.3.0-SNAPSHOT</version>
+ <version>3.4.0-SNAPSHOT</version>
<packaging>pom</packaging>
<modules>
<module>plugins</module>
Modified: trunk/tests/scripts/installation-updates/pom.xml
===================================================================
--- trunk/tests/scripts/installation-updates/pom.xml 2012-07-26 09:20:36 UTC (rev 42731)
+++ trunk/tests/scripts/installation-updates/pom.xml 2012-07-26 09:22:31 UTC (rev 42732)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.tools.tests</groupId>
<artifactId>scripts</artifactId>
- <version>3.3.0-SNAPSHOT</version>
+ <version>3.4.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
Modified: trunk/tests/scripts/pom.xml
===================================================================
--- trunk/tests/scripts/pom.xml 2012-07-26 09:20:36 UTC (rev 42731)
+++ trunk/tests/scripts/pom.xml 2012-07-26 09:22:31 UTC (rev 42732)
@@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.jboss.tools</groupId>
- <version>3.3.0-SNAPSHOT</version>
+ <version>3.4.0-SNAPSHOT</version>
<artifactId>tests</artifactId>
</parent>
<groupId>org.jboss.tools.tests</groupId>
Modified: trunk/tests/site/pom.xml
===================================================================
--- trunk/tests/site/pom.xml 2012-07-26 09:20:36 UTC (rev 42731)
+++ trunk/tests/site/pom.xml 2012-07-26 09:22:31 UTC (rev 42732)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>tests</artifactId>
- <version>3.3.0-SNAPSHOT</version>
+ <version>3.4.0-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.tests</groupId>
<artifactId>tests.site</artifactId>
Modified: trunk/tests/tests/org.jboss.tools.tests.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/tests/tests/org.jboss.tools.tests.test/META-INF/MANIFEST.MF 2012-07-26 09:20:36 UTC (rev 42731)
+++ trunk/tests/tests/org.jboss.tools.tests.test/META-INF/MANIFEST.MF 2012-07-26 09:22:31 UTC (rev 42732)
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: Tests for test utils
Bundle-SymbolicName: org.jboss.tools.tests.test
-Bundle-Version: 3.3.0.qualifier
+Bundle-Version: 3.4.0.qualifier
Bundle-Vendor: JBoss by Red Hat
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Require-Bundle: org.junit,
Modified: trunk/tests/tests/org.jboss.tools.tests.test/pom.xml
===================================================================
--- trunk/tests/tests/org.jboss.tools.tests.test/pom.xml 2012-07-26 09:20:36 UTC (rev 42731)
+++ trunk/tests/tests/org.jboss.tools.tests.test/pom.xml 2012-07-26 09:22:31 UTC (rev 42732)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.tools.tests</groupId>
<artifactId>tests</artifactId>
- <version>3.3.0-SNAPSHOT</version>
+ <version>3.4.0-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.tests.tests</groupId>
<artifactId>org.jboss.tools.tests.test</artifactId>
Modified: trunk/tests/tests/org.jboss.tools.ui.bot.ext.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/tests/tests/org.jboss.tools.ui.bot.ext.test/META-INF/MANIFEST.MF 2012-07-26 09:20:36 UTC (rev 42731)
+++ trunk/tests/tests/org.jboss.tools.ui.bot.ext.test/META-INF/MANIFEST.MF 2012-07-26 09:22:31 UTC (rev 42732)
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: Tests for SWTBot extensions
Bundle-SymbolicName: org.jboss.tools.ui.bot.ext.test
-Bundle-Version: 3.3.0.qualifier
+Bundle-Version: 3.4.0.qualifier
Bundle-Activator: org.jboss.tools.ui.bot.ext.test.Activator
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
Modified: trunk/tests/tests/org.jboss.tools.ui.bot.ext.test/pom.xml
===================================================================
--- trunk/tests/tests/org.jboss.tools.ui.bot.ext.test/pom.xml 2012-07-26 09:20:36 UTC (rev 42731)
+++ trunk/tests/tests/org.jboss.tools.ui.bot.ext.test/pom.xml 2012-07-26 09:22:31 UTC (rev 42732)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.jboss.tools.tests</groupId>
<artifactId>tests</artifactId>
- <version>3.3.0-SNAPSHOT</version>
+ <version>3.4.0-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.tests.tests</groupId>
Modified: trunk/tests/tests/pom.xml
===================================================================
--- trunk/tests/tests/pom.xml 2012-07-26 09:20:36 UTC (rev 42731)
+++ trunk/tests/tests/pom.xml 2012-07-26 09:22:31 UTC (rev 42732)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>tests</artifactId>
- <version>3.3.0-SNAPSHOT</version>
+ <version>3.4.0-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.tests</groupId>
<artifactId>tests</artifactId>
13 years, 5 months
JBoss Tools SVN: r42731 - trunk/gwt/tests/org.jboss.tools.gwt.test.
by jbosstools-commits＠lists.jboss.org
Author: ppalaga
Date: 2012-07-26 05:20:36 -0400 (Thu, 26 Jul 2012)
New Revision: 42731
Modified:
trunk/gwt/tests/org.jboss.tools.gwt.test/
Log:
org.jboss.tools.gwt.test/bin added to svn:ignore.
Property changes on: trunk/gwt/tests/org.jboss.tools.gwt.test
___________________________________________________________________
Modified: svn:ignore
- target
+ target
bin
13 years, 5 months
JBoss Tools SVN: r42730 - in trunk/jsf/tests/org.jboss.tools.jsf.test: src/org/jboss/tools/jsf/test/validation and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2012-07-25 20:30:44 -0400 (Wed, 25 Jul 2012)
New Revision: 42730
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2ComponentsValidator/WebContent/WEB-INF/faces-config.xml
trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/validation/FacesConfigValidatorTest.java
Log:
JBIDE-11916
https://issues.jboss.org/browse/JBIDE-11916
Test is added.
Modified: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2ComponentsValidator/WebContent/WEB-INF/faces-config.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2ComponentsValidator/WebContent/WEB-INF/faces-config.xml 2012-07-25 23:02:33 UTC (rev 42729)
+++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2ComponentsValidator/WebContent/WEB-INF/faces-config.xml 2012-07-26 00:30:44 UTC (rev 42730)
@@ -42,6 +42,9 @@
<to-view-id>/pages/greeting3.xhtml?page=#{aaa.bbb}</to-view-id>
</navigation-case>
</navigation-rule>
+ <navigation-rule>
+ <from-view-id>/pages/inputname222.xhtml</from-view-id>
+ </navigation-rule>
<application>
<action-listener>actionListener</action-listener>
</application>
Modified: trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/validation/FacesConfigValidatorTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/validation/FacesConfigValidatorTest.java 2012-07-25 23:02:33 UTC (rev 42729)
+++ trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/validation/FacesConfigValidatorTest.java 2012-07-26 00:30:44 UTC (rev 42730)
@@ -54,6 +54,7 @@
AbstractResourceMarkerTest.assertMarkerIsCreated(resource, NLS.bind(JSFValidationMessage.VIEW_NOT_EXISTS, JSFConstants.ATT_TO_VIEW_ID, "/pages/greeting3.xhtml"), 30, 42);
AbstractResourceMarkerTest.assertMarkerIsCreated(resource, NLS.bind(JSFValidationMessage.VIEW_ID_NO_SLASH, JSFConstants.ATT_TO_VIEW_ID), 34);
AbstractResourceMarkerTest.assertMarkerIsNotCreated(resource, NLS.bind(JSFValidationMessage.VIEW_NOT_EXISTS, JSFConstants.ATT_TO_VIEW_ID, "/pages/#{aaa.bbb}"), 38);
+ AbstractResourceMarkerTest.assertMarkerIsCreated(resource, NLS.bind(JSFValidationMessage.VIEW_NOT_EXISTS, JSFConstants.ATT_FROM_VIEW_ID, "/pages/inputname222.xhtml"), 46);
}
}
\ No newline at end of file
13 years, 5 months
JBoss Tools SVN: r42729 - in trunk: common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/refactoring and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2012-07-25 19:02:33 -0400 (Wed, 25 Jul 2012)
New Revision: 42729
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/CDIProblemMarkerResolutionGenerator.java
trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/refactoring/MarkerResolutionUtils.java
Log:
Make CDI Quick Fixes work for As-You-Type validator annotations https://issues.jboss.org/browse/JBIDE-12328
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/CDIProblemMarkerResolutionGenerator.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/CDIProblemMarkerResolutionGenerator.java 2012-07-25 22:39:31 UTC (rev 42728)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/CDIProblemMarkerResolutionGenerator.java 2012-07-25 23:02:33 UTC (rev 42729)
@@ -68,6 +68,7 @@
import org.jboss.tools.common.model.util.EclipseResourceUtil;
import org.jboss.tools.common.quickfix.IQuickFix;
import org.jboss.tools.common.quickfix.IQuickFixGenerator;
+import org.jboss.tools.common.refactoring.MarkerResolutionUtils;
import org.jboss.tools.common.validation.java.TempJavaProblem;
import org.jboss.tools.common.validation.java.TempJavaProblemAnnotation;
@@ -104,10 +105,11 @@
}
private int getMessageID(TemporaryAnnotation annotation){
- Integer attribute = ((Integer) annotation.getAttributes().get(CDIValidationErrorManager.MESSAGE_ID_ATTRIBUTE_NAME));
- if (attribute != null)
- return attribute.intValue();
-
+ if(annotation.getAttributes() != null){
+ Integer attribute = ((Integer) annotation.getAttributes().get(CDIValidationErrorManager.MESSAGE_ID_ATTRIBUTE_NAME));
+ if (attribute != null)
+ return attribute.intValue();
+ }
return -1;
}
@@ -1072,7 +1074,7 @@
}else if(annotation instanceof TemporaryAnnotation){
TemporaryAnnotation tempAnnotation = (TemporaryAnnotation)annotation;
- IFile file = getFile();
+ IFile file = MarkerResolutionUtils.getFile();
int messageId = getMessageID(tempAnnotation);
int start = tempAnnotation.getPosition().getOffset();
int end = start + tempAnnotation.getPosition().getLength();
@@ -1086,20 +1088,5 @@
return null;
}
- private static IFile getFile(){
- IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
- if(window != null){
- IWorkbenchPage page = window.getActivePage();
- if(page != null){
- IEditorPart editor = page.getActiveEditor();
- if(editor != null){
- IEditorInput input = editor.getEditorInput();
- if(input instanceof IFileEditorInput){
- return ((IFileEditorInput) input).getFile();
- }
- }
- }
- }
- return null;
- }
+
}
Modified: trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/refactoring/MarkerResolutionUtils.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/refactoring/MarkerResolutionUtils.java 2012-07-25 22:39:31 UTC (rev 42728)
+++ trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/refactoring/MarkerResolutionUtils.java 2012-07-25 23:02:33 UTC (rev 42729)
@@ -15,6 +15,7 @@
import java.util.regex.Matcher;
import java.util.regex.Pattern;
+import org.eclipse.core.resources.IFile;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.jdt.core.Flags;
@@ -49,6 +50,12 @@
import org.eclipse.text.edits.MultiTextEdit;
import org.eclipse.text.edits.ReplaceEdit;
import org.eclipse.text.edits.TextEdit;
+import org.eclipse.ui.IEditorInput;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.IFileEditorInput;
+import org.eclipse.ui.IWorkbenchPage;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.PlatformUI;
import org.jboss.tools.common.util.EclipseJavaUtil;
public class MarkerResolutionUtils {
@@ -689,4 +696,21 @@
}
return buf.toString();
}
+
+ public static IFile getFile(){
+ IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
+ if(window != null){
+ IWorkbenchPage page = window.getActivePage();
+ if(page != null){
+ IEditorPart editor = page.getActiveEditor();
+ if(editor != null){
+ IEditorInput input = editor.getEditorInput();
+ if(input instanceof IFileEditorInput){
+ return ((IFileEditorInput) input).getFile();
+ }
+ }
+ }
+ }
+ return null;
+ }
}
13 years, 5 months
JBoss Tools SVN: r42728 - in trunk/cdi/plugins: org.jboss.tools.cdi.seam.solder.core and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2012-07-25 18:39:31 -0400 (Wed, 25 Jul 2012)
New Revision: 42728
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/build.properties
trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/build.properties
Log:
https://issues.jboss.org/browse/JBIDE-12373 Update RequiredExecutionEnvironment to Java 1.6 for Common/CDI/Seam/JSF components
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/build.properties
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/build.properties 2012-07-25 22:35:52 UTC (rev 42727)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/build.properties 2012-07-25 22:39:31 UTC (rev 42728)
@@ -10,4 +10,4 @@
about.html,\
plugin.properties,\
META-INF/,\
- build.properties,\
+ build.properties
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/build.properties
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/build.properties 2012-07-25 22:35:52 UTC (rev 42727)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/build.properties 2012-07-25 22:39:31 UTC (rev 42728)
@@ -10,4 +10,4 @@
about.html,\
plugin.properties,\
META-INF/,\
- build.properties,\
+ build.properties
13 years, 5 months
JBoss Tools SVN: r42727 - in trunk/cdi/plugins: org.jboss.tools.cdi.seam.solder.core and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2012-07-25 18:35:52 -0400 (Wed, 25 Jul 2012)
New Revision: 42727
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/build.properties
trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/build.properties
Log:
https://issues.jboss.org/browse/JBIDE-12373 Update RequiredExecutionEnvironment to Java 1.6 for Common/CDI/Seam/JSF components
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/build.properties
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/build.properties 2012-07-25 22:33:52 UTC (rev 42726)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/build.properties 2012-07-25 22:35:52 UTC (rev 42727)
@@ -11,4 +11,3 @@
plugin.properties,\
META-INF/,\
build.properties,\
- .settings/
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/build.properties
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/build.properties 2012-07-25 22:33:52 UTC (rev 42726)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/build.properties 2012-07-25 22:35:52 UTC (rev 42727)
@@ -11,4 +11,3 @@
plugin.properties,\
META-INF/,\
build.properties,\
- .settings/
13 years, 5 months
JBoss Tools SVN: r42726 - trunk/jsf/tests/org.jboss.tools.jsf.base.test.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2012-07-25 18:33:52 -0400 (Wed, 25 Jul 2012)
New Revision: 42726
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.base.test/build.properties
Log:
https://issues.jboss.org/browse/JBIDE-12373 Update RequiredExecutionEnvironment to Java 1.6 for Common/CDI/Seam/JSF components
Modified: trunk/jsf/tests/org.jboss.tools.jsf.base.test/build.properties
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.base.test/build.properties 2012-07-25 21:50:40 UTC (rev 42725)
+++ trunk/jsf/tests/org.jboss.tools.jsf.base.test/build.properties 2012-07-25 22:33:52 UTC (rev 42726)
@@ -6,5 +6,4 @@
src.includes = projects/,\
pom.xml,\
META-INF/,\
- .settings/,\
.project
13 years, 5 months
JBoss Tools SVN: r42725 - in trunk: jsf/plugins/org.jboss.tools.jsf.text.ext and 39 other directories.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2012-07-25 17:50:40 -0400 (Wed, 25 Jul 2012)
New Revision: 42725
Removed:
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jbpm/.settings/
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.myfaces/.settings/
trunk/jsf/tests/org.jboss.tools.jsf.base.test/.settings/
trunk/jsf/tests/org.jboss.tools.jsf.test/.settings/
trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/.settings/
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/.settings/
trunk/jsf/tests/org.jboss.tools.jsf.verification.test/.settings/
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jbpm.test/.settings/
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/.settings/
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jstl.test/.settings/
trunk/jst/plugins/org.jboss.tools.jst.css/.settings/
trunk/jst/plugins/org.jboss.tools.jst.firstrun/.settings/
trunk/jst/plugins/org.jboss.tools.jst.jsp/.settings/
trunk/jst/plugins/org.jboss.tools.jst.text.ext/.settings/
trunk/jst/plugins/org.jboss.tools.jst.web.kb/.settings/
trunk/jst/plugins/org.jboss.tools.jst.web.tiles.ui/.settings/
trunk/jst/plugins/org.jboss.tools.jst.web.tiles/.settings/
trunk/jst/plugins/org.jboss.tools.jst.web.verification/.settings/
trunk/jst/plugins/org.jboss.tools.jst.web/.settings/
trunk/jst/tests/org.jboss.tools.jst.css.test/.settings/
trunk/jst/tests/org.jboss.tools.jst.jsp.base.test/.settings/
trunk/jst/tests/org.jboss.tools.jst.jsp.test/.settings/
trunk/jst/tests/org.jboss.tools.jst.web.kb.test/.settings/
trunk/jst/tests/org.jboss.tools.jst.web.test/.settings/
trunk/jst/tests/org.jboss.tools.jst.web.ui.test/.settings/
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.text.ext.richfaces/.classpath
trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/.classpath
trunk/jsf/plugins/org.jboss.tools.jsf.ui/.classpath
trunk/jsf/plugins/org.jboss.tools.jsf.verification/.classpath
trunk/jsf/plugins/org.jboss.tools.jsf/.classpath
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/.classpath
trunk/jsf/tests/org.jboss.tools.jsf.verification.test/.classpath
trunk/jst/plugins/org.jboss.tools.jst.firstrun/.classpath
trunk/jst/plugins/org.jboss.tools.jst.firstrun/META-INF/MANIFEST.MF
trunk/jst/plugins/org.jboss.tools.jst.text.ext/.classpath
trunk/jst/plugins/org.jboss.tools.jst.text.ext/META-INF/MANIFEST.MF
trunk/jst/plugins/org.jboss.tools.jst.web.tiles.ui/.classpath
trunk/jst/plugins/org.jboss.tools.jst.web.tiles.ui/META-INF/MANIFEST.MF
trunk/jst/plugins/org.jboss.tools.jst.web.tiles/.classpath
trunk/jst/plugins/org.jboss.tools.jst.web.tiles/META-INF/MANIFEST.MF
trunk/jst/plugins/org.jboss.tools.jst.web.verification/.classpath
trunk/jst/plugins/org.jboss.tools.jst.web.verification/META-INF/MANIFEST.MF
trunk/jst/plugins/org.jboss.tools.jst.web/.classpath
trunk/jst/plugins/org.jboss.tools.jst.web/META-INF/MANIFEST.MF
trunk/jst/tests/org.jboss.tools.jst.text.ext.test/.classpath
trunk/jst/tests/org.jboss.tools.jst.text.ext.test/META-INF/MANIFEST.MF
trunk/jst/tests/org.jboss.tools.jst.web.kb.test/.classpath
trunk/jst/tests/org.jboss.tools.jst.web.kb.test/META-INF/MANIFEST.MF
trunk/jst/tests/org.jboss.tools.jst.web.test/.classpath
trunk/jst/tests/org.jboss.tools.jst.web.test/META-INF/MANIFEST.MF
trunk/jst/tests/org.jboss.tools.jst.web.ui.test/.classpath
trunk/jst/tests/org.jboss.tools.jst.web.ui.test/META-INF/MANIFEST.MF
Log:
https://issues.jboss.org/browse/JBIDE-12373 Update RequiredExecutionEnvironment to Java 1.6 for Common/CDI/Seam/JSF components
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/.classpath
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/.classpath 2012-07-25 21:45:26 UTC (rev 42724)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/.classpath 2012-07-25 21:50:40 UTC (rev 42725)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <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.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src/"/>
<classpathentry kind="src" path="resources/"/>
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/.classpath
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/.classpath 2012-07-25 21:45:26 UTC (rev 42724)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/.classpath 2012-07-25 21:50:40 UTC (rev 42725)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <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.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.text.ext.richfaces/.classpath
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.text.ext.richfaces/.classpath 2012-07-25 21:45:26 UTC (rev 42724)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.text.ext.richfaces/.classpath 2012-07-25 21:50:40 UTC (rev 42725)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <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.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.ui/.classpath
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.ui/.classpath 2012-07-25 21:45:26 UTC (rev 42724)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.ui/.classpath 2012-07-25 21:50:40 UTC (rev 42725)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <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.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src/"/>
<classpathentry kind="src" path="resources/"/>
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.verification/.classpath
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.verification/.classpath 2012-07-25 21:45:26 UTC (rev 42724)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.verification/.classpath 2012-07-25 21:50:40 UTC (rev 42725)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <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.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src/"/>
<classpathentry kind="src" path="resources/"/>
Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/.classpath
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/.classpath 2012-07-25 21:45:26 UTC (rev 42724)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/.classpath 2012-07-25 21:50:40 UTC (rev 42725)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <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.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
Modified: trunk/jsf/tests/org.jboss.tools.jsf.verification.test/.classpath
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.verification.test/.classpath 2012-07-25 21:45:26 UTC (rev 42724)
+++ trunk/jsf/tests/org.jboss.tools.jsf.verification.test/.classpath 2012-07-25 21:50:40 UTC (rev 42725)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <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.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
Modified: trunk/jst/plugins/org.jboss.tools.jst.firstrun/.classpath
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.firstrun/.classpath 2012-07-25 21:45:26 UTC (rev 42724)
+++ trunk/jst/plugins/org.jboss.tools.jst.firstrun/.classpath 2012-07-25 21:50:40 UTC (rev 42725)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <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.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
Modified: trunk/jst/plugins/org.jboss.tools.jst.firstrun/META-INF/MANIFEST.MF
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.firstrun/META-INF/MANIFEST.MF 2012-07-25 21:45:26 UTC (rev 42724)
+++ trunk/jst/plugins/org.jboss.tools.jst.firstrun/META-INF/MANIFEST.MF 2012-07-25 21:50:40 UTC (rev 42725)
@@ -17,4 +17,4 @@
Bundle-ActivationPolicy: lazy
Export-Package: org.jboss.tools.jst.firstrun
Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Modified: trunk/jst/plugins/org.jboss.tools.jst.text.ext/.classpath
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.text.ext/.classpath 2012-07-25 21:45:26 UTC (rev 42724)
+++ trunk/jst/plugins/org.jboss.tools.jst.text.ext/.classpath 2012-07-25 21:50:40 UTC (rev 42725)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <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.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
Modified: trunk/jst/plugins/org.jboss.tools.jst.text.ext/META-INF/MANIFEST.MF
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.text.ext/META-INF/MANIFEST.MF 2012-07-25 21:45:26 UTC (rev 42724)
+++ trunk/jst/plugins/org.jboss.tools.jst.text.ext/META-INF/MANIFEST.MF 2012-07-25 21:50:40 UTC (rev 42725)
@@ -30,4 +30,4 @@
org.eclipse.wst.css.core;bundle-version="1.1.500",
org.eclipse.wst.html.core;bundle-version="1.1.500",
org.jboss.tools.jst.web.kb
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Modified: trunk/jst/plugins/org.jboss.tools.jst.web/.classpath
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web/.classpath 2012-07-25 21:45:26 UTC (rev 42724)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/.classpath 2012-07-25 21:50:40 UTC (rev 42725)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <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.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src/"/>
<classpathentry kind="src" path="resources/"/>
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-07-25 21:45:26 UTC (rev 42724)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/META-INF/MANIFEST.MF 2012-07-25 21:50:40 UTC (rev 42725)
@@ -58,5 +58,5 @@
org.jboss.tools.jst.web.validation,
org.jboss.tools.jst.web.webapp.model,
org.jboss.tools.jst.web.webapp.model.handlers
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.tiles/.classpath
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.tiles/.classpath 2012-07-25 21:45:26 UTC (rev 42724)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.tiles/.classpath 2012-07-25 21:50:40 UTC (rev 42725)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <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.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src/"/>
<classpathentry kind="src" path="resources/"/>
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.tiles/META-INF/MANIFEST.MF
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.tiles/META-INF/MANIFEST.MF 2012-07-25 21:45:26 UTC (rev 42724)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.tiles/META-INF/MANIFEST.MF 2012-07-25 21:50:40 UTC (rev 42725)
@@ -25,4 +25,4 @@
org.eclipse.core.resources;bundle-version="3.7.100",
org.eclipse.core.runtime;bundle-version="3.7.0"
Bundle-Version: 3.4.0.qualifier
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.tiles.ui/.classpath
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.tiles.ui/.classpath 2012-07-25 21:45:26 UTC (rev 42724)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.tiles.ui/.classpath 2012-07-25 21:50:40 UTC (rev 42725)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <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.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src/"/>
<classpathentry kind="src" path="resources/"/>
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.tiles.ui/META-INF/MANIFEST.MF
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.tiles.ui/META-INF/MANIFEST.MF 2012-07-25 21:45:26 UTC (rev 42724)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.tiles.ui/META-INF/MANIFEST.MF 2012-07-25 21:50:40 UTC (rev 42725)
@@ -48,4 +48,4 @@
org.eclipse.gef;bundle-version="3.7.0",
org.eclipse.core.expressions;bundle-version="3.4.200"
Bundle-Version: 3.4.0.qualifier
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.verification/.classpath
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.verification/.classpath 2012-07-25 21:45:26 UTC (rev 42724)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.verification/.classpath 2012-07-25 21:50:40 UTC (rev 42725)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <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.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="resources/"/>
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.verification/META-INF/MANIFEST.MF
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.verification/META-INF/MANIFEST.MF 2012-07-25 21:45:26 UTC (rev 42724)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.verification/META-INF/MANIFEST.MF 2012-07-25 21:50:40 UTC (rev 42725)
@@ -15,4 +15,4 @@
org.jboss.tools.jst.web
Bundle-Version: 3.4.0.qualifier
Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Modified: trunk/jst/tests/org.jboss.tools.jst.text.ext.test/.classpath
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.text.ext.test/.classpath 2012-07-25 21:45:26 UTC (rev 42724)
+++ trunk/jst/tests/org.jboss.tools.jst.text.ext.test/.classpath 2012-07-25 21:50:40 UTC (rev 42725)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <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.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
Modified: trunk/jst/tests/org.jboss.tools.jst.text.ext.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.text.ext.test/META-INF/MANIFEST.MF 2012-07-25 21:45:26 UTC (rev 42724)
+++ trunk/jst/tests/org.jboss.tools.jst.text.ext.test/META-INF/MANIFEST.MF 2012-07-25 21:50:40 UTC (rev 42725)
@@ -22,4 +22,4 @@
Export-Package: org.jboss.tools.jst.text.ext.test
Bundle-Vendor: %Bundle-Vendor.0
Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Modified: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/.classpath
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/.classpath 2012-07-25 21:45:26 UTC (rev 42724)
+++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/.classpath 2012-07-25 21:50:40 UTC (rev 42725)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <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.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
Modified: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/META-INF/MANIFEST.MF 2012-07-25 21:45:26 UTC (rev 42724)
+++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/META-INF/MANIFEST.MF 2012-07-25 21:50:40 UTC (rev 42725)
@@ -23,7 +23,7 @@
org.jboss.tools.common.base.test,
org.eclipse.jface.text;bundle-version="3.7.0"
Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-Vendor: %Bundle-Vendor.0
Export-Package: org.jboss.tools.jst.web.kb.test,
org.jboss.tools.jst.web.kb.test.validation
Modified: trunk/jst/tests/org.jboss.tools.jst.web.test/.classpath
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.web.test/.classpath 2012-07-25 21:45:26 UTC (rev 42724)
+++ trunk/jst/tests/org.jboss.tools.jst.web.test/.classpath 2012-07-25 21:50:40 UTC (rev 42725)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <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.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
Modified: trunk/jst/tests/org.jboss.tools.jst.web.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.web.test/META-INF/MANIFEST.MF 2012-07-25 21:45:26 UTC (rev 42724)
+++ trunk/jst/tests/org.jboss.tools.jst.web.test/META-INF/MANIFEST.MF 2012-07-25 21:50:40 UTC (rev 42725)
@@ -22,4 +22,4 @@
Bundle-Vendor: %Bundle-Vendor.0
Export-Package: org.jboss.tools.jst.web.test
Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Modified: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/.classpath
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.web.ui.test/.classpath 2012-07-25 21:45:26 UTC (rev 42724)
+++ trunk/jst/tests/org.jboss.tools.jst.web.ui.test/.classpath 2012-07-25 21:50:40 UTC (rev 42725)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <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.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
Modified: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.web.ui.test/META-INF/MANIFEST.MF 2012-07-25 21:45:26 UTC (rev 42724)
+++ trunk/jst/tests/org.jboss.tools.jst.web.ui.test/META-INF/MANIFEST.MF 2012-07-25 21:50:40 UTC (rev 42725)
@@ -17,4 +17,4 @@
org.eclipse.jst.standard.schemas
Export-Package: org.jboss.tools.jst.web.ui.test
Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
13 years, 5 months
JBoss Tools SVN: r42724 - in trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi: internal/core/impl/definition and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2012-07-25 17:45:26 -0400 (Wed, 25 Jul 2012)
New Revision: 42724
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDICoreBuilder.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/DefinitionContext.java
Log:
JBIDE-12366
https://issues.jboss.org/browse/JBIDE-12366
jsfnature is not necessary.
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDICoreBuilder.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDICoreBuilder.java 2012-07-25 21:28:04 UTC (rev 42723)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDICoreBuilder.java 2012-07-25 21:45:26 UTC (rev 42724)
@@ -167,12 +167,14 @@
}
n.cleanTypeFactory();
+
+ if(kind == FULL_BUILD) n.getClassPath().reset();
//1. Check class path.
boolean isClassPathUpdated = n.getClassPath().update();
JarSet newJars = new JarSet();
- if(isClassPathUpdated) {
+ if(isClassPathUpdated || kind == FULL_BUILD) {
//2. Update class path. Removed paths will be cached to be applied to working copy of context.
n.getClassPath().setSrcs(getResourceVisitor().srcs);
newJars = n.getClassPath().process();
@@ -204,7 +206,7 @@
for (IBuildParticipantFeature p: buildParticipants) p.beginVisiting();
//5.2 Discover sources and build definitions.
- if(isClassPathUpdated) {
+ if(isClassPathUpdated || kind == FULL_BUILD) {
buildJars(newJars);
n.getClassPath().validateProjectDependencies();
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/DefinitionContext.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/DefinitionContext.java 2012-07-25 21:28:04 UTC (rev 42723)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/DefinitionContext.java 2012-07-25 21:45:26 UTC (rev 42724)
@@ -330,7 +330,7 @@
}
public void newWorkingCopy(boolean forFullBuild) {
- if(original != null) return;
+ if(original != null || workingCopy != null) return;
workingCopy = copy(forFullBuild);
workingCopy.original = this;
}
13 years, 5 months
JBoss Tools SVN: r42723 - trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/project/ext.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2012-07-25 17:28:04 -0400 (Wed, 25 Jul 2012)
New Revision: 42723
Modified:
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/project/ext/AbstractClassPathMonitor.java
Log:
JBIDE-11366
https://issues.jboss.org/browse/JBIDE-11366
jsfnature is not necessary.
Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/project/ext/AbstractClassPathMonitor.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/project/ext/AbstractClassPathMonitor.java 2012-07-25 21:18:35 UTC (rev 42722)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/project/ext/AbstractClassPathMonitor.java 2012-07-25 21:28:04 UTC (rev 42723)
@@ -114,6 +114,10 @@
}
}
+ public synchronized void reset() {
+ processedPaths.clear();
+ }
+
protected List<String> syncProcessedPaths() {
ArrayList<String> removed = new ArrayList<String>();
synchronized (this) {
13 years, 5 months