Skip to content
[Jenkins]Jenkins
log in

Changes

Summary

  1. Bug 424018 - Externalize strings (details)
  2. Bug 449438 - EMFStoreCommandNotifier & OperationManager should use (details)
  3. Bug 424018 - Externalize strings (details)
  4. Bug 449486 - Merge fuzzy and fuzzy.emf bundles (details)
  5. Bug 449438 - EMFStoreCommandNotifier & OperationManager should use (details)
  6. Bug 449486 - Merge fuzzy and fuzzy.emf bundles (details)
Commit 9387c7d0d41200f70316a56048920ac985ae84e8 by edgar.m.mueller
Bug 424018 - Externalize strings

package
org.eclipse.emf.emfstore.internal.client.model.changeTracking.merging.conflict.conflicts;
The file was modified bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/changeTracking/merging/conflict/conflicts/Messages.java
The file was modified bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/changeTracking/merging/conflict/conflicts/MultiAttributeSetSetConflict.java
The file was modified bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/changeTracking/merging/conflict/conflicts/MultiAttributeMoveSetConflict.java
The file was modified bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/changeTracking/merging/conflict/conflicts/messages.properties
The file was modified bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/changeTracking/merging/conflict/conflicts/MultiAttributeConflict.java
The file was modified bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/changeTracking/merging/conflict/conflicts/MultiAttributeMoveConflict.java
The file was modified bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/changeTracking/merging/conflict/conflicts/MultiAttributeSetConflict.java
Commit 6696ad52b78852f9fc024019d13abd598e9d56d7 by edgar.m.mueller
Bug 449438 - EMFStoreCommandNotifier & OperationManager should use
ObserverBus
The file was addedtests/org.eclipse.emf.emfstore.client.recording.test/src/org/eclipse/emf/emfstore/client/recording/test/OperationManagerTest.java
The file was modified bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/impl/OperationManager.java
The file was modified bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/changeTracking/commands/EMFStoreBasicCommandStack.java
The file was modified bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/changeTracking/commands/EMFStoreCommandNotifier.java
The file was modified bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/changeTracking/commands/Messages.java
The file was modified tests/org.eclipse.emf.emfstore.client.recording.test/src/org/eclipse/emf/emfstore/client/recording/test/OperationRecorderTest.java
Commit e951deadafda24f8919ac87d626d0bbd54d06bd1 by edgar.m.mueller
Bug 424018 - Externalize strings
The file was modified bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/changeTracking/merging/conflict/ConflictContext.java
The file was modified bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/changeTracking/merging/conflict/Messages.java
The file was modified bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/changeTracking/merging/conflict/messages.properties
The file was modified bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/filetransfer/FileUploadJob.java
The file was modified bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/changeTracking/merging/conflict/options/MergeTextOption.java
The file was modified bundles/org.eclipse.emf.emfstore.client/build.properties
The file was modified bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/changeTracking/merging/conflict/ConflictDescription.java
The file was modified bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/changeTracking/merging/Messages.java
The file was modified bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/changeTracking/merging/conflict/ConflictOption.java
The file was addedbundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/changeTracking/merging/conflict/options/Messages.java
The file was addedbundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/changeTracking/merging/conflict/options/messages.properties
Commit b5605cd34c6adeba9edffeb4c5abf3be9417686e by edgar.m.mueller
Bug 449486 - Merge fuzzy and fuzzy.emf bundles
The file was modified tests/org.eclipse.emf.emfstore.fuzzy.emf.test/src/org/eclipse/emf/emfstore/fuzzy/emf/test/CrossResourceReferencesMutatorTest.java
The file was addedbundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/fuzzy/emf/junit/ESFuzzyRunner.java
The file was modified bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/fuzzy/emf/ESXMIResourceDataProvider.java
The file was modified tests/org.eclipse.emf.emfstore.fuzzy.emf.test/AllFuzzyTests.launch
The file was addedbundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/fuzzy/emf/internal/junit/FuzzyTestClassRunner.java
The file was removedbundles/org.eclipse.emf.emfstore.fuzzy/src/org/eclipse/emf/emfstore/fuzzy/messages.properties
The file was modified bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/fuzzy/emf/ESFuzzyEMFDataProvider.java
The file was removedbundles/org.eclipse.emf.emfstore.modelmutator/src/org/eclipse/emf/emfstore/modelmutator/ESDefaultModelMutator.java
The file was modified bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/fuzzy/emf/ESMutateUtil.java
The file was addedbundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/fuzzy/emf/junit/ESFuzzyDataProvider.java
The file was removedbundles/org.eclipse.emf.emfstore.fuzzy/src/org/eclipse/emf/emfstore/fuzzy/ESFuzzyUtil.java
The file was modified bundles/org.eclipse.emf.emfstore.fuzzy.emf.example/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/example/FuzzyTest.java
The file was removedbundles/org.eclipse.emf.emfstore.fuzzy/src/org/eclipse/emf/emfstore/fuzzy/ESFuzzyDataProvider.java
The file was addedbundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/fuzzy/emf/junit/Messages.java
The file was addedbundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/fuzzy/emf/internal/junit/messages.properties
The file was addedbundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/fuzzy/emf/junit/messages.properties
The file was modified tests/org.eclipse.emf.emfstore.performance.test/src/org/eclipse/emf/emfstore/performance/test/PerformanceTest.java
The file was addedbundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/fuzzy/emf/junit/ESDefaultModelMutator.java
The file was removedbundles/org.eclipse.emf.emfstore.fuzzy/src/org/eclipse/emf/emfstore/fuzzy/ESFuzzyRunner.java
The file was modified tests/org.eclipse.emf.emfstore.fuzzy.emf.test/src/org/eclipse/emf/emfstore/fuzzy/emf/test/OperationReverseTest.java
The file was modified tests/org.eclipse.emf.emfstore.performance.test/META-INF/MANIFEST.MF
The file was modified tests/org.eclipse.emf.emfstore.fuzzy.emf.test/src/org/eclipse/emf/emfstore/fuzzy/emf/test/SerializationTest.java
The file was modified tests/org.eclipse.emf.emfstore.fuzzy.emf.test/META-INF/MANIFEST.MF
The file was modified bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/fuzzy/emf/ESEMFDataProvider.java
The file was modified tests/org.eclipse.emf.emfstore.fuzzy.emf.test/src/org/eclipse/emf/emfstore/fuzzy/emf/test/ESXMIProviderDataMutatorTest.java
The file was removedbundles/org.eclipse.emf.emfstore.fuzzy/src/org/eclipse/emf/emfstore/fuzzy/ESFuzzyTest.java
The file was modified bundles/org.eclipse.emf.emfstore.fuzzy.emf.example/META-INF/MANIFEST.MF
The file was modified bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/EMFRunListener.java
The file was removedbundles/org.eclipse.emf.emfstore.fuzzy/src/org/eclipse/emf/emfstore/internal/fuzzy/FuzzyTestClassRunner.java
The file was removedbundles/org.eclipse.emf.emfstore.fuzzy/src/org/eclipse/emf/emfstore/fuzzy/Messages.java
The file was modified tests/org.eclipse.emf.emfstore.fuzzy.emf.test/src/org/eclipse/emf/emfstore/fuzzy/emf/test/FuzzyProjectConfigTest.java
The file was addedbundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/fuzzy/emf/internal/junit/Messages.java
The file was modified tests/org.eclipse.emf.emfstore.fuzzy.emf.test/src/org/eclipse/emf/emfstore/fuzzy/emf/test/ServerTest.java
The file was addedbundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/fuzzy/emf/junit/Annotations.java
The file was modified tests/org.eclipse.emf.emfstore.fuzzy.emf.test/src/org/eclipse/emf/emfstore/fuzzy/emf/test/OperationApplyTest.java
The file was addedbundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/fuzzy/emf/junit/ESFuzzyTest.java
The file was removedbundles/org.eclipse.emf.emfstore.fuzzy/src/org/eclipse/emf/emfstore/fuzzy/Annotations.java
The file was addedbundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/fuzzy/emf/junit/ESFuzzyUtil.java
The file was modified tests/org.eclipse.emf.emfstore.performance.test/src/org/eclipse/emf/emfstore/performance/test/memory/MemoryLoadTest.java
The file was modified tests/org.eclipse.emf.emfstore.fuzzy.emf.test/src/org/eclipse/emf/emfstore/fuzzy/emf/test/BigMutationTest.java
The file was removedbundles/org.eclipse.emf.emfstore.fuzzy/src/org/eclipse/emf/emfstore/internal/fuzzy/Messages.java
The file was modified tests/org.eclipse.emf.emfstore.fuzzy.emf.test/src/org/eclipse/emf/emfstore/fuzzy/emf/test/FuzzyProjectTest.java
The file was removedbundles/org.eclipse.emf.emfstore.fuzzy/src/org/eclipse/emf/emfstore/internal/fuzzy/messages.properties
The file was modified tests/org.eclipse.emf.emfstore.fuzzy.emf.test/src/org/eclipse/emf/emfstore/fuzzy/emf/test/MutatorTest.java
The file was modified tests/org.eclipse.emf.emfstore.fuzzy.emf.test/src/org/eclipse/emf/emfstore/fuzzy/emf/test/AllFuzzyTests.java
Commit 3bb2a9633056878fb3705d1e1e15a81f9881bc32 by edgar.m.mueller
Bug 449438 - EMFStoreCommandNotifier & OperationManager should use
ObserverBus

