Merge release/5.2.1/tis_shared and release/5.2.1/tos for release/5.2.1.

org.talend.common.ui.runtime.nl/src/main/java/messages_zh_CN.properties

@@ -1,68 +0,0 @@
-AccessorUtils.Assert0=\u8FD9\u4E2A\u5217(\u6807\u9898\u4E3A\u2018{0}\u2019\uFF0CID\u4E3A\u2018{1}\u2019)\u7684\u2018BeanPropertyAccessors\u2019\u6CA1\u6709\u6B63\u786E\u914D\u7F6E\u3002\u2018{2}\u2019\u9700\u8981\u4E00\u4E2ABean<B>
-AccessorUtils.Assert1=\u8FD9\u4E2A\u5217(\u6807\u9898\u4E3A\u2018{0}\u2019\uFF0CID\u4E3A\u2018{1}\u2019)\u7684\u2018BeanPropertyAccessors\u2019\u6CA1\u6709\u6B63\u786E\u914D\u7F6E,\u6216\u8005\u503C\u8BBE\u7F6E\u4E3A\u4E0D\u6B63\u786E\u7684\u7C7B\u578B\u3002
-AddPushButton.AddButton.Tip=\u589E\u52A0
-AddAllPushButton.AddAllButton.Tip=\u6DFB\u52A0\u6240\u6709
-ColorStyledText.RedoItem.Text=\u91CD\u505A
-ColorStyledText.UndoItem.Text=\u590D\u539F
-ColorStyledText.CopyItem.Text=\u590D\u5236
-ColorStyledText.PasteItem.Text=\u7C98\u8D34
-ColorStyledText.SelectAllItem.Text=\u5168\u9009
-ContentProposalAdapterExtended.close=\u5173\u95ED
-ContentProposalAdapterExtended.closeFocusout=\u5173\u95EDfocusout
-ControlUtils.Unsupported1=\u8FD9\u4E2A\u9762\u677F({0})\u4E0D\u652F\u6301\u3002\u5982\u679C\u4F60\u60F3\u4F7F\u7528\uFF0C\u8BF7\u6DFB\u52A0\u4E8B\u4EF6\u3002
-CopyPushButton.CopyButton.Tip=\u590D\u5236\u88AB\u9009\u4E2D\u7684\u9879
-DateDialog.textContent=\u9009\u62E9\u65E5\u671F& \u65F6\u95F4
-DialogErrorForCellEditorListener.Error.MsgDialogTitle=\u9519\u8BEF
-ErrorDialogWidthDetailArea.ErrorMessage.Text=\u9519\u8BEF\u4FE1\u606F
-ErrorDialogWithContinue.setParameter=\u8BBE\u7F6E\u53C2\u6570\u5E76\u7EE7\u7EED
-EventUtil.activate=\u542f\u52a8
-EventUtil.close=\u5173\u95ED
-EventUtil.deactivate=\u64a4\u6d88
-EventUtil.defaultSelection=\u9ED8\u8BA4\u9009\u62E9
-EventUtil.dragDetect=\u62D6\u66F3\u68C0\u6D4B
-EventUtil.expand=\u6269\u5F20
-EventUtil.help=\u5e2e\u52a9
-EventUtil.mouseDoubleClick=\u9F20\u6807\u53CC\u51FB
-EventUtil.mouseDown=\u9F20\u6807\u6309\u4E0B
-EventUtil.mouseEnter=\u9F20\u6807\u8F93\u5165
-EventUtil.mouseExit=\u9F20\u6807\u9000\u51FA
-EventUtil.mouseHover=\u9F20\u6807\u60AC\u505C
-EventUtil.mouseMove=\u9F20\u6807\u79FB\u52A8
-EventUtil.mouseUp=\u9F20\u6807\u5411\u4E0A
-EventUtil.move=\u79fb\u52a8
-EventUtil.paint=\u989C\u6599
-EventUtil.resize=\u8C03\u6574\u5927\u5C0F
-EventUtil.show=\u663E\u793A
-ExceptionHandler.Parameter.BeNull=\u53C2\u6570\u4E0D\u80FD\u4E3A\u7A7A\u5F02\u5E38
-ExceptionMessageDialog.log=\u65E5\u5FD7
-ExportPushButton.ExportButton.Tip=\u5BFC\u51FA\u6240\u6709\u884C\u5230XML\u6587\u4EF6
-ExtendedTableAddCommand.Add.Label=\u6DFB\u52A0\u4E00\u4E2A\u6216\u591A\u4E2A\u8868
-ExtendedTableCopyCommand.Copy.Label=\u590D\u5236\u4E00\u4E2A\u6216\u591A\u4E2A\u8868\u5728\u5916\u90E8\u526A\u8D34\u677F\u4E2D\u3002
-ExtendedTableModel.ModifiedObject.Error=ModifiedBeanListenable\u7684\u5BF9\u8C61\u5FC5\u987B\u5728\u4F7F\u7528\u8FD9\u4E2A\u65B9\u6CD5\u4E4B\u524D\u88AB\u5B9E\u73B0\u3002
-ExtendedTableMoveCommand.MoveLabel=\u5411\u4E0A\u6216\u5411\u4E0B\u79FB\u52A8\u4E00\u4E2A\u6216\u591A\u4E2A\u8868
-ExtendedTablePasteCommand.Paste.Label=\u4ECE\u5916\u90E8\u526A\u8D34\u677F\u7C98\u8D34\u6570\u636E
-ExtendedTableRemoveCommand.Romve.Label=\u5220\u9664\u8868
-ExtendedTableResetDBTypesCommand.ResetDBTypes.Label=\u91CD\u7F6E\u6240\u6709\u6570\u636E\u5E93\u7C7B\u578B\u4E3A\u9ED8\u8BA4\u503C
-ImportPushButton.ImportButton.Tip=\u5BFC\u5165XML\u6587\u4EF6\u66FF\u6362\u6240\u6709\u884C
-ImportPushButtonForExtendedTable.ErrorMsg.Text=\u51FA\u9519
-LabelledFileField.BrowseButton.Text=\u6D4F\u89C8...
-LabelledFileField.FileDialog.Text=\u9009\u62E9\u4E00\u4E2A
-ModeReader.IgnoreElement=\u5FFD\u7565\u672A\u77E5\u5143\u7D20
-ModifyBeanValueCommand.ModifyCell.Label=\u4FEE\u6539\u5355\u5143\u683C\u503C
-MoveDownPushButton.MoveDownTip=\u5411\u4E0B\u79FB\u52A8\u9009\u4E2D\u9879
-MoveUpPushButton.MoveUpButton.Tip=\u5411\u4E0A\u79FB\u52A8\u9009\u4E2D\u9879
-PastePushButton.PasteButton.Label=\u7C98\u8D34
-RemovePushButton.RemoveButton.Tip=\u5220\u9664\u6240\u9009\u9879
-ResetDBTypesButton.ResetDBTypesButton.Tip=\u91CD\u7F6E\u6240\u6709\u6570\u636E\u5E93\u7C7B\u578B
-SaveAsGenericSchemaPushButton.saveAsSchema=\u53e6\u5b58\u4e3a\u4e00\u822cschema
-SelectContextVariablesPushButton.Label=\u9009\u62E9\u4E0A\u4E0B\u6587\u53D8\u91CF
-TableViewerCreator.CallMethod.ErrorMsg=\u53EA\u6709\u4F60\u7684\u5DF2\u7ECF\u8C03\u7528\u4E86createTable()\u65B9\u6CD5\u540E\uFF0C\u624D\u80FD\u8C03\u7528\u6B64\u65B9\u6CD5\u3002
-TableViewerCreator.IdProperty.AssertMsg=\u4F60\u5FC5\u987B\u6539\u53D8\u5217ID\u5C5E\u6027\uFF0C\u4E00\u4E2A\u8868\u4E2D\u5217\u7684ID\u5C5E\u6027\u5FC5\u987B\u552F\u4E00\u3002
-TableViewerCreator.Table.BeNull=\u8868\u4E3A\u7A7A
-TableViewerCreator.TableColumn.AssertMsg=ID\u5C5E\u6027\u4E3A\u2019{0}\u2018\u7684TableEditorColumn\u7684TableColumn\u6CA1\u6709\u6B63\u786E\u7684Table\u3002
-TreeToTablesLinker.Type.Unsupported=\u4e0d\u652f\u6301\u5f53\u524d\u7684\u63a7\u4ef6
-commons.error=\u9519\u8BEF
-GlobalServiceRegister.ServiceNotRegistered=\u670D\u52A1{0}\u6CA1\u6709\u88AB\u6CE8\u518C
-ExceptionMessageDialog.Cancel=\u53D6\u6D88
-ExceptionMessageDialog.OK=\u786E\u5B9A
-ExceptionMessageDialog.Yes=\u662F

org.talend.common.ui.runtime/src/main/java/messages.properties

@@ -25,7 +25,6 @@ DefaultCellModifier.tableItemDispose=TableItem disposed
 DialogErrorForCellEditorListener.Error.MsgDialogTitle=Error
 ErrorDialogWidthDetailArea.ErrorMessage.Text=Error Message
 ErrorDialogWidthDetailArea.ErrorMessage.ColumnText=Column can not be empty
-ErrorDialogWidthDetailArea.ErrorMessage.ColumnText.NotValid=The input '{0}' is not valid, will use the original value '{1}' instead of it.
 ErrorDialogWithContinue.setParameter=Set parameters and continue
 EventUtil.activate=activate
 EventUtil.arm=arm

org.talend.commons.runtime.nl/src/messages_en.properties

@@ -45,8 +45,3 @@ XmlNodeRetriever.xPathExpression=xPathExpression = '
 VersionUtils.readPropertyFileError=Error to read property in talend.properties file.
 DatabaseContentRetriever.PRODUCTNAME=Database Product Name:
 DatabaseContentRetriever.PRODUCTVERSION=Database Product Version:
-SybaseResultSet.outofRange=\ is out of range.
-SybaseResultSet.parameterIndex=Invalid argument\: parameter index
-SybaseResultSet.unknowCloumn=Invalid argument\: unknown column name
-AbstractFakeResultSet.unknowCloumn=Invalid argument\: {0} is unknown column name
-AbstractFakeResultSet.parameterIndexOutOfRange=Invalid argument\: parameter index {0} is out of range

org.talend.commons.runtime.nl/src/messages_zh_CN.properties

@@ -1,24 +0,0 @@
-DB2ForZosResultSet.parameterIndex=\u65E0\u6548\u7684\u53C2\u6570\uFF1A\u53C2\u6570\u6307\u6807
-DB2ForZosResultSet.unknowCloumn=\u65E0\u6548\u7684\u53C2\u6570\uFF1A\u672A\u77E5\u7684\u5217\u540D
-ExceptionHandler.Parameter.BeNull=\u53C2\u6570\u4E0D\u80FD\u4E3A\u7A7A\u5F02\u5E38
-ExtensionImplementationProviders.ExtensionPointError=\u6269\u5C55\u70B9\u5FC5\u987B\u4F7F\u7528\u5355\u5B9E\u4F8B\u6A21\u5F0F
-ListenableList.IndexSameLength.Error=\u539F\u59CB\u7D22\u5F15\u548C\u76EE\u6807\u7D22\u5F15\u5FC5\u987B\u4E3A\u76F8\u540C\u7684\u957F\u5EA6
-ReflectionPropertyException.Access.ErrorMsg3=\u5F53\u5F15\u7528\u7C7B{2}\u7684\u5C5E\u6027{1}\u503C{0}\u662F\u51FA\u9519
-ResourceUtils.canMove1=\u53EF\u79FB\u52A8
-ResourceUtils.streamNull=\u6D41\u4E3A\u7A7A
-ReusableMultiKey.Keys.BeNull=\u4E3B\u952E\u6570\u7EC4\u4E0D\u80FD\u4E3A\u7A7A
-VersionUtils.Version.Error2=\u7578\u5F62\u5B57\u7B26\u4E32{0}(\u51FA\u73B0M{1}m)
-resources.file.notCreated=\u6587\u4EF6"{0}"\u4E0D\u80FD\u88AB\u521B\u5EFA({1})
-resources.file.notDeleted=\u6587\u4EF6"{0}"\u4E0D\u80FD\u88AB\u5220\u9664
-resources.file.notGet=\u8981\u6C42\u7684\u6587\u4EF6"{0}"\u6CA1\u6709\u5728\u6587\u4EF6\u5939"{1}"\u4E2D
-resources.folder.notCreated=\u6587\u4EF6\u5939"{0}"\u4E0D\u80FD\u88AB\u521B\u5EFA
-resources.folder.notDeleted=\u6587\u4EF6\u5939"{0}"\u4E0D\u80FD\u88AB\u5220\u9664
-resources.folder.notEmptied=\u6587\u4EF6\u5939"{0}"\u4E0D\u80FD\u4E3A\u7A7A
-resources.folder.notGet=\u8981\u6C42\u7684\u6587\u4EF6\u5939"{0}"\u6CA1\u6709\u5728\u5DE5\u7A0B"{1}"\u4E2D
-resources.project.notGet=\u8981\u6C42\u7684\u5DE5\u7A0B"{0}"\u4E0D\u5B58\u5728
-resources.resource.notMoved=\u8D44\u6E90"{0}"\u4E0D\u80FD\u79FB\u52A8\u5230"{1}"
-utils.data.container=Id{0}\u5DF2\u7ECF\u88AB\u4F7F\u7528\u5728\u5BB9\u5668\u4E2D
-utils.workbench.extensions.badNumberOfExtension=\u65E0\u6548\u7684\u6269\u5C55\u6570\u5B57\u88AB\u53D1\u73B0\u5728{0}\u4E2D\uFF0C\u5F53\u67E5\u627E{3}\u51FA\u73B0\u5728{1}\u548C{2}\u4E4B\u95F4
-utils.workbench.extensions.noExtension=\u6269\u5C55\u70B9ID\u4E3A"{0}"\u7684Plug-in\u4E0D\u5B58\u5728
-XmlNodeRetriever.countResult=\u8BB0\u5F55\u7ED3\u679C\u6570
-XmlNodeRetriever.singleQuotes=.

org.talend.commons.runtime/modes/java.xml

@@ -113,9 +113,6 @@
 			<KEYWORD1>try</KEYWORD1>
 			<KEYWORD1>volatile</KEYWORD1>
 			<KEYWORD1>while</KEYWORD1>
-			<KEYWORD1>assert</KEYWORD1>
-			<KEYWORD1>enum</KEYWORD1>
-			<KEYWORD1>strictfp</KEYWORD1>
 
 			<KEYWORD2>package</KEYWORD2>
 			<KEYWORD2>import</KEYWORD2>

org.talend.commons.runtime/src/org/talend/commons/utils/data/list/ListenableList.java

