Added patch from #1437426: error in assign template

[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 f35f9f1..e344236 100644 (file)
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/PHPeclipsePlugin.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/PHPeclipsePlugin.java
@@ -1153,9 +1153,9 @@ public class PHPeclipsePlugin extends AbstractUIPlugin implements IPreferenceCon
        super.start(context);
 
        //              JavaCore.start(this, context);
-       final JavaModelManager manager = JavaModelManager.getJavaModelManager();
+       final JavaModelManager modelManager = JavaModelManager.getJavaModelManager();
        try {
-         manager.configurePluginDebugOptions();
+         modelManager.configurePluginDebugOptions();
 
          // request state folder creation (workaround 19885)
          //      JavaCore.getPlugin().getStateLocation();
@@ -1166,11 +1166,11 @@ public class PHPeclipsePlugin extends AbstractUIPlugin implements IPreferenceCon
          //                            manager.loadVariablesAndContainers();
 
          final IWorkspace workspace = ResourcesPlugin.getWorkspace();
-         workspace.addResourceChangeListener(manager.deltaState, IResourceChangeEvent.PRE_BUILD | IResourceChangeEvent.POST_BUILD
+         workspace.addResourceChangeListener(modelManager.deltaState, IResourceChangeEvent.PRE_BUILD | IResourceChangeEvent.POST_BUILD
                  | IResourceChangeEvent.POST_CHANGE | IResourceChangeEvent.PRE_DELETE | IResourceChangeEvent.PRE_CLOSE);
 
          //            startIndexing();
-         ISavedState savedState = workspace.addSaveParticipant(PHPeclipsePlugin.this, manager);
+         ISavedState savedState = workspace.addSaveParticipant(PHPeclipsePlugin.this, modelManager);
 
          // 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
@@ -1181,12 +1181,12 @@ public class PHPeclipsePlugin extends AbstractUIPlugin implements IPreferenceCon
                        // 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);
+                               ISavedState savedState = workspace.addSaveParticipant(PHPeclipsePlugin.this, modelManager);
                                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);
+                                 modelManager.deltaState.getDeltaProcessor().overridenEventType = IResourceChangeEvent.POST_CHANGE;
+                                 savedState.processResourceChangeEvents(modelManager.deltaState);
                                }
                          }
                        }, monitor);
@@ -1200,7 +1200,7 @@ public class PHPeclipsePlugin extends AbstractUIPlugin implements IPreferenceCon
          processSavedState.setPriority(Job.SHORT); // process asap
          processSavedState.schedule();
        } catch (RuntimeException e) {
-         manager.shutdown();
+         modelManager.shutdown();
          throw e;
        }