[jbosstools-commits] JBoss Tools SVN: r3626 - trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/support/kb.
Author: vrubezhny
Date: 2007-09-14 06:59:19 -0400 (Fri, 14 Sep 2007)
New Revision: 3626
Modified:
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/support/kb/WTPTextJspKbConnector.java
Log:
http://jira.jboss.com/jira/browse/JBIDE-814 Resource bundle completion works for
<f:loadBundle> but doesn't work for <a4j:loadBundle>
Issue is fixed
Modified:
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/support/kb/WTPTextJspKbConnector.java
===================================================================
---
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/support/kb/WTPTextJspKbConnector.java 2007-09-14
10:26:31 UTC (rev 3625)
+++
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/support/kb/WTPTextJspKbConnector.java 2007-09-14
10:59:19 UTC (rev 3626)
@@ -180,13 +180,24 @@
private Map<String,Object> trackers = new HashMap<String,Object>();
private Map<String,LoadBundleInfo> loadedBundles = new
HashMap<String,LoadBundleInfo>();
- private final static String TRACKERS_TO_WATCH =
"http://java.sun.com/jsf/core";
+ private final static String[] TRACKERS_TO_WATCH =
{"http://java.sun.com/jsf/core",
+ "https://ajax4jsf.dev.java.net/ajax"
+ };
private boolean taglibTrackerListenerInstalled = false;
public void invokeDelayedUpdateKnownTagLists() {
timer.schedule(new MyTimerTask(), 500);
}
+ private boolean isTrackerToWatch(String trackerUri) {
+ for(int i=0; TRACKERS_TO_WATCH != null && i<TRACKERS_TO_WATCH.length; i++)
{
+ if (TRACKERS_TO_WATCH[i].equals(trackerUri)) {
+ return true;
+ }
+ }
+ return false;
+ }
+
public void initTaglibPrefixes() {
trackers.clear();
if(taglibManagerProvider==null || taglibManagerProvider.getTaglibManager()==null) {
@@ -195,7 +206,7 @@
List list = manager.getTaglibTrackers();
for(int i=0; i<list.size(); i++) {
TaglibTracker tracker = (TaglibTracker)list.get(i);
- if (TRACKERS_TO_WATCH.equals(tracker.getURI())) {
+ if (isTrackerToWatch(tracker.getURI())) {
trackers.put(tracker.getPrefix(), tracker);
}
}
@@ -204,7 +215,7 @@
List list = taglibManagerProvider.getTaglibManager().getTagLibs();
for(int i=0; i<list.size(); i++) {
TaglibData data = (TaglibData)list.get(i);
- if (TRACKERS_TO_WATCH.equals(data.getUri())) {
+ if (isTrackerToWatch(data.getUri())) {
trackers.put(data.getPrefix(), data);
}
}
@@ -219,7 +230,7 @@
List list = manager.getTaglibTrackers();
for(int i=0; i<list.size(); i++) {
TaglibTracker tracker = (TaglibTracker)list.get(i);
- if (TRACKERS_TO_WATCH.equals(tracker.getURI())) {
+ if (isTrackerToWatch(tracker.getURI())) {
trackers.put(tracker.getPrefix(), tracker);
}
}
@@ -227,7 +238,7 @@
List list = taglibManagerProvider.getTaglibManager().getTagLibs();
for(int i=0; i<list.size(); i++) {
TaglibData data = (TaglibData)list.get(i);
- if (TRACKERS_TO_WATCH.equals(data.getUri())) {
+ if (isTrackerToWatch(data.getUri())) {
trackers.put(data.getPrefix(), data);
}
}