You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by ma...@apache.org on 2020/12/04 17:14:43 UTC
[netbeans] branch master updated: [NETBEANS-5057] fix for indexing
composite components
This is an automated email from the ASF dual-hosted git repository.
matthiasblaesing pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new f351742 [NETBEANS-5057] fix for indexing composite components
new c6ba791 Merge pull request #2557 from e-Contract/jsf-composite-lib-fix
f351742 is described below
commit f3517423d17cc1c945ea6e8ab47eabbe8f19f984
Author: Frank Cornelis <in...@e-contract.be>
AuthorDate: Mon Nov 23 09:32:13 2020 +0100
[NETBEANS-5057] fix for indexing composite components
---
.../modules/web/jsf/editor/index/CompositeComponentModel.java | 2 +-
.../org/netbeans/modules/web/jsf/editor/index/JsfBinaryIndexer.java | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/enterprise/web.jsf.editor/src/org/netbeans/modules/web/jsf/editor/index/CompositeComponentModel.java b/enterprise/web.jsf.editor/src/org/netbeans/modules/web/jsf/editor/index/CompositeComponentModel.java
index e96611b..c1962c7 100644
--- a/enterprise/web.jsf.editor/src/org/netbeans/modules/web/jsf/editor/index/CompositeComponentModel.java
+++ b/enterprise/web.jsf.editor/src/org/netbeans/modules/web/jsf/editor/index/CompositeComponentModel.java
@@ -270,7 +270,7 @@ public class CompositeComponentModel extends JsfPageModel {
if (folder.getName().equalsIgnoreCase("resources")) { //NOI18N
//check if its parent is META-INF
FileObject parent = folder.getParent();
- if (parent != null && parent.getNameExt().startsWith("META-INF")) { //NOI18N
+ if (parent != null && parent.getName().startsWith("META-INF")) { //NOI18N
//the folder seems to be the right resources folder
return folder;
}
diff --git a/enterprise/web.jsf.editor/src/org/netbeans/modules/web/jsf/editor/index/JsfBinaryIndexer.java b/enterprise/web.jsf.editor/src/org/netbeans/modules/web/jsf/editor/index/JsfBinaryIndexer.java
index c0d87ad..14f1d7d 100644
--- a/enterprise/web.jsf.editor/src/org/netbeans/modules/web/jsf/editor/index/JsfBinaryIndexer.java
+++ b/enterprise/web.jsf.editor/src/org/netbeans/modules/web/jsf/editor/index/JsfBinaryIndexer.java
@@ -48,14 +48,14 @@ import org.openide.util.Exceptions;
* @author marekfukala
*/
@ConstrainedBinaryIndexer.Registration(
-namePattern = ".*\\.tld|.*\\.taglib\\.xml",
+namePattern = ".*\\.tld|.*\\.taglib\\.xml|.*\\.xhtml",
indexVersion = JsfBinaryIndexer.INDEXER_VERSION,
indexerName = JsfBinaryIndexer.INDEXER_NAME)
public class JsfBinaryIndexer extends ConstrainedBinaryIndexer {
private static final Logger LOGGER = Logger.getLogger(JsfBinaryIndexer.class.getSimpleName());
private static final String CONTENT_UNKNOWN = "content/unknown"; //NOI18N
- static final int INDEXER_VERSION = 10; //NOI18N
+ static final int INDEXER_VERSION = 11; //NOI18N
static final String INDEXER_NAME = "jsfBinary"; //NOI18N
@Override
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@netbeans.apache.org
For additional commands, e-mail: commits-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists