fixed Bug 1024299

[phpeclipse.git] / net.sourceforge.phpeclipse / src / net / sourceforge / phpeclipse / PHPeclipsePlugin.java

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/PHPeclipsePlugin.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/PHPeclipsePlugin.java
index 8276b1d..75709ed 100644 (file)
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/PHPeclipsePlugin.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/PHPeclipsePlugin.java
@@ -646,19 +646,19 @@ public class PHPeclipsePlugin extends AbstractUIPlugin implements
     //    store.setDefault(LOCALHOST_PREF, "http://localhost");
     //    store.setDefault(DOCUMENTROOT_PREF,
     // getWorkspace().getRoot().getLocation().toString());
-    store.setDefault(PHP_LOCALHOST_PREF, "http://localhost");
-    store.setDefault(PHP_DOCUMENTROOT_PREF, getWorkspace().getRoot()
-        .getLocation().toString());
+//    store.setDefault(PHP_LOCALHOST_PREF, "http://localhost");
+//    store.setDefault(PHP_DOCUMENTROOT_PREF, getWorkspace().getRoot()
+//        .getLocation().toString());
 
     //    store.setDefault(SHOW_EXTERNAL_PREVIEW_PREF, "true");
     store.setDefault(USE_EXTERNAL_BROWSER_PREF, "false");
     store.setDefault(SHOW_OUTPUT_IN_CONSOLE, "true");
     store.setDefault(PHP_OBFUSCATOR_DEFAULT, "c:\\temp");
-    store.setDefault(PHP_BOOKMARK_DEFAULT, "");
-
-    store.setDefault(PHP_AUTO_PREVIEW_DEFAULT, "true");
-    store.setDefault(PHP_BRING_TO_TOP_PREVIEW_DEFAULT, "true");
-    store.setDefault(PHP_SHOW_HTML_FILES_LOCAL, "true");
+//    store.setDefault(PHP_BOOKMARK_DEFAULT, "");
+//
+//    store.setDefault(PHP_AUTO_PREVIEW_DEFAULT, "true");
+//    store.setDefault(PHP_BRING_TO_TOP_PREVIEW_DEFAULT, "true");
+//    store.setDefault(PHP_SHOW_HTML_FILES_LOCAL, "true");
 
     String windowsSystem = Platform.getWS();
     if (jvm == WINDOWS_9x) {
@@ -1137,47 +1137,46 @@ public class PHPeclipsePlugin extends AbstractUIPlugin implements
       //                       manager.loadVariablesAndContainers();
 
       final IWorkspace workspace = ResourcesPlugin.getWorkspace();
-      workspace.addResourceChangeListener(manager.deltaState,
-          IResourceChangeEvent.PRE_BUILD | IResourceChangeEvent.POST_BUILD
-              | IResourceChangeEvent.POST_CHANGE
-              | IResourceChangeEvent.PRE_DELETE
-              | IResourceChangeEvent.PRE_CLOSE);
-
-      //                       startIndexing();
-
-        // process deltas since last activated in indexer thread so that indexes
-        // are up-to-date.
-        // see https://bugs.eclipse.org/bugs/show_bug.cgi?id=38658
-//        Job processSavedState = new Job(Util.bind("savedState.jobName")) { //$NON-NLS-1$
-//          protected IStatus run(IProgressMonitor monitor) {
-//            try {
-//              // add save participant and process delta atomically
-//              // see https://bugs.eclipse.org/bugs/show_bug.cgi?id=59937
-//              workspace.run(new IWorkspaceRunnable() {
-//                public void run(IProgressMonitor progress) throws CoreException {
-//                  ISavedState savedState = workspace.addSaveParticipant(
-//                      PHPeclipsePlugin.this, manager);
-//                  if (savedState != null) {
-//                    // the event type coming from the saved state is always
-//                    // POST_AUTO_BUILD
-//                    // force it to be POST_CHANGE so that the delta processor
-//                    // can
-//                    // handle it
-//                    manager.deltaState.getDeltaProcessor().overridenEventType = IResourceChangeEvent.POST_CHANGE;
-//                    savedState.processResourceChangeEvents(manager.deltaState);
-//                  }
-//                }
-//              }, monitor);
-//            } catch (CoreException e) {
-//              return e.getStatus();
-//            }
-//            return Status.OK_STATUS;
-//          }
-//        };
-//        processSavedState.setSystem(true);
-//        processSavedState.setPriority(Job.SHORT); // process asap
-//        processSavedState.schedule();
-//      }
+               workspace.addResourceChangeListener(
+                       manager.deltaState,
+                       IResourceChangeEvent.PRE_BUILD
+                               | IResourceChangeEvent.POST_BUILD
+                               | IResourceChangeEvent.POST_CHANGE
+                               | IResourceChangeEvent.PRE_DELETE
+                               | IResourceChangeEvent.PRE_CLOSE);
+
+//             startIndexing();
+               ISavedState savedState = workspace.addSaveParticipant(PHPeclipsePlugin.this, manager);
+
+               // process deltas since last activated in indexer thread so that indexes are up-to-date.
+               // see https://bugs.eclipse.org/bugs/show_bug.cgi?id=38658
+//             Job processSavedState = new Job(Util.bind("savedState.jobName")) { //$NON-NLS-1$
+//                     protected IStatus run(IProgressMonitor monitor) {
+//                             try {
+//                                     // add save participant and process delta atomically
+//                                     // see https://bugs.eclipse.org/bugs/show_bug.cgi?id=59937
+//                                     workspace.run(
+//                                             new IWorkspaceRunnable() {
+//                                                     public void run(IProgressMonitor progress) throws CoreException {
+//                                                             ISavedState savedState = workspace.addSaveParticipant(PHPeclipsePlugin.this, manager);
+//                                                             if (savedState != null) {
+//                                                                     // the event type coming from the saved state is always POST_AUTO_BUILD
+//                                                                     // force it to be POST_CHANGE so that the delta processor can handle it
+//                                                                     manager.deltaState.getDeltaProcessor().overridenEventType = IResourceChangeEvent.POST_CHANGE;
+//                                                                     savedState.processResourceChangeEvents(manager.deltaState);
+//                                                             }
+//                                                     }
+//                                             },
+//                                             monitor);
+//                             } catch (CoreException e) {
+//                                     return e.getStatus();
+//                             }
+//                             return Status.OK_STATUS;
+//                     }
+//             };
+//             processSavedState.setSystem(true);
+//             processSavedState.setPriority(Job.SHORT); // process asap
+//             processSavedState.schedule();
     } catch (RuntimeException e) {
       manager.shutdown();
       throw e;