RESOLVED - bug 327432: [regression] copy a text file -> should be added
to context
https://bugs.eclipse.org/bugs/show_bug.cgi?id=327432
Change-Id: I75fbb676bbc8d26ebf9e1397ae2262918d0301d5
diff --git a/org.eclipse.mylyn.resources.ui/META-INF/MANIFEST.MF b/org.eclipse.mylyn.resources.ui/META-INF/MANIFEST.MF
index d4f0a51..100553b 100644
--- a/org.eclipse.mylyn.resources.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.mylyn.resources.ui/META-INF/MANIFEST.MF
@@ -18,7 +18,6 @@
org.eclipse.mylyn.context.ui;bundle-version="[3.0.0,4.0.0)",
org.eclipse.mylyn.monitor.ui;bundle-version="[3.0.0,4.0.0)",
org.eclipse.mylyn.monitor.core;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.ltk.core.refactoring,
org.apache.ant;bundle-version="1.7.0"
Bundle-ActivationPolicy: lazy
Bundle-Vendor: %Bundle-Vendor
diff --git a/org.eclipse.mylyn.resources.ui/src/org/eclipse/mylyn/internal/resources/ui/ResourceModifiedDateExclusionStrategy.java b/org.eclipse.mylyn.resources.ui/src/org/eclipse/mylyn/internal/resources/ui/ResourceModifiedDateExclusionStrategy.java
index 26e02d4..fa17273 100644
--- a/org.eclipse.mylyn.resources.ui/src/org/eclipse/mylyn/internal/resources/ui/ResourceModifiedDateExclusionStrategy.java
+++ b/org.eclipse.mylyn.resources.ui/src/org/eclipse/mylyn/internal/resources/ui/ResourceModifiedDateExclusionStrategy.java
@@ -13,23 +13,23 @@
import java.util.Date;
+import org.eclipse.core.commands.operations.IOperationHistoryListener;
+import org.eclipse.core.commands.operations.OperationHistoryEvent;
+import org.eclipse.core.commands.operations.OperationHistoryFactory;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IResource;
import org.eclipse.jface.util.IPropertyChangeListener;
import org.eclipse.jface.util.PropertyChangeEvent;
-import org.eclipse.ltk.core.refactoring.Change;
-import org.eclipse.ltk.core.refactoring.IUndoManager;
-import org.eclipse.ltk.core.refactoring.IUndoManagerListener;
-import org.eclipse.ltk.core.refactoring.RefactoringCore;
import org.eclipse.mylyn.context.core.AbstractContextListener;
import org.eclipse.mylyn.context.core.ContextChangeEvent;
import org.eclipse.mylyn.context.core.ContextCore;
/**
* @author Shawn Minto
+ * @author Steffen Pingel
*/
public class ResourceModifiedDateExclusionStrategy extends AbstractContextListener implements
- IResourceExclusionStrategy, IPropertyChangeListener, IUndoManagerListener {
+ IResourceExclusionStrategy, IPropertyChangeListener, IOperationHistoryListener {
private transient Date lastActivatedDate = null;
@@ -40,7 +40,7 @@
public void dispose() {
ContextCore.getContextManager().removeListener(this);
ResourcesUiBridgePlugin.getDefault().getPreferenceStore().removePropertyChangeListener(this);
- RefactoringCore.getUndoManager().removeListener(this);
+ OperationHistoryFactory.getOperationHistory().removeOperationHistoryListener(this);
}
public void init() {
@@ -52,7 +52,7 @@
if (ContextCore.getContextManager().isContextActive()) {
lastActivatedDate = new Date();
}
- RefactoringCore.getUndoManager().addListener(this);
+ OperationHistoryFactory.getOperationHistory().addOperationHistoryListener(this);
}
public void update() {
@@ -123,20 +123,13 @@
}
}
- public void undoStackChanged(IUndoManager manager) {
- // ignore
- }
-
- public void redoStackChanged(IUndoManager manager) {
- // ignore
- }
-
- public void aboutToPerformChange(IUndoManager manager, Change change) {
- performingChange = true;
- }
-
- public void changePerformed(IUndoManager manager, Change change) {
- performingChange = false;
+ public void historyNotification(OperationHistoryEvent event) {
+ if (event.getEventType() == OperationHistoryEvent.ABOUT_TO_EXECUTE) {
+ performingChange = true;
+ } else if (event.getEventType() == OperationHistoryEvent.DONE
+ || event.getEventType() == OperationHistoryEvent.OPERATION_NOT_OK) {
+ performingChange = false;
+ }
}
}
