JBoss Tools SVN: r21523 - trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide.
by jbosstools-commits＠lists.jboss.org
Author: mareshkau
Date: 2010-04-16 07:24:10 -0400 (Fri, 16 Apr 2010)
New Revision: 21523
Added:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/UnclosedELExpressionTest.java
Log:
junit test for https://jira.jboss.org/jira/browse/JBIDE-6064
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/UnclosedELExpressionTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/UnclosedELExpressionTest.java (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/UnclosedELExpressionTest.java 2010-04-16 11:24:10 UTC (rev 21523)
@@ -0,0 +1,40 @@
+/*******************************************************************************
+ * Copyright (c) 2007-2010 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributor:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.jsf.vpe.jsf.test.jbide;
+
+import org.jboss.tools.jsf.vpe.jsf.test.JsfAllTests;
+import org.jboss.tools.vpe.ui.test.ComponentContentTest;
+
+/**
+ * Junit test for https://jira.jboss.org/jira/browse/JBIDE-6064
+ *
+ * @author mareshkau
+ *
+ */
+public class UnclosedELExpressionTest extends ComponentContentTest {
+
+ public UnclosedELExpressionTest(String name) {
+ super(name);
+ }
+
+ public void testCheckContetnForDefaultNamespace() throws Throwable{
+ performContentTest("JBIDE/6064/jbide6064.xhtml"); //$NON-NLS-1$
+ }
+
+ /* (non-Javadoc)
+ * @see org.jboss.tools.vpe.ui.test.ComponentContentTest#getTestProjectName()
+ */
+ @Override
+ protected String getTestProjectName() {
+ return JsfAllTests.IMPORT_PROJECT_NAME;
+ }
+
+}
14 years, 9 months
JBoss Tools SVN: r21522 - in trunk: jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/6064 and 3 other directories.
by jbosstools-commits＠lists.jboss.org
Author: mareshkau
Date: 2010-04-16 07:18:02 -0400 (Fri, 16 Apr 2010)
New Revision: 21522
Added:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/6064/
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/6064/jbide6064.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/6064/jbide6064.xhtml.xml
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/bundle/BundleMap.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-6064, out of range exception has been fixed
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/6064/jbide6064.xhtml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/6064/jbide6064.xhtml (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/6064/jbide6064.xhtml 2010-04-16 11:18:02 UTC (rev 21522)
@@ -0,0 +1,10 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:h="http://java.sun.com/jsf/html">
+
+ <ui:composition template="" id="jbide6064Test">
+ #{{
+ </ui:composition>
+</html>
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/6064/jbide6064.xhtml.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/6064/jbide6064.xhtml.xml (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/6064/jbide6064.xhtml.xml 2010-04-16 11:18:02 UTC (rev 21522)
@@ -0,0 +1,17 @@
+<tests>
+<test id="jbide6064Test">
+<DIV VPE:INCLUDE-ELEMENT="yes" STYLE="border: 1px dashed rgb(42, 127, 0);">
+<DIV>
+<SPAN CLASS="__any__tag__caption">
+ui:composition
+</SPAN>
+<SPAN CLASS="__any__tag__caption" STYLE="color: red; font-style: italic;">
+Template file is not found: ""
+</SPAN>
+</DIV>
+<SPAN CLASS="vpe-text">
+#{{
+</SPAN>
+</DIV>
+</test>
+</tests>
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java 2010-04-16 10:10:00 UTC (rev 21521)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java 2010-04-16 11:18:02 UTC (rev 21522)
@@ -93,6 +93,7 @@
import org.jboss.tools.jsf.vpe.jsf.test.jbide.TaglibXMLUnformatedDTD_JBIDE5642;
import org.jboss.tools.jsf.vpe.jsf.test.jbide.TestContextPathResolution;
import org.jboss.tools.jsf.vpe.jsf.test.jbide.TestFViewLocaleAttribute_JBIDE5218;
+import org.jboss.tools.jsf.vpe.jsf.test.jbide.UnclosedELExpressionTest;
import org.jboss.tools.jsf.vpe.jsf.test.jbide.TestForUsingComponentsLibrariesWithDefaultNamespace;
import org.jboss.tools.jsf.vpe.jsf.test.jbide.TestOpenOnForXhtmlFiles_JBIDE5577;
import org.jboss.tools.jsf.vpe.jsf.test.jbide.VPERefreshTest;
@@ -123,6 +124,7 @@
TestSuite suite = new TestSuite("Tests for Vpe Jsf components"); //$NON-NLS-1$
// $JUnit-BEGIN$
+ suite.addTestSuite(UnclosedELExpressionTest.class);
suite.addTestSuite(TestContextPathResolution.class);
suite.addTestSuite(JBIDE5920Test.class);
suite.addTestSuite(RenderFacetAndInsertChildrenTest.class);
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java 2010-04-16 10:10:00 UTC (rev 21521)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java 2010-04-16 11:18:02 UTC (rev 21522)
@@ -549,8 +549,8 @@
// refresh job in time, so we just ignore
// this exception
}
- } catch(ClassCastException ex) {
- VpePlugin.getDefault().reportProblem(ex);
+ } catch(Exception ex) {
+ VpePlugin.getPluginLog().logError(ex);
}
getChangeEvents().remove(eventBean);
}
@@ -1527,7 +1527,9 @@
// refresh job in time, so we just ignore this
// exception
}
- } finally {
+ }catch (Exception ex){
+ VpePlugin.getPluginLog().logError(ex);
+ }finally {
if (switcher != null) {
switcher.stopActiveEditor();
}
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/bundle/BundleMap.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/bundle/BundleMap.java 2010-04-16 10:10:00 UTC (rev 21521)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/bundle/BundleMap.java 2010-04-16 11:18:02 UTC (rev 21522)
@@ -439,8 +439,15 @@
}
}
if(index < i.getEndPosition()) {
- sb.append(name.substring(index, i.getEndPosition()));
- index = i.getEndPosition();
+ //fix has been added by Maksim Areshkau
+ // https://jira.jboss.org/jira/browse/JBIDE-6064
+ if(name.length()>i.getEndPosition()) {
+ sb.append(name.substring(index, i.getEndPosition()));
+ index = i.getEndPosition();
+ }else {
+ sb.append(name.substring(index, name.length()));
+ index =name.length();
+ }
}
}
sb.append(name.substring(index));
14 years, 9 months
JBoss Tools SVN: r21521 - in trunk/seam/tests: org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2010-04-16 06:10:00 -0400 (Fri, 16 Apr 2010)
New Revision: 21521
Modified:
trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/AbstractSeamFacetTest.java
trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/SeamCreateTestProjectTest.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-6191
Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/AbstractSeamFacetTest.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/AbstractSeamFacetTest.java 2010-04-16 09:59:30 UTC (rev 21520)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/AbstractSeamFacetTest.java 2010-04-16 10:10:00 UTC (rev 21521)
@@ -198,6 +198,13 @@
fproj.installProjectFacet(dynamicWebVersion, null, null);
fproj.installProjectFacet(javaFacesVersion, null, null);
}
+
+ protected void setIfEmpty(IDataModel model, String propertyName, String value){
+ String oldValue = model.getStringProperty(propertyName);
+ if(oldValue == null || "".equals(oldValue)){
+ model.setStringProperty(propertyName, value);
+ }
+ }
protected IFacetedProject createSeamProject(String baseProjectName, final IDataModel config) throws CoreException {
final IFacetedProject fproj = ProjectFacetsManager.create(baseProjectName, null,
@@ -213,6 +220,9 @@
final IProject proj = fproj.getProject();
+ setIfEmpty(config, ISeamFacetDataModelProperties.SEAM_TEST_PROJECT, baseProjectName+"-test");
+ setIfEmpty(config, ISeamFacetDataModelProperties.SEAM_EAR_PROJECT, baseProjectName+"-ear");
+ setIfEmpty(config, ISeamFacetDataModelProperties.SEAM_EJB_PROJECT, baseProjectName+"-ejb");
ResourcesPlugin.getWorkspace().run(new IWorkspaceRunnable() {
Modified: trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/SeamCreateTestProjectTest.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/SeamCreateTestProjectTest.java 2010-04-16 09:59:30 UTC (rev 21520)
+++ trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/SeamCreateTestProjectTest.java 2010-04-16 10:10:00 UTC (rev 21521)
@@ -34,12 +34,8 @@
// set property to create test project
model.setProperty(ISeamFacetDataModelProperties.TEST_PROJECT_CREATING, new Boolean(createTestProject));
- model.setStringProperty(ISeamFacetDataModelProperties.SEAM_TEST_PROJECT, name+"-test");
- model.setStringProperty(ISeamFacetDataModelProperties.SEAM_EAR_PROJECT, name+"-ear");
- model.setStringProperty(ISeamFacetDataModelProperties.SEAM_EJB_PROJECT, name+"-ejb");
model.setStringProperty(ISeamFacetDataModelProperties.SEAM_RUNTIME_NAME, seamVersion);
-
final IFacetedProject fproj = createSeamProject(name, model);
14 years, 9 months
JBoss Tools SVN: r21520 - trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/info.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2010-04-16 05:59:30 -0400 (Fri, 16 Apr 2010)
New Revision: 21520
Modified:
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/info/FaceletTagInfoHoverProcessor.java
Log:
JBIDE-6192: NullPointerException occures while calculating EL text hover
issue is fixed
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/info/FaceletTagInfoHoverProcessor.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/info/FaceletTagInfoHoverProcessor.java 2010-04-16 09:53:35 UTC (rev 21519)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/info/FaceletTagInfoHoverProcessor.java 2010-04-16 09:59:30 UTC (rev 21520)
@@ -185,7 +185,9 @@
ELResolver[] resolvers = fContext.getElResolvers();
for (int i = 0; resolvers != null && i < resolvers.length; i++) {
- ELResolution resolution = resolvers[i].resolve(fContext, elOperand, fDocumentPosition);
+ ELResolution resolution = resolvers[i] == null ? null : resolvers[i].resolve(fContext, elOperand, fDocumentPosition);
+ if (resolution == null)
+ continue;
ELSegment segment = resolution.getLastSegment();
if(segment instanceof JavaMemberELSegmentImpl) {
14 years, 9 months
JBoss Tools SVN: r21519 - in trunk/seam: tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2010-04-16 05:53:35 -0400 (Fri, 16 Apr 2010)
New Revision: 21519
Modified:
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/Seam2ProjectCreator.java
trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/SeamCreateTestProjectTest.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-6191
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/Seam2ProjectCreator.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/Seam2ProjectCreator.java 2010-04-16 08:47:06 UTC (rev 21518)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/Seam2ProjectCreator.java 2010-04-16 09:53:35 UTC (rev 21519)
@@ -131,12 +131,14 @@
File[] firstlibs = includeLibs.getDir().listFiles(new AntCopyUtils.FileSetFileFilter(includeLibs));
File[] secondLibs = secondSetincludeLibs.getDir().listFiles(new AntCopyUtils.FileSetFileFilter(secondSetincludeLibs));
Set<String> allLibs = new HashSet<String>(); // HACK: needed to be unique because some jboss-*.jars are duplicated
- for(File f : firstlibs) {
- allLibs.add(f.getName());
- }
- for(File f : secondLibs) {
- allLibs.add(f.getName());
- }
+ if(firstlibs != null)
+ for(File f : firstlibs) {
+ allLibs.add(f.getName());
+ }
+ if(secondLibs != null)
+ for(File f : secondLibs) {
+ allLibs.add(f.getName());
+ }
StringBuffer testLibraries = new StringBuffer();
Modified: trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/SeamCreateTestProjectTest.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/SeamCreateTestProjectTest.java 2010-04-16 08:47:06 UTC (rev 21518)
+++ trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/SeamCreateTestProjectTest.java 2010-04-16 09:53:35 UTC (rev 21519)
@@ -34,6 +34,9 @@
// set property to create test project
model.setProperty(ISeamFacetDataModelProperties.TEST_PROJECT_CREATING, new Boolean(createTestProject));
+ model.setStringProperty(ISeamFacetDataModelProperties.SEAM_TEST_PROJECT, name+"-test");
+ model.setStringProperty(ISeamFacetDataModelProperties.SEAM_EAR_PROJECT, name+"-ear");
+ model.setStringProperty(ISeamFacetDataModelProperties.SEAM_EJB_PROJECT, name+"-ejb");
model.setStringProperty(ISeamFacetDataModelProperties.SEAM_RUNTIME_NAME, seamVersion);
14 years, 9 months
JBoss Tools SVN: r21518 - trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test.
by jbosstools-commits＠lists.jboss.org
Author: mareshkau
Date: 2010-04-16 04:47:06 -0400 (Fri, 16 Apr 2010)
New Revision: 21518
Removed:
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/XhtmlFileNewWizardTest.java
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/JsfUiAllTests.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-6189, old xhml wizard junit test has been removed, because i have added new wizard and swt bot tests
Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/JsfUiAllTests.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/JsfUiAllTests.java 2010-04-16 08:42:54 UTC (rev 21517)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/JsfUiAllTests.java 2010-04-16 08:47:06 UTC (rev 21518)
@@ -29,7 +29,6 @@
suite.addTestSuite(JsFileNewWizardTest.class);
suite.addTestSuite(JspFileNewWizardTest.class);
suite.addTestSuite(PropertiesNewWizardTest.class);
- suite.addTestSuite(XhtmlFileNewWizardTest.class);
suite.addTestSuite(JsfUiPreferencesPagesTest.class);
suite.addTest(new ProjectImportTestSetup(new TestSuite(
ELReferencesRenameTest.class), "org.jboss.tools.jsf.ui.test", //$NON-NLS-1$
Deleted: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/XhtmlFileNewWizardTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/XhtmlFileNewWizardTest.java 2010-04-16 08:42:54 UTC (rev 21517)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/XhtmlFileNewWizardTest.java 2010-04-16 08:47:06 UTC (rev 21518)
@@ -1,45 +0,0 @@
-package org.jboss.tools.jsf.ui.test;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.jface.wizard.IWizard;
-import org.jboss.tools.test.util.JobUtils;
-
-
-public class XhtmlFileNewWizardTest extends WizardTest {
- public XhtmlFileNewWizardTest(){
- super("org.jboss.tools.common.model.ui.wizard.newfile.NewXHTMLFileWizard");
- }
-
- public void testXhtmlFileNewWizardTestIsCreated() {
- wizardIsCreated();
- }
-
- public void testXhtmlFileNewWizardValidation() {
- IWizard wizard = getWizard();
-
- boolean canFinish = wizard.canFinish();
-
- assertFalse("Finish button is enabled at first wizard page.", canFinish);
- }
-
- public void testXhtmlFileNewWizardValidation2() {
- validateFolderAndName();
- }
-
- public void testXhtmlFileNewWizardResults() {
- // Assert file with name from Name field created in folder with name form Folder field
- IWizard wizard = getWizardOnProject("aaa");
-
- boolean canFinish = wizard.canFinish();
-
- assertTrue("Finish button is disabled.", canFinish);
-
- wizard.performFinish();
-
- JobUtils.waitForIdle();
-
- IResource res = project.findMember("aaa.xhtml");
-
- assertNotNull(res);
- }
-}
\ No newline at end of file
14 years, 9 months
JBoss Tools SVN: r21517 - trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/contentassist.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2010-04-16 04:42:54 -0400 (Fri, 16 Apr 2010)
New Revision: 21517
Modified:
trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/contentassist/SortingCompoundContentAssistProcessor.java
Log:
JBIDE-6064: CA out of range error occurs sometimes
Because of some exceptions are hidden by CA Pop-up additional try-catch is added while trying to find the problem
Modified: trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/contentassist/SortingCompoundContentAssistProcessor.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/contentassist/SortingCompoundContentAssistProcessor.java 2010-04-16 07:46:54 UTC (rev 21516)
+++ trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/contentassist/SortingCompoundContentAssistProcessor.java 2010-04-16 08:42:54 UTC (rev 21517)
@@ -36,6 +36,7 @@
import org.eclipse.wst.sse.ui.internal.contentassist.CustomCompletionProposal;
import org.eclipse.wst.sse.ui.internal.contentassist.IRelevanceCompletionProposal;
import org.eclipse.wst.sse.ui.internal.util.Sorter;
+import org.jboss.tools.common.text.xml.XmlEditorPlugin;
/**
* Reads the plugin.xml file for the processors defined using the
@@ -208,6 +209,8 @@
public ICompletionProposal[] computeCompletionProposals(ITextViewer viewer, int offset) {
fErrorMessage = null;
+ ICompletionProposal[] resultArray = new ICompletionProposal[0];
+ try {
String contentType = getContentType(fSourceViewer);
if (contentType == null)
return new ICompletionProposal[0];
@@ -245,11 +248,14 @@
}
}
}
- ICompletionProposal[] resultArray = ret.toArray(new ICompletionProposal[ret.size()]);
+ resultArray = ret.toArray(new ICompletionProposal[ret.size()]);
Object[] sorted = createSorter().sort(resultArray);
System.arraycopy(sorted, 0, resultArray, 0, sorted.length);
resultArray = makeUnique(resultArray);
+ } catch (Exception e) {
+ XmlEditorPlugin.getPluginLog().logError("An error occured while computing the completion proposals", e);
+ }
return resultArray;
}
14 years, 9 months
JBoss Tools SVN: r21516 - branches/modular_build/xulrunner/site/org.mozilla.xulrunner.site.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-04-16 03:46:54 -0400 (Fri, 16 Apr 2010)
New Revision: 21516
Modified:
branches/modular_build/xulrunner/site/org.mozilla.xulrunner.site/README.txt
Log:
update README.txt to include mvn3 instructions
Modified: branches/modular_build/xulrunner/site/org.mozilla.xulrunner.site/README.txt
===================================================================
--- branches/modular_build/xulrunner/site/org.mozilla.xulrunner.site/README.txt 2010-04-16 07:03:26 UTC (rev 21515)
+++ branches/modular_build/xulrunner/site/org.mozilla.xulrunner.site/README.txt 2010-04-16 07:46:54 UTC (rev 21516)
@@ -1,6 +1,6 @@
To regen update site metadata:
-java -jar ~/eclipse/eclipse36/plugins/org.eclipse.equinox.launcher_1.1.0.v20091116.jar \
+java -jar ~/eclipse/eclipse36/plugins/org.eclipse.equinox.launcher_*.jar \
-application org.eclipse.equinox.p2.publisher.FeaturesAndBundlesPublisher \
-metadataRepository file:/home/nboldt/11/jbosstools-trunk/xulrunner/ \
-artifactRepository file:/home/nboldt/11/jbosstools-trunk/xulrunner/ \
@@ -9,9 +9,14 @@
or
-java -jar ~/eclipse/eclipse36/plugins/org.eclipse.equinox.launcher_1.1.0.v20091116.jar \
+java -jar ~/eclipse/eclipse36/plugins/org.eclipse.equinox.launcher_*.jar \
-application org.eclipse.equinox.p2.publisher.UpdateSitePublisher \
-metadataRepository file:/home/nboldt/11/jbosstools-trunk/xulrunner/ \
-artifactRepository file:/home/nboldt/11/jbosstools-trunk/xulrunner/ \
-source /home/nboldt/11/jbosstools-trunk/xulrunner/features/org.mozilla.xulrunner.site -configs "*.*.*" \
-compress -publishArtifacts
+
+... or just run:
+
+cd /home/nboldt/11/jbosstools-trunk/xulrunner/site/; mvn3 clean install
+
14 years, 9 months
JBoss Tools SVN: r21514 - in branches/modular_build/xulrunner: features and 10 other directories.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-04-16 03:02:25 -0400 (Fri, 16 Apr 2010)
New Revision: 21514
Added:
branches/modular_build/xulrunner/features/org.mozilla.xpcom.feature/pom.xml
branches/modular_build/xulrunner/features/org.mozilla.xulrunner.feature/pom.xml
branches/modular_build/xulrunner/features/pom.xml
branches/modular_build/xulrunner/pom.xml
branches/modular_build/xulrunner/site/
branches/modular_build/xulrunner/site/org.mozilla.xulrunner.site/
branches/modular_build/xulrunner/site/org.mozilla.xulrunner.site/.project
branches/modular_build/xulrunner/site/org.mozilla.xulrunner.site/README.txt
branches/modular_build/xulrunner/site/org.mozilla.xulrunner.site/pom.xml
branches/modular_build/xulrunner/site/org.mozilla.xulrunner.site/site.xml
branches/modular_build/xulrunner/site/pom.xml
Modified:
branches/modular_build/xulrunner/features/org.mozilla.xpcom.feature/
branches/modular_build/xulrunner/features/org.mozilla.xulrunner.feature/
branches/modular_build/xulrunner/plugins/org.mozilla.xpcom/
branches/modular_build/xulrunner/plugins/org.mozilla.xulrunner.carbon.macosx/
branches/modular_build/xulrunner/plugins/org.mozilla.xulrunner.cocoa.macosx/
branches/modular_build/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/
branches/modular_build/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/
branches/modular_build/xulrunner/plugins/org.mozilla.xulrunner.win32.win32.x86/
Log:
commit poms and svn:ignore for building xulrunner plugins, features, and site
Property changes on: branches/modular_build/xulrunner/features/org.mozilla.xpcom.feature
___________________________________________________________________
Name: svn:ignore
+ target
Added: branches/modular_build/xulrunner/features/org.mozilla.xpcom.feature/pom.xml
===================================================================
--- branches/modular_build/xulrunner/features/org.mozilla.xpcom.feature/pom.xml (rev 0)
+++ branches/modular_build/xulrunner/features/org.mozilla.xpcom.feature/pom.xml 2010-04-16 07:02:25 UTC (rev 21514)
@@ -0,0 +1,15 @@
+<project
+xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <relativePath>../../../parent-pom.xml</relativePath>
+ <groupId>org.jboss.tools</groupId>
+ <artifactId>org.jboss.tools.parent.pom</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ </parent>
+ <groupId>org.jboss.tools</groupId>
+ <artifactId>org.mozilla.xpcom.feature</artifactId>
+ <version>1.9.1.2a</version>
+ <packaging>eclipse-feature</packaging>
+</project>
+
Property changes on: branches/modular_build/xulrunner/features/org.mozilla.xulrunner.feature
___________________________________________________________________
Name: svn:ignore
+ target
Added: branches/modular_build/xulrunner/features/org.mozilla.xulrunner.feature/pom.xml
===================================================================
--- branches/modular_build/xulrunner/features/org.mozilla.xulrunner.feature/pom.xml (rev 0)
+++ branches/modular_build/xulrunner/features/org.mozilla.xulrunner.feature/pom.xml 2010-04-16 07:02:25 UTC (rev 21514)
@@ -0,0 +1,15 @@
+<project
+xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <relativePath>../../../parent-pom.xml</relativePath>
+ <groupId>org.jboss.tools</groupId>
+ <artifactId>org.jboss.tools.parent.pom</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ </parent>
+ <groupId>org.jboss.tools</groupId>
+ <artifactId>org.mozilla.xulrunner.feature</artifactId>
+ <version>1.9.1.2</version>
+ <packaging>eclipse-feature</packaging>
+</project>
+
Added: branches/modular_build/xulrunner/features/pom.xml
===================================================================
--- branches/modular_build/xulrunner/features/pom.xml (rev 0)
+++ branches/modular_build/xulrunner/features/pom.xml 2010-04-16 07:02:25 UTC (rev 21514)
@@ -0,0 +1,19 @@
+<project
+xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <relativePath>../../parent-pom.xml</relativePath>
+ <groupId>org.jboss.tools</groupId>
+ <artifactId>org.jboss.tools.parent.pom</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ </parent>
+ <groupId>org.jboss.tools</groupId>
+ <artifactId>features.all</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <packaging>pom</packaging>
+ <modules>
+ <module>org.mozilla.xpcom.feature</module>
+ <module>org.mozilla.xulrunner.feature</module>
+ </modules>
+</project>
+
Property changes on: branches/modular_build/xulrunner/plugins/org.mozilla.xpcom
___________________________________________________________________
Name: svn:ignore
+ target
Property changes on: branches/modular_build/xulrunner/plugins/org.mozilla.xulrunner.carbon.macosx
___________________________________________________________________
Name: svn:ignore
+ target
Property changes on: branches/modular_build/xulrunner/plugins/org.mozilla.xulrunner.cocoa.macosx
___________________________________________________________________
Name: svn:ignore
+ target
Property changes on: branches/modular_build/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86
___________________________________________________________________
Name: svn:ignore
+ target
Property changes on: branches/modular_build/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64
___________________________________________________________________
Name: svn:ignore
+ target
Property changes on: branches/modular_build/xulrunner/plugins/org.mozilla.xulrunner.win32.win32.x86
___________________________________________________________________
Name: svn:ignore
+ target
Added: branches/modular_build/xulrunner/pom.xml
===================================================================
--- branches/modular_build/xulrunner/pom.xml (rev 0)
+++ branches/modular_build/xulrunner/pom.xml 2010-04-16 07:02:25 UTC (rev 21514)
@@ -0,0 +1,20 @@
+<project
+xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <relativePath>../parent-pom.xml</relativePath>
+ <groupId>org.jboss.tools</groupId>
+ <artifactId>org.jboss.tools.parent.pom</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ </parent>
+ <groupId>org.jboss.tools</groupId>
+ <artifactId>xulrunner.all</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <packaging>pom</packaging>
+ <modules>
+ <module>plugins</module>
+ <module>features</module>
+ <module>site</module>
+ </modules>
+</project>
+
Property changes on: branches/modular_build/xulrunner/site/org.mozilla.xulrunner.site
___________________________________________________________________
Name: svn:ignore
+ target
Added: branches/modular_build/xulrunner/site/org.mozilla.xulrunner.site/.project
===================================================================
--- branches/modular_build/xulrunner/site/org.mozilla.xulrunner.site/.project (rev 0)
+++ branches/modular_build/xulrunner/site/org.mozilla.xulrunner.site/.project 2010-04-16 07:02:25 UTC (rev 21514)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.mozilla.xulrunner.site</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.pde.UpdateSiteBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.pde.UpdateSiteNature</nature>
+ </natures>
+</projectDescription>
Added: branches/modular_build/xulrunner/site/org.mozilla.xulrunner.site/README.txt
===================================================================
--- branches/modular_build/xulrunner/site/org.mozilla.xulrunner.site/README.txt (rev 0)
+++ branches/modular_build/xulrunner/site/org.mozilla.xulrunner.site/README.txt 2010-04-16 07:02:25 UTC (rev 21514)
@@ -0,0 +1,17 @@
+To regen update site metadata:
+
+java -jar ~/eclipse/eclipse36/plugins/org.eclipse.equinox.launcher_1.1.0.v20091116.jar \
+-application org.eclipse.equinox.p2.publisher.FeaturesAndBundlesPublisher \
+-metadataRepository file:/home/nboldt/11/jbosstools-trunk/xulrunner/ \
+-artifactRepository file:/home/nboldt/11/jbosstools-trunk/xulrunner/ \
+-source /home/nboldt/11/jbosstools-trunk/xulrunner/ -configs "*.*.*" \
+-compress -publishArtifacts
+
+or
+
+java -jar ~/eclipse/eclipse36/plugins/org.eclipse.equinox.launcher_1.1.0.v20091116.jar \
+-application org.eclipse.equinox.p2.publisher.UpdateSitePublisher \
+-metadataRepository file:/home/nboldt/11/jbosstools-trunk/xulrunner/ \
+-artifactRepository file:/home/nboldt/11/jbosstools-trunk/xulrunner/ \
+-source /home/nboldt/11/jbosstools-trunk/xulrunner/features/org.mozilla.xulrunner.site -configs "*.*.*" \
+-compress -publishArtifacts
Added: branches/modular_build/xulrunner/site/org.mozilla.xulrunner.site/pom.xml
===================================================================
--- branches/modular_build/xulrunner/site/org.mozilla.xulrunner.site/pom.xml (rev 0)
+++ branches/modular_build/xulrunner/site/org.mozilla.xulrunner.site/pom.xml 2010-04-16 07:02:25 UTC (rev 21514)
@@ -0,0 +1,15 @@
+<project
+xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <relativePath>../../../parent-pom.xml</relativePath>
+ <groupId>org.jboss.tools</groupId>
+ <artifactId>org.jboss.tools.parent.pom</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ </parent>
+ <groupId>org.jboss.tools</groupId>
+ <artifactId>org.mozilla.xulrunner.site</artifactId>
+ <version>1.9.1.2</version>
+ <packaging>eclipse-update-site</packaging>
+</project>
+
Added: branches/modular_build/xulrunner/site/org.mozilla.xulrunner.site/site.xml
===================================================================
--- branches/modular_build/xulrunner/site/org.mozilla.xulrunner.site/site.xml (rev 0)
+++ branches/modular_build/xulrunner/site/org.mozilla.xulrunner.site/site.xml 2010-04-16 07:02:25 UTC (rev 21514)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<site>
+ <feature url="features/org.mozilla.xulrunner.feature_0.0.0.jar" id="org.mozilla.xulrunner.feature" version="0.0.0">
+ <category name="XulRunner"/>
+ </feature>
+ <feature url="features/org.mozilla.xpcom.feature_0.0.0.jar" id="org.mozilla.xpcom.feature" version="0.0.0">
+ <category name="XulRunner"/>
+ </feature>
+ <category-def name="XulRunner" label="XulRunner support for JBoss Tools">
+ <description>XulRunner support for JBoss Tools</description>
+ </category-def>
+</site>
Added: branches/modular_build/xulrunner/site/pom.xml
===================================================================
--- branches/modular_build/xulrunner/site/pom.xml (rev 0)
+++ branches/modular_build/xulrunner/site/pom.xml 2010-04-16 07:02:25 UTC (rev 21514)
@@ -0,0 +1,18 @@
+<project
+xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <relativePath>../../parent-pom.xml</relativePath>
+ <groupId>org.jboss.tools</groupId>
+ <artifactId>org.jboss.tools.parent.pom</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ </parent>
+ <groupId>org.jboss.tools</groupId>
+ <artifactId>site.all</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <packaging>pom</packaging>
+ <modules>
+ <module>org.mozilla.xulrunner.site</module>
+ </modules>
+</project>
+
14 years, 9 months