Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2016-02-16 12:30:23 +0000
committerEike Stepper2016-02-16 12:30:23 +0000
commit575951a1cad4dbddf610c8290b6bf7f7831c4061 (patch)
tree5352422391cc12975380cb9078419b15c3422a06 /plugins/org.eclipse.emf.cdo.explorer.ui
parent1f70c6f6785d44bf46eb1b08be13980027eeaa2e (diff)
downloadcdo-575951a1cad4dbddf610c8290b6bf7f7831c4061.tar.gz
cdo-575951a1cad4dbddf610c8290b6bf7f7831c4061.tar.xz
cdo-575951a1cad4dbddf610c8290b6bf7f7831c4061.zip
[486458] Provide support for optimized loading and notifying of object units
https://bugs.eclipse.org/bugs/show_bug.cgi?id=486458
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.explorer.ui')
-rw-r--r--plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/checkouts/CDOModelEditorOpener.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/checkouts/CDOModelEditorOpener.java b/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/checkouts/CDOModelEditorOpener.java
index 7d9078720d..505b2bdc82 100644
--- a/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/checkouts/CDOModelEditorOpener.java
+++ b/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/checkouts/CDOModelEditorOpener.java
@@ -22,6 +22,8 @@ import org.eclipse.emf.cdo.view.CDOView;
import org.eclipse.emf.internal.cdo.transaction.CDOHandlingConflictResolver;
+import org.eclipse.net4j.util.om.OMPlatform;
+
import org.eclipse.emf.common.util.URI;
import org.eclipse.emf.spi.cdo.CDOMergingConflictResolver;
@@ -39,7 +41,7 @@ import org.eclipse.ui.IWorkbenchPart;
public class CDOModelEditorOpener extends CDOEditorOpener.Default
{
private static final boolean INTERACTIVE_CONFLICT_RESOLUTION = !"false"
- .equalsIgnoreCase(System.getProperty("cdo.interactive.conflict.resolution"));
+ .equalsIgnoreCase(OMPlatform.INSTANCE.getProperty("cdo.interactive.conflict.resolution"));
public CDOModelEditorOpener()
{

Back to the top