| commit | 068dc3b9a60d1e4236daf2d918598f13172262cc | [log] [tgz] |
|---|---|---|
| author | alagarde <alex.lagarde@obeo.fr> | Thu Oct 20 09:32:41 2011 +0200 |
| committer | alagarde <alex.lagarde@obeo.fr> | Thu Oct 20 09:33:04 2011 +0200 |
| tree | c7b80b9e0bf202c9a03aaa1ff0e0131e3a0e6548 | |
| parent | f3ee782782dc531fadb52c5aec720afd414d7ba3 [diff] |
Changing Synchronizer default overrideStrategy and remove the adapter.save() call when the IntentDocumentProvider merge local and remote content
diff --git a/plugins/org.eclipse.mylyn.docs.intent.client.synchronizer/src/org/eclipse/mylyn/docs/intent/client/synchronizer/synchronizer/IntentSynchronizer.java b/plugins/org.eclipse.mylyn.docs.intent.client.synchronizer/src/org/eclipse/mylyn/docs/intent/client/synchronizer/synchronizer/IntentSynchronizer.java index 2ab8933..962dde9 100644 --- a/plugins/org.eclipse.mylyn.docs.intent.client.synchronizer/src/org/eclipse/mylyn/docs/intent/client/synchronizer/synchronizer/IntentSynchronizer.java +++ b/plugins/org.eclipse.mylyn.docs.intent.client.synchronizer/src/org/eclipse/mylyn/docs/intent/client/synchronizer/synchronizer/IntentSynchronizer.java
@@ -39,7 +39,7 @@ import org.eclipse.mylyn.docs.intent.client.synchronizer.factory.SynchronizerMessageProvider; import org.eclipse.mylyn.docs.intent.client.synchronizer.factory.SynchronizerStatusFactory; import org.eclipse.mylyn.docs.intent.client.synchronizer.listeners.GeneratedElementListener; -import org.eclipse.mylyn.docs.intent.client.synchronizer.strategy.CopyInternalResourceStrategy; +import org.eclipse.mylyn.docs.intent.client.synchronizer.strategy.DefaultSynchronizerStrategy; import org.eclipse.mylyn.docs.intent.client.synchronizer.strategy.SynchronizerStrategy; import org.eclipse.mylyn.docs.intent.collab.handlers.adapters.IntentCommand; import org.eclipse.mylyn.docs.intent.collab.handlers.adapters.RepositoryAdapter; @@ -81,7 +81,7 @@ */ public IntentSynchronizer(SynchronizerRepositoryClient synchronizerRepositoryClient) { this.repositoryClient = synchronizerRepositoryClient; - this.synchronizerStrategy = new CopyInternalResourceStrategy(); + this.synchronizerStrategy = new DefaultSynchronizerStrategy(); } /**
diff --git a/plugins/org.eclipse.mylyn.docs.intent.client.ui/src/org/eclipse/mylyn/docs/intent/client/ui/editor/IntentDocumentProvider.java b/plugins/org.eclipse.mylyn.docs.intent.client.ui/src/org/eclipse/mylyn/docs/intent/client/ui/editor/IntentDocumentProvider.java index 79678f6..28a7d1b 100644 --- a/plugins/org.eclipse.mylyn.docs.intent.client.ui/src/org/eclipse/mylyn/docs/intent/client/ui/editor/IntentDocumentProvider.java +++ b/plugins/org.eclipse.mylyn.docs.intent.client.ui/src/org/eclipse/mylyn/docs/intent/client/ui/editor/IntentDocumentProvider.java
@@ -410,14 +410,6 @@ IntentUiLogger.logError(e); } - try { - listenedElementsHandler.getRepositoryAdapter().save(); - } catch (ReadOnlyException e) { - IntentUiLogger.logError(e); - } catch (SaveException e) { - IntentUiLogger.logError(e); - } - // We update the mapping between elements and documents addAllContentAsIntentElement(documentRoot, (IntentEditorDocument)document);