JBoss Tools SVN: r29364 - branches.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-02-25 17:19:14 -0500 (Fri, 25 Feb 2011)
New Revision: 29364
Added:
branches/3.3.indigo/
Log:
branch for prelim work on supporting Eclipse Indigo (JBT 3.3)
13 years, 1 month
JBoss Tools SVN: r29363 - trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2011-02-25 17:17:56 -0500 (Fri, 25 Feb 2011)
New Revision: 29363
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeDomBuilder.java
Log:
JBIDE-8049
*.inc content type JSP clash with PDT
Issue is fixed.
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeDomBuilder.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeDomBuilder.java 2011-02-25 22:16:02 UTC (rev 29362)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeDomBuilder.java 2011-02-25 22:17:56 UTC (rev 29363)
@@ -47,7 +47,14 @@
domMapping.mapNodes(nodeMapping);
Node sourceNode = nodeMapping.getSourceNode();
- if (((INodeNotifier) sourceNode).getExistingAdapter(sorceAdapter) == null) {
+
+
+ /* yradtsevich:
+ * checking for ((INodeNotifier) sourceNode).getExistingAdapter(sorceAdapter) == null
+ * is not used because of JBIDE-8049 (JBIDE-8051)
+ * (PDT implementation of getExistingAdapter(Object type) works
+ * incorrectly with non Class parameters) */
+ if (!sourceNodes.contains(sourceNode)) {
((INodeNotifier) sourceNode).addAdapter(sorceAdapter);
sourceNodes.add(sourceNode);
}
13 years, 1 month
JBoss Tools SVN: r29362 - in trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp: selection/bar and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2011-02-25 17:16:02 -0500 (Fri, 25 Feb 2011)
New Revision: 29362
Added:
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPIncludeContentDescriber.java
Modified:
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/selection/bar/SelectionBar.java
Log:
JBIDE-8049
*.inc content type JSP clash with PDT
Issue is fixed.
Added: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPIncludeContentDescriber.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPIncludeContentDescriber.java (rev 0)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPIncludeContentDescriber.java 2011-02-25 22:16:02 UTC (rev 29362)
@@ -0,0 +1,89 @@
+/*******************************************************************************
+ * Copyright (c) 2011 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
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.jst.jsp.jspeditor;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.Reader;
+
+import org.eclipse.core.internal.content.TextContentDescriber;
+import org.eclipse.core.runtime.content.IContentDescription;
+import org.eclipse.core.runtime.content.ITextContentDescriber;
+
+/**
+ * Content decriber class that helps Eclipse to detect if the *.inc file has jsp content inside.
+ *
+ * @author Victor Rubezhny
+ *
+ */
+@SuppressWarnings("restriction")
+public class JSPIncludeContentDescriber extends TextContentDescriber implements ITextContentDescriber {
+
+ public int describe(InputStream input, IContentDescription description) throws IOException {
+ InputStreamReader reader = new InputStreamReader(input);
+ try {
+ return (containsJspElements(reader) ?
+ VALID :
+ INVALID);
+ } finally {
+ reader.close();
+ }
+ }
+
+ public int describe(Reader contents, IContentDescription description) throws IOException {
+ return (containsJspElements(contents) ?
+ VALID :
+ INVALID);
+ }
+
+ private boolean containsJspElements(Reader contents) {
+ try {
+ int c = contents.read();
+ while (c != -1) {
+ if (c == '<') { // JSP Code/Tag/Directive Opener check
+ if ((c = contents.read()) == -1)
+ return false;
+ if (c == '%') { // JSP Code/Directive opened
+ return true;
+ }
+ if (c == 'j') { // JSP Tag opener check
+ if ((c = contents.read()) == -1)
+ return false;
+ if (c != 's')
+ continue;
+ if ((c = contents.read()) == -1)
+ return false;
+ if (c != 'p')
+ continue;
+ if ((c = contents.read()) == -1)
+ return false;
+ if (c != ':')
+ continue;
+
+ // Find the tag close
+ while ((c = contents.read()) != -1) {
+ if (c == '>') {
+ return true;
+ }
+ }
+ continue;
+ }
+ }
+ c = contents.read();
+ }
+ } catch (IOException ex) {
+ ex.printStackTrace();
+ // Ignore
+ }
+ return false;
+ }
+}
Property changes on: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPIncludeContentDescriber.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/selection/bar/SelectionBar.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/selection/bar/SelectionBar.java 2011-02-25 22:11:49 UTC (rev 29361)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/selection/bar/SelectionBar.java 2011-02-25 22:16:02 UTC (rev 29362)
@@ -488,7 +488,13 @@
private void addNodeListenerTo(Node node) {
if (node instanceof INodeNotifier) {
INodeNotifier notifier = (INodeNotifier) node;
- if (notifier.getExistingAdapter(this) == null) {
+
+ /* yradtsevich:
+ * checking for notifier.getExistingAdapter(this) == null
+ * is not used because of JBIDE-8049 (JBIDE-8051)
+ * (PDT implementation of getExistingAdapter(Object type) works
+ * incorrectly with non Class parameters) */
+ if (!nodeNotifiers.contains(notifier)) {
notifier.addAdapter(nodeListener);
nodeNotifiers.add(notifier);
}
13 years, 1 month
JBoss Tools SVN: r29360 - trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2011-02-25 17:10:43 -0500 (Fri, 25 Feb 2011)
New Revision: 29360
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java
Log:
https://issues.jboss.org/browse/JBIDE-8488 Temporary commented the broken code.
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 2011-02-25 22:09:55 UTC (rev 29359)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java 2011-02-25 22:10:43 UTC (rev 29360)
@@ -123,6 +123,7 @@
public static final String IMPORT_TEST_WITH_2_URL_PATTERNS_PROJECT_NAME = "TestWith2URLPatterns"; //$NON-NLS-1$
public static Test suite() {
+// FIXME https://issues.jboss.org/browse/JBIDE-8488
// JSPIndexManager.getInstance().shutdown();
TestSuite suite = new TestSuite("Tests for Vpe Jsf components"); //$NON-NLS-1$
// $JUnit-BEGIN$
13 years, 1 month
JBoss Tools SVN: r29359 - trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2011-02-25 17:09:55 -0500 (Fri, 25 Feb 2011)
New Revision: 29359
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java
Log:
https://issues.jboss.org/browse/JBIDE-8488 Temporary commented the broken code.
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 2011-02-25 22:09:25 UTC (rev 29358)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java 2011-02-25 22:09:55 UTC (rev 29359)
@@ -123,7 +123,7 @@
public static final String IMPORT_TEST_WITH_2_URL_PATTERNS_PROJECT_NAME = "TestWith2URLPatterns"; //$NON-NLS-1$
public static Test suite() {
- JSPIndexManager.getInstance().shutdown();
+// JSPIndexManager.getInstance().shutdown();
TestSuite suite = new TestSuite("Tests for Vpe Jsf components"); //$NON-NLS-1$
// $JUnit-BEGIN$
/*
13 years, 1 month
JBoss Tools SVN: r29358 - trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-02-25 17:09:25 -0500 (Fri, 25 Feb 2011)
New Revision: 29358
Added:
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/NewJSFProjectTest.java
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/JsfUiAllTests.java
Log:
JBIDE-8484
https://issues.jboss.org/browse/JBIDE-8484
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 2011-02-25 22:02:24 UTC (rev 29357)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/JsfUiAllTests.java 2011-02-25 22:09:25 UTC (rev 29358)
@@ -35,6 +35,7 @@
public static Test suite() {
TestSuite suite = new TestSuite("JSF UI tests"); //$NON-NLS-1$
+ suite.addTestSuite(NewJSFProjectTest.class);
suite.addTestSuite(CAForUnclosedELTest.class);
suite.addTestSuite(CAForCompositeComponentTest.class);
// suite.addTestSuite(MissingKBBuilderTest.class);
Added: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/NewJSFProjectTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/NewJSFProjectTest.java (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/NewJSFProjectTest.java 2011-02-25 22:09:25 UTC (rev 29358)
@@ -0,0 +1,56 @@
+package org.jboss.tools.jsf.ui.test;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.jboss.tools.common.model.XModelObject;
+import org.jboss.tools.common.model.project.IModelNature;
+import org.jboss.tools.common.model.ui.ModelUIPlugin;
+import org.jboss.tools.common.model.util.EclipseResourceUtil;
+import org.jboss.tools.jsf.ui.JsfUiPlugin;
+import org.jboss.tools.jsf.ui.operation.JSFProjectCreationOperation;
+import org.jboss.tools.jsf.web.helpers.context.NewProjectWizardContext;
+import org.jboss.tools.jst.web.model.helpers.WebAppHelper;
+
+import junit.framework.TestCase;
+
+public class NewJSFProjectTest extends TestCase {
+ static String PROJECT_NAME = "NewTestProject";
+
+ public void testNewJSFProjectOperation() throws Exception {
+ NewProjectWizardContext context = new NewProjectWizardContext();
+ IProject project = getProjectHandle();
+ context.setProject(project);
+ IPath defaultPath = ModelUIPlugin.getWorkspace().getRoot().getLocation();
+ IPath locationPath = defaultPath.append(PROJECT_NAME);
+ context.setServletVersion("2.5");
+ context.setProjectLocation(locationPath.toOSString());
+ context.setProjectTemplate("JSFKickStartWithoutLibs");
+ context.setJSFVersion("JSF 1.2");
+
+ JSFProjectCreationOperation operation = new JSFProjectCreationOperation(context);
+ IWorkbenchWindow window = JsfUiPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow();
+ window.run(false, false, operation);
+
+ IModelNature nature = EclipseResourceUtil.getModelNature(project);
+ assertNotNull(nature);
+ XModelObject webxml = nature.getModel().getByPath("/web.xml");
+ assertNotNull(webxml);
+
+ XModelObject[] s = WebAppHelper.getServlets(webxml);
+ assertTrue(s.length > 0);
+ String servletName = s[0].getAttributeValue("servlet-name");
+ assertEquals("Faces Servlet", servletName);
+
+ XModelObject facesConfig = nature.getModel().getByPath("/faces-config.xml");
+ assertNotNull(facesConfig);
+ XModelObject userBean = facesConfig.getChildByPath("Managed Beans/user");
+ assertNotNull(userBean);
+ }
+
+ private IProject getProjectHandle() {
+ return ResourcesPlugin.getWorkspace().getRoot().getProject(PROJECT_NAME);
+ }
+
+}
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/NewJSFProjectTest.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
13 years, 1 month
JBoss Tools SVN: r29357 - trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/META-INF.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2011-02-25 17:02:24 -0500 (Fri, 25 Feb 2011)
New Revision: 29357
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/META-INF/MANIFEST.MF
Log:
Fixed tycho build.
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/META-INF/MANIFEST.MF 2011-02-25 22:01:59 UTC (rev 29356)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/META-INF/MANIFEST.MF 2011-02-25 22:02:24 UTC (rev 29357)
@@ -22,14 +22,14 @@
org.jboss.tools.jst.web,
org.eclipse.core.filesystem,
org.eclipse.ui.ide,
- org.jboss.tools.vpe.resref;bundle-version="2.0.0",
- org.jboss.tools.common.el.ui;bundle-version="1.0.0",
- org.jboss.tools.common.el.core;bundle-version="2.0.0",
- org.jboss.tools.common.model.ui;bundle-version="2.0.0",
- org.eclipse.wst.xml.ui;bundle-version="1.1.0",
- org.eclipse.jdt.ui;bundle-version="3.5.0",
+ org.jboss.tools.vpe.resref,
+ org.jboss.tools.common.el.ui,
+ org.jboss.tools.common.el.core,
+ org.jboss.tools.common.model.ui,
+ org.eclipse.wst.xml.ui,
+ org.eclipse.jdt.ui,
org.jboss.tools.common.ui,
- org.jboss.tools.jst.web.ui;bundle-version="2.0.0",
+ org.jboss.tools.jst.web.ui,
org.jboss.tools.vpe.jsp,
org.jboss.tools.vpe.html,
org.jboss.tools.jsf.vpe.jsf,
@@ -43,7 +43,7 @@
org.jboss.tools.jsf.text.ext.richfaces,
org.jboss.tools.jst.text.ext,
org.eclipse.wst.validation,
- org.jboss.tools.tests;bundle-version="3.1.0"
+ org.jboss.tools.tests
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Export-Package: org.jboss.tools.jsf.vpe.jsf.test
13 years, 1 month
JBoss Tools SVN: r29356 - branches/jbosstools-3.2.x/seam/plugins/org.jboss.tools.seam.ui.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2011-02-25 17:01:59 -0500 (Fri, 25 Feb 2011)
New Revision: 29356
Modified:
branches/jbosstools-3.2.x/seam/plugins/org.jboss.tools.seam.ui/plugin.xml
Log:
https://issues.jboss.org/browse/JBIDE-8473
o.j.t.seam.ui plugin.xml warning message
Issue is fixed. Fixed for 3.2.1
Modified: branches/jbosstools-3.2.x/seam/plugins/org.jboss.tools.seam.ui/plugin.xml
===================================================================
--- branches/jbosstools-3.2.x/seam/plugins/org.jboss.tools.seam.ui/plugin.xml 2011-02-25 21:59:59 UTC (rev 29355)
+++ branches/jbosstools-3.2.x/seam/plugins/org.jboss.tools.seam.ui/plugin.xml 2011-02-25 22:01:59 UTC (rev 29356)
@@ -404,12 +404,6 @@
</hyperlinkDetector>
</extension>
- <extension
- point="org.jboss.tools.common.text.xml.contentAssistProcessor"
- id="org.jboss.tools.seam.ui.contentAssistProcessor"
- name="org.jboss.tools.seam.ui.contentAssistProcessor">
- </extension>
-
<extension point="org.eclipse.ui.preferencePages">
<page
category="org.jboss.tools.common.model.ui.seam"
13 years, 1 month
JBoss Tools SVN: r29355 - trunk/seam/plugins/org.jboss.tools.seam.ui.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2011-02-25 16:59:59 -0500 (Fri, 25 Feb 2011)
New Revision: 29355
Modified:
trunk/seam/plugins/org.jboss.tools.seam.ui/plugin.xml
Log:
https://issues.jboss.org/browse/JBIDE-8473
o.j.t.seam.ui plugin.xml warning message
Issue is fixed
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/plugin.xml
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/plugin.xml 2011-02-25 21:58:10 UTC (rev 29354)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/plugin.xml 2011-02-25 21:59:59 UTC (rev 29355)
@@ -404,12 +404,6 @@
</hyperlinkDetector>
</extension>
- <extension
- point="org.jboss.tools.common.text.xml.contentAssistProcessor"
- id="org.jboss.tools.seam.ui.contentAssistProcessor"
- name="org.jboss.tools.seam.ui.contentAssistProcessor">
- </extension>
-
<extension point="org.eclipse.ui.preferencePages">
<page
category="org.jboss.tools.common.model.ui.seam"
13 years, 1 month
