Author: dgolovin Date: 2008-01-30 21:23:23 -0500 (Wed, 30 Jan 2008) New Revision: 6048 Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/support/kb/WTPTextJspKbConnector.java Log: fix exception during JUnit tetsts java.lang.IllegalStateException: Timer already cancelled. at java.util.Timer.sched(Timer.java:354) at java.util.Timer.schedule(Timer.java:170) at org.jboss.tools.jst.jsp.support.kb.WTPTextJspKbConnector.invokeDelayedUpdateKnownTagLists(WTPTextJspKbConnector.java:185) at org.jboss.tools.jst.jsp.support.kb.WTPTextJspKbConnector.<init>(WTPTextJspKbConnector.java:132) at org.jboss.tools.jst.jsp.jspeditor.JSPTextEditor.installActivePropmtSupport(JSPTextEditor.java:550) at org.jboss.tools.jst.jsp.jspeditor.JSPTextEditor.createPartControl(JSPTextEditor.java:262) at org.jboss.tools.vpe.editor.VpeEditorPart.createPartControl(VpeEditorPart.java:500) 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 2008-01-31 02:13:13 UTC (rev 6047) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/support/kb/WTPTextJspKbConnector.java 2008-01-31 02:23:23 UTC (rev 6048) @@ -182,7 +182,10 @@ private boolean taglibTrackerListenerInstalled = false; public void invokeDelayedUpdateKnownTagLists() { - timer.schedule(new MyTimerTask(), 500); + // Previous code is + // timer.schedule(new MyTimerTask(), 500); + initTaglibPrefixes(); + updateKnownTagLists(); } private boolean isTrackerToWatch(String trackerUri) { @@ -219,30 +222,26 @@ } public void taglibPrefixChanged(String[] prefixs) { - try { - trackers.clear(); - if(taglibManagerProvider==null || taglibManagerProvider.getTaglibManager()==null) { - TLDCMDocumentManager manager = TaglibController.getTLDCMDocumentManager(fDocument); - List list = manager.getTaglibTrackers(); - for(int i=0; i<list.size(); i++) { - TaglibTracker tracker = (TaglibTracker)list.get(i); - if (isTrackerToWatch(tracker.getURI())) { - trackers.put(tracker.getPrefix(), tracker); - } + trackers.clear(); + if(taglibManagerProvider==null || taglibManagerProvider.getTaglibManager()==null) { + TLDCMDocumentManager manager = TaglibController.getTLDCMDocumentManager(fDocument); + List list = manager.getTaglibTrackers(); + for(int i=0; i<list.size(); i++) { + TaglibTracker tracker = (TaglibTracker)list.get(i); + if (isTrackerToWatch(tracker.getURI())) { + trackers.put(tracker.getPrefix(), tracker); } - } else { - List list = taglibManagerProvider.getTaglibManager().getTagLibs(); - for(int i=0; i<list.size(); i++) { - TaglibData data = (TaglibData)list.get(i); - if (isTrackerToWatch(data.getUri())) { - trackers.put(data.getPrefix(), data); - } + } + } else { + List list = taglibManagerProvider.getTaglibManager().getTagLibs(); + for(int i=0; i<list.size(); i++) { + TaglibData data = (TaglibData)list.get(i); + if (isTrackerToWatch(data.getUri())) { + trackers.put(data.getPrefix(), data); } } - invokeDelayedUpdateKnownTagLists(); - } catch (Exception x) { - JspEditorPlugin.getPluginLog().logError("Error while processing change in taglib prefixes", x); } + invokeDelayedUpdateKnownTagLists(); } public void addTaglib(String uri, String prefix) { @@ -359,7 +358,6 @@ } public void notifyChanged(INodeNotifier notifier, int eventType, Object feature, Object oldValue, Object newValue, int index) { - try { switch (eventType) { case INodeNotifier.ADD : { @@ -405,9 +403,6 @@ break; } } - } catch (Exception x) { - JspEditorPlugin.getPluginLog().logError("Error in JSF kb connector", x); - } invokeDelayedUpdateKnownTagLists(); } }