From df5d263bd474c058807ed26086c2f71abcc2911e Mon Sep 17 00:00:00 2001
From: ldong <ldong@f6f1c999-d317-4740-80b0-e6d1abc6f99e>
Date: Fri, 13 Dec 2013 10:21:32 +0000
Subject: [PATCH] bug TDI-28187 fixed:tMap joined outputs in wrong order.

git-svn-id: http://talendforge.org/svn/tos/branches/branch-5_3@111989 f6f1c999-d317-4740-80b0-e6d1abc6f99e
---
 .../talend/designer/mapper/managers/UIManager.java    | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/org.talend.designer.mapper/src/main/java/org/talend/designer/mapper/managers/UIManager.java b/org.talend.designer.mapper/src/main/java/org/talend/designer/mapper/managers/UIManager.java
index 50d4f8e3b9b..99f88820885 100644
--- a/org.talend.designer.mapper/src/main/java/org/talend/designer/mapper/managers/UIManager.java
+++ b/org.talend.designer.mapper/src/main/java/org/talend/designer/mapper/managers/UIManager.java
@@ -1889,11 +1889,22 @@ public class UIManager extends AbstractUIManager {
             int indexCurrentTable = tablesView.indexOf(currentSelectedOutputTableView);
             if (moveUp) {
                 if (indexCurrentTable > 0) {
+                    // TDI-28187:join table should always under its host table
+                    OutputDataMapTableView previousOutTable = (OutputDataMapTableView) tablesView.get(indexCurrentTable - 1);
+                    String joinTableName = currentSelectedOutputTableView.getOutputTable().getIsJoinTableOf();
+                    if (joinTableName != null && joinTableName.equals(previousOutTable.getOutputTable().getName())) {
+                        return false;
+                    }
                     return true;
                 }
                 return false;
             } else {
                 if (indexCurrentTable < tablesView.size() - 1) {
+                    OutputDataMapTableView nextOutTable = (OutputDataMapTableView) tablesView.get(indexCurrentTable + 1);
+                    String joinTableName = nextOutTable.getOutputTable().getIsJoinTableOf();
+                    if (joinTableName != null && joinTableName.equals(currentSelectedOutputTableView.getOutputTable().getName())) {
+                        return false;
+                    }
                     return true;
                 }
                 return false;