JBoss Tools SVN: r42476 - trunk/download.jboss.org/jbosstools/examples.
by jbosstools-commits＠lists.jboss.org
Author: fbricon
Date: 2012-07-09 18:16:37 -0400 (Mon, 09 Jul 2012)
New Revision: 42476
Modified:
trunk/download.jboss.org/jbosstools/examples/project-examples-shared-3.3....
Log:
JBIDE-12254 : central wizards/project example that uses mvn archetypes should have info about which archetype it uses
Modified: trunk/download.jboss.org/jbosstools/examples/project-examples-shared-3.3....
===================================================================
--- trunk/download.jboss.org/jbosstools/examples/project-examples-shared-3.3.... 2012-07-09 22:13:31 UTC (rev 42475)
+++ trunk/download.jboss.org/jbosstools/examples/project-examples-shared-3.3.... 2012-07-09 22:16:37 UTC (rev 42476)
@@ -13,7 +13,7 @@
<description>
This is your project! It's a sample, deployable Maven 3 project to help you get your foot in the door developing with Java EE 6 on JBoss Enterprise Application Platform 6 or JBoss Application Server 7.1.
This project is setup to allow you to create a compliant Java EE 6 application using JSF 2.0, CDI 1.0, EJB 3.1, JPA 2.0 and Bean Validation 1.0.
-It includes a persistence unit and some sample persistence and transaction code to help you get your feet wet with database access in enterprise Java.
+This project is based on the org.jboss.spec.archetypes:jboss-javaee6-webapp-archetype:7.1.1.Beta3 Maven archetype.
</description>
<size>8192</size>
<url/>
@@ -25,7 +25,7 @@
</fix>
<fix type="plugin">
<property name="id">org.eclipse.m2e.core</property>
- <property name="versions">[1.0.0,1.2.0)</property>
+ <property name="versions">[1.0.0,2.0.0)</property>
<property name="description">This project example requires m2e >= 1.0.</property>
<property name="connectorIds">org.eclipse.m2e.feature</property>
</fix>
@@ -71,7 +71,10 @@
<included-projects>multi-javaee6-archetype</included-projects>
<shortDescription>Java EE Project</shortDescription>
<priority>2</priority>
- <description>An archetype that generates a starter Java EE 6 webapp project for JBoss Enterprise Application Platform 6 or JBoss Application Server. The project is an EAR, with an EJB-JAR and WAR</description>
+ <description>An archetype that generates a starter Java EE 6 webapp project for JBoss Enterprise Application Platform 6 or JBoss Application Server. The project is an EAR, with an EJB-JAR and WAR.
+
+This project is based on the org.jboss.spec.archetypes:jboss-javaee6-webapp-ear-archetype:7.1.1.Beta3 Maven archetype.
+ </description>
<size>13806</size>
<url/>
<fixes>
@@ -126,7 +129,10 @@
<included-projects>jboss-javaee6-poh5</included-projects>
<shortDescription>HTML5 Project</shortDescription>
<priority>3</priority>
- <description>An archetype that generates a Java EE 6 HTML5 Mobile Webapp project for JBoss Enterprise Application Platform 6 or JBoss Application Server 7.1</description>
+ <description>An archetype that generates a Java EE 6 HTML5 Mobile Webapp project for JBoss Enterprise Application Platform 6 or JBoss Application Server 7.1
+
+This project is based on the org.jboss.aerogear.archetypes:jboss-html5-mobile-archetype:1.0.0.M4b Maven archetype.
+ </description>
<size>165567</size>
<url/>
<fixes>
@@ -180,7 +186,9 @@
<included-projects>richfaces-archetype-simpleapp</included-projects>
<shortDescription>RichFaces Project</shortDescription>
<priority>4</priority>
- <description>An archetype that generates a simple Richfaces application</description>
+ <description>An archetype that generates a simple Richfaces application
+
+This project is based on the org.richfaces.archetypes:richfaces-archetype-kitchensink:4.2.2.Final-2 Maven archetype.</description>
<size>165567</size>
<url/>
<fixes>
@@ -245,7 +253,9 @@
<included-projects>spring-mvc-webapp</included-projects>
<shortDescription>Spring MVC Project</shortDescription>
<priority>5</priority>
- <description>An archetype that generates a starter Spring MVC application with Java EE persistence settings (server bootstrapped JPA, JTA transaction management) for JBoss Enterprise Application Platform 6 or JBoss Application Server 7.1</description>
+ <description>An archetype that generates a starter Spring MVC application with Java EE persistence settings (server bootstrapped JPA, JTA transaction management) for JBoss Enterprise Application Platform 6 or JBoss Application Server 7.1
+
+This project is based on the org.jboss.spring.archetypes:spring-mvc-webapp:1.0.0.CR6 Maven archetype.</description>
<size>165567</size>
<url/>
<fixes>
@@ -303,8 +313,9 @@
<priority>6</priority>
<shortDescription>GWT Web Project</shortDescription>
<description>An archetype that generates a starter GWT application with Java EE 6 and Errai.
-
-Make sure you read the deployment instructions in README.md</description>
+Make sure you read the deployment instructions in README.md.
+
+This project is based on the org.jboss.errai.archetypes:jboss-errai-kitchensink-archetype:2.0.0.Final Maven archetype.</description>
<size>165567</size>
<url/>
<fixes>
13 years, 9 months
JBoss Tools SVN: r42475 - branches/jbosstools-3.3.x/central/plugins/org.jboss.tools.central.discovery.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-07-09 18:13:31 -0400 (Mon, 09 Jul 2012)
New Revision: 42475
Modified:
branches/jbosstools-3.3.x/central/plugins/org.jboss.tools.central.discovery/plugin.xml
Log:
JBDS-2219, JBDS-2220, JBDS-2221 apply patch to fix order of connectors
Modified: branches/jbosstools-3.3.x/central/plugins/org.jboss.tools.central.discovery/plugin.xml
===================================================================
--- branches/jbosstools-3.3.x/central/plugins/org.jboss.tools.central.discovery/plugin.xml 2012-07-09 21:03:33 UTC (rev 42474)
+++ branches/jbosstools-3.3.x/central/plugins/org.jboss.tools.central.discovery/plugin.xml 2012-07-09 22:13:31 UTC (rev 42475)
@@ -283,11 +283,11 @@
<connectorDescriptor
categoryId="org.jboss.tools.central.discovery.scm"
groupId="org.jboss.tools.central.discovery.scm.git"
- description="Mylyn support for Git and GitHub"
+ description="Mylyn support for Eclipse EGit and GitHub"
id="org.eclipse.egit.mylyn"
kind="task"
license="Free, EPL"
- name="Mylyn support for Eclipse EGit + GitHub"
+ name="Eclipse EGit: Mylyn Support"
provider="eclipse.org"
siteUrl="http://download.jboss.org/jbosstools/updates/stable/indigo/central/core/">
<iu id="org.eclipse.jgit"/>
@@ -337,7 +337,7 @@
id="org.tigris.subversion.subclipse.mylyn"
kind="task"
license="Free, Subclipse License"
- name="Mylyn for Subclipse + SVNKit"
+ name="Subclipse + SVNKit: Mylyn Support"
provider="tigris.org"
siteUrl="http://download.jboss.org/jbosstools/updates/stable/indigo/central/core/">
<iu id="org.tigris.subversion.subclipse"/>
13 years, 9 months
JBoss Tools SVN: r42474 - trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/java.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2012-07-09 17:03:33 -0400 (Mon, 09 Jul 2012)
New Revision: 42474
Modified:
trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/java/ParametedTypeFactory.java
Log:
JBIDE-12296
https://issues.jboss.org/browse/JBIDE-12296
Map ParametedTypeFactory.cache is accessed from different threads by build and as-you-type validation. It should be synchronized.
Modified: trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/java/ParametedTypeFactory.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/java/ParametedTypeFactory.java 2012-07-09 20:48:30 UTC (rev 42473)
+++ trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/java/ParametedTypeFactory.java 2012-07-09 21:03:33 UTC (rev 42474)
@@ -11,6 +11,7 @@
package org.jboss.tools.common.java;
import java.util.HashMap;
+import java.util.Hashtable;
import java.util.Map;
import org.eclipse.core.runtime.CoreException;
@@ -25,20 +26,20 @@
public class ParametedTypeFactory {
// I S J C F D Z
- static HashMap<Character,String> primitives = new HashMap<Character, String>();
+ static Map<Character,String> primitives = new HashMap<Character, String>();
static {
- primitives.put(Signature.C_INT, "Ljava.lang.Integer;");
- primitives.put(Signature.C_SHORT, "Ljava.lang.Short;");
- primitives.put(Signature.C_LONG, "Ljava.lang.Long;");
- primitives.put(Signature.C_CHAR, "Ljava.lang.Character;");
- primitives.put(Signature.C_FLOAT, "Ljava.lang.Float;");
- primitives.put(Signature.C_DOUBLE, "Ljava.lang.Double;");
- primitives.put(Signature.C_BOOLEAN, "Ljava.lang.Boolean;");
- primitives.put(Signature.C_BYTE, "Ljava.lang.Boolean;");
+ primitives.put(Signature.C_INT, "Ljava.lang.Integer;"); //$NON-NLS-1$
+ primitives.put(Signature.C_SHORT, "Ljava.lang.Short;"); //$NON-NLS-1$
+ primitives.put(Signature.C_LONG, "Ljava.lang.Long;"); //$NON-NLS-1$
+ primitives.put(Signature.C_CHAR, "Ljava.lang.Character;"); //$NON-NLS-1$
+ primitives.put(Signature.C_FLOAT, "Ljava.lang.Float;"); //$NON-NLS-1$
+ primitives.put(Signature.C_DOUBLE, "Ljava.lang.Double;"); //$NON-NLS-1$
+ primitives.put(Signature.C_BOOLEAN, "Ljava.lang.Boolean;"); //$NON-NLS-1$
+ primitives.put(Signature.C_BYTE, "Ljava.lang.Boolean;"); //$NON-NLS-1$
}
//unresolved Object signature
public static String OBJECT = "QObject;"; //$NON-NLS-1$
- Map<String, ParametedType> cache = new HashMap<String, ParametedType>();
+ Map<String, ParametedType> cache = new Hashtable<String, ParametedType>();
public ParametedType newParametedType(IType type) {
ParametedType parametedType = new ParametedType();
13 years, 9 months
JBoss Tools SVN: r42473 - in trunk: cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/marker and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2012-07-09 16:48:30 -0400 (Mon, 09 Jul 2012)
New Revision: 42473
Added:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/NonStaticProducerBroken.qfxresult
Removed:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/NonStaticProducerBroken.new
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/marker/CDIQuickFixTest.java
trunk/common/tests/org.jboss.tools.common.base.test/src/org/jboss/tools/common/base/test/QuickFixTestUtil.java
Log:
Make Quick Fix "Configure Problem Severity" work on Temporary annotations https://issues.jboss.org/browse/JBIDE-12232
Deleted: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/NonStaticProducerBroken.new
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/NonStaticProducerBroken.new 2012-07-09 18:58:07 UTC (rev 42472)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/NonStaticProducerBroken.new 2012-07-09 20:48:30 UTC (rev 42473)
@@ -1,10 +0,0 @@
-package org.jboss.jsr299.tck.tests.jbt.quickfixes;
-
-import javax.ejb.Stateless;
-import javax.enterprise.inject.Produces;
-
-@Stateless
-public class NonStaticProducerBroken {
-
- @Produces public FunnelWeaver<String> anotherFunnelWeaver;
-}
\ No newline at end of file
Copied: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/NonStaticProducerBroken.qfxresult (from rev 42466, trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/NonStaticProducerBroken.new)
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/NonStaticProducerBroken.qfxresult (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/NonStaticProducerBroken.qfxresult 2012-07-09 20:48:30 UTC (rev 42473)
@@ -0,0 +1,10 @@
+package org.jboss.jsr299.tck.tests.jbt.quickfixes;
+
+import javax.ejb.Stateless;
+import javax.enterprise.inject.Produces;
+
+@Stateless
+public class NonStaticProducerBroken {
+
+ @Produces public FunnelWeaver<String> anotherFunnelWeaver;
+}
\ No newline at end of file
Modified: trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/marker/CDIQuickFixTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/marker/CDIQuickFixTest.java 2012-07-09 18:58:07 UTC (rev 42472)
+++ trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/marker/CDIQuickFixTest.java 2012-07-09 20:48:30 UTC (rev 42473)
@@ -12,7 +12,7 @@
public void testConfigureProblemSeverity() throws CoreException {
util.checkPrpposal(tckProject,
"JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/NonStaticProducerBroken.java",
- "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/NonStaticProducerBroken.new",
+ "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/NonStaticProducerBroken.qfxresult",
CDIValidationErrorManager.MESSAGE_ID_ATTRIBUTE_NAME,
CDIValidationErrorManager.ILLEGAL_PRODUCER_FIELD_IN_SESSION_BEAN_ID,
ConfigureProblemSeverityMarkerResolution.class);
Modified: trunk/common/tests/org.jboss.tools.common.base.test/src/org/jboss/tools/common/base/test/QuickFixTestUtil.java
===================================================================
--- trunk/common/tests/org.jboss.tools.common.base.test/src/org/jboss/tools/common/base/test/QuickFixTestUtil.java 2012-07-09 18:58:07 UTC (rev 42472)
+++ trunk/common/tests/org.jboss.tools.common.base.test/src/org/jboss/tools/common/base/test/QuickFixTestUtil.java 2012-07-09 20:48:30 UTC (rev 42473)
@@ -79,57 +79,63 @@
IEditorPart editor = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().openEditor(input, getEditorID(), true);
ISourceViewer viewer = getViewer(editor);
- // change file
- IDocument document = viewer.getDocument();
-
- String text = FileUtil.getContentFromEditorOrFile(nFile);
-
- document.set(text);
-
- // Find annotation
- TempJavaProblemAnnotation[] annotations = waitForProblemAnnotationAppearance(viewer);
-
- for(TempJavaProblemAnnotation annotation : annotations){
- IJavaCompletionProposal[] proposals = getCompletionProposals(annotation);
- checkForConfigureProblemSeverity(proposals);
- checkForAddSuppressWarnings(file, annotation, proposals);
- for(IJavaCompletionProposal proposal : proposals){
- if (proposal.getClass().equals(proposalClass)) {
-
- if(proposal instanceof TestableResolutionWithRefactoringProcessor){
- RefactoringProcessor processor = ((TestableResolutionWithRefactoringProcessor)proposal).getRefactoringProcessor();
-
- RefactoringStatus status = processor.checkInitialConditions(new NullProgressMonitor());
-
- Assert.assertNull("Rename processor returns fatal error", status.getEntryMatchingSeverity(RefactoringStatus.FATAL));
-
- status = processor.checkFinalConditions(new NullProgressMonitor(), null);
-
- Assert.assertNull("Rename processor returns fatal error", status.getEntryMatchingSeverity(RefactoringStatus.FATAL));
-
- CompositeChange rootChange = (CompositeChange)processor.createChange(new NullProgressMonitor());
-
- rootChange.perform(new NullProgressMonitor());
- } else if(proposal instanceof TestableResolutionWithDialog){
- ((TestableResolutionWithDialog) proposal).runForTest(null);
- } else {
- proposal.apply(document);
+ try{
+ // change file
+ IDocument document = viewer.getDocument();
+
+ String text = FileUtil.getContentFromEditorOrFile(nFile);
+
+ document.set(text);
+
+ // Find annotation
+ TempJavaProblemAnnotation[] annotations = waitForProblemAnnotationAppearance(viewer);
+
+ for(TempJavaProblemAnnotation annotation : annotations){
+ IJavaCompletionProposal[] proposals = getCompletionProposals(annotation);
+ checkForConfigureProblemSeverity(proposals);
+ checkForAddSuppressWarnings(file, annotation, proposals);
+ for(IJavaCompletionProposal proposal : proposals){
+ if (proposal.getClass().equals(proposalClass)) {
+
+ if(proposal instanceof TestableResolutionWithRefactoringProcessor){
+ RefactoringProcessor processor = ((TestableResolutionWithRefactoringProcessor)proposal).getRefactoringProcessor();
+
+ RefactoringStatus status = processor.checkInitialConditions(new NullProgressMonitor());
+
+ Assert.assertNull("Rename processor returns fatal error", status.getEntryMatchingSeverity(RefactoringStatus.FATAL));
+
+ status = processor.checkFinalConditions(new NullProgressMonitor(), null);
+
+ Assert.assertNull("Rename processor returns fatal error", status.getEntryMatchingSeverity(RefactoringStatus.FATAL));
+
+ CompositeChange rootChange = (CompositeChange)processor.createChange(new NullProgressMonitor());
+
+ rootChange.perform(new NullProgressMonitor());
+ } else if(proposal instanceof TestableResolutionWithDialog){
+ ((TestableResolutionWithDialog) proposal).runForTest(null);
+ } else {
+ //proposal.apply(document);
+ }
+
+ //TestUtil.validate(file);
+
+ //TempJavaProblemAnnotation[] newAnnotations = waitForProblemAnnotationAppearance(viewer);
+
+ //Assert.assertTrue("Quick fix did not decrease number of problems. was: "+annotations.length+" now: "+newAnnotations.length, newAnnotations.length < annotations.length);
+
+ //checkResults(project, fileNames, results);
+
+ return;
}
-
- TestUtil.validate(file);
-
- TempJavaProblemAnnotation[] newAnnotations = waitForProblemAnnotationAppearance(viewer);
-
- Assert.assertTrue("Quick fix did not decrease number of problems. was: "+annotations.length+" now: "+newAnnotations.length, newAnnotations.length < annotations.length);
-
- //checkResults(project, fileNames, results);
-
- return;
}
}
+
+ Assert.fail("Quick fix: "+proposalClass+" not found");
+ }finally{
+ if(editor.isDirty()){
+ editor.doSave(new NullProgressMonitor());
+ }
}
-
- Assert.fail("Quick fix: "+proposalClass+" not found");
}
public static IJavaCompletionProposal[] getCompletionProposals(TempJavaProblemAnnotation annotation){
13 years, 9 months
JBoss Tools SVN: r42472 - in trunk: cdi/plugins/org.jboss.tools.cdi.ui/META-INF and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2012-07-09 14:58:07 -0400 (Mon, 09 Jul 2012)
New Revision: 42472
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDIValidationErrorManager.java
trunk/cdi/plugins/org.jboss.tools.cdi.ui/META-INF/MANIFEST.MF
trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/TempMarkerManager.java
trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/ValidationErrorManager.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamCoreValidator.java
Log:
Make Quick Fix "Configure Problem Severity" work on Temporary annotations https://issues.jboss.org/browse/JBIDE-12232
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java 2012-07-09 18:18:04 UTC (rev 42471)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java 2012-07-09 18:58:07 UTC (rev 42472)
@@ -280,7 +280,6 @@
IReporter reporter) {
super.init(rootProject, validationHelper, context, manager, reporter);
setAsYouTypeValidation(false);
- setMessageIdQuickFixAttributeName(MESSAGE_ID_ATTRIBUTE_NAME);
projectTree = validationHelper.getValidationContextManager().getValidatingProjectTree(this);
projectSet = projectTree.getBrunches().get(rootProject);
rootCdiProject = null;
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDIValidationErrorManager.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDIValidationErrorManager.java 2012-07-09 18:18:04 UTC (rev 42471)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDIValidationErrorManager.java 2012-07-09 18:58:07 UTC (rev 42472)
@@ -17,8 +17,6 @@
abstract public class CDIValidationErrorManager extends KBValidator {
- public static final String MESSAGE_ID_ATTRIBUTE_NAME = "CDI_message_id"; //$NON-NLS-1$
-
public static final int ILLEGAL_PRODUCER_FIELD_IN_SESSION_BEAN_ID = 1;
public static final int ILLEGAL_PRODUCER_METHOD_IN_SESSION_BEAN_ID = 2;
public static final int ILLEGAL_DISPOSER_IN_SESSION_BEAN_ID = 3;
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/META-INF/MANIFEST.MF
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/META-INF/MANIFEST.MF 2012-07-09 18:18:04 UTC (rev 42471)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/META-INF/MANIFEST.MF 2012-07-09 18:58:07 UTC (rev 42472)
@@ -43,7 +43,8 @@
org.eclipse.wst.common.frameworks;bundle-version="1.2.100",
org.eclipse.jst.jsf.ui;bundle-version="1.3.2",
org.eclipse.jst.jsf.core;bundle-version="1.3.5",
- org.eclipse.wst.common.frameworks.ui;bundle-version="1.2.100"
+ org.eclipse.wst.common.frameworks.ui;bundle-version="1.2.100",
+ org.jboss.tools.common.validation
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-Vendor: %Bundle-Vendor.0
Modified: trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/TempMarkerManager.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/TempMarkerManager.java 2012-07-09 18:18:04 UTC (rev 42471)
+++ trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/TempMarkerManager.java 2012-07-09 18:58:07 UTC (rev 42472)
@@ -118,7 +118,7 @@
public IMessage addMesssage(IResource target, ITextSourceReference location, String preferenceKey, String textMessage, Integer quickFixId) {
IMessage message = addMesssage(target, -1, location, preferenceKey, textMessage, null);
if(message!=null) {
- message.setAttribute(messageIdQuickFixAttributeName, quickFixId);
+ message.setAttribute(MESSAGE_ID_ATTRIBUTE_NAME, quickFixId);
}
return message;
}
@@ -139,7 +139,7 @@
public IMessage addMesssage(IResource target, int offset, int length, String preferenceKey, String messageText, String[] messageArguments, int quickFixId) {
IMessage message = addMesssage(target, -1, offset, length, preferenceKey, messageText, messageArguments);
if(message!=null) {
- message.setAttribute(messageIdQuickFixAttributeName, quickFixId);
+ message.setAttribute(MESSAGE_ID_ATTRIBUTE_NAME, quickFixId);
}
return message;
}
Modified: trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/ValidationErrorManager.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/ValidationErrorManager.java 2012-07-09 18:18:04 UTC (rev 42471)
+++ trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/ValidationErrorManager.java 2012-07-09 18:58:07 UTC (rev 42472)
@@ -52,6 +52,7 @@
public static final String PREFERENCE_KEY_ATTRIBUTE_NAME = "preference_key"; //$NON-NLS-1$
public static final String PREFERENCE_PAGE_ID_NAME = "preference_page_id"; //$NON-NLS-1$
public static final String SUPPRESS_WARNINGS_ENABLED_ATTRIBUTE = "sup_warn_ena"; //$NON-NLS-1$
+ public static final String MESSAGE_ID_ATTRIBUTE_NAME = "Message_id"; //$NON-NLS-1$
protected IStatus OK_STATUS = new Status(IStatus.OK,
"org.eclipse.wst.validation", 0, "OK", null); //$NON-NLS-1$ //$NON-NLS-2$
@@ -66,7 +67,7 @@
protected IDocument document;
protected Set<IFile> dirtyFiles;
- protected String messageIdQuickFixAttributeName;
+
/**
* Constructor
@@ -74,13 +75,13 @@
public ValidationErrorManager() {
}
- /**
- * @param messageIdQuickFixAttributeName the messageIdQuickFixAttributeName to set
- */
- public void setMessageIdQuickFixAttributeName(
- String messageIdQuickFixAttributeName) {
- this.messageIdQuickFixAttributeName = messageIdQuickFixAttributeName;
- }
+// /**
+// * @param messageIdQuickFixAttributeName the messageIdQuickFixAttributeName to set
+// */
+// public void setMessageIdQuickFixAttributeName(
+// String messageIdQuickFixAttributeName) {
+// this.messageIdQuickFixAttributeName = messageIdQuickFixAttributeName;
+// }
/*
* (non-Javadoc)
@@ -387,7 +388,7 @@
IMarker marker = addError(message, preferenceKey, messageArguments, length, offset, target);
try {
if(marker!=null) {
- marker.setAttribute(messageIdQuickFixAttributeName, new Integer(messageId));
+ marker.setAttribute(MESSAGE_ID_ATTRIBUTE_NAME, new Integer(messageId));
}
} catch(CoreException e) {
CommonPlugin.getDefault().logError(e);
@@ -475,7 +476,7 @@
IMarker marker = addError(message, preferenceKey, location, target);
try {
if(marker!=null) {
- marker.setAttribute(messageIdQuickFixAttributeName, new Integer(messageId));
+ marker.setAttribute(MESSAGE_ID_ATTRIBUTE_NAME, new Integer(messageId));
}
} catch(CoreException e) {
CommonPlugin.getDefault().logError(e);
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamCoreValidator.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamCoreValidator.java 2012-07-09 18:18:04 UTC (rev 42471)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamCoreValidator.java 2012-07-09 18:58:07 UTC (rev 42472)
@@ -89,8 +89,6 @@
public static final String ID = "org.jboss.tools.seam.core.CoreValidator"; //$NON-NLS-1$
public static final String PROBLEM_TYPE = "org.jboss.tools.seam.core.seamproblem"; //$NON-NLS-1$
- public static final String MESSAGE_ID_ATTRIBUTE_NAME = "Seam_message_id"; //$NON-NLS-1$
-
public static final int NONUNIQUE_COMPONENT_NAME_MESSAGE_ID = 1;
public static final int DUPLICATE_REMOVE_MESSAGE_ID = 2;
public static final int DUPLICATE_DESTROY_MESSAGE_ID = 3;
13 years, 9 months
JBoss Tools SVN: r42471 - trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/java.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2012-07-09 14:18:04 -0400 (Mon, 09 Jul 2012)
New Revision: 42471
Modified:
trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/java/JavaDirtyRegionProcessor.java
Log:
JBIDE-10611
As-you-type CDI validation
Removed any savings of Annotation Positions outside of the Documant Annotation Model, because such Positions aren't updated on the text editing.
Modified: trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/java/JavaDirtyRegionProcessor.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/java/JavaDirtyRegionProcessor.java 2012-07-09 17:18:15 UTC (rev 42470)
+++ trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/java/JavaDirtyRegionProcessor.java 2012-07-09 18:18:04 UTC (rev 42471)
@@ -10,10 +10,8 @@
******************************************************************************/
package org.jboss.tools.common.validation.java;
-import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
-import java.util.Map;
import java.util.Set;
import org.eclipse.core.resources.IFile;
@@ -60,12 +58,6 @@
@SuppressWarnings("restriction")
final public class JavaDirtyRegionProcessor extends
DirtyRegionProcessor {
- /**
- * This constant is put as value to JavaELProblemReporter.fAnnotations(Annotation, Position)
- * to indicate that in JavaELProblemReporter.clearAnnotations(int start, int end)
- * that annotation should be removed without regard to its position.
- */
- static final Position ALWAYS_CLEARED = new Position(Integer.MAX_VALUE);
private ITextEditor fEditor;
private IDocument fDocument;
@@ -123,7 +115,12 @@
// Does nothing
}
- Map<Annotation, Position> fAnnotations = new HashMap<Annotation, Position>();
+ Set<Annotation> fAnnotations = new HashSet<Annotation>();
+
+ /**
+ * This set contains annotations that should be removed regardless to their positions
+ */
+ Set<Annotation> fAlwaysRemoveAnnotations = new HashSet<Annotation>();
public void update() {
clearAllAnnotations();
@@ -152,9 +149,11 @@
if (fAnnotations.isEmpty()) {
return;
}
- Annotation[] annotations = fAnnotations.keySet().toArray(new Annotation[0]);
+ Annotation[] annotations = fAnnotations.toArray(new Annotation[0]);
for (Annotation annotation : annotations) {
fAnnotations.remove(annotation);
+ if (fAlwaysRemoveAnnotations.contains(annotation))
+ fAlwaysRemoveAnnotations.remove(annotation);
if(fAnnotationModel != null)
fAnnotationModel.removeAnnotation(annotation);
}
@@ -164,29 +163,30 @@
* This method removes from annotation model each annotation stored
* in JavaELProblemReporter.fAnnotations(Annotation, Position) that
* 1) either has position inside [start,end] region;
- * 2) or is associated with special Position instance ALWAYS_CLEARED
+ * 2) or exists in fAlwaysRemoveAnnotations
* that indicates it should be removed without regard to its actual position.
*/
public void clearAnnotations(int start, int end) {
if (fAnnotations.isEmpty()) {
return;
}
- Annotation[] annotations = fAnnotations.keySet().toArray(new Annotation[0]);
+ Annotation[] annotations = fAnnotations.toArray(new Annotation[0]);
for (Annotation annotation : annotations) {
- Position position = fAnnotations.get(annotation);
- if (position == ALWAYS_CLEARED || (position.getOffset() >= start &&
- position.getOffset() < end)) {
+ Position position = getAnnotationModel().getPosition(annotation);
+ if (fAlwaysRemoveAnnotations.contains(annotation) || ( position != null && position.getOffset() >= start &&
+ position.getOffset() <= end)) {
// remove annotation from managed annotations map as well as from the model
fAnnotations.remove(annotation);
+ if (fAlwaysRemoveAnnotations.contains(annotation))
+ fAlwaysRemoveAnnotations.remove(annotation);
getAnnotationModel().removeAnnotation(annotation);
}
}
}
/**
- * Adds annotation to the annotation model, and stores it in fAnnotations with either actual position
- * or special constant ALWAYS_CLEARED (when cleanAllAnnotations = true) that indicates that
- * the annotation should be removed without regard to the modified region.
+ * Adds annotation to the annotation model, and stores it in fAnnotations (when cleanAllAnnotations = true, that indicates that
+ * the annotation should be removed without regard to the modified region, the annotation is stored in fAlwaysRemoveAnnotations as well).
*
* @param annotation
* @param position
@@ -196,7 +196,9 @@
if (isCancelled()) {
return;
}
- fAnnotations.put(annotation, cleanAllAnnotations ? ALWAYS_CLEARED : position);
+ fAnnotations.add(annotation);
+ if (cleanAllAnnotations)
+ fAlwaysRemoveAnnotations.add(annotation);
fAnnotationModel.addAnnotation(annotation, position);
}
13 years, 9 months
JBoss Tools SVN: r42470 - trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/java.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2012-07-09 13:18:15 -0400 (Mon, 09 Jul 2012)
New Revision: 42470
Modified:
trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/java/TempJavaProblem.java
Log:
Make Quick Fix "Configure Problem Severity" work on Temporary annotations https://issues.jboss.org/browse/JBIDE-12232
Modified: trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/java/TempJavaProblem.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/java/TempJavaProblem.java 2012-07-09 16:57:20 UTC (rev 42469)
+++ trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/java/TempJavaProblem.java 2012-07-09 17:18:15 UTC (rev 42470)
@@ -20,11 +20,7 @@
* @author Victor V. Rubezhny
*/
public class TempJavaProblem extends CategorizedProblem {
- // TODO for dazarov. Why are you using EL marker type for all the java problems?
- // AsYouType EL Validation 'marker type' name.
- // marker type is used in the quickFixProcessor extension point
-// public static final String MARKER_TYPE = "org.jboss.tools.common.validation.el"; //$NON-NLS-1$
- public static final String MARKER_TYPE = "TODO";
+ public static final String MARKER_TYPE = "org.jboss.tools.common.validation.temp"; //$NON-NLS-1$
/** The end offset of the problem */
private int fSourceEnd= 0;
@@ -45,7 +41,7 @@
private ValidationMessage vMessage;
- public static final int EL_PROBLEM_ID= 0x88000000;
+ public static final int TEMP_PROBLEM_ID= 0x88000000;
/**
* Initialize with the given parameters.
@@ -76,7 +72,7 @@
* @see org.eclipse.jdt.core.compiler.IProblem#getID()
*/
public int getID() {
- return EL_PROBLEM_ID;
+ return TEMP_PROBLEM_ID;
}
/*
13 years, 9 months
JBoss Tools SVN: r42469 - trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/java.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2012-07-09 12:57:20 -0400 (Mon, 09 Jul 2012)
New Revision: 42469
Modified:
trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/java/JavaDirtyRegionProcessor.java
Log:
JBIDE-10611
As-you-type CDI validation
CDI-like validators are invoked for an original region instead of calculated start and end partitions (which was a much wider region)
Modified: trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/java/JavaDirtyRegionProcessor.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/java/JavaDirtyRegionProcessor.java 2012-07-09 16:33:01 UTC (rev 42468)
+++ trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/java/JavaDirtyRegionProcessor.java 2012-07-09 16:57:20 UTC (rev 42469)
@@ -148,7 +148,7 @@
return fCompilationUnit;
}
- private void clearAllAnnotations() {
+ public void clearAllAnnotations() {
if (fAnnotations.isEmpty()) {
return;
}
@@ -310,6 +310,7 @@
public void uninstall() {
fIsCanceled = true;
if(fReporter != null) {
+ fReporter.clearAllAnnotations();
fReporter.setCanceled(true);
}
@@ -393,11 +394,21 @@
fReporter.clearAnnotations(fStartPartitionsToProcess, fEndPartitionsToProcess);
for (ITypedRegion partition : fPartitionsToProcess) {
+// try {
+// System.out.println("validateString: " + partition.getOffset() + "->" + (partition.getOffset() + partition.getLength()) + ": [" + fDocument.get(partition.getOffset(), partition.getLength())+ "]");
+// } catch (BadLocationException e) {
+// e.printStackTrace();
+// }
fValidatorManager.validateString(partition, fHelper, fReporter);
}
if (isJavaElementValidationRequired(fStartRegionToProcess, fEndRegionToProcess)) {
- fValidatorManager.validateJavaElement(new Region(fStartPartitionsToProcess, fEndPartitionsToProcess - fStartPartitionsToProcess), fHelper, fReporter);
+// try {
+// System.out.println("validateJavaElement: " + fStartRegionToProcess + "->" + fEndRegionToProcess + ": [" + fDocument.get(fStartRegionToProcess, fEndRegionToProcess - fStartRegionToProcess)+ "]");
+// } catch (BadLocationException e) {
+// e.printStackTrace();
+// }
+ fValidatorManager.validateJavaElement(new Region(fStartRegionToProcess, fEndRegionToProcess - fStartRegionToProcess), fHelper, fReporter);
}
}
13 years, 9 months
JBoss Tools SVN: r42468 - trunk/central/plugins/org.jboss.tools.central.discovery.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-07-09 12:33:01 -0400 (Mon, 09 Jul 2012)
New Revision: 42468
Modified:
trunk/central/plugins/org.jboss.tools.central.discovery/plugin.xml
Log:
JBDS-2219 split git connector into 1 for git and 1 for mylyn support for git/github
Modified: trunk/central/plugins/org.jboss.tools.central.discovery/plugin.xml
===================================================================
--- trunk/central/plugins/org.jboss.tools.central.discovery/plugin.xml 2012-07-09 16:32:26 UTC (rev 42467)
+++ trunk/central/plugins/org.jboss.tools.central.discovery/plugin.xml 2012-07-09 16:33:01 UTC (rev 42468)
@@ -271,7 +271,8 @@
name="Eclipse EGit"
provider="eclipse.org"
siteUrl="http://download.jboss.org/jbosstools/updates/development/juno/central/core/">
- <iu id="org.eclipse.egit"/>
+ <iu id="org.eclipse.jgit"/>
+ <iu id="org.eclipse.egit"/>
<icon
image32="images/egit_32.png">
</icon>
@@ -281,6 +282,37 @@
</connectorDescriptor>
<connectorDescriptor
categoryId="org.jboss.tools.central.discovery.scm"
+ groupId="org.jboss.tools.central.discovery.scm.git"
+ description="Mylyn support for Git and GitHub"
+ id="org.eclipse.egit.mylyn"
+ kind="task"
+ license="Free, EPL"
+ name="Mylyn support for Eclipse EGit + GitHub"
+ provider="eclipse.org"
+ siteUrl="http://download.jboss.org/jbosstools/updates/development/juno/central/core/">
+ <iu id="org.eclipse.jgit"/>
+ <iu id="org.eclipse.egit"/>
+ <iu id="org.eclipse.egit.mylyn"/>
+ <iu id="org.eclipse.mylyn.github.feature"/>
+ <iu id="org.eclipse.mylyn.git"/>
+ <iu id="org.eclipse.mylyn_feature"/>
+ <iu id="org.eclipse.mylyn.ide_feature"/>
+ <iu id="org.eclipse.mylyn.commons"/>
+ <iu id="org.eclipse.mylyn.context_feature"/>
+ <iu id="org.eclipse.mylyn.bugzilla_feature"/>
+ <iu id="org.eclipse.mylyn.java_feature"/>
+ <iu id="org.eclipse.mylyn.pde_feature"/>
+ <iu id="org.eclipse.mylyn.team_feature"/>
+ <iu id="org.eclipse.mylyn.versions"/>
+ <icon
+ image32="images/egit_32.png">
+ </icon>
+ <overview
+ url="http://www.eclipse.org/egit/">
+ </overview>
+ </connectorDescriptor>
+ <connectorDescriptor
+ categoryId="org.jboss.tools.central.discovery.scm"
groupId="org.jboss.tools.central.discovery.scm.svn"
description="Eclipse Team Provider for the Subversion version control system, including SVNKit"
id="org.tigris.subversion.subclipse"
13 years, 9 months
JBoss Tools SVN: r42467 - branches/jbosstools-3.3.x/central/plugins/org.jboss.tools.central.discovery.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-07-09 12:32:26 -0400 (Mon, 09 Jul 2012)
New Revision: 42467
Modified:
branches/jbosstools-3.3.x/central/plugins/org.jboss.tools.central.discovery/plugin.xml
Log:
JBDS-2219 apply patch JBDS2219-33x.patch
Modified: branches/jbosstools-3.3.x/central/plugins/org.jboss.tools.central.discovery/plugin.xml
===================================================================
--- branches/jbosstools-3.3.x/central/plugins/org.jboss.tools.central.discovery/plugin.xml 2012-07-09 16:17:06 UTC (rev 42466)
+++ branches/jbosstools-3.3.x/central/plugins/org.jboss.tools.central.discovery/plugin.xml 2012-07-09 16:32:26 UTC (rev 42467)
@@ -271,7 +271,8 @@
name="Eclipse EGit"
provider="eclipse.org"
siteUrl="http://download.jboss.org/jbosstools/updates/stable/indigo/central/core/">
- <iu id="org.eclipse.egit"/>
+ <iu id="org.eclipse.jgit"/>
+ <iu id="org.eclipse.egit"/>
<icon
image32="images/egit_32.png">
</icon>
@@ -281,6 +282,37 @@
</connectorDescriptor>
<connectorDescriptor
categoryId="org.jboss.tools.central.discovery.scm"
+ groupId="org.jboss.tools.central.discovery.scm.git"
+ description="Mylyn support for Git and GitHub"
+ id="org.eclipse.egit.mylyn"
+ kind="task"
+ license="Free, EPL"
+ name="Mylyn support for Eclipse EGit + GitHub"
+ provider="eclipse.org"
+ siteUrl="http://download.jboss.org/jbosstools/updates/stable/indigo/central/core/">
+ <iu id="org.eclipse.jgit"/>
+ <iu id="org.eclipse.egit"/>
+ <iu id="org.eclipse.egit.mylyn"/>
+ <iu id="org.eclipse.mylyn.github.feature"/>
+ <iu id="org.eclipse.mylyn.git"/>
+ <iu id="org.eclipse.mylyn_feature"/>
+ <iu id="org.eclipse.mylyn.ide_feature"/>
+ <iu id="org.eclipse.mylyn.commons"/>
+ <iu id="org.eclipse.mylyn.context_feature"/>
+ <iu id="org.eclipse.mylyn.bugzilla_feature"/>
+ <iu id="org.eclipse.mylyn.java_feature"/>
+ <iu id="org.eclipse.mylyn.pde_feature"/>
+ <iu id="org.eclipse.mylyn.team_feature"/>
+ <iu id="org.eclipse.mylyn.versions"/>
+ <icon
+ image32="images/egit_32.png">
+ </icon>
+ <overview
+ url="http://www.eclipse.org/egit/">
+ </overview>
+ </connectorDescriptor>
+ <connectorDescriptor
+ categoryId="org.jboss.tools.central.discovery.scm"
groupId="org.jboss.tools.central.discovery.scm.svn"
description="Eclipse Team Provider for the Subversion version control system, including SVNKit"
id="org.tigris.subversion.subclipse"
13 years, 9 months