JBoss Tools SVN: r22818 - branches/jbosstools-3.1.x/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2010-06-15 09:57:44 -0400 (Tue, 15 Jun 2010)
New Revision: 22818
Added:
branches/jbosstools-3.1.x/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/JarAccessFactory.java
Modified:
branches/jbosstools-3.1.x/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/JarAccess.java
branches/jbosstools-3.1.x/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/JarSystemImpl.java
Log:
https://jira.jboss.org/browse/JBIDE-6372
Modified: branches/jbosstools-3.1.x/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/JarAccess.java
===================================================================
--- branches/jbosstools-3.1.x/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/JarAccess.java 2010-06-15 13:46:49 UTC (rev 22817)
+++ branches/jbosstools-3.1.x/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/JarAccess.java 2010-06-15 13:57:44 UTC (rev 22818)
@@ -18,13 +18,16 @@
import java.util.Enumeration;
import java.util.HashMap;
import java.util.HashSet;
+import java.util.Iterator;
import java.util.Map;
import java.util.Set;
import java.util.zip.ZipEntry;
import java.util.zip.ZipFile;
+import org.eclipse.core.resources.IProject;
import org.jboss.tools.common.model.XModelObjectConstants;
import org.jboss.tools.common.model.plugin.ModelPlugin;
+import org.jboss.tools.common.model.util.EclipseResourceUtil;
import org.jboss.tools.common.util.FileUtil;
public class JarAccess {
@@ -197,7 +200,17 @@
String encoding = null;
boolean first = true;
try {
- InputStream is = jar.getInputStream(jar.getEntry(path));
+ ZipEntry entry = jar.getEntry(path);
+ if(entry == null && path != null && path.length() > 0 && !path.startsWith("/")) {
+ entry = jar.getEntry("/" + path);
+ }
+ if(entry == null) {
+ String error = "JarAccess: cannot obtain entry for path '" + path + "' from jar '" + location + "'."; //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$
+ ModelPlugin.getDefault().logError(error);
+ return ""; //$NON-NLS-1$
+ }
+
+ InputStream is = jar.getInputStream(entry);
bs = new BufferedInputStream(is);
while ((length = bs.available()) > 0) {
if (length > size)
@@ -274,6 +287,56 @@
return templocation;
}
+ JarSystemImpl main = null;
+ Set<JarSystemImpl> slaves = new HashSet<JarSystemImpl>();
+
+ public JarSystemImpl getMain() {
+ IProject p = EclipseResourceUtil.getProject(main);
+ if(p == null || !p.isAccessible() || main.getParent() == null) {
+ main = null;
+ synchronized(slaves) {
+ Iterator<JarSystemImpl> it = slaves.iterator();
+ while(it.hasNext()) {
+ JarSystemImpl s = it.next();
+ p = EclipseResourceUtil.getProject(s);
+ if(p == null || !p.isAccessible() || s.getParent() == null) {
+ it.remove();
+ } else if(main == null) {
+ main = s;
+ it.remove();
+ }
+ }
+ }
+ if(main != null) main.jarUpdated();
+ JarSystemImpl[] ss = getSlaves();
+ for (JarSystemImpl s: ss) s.jarUpdated();
+ }
+ return main;
+ }
+
+ public void setMain(JarSystemImpl main) {
+ this.main = main;
+ }
+
+ public JarSystemImpl[] getSlaves() {
+ synchronized(slaves) {
+ return slaves.toArray(new JarSystemImpl[slaves.size()]);
+ }
+ }
+
+ public void addSlave(JarSystemImpl s) {
+ if(main == null) {
+ main = s;
+ } else {
+ synchronized(slaves) {
+ slaves.add(s);
+ }
+ }
+ }
+
+ public boolean isSlave(JarSystemImpl s) {
+ return slaves.contains(s);
+ }
}
class LFileObjectJarImpl implements LFileObject {
@@ -341,4 +404,4 @@
return false;
}
-}
+}
\ No newline at end of file
Added: branches/jbosstools-3.1.x/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/JarAccessFactory.java
===================================================================
--- branches/jbosstools-3.1.x/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/JarAccessFactory.java (rev 0)
+++ branches/jbosstools-3.1.x/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/JarAccessFactory.java 2010-06-15 13:57:44 UTC (rev 22818)
@@ -0,0 +1,24 @@
+package org.jboss.tools.common.model.filesystems.impl;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class JarAccessFactory {
+
+ static Map<String, JarAccess> jars = new HashMap<String, JarAccess>();
+
+ public static JarAccess getJarAccess(String location, JarSystemImpl context) {
+ JarAccess jar = jars.get(location);
+ if(jar == null) {
+ jar = new JarAccess();
+ jar.setMain(context);
+ jar.setLocation(location);
+ jars.put(location, jar);
+ }
+ if(context != jar.getMain()) {
+ jar.addSlave(context);
+ }
+ return jar;
+ }
+
+}
Property changes on: branches/jbosstools-3.1.x/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/JarAccessFactory.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: branches/jbosstools-3.1.x/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/JarSystemImpl.java
===================================================================
--- branches/jbosstools-3.1.x/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/JarSystemImpl.java 2010-06-15 13:46:49 UTC (rev 22817)
+++ branches/jbosstools-3.1.x/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/JarSystemImpl.java 2010-06-15 13:57:44 UTC (rev 22818)
@@ -10,12 +10,14 @@
******************************************************************************/
package org.jboss.tools.common.model.filesystems.impl;
+import java.util.Set;
+
import org.jboss.tools.common.model.*;
import org.jboss.tools.common.model.util.*;
public class JarSystemImpl extends JarFolderImpl implements org.jboss.tools.common.model.filesystems.FileSystem {
private static final long serialVersionUID = 7958999759019059243L;
- protected JarAccess jar = new JarAccess();
+ protected JarAccess jar = null;
public JarSystemImpl() {}
@@ -28,6 +30,9 @@
}
protected JarAccess getJarAccess() {
+ if(jar == null) {
+ jar = JarAccessFactory.getJarAccess(getLocation(), this);
+ }
return jar;
}
@@ -38,15 +43,32 @@
protected String getAbsolutePath() {
return ""; //$NON-NLS-1$
}
+
+ boolean loaded2 = false;
protected void loadChildren() {
- if(jar.isLoaded()) return;
+// if(jar.isLoaded()) return;
+
+ if(this != getJarAccess().getMain()) return;
+ if(loaded2) return;
+ loaded2 = true;
+
synchronized (this) {
jar.setLocation(getLocation());
super.loadChildren();
}
}
+ public XModelObject[] getChildren() {
+ JarSystemImpl main = getJarAccess().getMain();
+ return (main == this || main == null) ? super.getChildren() : main.getChildren();
+ }
+
+ public XModelObject getChildByPathPart(String pathpart) {
+ JarSystemImpl main = getJarAccess().getMain();
+ return (main == this || main == null) ? super.getChildByPathPart(pathpart) : main.getChildByPathPart(pathpart);
+ }
+
public String getPathPart() {
return name();
}
@@ -56,29 +78,44 @@
}
public String getTempLocation() {
- if(!jar.isLoaded()) loadChildren();
+ JarSystemImpl main = getJarAccess().getMain();
+ if(main != this && main != null) {
+ main.getChildren();
+ } else if(!jar.isLoaded()) {
+ loadChildren();
+ }
String s = jar.getTempLocation();
return (s == null) ? get(XModelObjectConstants.ATTR_NAME_LOCATION) : s;
}
public LFileObject getFileObject(String relpath) {
- return jar.getFileObject(name(), relpath);
+ return getJarAccess().getFileObject(name(), relpath);
}
public boolean update() {
+ if(getJarAccess().getMain() != this) return true;
+
if(jar.isModified()) {
if(jar.isLoaded()) {
XModelObject[] cs = getChildren();
for (int i = 0; i < cs.length; i++) removeChild_0(cs[i]);
jar.invalidate();
}
- loaded = false;
- fire = true;
- fireStructureChanged(3, null);
+ jarUpdated();
+
+ JarSystemImpl[] ss = getJarAccess().getSlaves();
+ for (JarSystemImpl s: ss) s.jarUpdated();
}
return true;
}
+ public void jarUpdated() {
+ loaded = false;
+ loaded2 = false;
+ fire = true;
+ fireStructureChanged(3, null);
+ }
+
public String getPresentationString() {
String location = getLocation();
if(location != null) {
@@ -90,4 +127,3 @@
return super.getPresentationString();
}
}
-
15 years, 10 months
- 1
- 0
JBoss Tools SVN: r22817 - trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2010-06-15 09:46:49 -0400 (Tue, 15 Jun 2010)
New Revision: 22817
Modified:
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/JspContentAssistProcessor.java
Log:
https://jira.jboss.org/browse/JBIDE-6470
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/JspContentAssistProcessor.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/JspContentAssistProcessor.java 2010-06-15 13:34:12 UTC (rev 22816)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/JspContentAssistProcessor.java 2010-06-15 13:46:49 UTC (rev 22817)
@@ -141,7 +141,7 @@
if (n == null)
return false;
- return (((Element)n).getAttribute(attrName) != null);
+ return (((Element)n).getAttributeNode(attrName) != null);
} finally {
if (sModel != null) {
sModel.releaseFromRead();
15 years, 10 months
- 1
- 0
JBoss Tools SVN: r22816 - branches/jbosstools-3.1.x/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2010-06-15 09:34:12 -0400 (Tue, 15 Jun 2010)
New Revision: 22816
Modified:
branches/jbosstools-3.1.x/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/FolderImpl.java
Log:
https://jira.jboss.org/browse/JBIDE-6185
Modified: branches/jbosstools-3.1.x/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/FolderImpl.java
===================================================================
--- branches/jbosstools-3.1.x/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/FolderImpl.java 2010-06-15 13:32:17 UTC (rev 22815)
+++ branches/jbosstools-3.1.x/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/FolderImpl.java 2010-06-15 13:34:12 UTC (rev 22816)
@@ -12,6 +12,7 @@
import java.io.File;
import java.io.IOException;
+import java.net.URI;
import java.text.MessageFormat;
import java.util.Comparator;
import java.util.HashMap;
@@ -40,7 +41,6 @@
import org.jboss.tools.common.model.XModelException;
import org.jboss.tools.common.model.XModelObjectConstants;
import org.jboss.tools.common.model.XModelObject;
-import org.jboss.tools.common.model.XModelObjectConstants;
import org.jboss.tools.common.model.filesystems.BodySource;
import org.jboss.tools.common.model.filesystems.FileAuxiliary;
import org.jboss.tools.common.model.filesystems.FilePathHelper;
@@ -67,6 +67,30 @@
// protected Map<String, File> linked = new HashMap<String, File>();
// protected Map<String, IResource> linkedResources = new HashMap<String, IResource>();
+ public static File toFile(IResource resource) {
+ if(resource == null) return null;
+ File f = null;
+ IPath path = resource.getLocation();
+ if(path == null || true) {
+ URI uri = resource.getLocationURI();
+ if(uri != null) {
+ String scheme = uri.getScheme();
+ if("file".equals(scheme)) try { //$NON-NLS-1$
+ f = new File(uri);
+ } catch (IllegalArgumentException e) {
+ ModelPlugin.getDefault().logError(e); //TODO remove and ignore after testing
+ }
+ if(f != null && !f.exists()) {
+ f = null;
+ }
+ }
+ } else {
+ f = path.toFile();
+ }
+
+ return f;
+ }
+
public FolderImpl() {}
public int getFileType() {
@@ -159,11 +183,11 @@
for (int i = 0; i < rs.length; i++) {
if(!rs[i].isAccessible()) continue;
if(!rs[i].isLinked()) continue;
- if(rs[i].getLocation() == null) {
+ File f = toFile(rs[i]);
+ if(f == null) {
// System.out.println("no location at link " + rs[i]);
continue;
}
- File f = rs[i].getLocation().toFile();
linked.registerResource(rs[i]);
_loadChild(peer, f);
}
@@ -285,8 +309,8 @@
}
}
} catch (ResourceException re) {
- IPath p = resource.getLocation();
- if(p != null && p.toFile().exists()) {
+ File f = toFile(resource);
+ if(f != null && f.exists()) {
ModelPlugin.getPluginLog().logError("Exception caught in FolderImpl.update()", re); //$NON-NLS-1$
} else {
//ignore we cannot prevent this when project is removed externally
@@ -303,10 +327,12 @@
IResource[] rs = resource.members();
for (int i = 0; i < rs.length; i++) {
if(rs[i].isLinked()) {
- File f = rs[i].getLocation().toFile();
- String p = FilePathHelper.toPathPath(f.getName());
- mf.put(p, f);
- linked.registerResource(rs[i]);
+ File f = toFile(rs[i]);
+ if(f != null) {
+ String p = FilePathHelper.toPathPath(f.getName());
+ mf.put(p, f);
+ linked.registerResource(rs[i]);
+ }
}
}
}
@@ -1099,7 +1125,7 @@
}
public void registerResource(IResource r) {
- File f = r.getLocation().toFile();
+ File f = FolderImpl.toFile(r);
String pp = FilePathHelper.toPathPath(f.getName());
filesByFileName.put(pp, f);
filesByLinkName.put(r.getName(), f);
@@ -1175,4 +1201,4 @@
return true;
}
-}
+}
\ No newline at end of file
15 years, 10 months
- 1
- 0
JBoss Tools SVN: r22815 - trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2010-06-15 09:32:17 -0400 (Tue, 15 Jun 2010)
New Revision: 22815
Modified:
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/FolderImpl.java
Log:
https://jira.jboss.org/browse/JBIDE-6185
Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/FolderImpl.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/FolderImpl.java 2010-06-15 13:29:30 UTC (rev 22814)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl/FolderImpl.java 2010-06-15 13:32:17 UTC (rev 22815)
@@ -12,6 +12,7 @@
import java.io.File;
import java.io.IOException;
+import java.net.URI;
import java.text.MessageFormat;
import java.util.Comparator;
import java.util.HashMap;
@@ -40,7 +41,6 @@
import org.jboss.tools.common.model.XModelException;
import org.jboss.tools.common.model.XModelObjectConstants;
import org.jboss.tools.common.model.XModelObject;
-import org.jboss.tools.common.model.XModelObjectConstants;
import org.jboss.tools.common.model.filesystems.BodySource;
import org.jboss.tools.common.model.filesystems.FileAuxiliary;
import org.jboss.tools.common.model.filesystems.FilePathHelper;
@@ -67,6 +67,30 @@
// protected Map<String, File> linked = new HashMap<String, File>();
// protected Map<String, IResource> linkedResources = new HashMap<String, IResource>();
+ public static File toFile(IResource resource) {
+ if(resource == null) return null;
+ File f = null;
+ IPath path = resource.getLocation();
+ if(path == null || true) {
+ URI uri = resource.getLocationURI();
+ if(uri != null) {
+ String scheme = uri.getScheme();
+ if("file".equals(scheme)) try { //$NON-NLS-1$
+ f = new File(uri);
+ } catch (IllegalArgumentException e) {
+ ModelPlugin.getDefault().logError(e); //TODO remove and ignore after testing
+ }
+ if(f != null && !f.exists()) {
+ f = null;
+ }
+ }
+ } else {
+ f = path.toFile();
+ }
+
+ return f;
+ }
+
public FolderImpl() {}
public int getFileType() {
@@ -159,11 +183,11 @@
for (int i = 0; i < rs.length; i++) {
if(!rs[i].isAccessible()) continue;
if(!rs[i].isLinked()) continue;
- if(rs[i].getLocation() == null) {
+ File f = toFile(rs[i]);
+ if(f == null) {
// System.out.println("no location at link " + rs[i]);
continue;
}
- File f = rs[i].getLocation().toFile();
linked.registerResource(rs[i]);
_loadChild(peer, f);
}
@@ -285,8 +309,8 @@
}
}
} catch (ResourceException re) {
- IPath p = resource.getLocation();
- if(p != null && p.toFile().exists()) {
+ File f = toFile(resource);
+ if(f != null && f.exists()) {
ModelPlugin.getPluginLog().logError("Exception caught in FolderImpl.update()", re); //$NON-NLS-1$
} else {
//ignore we cannot prevent this when project is removed externally
@@ -303,10 +327,12 @@
IResource[] rs = resource.members();
for (int i = 0; i < rs.length; i++) {
if(rs[i].isLinked()) {
- File f = rs[i].getLocation().toFile();
- String p = FilePathHelper.toPathPath(f.getName());
- mf.put(p, f);
- linked.registerResource(rs[i]);
+ File f = toFile(rs[i]);
+ if(f != null) {
+ String p = FilePathHelper.toPathPath(f.getName());
+ mf.put(p, f);
+ linked.registerResource(rs[i]);
+ }
}
}
}
@@ -1099,7 +1125,7 @@
}
public void registerResource(IResource r) {
- File f = r.getLocation().toFile();
+ File f = FolderImpl.toFile(r);
String pp = FilePathHelper.toPathPath(f.getName());
filesByFileName.put(pp, f);
filesByLinkName.put(r.getName(), f);
@@ -1175,4 +1201,4 @@
return true;
}
-}
+}
\ No newline at end of file
15 years, 10 months
- 1
- 0
JBoss Tools SVN: r22814 - in trunk: jsf/plugins/org.jboss.tools.jsf and 9 other directories.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2010-06-15 09:29:30 -0400 (Tue, 15 Jun 2010)
New Revision: 22814
Modified:
trunk/common/plugins/org.jboss.tools.common.text.ext/plugin.xml
trunk/jsf/plugins/org.jboss.tools.jsf.text.ext.facelets/plugin.xml
trunk/jsf/plugins/org.jboss.tools.jsf.text.ext.richfaces/plugin.xml
trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/plugin.xml
trunk/jsf/plugins/org.jboss.tools.jsf/plugin.xml
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/jsf2/refactoring/RefactoringChangesFactory.java
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/ELValidator.java
trunk/jst/plugins/org.jboss.tools.jst.jsp/plugin.xml
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/info/ChainTextHover.java
trunk/jst/plugins/org.jboss.tools.jst.text.ext/plugin.xml
trunk/seam/plugins/org.jboss.tools.seam.text.ext/plugin.xml
Log:
https://jira.jboss.org/browse/JBIDE-6469: Migrate to new content type: jsf.facelet
Modified: trunk/common/plugins/org.jboss.tools.common.text.ext/plugin.xml
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.text.ext/plugin.xml 2010-06-15 13:16:24 UTC (rev 22813)
+++ trunk/common/plugins/org.jboss.tools.common.text.ext/plugin.xml 2010-06-15 13:29:30 UTC (rev 22814)
@@ -223,6 +223,14 @@
<axis path="*/[http://java.sun.com/jsp/jstl/core]:redirect/url" />
</partitionType>
</contentType>
+ <contentType id="jsf.facelet">
+ <partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE">
+ <axis path="*/[http://java.sun.com/jstl/core]:import/url" />
+ <axis path="*/[http://java.sun.com/jstl/core]:redirect/url" />
+ <axis path="*/[http://java.sun.com/jsp/jstl/core]:import/url" />
+ <axis path="*/[http://java.sun.com/jsp/jstl/core]:redirect/url" />
+ </partitionType>
+ </contentType>
</hyperlinkPartitioner>
@@ -620,6 +628,9 @@
<contenttypeidentifier id="org.eclipse.jst.jsp.core.jspsource">
<partitiontype id="org.jboss.tools.common.text.ext.hyperlink.xml.INCLUDE_FILE" />
</contenttypeidentifier>
+ <contenttypeidentifier id="jsf.facelet">
+ <partitiontype id="org.jboss.tools.common.text.ext.hyperlink.xml.INCLUDE_FILE" />
+ </contenttypeidentifier>
</hyperlink>
</extension>
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/plugin.xml
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/plugin.xml 2010-06-15 13:16:24 UTC (rev 22813)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/plugin.xml 2010-06-15 13:29:30 UTC (rev 22814)
@@ -414,7 +414,8 @@
<include>
<rules>
- <contentType id="org.eclipse.wst.html.core.htmlsource"/>
+ <contentType id="jsf.facelet"/>
+ <contentType id="org.eclipse.wst.html.core.htmlsource"/>
<contentType id="org.eclipse.jst.jsp.core.jspfragmentsource"/>
<contentType id="org.eclipse.jst.jsp.core.tagsource"/>
@@ -570,6 +571,10 @@
id="org.jboss.tools.jsf.jsf2sourcevalidator"
scope="total">
<contentTypeIdentifier
+ id="jsf.facelet">
+ <partitionType id="org.eclipse.wst.html.HTML_DEFAULT"/>
+ </contentTypeIdentifier>
+ <contentTypeIdentifier
id="org.eclipse.wst.html.core.htmlsource">
<partitionType id="org.eclipse.wst.html.HTML_DEFAULT"/>
</contentTypeIdentifier>
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/jsf2/refactoring/RefactoringChangesFactory.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/jsf2/refactoring/RefactoringChangesFactory.java 2010-06-15 13:16:24 UTC (rev 22813)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/jsf2/refactoring/RefactoringChangesFactory.java 2010-06-15 13:29:30 UTC (rev 22814)
@@ -42,6 +42,9 @@
@SuppressWarnings("restriction")
public class RefactoringChangesFactory {
+ private static final String JSF_CONTENT_TYPE = "jsf.facelet";
+ private static final String JSP_CONTENT_TYPE = "org.eclipse.jst.jsp.core.jspsource";
+ private static final String HTML_CONTENT_TYPE = "org.eclipse.wst.html.core.htmlsource";
private static final GroupCategorySet CATEGORY_COMPOSITE_URI_RENAME = new GroupCategorySet(
new GroupCategory(
@@ -217,7 +220,7 @@
return false;
}
String id = contentType.getId();
- if (!"org.eclipse.jst.jsp.core.jspsource".equals(id) && !"org.eclipse.wst.html.core.htmlsource".equals(id)) { //$NON-NLS-1$ //$NON-NLS-2$
+ if (!JSP_CONTENT_TYPE.equals(id) && ! HTML_CONTENT_TYPE.equals(id) && !JSF_CONTENT_TYPE.equals(id)) { //$NON-NLS-1$ //$NON-NLS-2$
return false;
}
}
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/ELValidator.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/ELValidator.java 2010-06-15 13:16:24 UTC (rev 22813)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/ELValidator.java 2010-06-15 13:29:30 UTC (rev 22814)
@@ -17,7 +17,6 @@
import org.eclipse.core.resources.IContainer;
import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IMarker;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;
import org.eclipse.core.resources.IWorkspaceRoot;
@@ -253,8 +252,9 @@
for (int i = 0; i < references.length; i++) {
if(!references[i].getSyntaxErrors().isEmpty()) {
for (SyntaxError error: references[i].getSyntaxErrors()) {
- IMarker marker = addError(JSFValidationMessages.EL_SYNTAX_ERROR, JSFSeverityPreferences.EL_SYNTAX_ERROR, new String[]{"" + error.getProblem()}, 1, references[i].getStartPosition() + error.getPosition(), context.getResource());
- references[i].addMarker(marker);
+ addError(JSFValidationMessages.EL_SYNTAX_ERROR, JSFSeverityPreferences.EL_SYNTAX_ERROR, new String[]{"" + error.getProblem()}, 1, references[i].getStartPosition() + error.getPosition(), context.getResource());
+// IMarker marker = addError(JSFValidationMessages.EL_SYNTAX_ERROR, JSFSeverityPreferences.EL_SYNTAX_ERROR, new String[]{"" + error.getProblem()}, 1, references[i].getStartPosition() + error.getPosition(), context.getResource());
+// references[i].addMarker(marker);
}
}
validateEL(references[i]);
@@ -359,8 +359,9 @@
startPosition = startPosition + startPr;
length = propertyName.length();
}
- IMarker marker = addError(JSFValidationMessages.UNPAIRED_GETTER_OR_SETTER, JSFSeverityPreferences.UNPAIRED_GETTER_OR_SETTER, new String[]{propertyName, existedMethodName, missingMethodName}, length, startPosition, file);
- elReference.addMarker(marker);
+ addError(JSFValidationMessages.UNPAIRED_GETTER_OR_SETTER, JSFSeverityPreferences.UNPAIRED_GETTER_OR_SETTER, new String[]{propertyName, existedMethodName, missingMethodName}, length, startPosition, file);
+// IMarker marker = addError(JSFValidationMessages.UNPAIRED_GETTER_OR_SETTER, JSFSeverityPreferences.UNPAIRED_GETTER_OR_SETTER, new String[]{propertyName, existedMethodName, missingMethodName}, length, startPosition, file);
+// elReference.addMarker(marker);
}
}
}
@@ -394,11 +395,13 @@
}
// Mark invalid EL
if(unresolvedTokenIsVariable) {
- IMarker marker = addError(JSFValidationMessages.UNKNOWN_EL_VARIABLE_NAME, JSFSeverityPreferences.UNKNOWN_EL_VARIABLE_NAME, new String[]{varName}, lengthOfVarName, offsetOfVarName, file);
- elReference.addMarker(marker);
+ addError(JSFValidationMessages.UNKNOWN_EL_VARIABLE_NAME, JSFSeverityPreferences.UNKNOWN_EL_VARIABLE_NAME, new String[]{varName}, lengthOfVarName, offsetOfVarName, file);
+// IMarker marker = addError(JSFValidationMessages.UNKNOWN_EL_VARIABLE_NAME, JSFSeverityPreferences.UNKNOWN_EL_VARIABLE_NAME, new String[]{varName}, lengthOfVarName, offsetOfVarName, file);
+// elReference.addMarker(marker);
} else {
- IMarker marker = addError(JSFValidationMessages.UNKNOWN_EL_VARIABLE_PROPERTY_NAME, JSFSeverityPreferences.UNKNOWN_EL_VARIABLE_PROPERTY_NAME, new String[]{varName}, lengthOfVarName, offsetOfVarName, file);
- elReference.addMarker(marker);
+ addError(JSFValidationMessages.UNKNOWN_EL_VARIABLE_PROPERTY_NAME, JSFSeverityPreferences.UNKNOWN_EL_VARIABLE_PROPERTY_NAME, new String[]{varName}, lengthOfVarName, offsetOfVarName, file);
+// IMarker marker = addError(JSFValidationMessages.UNKNOWN_EL_VARIABLE_PROPERTY_NAME, JSFSeverityPreferences.UNKNOWN_EL_VARIABLE_PROPERTY_NAME, new String[]{varName}, lengthOfVarName, offsetOfVarName, file);
+// elReference.addMarker(marker);
}
}
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/plugin.xml
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/plugin.xml 2010-06-15 13:16:24 UTC (rev 22813)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/plugin.xml 2010-06-15 13:29:30 UTC (rev 22814)
@@ -411,6 +411,9 @@
<contentType id="org.eclipse.wst.html.core.htmlsource">
<partitionType id="org.jboss.tools.common.text.ext.jsp.JSP_LINK" />
</contentType>
+ <contentType id="jsf.facelet">
+ <partitionType id="org.jboss.tools.common.text.ext.jsp.JSP_LINK" />
+ </contentType>
</hyperlinkPartitioner>
<hyperlinkPartitioner
@@ -430,6 +433,13 @@
<axis path="*/[http://java.sun.com/jsf/html]:graphicImage/name/" />
</partitionType>
</contentType>
+ <contentType id="jsf.facelet">
+ <partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE">
+ <axis path="*/[http://java.sun.com/jsf/html]:outputStylesheet/name/" />
+ <axis path="*/[http://java.sun.com/jsf/html]:outputScript/name/" />
+ <axis path="*/[http://java.sun.com/jsf/html]:graphicImage/name/" />
+ </partitionType>
+ </contentType>
</hyperlinkPartitioner>
<hyperlinkPartitioner
@@ -441,6 +451,9 @@
<contentType id="org.eclipse.wst.html.core.htmlsource">
<partitionType id="org.jboss.tools.common.text.ext.jsp.JSP_XMLNS" />
</contentType>
+ <contentType id="jsf.facelet">
+ <partitionType id="org.jboss.tools.common.text.ext.jsp.JSP_XMLNS" />
+ </contentType>
</hyperlinkPartitioner>
<hyperlinkPartitioner
@@ -464,6 +477,15 @@
<axis path="*/[http://myfaces.apache.org/tomahawk]:commandLink/action/" />
</partitionType>
</contentType>
+ <contentType id="jsf.facelet">
+ <partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE">
+ <axis path="*/[http://java.sun.com/jsf/html]:commandButton/action/" />
+ <axis path="*/[http://java.sun.com/jsf/html]:commandLink/action/" />
+
+ <axis path="*/[http://myfaces.apache.org/tomahawk]:commandButton/action/" />
+ <axis path="*/[http://myfaces.apache.org/tomahawk]:commandLink/action/" />
+ </partitionType>
+ </contentType>
</hyperlinkPartitioner>
<hyperlinkPartitioner
@@ -541,6 +563,42 @@
<axis path="*/[http://myfaces.apache.org/tomahawk]:selectOneRadio/converter/" />
</partitionType>
</contentType>
+ <contentType id="jsf.facelet">
+ <partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE">
+ <axis path="*/[http://java.sun.com/jsf/core]:converter/converterId/" />
+ <axis path="*/[http://java.sun.com/jsf/html]:inputHidden/converter/" />
+ <axis path="*/[http://java.sun.com/jsf/html]:inputSecret/converter/" />
+ <axis path="*/[http://java.sun.com/jsf/html]:inputText/converter/" />
+ <axis path="*/[http://java.sun.com/jsf/html]:inputTextarea/converter/" />
+ <axis path="*/[http://java.sun.com/jsf/html]:outputFormat/converter/" />
+ <axis path="*/[http://java.sun.com/jsf/html]:outputLabel/converter/" />
+ <axis path="*/[http://java.sun.com/jsf/html]:outputLink/converter/" />
+ <axis path="*/[http://java.sun.com/jsf/html]:outputText/converter/" />
+ <axis path="*/[http://java.sun.com/jsf/html]:selectBooleanCheckbox/converter/" />
+ <axis path="*/[http://java.sun.com/jsf/html]:selectManyCheckbox/converter/" />
+ <axis path="*/[http://java.sun.com/jsf/html]:selectManyListbox/converter/" />
+ <axis path="*/[http://java.sun.com/jsf/html]:selectManyMenu/converter/" />
+ <axis path="*/[http://java.sun.com/jsf/html]:selectOneListbox/converter/" />
+ <axis path="*/[http://java.sun.com/jsf/html]:selectOneMenu/converter/" />
+ <axis path="*/[http://java.sun.com/jsf/html]:selectOneRadio/converter/" />
+
+ <axis path="*/[http://myfaces.apache.org/tomahawk]:inputHidden/converter/" />
+ <axis path="*/[http://myfaces.apache.org/tomahawk]:inputSecret/converter/" />
+ <axis path="*/[http://myfaces.apache.org/tomahawk]:inputText/converter/" />
+ <axis path="*/[http://myfaces.apache.org/tomahawk]:inputTextarea/converter/" />
+ <axis path="*/[http://myfaces.apache.org/tomahawk]:outputFormat/converter/" />
+ <axis path="*/[http://myfaces.apache.org/tomahawk]:outputLabel/converter/" />
+ <axis path="*/[http://myfaces.apache.org/tomahawk]:outputLink/converter/" />
+ <axis path="*/[http://myfaces.apache.org/tomahawk]:outputText/converter/" />
+ <axis path="*/[http://myfaces.apache.org/tomahawk]:selectBooleanCheckbox/converter/" />
+ <axis path="*/[http://myfaces.apache.org/tomahawk]:selectManyCheckbox/converter/" />
+ <axis path="*/[http://myfaces.apache.org/tomahawk]:selectManyListbox/converter/" />
+ <axis path="*/[http://myfaces.apache.org/tomahawk]:selectManyMenu/converter/" />
+ <axis path="*/[http://myfaces.apache.org/tomahawk]:selectOneListbox/converter/" />
+ <axis path="*/[http://myfaces.apache.org/tomahawk]:selectOneMenu/converter/" />
+ <axis path="*/[http://myfaces.apache.org/tomahawk]:selectOneRadio/converter/" />
+ </partitionType>
+ </contentType>
</hyperlinkPartitioner>
<hyperlinkPartitioner
@@ -556,6 +614,11 @@
<axis path="*/[http://java.sun.com/jsf/core]:validator/validatorId/" />
</partitionType>
</contentType>
+ <contentType id="jsf.facelet">
+ <partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE">
+ <axis path="*/[http://java.sun.com/jsf/core]:validator/validatorId/" />
+ </partitionType>
+ </contentType>
</hyperlinkPartitioner>
<hyperlinkPartitioner
@@ -579,6 +642,15 @@
<axis path="*/[http://myfaces.apache.org/tomahawk]:message/for/" />
</partitionType>
</contentType>
+ <contentType id="jsf.facelet">
+ <partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE">
+ <axis path="*/[http://java.sun.com/jsf/html]:outputLabel/for/" />
+ <axis path="*/[http://java.sun.com/jsf/html]:message/for/" />
+
+ <axis path="*/[http://myfaces.apache.org/tomahawk]:outputLabel/for/" />
+ <axis path="*/[http://myfaces.apache.org/tomahawk]:message/for/" />
+ </partitionType>
+ </contentType>
</hyperlinkPartitioner>
<hyperlinkPartitioner
id="org.jboss.tools.common.text.ext.jsf.hyperlink.JSPExprHyperlinkPartitioner"
@@ -599,6 +671,14 @@
<partitionType id="org.eclipse.jst.jsp.SCRIPT.JSP_EL" />
<partitionType id="org.eclipse.jst.jsp.SCRIPT.JSP_EL2" />
</contentType>
+ <contentType id="jsf.facelet">
+ <partitionType id="org.jboss.tools.common.text.ext.xml.XML_TEXT" />
+ <partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE" />
+ <partitionType id="org.jboss.tools.common.text.ext.jsp.JSP_CONVERTER" />
+ <partitionType id="org.jboss.tools.common.text.ext.jsp.JSP_NAVIGATION_CASE" />
+ <partitionType id="org.eclipse.jst.jsp.SCRIPT.JSP_EL" />
+ <partitionType id="org.eclipse.jst.jsp.SCRIPT.JSP_EL2" />
+ </contentType>
</hyperlinkPartitioner>
<hyperlinkPartitioner
@@ -614,6 +694,11 @@
<!--axis path="*/[http://java.sun.com/jsf/core]:loadBundle/basename/" /-->
</partitionType>
</contentType>
+ <contentType id="jsf.facelet">
+ <partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE">
+ <!--axis path="*/[http://java.sun.com/jsf/core]:loadBundle/basename/" /-->
+ </partitionType>
+ </contentType>
</hyperlinkPartitioner>
<hyperlinkPartitioner
@@ -629,6 +714,9 @@
<contentType id="org.eclipse.wst.html.core.htmlsource">
<partitionType id="org.jboss.tools.common.text.ext.jsp.JSP_EXPRESSION" />
</contentType>
+ <contentType id="jsf.facelet">
+ <partitionType id="org.jboss.tools.common.text.ext.jsp.JSP_EXPRESSION" />
+ </contentType>
</hyperlinkPartitioner>
<hyperlinkPartitioner
@@ -650,6 +738,14 @@
<axis path="*/[http://java.sun.com/jsf/core]:actionListener/type/" />
</partitionType>
</contentType>
+ <contentType id="jsf.facelet">
+ <partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE">
+ <axis path="*/[http://java.sun.com/jsf/core]:actionListener/type/" />
+ <axis path="*/[http://java.sun.com/jsf/core]:valueChangeListener/type/" />
+ <axis path="*/[http://java.sun.com/jsf/core]:actionListener/type/" />
+ <axis path="*/[http://java.sun.com/jsf/core]:actionListener/type/" />
+ </partitionType>
+ </contentType>
</hyperlinkPartitioner>
<hyperlinkPartitioner
@@ -659,9 +755,8 @@
<partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE">
<axis path="*/[http://java.sun.com/jsf/html]:commandButton/image/" />
<axis path="*/[http://java.sun.com/jsf/html]:graphicImage/value/" />
- <axis path="*/img/src/" />
+ <axis path="*/img/src/" />
<axis path="*/[http://java.sun.com/jsf/html]:graphicImage/url/" />
-
<axis path="*/[http://myfaces.apache.org/tomahawk]:commandButton/image/" />
<axis path="*/[http://myfaces.apache.org/tomahawk]:graphicImage/value/" />
<axis path="*/[http://myfaces.apache.org/tomahawk]:graphicImage/url/" />
@@ -671,14 +766,24 @@
<partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE">
<axis path="*/[http://java.sun.com/jsf/html]:commandButton/image/" />
<axis path="*/[http://java.sun.com/jsf/html]:graphicImage/value/" />
- <axis path="*/img/src/" />
+ <axis path="*/img/src/" />
<axis path="*/[http://java.sun.com/jsf/html]:graphicImage/url/" />
-
<axis path="*/[http://myfaces.apache.org/tomahawk]:commandButton/image/" />
<axis path="*/[http://myfaces.apache.org/tomahawk]:graphicImage/value/" />
<axis path="*/[http://myfaces.apache.org/tomahawk]:graphicImage/url/" />
</partitionType>
</contentType>
+ <contentType id="jsf.facelet">
+ <partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE">
+ <axis path="*/[http://java.sun.com/jsf/html]:commandButton/image/" />
+ <axis path="*/[http://java.sun.com/jsf/html]:graphicImage/value/" />
+ <axis path="*/img/src/" />
+ <axis path="*/[http://java.sun.com/jsf/html]:graphicImage/url/" />
+ <axis path="*/[http://myfaces.apache.org/tomahawk]:commandButton/image/" />
+ <axis path="*/[http://myfaces.apache.org/tomahawk]:graphicImage/value/" />
+ <axis path="*/[http://myfaces.apache.org/tomahawk]:graphicImage/url/" />
+ </partitionType>
+ </contentType>
</hyperlinkPartitioner>
<hyperlinkPartitioner
@@ -690,6 +795,9 @@
<contentType id="org.eclipse.wst.html.core.htmlsource">
<partitionType id="org.jboss.tools.common.text.ext.jsp.JSP_TAGLIB" />
</contentType>
+ <contentType id="jsf.facelet">
+ <partitionType id="org.jboss.tools.common.text.ext.jsp.JSP_TAGLIB" />
+ </contentType>
</hyperlinkPartitioner>
<hyperlinkPartitioner
@@ -701,6 +809,9 @@
<contentType id="org.eclipse.wst.html.core.htmlsource">
<partitionType id="org.jboss.tools.common.text.ext.jsp.JSP_TAG_ATTRIBUTE" />
</contentType>
+ <contentType id="jsf.facelet">
+ <partitionType id="org.jboss.tools.common.text.ext.jsp.JSP_TAG_ATTRIBUTE" />
+ </contentType>
</hyperlinkPartitioner>
<hyperlinkPartitioner
@@ -712,6 +823,9 @@
<contentType id="org.eclipse.wst.html.core.htmlsource">
<partitionType id="org.jboss.tools.common.text.ext.xml.XML_ELEMENT_NAME" />
</contentType>
+ <contentType id="jsf.facelet">
+ <partitionType id="org.jboss.tools.common.text.ext.xml.XML_ELEMENT_NAME" />
+ </contentType>
</hyperlinkPartitioner>
</extension>
@@ -822,6 +936,9 @@
<contenttypeidentifier id="org.eclipse.wst.html.core.htmlsource">
<partitiontype id="org.jboss.tools.common.text.ext.jsp.JSP_LOADBUNDLE" />
</contenttypeidentifier>
+ <contenttypeidentifier id="jsf.facelet">
+ <partitiontype id="org.jboss.tools.common.text.ext.jsp.JSP_LOADBUNDLE" />
+ </contenttypeidentifier>
</hyperlink>
<hyperlink
@@ -837,6 +954,9 @@
<contenttypeidentifier id="org.eclipse.wst.html.core.htmlsource">
<partitiontype id="org.jboss.tools.common.text.ext.jsp.JSP_BUNDLE" />
</contenttypeidentifier>
+ <contenttypeidentifier id="jsf.facelet">
+ <partitiontype id="org.jboss.tools.common.text.ext.jsp.JSP_BUNDLE" />
+ </contenttypeidentifier>
</hyperlink>
<hyperlink
@@ -871,6 +991,9 @@
<contenttypeidentifier id="org.eclipse.wst.html.core.htmlsource">
<partitiontype id="org.jboss.tools.common.text.ext.jsp.JSP_FORWARD" />
</contenttypeidentifier>
+ <contenttypeidentifier id="jsf.facelet">
+ <partitiontype id="org.jboss.tools.common.text.ext.jsp.JSP_FORWARD" />
+ </contenttypeidentifier>
</hyperlink>
<hyperlink
@@ -882,6 +1005,9 @@
<contenttypeidentifier id="org.eclipse.wst.html.core.htmlsource">
<partitiontype id="org.jboss.tools.common.text.ext.jsp.JSP_NAVIGATION_CASE" />
</contenttypeidentifier>
+ <contenttypeidentifier id="jsf.facelet">
+ <partitiontype id="org.jboss.tools.common.text.ext.jsp.JSP_NAVIGATION_CASE" />
+ </contenttypeidentifier>
</hyperlink>
<hyperlink
@@ -893,6 +1019,9 @@
<contenttypeidentifier id="org.eclipse.wst.html.core.htmlsource">
<partitiontype id="org.jboss.tools.common.text.ext.jsp.JSP_CONVERTER" />
</contenttypeidentifier>
+ <contenttypeidentifier id="jsf.facelet">
+ <partitiontype id="org.jboss.tools.common.text.ext.jsp.JSP_CONVERTER" />
+ </contenttypeidentifier>
<contenttypeidentifier id="org.eclipse.jst.jsf.facesconfig.facesConfigFile">
<partitiontype id="org.jboss.tools.common.text.ext.xml.XML_CONVERTER" />
</contenttypeidentifier>
@@ -922,6 +1051,9 @@
<contenttypeidentifier id="org.eclipse.wst.html.core.htmlsource">
<partitiontype id="org.jboss.tools.common.text.ext.jsp.JSP_VALIDATOR" />
</contenttypeidentifier>
+ <contenttypeidentifier id="jsf.facelet">
+ <partitiontype id="org.jboss.tools.common.text.ext.jsp.JSP_VALIDATOR" />
+ </contenttypeidentifier>
</hyperlink>
<hyperlink
@@ -933,6 +1065,9 @@
<contenttypeidentifier id="org.eclipse.wst.html.core.htmlsource">
<partitiontype id="org.jboss.tools.common.text.ext.jsp.JSP_FOR_ID" />
</contenttypeidentifier>
+ <contenttypeidentifier id="jsf.facelet">
+ <partitiontype id="org.jboss.tools.common.text.ext.jsp.JSP_FOR_ID" />
+ </contenttypeidentifier>
</hyperlink>
<!-- Faces Config File -->
@@ -963,6 +1098,9 @@
<contenttypeidentifier id="org.eclipse.wst.html.core.htmlsource">
<partitiontype id="org.jboss.tools.common.text.ext.jsp.JSF_JSP_LINK" />
</contenttypeidentifier>
+ <contenttypeidentifier id="jsf.facelet">
+ <partitiontype id="org.jboss.tools.common.text.ext.jsp.JSF_JSP_LINK" />
+ </contenttypeidentifier>
</hyperlink>
<hyperlink
@@ -974,6 +1112,9 @@
<contenttypeidentifier id="org.eclipse.wst.html.core.htmlsource">
<partitiontype id="org.jboss.tools.common.text.ext.jsp.JSF2_JSP_LINK" />
</contenttypeidentifier>
+ <contenttypeidentifier id="jsf.facelet">
+ <partitiontype id="org.jboss.tools.common.text.ext.jsp.JSF2_JSP_LINK" />
+ </contenttypeidentifier>
</hyperlink>
<hyperlink
@@ -985,6 +1126,9 @@
<contenttypeidentifier id="org.eclipse.wst.html.core.htmlsource">
<partitiontype id="org.jboss.tools.common.text.ext.jsp.JSF_JSP_XMLNS" />
</contenttypeidentifier>
+ <contenttypeidentifier id="jsf.facelet">
+ <partitiontype id="org.jboss.tools.common.text.ext.jsp.JSF_JSP_XMLNS" />
+ </contenttypeidentifier>
</hyperlink>
<hyperlink
@@ -996,6 +1140,9 @@
<contenttypeidentifier id="org.eclipse.wst.html.core.htmlsource">
<partitiontype id="org.jboss.tools.common.text.ext.jsp.JSF_JSP_TAGLIB_DIRECTIVE" />
</contenttypeidentifier>
+ <contenttypeidentifier id="jsf.facelet">
+ <partitiontype id="org.jboss.tools.common.text.ext.jsp.JSF_JSP_TAGLIB_DIRECTIVE" />
+ </contenttypeidentifier>
</hyperlink>
<hyperlink
@@ -1007,6 +1154,9 @@
<contenttypeidentifier id="org.eclipse.wst.html.core.htmlsource">
<partitiontype id="org.jboss.tools.common.text.ext.jsp.JSF_JSP_TAG_ATTRIBUTE" />
</contenttypeidentifier>
+ <contenttypeidentifier id="jsf.facelet">
+ <partitiontype id="org.jboss.tools.common.text.ext.jsp.JSF_JSP_TAG_ATTRIBUTE" />
+ </contenttypeidentifier>
</hyperlink>
<hyperlink
@@ -1018,6 +1168,9 @@
<contenttypeidentifier id="org.eclipse.wst.html.core.htmlsource">
<partitiontype id="org.jboss.tools.common.text.ext.jsp.JSF_JSP_TAG_NAME" />
</contenttypeidentifier>
+ <contenttypeidentifier id="jsf.facelet">
+ <partitiontype id="org.jboss.tools.common.text.ext.jsp.JSF_JSP_TAG_NAME" />
+ </contenttypeidentifier>
</hyperlink>
<hyperlink
@@ -1029,6 +1182,9 @@
<contenttypeidentifier id="org.eclipse.wst.html.core.htmlsource">
<partitiontype id="org.jboss.tools.common.text.ext.jsp.EXPRESSION" />
</contenttypeidentifier>
+ <contenttypeidentifier id="jsf.facelet">
+ <partitiontype id="org.jboss.tools.common.text.ext.jsp.EXPRESSION" />
+ </contenttypeidentifier>
<contenttypeidentifier id="org.eclipse.core.runtime.xml">
<partitiontype id="org.jboss.tools.common.text.ext.jsp.EXPRESSION" />
</contenttypeidentifier>
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.text.ext.facelets/plugin.xml
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.text.ext.facelets/plugin.xml 2010-06-15 13:16:24 UTC (rev 22813)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.text.ext.facelets/plugin.xml 2010-06-15 13:29:30 UTC (rev 22814)
@@ -16,6 +16,9 @@
<contentType id="org.eclipse.wst.html.core.htmlsource">
<partitionType id="org.jboss.tools.common.text.ext.jsp.JSP_ROOT" />
</contentType>
+ <contentType id="jsf.facelet">
+ <partitionType id="org.jboss.tools.common.text.ext.jsp.JSP_ROOT" />
+ </contentType>
</hyperlinkPartitioner>
<hyperlinkPartitioner
@@ -27,6 +30,9 @@
<contentType id="org.eclipse.wst.html.core.htmlsource">
<partitionType id="org.jboss.tools.common.text.ext.jsp.FACELETS_ATTRIBUTE_VALUE_WITH_EXPR" />
</contentType>
+ <contentType id="jsf.facelet">
+ <partitionType id="org.jboss.tools.common.text.ext.jsp.FACELETS_ATTRIBUTE_VALUE_WITH_EXPR" />
+ </contentType>
</hyperlinkPartitioner>
<hyperlinkPartitioner
@@ -48,6 +54,14 @@
<axis path="*/[http://java.sun.com/jsf/facelets]:include/src/" />
</partitionType>
</contentType>
+ <contentType id="jsf.facelet">
+ <partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE">
+ <axis path="*/[http://java.sun.com/jsf/facelets]:composition/template/" />
+ <axis path="*/[http://java.sun.com/jsf/facelets]:decorate/template/" />
+ <axis path="*/[http://jboss.com/products/seam/taglib]:decorate/template/" />
+ <axis path="*/[http://java.sun.com/jsf/facelets]:include/src/" />
+ </partitionType>
+ </contentType>
</hyperlinkPartitioner>
<hyperlinkPartitioner
@@ -58,16 +72,11 @@
<partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE">
<axis path="*/[http://java.sun.com/jsf/facelets]:component/id/" />
<axis path="*/[http://java.sun.com/jsf/facelets]:component/binding/" />
-
<axis path="*/[http://java.sun.com/jsf/facelets]:component/rendered/" />
-
<axis path="*/[http://java.sun.com/jsf/facelets]:define/name/" />
-
<axis path="*/[http://java.sun.com/jsf/facelets]:fragment/id/" />
<axis path="*/[http://java.sun.com/jsf/facelets]:fragment/binding/" />
-
<axis path="*/[http://java.sun.com/jsf/facelets]:insert/name/" />
-
<axis path="*/[http://java.sun.com/jsf/facelets]:param/name/" />
<axis path="*/[http://java.sun.com/jsf/facelets]:param/value/" />
</partitionType>
@@ -77,20 +86,29 @@
<partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE">
<axis path="*/[http://java.sun.com/jsf/facelets]:component/id/" />
<axis path="*/[http://java.sun.com/jsf/facelets]:component/binding/" />
-
<axis path="*/[http://java.sun.com/jsf/facelets]:component/rendered/" />
-
<axis path="*/[http://java.sun.com/jsf/facelets]:define/name/" />
-
<axis path="*/[http://java.sun.com/jsf/facelets]:fragment/id/" />
<axis path="*/[http://java.sun.com/jsf/facelets]:fragment/binding/" />
-
<axis path="*/[http://java.sun.com/jsf/facelets]:insert/name/" />
-
<axis path="*/[http://java.sun.com/jsf/facelets]:param/name/" />
<axis path="*/[http://java.sun.com/jsf/facelets]:param/value/" />
</partitionType>
</contentType>
+ <contentType id="jsf.facelet">
+ <partitionType id="org.jboss.tools.common.text.ext.xml.XML_TEXT" />
+ <partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE">
+ <axis path="*/[http://java.sun.com/jsf/facelets]:component/id/" />
+ <axis path="*/[http://java.sun.com/jsf/facelets]:component/binding/" />
+ <axis path="*/[http://java.sun.com/jsf/facelets]:component/rendered/" />
+ <axis path="*/[http://java.sun.com/jsf/facelets]:define/name/" />
+ <axis path="*/[http://java.sun.com/jsf/facelets]:fragment/id/" />
+ <axis path="*/[http://java.sun.com/jsf/facelets]:fragment/binding/" />
+ <axis path="*/[http://java.sun.com/jsf/facelets]:insert/name/" />
+ <axis path="*/[http://java.sun.com/jsf/facelets]:param/name/" />
+ <axis path="*/[http://java.sun.com/jsf/facelets]:param/value/" />
+ </partitionType>
+ </contentType>
</hyperlinkPartitioner>
<hyperlinkPartitioner
@@ -106,6 +124,11 @@
<axis path="*/[http://java.sun.com/jsf/facelets]:component/hotkey/" />
</partitionType>
</contentType>
+ <contentType id="jsf.facelet">
+ <partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE">
+ <axis path="*/[http://java.sun.com/jsf/facelets]:component/hotkey/" />
+ </partitionType>
+ </contentType>
</hyperlinkPartitioner>
<hyperlinkPartitioner
@@ -144,6 +167,22 @@
<axis path="*/[http://java.sun.com/jsf/html]:*/enabledClass/" />
</partitionType>
</contentType>
+ <contentType id="jsf.facelet">
+ <partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE">
+ <axis path="*/[http://java.sun.com/jsf/html]:*/columnClasses/" />
+ <axis path="*/[http://java.sun.com/jsf/html]:*/footerClass/" />
+ <axis path="*/[http://java.sun.com/jsf/html]:*/headerClass/" />
+ <axis path="*/[http://java.sun.com/jsf/html]:*/rowClasses/" />
+ <axis path="*/[http://java.sun.com/jsf/html]:*/captionClass/" />
+ <axis path="*/[http://java.sun.com/jsf/html]:*/styleClass/" />
+ <axis path="*/[http://java.sun.com/jsf/html]:*/errorClass/" />
+ <axis path="*/[http://java.sun.com/jsf/html]:*/fatalClass/" />
+ <axis path="*/[http://java.sun.com/jsf/html]:*/infoClass/" />
+ <axis path="*/[http://java.sun.com/jsf/html]:*/warnClass/" />
+ <axis path="*/[http://java.sun.com/jsf/html]:*/disabledClass/" />
+ <axis path="*/[http://java.sun.com/jsf/html]:*/enabledClass/" />
+ </partitionType>
+ </contentType>
</hyperlinkPartitioner>
</extension>
@@ -162,6 +201,9 @@
<contenttypeidentifier id="org.eclipse.wst.html.core.htmlsource">
<partitiontype id="org.jboss.tools.common.text.ext.FACELETS_CSS_CLASS" />
</contenttypeidentifier>
+ <contenttypeidentifier id="jsf.facelet">
+ <partitiontype id="org.jboss.tools.common.text.ext.FACELETS_CSS_CLASS" />
+ </contenttypeidentifier>
</hyperlink>
</extension>
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.text.ext.richfaces/plugin.xml
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.text.ext.richfaces/plugin.xml 2010-06-15 13:16:24 UTC (rev 22813)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.text.ext.richfaces/plugin.xml 2010-06-15 13:29:30 UTC (rev 22814)
@@ -86,6 +86,44 @@
<axis path="*/[http://richfaces.org/rich]:inplaceSelect/saveControlIcon/" />
</partitionType>
</contentType>
+ <contentType id="jsf.facelet">
+ <partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE">
+ <axis path="*/[http://richfaces.org/a4j]:include/viewId/" />
+ <axis path="*/[http://richfaces.org/a4j]:loadStyle/src/" />
+ <axis path="*/[http://richfaces.org/a4j]:commandButton/image/" />
+ <axis path="*/[http://richfaces.org/a4j]:loadScript/src/" />
+ <axis path="*/[http://richfaces.org/rich]:insert/src/" />
+ <axis path="*/[http://richfaces.org/rich]:menuGroug/icon/" />
+ <axis path="*/[http://richfaces.org/rich]:menuGroug/iconDisabled/" />
+ <axis path="*/[http://richfaces.org/rich]:menuGroug/iconFolder/" />
+ <axis path="*/[http://richfaces.org/rich]:menuGroug/iconFolderDisabled/" />
+ <axis path="*/[http://richfaces.org/rich]:menuItem/icon/" />
+ <axis path="*/[http://richfaces.org/rich]:menuItem/iconDisabled/" />
+ <axis path="*/[http://richfaces.org/rich]:tree/icon/" />
+ <axis path="*/[http://richfaces.org/rich]:tree/iconCollapsed/" />
+ <axis path="*/[http://richfaces.org/rich]:tree/iconExpanded/" />
+ <axis path="*/[http://richfaces.org/rich]:tree/iconLeaf/" />
+ <axis path="*/[http://richfaces.org/rich]:panelMenu/iconCollapsedGroup/" />
+ <axis path="*/[http://richfaces.org/rich]:panelMenu/iconCollapsedTopGroup/" />
+ <axis path="*/[http://richfaces.org/rich]:panelMenu/iconDisabledGroup/" />
+ <axis path="*/[http://richfaces.org/rich]:panelMenu/iconDisabledItem/" />
+ <axis path="*/[http://richfaces.org/rich]:panelMenu/iconExpandedGroup/" />
+ <axis path="*/[http://richfaces.org/rich]:panelMenu/iconExpandedTopGroup/" />
+ <axis path="*/[http://richfaces.org/rich]:panelMenu/iconItem/" />
+ <axis path="*/[http://richfaces.org/rich]:panelMenu/iconTopDisabledGroup/" />
+ <axis path="*/[http://richfaces.org/rich]:panelMenu/iconTopDisabledItem/" />
+ <axis path="*/[http://richfaces.org/rich]:panelMenu/iconTopItem/" />
+ <axis path="*/[http://richfaces.org/rich]:calendar/buttonIcon/" />
+ <axis path="*/[http://richfaces.org/rich]:calendar/buttonIconDisabled/" />
+ <axis path="*/[http://richfaces.org/rich]:comboBox/buttonIcon/" />
+ <axis path="*/[http://richfaces.org/rich]:comboBox/buttonIconDisabled/" />
+ <axis path="*/[http://richfaces.org/rich]:comboBox/buttonIconInactive/" />
+ <axis path="*/[http://richfaces.org/rich]:inplaceInput/cancelControlIcon/" />
+ <axis path="*/[http://richfaces.org/rich]:inplaceInput/saveControlIcon/" />
+ <axis path="*/[http://richfaces.org/rich]:inplaceSelect/cancelControlIcon/" />
+ <axis path="*/[http://richfaces.org/rich]:inplaceSelect/saveControlIcon/" />
+ </partitionType>
+ </contentType>
</hyperlinkPartitioner>
<hyperlinkPartitioner
@@ -167,6 +205,44 @@
<axis path="*/[http://richfaces.org/rich]:inplaceSelect/saveControlIcon/" />
</partitionType>
</contentType>
+ <contentType id="jsf.facelet">
+ <partitionType id="org.jboss.tools.common.text.ext.jsp.JSP_LINK" >
+ <axis path="*/[http://richfaces.org/a4j]:include/viewId/" />
+ <axis path="*/[http://richfaces.org/a4j]:loadStyle/src/" />
+ <axis path="*/[http://richfaces.org/a4j]:commandButton/image/" />
+ <axis path="*/[http://richfaces.org/a4j]:loadScript/src/" />
+ <axis path="*/[http://richfaces.org/rich]:insert/src/" />
+ <axis path="*/[http://richfaces.org/rich]:menuGroug/icon/" />
+ <axis path="*/[http://richfaces.org/rich]:menuGroug/iconDisabled/" />
+ <axis path="*/[http://richfaces.org/rich]:menuGroug/iconFolder/" />
+ <axis path="*/[http://richfaces.org/rich]:menuGroug/iconFolderDisabled/" />
+ <axis path="*/[http://richfaces.org/rich]:menuItem/icon/" />
+ <axis path="*/[http://richfaces.org/rich]:menuItem/iconDisabled/" />
+ <axis path="*/[http://richfaces.org/rich]:tree/icon/" />
+ <axis path="*/[http://richfaces.org/rich]:tree/iconCollapsed/" />
+ <axis path="*/[http://richfaces.org/rich]:tree/iconExpanded/" />
+ <axis path="*/[http://richfaces.org/rich]:tree/iconLeaf/" />
+ <axis path="*/[http://richfaces.org/rich]:panelMenu/iconCollapsedGroup/" />
+ <axis path="*/[http://richfaces.org/rich]:panelMenu/iconCollapsedTopGroup/" />
+ <axis path="*/[http://richfaces.org/rich]:panelMenu/iconDisabledGroup/" />
+ <axis path="*/[http://richfaces.org/rich]:panelMenu/iconDisabledItem/" />
+ <axis path="*/[http://richfaces.org/rich]:panelMenu/iconExpandedGroup/" />
+ <axis path="*/[http://richfaces.org/rich]:panelMenu/iconExpandedTopGroup/" />
+ <axis path="*/[http://richfaces.org/rich]:panelMenu/iconItem/" />
+ <axis path="*/[http://richfaces.org/rich]:panelMenu/iconTopDisabledGroup/" />
+ <axis path="*/[http://richfaces.org/rich]:panelMenu/iconTopDisabledItem/" />
+ <axis path="*/[http://richfaces.org/rich]:panelMenu/iconTopItem/" />
+ <axis path="*/[http://richfaces.org/rich]:calendar/buttonIcon/" />
+ <axis path="*/[http://richfaces.org/rich]:calendar/buttonIconDisabled/" />
+ <axis path="*/[http://richfaces.org/rich]:comboBox/buttonIcon/" />
+ <axis path="*/[http://richfaces.org/rich]:comboBox/buttonIconDisabled/" />
+ <axis path="*/[http://richfaces.org/rich]:comboBox/buttonIconInactive/" />
+ <axis path="*/[http://richfaces.org/rich]:inplaceInput/cancelControlIcon/" />
+ <axis path="*/[http://richfaces.org/rich]:inplaceInput/saveControlIcon/" />
+ <axis path="*/[http://richfaces.org/rich]:inplaceSelect/cancelControlIcon/" />
+ <axis path="*/[http://richfaces.org/rich]:inplaceSelect/saveControlIcon/" />
+ </partitionType>
+ </contentType>
</hyperlinkPartitioner>
<hyperlinkPartitioner
@@ -180,6 +256,10 @@
<partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE">
</partitionType>
</contentType>
+ <contentType id="jsf.facelet">
+ <partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE">
+ </partitionType>
+ </contentType>
</hyperlinkPartitioner>
@@ -194,6 +274,10 @@
<partitionType id="org.jboss.tools.common.text.ext.jsp.FACELETS_ATTRIBUTE_VALUE_WITH_EXPR" />
<partitionType id="org.jboss.tools.common.text.ext.jsp.JSP_EXPRESSION" />
</contentType>
+ <contentType id="jsf.facelet">
+ <partitionType id="org.jboss.tools.common.text.ext.jsp.FACELETS_ATTRIBUTE_VALUE_WITH_EXPR" />
+ <partitionType id="org.jboss.tools.common.text.ext.jsp.JSP_EXPRESSION" />
+ </contentType>
</hyperlinkPartitioner>
<hyperlinkPartitioner
@@ -285,6 +369,49 @@
<axis path="*/[http://richfaces.ajax4jsf.org/rich]:contextMenu/attachTo/" />
</partitionType>
</contentType>
+ <contentType id="jsf.facelet">
+ <partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE">
+ <axis path="*/[http://richfaces.org/a4j]:*/focus/" />
+ <axis path="*/[https://ajax4jsf.dev.java.net/ajax]:*/focus/" />
+ <axis path="*/[http://richfaces.org/rich]:*/focus/" />
+ <axis path="*/[http://richfaces.ajax4jsf.org/rich]:*/focus/" />
+
+ <axis path="*/[http://richfaces.org/a4j]:*/reRender/" />
+ <axis path="*/[https://ajax4jsf.dev.java.net/ajax]:*/reRender/" />
+ <axis path="*/[http://richfaces.org/rich]:*/reRender/" />
+ <axis path="*/[http://richfaces.ajax4jsf.org/rich]:*/reRender/" />
+
+ <axis path="*/[http://richfaces.org/a4j]:*/status/" />
+ <axis path="*/[https://ajax4jsf.dev.java.net/ajax]:*/status/" />
+ <axis path="*/[http://richfaces.org/rich]:*/status/" />
+ <axis path="*/[http://richfaces.ajax4jsf.org/rich]:*/status/" />
+
+ <axis path="*/[http://richfaces.org/a4j]:*/for/" />
+ <axis path="*/[https://ajax4jsf.dev.java.net/ajax]:*/for/" />
+ <axis path="*/[http://richfaces.org/rich]:*/for/" />
+ <axis path="*/[http://richfaces.ajax4jsf.org/rich]:*/for/" />
+
+ <axis path="*/[http://richfaces.org/rich]:effect/targetId/" />
+ <axis path="*/[http://richfaces.ajax4jsf.org/rich]:effect/targetId/" />
+
+ <axis path="*/[http://richfaces.org/rich]:toggleControl/panelId/" />
+ <axis path="*/[http://richfaces.ajax4jsf.org/rich]:toggleControl/panelId/" />
+
+ <axis path="*/[http://richfaces.org/rich]:*/dragIndicator/" />
+ <axis path="*/[http://richfaces.ajax4jsf.org/rich]:*/dragIndicator/" />
+
+ <axis path="*/[http://richfaces.org/rich]:*/process/" />
+ <axis path="*/[http://richfaces.ajax4jsf.org/rich]:*/process/" />
+
+ <axis path="*/[http://richfaces.org/rich]:*/similarityGroupingId/" />
+ <axis path="*/[http://richfaces.ajax4jsf.org/rich]:*/similarityGroupingId/" />
+
+ <axis path="*/[http://richfaces.org/rich]:progressBar/reRenderAfterComplete/" />
+
+ <axis path="*/[http://richfaces.ajax4jsf.org/rich]:componentControl/attachTo/" />
+ <axis path="*/[http://richfaces.ajax4jsf.org/rich]:contextMenu/attachTo/" />
+ </partitionType>
+ </contentType>
</hyperlinkPartitioner>
<hyperlinkPartitioner
@@ -312,6 +439,17 @@
<axis path="*/[http://richfaces.ajax4jsf.org/rich]:*/rowKeyConverter/" />
</partitionType>
</contentType>
+ <contentType id="jsf.facelet">
+ <partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE">
+ <axis path="*/[http://richfaces.org/a4j]:*/converter/" />
+ <axis path="*/[https://ajax4jsf.dev.java.net/ajax]:*/converter/" />
+ <axis path="*/[http://richfaces.org/rich]:*/converter/" />
+ <axis path="*/[http://richfaces.ajax4jsf.org/rich]:*/converter/" />
+
+ <axis path="*/[http://richfaces.org/rich]:*/rowKeyConverter/" />
+ <axis path="*/[http://richfaces.ajax4jsf.org/rich]:*/rowKeyConverter/" />
+ </partitionType>
+ </contentType>
</hyperlinkPartitioner>
<hyperlinkPartitioner
@@ -511,6 +649,103 @@
<axis path="*/[http://richfaces.org/rich]:*/nodeClass/" />
</partitionType>
</contentType>
+ <contentType id="jsf.facelet">
+ <partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE">
+ <axis path="*/[http://richfaces.org/rich]:*/addButtonClass/" />
+ <axis path="*/[http://richfaces.org/rich]:*/activeClass/" />
+ <axis path="*/[http://richfaces.org/rich]:*/activeTabClass/" />
+ <axis path="*/[http://richfaces.org/rich]:*/buttonClass/" />
+ <axis path="*/[http://richfaces.org/rich]:*/buttonDisabledClass/" />
+ <axis path="*/[http://richfaces.org/rich]:*/buttonInactiveClass/" />
+ <axis path="*/[http://richfaces.org/rich]:*/barClass/" />
+ <axis path="*/[http://richfaces.org/rich]:*/bottomControlClass/" />
+ <axis path="*/[http://richfaces.org/rich]:*/bodyClass/" />
+ <axis path="*/[http://richfaces.org/rich]:*/columnClasses/" />
+ <axis path="*/[http://richfaces.org/rich]:*/controlClass/" />
+ <axis path="*/[http://richfaces.org/rich]:*/controlsClass/" />
+ <axis path="*/[http://richfaces.org/rich]:*/controlHoverClass/" />
+ <axis path="*/[http://richfaces.org/rich]:*/controlPressedClass/" />
+ <axis path="*/[http://richfaces.org/rich]:*/controlPressClass/" />
+ <axis path="*/[http://richfaces.org/rich]:*/cleanButtonClass/" />
+ <axis path="*/[http://richfaces.org/rich]:*/changedClass/" />
+ <axis path="*/[http://richfaces.org/rich]:*/changedHoverClass/" />
+ <axis path="*/[http://richfaces.org/rich]:*/copyAllControlClass/" />
+ <axis path="*/[http://richfaces.org/rich]:*/copyControlClass/" />
+ <axis path="*/[http://richfaces.org/rich]:*/contentClass/" />
+ <axis path="*/[http://richfaces.org/rich]:*/completeClass/" />
+ <axis path="*/[http://richfaces.org/rich]:*/dayStyleClass/" />
+ <axis path="*/[http://richfaces.org/rich]:*/decreaseClass/" />
+ <axis path="*/[http://richfaces.org/rich]:*/decreaseSelectedClass/" />
+ <axis path="*/[http://richfaces.org/rich]:*/disabledItemClass/" />
+ <axis path="*/[http://richfaces.org/rich]:*/disabledControlClass/" />
+ <axis path="*/[http://richfaces.org/rich]:*/downControlClass/" />
+ <axis path="*/[http://richfaces.org/rich]:*/disabledGroupClass/" />
+ <axis path="*/[http://richfaces.org/rich]:*/disabledClass/" />
+ <axis path="*/[http://richfaces.org/rich]:*/errorClass/" />
+ <axis path="*/[http://richfaces.org/rich]:*/errorLabelClass/" />
+ <axis path="*/[http://richfaces.org/rich]:*/errorMarkerClass/" />
+ <axis path="*/[http://richfaces.org/rich]:*/entryClass/" />
+ <axis path="*/[http://richfaces.org/rich]:*/footerClass/" />
+ <axis path="*/[http://richfaces.org/rich]:*/fileEntryClass/" />
+ <axis path="*/[http://richfaces.org/rich]:*/fileEntryControlClass/" />
+ <axis path="*/[http://richfaces.org/rich]:*/fatalClass/" />
+ <axis path="*/[http://richfaces.org/rich]:*/fatalLabelClass/" />
+ <axis path="*/[http://richfaces.org/rich]:*/fatalMarkerClass/" />
+ <axis path="*/[http://richfaces.org/rich]:*/finishClass/" />
+ <axis path="*/[http://richfaces.org/rich]:*/headerClass/" />
+ <axis path="*/[http://richfaces.org/rich]:*/handleClass/" />
+ <axis path="*/[http://richfaces.org/rich]:*/handleSelectedClass/" />
+ <axis path="*/[http://richfaces.org/rich]:*/hoveredGroupClass/" />
+ <axis path="*/[http://richfaces.org/rich]:*/hoveredItemClass/" />
+ <axis path="*/[http://richfaces.org/rich]:*/highlightedClass/" />
+ <axis path="*/[http://richfaces.org/rich]:*/inputClass/" />
+ <axis path="*/[http://richfaces.org/rich]:*/inputDisabledClass/" />
+ <axis path="*/[http://richfaces.org/rich]:*/inputInactiveClass/" />
+ <axis path="*/[http://richfaces.org/rich]:*/itemClass/" />
+ <axis path="*/[http://richfaces.org/rich]:*/itemSelectedClass/" />
+ <axis path="*/[http://richfaces.org/rich]:*/increaseClass/" />
+ <axis path="*/[http://richfaces.org/rich]:*/increaseSelectedClass/" />
+ <axis path="*/[http://richfaces.org/rich]:*/iconClass/" />
+ <axis path="*/[http://richfaces.org/rich]:*/infoClass/" />
+ <axis path="*/[http://richfaces.org/rich]:*/infoLabelClass/" />
+ <axis path="*/[http://richfaces.org/rich]:*/infoMarkerClass/" />
+ <axis path="*/[http://richfaces.org/rich]:*/initialClass/" />
+ <axis path="*/[http://richfaces.org/rich]:*/listClass/" />
+ <axis path="*/[http://richfaces.org/rich]:*/labelClass/" />
+ <axis path="*/[http://richfaces.org/rich]:*/popupClass/" />
+ <axis path="*/[http://richfaces.org/rich]:*/rowClasses/" />
+ <axis path="*/[http://richfaces.org/rich]:*/removeAllControlClass/" />
+ <axis path="*/[http://richfaces.org/rich]:*/removeControlClass/" />
+ <axis path="*/[http://richfaces.org/rich]:*/remainClass/" />
+ <axis path="*/[http://richfaces.org/rich]:*/styleClass/" />
+ <axis path="*/[http://richfaces.org/rich]:*/selectItemClass/" />
+ <axis path="*/[http://richfaces.org/rich]:*/stopButtonClass/" />
+ <axis path="*/[http://richfaces.org/rich]:*/selectClass/" />
+ <axis path="*/[http://richfaces.org/rich]:*/sidebarClass/" />
+ <axis path="*/[http://richfaces.org/rich]:*/selectedClass/" />
+ <axis path="*/[http://richfaces.org/rich]:*/selectValueClass/" />
+ <axis path="*/[http://richfaces.org/rich]:*/separatorClass/" />
+ <axis path="*/[http://richfaces.org/rich]:*/uploadButtonClass/" />
+ <axis path="*/[http://richfaces.org/rich]:*/uploadListClass/" />
+ <axis path="*/[http://richfaces.org/rich]:*/upControlClass/" />
+ <axis path="*/[http://richfaces.org/rich]:*/editClass/" />
+ <axis path="*/[http://richfaces.org/rich]:*/viewClass/" />
+ <axis path="*/[http://richfaces.org/rich]:*/viewHoverClass/" />
+ <axis path="*/[http://richfaces.org/rich]:*/tipClass/" />
+ <axis path="*/[http://richfaces.org/rich]:*/topControlClass/" />
+ <axis path="*/[http://richfaces.org/rich]:*/topGroupClass/" />
+ <axis path="*/[http://richfaces.org/rich]:*/topItemClass/" />
+ <axis path="*/[http://richfaces.org/rich]:*/tabClass/" />
+ <axis path="*/[http://richfaces.org/rich]:*/markerClass/" />
+ <axis path="*/[http://richfaces.org/rich]:*/warnClass/" />
+ <axis path="*/[http://richfaces.org/rich]:*/warnLabelClass/" />
+ <axis path="*/[http://richfaces.org/rich]:*/warnMarkerClass/" />
+ <axis path="*/[http://richfaces.org/rich]:*/groupClass/" />
+ <axis path="*/[http://richfaces.org/rich]:*/disabledTabClass/" />
+ <axis path="*/[http://richfaces.org/rich]:*/inactiveTabClass/" />
+ <axis path="*/[http://richfaces.org/rich]:*/nodeClass/" />
+ </partitionType>
+ </contentType>
</hyperlinkPartitioner>
</extension>
@@ -529,6 +764,9 @@
<contenttypeidentifier id="org.eclipse.wst.html.core.htmlsource">
<partitiontype id="org.jboss.tools.common.text.ext.jsp.JSP_RICHFACES_LOADBUNDLE" />
</contenttypeidentifier>
+ <contenttypeidentifier id="jsf.facelet">
+ <partitiontype id="org.jboss.tools.common.text.ext.jsp.JSP_RICHFACES_LOADBUNDLE" />
+ </contenttypeidentifier>
</hyperlink>
<hyperlink
@@ -540,6 +778,9 @@
<contenttypeidentifier id="org.eclipse.wst.html.core.htmlsource">
<partitiontype id="org.jboss.tools.common.text.ext.jsp.JSP_RICHFACES_BUNDLE" />
</contenttypeidentifier>
+ <contenttypeidentifier id="jsf.facelet">
+ <partitiontype id="org.jboss.tools.common.text.ext.jsp.JSP_RICHFACES_BUNDLE" />
+ </contenttypeidentifier>
</hyperlink>
</extension>
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/plugin.xml
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/plugin.xml 2010-06-15 13:16:24 UTC (rev 22813)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/plugin.xml 2010-06-15 13:29:30 UTC (rev 22814)
@@ -100,6 +100,49 @@
type="preferencepages"
value="org.eclipse.wst.sse.ui.preferences.jsp.occurrences"
target="org.eclipse.wst.html.core.htmlsource"/>
+
+ <sourceViewerConfiguration
+ class="org.jboss.tools.jst.jsp.HTMLTextViewerConfiguration"
+ target="jsf.facelet"/>
+ <contentOutlineConfiguration
+ class="org.eclipse.wst.html.ui.views.contentoutline.HTMLContentOutlineConfiguration"
+ target="jsf.facelet"/>
+ <propertySheetConfiguration
+ class="org.eclipse.wst.xml.ui.views.properties.XMLPropertySheetConfiguration"
+ target="jsf.facelet"/>
+ <provisionalConfiguration
+ type="sourceeditingtexttools"
+ class="org.eclipse.wst.xml.ui.internal.provisional.XMLSourceEditingTextTools"
+ target="jsf.facelet"/>
+ <provisionalConfiguration
+ type="characterpairmatcher"
+ class="org.eclipse.wst.html.ui.internal.text.HTMLDocumentRegionEdgeMatcher"
+ target="jsf.facelet"/>
+ <provisionalConfiguration
+ type="structuredtextfoldingprovider"
+ class="org.eclipse.wst.html.ui.internal.projection.StructuredTextFoldingProviderHTML"
+ target="jsf.facelet"/>
+ <provisionalDefinition
+ type="preferencepages"
+ value="org.eclipse.wst.html.ui.preferences"
+ target="jsf.facelet"/>
+ <provisionalDefinition
+ type="preferencepages"
+ value="org.eclipse.wst.html.ui.preferences.source"
+ target="jsf.facelet"/>
+ <provisionalDefinition
+ type="preferencepages"
+ value="org.eclipse.wst.html.ui.preferences.templates"
+ target="jsf.facelet"/>
+ <provisionalDefinition
+ type="preferencepages"
+ value="org.eclipse.wst.html.ui.preferences.styles"
+ target="jsf.facelet"/>
+ <provisionalDefinition
+ type="preferencepages"
+ value="org.eclipse.wst.sse.ui.preferences.jsp.occurrences"
+ target="jsf.facelet"/>
+
<provisionalConfiguration
class="org.eclipse.wst.xml.ui.internal.projection.StructuredTextFoldingProviderXML"
target="org.jboss.tools.jst.jsp.jspeditor.JSPTextEditor"
@@ -163,6 +206,7 @@
name="%editors.html.name"
default="true">
<contentTypeBinding contentTypeId="org.eclipse.wst.html.core.htmlsource"/>
+ <contentTypeBinding contentTypeId="jsf.facelet"/>
</editor>
</extension>
@@ -554,6 +598,12 @@
<partitiontype id="org.eclipse.jst.jsp.SCRIPT.JSP_EL2" />
<partitiontype id="org.eclipse.wst.css.STYLE" />
</contenttype>
+ <contenttype id="jsf.facelet">
+ <partitiontype id="org.eclipse.wst.html.HTML_DEFAULT" />
+ <partitiontype id="org.eclipse.jst.jsp.SCRIPT.JSP_EL" />
+ <partitiontype id="org.eclipse.jst.jsp.SCRIPT.JSP_EL2" />
+ <partitiontype id="org.eclipse.wst.css.STYLE" />
+ </contenttype>
</contentAssistProcessor>
</extension>
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/info/ChainTextHover.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/info/ChainTextHover.java 2010-06-15 13:16:24 UTC (rev 22813)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/info/ChainTextHover.java 2010-06-15 13:29:30 UTC (rev 22814)
@@ -18,6 +18,7 @@
import org.eclipse.jface.text.IRegion;
import org.eclipse.jface.text.ITextHover;
import org.eclipse.jface.text.ITextHoverExtension;
+import org.eclipse.jface.text.ITextHoverExtension2;
import org.eclipse.jface.text.ITextViewer;
import org.eclipse.wst.sse.ui.internal.Logger;
import org.eclipse.wst.sse.ui.internal.taginfo.AnnotationHoverProcessor;
@@ -111,7 +112,14 @@
Iterator<ITextHover> i = getTextHovers().iterator();
while ((i.hasNext()) && (displayInfo == null)) {
ITextHover hover = (ITextHover) i.next();
- displayInfo = hover.getHoverInfo(viewer, hoverRegion);
+ if(hover instanceof ITextHoverExtension2) {
+ Object displayInfoObject = ((ITextHoverExtension2)hover).getHoverInfo2(viewer, hoverRegion);
+ if(displayInfoObject!=null) {
+ displayInfo = displayInfoObject.toString();
+ }
+ } else {
+ displayInfo = hover.getHoverInfo(viewer, hoverRegion);
+ }
}
}
return displayInfo;
Modified: trunk/jst/plugins/org.jboss.tools.jst.text.ext/plugin.xml
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.text.ext/plugin.xml 2010-06-15 13:16:24 UTC (rev 22813)
+++ trunk/jst/plugins/org.jboss.tools.jst.text.ext/plugin.xml 2010-06-15 13:29:30 UTC (rev 22814)
@@ -17,6 +17,9 @@
<contentType id="org.eclipse.wst.html.core.htmlsource">
<partitionType id="org.eclipse.wst.html.HTML_DEFAULT" />
</contentType>
+ <contentType id="jsf.facelet">
+ <partitionType id="org.eclipse.wst.html.HTML_DEFAULT" />
+ </contentType>
</hyperlinkPartitioner>
<hyperlinkPartitioner
@@ -30,6 +33,10 @@
<partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE">
</partitionType>
</contentType>
+ <contentType id="jsf.facelet">
+ <partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE">
+ </partitionType>
+ </contentType>
</hyperlinkPartitioner>
<!--Maksim Areshkau, partitioner for *.taglib.xml files -->
@@ -98,6 +105,9 @@
<contentType id="org.eclipse.wst.html.core.htmlsource">
<partitionType id="org.jboss.tools.common.text.ext.jsp.JSP_ROOT" />
</contentType>
+ <contentType id="jsf.facelet">
+ <partitionType id="org.jboss.tools.common.text.ext.jsp.JSP_ROOT" />
+ </contentType>
</hyperlinkPartitioner>
<hyperlinkPartitioner
@@ -109,6 +119,9 @@
<contentType id="org.eclipse.wst.html.core.htmlsource">
<partitionType id="org.jboss.tools.common.text.ext.xml.XML_ELEMENT"/>
</contentType>
+ <contentType id="jsf.facelet">
+ <partitionType id="org.jboss.tools.common.text.ext.xml.XML_ELEMENT"/>
+ </contentType>
</hyperlinkPartitioner>
<hyperlinkPartitioner
@@ -120,6 +133,9 @@
<contentType id="org.eclipse.wst.html.core.htmlsource">
<partitionType id="org.jboss.tools.common.text.ext.xml.XML_ELEMENT" />
</contentType>
+ <contentType id="jsf.facelet">
+ <partitionType id="org.jboss.tools.common.text.ext.xml.XML_ELEMENT" />
+ </contentType>
</hyperlinkPartitioner>
<hyperlinkPartitioner
@@ -131,6 +147,9 @@
<contentType id="org.eclipse.wst.html.core.htmlsource">
<partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE"/>
</contentType>
+ <contentType id="jsf.facelet">
+ <partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE"/>
+ </contentType>
</hyperlinkPartitioner>
<hyperlinkPartitioner
@@ -201,6 +220,17 @@
<!--axis path="*/style/" /-->
</partitionType>
</contentType>
+ <contentType id="jsf.facelet">
+ <partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE">
+ <axis path="*/link/*" ignoreCase="true"/>
+ </partitionType>
+ <partitionType id="org.jboss.tools.common.text.ext.xml.XML_ELEMENT">
+ <axis path="*/link/*" ignoreCase="true"/>
+ </partitionType>
+ <partitionType id="com.ibm.sse.STYLE">
+ <!--axis path="*/style/" /-->
+ </partitionType>
+ </contentType>
</hyperlinkPartitioner>
<hyperlinkPartitioner
@@ -230,6 +260,12 @@
<axis path="*/link/href/" ignoreCase="true"/>
</partitionType>
</contentType>
+ <contentType id="jsf.facelet">
+ <partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE">
+ <axis path="*/a/href/" ignoreCase="true"/>
+ <axis path="*/link/href/" ignoreCase="true"/>
+ </partitionType>
+ </contentType>
</hyperlinkPartitioner>
<!-- End of Common HTML and/or JSP hyperlink partitioners -->
@@ -249,6 +285,9 @@
<contenttypeidentifier id="org.eclipse.wst.html.core.htmlsource">
<partitiontype id="org.jboss.tools.common.text.ext.CSS_CLASS" />
</contenttypeidentifier>
+ <contenttypeidentifier id="jsf.facelet">
+ <partitiontype id="org.jboss.tools.common.text.ext.CSS_CLASS" />
+ </contenttypeidentifier>
</hyperlink>
<hyperlink
@@ -280,6 +319,9 @@
<contenttypeidentifier id="org.eclipse.wst.html.core.htmlsource">
<partitiontype id="org.jboss.tools.common.text.ext.jsp.JSP_STYLESHEET_REL_LINK" />
</contenttypeidentifier>
+ <contenttypeidentifier id="jsf.facelet">
+ <partitiontype id="org.jboss.tools.common.text.ext.jsp.JSP_STYLESHEET_REL_LINK" />
+ </contenttypeidentifier>
</hyperlink>
<hyperlink
@@ -371,6 +413,9 @@
<contenttypeidentifier id="org.eclipse.wst.html.core.htmlsource">
<partitiontype id="org.jboss.tools.common.text.ext.jsp.JSP_XMLNS" />
</contenttypeidentifier>
+ <contenttypeidentifier id="jsf.facelet">
+ <partitiontype id="org.jboss.tools.common.text.ext.jsp.JSP_XMLNS" />
+ </contenttypeidentifier>
</hyperlink>
<hyperlink
Modified: trunk/seam/plugins/org.jboss.tools.seam.text.ext/plugin.xml
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.text.ext/plugin.xml 2010-06-15 13:16:24 UTC (rev 22813)
+++ trunk/seam/plugins/org.jboss.tools.seam.text.ext/plugin.xml 2010-06-15 13:29:30 UTC (rev 22814)
@@ -68,6 +68,12 @@
<axis path="*/[http://jboss.com/products/seam/taglib]:link/action/" />
</partitionType>
</contentType>
+ <contentType id="jsf.facelet">
+ <partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE">
+ <axis path="*/[http://jboss.com/products/seam/taglib]:button/action/" />
+ <axis path="*/[http://jboss.com/products/seam/taglib]:link/action/" />
+ </partitionType>
+ </contentType>
</hyperlinkPartitioner>
@@ -126,6 +132,9 @@
<contentType id="org.eclipse.wst.html.core.htmlsource">
<partitionType id="org.jboss.tools.common.text.ext.jsp.JSP_EXPRESSION" />
</contentType>
+ <contentType id="jsf.facelet">
+ <partitionType id="org.jboss.tools.common.text.ext.jsp.JSP_EXPRESSION" />
+ </contentType>
<contentType id="org.eclipse.core.runtime.xml">
<partitionType id="org.jboss.tools.common.text.ext.jsp.JSP_EXPRESSION" />
</contentType>
@@ -205,6 +214,12 @@
<axis path="*/[http://jboss.com/products/seam/taglib]:link/view/" />
</partitionType>
</contentType>
+ <contentType id="jsf.facelet">
+ <partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE">
+ <axis path="*/[http://jboss.com/products/seam/taglib]:button/view/" />
+ <axis path="*/[http://jboss.com/products/seam/taglib]:link/view/" />
+ </partitionType>
+ </contentType>
<contentType id="org.eclipse.core.runtime.xml">
<partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE">
@@ -233,6 +248,11 @@
<axis path="*/[http://jboss.com/products/seam/taglib]:graphicImage/value/" />
</partitionType>
</contentType>
+ <contentType id="jsf.facelet">
+ <partitionType id="org.jboss.tools.common.text.ext.xml.XML_ATTRIBUTE_VALUE">
+ <axis path="*/[http://jboss.com/products/seam/taglib]:graphicImage/value/" />
+ </partitionType>
+ </contentType>
</hyperlinkPartitioner>
@@ -290,6 +310,9 @@
<contenttypeidentifier id="org.eclipse.wst.html.core.htmlsource">
<partitiontype id="org.jboss.tools.seam.text.ext.SEAM_MESSAGES_BEAN" />
</contenttypeidentifier>
+ <contenttypeidentifier id="jsf.facelet">
+ <partitiontype id="org.jboss.tools.seam.text.ext.SEAM_MESSAGES_BEAN" />
+ </contenttypeidentifier>
<contenttypeidentifier id="org.eclipse.core.runtime.xml">
<partitiontype id="org.jboss.tools.seam.text.ext.SEAM_MESSAGES_BEAN" />
</contenttypeidentifier>
@@ -325,6 +348,9 @@
<contenttypeidentifier id="org.eclipse.wst.html.core.htmlsource">
<partitiontype id="org.jboss.tools.seam.text.ext.SEAM_VIEW_LINK" />
</contenttypeidentifier>
+ <contenttypeidentifier id="jsf.facelet">
+ <partitiontype id="org.jboss.tools.seam.text.ext.SEAM_VIEW_LINK" />
+ </contenttypeidentifier>
<contenttypeidentifier id="org.eclipse.core.runtime.xml">
<partitiontype id="org.jboss.tools.seam.text.ext.SEAM_VIEW_LINK" />
15 years, 10 months
- 1
- 0
JBoss Tools SVN: r22813 - in branches/jbosstools-3.1.x/seam/tests/org.jboss.tools.seam.xml.test: META-INF and 3 other directories.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2010-06-15 09:16:24 -0400 (Tue, 15 Jun 2010)
New Revision: 22813
Added:
branches/jbosstools-3.1.x/seam/tests/org.jboss.tools.seam.xml.test/projects/
branches/jbosstools-3.1.x/seam/tests/org.jboss.tools.seam.xml.test/projects/Test/
branches/jbosstools-3.1.x/seam/tests/org.jboss.tools.seam.xml.test/projects/Test/components22.xml
branches/jbosstools-3.1.x/seam/tests/org.jboss.tools.seam.xml.test/src/org/jboss/tools/seam/xml/test/SeamXMLAllTests.java
branches/jbosstools-3.1.x/seam/tests/org.jboss.tools.seam.xml.test/src/org/jboss/tools/seam/xml/test/SeamXMLModelTest.java
branches/jbosstools-3.1.x/seam/tests/org.jboss.tools.seam.xml.test/src/org/jboss/tools/seam/xml/test/SeamXMLTestSetup.java
branches/jbosstools-3.1.x/seam/tests/org.jboss.tools.seam.xml.test/src/org/jboss/tools/seam/xml/test/SeamXMLTestSuite.java
Modified:
branches/jbosstools-3.1.x/seam/tests/org.jboss.tools.seam.xml.test/META-INF/MANIFEST.MF
Log:
https://jira.jboss.org/browse/JBIDE-6224
Modified: branches/jbosstools-3.1.x/seam/tests/org.jboss.tools.seam.xml.test/META-INF/MANIFEST.MF
===================================================================
--- branches/jbosstools-3.1.x/seam/tests/org.jboss.tools.seam.xml.test/META-INF/MANIFEST.MF 2010-06-15 13:14:37 UTC (rev 22812)
+++ branches/jbosstools-3.1.x/seam/tests/org.jboss.tools.seam.xml.test/META-INF/MANIFEST.MF 2010-06-15 13:16:24 UTC (rev 22813)
@@ -3,6 +3,10 @@
Bundle-Name: Seam XML Tests
Bundle-SymbolicName: org.jboss.tools.seam.xml.test;singleton:=true
Bundle-Version: 1.0.0
-Require-Bundle: org.eclipse.core.runtime
+Require-Bundle: org.eclipse.core.runtime,
+ org.junit,
+ org.jboss.tools.seam.xml,
+ org.jboss.tools.common.test,
+ org.jboss.tools.tests
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Added: branches/jbosstools-3.1.x/seam/tests/org.jboss.tools.seam.xml.test/projects/Test/components22.xml
===================================================================
--- branches/jbosstools-3.1.x/seam/tests/org.jboss.tools.seam.xml.test/projects/Test/components22.xml (rev 0)
+++ branches/jbosstools-3.1.x/seam/tests/org.jboss.tools.seam.xml.test/projects/Test/components22.xml 2010-06-15 13:16:24 UTC (rev 22813)
@@ -0,0 +1,20 @@
+<?xml version="1.0"?>
+<components xmlns="http://jboss.com/products/seam/components"
+ xmlns:core="http://jboss.com/products/seam/core"
+ xmlns:framework="http://jboss.com/products/seam/framework"
+ xmlns:navigation="http://jboss.com/products/seam/navigation"
+ xmlns:pdf="http://jboss.com/products/seam/pdf"
+ xmlns:remoting="http://jboss.com/products/seam/remoting"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.2.xsd http://jboss.com/products/seam/framework http://jboss.com/products/seam/framework-2.2.xsd http://jboss.com/products/seam/remoting http://jboss.com/products/seam/remoting-2.2.xsd http://jboss.com/products/seam/core http://jboss.com/products/seam/core-2.2.xsd http://jboss.com/products/seam/navigation http://jboss.com/products/seam/navigation-2.2.xsd http://jboss.com/products/seam/pdf http://jboss.com/products/seam/pdf-2.2.xsd">
+ <component class="MyCls" name="component1"/>
+ <framework:entity-query name="entityQuery"/>
+ <remoting:remoting poll-interval="1" poll-timeout="2"/>
+ <core:manager/>
+ <navigation:pages http-port="1111" https-port="1112"
+ login-view-id="b.xhtml" no-conversation-view-id="a.xhtml">
+ <navigation:resources>
+ <value>v2</value>
+ </navigation:resources>
+ </navigation:pages>
+ <pdf:document-store name="mypdfStore"/>
+</components>
Property changes on: branches/jbosstools-3.1.x/seam/tests/org.jboss.tools.seam.xml.test/projects/Test/components22.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: branches/jbosstools-3.1.x/seam/tests/org.jboss.tools.seam.xml.test/src/org/jboss/tools/seam/xml/test/SeamXMLAllTests.java
===================================================================
--- branches/jbosstools-3.1.x/seam/tests/org.jboss.tools.seam.xml.test/src/org/jboss/tools/seam/xml/test/SeamXMLAllTests.java (rev 0)
+++ branches/jbosstools-3.1.x/seam/tests/org.jboss.tools.seam.xml.test/src/org/jboss/tools/seam/xml/test/SeamXMLAllTests.java 2010-06-15 13:16:24 UTC (rev 22813)
@@ -0,0 +1,31 @@
+/*******************************************************************************
+ * Copyright (c) 2007 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.seam.xml.test;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+
+/**
+ * @author V.Kabanovich
+ *
+ */
+public class SeamXMLAllTests {
+ public static final String PLUGIN_ID = "org.jboss.tools.seam.xml";
+
+ public static Test suite() {
+ TestSuite suite = new TestSuite();
+ suite.setName("All tests for " + PLUGIN_ID);
+ suite.addTest(new SeamXMLTestSetup(SeamXMLTestSuite.suite()));
+
+ return suite;
+ }
+}
Property changes on: branches/jbosstools-3.1.x/seam/tests/org.jboss.tools.seam.xml.test/src/org/jboss/tools/seam/xml/test/SeamXMLAllTests.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: branches/jbosstools-3.1.x/seam/tests/org.jboss.tools.seam.xml.test/src/org/jboss/tools/seam/xml/test/SeamXMLModelTest.java
===================================================================
--- branches/jbosstools-3.1.x/seam/tests/org.jboss.tools.seam.xml.test/src/org/jboss/tools/seam/xml/test/SeamXMLModelTest.java (rev 0)
+++ branches/jbosstools-3.1.x/seam/tests/org.jboss.tools.seam.xml.test/src/org/jboss/tools/seam/xml/test/SeamXMLModelTest.java 2010-06-15 13:16:24 UTC (rev 22813)
@@ -0,0 +1,100 @@
+/*******************************************************************************
+ * Copyright (c) 2007 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.seam.xml.test;
+
+import junit.framework.TestCase;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.Path;
+import org.jboss.tools.common.model.XModelObject;
+import org.jboss.tools.common.model.util.EclipseResourceUtil;
+import org.jboss.tools.seam.xml.components.model.SeamComponentConstants;
+
+public class SeamXMLModelTest extends TestCase {
+ IProject project = null;
+
+ public SeamXMLModelTest() {
+ super("Seam Scanner test");
+ project = getTestProject();
+ }
+
+ public IProject getTestProject() {
+ if(project==null) {
+ try {
+ project = findTestProject();
+ if(project==null || !project.exists()) {
+// project = importPreparedProject("/");
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ fail("Can't import Seam XML test project: " + e.getMessage());
+ }
+ }
+ return project;
+ }
+
+ public static IProject findTestProject() {
+ return ResourcesPlugin.getWorkspace().getRoot().getProject("Test");
+ }
+
+
+ /**
+ * This test is to check different cases of declaring components in xml.
+ * It does not check interaction of xml declaration with other declarations.
+ */
+ public void testXMLModel() {
+ IFile f = project.getFile(new Path("components22.xml"));
+ assertNotNull("File components22.xml is not found in Test project.", f);
+
+ XModelObject fileObject = EclipseResourceUtil.createObjectForResource(f);
+ assertNotNull("Cannot create XModel object for file components22.xml.", fileObject);
+
+ String entity = fileObject.getModelEntity().getName();
+ assertEquals("File components22.xml is incorrectly parsed by XModel.", SeamComponentConstants.ENT_SEAM_COMPONENTS_22, entity);
+
+ //TODO continue test
+ }
+
+ protected XModelObject getComponents22Object() {
+ if(project == null) return null;
+ IFile f = project.getFile(new Path("components22.xml"));
+ return f == null ? null : EclipseResourceUtil.createObjectForResource(f);
+
+ }
+
+ public void testNavigationPagesComponent() {
+ XModelObject fileObject = getComponents22Object();
+ assertNotNull("Cannot create XModel object for file components22.xml.", fileObject);
+
+ XModelObject navigationPages = fileObject.getChildByPath("org.jboss.seam.navigation.pages");
+ assertNotNull("Cannot find org.jboss.seam.navigation.pages", navigationPages);
+
+ XModelObject resources = navigationPages.getChildByPath("resources");
+ assertNotNull("Cannot find resources in org.jboss.seam.navigation.pages", resources);
+
+ XModelObject[] resourcesList = resources.getChildren();
+ assertEquals(1, resourcesList.length);
+
+ assertAttribute(navigationPages, "no-conversation-view-id", "a.xhtml");
+ assertAttribute(navigationPages, "login-view-id", "b.xhtml");
+ assertAttribute(navigationPages, "http-port", "1111");
+ assertAttribute(navigationPages, "https-port", "1112");
+
+ }
+
+ protected void assertAttribute(XModelObject object, String name, String value) {
+ String actual = object.getAttributeValue(name);
+ assertEquals("Attribute " + name + " in " + object.getPresentationString() + " is incorrect.", value, actual);
+ }
+
+}
Property changes on: branches/jbosstools-3.1.x/seam/tests/org.jboss.tools.seam.xml.test/src/org/jboss/tools/seam/xml/test/SeamXMLModelTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: branches/jbosstools-3.1.x/seam/tests/org.jboss.tools.seam.xml.test/src/org/jboss/tools/seam/xml/test/SeamXMLTestSetup.java
===================================================================
--- branches/jbosstools-3.1.x/seam/tests/org.jboss.tools.seam.xml.test/src/org/jboss/tools/seam/xml/test/SeamXMLTestSetup.java (rev 0)
+++ branches/jbosstools-3.1.x/seam/tests/org.jboss.tools.seam.xml.test/src/org/jboss/tools/seam/xml/test/SeamXMLTestSetup.java 2010-06-15 13:16:24 UTC (rev 22813)
@@ -0,0 +1,50 @@
+/*******************************************************************************
+ * Copyright (c) 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
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.seam.xml.test;
+
+import junit.extensions.TestSetup;
+import junit.framework.Test;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.jboss.tools.test.util.JobUtils;
+import org.jboss.tools.test.util.ResourcesUtils;
+import org.jboss.tools.test.util.xpl.EditorTestHelper;
+
+/**
+ * @author Viacheslav Kabanovich
+ */
+public class SeamXMLTestSetup extends TestSetup {
+
+ protected IProject project;
+
+ public SeamXMLTestSetup(Test test) {
+ super(test);
+ }
+
+ @Override
+ protected void setUp() throws Exception {
+ project = ResourcesUtils.importProject(
+ "org.jboss.tools.seam.xml.test","/projects/Test" , new NullProgressMonitor());
+ project.refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor());
+ EditorTestHelper.joinBackgroundActivities();
+ }
+
+ @Override
+ protected void tearDown() throws Exception {
+ boolean saveAutoBuild = ResourcesUtils.setBuildAutomatically(false);
+ JobUtils.waitForIdle();
+ project.delete(true, true, null);
+ JobUtils.waitForIdle();
+ ResourcesUtils.setBuildAutomatically(saveAutoBuild);
+ }
+}
Property changes on: branches/jbosstools-3.1.x/seam/tests/org.jboss.tools.seam.xml.test/src/org/jboss/tools/seam/xml/test/SeamXMLTestSetup.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: branches/jbosstools-3.1.x/seam/tests/org.jboss.tools.seam.xml.test/src/org/jboss/tools/seam/xml/test/SeamXMLTestSuite.java
===================================================================
--- branches/jbosstools-3.1.x/seam/tests/org.jboss.tools.seam.xml.test/src/org/jboss/tools/seam/xml/test/SeamXMLTestSuite.java (rev 0)
+++ branches/jbosstools-3.1.x/seam/tests/org.jboss.tools.seam.xml.test/src/org/jboss/tools/seam/xml/test/SeamXMLTestSuite.java 2010-06-15 13:16:24 UTC (rev 22813)
@@ -0,0 +1,26 @@
+/*******************************************************************************
+ * Copyright (c) 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
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.seam.xml.test;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+/**
+ * @author V. Kabanovich
+ */
+public class SeamXMLTestSuite extends TestSuite {
+
+ public static Test suite() {
+ TestSuite suite = new TestSuite("Seam XML Tests");
+ suite.addTestSuite(SeamXMLModelTest.class);
+ return suite;
+ }
+}
Property changes on: branches/jbosstools-3.1.x/seam/tests/org.jboss.tools.seam.xml.test/src/org/jboss/tools/seam/xml/test/SeamXMLTestSuite.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
15 years, 10 months
- 1
- 0
JBoss Tools SVN: r22812 - branches/jbosstools-3.1.x/seam/plugins/org.jboss.tools.seam.xml.ui/src/org/jboss/tools/seam/xml/ui/editor/form/core.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2010-06-15 09:14:37 -0400 (Tue, 15 Jun 2010)
New Revision: 22812
Modified:
branches/jbosstools-3.1.x/seam/plugins/org.jboss.tools.seam.xml.ui/src/org/jboss/tools/seam/xml/ui/editor/form/core/PropertyListFormLayoutData.java
branches/jbosstools-3.1.x/seam/plugins/org.jboss.tools.seam.xml.ui/src/org/jboss/tools/seam/xml/ui/editor/form/core/SeamComponentsCoreFormLayoutData.java
Log:
https://jira.jboss.org/browse/JBIDE-6224
Modified: branches/jbosstools-3.1.x/seam/plugins/org.jboss.tools.seam.xml.ui/src/org/jboss/tools/seam/xml/ui/editor/form/core/PropertyListFormLayoutData.java
===================================================================
--- branches/jbosstools-3.1.x/seam/plugins/org.jboss.tools.seam.xml.ui/src/org/jboss/tools/seam/xml/ui/editor/form/core/PropertyListFormLayoutData.java 2010-06-15 13:14:06 UTC (rev 22811)
+++ branches/jbosstools-3.1.x/seam/plugins/org.jboss.tools.seam.xml.ui/src/org/jboss/tools/seam/xml/ui/editor/form/core/PropertyListFormLayoutData.java 2010-06-15 13:14:37 UTC (rev 22812)
@@ -33,6 +33,9 @@
static String ENT_RESTRICTIONS = "SeamFrameworkRestrictions"; //$NON-NLS-1$
static String ENT_HINTS = "SeamFrameworkHints"; //$NON-NLS-1$
+ static String ENT_NAVIGATION_PAGES = "SeamNavigationPages"; //$NON-NLS-1$
+ static String ENT_NAVIGATION_RESOURCES = "SeamNavigationResources"; //$NON-NLS-1$
+
static String ENT_THEME_SELECTOR = "SeamThemeSelector"; //$NON-NLS-1$
static String ENT_AVAILABLE_THEMES = "SeamThemeAvailableThemes"; //$NON-NLS-1$
@@ -225,6 +228,23 @@
ENT_FILTER, new String[]{null}, FILTER_DEFINITIONS);
/**
+ * Navigation
+ */
+ private final static IFormData[] NAVIGATION_RESOURCES_DEFINITIONS = new IFormData[] {
+ createListDefinition("Resources") //$NON-NLS-1$
+ };
+
+ final static IFormData NAVIGATION_RESOURCES_FORM_DEFINITION = new FormData(
+ ENT_NAVIGATION_RESOURCES, new String[]{null}, NAVIGATION_RESOURCES_DEFINITIONS);
+
+ private final static IFormData[] NAVIGATION_PAGES_DEFINITIONS =
+ createDefinitionsForListHolder("Navigation Pages", ENT_NAVIGATION_PAGES, "Resources", "resources"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+
+ final static IFormData NAVIGATION_PAGES_FORM_DEFINITION = new FormData(
+ ENT_NAVIGATION_PAGES, new String[]{null}, NAVIGATION_PAGES_DEFINITIONS);
+
+
+ /**
* Theme
*/
private final static IFormData[] AVAILABLE_THEMES_DEFINITIONS = new IFormData[] {
Modified: branches/jbosstools-3.1.x/seam/plugins/org.jboss.tools.seam.xml.ui/src/org/jboss/tools/seam/xml/ui/editor/form/core/SeamComponentsCoreFormLayoutData.java
===================================================================
--- branches/jbosstools-3.1.x/seam/plugins/org.jboss.tools.seam.xml.ui/src/org/jboss/tools/seam/xml/ui/editor/form/core/SeamComponentsCoreFormLayoutData.java 2010-06-15 13:14:06 UTC (rev 22811)
+++ branches/jbosstools-3.1.x/seam/plugins/org.jboss.tools.seam.xml.ui/src/org/jboss/tools/seam/xml/ui/editor/form/core/SeamComponentsCoreFormLayoutData.java 2010-06-15 13:14:37 UTC (rev 22812)
@@ -43,6 +43,9 @@
PropertyListFormLayoutData.HINTS_FORM_DEFINITION,
PropertyListFormLayoutData.RESTRICTIONS_FORM_DEFINITION,
+ PropertyListFormLayoutData.NAVIGATION_PAGES_FORM_DEFINITION,
+ PropertyListFormLayoutData.NAVIGATION_RESOURCES_FORM_DEFINITION,
+
PropertyListFormLayoutData.THEME_SELECTOR_FORM_DEFINITION,
PropertyListFormLayoutData.AVAILABLE_THEMES_FORM_DEFINITION,
15 years, 10 months
- 1
- 0
JBoss Tools SVN: r22811 - in branches/jbosstools-3.1.x/seam/plugins/org.jboss.tools.seam.xml: resources/help and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2010-06-15 09:14:06 -0400 (Tue, 15 Jun 2010)
New Revision: 22811
Added:
branches/jbosstools-3.1.x/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-navigation.meta
Modified:
branches/jbosstools-3.1.x/seam/plugins/org.jboss.tools.seam.xml/plugin.xml
branches/jbosstools-3.1.x/seam/plugins/org.jboss.tools.seam.xml/resources/help/keys-seam-menu.properties
branches/jbosstools-3.1.x/seam/plugins/org.jboss.tools.seam.xml/resources/help/keys-seam.properties
Log:
https://jira.jboss.org/browse/JBIDE-6224
Modified: branches/jbosstools-3.1.x/seam/plugins/org.jboss.tools.seam.xml/plugin.xml
===================================================================
--- branches/jbosstools-3.1.x/seam/plugins/org.jboss.tools.seam.xml/plugin.xml 2010-06-15 12:57:42 UTC (rev 22810)
+++ branches/jbosstools-3.1.x/seam/plugins/org.jboss.tools.seam.xml/plugin.xml 2010-06-15 13:14:06 UTC (rev 22811)
@@ -11,6 +11,7 @@
<meta path="meta/seam-international.meta"/>
<meta path="meta/seam-mail.meta"/>
<meta path="meta/seam-pdf.meta"/>
+ <meta path="meta/seam-navigation.meta"/>
<meta path="meta/seam-persistence.meta"/>
<meta path="meta/seam-theme.meta"/>
<meta path="meta/seam-web.meta"/>
Modified: branches/jbosstools-3.1.x/seam/plugins/org.jboss.tools.seam.xml/resources/help/keys-seam-menu.properties
===================================================================
--- branches/jbosstools-3.1.x/seam/plugins/org.jboss.tools.seam.xml/resources/help/keys-seam-menu.properties 2010-06-15 12:57:42 UTC (rev 22810)
+++ branches/jbosstools-3.1.x/seam/plugins/org.jboss.tools.seam.xml/resources/help/keys-seam-menu.properties 2010-06-15 13:14:06 UTC (rev 22811)
@@ -73,6 +73,8 @@
Seam.AddContextLoader.menu=Context Loader...
Seam.AddTaskDispatcher.menu=Task Dispatcher...
Seam.AddTransaction.menu=Transaction...
+Seam.Navigation.menu=Navigation
+Seam.AddNavigationPages.menu=Navigation Pages...
Seam.Theme.menu=Theme
Seam.AddThemeSelector.menu=Theme Selector...
Seam.Transaction.menu=Transaction
Modified: branches/jbosstools-3.1.x/seam/plugins/org.jboss.tools.seam.xml/resources/help/keys-seam.properties
===================================================================
--- branches/jbosstools-3.1.x/seam/plugins/org.jboss.tools.seam.xml/resources/help/keys-seam.properties 2010-06-15 12:57:42 UTC (rev 22810)
+++ branches/jbosstools-3.1.x/seam/plugins/org.jboss.tools.seam.xml/resources/help/keys-seam.properties 2010-06-15 13:14:06 UTC (rev 22811)
@@ -975,6 +975,9 @@
FileSeamComponents20_AddThemeSelector.WindowTitle=Add Theme Selector
FileSeamComponents20_AddThemeSelector.Title=Seam Theme Selector
+FileSeamComponents20_AddNavigationPages.WindowTitle=Add Navigation Pages
+FileSeamComponents20_AddNavigationPages.Title=Seam Navigation Pages
+
FileSeamComponents20_EditorActionList_AddThemeSelector.WindowTitle=Add Theme Selector
FileSeamComponents20_EditorActionList_AddThemeSelector.Title=Seam Theme Selector
@@ -1317,6 +1320,9 @@
FileSeamComponents21_AddThemeSelector.WindowTitle=Add Theme Selector
FileSeamComponents21_AddThemeSelector.Title=Seam Theme Selector
+FileSeamComponents21_AddNavigationPages.WindowTitle=Add Navigation Pages
+FileSeamComponents21_AddNavigationPages.Title=Seam Navigation Pages
+
FileSeamComponents21_AddEjb.WindowTitle=Add Ejb
FileSeamComponents21_AddEjb.Title=Seam Transaction Ejb
@@ -1413,6 +1419,9 @@
FileSeamComponents22_AddThemeSelector.WindowTitle=Add Theme Selector
FileSeamComponents22_AddThemeSelector.Title=Seam Theme Selector
+FileSeamComponents22_AddNavigationPages.WindowTitle=Add Navigation Pages
+FileSeamComponents22_AddNavigationPages.Title=Seam Navigation Pages
+
FileSeamComponents22_AddEjb.WindowTitle=Add Ejb
FileSeamComponents22_AddEjb.Title=Seam Transaction Ejb
Added: branches/jbosstools-3.1.x/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-navigation.meta
===================================================================
--- branches/jbosstools-3.1.x/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-navigation.meta (rev 0)
+++ branches/jbosstools-3.1.x/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-navigation.meta 2010-06-15 13:14:06 UTC (rev 22811)
@@ -0,0 +1,226 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE XModelEntityGroup PUBLIC "-//Red Hat, Inc.//DTD Meta 1.0//EN"
+ "meta.dtd">
+<XModelEntityGroup>
+ <VERSION DEPENDS="Model:1.0" MODULE="Seam" VERSION="1.0"/>
+ <MAPPINGS>
+ <MAPPING name="Handlers"/>
+ <MAPPING name="SeamNamespaces">
+ <PAIR name="navigation" value="http://jboss.com/products/seam/navigation"/>
+ </MAPPING>
+ <MAPPING name="SeamSchemas">
+ <PAIR name="navigation$20" value="http://jboss.com/products/seam/navigation-2.0.xsd"/>
+ <PAIR name="navigation$21" value="http://jboss.com/products/seam/navigation-2.1.xsd"/>
+ <PAIR name="navigation$22" value="http://jboss.com/products/seam/navigation-2.2.xsd"/>
+ </MAPPING>
+ </MAPPINGS>
+ <ICONS>
+ <GROUP name="action">
+ <GROUP name="new">
+ <GROUP name="navigation"/>
+ </GROUP>
+ </GROUP>
+ <GROUP name="main">
+ <GROUP name="seam">
+ <GROUP name="navigation">
+ <ICON name="pages" path="images/struts/plug_in.gif"/>
+ </GROUP>
+ </GROUP>
+ </GROUP>
+ </ICONS>
+ <GlobalActions kind="list"/>
+ <XModelEntity ImplementingClass="%Custom%"
+ PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.seam.xml.ui.editor.form.core.SeamComponentsCoreFormLayoutData"
+ XMLSUBPATH="navigation:pages" name="SeamNavigationPages">
+ <XChildrenEntities>
+ <XChildEntity maxCount="1" name="SeamNavigationResources" required="yes"/>
+ </XChildrenEntities>
+ <XEntityRenderer>
+ <ICONS>
+ <ICON info="main.seam.navigation.pages" type="main"/>
+ </ICONS>
+ </XEntityRenderer>
+ <XModelAttributes>
+ <XModelAttribute default="navigation pages" loader="ElementType" name="element type">
+ <Editor name="Uneditable"/>
+ </XModelAttribute>
+ <XModelAttribute PROPERTIES="id=true;category=general"
+ default="org.jboss.seam.navigation.pages" name="name" xmlname="name"/>
+ <XModelAttributeReference
+ attributes="class,scope,precedence,installed,auto-create"
+ entity="SeamComponent" name="component"/>
+ <XModelAttribute PROPERTIES="category=general"
+ name="no-conversation-view-id" xmlname="no-conversation-view-id"/>
+ <XModelAttribute PROPERTIES="category=general" name="login-view-id" xmlname="login-view-id"/>
+ <XModelAttribute PROPERTIES="category=advanced" name="http-port" xmlname="http-port">
+ <Constraint loader="%IntEL%">
+ <value name="minimum=0"/>
+ </Constraint>
+ <Editor name="Int"/>
+ </XModelAttribute>
+ <XModelAttribute PROPERTIES="category=advanced" name="https-port" xmlname="https-port">
+ <Constraint loader="%IntEL%">
+ <value name="minimum=0"/>
+ </Constraint>
+ <Editor name="Int"/>
+ </XModelAttribute>
+ <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment">
+ <Editor name="Note"/>
+ </XModelAttribute>
+ </XModelAttributes>
+ <XActionItem kind="list">
+ <XActionItem kind="list" name="CreateActions"/>
+ <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions">
+ <XActionItemReference entity="SeamComponent" name="Rename" path="EditActions/Rename"/>
+ </XActionItem>
+ <XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions">
+ <XActionItem BaseActionName="Copy" HandlerClassName="%Copy%"
+ ICON="action.copy" displayName="Copy" kind="action" name="Copy"/>
+ <XActionItem BaseActionName="Cut" HandlerClassName="%Cut%"
+ ICON="action.cut" displayName="Cut" kind="action" name="Cut"/>
+ </XActionItem>
+ <XActionItem ICON="action.delete" displayName="Delete" kind="list" name="DeleteActions">
+ <XActionItem BaseActionName="Delete" HandlerClassName="%Delete%"
+ ICON="action.delete" displayName="Delete" kind="action" name="Delete"/>
+ </XActionItem>
+ <XActionItem ICON="action.empty" kind="list" name="Properties">
+ <XActionItem HandlerClassName="%Properties%" ICON="action.empty"
+ displayName="Properties..." kind="action" name="Properties"/>
+ </XActionItem>
+ <XActionItem displayName="move" kind="list" name="MoveActions">
+ <XActionItem HIDE="always" HandlerClassName="%Move%"
+ ICON="action.move" displayName="Move" kind="action" name="Move"/>
+ </XActionItem>
+ </XActionItem>
+ <XDependencies/>
+ </XModelEntity>
+ <XModelEntity ImplementingClass="%Custom%"
+ PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.seam.xml.ui.editor.form.core.SeamComponentsCoreFormLayoutData;children=%Ordered%;childrenLoader=list;saveDefault=false"
+ XMLSUBPATH="navigation:resources" name="SeamNavigationResources">
+ <XChildrenEntities>
+ <XChildEntity name="SeamListEntry"/>
+ </XChildrenEntities>
+ <XEntityRenderer>
+ <ICONS>
+ <ICON info="main.seam.property" type="main"/>
+ </ICONS>
+ </XEntityRenderer>
+ <XModelAttributes>
+ <XModelAttribute default="resources" loader="ElementType" name="element type">
+ <Editor name="Uneditable"/>
+ </XModelAttribute>
+ <XModelAttribute PROPERTIES="id=true;category=general"
+ default="resources" name="name">
+ <Editor name="Uneditable"/>
+ </XModelAttribute>
+ <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment">
+ <Editor name="Note"/>
+ </XModelAttribute>
+ </XModelAttributes>
+ <XActionItem kind="list">
+ <XActionItem kind="list" name="CreateActions">
+ <XActionItem HandlerClassName="%Create%" ICON="action.empty"
+ WizardClassName="%Default%" displayName="Add Entry..."
+ kind="action" name="AddEntry">
+ <EntityData EntityName="SeamListEntry">
+ <AttributeData AttributeName="value"/>
+ </EntityData>
+ </XActionItem>
+ </XActionItem>
+ <XActionItem ICON="action.empty" displayName="Create" kind="list" name="EditActions"/>
+ <XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions">
+ <XActionItem BaseActionName="Copy" HandlerClassName="%Copy%"
+ ICON="action.copy" displayName="Copy" kind="action" name="Copy"/>
+ <XActionItem BaseActionName="Cut" HandlerClassName="%Cut%"
+ ICON="action.cut" displayName="Cut" kind="action" name="Cut"/>
+ <XActionItem BaseActionName="Paste" HandlerClassName="%Paste%"
+ ICON="action.paste" displayName="Paste" kind="action" name="Paste"/>
+ </XActionItem>
+ <XActionItem ICON="action.delete" displayName="Delete" kind="list" name="DeleteActions">
+ <XActionItem BaseActionName="Delete" HandlerClassName="%Delete%"
+ ICON="action.delete" displayName="Delete" kind="action" name="Delete"/>
+ </XActionItem>
+ <XActionItem ICON="action.empty" kind="list" name="Properties">
+ <XActionItem HandlerClassName="%Properties%" ICON="action.empty"
+ displayName="Properties..." kind="action" name="Properties"/>
+ </XActionItem>
+ <XActionItem displayName="move" kind="list" name="MoveActions">
+ <XActionItem HIDE="always" HandlerClassName="%Move%"
+ ICON="action.move" displayName="Move" kind="action" name="Move"/>
+ </XActionItem>
+ </XActionItem>
+ <XDependencies/>
+ </XModelEntity>
+ <XEntityExtension name="FileSeamComponents20">
+ <XChildrenEntities>
+ <XChildEntity name="SeamNavigationPages"/>
+ </XChildrenEntities>
+ <XActionItem kind="list">
+ <XActionItem ICON="action.empty" displayName="New" group="1"
+ kind="list" name="CreateActions">
+ <XActionItem ICON="action.empty" displayName="Navigation" group="1"
+ kind="list" name="Navigation">
+ <XActionItem HandlerClassName="%Create%" ICON="action.empty"
+ PROPERTIES="validator.add=true" WizardClassName="%Default%"
+ displayName="Navigation Pages..." kind="action" name="AddNavigationPages">
+ <EntityData EntityName="SeamNavigationPages">
+ <AttributeData AttributeName="name"/>
+ <AttributeData AttributeName="no-conversation-view-id" Mandatory="no"/>
+ <AttributeData AttributeName="login-view-id" Mandatory="no"/>
+ <AttributeData AttributeName="http-port" Mandatory="no"/>
+ <AttributeData AttributeName="https-port" Mandatory="no"/>
+ </EntityData>
+ </XActionItem>
+ </XActionItem>
+ </XActionItem>
+ </XActionItem>
+ </XEntityExtension>
+ <XEntityExtension name="FileSeamComponents21">
+ <XChildrenEntities>
+ <XChildEntity name="SeamNavigationPages"/>
+ </XChildrenEntities>
+ <XActionItem kind="list">
+ <XActionItem ICON="action.empty" displayName="New" group="1"
+ kind="list" name="CreateActions">
+ <XActionItem ICON="action.empty" displayName="Navigation" group="1"
+ kind="list" name="Navigation">
+ <XActionItem HandlerClassName="%Create%" ICON="action.empty"
+ PROPERTIES="validator.add=true" WizardClassName="%Default%"
+ displayName="Navigation Pages..." kind="action" name="AddNavigationPages">
+ <EntityData EntityName="SeamNavigationPages">
+ <AttributeData AttributeName="name"/>
+ <AttributeData AttributeName="no-conversation-view-id" Mandatory="no"/>
+ <AttributeData AttributeName="login-view-id" Mandatory="no"/>
+ <AttributeData AttributeName="http-port" Mandatory="no"/>
+ <AttributeData AttributeName="https-port" Mandatory="no"/>
+ </EntityData>
+ </XActionItem>
+ </XActionItem>
+ </XActionItem>
+ </XActionItem>
+ </XEntityExtension>
+ <XEntityExtension name="FileSeamComponents22">
+ <XChildrenEntities>
+ <XChildEntity name="SeamNavigationPages"/>
+ </XChildrenEntities>
+ <XActionItem kind="list">
+ <XActionItem ICON="action.empty" displayName="New" group="1"
+ kind="list" name="CreateActions">
+ <XActionItem ICON="action.empty" displayName="Navigation" group="1"
+ kind="list" name="Navigation">
+ <XActionItem HandlerClassName="%Create%" ICON="action.empty"
+ PROPERTIES="validator.add=true" WizardClassName="%Default%"
+ displayName="Navigation Pages..." kind="action" name="AddNavigationPages">
+ <EntityData EntityName="SeamNavigationPages">
+ <AttributeData AttributeName="name"/>
+ <AttributeData AttributeName="no-conversation-view-id" Mandatory="no"/>
+ <AttributeData AttributeName="login-view-id" Mandatory="no"/>
+ <AttributeData AttributeName="http-port" Mandatory="no"/>
+ <AttributeData AttributeName="https-port" Mandatory="no"/>
+ </EntityData>
+ </XActionItem>
+ </XActionItem>
+ </XActionItem>
+ </XActionItem>
+ </XEntityExtension>
+</XModelEntityGroup>
15 years, 10 months
- 1
- 0
JBoss Tools SVN: r22810 - branches/jbosstools-3.1.x/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/editor.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2010-06-15 08:57:42 -0400 (Tue, 15 Jun 2010)
New Revision: 22810
Modified:
branches/jbosstools-3.1.x/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/editor/HibConfig3CompoundEditor.java
Log:
https://jira.jboss.org/browse/JBIDE-6374
Modified: branches/jbosstools-3.1.x/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/editor/HibConfig3CompoundEditor.java
===================================================================
--- branches/jbosstools-3.1.x/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/editor/HibConfig3CompoundEditor.java 2010-06-15 12:56:42 UTC (rev 22809)
+++ branches/jbosstools-3.1.x/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/src/org/jboss/tools/hibernate/ui/xml/editor/HibConfig3CompoundEditor.java 2010-06-15 12:57:42 UTC (rev 22810)
@@ -11,9 +11,11 @@
package org.jboss.tools.hibernate.ui.xml.editor;
import org.jboss.tools.common.editor.TreeFormPage;
+import org.jboss.tools.common.model.XModelObject;
import org.jboss.tools.common.model.ui.editor.EditorDescriptor;
import org.jboss.tools.common.model.ui.editors.multipage.DefaultMultipageEditor;
import org.jboss.tools.common.model.ui.texteditors.XMLTextEditorComponent;
+import org.jboss.tools.common.model.util.XModelObjectLoaderUtil;
import org.jboss.tools.hibernate.ui.xml.HibernateUIXMLPlugin;
import org.jboss.tools.hibernate.ui.xml.Messages;
import org.jboss.tools.hibernate.xml.model.FileHibernateFilteredTreeConstraint;
@@ -31,14 +33,14 @@
sessionFactory.setLabel(Messages.HibConfig3CompoundEditor_SessionFactoryLabel);
sessionFactory.setTitle(Messages.HibConfig3CompoundEditor_SessionFactoryTitle);
((TreeFormPage)sessionFactory).addFilter(new FileHibernateFilteredTreeConstraint());
- sessionFactory.initialize(object.getChildByPath("Session Factory")); //$NON-NLS-1$
+ sessionFactory.initialize(getSessionFactoryObject());
addFormPage(sessionFactory, "sessionFactoryEditor"); //$NON-NLS-1$
security = createTreeFormPage();
security.setLabel(Messages.HibConfig3CompoundEditor_SecurityLabel);
security.setTitle(Messages.HibConfig3CompoundEditor_SecurityTitle);
((TreeFormPage)security).addFilter(new FileHibernateFilteredTreeConstraint());
- security.initialize(object.getChildByPath("Security")); //$NON-NLS-1$
+ security.initialize(getSecurityObject());
addFormPage(security, "securityEditor"); //$NON-NLS-1$
}
@@ -64,9 +66,9 @@
protected void setNormalMode() {
if (treeFormPage!=null) { // AU added
- sessionFactory.initialize(getModelObject().getChildByPath("Session Factory")); // AU added //$NON-NLS-1$
+ sessionFactory.initialize(getSessionFactoryObject());
sessionFactory.setErrorMode(isErrorMode());
- security.initialize(getModelObject().getChildByPath("Security")); // AU added //$NON-NLS-1$
+ security.initialize(getSecurityObject());
security.setErrorMode(isErrorMode());
} // AU added
if (selectionProvider!=null) {
@@ -77,11 +79,27 @@
}
}
+ XModelObject getSessionFactoryObject() {
+ XModelObject o = getModelObject().getChildByPath("Session Factory"); //$NON-NLS-1$
+ if(o == null) {
+ o = XModelObjectLoaderUtil.createValidObject(object.getModel(), "HibConfig3SessionFactory"); //$NON-NLS-1$
+ }
+ return o;
+ }
+
+ XModelObject getSecurityObject() {
+ XModelObject o = getModelObject().getChildByPath("Security"); //$NON-NLS-1$
+ if(o == null) {
+ o = XModelObjectLoaderUtil.createValidObject(object.getModel(), "HibConfig3Security"); //$NON-NLS-1$
+ }
+ return o;
+ }
+
protected void setErrorMode() {
if (treeFormPage!=null) { // AU added
- sessionFactory.initialize(getModelObject().getChildByPath("Session Factory")); // AU added //$NON-NLS-1$
+ sessionFactory.initialize(getSessionFactoryObject());
sessionFactory.setErrorMode(isErrorMode());
- security.initialize(getModelObject().getChildByPath("Security")); // AU added //$NON-NLS-1$
+ security.initialize(getSecurityObject());
security.setErrorMode(isErrorMode());
} // AU added
if (treeEditor!=null) {
@@ -100,4 +118,4 @@
return new XMLTextEditorComponent(false);
}
-}
+}
\ No newline at end of file
15 years, 10 months
- 1
- 0
JBoss Tools SVN: r22809 - branches/jbosstools-3.1.x/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/wizards.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2010-06-15 08:56:42 -0400 (Tue, 15 Jun 2010)
New Revision: 22809
Modified:
branches/jbosstools-3.1.x/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/wizards/NewConfigurationWizard.java
Log:
https://jira.jboss.org/browse/JBIDE-6374
Modified: branches/jbosstools-3.1.x/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/wizards/NewConfigurationWizard.java
===================================================================
--- branches/jbosstools-3.1.x/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/wizards/NewConfigurationWizard.java 2010-06-15 12:55:22 UTC (rev 22808)
+++ branches/jbosstools-3.1.x/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/wizards/NewConfigurationWizard.java 2010-06-15 12:56:42 UTC (rev 22809)
@@ -22,17 +22,13 @@
package org.hibernate.eclipse.console.wizards;
import java.io.ByteArrayInputStream;
-import java.io.IOException;
import java.io.InputStream;
import java.io.StringWriter;
import java.io.UnsupportedEncodingException;
-import java.lang.reflect.InvocationTargetException;
import java.util.Properties;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jface.operation.IRunnableWithProgress;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.wizard.IWizardPage;
@@ -91,7 +87,20 @@
* Adding the page to the wizard.
*/
public void addPages() {
- cPage = new ExtendedWizardNewFileCreationPage( "Ccfgxml", (IStructuredSelection) selection ); //$NON-NLS-1$
+ cPage = new ExtendedWizardNewFileCreationPage( "Ccfgxml", (IStructuredSelection) selection ) {
+ protected InputStream getInitialContents() {
+ final Properties props = new Properties();
+ putIfNotNull(props, Environment.SESSION_FACTORY_NAME, connectionInfoPage.getSessionFactoryName() );
+ putIfNotNull(props, Environment.DIALECT, connectionInfoPage.getDialect() );
+ putIfNotNull(props, Environment.DRIVER, connectionInfoPage.getDriver() );
+ putIfNotNull(props, Environment.URL, connectionInfoPage.getConnectionURL() );
+ putIfNotNull(props, Environment.USER, connectionInfoPage.getUsername() );
+ putIfNotNull(props, Environment.PASS, connectionInfoPage.getPassword() );
+ putIfNotNull(props, Environment.DEFAULT_CATALOG, connectionInfoPage.getDefaultCatalog() );
+ putIfNotNull(props, Environment.DEFAULT_SCHEMA, connectionInfoPage.getDefaultSchema() );
+ return openContentStream(props);
+ }
+ }; //$NON-NLS-1$
cPage.setTitle( HibernateConsoleMessages.NewConfigurationWizard_create_hibernate_cfg_file );
cPage.setDescription( HibernateConsoleMessages.NewConfigurationWizard_create_new_hibernate_cfg_xml );
cPage.setFileName("hibernate.cfg.xml"); //$NON-NLS-1$
@@ -122,26 +131,7 @@
putIfNotNull(props, Environment.DEFAULT_SCHEMA, connectionInfoPage.getDefaultSchema() );
final IFile file = cPage.createNewFile();
- IRunnableWithProgress op = new IRunnableWithProgress() {
- public void run(IProgressMonitor monitor) throws InvocationTargetException {
- try {
- createHibernateCfgXml(file, props, monitor);
- } catch (CoreException e) {
- throw new InvocationTargetException(e);
- } finally {
- monitor.done();
- }
- }
- };
- try {
- getContainer().run(true, false, op);
- } catch (InterruptedException e) {
- return false;
- } catch (InvocationTargetException e) {
- Throwable realException = e.getTargetException();
- HibernateConsolePlugin.getDefault().showError(getShell(), HibernateConsoleMessages.NewConfigurationWizard_error, realException);
- return false;
- }
+ openHibernateCfgXml(file);
if (connectionInfoPage.isCreateConsoleConfigurationEnabled()) {
try {
@@ -173,30 +163,7 @@
}
}
- /**
- * The worker method. It will find the container, create the
- * file if missing or just replace its contents, and open
- * the editor on the newly created file.
- * @param file
- * @param props
- */
- private void createHibernateCfgXml(
- final IFile file, Properties props, IProgressMonitor monitor)
- throws CoreException {
- // create a sample file
- monitor.beginTask(HibernateConsoleMessages.NewConfigurationWizard_creating + file.getName(), 2);
- try {
- InputStream stream = openContentStream(props);
- if (file.exists() ) {
- file.setContents(stream, true, true, monitor);
- } else {
- file.create(stream, true, monitor);
- }
- stream.close();
- } catch (IOException e) {
- }
- monitor.worked(1);
- monitor.setTaskName(HibernateConsoleMessages.NewConfigurationWizard_open_file_for_editing);
+ private void openHibernateCfgXml(final IFile file) {
getShell().getDisplay().asyncExec(new Runnable() {
public void run() {
IWorkbenchPage page =
@@ -207,7 +174,6 @@
}
}
});
- monitor.worked(1);
}
/**
15 years, 10 months
- 1
- 0