Author: mareshkau Date: 2008-02-19 12:30:44 -0500 (Tue, 19 Feb 2008) New Revision: 6438 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/VpeVisualDomBuilder.java Log: http://jira.jboss.com/jira/browse/JBIDE-1457 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 2008-02-19 16:54:08 UTC (rev 6437) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java 2008-02-19 17:30:44 UTC (rev 6438) @@ -409,7 +409,7 @@ if(visualBuilder==null) { return; } - visualBuilder.rebuildFlag = false; +// visualBuilder.rebuildFlag = false; switch (eventType) { case INodeNotifier.CHANGE: @@ -473,9 +473,9 @@ break; } //TODO Max Areshkau JBIDE-1457 - if (visualBuilder.rebuildFlag) { -// pageContext.fireTaglibsChanged(); - } +// if (visualBuilder.rebuildFlag) { +//// pageContext.fireTaglibsChanged(); +// } switcher.stopActiveEditor(); } @@ -602,7 +602,6 @@ sourceSelectionChanged(showCaret); switcher.stopActiveEditor(); } - // IModelLifecycleListener implementation public void processPreModelEvent(ModelLifecycleEvent event) { } @@ -611,6 +610,16 @@ if (!switcher.startActiveEditor(ActiveEditorSwitcher.ACTIVE_EDITOR_SOURCE)) { return; } + /* Added by Max Areshkau JBIDE-1457 + * ModelLifecycleEvent.MODEL_RELEASED generated when model in + * model calls methods releaseFromRead() or releaseFromEdit(). + * When editor is open he has only when href on model, so nothing can generated + * this event.When editor closes generation of this event depends from cantains + * any service href on model or not. It's can be a reason of problems + * on reopen file. + * + * We shouldn't call here rebuild dom. + */ if (event.getType() == ModelLifecycleEvent.MODEL_RELEASED) { if (VpeDebug.PRINT_SOURCE_MODEL_LIFECYCLE_EVENT) { System.out.println(">>> processPostModelEvent: " + event.toString()); //$NON-NLS-1$ @@ -624,7 +633,8 @@ bundle.refresh(); visualBuilder.setSelectionRectangle(null); IDOMDocument sourceDocument = sourceModel.getDocument(); - visualBuilder.rebuildDom(sourceDocument); + // JBIDE-1457 +// visualBuilder.rebuildDom(sourceDocument); // pageContext.fireTaglibsChanged(); } switcher.stopActiveEditor(); Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java 2008-02-19 16:54:08 UTC (rev 6437) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java 2008-02-19 17:30:44 UTC (rev 6438) @@ -114,7 +114,7 @@ private nsIDOMNode headNode; private List includeStack; //TODO Max Areshkau JBIDE-1457 - boolean rebuildFlag = false; +// boolean rebuildFlag = false; /** faceletFile */ private boolean faceletFile = false; @@ -205,10 +205,10 @@ } public void rebuildDom(Document sourceDocument) { - //clearIncludeDocuments(); + //clearIncludeDocuments(); cleanHead(); domMapping.clear(visualContentArea); - super.dispose(); + super.dispose(); pageContext.clearAll(); refreshExternalLinks(); @@ -224,7 +224,6 @@ buildDom(sourceDocument); } - rebuildFlag = true; } // temporary, will be change to prefference's variable