TUP-4133 fix: [5.6.1] Referenced Project metadata DB Connection not

displaying correct name
https://jira.talendforge.org/browse/TUP-4133

main/plugins/org.talend.designer.business.diagram/src/org/talend/designer/business/diagram/custom/listeners/BusinessDeleteListener.java

@@ -18,10 +18,12 @@ import java.beans.PropertyChangeListener;
 import org.talend.commons.exception.PersistenceException;
 import org.talend.commons.ui.runtime.exception.ExceptionHandler;
 import org.talend.core.CorePlugin;
+import org.talend.core.model.general.Project;
 import org.talend.core.model.repository.ERepositoryObjectType;
 import org.talend.core.model.repository.IRepositoryObject;
 import org.talend.core.model.repository.IRepositoryViewObject;
 import org.talend.core.repository.model.ProxyRepositoryFactory;
+import org.talend.repository.ProjectManager;
 import org.talend.repository.documentation.ERepositoryActionName;
 import org.talend.repository.model.IProxyRepositoryFactory;
 
@@ -75,7 +77,15 @@ public class BusinessDeleteListener implements PropertyChangeListener {
 
     public void deleteSVGObjectLogicalOrPhysical(IRepositoryObject object, boolean isDeleteBusinessLogical)
             throws PersistenceException {
-        IRepositoryViewObject svgObjectToDelete = ProxyRepositoryFactory.getInstance().getLastVersion("svg_" + object.getId());
+        ProxyRepositoryFactory repFactory = ProxyRepositoryFactory.getInstance();
+        String fullId = object.getId();
+        Project project = repFactory.getProjectFromItemId(fullId);
+        if (project != null) {
+            project = ProjectManager.getInstance().getCurrentProject();
+        }
+        String pureItemId = repFactory.getPureItemId(fullId);
+        IRepositoryViewObject svgObjectToDelete = ProxyRepositoryFactory.getInstance().getLastVersion(project,
+                "svg_" + pureItemId); //$NON-NLS-1$
 
         if (svgObjectToDelete != null) {
             try {

main/plugins/org.talend.designer.core.generic/src/main/java/org/talend/designer/core/generic/controller/SchemaReferenceController.java

@@ -37,7 +37,6 @@ import org.talend.core.model.process.INode;
 import org.talend.core.model.process.INodeConnector;
 import org.talend.core.model.properties.ConnectionItem;
 import org.talend.core.model.properties.Item;
-import org.talend.core.model.properties.Property;
 import org.talend.core.model.repository.ERepositoryObjectType;
 import org.talend.core.model.repository.IRepositoryViewObject;
 import org.talend.core.model.utils.TalendTextUtils;
@@ -360,10 +359,16 @@ public class SchemaReferenceController extends AbstractSchemaController {
         } else if (button.getData(NAME).equals(REPOSITORY_CHOICE)) {
             String paramName = (String) button.getData(PARAMETER_NAME);
             IElementParameter schemaParam = elem.getElementParameter(paramName);
+            String fullParamName = paramName + ":" + getRepositoryChoiceParamName(); //$NON-NLS-1$
 
             ERepositoryObjectType type = ERepositoryObjectType.METADATA_CON_TABLE;
             String filter = schemaParam.getFilter();
             RepositoryReviewDialog dialog = new RepositoryReviewDialog(button.getShell(), type, filter);
+            String oldValue = (String) elem.getPropertyValue(fullParamName);
+            if (oldValue != null && !oldValue.isEmpty()) {
+                dialog.setSelectedNodeName(oldValue);
+                dialog.setIsSelectionId(true);
+            }
             if (dialog.open() == RepositoryReviewDialog.OK) {
                 RepositoryNode node = dialog.getResult();
                 while (node.getObject().getProperty().getItem() == null
@@ -372,8 +377,7 @@ public class SchemaReferenceController extends AbstractSchemaController {
                 }
 
                 IRepositoryViewObject object = dialog.getResult().getObject();
-                Property property = object.getProperty();
-                String id = property.getId();
+                String id = dialog.getSelectedFullId();
                 String name = object.getLabel();// The name is Table Name.
                 if (name != null) {
                     if (elem instanceof Node) {
@@ -384,7 +388,6 @@ public class SchemaReferenceController extends AbstractSchemaController {
                     }
                 }
                 String value = id + " - " + name; //$NON-NLS-1$
-                String fullParamName = paramName + ":" + getRepositoryChoiceParamName(); //$NON-NLS-1$
 
                 org.talend.core.model.metadata.builder.connection.Connection connection = null;
                 if (elem instanceof Node) {

main/plugins/org.talend.designer.core/src/main/java/org/talend/designer/core/model/components/EmfComponent.java

@@ -98,6 +98,7 @@ import org.talend.core.model.temp.ECodePart;
 import org.talend.core.model.utils.SQLPatternUtils;
 import org.talend.core.model.utils.TalendTextUtils;
 import org.talend.core.prefs.ITalendCorePrefConstants;
+import org.talend.core.repository.model.ProxyRepositoryFactory;
 import org.talend.core.ui.branding.IBrandingService;
 import org.talend.core.ui.component.ComponentsFactoryProvider;
 import org.talend.core.ui.component.settings.ComponentsSettingsHelper;
@@ -709,8 +710,8 @@ public class EmfComponent extends AbstractBasicComponent {
             if (sqlItem == null) {
                 continue;
             }
-            map.put(SQLPatternUtils.SQLPATTERNLIST, sqlItem.getProperty().getId() + SQLPatternUtils.ID_SEPARATOR
-                    + sqlItem.getProperty().getLabel());
+            map.put(SQLPatternUtils.SQLPATTERNLIST, ProxyRepositoryFactory.getInstance().getFullId(sqlItem.getProperty())
+                    + SQLPatternUtils.ID_SEPARATOR + sqlItem.getProperty().getLabel());
             patternNames.add(pattern.getNAME());
             value.add(map);
         }

main/plugins/org.talend.designer.core/src/main/java/org/talend/designer/core/model/process/DataProcess.java

@@ -63,7 +63,6 @@ import org.talend.core.model.process.INodeConnector;
 import org.talend.core.model.process.IProcess;
 import org.talend.core.model.process.IProcess2;
 import org.talend.core.model.process.IReplaceNodeInProcess;
-import org.talend.core.model.process.ProcessUtils;
 import org.talend.core.model.process.ReplaceNodesInProcessProvider;
 import org.talend.core.model.process.UniqueNodeNameGenerator;
 import org.talend.core.model.properties.Item;
@@ -2330,10 +2329,10 @@ public class DataProcess implements IGeneratingProcess {
         DataConnection dataConnection = null;
         if (isOutput) {
             validRuleConnections = (List<IConnection>) nodeUseValidationRule.getIncomingConnections();
-            mainConnections = nodeUseValidationRule.getIncomingConnections(EConnectionType.FLOW_MAIN);//$NON-NLS-1$
+            mainConnections = nodeUseValidationRule.getIncomingConnections(EConnectionType.FLOW_MAIN);
         } else {
             validRuleConnections = (List<IConnection>) nodeUseValidationRule.getOutgoingConnections();
-            mainConnections = nodeUseValidationRule.getOutgoingConnections(EConnectionType.FLOW_MAIN);//$NON-NLS-1$
+            mainConnections = nodeUseValidationRule.getOutgoingConnections(EConnectionType.FLOW_MAIN);
         }
 
         if (validRuleConnections == null || validRuleConnections.size() == 0) {
@@ -3109,6 +3108,7 @@ public class DataProcess implements IGeneratingProcess {
             return Collections.emptyList();
         }
         buildGraphicalMap.clear();
+        IProxyRepositoryFactory repFactory = ProxyRepositoryFactory.getInstance();
 
         Property property = null;
         AbstractMultiPageTalendEditor editor = null;
@@ -3120,7 +3120,7 @@ public class DataProcess implements IGeneratingProcess {
             }
         } else {
             property = PropertiesFactory.eINSTANCE.createProperty();
-            property.setId(graphicalNodeList.get(0).getProcess().getId() + "_generated");
+            property.setId(repFactory.getPureItemId(graphicalNodeList.get(0).getProcess().getId()) + "_generated");
         }
         duplicatedProcess = new Process(property);
         ((Process) duplicatedProcess).setComponentsType(process.getComponentsType());

main/plugins/org.talend.designer.core/src/main/java/org/talend/designer/core/ui/AbstractMultiPageTalendEditor.java

@@ -446,7 +446,7 @@ public abstract class AbstractMultiPageTalendEditor extends MultiPageEditorPart
                                 Object o = event.getProperty(Constant.ITEM_EVENT_PROPERTY_KEY);
                                 if (o != null && o instanceof Item) {
                                     Item item = (Item) o;
-                                    String itemId = item.getProperty().getId();
+                                    String itemId = ProxyRepositoryFactory.getInstance().getFullId(item.getProperty());
                                     if (itemId.equals(currentProcess.getId())) {
                                         if (currentProcess.isReadOnly()) {
                                             boolean readOnly = currentProcess.checkReadOnly();
@@ -1302,7 +1302,7 @@ public abstract class AbstractMultiPageTalendEditor extends MultiPageEditorPart
 
                                         Set<String> curContextVars = getCurrentContextVariables(manager);
                                         IProcess2 process2 = getProcess();
-                                        String jobId = process2.getProperty().getId();
+                                        String jobId = factory.getFullId(process2.getProperty());
                                         IEditorReference[] reference = PlatformUI.getWorkbench().getActiveWorkbenchWindow()
                                                 .getActivePage().getEditorReferences();
                                         List<IProcess2> processes = CorePlugin.getDefault().getDesignerCoreService()

main/plugins/org.talend.designer.core/src/main/java/org/talend/designer/core/ui/action/CreateProcess.java

@@ -135,7 +135,7 @@ public class CreateProcess extends AContextualAction implements IIntroAction {
                 fileEditorInput = new ProcessEditorInput(processWizard.getProcess(), false, true, false);
 
                 IRepositoryNode repositoryNode = RepositorySeekerManager.getInstance().searchRepoViewNode(
-                        fileEditorInput.getItem().getProperty().getId(), false);
+                        ProxyRepositoryFactory.getInstance().getFullId(fileEditorInput.getItem().getProperty()), false);
                 fileEditorInput.setRepositoryNode(repositoryNode);
 
                 IWorkbenchPage page = getActivePage();

main/plugins/org.talend.designer.core/src/main/java/org/talend/designer/core/ui/editor/jobletcontainer/JobletUtil.java

@@ -469,12 +469,13 @@ public class JobletUtil {
     public boolean needReadOnlyJoblet(JobletProcessItem jobletItem) {
         IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
         IEditorPart[] editors = page.getEditors();
+        IProxyRepositoryFactory repFactory = ProxyRepositoryFactory.getInstance();
         for (IEditorPart editor : editors) {
             if (editor instanceof AbstractMultiPageTalendEditor) {
                 List<? extends INode> nodeList = ((AbstractMultiPageTalendEditor) editor).getProcess().getGraphicalNodes();
                 for (INode node : nodeList) {
                     if (((Node) node).isJoblet() && jobletItem.getProperty() != null) {
-                        if (jobletItem.getProperty().getId().equals(node.getComponent().getProcess().getId())) {
+                        if (repFactory.getFullId(jobletItem.getProperty()).equals(node.getComponent().getProcess().getId())) {
                             boolean haveLock = jobletItem.getState().isLocked();
                             boolean isSvn = false;
                             ISVNProviderService service = null;
@@ -510,6 +511,7 @@ public class JobletUtil {
     public boolean openedInJob(JobletProcessItem jobletItem, Node currNode) {
         IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
         IEditorPart[] editors = page.getEditors();
+        IProxyRepositoryFactory repFactory = ProxyRepositoryFactory.getInstance();
         for (IEditorPart editor : editors) {
             if (editor instanceof AbstractMultiPageTalendEditor) {
                 IProcess2 pro = ((AbstractMultiPageTalendEditor) editor).getProcess();
@@ -522,7 +524,8 @@ public class JobletUtil {
                                 continue;
                             } else {
                                 if (((Node) node).isJoblet() && jobletItem.getProperty() != null) {
-                                    if (jobletItem.getProperty().getId().equals(node.getComponent().getProcess().getId())) {
+                                    if (repFactory.getFullId(jobletItem.getProperty())
+                                            .equals(node.getComponent().getProcess().getId())) {
                                         boolean haveOpened = !((Node) node).getNodeContainer().isCollapsed();
                                         if (haveOpened) {
                                             return true;
@@ -538,7 +541,7 @@ public class JobletUtil {
                 List<? extends INode> nodeList = pro.getGraphicalNodes();
                 for (INode node : nodeList) {
                     if (((Node) node).isJoblet() && jobletItem.getProperty() != null) {
-                        if (jobletItem.getProperty().getId().equals(node.getComponent().getProcess().getId())) {
+                        if (repFactory.getFullId(jobletItem.getProperty()).equals(node.getComponent().getProcess().getId())) {
                             boolean haveOpened = !((Node) node).getNodeContainer().isCollapsed();
                             if (haveOpened) {
                                 return true;

main/plugins/org.talend.designer.core/src/main/java/org/talend/designer/core/ui/editor/nodecontainer/NodeContainerPart.java

@@ -27,6 +27,8 @@ import org.eclipse.gef.SnapToGrid;
 import org.eclipse.gef.SnapToHelper;
 import org.eclipse.gef.editparts.AbstractGraphicalEditPart;
 import org.eclipse.gef.rulers.RulerProvider;
+import org.eclipse.swt.widgets.Display;
+import org.talend.commons.CommonsPlugin;
 import org.talend.core.model.process.IElementParameter;
 import org.talend.designer.core.model.components.EParameterName;
 import org.talend.designer.core.ui.editor.nodes.Node;
@@ -54,6 +56,7 @@ public class NodeContainerPart extends AbstractGraphicalEditPart implements Prop
         return false;
     }
 
+    @Override
     public void activate() {
         if (!isActive()) {
             super.activate();
@@ -62,6 +65,7 @@ public class NodeContainerPart extends AbstractGraphicalEditPart implements Prop
         }
     }
 
+    @Override
     public void deactivate() {
         if (isActive()) {
             super.deactivate();
@@ -116,6 +120,7 @@ public class NodeContainerPart extends AbstractGraphicalEditPart implements Prop
         installEditPolicy(EditPolicy.LAYOUT_ROLE, new NodeContainerLayoutEditPolicy());
     }
 
+    @Override
     protected void refreshVisuals() {
         Rectangle rectangle = ((NodeContainer) this.getModel()).getNodeContainerRectangle();
         Rectangle cleanRectangle = ((NodeContainer) this.getModel()).getNodeMarkRectangle();
@@ -123,6 +128,7 @@ public class NodeContainerPart extends AbstractGraphicalEditPart implements Prop
         ((NodeContainerFigure) getFigure()).initializeNodeContainer(cleanRectangle);
     }
 
+    @Override
     protected List getModelChildren() {
         return ((NodeContainer) this.getModel()).getElements();
     }
@@ -132,7 +138,25 @@ public class NodeContainerPart extends AbstractGraphicalEditPart implements Prop
      * 
      * @see java.beans.PropertyChangeListener#propertyChange(java.beans.PropertyChangeEvent)
      */
+    @Override
     public void propertyChange(PropertyChangeEvent changeEvent) {
+        if (!CommonsPlugin.isHeadless() && Display.getCurrent() == null) {
+            /**
+             * If not running in UI thread, should run it in UI thread, use asyncExec to avoid potential UI block issue
+             */
+            Display.getDefault().asyncExec(new Runnable() {
+
+                @Override
+                public void run() {
+                    onPropertyChange(changeEvent);
+                }
+            });
+        } else {
+            onPropertyChange(changeEvent);
+        }
+    }
+
+    private void onPropertyChange(PropertyChangeEvent changeEvent) {
         if (changeEvent.getPropertyName().equals(EParameterName.VALIDATION_RULES.getName())) {
             Node node = ((NodeContainer) getModel()).getNode();
             ((NodeContainerFigure) this.getFigure()).updateValidationRuleFigure(node.isHasValidationRule());

main/plugins/org.talend.designer.core/src/main/java/org/talend/designer/core/ui/editor/process/Process.java

@@ -2829,7 +2829,7 @@ public class Process extends Element implements IProcess2, IGEFProcess, ILastVer
      */
     @Override
     public String getId() {
-        return getProperty().getId();
+        return ProxyRepositoryFactory.getInstance().getFullId(getProperty());
     }
 
     /*

main/plugins/org.talend.designer.core/src/main/java/org/talend/designer/core/ui/editor/process/ProcessUpdateManager.java

@@ -96,6 +96,7 @@ import org.talend.core.model.update.UpdatesConstants;
 import org.talend.core.model.update.extension.UpdateManagerProviderDetector;
 import org.talend.core.model.utils.SAPConnectionUtils;
 import org.talend.core.model.utils.TalendTextUtils;
+import org.talend.core.repository.model.ProxyRepositoryFactory;
 import org.talend.core.runtime.services.IGenericWizardService;
 import org.talend.core.service.IDesignerMapperService;
 import org.talend.core.service.IEBCDICProviderService;
@@ -149,10 +150,12 @@ public class ProcessUpdateManager extends AbstractUpdateManager {
         if (jobletProcessProvider == null) {
             return;
         }
+        ProxyRepositoryFactory repFactory = ProxyRepositoryFactory.getInstance();
         for (INode node : this.getProcess().getGraphicalNodes()) {
             Item jobletItem = jobletProcessProvider.getJobletItem(node);
             if (jobletItem != null) {
-                jobletReferenceMap.put(jobletItem.getProperty().getId(), jobletItem.getProperty().getModificationDate());
+                jobletReferenceMap.put(repFactory.getFullId(jobletItem.getProperty()),
+                        jobletItem.getProperty().getModificationDate());
             }
         }
     }
@@ -547,8 +550,8 @@ public class ProcessUpdateManager extends AbstractUpdateManager {
         List<IProcess2> openedProcessList = CorePlugin.getDefault().getDesignerCoreService().getOpenedProcess(reference);
         for (IProcess2 process : openedProcessList) {
             Property property = curProcess.getProperty();
-            if (process.getId().equals(property.getId()) && process.getName().equals(property.getLabel())
-                    && process.getVersion().equals(property.getVersion())) {
+            if (process.getId().equals(ProxyRepositoryFactory.getInstance().getFullId(property))
+                    && process.getName().equals(property.getLabel()) && process.getVersion().equals(property.getVersion())) {
                 return true;
             }
         }
@@ -2292,17 +2295,19 @@ public class ProcessUpdateManager extends AbstractUpdateManager {
         }
         List<IProcess2> openedProcesses = UpdateManagerUtils.getOpenedProcess();
         List<UpdateResult> nodeResults = new ArrayList<UpdateResult>();
+        ProxyRepositoryFactory repFactory = ProxyRepositoryFactory.getInstance();
+        String currentFullId = repFactory.getFullId(getProcess().getProperty());
         for (INode node : this.getProcess().getGraphicalNodes()) {
             final Item jobletItem = jobletProcessProvider.getJobletItem(node);
             if (jobletItem != null) {
                 final Property property = jobletItem.getProperty();
-                final String id = property.getId();
+                String fullId = repFactory.getFullId(property);
                 final Date modificationDate = property.getModificationDate();
 
-                final Date oldDate = this.jobletReferenceMap.get(id);
+                final Date oldDate = this.jobletReferenceMap.get(fullId);
 
                 if (((oldDate != null && !modificationDate.equals(oldDate)) || onlySimpleShow)
-                        && !getProcess().getId().equals(id)) {
+                        && !currentFullId.equals(fullId)) {
                     List<INode> jobletNodes = findRelatedJobletNode(getProcess(), property.getLabel(), null);
                     if (jobletNodes != null && !jobletNodes.isEmpty()) {
                         String source = UpdatesConstants.JOBLET + UpdatesConstants.COLON + property.getLabel();

main/plugins/org.talend.designer.core/src/main/java/org/talend/designer/core/ui/editor/process/TalendEditorDropTargetListener.java

@@ -78,6 +78,7 @@ import org.talend.core.model.components.ComponentCategory;
 import org.talend.core.model.components.ComponentUtilities;
 import org.talend.core.model.components.IComponent;
 import org.talend.core.model.components.IComponentsService;
+import org.talend.core.model.general.Project;
 import org.talend.core.model.metadata.IEbcdicConstant;
 import org.talend.core.model.metadata.IHL7Constant;
 import org.talend.core.model.metadata.IMetadataTable;
@@ -196,6 +197,7 @@ import org.talend.repository.model.IProxyRepositoryFactory;
 import org.talend.repository.model.IRepositoryNode;
 import org.talend.repository.model.IRepositoryNode.EProperties;
 import org.talend.repository.model.RepositoryNode;
+import org.talend.repository.model.nodes.IProjectRepositoryNode;
 
 import orgomg.cwm.objectmodel.core.ModelElement;
 
@@ -1202,6 +1204,7 @@ public class TalendEditorDropTargetListener extends TemplateTransferDropTargetLi
         // List<Command> list = new ArrayList<Command>();
         if (selectedNode.getObject().getProperty().getItem() instanceof ConnectionItem) {
             String propertyId = selectedNode.getObject().getProperty().getId();
+            propertyId = generateItemIdWithProjectLabel(selectedNode, propertyId);
             ConnectionItem originalConnectionItem = (ConnectionItem) selectedNode.getObject().getProperty().getItem();
             ConnectionItem connectionItem = originalConnectionItem;
             Connection originalConnection = connectionItem.getConnection();
@@ -1488,6 +1491,7 @@ public class TalendEditorDropTargetListener extends TemplateTransferDropTargetLi
             ProcessItem processItem = (ProcessItem) selectedNode.getObject().getProperty().getItem();
             // command used to set job
             String value = processItem.getProperty().getId();
+            value = generateItemIdWithProjectLabel(selectedNode, value);
             PropertyChangeCommand command4 = new PropertyChangeCommand(node, EParameterName.PROCESS_TYPE_PROCESS.getName(), value);
             cc.add(command4);
             PropertyChangeCommand command5 = new PropertyChangeCommand(node, EParameterName.PROCESS_TYPE_CONTEXT.getName(),
@@ -1631,7 +1635,10 @@ public class TalendEditorDropTargetListener extends TemplateTransferDropTargetLi
             }
 
             if (table != null) {
-                String value = connectionItem.getProperty().getId() + " - " + table.getLabel(); //$NON-NLS-1$
+                String connectionId = connectionItem.getProperty().getId();
+                connectionId = generateItemIdWithProjectLabel(selectedNode, connectionId);
+
+                String value = connectionId + " - " + table.getLabel(); //$NON-NLS-1$
                 IElementParameter schemaParam = node.getElementParameterFromField(EParameterFieldType.SCHEMA_TYPE);
                 if (schemaParam == null) {
                     schemaParam = node.getElementParameterFromField(EParameterFieldType.SCHEMA_REFERENCE);
@@ -2214,6 +2221,33 @@ public class TalendEditorDropTargetListener extends TemplateTransferDropTargetLi
         }
         return openEditor;
     }
+
+    private String getProjectLabel(RepositoryNode node) {
+        if (node == null) {
+            return null;
+        }
+        IProjectRepositoryNode projRepNode = node.getRoot();
+        if (projRepNode != null) {
+            Project project = projRepNode.getProject();
+            if (project != null) {
+                return project.getLabel();
+            }
+        }
+        return null;
+    }
+
+    private String generateItemIdWithProjectLabel(String projectLabel, String pureItemId) {
+        return ProxyRepositoryFactory.getInstance().generateFullId(projectLabel, pureItemId);
+    }
+
+    private String generateItemIdWithProjectLabel(RepositoryNode selectedNode, String propertyId) {
+        String generatedItemId = propertyId;
+        String projectLabel = getProjectLabel(selectedNode);
+        if (projectLabel != null && !projectLabel.trim().isEmpty()) {
+            generatedItemId = generateItemIdWithProjectLabel(projectLabel.trim(), propertyId);
+        }
+        return generatedItemId;
+    }
 }
 
 /**

main/plugins/org.talend.designer.core/src/main/java/org/talend/designer/core/ui/editor/properties/controllers/AbstractSchemaController.java

@@ -518,7 +518,8 @@ public abstract class AbstractSchemaController extends AbstractRepositoryControl
         // find IRepositoryObject from repository that contains current connection
         IRepositoryViewObject node = findRepositoryObject(schemaId);
         RepositoryNode repositoryNode = null;
-        IRepositoryNode iRepNode = RepositorySeekerManager.getInstance().searchRepoViewNode(node.getProperty().getId());
+        IRepositoryNode iRepNode = RepositorySeekerManager.getInstance()
+                .searchRepoViewNode(ProxyRepositoryFactory.getInstance().getFullId(node.getProperty()));
         if (iRepNode instanceof RepositoryNode) {
             repositoryNode = (RepositoryNode) iRepNode;
         }
@@ -912,6 +913,7 @@ public abstract class AbstractSchemaController extends AbstractRepositoryControl
         } else if (button.getData(NAME).equals(REPOSITORY_CHOICE)) {
             String paramName = (String) button.getData(PARAMETER_NAME);
             IElementParameter schemaParam = elem.getElementParameter(paramName);
+            String fullParamName = paramName + ":" + getRepositoryChoiceParamName(); //$NON-NLS-1$
 
             ERepositoryObjectType type = ERepositoryObjectType.METADATA_CON_TABLE;
             String filter = schemaParam.getFilter();
@@ -925,6 +927,11 @@ public abstract class AbstractSchemaController extends AbstractRepositoryControl
             }
 
             RepositoryReviewDialog dialog = new RepositoryReviewDialog(button.getShell(), type, filter);
+            String oldValue = (String) elem.getPropertyValue(fullParamName);
+            if (oldValue != null && !oldValue.isEmpty()) {
+                dialog.setSelectedNodeName(oldValue);
+                dialog.setIsSelectionId(true);
+            }
             if (dialog.open() == RepositoryReviewDialog.OK) {
                 RepositoryNode node = dialog.getResult();
                 while (node.getObject().getProperty().getItem() == null
@@ -934,7 +941,7 @@ public abstract class AbstractSchemaController extends AbstractRepositoryControl
 
                 IRepositoryViewObject object = dialog.getResult().getObject();
                 Property property = object.getProperty();
-                String id = property.getId();
+                String id = object.getId();
                 String name = object.getLabel();// The name is Table Name.
                 org.talend.core.model.metadata.builder.connection.MetadataTable table = null;
                 if (property.getItem() instanceof SAPConnectionItem && object instanceof MetadataTableRepositoryObject) {
@@ -1028,8 +1035,6 @@ public abstract class AbstractSchemaController extends AbstractRepositoryControl
                 }
                 String value = id + " - " + name; //$NON-NLS-1$
 
-                String fullParamName = paramName + ":" + getRepositoryChoiceParamName(); //$NON-NLS-1$
-
                 org.talend.core.model.metadata.builder.connection.Connection connection = null;
                 if (elem instanceof Node) {
                     IMetadataTable repositoryMetadata = null;

main/plugins/org.talend.designer.core/src/main/java/org/talend/designer/core/ui/editor/properties/controllers/ProcessController.java

@@ -52,6 +52,7 @@ import org.talend.core.model.properties.ProcessItem;
 import org.talend.core.model.repository.ERepositoryObjectType;
 import org.talend.core.model.repository.IRepositoryViewObject;
 import org.talend.core.model.utils.PerlResourcesHelper;
+import org.talend.core.repository.model.ProxyRepositoryFactory;
 import org.talend.core.ui.CoreUIPlugin;
 import org.talend.core.ui.branding.IBrandingService;
 import org.talend.core.ui.properties.tab.IDynamicProperty;
@@ -456,6 +457,7 @@ public class ProcessController extends AbstractElementPropertySectionController
                 isSelectUseDynamic = (Boolean) useDynamicJobValue;
             }
         }
+        ProxyRepositoryFactory repFactory = ProxyRepositoryFactory.getInstance();
         if (isSelectUseDynamic) {
             UseDynamicJobSelectionDialog usedialog = new UseDynamicJobSelectionDialog((button).getShell(),
                     ERepositoryObjectType.PROCESS, procssId, isSelectUseDynamic);
@@ -471,8 +473,7 @@ public class ProcessController extends AbstractElementPropertySectionController
                     for (int i = 0; i < repositoryNodeList.size(); i++) {
                         RepositoryNode node = repositoryNodeList.get(i);
                         IRepositoryViewObject repositoryViewObject = node.getObject();
-                        final Item item = repositoryViewObject.getProperty().getItem();
-                        String id = item.getProperty().getId();
+                        String id = repFactory.getFullId(repositoryViewObject);
                         if (i > 0) {
                             ids.append(ProcessController.COMMA);
                         }
@@ -499,9 +500,7 @@ public class ProcessController extends AbstractElementPropertySectionController
             selectJobNodeIfExists(button, dialog);
 
             if (dialog.open() == RepositoryReviewDialog.OK) {
-                IRepositoryViewObject repositoryObject = dialog.getResult().getObject();
-                final Item item = repositoryObject.getProperty().getItem();
-                String id = item.getProperty().getId();
+                String id = dialog.getSelectedFullId();
 
                 String paramName = (String) button.getData(PARAMETER_NAME);
                 return new PropertyChangeCommand(elem, paramName, id);
@@ -524,11 +523,12 @@ public class ProcessController extends AbstractElementPropertySectionController
                 String paramName = (String) button.getData(PARAMETER_NAME);
                 String jobId = (String) runJobNode.getPropertyValue(paramName); // .getElementParameter(name).getValue();
                 if (StringUtils.isNotEmpty(jobId)) {
-                    // if user have selected job
-                    ProcessItem processItem = ItemCacheManager.getProcessItem(jobId);
-                    String jobName = processItem.getProperty().getLabel();
+                    // // if user have selected job
+                    // ProcessItem processItem = ItemCacheManager.getProcessItem(jobId);
+                    // String jobName = processItem.getProperty().getLabel();
                     // expand the tree node and reveal it
-                    dialog.setSelectedNodeName(jobName);
+                    dialog.setSelectedNodeName(jobId);
+                    dialog.setIsSelectionId(true);
                 }
             }
         } catch (Throwable e) {

main/plugins/org.talend.designer.core/src/main/java/org/talend/designer/core/ui/editor/properties/controllers/PropertyTypeController.java

@@ -299,6 +299,9 @@ public class PropertyTypeController extends AbstractRepositoryController {
             RepositoryNode selectNode = null;
 
             if (id == null) {
+                IElementParameter repositoryParam = param.getChildParameters()
+                        .get(EParameterName.REPOSITORY_PROPERTY_TYPE.getName());
+                String oldId = (String) repositoryParam.getValue();
                 RepositoryReviewDialog dialog = null;
                 if (dbTypeParam != null) {
                     String[] listRepositoryItems = dbTypeParam.getListRepositoryItems();
@@ -308,10 +311,14 @@ public class PropertyTypeController extends AbstractRepositoryController {
                     dialog = new RepositoryReviewDialog(Display.getCurrent().getActiveShell(), ERepositoryObjectType.METADATA,
                             elem, param);
                 }
+                if (oldId != null && !oldId.isEmpty()) {
+                    dialog.setSelectedNodeName(oldId);
+                    dialog.setIsSelectionId(true);
+                }
 
                 if (dialog.open() == RepositoryReviewDialog.OK) {
                     selectNode = dialog.getResult();
-                    id = selectNode.getObject().getId();
+                    id = dialog.getSelectedFullId();
                 }
             }
             if (id != null && !"".equals(id)) {

main/plugins/org.talend.designer.core/src/main/java/org/talend/designer/core/ui/editor/properties/controllers/QueryTypeController.java

@@ -163,7 +163,7 @@ public class QueryTypeController extends AbstractRepositoryController {
                         || (!(node.getObject().getProperty().getItem() instanceof ConnectionItem))) {
                     node = node.getParent();
                 }
-                String id = node.getObject().getProperty().getId();
+                String id = dialog.getSelectedFullId();
                 String name = dialog.getResult().getObject().getLabel();
                 String paramName = (String) button.getData(PARAMETER_NAME);
                 String value = id + " - " + name; //$NON-NLS-1$

main/plugins/org.talend.designer.core/src/main/java/org/talend/designer/core/ui/editor/properties/controllers/SapSchemaTypeController.java

@@ -890,6 +890,7 @@ public class SapSchemaTypeController extends AbstractRepositoryController {
         } else if (button.getData(NAME).equals(REPOSITORY_CHOICE)) {
             String paramName = (String) button.getData(PARAMETER_NAME);
             IElementParameter schemaParam = elem.getElementParameter(paramName);
+            String fullParamName = paramName + ":" + getRepositoryChoiceParamName(); //$NON-NLS-1$
 
             ERepositoryObjectType type = ERepositoryObjectType.METADATA_CON_TABLE;
             String filter = schemaParam.getFilter();
@@ -903,6 +904,11 @@ public class SapSchemaTypeController extends AbstractRepositoryController {
             }
 
             RepositoryReviewDialog dialog = new RepositoryReviewDialog(button.getShell(), type, filter);
+            String oldValue = (String) elem.getPropertyValue(fullParamName);
+            if (oldValue != null && !oldValue.isEmpty()) {
+                dialog.setSelectedNodeName(oldValue);
+                dialog.setIsSelectionId(true);
+            }
             if (dialog.open() == RepositoryReviewDialog.OK) {
                 RepositoryNode node = dialog.getResult();
                 while (node.getObject().getProperty().getItem() == null
@@ -910,7 +916,7 @@ public class SapSchemaTypeController extends AbstractRepositoryController {
                     node = node.getParent();
                 }
 
-                String id = dialog.getResult().getObject().getProperty().getId();
+                String id = dialog.getSelectedFullId();
                 String name = dialog.getResult().getObject().getLabel();// The name is Table Name.
                 if (name != null) {
                     if (elem instanceof Node) {
@@ -990,8 +996,6 @@ public class SapSchemaTypeController extends AbstractRepositoryController {
                 }
                 String value = id + " - " + name; //$NON-NLS-1$
 
-                String fullParamName = paramName + ":" + getRepositoryChoiceParamName(); //$NON-NLS-1$
-
                 org.talend.core.model.metadata.builder.connection.Connection connection = null;
                 if (elem instanceof Node) {
                     IMetadataTable repositoryMetadata = MetadataToolHelper.getMetadataFromRepository(value);

main/plugins/org.talend.designer.core/src/main/java/org/talend/designer/core/ui/projectsetting/AbstractJobSettingsPage.java

@@ -355,8 +355,8 @@ public abstract class AbstractJobSettingsPage extends ProjectSettingPage {
         Property property = object.getProperty();
         if (property.getItem() instanceof ProcessItem) {
             for (IProcess2 process : openedProcessList) {
-                if (process.getId().equals(property.getId()) && process.getName().equals(property.getLabel())
-                        && process.getVersion().equals(property.getVersion())) {
+                if (process.getId().equals(ProxyRepositoryFactory.getInstance().getFullId(property))
+                        && process.getName().equals(property.getLabel()) && process.getVersion().equals(property.getVersion())) {
                     return true;
                 }
             }

main/plugins/org.talend.designer.core/src/main/java/org/talend/designer/core/ui/projectsetting/StatLogsAndImplicitcontextTreeViewPage.java

@@ -367,8 +367,8 @@ public class StatLogsAndImplicitcontextTreeViewPage extends ProjectSettingPage {
         Property property = node.getObject().getProperty();
         if (property.getItem() instanceof ProcessItem) {
             for (IProcess process : opendProcess) {
-                if (process.getId().equals(property.getId()) && process.getName().equals(property.getLabel())
-                        && process.getVersion().equals(property.getVersion())) {
+                if (process.getId().equals(ProxyRepositoryFactory.getInstance().getFullId(property))
+                        && process.getName().equals(property.getLabel()) && process.getVersion().equals(property.getVersion())) {
                     return true;
                 }
             }

main/plugins/org.talend.designer.dbmap/src/main/java/org/talend/designer/dbmap/managers/MapperManager.java

@@ -31,6 +31,7 @@ import org.talend.core.model.metadata.IMetadataTable;
 import org.talend.core.model.metadata.MetadataTable;
 import org.talend.core.model.process.IElementParameter;
 import org.talend.core.model.process.IProcess;
+import org.talend.core.runtime.CoreRuntimePlugin;
 import org.talend.core.ui.metadata.editor.MetadataTableEditor;
 import org.talend.core.ui.metadata.editor.MetadataTableEditorView;
 import org.talend.designer.abstractmap.managers.AbstractMapperManager;
@@ -614,7 +615,7 @@ public class MapperManager extends AbstractMapperManager {
      * @return
      */
     private String getPreviewFileName() {
-        return mapperComponent.getProcess().getId()
+        return CoreRuntimePlugin.getInstance().getProxyRepositoryFactory().getPureItemId(mapperComponent.getProcess().getId())
                 + "-" + mapperComponent.getUniqueName() + "-" + EParameterName.PREVIEW.getName() //$NON-NLS-1$ //$NON-NLS-2$
                 + ".bmp"; //$NON-NLS-1$
     }

main/plugins/org.talend.designer.mapper/src/main/java/org/talend/designer/mapper/managers/MapperManager.java

@@ -43,6 +43,7 @@ import org.talend.core.model.process.IElementParameter;
 import org.talend.core.model.process.IExternalData;
 import org.talend.core.model.process.IProcess;
 import org.talend.core.model.process.IProcess2;
+import org.talend.core.runtime.CoreRuntimePlugin;
 import org.talend.core.ui.metadata.dialog.CustomTableManager;
 import org.talend.core.ui.metadata.editor.MetadataTableEditor;
 import org.talend.core.ui.metadata.editor.MetadataTableEditorView;
@@ -869,8 +870,9 @@ public class MapperManager extends AbstractMapperManager {
      * @return
      */
     private String getPreviewFileName() {
-        return getAbstractMapComponent().getProcess().getId()
-                + "-" + getAbstractMapComponent().getUniqueName() + "-" + EParameterName.PREVIEW.getName() //$NON-NLS-1$ //$NON-NLS-2$
+        return CoreRuntimePlugin.getInstance().getProxyRepositoryFactory()
+                .getPureItemId(getAbstractMapComponent().getProcess().getId()) + "-" + getAbstractMapComponent().getUniqueName() //$NON-NLS-1$
+                + "-" + EParameterName.PREVIEW.getName() //$NON-NLS-1$
                 + ".bmp"; //$NON-NLS-1$
     }
 

main/plugins/org.talend.designer.rowgenerator/src/main/java/org/talend/designer/rowgenerator/shadow/RowGenProcess.java

@@ -35,6 +35,7 @@ import org.talend.core.model.properties.Property;
 import org.talend.core.model.properties.User;
 import org.talend.core.model.repository.ERepositoryObjectType;
 import org.talend.core.model.repository.IRepositoryViewObject;
+import org.talend.core.runtime.CoreRuntimePlugin;
 import org.talend.designer.rowgenerator.RowGeneratorComponent;
 import org.talend.designer.rowgenerator.i18n.Messages;
 import org.talend.designer.runprocess.IProcessor;
@@ -313,7 +314,7 @@ public class RowGenProcess extends Element implements IProcess {
      */
     @Override
     public String getId() {
-        return getProperty().getId();
+        return CoreRuntimePlugin.getInstance().getProxyRepositoryFactory().getFullId(getProperty());
     }
 
     /*

main/plugins/org.talend.designer.runprocess/src/main/java/org/talend/designer/runprocess/JobErrorsChecker.java

@@ -43,6 +43,7 @@ import org.talend.core.model.properties.Item;
 import org.talend.core.model.properties.Property;
 import org.talend.core.model.repository.ERepositoryObjectType;
 import org.talend.core.model.repository.IRepositoryViewObject;
+import org.talend.core.repository.model.ProxyRepositoryFactory;
 import org.talend.core.runtime.process.LastGenerationInfo;
 import org.talend.designer.codegen.ITalendSynchronizer;
 import org.talend.designer.core.IDesignerCoreService;
@@ -84,7 +85,7 @@ public class JobErrorsChecker {
                 if (sourceFile == null) {
                     continue;
                 }
-                jobIds.add(item.getProperty().getId());
+                jobIds.add(proxyRepositoryFactory.getFullId(item.getProperty()));
 
                 // Property property = process.getProperty();
                 Problems.addJobRoutineFile(sourceFile, ProblemType.JOB, item, true);
@@ -129,6 +130,7 @@ public class JobErrorsChecker {
         if (!selection.isEmpty()) {
             final ITalendSynchronizer synchronizer = CorePlugin.getDefault().getCodeGeneratorService()
                     .createRoutineSynchronizer();
+            IProxyRepositoryFactory repFactory = ProxyRepositoryFactory.getInstance();
             Set<String> jobIds = new HashSet<String>();
 
             List<RepositoryNode> nodes = selection.toList();
@@ -172,7 +174,7 @@ public class JobErrorsChecker {
                             }
                         }
 
-                        jobIds.add(item.getProperty().getId());
+                        jobIds.add(repFactory.getFullId(item.getProperty()));
 
                         Problems.addRoutineFile(sourceFile, ProblemType.JOB, item.getProperty().getLabel(), item.getProperty()
                                 .getVersion(), true);

main/plugins/org.talend.designer.runprocess/src/main/java/org/talend/designer/runprocess/java/JavaProcessor.java

@@ -115,6 +115,7 @@ import org.talend.core.model.properties.Property;
 import org.talend.core.model.runprocess.IJavaProcessorStates;
 import org.talend.core.model.utils.JavaResourcesHelper;
 import org.talend.core.prefs.ITalendCorePrefConstants;
+import org.talend.core.repository.model.ProxyRepositoryFactory;
 import org.talend.core.runtime.process.ITalendProcessJavaProject;
 import org.talend.core.runtime.process.LastGenerationInfo;
 import org.talend.core.ui.services.IRulesProviderService;
@@ -332,7 +333,8 @@ public class JavaProcessor extends AbstractJavaProcessor implements IJavaBreakpo
             // test/shadowfileinputtodelimitedoutput_0_1/ShadowFileInputToDelimitedOutput.java,
             // test/preview_data/Preview_Data.java
             jobClassFilePath = jobClassPackageFolder + JavaUtils.PATH_SEPARATOR
-                    + (filenameFromLabel ? JavaResourcesHelper.escapeFileName(process.getName()) : process.getId())
+                    + (filenameFromLabel ? JavaResourcesHelper.escapeFileName(process.getName())
+                            : ProxyRepositoryFactory.getInstance().getPureItemId(process.getId()))
                     + JavaUtils.JAVA_EXTENSION;
             // test.shadowfileinputtodelimitedoutput_0_1.ShadowFileInputToDelimitedOutput,
             // test.preview_data.Preview_Data

main/plugins/org.talend.repository.generic/src/main/java/org/talend/repository/generic/ui/GenericConnWizard.java

@@ -51,16 +51,12 @@ import org.talend.core.model.repository.RepositoryObject;
 import org.talend.core.repository.model.ProxyRepositoryFactory;
 import org.talend.core.runtime.CoreRuntimePlugin;
 import org.talend.core.runtime.services.IGenericWizardService;
-import org.talend.daikon.properties.Properties;
 import org.talend.daikon.properties.presentation.Form;
-import org.talend.daikon.serialize.PostDeserializeSetup;
-import org.talend.daikon.serialize.SerializerDeserializer;
 import org.talend.designer.core.generic.constants.IGenericConstants;
 import org.talend.designer.core.generic.utils.ComponentsUtils;
 import org.talend.designer.core.model.components.ElementParameter;
 import org.talend.metadata.managment.ui.utils.ConnectionContextHelper;
 import org.talend.metadata.managment.ui.wizard.CheckLastVersionRepositoryWizard;
-import org.talend.metadata.managment.ui.wizard.context.MetadataContextPropertyValueEvaluator;
 import org.talend.repository.generic.i18n.Messages;
 import org.talend.repository.generic.internal.IGenericWizardInternalService;
 import org.talend.repository.generic.internal.service.GenericWizardInternalService;
@@ -186,7 +182,8 @@ public class GenericConnWizard extends CheckLastVersionRepositoryWizard {
         IGenericWizardInternalService internalService = new GenericWizardInternalService();
         ComponentWizard componentWizard = null;
         if (creation) {
-            componentWizard = internalService.getComponentWizard(typeName, connectionProperty.getId());
+            componentWizard = internalService.getComponentWizard(typeName,
+                    ProxyRepositoryFactory.getInstance().getFullId(connectionProperty));
         } else {
             String compPropertiesStr = connection.getCompProperties();
             if (compPropertiesStr != null) {
@@ -264,7 +261,7 @@ public class GenericConnWizard extends CheckLastVersionRepositoryWizard {
                         if (creation) {
                             factory.create(connectionItem, pathToSave);
                         }
-                        compService.afterFormFinish(form.getName(), (ComponentProperties) form.getProperties());
+                        compService.afterFormFinish(form.getName(), form.getProperties());
                     }
                     if (!creation) {
                         GenericUpdateManager.updateGenericConnection(connectionItem, oldMetadataTable);

main/plugins/org.talend.repository.generic/src/main/java/org/talend/repository/generic/update/GenericUpdateManager.java

@@ -60,7 +60,7 @@ public class GenericUpdateManager extends RepositoryUpdateManager {
 
     public static boolean updateGenericConnection(ConnectionItem connectionItem, List<IMetadataTable> oldMetadataTable,
             boolean show, final boolean onlySimpleShow) {
-        List<Relation> relations = RelationshipItemBuilder.getInstance().getItemsRelatedTo(connectionItem.getProperty().getId(),
+        List<Relation> relations = RelationshipItemBuilder.getInstance().getItemsRelatedTo(connectionItem.getProperty(),
                 RelationshipItemBuilder.LATEST_VERSION, RelationshipItemBuilder.PROPERTY_RELATION);
         RepositoryUpdateManager repositoryUpdateManager = new GenericUpdateManager(connectionItem, oldMetadataTable, relations);
         return repositoryUpdateManager.doWork(true, false);

main/plugins/org.talend.repository/src/main/java/org/talend/repository/imports/ImportItemUtil.java

@@ -215,6 +215,7 @@ public class ImportItemUtil {
 
     private boolean checkItem(ItemRecord itemRecord, boolean overwrite) {
 
+        IProxyRepositoryFactory repFactory = ProxyRepositoryFactory.getInstance();
         boolean result = false;
 
         try {
@@ -245,8 +246,9 @@ public class ImportItemUtil {
             for (IRepositoryViewObject current : cache.getItemsFromRepository().get(itemType)) {
                 final Property property = itemRecord.getProperty();
                 if (property != null) {
+                    String currentPureId = repFactory.getPureItemId(current.getId());
                     if (property.getLabel() != null && property.getLabel().equalsIgnoreCase(current.getLabel())
-                            && property.getId() != current.getId()) {
+                            && property.getId() != currentPureId) {
                         // To check SQLPattern in same path. see bug 0005038: unable to add a SQLPattern into
                         // repository.
                         if (!isAllowMultipleName || current.getPath().equals(itemPath)) {
@@ -258,7 +260,7 @@ public class ImportItemUtil {
                             itemWithSameName = current;
                         }
                     }
-                    if (property.getId() != null && property.getId().equalsIgnoreCase(current.getId())) {
+                    if (property.getId() != null && property.getId().equalsIgnoreCase(currentPureId)) {
                         itemWithSameId = current;
                     }
                 }

main/plugins/org.talend.repository/src/main/java/org/talend/repository/preference/TosTokenCollector.java

@@ -159,8 +159,8 @@ public class TosTokenCollector extends AbstractTokenCollector {
                                 || ERepositoryObjectType.CONTEXT.equals(type) || type.equals(ERepositoryObjectType.JOBLET)) {
                             int nbUsed = 0;
                             for (IRepositoryViewObject object : all) {
-                                List<Relation> relations = RelationshipItemBuilder.getInstance().getItemsHaveRelationWith(
-                                        object.getId());
+                                List<Relation> relations = RelationshipItemBuilder.getInstance()
+                                        .getItemsHaveRelationWith(object.getId());
                                 relations.addAll(RelationshipItemBuilder.getInstance()
                                         .getItemsHaveRelationWith(object.getLabel()));
                                 if (relations.size() > 0) {
@@ -190,7 +190,7 @@ public class TosTokenCollector extends AbstractTokenCollector {
                 }
             }
         }
-        jObject.put(PROJECTS.getKey(), repoStats); //$NON-NLS-1$
+        jObject.put(PROJECTS.getKey(), repoStats); 
         jObject.put(TYPE.getKey(), ProjectManager.getInstance().getProjectType(currentProject));
         int nbRef = ProjectManager.getInstance().getAllReferencedProjects().size();
         if (nbRef > 0) {
@@ -247,7 +247,8 @@ public class TosTokenCollector extends AbstractTokenCollector {
                 }
 
             }
-            if (factory.getStatus(item) != ERepositoryStatus.LOCK_BY_USER && !idsOpened.contains(item.getProperty().getId())) {
+            if (factory.getStatus(item) != ERepositoryStatus.LOCK_BY_USER
+                    && !idsOpened.contains(factory.getFullId(item.getProperty()))) {
                 // job is not locked and not opened by editor, so we can unload.
                 if (item.getParent() instanceof FolderItem) {
                     ((FolderItem) item.getParent()).getChildren().remove(item);

main/plugins/org.talend.repository/src/main/java/org/talend/repository/preference/VersionManagementPage.java

@@ -594,6 +594,7 @@ public class VersionManagementPage extends ProjectSettingPage {
         RelationshipItemBuilder builder = RelationshipItemBuilder.getInstance();
         for (ItemVersionObject object : getModifiedVersionItems()) {
             if (object.getRepositoryNode() != null) {
+
                 List<Relation> relations = builder.getItemsRelatedTo(object.getRepositoryNode().getId(), object.getOldVersion(),
                         RelationshipItemBuilder.JOB_RELATION);
 
@@ -669,7 +670,6 @@ public class VersionManagementPage extends ProjectSettingPage {
 
     private void checkAllVerSionLatest(List<ItemVersionObject> tableList, ItemVersionObject object) {
         // List<ItemVersionObject> tableList = new ArrayList<ItemVersionObject>();
-        IProxyRepositoryFactory factory = CorePlugin.getDefault().getProxyRepositoryFactory();
         RelationshipItemBuilder builder = RelationshipItemBuilder.getInstance();
         // for (ItemVersionObject object : getModifiedVersionItems()) {
         if (object.getRepositoryNode() != null) {
@@ -709,12 +709,12 @@ public class VersionManagementPage extends ProjectSettingPage {
         }
 
         tableList.addAll(jobList);
-        IProxyRepositoryFactory factory = CorePlugin.getDefault().getProxyRepositoryFactory();
         RelationshipItemBuilder builder = RelationshipItemBuilder.getInstance();
         for (ItemVersionObject object : jobList) {
             if (object.getRepositoryNode() != null) {
                 List<Relation> relations = builder.getItemsJobRelatedTo(object.getRepositoryNode().getId(),
-                        object.getOldVersion(), RelationshipItemBuilder.JOB_RELATION);
+                        object.getOldVersion(),
+                        RelationshipItemBuilder.JOB_RELATION);
                 for (Relation relation : relations) {
                     try {
                         IRepositoryViewObject obj = factory.getLastVersion(relation.getId());

main/plugins/org.talend.repository/src/main/java/org/talend/repository/ui/dialog/RepositoryReviewDialog.java

@@ -58,6 +58,7 @@ import org.talend.core.model.repository.IRepositoryTypeProcessor;
 import org.talend.core.model.repository.IRepositoryViewObject;
 import org.talend.core.model.repository.RepositoryContentManager;
 import org.talend.core.model.utils.RepositoryManagerHelper;
+import org.talend.core.repository.model.ProxyRepositoryFactory;
 import org.talend.repository.i18n.Messages;
 import org.talend.repository.model.IRepositoryNode;
 import org.talend.repository.model.IRepositoryNode.ENodeType;
@@ -587,6 +588,10 @@ public class RepositoryReviewDialog extends Dialog {
         this.selectedNodeName = selectionNode;
     }
 
+    public void setIsSelectionId(boolean isSelectionId) {
+        this.isSelectionId = isSelectionId;
+    }
+
     public void setSelectedNodeName(ERepositoryObjectType selectionType, String selectionNode, boolean isSelectionId) {
         setSelectedNodeName(selectionNode);
         this.selectionType = selectionType;
@@ -595,9 +600,11 @@ public class RepositoryReviewDialog extends Dialog {
 
     private void selectNode() {
         /*
-         * Make sure expand all. Just notice it here, because have been expand before.
+         * Make sure expand all to initialise the tree map. Just notice it here, because have been expand before.
          */
-        // getRepositoryTreeViewer().expandAll();
+        getRepositoryTreeViewer().expandAll();
+        // collapse them, in case there are too many items
+        getRepositoryTreeViewer().collapseAll();
         RepositoryNode root = (RepositoryNode) getRepositoryTreeViewer().getInput();
         selectNode(root, this.selectionType, this.selectedNodeName, this.isSelectionId);
     }
@@ -614,8 +621,28 @@ public class RepositoryReviewDialog extends Dialog {
         boolean valid = false;
         if (isSelectionId) {
             IRepositoryViewObject object = root.getObject();
-            if (object != null && idOrLabel.equals(object.getId())) {
-                valid = true;
+            if (object != null) {
+                String idWithoutSchema = idOrLabel;
+                String schemaLabel = null;
+                String schemaSeperator = " - "; //$NON-NLS-1$
+                String[] ids = idOrLabel.split(schemaSeperator);
+                if (ids != null && 1 < ids.length) {
+                    idWithoutSchema = ids[0];
+                    schemaLabel = ids[1];
+                }
+                String itemId = null;
+                if (ProxyRepositoryFactory.getInstance().getProjectLabelFromItemId(idWithoutSchema) == null) {
+                    itemId = object.getId();
+                } else {
+                    itemId = ProxyRepositoryFactory.getInstance().getFullId(object);
+                }
+                if (idWithoutSchema.equals(itemId)) {
+                    if (schemaLabel != null && !schemaLabel.isEmpty()) {
+                        selectNode(root, selectionType, schemaLabel, false);
+                    } else {
+                        valid = true;
+                    }
+                }
             }
         } else if (idOrLabel.equals(root.getProperties(EProperties.LABEL))) {
             valid = true;
@@ -661,6 +688,11 @@ public class RepositoryReviewDialog extends Dialog {
             ((JobTypeProcessor) this.typeProcessor).setJobIDList(jobIDList);
         }
     }
+
+    public String getSelectedFullId() {
+        IRepositoryViewObject object = getResult().getObject();
+        return ProxyRepositoryFactory.getInstance().getFullId(object);
+    }
 }
 
 /**

main/plugins/org.talend.repository/src/main/java/org/talend/repository/ui/wizards/exportjob/handler/AbstractBuildJobHandler.java

@@ -28,6 +28,7 @@ import org.talend.core.model.properties.ProcessItem;
 import org.talend.core.model.properties.Project;
 import org.talend.core.model.properties.Property;
 import org.talend.core.model.utils.JavaResourcesHelper;
+import org.talend.core.repository.model.ProxyRepositoryFactory;
 import org.talend.core.runtime.process.IBuildJobHandler;
 import org.talend.core.runtime.process.ITalendProcessJavaProject;
 import org.talend.core.runtime.process.LastGenerationInfo;
@@ -119,10 +120,12 @@ public abstract class AbstractBuildJobHandler implements IBuildJobHandler {
 
     protected boolean needRules() {
         if (this.version == null) {
-            return LastGenerationInfo.getInstance().isUseRules(processItem.getProperty().getId(),
+            return LastGenerationInfo.getInstance().isUseRules(
+                    ProxyRepositoryFactory.getInstance().getFullId(processItem.getProperty()),
                     processItem.getProperty().getVersion());
         }
-        return LastGenerationInfo.getInstance().isUseRules(processItem.getProperty().getId(), this.version);
+        return LastGenerationInfo.getInstance()
+                .isUseRules(ProxyRepositoryFactory.getInstance().getFullId(processItem.getProperty()), this.version);
     }
 
     protected boolean needPigUDFs() {

main/plugins/org.talend.repository/src/main/java/org/talend/repository/ui/wizards/exportjob/scriptsmanager/JobJavaScriptsManager.java

@@ -1048,7 +1048,8 @@ public class JobJavaScriptsManager extends JobScriptsManager {
             if (resource.getItem() instanceof ProcessItem) {
                 List<JobInfo> list = new ArrayList<JobInfo>();
 
-                hasDynamicMetadata = LastGenerationInfo.getInstance().isUseDynamic(resource.getItem().getProperty().getId(),
+                hasDynamicMetadata = LastGenerationInfo.getInstance().isUseDynamic(
+                        ProxyRepositoryFactory.getInstance().getFullId(resource.getItem().getProperty()),
                         resource.getItem().getProperty().getVersion());
 
             }

test/plugins/org.talend.repository.test/src/org/talend/repository/utils/JobVersionUtilsTest.java

@@ -12,9 +12,8 @@
 // ============================================================================
 package org.talend.repository.utils;
 
-import static org.junit.Assert.assertEquals;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
+import static org.junit.Assert.*;
+import static org.mockito.Mockito.*;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -94,12 +93,13 @@ public class JobVersionUtilsTest {
      */
     @Test
     public void testGetCurrentVersion() throws PersistenceException {
+        IProxyRepositoryFactory repFactory = ProxyRepositoryFactory.getInstance();
 
         repositoryObject = createRepositoryObject("job1");
 
         RepositoryNode childrenNode = mock(RepositoryNode.class);
         when(childrenNode.getObject()).thenReturn(repositoryObject);
-        when(childrenNode.getId()).thenReturn(repositoryObject.getProperty().getId());
+        when(childrenNode.getId()).thenReturn(repFactory.getFullId(repositoryObject.getProperty()));
 
         List<IRepositoryNode> children = new ArrayList<IRepositoryNode>();
         children.add(childrenNode);