diff --git a/org.talend.core.repository/src/main/java/org/talend/repository/model/ProjectRepositoryNode.java b/org.talend.core.repository/src/main/java/org/talend/repository/model/ProjectRepositoryNode.java index 42a846dbf2..3a5ef4ff8b 100644 --- a/org.talend.core.repository/src/main/java/org/talend/repository/model/ProjectRepositoryNode.java +++ b/org.talend.core.repository/src/main/java/org/talend/repository/model/ProjectRepositoryNode.java @@ -1813,7 +1813,7 @@ public class ProjectRepositoryNode extends RepositoryNode implements IProjectRep } public boolean getMergeRefProject() { - IPreferenceStore preferenceStore = RepositoryManager.getPreferenceStore(); + IPreferenceStore preferenceStore = RepositoryManager.getRepositoryPreferenceStore(); return preferenceStore.getBoolean(IRepositoryPrefConstants.MERGE_REFERENCE_PROJECT); } diff --git a/org.talend.core.runtime/src/main/java/org/talend/core/model/repository/RepositoryManager.java b/org.talend.core.runtime/src/main/java/org/talend/core/model/repository/RepositoryManager.java index 5eb7fe07ef..ce1881fa2e 100644 --- a/org.talend.core.runtime/src/main/java/org/talend/core/model/repository/RepositoryManager.java +++ b/org.talend.core.runtime/src/main/java/org/talend/core/model/repository/RepositoryManager.java @@ -50,6 +50,16 @@ public final class RepositoryManager { return CoreRuntimePlugin.getInstance().getDesignerCoreService().getDesignerCorePreferenceStore(); } + /** + * + * DOC wchen DesignerCorePreference disappear in some case ,so i change to use repository preference store. + * + * @return + */ + public static IPreferenceStore getRepositoryPreferenceStore() { + return CoreRuntimePlugin.getInstance().getRepositoryService().getRepositoryPreferenceStore(); + } + public static boolean isRefreshManually() { return getPreferenceStore().getBoolean(IRepositoryPrefConstants.MANUALLY_REFRESH); } diff --git a/org.talend.repository.view/src/org/talend/repository/viewer/content/ProjectRepoAbstractContentProvider.java b/org.talend.repository.view/src/org/talend/repository/viewer/content/ProjectRepoAbstractContentProvider.java index 996da80aef..2b377f3f14 100644 --- a/org.talend.repository.view/src/org/talend/repository/viewer/content/ProjectRepoAbstractContentProvider.java +++ b/org.talend.repository.view/src/org/talend/repository/viewer/content/ProjectRepoAbstractContentProvider.java @@ -190,7 +190,7 @@ public abstract class ProjectRepoAbstractContentProvider extends FolderListenerS }; // the merge only for DI repository,need to judge null for other product if (CoreRuntimePlugin.getInstance().getDesignerCoreService() != null) { - IPreferenceStore preferenceStore = RepositoryManager.getPreferenceStore(); + IPreferenceStore preferenceStore = RepositoryManager.getRepositoryPreferenceStore(); preferenceStore.addPropertyChangeListener(mergeRefListener); }