JBoss Tools SVN: r19758 - in trunk/smooks: plugins/org.jboss.tools.smooks.templating/src/org/jboss/tools/smooks/templating/template/csv and 5 other directories.
by jbosstools-commits＠lists.jboss.org
Author: tfennelly
Date: 2010-01-14 15:40:36 -0500 (Thu, 14 Jan 2010)
New Revision: 19758
Modified:
trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks10/model/smooks/util/SmooksModelUtils.java
trunk/smooks/plugins/org.jboss.tools.smooks.templating/src/org/jboss/tools/smooks/templating/template/csv/CSVFreeMarkerTemplateBuilder.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/freemarker/FreemarkerCSVContentGenerator.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/template/FreemarkerTemplateContentGraphModelProviderImpl.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/wizard/freemarker/FreemarkerCSVCreationWizardPage.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/wizard/freemarker/FreemarkerCSVTemplateCreationWizard.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/wizard/freemarker/Messages.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/wizard/freemarker/messages.properties
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/launch/SmooksLauncher.java
trunk/smooks/tests/org.jboss.tools.smooks.templating.test/src/org/jboss/tools/smooks/templating/template/csv/CSVFreeMarkerTemplateBuilderTest.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-5379
Support adding the CSV field names as the first record produced by a CSV template
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks10/model/smooks/util/SmooksModelUtils.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks10/model/smooks/util/SmooksModelUtils.java 2010-01-14 17:49:29 UTC (rev 19757)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks10/model/smooks/util/SmooksModelUtils.java 2010-01-14 20:40:36 UTC (rev 19758)
@@ -50,6 +50,8 @@
public static final String KEY_CSV_FIELDS = "csvFields"; //$NON-NLS-1$
+ public static final String KEY_INCLUDE_FIELD_NAMES = "includeFieldNames"; //$NON-NLS-1$
+
public static final String KEY_TASK_ID_REF = "idref"; //$NON-NLS-1$
public static final String KEY_OBJECT_ID = "id"; //$NON-NLS-1$
@@ -611,6 +613,18 @@
return 0;
}
+ public static boolean getFreemarkerCSVIncludeFieldNames(Freemarker freemarker) {
+ org.jboss.tools.smooks.model.smooks.ParamType typeParam = getParam(freemarker.getParam(), KEY_INCLUDE_FIELD_NAMES);
+ if (typeParam != null) {
+ String value = typeParam.getStringValue();
+ if (value != null) {
+ return value.equals("true");
+ }
+ }
+
+ return false;
+ }
+
public static String getFreemarkerXMLFileType(Freemarker freemarker) {
org.jboss.tools.smooks.model.smooks.ParamType typeParam = getParam(freemarker.getParam(), KEY_XML_FILE_TYPE);
if (typeParam != null) {
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.templating/src/org/jboss/tools/smooks/templating/template/csv/CSVFreeMarkerTemplateBuilder.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.templating/src/org/jboss/tools/smooks/templating/template/csv/CSVFreeMarkerTemplateBuilder.java 2010-01-14 17:49:29 UTC (rev 19757)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.templating/src/org/jboss/tools/smooks/templating/template/csv/CSVFreeMarkerTemplateBuilder.java 2010-01-14 20:40:36 UTC (rev 19758)
@@ -32,6 +32,7 @@
import org.jboss.tools.smooks.templating.template.exception.TemplateBuilderException;
import org.jboss.tools.smooks.templating.template.exception.UnmappedCollectionNodeException;
import org.jboss.tools.smooks.templating.template.util.FreeMarkerUtil;
+import org.milyn.xml.DomUtils;
import au.com.bytecode.opencsv.CSVReader;
@@ -47,19 +48,22 @@
public class CSVFreeMarkerTemplateBuilder extends TemplateBuilder {
private char separatorChar;
- private char quoteChar;
+ private char quoteChar;
+ private boolean includeFieldNames;
/**
* Construct a new FreeMarker Template Builder with no mappings.
* @param model The model.
* @param separatorChar The CSV field separator character.
* @param quoteChar The CSV field quote character.
+ * @param includeFieldNames True if field names are to be added at the start of the generated message, otherwise false.
* @throws ModelBuilderException Error building model.
*/
- public CSVFreeMarkerTemplateBuilder(ModelBuilder modelBuilder, char separatorChar, char quoteChar) throws ModelBuilderException {
+ public CSVFreeMarkerTemplateBuilder(ModelBuilder modelBuilder, char separatorChar, char quoteChar, boolean includeFieldNames) throws ModelBuilderException {
super(modelBuilder);
this.separatorChar = separatorChar;
this.quoteChar = quoteChar;
+ this.includeFieldNames = includeFieldNames;
}
/**
@@ -68,12 +72,13 @@
* @param model The model.
* @param separatorChar The CSV field separator character.
* @param quoteChar The CSV field quote character.
+ * @param includeFieldNames True if field names are to be added at the start of the generated message, otherwise false.
* @param ftlTemplate The FreeMarker Template from which the mappings are to be extracted.
* @throws ModelBuilderException Error building model.
* @throws TemplateBuilderException Error adding mappings extracted from template.
*/
- public CSVFreeMarkerTemplateBuilder(ModelBuilder modelBuilder, char separatorChar, char quoteChar, String ftlTemplate) throws ModelBuilderException, TemplateBuilderException {
- this(modelBuilder, separatorChar, quoteChar);
+ public CSVFreeMarkerTemplateBuilder(ModelBuilder modelBuilder, char separatorChar, char quoteChar, boolean includeFieldNames, String ftlTemplate) throws ModelBuilderException, TemplateBuilderException {
+ this(modelBuilder, separatorChar, quoteChar, includeFieldNames);
addMappings(ftlTemplate);
}
@@ -86,18 +91,41 @@
throw new TemplateBuilderException ("Failed to parse the Supplied FreeMarker template.", e); //$NON-NLS-1$
}
- TemplateElement listElement = template.getRootTreeNode();
- if(!listElement.getNodeName().equals("IteratorBlock") || !listElement.getDescription().startsWith("list")) { //$NON-NLS-1$
- throw new TemplateBuilderException ("Unable to recognize template as being a CSV template. Expecting first template token to be a 'list' IteratorBlock node."); //$NON-NLS-1$
+ TemplateElement listNode = findListNode(template.getRootTreeNode());
+ if(listNode == null) { //$NON-NLS-1$
+ throw new TemplateBuilderException ("Unable to recognize template as being a CSV template"); //$NON-NLS-1$
}
// Add the mapping for the list itself...
- addCSVListMapping(listElement.getDescription());
+ addCSVListMapping(listNode.getDescription());
// Add the mappings for the individual fields...
- addCSVFieldMappings(listElement);
+ addCSVFieldMappings(listNode);
}
+ private TemplateElement findListNode(TemplateElement templateNode) throws TemplateBuilderException {
+ if(templateNode.getNodeName().equals("IteratorBlock")) {
+ String description = templateNode.getDescription();
+ if(!description.startsWith("list")) { //$NON-NLS-1$
+ throw new TemplateBuilderException ("Unsupported CSV template IteratorBlock type '" + description + "'. Currently only support 'list' IteratorBlock nodes."); //$NON-NLS-1$
+ }
+ return templateNode;
+ } else {
+ Enumeration<TemplateElement> children = templateNode.children();
+
+ if(children != null && children.hasMoreElements()) {
+ while(children.hasMoreElements()) {
+ TemplateElement listNode = findListNode(children.nextElement());
+ if(listNode != null) {
+ return listNode;
+ }
+ }
+ }
+ }
+
+ return null;
+ }
+
private void addCSVListMapping(String description) throws TemplateBuilderException {
String[] tokens = description.split(" +?"); //$NON-NLS-1$
Element csvRecordElement = getModel().getDocumentElement();
@@ -149,9 +177,27 @@
} else {
StringBuilder template = new StringBuilder();
NodeList nodeList = recordElement.getChildNodes();
- int fieldIndex = 0;
+
+ if(includeFieldNames) {
+ int fieldIndex = 0;
+ for(int i = 0; i < nodeList.getLength(); i++) {
+ Node node = nodeList.item(i);
+ if(node.getNodeType() == Node.ELEMENT_NODE) {
+ if(fieldIndex > 0) {
+ template.append(separatorChar);
+ }
+ template.append(quoteChar);
+ template.append(DomUtils.getName((Element) node));
+ template.append(quoteChar);
+ fieldIndex++;
+ }
+ }
+ template.append('\n');
+ }
+
template.append("<#list " + collectionMapping.getSrcPath() + " as " + collectionMapping.getCollectionItemName() + ">\n"); //$NON-NLS-1$
+ int fieldIndex = 0;
for(int i = 0; i < nodeList.getLength(); i++) {
Node node = nodeList.item(i);
if(node.getNodeType() == Node.ELEMENT_NODE) {
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/freemarker/FreemarkerCSVContentGenerator.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/freemarker/FreemarkerCSVContentGenerator.java 2010-01-14 17:49:29 UTC (rev 19757)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/freemarker/FreemarkerCSVContentGenerator.java 2010-01-14 20:40:36 UTC (rev 19758)
@@ -80,6 +80,7 @@
char sperator = SmooksModelUtils.getFreemarkerCSVSeperator((Freemarker) freemarker);
char quote = SmooksModelUtils.getFreemarkerCSVQuote((Freemarker) freemarker);
+ boolean includeFieldNames = SmooksModelUtils.getFreemarkerCSVIncludeFieldNames((Freemarker) freemarker);
List<AbstractSmooksGraphicalModel> childrenGraphModel = csvRecordGraphicalModel.getChildren();
List<String> fieldsName = new ArrayList<String>();
@@ -96,7 +97,7 @@
CSVFreeMarkerTemplateBuilder builder;
Document model;
- builder = new CSVFreeMarkerTemplateBuilder(modelBuilder, sperator, quote);
+ builder = new CSVFreeMarkerTemplateBuilder(modelBuilder, sperator, quote, includeFieldNames);
model = builder.getModel();
List<TreeNodeConnection> connections = csvRecordGraphicalModel.getTargetConnections();
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/template/FreemarkerTemplateContentGraphModelProviderImpl.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/template/FreemarkerTemplateContentGraphModelProviderImpl.java 2010-01-14 17:49:29 UTC (rev 19757)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/template/FreemarkerTemplateContentGraphModelProviderImpl.java 2010-01-14 20:40:36 UTC (rev 19758)
@@ -131,10 +131,12 @@
try {
builder1 = new CSVFreeMarkerTemplateBuilder(modelBuilder, SmooksModelUtils
.getFreemarkerCSVSeperator(freemarker), SmooksModelUtils.getFreemarkerCSVQuote(freemarker),
+ SmooksModelUtils.getFreemarkerCSVIncludeFieldNames(freemarker),
contents);
} catch (Exception e) {
builder1 = new CSVFreeMarkerTemplateBuilder(modelBuilder, SmooksModelUtils
- .getFreemarkerCSVSeperator(freemarker), SmooksModelUtils.getFreemarkerCSVQuote(freemarker));
+ .getFreemarkerCSVSeperator(freemarker), SmooksModelUtils.getFreemarkerCSVQuote(freemarker),
+ SmooksModelUtils.getFreemarkerCSVIncludeFieldNames(freemarker));
}
templateBuilder = builder1;
}
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/wizard/freemarker/FreemarkerCSVCreationWizardPage.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/wizard/freemarker/FreemarkerCSVCreationWizardPage.java 2010-01-14 17:49:29 UTC (rev 19757)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/wizard/freemarker/FreemarkerCSVCreationWizardPage.java 2010-01-14 20:40:36 UTC (rev 19758)
@@ -23,6 +23,7 @@
import org.eclipse.swt.events.ModifyListener;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Text;
@@ -37,9 +38,8 @@
private Text seperatorText;
private Text quoteText;
private Text fieldsText;
+ private Button includeFieldNames;
-
-
public FreemarkerCSVCreationWizardPage(String pageName, String title, ImageDescriptor titleImage) {
super(pageName, title, titleImage);
}
@@ -79,6 +79,10 @@
return quoteText;
}
+ public Button getIncludeFieldNames() {
+ return includeFieldNames;
+ }
+
/*
* (non-Javadoc)
*
@@ -96,26 +100,32 @@
layout.numColumns = 2;
mainComposite.setLayout(layout);
+ Label filedsLabel = new Label(mainComposite, SWT.NONE);
+ filedsLabel.setText(Messages.FreemarkerCSVCreationWizardPage_FieldsGroupText);
+ fieldsText = new Text(mainComposite, SWT.BORDER);
+ gd = new GridData(GridData.FILL_HORIZONTAL);
+ fieldsText.setLayoutData(gd);
+
Label seperatorLabel = new Label(mainComposite, SWT.NONE);
seperatorLabel.setText(Messages.FreemarkerCSVCreationWizardPage_SeperatorCharLabel);
seperatorText = new Text(mainComposite, SWT.BORDER);
- gd = new GridData(GridData.FILL_HORIZONTAL);
+ gd = new GridData(GridData.BEGINNING);
seperatorText.setLayoutData(gd);
seperatorText.setTextLimit(1);
Label quoteLabel = new Label(mainComposite, SWT.NONE);
quoteLabel.setText(Messages.FreemarkerCSVCreationWizardPage_QuoteCharLabel);
quoteText = new Text(mainComposite, SWT.BORDER);
- gd = new GridData(GridData.FILL_HORIZONTAL);
+ gd = new GridData(GridData.BEGINNING);
quoteText.setLayoutData(gd);
quoteText.setTextLimit(1);
-
- Label filedsLabel = new Label(mainComposite, SWT.NONE);
- filedsLabel.setText(Messages.FreemarkerCSVCreationWizardPage_FieldsGroupText);
- fieldsText = new Text(mainComposite, SWT.BORDER);
- gd = new GridData(GridData.FILL_HORIZONTAL);
- fieldsText.setLayoutData(gd);
-
+
+ Label includeFieldNamesLabel = new Label(mainComposite, SWT.NONE);
+ includeFieldNamesLabel.setText(Messages.FreemarkerCSVCreationWizardPage_IncludeFieldNamesLabel);
+ includeFieldNames = new Button(mainComposite, SWT.CHECK | SWT.CENTER | SWT.BORDER);
+ gd = new GridData(GridData.BEGINNING);
+ includeFieldNames.setLayoutData(gd);
+
// gd = new GridData(GridData.FILL_HORIZONTAL);
// gd.heightHint = 200;
// gd.horizontalSpan = 2;
@@ -271,7 +281,7 @@
updatePage();
}
});
-
+
this.setPageComplete(false);
}
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/wizard/freemarker/FreemarkerCSVTemplateCreationWizard.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/wizard/freemarker/FreemarkerCSVTemplateCreationWizard.java 2010-01-14 17:49:29 UTC (rev 19757)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/wizard/freemarker/FreemarkerCSVTemplateCreationWizard.java 2010-01-14 20:40:36 UTC (rev 19758)
@@ -57,6 +57,7 @@
this.addParamter(SmooksModelUtils.KEY_CSV_QUOTE, quote);
this.addParamter(SmooksModelUtils.KEY_CSV_SEPERATOR, seprator);
this.addParamter(SmooksModelUtils.KEY_CSV_FIELDS, fieldsString);
+ this.addParamter(SmooksModelUtils.KEY_INCLUDE_FIELD_NAMES, Boolean.toString(page.getIncludeFieldNames().getSelection()));
// List<FieldText> fieldList = page.getFieldsList();
// for (Iterator<?> iterator = fieldList.iterator(); iterator.hasNext();) {
// FieldText fieldText = (FieldText) iterator.next();
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/wizard/freemarker/Messages.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/wizard/freemarker/Messages.java 2010-01-14 17:49:29 UTC (rev 19757)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/wizard/freemarker/Messages.java 2010-01-14 20:40:36 UTC (rev 19758)
@@ -11,6 +11,7 @@
/* public static String FreemarkerCSVCreationWizardPage_FieldEmptyErrorMessage; */
public static String FreemarkerCSVCreationWizardPage_FieldsGroupText;
public static String FreemarkerCSVCreationWizardPage_QuoteCharLabel;
+ public static String FreemarkerCSVCreationWizardPage_IncludeFieldNamesLabel;
public static String FreemarkerCSVCreationWizardPage_QuoteEmptyErrorMessage;
/* public static String FreemarkerCSVCreationWizardPage_RemoveFieldButtonLabel; */
public static String FreemarkerCSVCreationWizardPage_SeperatorCharLabel;
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/wizard/freemarker/messages.properties
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/wizard/freemarker/messages.properties 2010-01-14 17:49:29 UTC (rev 19757)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/wizard/freemarker/messages.properties 2010-01-14 20:40:36 UTC (rev 19758)
@@ -5,6 +5,7 @@
#FreemarkerCSVCreationWizardPage_FieldEmptyErrorMessage=Fields can't be null
FreemarkerCSVCreationWizardPage_FieldsGroupText=Fields
FreemarkerCSVCreationWizardPage_QuoteCharLabel=Quote Character \:
+FreemarkerCSVCreationWizardPage_IncludeFieldNamesLabel=Include Field Names \:
FreemarkerCSVCreationWizardPage_QuoteEmptyErrorMessage=Quote can't be null
#FreemarkerCSVCreationWizardPage_RemoveFieldButtonLabel=Remove
FreemarkerCSVCreationWizardPage_SeperatorCharLabel=Separator Character \:
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/launch/SmooksLauncher.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/launch/SmooksLauncher.java 2010-01-14 17:49:29 UTC (rev 19757)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/launch/SmooksLauncher.java 2010-01-14 20:40:36 UTC (rev 19758)
@@ -79,7 +79,7 @@
StringResult stringResult = new StringResult();
smooks.filterSource(new StreamSource(new FileInputStream(input)), stringResult, javaResult);
- System.out.println("[" + localizedMessages.getProperty("SmooksLauncher_Templating_To_StreamResult") + " ...]\n"); //$NON-NLS-1$
+ System.out.println("[" + localizedMessages.getProperty("SmooksLauncher_Templating_To_StreamResult") + " ...]"); //$NON-NLS-1$
System.out.println(" |--"); //$NON-NLS-1$
System.out.println(indent(stringResult.toString()));
System.out.println(" |--\n"); //$NON-NLS-1$
Modified: trunk/smooks/tests/org.jboss.tools.smooks.templating.test/src/org/jboss/tools/smooks/templating/template/csv/CSVFreeMarkerTemplateBuilderTest.java
===================================================================
--- trunk/smooks/tests/org.jboss.tools.smooks.templating.test/src/org/jboss/tools/smooks/templating/template/csv/CSVFreeMarkerTemplateBuilderTest.java 2010-01-14 17:49:29 UTC (rev 19757)
+++ trunk/smooks/tests/org.jboss.tools.smooks.templating.test/src/org/jboss/tools/smooks/templating/template/csv/CSVFreeMarkerTemplateBuilderTest.java 2010-01-14 20:40:36 UTC (rev 19758)
@@ -37,7 +37,7 @@
public void test_all_fields_mapped_01() throws TemplateBuilderException, IOException, ModelBuilderException {
CSVModelBuilder modelBuilder = new CSVModelBuilder("firstname", "lastname", "country");
- CSVFreeMarkerTemplateBuilder builder1 = new CSVFreeMarkerTemplateBuilder(modelBuilder, ',', '\"');
+ CSVFreeMarkerTemplateBuilder builder1 = new CSVFreeMarkerTemplateBuilder(modelBuilder, ',', '\"', false);
//System.out.println(XmlUtil.serialize(model, true));
@@ -53,22 +53,51 @@
"</#list>",
template);
- CSVFreeMarkerTemplateBuilder builder2 = new CSVFreeMarkerTemplateBuilder(modelBuilder, ',', '\"', template);
+ CSVFreeMarkerTemplateBuilder builder2 = new CSVFreeMarkerTemplateBuilder(modelBuilder, ',', '\"', false, template);
template = builder2.buildTemplate();
- System.out.println(template);
+ //System.out.println(template);
assertEquals("<#list people as person>\n" +
"\"${person.fname?string}\",\"${person.lname?string}\",\"${person.address.country?string}\"\n" +
"</#list>",
template);
}
+ public void test_all_fields_mapped_01_includingFieldNames() throws TemplateBuilderException, IOException, ModelBuilderException {
+ CSVModelBuilder modelBuilder = new CSVModelBuilder("firstname", "lastname", "country");
+ CSVFreeMarkerTemplateBuilder builder1 = new CSVFreeMarkerTemplateBuilder(modelBuilder, ',', '\"', true);
+
+ //System.out.println(XmlUtil.serialize(model, true));
+
+ builder1.addCollectionMapping("people", getRecordElement(builder1.getModel()), "person");
+ builder1.addValueMapping("person.fname", getFieldElement(builder1.getModel(), "firstname"));
+ builder1.addValueMapping("person.lname", getFieldElement(builder1.getModel(), "lastname"));
+ builder1.addValueMapping("person.address.country", getFieldElement(builder1.getModel(), "country"));
+
+ String template = builder1.buildTemplate();
+ //System.out.println(template);
+ assertEquals("\"firstname\",\"lastname\",\"country\"\n" +
+ "<#list people as person>\n" +
+ "\"${person.fname?string}\",\"${person.lname?string}\",\"${person.address.country?string}\"\n" +
+ "</#list>",
+ template);
+
+ CSVFreeMarkerTemplateBuilder builder2 = new CSVFreeMarkerTemplateBuilder(modelBuilder, ',', '\"', true, template);
+ template = builder2.buildTemplate();
+ //System.out.println(template);
+ assertEquals("\"firstname\",\"lastname\",\"country\"\n" +
+ "<#list people as person>\n" +
+ "\"${person.fname?string}\",\"${person.lname?string}\",\"${person.address.country?string}\"\n" +
+ "</#list>",
+ template);
+ }
+
/**
* Same as test above accept it uses different delimiters.
* @throws ModelBuilderException
*/
public void test_all_fields_mapped_02() throws TemplateBuilderException, IOException, ModelBuilderException {
CSVModelBuilder modelBuilder = new CSVModelBuilder("firstname", "lastname", "country");
- CSVFreeMarkerTemplateBuilder builder1 = new CSVFreeMarkerTemplateBuilder(modelBuilder, '|', '\'');
+ CSVFreeMarkerTemplateBuilder builder1 = new CSVFreeMarkerTemplateBuilder(modelBuilder, '|', '\'', false);
builder1.addCollectionMapping("people", getRecordElement(builder1.getModel()), "person");
builder1.addValueMapping("person.fname", getFieldElement(builder1.getModel(), "firstname"));
@@ -82,7 +111,7 @@
"</#list>",
template);
- CSVFreeMarkerTemplateBuilder builder2 = new CSVFreeMarkerTemplateBuilder(modelBuilder, '|', '\'', template);
+ CSVFreeMarkerTemplateBuilder builder2 = new CSVFreeMarkerTemplateBuilder(modelBuilder, '|', '\'', false, template);
template = builder2.buildTemplate();
//System.out.println(template);
assertEquals("<#list people as person>\n" +
@@ -95,7 +124,7 @@
CSVModelBuilder modelBuilder = new CSVModelBuilder("firstname", "lastname", "country");
CSVFreeMarkerTemplateBuilder builder;
- builder = new CSVFreeMarkerTemplateBuilder(modelBuilder, ',', '\"');
+ builder = new CSVFreeMarkerTemplateBuilder(modelBuilder, ',', '\"', false);
builder.addCollectionMapping("people", getRecordElement(builder.getModel()), "person");
builder.addValueMapping("person.fname", getFieldElement(builder.getModel(), "firstname"));
@@ -108,7 +137,7 @@
"</#list>",
template);
- CSVFreeMarkerTemplateBuilder builder2 = new CSVFreeMarkerTemplateBuilder(modelBuilder, ',', '\"', template);
+ CSVFreeMarkerTemplateBuilder builder2 = new CSVFreeMarkerTemplateBuilder(modelBuilder, ',', '\"', false, template);
template = builder2.buildTemplate();
//System.out.println(template);
assertEquals("<#list people as person>\n" +
@@ -117,7 +146,7 @@
template);
try {
- new CSVFreeMarkerTemplateBuilder(modelBuilder, ';', '\"', template);
+ new CSVFreeMarkerTemplateBuilder(modelBuilder, ';', '\"', false, template);
fail("Expected TemplateBuilderException");
} catch(TemplateBuilderException e) {
assertEquals("CSV Template fieldset size does not match that of the specified message model. Check the supplied fieldset. Check the specified 'separator' and 'quote' characters match those used in the template.", e.getMessage());
@@ -128,7 +157,7 @@
CSVModelBuilder modelBuilder = new CSVModelBuilder("firstname", "lastname", "country");
CSVFreeMarkerTemplateBuilder builder;
- builder = new CSVFreeMarkerTemplateBuilder(modelBuilder, ',', '\"');
+ builder = new CSVFreeMarkerTemplateBuilder(modelBuilder, ',', '\"', false);
try {
// Shouldn't be able to add a value binding where the model target is inside
@@ -144,7 +173,7 @@
CSVModelBuilder modelBuilder = new CSVModelBuilder("firstname", "lastname", "country");
CSVFreeMarkerTemplateBuilder builder;
- builder = new CSVFreeMarkerTemplateBuilder(modelBuilder, ',', '\"');
+ builder = new CSVFreeMarkerTemplateBuilder(modelBuilder, ',', '\"', false);
try {
// For CSV, you need to have at least mapped the collection...
15 years, 11 months
- 1
- 0
JBoss Tools SVN: r19757 - trunk/jsf/docs/userguide/en/modules.
by jbosstools-commits＠lists.jboss.org
Author: smukhina
Date: 2010-01-14 12:49:29 -0500 (Thu, 14 Jan 2010)
New Revision: 19757
Modified:
trunk/jsf/docs/userguide/en/modules/editors.xml
Log:
https://jira.jboss.org/jira/browse/JBDS-933 Seam components templates - Page Preview section is update
Modified: trunk/jsf/docs/userguide/en/modules/editors.xml
===================================================================
--- trunk/jsf/docs/userguide/en/modules/editors.xml 2010-01-14 17:32:39 UTC (rev 19756)
+++ trunk/jsf/docs/userguide/en/modules/editors.xml 2010-01-14 17:49:29 UTC (rev 19757)
@@ -1885,157 +1885,299 @@
</section>
<section id="page_preview">
- <title>Page Preview</title>
-
- <para><property>VPE</property> comes with design-time preview feature which is available
- for:</para>
-
- <itemizedlist>
- <listitem>
- <para>Struts Pages</para>
- </listitem>
- <listitem>
- <para>JSF Pages</para>
- </listitem>
- </itemizedlist>
-
- <para><property>Preview view</property> is read-only, it shows how the page will look
- like in a browser.</para>
- <figure>
- <title>Preview View</title>
- <mediaobject>
- <imageobject>
- <imagedata fileref="images/visual_page/visual_page_16.png"/>
- </imageobject>
- </mediaobject>
- </figure>
-
- <!--para>You can even
- attach your stylesheet to the preview.</para-->
+ <title>Page Preview</title>
+ <para><property>VPE</property> comes with design-time preview feature which is available
+ for:</para>
+ <itemizedlist>
+ <listitem>
+ <para>Struts Pages</para>
+ </listitem>
+ <listitem>
+ <para>JSF Pages</para>
+ </listitem>
+ <listitem>
+ <para>Seam Pages</para>
+ </listitem>
+ </itemizedlist>
+ <para><property>Preview view</property> is read-only, it shows how the page will look
+ like in a browser.</para>
+ <figure>
+ <title>Preview View</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/visual_page/visual_page_16.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
+ <!--para>You can even
+ attach your stylesheet to the preview.</para-->
</section>
-
- <section id="custom_facelets_support">
- <title>Support for Custom Facelets Components</title>
-
- <para><property>Visual Page Editor</property> (starting from 3.0.0.M3 version of <property>JBoss Tools</property>) supports
- custom Facelets tag libraries both declared in the <literal>web.xml</literal> file
- (for details, see
- <ulink url="http://www.ibm.com/developerworks/java/library/j-facelets/#N10294">Creating a component</ulink>) and packed into the JAR file.</para>
-
- <tip>
- <title>Tip:</title>
- <para>In case of Facelets tag library packed in <literal>.jar</literal>, remember to put <literal>*.taglib.xml</literal> in right place:
- <literal>[filename].jar/META-INF/*.taglib.xml</literal></para>
- </tip>
-
- <para><property>Visual Page Editor</property> recognizes the tags from the custom Facelets tag library and correctly
- renders them both in source and visual view of the editor.</para>
-
- <figure>
- <title>Custom Facelets Tags in the VPE</title>
- <mediaobject>
- <imageobject>
- <imagedata fileref="images/visual_page/customFacelets1.png"/>
- </imageobject>
- </mediaobject>
- </figure>
-
- <para>While editing an XHTML file that uses a custom Facelets components
- you can always make use of the following editor's features:</para>
-
- <itemizedlist>
- <listitem>
- <para><link linkend="contentAssistForCustomFacelets">Content Assist for Custom Facelets Components</link></para>
- </listitem>
- <listitem>
- <para><link linkend="openOnForCustomFacelets">OpenOn for Custom Facelets Components</link></para>
- </listitem>
- </itemizedlist>
-
- <section id="contentAssistForCustomFacelets">
- <title>Content Assist for Custom Facelets Components</title>
- <para>Call the content assist as usual by using <emphasis><property>Ctrl+Space</property></emphasis>
- when typing a tag. As proposals you should see custom Facelets tags defined in your Facelets tag library.</para>
-
- <figure>
- <title>Content Assist for Custom Facelets Tags</title>
- <mediaobject>
- <imageobject>
- <imagedata fileref="images/visual_page/customFacelets2.png"/>
- </imageobject>
- </mediaobject>
- </figure>
- </section>
-
- <section id="openOnForCustomFacelets">
- <title>OpenOn for Custom Facelets Components</title>
-
- <para>While developing using Facelets you can make use of:</para>
- <itemizedlist>
- <listitem><para><link linkend="openOnInXHTML">OpenOn in XHTML Files That Use Custom Facelets Components</link></para></listitem>
- <listitem><para><link linkend="openOnInCustomFaceletsTaglibs">OpenOn in Custom Facelets Tag File (<literal>*.taglib.xml</literal>)</link></para></listitem>
- </itemizedlist>
-
- <section id="openOnInXHTML">
- <title>OpenOn in XHTML Files That Use Custom Facelets Components</title>
- <para>OpenOn functionality in XHTML files is available in two views of the <property>Visual Page Editor</property>:</para>
-
- <orderedlist>
- <listitem>
- <para>Source view</para>
-
- <para><emphasis><property>Ctrl+Click</property></emphasis> on the namespace will open the Facelets tag file
- in a separate window.</para>
-
- <figure>
- <title>Opening a Custom Facelets Tag File</title>
- <mediaobject>
- <imageobject>
- <imagedata fileref="images/visual_page/customFacelets3.png"/>
- </imageobject>
- </mediaobject>
- </figure>
-
- <para><emphasis><property>Ctrl+Click</property></emphasis> on any custom Facelets tag declared on the page will do the same.
- The selected tag will be highlighted in the opened file.</para>
-
- <figure>
- <title>Opening a Custom Facelets Tag File</title>
- <mediaobject>
- <imageobject>
- <imagedata fileref="images/visual_page/customFacelets4.png"/>
- </imageobject>
- </mediaobject>
- </figure>
- </listitem>
-
- <listitem>
- <para>Visual view</para>
-
- <para>In the visual view of the <property>VPE</property>, double-click a custom component and the Facelets tag file
- (<literal>*.taglib.xml</literal>) where it is declared will be opened.</para>
- </listitem>
- </orderedlist>
- </section>
-
- <section id="openOnInCustomFaceletsTaglibs">
- <title>OpenOn in Custom Facelets Tag File (<literal>*.taglib.xml</literal>)</title>
-
- <para><emphasis><property>Ctrl+Click</property></emphasis> on the path to source of the Facelets tag will
- open the component in its own editor.</para>
- <figure>
- <title>Opening a Custom Facelets Component</title>
- <mediaobject>
- <imageobject>
- <imagedata fileref="images/visual_page/customFacelets5.png"/>
- </imageobject>
- </mediaobject>
- </figure>
- </section>
-
- </section>
- </section>
-
+ <section id="custom_facelets_support">
+ <title>Support for Custom Facelets Components</title>
+ <para><property>Visual Page Editor</property> (starting from 3.0.0.M3 version of
+ <property>JBoss Tools</property>) supports custom Facelets tag libraries both
+ declared in the <literal>web.xml</literal> file (for details, see <ulink
+ url="http://www.ibm.com/developerworks/java/library/j-facelets/#N10294">Creating
+ a component</ulink>) and packed into the JAR file.</para>
+ <tip>
+ <title>Tip:</title>
+ <para>In case of Facelets tag library packed in <literal>.jar</literal>, remember to
+ put <literal>*.taglib.xml</literal> in right place: <literal
+ >[filename].jar/META-INF/*.taglib.xml</literal></para>
+ </tip>
+ <para><property>Visual Page Editor</property> recognizes the tags from the custom
+ Facelets tag library and correctly renders them both in source and visual view of
+ the editor.</para>
+ <figure>
+ <title>Custom Facelets Tags in the VPE</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/visual_page/customFacelets1.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
+ <para>While editing an XHTML file that uses a custom Facelets components you can always
+ make use of the following editor's features:</para>
+ <itemizedlist>
+ <listitem>
+ <para><link linkend="contentAssistForCustomFacelets">Content Assist for Custom
+ Facelets Components</link></para>
+ </listitem>
+ <listitem>
+ <para><link linkend="openOnForCustomFacelets">OpenOn for Custom Facelets
+ Components</link></para>
+ </listitem>
+ </itemizedlist>
+ <section id="contentAssistForCustomFacelets">
+ <title>Content Assist for Custom Facelets Components</title>
+ <para>Call the content assist as usual by using <emphasis><property
+ >Ctrl+Space</property></emphasis> when typing a tag. As proposals you
+ should see custom Facelets tags defined in your Facelets tag library.</para>
+ <figure>
+ <title>Content Assist for Custom Facelets Tags</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/visual_page/customFacelets2.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
+ </section>
+ <section id="openOnForCustomFacelets">
+ <title>OpenOn for Custom Facelets Components</title>
+ <para>While developing using Facelets you can make use of:</para>
+ <itemizedlist>
+ <listitem>
+ <para><link linkend="openOnInXHTML">OpenOn in XHTML Files That Use Custom
+ Facelets Components</link></para>
+ </listitem>
+ <listitem>
+ <para><link linkend="openOnInCustomFaceletsTaglibs">OpenOn in Custom
+ Facelets Tag File (<literal>*.taglib.xml</literal>)</link></para>
+ </listitem>
+ </itemizedlist>
+ <section id="openOnInXHTML">
+ <title>OpenOn in XHTML Files That Use Custom Facelets Components</title>
+ <para>OpenOn functionality in XHTML files is available in two views of the
+ <property>Visual Page Editor</property>:</para>
+ <orderedlist>
+ <listitem>
+ <para>Source view</para>
+ <para><emphasis><property>Ctrl+Click</property></emphasis> on the
+ namespace will open the Facelets tag file in a separate
+ window.</para>
+ <figure>
+ <title>Opening a Custom Facelets Tag File</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/visual_page/customFacelets3.png"
+ />
+ </imageobject>
+ </mediaobject>
+ </figure>
+ <para><emphasis><property>Ctrl+Click</property></emphasis> on any custom
+ Facelets tag declared on the page will do the same. The selected tag
+ will be highlighted in the opened file.</para>
+ <figure>
+ <title>Opening a Custom Facelets Tag File</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/visual_page/customFacelets4.png"
+ />
+ </imageobject>
+ </mediaobject>
+ </figure>
+ </listitem>
+ <listitem>
+ <para>Visual view</para>
+ <para>In the visual view of the <property>VPE</property>, double-click a
+ custom component and the Facelets tag file (<literal
+ >*.taglib.xml</literal>) where it is declared will be
+ opened.</para>
+ </listitem>
+ </orderedlist>
+ </section>
+ <section id="openOnInCustomFaceletsTaglibs">
+ <title>OpenOn in Custom Facelets Tag File (<literal
+ >*.taglib.xml</literal>)</title>
+ <para><emphasis><property>Ctrl+Click</property></emphasis> on the path to source
+ of the Facelets tag will open the component in its own editor.</para>
+ <figure>
+ <title>Opening a Custom Facelets Component</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/visual_page/customFacelets5.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
+ </section>
+ </section>
+ </section><title>Page Preview</title>
+ <para><property>VPE</property> comes with design-time preview feature which is available
+ for:</para>
+ <itemizedlist>
+ <listitem>
+ <para>Struts Pages</para>
+ </listitem>
+ <listitem>
+ <para>JSF Pages</para>
+ </listitem>
+ <listitem>
+ <para>Seam Pages</para>
+ </listitem>
+ </itemizedlist>
+ <para><property>Preview view</property> is read-only, it shows how the page will look
+ like in a browser.</para>
+ <figure>
+ <title>Preview View</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/visual_page/visual_page_16.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
+ <!--para>You can even
+ attach your stylesheet to the preview.</para-->
+ </section>
+ <section id="custom_facelets_support">
+ <title>Support for Custom Facelets Components</title>
+ <para><property>Visual Page Editor</property> (starting from 3.0.0.M3 version of
+ <property>JBoss Tools</property>) supports custom Facelets tag libraries both
+ declared in the <literal>web.xml</literal> file (for details, see <ulink
+ url="http://www.ibm.com/developerworks/java/library/j-facelets/#N10294">Creating
+ a component</ulink>) and packed into the JAR file.</para>
+ <tip>
+ <title>Tip:</title>
+ <para>In case of Facelets tag library packed in <literal>.jar</literal>, remember to
+ put <literal>*.taglib.xml</literal> in right place: <literal
+ >[filename].jar/META-INF/*.taglib.xml</literal></para>
+ </tip>
+ <para><property>Visual Page Editor</property> recognizes the tags from the custom
+ Facelets tag library and correctly renders them both in source and visual view of
+ the editor.</para>
+ <figure>
+ <title>Custom Facelets Tags in the VPE</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/visual_page/customFacelets1.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
+ <para>While editing an XHTML file that uses a custom Facelets components you can always
+ make use of the following editor's features:</para>
+ <itemizedlist>
+ <listitem>
+ <para><link linkend="contentAssistForCustomFacelets">Content Assist for Custom
+ Facelets Components</link></para>
+ </listitem>
+ <listitem>
+ <para><link linkend="openOnForCustomFacelets">OpenOn for Custom Facelets
+ Components</link></para>
+ </listitem>
+ </itemizedlist>
+ <section id="contentAssistForCustomFacelets">
+ <title>Content Assist for Custom Facelets Components</title>
+ <para>Call the content assist as usual by using <emphasis><property
+ >Ctrl+Space</property></emphasis> when typing a tag. As proposals you
+ should see custom Facelets tags defined in your Facelets tag library.</para>
+ <figure>
+ <title>Content Assist for Custom Facelets Tags</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/visual_page/customFacelets2.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
+ </section>
+ <section id="openOnForCustomFacelets">
+ <title>OpenOn for Custom Facelets Components</title>
+ <para>While developing using Facelets you can make use of:</para>
+ <itemizedlist>
+ <listitem>
+ <para><link linkend="openOnInXHTML">OpenOn in XHTML Files That Use Custom
+ Facelets Components</link></para>
+ </listitem>
+ <listitem>
+ <para><link linkend="openOnInCustomFaceletsTaglibs">OpenOn in Custom
+ Facelets Tag File (<literal>*.taglib.xml</literal>)</link></para>
+ </listitem>
+ </itemizedlist>
+ <section id="openOnInXHTML">
+ <title>OpenOn in XHTML Files That Use Custom Facelets Components</title>
+ <para>OpenOn functionality in XHTML files is available in two views of the
+ <property>Visual Page Editor</property>:</para>
+ <orderedlist>
+ <listitem>
+ <para>Source view</para>
+ <para><emphasis><property>Ctrl+Click</property></emphasis> on the
+ namespace will open the Facelets tag file in a separate
+ window.</para>
+ <figure>
+ <title>Opening a Custom Facelets Tag File</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/visual_page/customFacelets3.png"
+ />
+ </imageobject>
+ </mediaobject>
+ </figure>
+ <para><emphasis><property>Ctrl+Click</property></emphasis> on any custom
+ Facelets tag declared on the page will do the same. The selected tag
+ will be highlighted in the opened file.</para>
+ <figure>
+ <title>Opening a Custom Facelets Tag File</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/visual_page/customFacelets4.png"
+ />
+ </imageobject>
+ </mediaobject>
+ </figure>
+ </listitem>
+ <listitem>
+ <para>Visual view</para>
+ <para>In the visual view of the <property>VPE</property>, double-click a
+ custom component and the Facelets tag file (<literal
+ >*.taglib.xml</literal>) where it is declared will be
+ opened.</para>
+ </listitem>
+ </orderedlist>
+ </section>
+ <section id="openOnInCustomFaceletsTaglibs">
+ <title>OpenOn in Custom Facelets Tag File (<literal
+ >*.taglib.xml</literal>)</title>
+ <para><emphasis><property>Ctrl+Click</property></emphasis> on the path to source
+ of the Facelets tag will open the component in its own editor.</para>
+ <figure>
+ <title>Opening a Custom Facelets Component</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/visual_page/customFacelets5.png"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
+ </section>
+ </section>
+ </section>
<section id="SetupnotesforLinu895x">
<title>Setup notes for Linux</title>
15 years, 11 months
- 1
- 0
JBoss Tools SVN: r19756 - trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/preferences.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2010-01-14 12:32:39 -0500 (Thu, 14 Jan 2010)
New Revision: 19756
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/preferences/CDIPreferencesMessages.properties
Log:
https://jira.jboss.org/jira/browse/JBIDE-5683
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/preferences/CDIPreferencesMessages.properties
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/preferences/CDIPreferencesMessages.properties 2010-01-14 16:59:09 UTC (rev 19755)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/preferences/CDIPreferencesMessages.properties 2010-01-14 17:32:39 UTC (rev 19756)
@@ -45,69 +45,69 @@
##Scope
CDIValidatorConfigurationBlock_section_scope=Scope
CDIValidatorConfigurationBlock_pb_multipleScopeTypeAnnotations_label=Multiple scope annotations:
-CDIValidatorConfigurationBlock_pb_missingScopeWhenThereIsNoDefaultScope_label=
-CDIValidatorConfigurationBlock_pb_stereotypeDeclaresMoreThanOneScope_label=
-CDIValidatorConfigurationBlock_pb_illegalScopeForManagedBean_label=
-CDIValidatorConfigurationBlock_pb_illegalScopeForSessionBean_label=
-CDIValidatorConfigurationBlock_pb_illegalScopeForProducerMethod_label=
-CDIValidatorConfigurationBlock_pb_illegalScopeForProducerField_label=
-CDIValidatorConfigurationBlock_pb_illegalScopeWhenTypeInjectionPointIsInjected_label=
-CDIValidatorConfigurationBlock_pb_illegalScopeForInterceptor_label=
-CDIValidatorConfigurationBlock_pb_illegalScopeForDecorator_label=
+CDIValidatorConfigurationBlock_pb_missingScopeWhenThereIsNoDefaultScope_label=Missing scope when there is no default scope:
+CDIValidatorConfigurationBlock_pb_stereotypeDeclaresMoreThanOneScope_label=Stereotype declares more than one scope:
+CDIValidatorConfigurationBlock_pb_illegalScopeForManagedBean_label=Illegal scope for Managed Bean:
+CDIValidatorConfigurationBlock_pb_illegalScopeForSessionBean_label=Illegal scope for Session Bean:
+CDIValidatorConfigurationBlock_pb_illegalScopeForProducerMethod_label=Illegal scope for producer method:
+CDIValidatorConfigurationBlock_pb_illegalScopeForProducerField_label=Illegal scope for producer field:
+CDIValidatorConfigurationBlock_pb_illegalScopeWhenTypeInjectionPointIsInjected_label=Illegal scope when type injection point is injected:
+CDIValidatorConfigurationBlock_pb_illegalScopeForInterceptor_label=Illegal scope for interceptor:
+CDIValidatorConfigurationBlock_pb_illegalScopeForDecorator_label=Illegal scope for decorator:
##Member
CDIValidatorConfigurationBlock_section_member=Members
-CDIValidatorConfigurationBlock_pb_producerAnnotatedInject_label=
-CDIValidatorConfigurationBlock_pb_producerParameterIllegallyAnnotated_label=
-CDIValidatorConfigurationBlock_pb_observerAnnotatedInject_label=
-CDIValidatorConfigurationBlock_pb_observerParameterIllegallyAnnotated_label=
-CDIValidatorConfigurationBlock_pb_illegalProducerMethodInSessionBean_label=
-CDIValidatorConfigurationBlock_pb_multipleDisposingParameters_label=
-CDIValidatorConfigurationBlock_pb_disposerAnnotatedInject_label=
-CDIValidatorConfigurationBlock_pb_illegalDisposerInSessionBean_label=
-CDIValidatorConfigurationBlock_pb_noProducerMatchingDisposer_label=
-CDIValidatorConfigurationBlock_pb_multipleDisposersForProducer_label=
-CDIValidatorConfigurationBlock_pb_illegalProducerFieldInSessionBean_label=
-CDIValidatorConfigurationBlock_pb_multipleInjectionConstructors_label=
-CDIValidatorConfigurationBlock_pb_constructorParameterIllegallyAnnotated_label=
-CDIValidatorConfigurationBlock_pb_genericMethodAnnotatedInject_label=
-CDIValidatorConfigurationBlock_pb_multipleObservingParameters_label=
-CDIValidatorConfigurationBlock_pb_illegalObserverInSessionBean_label=
-CDIValidatorConfigurationBlock_pb_illegalConditionalObserver_label=
+CDIValidatorConfigurationBlock_pb_producerAnnotatedInject_label=Producer annotated inject:
+CDIValidatorConfigurationBlock_pb_producerParameterIllegallyAnnotated_label=Producer parameter illegally annotated:
+CDIValidatorConfigurationBlock_pb_observerAnnotatedInject_label=Observer annotated inject:
+CDIValidatorConfigurationBlock_pb_observerParameterIllegallyAnnotated_label=Observer parameter illegally annotated:
+CDIValidatorConfigurationBlock_pb_illegalProducerMethodInSessionBean_label=Illegal producer method in Session Bean:
+CDIValidatorConfigurationBlock_pb_multipleDisposingParameters_label=Multiple disposing parameters:
+CDIValidatorConfigurationBlock_pb_disposerAnnotatedInject_label=Disposer annotated inject:
+CDIValidatorConfigurationBlock_pb_illegalDisposerInSessionBean_label=Illegal disposer in Session Bean:
+CDIValidatorConfigurationBlock_pb_noProducerMatchingDisposer_label=No producer matching disposer:
+CDIValidatorConfigurationBlock_pb_multipleDisposersForProducer_label=Multiple disposers for producer:
+CDIValidatorConfigurationBlock_pb_illegalProducerFieldInSessionBean_label=Illegal producer field in Session Bean:
+CDIValidatorConfigurationBlock_pb_multipleInjectionConstructors_label=Multiple injection constructors:
+CDIValidatorConfigurationBlock_pb_constructorParameterIllegallyAnnotated_label=Constructor parameter illegally annotated:
+CDIValidatorConfigurationBlock_pb_genericMethodAnnotatedInject_label=Generic method annotated inject:
+CDIValidatorConfigurationBlock_pb_multipleObservingParameters_label=Multiple observing parameterts:
+CDIValidatorConfigurationBlock_pb_illegalObserverInSessionBean_label=Illegal observer in Session Bean:
+CDIValidatorConfigurationBlock_pb_illegalConditionalObserver_label=Illegal conditional observer:
##Interceptor & Decorator
CDIValidatorConfigurationBlock_section_interceptor_and_decorator=Interceptors & Decorators
CDIValidatorConfigurationBlock_pb_bothInterceptorAndDecorator_label=Both @Interceptor and @Decorator used:
CDIValidatorConfigurationBlock_pb_sessionBeanAnnotatedInterceptorOrDecorator_label=Session bean annotated @Interceptor or @Decorator:
-CDIValidatorConfigurationBlock_pb_producerInInterceptorOrDecorator_label=
-CDIValidatorConfigurationBlock_pb_disposerInInterceptorOrDecorator_label=
-CDIValidatorConfigurationBlock_pb_multipleDelegate_label=
-CDIValidatorConfigurationBlock_pb_missingDelegate_label=
-CDIValidatorConfigurationBlock_pb_illegalInjectionPointDelegate_label=
-CDIValidatorConfigurationBlock_pb_illegalBeanDeclaringDelegate_label=
-CDIValidatorConfigurationBlock_pb_delegateHasIllegalType_label=
-CDIValidatorConfigurationBlock_pb_illegalLifecycleCallbackInterceptorBinding_label=
-CDIValidatorConfigurationBlock_pb_illegalInterceptorBindingMethod_label=
-CDIValidatorConfigurationBlock_pb_conflictingInterceptorBindings_label=
-CDIValidatorConfigurationBlock_pb_observerInInterceptorOrDecorator_label=
-CDIValidatorConfigurationBlock_pb_interceptorOrDecoratorIsAlternative_label=
-CDIValidatorConfigurationBlock_pb_missingInterceptorBinding_label=
+CDIValidatorConfigurationBlock_pb_producerInInterceptorOrDecorator_label=Producer in interceptor or decorator:
+CDIValidatorConfigurationBlock_pb_disposerInInterceptorOrDecorator_label=Disposer in interceptor or decorator:
+CDIValidatorConfigurationBlock_pb_multipleDelegate_label=Multiple delegate:
+CDIValidatorConfigurationBlock_pb_missingDelegate_label=Missing delegate:
+CDIValidatorConfigurationBlock_pb_illegalInjectionPointDelegate_label=Illegal injection point delegate:
+CDIValidatorConfigurationBlock_pb_illegalBeanDeclaringDelegate_label=Illegal Bean declaring delegate:
+CDIValidatorConfigurationBlock_pb_delegateHasIllegalType_label=Delegate has illegal type:
+CDIValidatorConfigurationBlock_pb_illegalLifecycleCallbackInterceptorBinding_label=Illegal lifecycle callback interceptor binding:
+CDIValidatorConfigurationBlock_pb_illegalInterceptorBindingMethod_label=Illegal interceptor binding method:
+CDIValidatorConfigurationBlock_pb_conflictingInterceptorBindings_label=Conflicting interceptor binding:
+CDIValidatorConfigurationBlock_pb_observerInInterceptorOrDecorator_label=Observer in Interceptor or decorator:
+CDIValidatorConfigurationBlock_pb_interceptorOrDecoratorIsAlternative_label=Interceptor or decorator is alternative:
+CDIValidatorConfigurationBlock_pb_missingInterceptorBinding_label=Missing interceptor binding:
##Specializing
CDIValidatorConfigurationBlock_section_specializing=Specializing
-CDIValidatorConfigurationBlock_pb_illegalSpecializingManagedBean_label=
-CDIValidatorConfigurationBlock_pb_illegalSpecializingSessionBean_label=
-CDIValidatorConfigurationBlock_pb_illegalSpecializingProducer_label=
-CDIValidatorConfigurationBlock_pb_missingTypeInSpecializingBean_label=
-CDIValidatorConfigurationBlock_pb_conflictingNameInSpecializingBean_label=
-CDIValidatorConfigurationBlock_pb_interceptorAnnotatedSpecializes_label=
-CDIValidatorConfigurationBlock_pb_decoratorAnnotatedSpecializes_label=
+CDIValidatorConfigurationBlock_pb_illegalSpecializingManagedBean_label=Illegal Specializing Managed Bean:
+CDIValidatorConfigurationBlock_pb_illegalSpecializingSessionBean_label=Illegal specializing Session Bean:
+CDIValidatorConfigurationBlock_pb_illegalSpecializingProducer_label=Illegal Specializing producer:
+CDIValidatorConfigurationBlock_pb_missingTypeInSpecializingBean_label=Missing type in specializing Bean:
+CDIValidatorConfigurationBlock_pb_conflictingNameInSpecializingBean_label=Conflicting name in specializing Bean:
+CDIValidatorConfigurationBlock_pb_interceptorAnnotatedSpecializes_label=Interceptor annotated specializes:
+CDIValidatorConfigurationBlock_pb_decoratorAnnotatedSpecializes_label=Decorator annotated specializes:
##Miscellaneous
CDIValidatorConfigurationBlock_section_miscellaneous=Miscellaneous
-CDIValidatorConfigurationBlock_pb_illegalInjectingUserTransactionType_label=
-CDIValidatorConfigurationBlock_pb_illegalInjectingInjectionPointType_label=
-CDIValidatorConfigurationBlock_pb_illegalQualifierInStereotype_label=
+CDIValidatorConfigurationBlock_pb_illegalInjectingUserTransactionType_label=Illegal injecting user transaction type:
+CDIValidatorConfigurationBlock_pb_illegalInjectingInjectionPointType_label=Illegal injecting injection point type:
+CDIValidatorConfigurationBlock_pb_illegalQualifierInStereotype_label=Illegal qualifier in stereotype:
CDI_VALIDATOR_PREFERENCE_PAGE_CDI_VALIDATOR=CDI Validator
15 years, 11 months
- 1
- 0
JBoss Tools SVN: r19755 - in trunk/jsf: tests/org.jboss.tools.jsf.vpe.jsf.test/META-INF and 3 other directories.
by jbosstools-commits＠lists.jboss.org
Author: yzhishko
Date: 2010-01-14 11:59:09 -0500 (Thu, 14 Jan 2010)
New Revision: 19755
Added:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/WEB-INF/lib/primefaces-2.0.0.RC.jar
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/TaglibXMLUnformatedDTD_JBIDE5642.java
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/facelet/model/FaceletTaglibEntityRecognizer.java
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/META-INF/MANIFEST.MF
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-5642 - fixed bad formated DTD
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/facelet/model/FaceletTaglibEntityRecognizer.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/facelet/model/FaceletTaglibEntityRecognizer.java 2010-01-14 16:31:11 UTC (rev 19754)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/facelet/model/FaceletTaglibEntityRecognizer.java 2010-01-14 16:59:09 UTC (rev 19755)
@@ -7,30 +7,103 @@
*
* Contributors:
* Exadel, Inc. and Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
+ ******************************************************************************/
package org.jboss.tools.jsf.facelet.model;
+import java.io.IOException;
+import java.io.Reader;
+import java.io.StringReader;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
import org.jboss.tools.common.model.loaders.EntityRecognizer;
+import org.w3c.dom.Document;
+import org.xml.sax.EntityResolver;
+import org.xml.sax.ErrorHandler;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
+import org.xml.sax.SAXParseException;
/**
* @author Viacheslav Kabanovich
*/
-public class FaceletTaglibEntityRecognizer implements EntityRecognizer, FaceletTaglibConstants {
+public class FaceletTaglibEntityRecognizer implements EntityRecognizer,
+ FaceletTaglibConstants {
- public String getEntityName(String ext, String body) {
- if (body == null) return null;
- if (body.indexOf(DOC_PUBLICID) > 0) return ENT_FACELET_TAGLIB;
- if(is20(body)) return ENT_FACELET_TAGLIB_20;
- return null;
- }
+ public String getEntityName(String ext, String body) {
+ if (body == null)
+ return null;
+ String doctype = getUnforamtedDoctypeFromBody(body);
+ if (doctype != null && !doctype.equals("")) { //$NON-NLS-1$
+ doctype = checkDocType(doctype);
+ if (doctype.indexOf(DOC_PUBLICID) > -1)
+ return ENT_FACELET_TAGLIB;
+ }
+ if (is20(body))
+ return ENT_FACELET_TAGLIB_20;
+ return null;
+ }
- private boolean is20(String body) {
- int i = body.indexOf("<facelet-taglib"); //$NON-NLS-1$
- if(i < 0) return false;
- int j = body.indexOf(">", i); //$NON-NLS-1$
- if(j < 0) return false;
- String s = body.substring(i, j);
- return s.indexOf("version=\"2.0\"") > 0 && //$NON-NLS-1$
- s.indexOf("\"http://java.sun.com/xml/ns/javaee\"") > 0; //$NON-NLS-1$
- }
+ private boolean is20(String body) {
+ int i = body.indexOf("<facelet-taglib"); //$NON-NLS-1$
+ if (i < 0)
+ return false;
+ int j = body.indexOf(">", i); //$NON-NLS-1$
+ if (j < 0)
+ return false;
+ String s = body.substring(i, j+1);
+ return s.indexOf("version=\"2.0\"") > 0 && //$NON-NLS-1$
+ s.indexOf("\"http://java.sun.com/xml/ns/javaee\"") > 0; //$NON-NLS-1$
+ }
+
+ private String checkDocType(String docTypeString) {
+ final StringBuffer docTypeBuffer = new StringBuffer(""); //$NON-NLS-1$
+ Reader xml = new StringReader(docTypeString + "<root></root>"); //$NON-NLS-1$
+ DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+ dbf.setNamespaceAware(true);
+ dbf.setValidating(true);
+ try {
+ DocumentBuilder db = dbf.newDocumentBuilder();
+ db.setErrorHandler(new ErrorHandler() {
+ public void warning(SAXParseException exception)
+ throws SAXException {
+ }
+
+ public void fatalError(SAXParseException exception)
+ throws SAXException {
+ }
+
+ public void error(SAXParseException exception)
+ throws SAXException {
+ }
+ });
+ db.setEntityResolver(new EntityResolver() {
+ public InputSource resolveEntity(String publicId,
+ String systemId) throws SAXException, IOException {
+ docTypeBuffer.append(publicId);
+ return new InputSource(new StringReader("")); //$NON-NLS-1$
+ }
+ });
+ @SuppressWarnings("unused")
+ Document dom = db.parse(new InputSource(xml));
+ } catch (Exception e) {
+ return docTypeBuffer.toString();
+ } finally {
+ try {
+ xml.close();
+ } catch (IOException e) {
+ }
+ }
+ return docTypeBuffer.toString();
+ }
+
+ private String getUnforamtedDoctypeFromBody(String body) {
+ int i = body.indexOf("<!DOCTYPE"); //$NON-NLS-1$
+ if (i < 0)
+ return null;
+ int j = body.indexOf(">", i); //$NON-NLS-1$
+ if (j < 0)
+ return null;
+ return body.substring(i, j+1);
+ }
+
}
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/META-INF/MANIFEST.MF 2010-01-14 16:31:11 UTC (rev 19754)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/META-INF/MANIFEST.MF 2010-01-14 16:59:09 UTC (rev 19755)
@@ -28,7 +28,8 @@
org.jboss.tools.common.model.ui;bundle-version="2.0.0",
org.eclipse.wst.xml.ui;bundle-version="1.1.0",
org.eclipse.jdt.ui;bundle-version="3.5.0",
- org.jboss.tools.common.ui
+ org.jboss.tools.common.ui,
+ org.jboss.tools.jst.web.ui;bundle-version="2.0.0"
Bundle-ClassPath: jsf-test.jar
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/WEB-INF/lib/primefaces-2.0.0.RC.jar
===================================================================
(Binary files differ)
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/WEB-INF/lib/primefaces-2.0.0.RC.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java 2010-01-14 16:31:11 UTC (rev 19754)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java 2010-01-14 16:59:09 UTC (rev 19755)
@@ -68,6 +68,7 @@
import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE4510Test;
import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE4534Test;
import org.jboss.tools.jsf.vpe.jsf.test.jbide.OpenOnJsf20Test_JBIDE5382;
+import org.jboss.tools.jsf.vpe.jsf.test.jbide.TaglibXMLUnformatedDTD_JBIDE5642;
import org.jboss.tools.jsf.vpe.jsf.test.jbide.TestFViewLocaleAttribute_JBIDE5218;
import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE675Test;
import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE788Test;
@@ -186,7 +187,8 @@
suite.addTestSuite(NullPointerWithStyleProperty_JBIDE5193.class);
suite.addTestSuite(TestFViewLocaleAttribute_JBIDE5218.class);
suite.addTestSuite(TestOpenOnForXhtmlFiles_JBIDE5577.class);
-
+ suite.addTestSuite(TaglibXMLUnformatedDTD_JBIDE5642.class);
+
// $JUnit-END$
// added by Max Areshkau
// add here projects which should be imported for junit tests
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/TaglibXMLUnformatedDTD_JBIDE5642.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/TaglibXMLUnformatedDTD_JBIDE5642.java (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/TaglibXMLUnformatedDTD_JBIDE5642.java 2010-01-14 16:59:09 UTC (rev 19755)
@@ -0,0 +1,118 @@
+/*******************************************************************************
+ * Copyright (c) 2007-2010 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributor:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+
+package org.jboss.tools.jsf.vpe.jsf.test.jbide;
+
+import java.util.StringTokenizer;
+import org.eclipse.jface.viewers.TreeViewer;
+import org.eclipse.swt.widgets.Tree;
+import org.eclipse.swt.widgets.TreeItem;
+import org.eclipse.swt.widgets.Widget;
+import org.eclipse.ui.IViewPart;
+import org.eclipse.ui.PlatformUI;
+import org.jboss.tools.jst.web.ui.navigator.WebProjectsNavigator;
+import org.jboss.tools.vpe.ui.test.TestUtil;
+import org.jboss.tools.vpe.ui.test.VpeTest;
+
+/**
+ *
+ * @author yzhishko
+ *
+ */
+
+public class TaglibXMLUnformatedDTD_JBIDE5642 extends VpeTest {
+
+ private static final String WEB_PROJECTS_VIEW_ID = "org.jboss.tools.jst.web.ui.navigator.WebProjectsView"; //$NON-NLS-1$
+ private static final String PACKAGE_EXPLORER_VIEW_ID = "org.eclipse.jdt.ui.PackageExplorer"; //$NON-NLS-1$
+ private static final String LIB_PATH = "jsfTest/Tag Libraries/"; //$NON-NLS-1$
+ private static final String LIB_NAME_I = "primefaces-i.taglib.xml - primefaces-2.0.0.RC.jar"; //$NON-NLS-1$
+ private static final String LIB_NAME_P = "primefaces-p.taglib.xml - primefaces-2.0.0.RC.jar"; //$NON-NLS-1$
+
+ private IViewPart webProjectsView;
+
+ public TaglibXMLUnformatedDTD_JBIDE5642(String name) {
+ super(name);
+ }
+
+ public void testTaglibXMLUnformatedDTD() throws Throwable {
+ webProjectsView = PlatformUI.getWorkbench().getActiveWorkbenchWindow()
+ .getActivePage().showView(WEB_PROJECTS_VIEW_ID);
+ assertNotNull("Web Projects view is not available", webProjectsView); //$NON-NLS-1$
+ TestUtil.delay(2000);
+ TestUtil.waitForJobs();
+
+ WebProjectsNavigator projectsNavigator = (WebProjectsNavigator) webProjectsView;
+ TreeViewer treeViewer = projectsNavigator.getViewer();
+ assertNotNull(treeViewer);
+
+ Object testLibI = findElementByPath(LIB_PATH + LIB_NAME_I, treeViewer);
+ assertNotNull("The tag library " + LIB_NAME_I + " was not found", //$NON-NLS-1$ //$NON-NLS-2$
+ testLibI);
+
+ Object testLibP = findElementByPath(LIB_PATH + LIB_NAME_P, treeViewer);
+ assertNotNull("The tag library " + LIB_NAME_P + " was not found", //$NON-NLS-1$ //$NON-NLS-2$
+ testLibP);
+ }
+
+ private Object findElementByPath(String path, final TreeViewer searchTreeViwer) {
+ Tree searchTree = searchTreeViwer.getTree();
+ if (searchTree == null || path == null) {
+ return null;
+ }
+ StringTokenizer tokenizer = new StringTokenizer(path, "/", false); //$NON-NLS-1$
+ TreeItem childItem = getItemByName(tokenizer.nextToken(), searchTree);
+ if (childItem != null) {
+ searchTreeViwer.expandToLevel(childItem.getData(), 1);
+ } else {
+ return null;
+ }
+ while (tokenizer.hasMoreTokens()) {
+ childItem = getItemByName(tokenizer.nextToken(), childItem);
+ if (childItem != null) {
+ searchTreeViwer.expandToLevel(childItem.getData(), 1);
+ } else {
+ return null;
+ }
+ }
+ return childItem.getData();
+ }
+
+ private TreeItem getItemByName(String elementName, Widget rootItem) {
+ if (rootItem == null || elementName == null) {
+ return null;
+ }
+ TreeItem[] children = null;
+ if (rootItem instanceof Tree) {
+ children = ((Tree) rootItem).getItems();
+ } else if (rootItem instanceof TreeItem) {
+ children = ((TreeItem) rootItem).getItems();
+ }
+ if (children == null) {
+ return null;
+ }
+ for (int i = 0; i < children.length; i++) {
+ if (elementName.equals(children[i].getText())) {
+ return children[i];
+ }
+ }
+ return null;
+ }
+
+ @Override
+ protected void tearDown() throws Exception {
+ PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage()
+ .hideView(webProjectsView);
+ PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage()
+ .showView(PACKAGE_EXPLORER_VIEW_ID);
+ super.tearDown();
+ }
+
+}
15 years, 11 months
- 1
- 0
JBoss Tools SVN: r19753 - trunk/documentation/guides/GettingStartedGuide/en/images/first_seam.
by jbosstools-commits＠lists.jboss.org
Author: smukhina
Date: 2010-01-14 11:25:46 -0500 (Thu, 14 Jan 2010)
New Revision: 19753
Modified:
trunk/documentation/guides/GettingStartedGuide/en/images/first_seam/first_seam4.png
trunk/documentation/guides/GettingStartedGuide/en/images/first_seam/first_seam5.png
Log:
https://jira.jboss.org/jira/browse/JBDS-926 Maven WTP 3.1 Library Providers are added screens are updated
Modified: trunk/documentation/guides/GettingStartedGuide/en/images/first_seam/first_seam4.png
===================================================================
(Binary files differ)
Modified: trunk/documentation/guides/GettingStartedGuide/en/images/first_seam/first_seam5.png
===================================================================
(Binary files differ)
15 years, 11 months
- 1
- 0
JBoss Tools SVN: r19752 - trunk/vpe/plugins/org.jboss.tools.vpe/ve.
by jbosstools-commits＠lists.jboss.org
Author: yradtsevich
Date: 2010-01-14 11:04:04 -0500 (Thu, 14 Jan 2010)
New Revision: 19752
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/ve/init.html
Log:
https://jira.jboss.org/jira/browse/JBIDE-5603
Incorrect selection for HTML DOCTYPE
VPE fails if the style of the BODY tag is display:table, it is fixed by setting this style to the HTML tag.
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/ve/init.html
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/ve/init.html 2010-01-14 16:00:09 UTC (rev 19751)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/ve/init.html 2010-01-14 16:04:04 UTC (rev 19752)
@@ -29,9 +29,15 @@
.__any__tag__none {
display: none;
}
+
+ html {
+ height: 100%;
+ width: 100%;
+ display: table !important;
+ }
#__content__area__ {
- display: table;
+ display:table-cell !important;/*if display:table, VPE will fail*/
width:100%;
height:100%;
min-height:50px;
@@ -58,7 +64,7 @@
font-size: 13.3333px;
line-height:1.6;
-moz-user-select: normal;
- }
+ }
-->
</style>
</head>
15 years, 11 months
- 1
- 0
JBoss Tools SVN: r19751 - in trunk/jst/plugins/org.jboss.tools.jst.web: catalog and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2010-01-14 11:00:09 -0500 (Thu, 14 Jan 2010)
New Revision: 19751
Added:
trunk/jst/plugins/org.jboss.tools.jst.web/catalog/web-facelettaglibrary_2_0.xsd
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web/plugin.xml
trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tld/TaglibMapping.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-5670
Added: trunk/jst/plugins/org.jboss.tools.jst.web/catalog/web-facelettaglibrary_2_0.xsd
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web/catalog/web-facelettaglibrary_2_0.xsd (rev 0)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/catalog/web-facelettaglibrary_2_0.xsd 2010-01-14 16:00:09 UTC (rev 19751)
@@ -0,0 +1,512 @@
+<?xml version = "1.0" encoding = "UTF-8"?>
+
+<xsd:schema
+ targetNamespace="http://java.sun.com/xml/ns/javaee"
+ xmlns:javaee="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ xmlns:xml="http://www.w3.org/XML/1998/namespace"
+ elementFormDefault="qualified"
+ attributeFormDefault="unqualified"
+ version="2.0">
+ <xsd:include schemaLocation="javaee_5.xsd"/>
+
+ <xsd:annotation>
+ <xsd:documentation>
+
+ DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+
+ Copyright 2003-2009 Sun Microsystems, Inc. All rights reserved.
+
+ The contents of this file are subject to the terms of either the
+ GNU General Public License Version 2 only ("GPL") or the Common
+ Development and Distribution License("CDDL") (collectively, the
+ "License"). You may not use this file except in compliance with
+ the License. You can obtain a copy of the License at
+ https://glassfish.dev.java.net/public/CDDL+GPL.html or
+ glassfish/bootstrap/legal/LICENSE.txt. See the License for the
+ specific language governing permissions and limitations under the
+ License.
+
+ When distributing the software, include this License Header
+ Notice in each file and include the License file at
+ glassfish/bootstrap/legal/LICENSE.txt. Sun designates this
+ particular file as subject to the "Classpath" exception as
+ provided by Sun in the GPL Version 2 section of the License file
+ that accompanied this code. If applicable, add the following
+ below the License Header, with the fields enclosed by brackets []
+ replaced by your own identifying information:
+ "Portions Copyrighted [year] [name of copyright owner]"
+
+ Contributor(s):
+
+ If you wish your version of this file to be governed by only the
+ CDDL or only the GPL Version 2, indicate your decision by adding
+ "[Contributor] elects to include this software in this
+ distribution under the [CDDL or GPL Version 2] license." If you
+ don't indicate a single choice of license, a recipient has the
+ option to distribute your version of this file under either the
+ CDDL, the GPL Version 2 or to extend the choice of license to its
+ licensees as provided above. However, if you add GPL Version 2
+ code and therefore, elected the GPL Version 2 license, then the
+ option applies only if the new code is made subject to such
+ option by the copyright holder.
+
+ </xsd:documentation>
+ </xsd:annotation>
+
+<xsd:annotation>
+ <xsd:documentation>
+
+ <![CDATA[
+
+ The XML Schema for the Tag Libraries in the JavaServer Faces
+ Standard Facelets View Declaration Language (Facelets VDL)
+ (Version 2.0).
+
+ JSF 2.0 Facelet Tag Libraries that wish to conform to this
+ schema must declare it in the following manner.
+
+ <facelet-taglib xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facelettaglibary_2_0.xsd"
+ version="2.0">
+
+ ...
+
+ </facelet-taglib>
+
+ The instance documents may indicate the published
+ version of the schema using xsi:schemaLocation attribute
+ for javaee namespace with the following location:
+
+ http://java.sun.com/xml/ns/javaee/web-facelettaglibary_2_0.xsd
+
+ ]]>
+
+ </xsd:documentation>
+ </xsd:annotation>
+
+
+
+ <xsd:element name="facelet-taglib" type="javaee:facelet-taglibType">
+ <xsd:unique name="facelet-taglib-tagname-uniqueness">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ tag-names must be unique within a document.
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:selector xpath="javaee:tag"/>
+ <xsd:field xpath="javaee:tag-name"/>
+ </xsd:unique>
+ <xsd:unique name="faces-config-behavior-ID-uniqueness">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ Behavior IDs must be unique within a document.
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:selector xpath="javaee:behavior"/>
+ <xsd:field xpath="javaee:behavior-id"/>
+ </xsd:unique>
+ <xsd:unique name="faces-config-converter-ID-uniqueness">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ Converter IDs must be unique within a document.
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:selector xpath="javaee:converter"/>
+ <xsd:field xpath="javaee:converter-id"/>
+ </xsd:unique>
+ <xsd:unique name="faces-config-validator-ID-uniqueness">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ Validator IDs must be unique within a document.
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:selector xpath="javaee:validator"/>
+ <xsd:field xpath="javaee:validator-id"/>
+ </xsd:unique>
+ </xsd:element>
+ <xsd:complexType name="facelet-taglibType">
+ <xsd:annotation>
+ <xsd:documentation>
+ The top level XML element in a facelet tag library XML file.
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:sequence>
+ <xsd:group ref="javaee:descriptionGroup"/>
+ <xsd:choice>
+ <xsd:element name="library-class"
+ type="javaee:fully-qualified-classType"/>
+ <xsd:sequence>
+ <xsd:element name="namespace" type="javaee:string"/>
+ <xsd:element minOccurs="0" maxOccurs="1"
+ name="composite-library-name"
+ type="javaee:fully-qualified-classType"/>
+ <xsd:choice minOccurs="0" maxOccurs="unbounded">
+ <xsd:element name="tag"
+ type="javaee:facelet-taglib-tagType"/>
+ <xsd:element name="function"
+ type="javaee:facelet-taglib-functionType"/>
+
+ </xsd:choice>
+ </xsd:sequence>
+ </xsd:choice>
+ <xsd:element name="taglib-extension"
+ type="javaee:facelet-taglib-extensionType"
+ minOccurs="0"
+ maxOccurs="unbounded"/>
+ </xsd:sequence>
+ <xsd:attribute name="id" type="xsd:ID"/>
+ <xsd:attribute name="version"
+ type="javaee:facelet-taglib-versionType"
+ use="required"/>
+ </xsd:complexType>
+ <xsd:complexType name="facelet-taglib-extensionType">
+ <xsd:annotation>
+ <xsd:documentation>
+ Extension element for facelet-taglib. It may contain
+ implementation specific content.
+ </xsd:documentation>
+ </xsd:annotation>
+
+ <xsd:sequence>
+ <xsd:any namespace="##any"
+ processContents="lax"
+ minOccurs="0"
+ maxOccurs="unbounded"/>
+ </xsd:sequence>
+ <xsd:attribute name="id" type="xsd:ID"/>
+ </xsd:complexType>
+
+ <xsd:complexType name="facelet-taglib-tagType">
+ <xsd:annotation>
+ <xsd:documentation>
+ If the tag library XML file contains individual tag
+ declarations rather than pointing to a library-class or a
+ declaring a composite-library name, the individual tags are
+ enclosed in tag elements.
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:sequence>
+ <xsd:group ref="javaee:descriptionGroup"/>
+ <xsd:element name="tag-name"
+ type="javaee:facelet-taglib-canonical-nameType"/>
+ <xsd:choice>
+ <xsd:element name="handler-class"
+ type="javaee:fully-qualified-classType"/>
+ <xsd:element name="behavior"
+ type="javaee:facelet-taglib-tag-behaviorType"/>
+ <xsd:element name="component"
+ type="javaee:facelet-taglib-tag-componentType"/>
+ <xsd:element name="converter"
+ type="javaee:facelet-taglib-tag-converterType"/>
+ <xsd:element name="validator"
+ type="javaee:facelet-taglib-tag-validatorType"/>
+ <xsd:element name="source" type="javaee:string"/>
+ </xsd:choice>
+ <xsd:element name="attribute"
+ type="javaee:facelet-taglib-tag-attributeType"
+ minOccurs="0"
+ maxOccurs="unbounded"/>
+ <xsd:element name="tag-extension"
+ type="javaee:facelet-taglib-tag-extensionType"
+ minOccurs="0"
+ maxOccurs="unbounded"/>
+ </xsd:sequence>
+ </xsd:complexType>
+
+ <!-- **************************************************** -->
+
+ <xsd:complexType name="facelet-taglib-tag-attributeType">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ The attribute element defines an attribute for the nesting
+ tag. The attribute element may have several subelements
+ defining:
+
+ description a description of the attribute
+
+ name the name of the attribute
+
+ required whether the attribute is required or
+ optional
+
+ type the type of the attribute
+
+ </xsd:documentation>
+ </xsd:annotation>
+
+ <xsd:sequence>
+ <xsd:group ref="javaee:descriptionGroup"/>
+ <xsd:element name="name"
+ type="javaee:xsdNMTOKENType"/>
+ <xsd:element name="required"
+ type="javaee:generic-booleanType"
+ minOccurs="0">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ Defines if the nesting attribute is required or
+ optional.
+
+ If not present then the default is "false", i.e
+ the attribute is optional.
+
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+ <xsd:choice>
+ <xsd:element name="type"
+ type="javaee:fully-qualified-classType"
+ minOccurs="0">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ Defines the Java type of the attributes
+ value. If this element is omitted, the
+ expected type is assumed to be
+ "java.lang.Object".
+
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+ <xsd:element name="method-signature"
+ type="javaee:string"
+ minOccurs="0">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ Defines the method signature for a MethodExpression-
+ enabled attribute.
+
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+ </xsd:choice>
+ </xsd:sequence>
+ <xsd:attribute name="id" type="xsd:ID"/>
+ </xsd:complexType>
+
+
+ <xsd:complexType name="facelet-taglib-tag-extensionType">
+ <xsd:annotation>
+ <xsd:documentation>
+ Extension element for tag It may contain
+ implementation specific content.
+ </xsd:documentation>
+ </xsd:annotation>
+
+ <xsd:sequence>
+ <xsd:any namespace="##any"
+ processContents="lax"
+ minOccurs="0"
+ maxOccurs="unbounded"/>
+ </xsd:sequence>
+ <xsd:attribute name="id" type="xsd:ID"/>
+ </xsd:complexType>
+
+ <xsd:complexType name="facelet-taglib-functionType">
+ <xsd:annotation>
+ <xsd:documentation>
+ If the tag library XML file contains individual function
+ declarations rather than pointing to a library-class or a
+ declaring a composite-library name, the individual functions are
+ enclosed in function elements.
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:sequence>
+ <xsd:group ref="javaee:descriptionGroup"/>
+ <xsd:element name="function-name" type="javaee:string"/>
+ <xsd:element name="function-class"
+ type="javaee:fully-qualified-classType"/>
+ <xsd:element name="function-signature" type="javaee:string"/>
+ </xsd:sequence>
+ </xsd:complexType>
+ <xsd:complexType name="facelet-taglib-tag-behaviorType">
+ <xsd:annotation>
+ <xsd:documentation>
+ Within a tag element, the behavior element encapsulates
+ information specific to a JSF Behavior.
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:sequence>
+ <xsd:group ref="javaee:descriptionGroup"/>
+ <xsd:element minOccurs="1" maxOccurs="1"
+ name="behavior-id" type="javaee:string"/>
+ <xsd:element minOccurs="0" maxOccurs="1"
+ name="handler-class"
+ type="javaee:fully-qualified-classType"/>
+ <xsd:element name="behavior-extension"
+ type="javaee:facelet-taglib-tag-behavior-extensionType"
+ minOccurs="0"
+ maxOccurs="unbounded"/>
+ </xsd:sequence>
+ </xsd:complexType>
+ <xsd:complexType name="facelet-taglib-tag-behavior-extensionType">
+ <xsd:annotation>
+ <xsd:documentation>
+ Extension element for behavior. It may contain
+ implementation specific content.
+ </xsd:documentation>
+ </xsd:annotation>
+
+ <xsd:sequence>
+ <xsd:any namespace="##any"
+ processContents="lax"
+ minOccurs="0"
+ maxOccurs="unbounded"/>
+ </xsd:sequence>
+ <xsd:attribute name="id" type="xsd:ID"/>
+ </xsd:complexType>
+ <xsd:complexType name="facelet-taglib-tag-componentType">
+ <xsd:annotation>
+ <xsd:documentation>
+ Within a tag element, the component element encapsulates
+ information specific to a JSF UIComponent.
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:sequence>
+ <xsd:group ref="javaee:descriptionGroup"/>
+ <xsd:element name="component-type" type="javaee:string"/>
+ <xsd:element minOccurs="0" maxOccurs="1"
+ name="renderer-type" type="javaee:string"/>
+ <xsd:element minOccurs="0" maxOccurs="1"
+ name="handler-class"
+ type="javaee:fully-qualified-classType"/>
+ <xsd:element name="component-extension"
+ type="javaee:facelet-taglib-tag-component-extensionType"
+ minOccurs="0"
+ maxOccurs="unbounded"/>
+
+ </xsd:sequence>
+ </xsd:complexType>
+ <xsd:complexType name="facelet-taglib-tag-component-extensionType">
+ <xsd:annotation>
+ <xsd:documentation>
+ Extension element for component It may contain
+ implementation specific content.
+ </xsd:documentation>
+ </xsd:annotation>
+
+ <xsd:sequence>
+ <xsd:any namespace="##any"
+ processContents="lax"
+ minOccurs="0"
+ maxOccurs="unbounded"/>
+ </xsd:sequence>
+ <xsd:attribute name="id" type="xsd:ID"/>
+ </xsd:complexType>
+
+ <xsd:complexType name="facelet-taglib-tag-converterType">
+ <xsd:annotation>
+ <xsd:documentation>
+ Within a tag element, the converter element encapsulates
+ information specific to a JSF Converter.
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:sequence>
+ <xsd:group ref="javaee:descriptionGroup"/>
+ <xsd:element minOccurs="1" maxOccurs="1"
+ name="converter-id" type="javaee:string"/>
+ <xsd:element minOccurs="0" maxOccurs="1"
+ name="handler-class"
+ type="javaee:fully-qualified-classType"/>
+ <xsd:element name="converter-extension"
+ type="javaee:facelet-taglib-tag-converter-extensionType"
+ minOccurs="0"
+ maxOccurs="unbounded"/>
+ </xsd:sequence>
+ </xsd:complexType>
+ <xsd:complexType name="facelet-taglib-tag-converter-extensionType">
+ <xsd:annotation>
+ <xsd:documentation>
+ Extension element for converter It may contain
+ implementation specific content.
+ </xsd:documentation>
+ </xsd:annotation>
+
+ <xsd:sequence>
+ <xsd:any namespace="##any"
+ processContents="lax"
+ minOccurs="0"
+ maxOccurs="unbounded"/>
+ </xsd:sequence>
+ <xsd:attribute name="id" type="xsd:ID"/>
+ </xsd:complexType>
+
+ <xsd:complexType name="facelet-taglib-tag-validatorType">
+ <xsd:annotation>
+ <xsd:documentation>
+ Within a tag element, the validator element encapsulates
+ information specific to a JSF Validator.
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:sequence>
+ <xsd:group ref="javaee:descriptionGroup"/>
+ <xsd:element minOccurs="1" maxOccurs="1"
+ name="validator-id" type="javaee:string"/>
+ <xsd:element minOccurs="0" maxOccurs="1"
+ name="handler-class"
+ type="javaee:fully-qualified-classType"/>
+ <xsd:element name="validator-extension"
+ type="javaee:facelet-taglib-tag-validator-extensionType"
+ minOccurs="0"
+ maxOccurs="unbounded"/>
+ </xsd:sequence>
+ </xsd:complexType>
+ <xsd:complexType name="facelet-taglib-tag-validator-extensionType">
+ <xsd:annotation>
+ <xsd:documentation>
+ Extension element for validator It may contain
+ implementation specific content.
+ </xsd:documentation>
+ </xsd:annotation>
+
+ <xsd:sequence>
+ <xsd:any namespace="##any"
+ processContents="lax"
+ minOccurs="0"
+ maxOccurs="unbounded"/>
+ </xsd:sequence>
+ <xsd:attribute name="id" type="xsd:ID"/>
+ </xsd:complexType>
+
+ <!-- **************************************************** -->
+ <xsd:simpleType name="facelet-taglib-versionType">
+ <xsd:annotation>
+ <xsd:documentation>
+ This type contains the recognized versions of
+ facelet-taglib supported.
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:restriction base="xsd:token">
+ <xsd:enumeration value="2.0"/>
+ </xsd:restriction>
+ </xsd:simpleType>
+
+ <xsd:complexType name="facelet-taglib-canonical-nameType">
+
+ <xsd:annotation>
+ <xsd:documentation>
+
+ Defines the canonical name of a tag or attribute being
+ defined.
+
+ The name must conform to the lexical rules for an NCName
+
+ </xsd:documentation>
+ </xsd:annotation>
+
+ <xsd:simpleContent>
+ <xsd:extension base="xsd:NCName">
+ <xsd:attribute name="id" type="xsd:ID"/>
+ </xsd:extension>
+ </xsd:simpleContent>
+ </xsd:complexType>
+
+</xsd:schema>
Property changes on: trunk/jst/plugins/org.jboss.tools.jst.web/catalog/web-facelettaglibrary_2_0.xsd
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/jst/plugins/org.jboss.tools.jst.web/plugin.xml
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web/plugin.xml 2010-01-14 15:58:44 UTC (rev 19750)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/plugin.xml 2010-01-14 16:00:09 UTC (rev 19751)
@@ -275,6 +275,15 @@
<uri
name="http://java.sun.com/xml/ns/javaee/"
uri="platform:/plugin/org.jboss.tools.jst.web/catalog/javaee_5.xsd" />
+ <uri
+ name="javaee_5.xsd"
+ uri="platform:/plugin/org.jboss.tools.jst.web/catalog/javaee_5.xsd" />
+ <uri
+ name="http://java.sun.com/xml/ns/javaee/web-facelettaglibary_2_0.xsd"
+ uri="platform:/plugin/org.jboss.tools.jst.web/catalog/web-facelettaglibrary_2_0.xsd"/>
+ <uri
+ name="http://java.sun.com/xml/ns/javaee/web-facelettaglibrary_2_0.xsd"
+ uri="platform:/plugin/org.jboss.tools.jst.web/catalog/web-facelettaglibrary_2_0.xsd"/>
</catalogContribution>
</extension>
Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tld/TaglibMapping.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tld/TaglibMapping.java 2010-01-14 15:58:44 UTC (rev 19750)
+++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tld/TaglibMapping.java 2010-01-14 16:00:09 UTC (rev 19751)
@@ -255,6 +255,11 @@
String location = base + FileAnyImpl.toFileName(cs[i]);
if(folder instanceof FolderImpl) {
String path = WebProject.getInstance(cs[i].getModel()).getPathInWebRoot(cs[i]);
+ if(uri == null) {
+ System.out.println("-->Null uri");
+ System.out.println(cs[i]);
+ System.out.println(cs[i].getModelEntity().getName());
+ } else
if(path != null) resolvedURIs.put(path, uri);
}
addLocation(uri, location);
15 years, 11 months
- 1
- 0
JBoss Tools SVN: r19750 - in trunk/jsf/plugins/org.jboss.tools.jsf.ui: src/org/jboss/tools/jsf/ui/editor/form and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2010-01-14 10:58:44 -0500 (Thu, 14 Jan 2010)
New Revision: 19750
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.ui/plugin.xml
trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/form/FaceletTaglibXMLFormLayoutData.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-5670
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.ui/plugin.xml
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.ui/plugin.xml 2010-01-14 15:54:46 UTC (rev 19749)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.ui/plugin.xml 2010-01-14 15:58:44 UTC (rev 19750)
@@ -63,7 +63,7 @@
<xmlEditor
class="org.jboss.tools.jst.web.ui.editors.WebCompoundEditor"
contributorClass="org.jboss.tools.common.model.ui.texteditors.MultiPageContributor"
- entities="FileFaceletTaglib"
+ entities="FileFaceletTaglib,FileFaceletTaglib20"
icon="$nl$/images/xstudio/editors/jsf.gif"
name="FaceletTaglib">
</xmlEditor>
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/form/FaceletTaglibXMLFormLayoutData.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/form/FaceletTaglibXMLFormLayoutData.java 2010-01-14 15:54:46 UTC (rev 19749)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/form/FaceletTaglibXMLFormLayoutData.java 2010-01-14 15:58:44 UTC (rev 19750)
@@ -76,6 +76,9 @@
// } else if(entity.getChild(ENT_ESB_PROPERTY) != null) {
// list.add(ESBListsFormLayoutData.ESB_PROPERTY_LIST_DEFINITION);
// }
+ if(entity.getChild("AnyElement") != null) {
+ list.add(ModelFormLayoutData.TAG_LIST);
+ }
IFormData a = ModelFormLayoutData.createAdvancedFormData(entityName);
if(a != null) list.add(a);
IFormData[] ds = list.toArray(new IFormData[0]);
15 years, 11 months
- 1
- 0
JBoss Tools SVN: r19749 - trunk/jsf/plugins/org.jboss.tools.jsf/resources/meta.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2010-01-14 10:54:46 -0500 (Thu, 14 Jan 2010)
New Revision: 19749
Added:
trunk/jsf/plugins/org.jboss.tools.jsf/resources/meta/facelet-taglib2.meta
Log:
https://jira.jboss.org/jira/browse/JBIDE-5670
Added: trunk/jsf/plugins/org.jboss.tools.jsf/resources/meta/facelet-taglib2.meta
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/resources/meta/facelet-taglib2.meta (rev 0)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/resources/meta/facelet-taglib2.meta 2010-01-14 15:54:46 UTC (rev 19749)
@@ -0,0 +1,841 @@
+<?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="JSF" VERSION="1.0"/>
+ <MAPPINGS>
+ <MAPPING name="FileVersions">
+ <PAIR name="FaceletTaglib2.0" value="FileFaceletTaglib20"/>
+ </MAPPING>
+ <MAPPING name="FilteredTreeConstraints"/>
+ <MAPPING name="FilteredTrees"/>
+ <MAPPING name="Handlers"/>
+ <MAPPING name="Implementations"/>
+ <MAPPING name="Recognizers"/>
+ </MAPPINGS>
+ <ICONS>
+ <GROUP name="action"/>
+ <GROUP name="main"/>
+ </ICONS>
+ <GlobalActions kind="list"/>
+ <XModelEntity ImplementingClass="%Custom%"
+ PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.jsf.ui.editor.form.FaceletTaglibXMLFormLayoutData"
+ XMLSUBPATH="attribute" name="FaceletTaglibAttribute20">
+ <XChildrenEntities/>
+ <XEntityRenderer>
+ <ICONS>
+ <ICON info="main.facelet.attribute" type="main"/>
+ </ICONS>
+ </XEntityRenderer>
+ <XModelAttributes>
+ <XModelAttribute default="attribute" loader="ElementType" name="element type">
+ <Editor name="Uneditable"/>
+ </XModelAttribute>
+ <XModelAttributeReference
+ attributes="description,display-name,small-icon,large-icon"
+ entity="FileFaceletTaglib20" name="description"/>
+ <XModelAttribute PROPERTIES="save=always;category=general;id=true"
+ name="name" xmlname="name.#text"/>
+ <XModelAttribute PROPERTIES="category=general" name="required" xmlname="required.#text">
+ <Constraint loader="ListString">
+ <value/>
+ <value name="true"/>
+ <value name="false"/>
+ </Constraint>
+ <Editor name="ListString"/>
+ </XModelAttribute>
+ <XModelAttribute PROPERTIES="category=general" name="type" xmlname="type.#text">
+ <Editor name="AccessibleJava"/>
+ </XModelAttribute>
+ <XModelAttribute PROPERTIES="category=general"
+ name="method-signature" xmlname="method-signature.#text">
+ <Editor name="AccessibleJava"/>
+ </XModelAttribute>
+ <XModelAttribute TRIM="no" name="comment" xmlname="#comment">
+ <Editor name="Note"/>
+ </XModelAttribute>
+ </XModelAttributes>
+ <XActionItem kind="list">
+ <XActionItem HandlerClassName="%OpenJavaSource%" ICON="action.empty"
+ PROPERTIES="attribute=handler-class" displayName="Open Handler"
+ kind="action" name="OpenSource"/>
+ <XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions">
+ <XActionItem BaseActionName="Cut" HandlerClassName="%Cut%"
+ ICON="action.cut" displayName="Cut" kind="action" name="Cut"/>
+ <XActionItem BaseActionName="Copy" HandlerClassName="%Copy%"
+ ICON="action.copy" displayName="Copy" kind="action" name="Copy"/>
+ </XActionItem>
+ <XActionItemReference entity="FaceletTaglibConverter" name="DeleteActions"/>
+ <XActionItemReference entity="FaceletTaglibConverter" name="MoveActions"/>
+ <XActionItemReference entity="FaceletTaglibConverter" name="Properties"/>
+ </XActionItem>
+ <XDependencies/>
+ </XModelEntity>
+ <XModelEntity ImplementingClass="%FT_TagDecl%"
+ PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.jsf.ui.editor.form.FaceletTaglibXMLFormLayoutData"
+ XMLSUBPATH="converter" name="FaceletTaglibBehavior20">
+ <XChildrenEntities>
+ <XChildEntity name="FaceletTaglibBehaviorExtension"/>
+ </XChildrenEntities>
+ <XEntityRenderer>
+ <ICONS>
+ <ICON info="main.facelet.converter" type="main"/>
+ </ICONS>
+ </XEntityRenderer>
+ <XModelAttributes>
+ <XModelAttribute default="behavior" loader="ElementType" name="element type">
+ <Editor name="Uneditable"/>
+ </XModelAttribute>
+ <XModelAttribute PROPERTIES="id=true" default="declaration"
+ name="name" visibility="false">
+ <Editor name="Uneditable"/>
+ </XModelAttribute>
+ <XModelAttributeReference
+ attributes="description,display-name,small-icon,large-icon"
+ entity="FileFaceletTaglib20" name="description"/>
+ <XModelAttribute PROPERTIES="save=always;category=general"
+ name="behavior-id" xmlname="behavior-id.#text"/>
+ <XModelAttribute PROPERTIES="category=general" name="handler-class" xmlname="handler-class.#text">
+ <Editor name="AccessibleJava"/>
+ </XModelAttribute>
+ <XModelAttribute TRIM="no" name="comment" xmlname="#comment">
+ <Editor name="Note"/>
+ </XModelAttribute>
+ </XModelAttributes>
+ <XActionItem kind="list">
+ <XActionItem HandlerClassName="%OpenJavaSource%" ICON="action.empty"
+ PROPERTIES="attribute=handler-class" displayName="Open Handler"
+ kind="action" name="OpenSource"/>
+ <XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions">
+ <XActionItem BaseActionName="Cut" HandlerClassName="%Cut%"
+ ICON="action.cut" displayName="Cut" kind="action" name="Cut"/>
+ <XActionItem BaseActionName="Copy" HandlerClassName="%Copy%"
+ ICON="action.copy" displayName="Copy" kind="action" name="Copy"/>
+ </XActionItem>
+ <XActionItemReference entity="FaceletTaglibConverter" name="DeleteActions"/>
+ <XActionItemReference entity="FaceletTaglibConverter" name="MoveActions"/>
+ <XActionItemReference entity="FaceletTaglibConverter" name="Properties"/>
+ </XActionItem>
+ <XDependencies/>
+ </XModelEntity>
+ <XModelEntity
+ ImplementingClass="org.jboss.tools.jsf.model.impl.ExtensionObjectImpl"
+ PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.jsf.ui.editor.form.FaceletTaglibXMLFormLayoutData"
+ XMLSUBPATH="behavior-extension" name="FaceletTaglibBehaviorExtension">
+ <XChildrenEntities>
+ <XChildEntity name="AnyElement"/>
+ </XChildrenEntities>
+ <XEntityRenderer>
+ <ICONS>
+ <ICON info="main.jsf.extension" type="main"/>
+ </ICONS>
+ </XEntityRenderer>
+ <XModelAttributes>
+ <XModelAttribute default="behavior-extension" loader="ElementType" name="element type">
+ <Editor name="Uneditable"/>
+ </XModelAttribute>
+ <XModelAttribute name="_id_" visibility="false"/>
+ </XModelAttributes>
+ <XActionItem kind="list">
+ <XActionItemReference entity="FaceletTaglibExtension" name="CreateActions"/>
+ <XActionItemReference entity="FaceletTaglibExtension" name="DeleteActions"/>
+ <XActionItemReference entity="FaceletTaglibExtension" name="CopyActions"/>
+ </XActionItem>
+ <XDependencies/>
+ </XModelEntity>
+ <XModelEntity ImplementingClass="%FT_TagDecl%"
+ PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.jsf.ui.editor.form.FaceletTaglibXMLFormLayoutData"
+ XMLSUBPATH="component" name="FaceletTaglibComponent20">
+ <XChildrenEntities>
+ <XChildEntity name="FaceletTaglibComponentExtension"/>
+ </XChildrenEntities>
+ <XEntityRenderer>
+ <ICONS>
+ <ICON info="main.facelet.component" type="main"/>
+ </ICONS>
+ </XEntityRenderer>
+ <XModelAttributes>
+ <XModelAttribute default="component" loader="ElementType" name="element type">
+ <Editor name="Uneditable"/>
+ </XModelAttribute>
+ <XModelAttribute PROPERTIES="id=true" default="declaration"
+ name="name" visibility="false">
+ <Editor name="Uneditable"/>
+ </XModelAttribute>
+ <XModelAttributeReference
+ attributes="description,display-name,small-icon,large-icon"
+ entity="FileFaceletTaglib20" name="description"/>
+ <XModelAttribute PROPERTIES="save=always;category=general"
+ name="component-type" xmlname="component-type.#text"/>
+ <XModelAttribute PROPERTIES="category=general" name="renderer-type" xmlname="renderer-type.#text"/>
+ <XModelAttribute PROPERTIES="save=always;category=general"
+ name="handler-class" xmlname="handler-class.#text">
+ <Editor name="AccessibleJava"/>
+ </XModelAttribute>
+ <XModelAttribute TRIM="no" name="comment" xmlname="#comment">
+ <Editor name="Note"/>
+ </XModelAttribute>
+ </XModelAttributes>
+ <XActionItem kind="list">
+ <XActionItem HandlerClassName="%OpenJavaSource%" ICON="action.empty"
+ PROPERTIES="attribute=handler-class" displayName="Open Handler"
+ kind="action" name="OpenSource"/>
+ <XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions">
+ <XActionItem BaseActionName="Cut" HandlerClassName="%Cut%"
+ ICON="action.cut" displayName="Cut" kind="action" name="Cut"/>
+ <XActionItem BaseActionName="Copy" HandlerClassName="%Copy%"
+ ICON="action.copy" displayName="Copy" kind="action" name="Copy"/>
+ </XActionItem>
+ <XActionItemReference entity="FaceletTaglibComponent" name="DeleteActions"/>
+ <XActionItemReference entity="FaceletTaglibComponent" name="MoveActions"/>
+ <XActionItemReference entity="FaceletTaglibComponent" name="Properties"/>
+ </XActionItem>
+ <XDependencies/>
+ </XModelEntity>
+ <XModelEntity
+ ImplementingClass="org.jboss.tools.jsf.model.impl.ExtensionObjectImpl"
+ PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.jsf.ui.editor.form.FaceletTaglibXMLFormLayoutData"
+ XMLSUBPATH="component-extension" name="FaceletTaglibComponentExtension">
+ <XChildrenEntities>
+ <XChildEntity name="AnyElement"/>
+ </XChildrenEntities>
+ <XEntityRenderer>
+ <ICONS>
+ <ICON info="main.jsf.extension" type="main"/>
+ </ICONS>
+ </XEntityRenderer>
+ <XModelAttributes>
+ <XModelAttribute default="component-extension" loader="ElementType" name="element type">
+ <Editor name="Uneditable"/>
+ </XModelAttribute>
+ <XModelAttribute name="_id_" visibility="false"/>
+ </XModelAttributes>
+ <XActionItem kind="list">
+ <XActionItemReference entity="FaceletTaglibExtension" name="CreateActions"/>
+ <XActionItemReference entity="FaceletTaglibExtension" name="DeleteActions"/>
+ <XActionItemReference entity="FaceletTaglibExtension" name="CopyActions"/>
+ </XActionItem>
+ <XDependencies/>
+ </XModelEntity>
+ <XModelEntity ImplementingClass="%FT_TagDecl%"
+ PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.jsf.ui.editor.form.FaceletTaglibXMLFormLayoutData"
+ XMLSUBPATH="converter" name="FaceletTaglibConverter20">
+ <XChildrenEntities>
+ <XChildEntity name="FaceletTaglibConverterExtension"/>
+ </XChildrenEntities>
+ <XEntityRenderer>
+ <ICONS>
+ <ICON info="main.facelet.converter" type="main"/>
+ </ICONS>
+ </XEntityRenderer>
+ <XModelAttributes>
+ <XModelAttribute default="converter" loader="ElementType" name="element type">
+ <Editor name="Uneditable"/>
+ </XModelAttribute>
+ <XModelAttribute PROPERTIES="id=true" default="declaration"
+ name="name" visibility="false">
+ <Editor name="Uneditable"/>
+ </XModelAttribute>
+ <XModelAttributeReference
+ attributes="description,display-name,small-icon,large-icon"
+ entity="FileFaceletTaglib20" name="description"/>
+ <XModelAttribute PROPERTIES="save=always;category=general"
+ name="converter-id" xmlname="converter-id.#text"/>
+ <XModelAttribute PROPERTIES="category=general" name="handler-class" xmlname="handler-class.#text">
+ <Editor name="AccessibleJava"/>
+ </XModelAttribute>
+ <XModelAttribute TRIM="no" name="comment" xmlname="#comment">
+ <Editor name="Note"/>
+ </XModelAttribute>
+ </XModelAttributes>
+ <XActionItem kind="list">
+ <XActionItem HandlerClassName="%OpenJavaSource%" ICON="action.empty"
+ PROPERTIES="attribute=handler-class" displayName="Open Handler"
+ kind="action" name="OpenSource"/>
+ <XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions">
+ <XActionItem BaseActionName="Cut" HandlerClassName="%Cut%"
+ ICON="action.cut" displayName="Cut" kind="action" name="Cut"/>
+ <XActionItem BaseActionName="Copy" HandlerClassName="%Copy%"
+ ICON="action.copy" displayName="Copy" kind="action" name="Copy"/>
+ </XActionItem>
+ <XActionItemReference entity="FaceletTaglibConverter" name="DeleteActions"/>
+ <XActionItemReference entity="FaceletTaglibConverter" name="MoveActions"/>
+ <XActionItemReference entity="FaceletTaglibConverter" name="Properties"/>
+ </XActionItem>
+ <XDependencies/>
+ </XModelEntity>
+ <XModelEntity
+ ImplementingClass="org.jboss.tools.jsf.model.impl.ExtensionObjectImpl"
+ PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.jsf.ui.editor.form.FaceletTaglibXMLFormLayoutData"
+ XMLSUBPATH="converter-extension" name="FaceletTaglibConverterExtension">
+ <XChildrenEntities>
+ <XChildEntity name="AnyElement"/>
+ </XChildrenEntities>
+ <XEntityRenderer>
+ <ICONS>
+ <ICON info="main.jsf.extension" type="main"/>
+ </ICONS>
+ </XEntityRenderer>
+ <XModelAttributes>
+ <XModelAttribute default="converter-extension" loader="ElementType" name="element type">
+ <Editor name="Uneditable"/>
+ </XModelAttribute>
+ <XModelAttribute name="_id_" visibility="false"/>
+ </XModelAttributes>
+ <XActionItem kind="list">
+ <XActionItemReference entity="FaceletTaglibExtension" name="CreateActions"/>
+ <XActionItemReference entity="FaceletTaglibExtension" name="DeleteActions"/>
+ <XActionItemReference entity="FaceletTaglibExtension" name="CopyActions"/>
+ </XActionItem>
+ <XDependencies/>
+ </XModelEntity>
+ <XModelEntity
+ ImplementingClass="org.jboss.tools.jsf.model.impl.ExtensionObjectImpl"
+ PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.jsf.ui.editor.form.FaceletTaglibXMLFormLayoutData"
+ XMLSUBPATH="taglib-extension" name="FaceletTaglibExtension">
+ <XChildrenEntities>
+ <XChildEntity name="AnyElement"/>
+ </XChildrenEntities>
+ <XEntityRenderer>
+ <ICONS>
+ <ICON info="main.jsf.extension" type="main"/>
+ </ICONS>
+ </XEntityRenderer>
+ <XModelAttributes>
+ <XModelAttribute default="taglib-extension" loader="ElementType" name="element type">
+ <Editor name="Uneditable"/>
+ </XModelAttribute>
+ <XModelAttribute name="_id_" visibility="false"/>
+ </XModelAttributes>
+ <XActionItem kind="list">
+ <XActionItem kind="list" name="CreateActions">
+ <XActionItem HandlerClassName="%Create%" ICON="action.empty"
+ PROPERTIES="entity=AnyElement" WizardClassName="%Default%"
+ displayName="Add Tag..." kind="action" name="CreateTag">
+ <EntityData EntityName="AnyElementNew">
+ <AttributeData AttributeName="tag"/>
+ </EntityData>
+ </XActionItem>
+ </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.copy" displayName="Copy" kind="list" name="CopyActions">
+ <XActionItem BaseActionName="Paste" HandlerClassName="%Paste%"
+ ICON="action.paste" displayName="Paste" kind="action" name="Paste"/>
+ </XActionItem>
+ </XActionItem>
+ <XDependencies/>
+ </XModelEntity>
+ <XModelEntity ImplementingClass="%Custom%"
+ PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.jsf.ui.editor.form.FaceletTaglibXMLFormLayoutData"
+ XMLSUBPATH="function" name="FaceletTaglibFunction20">
+ <XChildrenEntities/>
+ <XEntityRenderer>
+ <ICONS>
+ <ICON info="main.facelet.component" type="main"/>
+ </ICONS>
+ </XEntityRenderer>
+ <XModelAttributes>
+ <XModelAttribute default="function" loader="ElementType" name="element type">
+ <Editor name="Uneditable"/>
+ </XModelAttribute>
+ <XModelAttributeReference
+ attributes="description,display-name,small-icon,large-icon"
+ entity="FileFaceletTaglib20" name="description"/>
+ <XModelAttribute PROPERTIES="save=always;category=general;id=true"
+ name="function-name" xmlname="function-name.#text"/>
+ <XModelAttribute PROPERTIES="save=always;category=general"
+ name="function-class" xmlname="function-class.#text">
+ <Editor name="AccessibleJava"/>
+ </XModelAttribute>
+ <XModelAttribute PROPERTIES="save=always;category=general"
+ name="function-signature" xmlname="function-signature.#text"/>
+ <XModelAttribute TRIM="no" name="comment" xmlname="#comment">
+ <Editor name="Note"/>
+ </XModelAttribute>
+ </XModelAttributes>
+ <XActionItem kind="list">
+ <XActionItem HandlerClassName="%OpenJavaSource%" ICON="action.empty"
+ PROPERTIES="attribute=handler-class" displayName="Open Handler"
+ kind="action" name="OpenSource"/>
+ <XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions">
+ <XActionItem BaseActionName="Cut" HandlerClassName="%Cut%"
+ ICON="action.cut" displayName="Cut" kind="action" name="Cut"/>
+ <XActionItem BaseActionName="Copy" HandlerClassName="%Copy%"
+ ICON="action.copy" displayName="Copy" kind="action" name="Copy"/>
+ </XActionItem>
+ <XActionItemReference entity="FaceletTaglibFunction" name="DeleteActions"/>
+ <XActionItemReference entity="FaceletTaglibFunction" name="MoveActions"/>
+ <XActionItemReference entity="FaceletTaglibFunction" name="Properties"/>
+ </XActionItem>
+ <XDependencies/>
+ </XModelEntity>
+ <XModelEntity ImplementingClass="%FT_TagDecl%"
+ PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.jsf.ui.editor.form.FaceletTaglibXMLFormLayoutData"
+ XMLSUBPATH="handler-class" name="FaceletTaglibHandler20">
+ <XChildrenEntities/>
+ <XEntityRenderer>
+ <ICONS>
+ <ICON info="main.jsf.bean" type="main"/>
+ </ICONS>
+ </XEntityRenderer>
+ <XModelAttributes>
+ <XModelAttribute default="handler" loader="ElementType" name="element type">
+ <Editor name="Uneditable"/>
+ </XModelAttribute>
+ <XModelAttribute PROPERTIES="id=true" default="declaration"
+ name="name" visibility="false">
+ <Editor name="Uneditable"/>
+ </XModelAttribute>
+ <XModelAttribute PROPERTIES="save=always;category=general"
+ name="handler-class" xmlname="#text">
+ <Editor name="AccessibleJava"/>
+ </XModelAttribute>
+ <XModelAttribute TRIM="no" name="comment" xmlname="#comment">
+ <Editor name="Note"/>
+ </XModelAttribute>
+ </XModelAttributes>
+ <XActionItem kind="list">
+ <XActionItem HandlerClassName="%OpenJavaSource%" ICON="action.empty"
+ PROPERTIES="attribute=handler-class" displayName="Open Handler"
+ kind="action" name="OpenSource"/>
+ <XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions">
+ <XActionItem BaseActionName="Cut" HandlerClassName="%Cut%"
+ ICON="action.cut" displayName="Cut" kind="action" name="Cut"/>
+ <XActionItem BaseActionName="Copy" HandlerClassName="%Copy%"
+ ICON="action.copy" displayName="Copy" kind="action" name="Copy"/>
+ </XActionItem>
+ <XActionItemReference entity="FaceletTaglibHandler" name="DeleteActions"/>
+ <XActionItemReference entity="FaceletTaglibHandler" name="MoveActions"/>
+ <XActionItemReference entity="FaceletTaglibHandler" name="Properties"/>
+ </XActionItem>
+ <XDependencies/>
+ </XModelEntity>
+ <XModelEntity ImplementingClass="%FT_TagDecl%"
+ PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.jsf.ui.editor.form.FaceletTaglibXMLFormLayoutData"
+ XMLSUBPATH="source" name="FaceletTaglibSource20">
+ <XChildrenEntities/>
+ <XEntityRenderer>
+ <ICONS>
+ <ICON info="main.jsf.data-source" type="main"/>
+ </ICONS>
+ </XEntityRenderer>
+ <XModelAttributes>
+ <XModelAttribute default="source" loader="ElementType" name="element type">
+ <Editor name="Uneditable"/>
+ </XModelAttribute>
+ <XModelAttribute PROPERTIES="id=true" default="declaration"
+ name="name" visibility="false">
+ <Editor name="Uneditable"/>
+ </XModelAttribute>
+ <XModelAttribute PROPERTIES="save=always;category=general"
+ name="source" xmlname="#text"/>
+ <XModelAttribute TRIM="no" name="comment" xmlname="#comment">
+ <Editor name="Note"/>
+ </XModelAttribute>
+ </XModelAttributes>
+ <XActionItem kind="list">
+ <XActionItem HandlerClassName="%OpenJavaSource%" ICON="action.empty"
+ PROPERTIES="attribute=handler-class" displayName="Open Handler"
+ kind="action" name="OpenSource"/>
+ <XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions">
+ <XActionItem BaseActionName="Cut" HandlerClassName="%Cut%"
+ ICON="action.cut" displayName="Cut" kind="action" name="Cut"/>
+ <XActionItem BaseActionName="Copy" HandlerClassName="%Copy%"
+ ICON="action.copy" displayName="Copy" kind="action" name="Copy"/>
+ </XActionItem>
+ <XActionItemReference entity="FaceletTaglibSource" name="DeleteActions"/>
+ <XActionItemReference entity="FaceletTaglibSource" name="MoveActions"/>
+ <XActionItemReference entity="FaceletTaglibSource" name="Properties"/>
+ </XActionItem>
+ <XDependencies/>
+ </XModelEntity>
+ <XModelEntity ImplementingClass="%Custom%"
+ PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.jsf.ui.editor.form.FaceletTaglibXMLFormLayoutData"
+ XMLSUBPATH="tag" name="FaceletTaglibTag20">
+ <XChildrenEntities>
+ <XChildEntity maxCount="1" name="FaceletTaglibHandler20"/>
+ <XChildEntity maxCount="1" name="FaceletTaglibBehavior20"/>
+ <XChildEntity maxCount="1" name="FaceletTaglibComponent20"/>
+ <XChildEntity maxCount="1" name="FaceletTaglibConverter20"/>
+ <XChildEntity maxCount="1" name="FaceletTaglibValidator20"/>
+ <XChildEntity maxCount="1" name="FaceletTaglibSource20"/>
+ <XChildEntity name="FaceletTaglibAttribute20"/>
+ <XChildEntity name="FaceletTaglibTagExtension"/>
+ </XChildrenEntities>
+ <XEntityRenderer>
+ <ICONS>
+ <ICON info="main.facelet.tag" type="main"/>
+ </ICONS>
+ </XEntityRenderer>
+ <XModelAttributes>
+ <XModelAttribute default="tag" loader="ElementType" name="element type">
+ <Editor name="Uneditable"/>
+ </XModelAttribute>
+ <XModelAttribute PROPERTIES="save=always;id=true;category=general"
+ name="tag-name" xmlname="tag-name.#text"/>
+ <XModelAttribute TRIM="no" name="comment" xmlname="#comment">
+ <Editor name="Note"/>
+ </XModelAttribute>
+ </XModelAttributes>
+ <XActionItem kind="list">
+ <XActionItem ICON="action.empty" displayName="New" group="1"
+ kind="list" name="CreateActions">
+ <XActionItem HandlerClassName="%DefaultReplaceUnique%"
+ ICON="action.empty"
+ PROPERTIES="significanceMessageClass=%Replace%;child=declaration"
+ WizardClassName="%Default%" displayName="Handler..." kind="action" name="AddHandler">
+ <EntityData EntityName="FaceletTaglibHandler20">
+ <AttributeData AttributeName="handler-class"/>
+ </EntityData>
+ </XActionItem>
+ <XActionItem HandlerClassName="%DefaultReplaceUnique%"
+ ICON="action.empty"
+ PROPERTIES="significanceMessageClass=%Replace%;child=declaration"
+ WizardClassName="%Default%" displayName="Behavior..." kind="action" name="AddBehavior">
+ <EntityData EntityName="FaceletTaglibBehavior20">
+ <AttributeData AttributeName="behavior-id"/>
+ <AttributeData AttributeName="handler-class" Mandatory="no"/>
+ </EntityData>
+ </XActionItem>
+ <XActionItem HandlerClassName="%DefaultReplaceUnique%"
+ ICON="action.empty"
+ PROPERTIES="significanceMessageClass=%Replace%;child=declaration"
+ WizardClassName="%Default%" displayName="Component..."
+ kind="action" name="AddComponent">
+ <EntityData EntityName="FaceletTaglibComponent20">
+ <AttributeData AttributeName="component-type"/>
+ <AttributeData AttributeName="renderer-type" Mandatory="no"/>
+ <AttributeData AttributeName="handler-class" Mandatory="no"/>
+ </EntityData>
+ </XActionItem>
+ <XActionItem HandlerClassName="%DefaultReplaceUnique%"
+ ICON="action.empty"
+ PROPERTIES="significanceMessageClass=%Replace%;child=declaration"
+ WizardClassName="%Default%" displayName="Converter..."
+ kind="action" name="AddConverter">
+ <EntityData EntityName="FaceletTaglibConverter20">
+ <AttributeData AttributeName="converter-id"/>
+ <AttributeData AttributeName="handler-class" Mandatory="no"/>
+ </EntityData>
+ </XActionItem>
+ <XActionItem HandlerClassName="%DefaultReplaceUnique%"
+ ICON="action.empty"
+ PROPERTIES="significanceMessageClass=%Replace%;child=declaration"
+ WizardClassName="%Default%" displayName="Validator..."
+ kind="action" name="AddValidator">
+ <EntityData EntityName="FaceletTaglibValidator20">
+ <AttributeData AttributeName="validator-id"/>
+ <AttributeData AttributeName="handler-class" Mandatory="no"/>
+ </EntityData>
+ </XActionItem>
+ <XActionItem HandlerClassName="%DefaultReplaceUnique%"
+ ICON="action.empty"
+ PROPERTIES="significanceMessageClass=%Replace%;child=declaration"
+ WizardClassName="%Default%" displayName="Source..." kind="action" name="AddSource">
+ <EntityData EntityName="FaceletTaglibSource20">
+ <AttributeData AttributeName="source"/>
+ </EntityData>
+ </XActionItem>
+ <XActionItem HandlerClassName="%Create%" ICON="action.empty"
+ PROPERTIES="validator.add=true" WizardClassName="%Default%"
+ displayName="Handler..." kind="action" name="AddAttribute">
+ <EntityData EntityName="FaceletTaglibAttribute20">
+ <AttributeData AttributeName="name"/>
+ </EntityData>
+ </XActionItem>
+ </XActionItem>
+ <XActionItemReference entity="FaceletTaglibTag" name="CopyActions"/>
+ <XActionItemReference entity="FaceletTaglibTag" name="DeleteActions"/>
+ <XActionItemReference entity="FaceletTaglibTag" name="Properties"/>
+ <XActionItemReference entity="FaceletTaglibTag" name="MoveActions"/>
+ </XActionItem>
+ <XDependencies/>
+ </XModelEntity>
+ <XModelEntity
+ ImplementingClass="org.jboss.tools.jsf.model.impl.ExtensionObjectImpl"
+ PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.jsf.ui.editor.form.FaceletTaglibXMLFormLayoutData"
+ XMLSUBPATH="tag-extension" name="FaceletTaglibTagExtension">
+ <XChildrenEntities>
+ <XChildEntity name="AnyElement"/>
+ </XChildrenEntities>
+ <XEntityRenderer>
+ <ICONS>
+ <ICON info="main.jsf.extension" type="main"/>
+ </ICONS>
+ </XEntityRenderer>
+ <XModelAttributes>
+ <XModelAttribute default="tag-extension" loader="ElementType" name="element type">
+ <Editor name="Uneditable"/>
+ </XModelAttribute>
+ <XModelAttribute name="_id_" visibility="false"/>
+ </XModelAttributes>
+ <XActionItem kind="list">
+ <XActionItemReference entity="FaceletTaglibExtension" name="CreateActions"/>
+ <XActionItemReference entity="FaceletTaglibExtension" name="DeleteActions"/>
+ <XActionItemReference entity="FaceletTaglibExtension" name="CopyActions"/>
+ </XActionItem>
+ <XDependencies/>
+ </XModelEntity>
+ <XModelEntity ImplementingClass="%FT_TagDecl%"
+ PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.jsf.ui.editor.form.FaceletTaglibXMLFormLayoutData"
+ XMLSUBPATH="validator" name="FaceletTaglibValidator20">
+ <XChildrenEntities>
+ <XChildEntity name="FaceletTaglibValidatorExtension"/>
+ </XChildrenEntities>
+ <XEntityRenderer>
+ <ICONS>
+ <ICON info="main.facelet.converter" type="main"/>
+ </ICONS>
+ </XEntityRenderer>
+ <XModelAttributes>
+ <XModelAttribute default="validator" loader="ElementType" name="element type">
+ <Editor name="Uneditable"/>
+ </XModelAttribute>
+ <XModelAttribute PROPERTIES="id=true" default="declaration"
+ name="name" visibility="false">
+ <Editor name="Uneditable"/>
+ </XModelAttribute>
+ <XModelAttributeReference
+ attributes="description,display-name,small-icon,large-icon"
+ entity="FileFaceletTaglib20" name="description"/>
+ <XModelAttribute PROPERTIES="save=always;category=general"
+ name="validator-id" xmlname="validator-id.#text"/>
+ <XModelAttribute PROPERTIES="category=general" name="handler-class" xmlname="handler-class.#text">
+ <Editor name="AccessibleJava"/>
+ </XModelAttribute>
+ <XModelAttribute TRIM="no" name="comment" xmlname="#comment">
+ <Editor name="Note"/>
+ </XModelAttribute>
+ </XModelAttributes>
+ <XActionItem kind="list">
+ <XActionItem HandlerClassName="%OpenJavaSource%" ICON="action.empty"
+ PROPERTIES="attribute=handler-class" displayName="Open Handler"
+ kind="action" name="OpenSource"/>
+ <XActionItem ICON="action.copy" displayName="Copy" kind="list" name="CopyActions">
+ <XActionItem BaseActionName="Cut" HandlerClassName="%Cut%"
+ ICON="action.cut" displayName="Cut" kind="action" name="Cut"/>
+ <XActionItem BaseActionName="Copy" HandlerClassName="%Copy%"
+ ICON="action.copy" displayName="Copy" kind="action" name="Copy"/>
+ </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 displayName="move" kind="list" name="MoveActions">
+ <XActionItem HIDE="always" HandlerClassName="%Move%"
+ ICON="action.move" displayName="Move" kind="action" name="Move"/>
+ </XActionItem>
+ <XActionItem ICON="action.empty" kind="list" name="Properties">
+ <XActionItem HandlerClassName="%Properties%" ICON="action.empty"
+ displayName="Properties..." kind="action" name="Properties"/>
+ </XActionItem>
+ </XActionItem>
+ <XDependencies/>
+ </XModelEntity>
+ <XModelEntity
+ ImplementingClass="org.jboss.tools.jsf.model.impl.ExtensionObjectImpl"
+ PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.jsf.ui.editor.form.FaceletTaglibXMLFormLayoutData"
+ XMLSUBPATH="validator-extension" name="FaceletTaglibValidatorExtension">
+ <XChildrenEntities>
+ <XChildEntity name="AnyElement"/>
+ </XChildrenEntities>
+ <XEntityRenderer>
+ <ICONS>
+ <ICON info="main.jsf.extension" type="main"/>
+ </ICONS>
+ </XEntityRenderer>
+ <XModelAttributes>
+ <XModelAttribute default="validator-extension" loader="ElementType" name="element type">
+ <Editor name="Uneditable"/>
+ </XModelAttribute>
+ <XModelAttribute name="_id_" visibility="false"/>
+ </XModelAttributes>
+ <XActionItem kind="list">
+ <XActionItemReference entity="FaceletTaglibExtension" name="CreateActions"/>
+ <XActionItemReference entity="FaceletTaglibExtension" name="DeleteActions"/>
+ <XActionItemReference entity="FaceletTaglibExtension" name="CopyActions"/>
+ </XActionItem>
+ <XDependencies/>
+ </XModelEntity>
+ <XModelEntity
+ AdoptManagerClass="org.jboss.tools.jsf.model.handlers.FacesConfigAdopt"
+ ImplementationLoadingClass="org.jboss.tools.jsf.facelet.model.FaceletTaglibLoader"
+ ImplementingClass="org.jboss.tools.common.model.filesystems.impl.SimpleFileImpl"
+ ObjectEditorClass="%XML%"
+ PROPERTIES="formFactory=%Default%;formLayout=org.jboss.tools.jsf.ui.editor.form.FaceletTaglibXMLFormLayoutData"
+ XMLSUBPATH="facelet-taglib" name="FileFaceletTaglib20">
+ <XChildrenEntities>
+ <XChildEntity name="FaceletTaglibTag20"/>
+ <XChildEntity name="FaceletTaglibFunction20"/>
+ <XChildEntity name="FaceletTaglibExtension"/>
+ </XChildrenEntities>
+ <XEntityRenderer>
+ <ICONS>
+ <ICON info="main.facelet.taglib" type="main"/>
+ </ICONS>
+ </XEntityRenderer>
+ <XModelAttributes>
+ <XModelAttribute default="facelet-taglib" loader="ElementType" name="element type">
+ <Editor name="Uneditable"/>
+ </XModelAttribute>
+ <XModelAttribute PROPERTIES="category=general" name="name" xmlname="NAME"/>
+ <XModelAttribute default="xml" name="extension" xmlname="EXTENSION">
+ <Editor name="Uneditable"/>
+ </XModelAttribute>
+ <XModelAttribute loader="ElementType" name="_lateload" visibility="false">
+ <Editor name="Uneditable"/>
+ </XModelAttribute>
+ <XModelAttribute default="no" name="isIncorrect" visibility="false">
+ <Constraint loader="List">
+ <value name="yes"/>
+ <value name="no"/>
+ </Constraint>
+ <Editor name="Uneditable"/>
+ </XModelAttribute>
+ <XModelAttribute name="incorrectBody" visibility="false"/>
+ <XModelAttribute PROPERTIES="save=always"
+ default="http://java.sun.com/xml/ns/javaee" name="xmlns" xmlname="xmlns"/>
+ <XModelAttribute PROPERTIES="save=always"
+ default="http://www.w3.org/2001/XMLSchema-instance" name="xmlns:xsi" xmlname="xmlns:xsi"/>
+ <XModelAttribute PROPERTIES="save=always"
+ default="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facelettaglibrary_2_0.xsd"
+ name="xsi:schemaLocation" xmlname="xsi:schemaLocation"/>
+ <XModelAttribute name="encoding">
+ <Constraint loader="ListString">
+ <value name="ISO-8859-1"/>
+ <value name="UTF-8"/>
+ </Constraint>
+ <Editor name="ListString"/>
+ </XModelAttribute>
+ <XModelAttribute default="false" name="expanded" visibility="false">
+ <Constraint loader="List">
+ <value name="false"/>
+ <value name="true"/>
+ </Constraint>
+ <Editor name="Uneditable"/>
+ </XModelAttribute>
+ <XModelAttribute PROPERTIES="category=general" name="version"
+ visibility="false" xmlname="version">
+ <Editor name="AccessibleJava"/>
+ </XModelAttribute>
+ <XModelAttribute TRIM="no" name="description" xmlname="description.#text">
+ <Editor name="Note"/>
+ </XModelAttribute>
+ <XModelAttribute name="display-name" xmlname="display-name.#text"/>
+ <XModelAttribute name="small-icon" xmlname="icon.small-icon.#text"/>
+ <XModelAttribute name="large-icon" xmlname="icon.large-icon.#text"/>
+ <XModelAttribute PROPERTIES="category=general" name="library-class" xmlname="library-class.#text">
+ <Editor name="AccessibleJava"/>
+ </XModelAttribute>
+ <XModelAttribute PROPERTIES="category=general" name="uri" xmlname="namespace.#text"/>
+ <XModelAttribute PROPERTIES="category=general"
+ name="composite-library-name" xmlname="composite-library-name.#text">
+ <Editor name="AccessibleJava"/>
+ </XModelAttribute>
+ <XModelAttribute TRIM="no" name="comment" visibility="false" xmlname="#comment">
+ <Editor name="Note"/>
+ </XModelAttribute>
+ </XModelAttributes>
+ <XActionItem kind="list">
+ <XActionItem BaseActionName="Open" HandlerClassName="%Open%"
+ ICON="action.empty" displayName="Open" kind="action" name="Open"/>
+ <XActionItem displayName="Open With" group="1" kind="list" name="OpenWith">
+ <XActionItem HIDE="always"
+ HandlerClassName="org.jboss.tools.common.meta.action.impl.handlers.OpenWithExternalHandler"
+ ICON="action.empty" PROPERTIES="extension=struts-config"
+ displayName="Open with External Program" kind="action" name="OpenWithSelected"/>
+ <XActionItem HIDE="always"
+ HandlerClassName="org.jboss.tools.common.meta.action.impl.handlers.OpenWithChoiceHandler"
+ ICON="action.empty" PROPERTIES="extension=struts-config"
+ displayName="Choose Program..." kind="action" name="OpenWithChoice">
+ <EntityData EntityName="OpenWithHelper">
+ <AttributeData AttributeName="name"/>
+ <AttributeData AttributeName="default"/>
+ </EntityData>
+ </XActionItem>
+ </XActionItem>
+ <XActionItem kind="list" name="EditActions">
+ <XActionItem HIDE="always"
+ HandlerClassName="org.jboss.tools.jsf.model.handlers.RenameFacesConfigHandler"
+ ICON="action.empty" PROPERTIES="validator.edit=true"
+ WizardClassName="%Default%" displayName="Rename..." kind="action" name="Rename">
+ <EntityData EntityName="FileESB110">
+ <AttributeData AttributeName="name"/>
+ </EntityData>
+ </XActionItem>
+ <XActionItem
+ HandlerClassName="org.jboss.tools.common.model.filesystems.impl.handlers.RenameEclipseFileHandler"
+ ICON="action.empty" displayName="Rename..." kind="action" name="RenameEclipse"/>
+ </XActionItem>
+ <XActionItemReference entity="FileTXT" name="SaveActions"/>
+ <XActionItem ICON="action.empty" displayName="New" group="1"
+ kind="list" name="CreateActions">
+ <XActionItem
+ HandlerClassName="org.jboss.tools.jsf.facelet.model.AddTagHandler"
+ ICON="action.empty" PROPERTIES="validator.add=true"
+ WizardClassName="%Default%" displayName="Tag..." kind="action" name="AddTag">
+ <EntityData EntityName="FaceletTaglibTag20">
+ <AttributeData AttributeName="tag-name"/>
+ </EntityData>
+ </XActionItem>
+ <XActionItem HandlerClassName="%CreateInCollapsed%"
+ ICON="action.empty" PROPERTIES="validator.add=true"
+ WizardClassName="%Default%" displayName="Function..." kind="action" name="AddFunction">
+ <EntityData EntityName="FaceletTaglibFunction20">
+ <AttributeData AttributeName="function-name"/>
+ <AttributeData AttributeName="function-class"/>
+ <AttributeData AttributeName="function-signature"/>
+ </EntityData>
+ </XActionItem>
+ </XActionItem>
+ <XActionItem HIDE="disabled"
+ HandlerClassName="org.jboss.tools.jst.web.tld.model.handlers.ExpandTLDHandler"
+ ICON="action.empty" displayName="Set Expanded" kind="action" name="SetExpanded"/>
+ <XActionItemReference entity="FileFaceletTaglib" name="CopyActions"/>
+ <XActionItemReference entity="FileTXT" name="DeleteActions"/>
+ <XActionItemReference entity="FileTXT" name="Properties"/>
+ <XActionItemReference entity="FileTXT" name="DiscardActions"/>
+ </XActionItem>
+ <XDependencies/>
+ </XModelEntity>
+ <XModelEntity name="FileFaceletTaglib20_EditorActionList">
+ <XChildrenEntities/>
+ <XEntityRenderer/>
+ <XModelAttributes/>
+ <XActionItem kind="list">
+ <XActionItemReference entity="FileFaceletTaglib20" name="CreateActions"/>
+ <XActionItem ICON="action.empty" kind="list" name="Properties">
+ <XActionItem HandlerClassName="%Properties%" ICON="action.empty"
+ displayName="Properties..." kind="action" name="Properties"/>
+ </XActionItem>
+ </XActionItem>
+ <XDependencies/>
+ </XModelEntity>
+ <XEntityExtension name="FileFolder">
+ <XChildrenEntities>
+ <XChildEntity name="FileFaceletTaglib20"/>
+ </XChildrenEntities>
+ <XActionItem kind="list"/>
+ </XEntityExtension>
+ <XEntityExtension name="FileSystemFolder">
+ <XChildrenEntities>
+ <XChildEntity name="FileFaceletTaglib20"/>
+ </XChildrenEntities>
+ <XActionItem kind="list"/>
+ </XEntityExtension>
+ <XEntityExtension name="FileSystemJar">
+ <XChildrenEntities>
+ <XChildEntity name="FileFaceletTaglib20"/>
+ </XChildrenEntities>
+ <XActionItem kind="list"/>
+ </XEntityExtension>
+ <XEntityExtension name="JarFolder">
+ <XChildrenEntities>
+ <XChildEntity name="FileFaceletTaglib20"/>
+ </XChildrenEntities>
+ <XActionItem kind="list"/>
+ </XEntityExtension>
+</XModelEntityGroup>
15 years, 11 months
- 1
- 0
JBoss Tools SVN: r19748 - in trunk/jsf/plugins/org.jboss.tools.jsf: resources/help and 3 other directories.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2010-01-14 10:54:01 -0500 (Thu, 14 Jan 2010)
New Revision: 19748
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf/build.properties
trunk/jsf/plugins/org.jboss.tools.jsf/plugin.xml
trunk/jsf/plugins/org.jboss.tools.jsf/resources/help/keys-jsf.properties
trunk/jsf/plugins/org.jboss.tools.jsf/resources/meta/facelet-taglib.meta
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/facelet/model/FaceletTaglibConstants.java
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/facelet/model/FaceletTaglibEntityRecognizer.java
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/pv/JSFProjectTagLibs.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-5670
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/build.properties
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/build.properties 2010-01-14 14:42:10 UTC (rev 19747)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/build.properties 2010-01-14 15:54:01 UTC (rev 19748)
@@ -4,8 +4,11 @@
about.html,\
dtds/,\
images/,\
- .
+ .,\
+ schemas/
jars.compile.order = .
output.. = bin/
source.. = src/,\
resources/
+src.includes = dtds/,\
+ schemas/
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/plugin.xml
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/plugin.xml 2010-01-14 14:42:10 UTC (rev 19747)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/plugin.xml 2010-01-14 15:54:01 UTC (rev 19748)
@@ -13,6 +13,7 @@
<meta path="meta/jsfwizards.meta">
</meta>
<meta path="meta/facelet-taglib.meta"/>
+ <meta path="meta/facelet-taglib2.meta"/>
<meta path="meta/jsf2-components.meta"/>
</extension>
<extension point="org.jboss.tools.common.model.keys">
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/resources/help/keys-jsf.properties
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/resources/help/keys-jsf.properties 2010-01-14 14:42:10 UTC (rev 19747)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/resources/help/keys-jsf.properties 2010-01-14 15:54:01 UTC (rev 19748)
@@ -1,3 +1,6 @@
+FileFaceletTaglib.editorTitle=Facelet Taglib 1.0 Editor
+FileFaceletTaglib20.editorTitle=Facelet Taglib 2.0 Editor
+
FileSystems_RegisterInServerXML_jsf=/jsf/noHelpYet.html
FacesConfig_Rename.WindowTitle=Rename
@@ -632,29 +635,58 @@
JSFConfigExtensions_Properties.Title=Extensions
FileFaceletTaglib_Properties.Title=File Facelet Taglib
+FileFaceletTaglib20_Properties.Title=File Facelet Taglib
FileFaceletTaglib_AddTag.WindowTitle=Add Tag
FileFaceletTaglib_AddTag.Title=Facelet Tag
+FileFaceletTaglib20_AddTag.WindowTitle=Add Tag
+FileFaceletTaglib20_AddTag.Title=Facelet Tag
+
FileFaceletTaglib_AddFunction.WindowTitle=Add Function
FileFaceletTaglib_AddFunction.Title=Facelet Function
+FileFaceletTaglib20_AddFunction.WindowTitle=Add Function
+FileFaceletTaglib20_AddFunction.Title=Facelet Function
+
FaceletTaglibTag_AddHandler.WindowTitle=New Handler
FaceletTaglibTag_AddHandler.Title=Facelet Tag Handler
+FaceletTaglibTag20_AddHandler.WindowTitle=New Handler
+FaceletTaglibTag20_AddHandler.Title=Facelet Tag Handler
+
FaceletTaglibTag_AddComponent.WindowTitle=New Component
FaceletTaglibTag_AddComponent.Title=Facelet Component
+FaceletTaglibTag20_AddComponent.WindowTitle=New Component
+FaceletTaglibTag20_AddComponent.Title=Facelet Component
+
+FaceletTaglibTag20_AddBehavior.WindowTitle=New Behavior
+FaceletTaglibTag20_AddBehavior.Title=Facelet Behavior
+
FaceletTaglibTag_AddConverter.WindowTitle=New Converter
FaceletTaglibTag_AddConverter.Title=Facelet Converter
+FaceletTaglibTag20_AddConverter.WindowTitle=New Converter
+FaceletTaglibTag20_AddConverter.Title=Facelet Converter
+
FaceletTaglibTag_AddValidator.WindowTitle=New Validator
FaceletTaglibTag_AddValidator.Title=Facelet Validator
+FaceletTaglibTag20_AddValidator.WindowTitle=New Validator
+FaceletTaglibTag20_AddValidator.Title=Facelet Validator
+
FaceletTaglibTag_AddSource.WindowTitle=New Source
FaceletTaglibTag_AddSource.Title=Facelet Tag Source
+FaceletTaglibTag20_AddSource.WindowTitle=New Source
+FaceletTaglibTag20_AddSource.Title=Facelet Tag Source
+
+FaceletTaglibTag20_AddAttribute.WindowTitle=New Attribute
+FaceletTaglibTag20_AddAttribute.Title=Facelet Attribute
+
FaceletTaglibTag_Properties.Title=Facelet Tag
+FaceletTaglibTag20_Properties.Title=Facelet Tag
FaceletTaglibHandler_Properties.Title=Facelet Tag Handler
FaceletTaglibComponent_Properties.Title=Facelet Component
@@ -662,6 +694,14 @@
FaceletTaglibValidator_Properties.Title=Facelet Validator
FaceletTaglibSource_Properties.Title=Facelet Tag Source
+FaceletTaglibHandler20_Properties.Title=Facelet Tag Handler
+FaceletTaglibBehavior20_Properties.Title=Facelet Behavior
+FaceletTaglibComponent20_Properties.Title=Facelet Component
+FaceletTaglibConverter20_Properties.Title=Facelet Converter
+FaceletTaglibValidator20_Properties.Title=Facelet Validator
+FaceletTaglibSource20_Properties.Title=Facelet Tag Source
+FaceletTaglibAttribute20_Properties.Title=Facelet Attribute
+
# New Eclipse4Web JSF Project wizard
newJSFLightProjectPage1_introduction=The Create New Project Wizard is used for creating a brand new project. If you already have a pre-existing project, just use the Import Project Wizard to start working with it in Eclipse4Web.
newJSFLightProjectPage1_name = Project Name
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/resources/meta/facelet-taglib.meta
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/resources/meta/facelet-taglib.meta 2010-01-14 14:42:10 UTC (rev 19747)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/resources/meta/facelet-taglib.meta 2010-01-14 15:54:01 UTC (rev 19748)
@@ -27,6 +27,7 @@
</GROUP>
<GROUP name="main">
<GROUP name="facelet">
+ <ICON name="attribute" path="images/jsf/attribute.gif"/>
<ICON name="component" path="images/struts/plug_in.gif"/>
<ICON name="converter" path="images/jsf/convertor.gif"/>
<ICON name="data-source" path="images/struts/data_source.gif"/>
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/facelet/model/FaceletTaglibConstants.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/facelet/model/FaceletTaglibConstants.java 2010-01-14 14:42:10 UTC (rev 19747)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/facelet/model/FaceletTaglibConstants.java 2010-01-14 15:54:01 UTC (rev 19748)
@@ -18,5 +18,6 @@
public static final String DOC_PUBLICID = "-//Sun Microsystems, Inc.//DTD Facelet Taglib 1.0//EN"; //$NON-NLS-1$
public static final String ENT_FACELET_TAGLIB = "FileFaceletTaglib"; //$NON-NLS-1$
+ public static final String ENT_FACELET_TAGLIB_20 = "FileFaceletTaglib20"; //$NON-NLS-1$
}
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/facelet/model/FaceletTaglibEntityRecognizer.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/facelet/model/FaceletTaglibEntityRecognizer.java 2010-01-14 14:42:10 UTC (rev 19747)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/facelet/model/FaceletTaglibEntityRecognizer.java 2010-01-14 15:54:01 UTC (rev 19748)
@@ -20,7 +20,17 @@
public String getEntityName(String ext, String body) {
if (body == null) return null;
if (body.indexOf(DOC_PUBLICID) > 0) return ENT_FACELET_TAGLIB;
+ if(is20(body)) return ENT_FACELET_TAGLIB_20;
return null;
}
+ private boolean is20(String body) {
+ int i = body.indexOf("<facelet-taglib"); //$NON-NLS-1$
+ if(i < 0) return false;
+ int j = body.indexOf(">", i); //$NON-NLS-1$
+ if(j < 0) return false;
+ String s = body.substring(i, j);
+ return s.indexOf("version=\"2.0\"") > 0 && //$NON-NLS-1$
+ s.indexOf("\"http://java.sun.com/xml/ns/javaee\"") > 0; //$NON-NLS-1$
+ }
}
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/pv/JSFProjectTagLibs.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/pv/JSFProjectTagLibs.java 2010-01-14 14:42:10 UTC (rev 19747)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/pv/JSFProjectTagLibs.java 2010-01-14 15:54:01 UTC (rev 19748)
@@ -89,6 +89,10 @@
static String TLD_ENTITIES = ".FileTLD_PRO.FileTLD_1_2.FileTLD_2_0.FileTLD_2_1.";
protected boolean acceptFile(XModelObject o) {
+ if(o.getParent() == null) {
+ System.out.println("Null parent " + o);
+ return false;
+ }
if("META-INF".equals(o.getParent().getAttributeValue("name"))) {
if(TLDUtil.isFaceletTaglib(o)) return true;
}
15 years, 11 months
- 1
- 0