From 3d0883d83daaf913c0930487b2db2ca4c93f9b4f Mon Sep 17 00:00:00 2001
From: fwang <fwang@f6f1c999-d317-4740-80b0-e6d1abc6f99e>
Date: Thu, 29 Nov 2012 08:02:16 +0000
Subject: [PATCH] bug TDI-23890 fixed:Schemas and XML Export/Import feature

git-svn-id: http://talendforge.org/svn/tos/trunk@94595 f6f1c999-d317-4740-80b0-e6d1abc6f99e
---
 .../org/talend/core/model/metadata/MetadataSchema.java    | 8 ++++++--
 .../metadata/editor/AbstractMetadataTableEditorView.java  | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/org.talend.core.runtime/src/main/java/org/talend/core/model/metadata/MetadataSchema.java b/org.talend.core.runtime/src/main/java/org/talend/core/model/metadata/MetadataSchema.java
index 4d5755378d..3e856c1604 100644
--- a/org.talend.core.runtime/src/main/java/org/talend/core/model/metadata/MetadataSchema.java
+++ b/org.talend.core.runtime/src/main/java/org/talend/core/model/metadata/MetadataSchema.java
@@ -388,8 +388,12 @@ public class MetadataSchema {
                 if (pattern.getNodeValue() != null) {
                     metadataColumn.setPattern(pattern.getNodeValue());
                 }
-                metadataColumn.setOriginalField(metadataColumn.getLabel());
-
+                if (originalField.getNodeValue() != null) {
+                    String originalFieldValue = MetadataToolHelper.validateColumnName(originalField.getNodeValue(), 0);
+                    metadataColumn.setOriginalField(originalFieldValue);
+                } else {
+                    metadataColumn.setOriginalField(metadataColumn.getLabel());
+                }
                 if (!columnsAlreadyAdded.contains(metadataColumn.getLabel())) {
                     listColumns.add(metadataColumn);
                     columnsAlreadyAdded.add(metadataColumn.getLabel());
diff --git a/org.talend.metadata.managment.ui/src/main/java/org/talend/core/ui/metadata/editor/AbstractMetadataTableEditorView.java b/org.talend.metadata.managment.ui/src/main/java/org/talend/core/ui/metadata/editor/AbstractMetadataTableEditorView.java
index 0dfa343048..0c34e6cd01 100644
--- a/org.talend.metadata.managment.ui/src/main/java/org/talend/core/ui/metadata/editor/AbstractMetadataTableEditorView.java
+++ b/org.talend.metadata.managment.ui/src/main/java/org/talend/core/ui/metadata/editor/AbstractMetadataTableEditorView.java
@@ -679,7 +679,7 @@ public abstract class AbstractMetadataTableEditorView<B> extends AbstractDataTab
 
             @Override
             public boolean canModify(Object bean) {
-                return super.canModify(bean) && canModifyDBColumn(bean);
+                return super.canModify(bean);
             }
 
         });