Adopted tests
The file was modified tests/org.eclipse.emf.emfstore.client.recording.test/src/org/eclipse/emf/emfstore/client/recording/test/AllRecordingTests.java
The file was modified tests/org.eclipse.emf.emfstore.client.recording.test/src/org/eclipse/emf/emfstore/client/recording/test/CreateDeleteOperationTest.java
Commit 25cddbbd00c5731602935d89e54f95eb1e97545e by edgar.m.mueller
Bug 449486 - Merge fuzzy and fuzzy.emf bundles

Small refactorings & javadoc
The file was modified bundles/org.eclipse.emf.emfstore.fuzzy.emf/META-INF/MANIFEST.MF
The file was modified bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/fuzzy/emf/internal/junit/messages.properties
The file was modified bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/fuzzy/emf/ESEMFDataProvider.java
The file was modified bundles/org.eclipse.emf.emfstore.modelmutator/src/org/eclipse/emf/emfstore/modelmutator/ESAbstractModelMutator.java
The file was modified bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/fuzzy/emf/internal/junit/FuzzyTestClassRunner.java
The file was addedbundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/fuzzy/emf/internal/junit/FrameworkFields.java
The file was modified bundles/org.eclipse.emf.emfstore.modelmutator/src/org/eclipse/emf/emfstore/modelmutator/ESCrossResourceReferencesModelMutator.java