Author: mareshkau
Date: 2009-10-20 10:34:51 -0400 (Tue, 20 Oct 2009)
New Revision: 18179
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tld/TaglibMapping.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-4839,
https://jira.jboss.org/jira/browse/JBIDE-5053
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 2009-10-20
13:48:00 UTC (rev 18178)
+++
trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/tld/TaglibMapping.java 2009-10-20
14:34:51 UTC (rev 18179)
@@ -17,7 +17,6 @@
import java.util.StringTokenizer;
import org.eclipse.core.resources.IResource;
-
import org.jboss.tools.common.model.XModel;
import org.jboss.tools.common.model.XModelObject;
import org.jboss.tools.common.model.event.XModelTreeEvent;
@@ -49,7 +48,7 @@
model.addModelTreeListener(listener = new TaglibModelTreeListener());
}
- synchronized public void revalidate(XModelObject webxml) {
+ public void revalidate(XModelObject webxml) {
if (webxml == null || isLoading) return;
model = webxml.getModel();
long jts = getJarsTimeStamp();
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java
===================================================================
---
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java 2009-10-20
13:48:00 UTC (rev 18178)
+++
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java 2009-10-20
14:34:51 UTC (rev 18179)
@@ -15,6 +15,7 @@
import java.util.List;
import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
@@ -73,10 +74,12 @@
import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument;
import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
import org.jboss.tools.common.el.core.ELReferenceList;
+import org.jboss.tools.common.model.XModel;
import org.jboss.tools.common.model.XModelObject;
import org.jboss.tools.common.model.event.XModelTreeEvent;
import org.jboss.tools.common.model.event.XModelTreeListener;
import org.jboss.tools.common.model.options.PreferenceModelUtilities;
+import org.jboss.tools.common.model.project.IModelNature;
import org.jboss.tools.common.model.ui.dnd.ModelTransfer;
import org.jboss.tools.common.model.ui.editor.IModelObjectEditorInput;
import org.jboss.tools.common.model.ui.editors.dnd.DropCommandFactory;
@@ -97,6 +100,8 @@
import org.jboss.tools.jst.jsp.jspeditor.dnd.JSPTagProposalFactory;
import org.jboss.tools.jst.jsp.preferences.IVpePreferencesPage;
import org.jboss.tools.jst.jsp.preferences.VpePreference;
+import org.jboss.tools.jst.web.model.helpers.WebAppHelper;
+import org.jboss.tools.jst.web.project.WebProject;
import org.jboss.tools.jst.web.tld.URIConstants;
import org.jboss.tools.jst.web.tld.model.TLDUtil;
import org.jboss.tools.vpe.VpeDebug;
@@ -254,21 +259,21 @@
}
sourceModel.addModelLifecycleListener(this);
-// IEditorInput editorInput = pageContext.getEditPart().getEditorInput();
+ IEditorInput editorInput = pageContext.getEditPart().getEditorInput();
//commented by Maksim Areshkau, as fix for
https://jira.jboss.org/jira/browse/JBIDE-4534
-// if(editorInput instanceof IFileEditorInput) {
-// XModel xm = null;
-// IProject project = ((IFileEditorInput) editorInput).getFile()
-// .getProject();
-// IModelNature mn = EclipseResourceUtil.getModelNature(project);
-// if (mn != null) {
-// xm = mn.getModel();
-// }
-// if (xm != null) {
-// WebProject.getInstance(xm).getTaglibMapping().revalidate(
-// WebAppHelper.getWebApp(xm));
-// }
-// }
+ if(editorInput instanceof IFileEditorInput) {
+ XModel xm = null;
+ IProject project = ((IFileEditorInput) editorInput).getFile()
+ .getProject();
+ IModelNature mn = EclipseResourceUtil.getModelNature(project);
+ if (mn != null) {
+ xm = mn.getModel();
+ }
+ if (xm != null) {
+ WebProject.getInstance(xm).getTaglibMapping().revalidate(
+ WebAppHelper.getWebApp(xm));
+ }
+ }
IDOMDocument sourceDocument = sourceModel.getDocument();
// FIXED FOR JBIDE-3799 by sdzmitrovich, moved calling of this method to buid dom