diff options
| author | Eike Stepper | 2015-02-18 11:41:24 +0000 |
|---|---|---|
| committer | Eike Stepper | 2015-02-18 14:43:10 +0000 |
| commit | 489b0c2b1c0ab7dfd9d1984d57ec8c2af27224b8 (patch) | |
| tree | fe77d74076d4e6f7b49aa22860b23c62fa5ac6d4 /plugins/org.eclipse.emf.cdo.explorer/src | |
| parent | 11849bb512f96679918611b3558bb4cf9ab653d9 (diff) | |
| download | cdo-489b0c2b1c0ab7dfd9d1984d57ec8c2af27224b8.tar.gz cdo-489b0c2b1c0ab7dfd9d1984d57ec8c2af27224b8.tar.xz cdo-489b0c2b1c0ab7dfd9d1984d57ec8c2af27224b8.zip | |
[458349] Consolidate UI
Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=458349
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.explorer/src')
2 files changed, 5 insertions, 2 deletions
diff --git a/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/explorer/CDOExplorerUtil.java b/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/explorer/CDOExplorerUtil.java index bdf1a56d28..575230398d 100644 --- a/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/explorer/CDOExplorerUtil.java +++ b/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/explorer/CDOExplorerUtil.java @@ -92,7 +92,7 @@ public final class CDOExplorerUtil return null; } - private static CDOCheckout walkUp(EObject object, LinkedList<EObject> path) + public static CDOCheckout walkUp(EObject object, LinkedList<EObject> path) { while (object != null) { diff --git a/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/repositories/LocalCDORepository.java b/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/repositories/LocalCDORepository.java index 5bf945a44b..7307be6288 100644 --- a/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/repositories/LocalCDORepository.java +++ b/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/repositories/LocalCDORepository.java @@ -109,7 +109,10 @@ public class LocalCDORepository extends CDORepositoryImpl versioningMode = VersioningMode.valueOf(properties.getProperty(PROP_VERSIONING_MODE)); idGeneration = IDGeneration.valueOf(properties.getProperty(PROP_ID_GENERATION)); tcpDisabled = Boolean.parseBoolean(properties.getProperty(PROP_TCP_DISABLED)); - tcpPort = Integer.parseInt(properties.getProperty(PROP_TCP_PORT)); + if (!tcpDisabled) + { + tcpPort = Integer.parseInt(properties.getProperty(PROP_TCP_PORT)); + } } @Override |