Author: mareshkau
Date: 2008-09-29 14:35:17 -0400 (Mon, 29 Sep 2008)
New Revision: 10547
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java
Log:
JBIDE-2774
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java
===================================================================
---
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java 2008-09-29
18:32:42 UTC (rev 10546)
+++
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java 2008-09-29
18:35:17 UTC (rev 10547)
@@ -36,7 +36,8 @@
import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE2582Test;
import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE2584Test;
import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE2594Test;
-import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE2624;
+import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE2624Test;
+import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE2774Test;
import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE675Test;
import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE788Test;
import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE924Test;
@@ -94,9 +95,10 @@
suite.addTestSuite(JBIDE2594Test.class);
suite.addTestSuite(JBIDE924Test.class);
suite.addTestSuite(JBIDE2526Test.class);
- suite.addTestSuite(JBIDE2624.class);
+ suite.addTestSuite(JBIDE2624Test.class);
suite.addTestSuite(JBIDE1805Test.class);
suite.addTestSuite(JsfComponentContentTest.class);
+ suite.addTestSuite(JBIDE2774Test.class);
// $JUnit-END$
// added by Max Areshkau
// add here projects which should be imported for junit tests
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-09-29
18:32:42 UTC (rev 10546)
+++
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java 2008-09-29
18:35:17 UTC (rev 10547)
@@ -3283,28 +3283,39 @@
}
public void reinit() {
-
- visualBuilder.setSelectionRectangle(null);
- visualEditor.setEditorDomEventListener(this);
- IDOMModel sourceModel = (IDOMModel) getModel();
- if (sourceModel != null) {
- IDOMDocument sourceDocument = sourceModel.getDocument();
- visualBuilder.rebuildDom(sourceDocument);
- } else {
- visualBuilder.rebuildDom(null);
+ try {
+ if(!switcher
+ .startActiveEditor(ActiveEditorSwitcher.ACTIVE_EDITOR_SOURCE)) {
+ return;
+ }
+ visualBuilder.setSelectionRectangle(null);
+ visualEditor.setEditorDomEventListener(this);
+ IDOMModel sourceModel = (IDOMModel) getModel();
+ if (sourceModel != null) {
+ IDOMDocument sourceDocument = sourceModel.getDocument();
+ visualBuilder.rebuildDom(sourceDocument);
+ } else {
+ visualBuilder.rebuildDom(null);
+ }
+ //reinits selection controller+ controller
+ visualEditor.reinitDesignMode();
+ visualSelectionController = new
VpeSelectionController(visualEditor.getEditor().getSelectionController());
+
+ selectionBuilder = new VpeSelectionBuilder(domMapping, sourceBuilder,
+ visualBuilder, visualSelectionController);
+
+ selectionManager = new SelectionManager(pageContext,
+ sourceEditor, visualSelectionController);
+
+ keyEventHandler = new KeyEventManager(sourceEditor, domMapping,
+ pageContext,visualSelectionController);
+ //restore selection in visula part
+ sourceSelectionChanged();
+ }finally {
+
+ switcher.stopActiveEditor();
}
- //reinits selection controller+ controller
- visualEditor.reinitDesignMode();
- visualSelectionController = new
VpeSelectionController(visualEditor.getEditor().getSelectionController());
-
- selectionBuilder = new VpeSelectionBuilder(domMapping, sourceBuilder,
- visualBuilder, visualSelectionController);
-
- selectionManager = new SelectionManager(pageContext,
- sourceEditor, visualSelectionController);
-
- keyEventHandler = new KeyEventManager(sourceEditor, domMapping,
- pageContext,visualSelectionController);
+
}
/**
Show replies by date