Author: mareshkau
Date: 2009-01-10 08:25:41 -0500 (Sat, 10 Jan 2009)
New Revision: 12967
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE3441Test.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-3441, reinit method was moved to job
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE3441Test.java
===================================================================
---
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE3441Test.java 2009-01-10
11:49:33 UTC (rev 12966)
+++
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE3441Test.java 2009-01-10
13:25:41 UTC (rev 12967)
@@ -14,7 +14,6 @@
import org.eclipse.core.resources.IFile;
import org.eclipse.core.runtime.CoreException;
-import org.eclipse.swt.widgets.Display;
import org.eclipse.ui.IEditorInput;
import org.eclipse.ui.PartInitException;
import org.eclipse.ui.PlatformUI;
@@ -52,15 +51,12 @@
VpeController controller1 = openPageInVpe(TEST_PAGE_NAME_1);
VpeController controller2 = openPageInVpe(TEST_PAGE_NAME_2);
-
- Display display = Display.getCurrent();
+
for (int i = 0; i < 20; i++) {
controller1.visualRefresh();
controller2.visualRefresh();
- while(display.readAndDispatch());
+ TestUtil.delay(500);
TestUtil.waitForJobs();
- Thread.sleep(500);
-
checkTaggedDivValue(controller1, i);
checkTaggedDivValue(controller2, i);
}
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-01-10
11:49:33 UTC (rev 12966)
+++
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java 2009-01-10
13:25:41 UTC (rev 12967)
@@ -181,11 +181,7 @@
private boolean sourceChangeFlag;
private VpePageContext pageContext;
private BundleMap bundle;
- private VpeEditorPart editPart;
- private static final int AROUND_MENU = 1;
- private static final int BEFORE_MENU = 2;
- private static final int AFTER_MENU = 3;
-
+ private VpeEditorPart editPart;
private static final int LEFT_BUTTON = 0;
private CSSReferenceList cssReferenceListListener;
@@ -209,6 +205,7 @@
* when{@link #vpeVisualRefreshJob} is accessed.
*/
private final Object vpeVisualRefreshJobLock = new Object();
+ private UIJob reinitJob;
/**
* Added by Max Areshkau JBIDE-675, stores information about modification
@@ -2618,28 +2615,6 @@
}
/**
- * @return the progressMonitor
- */
- private IProgressMonitor getProgressMonitor() {
-
- if (progressMonitor == null) {
-
- progressMonitor = Job.getJobManager().createProgressGroup();
- }
-
- return progressMonitor;
- }
-
- /**
- * @param progressMonitor
- * the progressMonitor to set
- */
- private void setProgressMonitor(IProgressMonitor progressMonitor) {
-
- this.progressMonitor = progressMonitor;
- }
-
- /**
* @return the changeEvents
*/
public LinkedList<VpeEventBean> getChangeEvents() {
@@ -2650,8 +2625,26 @@
}
return changeEvents;
}
+
+ public void reinit(){
+ if(reinitJob!=null) {
+ reinitJob.cancel();
+ }
+ reinitJob = new UIJob(VpeUIMessages.VPE_VISUAL_REFRESH_JOB) {
- public void reinit() {
+ @Override
+ public IStatus runInUIThread(IProgressMonitor monitor) {
+ if(monitor.isCanceled()) {
+ return Status.CANCEL_STATUS;
+ }
+ reinitImpl();
+ return Status.OK_STATUS;
+ }
+ };
+ reinitJob.schedule();
+ }
+
+ private void reinitImpl() {
try {
if(!switcher
.startActiveEditor(ActiveEditorSwitcher.ACTIVE_EDITOR_SOURCE)) {