JBoss Tools SVN: r33855 - in trunk: jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/computers and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2011-08-12 11:45:23 -0400 (Fri, 12 Aug 2011)
New Revision: 33855
Modified:
trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/contentassist/ProposalSorter.java
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/computers/AbstractXmlCompletionProposalComputer.java
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/computers/JspELCompletionProposalComputer.java
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/computers/XmlTagCompletionProposalComputer.java
Log:
JBIDE-9515
EL code completion is broken
Issue is fixed
Modified: trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/contentassist/ProposalSorter.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/contentassist/ProposalSorter.java 2011-08-12 15:43:31 UTC (rev 33854)
+++ trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/contentassist/ProposalSorter.java 2011-08-12 15:45:23 UTC (rev 33855)
@@ -41,9 +41,9 @@
if (proposals == null)
return null;
ICompletionProposal[] resultArray = (ICompletionProposal[])proposals.toArray(new ICompletionProposal[proposals.size()]);
+ resultArray = makeUnique(resultArray);
Object[] sorted = createSorter().sort(resultArray);
System.arraycopy(sorted, 0, resultArray, 0, sorted.length);
- resultArray = makeUnique(resultArray);
return Arrays.asList(resultArray);
}
@@ -107,6 +107,15 @@
if (existingProposal == null) {
existingProposals.put(replString, proposal);
unique.add(proposal);
+ } else {
+ if (existingProposal instanceof IRelevanceCompletionProposal && proposal instanceof IRelevanceCompletionProposal) {
+ if (((IRelevanceCompletionProposal)existingProposal).getRelevance() <
+ ((IRelevanceCompletionProposal)proposal).getRelevance()) {
+ existingProposals.put(replString, proposal);
+ unique.remove(existingProposal);
+ unique.add(proposal);
+ }
+ }
}
}
return unique.toArray(new ICompletionProposal[unique.size()]);
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/computers/AbstractXmlCompletionProposalComputer.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/computers/AbstractXmlCompletionProposalComputer.java 2011-08-12 15:43:31 UTC (rev 33854)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/computers/AbstractXmlCompletionProposalComputer.java 2011-08-12 15:45:23 UTC (rev 33855)
@@ -57,6 +57,7 @@
private static final String[] EMPTY_TAGS = new String[0];
public static final String EL_DOLLAR_PREFIX = "${"; //$NON-NLS-1$
public static final String EL_NUMBER_PREFIX = "#{"; //$NON-NLS-1$
+ public static final String EL_SUFFIX = "}"; //$NON-NLS-1$
public static final String[] EL_PREFIXES = {EL_DOLLAR_PREFIX, EL_NUMBER_PREFIX};
protected CompletionProposalInvocationContext fCurrentContext;
@@ -729,4 +730,7 @@
protected boolean startsWithELBeginning(String text) {
return (text != null && (text.startsWith(EL_DOLLAR_PREFIX) || text.startsWith(EL_NUMBER_PREFIX)));
}
+ protected boolean endsWithELBeginning(String text) {
+ return (text != null && text.endsWith(EL_SUFFIX));
+ }
}
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/computers/JspELCompletionProposalComputer.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/computers/JspELCompletionProposalComputer.java 2011-08-12 15:43:31 UTC (rev 33854)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/computers/JspELCompletionProposalComputer.java 2011-08-12 15:45:23 UTC (rev 33855)
@@ -90,10 +90,6 @@
return null;
}
- protected boolean startsWithELBeginning(String text) {
- return (text != null && text.startsWith("${")); //$NON-NLS-1$ //$NON-NLS-2$
- }
-
protected void setVars(ELContextImpl context, IFile file) {
ELCompletionEngine fakeEngine = new ELCompletionEngine() {
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/computers/XmlTagCompletionProposalComputer.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/computers/XmlTagCompletionProposalComputer.java 2011-08-12 15:43:31 UTC (rev 33854)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/computers/XmlTagCompletionProposalComputer.java 2011-08-12 15:45:23 UTC (rev 33855)
@@ -572,10 +572,9 @@
ELInstance is = ELUtil.findInstance(model, inValueOffset);// ELInstance
ELInvocationExpression ie = ELUtil.findExpression(model, inValueOffset);// ELExpression
+ boolean isELStarted = (model != null && is != null && startsWithELBeginning(is.getFirstToken() == null ? null : is.getFirstToken().getText()));
+ boolean isELClosed = (model != null && is != null && endsWithELBeginning(is.getFirstToken() == null ? null : is.getLastToken().getText()));
- boolean isELStarted = (model != null && is != null && startsWithELBeginning(text));
- boolean isELClosed = (model != null && is != null && model.toString().endsWith("}")); //$NON-NLS-1$
-
// boolean insideEL = startOffset + model.toString().length()
TextRegion tr = new TextRegion(startOffset, ie == null ? inValueOffset : ie.getStartPosition(),
ie == null ? 0 : inValueOffset - ie.getStartPosition(), ie == null ? "" : ie.getText(), //$NON-NLS-1$
14 years, 8 months
JBoss Tools SVN: r33854 - trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template.
by jbosstools-commits＠lists.jboss.org
Author: dmaliarevich
Date: 2011-08-12 11:43:31 -0400 (Fri, 12 Aug 2011)
New Revision: 33854
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplateSet.java
Log:
https://issues.jboss.org/browse/JBIDE-9444 , fix spelling error.
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplateSet.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplateSet.java 2011-08-12 15:42:45 UTC (rev 33853)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplateSet.java 2011-08-12 15:43:31 UTC (rev 33854)
@@ -40,7 +40,7 @@
VpeTemplate getTemplate(VpePageContext pageContext, Node sourceNode, Set ifDependencySet) {
VpeTemplate result = defTemplate;
- boolean initializeCustomTemplete = true;
+ boolean initializeCustomTemplate = true;
for (int i = 0; i < templates.size(); i++) {
VpeTemplateSet set = (VpeTemplateSet)templates.get(i);
VpeTemplate template = set.getTemplate(pageContext, sourceNode, ifDependencySet);
@@ -51,14 +51,14 @@
* in the result -- set it up
*/
result = template;
- initializeCustomTemplete = false;
- } else if (initializeCustomTemplete) {
+ initializeCustomTemplate = false;
+ } else if (initializeCustomTemplate) {
/*
* Default template presents, but custom template was found.
* Put this new template to the result variable
*/
result = template;
- initializeCustomTemplete = false;
+ initializeCustomTemplate = false;
} else if (result.getPriority() < template.getPriority()) {
/*
* In the cycle -- looking for the template
14 years, 8 months
JBoss Tools SVN: r33853 - trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template.
by jbosstools-commits＠lists.jboss.org
Author: dmaliarevich
Date: 2011-08-12 11:42:45 -0400 (Fri, 12 Aug 2011)
New Revision: 33853
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplateSet.java
Log:
https://issues.jboss.org/browse/JBIDE-9444 , template's lookup mechanism was updated.
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplateSet.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplateSet.java 2011-08-12 15:42:32 UTC (rev 33852)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplateSet.java 2011-08-12 15:42:45 UTC (rev 33853)
@@ -39,17 +39,39 @@
}
VpeTemplate getTemplate(VpePageContext pageContext, Node sourceNode, Set ifDependencySet) {
+ VpeTemplate result = defTemplate;
+ boolean initializeCustomTemplete = true;
for (int i = 0; i < templates.size(); i++) {
VpeTemplateSet set = (VpeTemplateSet)templates.get(i);
VpeTemplate template = set.getTemplate(pageContext, sourceNode, ifDependencySet);
if (template != null) {
- if ((defTemplate != null) && (defTemplate.getPriority() > template.getPriority())) {
- return defTemplate;
- } else {
- return template;
+ if (result == null) {
+ /*
+ * When there is no default template
+ * in the result -- set it up
+ */
+ result = template;
+ initializeCustomTemplete = false;
+ } else if (initializeCustomTemplete) {
+ /*
+ * Default template presents, but custom template was found.
+ * Put this new template to the result variable
+ */
+ result = template;
+ initializeCustomTemplete = false;
+ } else if (result.getPriority() < template.getPriority()) {
+ /*
+ * In the cycle -- looking for the template
+ * with the highest priority
+ */
+ result = template;
}
}
}
- return defTemplate;
+ /*
+ * If no templates have been found --
+ * default template will be returned
+ */
+ return result;
}
}
14 years, 8 months
JBoss Tools SVN: r33852 - trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2011-08-12 11:42:32 -0400 (Fri, 12 Aug 2011)
New Revision: 33852
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/OpenCDINamedBeanDialog.java
Log:
JBIDE-7892
Search for @Named beans.
Open CDI Named Bean Dialog is added
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/OpenCDINamedBeanDialog.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/OpenCDINamedBeanDialog.java 2011-08-12 15:26:25 UTC (rev 33851)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/OpenCDINamedBeanDialog.java 2011-08-12 15:42:32 UTC (rev 33852)
@@ -172,8 +172,7 @@
CDIUIMessages.OPEN_CDI_NAMED_BEAN_DIALOG_LOADING,
projects.length);
- for (int i = 0; i < projects.length; i++) {
- IProject project = projects[i];
+ for (IProject project : projects) {
progressMonitor.subTask(project.getName());
ICDIProject cdiProject = CDICorePlugin.getCDIProject(project, true);
14 years, 8 months
JBoss Tools SVN: r33851 - in trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor: util and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dmaliarevich
Date: 2011-08-12 11:26:25 -0400 (Fri, 12 Aug 2011)
New Revision: 33851
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeAbstractTemplate.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplate.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplateFileList.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplateManager.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplateSafeWrapper.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplateSet.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/ELResolver.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/ElService.java
Log:
https://issues.jboss.org/browse/JBIDE-9444 , templates' priority was added
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeAbstractTemplate.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeAbstractTemplate.java 2011-08-12 15:23:12 UTC (rev 33850)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeAbstractTemplate.java 2011-08-12 15:26:25 UTC (rev 33851)
@@ -84,6 +84,9 @@
/** The pseudo content creator. */
private VpePseudoContentCreator pseudoContentCreator;
+
+ /** The priority to load templates for the tag */
+ protected double priority = 0.0;
/** The Constant TAG_BREAKER. */
private static final String TAG_BREAKER = VpeTemplateManager.VPE_PREFIX
@@ -1430,4 +1433,12 @@
return new Region(offset, 0);
}
+ final public double getPriority() {
+ return priority;
+ }
+
+ final public void setPriority(double priority) {
+ this.priority = priority;
+ }
+
}
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplate.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplate.java 2011-08-12 15:23:12 UTC (rev 33850)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplate.java 2011-08-12 15:26:25 UTC (rev 33851)
@@ -466,4 +466,8 @@
*/
public IRegion getSourceRegionForOpenOn(VpePageContext pageContext, Node sourceNode,nsIDOMNode domNode);
+ public double getPriority();
+
+ public void setPriority(double priority);
+
}
\ No newline at end of file
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplateFileList.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplateFileList.java 2011-08-12 15:23:12 UTC (rev 33850)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplateFileList.java 2011-08-12 15:26:25 UTC (rev 33851)
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007 Exadel, Inc. and Red Hat, Inc.
+ * Copyright (c) 2007-2011 Exadel, Inc. and 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,
@@ -7,7 +7,7 @@
*
* Contributors:
* Exadel, Inc. and Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
+ ******************************************************************************/
package org.jboss.tools.vpe.editor.template;
import java.io.IOException;
@@ -34,7 +34,7 @@
VpeTemplateFileList() {
}
-
+
void load() {
VpeTemplateFile newAutoTemplateFile = new VpeTemplateFile(
VpeTemplateManager.getAutoTemplates(), null);
@@ -57,50 +57,50 @@
autoTemplateFile = newAutoTemplateFile;
templateFiles = newTemplateFiles;
}
-
+
VpeTemplateFile getAutoTemplateFile() {
return autoTemplateFile;
}
-
+
VpeTemplateFile[] getTemplateFiles() {
return templateFiles;
}
-
+
boolean isChanged() {
return changed;
}
-
+
private VpeTemplateFile[] createTemplateFileList() {
List<VpeTemplateFile> templateList = createTemplateFileListImpl();
return templateList.toArray(new VpeTemplateFile[templateList.size()]);
}
-
+
private List<VpeTemplateFile> createTemplateFileListImpl() {
List<VpeTemplateFile> templateList = new ArrayList<VpeTemplateFile>();
- IExtensionRegistry registry = Platform.getExtensionRegistry();
- IExtensionPoint extensionPoint = registry.getExtensionPoint(VpePlugin.EXTESION_POINT_VPE_TEMPLATES);
- IExtension[] extensions = extensionPoint.getExtensions();
- for (int i=0;i<extensions.length;i++) {
- IExtension extension = extensions[i];
- IConfigurationElement[] elements = extension.getConfigurationElements();
- for(int j=0;j<elements.length;j++) {
- String pathAttrValue = elements[j].getAttribute("path"); //$NON-NLS-1$
- try {
+ IExtensionRegistry registry = Platform.getExtensionRegistry();
+ IExtensionPoint extensionPoint = registry.getExtensionPoint(VpePlugin.EXTESION_POINT_VPE_TEMPLATES);
+ IExtension[] extensions = extensionPoint.getExtensions();
+ for (int i = 0; i < extensions.length; i++) {
+ IExtension extension = extensions[i];
+ IConfigurationElement[] elements = extension.getConfigurationElements();
+ for (int j = 0; j < elements.length; j++) {
+ String pathAttrValue = elements[j].getAttribute("path"); //$NON-NLS-1$
+ try {
VpeTemplateFile templateFile = new VpeTemplateFile(pathAttrValue, elements[j]);
- templateList.add(templateFile);
- } catch (IOException e) {
- VpePlugin.getPluginLog().logError("Error during loading template '" + pathAttrValue + "'", e); //$NON-NLS-1$ //$NON-NLS-2$
- }
+ templateList.add(templateFile);
+ } catch (IOException e) {
+ VpePlugin.getPluginLog().logError("Error during loading template '" + pathAttrValue + "'", e); //$NON-NLS-1$ //$NON-NLS-2$
}
}
+ }
return templateList;
}
static IPath getFilePath(String name, IConfigurationElement confElement) throws IOException {
VpePlugin plugin = VpePlugin.getDefault();
Bundle bundle = confElement == null
- ? plugin.getBundle()
+ ? plugin.getBundle()
: Platform.getBundle(confElement.getContributor().getName());
URL url = bundle.getEntry("/"); //$NON-NLS-1$
IPath path = new Path(FileLocator.toFileURL(url).getFile());
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplateManager.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplateManager.java 2011-08-12 15:23:12 UTC (rev 33850)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplateManager.java 2011-08-12 15:26:25 UTC (rev 33851)
@@ -312,6 +312,9 @@
*/
private static final String NAMESPACE_IDENTIFIER_ATTRIBUTE = "namespaceIdentifier"; //$NON-NLS-1$
+ /** The priority to load tempaltes */
+ private static final String PRIORITY = "priority"; //$NON-NLS-1$
+
private static final IPath DEFAULT_AUTO_TEMPLATES_PATH = VpePlugin.getDefault()
.getStateLocation().append(VPE_TEMPLATES_AUTO);
@@ -1024,6 +1027,14 @@
.getAttribute(VpeTemplateManager.ATTR_TEMPLATE_CLASS);
String nameSpaceIdentifyer = templateElement
.getAttribute(VpeTemplateManager.NAMESPACE_IDENTIFIER_ATTRIBUTE);
+ String priority = templateElement
+ .getAttribute(VpeTemplateManager.PRIORITY);
+ if (priority != null) {
+ priority = priority.trim();
+ }
+ if (priority == null || priority.isEmpty()) {
+ priority = "0"; //$NON-NLS-1$
+ }
if (templateClassName != null && templateClassName.length() > 0) {
if (nameSpaceIdentifyer == null
|| nameSpaceIdentifyer.length() == 0) {
@@ -1055,6 +1066,9 @@
template.init(templateElement, caseSensitive);
template = new VpeTemplateSafeWrapper(template);
}
+ if (template != null) {
+ template.setPriority(Double.parseDouble(priority));
+ }
return template;
}
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplateSafeWrapper.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplateSafeWrapper.java 2011-08-12 15:23:12 UTC (rev 33850)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplateSafeWrapper.java 2011-08-12 15:26:25 UTC (rev 33851)
@@ -590,4 +590,11 @@
}
return null;
};
+
+ public double getPriority() {
+ return delegate.getPriority();
+ }
+ public void setPriority(double priority) {
+ delegate.setPriority(priority);
+ }
}
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplateSet.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplateSet.java 2011-08-12 15:23:12 UTC (rev 33850)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplateSet.java 2011-08-12 15:26:25 UTC (rev 33851)
@@ -20,6 +20,7 @@
public class VpeTemplateSet {
private List<VpeTemplateSet> templates = new ArrayList<VpeTemplateSet>();
+ /** Default template */
private VpeTemplate defTemplate;
VpeTemplateSet(){
@@ -32,6 +33,8 @@
void setDefTemplate(VpeTemplate defTemplate) {
if (this.defTemplate == null) {
this.defTemplate = defTemplate;
+ } else if (this.defTemplate.getPriority() < defTemplate.getPriority()) {
+ this.defTemplate = defTemplate;
}
}
@@ -40,7 +43,11 @@
VpeTemplateSet set = (VpeTemplateSet)templates.get(i);
VpeTemplate template = set.getTemplate(pageContext, sourceNode, ifDependencySet);
if (template != null) {
- return template;
+ if ((defTemplate != null) && (defTemplate.getPriority() > template.getPriority())) {
+ return defTemplate;
+ } else {
+ return template;
+ }
}
}
return defTemplate;
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/ELResolver.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/ELResolver.java 2011-08-12 15:23:12 UTC (rev 33850)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/ELResolver.java 2011-08-12 15:26:25 UTC (rev 33851)
@@ -198,4 +198,10 @@
rst = replaceEl(rst);
return rst;
}
+
+ public void createScope() {
+ }
+
+ public void resolveScope() {
+ }
}
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/ElService.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/ElService.java 2011-08-12 15:23:12 UTC (rev 33850)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/ElService.java 2011-08-12 15:26:25 UTC (rev 33851)
@@ -59,5 +59,13 @@
public void setElResolver(ELResolver elResolver) {
this.elResolver = elResolver;
}
+
+ public void createScope() {
+ getElResolver().createScope();
+ }
+
+ public void resolveScope() {
+ getElResolver().resolveScope();
+ }
}
14 years, 8 months
JBoss Tools SVN: r33849 - trunk/forge/plugins/org.jboss.tools.forge.runtime.ext/.settings.
by jbosstools-commits＠lists.jboss.org
Author: koen.aers(a)jboss.com
Date: 2011-08-12 11:22:37 -0400 (Fri, 12 Aug 2011)
New Revision: 33849
Added:
trunk/forge/plugins/org.jboss.tools.forge.runtime.ext/.settings/org.eclipse.jdt.core.prefs
Log:
cleanup
Copied: trunk/forge/plugins/org.jboss.tools.forge.runtime.ext/.settings/org.eclipse.jdt.core.prefs (from rev 33848, trunk/forge/plugins/org.jboss.tools.forge.runtime.ext/org.jboss.tools.forge.runtime.ext/.settings/org.eclipse.jdt.core.prefs)
===================================================================
--- trunk/forge/plugins/org.jboss.tools.forge.runtime.ext/.settings/org.eclipse.jdt.core.prefs (rev 0)
+++ trunk/forge/plugins/org.jboss.tools.forge.runtime.ext/.settings/org.eclipse.jdt.core.prefs 2011-08-12 15:22:37 UTC (rev 33849)
@@ -0,0 +1,8 @@
+#Mon Jul 18 13:48:41 CEST 2011
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.6
14 years, 8 months
JBoss Tools SVN: r33848 - trunk/forge/plugins/org.jboss.tools.forge.runtime.ext/META-INF.
by jbosstools-commits＠lists.jboss.org
Author: koen.aers(a)jboss.com
Date: 2011-08-12 11:21:27 -0400 (Fri, 12 Aug 2011)
New Revision: 33848
Added:
trunk/forge/plugins/org.jboss.tools.forge.runtime.ext/META-INF/MANIFEST.MF
Log:
cleanup
Copied: trunk/forge/plugins/org.jboss.tools.forge.runtime.ext/META-INF/MANIFEST.MF (from rev 33847, trunk/forge/plugins/org.jboss.tools.forge.runtime.ext/org.jboss.tools.forge.runtime.ext/META-INF/MANIFEST.MF)
===================================================================
--- trunk/forge/plugins/org.jboss.tools.forge.runtime.ext/META-INF/MANIFEST.MF (rev 0)
+++ trunk/forge/plugins/org.jboss.tools.forge.runtime.ext/META-INF/MANIFEST.MF 2011-08-12 15:21:27 UTC (rev 33848)
@@ -0,0 +1,8 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Forge Runtime Extensions
+Bundle-SymbolicName: org.jboss.tools.forge.runtime.ext
+Bundle-Version: 1.0.0.qualifier
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-Vendor: JBoss by Red Hat
+Require-Bundle: org.jboss.tools.forge.runtime;bundle-version="1.0.0"
14 years, 8 months
JBoss Tools SVN: r33847 - trunk/forge/plugins/org.jboss.tools.forge.runtime.ext/.settings.
by jbosstools-commits＠lists.jboss.org
Author: koen.aers(a)jboss.com
Date: 2011-08-12 11:20:28 -0400 (Fri, 12 Aug 2011)
New Revision: 33847
Removed:
trunk/forge/plugins/org.jboss.tools.forge.runtime.ext/.settings/org.eclipse.jdt.core.prefs
Log:
cleanup
Deleted: trunk/forge/plugins/org.jboss.tools.forge.runtime.ext/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/forge/plugins/org.jboss.tools.forge.runtime.ext/.settings/org.eclipse.jdt.core.prefs 2011-08-12 15:20:05 UTC (rev 33846)
+++ trunk/forge/plugins/org.jboss.tools.forge.runtime.ext/.settings/org.eclipse.jdt.core.prefs 2011-08-12 15:20:28 UTC (rev 33847)
@@ -1,8 +0,0 @@
-#Mon Jul 11 18:25:11 CEST 2011
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.6
14 years, 8 months
JBoss Tools SVN: r33846 - trunk/forge/plugins/org.jboss.tools.forge.runtime.ext/META-INF.
by jbosstools-commits＠lists.jboss.org
Author: koen.aers(a)jboss.com
Date: 2011-08-12 11:20:05 -0400 (Fri, 12 Aug 2011)
New Revision: 33846
Removed:
trunk/forge/plugins/org.jboss.tools.forge.runtime.ext/META-INF/MANIFEST.MF
Log:
cleanup
Deleted: trunk/forge/plugins/org.jboss.tools.forge.runtime.ext/META-INF/MANIFEST.MF
===================================================================
--- trunk/forge/plugins/org.jboss.tools.forge.runtime.ext/META-INF/MANIFEST.MF 2011-08-12 15:18:21 UTC (rev 33845)
+++ trunk/forge/plugins/org.jboss.tools.forge.runtime.ext/META-INF/MANIFEST.MF 2011-08-12 15:20:05 UTC (rev 33846)
@@ -1,7 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Plugin
-Bundle-SymbolicName: org.jboss.tools.forge.runtime.ext
-Bundle-Version: 1.0.0.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Require-Bundle: org.jboss.tools.forge.runtime;bundle-version="1.0.0"
14 years, 8 months