From 8a9a4bb0908161f87b2425bbbc1e9dced98954a1 Mon Sep 17 00:00:00 2001 From: zwzhao Date: Thu, 20 Feb 2014 05:38:49 +0000 Subject: [PATCH] bug TUP-1702 fixed : some problems when right-click on the nodes which under RecycleBin git-svn-id: http://talendforge.org/svn/tos/branches/branch-5_4@114230 f6f1c999-d317-4740-80b0-e6d1abc6f99e --- .../core/repository/model/AbstractEMFRepositoryFactory.java | 4 ++-- .../java/org/talend/core/repository/model/FolderHelper.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/org.talend.core.repository/src/main/java/org/talend/core/repository/model/AbstractEMFRepositoryFactory.java b/org.talend.core.repository/src/main/java/org/talend/core/repository/model/AbstractEMFRepositoryFactory.java index d81fba56bf..532d8c8590 100644 --- a/org.talend.core.repository/src/main/java/org/talend/core/repository/model/AbstractEMFRepositoryFactory.java +++ b/org.talend.core.repository/src/main/java/org/talend/core/repository/model/AbstractEMFRepositoryFactory.java @@ -486,12 +486,12 @@ public abstract class AbstractEMFRepositoryFactory extends AbstractRepositoryFac if (systemFolder == null) { Folder folder = createFolder(getRepositoryContext().getProject(), sqlpatternsType, categoryPath, systemPath.lastSegment()); - ((FolderItem) folder.getProperty().getItem()).setType(FolderType.SYSTEM_FOLDER_LITERAL); + ((FolderItem) folder.getProperty().getItem()).setType(FolderType.FOLDER_LITERAL); } if (folderHelper.getFolder(parentPath.append(userPath)) == null) { Folder folder = createFolder(getRepositoryContext().getProject(), sqlpatternsType, categoryPath, userPath.lastSegment()); - ((FolderItem) folder.getProperty().getItem()).setType(FolderType.SYSTEM_FOLDER_LITERAL); + ((FolderItem) folder.getProperty().getItem()).setType(FolderType.FOLDER_LITERAL); } // if (existingItem == null) { diff --git a/org.talend.core.repository/src/main/java/org/talend/core/repository/model/FolderHelper.java b/org.talend.core.repository/src/main/java/org/talend/core/repository/model/FolderHelper.java index f676d8d661..fd6212dc27 100644 --- a/org.talend.core.repository/src/main/java/org/talend/core/repository/model/FolderHelper.java +++ b/org.talend.core.repository/src/main/java/org/talend/core/repository/model/FolderHelper.java @@ -329,7 +329,7 @@ public abstract class FolderHelper { final EObject parent = folder.getParent(); if (parent instanceof FolderItem) { FolderItem parentFolder = (FolderItem) parent; - if (parentFolder.getParent() instanceof Project) { + if (FolderType.SYSTEM_FOLDER_LITERAL.equals(parentFolder.getType())) { if (path == null) { path = ""; }