JBoss Tools SVN: r13472 - trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2009-02-04 11:11:50 -0500 (Wed, 04 Feb 2009)
New Revision: 13472
Modified:
trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/BasePortletClasspathContainer.java
trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/JSFPortlet10LibrariesContainerInitializer.java
trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/Portlet20LibrariesContainerInitializer.java
trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/PortletRuntimeLibrariesContainerInitializer.java
Log:
JBIDE-3733 JBoss ESB classpath container does not set source attachment location
Modified: trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/BasePortletClasspathContainer.java
===================================================================
--- trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/BasePortletClasspathContainer.java 2009-02-04 16:11:45 UTC (rev 13471)
+++ trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/BasePortletClasspathContainer.java 2009-02-04 16:11:50 UTC (rev 13472)
@@ -10,15 +10,13 @@
protected static final String PORTLET_FOLDER = "portlet"; //$NON-NLS-1$
public final static String SUFFIX = PORTLET_FOLDER;//$NON-NLS-1$
public final static String PREFIX = "org.jboss.tools.portlet.core"; //$NON-NLS-1$
- private IJavaProject project;
public BasePortletClasspathContainer(IJavaProject project, IPath path,
String description, String suffix) {
- super(path, description, suffix);
- this.project = project;
+ super(path, description, suffix, project);
}
public IJavaProject getProject() {
- return project;
+ return javaProject;
}
}
Modified: trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/JSFPortlet10LibrariesContainerInitializer.java
===================================================================
--- trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/JSFPortlet10LibrariesContainerInitializer.java 2009-02-04 16:11:45 UTC (rev 13471)
+++ trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/JSFPortlet10LibrariesContainerInitializer.java 2009-02-04 16:11:50 UTC (rev 13472)
@@ -44,7 +44,7 @@
@Override
protected AbstractClasspathContainer createClasspathContainer(IPath path) {
- return new JSFPortlet10ClasspathContainer(path);
+ return new JSFPortlet10ClasspathContainer(path, javaProject);
}
@Override
@@ -57,8 +57,8 @@
public final static String SUFFIX = PortletCoreActivator.JSFPORTLET_FOLDER;//$NON-NLS-1$
public final static String PREFIX = "org.jboss.tools.portlet.core"; //$NON-NLS-1$
- public JSFPortlet10ClasspathContainer(IPath path) {
- super(path, Messages.JSFPortlet10LibrariesContainerInitializer_JBoss_JSF_Portlet_Libraries_v1_0, SUFFIX);
+ public JSFPortlet10ClasspathContainer(IPath path, IJavaProject javaProject) {
+ super(path, Messages.JSFPortlet10LibrariesContainerInitializer_JBoss_JSF_Portlet_Libraries_v1_0, SUFFIX, javaProject);
}
@Override
@@ -122,5 +122,10 @@
return entries.toArray(new IClasspathEntry[entries.size()]);
}
+
+ @Override
+ public void refresh() {
+ new JSFPortlet10ClasspathContainer(path,javaProject).install();
+ }
}
}
Modified: trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/Portlet20LibrariesContainerInitializer.java
===================================================================
--- trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/Portlet20LibrariesContainerInitializer.java 2009-02-04 16:11:45 UTC (rev 13471)
+++ trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/Portlet20LibrariesContainerInitializer.java 2009-02-04 16:11:50 UTC (rev 13472)
@@ -16,7 +16,6 @@
import java.net.URL;
import java.util.ArrayList;
-import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.FileLocator;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.Path;
@@ -27,6 +26,7 @@
import org.eclipse.jdt.core.JavaCore;
import org.jboss.ide.eclipse.as.classpath.core.jee.AbstractClasspathContainer;
import org.jboss.ide.eclipse.as.classpath.core.jee.AbstractClasspathContainerInitializer;
+import org.jboss.ide.eclipse.as.classpath.core.jee.J2EE13ClasspathContainerInitializer.J2EE13ClasspathContainer;
import org.jboss.ide.eclipse.as.classpath.core.xpl.ClasspathDecorations;
import org.jboss.tools.portlet.core.IPortletConstants;
import org.jboss.tools.portlet.core.Messages;
@@ -39,22 +39,13 @@
public class Portlet20LibrariesContainerInitializer extends
AbstractClasspathContainerInitializer {
- private IJavaProject project;
-
- @Override
- public void initialize(IPath containerPath, IJavaProject project)
- throws CoreException {
- this.project = project;
- super.initialize(containerPath, project);
- }
-
public String getDescription(IPath containerPath, IJavaProject project) {
return Messages.Portlet20LibrariesContainerInitializer_JBoss_Portlet_Classpath_Container_Initializer;
}
@Override
protected AbstractClasspathContainer createClasspathContainer(IPath path) {
- return new Portlet20ClasspathContainer(path, project);
+ return new Portlet20ClasspathContainer(path, javaProject);
}
@Override
@@ -135,5 +126,10 @@
return null;
}
+ @Override
+ public void refresh() {
+ new Portlet20ClasspathContainer(path,javaProject).install();
+ }
+
}
}
Modified: trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/PortletRuntimeLibrariesContainerInitializer.java
===================================================================
--- trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/PortletRuntimeLibrariesContainerInitializer.java 2009-02-04 16:11:45 UTC (rev 13471)
+++ trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/PortletRuntimeLibrariesContainerInitializer.java 2009-02-04 16:11:50 UTC (rev 13472)
@@ -14,7 +14,6 @@
import java.io.FileFilter;
import java.util.ArrayList;
-import org.eclipse.core.resources.IFolder;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
@@ -44,22 +43,13 @@
public class PortletRuntimeLibrariesContainerInitializer extends
AbstractClasspathContainerInitializer {
- private IJavaProject project;
-
- @Override
- public void initialize(IPath containerPath, IJavaProject project)
- throws CoreException {
- this.project = project;
- super.initialize(containerPath, project);
- }
-
public String getDescription(IPath containerPath, IJavaProject project) {
return Messages.PortletLibrariesContainerInitializer_JBoss_Portlet_Classpath_Container_Initializer;
}
@Override
protected AbstractClasspathContainer createClasspathContainer(IPath path) {
- return new PortletRuntimeClasspathContainer(path, project);
+ return new PortletRuntimeClasspathContainer(path, javaProject);
}
@Override
@@ -210,5 +200,10 @@
}
return null;
}
+
+ @Override
+ public void refresh() {
+ new PortletRuntimeClasspathContainer(path,javaProject).install();
+ }
}
}
15 years, 2 months
JBoss Tools SVN: r13471 - trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/classpath.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2009-02-04 11:11:45 -0500 (Wed, 04 Feb 2009)
New Revision: 13471
Modified:
trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/classpath/JBossWSRuntimeClassPathInitializer.java
Log:
JBIDE-3733 JBoss ESB classpath container does not set source attachment location
Modified: trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/classpath/JBossWSRuntimeClassPathInitializer.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/classpath/JBossWSRuntimeClassPathInitializer.java 2009-02-04 16:11:40 UTC (rev 13470)
+++ trunk/ws/plugins/org.jboss.tools.ws.core/src/org/jboss/tools/ws/core/classpath/JBossWSRuntimeClassPathInitializer.java 2009-02-04 16:11:45 UTC (rev 13471)
@@ -43,11 +43,11 @@
@Override
public void initialize(IPath containerPath, IJavaProject project)
throws CoreException {
-
+ this.javaProject = project;
if (containerPath.segment(0).equals(
JBossWSCoreMessages.JBossWS_Runtime_Lib)) {
JBossWSRuntimeClasspathContainer container = new JBossWSRuntimeClasspathContainer(
- containerPath);
+ containerPath, project);
segment = containerPath.segment(1);
JavaCore.setClasspathContainer(containerPath,
new IJavaProject[] { project },
@@ -56,7 +56,7 @@
}
public IClasspathEntry[] getEntries(IPath path) {
- return new JBossWSRuntimeClasspathContainer(path).getClasspathEntries();
+ return new JBossWSRuntimeClasspathContainer(path, javaProject).getClasspathEntries();
}
public class JBossWSRuntimeClasspathContainer extends
@@ -64,8 +64,8 @@
private IPath path;
private IClasspathEntry[] entries = null;
- public JBossWSRuntimeClasspathContainer(IPath path) {
- super(path,JBossWSCoreMessages.JBossWS_Runtime_Lib,null);
+ public JBossWSRuntimeClasspathContainer(IPath path, IJavaProject javaProject) {
+ super(path,JBossWSCoreMessages.JBossWS_Runtime_Lib,null, javaProject);
this.path = path;
}
@@ -200,6 +200,11 @@
entries = entriesList.toArray(new IClasspathEntry[0]);
}
+ @Override
+ public void refresh() {
+ new JBossWSRuntimeClasspathContainer(path,javaProject).install();
+ }
+
}
public boolean filterJars(String jarName, ArrayList<IClasspathEntry> list) {
@@ -213,7 +218,7 @@
@Override
protected AbstractClasspathContainer createClasspathContainer(IPath path) {
- return new JBossWSRuntimeClasspathContainer(path);
+ return new JBossWSRuntimeClasspathContainer(path, javaProject);
}
@Override
15 years, 2 months
JBoss Tools SVN: r13470 - trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/runtime.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2009-02-04 11:11:40 -0500 (Wed, 04 Feb 2009)
New Revision: 13470
Modified:
trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/runtime/JBossRuntimeClassPathInitializer.java
Log:
JBIDE-3733 JBoss ESB classpath container does not set source attachment location
Modified: trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/runtime/JBossRuntimeClassPathInitializer.java
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/runtime/JBossRuntimeClassPathInitializer.java 2009-02-04 15:48:08 UTC (rev 13469)
+++ trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/runtime/JBossRuntimeClassPathInitializer.java 2009-02-04 16:11:40 UTC (rev 13470)
@@ -47,8 +47,7 @@
private String segment;
private boolean isServerSupplied = false;
- private IJavaProject javaProject;
-
+
@Override
public void initialize(IPath containerPath, IJavaProject project)
throws CoreException {
@@ -87,7 +86,7 @@
public JBossRuntimeClasspathContainer(IPath path, IJavaProject project,
boolean isFromServer) {
- super(path, JBossFacetCoreMessages.JBoss_Runtime, null);
+ super(path, JBossFacetCoreMessages.JBoss_Runtime, null, project);
this.path = path;
this.isFromServer = isFromServer;
}
@@ -162,6 +161,11 @@
return entries;
}
+ @Override
+ public void refresh() {
+ new JBossRuntimeClasspathContainer(path,javaProject,isServerSupplied).install();
+ }
+
}
15 years, 2 months
JBoss Tools SVN: r13469 - trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/project/capabilities.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2009-02-04 10:48:08 -0500 (Wed, 04 Feb 2009)
New Revision: 13469
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/project/capabilities/LibrariesPerformer.java
Log:
JBIDE-3730
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/project/capabilities/LibrariesPerformer.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/project/capabilities/LibrariesPerformer.java 2009-02-04 15:42:56 UTC (rev 13468)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/project/capabilities/LibrariesPerformer.java 2009-02-04 15:48:08 UTC (rev 13469)
@@ -86,7 +86,7 @@
jarPerformers = l2.toArray(new JarPerformer[0]);
conflictingFiles = null;
- IContainer r = (IContainer)lib.getAdapter(IResource.class);
+ IContainer r = lib == null ? null : (IContainer)lib.getAdapter(IResource.class);
if(conflictingLibraryReferences != null && lib != null && r != null) {
ArrayList<IFile> cfjs = new ArrayList<IFile>();
for (int i = 0; i < conflictingLibraryReferences.length; i++) {
15 years, 2 months
JBoss Tools SVN: r13468 - in trunk/jsf: tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/resources/ajax4jsfTests/WebContent/pages/components and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: yradtsevich
Date: 2009-02-04 10:42:56 -0500 (Wed, 04 Feb 2009)
New Revision: 13468
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.ajax4jsf/src/org/jboss/tools/jsf/vpe/ajax4jsf/template/Ajax4JSFPageTemplate.java
trunk/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/resources/ajax4jsfTests/WebContent/pages/components/page.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/resources/ajax4jsfTests/WebContent/pages/components/page.xhtml.xml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/src/org/jboss/tools/jsf/vpe/ajax4jsf/test/Ajax4JsfComponentContentTest.java
Log:
RESOLVED - issue JBIDE-3718: a4j:page isn't rendered facets correctly
https://jira.jboss.org/jira/browse/JBIDE-3718
- the template of a4j:page has been almost completely rewritten
- JUnit test has been modified
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.ajax4jsf/src/org/jboss/tools/jsf/vpe/ajax4jsf/template/Ajax4JSFPageTemplate.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.ajax4jsf/src/org/jboss/tools/jsf/vpe/ajax4jsf/template/Ajax4JSFPageTemplate.java 2009-02-04 15:42:09 UTC (rev 13467)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.ajax4jsf/src/org/jboss/tools/jsf/vpe/ajax4jsf/template/Ajax4JSFPageTemplate.java 2009-02-04 15:42:56 UTC (rev 13468)
@@ -1,64 +1,94 @@
/*******************************************************************************
- * Copyright (c) 2007-2008 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
- ******************************************************************************/
+ * Copyright (c) 2007-2008 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.ajax4jsf.template;
-import org.jboss.tools.jsf.vpe.richfaces.ComponentUtil;
import org.jboss.tools.vpe.editor.context.VpePageContext;
import org.jboss.tools.vpe.editor.template.VpeAbstractTemplate;
import org.jboss.tools.vpe.editor.template.VpeChildrenInfo;
import org.jboss.tools.vpe.editor.template.VpeCreationData;
+import org.jboss.tools.vpe.editor.template.VpeTemplateManager;
import org.jboss.tools.vpe.editor.util.HTML;
import org.mozilla.interfaces.nsIDOMDocument;
import org.mozilla.interfaces.nsIDOMElement;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+/**
+ * The template intended for processing {@code <a4j:page>} elements.
+ *
+ * @author dmaliarevich
+ * @author yradtsevich
+ */
public class Ajax4JSFPageTemplate extends VpeAbstractTemplate {
- private static final String HEAD_FACET_NAME = "head"; //$NON-NLS-1$
+ private static final String FACET_TEMPLATE_NAME = "f:facet"; //$NON-NLS-1$
+ private static final String ATTR_NAME = "name"; //$NON-NLS-1$
+ private static final String HEAD_FACET_NAME = "head"; //$NON-NLS-1$
- public VpeCreationData create(VpePageContext pageContext, Node sourceNode,
- nsIDOMDocument visualDocument) {
- Element sourceElement = (Element) sourceNode;
- nsIDOMElement divHtml = visualDocument.createElement(HTML.TAG_DIV);
- nsIDOMElement divHead = visualDocument.createElement(HTML.TAG_DIV);
- nsIDOMElement divBody = visualDocument.createElement(HTML.TAG_DIV);
- VpeCreationData creationData = new VpeCreationData(divHtml);
+ public VpeCreationData create(VpePageContext pageContext, Node sourceNode,
+ nsIDOMDocument visualDocument) {
+ Element sourceElement = (Element) sourceNode;
- /*
- * Encoding label value
+ nsIDOMElement bodyContainer = visualDocument.createElement(HTML.TAG_DIV);
+ VpeCreationData creationData = new VpeCreationData(bodyContainer);
+
+ // Mozilla renders HEAD nested in HEAD pretty well, so we are nesting these elements
+ nsIDOMElement headContainer = visualDocument.createElement(HTML.TAG_HEAD);
+ pageContext.getVisualBuilder().getHeadNode().appendChild(headContainer);
+
+ VpeChildrenInfo headChildrenInfo = new VpeChildrenInfo(headContainer);
+ creationData.addChildrenInfo(headChildrenInfo);
+
+ VpeChildrenInfo bodyChildrenInfo = new VpeChildrenInfo(bodyContainer);
+ creationData.addChildrenInfo(bodyChildrenInfo);
+
+ NodeList childNodes = sourceElement.getChildNodes();
+ for (int i = 0; i < childNodes.getLength(); i++) {
+ Node child = childNodes.item(i);
+
+ if (isHeadFacet(pageContext, child)) {
+ Element headFacet = (Element) child;
+
+ NodeList headFacetChildren = headFacet.getChildNodes();
+ for (int j = 0; j < headFacetChildren.getLength(); j++) {
+ headChildrenInfo.addSourceChild(headFacetChildren.item(j));
+ }
+ } else {
+ bodyChildrenInfo.addSourceChild(child);
+ }
+ }
+
+ return creationData;
+ }
+
+ /**
+ * Returns {@code true} if and only if the {@code node} is a head facet.
*/
- Element headFacet = ComponentUtil.getFacet(sourceElement,
- HEAD_FACET_NAME);
- if (null != headFacet) {
- VpeChildrenInfo childrenInfo = new VpeChildrenInfo(divHead);
- childrenInfo.addSourceChild(headFacet);
- divHtml.appendChild(divHead);
- creationData.addChildrenInfo(childrenInfo);
+ private static boolean isHeadFacet(VpePageContext pageContext, Node node) {
+ String templateName = VpeTemplateManager.getInstance().getTemplateName(pageContext, node);
+ if (FACET_TEMPLATE_NAME.equals(templateName)) {
+ Element element = (Element) node;
+ String name = element.getAttribute(ATTR_NAME);
+ if (HEAD_FACET_NAME.equals(name)) {
+ return true;
+ }
+ }
+ return false;
}
- VpeChildrenInfo divBodyInfo = new VpeChildrenInfo(divBody);
- creationData.addChildrenInfo(divBodyInfo);
- divHtml.appendChild(divBody);
- for (Node child : ComponentUtil.getChildren(sourceElement, true)) {
- divBodyInfo.addSourceChild(child);
+ @Override
+ public boolean isRecreateAtAttrChange(VpePageContext pageContext,
+ Element sourceElement, nsIDOMDocument visualDocument,
+ nsIDOMElement visualNode, Object data, String name, String value) {
+ return true;
}
-
- return creationData;
- }
-
- public boolean isRecreateAtAttrChange(VpePageContext pageContext,
- Element sourceElement, nsIDOMDocument visualDocument,
- nsIDOMElement visualNode, Object data, String name, String value) {
- return true;
- }
-
}
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/resources/ajax4jsfTests/WebContent/pages/components/page.xhtml
===================================================================
(Binary files differ)
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/resources/ajax4jsfTests/WebContent/pages/components/page.xhtml.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/resources/ajax4jsfTests/WebContent/pages/components/page.xhtml.xml 2009-02-04 15:42:09 UTC (rev 13467)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/resources/ajax4jsfTests/WebContent/pages/components/page.xhtml.xml 2009-02-04 15:42:56 UTC (rev 13468)
@@ -1,5 +1,11 @@
<tests>
<test id="page">
-
+ <DIV>
+ <SPAN CLASS="red">
+ <SPAN CLASS="vpe-text">
+ Red Text
+ </SPAN>
+ </SPAN>
+ </DIV>
</test>
</tests>
\ No newline at end of file
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/src/org/jboss/tools/jsf/vpe/ajax4jsf/test/Ajax4JsfComponentContentTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/src/org/jboss/tools/jsf/vpe/ajax4jsf/test/Ajax4JsfComponentContentTest.java 2009-02-04 15:42:09 UTC (rev 13467)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/src/org/jboss/tools/jsf/vpe/ajax4jsf/test/Ajax4JsfComponentContentTest.java 2009-02-04 15:42:56 UTC (rev 13468)
@@ -70,7 +70,7 @@
public void testOutputPanel() throws Throwable {
}
- public void _testPage() throws Throwable {
+ public void testPage() throws Throwable {
performContentTest("components/page.xhtml");//$NON-NLS-1$
}
15 years, 2 months
JBoss Tools SVN: r13467 - trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/views/navigator.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2009-02-04 10:42:09 -0500 (Wed, 04 Feb 2009)
New Revision: 13467
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/views/navigator/NavigatorContentProvider.java
Log:
JBIDE-3730
Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/views/navigator/NavigatorContentProvider.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/views/navigator/NavigatorContentProvider.java 2009-02-04 15:40:50 UTC (rev 13466)
+++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/views/navigator/NavigatorContentProvider.java 2009-02-04 15:42:09 UTC (rev 13467)
@@ -35,6 +35,7 @@
import org.jboss.tools.common.model.XModelObject;
import org.jboss.tools.common.model.filesystems.FileSystemsHelper;
import org.jboss.tools.common.model.project.IModelNature;
+import org.jboss.tools.common.model.project.ModelNature;
import org.jboss.tools.common.model.ui.navigator.TreeViewerModelListenerImpl;
import org.jboss.tools.common.model.util.EclipseResourceUtil;
import org.jboss.tools.common.model.util.XModelTreeListenerSWTASync;
@@ -226,6 +227,9 @@
(affectedChildren[i].getKind() == IResourceDelta.CHANGED &&
((affectedChildren[i].getFlags() & IResourceDelta.OPEN) != 0)) ||
!projects.contains(project.getLocation().toString())) {
+ if(!ModelNature.checkModelNature(project)) {
+ continue;
+ }
XModelObject root = addProject(project);
if (root != null) affected.add(root);
}
15 years, 2 months
JBoss Tools SVN: r13466 - in trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model: util and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2009-02-04 10:40:50 -0500 (Wed, 04 Feb 2009)
New Revision: 13466
Modified:
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/project/ModelNature.java
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/EclipseResourceUtil.java
Log:
JBIDE-3730
Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/project/ModelNature.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/project/ModelNature.java 2009-02-04 14:13:20 UTC (rev 13465)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/project/ModelNature.java 2009-02-04 15:40:50 UTC (rev 13466)
@@ -190,4 +190,41 @@
return null;
}
+ /**
+ * These hack methods are used to prevent loading model nature
+ * when its project data is not stored in xmodel settings and should
+ * be loaded from WTP, but project is not synchronized yet so that
+ * loading will fail and xmodel will be corrupted.
+ * @param project
+ * @return
+ */
+ public static boolean checkModelNature(IProject project) {
+ if(project == null || !project.isOpen()) return false;
+ String nature = null;
+ try {
+ if(project.hasNature("org.jboss.tools.jsf.jsfnature")) {
+ nature = "org.jboss.tools.jsf.jsfnature";
+ } else if(project.hasNature("org.jboss.tools.struts.strutsnature")) {
+ nature = "org.jboss.tools.struts.strutsnature";
+ }
+ } catch (CoreException e) {
+ ModelPlugin.getPluginLog().logError(e);
+ return false;
+ }
+ return checkModelNature(project, nature);
+ }
+
+ public static boolean checkModelNature(IProject project, String nature) {
+ if(project == null || !project.isOpen()) return false;
+ if(nature == null) return false;
+ String home = new ProjectHome().getLocation(project);
+ if(home != null && home.length() > 0) {
+ return true;
+ }
+ if(!project.isSynchronized(1)) {
+ return false;
+ }
+ return true;
+ }
+
}
Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/EclipseResourceUtil.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/EclipseResourceUtil.java 2009-02-04 14:13:20 UTC (rev 13465)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/EclipseResourceUtil.java 2009-02-04 15:40:50 UTC (rev 13466)
@@ -37,6 +37,7 @@
import org.jboss.tools.common.model.impl.XModelObjectImpl;
import org.jboss.tools.common.model.plugin.ModelPlugin;
import org.jboss.tools.common.model.project.IModelNature;
+import org.jboss.tools.common.model.project.ModelNature;
public class EclipseResourceUtil {
@@ -213,6 +214,9 @@
for (int i = 0; i < natures.length; i++) {
try {
if(p.hasNature(natures[i])) {
+ if(!ModelNature.checkModelNature(p, natures[i])) {
+ continue;
+ }
IModelNature n = (IModelNature)p.getNature(natures[i]);
if(n == null) return null;
n = testNature(n);
@@ -242,6 +246,9 @@
if(p == null || !p.isOpen()) return null;
try {
if(p.hasNature(id)) {
+ if(!ModelNature.checkModelNature(p, id)) {
+ return null;
+ }
IModelNature n = (IModelNature)p.getNature(id);
if(n == null) return null;
n = testNature(n);
15 years, 2 months
JBoss Tools SVN: r13465 - trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template.
by jbosstools-commits＠lists.jboss.org
Author: mareshkau
Date: 2009-02-04 09:13:20 -0500 (Wed, 04 Feb 2009)
New Revision: 13465
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesPanelMenuItemTemplate.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-3737
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesPanelMenuItemTemplate.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesPanelMenuItemTemplate.java 2009-02-04 13:59:47 UTC (rev 13464)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesPanelMenuItemTemplate.java 2009-02-04 14:13:20 UTC (rev 13465)
@@ -144,7 +144,10 @@
Element panelMenuParent = getItemParent(elementToPass, true);
String childId = (String) elementToPass.getUserData(VPE_PANEL_MENU_ITEM_ID);
-
+ //fix for JBIDE-3737
+ if(childId==null) {
+ childId = "";//$NON-NLS-1$
+ }
readPanelMenuAttributes(panelMenuParent);
readPanelMenuItemAttributes(itemSourceElement);
15 years, 2 months
JBoss Tools SVN: r13464 - trunk/as/plugins/org.jboss.ide.eclipse.as.core.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2009-02-04 08:59:47 -0500 (Wed, 04 Feb 2009)
New Revision: 13464
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.properties
Log:
community name changed as per max
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.properties
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.properties 2009-02-04 13:16:05 UTC (rev 13463)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.properties 2009-02-04 13:59:47 UTC (rev 13464)
@@ -1,5 +1,5 @@
pluginName=JBoss WTP Server Tools Core Plugin
-providerName=JBoss.org Community
+providerName=JBoss Community
enterpriseProviderName=JBoss Enterprise Middleware
# Version Delegates
15 years, 2 months
JBoss Tools SVN: r13463 - trunk/as/plugins/org.jboss.ide.eclipse.as.core.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2009-02-04 08:16:05 -0500 (Wed, 04 Feb 2009)
New Revision: 13463
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.properties
Log:
changed provider names as per mailing list
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.properties
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.properties 2009-02-04 10:07:13 UTC (rev 13462)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.properties 2009-02-04 13:16:05 UTC (rev 13463)
@@ -1,6 +1,6 @@
pluginName=JBoss WTP Server Tools Core Plugin
-providerName=JBoss.org
-enterpriseProviderName=JBoss, a division of Red Hat
+providerName=JBoss.org Community
+enterpriseProviderName=JBoss Enterprise Middleware
# Version Delegates
jboss.version.32.name=JBoss AS 3.2
15 years, 2 months