JBoss Tools SVN: r42938 - trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/validation/java.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2012-08-08 20:13:12 -0400 (Wed, 08 Aug 2012)
New Revision: 42938
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/validation/java/CDIAsYouTypeInJavaValidationTest.java
Log:
https://issues.jboss.org/browse/JBIDE-10611 As-you-type CDI validation
Modified: trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/validation/java/CDIAsYouTypeInJavaValidationTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/validation/java/CDIAsYouTypeInJavaValidationTest.java 2012-08-08 23:58:46 UTC (rev 42937)
+++ trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/validation/java/CDIAsYouTypeInJavaValidationTest.java 2012-08-09 00:13:12 UTC (rev 42938)
@@ -15,6 +15,8 @@
import org.eclipse.jface.text.BadLocationException;
import org.eclipse.jface.text.source.Annotation;
import org.jboss.tools.cdi.core.test.tck.TCKTest;
+import org.jboss.tools.cdi.internal.core.validation.CDICoreValidator;
+import org.jboss.tools.cdi.internal.core.validation.CDIValidationMessages;
import org.jboss.tools.common.base.test.validation.AbstractAsYouTypeValidationTest;
import org.jboss.tools.common.base.test.validation.java.BaseAsYouTypeInJavaValidationTest;
@@ -25,25 +27,24 @@
*/
public class CDIAsYouTypeInJavaValidationTest extends TCKTest {
private static final String PAGE_NAME = "JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/NPEValidation.java";
- private static final String RESOURCE_MARKER_TYPE = "org.jboss.tools.cdi.core.cdiproblem";
-
+
private BaseAsYouTypeInJavaValidationTest baseTest = null;
protected IProject project;
-
+
private static final String [][] ANNOTATIONS2VALIDATE =
{
- {"@Inject", "Multiple beans are eligible for injection to the injection point [JSR-299 §5.2.1]"},
- {"@Produces", "Producer cannot be declared in a decorator [JSR-299 §3.3.2]"}
+ {"@Inject", CDIValidationMessages.AMBIGUOUS_INJECTION_POINTS},
+ {"@Produces", CDIValidationMessages.PRODUCER_IN_DECORATOR}
};
+ @Override
public void setUp() throws Exception {
project = TCKTest.findTestProject();
if (baseTest == null) {
- baseTest = new BaseAsYouTypeInJavaValidationTest(project, RESOURCE_MARKER_TYPE);
+ baseTest = new BaseAsYouTypeInJavaValidationTest(project, CDICoreValidator.PROBLEM_TYPE);
}
}
-
public void testAsYouTypeInJavaValidation() throws BadLocationException, CoreException {
assertNotNull("Test project '" + TCKTest.MAIN_PROJECT_NAME + "' is not prepared", project);
for (int i = 0; i < ANNOTATIONS2VALIDATE.length; i++) {
@@ -55,8 +56,7 @@
}
}
}
-
-
+
/**
* The test procedure steps:
* - Find EL by a given number
@@ -78,9 +78,9 @@
// The test procedure steps:
// - Find wrong annotation
//============================
-
+
String documentContent = baseTest.getDocument().get();
-
+
int start = (documentContent == null ? -1 : documentContent
.indexOf(annotation, 0));
assertFalse("No annotation " + annotation + " found in document", (start == -1));
@@ -93,20 +93,20 @@
Annotation problemAnnotation = baseTest.waitForAnnotation(
start, start + length, errorMessage, AbstractAsYouTypeValidationTest.MAX_SECONDS_TO_WAIT, true, true);
assertNotNull("Problem Marker Annotation for " + annotation + " not found!", problemAnnotation);
-
+
String message = problemAnnotation.getText();
assertEquals(
"Not expected error message found in ProblemAnnotation. Expected: ["
+ errorMessage + "], Found: [" + message + "]",
errorMessage, message);
-
+
//=================================================================================================
// - Remove broken Annotation => see error annotation to disappear
// (an old problem marker annotation has to disappear)
//=================================================================================================
baseTest.getDocument().replace(start, length, "");
-
+
problemAnnotation = baseTest.waitForAnnotation(
start, start + length, null, AbstractAsYouTypeValidationTest.MAX_SECONDS_TO_WAIT, true, false); // Still use the same length (Just to have a place to look in)
assertNull("Problem Annotation has not disappeared!", problemAnnotation);
@@ -116,10 +116,10 @@
//=================================================================================================
baseTest.getDocument().replace(start, 0, annotation);
-
+
problemAnnotation = baseTest.waitForAnnotation(
start, start + length, errorMessage, AbstractAsYouTypeValidationTest.MAX_SECONDS_TO_WAIT, false, true);
-
+
message = problemAnnotation.getText();
assertEquals(
"Not expected error message found in ProblemAnnotation. Expected: ["
@@ -128,10 +128,10 @@
assertNotNull("No Problem Annotation found for wrong annotation " + annotation + "!", problemAnnotation);
}
-
+
private String toRegex(String text) {
StringBuilder result = new StringBuilder(text);
-
+
int i = -1;
while ((i = result.indexOf("[", i+1)) != -1) {
result.insert(i++, '\\');
@@ -140,7 +140,7 @@
while ((i = result.indexOf("]", i+1)) != -1) {
result.insert(i++, '\\');
}
-
+
return result.toString();
}
-}
+}
\ No newline at end of file
12 years, 5 months
JBoss Tools SVN: r42937 - trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2012-08-08 19:58:46 -0400 (Wed, 08 Aug 2012)
New Revision: 42937
Modified:
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/DiagramContentOutlinePage.java
Log:
fix wromg menu parent error in tests
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/DiagramContentOutlinePage.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/DiagramContentOutlinePage.java 2012-08-08 19:33:26 UTC (rev 42936)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/DiagramContentOutlinePage.java 2012-08-08 23:58:46 UTC (rev 42937)
@@ -50,6 +50,7 @@
import org.jboss.tools.hibernate.ui.diagram.editors.actions.ToggleShapeVisibleStateAction;
import org.jboss.tools.hibernate.ui.diagram.editors.model.OrmDiagram;
import org.jboss.tools.hibernate.ui.diagram.editors.parts.TreePartFactory;
+import org.jboss.tools.hibernate.ui.diagram.editors.popup.PopupMenuProvider;
/**
*
@@ -178,8 +179,7 @@
protected void configureOutlineViewer() {
getViewer().setEditDomain(editor.getDefaultEditDomain());
getViewer().setEditPartFactory(new TreePartFactory());
- MenuManager provider = editor.getContextMenu();
- //MenuManager provider = new PopupMenuProvider(getViewer(), getActionRegistry());
+ MenuManager provider = new PopupMenuProvider(getViewer(), getActionRegistry());
//getViewer().setContextMenu(provider);
getViewer().setContextMenu(provider);
getSite().registerContextMenu(
12 years, 5 months
JBoss Tools SVN: r42935 - trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2012-08-08 14:34:44 -0400 (Wed, 08 Aug 2012)
New Revision: 42935
Modified:
trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/TempMarkerManager.java
Log:
https://issues.jboss.org/browse/JBIDE-10738 As-you-type EL validation
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-08-08 18:22:53 UTC (rev 42934)
+++ trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/TempMarkerManager.java 2012-08-08 18:34:44 UTC (rev 42935)
@@ -238,6 +238,9 @@
Position p = new Position(offset, length);
newAnnotations.put(newAnnotation, p);
annotationsToRemove.add(annotation);
+ } else if("org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor".equals(e.getClass().getName()) && "org.eclipse.jst.jsf.facelet.ui.FaceletValidationMarker".equals(type)) {
+ // Remove WTP's annotations for JBT JSP/XHTML editors.
+ annotationsToRemove.add(annotation);
}
} catch (CoreException ce) {
CommonPlugin.getDefault().logError(ce);
12 years, 5 months
JBoss Tools SVN: r42934 - in trunk/vpe/plugins/org.jboss.tools.vpe: src/org/jboss/tools/vpe/editor/util and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dmaliarevich
Date: 2012-08-08 14:22:53 -0400 (Wed, 08 Aug 2012)
New Revision: 42934
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/plugin.xml
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/VisualDomUtil.java
Log:
https://issues.jboss.org/browse/JBIDE-12392 - vpe refresh was bind for F5 only when VPE is active
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/plugin.xml
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/plugin.xml 2012-08-08 15:56:33 UTC (rev 42933)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/plugin.xml 2012-08-08 18:22:53 UTC (rev 42934)
@@ -33,13 +33,11 @@
name="%PreferencePage_ElVariables">
</page>
</extension>
- <extension
- point="org.eclipse.ui.contexts">
- <context
- description="%vpe.editor.binding.context.description"
- id="org.jboss.tools.vpe.editorContext"
- name="%editor.binding.context.name"
- parentId="org.eclipse.ui.textEditorScope">
+ <extension point="org.eclipse.ui.contexts">
+ <context id="org.jboss.tools.vpe.editorContext"
+ parentId="org.eclipse.ui.textEditorScope"
+ name="%editor.binding.context.name"
+ description="%vpe.editor.binding.context.description">
</context>
</extension>
<extension id="org.jboss.tools.vpe.commands" point="org.eclipse.ui.commands">
@@ -123,10 +121,6 @@
schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
contextId="org.jboss.tools.vpe.editorContext"
sequence="M1+R"/>
- <key commandId="org.jboss.tools.vpe.commands.refreshCommand"
- schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
- contextId="org.jboss.tools.vpe.editorContext"
- sequence="F5"/>
</extension>
<extension
point="org.jboss.tools.jst.jsp.visulaEditorImplementations" id="org.jboss.tools.vpe.editor.VpeEditorPartFactory">
@@ -147,6 +141,15 @@
</with>
</and>
</definition>
+ <definition id="org.jboss.tools.ui.vpe.editor.inView">
+ <with variable="activePartId">
+ <or>
+ <equals value="org.jboss.tools.jst.jsp.jspeditor.JSPTextEditor"/>
+ <equals value="org.jboss.tools.jst.jsp.jspeditor.HTMLTextEditor"/>
+ <equals value="org.jboss.tools.jst.jsp.jspeditor.DocBookEditor"/>
+ </or>
+ </with>
+ </definition>
</extension>
<extension
point="org.eclipse.ui.menus">
@@ -305,8 +308,25 @@
commandId="org.jboss.tools.vpe.commands.preferencesCommand"/>
<handler
class="org.jboss.tools.vpe.handlers.RefreshHandler"
- commandId="org.jboss.tools.vpe.commands.refreshCommand"/>
+ commandId="org.jboss.tools.vpe.commands.refreshCommand">
+ <activeWhen>
+ <reference definitionId="org.jboss.tools.ui.vpe.editor.inView">
+ </reference>
+ </activeWhen>
+ </handler>
+ <!--
+ Bind VPE refresh handler for eclipse's File Refresh (F5) command
+ When the focus is in VPE
+ -->
<handler
+ class="org.jboss.tools.vpe.handlers.RefreshHandler"
+ commandId="org.eclipse.ui.file.refresh">
+ <activeWhen>
+ <reference definitionId="org.jboss.tools.ui.vpe.editor.inView">
+ </reference>
+ </activeWhen>
+ </handler>
+ <handler
class="org.jboss.tools.vpe.handlers.PageDesignOptionsHandler"
commandId="org.jboss.tools.vpe.commands.pageDesignOptionsCommand"/>
<handler
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/VisualDomUtil.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/VisualDomUtil.java 2012-08-08 15:56:33 UTC (rev 42933)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/VisualDomUtil.java 2012-08-08 18:22:53 UTC (rev 42934)
@@ -52,8 +52,17 @@
public static String A4J_URI = "http://richfaces.org/a4j"; //$NON-NLS-1$
public static String FACELETS_URI = "http://java.sun.com/jsf/facelets"; //$NON-NLS-1$
+ /**
+ * Flag for correct JSF components
+ */
public static String FACET_JSF_TAG = "FACET-JSF-TAG"; //$NON-NLS-1$
+ /**
+ * Flag for RF, FACELETS, A4J tags
+ */
public static String FACET_ODD_TAGS = "FACET-ODD-TAGS"; //$NON-NLS-1$
+ /**
+ * Flag for plain HTML tags and text nodes
+ */
public static String FACET_HTML_TAGS = "FACET-HTML-TAGS"; //$NON-NLS-1$
private static final String ACCESSIBILITY_SERVICE_CONTRACT_ID = "@mozilla.org/accessibilityService;1"; //$NON-NLS-1$
12 years, 5 months
JBoss Tools SVN: r42932 - in trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test: as3 and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: ljelinko
Date: 2012-08-08 11:24:04 -0400 (Wed, 08 Aug 2012)
New Revision: 42932
Added:
trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as3/
trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as3/CreateAS3Server.java
trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as3/DeployJSPProjectAS3Server.java
trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as3/OperateAS3Server.java
trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as3/UndeployJSPProjectAS3Server.java
Log:
Added tests for AS3
Added: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as3/CreateAS3Server.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as3/CreateAS3Server.java (rev 0)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as3/CreateAS3Server.java 2012-08-08 15:24:04 UTC (rev 42932)
@@ -0,0 +1,44 @@
+package org.jboss.ide.eclipse.as.ui.bot.test.as3;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.is;
+
+import java.util.List;
+
+import org.jboss.ide.eclipse.as.ui.bot.test.template.CreateServerTemplate;
+import org.jboss.tools.ui.bot.ext.config.Annotations.Require;
+import org.jboss.tools.ui.bot.ext.config.Annotations.Server;
+import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState;
+import org.jboss.tools.ui.bot.ext.config.Annotations.ServerType;
+import org.jboss.tools.ui.bot.ext.entity.XMLConfiguration;
+
+/**
+*
+* @see CreateServerTemplate
+* @author Lucia Jelinkova
+*
+*/
+@Require(server=(a)Server(type=ServerType.JbossAS, version="3.2", state=ServerState.Present))
+public class CreateAS3Server extends CreateServerTemplate {
+
+ @Override
+ protected void assertEditorPorts() {
+ assertThat("8080", is(editor.getWebPort()));
+ assertThat("1099", is(editor.getJNDIPort()));
+ }
+
+ @Override
+ protected void assertViewPorts(List<XMLConfiguration> configurations) {
+ for (XMLConfiguration config : configurations){
+ assertValueIsNumber(config);
+ }
+ }
+
+ private void assertValueIsNumber(XMLConfiguration config){
+ try {
+ Integer.parseInt(config.getValue());
+ } catch (NumberFormatException e){
+ fail(config + " does not a numeric value");
+ }
+ }
+}
Added: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as3/DeployJSPProjectAS3Server.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as3/DeployJSPProjectAS3Server.java (rev 0)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as3/DeployJSPProjectAS3Server.java 2012-08-08 15:24:04 UTC (rev 42932)
@@ -0,0 +1,21 @@
+package org.jboss.ide.eclipse.as.ui.bot.test.as3;
+
+import org.jboss.ide.eclipse.as.ui.bot.test.template.DeployJSPProjectTemplate;
+import org.jboss.tools.ui.bot.ext.config.Annotations.Require;
+import org.jboss.tools.ui.bot.ext.config.Annotations.Server;
+import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState;
+import org.jboss.tools.ui.bot.ext.config.Annotations.ServerType;
+
+/**
+ * @see DeployJSPProjectTemplate
+ * @author Lucia Jelinkova
+ *
+ */
+@Require(server=(a)Server(type=ServerType.JbossAS, version="3.2", state=ServerState.Running))
+public class DeployJSPProjectAS3Server extends DeployJSPProjectTemplate {
+
+ @Override
+ protected String getConsoleMessage() {
+ return "deploy, ctxPath=/" + PROJECT_NAME;
+ }
+}
Added: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as3/OperateAS3Server.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as3/OperateAS3Server.java (rev 0)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as3/OperateAS3Server.java 2012-08-08 15:24:04 UTC (rev 42932)
@@ -0,0 +1,21 @@
+package org.jboss.ide.eclipse.as.ui.bot.test.as3;
+
+import org.jboss.ide.eclipse.as.ui.bot.test.template.OperateServerTemplate;
+import org.jboss.tools.ui.bot.ext.config.Annotations.Require;
+import org.jboss.tools.ui.bot.ext.config.Annotations.Server;
+import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState;
+import org.jboss.tools.ui.bot.ext.config.Annotations.ServerType;
+
+/**
+ * @see OperateServerTemplate
+ * @author Lucia Jelinkova
+ *
+ */
+@Require(server=(a)Server(type=ServerType.JbossAS, version="3.2", state=ServerState.NotRunning))
+public class OperateAS3Server extends OperateServerTemplate {
+
+ @Override
+ public String getWelcomePageText() {
+ return "Manage this JBoss AS Instance";
+ }
+}
Added: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as3/UndeployJSPProjectAS3Server.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as3/UndeployJSPProjectAS3Server.java (rev 0)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as3/UndeployJSPProjectAS3Server.java 2012-08-08 15:24:04 UTC (rev 42932)
@@ -0,0 +1,22 @@
+package org.jboss.ide.eclipse.as.ui.bot.test.as3;
+
+import org.jboss.ide.eclipse.as.ui.bot.test.template.DeployJSPProjectTemplate;
+import org.jboss.ide.eclipse.as.ui.bot.test.template.UndeployJSPProjectTemplate;
+import org.jboss.tools.ui.bot.ext.config.Annotations.Require;
+import org.jboss.tools.ui.bot.ext.config.Annotations.Server;
+import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState;
+import org.jboss.tools.ui.bot.ext.config.Annotations.ServerType;
+
+/**
+ * @see UndeployJSPProjectTemplate
+ * @author Lucia Jelinkova
+ *
+ */
+@Require(server=(a)Server(type=ServerType.JbossAS, version="3.2", state=ServerState.Running), clearProjects=false, clearWorkspace=false)
+public class UndeployJSPProjectAS3Server extends UndeployJSPProjectTemplate {
+
+ @Override
+ protected String getConsoleMessage() {
+ return "undeploy, ctxPath=/" + DeployJSPProjectTemplate.PROJECT_NAME;
+ }
+}
12 years, 5 months
JBoss Tools SVN: r42931 - in trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test: projects/jsp-project/.settings and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: ljelinko
Date: 2012-08-08 11:21:48 -0400 (Wed, 08 Aug 2012)
New Revision: 42931
Added:
trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/launchers/prepare_workspace/as_prepare_workspace.launch
trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/project/jbossas-3.properties
Removed:
trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/launchers/prepare_workspace/as_portlets_prepare_workspace.launch
Modified:
trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/.settings/org.eclipse.wst.common.project.facet.core.xml
trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/AllTestsSuite.java
Log:
Added tests for AS3
Deleted: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/launchers/prepare_workspace/as_portlets_prepare_workspace.launch
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/launchers/prepare_workspace/as_portlets_prepare_workspace.launch 2012-08-08 15:15:41 UTC (rev 42930)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/launchers/prepare_workspace/as_portlets_prepare_workspace.launch 2012-08-08 15:21:48 UTC (rev 42931)
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.m2e.Maven2LaunchConfigurationType">
-<booleanAttribute key="M2_DEBUG_OUTPUT" value="false"/>
-<stringAttribute key="M2_GOALS" value="clean process-resources"/>
-<booleanAttribute key="M2_NON_RECURSIVE" value="false"/>
-<booleanAttribute key="M2_OFFLINE" value="false"/>
-<stringAttribute key="M2_PROFILES" value=""/>
-<listAttribute key="M2_PROPERTIES">
-<listEntry value="eap-6.0=${folder_prompt:EAP 6.0 installation directory}"/>
-<listEntry value="jboss-as-5.1=${folder_prompt:JBoss AS 5.1 installation directory}"/>
-<listEntry value="jboss-as-6.1=${folder_prompt:JBoss AS 6.1 installation directory}"/>
-</listAttribute>
-<stringAttribute key="M2_RUNTIME" value="/home/ljelinko/programs/apache-maven-3.0.3"/>
-<booleanAttribute key="M2_SKIP_TESTS" value="false"/>
-<booleanAttribute key="M2_UPDATE_SNAPSHOTS" value="false"/>
-<booleanAttribute key="M2_WORKSPACE_RESOLUTION" value="false"/>
-<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:/org.jboss.ide.eclipse.as.ui.bot.test/launchers/prepare_workspace}"/>
-</launchConfiguration>
Added: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/launchers/prepare_workspace/as_prepare_workspace.launch
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/launchers/prepare_workspace/as_prepare_workspace.launch (rev 0)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/launchers/prepare_workspace/as_prepare_workspace.launch 2012-08-08 15:21:48 UTC (rev 42931)
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.m2e.Maven2LaunchConfigurationType">
+<booleanAttribute key="M2_DEBUG_OUTPUT" value="false"/>
+<stringAttribute key="M2_GOALS" value="clean process-resources"/>
+<booleanAttribute key="M2_NON_RECURSIVE" value="false"/>
+<booleanAttribute key="M2_OFFLINE" value="false"/>
+<stringAttribute key="M2_PROFILES" value=""/>
+<listAttribute key="M2_PROPERTIES">
+<listEntry value="eap-6.0=${folder_prompt:EAP 6.0 installation directory}"/>
+<listEntry value="jboss-as-6.1=${folder_prompt:JBoss AS 6.1 installation directory}"/>
+<listEntry value="jboss-as-5.1=${folder_prompt:JBoss AS 5.1 installation directory}"/>
+<listEntry value="jboss-as-4.2=${folder_prompt:JBoss AS 4.2 installation directory}"/>
+<listEntry value="jboss-as-3.2=${folder_prompt:JBoss AS 3.2 installation directory}"/>
+</listAttribute>
+<stringAttribute key="M2_RUNTIME" value="/home/ljelinko/programs/apache-maven-3.0.3"/>
+<booleanAttribute key="M2_SKIP_TESTS" value="false"/>
+<booleanAttribute key="M2_UPDATE_SNAPSHOTS" value="false"/>
+<booleanAttribute key="M2_WORKSPACE_RESOLUTION" value="false"/>
+<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:/org.jboss.ide.eclipse.as.ui.bot.test/launchers/prepare_workspace}"/>
+</launchConfiguration>
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/.settings/org.eclipse.wst.common.project.facet.core.xml
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/.settings/org.eclipse.wst.common.project.facet.core.xml 2012-08-08 15:15:41 UTC (rev 42930)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/.settings/org.eclipse.wst.common.project.facet.core.xml 2012-08-08 15:21:48 UTC (rev 42931)
@@ -5,5 +5,5 @@
<fixed facet="wst.jsdt.web"/>
<installed facet="java" version="1.6"/>
<installed facet="wst.jsdt.web" version="1.0"/>
- <installed facet="jst.web" version="2.5"/>
+ <installed facet="jst.web" version="2.4"/>
</faceted-project>
Added: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/project/jbossas-3.properties
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/project/jbossas-3.properties (rev 0)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/project/jbossas-3.properties 2012-08-08 15:21:48 UTC (rev 42931)
@@ -0,0 +1,2 @@
+SERVER=AS,3.2,1.5,${jboss-as-3.2}
+
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/AllTestsSuite.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/AllTestsSuite.java 2012-08-08 15:15:41 UTC (rev 42930)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/AllTestsSuite.java 2012-08-08 15:21:48 UTC (rev 42931)
@@ -1,5 +1,9 @@
package org.jboss.ide.eclipse.as.ui.bot.test;
+import org.jboss.ide.eclipse.as.ui.bot.test.as3.CreateAS3Server;
+import org.jboss.ide.eclipse.as.ui.bot.test.as3.DeployJSPProjectAS3Server;
+import org.jboss.ide.eclipse.as.ui.bot.test.as3.OperateAS3Server;
+import org.jboss.ide.eclipse.as.ui.bot.test.as3.UndeployJSPProjectAS3Server;
import org.jboss.ide.eclipse.as.ui.bot.test.as4.CreateAS4Server;
import org.jboss.ide.eclipse.as.ui.bot.test.as4.DeployJSPProjectAS4Server;
import org.jboss.ide.eclipse.as.ui.bot.test.as4.OperateAS4Server;
@@ -28,19 +32,23 @@
CreateAS6Server.class,
CreateAS5Server.class,
CreateAS4Server.class,
+ CreateAS3Server.class,
OperateAS7Server.class,
OperateAS6Server.class,
OperateAS5Server.class,
OperateAS4Server.class,
+ OperateAS3Server.class,
DeployJSPProjectAS7Server.class,
DeployJSPProjectAS6Server.class,
DeployJSPProjectAS5Server.class,
DeployJSPProjectAS4Server.class,
+ DeployJSPProjectAS3Server.class,
HotDeployJSPFile.class,
UndeployJSPProjectAS7Server.class,
UndeployJSPProjectAS6Server.class,
UndeployJSPProjectAS5Server.class,
UndeployJSPProjectAS4Server.class,
+ UndeployJSPProjectAS3Server.class,
DeleteServer.class
})
public class AllTestsSuite {
12 years, 5 months
JBoss Tools SVN: r42930 - trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/launchers.
by jbosstools-commits＠lists.jboss.org
Author: ljelinko
Date: 2012-08-08 11:15:41 -0400 (Wed, 08 Aug 2012)
New Revision: 42930
Added:
trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/launchers/AS_AllTestsSuite_allConfigs.launch
trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/launchers/AS_AllTestsSuite_singleConfig.launch
Removed:
trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/launchers/AS_AllTestsSuite.launch
Log:
Created 2 launchers, one for single and one for multiple configuration
Deleted: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/launchers/AS_AllTestsSuite.launch
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/launchers/AS_AllTestsSuite.launch 2012-08-08 14:48:38 UTC (rev 42929)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/launchers/AS_AllTestsSuite.launch 2012-08-08 15:15:41 UTC (rev 42930)
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.swtbot.eclipse.ui.launcher.JunitLaunchConfig">
-<booleanAttribute key="append.args" value="true"/>
-<booleanAttribute key="askclear" value="false"/>
-<booleanAttribute key="automaticAdd" value="true"/>
-<booleanAttribute key="automaticValidate" value="false"/>
-<stringAttribute key="bootstrap" value=""/>
-<stringAttribute key="checked" value="[NONE]"/>
-<booleanAttribute key="clearConfig" value="true"/>
-<booleanAttribute key="clearws" value="true"/>
-<booleanAttribute key="clearwslog" value="false"/>
-<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/>
-<booleanAttribute key="default" value="true"/>
-<booleanAttribute key="includeOptional" value="true"/>
-<stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/AllTestsSuite.java"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="1"/>
-</listAttribute>
-<mapAttribute key="org.eclipse.debug.core.environmentVariables">
-<mapEntry key="DISPLAY" value=":${string_prompt:display number:0}"/>
-</mapAttribute>
-<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
-<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
-<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
-<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.jboss.ide.eclipse.as.ui.bot.test.AllTestsSuite"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.jboss.ide.eclipse.as.ui.bot.test"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dswtbot.test.properties.file=${file_prompt:"Please choose a SWTBot configuration file":${workspace_loc}/org.jboss.ide.eclipse.as.ui.bot.test/resources/generated_config_files} -Xmx1024m -XX:MaxPermSize=256m"/>
-<stringAttribute key="pde.version" value="3.3"/>
-<stringAttribute key="product" value="org.eclipse.platform.ide"/>
-<booleanAttribute key="show_selected_only" value="false"/>
-<booleanAttribute key="tracing" value="false"/>
-<booleanAttribute key="useCustomFeatures" value="false"/>
-<booleanAttribute key="useDefaultConfig" value="true"/>
-<booleanAttribute key="useDefaultConfigArea" value="false"/>
-<booleanAttribute key="useProduct" value="true"/>
-</launchConfiguration>
Added: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/launchers/AS_AllTestsSuite_allConfigs.launch
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/launchers/AS_AllTestsSuite_allConfigs.launch (rev 0)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/launchers/AS_AllTestsSuite_allConfigs.launch 2012-08-08 15:15:41 UTC (rev 42930)
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.swtbot.eclipse.ui.launcher.JunitLaunchConfig">
+<booleanAttribute key="append.args" value="true"/>
+<booleanAttribute key="askclear" value="false"/>
+<booleanAttribute key="automaticAdd" value="true"/>
+<booleanAttribute key="automaticValidate" value="false"/>
+<stringAttribute key="bootstrap" value=""/>
+<stringAttribute key="checked" value="[NONE]"/>
+<booleanAttribute key="clearConfig" value="true"/>
+<booleanAttribute key="clearws" value="true"/>
+<booleanAttribute key="clearwslog" value="false"/>
+<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/>
+<booleanAttribute key="default" value="true"/>
+<booleanAttribute key="includeOptional" value="true"/>
+<stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/AllTestsSuite.java"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="1"/>
+</listAttribute>
+<mapAttribute key="org.eclipse.debug.core.environmentVariables">
+<mapEntry key="DISPLAY" value=":${string_prompt:display number:0}"/>
+</mapAttribute>
+<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
+<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
+<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
+<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.jboss.ide.eclipse.as.ui.bot.test.AllTestsSuite"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.jboss.ide.eclipse.as.ui.bot.test"/>
+<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dtest.configurations.dir=${workspace_loc}/org.jboss.ide.eclipse.as.ui.bot.test/resources/generated_config_files -Xmx1024m -XX:MaxPermSize=256m"/>
+<stringAttribute key="pde.version" value="3.3"/>
+<stringAttribute key="product" value="org.eclipse.platform.ide"/>
+<booleanAttribute key="show_selected_only" value="false"/>
+<booleanAttribute key="tracing" value="false"/>
+<booleanAttribute key="useCustomFeatures" value="false"/>
+<booleanAttribute key="useDefaultConfig" value="true"/>
+<booleanAttribute key="useDefaultConfigArea" value="false"/>
+<booleanAttribute key="useProduct" value="true"/>
+</launchConfiguration>
Added: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/launchers/AS_AllTestsSuite_singleConfig.launch
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/launchers/AS_AllTestsSuite_singleConfig.launch (rev 0)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/launchers/AS_AllTestsSuite_singleConfig.launch 2012-08-08 15:15:41 UTC (rev 42930)
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.swtbot.eclipse.ui.launcher.JunitLaunchConfig">
+<booleanAttribute key="append.args" value="true"/>
+<booleanAttribute key="askclear" value="false"/>
+<booleanAttribute key="automaticAdd" value="true"/>
+<booleanAttribute key="automaticValidate" value="false"/>
+<stringAttribute key="bootstrap" value=""/>
+<stringAttribute key="checked" value="[NONE]"/>
+<booleanAttribute key="clearConfig" value="true"/>
+<booleanAttribute key="clearws" value="true"/>
+<booleanAttribute key="clearwslog" value="false"/>
+<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/>
+<booleanAttribute key="default" value="true"/>
+<booleanAttribute key="includeOptional" value="true"/>
+<stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/AllTestsSuite.java"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="1"/>
+</listAttribute>
+<mapAttribute key="org.eclipse.debug.core.environmentVariables">
+<mapEntry key="DISPLAY" value=":${string_prompt:display number:0}"/>
+</mapAttribute>
+<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
+<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
+<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
+<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.jboss.ide.eclipse.as.ui.bot.test.AllTestsSuite"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.jboss.ide.eclipse.as.ui.bot.test"/>
+<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dswtbot.test.properties.file=${file_prompt:"Please choose a SWTBot configuration file":${workspace_loc}/org.jboss.ide.eclipse.as.ui.bot.test/resources/generated_config_files} -Xmx1024m -XX:MaxPermSize=256m"/>
+<stringAttribute key="pde.version" value="3.3"/>
+<stringAttribute key="product" value="org.eclipse.platform.ide"/>
+<booleanAttribute key="show_selected_only" value="false"/>
+<booleanAttribute key="tracing" value="false"/>
+<booleanAttribute key="useCustomFeatures" value="false"/>
+<booleanAttribute key="useDefaultConfig" value="true"/>
+<booleanAttribute key="useDefaultConfigArea" value="false"/>
+<booleanAttribute key="useProduct" value="true"/>
+</launchConfiguration>
12 years, 5 months
JBoss Tools SVN: r42929 - 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-08-08 10:48:38 -0400 (Wed, 08 Aug 2012)
New Revision: 42929
Modified:
trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/java/JavaDirtyRegionProcessor.java
Log:
JBIDE-12405
As-you-type validation works slow when many strings are being added
fixed
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-08-08 14:04:19 UTC (rev 42928)
+++ trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/java/JavaDirtyRegionProcessor.java 2012-08-08 14:48:38 UTC (rev 42929)
@@ -10,7 +10,7 @@
******************************************************************************/
package org.jboss.tools.common.validation.java;
-import java.util.ArrayList;
+import java.util.Arrays;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
@@ -420,33 +420,30 @@
protected void endProcessing() {
if (fValidatorManager == null || fReporter == null || fStartPartitionsToProcess == -1 || fEndPartitionsToProcess == -1)
return;
-
+// long t = System.currentTimeMillis();
+// String message = "";
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();
-// }
- // TODO
- List<IRegion> regions = new ArrayList<IRegion>();
- regions.add(partition);
- fValidatorManager.validateString(regions, fHelper, fReporter);
+ if (fPartitionsToProcess != null && !fPartitionsToProcess.isEmpty()) {
+ fValidatorManager.validateString(
+ Arrays.asList(fPartitionsToProcess.toArray(new IRegion[fPartitionsToProcess.size()])),
+ fHelper, fReporter);
+// message += "; validateString: " + fPartitionsToProcess.size() + " regions; ";
}
+// else { message += "; validateString: 0 regions; "; }
if (isJavaElementValidationRequired()) {
-// try {
-// System.out.println("validateJavaElement: " + fStartRegionToProcess + "->" + fEndRegionToProcess + ": [" + fDocument.get(fStartRegionToProcess, fEndRegionToProcess - fStartRegionToProcess)+ "]");
-// } catch (BadLocationException e) {
-// e.printStackTrace();
-// }
- //TODO
fReporter.clearAlwaysRemoveAnnotations();
- List<IRegion> regions = new ArrayList<IRegion>();
- regions.add(new Region(fStartRegionToProcess, fEndRegionToProcess - fStartRegionToProcess));
- fValidatorManager.validateJavaElement(regions, fHelper, fReporter);
- }
+ fValidatorManager.validateJavaElement(
+ Arrays.asList(
+ new IRegion[] {
+ new Region(fStartRegionToProcess, fEndRegionToProcess - fStartRegionToProcess)
+ }),
+ fHelper, fReporter);
+// message += "; validateJavaElement: one region";
+ }
+// else { message += "; validateJavaElement: 0 regions"; }
+// System.out.println("[" + (System.currentTimeMillis() - t) + "ms]: " + message);
}
private boolean isJavaElementValidationRequired() {
12 years, 5 months