From 55b39dbb41b46adb628a4f437b71b0c8eb61702e Mon Sep 17 00:00:00 2001 From: cli Date: Mon, 17 Sep 2012 08:21:00 +0000 Subject: [PATCH] TDI-21185: disable it first. git-svn-id: http://talendforge.org/svn/tos/trunk@90778 f6f1c999-d317-4740-80b0-e6d1abc6f99e --- .../core/model/utils/TalendPropertiesUtil.java | 12 ++++++++++++ .../java/org/talend/repository/ProjectManager.java | 4 +++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/org.talend.core.runtime/src/main/java/org/talend/core/model/utils/TalendPropertiesUtil.java b/org.talend.core.runtime/src/main/java/org/talend/core/model/utils/TalendPropertiesUtil.java index 4cb9612a9f..1a11fd4077 100644 --- a/org.talend.core.runtime/src/main/java/org/talend/core/model/utils/TalendPropertiesUtil.java +++ b/org.talend.core.runtime/src/main/java/org/talend/core/model/utils/TalendPropertiesUtil.java @@ -44,4 +44,16 @@ public final class TalendPropertiesUtil { return Boolean.parseBoolean(value); } + + /** + * + * DOC ggu Comment method "isEnabledMultiBranchesInWorkspacee". + * + * @return + */ + public static boolean isEnabledMultiBranchesInWorkspacee() { + String value = System.getProperty("talend.enable.multiBranchesInWorkspace"); //$NON-NLS-1$ + + return Boolean.parseBoolean(value); + } } diff --git a/org.talend.core.runtime/src/main/java/org/talend/repository/ProjectManager.java b/org.talend.core.runtime/src/main/java/org/talend/repository/ProjectManager.java index 2a75e5a1c3..6d0e5a6676 100644 --- a/org.talend.core.runtime/src/main/java/org/talend/repository/ProjectManager.java +++ b/org.talend.core.runtime/src/main/java/org/talend/repository/ProjectManager.java @@ -38,6 +38,7 @@ import org.talend.core.model.repository.ERepositoryObjectType; import org.talend.core.model.repository.IRepositoryViewObject; import org.talend.core.model.repository.RepositoryManager; import org.talend.core.model.repository.SVNConstant; +import org.talend.core.model.utils.TalendPropertiesUtil; import org.talend.core.runtime.CoreRuntimePlugin; import org.talend.core.ui.IReferencedProjectService; import org.talend.repository.model.IProxyRepositoryFactory; @@ -419,7 +420,8 @@ public final class ProjectManager { } public boolean enableSpecialTechnicalProjectName() { - return true; // FIXME TDI-21185, add the function to enable disabling this function. + // FIXME TDI-21185, add the function to enable disabling this function. + return TalendPropertiesUtil.isEnabledMultiBranchesInWorkspacee(); } /**