@@ -55,7 +55,6 @@ public class ListenableList<T> implements IExtendedList<T> {
      * 
      * @see java.util.List#add(java.lang.Object)
      */
-    @Override
     public boolean add(T o) {
         int index = this.list.size();
         fireAddedEvent(index, o, true);
@@ -85,7 +84,6 @@ public class ListenableList<T> implements IExtendedList<T> {
      * 
      * @see java.util.List#add(int, java.lang.Object)
      */
-    @Override
     public void add(int index, T element) {
         fireAddedEvent(index, element, true);
         this.list.add(index, element);
@@ -97,18 +95,11 @@ public class ListenableList<T> implements IExtendedList<T> {
      * 
      * @see java.util.List#addAll(java.util.Collection)
      */
-    @Override
     @SuppressWarnings("unchecked")
     public boolean addAll(Collection<? extends T> c) {
-        return addAll(c, true, true);
-    }
-
-    public boolean addAll(Collection<? extends T> c, boolean fireBefore, boolean fireAfter) {
-        if (fireBefore) {
-            fireAddedEvent(this.list.size(), (Collection<T>) c, null, true);
-        }
+        fireAddedEvent(this.list.size(), (Collection<T>) c, null, true);
         boolean returnValue = this.list.addAll(c);
-        if (returnValue && fireAfter) {
+        if (returnValue) {
             fireAddedEvent(this.list.size() - c.size(), (Collection<T>) c, null, false);
         }
         return returnValue;
@@ -119,18 +110,11 @@ public class ListenableList<T> implements IExtendedList<T> {
      * 
      * @see java.util.List#addAll(int, java.util.Collection)
      */
-    @Override
     @SuppressWarnings("unchecked")
     public boolean addAll(int index, Collection<? extends T> c) {
-        return addAll(index, c, true, true);
-    }
-
-    public boolean addAll(int index, Collection<? extends T> c, boolean fireBefore, boolean fireAfter) {
-        if (fireBefore) {
-            fireAddedEvent(index, (Collection<T>) c, null, true);
-        }
+        fireAddedEvent(index, (Collection<T>) c, null, true);
         boolean returnValue = this.list.addAll(index, c);
-        if (returnValue && fireAfter) {
+        if (returnValue) {
             fireAddedEvent(index, (Collection<T>) c, null, false);
         }
         return returnValue;
@@ -140,7 +124,6 @@ public class ListenableList<T> implements IExtendedList<T> {
      * 
      * 
      */
-    @Override
     @SuppressWarnings("unchecked")
     public void addAll(List<Integer> indices, Collection<? extends T> c) {
 
@@ -166,7 +149,6 @@ public class ListenableList<T> implements IExtendedList<T> {
      * 
      * @see java.util.List#clear()
      */
-    @Override
     public void clear() {
         fireClearedEvent(true);
         this.list.clear();
@@ -190,7 +172,6 @@ public class ListenableList<T> implements IExtendedList<T> {
      * @return whether the list contains the object.
      * @see #useEquals
      */
-    @Override
     public boolean contains(Object object) {
 
         int size = list.size();
@@ -224,7 +205,6 @@ public class ListenableList<T> implements IExtendedList<T> {
      * @param object the object in question.
      * @return the position of the first occurrence of the object in the list.
      */
-    @Override
     public int indexOf(Object object) {
         int size = list.size();
         if (useEquals && object != null) {
@@ -248,7 +228,6 @@ public class ListenableList<T> implements IExtendedList<T> {
      * 
      * @see java.util.List#containsAll(java.util.Collection)
      */
-    @Override
     public boolean containsAll(Collection<?> c) {
         return this.list.containsAll(c);
     }
@@ -258,7 +237,6 @@ public class ListenableList<T> implements IExtendedList<T> {
      * 
      * @see java.util.List#get(int)
      */
-    @Override
     public T get(int index) {
         return this.list.get(index);
     }
@@ -268,7 +246,6 @@ public class ListenableList<T> implements IExtendedList<T> {
      * 
      * @see java.util.List#isEmpty()
      */
-    @Override
     public boolean isEmpty() {
         return this.list.isEmpty();
     }
@@ -278,7 +255,6 @@ public class ListenableList<T> implements IExtendedList<T> {
      * 
      * @see java.util.List#iterator()
      */
-    @Override
     public Iterator<T> iterator() {
         return new Iterator<T>() {
 
@@ -286,18 +262,15 @@ public class ListenableList<T> implements IExtendedList<T> {
 
             private T current = null;
 
-            @Override
             public boolean hasNext() {
                 return internalIterator.hasNext();
             }
 
-            @Override
             public T next() {
                 current = internalIterator.next();
                 return current;
             }
 
-            @Override
             public void remove() {
                 Integer indexBeforeRemove = indexOf(current);
                 fireBeforeRemovedEvent(indexBeforeRemove);
@@ -313,7 +286,6 @@ public class ListenableList<T> implements IExtendedList<T> {
      * 
      * @see java.util.List#lastIndexOf(java.lang.Object)
      */
-    @Override
     public int lastIndexOf(Object o) {
         return this.list.lastIndexOf(o);
     }
@@ -323,7 +295,6 @@ public class ListenableList<T> implements IExtendedList<T> {
      * 
      * @see java.util.List#listIterator()
      */
-    @Override
     public ListIterator<T> listIterator() {
         return new ListIterator<T>() {
 
@@ -331,52 +302,43 @@ public class ListenableList<T> implements IExtendedList<T> {
 
             private T current = null;
 
-            @Override
             public void add(T o) {
                 internalListIterator.add(o);
                 fireAddedEvent(internalListIterator.previousIndex(), o, false);
             }
 
-            @Override
             public boolean hasPrevious() {
                 return internalListIterator.hasPrevious();
             }
 
-            @Override
             public int nextIndex() {
                 return internalListIterator.nextIndex();
             }
 
-            @Override
             public T previous() {
                 current = internalListIterator.previous();
                 return current;
             }
 
-            @Override
             public int previousIndex() {
                 return internalListIterator.previousIndex();
             }
 
-            @Override
             public void set(T o) {
                 fireReplacedEvent(internalListIterator.previousIndex() + 1, current, o, true);
                 internalListIterator.set(o);
                 fireReplacedEvent(internalListIterator.previousIndex() + 1, current, o, false);
             }
 
-            @Override
             public boolean hasNext() {
                 return internalListIterator.hasNext();
             }
 
-            @Override
             public T next() {
                 current = internalListIterator.next();
                 return current;
             }
 
-            @Override
             public void remove() {
                 Integer indexBeforeRemove = internalListIterator.previousIndex() + 1;
                 fireBeforeRemovedEvent(indexBeforeRemove);
@@ -392,7 +354,6 @@ public class ListenableList<T> implements IExtendedList<T> {
      * 
      * @see java.util.List#listIterator(int)
      */
-    @Override
     public ListIterator<T> listIterator(int index) {
         return this.list.listIterator(index);
     }
@@ -402,7 +363,6 @@ public class ListenableList<T> implements IExtendedList<T> {
      * 
      * @see java.util.List#remove(java.lang.Object)
      */
-    @Override
     @SuppressWarnings("unchecked")
     public boolean remove(Object o) {
         int index = indexOf(o);
@@ -418,7 +378,6 @@ public class ListenableList<T> implements IExtendedList<T> {
      * 
      * @see java.util.List#remove(int)
      */
-    @Override
     public T remove(int index) {
         fireBeforeRemovedEvent(index);
         T removedObject = this.list.remove(index);
@@ -435,7 +394,7 @@ public class ListenableList<T> implements IExtendedList<T> {
     private void fireRemovedEvent(int index, T removedObject) {
         if (afterListeners.size() != 0) {
             List<T> currentList = new ArrayList<T>(1);
-            currentList.add(removedObject);
+            currentList.add((T) removedObject);
             fireRemovedEvent(index, currentList, null, false);
         }
     }
@@ -444,7 +403,7 @@ public class ListenableList<T> implements IExtendedList<T> {
         if (beforeListeners.size() != 0) {
             T removingObject = this.list.get(index);
             List<T> currentList = new ArrayList<T>(1);
-            currentList.add(removingObject);
+            currentList.add((T) removingObject);
             fireRemovedEvent(index, currentList, null, true);
         }
     }
@@ -456,19 +415,12 @@ public class ListenableList<T> implements IExtendedList<T> {
      * @param collection the collection of objects to be removed.
      * @return whether any object was actually contained by the list.
      */
-    @Override
     @SuppressWarnings("unchecked")
     public boolean removeAll(Collection<?> collection) {
-        return removeAll(collection, true, true);
-    }
-
-    public boolean removeAll(Collection<?> collection, boolean fireBefore, boolean fireAfter) {
 
         List<Integer> indices = getIndices(collection);
 
-        if (fireBefore) {
-            fireRemovedEvent(null, new ArrayList(collection), indices, true);
-        }
+        fireRemovedEvent(null, new ArrayList(collection), indices, true);
         if (this.list == null) {
             return false;
         }
@@ -477,7 +429,7 @@ public class ListenableList<T> implements IExtendedList<T> {
             this.list.remove((int) indices.get(i));
             modified = true;
         }
-        if (modified && fireAfter) {
+        if (modified) {
             fireRemovedEvent(null, new ArrayList(collection), indices, false);
         }
         return modified;
@@ -506,7 +458,6 @@ public class ListenableList<T> implements IExtendedList<T> {
      * 
      * @see java.util.List#retainAll(java.util.Collection)
      */
-    @Override
     public boolean retainAll(Collection<?> c) {
         List<T> all = new ArrayList<T>();
         all.addAll(this.list);
@@ -530,7 +481,6 @@ public class ListenableList<T> implements IExtendedList<T> {
      * 
      * @see java.util.List#set(int, java.lang.Object)
      */
-    @Override
     public T set(int index, T element) {
         fireReplacedEvent(index, null, element, true);
         T replacedObject = this.list.set(index, element);
@@ -543,7 +493,6 @@ public class ListenableList<T> implements IExtendedList<T> {
      * 
      * @see java.util.List#size()
      */
-    @Override
     public int size() {
         if (this.list != null) {
             return this.list.size();
@@ -558,7 +507,6 @@ public class ListenableList<T> implements IExtendedList<T> {
      * 
      * @see java.util.List#subList(int, int)
      */
-    @Override
     public List<T> subList(int fromIndex, int toIndex) {
         if (this.list != null) {
             return this.list.subList(fromIndex, toIndex);
@@ -572,7 +520,6 @@ public class ListenableList<T> implements IExtendedList<T> {
      * 
      * @see java.util.List#toArray()
      */
-    @Override
     public Object[] toArray() {
         if (this.list != null) {
             return this.list.toArray();
@@ -586,7 +533,6 @@ public class ListenableList<T> implements IExtendedList<T> {
      * 
      * @see java.util.List#toArray(T[])
      */
-    @Override
     @SuppressWarnings("hiding")
     public <T> T[] toArray(T[] a) {
         if (this.list != null) {
@@ -596,7 +542,6 @@ public class ListenableList<T> implements IExtendedList<T> {
         }
     }
 
-    @Override
     public void swap(int index1, int index2) {
 
         ArrayList<Integer> indexList1 = new ArrayList<Integer>(1);
@@ -634,7 +579,6 @@ public class ListenableList<T> implements IExtendedList<T> {
         }
     }
 
-    @Override
     public void swapElements(List<Integer> indicesOrigin, List<Integer> indicesTarget) {
         if (indicesOrigin.size() != indicesTarget.size()) {
             throw new IllegalArgumentException(Messages.getString("ListenableList.IndexSameLength.Error")); //$NON-NLS-1$
@@ -652,7 +596,6 @@ public class ListenableList<T> implements IExtendedList<T> {
         fireSwapedEvent(indicesOrigin, indicesTarget, swapedObjects.toArray(), false);
     }
 
-    @Override
     public void swapElement(T object1, T object2) {
         swap(indexOf(object1), indexOf(object2));
     }
@@ -882,7 +825,6 @@ public class ListenableList<T> implements IExtendedList<T> {
      * 
      * @return the useEquals
      */
-    @Override
     public boolean isUseEquals() {
         return this.useEquals;
     }
@@ -892,7 +834,6 @@ public class ListenableList<T> implements IExtendedList<T> {
      * 
      * @param useEquals the useEquals to set
      */
-    @Override
     public void setUseEquals(boolean useEquals) {
         this.useEquals = useEquals;
     }

org.talend.commons.runtime/src/org/talend/commons/utils/platform/PluginChecker.java

@@ -26,6 +26,8 @@ public final class PluginChecker {
 
     private static final String TOP_BRANDING = "org.talend.rcp.branding.top"; //$NON-NLS-1$
 
+    private static final String AMCRAP_PLUGIN_ID = "org.talend.amc.rap"; //$NON-NLS-1$ 
+
     private PluginChecker() {
     }
 
@@ -73,4 +75,13 @@ public final class PluginChecker {
     public static boolean isOnlyTopLoaded() {
         return isPluginLoaded(TOP_BRANDING) && !isTDCPLoaded() && !isTDQLoaded();
     }
+
+    /**
+     * Method "isAMCRAPLoaded"
+     * 
+     */
+    public static boolean isAMCRAPLoaded() {
+        return isPluginLoaded(AMCRAP_PLUGIN_ID);
+    }
+
 }

org.talend.commons.runtime/src/org/talend/commons/utils/system/EclipseCommandLine.java

@@ -2,7 +2,7 @@
 //
 // Talend Community Edition
 //
-// Copyright (C) 2006-2012 Talend 锟<EFBFBD>www.talend.com
+// Copyright (C) 2006-2012 Talend <20> www.talend.com
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -41,8 +41,6 @@ public class EclipseCommandLine {
     static final String CMD_VMARGS = "-vmargs"; //$NON-NLS-1$
 
     static final String NEW_LINE = "\n"; //$NON-NLS-1$
-    
-    static public final String TALEND_NOSPLASH_COMMAND = "-nosplash";
 
     /**
      * Use it to specify the type of project that will be use to configure the studio when relaunched

org.talend.commons.runtime/talend.properties

@@ -1 +1 @@
-talend.version=5.2.2
+talend.version=5.2.1

org.talend.commons.ui.nl/src/main/java/messages_zh_CN.properties

@@ -1,82 +0,0 @@
-commons.error=\u9519\u8BEF
-TableViewerCreator.TableColumn.AssertMsg=ID\u5C5E\u6027\u4E3A\u2019{0}\u2018\u7684TableEditorColumn\u7684TableColumn\u6CA1\u6709\u6B63\u786E\u7684Table\u3002
-ColorStyledText.PasteItem.Text=\u7C98\u8D34
-EventUtil.UnknowDetail=\u672A\u77E5\u7684\u4E8B\u4EF6\u63CF\u8FF0\uFF1A
-ImportPushButtonForExtendedTable.ErrorMsg.Text=\u51FA\u9519
-ResetDBTypesButton.ResetDBTypesButton.Tip=\u91CD\u7F6E\u6240\u6709\u6570\u636E\u5E93\u7C7B\u578B
-ExportPushButtonForExtendedTable.ErrorMsg.Text=\u51FA\u9519!
-TableViewerCreator.IdProperty.AssertMsg=\u4F60\u5FC5\u987B\u6539\u53D8\u5217ID\u5C5E\u6027\uFF0C\u4E00\u4E2A\u8868\u4E2D\u5217\u7684ID\u5C5E\u6027\u5FC5\u987B\u552F\u4E00\u3002
-TableViewerCreator.CallMethod.ErrorMsg=\u53EA\u6709\u4F60\u7684\u5DF2\u7ECF\u8C03\u7528\u4E86createTable()\u65B9\u6CD5\u540E\uFF0C\u624D\u80FD\u8C03\u7528\u6B64\u65B9\u6CD5\u3002
-ExtendedTablePasteCommand.Paste.Label=\u4ECE\u5916\u90E8\u526A\u8D34\u677F\u7C98\u8D34\u6570\u636E
-SelectContextVariablesPushButton.Label=\u9009\u62E9\u4E0A\u4E0B\u6587\u53D8\u91CF
-ExtendedTableModel.ModifiedObject.Error=ModifiedBeanListenable\u7684\u5BF9\u8C61\u5FC5\u987B\u5728\u4F7F\u7528\u8FD9\u4E2A\u65B9\u6CD5\u4E4B\u524D\u88AB\u5B9E\u73B0\u3002
-ImportPushButton.ImportButton.Tip=\u5BFC\u5165XML\u6587\u4EF6\u66FF\u6362\u6240\u6709\u884C
-LabelledFileField.FileDialog.Text=\u9009\u62E9\u4E00\u4E2A
-TableViewerCreator.Table.BeNull=\u8868\u4E3A\u7A7A
-AddAllPushButton.AddAllButton.Tip=\u6DFB\u52A0\u6240\u6709
-ExtendedTableRemoveCommand.Romve.Label=\u5220\u9664\u8868
-AddPushButton.AddButton.Tip=\u6DFB\u52A0
-MoveDownPushButton.MoveDownTip=\u5411\u4E0B\u79FB\u52A8\u9009\u4E2D\u9879
-ExtendedTableCopyCommand.Copy.Label=\u590D\u5236\u4E00\u4E2A\u6216\u591A\u4E2A\u8868\u5728\u5916\u90E8\u526A\u8D34\u677F\u4E2D\u3002
-ProposalUtils.CtrlProposal.ErrorMsg=\u63A7\u952E\u7C7B\u578B\u63D0\u793A\u4E0D\u88AB\u652F\u6301\uFF1A
-AccessorUtils.isReq=\u9700\u8981\u4E00\u4E2ABean(<B>)
-EventUtil.UnknowType=\u672A\u77E5\u7684\u65F6\u95F4\u7C7B\u578B\uFF1A
-ProposalUtils.CellProposal.Error=CellEditor\u7C7B\u578B\u63D0\u793A\u4E0D\u88AB\u652F\u6301\uFF1A
-RemovePushButton.RemoveButton.Tip=\u5220\u9664\u6240\u9009\u9879
-FileStep2.previewFailure=\u9884\u89c8\u9519\u8bef\u3002\u987b\u6539\u53d8\u4e00\u4e9b\u8bbe\u7f6e\u3002 \n\u6ce8\u610f\uff1a\u9884\u89c8\u9519\u8bef\u53ef\u80fd\u662f\u56e0\u4e3a\u9519\u8bef\u7684\u7f16\u7801\u8bbe\u7f6e\u9020\u6210\u7684\u3002
-PastePushButton.PasteButton.Label=\u7C98\u8D34
-LabelledFileField.BrowseButton.Text=\u6D4F\u89C8...
-MoveUpPushButton.MoveUpButton.Tip=\u5411\u4E0A\u79FB\u52A8\u9009\u4E2D\u9879
-AccessorUtils.Assert1=\u8FD9\u4E2A\u5217(\u6807\u9898\u4E3A\u2018{0}\u2019\uFF0CID\u4E3A\u2018{1}\u2019)\u7684\u2018BeanPropertyAccessors\u2019\u6CA1\u6709\u6B63\u786E\u914D\u7F6E,\u6216\u8005\u503C\u8BBE\u7F6E\u4E3A\u4E0D\u6B63\u786E\u7684\u7C7B\u578B\u3002
-exception.errorOccured=\u4E00\u4E2A\u9519\u8BEF\u53D1\u751F({0}).\n \u8BE6\u7EC6\u63CF\u8FF0\u67E5\u770B\u65E5\u5FD7\u3002
-ColorStyledText.CopyItem.Text=\u590D\u5236
-AccessorUtils.Assert0=\u8FD9\u4E2A\u5217(\u6807\u9898\u4E3A\u2018{0}\u2019\uFF0CID\u4E3A\u2018{1}\u2019)\u7684\u2018BeanPropertyAccessors\u2019\u6CA1\u6709\u6B63\u786E\u914D\u7F6E\u3002\u2018{2}\u2019\u9700\u8981\u4E00\u4E2ABean<B>
-ExtendedTableMoveCommand.MoveLabel=\u5411\u4E0A\u6216\u5411\u4E0B\u79FB\u52A8\u4E00\u4E2A\u6216\u591A\u4E2A\u8868
-CopyPushButton.CopyButton.Tip=\u590D\u5236\u88AB\u9009\u4E2D\u7684\u9879
-ExtendedTableResetDBTypesCommand.ResetDBTypes.Label=\u91CD\u7F6E\u6240\u6709\u6570\u636E\u5E93\u7C7B\u578B\u4E3A\u9ED8\u8BA4\u503C
-ExtendedTableAddCommand.Add.Label=\u6DFB\u52A0\u4E00\u4E2A\u6216\u591A\u4E2A\u8868
-ControlUtils.Unsupported1=\u8FD9\u4E2A\u9762\u677F({0})\u4E0D\u652F\u6301\u3002\u5982\u679C\u4F60\u60F3\u4F7F\u7528\uFF0C\u8BF7\u6DFB\u52A0\u4E8B\u4EF6\u3002
-AccessorUtils.isReqValue=\u9700\u8981\u4E00\u4E2A\u503C(<V>),\u4F46\u662F\u8FD9\u4E2A\u503C\u662F\u7531\u2018CellEditorValueAdapter\u2019\u4EA7\u751F\u3002
-AccessorUtils.NoClassDef=\u7C7B\u672A\u5B9A\u4E49\u9519\u8BEF\uFF1A
-ErrorDialogWidthDetailArea.ErrorMessage.Text=\u9519\u8BEF\u4FE1\u606F
-ExceptionHandler.Parameter.BeNull=\u53C2\u6570\u4E0D\u80FD\u4E3A\u7A7A\u5F02\u5E38
-TreeToTablesLinker.Type.Unsupported=\u5F53\u524D\u63A7\u952E\u7C7B\u578B\u4E0D\u652F\u6301\u3002
-ModifyBeanValueCommand.ModifyCell.Label=\u4FEE\u6539\u5355\u5143\u683C\u503C
-ColorStyledText.SelectAllItem.Text=\u5168\u9009
-DialogErrorForCellEditorListener.Error.MsgDialogTitle=\u9519\u8BEF
-ExportPushButton.ExportButton.Tip=\u5BFC\u51FA\u6240\u6709\u884C\u5230XML\u6587\u4EF6
-TableViewerCreator.CellModifier.ExError=\u5F53\u524DCellModifier\u4E0D\u652F\u6301\u6B64\u64CD\u4F5C\u3002\n \u4F7F\u7528\u2019{0}\u2018\u7C7B\u6216\u7EE7\u627F\u8FD9\u4E2A\u7C7B\u7684\u5B50\u7C7B
-Curve2D.MinNum.Be0=\u6BB5\u7684\u6700\u5C0F\u503C\u5FC5\u987B\u4E3A\u6B63\u6570\u62160\u3002
-ModeReader.IgnoreElement=\u5FFD\u7565\u672A\u77E5\u5143\u7D20
-Curve2D.MaxNum.Be0=\u6BB5\u7684\u6700\u5927\u503C\u5FC5\u987B\u4E3A\u6B63\u6570\u62160\u3002
-CellEditorValueAdapterFactory.valueNotStringType=Bean\u503C\u5FC5\u987B\u662F\u4E00\u4E2AString\u7C7B\u578B\uFF01
-ColorStyledText.RedoItem.Text=\u91CD\u505A
-ColorStyledText.UndoItem.Text=\u590D\u539F
-ContentProposalAdapterExtended.close=\u5173\u95ED
-ContentProposalAdapterExtended.closeFocusout=\u5173\u95EDfocusout
-DateDialog.textContent=\u9009\u62E9\u65E5\u671F& \u65F6\u95F4
-ErrorDialogWithContinue.setParameter=\u8BBE\u7F6E\u53C2\u6570\u5E76\u7EE7\u7EED
-EventUtil.activate=\u542f\u52a8
-EventUtil.close=\u5173\u95ED
-EventUtil.deactivate=\u64a4\u6d88
-EventUtil.defaultSelection=\u9ED8\u8BA4\u9009\u62E9
-EventUtil.dragDetect=\u62D6\u66F3\u68C0\u6D4B
-EventUtil.expand=\u6269\u5F20
-EventUtil.help=\u5e2e\u52a9
-EventUtil.modify=\u4FEE\u6539
-EventUtil.mouseDoubleClick=\u9F20\u6807\u53CC\u51FB
-EventUtil.mouseDown=\u9F20\u6807\u6309\u4E0B
-EventUtil.mouseEnter=\u9F20\u6807\u8F93\u5165
-EventUtil.mouseExit=\u9F20\u6807\u9000\u51FA
-EventUtil.mouseHover=\u9F20\u6807\u60AC\u505C
-EventUtil.mouseMove=\u9F20\u6807\u79FB\u52A8
-EventUtil.mouseUp=\u9F20\u6807\u5411\u4E0A
-EventUtil.move=\u79fb\u52a8
-EventUtil.paint=\u989C\u6599
-EventUtil.resize=\u8C03\u6574\u5927\u5C0F
-EventUtil.selectedEqual=\u9009\u5B9A\u7684
-EventUtil.selection=\u9009\u62E9
-EventUtil.show=\u663E\u793A
-EventUtil.verify=\u9A8C\u8BC1
-ExceptionMessageDialog.log=\u65E5\u5FD7
-SaveAsGenericSchemaPushButton.saveAsSchema=\u53e6\u5b58\u4e3a\u4e00\u822cschema

org.talend.commons.ui/src/main/java/org/talend/commons/ui/swt/advanced/dataeditor/control/ExtendedPushButton.java

@@ -20,6 +20,7 @@ import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Event;
 import org.eclipse.swt.widgets.Listener;
+import org.talend.commons.ui.swt.advanced.dataeditor.commands.ExtendedTableCopyCommand;
 import org.talend.commons.ui.swt.extended.table.AbstractExtendedControlModel;
 import org.talend.commons.ui.swt.extended.table.AbstractExtendedControlViewer;
 import org.talend.commons.ui.swt.extended.table.ExtendedButtonEvent;
@@ -87,7 +88,7 @@ public abstract class ExtendedPushButton implements IExtendedPushButton {
 
             public void handleEvent(ExtendedControlEvent event) {
                 if (event.getType() == AbstractExtendedControlViewer.EVENT_TYPE.MODEL_CHANGED) {
-                    handleModelChange();
+                    button.setEnabled(getEnabledState());
                 }
             }
 
@@ -95,10 +96,6 @@ public abstract class ExtendedPushButton implements IExtendedPushButton {
 
     }
 
-    protected void handleModelChange() {
-        button.setEnabled(getEnabledState());
-    }
-
     /**
      * Getter for button.
      * 

org.talend.commons.ui/src/main/java/org/talend/commons/ui/swt/dialogs/ErrorDialogWidthDetailArea.java

@@ -47,20 +47,17 @@ public class ErrorDialogWidthDetailArea {
      * @param detailMessage (\n an \t are interpreted ; \r are deleted)
      */
     public ErrorDialogWidthDetailArea(Shell shell, String pid, String mainMessage, String detailMessage) {
-        this(shell, pid, mainMessage, detailMessage, IStatus.INFO);
-    }
-
-    public ErrorDialogWidthDetailArea(Shell shell, String pid, String mainMessage, String detailMessage, int status) {
         MultiStatus info = new MultiStatus(pid, 1, mainMessage, null);
         if (detailMessage != null) {
             String[] lines = detailMessage.split("\n"); //$NON-NLS-1$
-            for (String line : lines) {
-                info.add(new Status(status, pid, 1, line.replaceAll("\t", "    ").replaceAll("\r", ""), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-                        null));
+            for (int i = 0; i < lines.length; i++) {
+                info
+                        .add(new Status(IStatus.INFO, pid, 1, lines[i].replaceAll("\t", "    ").replaceAll("\r", ""), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+                                null));
             }
         }
         codeOfButton = ErrorDialog.openError(shell, Messages.getString("ErrorDialogWidthDetailArea.ErrorMessage.Text"), //$NON-NLS-1$
-                null, info);
+                null, info); //$NON-NLS-1$
     }
 
     public int getCodeOfButton() {

org.talend.commons.ui/src/main/java/org/talend/commons/ui/swt/extended/table/ExtendedTableModel.java

@@ -115,15 +115,11 @@ public class ExtendedTableModel<B> extends AbstractExtendedControlModel {
      * @param index can be null
      */
     public void addAll(final Integer index, List<B> beans) {
-        addAll(index, beans, true, true);
-    }
-
-    public void addAll(final Integer index, List<B> beans, boolean fireBefore, boolean fireAfter) {
         if (index == null || index < 0 || index > this.beansList.size() - 1) {
             if (tableViewer != null && !tableViewer.getTable().isDisposed()) {
                 tableViewer.add(beans.toArray(new Object[beans.size()]));
             }
-            this.beansList.addAll(beans, fireBefore, fireAfter);
+            this.beansList.addAll(beans);
         } else {
             if (tableViewer != null && !tableViewer.getTable().isDisposed()) {
                 int localIndex = index;
@@ -132,7 +128,7 @@ public class ExtendedTableModel<B> extends AbstractExtendedControlModel {
                     tableViewer.insert(beans.get(i), localIndex++);
                 }
             }
-            this.beansList.addAll(index, beans, fireBefore, fireAfter);
+            this.beansList.addAll(index, beans);
         }
     }
 
@@ -156,10 +152,6 @@ public class ExtendedTableModel<B> extends AbstractExtendedControlModel {
         addAll((Integer) null, beans);
     }
 
-    public void addAll(List<B> beans, boolean fireBefore, boolean fireAfter) {
-        addAll((Integer) null, beans, fireBefore, fireAfter);
-    }
-
     public void registerDataList(List<B> list) {
         this.beansList.registerList(list);
     }
@@ -170,9 +162,8 @@ public class ExtendedTableModel<B> extends AbstractExtendedControlModel {
 
     public void addBeans(B b) {
         if (this.beansList.contains(b)) {
-        } else {
+        } else
             this.beansList.add(b);
-        }
     }
 
     public void setUseEquals(boolean useEquals) {
@@ -209,14 +200,10 @@ public class ExtendedTableModel<B> extends AbstractExtendedControlModel {
      * @see org.talend.commons.utils.data.list.ListenableList#removeAll(java.util.Collection)
      */
     public boolean removeAll(Collection<B> c) {
-        return removeAll(c, true, true);
-    }
-
-    public boolean removeAll(Collection<B> c, boolean fireBefor, boolean fireAfter) {
         if (tableViewer != null && !tableViewer.getTable().isDisposed()) {
             tableViewer.remove(c.toArray(new Object[c.size()]));
         }
-        return this.beansList.removeAll(c, fireBefor, fireAfter);
+        return this.beansList.removeAll(c);
     }
 
     public void removeAll() {
@@ -290,8 +277,8 @@ public class ExtendedTableModel<B> extends AbstractExtendedControlModel {
      */
     public List<B> remove(int[] indexArray) {
         ArrayList<B> objectsToRemove = new ArrayList<B>(indexArray.length);
-        for (int element : indexArray) {
-            objectsToRemove.add(beansList.get(element));
+        for (int i = 0; i < indexArray.length; i++) {
+            objectsToRemove.add(beansList.get(indexArray[i]));
         }
         removeAll(objectsToRemove);
         return objectsToRemove;
@@ -357,7 +344,6 @@ public class ExtendedTableModel<B> extends AbstractExtendedControlModel {
         this.modifiedBeanListenable = modifiedBeanListenable;
     }
 
-    @Override
     public boolean isDataRegistered() {
         return beansList.isListRegistered();
     }

org.talend.commons.ui/src/main/java/org/talend/commons/ui/swt/linking/TableToTreeLinker.java

@@ -16,7 +16,6 @@ import java.util.Comparator;
 import java.util.HashSet;
 import java.util.List;
 
-import org.eclipse.core.runtime.Platform;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.Color;
 import org.eclipse.swt.graphics.GC;
@@ -100,7 +99,7 @@ public class TableToTreeLinker<D1, D2> extends BgDrawableComposite implements IB
         LinkableTree linkableTree = new LinkableTree(this, backgroundRefresher, targetTree, this, false);
         targetTree.removeSelectionListener(linkableTree.getSelectionListener());
 
-        new LinkableTable(this, backgroundRefresher, sourceTable, this, true);
+        new LinkableTable(this, backgroundRefresher, sourceTable, (BgDrawableComposite) this, true);
         this.target = targetTree;
         this.source = sourceTable;
 
@@ -228,7 +227,7 @@ public class TableToTreeLinker<D1, D2> extends BgDrawableComposite implements IB
             IExtremityLink<Tree, D2> extremity2 = link.getExtremity2();
             // see bug 7360
             dataToTableItemCache.clear();
-            TableItem tableItem = dataToTableItemCache.getTableItem(extremity1.getDataItem());
+            TableItem tableItem = dataToTableItemCache.getTableItem((Object) extremity1.getDataItem());
             TableItem firstExpandedAscTableItem = tableItem;
 
             Rectangle tableItemBounds = firstExpandedAscTableItem.getBounds();
@@ -303,13 +302,6 @@ public class TableToTreeLinker<D1, D2> extends BgDrawableComposite implements IB
                 pointEndCentralCurve.x += offset.x - 6;
                 pointEndCentralCurve.y += offset.y;
 
-                // Added by Marvin Wang on Dec. 17, 2012 for bug TDI-23378(see backport). This is not the best way to
-                // fix this issue,
-                // but till now I have not found the root cause.
-                if (Platform.OS_LINUX.equals(Platform.getOS())) {
-                    pointEndCentralCurve.y = pointEndCentralCurve.y - tableItem.getBounds().height;
-                }
-
                 drawableLink.setPoint1(pointEndStraight);
                 drawableLink.setPoint2(pointEndCentralCurve);
 
@@ -334,8 +326,8 @@ public class TableToTreeLinker<D1, D2> extends BgDrawableComposite implements IB
      * @return
      */
     private int findXRightStartBezierLink(TableItem[] items, int maxWidth) {
-        for (TableItem item2 : items) {
-            TableItem item = item2;
+        for (int i = 0; i < items.length; i++) {
+            TableItem item = items[i];
             if (!item.isDisposed()) {
                 Rectangle bounds = item.getBounds();
                 maxWidth = Math.max(maxWidth, bounds.x + bounds.width);
@@ -361,7 +353,8 @@ public class TableToTreeLinker<D1, D2> extends BgDrawableComposite implements IB
             getTarget().deselectAll();
 
             TreeItem[] selection = getTarget().getSelection();
-            for (TreeItem tableItem : selection) {
+            for (int i = 0; i < selection.length; i++) {
+                TreeItem tableItem = selection[i];
                 selectedItems.add(tableItem.getData());
             }
 
@@ -369,7 +362,8 @@ public class TableToTreeLinker<D1, D2> extends BgDrawableComposite implements IB
             getSource().deselectAll();
 
             TableItem[] selection = getSource().getSelection();
-            for (TableItem treeItem : selection) {
+            for (int i = 0; i < selection.length; i++) {
+                TableItem treeItem = selection[i];
                 selectedItems.add(treeItem.getData());
             }
 

org.talend.commons.ui/src/main/java/org/talend/commons/ui/swt/tableviewer/celleditor/DialogErrorForCellEditorListener.java

@@ -82,7 +82,7 @@ public abstract class DialogErrorForCellEditorListener implements ICellEditorLis
             CELL_EDITOR_STATE state) {
         final Text text = (Text) cellEditor.getControl();
         final ModifiedObjectInfo modifiedObjectInfo = tableViewerCreator.getModifiedObjectInfo();
-        final Object originalValue = modifiedObjectInfo.getOriginalPropertyBeanValue();
+        Object originalValue = modifiedObjectInfo.getOriginalPropertyBeanValue();
         lastValidValue = lastValidValue != null && state == CELL_EDITOR_STATE.EDITING ? lastValidValue : originalValue;
 
         int beanPosition = tableViewerCreator.getInputList().indexOf(currentModifiedBean);
@@ -101,22 +101,21 @@ public abstract class DialogErrorForCellEditorListener implements ICellEditorLis
 
                     public void run() {
                         if (errorMessage.equals("")) {
-                            MessageDialog.openError(text.getShell(),
-                                    Messages.getString("DialogErrorForCellEditorListener.Error.MsgDialogTitle"), //$NON-NLS-1$
-                                    Messages.getString("ErrorDialogWidthDetailArea.ErrorMessage.ColumnText.NotValid", //$NON-NLS-1$
-                                            newValue, originalValue == null ? "" : originalValue.toString())); //$NON-NLS-1$
+                            MessageDialog.openError(
+                                    text.getShell(),
+                                    Messages.getString("DialogErrorForCellEditorListener.Error.MsgDialogTitle"), Messages.getString("ErrorDialogWidthDetailArea.ErrorMessage.ColumnText")); //$NON-NLS-1$
                             final int columnPosition = tableViewerCreator.getColumns().indexOf(column);
                             tableViewerCreator.getTableViewer().editElement(currentModifiedBean, columnPosition);
-                            // Added by Marvin Wang on Dec. 12, 2012 for bug TDI-24174 and it also replaces the bug
-                            // TDI-23253.
-                            text.setText(originalValue == null ? "" : originalValue.toString()); //$NON-NLS-1$
+                            if (!("").equals(newValue)) {
+                                text.setText(newValue);
+                            }
                             text.setSelection(selection.x, selection.y);
                         } else {
                             MessageDialog.openError(text.getShell(),
                                     Messages.getString("DialogErrorForCellEditorListener.Error.MsgDialogTitle"), errorMessage); //$NON-NLS-1$
                             final int columnPosition = tableViewerCreator.getColumns().indexOf(column);
                             tableViewerCreator.getTableViewer().editElement(currentModifiedBean, columnPosition);
-                            text.setText(originalValue == null ? "" : originalValue.toString());
+                            text.setText(newValue);
                             text.setSelection(selection.x, selection.y);
                         }
                     }

org.talend.core.nl/plugin_zh_CN.properties

@@ -1,3 +0,0 @@
-pluginName=\u7EC4\u4EF6\u6A21\u5757
-prefColors=\u4EE3\u7801\u67E5\u770B\u5668\u989C\u8272\u914D\u7F6E
-defaultTypeAndLength=\u9ED8\u8BA4\u7C7B\u578B\u548C\u957F\u5EA6

org.talend.core.nl/src/main/java/messages_nl.properties

@@ -1,18 +1,11 @@
-UpdatesConstants.Context=Context
-UpdatesConstants.Job=Job
-VersionSection.Version=Versie
 ContextProcessSection.errorTitle=Fout
-VersionSection.CreationDate=Creatie Datum
 ContextProcessSection.7=Naam voor nieuwe Context
 ContextProcessSection.6=Nieuwe Context
 RoutinesFunctionProposal.User=Gebruiker
 ContextProcessSection.49=Standaard Context
-XmlArray.InvalidFile=Ongeldig bestand
 ContextProcessSection.29=Fout
 EUpdateItemType.Name=Naam
 ContextParameterProposal.ContextVariable=Context variabele
-UpdatesConstants.Joblet=Joblet
-VersionSection.ModificationDate=Wijzigings Datum
 ComponentsFormatPreferencePage.add=Toevoegen
 ComponentToRepositoryProperty.error=Fout
 ContextSetConfigurationDialog.nameNotValid=Ongeldige naam
@@ -21,7 +14,6 @@ ProcessorUtilities.generatingJob=Job genereren...
 ProcessorUtilities.loadingJob=Job laden...
 VariableItemEditor.name=Naam
 VariableItemEditor.new=Nieuw
-XSDValidater.IllegalArgument=De input xsd file bestaat niet.
 ApplicationActionBarAdvisor.menuFileLabel=&Bestand
 ApplicationActionBarAdvisor.navigateLabel=&Navigeer
 ApplicationActionBarAdvisor.gotoLabel=&Ga naar
@@ -38,23 +30,15 @@ ConextTableValuesComposite.nameLabel=Naam
 ContextTemplateComposite.CommentLabel=Opmerking
 ContextTemplateComposite.nameLabel=Naam
 ContextTemplateComposite.sourceLabel=Bron
-ContextTreeConstants.contextName=Context
-UpdatesConstants.ContextGroup=Context Groep
 EComponentCategory_assignment=Toewijzing
-EComponentCategory_context=Context
 EComponentCategory_properties=Eigenschappen
 EComponentCategory_sqlTemplate=SQL Template
-EComponentCategory_version=Versie
-AbstractBrandingService_job_license_header_content=// ============================================================================\n//\n// This source code has been automatically generated by_{0}\n// / JobDesigner (CodeGenerator version {1})\n// You can find more information about Talend products at www.talend.com.\n//\n// ============================================================================
 HTMLDocGenerator.comment=Opmerking
 HTMLDocGenerator.context=Context:
-HTMLDocGenerator.mapper.alias=Alias
 HTMLDocGenerator.name=Naam
 HTMLDocGenerator.project_description=Project omschrijving
 HTMLDocGenerator.project_name=Project Naam
 HTMLDocGenerator.properties=Eigenschappen
 HTMLDocGenerator.source=Bron
-HTMLDocGenerator.version=Versie
 ConnectionParameterName.UserLabel=Gebruiker
 ConnectionParameterName.PasswordLabel=Wachtwoord
-AbstractBrandingService.routines_license_header_content1=Copyright (c) 2005-2012, Talend Inc.n//n// This source code has been automatically generated by_{0}n// CodeGenerator version {1}n// You can find more information about Talend products at www.talend.com.n// You may distribute this code under the terms of the GNU LGPL licensen// http://www.gnu.org/licenses/lgpl.html).

org.talend.core.nl/src/main/java/messages_zh_CN.properties

@@ -1,292 +0,0 @@
-MetadataTypeLengthConstants.LIST_LENGTH=\u5217\u8868
-SelectRepositoryContextDialog.SelectAll=\u5168\u9009
-ColorsCodeViewerPreferencePage.keyword2Color=\u5173\u952E\u5B572 \u989C\u8272
-MetadataDialog.Message=\u6240\u6709\u6765\u81EA\u8F93\u5165Schema\u7684\u5217\u5C06\u88AB\u8F6C\u6362\u5230\u8F93\u51FASchema
-MetadataDialog.TransferMessage=\u6240\u6709\u6765\u81EA\u8F93\u51FASchema\u7684\u5217\u5C06\u88AB\u8F6C\u6362\u5230\u8F93\u5165Schema
-EMetadataEncoding.Cyrillic=\u53E4\u4EE3\u65AF\u62C9\u592B\u8BED
-EUpdateResult.BuiltIn=\u66F4\u6539\u4E3ABuilt-In\u6A21\u5F0F
-EUpdateResult.Rename=\u66F4\u6539\u540D\u79F0
-ContextProcessSection.ParameterNameIsNotValid=\u53C2\u6570\u540D\u5B57\u65E0\u6548\u3002
-ColorsCodeViewerPreferencePage.DigitColor=\u6570\u5B57 \u989C\u8272
-EMetadataEncoding.Hebrew=\u5E0C\u4F2F\u6765\u8BED
-UpdatesConstants.Context=\u7EC4\u4EF6
-UpdatesConstants.Job=\u8fdb\u7a0b
-RepositoryUpdateManager.NoModificationTitle=\u6CA1\u6709\u9700\u8981\u7684\u4FEE\u6539
-CorePreferencePage.javaInterpreter=Java\u89E3\u91CA\u5668
-EMetadataEncoding.GB2312=\u4E2D\u6587
-MetadataEmfTableEditor.ColumnInvalid=\u5217\u540D{0}\u65E0\u6548\u3002
-NodeReturnProposal.VariableName=\n\n\u53D8\u91CF\u540D\uFF1A {5}
-ERepositoryObjectType.FolderNotFound=\u7C7B\u578B{0}\u7684\u76EE\u5F55\u672A\u627E\u5230
-CorePreferencePage.componentDefaultFileDirectory=\u7EC4\u4EF6\u7F3A\u7701\u6587\u4EF6\u76EE\u5F55
-ColorsCodeViewerPreferencePage.keyword1Color=\u5173\u952E\u5B571 \u989C\u8272
-CorePreferencePage.runInMultiThread=\u591A\u7EBF\u7A0B\u8FD0\u884C(\u521b\u5efa\u65b0\u4f5c\u4e1a\u9ed8\u8ba4\u91c7\u7528)
-MappingFileLoader.UndeclaredDbType="{0}"\u6CA1\u6709\u88AB\u7533\u660E\u7684\u6570\u636E\u5E93\u7C7B\u578B\uFF0C\u5728\u6570\u636E\u5E93ID"{1}"\u5728\u8282\u70B9\uFF1A{2}
-EConnectionType.tableMenu=\u540E\u8FD0\u884C
-MappingFileLoader.UnbindedDbTypes=\u5728\u6570\u636E\u5E93ID"{0}"\u7684Mapping\u6587\u4EF6\uFF0C\u6570\u636E\u5E93\u7C7B\u578B\u6CA1\u6709\u7528"{1}" Talend \u7C7B\u578B\uFF1A"{2}"\u7ED1\u5B9A
-MetadataTypeLengthPreferencePage.FIELD=\u6240\u6709\u5B57\u6BB5\u9ED8\u8BA4\u8BBE\u7F6E
-EConnectionType.onComponentErrorMenu=\u7EC4\u4EF6\u8FD0\u884C\u9519\u8BEF
-Parameter.Type=\u7C7B\u578B\uFF1A
-EConnectionType.onComponentOkMenu=\u7EC4\u4EF6\u8FD0\u884C\u6B63\u786E
-PerspectiveMenuManager.perspectiveLabel=\u900F\u89C6\u56FE(&P)
-NodeReturnProposal.Description=\u63CF\u8FF0\uFF1A {0}
-TalendTabbedPropertyComposite.tableButton.toolTip=\u8868\u89C6\u56FE
-Parameter.Value=\u503C\uFF1A
-EConnectionType.runAfterMenu=\u8FD0\u884C\u540E
-ContextParameterProposal.Type=\n\u7C7B\u578B\uFF1A {1}
-ColorsCodeViewerPreferencePage.fieldTip=\u7C97\u4F53(&B)
-GlobalServiceRegister.ServiceNotRegistered=\u670D\u52A1{0}\u6CA1\u6709\u88AB\u6CE8\u518C
-ConextTemplateComposite.OrderText=\u539F\u59CB\u987A\u5E8F
-SelectRepositoryContextDialog.Title=\u9009\u62E9\u4E0A\u4E0B\u6587\u53D8\u91CF
-ColorsCodeViewerPreferencePage.LabelColor=\u6807\u7B7E \u989C\u8272
-EUpdateResult.Add=\u6DFB\u52A0\u5230\u5E93
-ColorsCodeViewerPreferencePage.MarkupColor=\u6807\u8BB0 \u989C\u8272
-ColorsCodeViewerPreferencePage.Comment2Color=\u6CE8\u91CA2 \u989C\u8272
-EUpdateResult.JobletUpdate=\u66F4\u65B0joblet\u8282\u70B9
-JavaGlobalVariableProposal.Description=\u63CF\u8FF0\uFF1A {0}
-RoutinesFunctionProposal.ReturnType=\u8FD4\u56DE\u7C7B\u578B:
-EConnectionType.onSubjobOkMenu=\u5B50job\u6B63\u786E
-CorePreferencePage.groupBySource=\u5728\u4E0A\u4E0B\u6587\u201C\u6839\u636E\u6E90\u5206\u7EC4\u201D
-NodeReturnProposal.Availability=\n\u53EF\u7528\u6027\uFF1A {4}
-EConnectionType.onSubjobErrorMenu=\u5B50job\u9519\u8BEF
-RepositoryUpdateManager.ItemsToUpdate=\u68C0\u67E5\u9879\u76EE\u4EE5\u66F4\u65B0
-SelectRepositoryContextDialog.Label=\u9009\u62E9\u5E93\u4E0A\u4E0B\u6587\u4E2D\u7684\u53D8\u91CF\u3002
-EMetadataEncoding.Greek=\u5E0C\u814A
-EMetadataEncoding.UTF16BE=Unicode BigEndian (16\u4F4D)
-EConnectionType.synchronize=\u540C\u6B65
-VersionSection.Version=\u7248\u672C
-ContextParameterProposal.Description=\u63CF\u8FF0\uFF1A {0}
-EUpdateResult.Delete=\u4ECE\u5E93\u4E2D\u5220\u9664
-SelectRepositoryContextDialog.ExpandAll=\u5C55\u5F00
-NodeReturnProposal.Type=\n\u7C7B\u578B\uFF1A {3}
-ColorsCodeViewerPreferencePage.FunctionColor=\u65B9\u6CD5 \u989C\u8272
-EUpdateItemType.Components=\u7EC4\u4EF6
-MetadataTypeLengthConstants.CHARACTER_LENGTH=\u5b57\u7b26
-TalendTabbedPropertyComposite.compactButton.toolTip=\u7F29\u653E\u89C6\u56FE
-EConnectionType.mergeMenu=\u5408\u5E76
-ColorsCodeViewerPreferencePage.Comment1Color=\u6CE8\u91CA1 \u989C\u8272
-RoutinesFunctionProposal.VariableName=\n\n\u53D8\u91CF\u540D\uFF1A {2}
-RepositoryUpdateManager.RenameContextTitle=\u91CD\u547D\u540D\u95EE\u9898
-EUpdateItemType.Schema=\u67B6\u6784
-MetadataEmfTableEditor.ColumnNameExists=\u5217\u540D{0}\u5DF2\u5B58\u5728\u3002
-Parameter.Name=\u53C2\u6570\u540D
-FunctionManager.PurePerl.ParaName=\u81EA\u5B9A\u4E49\u53C2\u6570
-ContextValueErrorChecker.ErrorTitile=\u4E0A\u4E0B\u6587\u503C\u9519\u8BEF: 
-EUpdateItemType.Query=\u67E5\u8BE2
-ExtractMetaDataFromDataBase.SchemaNoPresent=Schema\u5728\u6570\u636E\u5E93\u4E2D\u672A\u51FA\u73B0
-PerlGlobalVariableProposal.Description=\u63CF\u8FF0:{0}
-UpdatesConstants.Component=\u7EC4\u4EF6
-Parameter.Comment=\u6CE8\u91CA\uFF1A
-CorePreferencePage.perlInterpreter=Perl\u89E3\u91CA\u5668
-ColorsCodeViewerPreferencePage.OperatorColor=\u64CD\u4F5C\u7B26 \u989C\u8272
-EMetadataEncoding.GB18030=\u4E2D\u6587\u56FD\u6807
-ContextProcessSection.errorTitle=\u9519\u8BEF
-EConnectionType.parallelize=\u5E76\u884C
-MetadataDialog.SchemaModification=Schema\u7F16\u8F91
-VersionSection.CreationDate=\u521B\u5EFA\u65E5\u671F
-JavaGlobalVariableProposal.VariableName=\n\n\u53D8\u91CF\u540D:{1}
-MappingFileLoader.UnbindedTalendTypes=\u5728\u6570\u636E\u5E93ID"{0}"\u7684Mapping\u6587\u4EF6\uFF0CTalend\u7C7B\u578B\u6CA1\u6709\u7528"{1}"\u6570\u636E\u5E93\u7C7B\u578B:{2}\u7ED1\u5B9A
-MetadataTableEditor.ColumnNameExists=\u5217\u540D{0}\u5DF2\u7ECF\u5B58\u5728\u3002
-MetadataTableEditor.ColumnNameIsInvalid=\u5217\u540D{0}
-ColorsCodeViewerPreferencePage.defaultColor=\u9ED8\u8BA4 \u989C\u8272
-ContextProcessSection.7=\u4E3A\u65B0\u7684\u4E0A\u4E0B\u6587\u6307\u5B9A\u540D\u5B57
-ContextProcessSection.6=\u65B0\u7684\u4E0A\u4E0B\u6587
-EConnectionType.mainMenu=\u4E3B\u7EBF
-ContextProcessSection.4=\u6DFB\u52A0\u65B0\u7684\u4E0A\u4E0B\u6587 ->(
-ContextProcessSection.2=\u8BF7\u786E\u8BA4?
-ContextProcessSection.1=\u83DC\u5355\u8868\u683C
-EUpdateItemType.Property=\u5C5E\u6027
-SelectRepositoryContextDialog.DeselectAll=\u5168\u90E8\u4E0D\u9009
-CorePreferencePage.iReportPath=iReport \u8DEF\u5F84
-MetadataTalendType.DBMSNotSetted=\u6570\u636E\u5E93\u672A\u8BBE\u7F6E
-ContextParameterProposal.VariableName=\n\n\u53D8\u91CF\u540D\uFF1A {2}
-ColorsCodeViewerPreferencePage.InvalidColor=\u975E\u6CD5 \u989C\u8272
-ExtractMetaDataFromDataBase.dbTypeNotFound=dbType{0}\u672A\u627E\u5230
-RepositoryUpdateManager.NoModificationMessages=\u6CA1\u6709\u9700\u8981\u7684\u66F4\u65B0
-EMetadataEncoding.Latin6=Latin6 (\u65E5\u8033\u66FC\u8BED)
-EMetadataEncoding.Latin5=Latin5 (\u571F\u8033\u5176\u8BED)
-RoutinesFunctionProposal.User=\u7528\u6237
-EMetadataEncoding.Latin4=Latin4 (\u5317\u6B27)
-EMetadataEncoding.Latin3=Latin3 (\u5357\u6B27)
-ColorsCodeViewerPreferencePage.Literal2Color=\u6587\u5B572 \u989C\u8272
-EMetadataEncoding.Latin2=Latin2 (\u4E1C\u6B27)
-EMetadataEncoding.Latin1=Latin1 (\u897F\u6B27)
-EMetadataEncoding.UTF16=Unicode 2.0 (16\u4F4D)
-RoutinesFunctionProposal.System=\u7CFB\u7EDF
-CorePreferencePage.temporaryFiles=\u4E34\u65F6\u6587\u4EF6
-EUpdateResult.Reload=\u91CD\u65B0\u52A0\u8F7D\u7EC4\u4EF6
-RepositoryUpdateManager.Title=\u4fee\u6539
-ContextProcessSection.49=\u7F3A\u7701\u4E0A\u4E0B\u6587
-PerlGlobalVariableProposal.VariableName=\n\n\u53D8\u91CF\u540D:{1}
-RepositoryObject.NotImplemented=\u672A\u5B9E\u73B0
-MetadataTypeLengthPreferencePage.VALUE=\u7A7A\u503C\u5B57\u6BB5\u9ED8\u8BA4\u8BBE\u7F6E
-ERepositoryObjectType.NotImplemented=\u672A\u5B9E\u73B0
-ExtractMetaDataFromDataBase.connectionSuccessful=\u8FDE\u63A5\u6210\u529F
-LogImageCacheAction.CacheImage=\u7F13\u5B58\u56FE\u7247
-ContextParameterProposal.NoCommentAvaiable=\u6CA1\u6709\u6CE8\u91CA\u3002
-SelectRepositoryContextGroupDialog.Default=\u7F3A\u7701
-FunctionManager.PurePerl.Desc=\u8BBE\u7F6E\u81EA\u5B9A\u4E49\u8868\u8FBE\u5F0F
-XmlArray.InvalidFile=\u65E0\u6548\u7684\u6587\u4EF6\u3002
-EConnectionType.lookupMenu=\u67E5\u8BE2
-ContextProcessSection.30=\u540D\u5B57\u5DF2\u5B58\u5728
-EUpdateItemType.Variable=\u53D8\u91CF
-MetadataTypeLengthConstants.OBJECT_LENGTH=\u6a21\u5757
-ContextProcessSection.29=\u9519\u8BEF
-CorePreferencePage.previewLimit=\u9884\u89C8\u9650\u5236
-RoutinesFunctionProposal.Description=\u63CF\u8FF0:
-LogImageCacheAction.CacheImageDesc=\u7F13\u5B58\u56FE\u7247\u4FE1\u606F\u63CF\u8FF0
-ColorsCodeViewerPreferencePage.Literal1Color=\u6587\u5B571 \u989C\u8272
-ConextTemplateComposite.OrderMessages=\u5982\u679C\u60A8\u60F3\u91CD\u65B0\u6392\u5217\u53D8\u91CF\uFF0C\u5FC5\u987B\u9009\u4E2D\u5B83.
-MetadataTypeLengthConstants.VALUE_DEFAULT_TYPE=\u9ED8\u8BA4\u7C7B\u578B
-EUpdateItemType.Name=\u8fde\u63a5\u540d
-ContextProcessSection.13=\u4E3A\u4E0A\u4E0B\u6587\u6307\u5B9A\u65B0\u540D\u5B57{0}
-ContextProcessSection.12=\u4E3A\u4E0A\u4E0B\u6587\u6539\u540D
-ContextParameterProposal.ContextVariable=\n\n\u4E0A\u4E0B\u6587\u53D8\u91CF\u3002
-EMetadataEncoding.Big5=\u7E41\u4F53\u4E2D\u6587
-Function.FunctionName=\u51FD\u6570\u540D{0}
-ContextProcessSection.RemoveInformation={0}\u4E3A\u9ED8\u8BA4\u7684\u4E0A\u4E0B\u6587,\u4E0D\u80FD\u5220\u9664
-MetadataTypeLengthConstants.FIELD_DEFAULT_TYPE=\u9ED8\u8BA4\u7C7B\u578B
-RoutinesFunctionProposal.CreatedBy=\u88AB\u521B\u5EFA:
-RepositoryUpdateManager.Messages=\u60A8\u60F3\u5C06\u8FD9\u4E9B\u4FEE\u6539\u4F20\u9012\u5230\u6240\u6709\u4F5C\u4E1A\u4E2D\u5417\uFF1F\u53EF\u80FD\u9700\u8981\u8F83\u957F\u65F6\u95F4\u3002
-MappingFileLoader.InvalidTalendType="{0}"\u662F\u4E00\u4E2A\u975E\u6CD5\u7684Talend\u7C7B\u578B\u5BF9\u6570\u636E\u5E93ID"{2}"\uFF0C\u5728\u8282\u70B9\uFF1A{3}
-RepositoryUpdateManager.Check=\u68C0\u67E5\u4E2D...
-RoutinesFunctionProposal.Example=\u793A\u4F8B:
-TalendType.TypeName=\u7C7B\u578B\u540D{0}
-MetadataTableEditor.ColumnNameIsNull=\u9519\u8BEF\uFF1A\u5217\u540D\u4E3Anull
-ColorsCodeViewerPreferencePage.keyword3Color=\u5173\u952E\u5B573 \u989C\u8272
-NodeReturnProposal.GlobalVariable=\n\n\u5168\u5C40\u53D8\u91CF\uFF0C\u7EC4\u4EF6\u5C5E\u6027 {1} [{2}].
-ListPreferencePage.RemoveButtonName=\u79FB\u9664
-MetadataTypeLengthPreferencePage.DBTYPE=\u6570\u636E\u7C7B\u578B\u7684\u9ED8\u8BA4\u957F\u5EA6
-EMetadataEncoding.EUC_CN=\u7B80\u4F53\u4E2D\u6587(\u6269\u5C55\u7684Unix Code-CN)
-EConnectionType.iteratorMenu=\u8FED\u4EE3
-EMetadataEncoding.Arabic=\u963F\u62C9\u4F2F\u8BED
-EMetadataEncoding.Microsoft_Latin1=\u5FAE\u8F6F(Latin-1)
-MetadataEmfTableEditor.ColumnNameIsNullError=\u9519\u8BEF\uFF1A\u5217\u540D\u4E3Anull
-MappingFileLoader.DbmsIdAlreadyExists=\u6570\u636E\u5E93ID"{0}"\u5DF2\u7ECF\u5B58\u5728\uFF01
-EConnectionType.runIfMenu=\u6B63\u5E38\u65F6\u8FD0\u884C
-VersionSection.ModificationDate=\u4FEE\u6539\u65E5\u671F
-MappingFileLoader.DbTypeAlreadyExists=\u5728\u6570\u636E\u5E93ID{0}\u4E2D\uFF0C\u6570\u636E\u7C7B\u578B"{1}" \u51FA\u73B0\u591A\u6B21\u5728\u6587\u4EF6"{2}" \u8282\u70B9:{3}
-AbstractComponentsProvider.folderNotExist=\u6587\u4EF6\u5939{0}\u4E0D\u5B58\u5728.
-AbstractItemMigrationTask.taskFailed=\u8FC1\u79FB{0}\u9879\u76EE\u5931\u8D25{1}
-ColumnNameChangedExt.columnChanged=\u7ED3\u70B9: {0} \u5217\u6539\u53D8: {1}-> {2}
-ComponentsFormatPreferencePage.add=\u6DFB\u52A0
-ComponentsFormatPreferencePage.formatConnection=\u683C\u5F0F\u5316\u9ED8\u8BA4\u8FDE\u63A5
-ComponentsFormatPreferencePage.formatLable=\u683C\u5F0F\u5316\u9ED8\u8BA4\u6807\u7B7E
-ComponentsFormatPreferencePage.remove=\u79FB\u9664
-ComponentToRepositoryProperty.error=\u9519\u8BEF
-ComponentToRepositoryProperty.ImpossibleUseOCI=\u4E0D\u80FD\u518D\u5E93\u4E2D\u4F7F\u7528OCI\u7C7B\u578B\uFF01
-ContextComposite.tableValue=\u8868\u683C\u5F0F\u503C
-ContextComposite.treeValue=\u6811\u683C\u5F0F\u503C
-ContextComposite.variable=\u53D8\u91CF
-ContextSetConfigurationDialog.nameNotValid=\u8BE5\u540D\u79F0\u65E0\u6548
-ConextTemplateComposite.addToRepositoryContextAction.label=\u6DFB\u52A0\u5230repository\u4E0A\u4E0B\u6587
-DbTableSelectorDialog.textContent=\u9009\u62E9\u8868\u540D
-ECodeLanguage.unknowLanguage=\u672A\u77E5\u8BED\u8A00
-ExtractMetaDataUtils.noData=\u672A\u627E\u5230\u6570\u636E.
-JavaSimpleDateFormatProposalProvider.quoteDisplayError=\u4E24\u4E2A\u5355\u5F15\u53F7\u663E\u793A\u4E3A\u4E00\u4E2A\u5355\u5F15\u53F7
-MetadataDialog.CopyToInput.toolTipText=\u5C06\u8F93\u51FAschema\u6240\u6709\u5217\u590D\u5236\u5230\u8F93\u5165schema
-MetadataDialog.CopySelectionToInput.toolTipText=\u5C06\u8F93\u51FAschema\u5DF2\u9009\u62E9\u7684\u5217\u590D\u5236\u5230\u8F93\u5165schema
-MetadataDialog.CopyToOutput=\u5C06\u8F93\u5165schema\u6240\u6709\u5217\u590D\u5236\u5230\u8F93\u51FAschema
-MetadataDialog.CopySelectionToOutput=\u5C06\u8F93\u5165schema\u5DF2\u9009\u62E9\u7684\u5217\u590D\u5236\u5230\u8F93\u51FAschema
-MetadataTalendType.dbIdNotFound=DBMS Id\uFF1A{0}\u65E0\u6CD5\u627E\u5230\uFF01
-PaletteContentDialog.connection=\u683C\u5F0F\u5316\u9ED8\u8BA4\u8FDE\u63A5
-PaletteContentDialog.lable=\u683C\u5F0F\u5316\u9ED8\u8BA4\u6807\u7B7E
-PatternCalendar.example=\u793A\u4F8B:
-SchemaCellEditor.giveSchemaName=\u7ED9\u56FE\u89E3\u547D\u540D
-SchemaCellEditor.inputName=\u8F93\u5165\u540D\u79F0
-SchemaCellEditor.nameExistOrInvalid=\u6539\u540D\u79F0\u5DF2\u5B58\u5728\u6216\u65E0\u6548
-SchemaCellEditor.schemaName=\u56FE\u89E3\u540D
-SchemaOperationChoiceDialog.ChangeBuiltInMessage=\u66F4\u6539\u56FE\u89E3\u5230built-in\u6A21\u5F0F
-SchemaOperationChoiceDialog.ChangeRepositoryMessage=\u4ECE\u5E93\u4E2D\u66F4\u6539Schema
-SchemaOperationChoiceDialog.CreateBuiltInMessage=Built-in\u4E2D\u521B\u5EFA\u56FE\u89E3
-SchemaOperationChoiceDialog.CreateRepositoryMessage=\u4ECE\u5E93\u4E2D\u521B\u5EFA\u56FE\u89E3\u3002
-SchemaOperationChoiceDialog.EditSchemaMessage=\u7F16\u8F91\u67B6\u6784
-SchemaOperationChoiceDialog.StatusMessage=\u65E0\u6548\u6216\u5DF2\u5B58\u5728\u7684\u56FE\u89E3
-SchemaOperationChoiceDialog.Title=\u67B6\u6784
-VariableItemEditor.name=\u57fa\u672c\u6570\u636e\u540d
-VariableItemEditor.new=\u65b0
-VariableItemEditor.remove=\u79FB\u9664
-VariableItemEditor.twmplatePattern=\u6A21\u677F\u6837\u5F0F\uFF1A
-VariableItemEditor.variable=\u53D8\u91CF\uFF1A
-VersionSection.Status=\u72B6\u6001
-XSDValidater.IllegalArgument=\u8F93\u5165\u7684xsd\u6587\u4EF6\u4E0D\u5B58\u5728
-MultiStringSelectionDialog.nameEmpty=\u540D\u79F0\u4E0D\u80FD\u4E3A\u7A7A
-ApplicationActionBarAdvisor.menuFileLabel=\u6587\u4EF6(&F)
-ApplicationActionBarAdvisor.menuEditLabel=\u7F16\u8F91(&E)
-ApplicationActionBarAdvisor.gotoLabel=\u8DF3\u8F6C
-ApplicationActionBarAdvisor.projectLabel=\u5DE5\u7A0B
-ApplicationActionBarAdvisor.menuWindowLabel=\u7A97\u53E3(&W)
-ApplicationActionBarAdvisor.menuHelpLabel=\u5E2E\u52A9(&H)
-BusinessAppearanceComposite.textAlignmentGroup=\u6587\u672C\u5BF9\u9F50
-BusinessAppearanceComposite.textAlignment.horizontal=\u6C34\u5E73
-BusinessAppearanceComposite.textAlignment.vertical=\u5782\u76F4
-BusinessAppearanceComposite.textAlignment.horizontal.left=\u5DE6
-BusinessAppearanceComposite.textAlignment.horizontal.right=\u53F3
-BusinessAppearanceComposite.textAlignment.horizontal.centre=\u4E2D\u592E
-BusinessAppearanceComposite.textAlignment.vertical.top=\u9876\u90E8
-BusinessAppearanceComposite.textAlignment.vertical.bottom=\u5E95\u90E8
-BusinessAppearanceComposite.textAlignment.vertical.centre=\u4E2D\u592E
-ComponentsFormatPreferencePage.errorCreateConnectionName=\u547D\u540D"{0}"\u65E0\u6548
-ComponentsFormatPreferencePage.ErrorTitle=\u9519\u8BEF
-ConextTableValuesComposite.nameLabel=\u57fa\u672c\u6570\u636e\u540d
-ContextTemplateComposite.CommentLabel=\u5907\u6CE8
-ContextTemplateComposite.nameLabel=\u57fa\u672c\u6570\u636e\u540d
-ContextTemplateComposite.scriptCodeLabel=\u811A\u672C\u4EE3\u7801
-ContextTemplateComposite.sourceLabel=\u8D44\u6E90
-ContextTemplateComposite.typeLabel=\u7C7B\u578B
-ContextTreeConstants.contextName=\u7EC4\u4EF6
-ContextTreeConstants.promptName=\u63D0\u793A
-ContextTreeConstants.valueName=\u53C2\u6570\u503C
-ContextTreeConstants.variableName=\u53D8\u91CF
-GroupByContextAction.groupContext=\u6309\u4E0A\u4E0B\u6587\u5206\u7EC4
-GroupByVariableAction.groupVariable=\u6309\u53D8\u91CF\u5206\u7EC4
-SchemaXPathQuerysDialog.Mappings=\u6620\u5C04
-XPathQueryMetadataTableEditorViewExt.xpathQuerys=XML \u6587\u4EF6\u7ED3\u6784\u67E5\u8BE2\u8BED\u53E5
-EComponentCategory_advanceSetting=\u9AD8\u7EA7\u8BBE\u7F6E
-EComponentCategory_appearance=\u5916\u89C2
-EComponentCategory_assignment=\u6307\u6D3E
-EComponentCategory_context=\u7EC4\u4EF6
-EComponentCategory_doc=\u6587\u6863
-EComponentCategory_main=\u4E3B\u7EBF
-EComponentCategory_sqlTemplate=SQL\u6A21\u677F
-EComponentCategory_statsAndLogs=\u9759\u6001\u4FE1\u606F\u548C\u65E5\u5FD7
-EComponentCategory_version=\u7248\u672C
-EComponentCategory_view=\u89c6\u56fe
-EComponentCategory.advancedSettings=\u9AD8\u7EA7\u8BBE\u7F6E
-HTMLDocGenerator.author=\u4F5C\u8005
-HTMLDocGenerator.author1=\u4F5C\u8005
-HTMLDocGenerator.column=\u5217
-HTMLDocGenerator.component_list=\u7ec4\u4ef6\u5217\u8868
-HTMLDocGenerator.component_name=\u7ec4\u4ef6\u540d
-HTMLDocGenerator.content=\u5185\u5BB9
-HTMLDocGenerator.context=\u4e0a\u4e0b\u6587\uff1a
-HTMLDocGenerator.description=\u5FC5\u8981\u7684
-HTMLDocGenerator.job_description=\u5FC5\u8981\u7684
-HTMLDocGenerator.key=\u5173\u952E\u5B57
-HTMLDocGenerator.label=\u6807\u7B7E
-HTMLDocGenerator.length=\u957F\u5EA6
-HTMLDocGenerator.mapper.alias=\u522B\u79F0
-HTMLDocGenerator.mapper.expression=\u8868\u8FBE\u5F0F
-HTMLDocGenerator.mapper.operator=\u64CD\u4F5C\u7B26
-HTMLDocGenerator.mapper.table.name=\u6570\u636e\u8868
-HTMLDocGenerator.modification=\u4fee\u6539
-HTMLDocGenerator.name=\u4f5c\u4e1a\u540d
-HTMLDocGenerator.nullable=\u53EF\u4E3A\u7A7A
-HTMLDocGenerator.precision=\u7CBE\u5EA6
-HTMLDocGenerator.project_description=\u5de5\u7a0b\u63cf\u8ff0
-HTMLDocGenerator.project_name=\u5de5\u7a0b\u540d
-HTMLDocGenerator.prompt=\u63D0\u793A
-HTMLDocGenerator.purpose=\u76EE\u7684
-HTMLDocGenerator.row_default=\u65e0
-HTMLDocGenerator.row_functions=\u51FD\u6570
-HTMLDocGenerator.status=\u72B6\u6001
-HTMLDocGenerator.type=\u7C7B\u578B
-HTMLDocGenerator.unique_name=\u552f\u4e00\u540d\u5b57
-HTMLDocGenerator.value=\u503c
-HTMLDocGenerator.version=\u7248\u672C
-ConnectionParameters.exceptionMessage=\u8FD9\u662F\u50A8\u5B58\u5E93\uFF0C\u4E0D\u80FD\u8C03\u7528\u4E9B\u65B9\u6CD5\u3002
-ConnectionParameterName.HostLabel=\u4e3b\u673a
-ConnectionParameterName.PortLabel=\u7aef\u53e3
-ConnectionParameterName.SchemaLabel=\u67B6\u6784
-ConnectionParameterName.UserLabel=\u7528\u6237
-ConnectionParameterName.PasswordLabel=\u5bc6\u7801
-ConnectionParameterName.DbPathLabel=\u6570\u636E\u5E93\u7684\u6839\u8DEF\u5F84

org.talend.core.nl/src/main/java/org/talend/core/ui/metadata/celleditor/messages_zh_CN.properties

@@ -1,2 +0,0 @@
-CreateRuleDialog.conditionLabel=\u6761\u4EF6
-CreateRuleDialog.nameLabel=\u57fa\u672c\u6570\u636e\u540d

org.talend.core.repository.nl/src/main/java/messages_en.properties

@@ -170,7 +170,5 @@ RenameFolderAction.action.title=Rename folder
 RenameFolderAction.action.toolTipText=Rename folder
 RenameFolderAction.warning.editorOpen.message=Cannot rename "{1}" folder because an item ({0}) contained in this folder is currently open.\nClose it and retry.
 RenameFolderAction.warning.editorOpen.title=Action not available
-RenameFolderAction.warning.cannotFind.message=Cannot rename folder, it may have been moved or deleted. Click refresh button to update the repository.
+RenameFolderAction.warning.cannotFind.message=Cannot rename folder, it may have been moved or deleted. Click refresh button to update.the repository.
 RenameFolderAction.warning.cannotFind.title=Action not available
-DeleteAction.warning.message1=can not delete the folder because at least one item contained in this folder is currently open. Close any open item and try again.
-DeleteAction.warning.title=Warning

org.talend.core.repository.nl/src/main/java/messages_fr.properties

@@ -119,8 +119,6 @@ ItemReferenceDialog.project=Projet
 ItemReferenceDialog.deletedInfor=Dans la Corbeille
 ItemReferenceDialog.messages=Des éléments ne peuvent être supprimés car ils sont référencés par d'autres.
 ProxyRepositoryFactory.projectIsNotCompatible=Le projet {0} a été ouvert par un studio plus récent. Impossible de l'ouvrir.
-NewFolderWizard.description=Créer un nouveau dossier dans le référentiel
-NewFolderWizard.failureText=Une erreur est survenue. Impossible de créer les dossiers. Consultez le log pour plus d'informations.
 NewFolderWizard.label=Libellé
 NewFolderWizard.nameEmpty=Libellé requis
 NewFolderWizard.nameIncorrect=Le libellé contient des caractères incorrects.
@@ -129,6 +127,4 @@ NewFolderWizard.title=Dossier
 NewFolderWizard.windowTitle=Nouveau dossier
 CreateFolderAction.action.title=Créer le dossier
 RenameFolderAction.action.title=Renommer le dossier
-RenameFolderAction.warning.editorOpen.message=Impossible de renommer le dossier "{1}" car un élément ({0}) contenu dans ce dossier est ouvert.\n Fermez-le et réessayez.
 RenameFolderAction.warning.editorOpen.title=Action indisponible
-RenameFolderAction.warning.cannotFind.message=Impossible de renommer le dossier, il a été déplacé ou supprimé. Cliquez sur le bouton Rafraîchir pour mettre à jour le référentiel.

org.talend.core.repository.nl/src/main/java/messages_nl.properties

@@ -1,9 +1,7 @@
-AbstractEMFRepositoryFactory.job=Job
 CreateSandboxProjectDialog.userFirstname=Voornaam
 CreateSandboxProjectDialog.userLastname=Achternaam
 CreateSandboxProjectDialog.Password=Wachtwoord
 PropertiesWizardPage.Name=Naam
-PropertiesWizardPage.Version=Versie
 JobletReferenceDialog.project=PROJECT
 ProjectRepositoryNode.invalidItem=Ongeldig item
 RepositoryDropAdapter_moveTitle=Verplaatsen

org.talend.core.repository.nl/src/main/java/messages_zh_CN.properties

@@ -1,67 +0,0 @@
-AbstractEMFRepositoryFactory.cannotGenerateItem=\u65E0\u6CD5\u751F\u6210\u7C98\u8D34\u9879\u76EE\u7684\u6807\u7B7E.
-AbstractEMFRepositoryFactory.job=\u4f5c\u4e1a
-ProxyRepositoryFactory.bussinessException.itemNonModifiable=\u4e0d\u53ef\u4fee\u6539\u9879
-ProxyRepositoryFactory.illegalArgumentException.labelNotMatchPattern=\u6807\u7b7e {0} \u4e0e\u6a21\u5f0f {1} \u4e0d\u7b26
-ProxyRepositoryFactory.initializeProjectConnection=\u521D\u59CB\u5316\u5DE5\u7A0B\u8FDE\u63A5
-ProxyRepositoryFactory.Label=\u6807\u7B7E
-ProxyRepositoryFactory.log.Restoration=[{0}] \u88ab {1} \u6062\u590d\u5230 \u201c/{2}\u201d\u3002
-ProxyRepositoryFactory.log.lock=\u201c{1}\u201d\u88ab[{0}]\u9501\u5b9a\u3002
-ProxyRepositoryFactory.log.loggedOn={0}\u6ce8\u518c\u5165{1}\u3002
-ProxyRepositoryFactory.log.logicalDeletion=\u903b\u8f91[{0}]\u88ab{1}\u5220\u9664\u3002
-ProxyRepositoryFactory.log.move=\u4ece\u201c{1}\u201d\u79fb\u52a8\u5230[{0}]\u3002
-ProxyRepositoryFactory.log.physicalDeletion=\u7269\u7406\u6027\u5220\u9664 \u7531{1}\u5220\u9664[{0}]\u3002
-ProxyRepositoryFactory.log.tempFolderEmptied=\u4e34\u65f6\u6587\u4ef6\u5939\u6e05\u7a7a(\u6587\u4ef6{0}\u5728{1}ms\u5185\u88ab\u5220\u9664)
-ProxyRepositoryFactory.log.unlock=[{0}]\u88ab\u201c{1}\u201d\u89e3\u9501\u3002
-ProxyRepositoryFactory.logonInProgress=\u6B63\u5728\u767B\u5F55...
-CreateSandboxProjectDialog.ProjectDesc=\u5FC5\u8981\u7684
-CreateSandboxProjectDialog.ProjectLabel=\u6807\u7B7E
-CreateSandboxProjectDialog.ProjectSvnAdvance=SVN\u9AD8\u7EA7\u8BBE\u7F6E
-CreateSandboxProjectDialog.successTitile=\u6210\u529f
-CreateSandboxProjectDialog.Login=\u987b\u6307\u5b9a\u767b\u5f55
-CreateSandboxProjectDialog.Password=\u5bc6\u7801
-PropertiesWizardPage.Author=\u4F5C\u8005
-PropertiesWizardPage.Description=\u5FC5\u8981\u7684
-PropertiesWizardPage.EmptyDescWarning=\u5EFA\u8BAE\u4E0D\u8981\u4F7F\u7528\u7A7A\u63CF\u8FF0\u4FE1\u606F\u3002
-PropertiesWizardPage.EmptyPurposeWarning=\u5EFA\u8BAE\u4E0D\u8981\u4F7F\u7528\u7A7A\u76EE\u7684\u4FE1\u606F
-PropertiesWizardPage.ItemExistsError=\u76F8\u540C\u540D\u79F0\u7684\u9879\u5DF2\u5B58\u5728\uFF0C\u5982\u6709\u9700\u8981\uFF0C\u8BF7\u68C0\u67E5\u56DE\u6536\u7AD9
-PropertiesWizardPage.KeywordsError=\u540D\u5B57\u4E0D\u5408\u6CD5
-PropertiesWizardPage.Name=\u4f5c\u4e1a\u540d
-PropertiesWizardPage.NameEmptyError=\u4f5c\u4e1a\u540d\u4e3a\u7a7a\u3002
-PropertiesWizardPage.NameFormatError=\u4f5c\u4e1a\u540d\u5305\u542b\u4e0d\u5408\u6cd5\u7b26\u3002
-PropertiesWizardPage.Path=\u8DEF\u5F84
-PropertiesWizardPage.Purpose=\u76EE\u7684
-PropertiesWizardPage.Select=\u9009\u62E9
-PropertiesWizardPage.SelectfolderMessage=\u9009\u62E9\u5C06\u8981\u521B\u5EFA\u6761\u76EE\u7684\u6587\u4EF6\u5939
-PropertiesWizardPage.SelectfolderTitle=\u9009\u62E9\u76EE\u5F55
-PropertiesWizardPage.Status=\u72B6\u6001
-PropertiesWizardPage.Version=\u7248\u672C
-EAuthenticationMethod.anonymousAuth=\u533f\u540d\u9a8c\u8bc1
-EAuthenticationMethod.simpleAuth=\u7b80\u5355\u9a8c\u8bc1
-AdvancedSocketFactory.failedInitial=\u9519\u8BEF\uFF1A\u65E0\u6CD5\u521D\u59CB\u5316\uFF1A
-CopyAction.thisText.copy=\u590D\u5236
-RestoreAction.action.title=\u6062\u590D
-RestoreAction.action.toolTipText=\u6062\u590D
-PasteAction.thisText.paste=\u7C98\u8D34
-DeleteAction.action.foreverTitle=\u6c38\u4e45\u5220\u9664
-DeleteAction.action.logicalToolTipText=\u5c06\u5bf9\u8c61\u653e\u5165\u56de\u6536\u7ad9
-DeleteAction.dialog.message0=\u5C06\u6C38\u4E45\u5220\u9664\uFF08\u4E0D\u53EF\u6062\u590D\uFF09\u3002
-DeleteAction.dialog.title=\u6c38\u4e45\u5220\u9664
-DeleteAction.error.title=\u7981\u6b62\u5220\u9664
-DuplicateAction.cannotGenerateItem=\u65E0\u6CD5\u751F\u6210\u7C98\u8D34\u9879\u76EE\u7684\u6807\u7B7E.
-DuplicateAction.dialog.title=\u8BF7\u8F93\u5165\u4F5C\u4E1A\u540D
-DuplicateAction.thisText.duplicate=\u91CD\u590D
-DuplicateAction.NameEmptyError=\u4f5c\u4e1a\u540d\u4e3a\u7a7a\u3002
-DuplicateAction.NameFormatError=\u4f5c\u4e1a\u540d\u5305\u542b\u4e0d\u5408\u6cd5\u7b26\u3002
-DuplicateAction.ItemExistsError=\u76F8\u540C\u540D\u79F0\u7684\u9879\u5DF2\u5B58\u5728\uFF0C\u5982\u6709\u9700\u8981\uFF0C\u8BF7\u68C0\u67E5\u56DE\u6536\u7AD9
-DuplicateAction.KeywordsError=\u540D\u5B57\u4E0D\u5408\u6CD5
-EmptyRecycleBinAction.action.title=\u6e05\u7a7a\u56de\u6536\u7ad9
-EmptyRecycleBinAction.action.toolTipText=\u6e05\u7a7a\u56de\u6536\u7ad9
-EmptyRecycleBinAction.dialog.title=\u6e05\u7a7a\u56de\u6536\u7ad9
-PasteObjectAction.error.labelAlreadyExists=\u5df2\u7ecf\u5b58\u5728\u5f53\u524d\u8def\u5f84\u4e0b\u5e26\u6b64\u6807\u7b7e\u7684\u5bf9\u8c61
-PasteObjectAction.error.title=\u65e0\u6cd5\u7c98\u8d34
-JobletReferenceDialog.DeletedInfor=\u5728\u56DE\u6536\u7AD9
-JobletReferenceDialog.project=\u5de5\u7a0b
-JobletReferenceDialog.Title=\u5220\u9664joblet\u5931\u8D25
-CopyToGenericSchemaHelper.cannotGenarateItem=\u65E0\u6CD5\u751F\u6210\u7C98\u8D34\u9879\u76EE\u7684\u6807\u7B7E.
-ContextReferenceDialog.Recycle=\u5728\u56DE\u6536\u7AD9
-ContextReferenceDialog.Types=\u7C7B\u578B

org.talend.core.repository/src/main/java/org/talend/core/repository/model/AbstractEMFRepositoryFactory.java

@@ -325,8 +325,7 @@ public abstract class AbstractEMFRepositoryFactory extends AbstractRepositoryFac
     protected abstract FolderHelper getFolderHelper(org.talend.core.model.properties.Project emfProject);
 
     protected Item copyFromResource(Resource createResource) throws PersistenceException, BusinessException {
-        boolean changeLabelWithCopyPrefix = true;
-        return copyFromResource(createResource, changeLabelWithCopyPrefix);
+        return copyFromResource(createResource, true);
     }
 
     protected Item copyFromResource(Resource createResource, boolean changeLabelWithCopyPrefix) throws PersistenceException,
@@ -343,49 +342,30 @@ public abstract class AbstractEMFRepositoryFactory extends AbstractRepositoryFac
         return newItem;
     }
 
-    protected Item copyFromResource(Resource createResource, String newItemLabel) throws PersistenceException, BusinessException {
-        if (newItemLabel != null) {
-            Item newItem = (Item) EcoreUtil.getObjectByType(createResource.getContents(), PropertiesPackage.eINSTANCE.getItem());
-            Property property = newItem.getProperty();
-            property.setId(getNextId());
-            property.setAuthor(getRepositoryContext().getUser());
-            property.setLabel(newItemLabel);
-            property.setDisplayName(newItemLabel);
-            if (!isNameAvailable(getRepositoryContext().getProject(), property.getItem(), null)) {
-                throw new BusinessException(Messages.getString("AbstractEMFRepositoryFactory.cannotGenerateItem")); //$NON-NLS-1$
-            }
-            EcoreUtil.resolveAll(createResource);
-            return newItem;
-        } else {
-            boolean changeLabelWithCopyPrefix = true;
-            return copyFromResource(createResource, changeLabelWithCopyPrefix);
-        }
-    }
-
     /**
-     * Method "setPropNewName". Try first the new name with "[PROPERTY_NAME]_Copy", then, if it already exists, try
-     * again with "[PROPERTY_NAME]_CopyN" where N is number between 1 and Integer.MAX.
+     * DOC smallet Comment method "getCopiedLabel".
      * 
      * @param copiedProperty
+     * @return
      * @throws PersistenceException
      * @throws BusinessException
      */
     private void setPropNewName(Property copiedProperty) throws PersistenceException, BusinessException {
         String originalLabel = copiedProperty.getLabel();
-        String copy = "_Copy"; //$NON-NLS-1$
-        String initialTry = originalLabel + copy;
+        String add1 = "Copy_of_"; //$NON-NLS-1$
+        String initialTry = add1 + originalLabel;
         copiedProperty.setLabel(initialTry);
         // changed by hqzhang for TDI-19965
         copiedProperty.setDisplayName(initialTry);
         if (isNameAvailable(getRepositoryContext().getProject(), copiedProperty.getItem(), null)) {
             return;
         } else {
-            long index = 1;
+            char j = 'a';
             while (!isNameAvailable(getRepositoryContext().getProject(), copiedProperty.getItem(), null)) {
-                if (index < 0) {
+                if (j > 'z') {
                     throw new BusinessException(Messages.getString("AbstractEMFRepositoryFactory.cannotGenerateItem")); //$NON-NLS-1$
                 }
-                String nextTry = originalLabel + copy + (index++);
+                String nextTry = initialTry + "_" + (j++) + ""; //$NON-NLS-1$ //$NON-NLS-2$
                 copiedProperty.setLabel(nextTry);
                 // changed by hqzhang for TDI-19965
                 copiedProperty.setDisplayName(nextTry);

org.talend.core.repository/src/main/java/org/talend/core/repository/model/IRepositoryFactory.java

@@ -242,8 +242,6 @@ public interface IRepositoryFactory {
 
     public Item copy(Item item, IPath path, boolean changeLabelWithCopyPrefix) throws PersistenceException, BusinessException;
 
-    public Item copy(Item sourceItem, IPath targetPath, String newItemLabel) throws PersistenceException, BusinessException;
-
     /**
      * DOC mhelleboid Comment method "cancel".
      * 
@@ -384,5 +382,4 @@ public interface IRepositoryFactory {
     public void updateLockStatus() throws PersistenceException;
 
     public boolean isModified(Property property);
-
 }

org.talend.core.repository/src/main/java/org/talend/core/repository/model/ProxyRepositoryFactory.java

@@ -1321,23 +1321,6 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
 
     }
 
-    @Override
-    public Item copy(Item sourceItem, IPath targetPath, String newItemLabel) throws PersistenceException, BusinessException {
-
-        if (sourceItem instanceof ProcessItem) {
-            try {
-                coreService.checkJob(sourceItem.getProperty().getLabel());
-            } catch (BusinessException e) {
-                throw new PersistenceException(e);
-            } catch (RuntimeException e) {
-                // don't do anything
-            }
-        }
-        Item targetItem = this.repositoryFactoryFromProvider.copy(sourceItem, targetPath, newItemLabel);
-        return targetItem;
-
-    }
-
     @Override
     public void saveCopy(Item sourceItem, Item targetItem) {
         fireRepositoryPropertyChange(ERepositoryActionName.COPY.getName(), sourceItem, targetItem);
@@ -1722,15 +1705,15 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
                 LanguageManager.reset();
                 getRepositoryContext().setProject(project);
 
+                // Check project compatibility
+                checkProjectCompatibility(project);
+
                 currentMonitor = subMonitor.newChild(1, SubMonitor.SUPPRESS_NONE);
                 currentMonitor.beginTask(Messages.getString("ProxyRepositoryFactory.initializeProjectConnection"), 1); //$NON-NLS-1$
                 this.repositoryFactoryFromProvider.beforeLogon(project);
                 // monitorWrap.worked(1);
                 TimeMeasure.step("logOnProject", "beforeLogon");
 
-                // Check project compatibility
-                checkProjectCompatibility(project);
-
                 currentMonitor = subMonitor.newChild(1, SubMonitor.SUPPRESS_NONE);
                 currentMonitor.beginTask("Execute before logon migrations tasks", 1); //$NON-NLS-1$
                 executeMigrations(project, true, currentMonitor);
@@ -1885,13 +1868,6 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
                 return obj;
             }
         }
-        for (Project p : projectManager.getReferencedProjects(project)) {
-            IRepositoryViewObject specVersion = getSpecificVersion(p, id, version, avoidSaveProject);
-            if (specVersion != null) {
-                return specVersion;
-            }
-        }
-
         return null;
     }
 

org.talend.core.repository/src/main/java/org/talend/core/repository/utils/XmiResourceManager.java

@@ -134,13 +134,12 @@ public class XmiResourceManager {
         }
     }
 
-    public synchronized Property loadProperty(IResource iResource) {
+    public Property loadProperty(IResource iResource) {
         // force unload old version, or the UI won't be synchronized all the time to the current file.
         // this is only if a user update itself a .item or .properties, or for SVN repository.
         //
         URI propertyUri = URIHelper.convert(iResource.getFullPath());
         URI itemResourceURI = getItemResourceURI(propertyUri);
-        URI screenshotResourceURI = getScreenshotResourceURI(itemResourceURI);
         List<Resource> resources = new ArrayList<Resource>(resourceSet.getResources());
         for (Resource res : resources) {
             if (res != null) {
@@ -152,10 +151,6 @@ public class XmiResourceManager {
                     res.unload();
                     resourceSet.getResources().remove(res);
                 }
-                if (screenshotResourceURI.toString().equals(res.getURI().toString())) {
-                    res.unload();
-                    resourceSet.getResources().remove(res);
-                }
             }
         }
 
@@ -227,41 +222,36 @@ public class XmiResourceManager {
         return resourceSet.createResource(propertyResourceURI);
     }
 
-    public Resource getReferenceFileResource(Resource itemResource, ReferenceFileItem refFile, boolean needLoad) {
-        URI referenceFileURI = getReferenceFileURI(itemResource.getURI(), refFile.getExtension());
+    public Resource getReferenceFileResource(Resource itemResource, String extension, boolean needLoad) {
+        URI referenceFileURI = getReferenceFileURI(itemResource.getURI(), extension);
         URIConverter converter = resourceSet.getURIConverter();
         Resource referenceResource = new ByteArrayResource(referenceFileURI);
         InputStream inputStream = null;
 
         List<Resource> resources = new ArrayList<Resource>(resourceSet.getResources());
-        // in case ESB load reference file from the physcial file,but DI need reference from the EMF,so add this flag
-        if (refFile.isReloadFromFile()) {
-            for (Resource res : resources) {
-                if (res != null && referenceFileURI.toString().equals(res.getURI().toString())) {
-                    res.unload();
-                    resourceSet.getResources().remove(res);
-                }
+        for (Resource res : resources) {
+            if (res != null && referenceFileURI.toString().equals(res.getURI().toString())) {
+                res.unload();
+                resourceSet.getResources().remove(res);
             }
+        }
 
-            resourceSet.getResources().add(referenceResource);
+        resourceSet.getResources().add(referenceResource);
+        try {
+            if (needLoad) {
+                inputStream = converter.createInputStream(referenceFileURI);
+                referenceResource.load(inputStream, null);
+            }
+        } catch (IOException e) {
+            e.printStackTrace();
+        } finally {
             try {
-                if (needLoad) {
-                    inputStream = converter.createInputStream(referenceFileURI);
-                    referenceResource.load(inputStream, null);
+                if (inputStream != null) {
+                    inputStream.close();
                 }
             } catch (IOException e) {
-                e.printStackTrace();
-            } finally {
-                try {
-                    if (inputStream != null) {
-                        inputStream.close();
-                    }
-                } catch (IOException e) {
-                    ExceptionHandler.process(e);
-                }
+                ExceptionHandler.process(e);
             }
-        } else {
-            referenceResource = resourceSet.getResource(referenceFileURI, true);
         }
         return referenceResource;
     }
@@ -379,16 +369,6 @@ public class XmiResourceManager {
         }
         Resource itemResource = null;
         if (fileExist) {
-            List<Resource> resources = new ArrayList<Resource>(resourceSet.getResources());
-            // for (Resource res : resources) {
-            // if (res != null) {
-            // if (itemResourceURI.toString().equals(res.getURI().toString())) {
-            // res.unload();
-            // resourceSet.getResources().remove(res);
-            // break;
-            // }
-            // }
-            // }
             try {
                 // judge whether the physical file exists or not
                 itemResource = resourceSet.getResource(itemResourceURI, true);
@@ -396,7 +376,7 @@ public class XmiResourceManager {
                 // do nothing, consider the file don't exist
                 itemResource = null;
             }
-        }
+        } 
         if (itemResource == null && createIfNotExist) {
             itemResource = resourceSet.createResource(itemResourceURI);
         }
@@ -678,10 +658,10 @@ public class XmiResourceManager {
 
         for (Resource resource : resourcesToSave) {
             // add for bug TDI-20844
-            // if (ResourceFilenameHelper.mustChangeLabel(fileNameTest) && resource.getURI() != null
-            // && resource.getURI().toString().endsWith(".screenshot")) {
-            // continue;
-            // }
+            if (ResourceFilenameHelper.mustChangeLabel(fileNameTest) && resource.getURI() != null
+                    && resource.getURI().toString().endsWith(".screenshot")) {
+                continue;
+            }
             saveResource(resource);
         }
         if (!resourceProperty.equals(lastVersionProperty)) {

org.talend.core.repository/src/main/java/org/talend/repository/model/ProjectRepositoryNode.java

@@ -181,6 +181,7 @@ public class ProjectRepositoryNode extends RepositoryNode implements IProjectRep
     public static ProjectRepositoryNode getInstance() {
         if (defaultProjRepoNode == null) {
             defaultProjRepoNode = new ProjectRepositoryNode(null, null, ENodeType.STABLE_SYSTEM_FOLDER);
+            ProjectManager.getInstance().updateViewProjectNode(defaultProjRepoNode);
             defaultProjRepoNode.initialize(null);
         }
         return defaultProjRepoNode;
@@ -463,8 +464,6 @@ public class ProjectRepositoryNode extends RepositoryNode implements IProjectRep
             refProject.setProperties(EProperties.CONTENT_TYPE, ERepositoryObjectType.REFERENCED_PROJECTS);
             nodes.add(refProject);
         }
-        // delete the hidden nodes
-        deleteHiddenNodes(nodes);
         // *init the repository node from extension
         initExtensionRepositoryNodes(curParentNode);
 
@@ -477,31 +476,6 @@ public class ProjectRepositoryNode extends RepositoryNode implements IProjectRep
         collectRepositoryNodes(curParentNode);
     }
 
-    private void deleteHiddenNodes(List<IRepositoryNode> nodes) {
-
-        if (GlobalServiceRegister.getDefault().isServiceRegistered(IBrandingService.class)) {
-            IBrandingService service = (IBrandingService) GlobalServiceRegister.getDefault().getService(IBrandingService.class);
-            List<IRepositoryNode> hiddens = service.getBrandingConfiguration().getHiddenRepositoryCategory(this, "DI");
-            for (IRepositoryNode node : hiddens) {
-                Iterator<IRepositoryNode> it = nodes.iterator();
-                while (it.hasNext()) {
-                    IRepositoryNode curNode = it.next();
-                    if (curNode.getContentType() != null && curNode.getContentType().equals(ERepositoryObjectType.METADATA)) {
-                        for (IRepositoryNode curNode2 : curNode.getChildren()) {
-                            if (curNode2.equals(node)) {
-                                curNode.getChildren().remove(curNode2);
-                                break;
-                            }
-                        }
-                    }
-                    if (curNode.equals(node)) {
-                        it.remove();
-                    }
-                }
-            }
-        }
-    }
-
     private void collectRepositoryNodes(IRepositoryNode curParentNode) {
         if (repositoryNodeMap == null) {
             repositoryNodeMap = new HashMap<String, RepositoryNode>();
@@ -1223,8 +1197,7 @@ public class ProjectRepositoryNode extends RepositoryNode implements IProjectRep
                     referencedProjectNode.setProperties(EProperties.CONTENT_TYPE, ERepositoryObjectType.REFERENCED_PROJECTS);
                     parent.getChildren().add(referencedProjectNode);
                     // fix the bug for Ref-project
-                    // TDI-23358, revert to before
-                    // ProjectManager.getInstance().updateViewProjectNode(referencedProjectNode);
+                    ProjectManager.getInstance().updateViewProjectNode(referencedProjectNode);
 
                     referencedProjectNode.initialize(currentPerspective);
                 }

org.talend.core.repository/src/main/java/org/talend/repository/ui/actions/DeleteAction.java

@@ -1402,15 +1402,6 @@ public class DeleteAction extends AContextualAction {
                         break;
                     }
 
-                    if (contentType == ERepositoryObjectType.METADATA_VALIDATION_RULES) {
-                        RepositoryNode parent = node.getParent().getParent();
-                        if (parent != null && ERepositoryObjectType.METADATA_CON_TABLE == parent.getObjectType()) {
-                            enabled = false;
-                            visible = false;
-                            break;
-                        }
-                    }
-
                     IRepositoryViewObject repObj = node.getObject();
 
                     ERepositoryStatus status = repObj.getRepositoryStatus();

org.talend.core.runtime.nl/plugin_zh_CN.properties

@@ -1,2 +0,0 @@
-Metadata=\u5143\u6570\u636E
-TalendDataCollectorPreview=\u9884

org.talend.core.runtime.nl/src/main/java/messages_en.properties

@@ -529,4 +529,3 @@ BinRepositoryNode.label=Recycle bin
 EMetadataEncoding.Latin9=Latin9
 HDFS=HDFS
 HCAT=HCAT
-EConnectionType.startsMenu=Starts

org.talend.core.runtime.nl/src/main/java/messages_nl.properties

@@ -1,4 +1,3 @@
-AbstractBrandingService_job_license_header_content=// ============================================================================\n//\n// Copyright (c) 2005-2011, Talend Inc.\n//\n// This source code has been automatically generated by_{0}\n// / JobDesigner (CodeGenerator version {1})\n// You can find more information about Talend products at www.talend.com.\n// You may distribute this code under the terms of the GNU LGPL license\n// http://www.gnu.org/licenses/lgpl.html).\n//\n// ============================================================================
 ComponentsFormatPreferencePage.add=Toevoegen
 ComponentsFormatPreferencePage.ErrorTitle=Fout
 ComponentToRepositoryProperty.error=Fout
@@ -12,32 +11,19 @@ ContextSetConfigurationDialog.nameNotValid=Ongeldige naam
 ContextTemplateComposite.CommentLabel=Opmerking
 ContextTemplateComposite.nameLabel=Naam
 ContextTemplateComposite.sourceLabel=Bron
-ContextTreeConstants.contextName=Context
 EComponentCategory_assignment=Toewijzing
-EComponentCategory_context=Context
 EComponentCategory_properties=Eigenschappen
 EComponentCategory_sqlTemplate=SQL Template
-EComponentCategory_version=Versie
 MetadataTableEditorView.CommentTitle=Opmerking
 ProcessorUtilities.finalizeBuild=Bouwen afronden...
 ProcessorUtilities.generatingJob=Job genereren
 ProcessorUtilities.loadingJob=Job laden...
 PropertiesWizardPage.Name=Naam
-PropertiesWizardPage.Version=Versie
 RoutinesFunctionProposal.User=Gebruiker
 VariableItemEditor.name=Naam
 VariableItemEditor.new=Nieuw
-VersionSection.CreationDate=Creatie Datum
-VersionSection.ModificationDate=Wijzigings Datum
-VersionSection.Version=Versie
-XmlArray.InvalidFile=Ongeldig bestand
-XSDValidater.IllegalArgument=De input xsd file bestaat niet.
 repository.concept=Concept
 EUpdateItemType.Name=Naam
-UpdatesConstants.Context=Context
-UpdatesConstants.ContextGroup=Context Groep
-UpdatesConstants.Joblet=Joblet
-UpdatesConstants.Job=Job
 ApplicationActionBarAdvisor.menuFileLabel=&Bestand
 ApplicationActionBarAdvisor.navigateLabel=&Navigeer
 ApplicationActionBarAdvisor.gotoLabel=&Ga naar
@@ -51,4 +37,3 @@ BusinessAppearanceComposite.textAlignment.horizontal.centre=Centreer
 BusinessAppearanceComposite.textAlignment.vertical.centre=Centreer
 ConnectionBean.Local=Lokaal
 ConnectionBean.DefaultConnection=Standaard verbinding
-EConnectionType.when=When

org.talend.core.runtime.nl/src/main/java/messages_zh_CN.properties

@@ -1,274 +0,0 @@
-AbstractComponentsProvider.folderNotExist=\u6587\u4EF6\u5939{0}\u4E0D\u5B58\u5728.
-AbstractItemMigrationTask.taskFailed=\u8FC1\u79FB{0}\u9879\u76EE\u5931\u8D25{1}
-ColorsCodeViewerPreferencePage.Comment1Color=\u6CE8\u91CA1 \u989C\u8272
-ColorsCodeViewerPreferencePage.Comment2Color=\u6CE8\u91CA2 \u989C\u8272
-ColorsCodeViewerPreferencePage.DigitColor=\u6570\u5B57 \u989C\u8272
-ColorsCodeViewerPreferencePage.FunctionColor=\u65B9\u6CD5 \u989C\u8272
-ColorsCodeViewerPreferencePage.InvalidColor=\u975E\u6CD5 \u989C\u8272
-ColorsCodeViewerPreferencePage.LabelColor=\u6807\u7B7E \u989C\u8272
-ColorsCodeViewerPreferencePage.Literal1Color=\u6587\u5B571 \u989C\u8272
-ColorsCodeViewerPreferencePage.Literal2Color=\u6587\u5B572 \u989C\u8272
-ColorsCodeViewerPreferencePage.MarkupColor=\u6807\u8BB0 \u989C\u8272
-ColorsCodeViewerPreferencePage.OperatorColor=\u64CD\u4F5C\u7B26 \u989C\u8272
-ColorsCodeViewerPreferencePage.defaultColor=\u9ED8\u8BA4 \u989C\u8272
-ColorsCodeViewerPreferencePage.fieldTip=\u7C97\u4F53(&B)
-ColorsCodeViewerPreferencePage.keyword1Color=\u5173\u952E\u5B571 \u989C\u8272
-ColorsCodeViewerPreferencePage.keyword2Color=\u5173\u952E\u5B572 \u989C\u8272
-ColorsCodeViewerPreferencePage.keyword3Color=\u5173\u952E\u5B573 \u989C\u8272
-ColumnNameChangedExt.columnChanged=\u7ED3\u70B9: {0} \u5217\u6539\u53D8: {1}-> {2}
-ComponentsFormatPreferencePage.add=\u589E\u52A0
-ComponentsFormatPreferencePage.errorCreateConnectionName=\u547D\u540D"{0}"\u65E0\u6548
-ComponentsFormatPreferencePage.formatConnection=\u683C\u5F0F\u5316\u9ED8\u8BA4\u8FDE\u63A5
-ComponentsFormatPreferencePage.formatLable=\u683C\u5F0F\u5316\u9ED8\u8BA4\u6807\u7B7E
-ComponentsFormatPreferencePage.remove=\u5220\u9664
-ComponentsFormatPreferencePage.ErrorTitle=\u9519\u8BEF
-ComponentToRepositoryProperty.error=\u9519\u8BEF
-ContextComposite.tableValue=\u8868\u683C\u5F0F\u503C
-ContextComposite.treeValue=\u6811\u683C\u5F0F\u503C
-ContextParameterProposal.Description=\u63CF\u8FF0\uFF1A {0}
-ContextValueErrorChecker.ErrorTitile=\u4E0A\u4E0B\u6587\u503C\u9519\u8BEF: 
-ContextParameterProposal.NoCommentAvaiable=\u6CA1\u6709\u6CE8\u91CA\u3002
-ContextProcessSection.1=\u83DC\u5355\u8868\u683C
-ContextProcessSection.12=\u4E3A\u4E0A\u4E0B\u6587\u6539\u540D
-ContextProcessSection.13=\u4E3A\u4E0A\u4E0B\u6587\u6307\u5B9A\u65B0\u540D\u5B57{0}
-ContextProcessSection.2=\u8BF7\u786E\u8BA4?
-ContextProcessSection.29=\u9519\u8BEF
-ContextProcessSection.4=\u6DFB\u52A0\u65B0\u7684\u4E0A\u4E0B\u6587 ->(
-ContextProcessSection.49=\u7F3A\u7701\u4E0A\u4E0B\u6587
-ContextProcessSection.6=\u65B0\u7684\u4E0A\u4E0B\u6587
-ContextProcessSection.7=\u4E3A\u65B0\u7684\u4E0A\u4E0B\u6587\u6307\u5B9A\u540D\u5B57
-ContextProcessSection.ParameterNameIsNotValid=\u53C2\u6570\u540D\u5B57\u65E0\u6548\u3002
-ContextProcessSection.RemoveInformation={0}\u4E3A\u9ED8\u8BA4\u7684\u4E0A\u4E0B\u6587,\u4E0D\u80FD\u5220\u9664
-ContextProcessSection.errorTitle=\u9519\u8BEF
-ConextTableValuesComposite.nameLabel=\u4f5c\u4e1a\u540d
-ConextTemplateComposite.OrderMessages=\u5982\u679C\u60A8\u60F3\u91CD\u65B0\u6392\u5217\u53D8\u91CF\uFF0C\u5FC5\u987B\u9009\u4E2D\u5B83.
-ConextTemplateComposite.OrderText=\u539F\u59CB\u987A\u5E8F
-ContextSetConfigurationDialog.nameNotValid=\u8BE5\u540D\u79F0\u65E0\u6548
-ContextTemplateComposite.nameLabel=\u4f5c\u4e1a\u540d
-ContextTemplateComposite.scriptCodeLabel=\u811A\u672C\u4EE3\u7801
-ContextTemplateComposite.typeLabel=\u7C7B\u578B
-ContextTreeConstants.contextName=\u7EC4\u4EF6
-ContextTreeConstants.promptName=\u63D0\u793A
-ContextTreeConstants.valueName=\u503c
-ContextTreeConstants.variableName=\u53D8\u91CF
-ConextTemplateComposite.addToRepositoryContextAction.label=\u6DFB\u52A0\u5230repository\u4E0A\u4E0B\u6587
-CorePreferencePage.componentDefaultFileDirectory=\u7EC4\u4EF6\u7F3A\u7701\u6587\u4EF6\u76EE\u5F55
-CorePreferencePage.groupBySource=\u5728\u4E0A\u4E0B\u6587\u201C\u6839\u636E\u6E90\u5206\u7EC4\u201D
-CorePreferencePage.iReportPath=iReport \u8DEF\u5F84
-CorePreferencePage.javaInterpreter=Java\u89E3\u91CA\u5668
-CorePreferencePage.perlInterpreter=Perl\u89E3\u91CA\u5668
-CorePreferencePage.previewLimit=\u9884\u89C8\u9650\u5236
-CorePreferencePage.runInMultiThread=\u591A\u7EBF\u7A0B\u8FD0\u884C(\u521b\u5efa\u65b0\u4f5c\u4e1a\u9ed8\u8ba4\u91c7\u7528)
-CorePreferencePage.temporaryFiles=\u4E34\u65F6\u6587\u4EF6
-DbTableSelectorDialog.textContent=\u9009\u62E9\u8868\u540D
-ECodeLanguage.unknowLanguage=\u672A\u77E5\u8BED\u8A00
-EComponentCategory_advanceSetting=\u9AD8\u7EA7\u8BBE\u7F6E
-EComponentCategory_appearance=\u5916\u89C2
-EComponentCategory_assignment=\u6307\u6D3E
-EComponentCategory_context=\u7EC4\u4EF6
-EComponentCategory_doc=\u6587\u6863
-EComponentCategory_main=\u4E3B\u7EBF
-EComponentCategory_sqlTemplate=SQL\u6A21\u677F
-EComponentCategory_statsAndLogs=\u9759\u6001\u4FE1\u606F\u548C\u65E5\u5FD7
-EComponentCategory_version=\u7248\u672C
-EComponentCategory_view=\u89c6\u56fe
-EComponentCategory.advancedSettings=\u9AD8\u7EA7\u8BBE\u7F6E
-EConnectionType.iteratorMenu=\u8FED\u4EE3
-EConnectionType.lookupMenu=\u8ffd\u52a0\u5217
-EConnectionType.mainMenu=\u4E3B\u7EBF
-EConnectionType.onComponentErrorMenu=\u7EC4\u4EF6\u8FD0\u884C\u9519\u8BEF
-EConnectionType.onComponentOkMenu=\u7EC4\u4EF6\u8FD0\u884C\u6B63\u786E
-EConnectionType.onSubjobErrorMenu=\u5B50job\u9519\u8BEF
-EConnectionType.onSubjobOkMenu=\u5B50job\u6B63\u786E
-EConnectionType.runAfterMenu=\u8FD0\u884C\u540E
-EConnectionType.runIfMenu=\u6B63\u5E38\u65F6\u8FD0\u884C
-EConnectionType.tableMenu=\u540E\u8FD0\u884C
-EConnectionType.mergeMenu=\u5408\u5E76
-EConnectionType.synchronize=\u540C\u6B65
-EConnectionType.parallelize=\u5E76\u884C
-EMetadataEncoding.Arabic=\u963F\u62C9\u4F2F\u8BED
-EMetadataEncoding.Cyrillic=\u53E4\u4EE3\u65AF\u62C9\u592B\u8BED
-EMetadataEncoding.EUC_CN=\u7B80\u4F53\u4E2D\u6587(\u6269\u5C55\u7684Unix Code-CN)
-EMetadataEncoding.GB18030=\u4E2D\u6587\u56FD\u6807
-EMetadataEncoding.GB2312=\u4E2D\u6587
-EMetadataEncoding.Greek=\u5E0C\u814A
-EMetadataEncoding.Hebrew=\u5E0C\u4F2F\u6765\u8BED
-EMetadataEncoding.Latin1=Latin1 (\u897F\u6B27)
-EMetadataEncoding.Latin2=Latin2 (\u4E1C\u6B27)
-EMetadataEncoding.Latin3=Latin3 (\u5357\u6B27)
-EMetadataEncoding.Latin4=Latin4 (\u5317\u6B27)
-EMetadataEncoding.Latin5=Latin5 (\u571F\u8033\u5176\u8BED)
-EMetadataEncoding.Latin6=Latin6 (\u65E5\u8033\u66FC\u8BED)
-EMetadataEncoding.Microsoft_Latin1=\u5FAE\u8F6F(Latin-1)
-EMetadataEncoding.UTF16=Unicode 2.0 (16\u4F4D)
-EMetadataEncoding.UTF16BE=Unicode BigEndian (16\u4F4D)
-ERepositoryObjectType.FolderNotFound=\u7C7B\u578B{0}\u7684\u76EE\u5F55\u672A\u627E\u5230
-ERepositoryObjectType.NotImplemented=\u672A\u5B9E\u73B0
-ExtractMetaDataFromDataBase.SchemaNoPresent=Schema\u5728\u6570\u636E\u5E93\u4E2D\u672A\u51FA\u73B0
-ExtractMetaDataFromDataBase.connectionSuccessful=\u8FDE\u63A5\u6210\u529F
-ExtractMetaDataFromDataBase.dbTypeNotFound=dbType{0}\u672A\u627E\u5230
-Function.FunctionName=\u51FD\u6570\u540D{0}
-FunctionManager.PurePerl.Desc=\u8BBE\u7F6E\u81EA\u5B9A\u4E49\u8868\u8FBE\u5F0F
-FunctionManager.PurePerl.ParaName=\u81EA\u5B9A\u4E49\u53C2\u6570
-GlobalServiceRegister.ServiceNotRegistered=\u670D\u52A1{0}\u6CA1\u6709\u88AB\u6CE8\u518C
-GroupByContextAction.groupContext=\u6309\u4E0A\u4E0B\u6587\u5206\u7EC4
-GroupByVariableAction.groupVariable=\u6309\u53D8\u91CF\u5206\u7EC4
-JavaSimpleDateFormatProposalProvider.quoteDisplayError=\u4E24\u4E2A\u5355\u5F15\u53F7\u663E\u793A\u4E3A\u4E00\u4E2A\u5355\u5F15\u53F7
-ListPreferencePage.RemoveButtonName=\u5220\u9664
-MetadataDialog.CopyToInput.toolTipText=\u5C06\u8F93\u51FAschema\u6240\u6709\u5217\u590D\u5236\u5230\u8F93\u5165schema
-MetadataDialog.CopySelectionToInput.toolTipText=\u5C06\u8F93\u51FAschema\u5DF2\u9009\u62E9\u7684\u5217\u590D\u5236\u5230\u8F93\u5165schema
-MetadataDialog.CopyToOutput=\u5C06\u8F93\u5165schema\u6240\u6709\u5217\u590D\u5236\u5230\u8F93\u51FAschema
-MetadataDialog.CopySelectionToOutput=\u5C06\u8F93\u5165schema\u5DF2\u9009\u62E9\u7684\u5217\u590D\u5236\u5230\u8F93\u51FAschema
-MetadataDialog.Message=\u6240\u6709\u6765\u81EA\u8F93\u5165Schema\u7684\u5217\u5C06\u88AB\u8F6C\u6362\u5230\u8F93\u51FASchema
-MetadataDialog.SchemaModification=Schema\u7F16\u8F91
-MetadataDialog.TransferMessage=\u6240\u6709\u6765\u81EA\u8F93\u51FASchema\u7684\u5217\u5C06\u88AB\u8F6C\u6362\u5230\u8F93\u5165Schema
-MetadataEmfTableEditor.ColumnInvalid=\u5217\u540D{0}
-MetadataEmfTableEditor.ColumnNameExists=\u5217\u540D{0}\u5DF2\u5B58\u5728\u3002
-MetadataTableEditor.ColumnNameExists=\u5217\u540D{0}\u5DF2\u7ECF\u5B58\u5728\u3002
-MetadataTableEditor.ColumnNameIsInvalid=\u5217\u540D{0}
-MetadataTableEditorView.ColumnTitle=\u5217
-MetadataTableEditorView.DBTypeTitle=\u5fc5\u987b\u9009\u62e9 DB \u7c7b\u578b
-MetadataTableEditorView.DefaultTitle=\u65e0
-MetadataTableEditorView.KeyTitle=\u5173\u952E\u5B57
-MetadataTableEditorView.LengthTitle=\u957F\u5EA6
-MetadataTableEditorView.NullableTitle=\u53EF\u4E3A\u7A7A
-MetadataTableEditorView.PatternTitle=\u6A21\u5F0F (\u53EA\u9650\u6570\u636E)
-MetadataTableEditorView.PrecisionTitle=\u7CBE\u5EA6
-MetadataTableEditorView.TypleTitle=\u7C7B\u578B
-MetadataTalendType.DBMSNotSetted=\u6570\u636E\u5E93\u672A\u8BBE\u7F6E
-MetadataTalendTypeEditor.button.edit=\u7F16\u8F91(E&)
-MetadataTalendTypeEditor.button.export=\u5BFC\u51FA(E&)
-MetadataTalendTypeEditor.button.import=\u5BFC\u5165(I&)
-MetadataTalendTypeEditor.column1.Name=Metadata\u6620\u5C04\u6587\u4EF6
-MetadataTalendTypeEditor.editMappingDialog.title=\u7F16\u8F91Mapping\u6587\u4EF6
-MetadataTalendTypeEditor.error.message=\u9519\u8BEF\u4FE1\u606F
-MetadataTalendTypeEditor.fileIsImported=\u6587\u4EF6\u5DF2\u5B58\u5728\u3002
-MetadataTalendTypeEditor.fileIsInvalid=\u5BFC\u5165\u6587\u4EF6\u4E0D\u5408\u6CD5\u3002
-MetadataTalendTypeEditor.fileNameStartRule=\u6587\u4EF6\u540D\u5FC5\u987B\u4EE5'mapping_'\u5F00\u5934\u3002
-PaletteContentDialog.connection=\u683C\u5F0F\u5316\u9ED8\u8BA4\u8FDE\u63A5
-PaletteContentDialog.lable=\u683C\u5F0F\u5316\u9ED8\u8BA4\u6807\u7B7E
-Parameter.Name=\u53C2\u6570\u540D
-PatternCalendar.example=\u793A\u4F8B:
-PerspectiveMenuManager.perspectiveLabel=\u900F\u89C6\u56FE(&P)
-PropertiesWizard.EditPropertiesPageTitle=\u7F16\u8F91\u5C5E\u6027
-PropertiesWizardPage.Author=\u4F5C\u8005
-PropertiesWizardPage.Description=\u5FC5\u8981\u7684
-PropertiesWizardPage.EmptyDescWarning=\u5EFA\u8BAE\u4E0D\u8981\u4F7F\u7528\u7A7A\u63CF\u8FF0\u4FE1\u606F\u3002
-PropertiesWizardPage.EmptyPurposeWarning=\u5EFA\u8BAE\u4E0D\u8981\u4F7F\u7528\u7A7A\u76EE\u7684\u4FE1\u606F
-PropertiesWizardPage.ItemExistsError=\u76F8\u540C\u540D\u79F0\u7684\u9879\u5DF2\u5B58\u5728\uFF0C\u5982\u6709\u9700\u8981\uFF0C\u8BF7\u68C0\u67E5\u56DE\u6536\u7AD9
-PropertiesWizardPage.KeywordsError=\u540D\u5B57\u4E0D\u5408\u6CD5
-PropertiesWizardPage.Name=\u4f5c\u4e1a\u540d
-PropertiesWizardPage.NameEmptyError=\u4f5c\u4e1a\u540d\u4e3a\u7a7a\u3002
-PropertiesWizardPage.NameFormatError=\u4f5c\u4e1a\u540d\u5305\u542b\u4e0d\u5408\u6cd5\u7b26\u3002
-PropertiesWizardPage.Path=\u8DEF\u5F84
-PropertiesWizardPage.Purpose=\u76EE\u7684
-PropertiesWizardPage.Select=\u9009\u62E9
-PropertiesWizardPage.SelectfolderMessage=\u9009\u62E9\u5C06\u8981\u521B\u5EFA\u6761\u76EE\u7684\u6587\u4EF6\u5939
-PropertiesWizardPage.SelectfolderTitle=\u9009\u62E9\u76EE\u5F55
-PropertiesWizardPage.Status=\u72B6\u6001
-PropertiesWizardPage.Version=\u7248\u672C
-RepositoryObject.NotImplemented=\u672A\u5B9E\u73B0
-RepositoryUpdateManager.Title=\u4fee\u6539
-RepositoryUpdateManager.Check=\u68C0\u67E5\u4E2D...
-RepositoryUpdateManager.NoModificationTitle=\u6CA1\u6709\u9700\u8981\u7684\u4FEE\u6539
-RepositoryUpdateManager.NoModificationMessages=\u6CA1\u6709\u9700\u8981\u7684\u66F4\u65B0
-RepositoryUpdateManager.RenameContextTitle=\u91CD\u547D\u540D\u95EE\u9898
-RepositoryUpdateManager.ItemsToUpdate=\u68C0\u67E5\u9879\u76EE\u4EE5\u66F4\u65B0
-RoutinesFunctionProposal.System=\u7CFB\u7EDF
-RoutinesFunctionProposal.User=\u7528\u6237
-SchemaCellEditor.giveSchemaName=\u7ED9\u56FE\u89E3\u547D\u540D
-SchemaCellEditor.inputName=\u8F93\u5165\u540D\u79F0
-SchemaCellEditor.nameExistOrInvalid=\u6539\u540D\u79F0\u5DF2\u5B58\u5728\u6216\u65E0\u6548
-SchemaCellEditor.schemaName=\u56FE\u89E3\u540D
-SchemaOperationChoiceDialog.ChangeBuiltInMessage=\u66F4\u6539\u56FE\u89E3\u5230built-in\u6A21\u5F0F
-SchemaOperationChoiceDialog.ChangeRepositoryMessage=\u4ECE\u5E93\u4E2D\u66F4\u6539Schema
-SchemaOperationChoiceDialog.CreateBuiltInMessage=Built-in\u4E2D\u521B\u5EFA\u56FE\u89E3
-SchemaOperationChoiceDialog.CreateRepositoryMessage=\u4ECE\u5E93\u4E2D\u521B\u5EFA\u56FE\u89E3\u3002
-SchemaOperationChoiceDialog.EditSchemaMessage=\u7F16\u8F91\u67B6\u6784
-SchemaOperationChoiceDialog.StatusMessage=\u65E0\u6548\u6216\u5DF2\u5B58\u5728\u7684\u56FE\u89E3
-SchemaOperationChoiceDialog.Title=\u67B6\u6784
-SelectRepositoryContextDialog.DeselectAll=\u5168\u90E8\u4E0D\u9009
-SelectRepositoryContextDialog.Label=\u9009\u62E9\u5E93\u4E0A\u4E0B\u6587\u4E2D\u7684\u53D8\u91CF\u3002
-SelectRepositoryContextDialog.SelectAll=\u5168\u9009
-SelectRepositoryContextDialog.ExpandAll=\u5C55\u5F00
-SelectRepositoryContextDialog.Title=\u9009\u62E9\u4E0A\u4E0B\u6587\u53D8\u91CF
-SelectRepositoryContextGroupDialog.Default=\u65e0
-TalendTabbedPropertyComposite.compactButton.toolTip=\u7F29\u653E\u89C6\u56FE
-TalendTabbedPropertyComposite.tableButton.toolTip=\u8868\u89C6\u56FE
-TalendType.TypeName=\u7C7B\u578B\u540D{0}
-VariableItemEditor.name=\u4f5c\u4e1a\u540d
-VariableItemEditor.new=\u65b0
-VariableItemEditor.remove=\u5220\u9664
-VersionSection.CreationDate=\u521B\u5EFA\u65E5\u671F
-VersionSection.ModificationDate=\u4FEE\u6539\u65E5\u671F
-VersionSection.Version=\u7248\u672C
-VersionSection.Status=\u72B6\u6001
-XmlArray.InvalidFile=\u975E\u6CD5\u6587\u4EF6
-XPathQueryMetadataTableEditorViewExt.xpathQuerys=XML \u6587\u4EF6\u7ED3\u6784\u67E5\u8BE2\u8BED\u53E5
-XSDValidater.IllegalArgument=xsd\u6E90\u6587\u4EF6\u4E0D\u5B58\u5728
-repository.businessProcess=\u4E1A\u52A1\u6A21\u578B
-repository.context=\u4E0A\u4E0B\u6587
-repository.documentation=\u6587\u6863
-repository.folder=\u6587\u4EF6\u5939
-repository.generated=HTM\u6587\u6863
-repository.metadata=\u5143\u6570\u636E
-repository.metadataConnections=\u6570\u636E\u5E93\u8FDE\u63A5
-repository.metadataConnections.alias=\u6570\u636E\u5E93
-repository.metadataFileDelimited=\u5206\u5272\u6587\u4EF6
-repository.metadataFileLdif=Ldif\u6587\u4EF6
-repository.metadataFilePositional=\u5B9A\u4F4D\u6587\u4EF6
-repository.metadataFileRegexp=regex\u6587\u4EF6
-repository.metadataFileXml=xml\u6587\u4EF6
-repository.metadataGenericSchema=\u666E\u901A schema
-repository.metadataTable=\u5143\u6570\u636ESchema
-repository.metadataWSDLSchema=Web \u670D\u52A1
-repository.metadataWSDLSchema.alias=Web \u670D\u52A1
-repository.process=\u4F5C\u4E1A\u8BBE\u8BA1
-repository.query=\u67E5\u8BE2
-repository.referencedProjects=\u5F15\u7528\u7684\u9879\u76EE
-repository.routines=\u5E38\u89C4
-repository.snippets=\u7247\u65AD
-EUpdateItemType.Property=\u5C5E\u6027
-EUpdateItemType.Schema=\u67B6\u6784
-EUpdateItemType.Query=\u67E5\u8BE2
-EUpdateItemType.Variable=\u53D8\u91CF
-EUpdateItemType.Name=\u4f5c\u4e1a\u540d
-EUpdateResult.BuiltIn=\u66F4\u6539\u4E3ABuilt-In\u6A21\u5F0F
-EUpdateResult.JobletUpdate=\u66F4\u65B0joblet\u8282\u70B9
-EUpdateResult.Reload=\u91CD\u65B0\u52A0\u8F7D\u7EC4\u4EF6
-EUpdateResult.Rename=\u66F4\u6539\u540D\u79F0
-EUpdateResult.Delete=\u4ECE\u5E93\u4E2D\u5220\u9664
-UpdatesConstants.Context=\u7EC4\u4EF6
-UpdatesConstants.Job=\u4f5c\u4e1a
-MetadataTypeLengthConstants.FIELD_DEFAULT_TYPE=\u9ED8\u8BA4\u7C7B\u578B
-MetadataTypeLengthConstants.VALUE_DEFAULT_TYPE=\u9ED8\u8BA4\u7C7B\u578B
-MetadataTypeLengthPreferencePage.VALUE=\u7A7A\u503C\u5B57\u6BB5\u9ED8\u8BA4\u8BBE\u7F6E
-MetadataTypeLengthPreferencePage.FIELD=\u6240\u6709\u5B57\u6BB5\u9ED8\u8BA4\u8BBE\u7F6E
-MetadataTypeLengthPreferencePage.DBTYPE=\u6570\u636E\u7C7B\u578B\u7684\u9ED8\u8BA4\u957F\u5EA6
-MetadataTypeLengthConstants.CHARACTER_LENGTH=\u5b57\u7b26
-MetadataTypeLengthConstants.LIST_LENGTH=\u5217\u8868
-MultiStringSelectionDialog.nameEmpty=\u540D\u79F0\u4E0D\u80FD\u4E3A\u7A7A
-ApplicationActionBarAdvisor.menuFileLabel=\u6587\u4EF6(&F)
-ApplicationActionBarAdvisor.menuEditLabel=\u7F16\u8F91(&E)
-ApplicationActionBarAdvisor.gotoLabel=\u8DF3\u8F6C
-ApplicationActionBarAdvisor.menuWindowLabel=\u7A97\u53E3(&W)
-ApplicationActionBarAdvisor.menuHelpLabel=\u5E2E\u52A9(&H)
-BusinessAppearanceComposite.textAlignmentGroup=\u6587\u672C\u5BF9\u9F50
-BusinessAppearanceComposite.textAlignment.horizontal=\u6C34\u5E73
-BusinessAppearanceComposite.textAlignment.vertical=\u5782\u76F4
-BusinessAppearanceComposite.textAlignment.horizontal.left=\u5DE6
-BusinessAppearanceComposite.textAlignment.horizontal.right=\u53F3
-BusinessAppearanceComposite.textAlignment.horizontal.centre=\u4E2D\u592E
-BusinessAppearanceComposite.textAlignment.vertical.top=\u9876\u90E8
-BusinessAppearanceComposite.textAlignment.vertical.bottom=\u5E95\u90E8
-BusinessAppearanceComposite.textAlignment.vertical.centre=\u4E2D\u592E
-ConnectionBean.Local= \u672C\u5730
-ConnectionBean.DefaultConnection=\u9ED8\u8BA4\u8FDE\u63A5
-OpenXSDFileDialog.cancel=\u53D6\u6D88
-repository.column=\u5217
-repository.recyclebin=\u56DE\u6536\u7AD9
-repository.metadataColumn=\u5143\u6570\u636E\u5217
-repository.code=\u4ee3\u7801
-TalendDataCollectorPreviewPreferencePage_Key=\u5173\u952E\u5B57
-TalendDataCollectorPreviewPreferencePage_Value=\u503c
-repository.servicesPort=\u7aef\u53e3

org.talend.core.runtime/src/main/java/org/talend/core/GlobalServiceRegister.java

@@ -46,8 +46,6 @@ public class GlobalServiceRegister {
 
     private static IConfigurationElement[] configurationDQModelElements = null;
 
-    private static IConfigurationElement[] configurationDQDriverElements = null;
-
     private IConfigurationElement[] getConfigurationElements() {
         if (configurationElements == null) {
             IExtensionRegistry registry = Platform.getExtensionRegistry();
@@ -57,15 +55,6 @@ public class GlobalServiceRegister {
         return configurationElements;
     }
 
-    private IConfigurationElement[] getConfigurationDQDriverElements() {
-        if (configurationDQDriverElements == null) {
-            IExtensionRegistry registry = Platform.getExtensionRegistry();
-            configurationDQDriverElements = (registry == null ? null : registry
-                    .getConfigurationElementsFor("org.talend.metadata.managment.DBDriver_extension")); //$NON-NLS-1$
-        }
-        return configurationDQDriverElements;
-    }
-
     private IConfigurationElement[] getConfigurationDQModelElements() {
         if (configurationDQModelElements == null) {
             IExtensionRegistry registry = Platform.getExtensionRegistry();
@@ -86,17 +75,6 @@ public class GlobalServiceRegister {
         return dqModelserviceInst;
     }
 
-    public IService getDQDriverService(Class<?> klass) {
-        IService dqModelserviceInst = services.get(klass);
-        if (dqModelserviceInst == null) {
-            dqModelserviceInst = findDQModelService(klass);
-            if (dqModelserviceInst != null) {
-                services.put(klass, dqModelserviceInst);
-            }
-        }
-        return dqModelserviceInst;
-    }
-
     public boolean isDQModelServiceRegistered(Class klass) {
         AbstractDQModelService service = dqModelServices.get(klass);
         if (service == null) {
@@ -109,18 +87,6 @@ public class GlobalServiceRegister {
         return true;
     }
 
-    public boolean isDQDriverServiceRegistered(Class klass) {
-        IService service = services.get(klass);
-        if (service == null) {
-            service = findDQDriverService(klass);
-            if (service == null) {
-                return false;
-            }
-            services.put(klass, service);
-        }
-        return true;
-    }
-
     public boolean isServiceRegistered(Class klass) {
         IService service = services.get(klass);
         if (service == null) {
@@ -230,21 +196,4 @@ public class GlobalServiceRegister {
         }
         return null;
     }
-
-    private IService findDQDriverService(Class<?> klass) {
-        IConfigurationElement[] configDQModelElements = getConfigurationDQDriverElements();
-        if (configDQModelElements != null) {
-            for (IConfigurationElement element : configDQModelElements) {
-                try {
-                    Object service = element.createExecutableExtension("class"); //$NON-NLS-1$
-                    if (klass.isInstance(service)) {
-                        return (IService) service;
-                    }
-                } catch (CoreException e) {
-                    ExceptionHandler.process(e);
-                }
-            }
-        }
-        return null;
-    }
 }

org.talend.core.runtime/src/main/java/org/talend/core/ITDQCompareService.java

@@ -1,26 +0,0 @@
-// ============================================================================
-//
-// Copyright (C) 2006-2012 Talend Inc. - www.talend.com
-//
-// This source code is available under agreement available at
-// %InstallDIR%\features\org.talend.rcp.branding.%PRODUCTNAME%\%PRODUCTNAME%license.txt
-//
-// You should have received a copy of the agreement
-// along with this program; if not, write to Talend SA
-// 9 rue Pages 92150 Suresnes, France
-//
-// ============================================================================
-package org.talend.core;
-
-import org.talend.core.model.properties.ConnectionItem;
-import org.talend.utils.sugars.ReturnCode;
-
-/**
- * created by talend on Dec 19, 2012 Detailled comment
- * 
- */
-public interface ITDQCompareService extends IService {
-
-    // ADD zshen 2012-12-19 to reuse reloadAction
-    public ReturnCode reloadDatabase(ConnectionItem connectionItem);
-}

org.talend.core.runtime/src/main/java/org/talend/core/ITDQRepositoryService.java

@@ -107,9 +107,4 @@ public interface ITDQRepositoryService extends IService {
 
     public void refreshConnectionEditor(Item item);
 
-    // Add xqliu 2012-12-11 TDQ-5750
-    public void refreshCurrentAnalysisEditor();
-
-    // Add zshen 2013-01-05
-    public void refreshCurrentAnalysisAndConnectionEditor();
 }

org.talend.core.runtime/src/main/java/org/talend/core/database/hbase/conn/version/EHBaseDistribution4Versions.java

@@ -20,9 +20,7 @@ import java.util.List;
  */
 public enum EHBaseDistribution4Versions {
 
-    HDP_1_0(EHBaseDistributions.HORTONWORKS, "Hortonworks Data Platform V1.0.0", "HDP_1_0"),
-
-    HDP_1_2(EHBaseDistributions.HORTONWORKS, "Hortonworks Data Platform V1.2.0(Bimota)", "HDP_1_2"),
+    HDP_1_0(EHBaseDistributions.HORTONWORKS, "Hortonworks Data Platform V1", "HDP_1_0"),
 
     APACHE_1_0_0(EHBaseDistributions.APACHE, "Apache 1.0.0", "APACHE_1_0_0"),
 

org.talend.core.runtime/src/main/java/org/talend/core/model/context/UpdateRunJobComponentContextHelper.java

@@ -94,18 +94,14 @@ public final class UpdateRunJobComponentContextHelper {
                                     }
                                 }
                             }
-                            // Change value only for the job which context variable is changed. Changed by Marvin Wang
-                            // on Dec. 28, 2012 for bug TDI-24255.
-                            if (process.getId().equals(refJobId)) {
-                                // bug 9424
-                                obj = valueMap.get(PARAM_VALUE_COLUMN);
-                                if (obj != null && obj instanceof String) {
-                                    String oldValue = (String) obj;
-                                    String newValue = checkAndUpdateValue(nameMap, oldValue);
-                                    if (newValue != null) { // update
-                                        valueMap.put(PARAM_VALUE_COLUMN, newValue);
-                                        changed = true;
-                                    }
+                            // bug 9424
+                            obj = valueMap.get(PARAM_VALUE_COLUMN);
+                            if (obj != null && obj instanceof String) {
+                                String oldValue = (String) obj;
+                                String newValue = checkAndUpdateValue(nameMap, oldValue);
+                                if (newValue != null) { // update
+                                    valueMap.put(PARAM_VALUE_COLUMN, newValue);
+                                    changed = true;
                                 }
                             }
                         }
@@ -120,7 +116,7 @@ public final class UpdateRunJobComponentContextHelper {
             }
             // update the job state
             if (changed && process instanceof IProcess2) {
-                CommandStack commandStack = process.getCommandStack();
+                CommandStack commandStack = ((IProcess2) process).getCommandStack();
                 if (commandStack != null) {
                     commandStack.execute(new Command() {
                     });
@@ -272,19 +268,15 @@ public final class UpdateRunJobComponentContextHelper {
                                 }
                             }
                         }
-
-                        // Change value only for the job which context variable is changed. Changed by Marvin Wang
-                        // on Jan. 24, for bug TDI-24255. Context value should not be changed, because the context
-                        // value is from the current job like "context.foo".
                         // bug 9424
-                        // if (eleValueType.getElementRef().equals(PARAM_VALUE_COLUMN)) {
-                        // String oldValue = eleValueType.getValue();
-                        // String newValue = checkAndUpdateValue(nameMap, oldValue);
-                        // if (newValue != null) { // update
-                        // eleValueType.setValue(newValue);
-                        // modified = true;
-                        // }
-                        // }
+                        if (eleValueType.getElementRef().equals(PARAM_VALUE_COLUMN)) {
+                            String oldValue = eleValueType.getValue();
+                            String newValue = checkAndUpdateValue(nameMap, oldValue);
+                            if (newValue != null) { // update
+                                eleValueType.setValue(newValue);
+                                modified = true;
+                            }
+                        }
                     }
                     if (!movedRecord.isEmpty()) {
                         for (ElementValueType eleValueType : movedRecord) {
@@ -329,7 +321,7 @@ public final class UpdateRunJobComponentContextHelper {
                         boolean exist = false;
                         for (IContext con : listContext) {
                             String name = con.getName();
-                            if (value.equals(name)) {
+                            if (((String) value).equals(name)) {
                                 exist = true;
                                 break;
                             }

org.talend.core.runtime/src/main/java/org/talend/core/model/metadata/IMetadataTable.java

@@ -13,7 +13,6 @@
 package org.talend.core.model.metadata;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * DOC nrousseau class global comment. Detailled comment <br/>
@@ -85,8 +84,4 @@ public interface IMetadataTable {
 
     public IMetadataColumn getDynamicColumn();
 
-    public Map<String, String> getAdditionalProperties();
-
-    public void setAdditionalProperties(Map<String, String> additionalProperties);
-
 }

org.talend.core.runtime/src/main/java/org/talend/core/model/metadata/MetadataManager.java

@@ -67,7 +67,7 @@ public class MetadataManager {
         if (!components.isEmpty()) {
             itemResource.getContents().addAll(components);
         }
-        if (!dependencies.isEmpty()) {
+        if(!dependencies.isEmpty()){
             itemResource.getContents().addAll(dependencies);
         }
     }
@@ -123,11 +123,6 @@ public class MetadataManager {
             for (int i = 0; i < item.getConnection().getDataPackage().size(); i++) {
                 if (item.getConnection().getDataPackage().get(i) instanceof RecordFile) {
                     RecordFile rf = (RecordFile) item.getConnection().getDataPackage().get(i);
-                    // add for TDI-22857
-                    item.getConnection().setName(item.getProperty().getDisplayName());
-                    if (rf != null) {
-                        rf.setName("default");
-                    }
                     returnlist.add(rf);
                 }
             }
@@ -147,8 +142,8 @@ public class MetadataManager {
             }
             break;
         case Dependency:
-            List<Dependency> dependencies = item.getConnection().getSupplierDependency();
-            returnlist.addAll(dependencies);
+                List<Dependency> dependencies = item.getConnection().getSupplierDependency();
+                returnlist.addAll(dependencies);
             break;
         default:
         }

org.talend.core.runtime/src/main/java/org/talend/core/model/metadata/MetadataSchema.java

@@ -389,7 +389,8 @@ public class MetadataSchema {
                     metadataColumn.setPattern(pattern.getNodeValue());
                 }
                 if (originalField.getNodeValue() != null) {
-                    metadataColumn.setOriginalField(originalField.getNodeValue());
+                    String originalFieldValue = MetadataToolHelper.validateColumnName(originalField.getNodeValue(), 0);
+                    metadataColumn.setOriginalField(originalFieldValue);
                 } else {
                     metadataColumn.setOriginalField(metadataColumn.getLabel());
                 }

org.talend.core.runtime/src/main/java/org/talend/core/model/metadata/MetadataTable.java

@@ -13,7 +13,6 @@
 package org.talend.core.model.metadata;
 
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -46,7 +45,7 @@ public class MetadataTable implements IMetadataTable, Cloneable {
 
     private String comment;
 
-    private Map<String, String> additionalProperties = new HashMap<String, String>();
+    private Map<String, String> additionalProperties;
 
     public String getReadOnlyColumnPosition() {
         return this.readOnlyColumnPosition;
@@ -138,7 +137,6 @@ public class MetadataTable implements IMetadataTable, Cloneable {
             }
             clonedMetadata.setTableName(this.getTableName());
             clonedMetadata.setLabel(this.getLabel());
-            clonedMetadata.setAdditionalProperties(new HashMap<String, String>(additionalProperties));
         } catch (CloneNotSupportedException e) {
             // nothing
         } catch (Exception e) {
@@ -348,8 +346,4 @@ public class MetadataTable implements IMetadataTable, Cloneable {
     public Map<String, String> getAdditionalProperties() {
         return this.additionalProperties;
     }
-
-    public void setAdditionalProperties(Map<String, String> additionalProperties) {
-        this.additionalProperties = additionalProperties;
-    }
 }

org.talend.core.runtime/src/main/java/org/talend/core/model/metadata/MetadataToolHelper.java

@@ -15,17 +15,13 @@ package org.talend.core.model.metadata;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
-import java.util.Iterator;
 import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
 import java.util.Set;
 import java.util.Vector;
 import java.util.regex.Pattern;
 
 import org.eclipse.emf.common.util.BasicEList;
 import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.common.util.EMap;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.swt.events.KeyEvent;
@@ -1233,12 +1229,6 @@ public final class MetadataToolHelper {
             // columns.add(convertToIMetaDataColumn(column));
         }
         result.setListColumns(columns);
-        Map<String, String> newProperties = result.getAdditionalProperties();
-        EMap<String, String> oldProperties = old.getAdditionalProperties();
-        for (Iterator<Entry<String, String>> iterator = oldProperties.iterator(); iterator.hasNext();) {
-            Entry<String, String> entry = iterator.next();
-            newProperties.put(entry.getKey(), entry.getValue());
-        }
         return result;
     }
 

org.talend.core.runtime/src/main/java/org/talend/core/model/metadata/connection/hive/HiveConnVersionInfo.java

@@ -37,8 +37,6 @@ public enum HiveConnVersionInfo {
 
     HDP_1_0(1, "HDP_1_0", "HDP 1.0", HiveConnVersionInfo.HORTONWORKS),
 
-    HDP_1_2(1, "HDP_1_2", "HDP 1.2", HiveConnVersionInfo.HORTONWORKS),
-
     APACHE_0_20_203(1, "APACHE_0_20_203", "Apache 0.20.203", HiveConnVersionInfo.APACHE),
 
     APACHE_1_0_0(1, "APACHE_1_0_0", "Apache 1.0.0", HiveConnVersionInfo.APACHE),
@@ -50,7 +48,6 @@ public enum HiveConnVersionInfo {
                   "EMBEDDED",
                   "Embedded",
                   HiveConnVersionInfo.HDP_1_0,
-                  HiveConnVersionInfo.HDP_1_2,
                   HiveConnVersionInfo.APACHE_1_0_0,
                   HiveConnVersionInfo.Cloudera_CDH4),
 
@@ -64,9 +61,9 @@ public enum HiveConnVersionInfo {
 
     private int level;
 
-    private String key, displayName;// The key is mapped to item name of component in t*_java.xml file.
+    private String key, displayName;
 
-    private HiveConnVersionInfo[] follows;// That stores all are followed by the current object.
+    private HiveConnVersionInfo[] follows;
 
     private HiveConnVersionInfo(int level, String key, String displayName, HiveConnVersionInfo... follows) {
         this.level = level;

org.talend.core.runtime/src/main/java/org/talend/core/model/metadata/designerproperties/RepositoryToComponentProperty.java

@@ -911,22 +911,17 @@ public class RepositoryToComponentProperty {
 
         if (value.equals("DB_VERSION")) { //$NON-NLS-1$
             String dbVersionString = connection.getDbVersionString();
-            if (EDatabaseConnTemplate.ACCESS.getDBDisplayName().equals(databaseType)) {
+            if (EDatabaseConnTemplate.ACCESS.getDBDisplayName().equals(databaseType)
+                    || EDatabaseConnTemplate.MYSQL.getDBDisplayName().equals(databaseType)) {
                 // @Deprecated: see bug 7262 this bug is Deprecated
                 return dbVersionString;
-            } else if (EDatabaseConnTemplate.MYSQL.getDBDisplayName().equals(databaseType)) {
-                if (dbVersionString != null) {
-                    return dbVersionString.toUpperCase();
-                }
             } else {
                 String driverValue = EDatabaseVersion4Drivers.getDriversStr(databaseType, dbVersionString);
                 if (EDatabaseConnTemplate.ORACLE_OCI.getDBDisplayName().equals(databaseType)
                         || EDatabaseConnTemplate.ORACLE_RAC.getDBDisplayName().equals(databaseType)
                         || EDatabaseConnTemplate.ORACLEFORSID.getDBDisplayName().equals(databaseType)
                         || EDatabaseConnTemplate.ORACLESN.getDBDisplayName().equals(databaseType)) {
-                    if (dbVersionString != null) {
-                        driverValue = dbVersionString.toUpperCase();
-                    }
+                    driverValue = dbVersionString;
                 }
                 if (isContextMode(connection, dbVersionString)) {
                     return dbVersionString;
@@ -1266,20 +1261,6 @@ public class RepositoryToComponentProperty {
                 return TalendQuoteUtils.addQuotes(p.toPortableString());
             }
         }
-        if ("CODE_PAGE".equals(value)) { //$NON-NLS-1$
-            if (connection.getCodePage() == null) {
-                return null;
-            }
-            if (isContextMode(connection, connection.getCodePage())) {
-                return connection.getCodePage();
-            } else {
-                Path p = new Path(""); //$NON-NLS-1$
-                if (connection.getCodePage() != null) {
-                    p = new Path(connection.getCodePage());
-                }
-                return TalendQuoteUtils.addQuotes(p.toPortableString());
-            }
-        }
         return null;
     }
 

org.talend.core.runtime/src/main/java/org/talend/core/model/process/EConnectionType.java

@@ -121,43 +121,43 @@ public enum EConnectionType implements IConnectionCategory, IDraw2dGraphics {
                 new RGB(0, 50, 150)),
     ROUTE(14, "ROUTE", //$NON-NLS-1$
                 EConnectionCategory.MAIN,
-                CAMEL | UNIQUE_NAME | CUSTOM_NAME,
+                CAMEL | UNIQUE_NAME,
                 "Route", Messages.getString("EConnectionType.route"), //$NON-NLS-1$ //$NON-NLS-2$
                 new Integer(LINE_SOLID),
                 new RGB(230, 100, 0)),
     ROUTE_WHEN(15, "ROUTE_WHEN", //$NON-NLS-1$
                 EConnectionCategory.MAIN,
-                CONDITION | CAMEL | UNIQUE_NAME| CUSTOM_NAME,
+                CONDITION | CAMEL | UNIQUE_NAME,
                 "When", Messages.getString("EConnectionType.when"), //$NON-NLS-1$ //$NON-NLS-2$
                 new Integer(LINE_SOLID),
                 new RGB(230, 100, 0)),
     ROUTE_OTHER(16, "ROUTE_OTHER", //$NON-NLS-1$
                 EConnectionCategory.MAIN,
-                CAMEL | UNIQUE_NAME| CUSTOM_NAME,
+                CAMEL | UNIQUE_NAME,
                 "Otherwise", Messages.getString("EConnectionType.otherwise"), //$NON-NLS-1$ //$NON-NLS-2$
                 new Integer(LINE_SOLID),
                 new RGB(230, 100, 0)),
     ROUTE_TRY(17, "ROUTE_TRY", //$NON-NLS-1$
             EConnectionCategory.MAIN,
-            CAMEL | UNIQUE_NAME| CUSTOM_NAME,
+            CAMEL | UNIQUE_NAME,
             "Try", "Try", //$NON-NLS-1$ //$NON-NLS-2$
             new Integer(LINE_SOLID),
             new RGB(0, 100, 0)),
     ROUTE_CATCH(18, "ROUTE_CATCH", //$NON-NLS-1$
             EConnectionCategory.MAIN,
-            CONDITION | CAMEL | UNIQUE_NAME| CUSTOM_NAME,
+            CONDITION | CAMEL | UNIQUE_NAME,
             "Catch", "Catch", //$NON-NLS-1$ //$NON-NLS-2$
             new Integer(LINE_SOLID),
             new RGB(128, 0, 0)),
     ROUTE_FINALLY(19, "ROUTE_FINALLY", //$NON-NLS-1$
             EConnectionCategory.MAIN,
-            CAMEL | UNIQUE_NAME| CUSTOM_NAME,
+            CAMEL | UNIQUE_NAME,
             "Finally", "Finally", //$NON-NLS-1$ //$NON-NLS-2$
             new Integer(LINE_SOLID),
             new RGB(0, 0, 160)),
     ROUTE_ENDBLOCK(20, "ROUTE_ENDBLOCK", //$NON-NLS-1$
             EConnectionCategory.MAIN,
-            CAMEL | UNIQUE_NAME| CUSTOM_NAME,
+            CAMEL | UNIQUE_NAME,
             "Route", "Route", //$NON-NLS-1$ //$NON-NLS-2$
             new Integer(LINE_SOLID),
             new RGB(230, 100, 0)),

org.talend.core.runtime/src/main/java/org/talend/core/model/process/IConnection.java

@@ -74,8 +74,6 @@ public interface IConnection extends IElement {
     public IMetadataTable getMetadataTable();
 
     public boolean isActivate();
-    
-    public void setActivate(boolean activate);
 
     public void setTraceData(Map<String, String> traceData);
 

org.talend.core.runtime/src/main/java/org/talend/core/model/process/Problem.java

@@ -212,10 +212,6 @@ public class Problem {
             /* nodeName should use uniqueName,see bug 20560 */
             nodeName = ((INode) element).getUniqueName();
             componentName = ((INode) element).getComponent().getName();
-        }else if (element instanceof IProcess) {
-            jobInfo = new BasicJobInfo(((IProcess) element).getId(), null, ((IProcess) element).getVersion());
-            jobInfo.setJobName(((IProcess) element).getName());
-            type = ProblemType.JOB;
         }
     }
 

org.talend.core.runtime/src/main/java/org/talend/core/model/repository/ERepositoryObjectType.java

@@ -1134,22 +1134,4 @@ public class ERepositoryObjectType extends DynaEnum<ERepositoryObjectType> {
     public String getNamePattern() {
         return namePattern;
     }
-
-    /**
-     * 
-     * DOC ggu Comment method "valueOf".
-     * 
-     * in order to adapte old codes. and enable to init this class at same times.
-     * 
-     * @param clazz
-     * @param name
-     * @return
-     */
-    public static ERepositoryObjectType valueOf(Class<ERepositoryObjectType> clazz, String name) {
-        return DynaEnum.valueOf(clazz, name);
-    }
-
-    public static ERepositoryObjectType valueOf(String name) {
-        return valueOf(ERepositoryObjectType.class, name);
-    }
 }

org.talend.core.runtime/src/main/java/org/talend/core/model/update/RepositoryUpdateManager.java

@@ -1281,10 +1281,10 @@ public abstract class RepositoryUpdateManager {
             List<UpdateResult> resultFromProcess = getResultFromProcess(process2, types, onlySimpleShow);
 
             for (UpdateResult result : resultFromProcess) {
-                result.setFromItem(true);
                 if (result.getJob() != null) {
                     result.setJob(null);
                 }
+                result.setFromItem(true);
                 result.setObjectId(item.getProperty().getId());
             }
 

org.talend.core.runtime/src/main/java/org/talend/core/model/utils/IDragAndDropServiceHandler.java

@@ -17,7 +17,6 @@ import java.util.List;
 import org.talend.core.model.components.IComponent;
 import org.talend.core.model.metadata.IMetadataTable;
 import org.talend.core.model.metadata.builder.connection.Connection;
-import org.talend.core.model.process.IElement;
 import org.talend.core.model.process.INode;
 import org.talend.core.model.properties.Item;
 import org.talend.core.model.repository.ERepositoryObjectType;
@@ -83,15 +82,4 @@ public interface IDragAndDropServiceHandler {
      * DOC zwzhao Comment method "getType".
      */
     public ERepositoryObjectType getType(String repositoryType);
-
-    /**
-     * DOC ycbai Comment method "handleTableRelevantParameters".
-     * 
-     * Set metadata table relevant parameters value of the element.
-     * 
-     * @param ele
-     * @param metadataTable
-     */
-    public void handleTableRelevantParameters(IElement ele, IMetadataTable metadataTable);
-
 }

org.talend.core.runtime/src/main/java/org/talend/core/model/utils/NodeUtil.java

@@ -58,14 +58,6 @@ public class NodeUtil {
             Collections.sort(conns, new Comparator<IConnection>() {
 
                 public int compare(IConnection o1, IConnection o2) {
-                	if (o1.getLineStyle() == o2.getLineStyle()) {
-						// same style, compare by inputId
-						if (o1.getOutputId() > o2.getOutputId()) {
-							return 1;
-						} else {
-							return -1;
-						}
-					}
                     if (EConnectionType.ROUTE_WHEN == o1.getLineStyle()){
                     	if(EConnectionType.ROUTE == o2.getLineStyle()){
                     		return 1;

org.talend.core.runtime/src/main/java/org/talend/core/ui/IJobletProviderService.java

@@ -22,15 +22,12 @@ import org.eclipse.ui.IWorkbenchPart;
 import org.eclipse.ui.part.MultiPageEditorPart;
 import org.talend.core.IService;
 import org.talend.core.model.components.IComponent;
-import org.talend.core.model.metadata.IMetadataTable;
 import org.talend.core.model.process.EConnectionType;
 import org.talend.core.model.process.IConnection;
 import org.talend.core.model.process.IElement;
 import org.talend.core.model.process.IElementParameter;
 import org.talend.core.model.process.INode;
 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.properties.JobletProcessItem;
 import org.talend.core.model.properties.Property;
 import org.talend.designer.core.model.utils.emf.talendfile.NodeType;
@@ -103,9 +100,6 @@ public interface IJobletProviderService extends IService {
 
     public List<INode> checkAddNodes(IElement jobletContainer);
 
-    public void updateRelationShip(final IProcess curJobletProcess, final IProcess2 currentProcess,
-            final List<IMetadataTable> oldInputMetadata, final List<IMetadataTable> oldOutputMetadata, final boolean updateContext);
-
     public List<INode> checkDeleteNodes(IElement jobletContainer);
 
     public boolean checkModify(IElement jobletContainer);

org.talend.core.runtime/src/main/java/org/talend/core/ui/context/DefaultCellEditorFactory.java

@@ -36,7 +36,6 @@ import org.talend.core.language.LanguageManager;
 import org.talend.core.model.context.JobContextManager;
 import org.talend.core.model.metadata.MetadataToolHelper;
 import org.talend.core.model.metadata.types.PerlTypesManager;
-import org.talend.core.model.process.IContext;
 import org.talend.core.model.process.IContextManager;
 import org.talend.core.model.process.IContextParameter;
 import org.talend.core.utils.TalendQuoteUtils;
@@ -229,12 +228,6 @@ public final class DefaultCellEditorFactory {
                     return;
                 }
                 para.setValue(value);
-                if (getModelManager().getContextManager() != null) {
-                    IContext context = getModelManager().getContextManager().getContext(para.getContext().getName());
-                    if (context != null && context.getContextParameter(para.getName()) != null) {
-                        context.getContextParameter(para.getName()).setValue(value);
-                    }
-                }
                 refreshCurrentSelection();
                 setModifyFlag();
             }

org.talend.core.runtime/src/main/java/org/talend/core/ui/context/model/table/ContextTableCellModifier.java

@@ -127,7 +127,7 @@ public class ContextTableCellModifier extends AbstractContextCellModifier {
                 }
             } else if (element instanceof ContextTableTabChildModel) {
                 ContextTableTabChildModel child = (ContextTableTabChildModel) element;
-                para = context.getContextParameter(child.getContextParameter().getName());
+                para = child.getContextParameter();
             }
         }
         return para;

org.talend.core.runtime/src/main/java/org/talend/core/utils/TalendQuoteUtils.java

@@ -147,23 +147,11 @@ public final class TalendQuoteUtils {
         return str.replace("'", "\\'"); //$NON-NLS-1$ //$NON-NLS-2$
     }
 
-    /**
-     * For job script. it needs to transfer <code>\"</code> to <code>\\"</code>. Added by Marvin Wang on Dec 13, 2012.
-     */
-    public static String checkSlashQuotationMarks(String str) {
+    public static String checkStringQuotationMarks(String str) {
         if (str == null) {
             return ""; //$NON-NLS-1$
         }
-        return str.replace("\\\"", "\\\\\""); //$NON-NLS-1$ //$NON-NLS-2$
-    }
-
-    public static String checkStringQuotationMarks(String str) {
-    	 if (str == null) {
-             return ""; //$NON-NLS-1$
-         } else if (!str.contains("\"")) {
-             return str;
-         }
-         return str.replace("\"", "\\\""); //$NON-NLS-1$ //$NON-NLS-2$
+        return str.replace("\"", "\\\""); //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     public static String removeQuotes(String text) {
@@ -188,17 +176,15 @@ public final class TalendQuoteUtils {
 
         switch (language) {
         case JAVA:
-            if (text.startsWith(QUOTATION_MARK)) {
+            if (text.startsWith(QUOTATION_MARK))
                 return removeQuotes(text, QUOTATION_MARK);
-            } else {
+            else
                 return text;
-            }
         default: // PERL
-            if (text.startsWith(SINGLE_QUOTE)) {
+            if (text.startsWith(SINGLE_QUOTE))
                 return removeQuotes(text, SINGLE_QUOTE);
-            } else {
+            else
                 return text;
-            }
         }
     }
 

org.talend.core.runtime/src/main/java/org/talend/designer/core/IProcessConvertService.java

@@ -1,10 +0,0 @@
-package org.talend.designer.core;
-
-import org.talend.core.model.process.IProcess;
-import org.talend.core.model.properties.Item;
-
-public interface IProcessConvertService {
-
-	public IProcess getProcessFromItem(Item item, boolean loadScreenshots);
-	
-}

org.talend.core.runtime/src/main/java/org/talend/designer/runprocess/IRunProcessService.java

@@ -126,32 +126,4 @@ public interface IRunProcessService extends IService {
     public IProcess getActiveProcess();
 
     public boolean checkExportProcess(IStructuredSelection selection, boolean isJob);
-
-    /**
-     * DOC ycbai Comment method "getResourceFilePath".
-     * 
-     * get the absolute path of file which under resource folder by relative path.
-     * 
-     * @param filePath the path relative resource folder.
-     * @return
-     */
-    public String getResourceFilePath(String filePath);
-
-    /**
-     * DOC ycbai Comment method "getTemplateStrFromPreferenceStore".
-     * 
-     * @param templateType
-     * @return
-     */
-    public String getTemplateStrFromPreferenceStore(String templateType);
-
-    /**
-     * DOC ycbai Comment method "updateLogFiles".
-     * 
-     * Create or update common-logging.properties and log4j.properties files under the project.
-     * 
-     * @param project
-     */
-    public void updateLogFiles(IProject project);
-
 }

org.talend.core.runtime/src/main/java/org/talend/repository/ProjectManager.java

@@ -15,6 +15,7 @@ package org.talend.repository;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
@@ -69,6 +70,8 @@ public final class ProjectManager {
 
     private List<Project> referencedprojects = new ArrayList<Project>();
 
+    private List<IProjectRepositoryNode> viewProjectNodes = new ArrayList<IProjectRepositoryNode>();
+
     private List<Project> allReferencedprojects = new ArrayList<Project>();
 
     private Map<String, String> mapProjectUrlToBranchUrl = new HashMap<String, String>();
@@ -389,6 +392,45 @@ public final class ProjectManager {
         return foldersMap.get(project.getTechnicalLabel());
     }
 
+    public synchronized void updateViewProjectNode(IProjectRepositoryNode projectRepNode) {
+        if (projectRepNode != null) {
+            final Iterator<IProjectRepositoryNode> iterator = viewProjectNodes.iterator();
+            while (iterator.hasNext()) {
+                IProjectRepositoryNode tmpProjectNode = iterator.next();
+                // remove the old one.
+                if (tmpProjectNode.getProject().getTechnicalLabel().equals(projectRepNode.getProject().getTechnicalLabel())) {
+                    iterator.remove();
+                    // FIXME, later will check this to make sure work well. just now, disable on trunk only.
+                    // if (tmpProjectNode instanceof RepositoryNode) {
+                    // ((RepositoryNode) tmpProjectNode).setEnableDisposed(true);
+                    // }
+                    //
+                    // tmpProjectNode.dispose();
+                }
+            }
+            viewProjectNodes.add(projectRepNode);
+        }
+    }
+
+    public synchronized IProjectRepositoryNode getProjectNode(String projectName) {
+        if (projectName != null) {
+            final Iterator<IProjectRepositoryNode> iterator = viewProjectNodes.iterator();
+            while (iterator.hasNext()) {
+                final IProjectRepositoryNode tmpProjectNode = iterator.next();
+                if (tmpProjectNode.getProject().getTechnicalLabel().equals(projectName)) {
+                    return tmpProjectNode;
+                }
+            }
+        }
+        return null;
+    }
+
+    public synchronized void cleanupViewProjects() {
+        if (viewProjectNodes != null) {
+            viewProjectNodes.clear();
+        }
+    }
+
     public static boolean enableSpecialTechnicalProjectName() {
         // FIXME TDI-21185, add the function to enable disabling this function.
         return TalendPropertiesUtil.isEnabledMultiBranchesInWorkspace();

org.talend.core.runtime/src/main/java/org/talend/repository/model/IProxyRepositoryFactory.java

@@ -341,8 +341,6 @@ public interface IProxyRepositoryFactory {
     public abstract Item copy(Item item, IPath path, boolean changeLabelWithCopyPrefix) throws PersistenceException,
             BusinessException;
 
-    Item copy(Item sourceItem, IPath targetPath, String newItemLabel) throws PersistenceException, BusinessException;
-
     public abstract void saveCopy(Item item, Item targetItem) throws PersistenceException;
 
     public abstract Property reload(Property property) throws PersistenceException;
@@ -485,5 +483,4 @@ public interface IProxyRepositoryFactory {
     public void updateLockStatus() throws PersistenceException;
 
     public boolean isModified(Property property);
-
 }

org.talend.core.runtime/src/main/java/org/talend/repository/model/RepositoryConstants.java

@@ -85,10 +85,7 @@ public class RepositoryConstants {
 
     public static final String MDM_ITEM_PATTERN = ".*"; //$NON-NLS-1$
 
-    public static final String METADATA_NAME_PATTERN = ".*";
-
-    public static final String[] ITEM_FORBIDDEN_IN_LABEL = { "~", "!", "`", "#", "^", "&", "*", "\\", "/", "?", ":", ";", "\"",
-            ".", "(", ")", "，", "。", "'", "￥", "‘", "”", "、", "《", "，", "》" };
+    public static final String METADATA_NAME_PATTERN = "^[^\\s\\\\~\\!\\`\\@\\#\\$\\%\\^\\&\\*\\(\\)\\-\\+\\=\\{\\[\\]\\}\\:\\;\\'\\|\\<\\,\\>\\.\\?\\/\"￥；：‘”、《，》。？……]{1,}$";
 
     public static String getPattern(ERepositoryObjectType type) {
         if (type == ERepositoryObjectType.FOLDER) {

org.talend.core.runtime/src/main/java/org/talend/repository/model/RepositoryNode.java

@@ -26,6 +26,7 @@ import org.talend.core.model.repository.Folder;
 import org.talend.core.model.repository.IRepositoryViewObject;
 import org.talend.core.ui.branding.IBrandingService;
 import org.talend.core.ui.images.RepositoryImageProvider;
+import org.talend.repository.ProjectManager;
 import org.talend.repository.model.nodes.IProjectRepositoryNode;
 
 /**
@@ -51,9 +52,8 @@ public class RepositoryNode implements IRepositoryNode, IActionFilter {
 
     private Map<EProperties, Object> properties = new Hashtable<EProperties, Object>();
 
-    private IProjectRepositoryNode root;
-
-    // private String projectTechnicalLabel;
+    // private IProjectRepositoryNode root;
+    private String projectTechnicalLabel;
 
     private IImage icon;
 
@@ -120,7 +120,6 @@ public class RepositoryNode implements IRepositoryNode, IActionFilter {
      * 
      * @see org.talend.repository.model.RepositoryNode#getChildren()
      */
-    @Override
     public List<IRepositoryNode> getChildren() {
         if (true) {
             // FIXME SML Remove when mhelleboid attach item to folders
@@ -158,7 +157,6 @@ public class RepositoryNode implements IRepositoryNode, IActionFilter {
      * 
      * @see org.talend.repository.model.RepositoryNode#hasChildren()
      */
-    @Override
     public boolean hasChildren() {
         return !getChildren().isEmpty();
     }
@@ -168,7 +166,6 @@ public class RepositoryNode implements IRepositoryNode, IActionFilter {
      * 
      * @see org.talend.repository.model.RepositoryNode#getId()
      */
-    @Override
     public String getId() {
         return this.id;
     }
@@ -187,7 +184,6 @@ public class RepositoryNode implements IRepositoryNode, IActionFilter {
      * 
      * @see org.talend.repository.model.RepositoryNode#getObject()
      */
-    @Override
     public IRepositoryViewObject getObject() {
         return this.object;
     }
@@ -197,7 +193,6 @@ public class RepositoryNode implements IRepositoryNode, IActionFilter {
      * 
      * @see org.talend.repository.model.RepositoryNode#getParent()
      */
-    @Override
     public RepositoryNode getParent() {
         return this.parent;
     }
@@ -216,7 +211,6 @@ public class RepositoryNode implements IRepositoryNode, IActionFilter {
      * 
      * @see org.talend.repository.model.RepositoryNode#getType()
      */
-    @Override
     public ENodeType getType() {
         if (type == ENodeType.REPOSITORY_ELEMENT && getObject().getRepositoryObjectType() == ERepositoryObjectType.FOLDER) {
             return ENodeType.SIMPLE_FOLDER;
@@ -229,7 +223,6 @@ public class RepositoryNode implements IRepositoryNode, IActionFilter {
      * 
      * @see org.talend.repository.model.RepositoryNode#getObjectType()
      */
-    @Override
     public ERepositoryObjectType getObjectType() {
         if (getObject() != null) {
             return getObject().getRepositoryObjectType();
@@ -242,7 +235,6 @@ public class RepositoryNode implements IRepositoryNode, IActionFilter {
      * 
      * @see org.talend.repository.model.RepositoryNode#getContentType()
      */
-    @Override
     public ERepositoryObjectType getContentType() {
         if (getObject() != null) {
             if (getObject() instanceof Folder) {
@@ -271,7 +263,6 @@ public class RepositoryNode implements IRepositoryNode, IActionFilter {
      * 
      * @see org.talend.repository.model.RepositoryNode#getLabel()
      */
-    @Override
     public String getLabel() {
         switch (getType()) {
         case REFERENCED_PROJECT:
@@ -334,7 +325,6 @@ public class RepositoryNode implements IRepositoryNode, IActionFilter {
      * @see org.talend.repository.model.RepositoryNode#getProperties(org.talend.
      * repository.model.RepositoryNode.EProperties)
      */
-    @Override
     public Object getProperties(EProperties key) {
         return properties.get(key);
     }
@@ -344,7 +334,6 @@ public class RepositoryNode implements IRepositoryNode, IActionFilter {
      * 
      * @see org.talend.repository.model.RepositoryNode#isBin()
      */
-    @Override
     public boolean isBin() {
         return false;
     }
@@ -418,9 +407,8 @@ public class RepositoryNode implements IRepositoryNode, IActionFilter {
         return true;
     }
 
-    @Override
     public IProjectRepositoryNode getRoot() {
-        return this.root;
+        return ProjectManager.getInstance().getProjectNode(this.projectTechnicalLabel);
     }
 
     /**
@@ -429,7 +417,9 @@ public class RepositoryNode implements IRepositoryNode, IActionFilter {
      * @param root the root to set
      */
     public void setRoot(IProjectRepositoryNode root) {
-        this.root = root;
+        if (root != null) {
+            this.projectTechnicalLabel = root.getProject().getTechnicalLabel();
+        }
     }
 
     /**
@@ -437,7 +427,6 @@ public class RepositoryNode implements IRepositoryNode, IActionFilter {
      * delete elements; if withDeleted is false,will not catain some logical delete elements.
      * 
      */
-    @Override
     public List<IRepositoryNode> getChildren(boolean withDeleted) {
         return getChildren();
     }
@@ -455,7 +444,6 @@ public class RepositoryNode implements IRepositoryNode, IActionFilter {
      * 
      * @see org.eclipse.ui.IActionFilter#testAttribute(java.lang.Object, java.lang.String, java.lang.String)
      */
-    @Override
     public boolean testAttribute(Object target, String name, String value) {
         RepositoryNode node = (RepositoryNode) target;
         // The 2 following declarations are used by TDQ-3800:
@@ -483,7 +471,6 @@ public class RepositoryNode implements IRepositoryNode, IActionFilter {
         this.enableDisposed = enableDisposed;
     }
 
-    @Override
     public void dispose() {
         /*
          * FIXME, if later, can dispose all children, the flag enableDisposed will be not useful. So far, because many
@@ -497,7 +484,7 @@ public class RepositoryNode implements IRepositoryNode, IActionFilter {
         }
         if (doDispose) {
             this.id = null;
-            this.root = null;
+            this.projectTechnicalLabel = null;
             this.parent = null;
             this.object = null;
 
@@ -525,7 +512,6 @@ public class RepositoryNode implements IRepositoryNode, IActionFilter {
         }
     }
 
-    @Override
     public boolean isDisposed() {
         return this.isDisposed;
     }

org.talend.core/plugin.xml

@@ -61,13 +61,6 @@
             id="org.talend.core.InitConnectionsMigrationTask"
             name="Init connections preferences"
             version="5.1.2"/>
-      <workspacetask
-            breaks="5.1.3"
-            class="org.talend.core.prefs.EmptyConnectionsMigrationTask"
-            id="org.talend.core.EmptyConnectionsMigrationTask"
-            name="Empty connection from preference"
-            version="5.2.2">
-      </workspacetask>
    </extension>
    <extension
          point="org.eclipse.ui.startup">

org.talend.core/src/main/java/messages.properties

@@ -438,5 +438,4 @@ ConnectionParameterName.UserLabel=User
 ConnectionParameterName.PasswordLabel=Password
 ConnectionParameterName.DbfileLabel=Database
 ConnectionParameterName.DbPathLabel=DataBase Root Path
-ImportExternalJarAction.title=Import external jars
 

org.talend.core/src/main/java/org/talend/core/model/metadata/QueryUtil.java

@@ -13,8 +13,6 @@
 package org.talend.core.model.metadata;
 
 import java.util.List;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 
 import org.talend.core.CorePlugin;
 import org.talend.core.database.EDatabaseTypeName;
@@ -219,14 +217,6 @@ public class QueryUtil {
 
             String columnStr = columnName;
 
-            // Remove special symbols for mssql column
-            if (dbType != null
-                    && (dbType.equals(EDatabaseTypeName.MSSQL.getDisplayName()) || dbType.equals(EDatabaseTypeName.JAVADB_EMBEDED
-                            .getDisplayName()))) {
-                Pattern pattern = Pattern.compile("[^\\w.]");
-                Matcher matcher = pattern.matcher(columnStr);
-                columnStr = TalendTextUtils.addQuotes(matcher.replaceAll(""));
-            }
             if (i != index - 1) {
                 columnStr = checkAndConcatString(columnStr, TalendTextUtils.declareString("," + SPACE)); //$NON-NLS-1$
             }
@@ -249,12 +239,10 @@ public class QueryUtil {
             end = replaceTheSchemaString(end);
 
             query = checkAndConcatString(query, columnsQuery) + end;
-        } else if (dbType != null && dbType.equals(EDatabaseTypeName.INFORMIX.getDisplayName())) { // hywang
-                                                                                                   // add
-                                                                                                   // for
+        } else if (dbType != null && dbType.equals(EDatabaseTypeName.INFORMIX.getDisplayName())) { // hywang add for
             // bug0007563
             String declareString = TalendTextUtils.getStringDeclare();
-            String end = ""; //$NON-NLS-1$
+            String end = ""; //$NON-NLS-N$ //$NON-NLS-1$
             if (!isCheck) { // hywang add isCheck for informix
                 end = checkAndConcatString(TalendTextUtils.declareString(" FROM "), declareString + realTableName[0] //$NON-NLS-1$
                         + declareString);
@@ -312,11 +300,9 @@ public class QueryUtil {
                     if (dbTableName.startsWith(TalendTextUtils.QUOTATION_MARK)
                             && dbTableName.endsWith(TalendTextUtils.QUOTATION_MARK) && dbTableName.length() > 2) {
                         currentTableName = dbTableName.substring(1, dbTableName.length() - 1);
-                        // if (dbType != null && (dbType.equals("NETEZZA") ||
-                        // dbType.equals("Netezza"))) {
+                        // if (dbType != null && (dbType.equals("NETEZZA") || dbType.equals("Netezza"))) {
                         // if (dbName != null && schema != null) {
-                        // currentTableName = dbName + "." + schema + "." +
-                        // currentTableName;
+                        // currentTableName = dbName + "." + schema + "." + currentTableName;
                         // } else if (dbName != null && schema == null) {
                         // currentTableName = dbName + ".." + currentTableName;
                         // }
@@ -356,12 +342,8 @@ public class QueryUtil {
             currentTableName = DEFAULT_TABLE_NAME;
         }
         if (schema != null && schema.length() > 0) {
-            // Quote is added to schema and table when call getSchemaName()
-            // method
+            // Quote is added to schema and table when call getSchemaName() method
             currentTableName = getSchemaName(schema, dbType, currentTableName);
-            if (dbType != null && dbType.equals(EDatabaseTypeName.JAVADB_EMBEDED.getDisplayName())) {
-                currentTableName = quoteStringValue(currentTableName, dbType);
-            }
         } else {
             // If no schema, you also need to add quote to table name
             if (isContext(currentTableName)) {
@@ -379,8 +361,7 @@ public class QueryUtil {
         String suffix;
         EDatabaseTypeName typeFromDbType = EDatabaseTypeName.getTypeFromDbType(dbType);
         if (typeFromDbType.isNeedSchema()) {
-            // wzhang modified to fix bug 7879. value of oracle schema can't
-            // attach quotation marks.
+            // wzhang modified to fix bug 7879. value of oracle schema can't attach quotation marks.
             boolean isOracle = (typeFromDbType == EDatabaseTypeName.ORACLEFORSID || EDatabaseTypeName.ORACLESN == typeFromDbType || EDatabaseTypeName.ORACLE_OCI == typeFromDbType);
             if (isContext(schema)) {
                 String schemaStr = quoteVariableRefrence(schema, dbType);

org.talend.core/src/main/java/org/talend/core/prefs/EmptyConnectionsMigrationTask.java

@@ -1,54 +0,0 @@
-package org.talend.core.prefs;
-
-import java.io.IOException;
-import java.util.Date;
-import java.util.GregorianCalendar;
-
-import org.eclipse.jface.preference.IPersistentPreferenceStore;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.ui.PlatformUI;
-import org.talend.migration.AbstractMigrationTask;
-import org.talend.migration.IWorkspaceMigrationTask;
-
-/**
- * created by nrousseau on Jan 5, 2013 Detailled comment
- * 
- */
-public class EmptyConnectionsMigrationTask extends AbstractMigrationTask implements IWorkspaceMigrationTask {
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.talend.core.model.migration.IMigrationTask#execute()
-     */
-    public boolean execute() {
-        IPreferenceStore store = PlatformUI.getPreferenceStore();
-
-        if (store.contains(ITalendCorePrefConstants.LAST_USED_CONNECTION)) {
-            store.setValue(ITalendCorePrefConstants.LAST_USED_CONNECTION, ""); //$NON-NLS-1$
-        }
-
-        if (store.contains(ITalendCorePrefConstants.CONNECTIONS)) {
-            store.setValue(ITalendCorePrefConstants.CONNECTIONS, ""); //$NON-NLS-1$
-        }
-
-        if (store.contains("Connections.new")) { //$NON-NLS-1$
-            store.setValue("Connections.new", ""); //$NON-NLS-1$ //$NON-NLS-2$
-        }
-
-        if (store != null && store instanceof IPersistentPreferenceStore && store.needsSaving()) {
-            try {
-                ((IPersistentPreferenceStore) store).save();
-            } catch (IOException e) {
-                //
-            }
-        }
-
-        return true;
-    }
-
-    public Date getOrder() {
-        GregorianCalendar gc = new GregorianCalendar(2013, 1, 5, 12, 0, 0);
-        return gc.getTime();
-    }
-}

org.talend.core/src/main/java/org/talend/core/sqlbuilder/util/ConnectionParameters.java

@@ -12,9 +12,7 @@
 // ============================================================================
 package org.talend.core.sqlbuilder.util;
 
-import java.util.HashMap;
 import java.util.Hashtable;
-import java.util.Map;
 
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.Path;
@@ -175,8 +173,6 @@ public class ConnectionParameters {
     // mark first open Sql Builder
     private boolean isFirstOpenSqlBuilder = false;
 
-    private Map<String, String> parameters;
-
     /**
      * Sets the connectionComment.
      * 
@@ -282,25 +278,6 @@ public class ConnectionParameters {
      * ConnectionParameters constructor.
      */
     public ConnectionParameters() {
-        this.parameters = new HashMap<String, String>();
-    }
-
-    /**
-     * Getter for parameters.
-     * 
-     * @return the parameters
-     */
-    public Map<String, String> getParameters() {
-        return this.parameters;
-    }
-
-    /**
-     * Sets the parameters.
-     * 
-     * @param parameters the parameters to set
-     */
-    public void setParameters(Map<String, String> parameters) {
-        this.parameters = parameters;
     }
 
     /**
@@ -366,7 +343,7 @@ public class ConnectionParameters {
      * @param dbType the dbType to set
      */
     public void setDbType(String dbType) {
-        if (dbType != null && !"".equals(dbType)) { //$NON-NLS-1$
+        if (dbType != null) {
             this.dbType = TextUtil.removeQuots(EDatabaseTypeName.getTypeFromDbType(dbType).getDisplayName());
         } else {
             this.dbType = ""; //$NON-NLS-1$

org.talend.core/src/main/java/org/talend/core/sqlbuilder/util/EConnectionParameterName.java

@@ -33,8 +33,7 @@ public enum EConnectionParameterName {
     DRIVER_CLASS("Driver class"), //$NON-NLS-1$
     LOCAL_SERVICE_NAME("Local Service Name"),
     URL("Url"), //$NON-NLS-1$
-    HTTPS("https"), //$NON-NLS-1$
-    DBPATH("DBPATH");//$NON-NLS-1$
+    HTTPS("https");//$NON-NLS-1$
 
     private String displayName;
 

org.talend.core/src/main/java/org/talend/core/ui/images/CoreImageProvider.java

@@ -59,10 +59,8 @@ public class CoreImageProvider {
                 switch (iconSize) {
                 case ICON_16:
                     icon = component.getIcon16();
-                    break;
                 case ICON_24:
                     icon = component.getIcon24();
-                    break;
                 case ICON_32:
                 default:
                     icon = component.getIcon32();

org.talend.core/src/main/java/org/talend/core/ui/metadata/dialog/MetadataDialog.java

@@ -75,6 +75,8 @@ public class MetadataDialog extends Dialog {
 
     private static final String DATABASE_LABEL = "Database"; //$NON-NLS-1$
 
+    private static final String ELT_LABEL = "ELT"; //$NON-NLS-1$
+
     @Override
     protected void setShellStyle(int newShellStyle) {
         newShellStyle = newShellStyle | SWT.RESIZE;
@@ -186,7 +188,7 @@ public class MetadataDialog extends Dialog {
         boolean hasRepositoryDbSchema = false;
         boolean isEBCDIC = false;
         if (node != null && node.getComponent() != null) {
-            eltComponent = node.isELTComponent();
+            eltComponent = node.getComponent().getOriginalFamilyName().startsWith(ELT_LABEL);
             isEBCDIC = node.getComponent().getName().contains("EBCDIC");
             if (node.getComponent().getOriginalFamilyName().startsWith(DATABASE_LABEL) || eltComponent || isEBCDIC) {
                 dbComponent = true && !isEBCDIC;
@@ -264,7 +266,7 @@ public class MetadataDialog extends Dialog {
 
         metaView.setShowDbTypeColumn(hasMappingType || eltComponent, false, hasMappingType
                 || (dbComponent && !hasRepositoryDbSchema));
-        metaView.setShowDbColumnName(dbComponent, hasMappingType || (dbComponent && !hasRepositoryDbSchema));
+        metaView.setShowDbColumnName(dbComponent && (!eltComponent), hasMappingType || (dbComponent && !hasRepositoryDbSchema));
 
         // hide the talend type for ELT components
         metaView.setShowTalendTypeColumn(!eltComponent);

org.talend.core/src/main/java/org/talend/designer/runprocess/ProcessorUtilities.java

@@ -18,6 +18,7 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -32,6 +33,7 @@ import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.emf.common.util.EList;
+import org.eclipse.jdt.core.IJavaProject;
 import org.eclipse.ui.IEditorPart;
 import org.talend.commons.CommonsPlugin;
 import org.talend.commons.exception.PersistenceException;
@@ -97,8 +99,6 @@ public class ProcessorUtilities {
 
     private static boolean codeModified;
 
-    private static boolean needContextInCurrentGeneration = true;
-
     private static IDesignerCoreService designerCoreService = (IDesignerCoreService) GlobalServiceRegister.getDefault()
             .getService(IDesignerCoreService.class);
 
@@ -295,9 +295,8 @@ public class ProcessorUtilities {
     }
 
     private static IProcessor generateCode(IProcessor processor2, JobInfo jobInfo, String selectedContextName,
-            boolean statistics, boolean trace, boolean needContext, int option, IProgressMonitor progressMonitor)
+            boolean statistics, boolean trace, boolean properties, int option, IProgressMonitor progressMonitor)
             throws ProcessorException {
-        needContextInCurrentGeneration = needContext;
         if (progressMonitor == null) {
             progressMonitor = new NullProgressMonitor();
         }
@@ -378,7 +377,7 @@ public class ProcessorUtilities {
         }
         resetRunJobComponentParameterForContextApply(jobInfo, currentProcess, selectedContextName);
 
-        generateNodeInfo(jobInfo, selectedContextName, statistics, needContext, option, progressMonitor, currentProcess);
+        generateNodeInfo(jobInfo, selectedContextName, statistics, option, progressMonitor, currentProcess);
 
         IProcessor processor = null;
         if (processor2 != null) {
@@ -394,7 +393,7 @@ public class ProcessorUtilities {
         // generate the code of the father after the childrens
         // so the code won't have any error during the check, and it will help to check
         // if the generation is really needed.
-        generateContextInfo(jobInfo, selectedContextName, statistics, trace, needContext, progressMonitor, currentProcess,
+        generateContextInfo(jobInfo, selectedContextName, statistics, trace, properties, progressMonitor, currentProcess,
                 currentJobName, processor);
 
         /*
@@ -455,19 +454,18 @@ public class ProcessorUtilities {
             CorePlugin.getDefault().getRunProcessService().updateLibraries(jarList, currentProcess);
             if (LanguageManager.getCurrentLanguage() == ECodeLanguage.JAVA && codeModified) {
                 try {
-                    CorePlugin.getDefault().getRunProcessService().getJavaProject().getProject()
-                            .build(IncrementalProjectBuilder.AUTO_BUILD, null);
+                    ((IJavaProject) CorePlugin.getDefault().getRunProcessService().getJavaProject()).getProject().build(
+                            IncrementalProjectBuilder.AUTO_BUILD, null);
                 } catch (CoreException e) {
                     throw new ProcessorException(e);
                 }
             }
-            needContextInCurrentGeneration = true;
             codeModified = false;
         }
     }
 
     private static void generateContextInfo(JobInfo jobInfo, String selectedContextName, boolean statistics, boolean trace,
-            boolean needContext, IProgressMonitor progressMonitor, IProcess currentProcess, String currentJobName,
+            boolean properties, IProgressMonitor progressMonitor, IProcess currentProcess, String currentJobName,
             IProcessor processor) throws ProcessorException {
         if (isCodeGenerationNeeded(jobInfo, statistics, trace)) {
             codeModified = true;
@@ -485,27 +483,25 @@ public class ProcessorUtilities {
             }
 
             // always generate all context files.
-            if (needContext) {
-                List<IContext> list = currentProcess.getContextManager().getListContext();
-                for (IContext context : list) {
-                    if (context.getName().equals(currentContext.getName())) {
-                        processor.setContext(currentContext); // generate current context.
-                    } else {
-                        processor.setContext(context);
-                    }
-                    LastGenerationInfo.getInstance().getContextPerJob(jobInfo.getJobId(), jobInfo.getJobVersion())
-                            .add(context.getName());
-                    try {
-                        processor.generateContextCode();
-                    } catch (ProcessorException pe) {
-                        ExceptionHandler.process(pe);
-                    }
+            List<IContext> list = currentProcess.getContextManager().getListContext();
+            for (IContext context : list) {
+                if (context.getName().equals(currentContext.getName())) {
+                    processor.setContext(currentContext); // generate current context.
+                } else {
+                    processor.setContext(context);
+                }
+                LastGenerationInfo.getInstance().getContextPerJob(jobInfo.getJobId(), jobInfo.getJobVersion())
+                        .add(context.getName());
+                try {
+                    processor.generateContextCode();
+                } catch (ProcessorException pe) {
+                    ExceptionHandler.process(pe);
                 }
             }
 
             processor.setContext(currentContext);
             // main job will use stats / traces
-            processor.generateCode(statistics, trace, true, exportAsOSGI);
+            processor.generateCode(statistics, trace, properties, exportAsOSGI);
             if (currentProcess instanceof IProcess2 && ((IProcess2) currentProcess).getProperty() != null) {
                 designerCoreService.getLastGeneratedJobsDateMap().put(currentProcess.getId(),
                         ((IProcess2) currentProcess).getProperty().getModificationDate());
@@ -524,8 +520,7 @@ public class ProcessorUtilities {
     }
 
     private static IProcessor generateCode(JobInfo jobInfo, String selectedContextName, boolean statistics, boolean trace,
-            boolean needContext, int option, IProgressMonitor progressMonitor) throws ProcessorException {
-        needContextInCurrentGeneration = needContext;
+            boolean properties, int option, IProgressMonitor progressMonitor) throws ProcessorException {
         TimeMeasure.display = CommonsPlugin.isDebugMode();
         TimeMeasure.displaySteps = CommonsPlugin.isDebugMode();
         TimeMeasure.measureActive = CommonsPlugin.isDebugMode();
@@ -628,7 +623,7 @@ public class ProcessorUtilities {
             }
             resetRunJobComponentParameterForContextApply(jobInfo, currentProcess, selectedContextName);
 
-            generateNodeInfo(jobInfo, selectedContextName, statistics, needContext, option, progressMonitor, currentProcess);
+            generateNodeInfo(jobInfo, selectedContextName, statistics, option, progressMonitor, currentProcess);
             TimeMeasure.step(idTimer, "generateNodeInfo");
 
             IProcessor processor = null;
@@ -638,7 +633,7 @@ public class ProcessorUtilities {
                 processor = getProcessor(currentProcess, selectedProcessItem.getProperty());
             }
 
-            generateContextInfo(jobInfo, selectedContextName, statistics, trace, needContext, progressMonitor, currentProcess,
+            generateContextInfo(jobInfo, selectedContextName, statistics, trace, properties, progressMonitor, currentProcess,
                     currentJobName, processor);
             TimeMeasure.step(idTimer, "generateContextInfo");
 
@@ -689,8 +684,8 @@ public class ProcessorUtilities {
         }
     }
 
-    private static void generateNodeInfo(JobInfo jobInfo, String selectedContextName, boolean statistics, boolean properties,
-            int option, IProgressMonitor progressMonitor, IProcess currentProcess) throws ProcessorException {
+    private static void generateNodeInfo(JobInfo jobInfo, String selectedContextName, boolean statistics, int option,
+            IProgressMonitor progressMonitor, IProcess currentProcess) throws ProcessorException {
         if (option != GENERATE_MAIN_ONLY) {
             // handle subjob in joblet. see bug 004937: tRunJob in a Joblet
             List<? extends INode> graphicalNodes = currentProcess.getGeneratingNodes();
@@ -746,11 +741,11 @@ public class ProcessorUtilities {
                             if (!jobList.contains(subJobInfo)) {
                                 // children won't have stats / traces
                                 if (option == GENERATE_WITH_FIRST_CHILD) {
-                                    generateCode(subJobInfo, selectedContextName, statistics, false, properties,
-                                            GENERATE_MAIN_ONLY, progressMonitor);
+                                    generateCode(subJobInfo, selectedContextName, statistics, false, true, GENERATE_MAIN_ONLY,
+                                            progressMonitor);
                                 } else {
-                                    generateCode(subJobInfo, selectedContextName, statistics, false, properties,
-                                            GENERATE_ALL_CHILDS, progressMonitor);
+                                    generateCode(subJobInfo, selectedContextName, statistics, false, true, GENERATE_ALL_CHILDS,
+                                            progressMonitor);
                                     currentProcess.setNeedRegenerateCode(true);
                                 }
                                 LastGenerationInfo
@@ -820,7 +815,8 @@ public class ProcessorUtilities {
             String selectedContextName) {
 
         if (jobInfo.isApplyContextToChildren()) {
-            for (INode node : currentProcess.getGeneratingNodes()) {
+            for (Iterator<? extends INode> iter = currentProcess.getGeneratingNodes().iterator(); iter.hasNext();) {
+                INode node = iter.next();
                 if ((node != null) && node.getComponent().getName().equals("tRunJob")) { //$NON-NLS-1$
                     // the corresponding parameter is
                     // EParameterName.PROCESS_TYPE_CONTEXT
@@ -892,8 +888,16 @@ public class ProcessorUtilities {
     }
 
     public static IProcessor generateCode(ProcessItem process, String contextName, String version, boolean statistics,
-            boolean trace, boolean applyContextToChildren, boolean needContext, IProgressMonitor... monitors)
+            boolean trace, boolean applyContextToChildren, boolean isExportedAsOSGI, IProgressMonitor... monitors)
             throws ProcessorException {
+        exportAsOSGI = isExportedAsOSGI;
+        IProcessor result = generateCode(process, contextName, version, statistics, trace, applyContextToChildren, monitors);
+        exportAsOSGI = false;
+        return result;
+    }
+
+    public static IProcessor generateCode(ProcessItem process, String contextName, String version, boolean statistics,
+            boolean trace, boolean applyContextToChildren, IProgressMonitor... monitors) throws ProcessorException {
         IProgressMonitor monitor = null;
         if (monitors == null) {
             monitor = new NullProgressMonitor();
@@ -903,7 +907,7 @@ public class ProcessorUtilities {
         JobInfo jobInfo = new JobInfo(process, contextName, version);
         jobInfo.setApplyContextToChildren(applyContextToChildren);
         jobList.clear();
-        IProcessor result = generateCode(jobInfo, contextName, statistics, trace, needContext, GENERATE_ALL_CHILDS, monitor);
+        IProcessor result = generateCode(jobInfo, contextName, statistics, trace, true, GENERATE_ALL_CHILDS, monitor);
         jobList.clear();
         return result;
     }
@@ -1127,13 +1131,14 @@ public class ProcessorUtilities {
         IProcessor processor = getProcessor(currentProcess, selectedProcessItem.getProperty(), currentContext);
         String[] cmd = new String[] { processor.getCodePath().removeFirstSegments(1).toString().replace("/", ".") }; //$NON-NLS-1$ //$NON-NLS-2$
         if (codeOptions != null) {
-            for (String string : codeOptions) {
+            for (int i = 0; i < codeOptions.length; i++) {
+                String string = codeOptions[i];
                 if (string != null) {
                     cmd = (String[]) ArrayUtils.add(cmd, string);
                 }
             }
         }
-        if (needContextInCurrentGeneration && contextName != null && !contextName.equals("")) {
+        if (contextName != null && !contextName.equals("")) {
             cmd = (String[]) ArrayUtils.add(cmd, "--context=" + contextName); //$NON-NLS-1$
         }
         if (statisticPort != -1) {
@@ -1285,7 +1290,7 @@ public class ProcessorUtilities {
         sb.append(""); //$NON-NLS-1$
         if (cmd != null && cmd.length > 0) {
             for (String s : cmd) {
-                sb.append(s).append(' ');
+                sb.append(s).append(' '); //$NON-NLS-1$
             }
         }
         String commandStr = CorePlugin.getDefault().getPreferenceStore().getString(ITalendCorePrefConstants.COMMAND_STR);
@@ -1293,22 +1298,4 @@ public class ProcessorUtilities {
         return finalCommand;
     }
 
-    /**
-     * Getter for exportAsOSGI.
-     * 
-     * @return the exportAsOSGI
-     */
-    public static boolean isExportAsOSGI() {
-        return exportAsOSGI;
-    }
-
-    /**
-     * Sets the exportAsOSGI.
-     * 
-     * @param exportAsOSGI the exportAsOSGI to set
-     */
-    public static void setExportAsOSGI(boolean exportAsOSGI) {
-        ProcessorUtilities.exportAsOSGI = exportAsOSGI;
-    }
-
 }

org.talend.core/src/main/java/org/talend/repository/documentation/generation/InternalNodeComponentHandler.java

@@ -131,17 +131,17 @@ public class InternalNodeComponentHandler extends AbstractComponentHandler {
             for (int j = 0; j < elementParameterList.size(); j++) {
                 IElementParameter elemparameter = (IElementParameter) elementParameterList.get(j);
 
-//                if ((istRunJob && elemparameter.getName().equals("PROCESS")) //$NON-NLS-1$
-//                        || (!elemparameter.isShow(copyElementParameterList) && (!elemparameter.getName().equals(
-//                                EParameterFieldType.SCHEMA_TYPE.getName())))
-//                        || elemparameter.getCategory().equals(EComponentCategory.MAIN)
-//                        || elemparameter.getCategory().equals(EComponentCategory.VIEW)
-//                        || elemparameter.getName().equals(IHTMLDocConstants.REPOSITORY)
-//                        || elemparameter.getName().equals("SCHEMA") || elemparameter.getName().equals("QUERYSTORE") //$NON-NLS-1$ //$NON-NLS-2$
-//                        || elemparameter.getName().equals("PROPERTY") //$NON-NLS-1$
-//                        || elemparameter.getName().equals(EParameterFieldType.ENCODING_TYPE.getName())) {
-//                    continue;
-//                }
+                if ((istRunJob && elemparameter.getName().equals("PROCESS")) //$NON-NLS-1$
+                        || (!elemparameter.isShow(copyElementParameterList) && (!elemparameter.getName().equals(
+                                EParameterFieldType.SCHEMA_TYPE.getName())))
+                        || elemparameter.getCategory().equals(EComponentCategory.MAIN)
+                        || elemparameter.getCategory().equals(EComponentCategory.VIEW)
+                        || elemparameter.getName().equals(IHTMLDocConstants.REPOSITORY)
+                        || elemparameter.getName().equals("SCHEMA") || elemparameter.getName().equals("QUERYSTORE") //$NON-NLS-1$ //$NON-NLS-2$
+                        || elemparameter.getName().equals("PROPERTY") //$NON-NLS-1$
+                        || elemparameter.getName().equals(EParameterFieldType.ENCODING_TYPE.getName())) {
+                    continue;
+                }
                 // String value = HTMLDocUtils.checkString(elemparameter.getValue().toString());
                 Object eleObj = elemparameter.getValue();
                 String value = ""; //$NON-NLS-1$

org.talend.core/src/main/java/org/talend/runprocess/data/IteratePerformance.java

@@ -77,9 +77,6 @@ public class IteratePerformance extends CommonPerformance {
     }
 
     private int parseSize(String numStr) {
-        if (numStr.contains("exec.")) {
-            return new Integer(numStr.substring(5)).intValue();
-        }
         return new Integer(numStr.substring(4)).intValue();
     }
 

org.talend.datatools.xml/src/main/java/org/talend/datatools/xml/utils/SchemaPopulationUtil.java

@@ -97,28 +97,12 @@ public class SchemaPopulationUtil {
 
     public static ATreeNode getSchemaTree(XSDSchema schema, ATreeNode selectedNode) throws OdaException, URISyntaxException,
             IOException {
-        return getSchemaTree(null, schema, selectedNode);
-    }
-
-    public static ATreeNode getSchemaTree(XSDPopulationUtil2 popUtil, XSDSchema schema, ATreeNode selectedNode)
-            throws OdaException, URISyntaxException, IOException {
-        if (popUtil == null) {
-            popUtil = new XSDPopulationUtil2();
-        }
-        return popUtil.getSchemaTree(schema, selectedNode);
-    }
-
-    public static ATreeNode getSchemaTree(XSDPopulationUtil2 popUtil, XSDSchema schema, ATreeNode selectedNode,
-            boolean supportChoice, boolean supportSubstitution) throws OdaException, URISyntaxException, IOException {
-        if (popUtil == null) {
-            popUtil = new XSDPopulationUtil2();
-        }
-        return popUtil.getSchemaTree(schema, selectedNode, supportChoice, supportSubstitution);
+        return new XSDPopulationUtil2().getSchemaTree(schema, selectedNode);
     }
 
     public static ATreeNode getSchemaTree(XSDSchema schema, ATreeNode selectedNode, boolean supportChoice,
             boolean supportSubstitution) throws OdaException, URISyntaxException, IOException {
-        return getSchemaTree(null, schema, selectedNode, supportChoice, supportSubstitution);
+        return new XSDPopulationUtil2().getSchemaTree(schema, selectedNode, supportChoice, supportSubstitution);
     }
 
 }
@@ -164,7 +148,6 @@ final class XMLFileSchemaTreePopulator implements ISaxParserConsumer {
      * @see org.eclipse.datatools.enablement.oda.xml.util.ISaxParserConsumer#manipulateData(java.lang.String,
      * java.lang.String)
      */
-    @Override
     public void manipulateData(String path, String value) {
     }
 
@@ -174,7 +157,6 @@ final class XMLFileSchemaTreePopulator implements ISaxParserConsumer {
      * @see org.eclipse.datatools.enablement.oda.xml.util.ISaxParserConsumer#detectNewRow(java.lang.String,
      * java.lang.String, java.lang.String, boolean)
      */
-    @Override
     public void detectNewRow(String path, String prefix, String uri, boolean start) {
         String treamedPath = path.replaceAll("\\Q[\\E\\d+\\Q]\\E", "").trim();
         this.insertNode(treamedPath, prefix, uri);
@@ -207,7 +189,6 @@ final class XMLFileSchemaTreePopulator implements ISaxParserConsumer {
      * 
      * @see org.eclipse.datatools.enablement.oda.xml.util.ISaxParserConsumer#wakeup()
      */
-    @Override
     public synchronized void wakeup() {
         notify();
     }
@@ -349,15 +330,13 @@ final class XSDFileSchemaTreePopulator {
      */
     private static void populateRoot(ATreeNode root) {
         Object[] toBeIterated = root.getChildren();
-        for (Object element : toBeIterated) {
-            Object value = ((ATreeNode) element).getDataType();
+        for (int i = 0; i < toBeIterated.length; i++) {
+            Object value = ((ATreeNode) toBeIterated[i]).getDataType();
             List container = new ArrayList();
-            if (value != null) {
-                findNodeWithValue(root, value.toString(), container, new VisitingRecorder());
-            }
+            findNodeWithValue(root, value.toString(), container, new VisitingRecorder());
             for (int j = 0; j < container.size(); j++) {
                 if (((ATreeNode) container.get(j)).getChildren().length == 0) {
-                    Object[] os = ((ATreeNode) element).getChildren();
+                    Object[] os = ((ATreeNode) toBeIterated[i]).getChildren();
                     for (int k = 0; k < os.length; k++) {
                         if (os[k] instanceof ATreeNode) {
                             if (!(((ATreeNode) os[k]).getDataType() != null && ((ATreeNode) os[k]).getDataType().equals(
@@ -374,8 +353,8 @@ final class XSDFileSchemaTreePopulator {
 
     private static void populateRoot(ATreeNode root, ATreeNode selectedNode) {
         Object[] toBeIterated = root.getChildren();
-        for (Object element : toBeIterated) {
-            ATreeNode node = ((ATreeNode) element);
+        for (int i = 0; i < toBeIterated.length; i++) {
+            ATreeNode node = ((ATreeNode) toBeIterated[i]);
             Object nodeValue = node.getValue();
             if (nodeValue != null && !nodeValue.equals(selectedNode.getValue()) && !nodeValue.equals(selectedNode.getDataType())) {
                 continue;
@@ -385,7 +364,7 @@ final class XSDFileSchemaTreePopulator {
             findNodeWithValue(root, value.toString(), container, new VisitingRecorder());
             for (int j = 0; j < container.size(); j++) {
                 if (((ATreeNode) container.get(j)).getChildren().length == 0) {
-                    Object[] os = ((ATreeNode) element).getChildren();
+                    Object[] os = ((ATreeNode) toBeIterated[i]).getChildren();
                     for (int k = 0; k < os.length; k++) {
                         if (os[k] instanceof ATreeNode) {
                             if (!(((ATreeNode) os[k]).getDataType() != null && ((ATreeNode) os[k]).getDataType().equals(
@@ -417,9 +396,9 @@ final class XSDFileSchemaTreePopulator {
             container.add(root);
         }
         Object[] children = root.getChildren();
-        for (Object element : children) {
-            if (element instanceof ATreeNode) {
-                findNodeWithValue((ATreeNode) element, value, container, vr);
+        for (int i = 0; i < children.length; i++) {
+            if (children[i] instanceof ATreeNode) {
+                findNodeWithValue((ATreeNode) children[i], value, container, vr);
             }
 
         }
@@ -491,7 +470,7 @@ final class XSDFileSchemaTreePopulator {
                 for (int j = 0; j < fieldStrs.getLength(); j++) {
                     uniqueName = fieldStrs.item(j);
                     if (uniqueName != null && !"".equals(uniqueName)) {
-                        uniqueName = uniqueName.replace("/", "").replace(".", "");
+                        uniqueName = uniqueName.replace("/", "").replace(".", ""); //$NON-NLS-N$
                         node.getUniqueNames().add(uniqueName);
                     }
                 }
@@ -622,7 +601,7 @@ final class XSDFileSchemaTreePopulator {
                 for (int j = 0; j < fieldStrs.getLength(); j++) {
                     uniqueName = fieldStrs.item(j);
                     if (uniqueName != null && !"".equals(uniqueName)) {
-                        uniqueName = uniqueName.replace("/", "").replace(".", "");
+                        uniqueName = uniqueName.replace("/", "").replace(".", ""); //$NON-NLS-N$
                         node.getUniqueNames().add(uniqueName);
                     }
                 }
@@ -893,9 +872,9 @@ final class XSDFileSchemaTreePopulator {
      */
     private static ATreeNode findComplexElement(ATreeNode root, String value) {
         Object[] os = root.getChildren();
-        for (Object element : os) {
-            if (((ATreeNode) element).getValue().equals(value)) {
-                return (ATreeNode) element;
+        for (int i = 0; i < os.length; i++) {
+            if (((ATreeNode) os[i]).getValue().equals(value)) {
+                return (ATreeNode) os[i];
             }
         }
         return null;

org.talend.datatools.xml/src/main/java/org/talend/datatools/xml/utils/XSDPopulationUtil2.java

@@ -75,11 +75,8 @@ public class XSDPopulationUtil2 {
     }
 
     public XSDSchema getXSDSchema(String fileName) throws URISyntaxException, MalformedURLException {
-        return getXSDSchema(fileName, false);
-    }
-
-    public XSDSchema getXSDSchema(String fileName, boolean forceReload) throws URISyntaxException, MalformedURLException {
         // Create a resource set and load the main schema file into it.
+        //
         XSDResourceImpl mainXsdResource = (XSDResourceImpl) resourceSet.getResource(URI.createFileURI(fileName), true);
 
         boolean haveExternalDependenciesWithoutLocation = false;
@@ -109,7 +106,7 @@ public class XSDPopulationUtil2 {
         }
 
         XSDSchema xsdSchema = mainXsdResource.getSchema();
-        if (forceReload || haveExternalDependenciesWithoutLocation) {
+        if (haveExternalDependenciesWithoutLocation) {
             // force to set the element again, it will set automatically the dependencies
             xsdSchema.setElement(xsdSchema.getDocument().getDocumentElement());
         }
@@ -221,17 +218,7 @@ public class XSDPopulationUtil2 {
                 }
                 xsdElementDeclarationParticle = schemaFromNamespace.resolveElementDeclarationURI(xsdElementDeclarationParticle
                         .getURI());
-                typeDef = xsdElementDeclarationParticle.getTypeDefinition();
-            }
-            String typeNamespace = typeDef.getTargetNamespace();
-            if (typeNamespace != null && !typeNamespace.equals(namespace)) {
-                XSDSchema schemaOfType = getXSDSchemaFromNamespace(typeNamespace);
-                if (schemaOfType != null) {
-                    XSDTypeDefinition typeDefinition = schemaOfType.resolveComplexTypeDefinitionURI(typeDef.getURI());
-                    if (typeDefinition != null && typeDefinition.getContainer() != null) {
-                        typeDef = typeDefinition;
-                    }
-                }
+                typeDef = xsdElementDeclarationParticle.getType();
             }
             if (namespace != null) {
                 prefix = namespaceToPrefix.get(namespace);
@@ -272,15 +259,14 @@ public class XSDPopulationUtil2 {
             if (typeDef instanceof XSDComplexTypeDefinition) {
                 if (!currentPath.contains("/" + elementName + "/")) {
                     String path = currentPath + elementName + "/";
-                    // XSDTypeDefinition xsdTypeDefinition = xsdElementDeclarationParticle.getTypeDefinition();
-                    // if (xsdTypeDefinition == null) {
-                    // XSDComplexTypeDefinition generalType = xsdSchema
-                    // .resolveComplexTypeDefinitionURI(xsdElementDeclarationParticle.getURI());
-                    // if (generalType.getContainer() != null) {
-                    // xsdTypeDefinition = generalType;
-                    // }
-                    // }
-                    XSDTypeDefinition xsdTypeDefinition = typeDef;
+                    XSDTypeDefinition xsdTypeDefinition = xsdElementDeclarationParticle.getTypeDefinition();
+                    if (xsdTypeDefinition == null) {
+                        XSDComplexTypeDefinition generalType = xsdSchema
+                                .resolveComplexTypeDefinitionURI(xsdElementDeclarationParticle.getURI());
+                        if (generalType.getContainer() != null) {
+                            xsdTypeDefinition = generalType;
+                        }
+                    }
                     if (xsdTypeDefinition != null && xsdTypeDefinition.getName() != null) {
                         partNode.setDataType(xsdTypeDefinition.getQName());
                     }
@@ -321,8 +307,8 @@ public class XSDPopulationUtil2 {
             XSDModelGroup xsdModelGroup = (XSDModelGroup) xsdTerm;
             ATreeNode node = addChoiceDetails(parentNode, xsdModelGroup);
             handleOptionalAttribute(node, xsdParticle);
-            for (Object element : xsdModelGroup.getParticles()) {
-                XSDParticle childParticle = (XSDParticle) element;
+            for (Iterator j = xsdModelGroup.getParticles().iterator(); j.hasNext();) {
+                XSDParticle childParticle = (XSDParticle) j.next();
                 addParticleDetail(xsdSchema, childParticle, node, currentPath);
             }
         }
@@ -693,8 +679,8 @@ public class XSDPopulationUtil2 {
         if (xsdComplexTypeDefinition.getContentType() instanceof XSDParticle) {
             addParticleDetail(xsdSchema, (XSDParticle) xsdComplexTypeDefinition.getContentType(), node, currentPath);
         }
-        for (Object element : xsdComplexTypeDefinition.getAttributeUses()) {
-            XSDAttributeUse xsdAttributeUse = (XSDAttributeUse) element;
+        for (Iterator attributeUses = xsdComplexTypeDefinition.getAttributeUses().iterator(); attributeUses.hasNext();) {
+            XSDAttributeUse xsdAttributeUse = (XSDAttributeUse) attributeUses.next();
             XSDAttributeDeclaration xsdAttributeDeclaration = xsdAttributeUse.getAttributeDeclaration();
             String attributeDeclarationName = xsdAttributeDeclaration.getName();
             ATreeNode childNode = new ATreeNode();

org.talend.libraries.apache/.classpath

@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry exported="true" kind="lib" path="lib/poi-3.9-20121203.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/poi-ooxml-3.9-20121203.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/poi-ooxml-schemas-3.9-20121203.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/commons-codec-1.6.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/commons-logging-1.1.1.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
@@ -21,6 +18,9 @@
 	<classpathentry exported="true" kind="lib" path="lib/httpcore-4.0.1.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/httpmime-4.0.1.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/jakarta-oro-2.0.8.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/poi-3.6-20091214.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/poi-ooxml-3.6-20091214.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/poi-ooxml-schemas-3.6-20091214.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/xerces-2.6.2.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/xmlbeans-2.3.0.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/xalan.jar"/>

org.talend.libraries.apache/META-INF/MANIFEST.MF

@@ -17,14 +17,14 @@ Bundle-ClassPath: .,
  lib/httpcore-4.0.1.jar,
  lib/httpmime-4.0.1.jar,
  lib/jakarta-oro-2.0.8.jar,
+ lib/poi-3.6-20091214.jar,
+ lib/poi-ooxml-3.6-20091214.jar,
+ lib/poi-ooxml-schemas-3.6-20091214.jar,
  lib/xerces-2.6.2.jar,
  lib/xmlbeans-2.3.0.jar,
  lib/xalan.jar,
  lib/commons-logging-1.1.1.jar,
- lib/commons-codec-1.6.jar,
- lib/poi-3.9-20121203.jar,
- lib/poi-ooxml-3.9-20121203.jar,
- lib/poi-ooxml-schemas-3.9-20121203.jar
+ lib/commons-codec-1.6.jar
 Bundle-Vendor: .Talend SA.
 Eclipse-BuddyPolicy: dependent
 Require-Bundle: org.apache.log4j;resolution:=optional,
@@ -163,8 +163,15 @@ Export-Package: org.apache.commons.beanutils,
  org.apache.poi.hssf.record.cf,
  org.apache.poi.hssf.record.chart,
  org.apache.poi.hssf.record.common,
+ org.apache.poi.hssf.record.constant,
  org.apache.poi.hssf.record.cont,
  org.apache.poi.hssf.record.crypto,
+ org.apache.poi.hssf.record.formula,
+ org.apache.poi.hssf.record.formula.atp,
+ org.apache.poi.hssf.record.formula.eval,
+ org.apache.poi.hssf.record.formula.function,
+ org.apache.poi.hssf.record.formula.functions,
+ org.apache.poi.hssf.record.formula.udf,
  org.apache.poi.hssf.record.pivottable,
  org.apache.poi.hssf.usermodel,
  org.apache.poi.hssf.util,

org.talend.libraries.apache/build.properties

@@ -3,10 +3,7 @@ output.. = bin/
 bin.includes = META-INF/,\
                .,\
                licences/,\
-               lib/,\
-               lib/poi-3.9-20121203.jar,\
-               lib/poi-ooxml-3.9-20121203.jar,\
-               lib/poi-ooxml-schemas-3.9-20121203.jar
+               lib/
 bin.excludes = libs_not_used/commons-betwixt-0.8.jar,\
                libs_not_used/commons-digester-1.7.jar,\
                libs_not_used/commons-discovery-0.2.jar,\

org.talend.librariesmanager/resources/java/routines/StringHandling.java

@@ -168,7 +168,10 @@ public class StringHandling {
      * {example} EREPLACE("hello world!","world","guy") # hello world
      */
     public static String EREPLACE(String oldStr, String newStr, String replacement) {
-        return CHANGE(oldStr, newStr, replacement);
+        if (oldStr == null || newStr == null || replacement == null)
+        	return oldStr;
+        else
+        	return oldStr.replaceAll(newStr, replacement);
     }
 
     /**

org.talend.librariesmanager/resources/java/routines/TalendDate.java

@@ -8,7 +8,6 @@ package routines;
 import java.text.DateFormat;
 import java.text.FieldPosition;
 import java.text.ParseException;
-import java.text.ParsePosition;
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
 import java.util.Date;
@@ -171,58 +170,6 @@ public class TalendDate {
 
         return true;
     }
-    /**
-     * test string value as a date with right pattern.
-     * </br>examples:
-     * </br>TimeZone:+0100
-     * </br>2011/03/27 02:00:00 begin to carry out the daylight saving time. So parse dateString "20110327 021711"
-     * with TimeZone is wrong
-     * </br> <code>isDate("20110327 021711", "yyyyMMdd HHmmss",false)</code> return <code>false</code>
-     * 
-     * </br> <code>isDate("20110327 021711", "yyyyMMdd HHmmss",true)</code> return <code>true</code>
-     * 
-     * </br> <code>isDate("2008-11-32 12:15:25", "yyyy-MM-dd HH:mm:ss",true)</code> return <code>false</code> 
-     * 
-     * </br> <code>isDate("2008-11-32 12:15:25", "yyyy-MM-dd HH:mm:ss",false)</code> return <code>false</code>
-     * @param stringDate (A <code>String</code> whose beginning should be parsed)
-     * @param pattern (the pattern to format, like: "yyyy-MM-dd HH:mm:ss")
-     * @param ignoreTimeZone (if true ignore TimeZone when pare date with pattern)
-     * @return the result whether the stringDate is a date string that with a right pattern
-     * 
-     */
-    public static boolean isDate(String stringDate, String pattern, boolean ignoreTimeZone) {
-        TimeZone tz = TimeZone.getDefault();
-        if(ignoreTimeZone) {
-            tz = TimeZone.getTimeZone("UTC");
-        }
-        
-        if (stringDate == null) {
-            return false;
-        }
-        if (pattern == null) {
-            pattern = "yyyy-MM-dd HH:mm:ss";
-        }
-
-        java.text.SimpleDateFormat sdf = new java.text.SimpleDateFormat(pattern);
-        sdf.setTimeZone(tz);
-        sdf.setLenient(false);
-        
-        java.util.Date testDate = null;
-        ParsePosition pos = new ParsePosition(0);
-
-        testDate = sdf.parse(stringDate,pos);
-        
-        if(testDate == null) {
-            return false;
-        }
-        
-        String formatDate = sdf.format(testDate);
-        if(formatDate.equalsIgnoreCase(stringDate) || pos.getIndex() == stringDate.length()) {
-            return true;
-        }
-
-        return false;
-    }
 
     /**
      * compare two date

org.talend.librariesmanager/resources/java/sqltemplates/Generic/MergeInsert.sqltemplate

@@ -48,7 +48,7 @@
 					iFlag = true;
 				}
 				insertColumnsStr += (__TARGET_TABLE__ + "." + __ADDITIONAL_INSERT_COLUMNS_TRG_COLUMN_NAME__[i]);
-				insertValuesStr += (__ADDITIONAL_INSERT_COLUMNS_TRG_COLUMN_VALUE__[i]);
+				insertValuesStr += (__SOURCE_TABLE__ + "." + __ADDITIONAL_INSERT_COLUMNS_TRG_COLUMN_VALUE__[i]);
 			}
 		}
 		if (hasInsertWhereClause) {

org.talend.librariesmanager/resources/java/sqltemplates/Oracle/OracleMerge.sqltemplate

@@ -77,7 +77,7 @@
 					flag = true;
 				}
 				insertColumnsStr += (__TARGET_TABLE__ + "." + __ADDITIONAL_INSERT_COLUMNS_TRG_COLUMN_NAME__[i]);
-				insertValuesStr += (__ADDITIONAL_INSERT_COLUMNS_TRG_COLUMN_VALUE__[i]);
+				insertValuesStr += (__SOURCE_TABLE__ + "." + __ADDITIONAL_INSERT_COLUMNS_TRG_COLUMN_VALUE__[i]);
 			}
 		}
 		if (hasInsertWhereClause) {

org.talend.librariesmanager/src/main/java/org/talend/librariesmanager/ui/actions/ImportExternalJarAction.java

@@ -8,7 +8,7 @@
 // You should have received a copy of the agreement
 // along with this program; if not, write to Talend SA
 // 9 rue Pages 92150 Suresnes, France
-//
+//   
 // ============================================================================
 package org.talend.librariesmanager.ui.actions;
 
@@ -23,7 +23,6 @@ import org.eclipse.ui.PlatformUI;
 import org.talend.commons.ui.runtime.exception.ExceptionHandler;
 import org.talend.commons.ui.runtime.image.ECoreImage;
 import org.talend.commons.ui.runtime.image.ImageProvider;
-import org.talend.commons.utils.generation.JavaUtils;
 import org.talend.commons.utils.io.FilesUtils;
 import org.talend.core.CorePlugin;
 import org.talend.core.i18n.Messages;
@@ -54,23 +53,21 @@ public class ImportExternalJarAction extends Action {
     @Override
     public void run() {
 
-        FileDialog fileDialog = new FileDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), SWT.OPEN
-                | SWT.MULTI);
-        fileDialog.setFilterExtensions(FilesUtils.getAcceptJARFilesSuffix());
+        FileDialog fileDialog = new FileDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(),
+                SWT.OPEN | SWT.MULTI);
+        fileDialog.setFilterExtensions(FilesUtils.getAcceptJARFilesSuffix()); //$NON-NLS-1$
         fileDialog.open();
         final String path = fileDialog.getFilterPath();
         final String[] fileNames = fileDialog.getFileNames();
 
         BusyIndicator.showWhile(Display.getDefault(), new Runnable() {
 
-            @Override
             public void run() {
-                for (String fileName : fileNames) {
+                for (int i = 0; i < fileNames.length; i++) {
 
-                    final File file = new File(path + File.separatorChar + fileName);
+                    final File file = new File(path + File.separatorChar + fileNames[i]);
                     try {
                         CorePlugin.getDefault().getLibrariesService().deployLibrary(file.toURL());
-                        emptyLibs();
                     } catch (Exception e) {
                         ExceptionHandler.process(e);
                     }
@@ -78,12 +75,4 @@ public class ImportExternalJarAction extends Action {
             }
         });
     }
-
-    private void emptyLibs() {
-        File libsDir = org.eclipse.core.runtime.Platform.getLocation().append(JavaUtils.JAVA_PROJECT_NAME).append(File.separator)
-                .append(JavaUtils.JAVA_LIB_DIRECTORY).toFile();
-        if (libsDir.exists() && libsDir.isDirectory()) {
-            FilesUtils.emptyFolder(libsDir);
-        }
-    }
 }

org.talend.librariesmanager/src/main/java/org/talend/librariesmanager/ui/dialogs/ExternalModulesInstallDialog.java

@@ -65,8 +65,6 @@ import org.talend.commons.ui.swt.tableviewer.TableViewerCreatorNotModifiable.LAY
 import org.talend.commons.ui.swt.tableviewer.TableViewerCreatorNotModifiable.SORT;
 import org.talend.commons.ui.swt.tableviewer.behavior.IColumnImageProvider;
 import org.talend.commons.utils.data.bean.IBeanPropertyAccessors;
-import org.talend.commons.utils.generation.JavaUtils;
-import org.talend.commons.utils.io.FilesUtils;
 import org.talend.core.CorePlugin;
 import org.talend.core.download.DownloadHelper;
 import org.talend.core.language.ECodeLanguage;
@@ -366,14 +364,6 @@ public class ExternalModulesInstallDialog extends TitleAreaDialog implements IMo
         return toolBar;
     }
 
-    private void emptyLibs() {
-        File libsDir = org.eclipse.core.runtime.Platform.getLocation().append(JavaUtils.JAVA_PROJECT_NAME).append(File.separator)
-                .append(JavaUtils.JAVA_LIB_DIRECTORY).toFile();
-        if (libsDir.exists() && libsDir.isDirectory()) {
-            FilesUtils.emptyFolder(libsDir);
-        }
-    }
-
     private void addListeners() {
 
         installAllBtn.addSelectionListener(new SelectionAdapter() {
@@ -432,9 +422,6 @@ public class ExternalModulesInstallDialog extends TitleAreaDialog implements IMo
                                     MessageDialog.openInformation(getShell(),
                                             Messages.getString("ExternalModulesInstallDialog.MessageDialog.Infor"), message); //$NON-NLS-1$
                                     // refreshUI();
-                                    if (installedModules > 0) {
-                                        emptyLibs();
-                                    }
                                 }
                             }
                         });
@@ -508,7 +495,6 @@ public class ExternalModulesInstallDialog extends TitleAreaDialog implements IMo
                                             if (!job.installedModules.isEmpty()) {
                                                 message = Messages.getString(
                                                         "ExternalModulesInstallDialog_Download_Ok", data.getName()); //$NON-NLS-1$
-                                                emptyLibs();
                                             } else {
                                                 message = Messages.getString(
                                                         "ExternalModulesInstallDialog_Download_Fialed", data.getName());; //$NON-NLS-1$

org.talend.metadata.managment.nl/src/main/java/messages_en.properties

@@ -416,4 +416,3 @@ ProposalUtils.CellProposal.Error=Proposal of this type of CellEditor is unsuppor
 ProposalUtils.CtrlProposal.ErrorMsg=Proposal for this type of Control is unsupported \:
 MetadataTableEditorView.RelationshipType=RelationshipType
 MetadataTableEditorView.RelatedEntity=RelatedEntity
-JavaSqlFactory.NoClassName=No classname given to find the driver

org.talend.metadata.managment.nl/src/main/java/messages_nl.properties

@@ -11,31 +11,18 @@ ContextSetConfigurationDialog.nameNotValid=Ongeldige naam
 ContextTemplateComposite.CommentLabel=Opmerking
 ContextTemplateComposite.nameLabel=Naam
 ContextTemplateComposite.sourceLabel=Bron
-ContextTreeConstants.contextName=Context
 EComponentCategory_assignment=Toewijzing
-EComponentCategory_context=Context
 EComponentCategory_properties=Eigenschappen
 EComponentCategory_sqlTemplate=SQL Template
-EComponentCategory_version=Versie
 MetadataTableEditorView.CommentTitle=Opmerking
 ProcessorUtilities.finalizeBuild=Bouwen afronden...
 ProcessorUtilities.generatingJob=Job genereren
 ProcessorUtilities.loadingJob=Job laden...
 PropertiesWizardPage.Name=Naam
-PropertiesWizardPage.Version=Versie
 RoutinesFunctionProposal.User=Gebruiker
 VariableItemEditor.name=Naam
 VariableItemEditor.new=Nieuw
-VersionSection.CreationDate=Creatie Datum
-VersionSection.ModificationDate=Wijzigings Datum
-VersionSection.Version=Versie
-XmlArray.InvalidFile=Ongeldig bestand
-XSDValidater.IllegalArgument=De input xsd file bestaat niet.
 EUpdateItemType.Name=Naam
-UpdatesConstants.Context=Context
-UpdatesConstants.ContextGroup=Context Groep
-UpdatesConstants.Joblet=Joblet
-UpdatesConstants.Job=Job
 ApplicationActionBarAdvisor.menuFileLabel=&Bestand
 ApplicationActionBarAdvisor.navigateLabel=&Navigeer
 ApplicationActionBarAdvisor.gotoLabel=&Ga naar

org.talend.metadata.managment.nl/src/main/java/messages_zh_CN.properties

@@ -1,245 +0,0 @@
-AbstractComponentsProvider.folderNotExist=\u6587\u4EF6\u5939{0}\u4E0D\u5B58\u5728.
-AbstractItemMigrationTask.taskFailed=\u8FC1\u79FB{0}\u9879\u76EE\u5931\u8D25{1}
-ColorsCodeViewerPreferencePage.Comment1Color=\u6CE8\u91CA1 \u989C\u8272
-ColorsCodeViewerPreferencePage.Comment2Color=\u6CE8\u91CA2 \u989C\u8272
-ColorsCodeViewerPreferencePage.DigitColor=\u6570\u5B57 \u989C\u8272
-ColorsCodeViewerPreferencePage.FunctionColor=\u65B9\u6CD5 \u989C\u8272
-ColorsCodeViewerPreferencePage.InvalidColor=\u975E\u6CD5 \u989C\u8272
-ColorsCodeViewerPreferencePage.LabelColor=\u6807\u7B7E \u989C\u8272
-ColorsCodeViewerPreferencePage.Literal1Color=\u6587\u5B571 \u989C\u8272
-ColorsCodeViewerPreferencePage.Literal2Color=\u6587\u5B572 \u989C\u8272
-ColorsCodeViewerPreferencePage.MarkupColor=\u6807\u8BB0 \u989C\u8272
-ColorsCodeViewerPreferencePage.OperatorColor=\u64CD\u4F5C\u7B26 \u989C\u8272
-ColorsCodeViewerPreferencePage.defaultColor=\u9ED8\u8BA4 \u989C\u8272
-ColorsCodeViewerPreferencePage.fieldTip=\u7C97\u4F53(&B)
-ColorsCodeViewerPreferencePage.keyword1Color=\u5173\u952E\u5B571 \u989C\u8272
-ColorsCodeViewerPreferencePage.keyword2Color=\u5173\u952E\u5B572 \u989C\u8272
-ColorsCodeViewerPreferencePage.keyword3Color=\u5173\u952E\u5B573 \u989C\u8272
-ColumnNameChangedExt.columnChanged=\u7ED3\u70B9: {0} \u5217\u6539\u53D8: {1}-> {2}
-ComponentsFormatPreferencePage.add=\u589E\u52A0
-ComponentsFormatPreferencePage.errorCreateConnectionName=\u547D\u540D"{0}"\u65E0\u6548
-ComponentsFormatPreferencePage.formatConnection=\u683C\u5F0F\u5316\u9ED8\u8BA4\u8FDE\u63A5
-ComponentsFormatPreferencePage.formatLable=\u683C\u5F0F\u5316\u9ED8\u8BA4\u6807\u7B7E
-ComponentsFormatPreferencePage.remove=\u5220\u9664
-ComponentsFormatPreferencePage.ErrorTitle=\u9519\u8BEF
-ComponentToRepositoryProperty.error=\u9519\u8BEF
-ContextComposite.tableValue=\u8868\u683C\u5F0F\u503C
-ContextComposite.treeValue=\u6811\u683C\u5F0F\u503C
-ContextValueErrorChecker.ErrorTitile=\u4E0A\u4E0B\u6587\u503C\u9519\u8BEF: 
-ContextParameterProposal.NoCommentAvaiable=\u6CA1\u6709\u6CE8\u91CA\u3002
-ContextProcessSection.1=\u83DC\u5355\u8868\u683C
-ContextProcessSection.12=\u4E3A\u4E0A\u4E0B\u6587\u6539\u540D
-ContextProcessSection.13=\u4E3A\u4E0A\u4E0B\u6587\u6307\u5B9A\u65B0\u540D\u5B57{0}
-ContextProcessSection.2=\u8BF7\u786E\u8BA4?
-ContextProcessSection.29=\u9519\u8BEF
-ContextProcessSection.4=\u6DFB\u52A0\u65B0\u7684\u4E0A\u4E0B\u6587 ->(
-ContextProcessSection.49=\u7F3A\u7701\u4E0A\u4E0B\u6587
-ContextProcessSection.6=\u65B0\u7684\u4E0A\u4E0B\u6587
-ContextProcessSection.7=\u4E3A\u65B0\u7684\u4E0A\u4E0B\u6587\u6307\u5B9A\u540D\u5B57
-ContextProcessSection.ParameterNameIsNotValid=\u53C2\u6570\u540D\u5B57\u65E0\u6548\u3002
-ContextProcessSection.RemoveInformation={0}\u4E3A\u9ED8\u8BA4\u7684\u4E0A\u4E0B\u6587,\u4E0D\u80FD\u5220\u9664
-ContextProcessSection.errorTitle=\u9519\u8BEF
-ConextTableValuesComposite.nameLabel=\u4f5c\u4e1a\u540d
-ConextTemplateComposite.OrderMessages=\u5982\u679C\u60A8\u60F3\u91CD\u65B0\u6392\u5217\u53D8\u91CF\uFF0C\u5FC5\u987B\u9009\u4E2D\u5B83.
-ConextTemplateComposite.OrderText=\u539F\u59CB\u987A\u5E8F
-ContextSetConfigurationDialog.nameNotValid=\u8BE5\u540D\u79F0\u65E0\u6548
-ContextTemplateComposite.nameLabel=\u4f5c\u4e1a\u540d
-ContextTemplateComposite.scriptCodeLabel=\u811A\u672C\u4EE3\u7801
-ContextTemplateComposite.typeLabel=\u7C7B\u578B
-ContextTreeConstants.contextName=\u7EC4\u4EF6
-ContextTreeConstants.promptName=\u63D0\u793A
-ContextTreeConstants.valueName=\u503c
-ContextTreeConstants.variableName=\u53D8\u91CF
-ConextTemplateComposite.addToRepositoryContextAction.label=\u6DFB\u52A0\u5230repository\u4E0A\u4E0B\u6587
-CorePreferencePage.componentDefaultFileDirectory=\u7EC4\u4EF6\u7F3A\u7701\u6587\u4EF6\u76EE\u5F55
-CorePreferencePage.groupBySource=\u5728\u4E0A\u4E0B\u6587\u201C\u6839\u636E\u6E90\u5206\u7EC4\u201D
-CorePreferencePage.iReportPath=iReport \u8DEF\u5F84
-CorePreferencePage.javaInterpreter=Java\u89E3\u91CA\u5668
-CorePreferencePage.perlInterpreter=Perl\u89E3\u91CA\u5668
-CorePreferencePage.previewLimit=\u9884\u89C8\u9650\u5236
-CorePreferencePage.runInMultiThread=\u591A\u7EBF\u7A0B\u8FD0\u884C(\u521b\u5efa\u65b0\u4f5c\u4e1a\u9ed8\u8ba4\u91c7\u7528)
-CorePreferencePage.temporaryFiles=\u4E34\u65F6\u6587\u4EF6
-DbTableSelectorDialog.textContent=\u9009\u62E9\u8868\u540D
-ECodeLanguage.unknowLanguage=\u672A\u77E5\u8BED\u8A00
-EComponentCategory_advanceSetting=\u9AD8\u7EA7\u8BBE\u7F6E
-EComponentCategory_appearance=\u5916\u89C2
-EComponentCategory_assignment=\u6307\u6D3E
-EComponentCategory_context=\u7EC4\u4EF6
-EComponentCategory_doc=\u6587\u6863
-EComponentCategory_main=\u4E3B\u7EBF
-EComponentCategory_sqlTemplate=SQL\u6A21\u677F
-EComponentCategory_statsAndLogs=\u9759\u6001\u4FE1\u606F\u548C\u65E5\u5FD7
-EComponentCategory_version=\u7248\u672C
-EComponentCategory_view=\u89c6\u56fe
-EComponentCategory.advancedSettings=\u9AD8\u7EA7\u8BBE\u7F6E
-EConnectionType.iteratorMenu=\u8FED\u4EE3
-EConnectionType.lookupMenu=\u8ffd\u52a0\u5217
-EConnectionType.mainMenu=\u4E3B\u7EBF
-EConnectionType.onComponentErrorMenu=\u7EC4\u4EF6\u8FD0\u884C\u9519\u8BEF
-EConnectionType.onComponentOkMenu=\u7EC4\u4EF6\u8FD0\u884C\u6B63\u786E
-EConnectionType.onSubjobErrorMenu=\u5B50job\u9519\u8BEF
-EConnectionType.onSubjobOkMenu=\u5B50job\u6B63\u786E
-EConnectionType.runAfterMenu=\u8FD0\u884C\u540E
-EConnectionType.runIfMenu=\u6B63\u5E38\u65F6\u8FD0\u884C
-EConnectionType.tableMenu=\u540E\u8FD0\u884C
-EConnectionType.mergeMenu=\u5408\u5E76
-EConnectionType.synchronize=\u540C\u6B65
-EConnectionType.parallelize=\u5E76\u884C
-EMetadataEncoding.Arabic=\u963F\u62C9\u4F2F\u8BED
-EMetadataEncoding.Cyrillic=\u53E4\u4EE3\u65AF\u62C9\u592B\u8BED
-EMetadataEncoding.EUC_CN=\u7B80\u4F53\u4E2D\u6587(\u6269\u5C55\u7684Unix Code-CN)
-EMetadataEncoding.GB18030=\u4E2D\u6587\u56FD\u6807
-EMetadataEncoding.GB2312=\u4E2D\u6587
-EMetadataEncoding.Greek=\u5E0C\u814A
-EMetadataEncoding.Hebrew=\u5E0C\u4F2F\u6765\u8BED
-EMetadataEncoding.Latin1=Latin1 (\u897F\u6B27)
-EMetadataEncoding.Latin2=Latin2 (\u4E1C\u6B27)
-EMetadataEncoding.Latin3=Latin3 (\u5357\u6B27)
-EMetadataEncoding.Latin4=Latin4 (\u5317\u6B27)
-EMetadataEncoding.Latin5=Latin5 (\u571F\u8033\u5176\u8BED)
-EMetadataEncoding.Latin6=Latin6 (\u65E5\u8033\u66FC\u8BED)
-EMetadataEncoding.Microsoft_Latin1=\u5FAE\u8F6F(Latin-1)
-EMetadataEncoding.UTF16=Unicode 2.0 (16\u4F4D)
-EMetadataEncoding.UTF16BE=Unicode BigEndian (16\u4F4D)
-ERepositoryObjectType.FolderNotFound=\u7C7B\u578B{0}\u7684\u76EE\u5F55\u672A\u627E\u5230
-ERepositoryObjectType.NotImplemented=\u672A\u5B9E\u73B0
-ExtractMetaDataFromDataBase.SchemaNoPresent=Schema\u5728\u6570\u636E\u5E93\u4E2D\u672A\u51FA\u73B0
-ExtractMetaDataFromDataBase.connectionSuccessful=\u8FDE\u63A5\u6210\u529F
-ExtractMetaDataFromDataBase.dbTypeNotFound=dbType{0}\u672A\u627E\u5230
-ExtractMetaDataUtils.noData=\u672A\u627E\u5230\u6570\u636E.
-Function.FunctionName=\u51FD\u6570\u540D{0}
-FunctionManager.PurePerl.Desc=\u8BBE\u7F6E\u81EA\u5B9A\u4E49\u8868\u8FBE\u5F0F
-FunctionManager.PurePerl.ParaName=\u81EA\u5B9A\u4E49\u53C2\u6570
-GlobalServiceRegister.ServiceNotRegistered=\u670D\u52A1{0}\u6CA1\u6709\u88AB\u6CE8\u518C
-GroupByContextAction.groupContext=\u6309\u4E0A\u4E0B\u6587\u5206\u7EC4
-GroupByVariableAction.groupVariable=\u6309\u53D8\u91CF\u5206\u7EC4
-JavaSimpleDateFormatProposalProvider.quoteDisplayError=\u4E24\u4E2A\u5355\u5F15\u53F7\u663E\u793A\u4E3A\u4E00\u4E2A\u5355\u5F15\u53F7
-ListPreferencePage.RemoveButtonName=\u5220\u9664
-MetadataDialog.CopyToInput.toolTipText=\u5C06\u8F93\u51FAschema\u6240\u6709\u5217\u590D\u5236\u5230\u8F93\u5165schema
-MetadataDialog.CopySelectionToInput.toolTipText=\u5C06\u8F93\u51FAschema\u5DF2\u9009\u62E9\u7684\u5217\u590D\u5236\u5230\u8F93\u5165schema
-MetadataDialog.CopyToOutput=\u5C06\u8F93\u5165schema\u6240\u6709\u5217\u590D\u5236\u5230\u8F93\u51FAschema
-MetadataDialog.CopySelectionToOutput=\u5C06\u8F93\u5165schema\u5DF2\u9009\u62E9\u7684\u5217\u590D\u5236\u5230\u8F93\u51FAschema
-MetadataDialog.Message=\u6240\u6709\u6765\u81EA\u8F93\u5165Schema\u7684\u5217\u5C06\u88AB\u8F6C\u6362\u5230\u8F93\u51FASchema
-MetadataDialog.SchemaModification=Schema\u7F16\u8F91
-MetadataDialog.TransferMessage=\u6240\u6709\u6765\u81EA\u8F93\u51FASchema\u7684\u5217\u5C06\u88AB\u8F6C\u6362\u5230\u8F93\u5165Schema
-MetadataEmfTableEditor.ColumnInvalid=\u5217\u540D{0}
-MetadataEmfTableEditor.ColumnNameExists=\u5217\u540D{0}\u5DF2\u5B58\u5728\u3002
-MetadataTableEditor.ColumnNameExists=\u5217\u540D{0}\u5DF2\u7ECF\u5B58\u5728\u3002
-MetadataTableEditor.ColumnNameIsInvalid=\u5217\u540D{0}
-MetadataTableEditorView.ColumnTitle=\u5217
-MetadataTableEditorView.DBTypeTitle=\u5fc5\u987b\u9009\u62e9 DB \u7c7b\u578b
-MetadataTableEditorView.DefaultTitle=\u65e0
-MetadataTableEditorView.KeyTitle=\u5173\u952E\u5B57
-MetadataTableEditorView.LengthTitle=\u957F\u5EA6
-MetadataTableEditorView.NullableTitle=\u53EF\u4E3A\u7A7A
-MetadataTableEditorView.PatternTitle=\u6A21\u5F0F (\u53EA\u9650\u6570\u636E)
-MetadataTableEditorView.PrecisionTitle=\u7CBE\u5EA6
-MetadataTableEditorView.TypleTitle=\u7C7B\u578B
-MetadataTalendType.DBMSNotSetted=\u6570\u636E\u5E93\u672A\u8BBE\u7F6E
-MetadataTalendTypeEditor.button.edit=\u7F16\u8F91(E&)
-MetadataTalendTypeEditor.button.export=\u5BFC\u51FA(E&)
-MetadataTalendTypeEditor.button.import=\u5BFC\u5165(I&)
-MetadataTalendTypeEditor.column1.Name=Metadata\u6620\u5C04\u6587\u4EF6
-MetadataTalendTypeEditor.editMappingDialog.title=\u7F16\u8F91Mapping\u6587\u4EF6
-MetadataTalendTypeEditor.error.message=\u9519\u8BEF\u4FE1\u606F
-MetadataTalendTypeEditor.fileIsImported=\u6587\u4EF6\u5DF2\u5B58\u5728\u3002
-MetadataTalendTypeEditor.fileIsInvalid=\u5BFC\u5165\u6587\u4EF6\u4E0D\u5408\u6CD5\u3002
-MetadataTalendTypeEditor.fileNameStartRule=\u6587\u4EF6\u540D\u5FC5\u987B\u4EE5'mapping_'\u5F00\u5934\u3002
-PaletteContentDialog.connection=\u683C\u5F0F\u5316\u9ED8\u8BA4\u8FDE\u63A5
-PaletteContentDialog.lable=\u683C\u5F0F\u5316\u9ED8\u8BA4\u6807\u7B7E
-Parameter.Name=\u53C2\u6570\u540D
-PatternCalendar.example=\u793A\u4F8B:
-PerspectiveMenuManager.perspectiveLabel=\u900F\u89C6\u56FE(&P)
-PropertiesWizard.EditPropertiesPageTitle=\u7F16\u8F91\u5C5E\u6027
-PropertiesWizardPage.Author=\u4F5C\u8005
-PropertiesWizardPage.Description=\u5FC5\u8981\u7684
-PropertiesWizardPage.EmptyDescWarning=\u5EFA\u8BAE\u4E0D\u8981\u4F7F\u7528\u7A7A\u63CF\u8FF0\u4FE1\u606F\u3002
-PropertiesWizardPage.EmptyPurposeWarning=\u5EFA\u8BAE\u4E0D\u8981\u4F7F\u7528\u7A7A\u76EE\u7684\u4FE1\u606F
-PropertiesWizardPage.ItemExistsError=\u76F8\u540C\u540D\u79F0\u7684\u9879\u5DF2\u5B58\u5728\uFF0C\u5982\u6709\u9700\u8981\uFF0C\u8BF7\u68C0\u67E5\u56DE\u6536\u7AD9
-PropertiesWizardPage.KeywordsError=\u540D\u5B57\u4E0D\u5408\u6CD5
-PropertiesWizardPage.Name=\u4f5c\u4e1a\u540d
-PropertiesWizardPage.NameEmptyError=\u4f5c\u4e1a\u540d\u4e3a\u7a7a\u3002
-PropertiesWizardPage.NameFormatError=\u4f5c\u4e1a\u540d\u5305\u542b\u4e0d\u5408\u6cd5\u7b26\u3002
-PropertiesWizardPage.Path=\u8DEF\u5F84
-PropertiesWizardPage.Purpose=\u76EE\u7684
-PropertiesWizardPage.Select=\u9009\u62E9
-PropertiesWizardPage.SelectfolderMessage=\u9009\u62E9\u5C06\u8981\u521B\u5EFA\u6761\u76EE\u7684\u6587\u4EF6\u5939
-PropertiesWizardPage.SelectfolderTitle=\u9009\u62E9\u76EE\u5F55
-PropertiesWizardPage.Status=\u72B6\u6001
-PropertiesWizardPage.Version=\u7248\u672C
-RepositoryObject.NotImplemented=\u672A\u5B9E\u73B0
-RepositoryUpdateManager.Title=\u4fee\u6539
-RepositoryUpdateManager.Check=\u68C0\u67E5\u4E2D...
-RepositoryUpdateManager.NoModificationTitle=\u6CA1\u6709\u9700\u8981\u7684\u4FEE\u6539
-RepositoryUpdateManager.NoModificationMessages=\u6CA1\u6709\u9700\u8981\u7684\u66F4\u65B0
-RepositoryUpdateManager.RenameContextTitle=\u91CD\u547D\u540D\u95EE\u9898
-RepositoryUpdateManager.ItemsToUpdate=\u68C0\u67E5\u9879\u76EE\u4EE5\u66F4\u65B0
-RoutinesFunctionProposal.System=\u7CFB\u7EDF
-RoutinesFunctionProposal.User=\u7528\u6237
-SchemaCellEditor.giveSchemaName=\u7ED9\u56FE\u89E3\u547D\u540D
-SchemaCellEditor.inputName=\u8F93\u5165\u540D\u79F0
-SchemaCellEditor.nameExistOrInvalid=\u6539\u540D\u79F0\u5DF2\u5B58\u5728\u6216\u65E0\u6548
-SchemaCellEditor.schemaName=\u56FE\u89E3\u540D
-SchemaOperationChoiceDialog.ChangeBuiltInMessage=\u66F4\u6539\u56FE\u89E3\u5230built-in\u6A21\u5F0F
-SchemaOperationChoiceDialog.ChangeRepositoryMessage=\u4ECE\u5E93\u4E2D\u66F4\u6539Schema
-SchemaOperationChoiceDialog.CreateBuiltInMessage=Built-in\u4E2D\u521B\u5EFA\u56FE\u89E3
-SchemaOperationChoiceDialog.CreateRepositoryMessage=\u4ECE\u5E93\u4E2D\u521B\u5EFA\u56FE\u89E3\u3002
-SchemaOperationChoiceDialog.EditSchemaMessage=\u7F16\u8F91\u67B6\u6784
-SchemaOperationChoiceDialog.StatusMessage=\u65E0\u6548\u6216\u5DF2\u5B58\u5728\u7684\u56FE\u89E3
-SchemaOperationChoiceDialog.Title=\u67B6\u6784
-SelectRepositoryContextDialog.DeselectAll=\u5168\u90E8\u4E0D\u9009
-SelectRepositoryContextDialog.Label=\u9009\u62E9\u5E93\u4E0A\u4E0B\u6587\u4E2D\u7684\u53D8\u91CF\u3002
-SelectRepositoryContextDialog.SelectAll=\u5168\u9009
-SelectRepositoryContextDialog.ExpandAll=\u5C55\u5F00
-SelectRepositoryContextDialog.Title=\u9009\u62E9\u4E0A\u4E0B\u6587\u53D8\u91CF
-SelectRepositoryContextGroupDialog.Default=\u65e0
-TalendTabbedPropertyComposite.compactButton.toolTip=\u7F29\u653E\u89C6\u56FE
-TalendTabbedPropertyComposite.tableButton.toolTip=\u8868\u89C6\u56FE
-TalendType.TypeName=\u7C7B\u578B\u540D{0}
-VariableItemEditor.name=\u4f5c\u4e1a\u540d
-VariableItemEditor.new=\u65b0
-VariableItemEditor.remove=\u5220\u9664
-VersionSection.CreationDate=\u521B\u5EFA\u65E5\u671F
-VersionSection.ModificationDate=\u4FEE\u6539\u65E5\u671F
-VersionSection.Version=\u7248\u672C
-VersionSection.Status=\u72B6\u6001
-XmlArray.InvalidFile=\u975E\u6CD5\u6587\u4EF6
-XPathQueryMetadataTableEditorViewExt.xpathQuerys=XML \u6587\u4EF6\u7ED3\u6784\u67E5\u8BE2\u8BED\u53E5
-XSDValidater.IllegalArgument=xsd\u6E90\u6587\u4EF6\u4E0D\u5B58\u5728
-EUpdateItemType.Property=\u5C5E\u6027
-EUpdateItemType.Schema=\u67B6\u6784
-EUpdateItemType.Query=\u67E5\u8BE2
-EUpdateItemType.Variable=\u53D8\u91CF
-EUpdateItemType.Name=\u4f5c\u4e1a\u540d
-EUpdateResult.BuiltIn=\u66F4\u6539\u4E3ABuilt-In\u6A21\u5F0F
-EUpdateResult.JobletUpdate=\u66F4\u65B0joblet\u8282\u70B9
-EUpdateResult.Reload=\u91CD\u65B0\u52A0\u8F7D\u7EC4\u4EF6
-EUpdateResult.Rename=\u66F4\u6539\u540D\u79F0
-EUpdateResult.Delete=\u4ECE\u5E93\u4E2D\u5220\u9664
-UpdatesConstants.Context=\u7EC4\u4EF6
-UpdatesConstants.Job=\u4f5c\u4e1a
-MetadataTypeLengthConstants.FIELD_DEFAULT_TYPE=\u9ED8\u8BA4\u7C7B\u578B
-MetadataTypeLengthConstants.VALUE_DEFAULT_TYPE=\u9ED8\u8BA4\u7C7B\u578B
-MetadataTypeLengthPreferencePage.VALUE=\u7A7A\u503C\u5B57\u6BB5\u9ED8\u8BA4\u8BBE\u7F6E
-MetadataTypeLengthPreferencePage.FIELD=\u6240\u6709\u5B57\u6BB5\u9ED8\u8BA4\u8BBE\u7F6E
-MetadataTypeLengthPreferencePage.DBTYPE=\u6570\u636E\u7C7B\u578B\u7684\u9ED8\u8BA4\u957F\u5EA6
-MetadataTypeLengthConstants.CHARACTER_LENGTH=\u5b57\u7b26
-MetadataTypeLengthConstants.LIST_LENGTH=\u5217\u8868
-MultiStringSelectionDialog.nameEmpty=\u540D\u79F0\u4E0D\u80FD\u4E3A\u7A7A
-ApplicationActionBarAdvisor.menuFileLabel=\u6587\u4EF6(&F)
-ApplicationActionBarAdvisor.menuEditLabel=\u7F16\u8F91(&E)
-ApplicationActionBarAdvisor.gotoLabel=\u8DF3\u8F6C
-ApplicationActionBarAdvisor.menuWindowLabel=\u7A97\u53E3(&W)
-ApplicationActionBarAdvisor.menuHelpLabel=\u5E2E\u52A9(&H)
-BusinessAppearanceComposite.textAlignmentGroup=\u6587\u672C\u5BF9\u9F50
-BusinessAppearanceComposite.textAlignment.horizontal=\u6C34\u5E73
-BusinessAppearanceComposite.textAlignment.vertical=\u5782\u76F4
-BusinessAppearanceComposite.textAlignment.horizontal.left=\u5DE6
-BusinessAppearanceComposite.textAlignment.horizontal.right=\u53F3
-BusinessAppearanceComposite.textAlignment.horizontal.centre=\u4E2D\u592E
-BusinessAppearanceComposite.textAlignment.vertical.top=\u9876\u90E8
-BusinessAppearanceComposite.textAlignment.vertical.bottom=\u5E95\u90E8
-BusinessAppearanceComposite.textAlignment.vertical.centre=\u4E2D\u592E
-ConnectionBean.Local= \u672C\u5730
-ConnectionBean.DefaultConnection=\u9ED8\u8BA4\u8FDE\u63A5
-OpenXSDFileDialog.cancel=\u53D6\u6D88

org.talend.metadata.managment.ui.nl/src/main/java/messages_en.properties

@@ -515,5 +515,3 @@ FileStep3.fileNotExist=File {0} does not exist.
 PropertiesWizardPage.NameIsInvalid=The specified name is invalid, please Check.
 Step0WizardPage.description2=Add a service in the repository
 Step0WizardPage.title2=New Service
-ManagerConnection.connectionSuccessful=Connection successful!
-ManagerConnection.connectionFailed=Connection failed!

org.talend.metadata.managment.ui.nl/src/main/java/messages_fr.properties

@@ -444,6 +444,3 @@ SalesforceWizardPage.titleCreate.Step=Nouvelle connexion Salesforce dans le r
 SalesforceWizardPage.descriptionCreate.Step1=Définir les propriétés
 SalesforceWizardPage.descriptionCreate.Step2=Définir les paramètres de connexion à Salesforce
 SalesforceWizardPage.descriptionCreate.Step3=Définir les schémas du module
-PropertiesWizardPage.NameIsInvalid=Le nom spécifié est invalide, vérifiez.
-Step0WizardPage.description2=Ajouter un service dans le référentiel
-Step0WizardPage.title2=Nouveau service

org.talend.metadata.managment.ui.nl/src/main/java/messages_nl.properties

@@ -1,8 +1,5 @@
-AbstractForm.ExportAsContext=Exporteer als Context
-AbstractForm.RevertContext=Context terugdraaien
 Step0WizardPage.title=Titel
 PropertiesWizardPage.Name=Naam
-PropertiesWizardPage.Version=Versie
 MetadataTableEditorView.CommentTitle=Opmerking
 ContextSetsSelectionDialog.Title=Selecteer Context
 ContextWizard.contextPageTitle=Stap 2 van 2
@@ -28,14 +25,5 @@ WSDLSchemaStep1Form.ProxyPassword=Wachtwoord
 WSDLSchemaStep1Form.ProxyUser=Gebruiker
 WSDLSchemaStep1Form.UserName=Gebruiker
 WSDLSchemaStep1Form.WSDLGroupParameter=WSDL Parameter
-WSDLSchemaWizard.CreateNewWSDLSchema=Creëer nieuw WSDL schema
-WSDLSchemaWizard.SaveAsWSDLSchema=Opslaan als WSDL schema
-WSDLSchemaWizard.UpdateWSDLSchema=WSDL schema bijwerken
-XmlFileStep1.groupSchemaTarget=Doel Schema
-XmlFileStep1.sourceSchema=Bron Schema
-XmlFileStep2Form.previewNotAvailable=Geen preview beschikbaar voor XSD
-XmlFileSelectWizardPage.Input_XML=Input XML
-XmlFileSelectWizardPage.OutPut_XML=Output XML
-XmlFileWizard.newColumnsDectect.title=Nieuwe kolommen detecteren
 ConfirmReloadConnectionDialog.reload=Herladen
 ConfirmReloadConnectionDialog.unreload=Niet herladen

org.talend.metadata.managment.ui.nl/src/main/java/messages_zh_CN.properties

@@ -1,355 +0,0 @@
-AbstractForm.ExportAsContext=export as context
-Step0WizardPage.description=\u63CF\u8FF0
-Step0WizardPage.title=\u6807\u9898
-PropertiesWizardPage.Author=\u4F5C\u8005
-PropertiesWizardPage.Description=\u5FC5\u8981\u7684
-PropertiesWizardPage.EmptyDescWarning=\u5EFA\u8BAE\u4E0D\u8981\u4F7F\u7528\u7A7A\u63CF\u8FF0\u4FE1\u606F\u3002
-PropertiesWizardPage.EmptyPurposeWarning=\u5EFA\u8BAE\u4E0D\u8981\u4F7F\u7528\u7A7A\u76EE\u7684\u4FE1\u606F
-PropertiesWizardPage.ItemExistsError=\u76F8\u540C\u540D\u79F0\u7684\u9879\u5DF2\u5B58\u5728\uFF0C\u5982\u6709\u9700\u8981\uFF0C\u8BF7\u68C0\u67E5\u56DE\u6536\u7AD9
-PropertiesWizardPage.KeywordsError=\u540D\u5B57\u4E0D\u5408\u6CD5
-PropertiesWizardPage.Name=\u4f5c\u4e1a\u540d
-PropertiesWizardPage.NameEmptyError=\u4f5c\u4e1a\u540d\u4e3a\u7a7a\u3002
-PropertiesWizardPage.NameFormatError=\u4f5c\u4e1a\u540d\u5305\u542b\u4e0d\u5408\u6cd5\u7b26\u3002
-PropertiesWizardPage.Path=\u8DEF\u5F84
-PropertiesWizardPage.Purpose=\u76EE\u7684
-PropertiesWizardPage.Select=\u9009\u62E9
-PropertiesWizardPage.SelectfolderMessage=\u9009\u62E9\u5C06\u8981\u521B\u5EFA\u6761\u76EE\u7684\u6587\u4EF6\u5939
-PropertiesWizardPage.SelectfolderTitle=\u9009\u62E9\u76EE\u5F55
-PropertiesWizardPage.Status=\u72B6\u6001
-PropertiesWizardPage.Version=\u7248\u672C
-MetadataTableEditorView.ColumnTitle=\u5217
-MetadataTableEditorView.DBTypeTitle=\u5fc5\u987b\u9009\u62e9 DB \u7c7b\u578b
-MetadataTableEditorView.DefaultTitle=\u65e0
-MetadataTableEditorView.KeyTitle=\u5173\u952E\u5B57
-MetadataTableEditorView.LengthTitle=\u957F\u5EA6
-MetadataTableEditorView.NullableTitle=\u53EF\u4E3A\u7A7A
-MetadataTableEditorView.PatternTitle=\u6A21\u5F0F (\u53EA\u9650\u6570\u636E)
-MetadataTableEditorView.PrecisionTitle=\u7CBE\u5EA6
-MetadataTableEditorView.TypleTitle=\u7C7B\u578B
-ConnectionContextHelper.ContextTitle=\u4E0A\u4E0B\u6587\u6A21\u578B
-ConnectionContextHelper.InConextMessages=\u8FDE\u63A5\u5DF2\u5728\u4E0A\u4E0B\u6587\u6A21\u5F0F.
-ConnectionContextHelper.OutConextMessages=\u8FDE\u63A5\u4E0D\u5728\u4E0A\u4E0B\u6587\u6A21\u5F0F.
-ConnectionContextHelper.UpdateMessages=\u4F60\u8981\u66F4\u65B0\u4E0A\u4E0B\u6587\u53C2\u6570\u5417\uFF1F
-ConnectionContextHelper.UpdateTitle=\u66F4\u65B0\u4E0A\u4E0B\u6587
-ContextSetsSelectionDialog.ContextSets=\u4E0A\u4E0B\u6587\u8BBE\u7F6E
-ContextSetsSelectionDialog.Messages=\u5F53\u524D\u8FDE\u63A5\u662F\u4E0A\u4E0B\u6587\u6A21\u5F0F.
-ContextSetsSelectionDialog.Title=\u9009\u62E9\u4E0A\u4E0B\u6587
-CommonWizard.cancel=\u53D6\u6D88
-CommonWizard.exception=\u5f02\u5e38
-ContextWizard.Title=\u521b\u5efa\u6216\u7f16\u8f91\u4e0a\u4e0b\u6587
-ContextWizard.contextPageDescription=\u5b9a\u4e49\u4e0a\u4e0b\u6587\uff0c\u8bbe\u7f6e\u53d8\u91cf\u53ca\u5bf9\u5e94\u503c
-ContextWizard.contextPageTitle=\u7b2c\u4e8c\u6b65\uff08\u5171\u4e24\u6b65\uff09
-ContextWizard.step0Description=\u6dfb\u52a0\u6240\u9700\u4fe1\u606f
-ContextWizard.step0Title=\u7b2c\u4e00\u6b65\uff08\u5171\u4e24\u6b65\uff09
-CreateTableAction.action.createTitle=\u521b\u5efa Schema
-DatabaseForm.AddParams=\u989D\u5916\u53C2\u6570
-DatabaseForm.StandardSQL=\u6807\u51C6SQL\u8BED\u53E5
-DatabaseForm.SystemSQL=\u7CFB\u7EDFSQL\u8BED\u53E5
-DatabaseForm.check=\u68c0\u67e5(&C)
-DatabaseForm.checkConnectionTitle=\u68c0\u67e5\u8fde\u63a5
-DatabaseForm.checkFailure=\u8fde\u63a5\u5931\u8d25
-DatabaseForm.checkFailureTip=\u60a8\u5fc5\u987b\u6539\u53d8\u6570\u636e\u5e93\u8bbe\u7f6e
-DatabaseForm.checkInformation=\u4f60\u5fc5\u987b\u70b9\u51fb \u68c0\u67e5 \u6309\u94ae\uff0c\u6765\u68c0\u67e5\u6570\u636e\u5e93\u8bbe\u7f6e\u3002
-DatabaseForm.dataSource=\u6570\u636E\u6E90
-DatabaseForm.informixInstance=\u5B9E\u4F8B
-DatabaseForm.dbType=\u5fc5\u987b\u9009\u62e9 DB \u7c7b\u578b
-DatabaseForm.dbversion=\u6570\u636e\u5e93\u7248\u672c
-DatabaseForm.dbversion.tip=\u8BF7\u9009\u62E9\u6570\u636E\u5E93\u7248\u672C
-DatabaseForm.general.classname=\u7C7B\u522B\u540D\u79F0
-DatabaseForm.general.mapping=\u6620\u5C04\u6587\u4EF6
-DatabaseForm.general.password=\u5bc6\u7801
-DatabaseForm.groupDatabaseProperties=\u6570\u636e\u5e93\u5c5e\u6027
-DatabaseForm.groupDatabaseSettings=\u6570\u636e\u5e93\u8bbe\u7f6e
-DatabaseForm.login=\u987b\u6307\u5b9a\u767b\u5f55
-DatabaseForm.mdbFile=\u6587\u4ef6
-DatabaseForm.nullChar=\u7a7a\u5b57\u7b26\u5fc5\u987b\u88ab\u6307\u5b9a
-DatabaseForm.password=\u5bc6\u7801
-DatabaseForm.port=\u7aef\u53e3
-DatabaseForm.portError=\u65e0\u6548\u7aef\u53e3\u53f7
-DatabaseForm.schema=\u67B6\u6784
-DatabaseForm.selectJar=\u9009\u62E9jar\u6587\u4EF6
-DatabaseForm.selectRule=\u9009\u62E9\u6620\u5C04\u89C4\u5219
-DatabaseForm.server=\u670d\u52a1\u5668
-DatabaseForm.service_name=SID \u987b\u88ab\u6307\u5b9a
-DatabaseForm.sid=\u6570\u636E\u5E93\u670D\u52A1\u5668ID
-DatabaseForm.local_service_name=\u672C\u5730\u670D\u52A1\u540D
-DatabaseForm.sqlSyntax=SQL \u8bed\u53e5\u987b\u88ab\u6307\u5b9a
-DatabaseForm.stringConnection=\u8fde\u63a5\u8bed\u53e5
-DatabaseForm.stringQuote=\u5b57\u7b26\u4e32\u5f15\u7528
-DatabaseForm.yes=\u662F
-DatabaseTableFilterForm.edit=\u7F16\u8F91...
-DatabaseTableFilterForm.editFilterName=\u7F16\u8F91\u8FC7\u6EE4\u5668\u540D
-DatabaseTableFilterForm.new=\u65B0\u5EFA...
-DatabaseTableFilterForm.newFilterName=\u65B0\u8FC7\u6EE4\u5668\u540D
-DatabaseTableFilterForm.selectCondition=\u9009\u62E9\u8FC7\u6EE4\u6761\u4EF6
-DatabaseTableFilterForm.selectType=\u9009\u62E9\u7C7B\u578B
-DatabaseTableFilterForm.synonym=\u540C\u4E49\u8BCD
-DatabaseTableFilterForm.table=\u540E\u8FD0\u884C
-DatabaseTableFilterForm.useNameFilter=\u4F7F\u7528\u540D\u79F0\u8FC7\u6EE4
-DatabaseTableFilterForm.useSqlFilter=\u4F7F\u7528Sql\u8FC7\u6EE4
-DatabaseTableFilterForm.view=\u89c6\u56fe
-DatabaseTableForm.AddTable=\u52a0\u5165 Schema
-DatabaseTableForm.checkConnection=\u68c0\u67e5\u8fde\u63a5
-DatabaseTableForm.connectionFailureTip=\u6570\u636e\u5e93\u8fde\u63a5\u5931\u8d25\uff0c\u8bf7\u68c0\u67e5\u6570\u636e\u5e93\u8bbe\u7f6e\u6216\u4e0e\u6570\u636e\u5e93\u7ba1\u7406\u5458\u8054\u7cfb\u3002
-DatabaseTableForm.groupMetaData=\u67B6\u6784
-DatabaseTableForm.metadataDefaultNewLabel=\u65b0\u5217
-DatabaseTableForm.name=\u4f5c\u4e1a\u540d
-DatabaseTableForm.navigatorTree=\u67B6\u6784
-DatabaseTableForm.retreiveButtonAlert=\u8981\u4f7f\u7528\u201c\u53d6\u56de Schema\u201d\u6309\u94ae\uff0c\u8bf7\u5148\u9009\u62e9\u4e00\u4e2a\u8868\u683c\u3002
-DatabaseTableForm.retreiveButtonUse=\u4f7f\u7528\u201c\u53d6\u56de Schema\u201d\u6309\u94ae,\u7528\u57fa\u4e8e\u8868\u683c\u7684 Schema \u66ff\u6362\u5f53\u524dSchema
-DatabaseTableForm.retreiveSchema=\u521b\u5efa Schema
-DatabaseTableForm.guessSchema=\u8BA1\u7B97schema
-DatabaseTableForm.streamDetach=\u6d41\u5206\u9694
-DatabaseTableForm.table=\u57fa\u672c\u8868\u683c
-DatabaseTableForm.tableColumnText.talbe=\u540E\u8FD0\u884C
-DatabaseTableWizard.description=\u8FC7\u6EE4\u8868
-DatabaseWizardPage.descriptionCreate.Step1=\u6570\u636e\u53c2\u6570\u8bbe\u7f6e
-DatabaseWizardPage.descriptionCreate.Step2=\u8fde\u63a5\u53c2\u6570\u8bbe\u7f6e
-DatabaseWizardPage.descriptionUpdate.Step1=\u66f4\u65b0\u6570\u636e\u5e93\u8fde\u63a5\u8bbe\u7f6e
-DatabaseWizardPage.descriptionUpdate.Step2=\u66f4\u65b0\u8fde\u63a5\u53c2\u6570
-DatabaseWizardPage.titleCreate.Step1=\u65b0\u5efa\u6570\u636e\u5e93\u8fde\u63a5 - \u6b65\u9aa4 1/2
-DatabaseWizardPage.titleCreate.Step2=\u65b0\u5efa\u6570\u636e\u5e93\u8fde\u63a5 - \u6b65\u9aa4 2/2
-DatabaseWizardPage.titleUpdate.Step1=\u66f4\u65b0\u6570\u636e\u5e93\u8fde\u63a5 - \u6b65\u9aa4 1/2
-DatabaseWizardPage.titleUpdate.Step2=\u66f4\u65b0\u6570\u636e\u5e93\u8fde\u63a5 - \u6b65\u9aa4 2/2
-DelimitedFilePreview.column=\u5217
-DelimitedFileStep2Form.14=\u53EA\u5141\u8BB8\u6570\u5B57\u3002
-DelimitedFileStep2Form.onlyNumber=\u53EA\u5141\u8BB8\u6570\u5B57\u3002
-DelimitedFileWizard.windowTitleCreate=\u65b0\u5206\u9694\u578b\u6587\u4ef6
-DelimitedFileWizard.windowTitleUpdate=\u7f16\u8f91\u5206\u9694\u578b\u6587\u4ef6
-DocumentationCreateWizard.mainPageDescription=\u521b\u5efa\u63cf\u8ff0
-DocumentationCreateWizard.windowTitle=\u65b0\u6587\u6863
-DocumentationPage.browseBtnText.browse=\u6D4F\u89C8...
-DocumentationPage.checkLabel=\u68C0\u67E5
-DocumentationPage.checkTipText=\u68C0\u67E5\u8FDC\u7AEF\u6587\u4EF6\u662F\u5426\u5B58\u5728
-DocumentationPage.fileNameTabText.sourcDocFile=\u6e90\u6587\u6863\u6587\u4ef6
-DocumentationPage.originalNameLabText.orgName=\u6e90\u6587\u6863\u540d
-DocumentationPage.sourceDocIsNotSet=\u6e90\u6587\u6863\u672a\u8bbe\u7f6e\u3002
-DocumentationPage.thisTitle.document=\u6587\u6863
-DocumentationUpdateWizard.windowTitle=\u66f4\u65b0\u6587\u6863
-ExcelFileStep1Form.fileSetting=\u6587\u4EF6\u67E5\u770B\u548C\u8868\u5355\u8BBE\u7F6E
-ExcelFileStep1Form.sheet.choice=\u8BF7\u9009\u62E9\u5355\u5143(\u5355\u5143\u7ED3\u6784\u505A\u4E3Aschema\u5411\u5BFC)
-ExcelFileStep1Form.sheet.tip=\u7ED9\u8868\u5355\u547D\u540D
-ExcelFileStep1Form.sheetPara=\u8BBE\u7F6E\u8868\u5355\u53C2\u6570
-ExcelFileStep2Form.metadataSetting=\u5143\u6570\u636E\u5217\u8BBE\u7F6E
-ExcelFileStep2Form.onlyNumber=\u53EA\u5141\u8BB8\u6570\u5B57\u3002
-ExcelFileStep2Form.output=\u6807\u51c6\u8f93\u51fa
-ExcelFileStep2Form.preview=\u9884
-ExcelFileWizard.windowTitleCreate=\u65B0Excel\u6587\u4EF6
-ExcelFileWizard.windowTitleUpdate=\u7F16\u8F91\u5DF2\u5B58\u5728\u7684Excel\u6587\u4EF6
-ExtractionFieldsWithXPathEditorView.columnTitle.columnName=\u6807\u7b7e\u540d
-ExtractionFieldsWithXPathEditorView.columnTitle.xPath=\u76f8\u5bf9\u6216\u7edd\u5bf9\u8def\u5f84
-ExtractionLoopWithXPathEditorView.xPathColumnTitle.absXpathExpression=\u7edd\u5bf9\u8def\u5f84
-FileStep.moduleFailure=Perl\u63a7\u4ef6
-FileStep.moduleFailureEnd=\u6ca1\u6709\u5b89\u88c5
-FileStep1.eofException=EOF\u5b58\u5728\u4e0d\u6b63\u786e\u5b57\u7b26
-FileStep1.fileIncomplete=\u8def\u5f84\u4e0d\u5b8c\u6574\u4e14\u4e0d\u6b63\u786e\uff0c\u5fc5\u987b\u88ab\u6539\u53d8\u3002
-FileStep1.fileLocked=\u88ab\u53e6\u4e00\u4e2a\u7a0b\u5e8f\u9501\u4f4f
-FileStep1.fileNotFoundException=\u6ca1\u6709\u627e\u5230
-FileStep1.fileViewerAlert=\u663e\u793a\u6570\u636e\u6587\u4ef6\u9700\u8bbe\u7f6e\u6587\u4ef6\u8def\u5f84
-FileStep1.fileViewerProgress=\u68c0\u67e5\u6587\u4ef6\u662f\u5426\u5b58\u5728...
-FileStep1.fileViewerTip1=\u6307\u5b9a\u6587\u4ef6\u8def\u5f84\uff0c\u53ef\u8bfb
-FileStep1.fileViewerTip2=\u6587\u4ef6\u7b2c\u4e00\u884c
-FileStep1.filepath=\u6587\u4ef6
-FileStep1.filepathAlert=\u6587\u4ef6\u8def\u5f84\u987b\u6307\u5b9a
-FileStep1.format=\u683C\u5F0F
-FileStep1.formatAlert=\u683c\u5f0f\u987b\u88ab\u6307\u5b9a
-FileStep1.formatTip=\u5b9a\u4e49\u5c06\u88ab\u4f7f\u7528\u7684\u683c\u5f0f
-FileStep1.groupFileLocationSettings=\u6587\u4ef6\u8def\u5f84\u8bbe\u7f6e
-FileStep1.groupFileViewer=\u6587\u4ef6\u9884\u89c8
-FileStep1.nameAlert=\u6570\u636e\u5e93\u540d\u5fc5\u987b\u88ab\u6307\u5b9a
-FileStep1.noExist=\u4e0d\u5b58\u5728
-FileStep1.server=\u670d\u52a1\u5668
-FileStep1.serverTip=\u5b9a\u4e49\u6587\u4ef6\u662f\u5426\u4e3a\u672c\u5730\u7684
-FileStep2.correspondingCharacter=\u76f8\u5173\u5b57\u7b26
-FileStep2.delimited=\u5206\u9694
-FileStep2.empty=\u7a7a
-FileStep2.encoding=\u7f16\u7801
-FileStep2.encodingTip=\u7f16\u7801
-FileStep2.escapeChar=\u5206\u9694\u7b26
-FileStep2.escapeCharAlert=\u987b\u8bbe\u7f6e\u5206\u9694\u7b26
-FileStep2.escapeCharTip=\u5206\u9694\u7b26
-FileStep2.fieldPosition=\u6807\u8bb0\u4f4d\u7f6e
-FileStep2.fieldPositionAlert=\u987b\u8bbe\u7f6e\u5b57\u6bb5\u4f4d\u7f6e
-FileStep2.fieldPositionNotFinishByComma=\u5b57\u6bb5\u4f4d\u7f6e\u4e0d\u662f\u4ee5\u9017\u53f7\u7ed3\u675f
-FileStep2.fieldPositionNotValidate=\u5b57\u6bb5\u7684\u4f4d\u7f6e\u53ea\u80fd\u662f\u6570\u503c\u548c\u9017\u53f7\uff0c \u5e76\u4e14\u4f4d\u7f6e\u503c\u5fc5\u987b\u4ee5\u5347\u5e8f\u6392\u5217\u3002
-FileStep2.fieldSeparator=\u5b57\u6bb5\u5206\u9694\u7b26
-FileStep2.fieldSeparatorDelimitedTip=\u5b57\u6bb5\u5206\u9694\u7b26
-FileStep2.fieldSeparatorIncomplete=\u5b57\u7b26\u5b57\u6bb5\u505a\u5206\u9694\u7b26\u5fc5\u987b\u5b8c\u6574
-FileStep2.fieldSeparatorNotFinishByComma=\u5b57\u6bb5\u5206\u9694\u4e0d\u662f\u4ee5\u9017\u53f7\u7ed3\u675f\u3002
-FileStep2.filePathIncomplete=\u6587\u4ef6\u8def\u5f84\u987b\u88ab\u6307\u5b9a
-FileStep2.firstRowsIsCaption=\u8bbe\u7f6e\u5f00\u59cb\u884c\u4e0e\u5217\u540d
-FileStep2.footer=\u6587\u4EF6\u5C3E
-FileStep2.footerTip=\u6587\u4EF6\u5C3E
-FileStep2.groupDelimitedFileSettings=\u6587\u4EF6\u8BBE\u7F6E
-FileStep2.groupEscapeCharSettings=\u95f4\u9694\u5b57\u7b26\u8bbe\u7f6e
-FileStep2.groupLimitOfRows=\u884c\u6570\u9650\u5236
-FileStep2.groupLimitOfRowsTip=\u5982\u679c\u884c\u6570\u6709\u9650\u5236\uff0c\u8bf7\u8bbe\u7f6e\u6570\u503c\u3002
-FileStep2.groupRowsToSkip=\u53bb\u6389\u6307\u5b9a\u884c
-FileStep2.limit=\u9650\u5236
-FileStep2.limitTip=\u9650\u5236
-FileStep2.mustBePrecised=\u5fc5\u987b\u8bbe\u7f6e
-FileStep2.previewIsDone=\u9884\u89c8\u6210\u529f...
-FileStep2.previewProgress=\u9884\u89c8\u5904\u7406\u4e2d...
-FileStep2.refreshPreview=\u66f4\u65b0\u9884\u89c8
-FileStep2.removeEmptyRow=\u7565\u8fc7\u7a7a\u884c
-FileStep2.rowSeparator=\u884c\u5206\u9694\u7b26
-FileStep2.rowSeparatorIncomplete=\u5fc5\u987b\u8bbe\u7f6e\u884c\u5206\u9694\u7b26
-FileStep2.rowSeparatorTip=\u884c\u5206\u9694\u7b26
-FileStep2.rowsToSkipTip=\u5982\u679c\u9700\u8981\u5ffd\u7565\u4e00\u4e9b\u884c\uff0c\u8bf7\u8bbe\u5b9a\u4ee5\u4e0b\u53c2\u6570
-FileStep2.settingsIncomplete=\u9884\u89c8\u5fc5\u987b\u5728\u8bbe\u7f6e\u5b8c\u6210\u4e4b\u540e
-FileStep2.stop=\u505C\u6B62
-FileStep2.textEnclosure=\u6587\u672C\u56F4\u680F
-FileStep2.textEnclosureAlert=\u5fc5\u987b\u8bbe\u7f6e\u6587\u672c\u56f4\u7ed5
-FileStep2.textEnclosureTip=\u6587\u672C\u56F4\u680F
-FileStep2.wait=\u7B49\u5F85
-FileStep2Form.onlyNumber=\u53EA\u5141\u8BB8\u6570\u5B57\u3002
-FileStep2Form.output=\u6807\u51c6\u8f93\u51fa
-FileStep2Form.preview=\u9884
-FileStep3.filepathAlert=\u6587\u4ef6\u8def\u5f84\u987b\u88ab\u6307\u5b9a
-FileStep3.groupMetadata=\u67B6\u6784
-FileStep3.guessConfirmation=\u786e\u5b9a\u4fee\u6539\uff1f
-FileStep3.guessFailure=\u8ba1\u7b97\u5931\u8d25
-FileStep3.guessFailureTip=\u8ba1\u7b97\u5931\u8d25
-FileStep3.guessFailureTip2=\u5728\u9884\u89c8\u6b65\u9aa42\u7684\u57fa\u7840\u4e0a\u8ba1\u7b97
-FileStep3.guessIsDone=\u8ba1\u7b97\u6210\u529f
-FileStep3.guessTip=\u70b9\u51fb\u66f4\u65b0\u9884\u89c8
-FileStep3.itemAlert=Schema \u81f3\u5c11\u5e94\u8be5\u6709\u4e00\u4e2a\u6761\u76ee\u3002
-FileStep3.metadataDescription=\u56fe\u89e3\u7684\u63cf\u8ff0
-FileStep3.metadataName=\u4f5c\u4e1a\u540d
-FileTableWizardPage.descriptionCreate=\u5728\u5b58\u50a8\u5e93\u5185\u52a0\u5165\u65b0\u7684\u56fe\u89e3
-FileTableWizardPage.descriptionUpdate=\u66f4\u65b0\u5b58\u50a8\u5e93\u5185\u5df2\u5b58\u5728\u7684\u56fe\u89e3
-FileWizard.windowTitleCreate=\u65b0\u5b9a\u4f4d\u5f00\u578b\u6587\u4ef6
-FileWizard.windowTitleUpdate=\u7f16\u8f91\u5b58\u5728\u7684\u5b9a\u4f4d\u578b\u6587\u4ef6
-FileWizardPage.titleCreate=\u6587\u4ef6-\u6b65\u9aa4
-FileWizardPage.titleUpdate=\u6587\u4ef6-\u6b65\u9aa4
-GenericSchemaStep2Form.SelectDatabaseType=\u9009\u62e9\u5bf9\u5e94\u7684\u6570\u636e\u5e93\u7c7b\u578b
-GenericSchemaWizard.CreateNewGenericSchema=\u5efa\u7acb\u65b0\u4e00\u822cschema
-GenericSchemaWizard.SaveAsGenericSchema=\u53e6\u5b58\u4e3a\u4e00\u822cschema
-GenericSchemaWizard.UpdateGenericSchema=\u66f4\u65b0schema
-ImportSchemaFileWizard.WizardTitle=\u4ECEXML\u6587\u4EF6\u4E2D\u521B\u5EFA\u56FE\u89E3
-LDAPSchemaStep1Form.CheckNetWorkParameter=\u68c0\u67e5\u7f51\u7edc\u53c2\u6570
-LDAPSchemaStep1Form.NetWorkParameter=\u7f51\u7edc\u53c2\u6570
-LDAPSchemaStep1Form.connectionFailed=\u8FDE\u63A5\u5931\u8D25\u3002
-LDAPSchemaStep1Form.connnectionSuccessed=\u8FDE\u63A5\u6210\u529F\u3002
-LDAPSchemaStep2Form.AuthenticationMethod=\u9a8c\u8bc1\u65b9\u6cd5
-LDAPSchemaStep2Form.AuthenticationParameter=\u9a8c\u8bc1\u53c2\u6570
-LDAPSchemaStep2Form.BaseDN=\u57fa\u672cDN
-LDAPSchemaStep2Form.CheckAuthentication=\u9a8c\u8bc1
-LDAPSchemaStep2Form.FetchBaseDNs=\u83b7\u53d6\u57fa\u672cDNS
-LDAPSchemaStep2Form.GetBaseDNS=\u4ece\u6839DSE\u83b7\u5f97\u57fa\u672c\u7684DNS
-LDAPSchemaStep2Form.SavePassword=\u4fdd\u5b58\u79d8\u5bc6
-LDAPSchemaStep2Form.checkFailed=\u9A8C\u8BC1\u5931\u8D25\u3002
-LDAPSchemaStep2Form.checkSuccessful=\u9A8C\u8BC1\u6210\u529F
-LDAPSchemaStep2Form.fetchDNS=\u83b7\u53d6\u57fa\u672cDNS
-LDAPSchemaStep2Form.fetchFailed=DNS\u83B7\u53D6\u5931\u8D25
-LDAPSchemaStep2Form.fetchSuccessful=DNS\u83B7\u53D6\u6210\u529F
-LDAPSchemaStep2Form.verifyAuthentication=\u8BF7\u70B9\u51FB\u201C\u68C0\u67E5\u9A8C\u8BC1\u201D\u6309\u94AE\u9A8C\u8BC1\u3002
-LDAPSchemaStep3Form.output=\u6807\u51c6\u8f93\u51fa
-LDAPSchemaStep3Form.preview=\u9884
-LDAPSchemaStep3Form.selectAllText=\u5168\u9009
-LDAPSchemaStep3Form.selectAllTipText=\u9009\u62E9\u6240\u6709\u56FE\u89E3\u7684\u5C5E\u6027
-LDAPSchemaStep3Form.selectNoneText=\u6ca1\u6709\u9009\u62e9
-LDAPSchemaWizard.CreateNewLdapSchema=\u5efa\u7acb\u65b0LDAP\u6a21\u578b
-LDAPSchemaWizard.UpdateLdapSchema=\u66f4\u65b0LDAP\u6a21\u578b
-LDIFReader.ioException.unknow=\u672a\u77e5\u7c7b\u578b
-LdifFileStep2Form.group.listAttributes=\u5217\u51fa Ldif \u6587\u4ef6\u5c5e\u6027
-LdifFileStep2Form.output=\u6807\u51c6\u8f93\u51fa
-LdifFileStep2Form.preview=\u9884
-LdifFileWizard.windowTitleCreate=\u65b0 Ldif \u6587\u4ef6
-LdifFileWizard.windowTitleUpdate=\u7f16\u8f91 Ldif \u6587\u4ef6
-LinkDocumentationHelper.remoteErrorMessages=\u65E0\u6CD5\u83B7\u53D6\u8FDC\u7AEF\u6587\u4EF6\uFF0C\u60A8\u8981\u7EE7\u7EED\u5417\uFF1F
-LinkDocumentationHelper.remoteErrorTitle=\u8FDC\u7AEF\u6587\u4EF6\u672A\u627E\u5230
-MappingFileSelectDialog.mappingFileList=\u6620\u5C04\u6587\u4EF6\u5217\u8868
-MappingFileSelectDialog.name=\u4f5c\u4e1a\u540d
-MappingFileSelectDialog.selectMappingFile=\u9009\u62E9\u6570\u636E\u5E93\u6620\u5C04\u6587\u4EF6
-MappingFileSelectDialog.setMessage=\u60A8\u53EF\u4EE5\u5728Talend\u9996\u9009\u9879\u201CMetadata of Talend type\u201D\u8BBE\u7F6E\u6620\u5C04\u6587\u4EF6
-RegexpFileStep2Form.onlyNumber=\u53EA\u5141\u8BB8\u6570\u5B57\u3002
-RegexpFileStep2Form.output=\u6807\u51c6\u8f93\u51fa
-RegexpFileStep2Form.preview=\u9884
-RegexpFileWizard.windowTitleCreate=\u65b0 RegEx \u6587\u4ef6
-RegexpStep2.groupRegexSettings=\u5e38\u89c4\u8868\u8fbe\u5f0f\u8bbe\u7f6e
-SalesforceForm.checkConnectionTitle=\u68c0\u67e5\u8fde\u63a5
-SalesforceForm.checkFailure=\u8fde\u63a5\u5931\u8d25
-SalesforceForm.checkFailureTip=\u60A8\u5FC5\u987B\u66F4\u6539\u8FDE\u63A5\u8BBE\u7F6E\u3002
-SalesforceModuleParseAPI.URLInvalid=URL\u65E0\u6548\u3002
-SalesforceModuleParseAPI.lostUsernameOrPass=\u7528\u6237\u540D\u6216\u5BC6\u7801\u4E22\u5931
-SalesforceSchemaWizard.windowTitleCreate=\u65B0Saleforce
-SalesforceStep1Form.checkLogin=\u68C0\u67E5\u767B\u5F55
-SalesforceStep1Form.Password=\u5bc6\u7801
-SalesforceStep1Form.BatchSize=\u6279\u5927\u5C0F
-SalesforceStep1Form.ProxyHost=\u4e3b\u673a
-SalesforceStep1Form.ProxyPassword=\u5bc6\u7801
-SalesforceStep1Form.ProxyPort=\u7aef\u53e3
-SalesforceStep1Form.ProxyUsername=\u4EE3\u7406\u7528\u6237\u540D
-SalesforceStep1Form.SocksProxyParam=\u4ee3\u7406\u670d\u52a1\u5668\u53c2\u6570
-SalesforceStep1Form.selectModuleName=\u8BF7\u9009\u62E9\u4E00\u4E2A\u6807\u51C6\u5BF9\u8C61
-SalesforceStep2Form.otherTitle=\u5176\u5B83\u5217\u6807\u9898
-SalesforceStep2Form.output=\u6807\u51c6\u8f93\u51fa
-SalesforceStep2Form.preview=\u9884
-SchemaWizard.windowTitle=\u67B6\u6784
-SelectDatabaseJarDialog.add=\u589E\u52A0
-SelectDatabaseJarDialog.delete=\u5220\u9664
-SelectDatabaseJarDialog.warningTitle=\u8B66\u544A
-SelectorTableForm.CreationStatus=\u521b\u5efa\u72b6\u6001
-SelectorTableForm.Pending=\u5904\u7406\u4e2d
-SelectorTableForm.Success=\u6210\u529f
-SelectorTableForm.TableName=\u4f5c\u4e1a\u540d
-SelectorTableForm.TableType=\u7C7B\u578B
-SelectorTableForm.groupTableSettings=\u9009\u62e9 Schema \u521b\u5efa
-SelectorTableForm.selectAllTables=\u5168\u9009
-SelectorTableForm.selectNoneTables=\u6ca1\u6709\u9009\u62e9
-ShowAddedContextdialog.Title=\u5DF2\u6DFB\u52A0\u7684\u4E0A\u4E0B\u6587
-StoppablePreviewLoader.inforLabelText.previewInterrupted=\u9884\u89c8\u7ec8\u65ad
-TableWizard.windowTitle=\u67B6\u6784
-TableWizardPage.descriptionCreate=\u5411\u50a8\u5b58\u5e93\u91cc\u52a0\u5165\u4e00\u4e2a\u56fe\u89e3
-TableWizardPage.descriptionUpdate=\u66f4\u65b0\u76ee\u524d\u5b58\u5728\u7684\u50a8\u5b58\u5e93\u91cc\u7684\u56fe\u89e3
-TableWizardPage.titleCreate=\u65b0\u8fde\u63a5\u91cc\u7684 Schema \u8868
-TableWizardPage.titleUpdate=\u66f4\u65b0\u56fe\u89e3\u5217\u8868
-WSDLSchemaStep1Form.ENDPOINTURI=Endpoint URI
-\n\n\n 
-\n 
-\n 
-\n\n Endpoint URI
-\n 
-\nEndpoint URI
-\n 
-WSDLSchemaStep1Form.MethodName=\u65B9\u6CD5\u540D
-WSDLSchemaStep1Form.NeedAuth=\u9700\u8981\u9A8C\u8BC1?
-WSDLSchemaStep1Form.ParColumnValue=\u503c
-WSDLSchemaStep1Form.ParameterAdd=\u589E\u52A0
-WSDLSchemaStep1Form.ParameterRemove=\u5220\u9664
-WSDLSchemaStep1Form.Password=\u5bc6\u7801
-WSDLSchemaStep1Form.ProxyHost=\u4e3b\u673a
-WSDLSchemaStep1Form.ProxyPassword=\u5bc6\u7801
-WSDLSchemaStep1Form.ProxyPort=\u7aef\u53e3
-WSDLSchemaStep1Form.ProxyUser=\u7528\u6237
-WSDLSchemaStep1Form.UseProxy=\u4F7F\u7528http\u4EE3\u7406
-WSDLSchemaStep1Form.UserName=\u7528\u6237
-WSDLSchemaStep1Form.WSDLGroupParameter=WSDL \u53C2\u6570
-WSDLSchemaStep1Form.output=\u6807\u51c6\u8f93\u51fa
-WSDLSchemaStep1Form.preview=\u9884
-WSDLSchemaWizard.CreateNewWSDLSchema=\u65B0\u5EFAWSDL\u6587\u6863\u7ED3\u6784
-WSDLSchemaWizard.SaveAsWSDLSchema=\u4FDD\u5B58\u4E3AWSDL\u6587\u6863\u7ED3\u6784
-WSDLSchemaWizard.UpdateWSDLSchema=\u66F4\u65B0WSDL\u6587\u6863\u7ED3\u6784
-XPathProposalProvider.contentProposal=<< \u8282\u70b9\u592a\u591a, \u5efa\u8bae\u503c\u53ef\u80fd\u4e0d\u5b8c\u5168 ... >>
-XmlFileStep1.groupFileViewer=Schema\u89C6\u56FE
-XmlFileStep1.groupSchemaTarget=\u76ee\u6807\u56fe\u89e3
-XmlFileStep1.sourceSchema=\u6e90\u56fe\u89e3
-XmlFileStep1Form.limitation=\u9650\u5236
-XmlFileStep2Form.previewNotAvailable=XSD\u6587\u4EF6\u4E0D\u53EF\u9884\u89C8
-XmlFileWizard.windowTitleCreate=\u65B0\u5EFAxml\u6587\u4EF6
-XmlFileWizard.windowTitleUpdate=\u7F16\u8F91\u5DF2\u5B58\u5728\u7684Xml\u6587\u4EF6
-XmlToXPathLinker.Loop=\u521b\u5efa\u5faa\u73af\u8fde\u63a5...
-XmlToXPathLinker.beginTask.fieldLinksCreation=\u521b\u5efa\u5b57\u6bb5\u8fde\u63a5...
-XmlToXPathLinker.exceptionReturn.xPathInvalid=\u65e0\u6cd5\u83b7\u53d6\u5f53\u524d\u8def\u5f84
-XmlToXPathLinker.illegalArgumentException=\u4e0d\u652f\u6301\u5f53\u524d\u7684\u63a7\u4ef6
-XmlFileSelectWizardPage.Input_XML=XML\u8F93\u5165\u6570\u636E\u6E90
-XmlFileSelectWizardPage.OutPut_XML=XML\u8F93\u51FA\u6570\u636E\u6E90
-XmlFileOutputStep1Form.Encording=\u7f16\u7801
-MetadataTalendTypeEditor.button.edit=\u7F16\u8F91(E&)
-MetadataTalendTypeEditor.button.export=\u5BFC\u51FA(E&)
-MetadataTalendTypeEditor.button.import=\u5BFC\u5165(I&)
-MetadataTalendTypeEditor.column1.Name=Metadata\u6620\u5C04\u6587\u4EF6
-MetadataTalendTypeEditor.editMappingDialog.title=\u7F16\u8F91Mapping\u6587\u4EF6
-MetadataTalendTypeEditor.error.message=\u9519\u8BEF\u4FE1\u606F
-MetadataTalendTypeEditor.fileIsInvalid=\u5BFC\u5165\u6587\u4EF6\u4E0D\u5408\u6CD5\u3002

org.talend.metadata.managment.ui/src/main/java/messages.properties

@@ -519,8 +519,4 @@ ConfirmReloadConnectionDialog.desc=Connection properties changed, the analyzed e
 ConfirmReloadConnectionDialog.reload=reload
 ConfirmReloadConnectionDialog.unreload=don\'t reload
 ManagerConnection.connectionSuccessful=Connection successful!
-ManagerConnection.connectionFailed=Connection failed!
-InegerCellEditorListener.NumeralMessage=Input value invalid
-MetadataTableEditor.ColumnNameExists=The input '{0}' already exist.
-MetadataTableEditor.ColumnNameIsInvalid=Beacuse the input name not case sensitive, the input '{0}' already exist.
-MetadataEmfTableEditor.ColumnNameExists=The input '{0}' already exist.
+ManagerConnection.connectionFailed=Connection failed!

org.talend.metadata.managment.ui/src/main/java/org/talend/core/model/metadata/editor/MetadataEmfTableEditor.java

@@ -110,7 +110,7 @@ public class MetadataEmfTableEditor extends ExtendedTableModel<MetadataColumn> {
         }
 
         if (!MetadataToolHelper.isValidColumnName(columnName)) {
-            return ""; //$NON-NLS-1$ //$NON-NLS-2$
+            return Messages.getString(("MetadataEmfTableEditor.ColumnInvalid"), columnName); //$NON-NLS-1$ //$NON-NLS-2$
         }
 
         int lstSize = metadataColumns.size();

org.talend.metadata.managment.ui/src/main/java/org/talend/core/model/metadata/editor/MetadataTableEditor.java

@@ -97,7 +97,7 @@ public class MetadataTableEditor extends ExtendedTableModel<IMetadataColumn> {
         int lstSize = getBeansList().size();
         for (int i = 0; i < lstSize; i++) {
             if (columnName.equals(getBeansList().get(i).getLabel()) && i != beanPosition) {
-                return Messages.getString("MetadataTableEditor.ColumnNameExists", columnName); //$NON-NLS-1$
+                return ""; //$NON-NLS-1$
             } else if (columnName.toLowerCase().equals(getBeansList().get(i).getLabel().toLowerCase()) && i != beanPosition) {
                 String index = columnName.substring(0, 1);
                 String last = getBeansList().get(i).getLabel().substring(0, 1);