FILE COMPARISON
Produced: 4/2/2013 11:16:16 AM

Mode: Differences with Context

Left file: C:\Users\gaolj\Desktop\perf\org.eclipse.ui.workbench\org.eclipse.ui.workbench\Eclipse UI\org\eclipse\ui\internal\ActivityPersistanceHelper.java
Right file: F:\WS\Toolbarjump\org.eclipse.ui.workbench\Eclipse UI\org\eclipse\ui\internal\ActivityPersistanceHelper.java

 import java.util.Collections;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Set;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.core.runtime.jobs.Job;
 import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.util.IPropertyChangeListener;
 import org.eclipse.jface.util.PropertyChangeEvent;
 import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.activities.ActivityManagerEvent;
 import org.eclipse.ui.activities.IActivity;
                 // whatever is still in delta are new activities - restore their
                 // state
                 loadEnabledStates(activityManagerEvent
                         .getActivityManager().getEnabledActivityIds(), delta);
             }
             if (activityManagerEvent.haveEnabledActivityIdsChanged()) {
-                                saveEnabledStates();
+                                saveEnabledStates(true);
                         }
         }
     };
     /**
      * The listener that responds to preference changes
          *
          * @see org.eclipse.jface.util.IPropertyChangeListener#propertyChange(org.eclipse.jface.util.PropertyChangeEvent)
          */
         public void propertyChange(PropertyChangeEvent event) {
             // dont process property events if we're in the process of
             // serializing state.
+                synchronized(savingLock){
-            if (!saving && event.getProperty().startsWith(PREFIX)) {
+                        if (event.getProperty().startsWith(PREFIX)) {
-                String activityId = event.getProperty().substring(PREFIX.length());
+                                String activityId = event.getProperty().substring(PREFIX.length());
-                IWorkbenchActivitySupport support = PlatformUI.getWorkbench().getActivitySupport();
+                                IWorkbenchActivitySupport support = PlatformUI.getWorkbench().getActivitySupport();
-                IActivityManager activityManager = support.getActivityManager();
+                                IActivityManager activityManager = support.getActivityManager();
-                boolean enabled = Boolean.valueOf(event.getNewValue().toString()).booleanValue();
+                                boolean enabled = Boolean.valueOf(event.getNewValue().toString()).booleanValue();
-                // if we're turning an activity off we'll need to create its dependency tree to ensuure that all dependencies are also disabled.
+                                // if we're turning an activity off we'll need to create its dependency tree to ensuure that all dependencies are also disabled.
-                Set set = new HashSet(activityManager.getEnabledActivityIds());
+                                Set set = new HashSet(activityManager.getEnabledActivityIds());
-                if (enabled == false) {
+                                if (enabled == false) {
-                    Set dependencies = buildDependencies(activityManager, activityId);
+                                        Set dependencies = buildDependencies(activityManager, activityId);
-                    set.removeAll(dependencies);
+                                        set.removeAll(dependencies);
-                }
+                                }
-                else {
+                                else {
-                    set.add(activityId);
+                                        set.add(activityId);
-                }
+                                }
-                support.setEnabledActivityIds(set);
+                                support.setEnabledActivityIds(set);
-            }
+                        }
-        }
+                }
+        }
     };
     /**
      * Whether we are currently saving the state of activities to the preference
      * store.
      */
-    protected boolean saving = false;
+    protected Object savingLock = new Object();
     /**
      * Get the singleton instance of this class.
      *
      * @return the singleton instance of this class.
      */
     }
     /**
      * Save the enabled states in the preference store.
      */
     protected void saveEnabledStates() {
-        try {
+        saveEnabledStates(false);
-            saving = true;
+    }
+    private void saveEnabledStates(boolean saveInBackground) {
+        synchronized(savingLock){
                 IPreferenceStore store = WorkbenchPlugin.getDefault()
                         .getPreferenceStore();
-                IWorkbenchActivitySupport support = PlatformUI.getWorkbench()
+                        IWorkbenchActivitySupport support = PlatformUI.getWorkbench()
-                        .getActivitySupport();
+                        .getActivitySupport();
-                IActivityManager activityManager = support.getActivityManager();
+                        IActivityManager activityManager = support.getActivityManager();
-                Iterator values = activityManager.getDefinedActivityIds().iterator();
+                        Iterator values = activityManager.getDefinedActivityIds().iterator();
-                while (values.hasNext()) {
+                        while (values.hasNext()) {
-                    IActivity activity = activityManager.getActivity((String) values
+                                IActivity activity = activityManager.getActivity((String) values
-                            .next());
+                                                .next());
-                    if (activity.getExpression() != null) {
+                                if (activity.getExpression() != null) {
-                        continue;
+                                        continue;
-                    }
+                                }
-                    store.setValue(createPreferenceKey(activity.getId()), activity
+                                store.setValue(createPreferenceKey(activity.getId()), activity
-                            .isEnabled());
+                                                .isEnabled());
-                }
+                        }
+                        if (saveInBackground) {
+                                Job job = new Job("Save Activity to Plugin Preference Job") {   //$NON-NLS-1$
+                                        protected IStatus run(IProgressMonitor arg0) {
+                                                synchronized(savingLock){
-                WorkbenchPlugin.getDefault().savePluginPreferences();
+                                                        WorkbenchPlugin.getDefault().savePluginPreferences();
-        }
+                                                }
+                                                return Status.OK_STATUS;
-        finally {
+                                        }
-            saving = false;
+                                };
+                                job.schedule();
+                        } else {
+                                WorkbenchPlugin.getDefault().savePluginPreferences();
-        }
+                        }
+        }
     }
     /**
      * Save the enabled state of all activities.
      */
     public void shutdown() {
         unhookListeners();
-        saveEnabledStates();
+        saveEnabledStates(false);
     }
 }