Compare commits
98 Commits
bugfix/mas
...
patch/7.0.
| Author | SHA1 | Date | |
|---|---|---|---|
|
a16cf3e274 | ||
|
|
f8a2fdc438 | ||
|
|
5b4267e251 | ||
|
|
30f0f163c4 | ||
|
|
af04a91e97 | ||
|
|
85a09d324c | ||
|
|
582f8b2469 | ||
|
|
1e5157cbd2 | ||
|
|
1b682fe5bc | ||
|
|
c8e1c54aac | ||
|
|
a96615ef09 | ||
|
|
a98a976cd0 | ||
|
|
6b103fd3ac | ||
|
|
30b87e0681 | ||
|
|
838a8a6684 | ||
|
|
351b9a4b4a | ||
|
|
0dee4713dc | ||
|
|
828eb43a7b | ||
|
|
0a6bedba28 | ||
|
|
a34a0a88fd | ||
|
|
819ee6502b | ||
|
|
f35f205c3b | ||
|
|
c4fe7035b5 | ||
|
|
a2d1786ea8 | ||
|
|
051fe3e48a | ||
|
|
d31b682b28 | ||
|
|
bae2cad315 | ||
|
|
9343adeb4a | ||
|
|
6d7b654b34 | ||
|
|
e87525b0e6 | ||
|
|
29003ebd3c | ||
|
|
1e99439aba | ||
|
|
8be5155c69 | ||
|
|
73e605aa4a | ||
|
|
99be76ceed | ||
|
|
7aebd682b2 | ||
|
|
d29a0aaec8 | ||
|
|
5bc4661370 | ||
|
|
fa7893c4f4 | ||
|
|
9477f854bc | ||
|
|
b2eb124c04 | ||
|
|
2eea07a83a | ||
|
|
1ef455ed31 | ||
|
|
cb77c21385 | ||
|
|
8555dcd8ad | ||
|
|
9d6e03f249 | ||
|
|
f848b4ed2d | ||
|
|
102714f19a | ||
|
|
358d645e99 | ||
|
|
4447d4bb50 | ||
|
|
a881130b33 | ||
|
|
26059bd79c | ||
|
|
83080b21d7 | ||
|
|
cf38315b5e | ||
|
|
da5691927a | ||
|
|
c9b1ba680c | ||
|
|
cbb807dff3 | ||
|
|
69b7590e99 | ||
|
|
355a4ee886 | ||
|
|
275a642076 | ||
|
|
f1fbc5de20 | ||
|
|
8375532c95 | ||
|
|
aad98ef225 | ||
|
|
4578c50f6b | ||
|
|
be4188b258 | ||
|
|
1cf4d5386b | ||
|
|
06c055c9d2 | ||
|
|
4bc73e655a | ||
|
|
ff57acfe20 | ||
|
|
69f1e32d4d | ||
|
|
8c377775c2 | ||
|
|
46b305e505 | ||
|
|
a03ebdeffd | ||
|
|
c3d592e3f1 | ||
|
|
314cdd7303 | ||
|
|
f36c57fa9b | ||
|
|
f4c00362bb | ||
|
|
5570790394 | ||
|
|
786e647bce | ||
|
|
3592bfdc5d | ||
|
|
eec5ecfe43 | ||
|
|
9ab6f3a3f8 | ||
|
|
4ddfe3b63f | ||
|
|
8544acc63a | ||
|
|
ee250bf321 | ||
|
|
1873649aba | ||
|
|
602b540b74 | ||
|
|
8cf78fc9fe | ||
|
|
e04f76553a | ||
|
|
71b5c95101 | ||
|
|
ac20507d82 | ||
|
|
f2e086da18 | ||
|
|
dd4f207455 | ||
|
|
026ec6f8b5 | ||
|
|
ed18c48ac2 | ||
|
|
cd51a8b93e | ||
|
|
162aaeff65 | ||
|
|
e0ae2ba35a |
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tcommon-studio-se</artifactId>
|
||||
<version>7.0.1-SNAPSHOT</version>
|
||||
<version>7.0.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tcommon-studio-se</artifactId>
|
||||
<version>7.0.1-SNAPSHOT</version>
|
||||
<version>7.0.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.common.ui.runtime.nl</artifactId>
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
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
|
||||
CellEditorDialogBehavior.textContent=...
|
||||
ColorStyledText.RedoItem.Text=\u91CD\u505A
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tcommon-studio-se</artifactId>
|
||||
<version>7.0.1-SNAPSHOT</version>
|
||||
<version>7.0.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.commons.runtime.nl</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tcommon-studio-se</artifactId>
|
||||
<version>7.0.1-SNAPSHOT</version>
|
||||
<version>7.0.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.commons.ui.nl</artifactId>
|
||||
|
||||
@@ -16,6 +16,7 @@ ModelSelectionDialog.Option=\u9009\u9879
|
||||
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
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tcommon-studio-se</artifactId>
|
||||
<version>7.0.1-SNAPSHOT</version>
|
||||
<version>7.0.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.core.nl</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tcommon-studio-se</artifactId>
|
||||
<version>7.0.1-SNAPSHOT</version>
|
||||
<version>7.0.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.core.repository.nl</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tcommon-studio-se</artifactId>
|
||||
<version>7.0.1-SNAPSHOT</version>
|
||||
<version>7.0.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.core.runtime.nl</artifactId>
|
||||
|
||||
@@ -19,6 +19,7 @@ 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.formatHint=\u683C\u5F0F\u63D0\u793A\u9ED8\u8BA4\u503C\uFF1A
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tcommon-studio-se</artifactId>
|
||||
<version>7.0.1-SNAPSHOT</version>
|
||||
<version>7.0.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.core.ui.nl</artifactId>
|
||||
|
||||
@@ -3,6 +3,7 @@ AbstractItemMigrationTask.taskFailed=\u8FC1\u79FB{0}\u9879\u76EE\u5931\u8D25{1}
|
||||
AdvancedSocketFactory.failedInitial=\u9519\u8BEF:\u65E0\u6CD5\u521D\u59CB\u5316
|
||||
ArchiveFileExportOperationFullPath.SpecialFile=spagic.\u5C5E\u6027
|
||||
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.formatHint=\u683C\u5F0F\u63D0\u793A\u9ED8\u8BA4\u503C\uFF1A
|
||||
@@ -344,6 +345,7 @@ MetadataTableEditorView.ValueTitle=\u503C
|
||||
ContextNebulaComposite.ContextGroupLabel=\u9ED8\u8BA4\u4E0A\u4E0B\u6587\u73AF\u5883
|
||||
ContextTreeTable.PromptToolTips=\u6FC0\u6D3B\u63D0\u793A\u53D8\u91CF
|
||||
ContextValidator.ParameterNotValid=\u53C2\u6570\u540D\u65E0\u6548
|
||||
ModuleListCellEditor.add=\u6DFB\u52A0
|
||||
ModuleListCellEditor.delete=\u5220\u9664
|
||||
ContextBuiltinToRepositoryCommand.addRelation=\u5728\u5B58\u50A8\u5E93\u4E2D\u6709\u76F8\u540C\u540D\u79F0\u7684\u4E0A\u4E0B\u6587\u53D8\u91CF\uFF0C\u60A8\u7684\u5185\u7F6E\u53D8\u91CF\u5C06\u88AB\u66FF\u6362\uFF0C\u662F\u5426\u7EE7\u7EED\uFF1F
|
||||
WorkspaceMnu.switch.text=\u5207\u6362\u5DE5\u4F5C\u533A
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tcommon-studio-se</artifactId>
|
||||
<version>7.0.1-SNAPSHOT</version>
|
||||
<version>7.0.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.cwm.mip.edit.nl</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tcommon-studio-se</artifactId>
|
||||
<version>7.0.1-SNAPSHOT</version>
|
||||
<version>7.0.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.cwm.mip.nl</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tcommon-studio-se</artifactId>
|
||||
<version>7.0.1-SNAPSHOT</version>
|
||||
<version>7.0.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.maven.ui.nl</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tcommon-studio-se</artifactId>
|
||||
<version>7.0.1-SNAPSHOT</version>
|
||||
<version>7.0.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.help.nl</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tcommon-studio-se</artifactId>
|
||||
<version>7.0.1-SNAPSHOT</version>
|
||||
<version>7.0.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.helpers.nl</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tcommon-studio-se</artifactId>
|
||||
<version>7.0.1-SNAPSHOT</version>
|
||||
<version>7.0.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.librariesmanager.nl</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tcommon-studio-se</artifactId>
|
||||
<version>7.0.1-SNAPSHOT</version>
|
||||
<version>7.0.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.librariesmanager.ui.nl</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tcommon-studio-se</artifactId>
|
||||
<version>7.0.1-SNAPSHOT</version>
|
||||
<version>7.0.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.metadata.managment.nl</artifactId>
|
||||
|
||||
@@ -19,6 +19,7 @@ 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.formatHint=\u683C\u5F0F\u63D0\u793A\u9ED8\u8BA4\u503C\uFF1A
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tcommon-studio-se</artifactId>
|
||||
<version>7.0.1-SNAPSHOT</version>
|
||||
<version>7.0.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.metadata.managment.ui.nl</artifactId>
|
||||
|
||||
@@ -330,6 +330,7 @@ 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.ColumnNumber=\u5217\u53F7
|
||||
@@ -355,6 +356,7 @@ WSDLSchemaStep1Form.ENDPOINTURI=Endpoint URI
\n\n\n
\n
\n
\n\n Endpoint URI
\
|
||||
\n\n\n
|
||||
\n
|
||||
\n
|
||||
\n\n Endpoint URI
|
||||
\n
|
||||
\nEndpoint URI
|
||||
\n
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tcommon-studio-se</artifactId>
|
||||
<version>7.0.1-SNAPSHOT</version>
|
||||
<version>7.0.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.migrationTool.nl</artifactId>
|
||||
|
||||
@@ -622,7 +622,6 @@ _UI_TdSoftwareSystem_type=Td Software System
|
||||
_UI_TdMachine_type=Td Machine
|
||||
_UI_TdXMLElement_type=Td XML Element
|
||||
_UI_TdXMLContent_type=Td XML Content
|
||||
_UI_TdXMLContent_type=Td XML Content
|
||||
_UI_TdXMLDocument_type=Td XML Document
|
||||
_UI_Metadata_connections_feature=Connections
|
||||
_UI_Connection_version_feature=Version
|
||||
@@ -886,7 +885,6 @@ _UI_TdXMLElement_ownedDocument_feature=Owned Document
|
||||
_UI_TdXMLElement_javaType_feature=Java Type
|
||||
_UI_TdXMLElement_xmlContent_feature=Xml Content
|
||||
_UI_TdXMLContent_xmlElements_feature=Xml Elements
|
||||
_UI_TdXMLContent_xmlElements_feature=Xml Elements
|
||||
_UI_TdXMLDocument_xsdFilePath_feature=XSD File Path
|
||||
_UI_FileFormat_UNIX_literal=UNIX
|
||||
_UI_FileFormat_MAC_literal=MAC
|
||||
@@ -1061,12 +1059,8 @@ _UI_RuleType_BASIC_literal=BASIC
|
||||
_UI_RuleType_CUSTOM_literal=CUSTOM
|
||||
_UI_Function_Empty_literal=Empty
|
||||
_UI_Function_Lower_Case_literal=Lower_Case
|
||||
_UI_Function_Lower_Case_literal=Lower_Case
|
||||
_UI_Function_Upper_Case_literal=Upper_Case
|
||||
_UI_Function_Upper_Case_literal=Upper_Case
|
||||
_UI_Function_Lower_Case_First_literal=Lower_Case_First
|
||||
_UI_Function_Lower_Case_First_literal=Lower_Case_First
|
||||
_UI_Function_Upper_Case_First_literal=Upper_Case_First
|
||||
_UI_Function_Upper_Case_First_literal=Upper_Case_First
|
||||
_UI_Function_Length_literal=Length
|
||||
_UI_Function_Match_literal=Match
|
||||
@@ -1078,8 +1072,6 @@ _UI_Operator_Greater_Or_Equal_To_literal=Greater_Or_Equal_To
|
||||
_UI_Operator_Lower_Or_Equal_To_literal=Lower_Or_Equal_To
|
||||
_UI_ConditionType_logicalOperator_feature=Logical Operator
|
||||
_UI_LogicalOperator_AND_literal=AND
|
||||
_UI_LogicalOperator_AND_literal=AND
|
||||
_UI_LogicalOperator_OR_literal=OR
|
||||
_UI_LogicalOperator_OR_literal=OR
|
||||
_UI_ValidationRulesConnection_isDisallow_feature=Is Disallow
|
||||
_UI_ValidationRulesConnection_isRejectLink_feature=Is Reject Link
|
||||
|
||||
@@ -622,7 +622,6 @@ _UI_TdSoftwareSystem_type=Syst
|
||||
_UI_TdMachine_type=Machine Td
|
||||
_UI_TdXMLElement_type=Elément XML Td
|
||||
_UI_TdXMLContent_type=Content XML Td
|
||||
_UI_TdXMLContent_type=Content XML Td
|
||||
_UI_TdXMLDocument_type=Document XML Td
|
||||
_UI_Metadata_connections_feature=Connexions
|
||||
_UI_Connection_version_feature=Version
|
||||
@@ -881,7 +880,6 @@ _UI_TdXMLElement_xsdElementDeclaration_feature=D
|
||||
_UI_TdXMLElement_javaType_feature=Type Java
|
||||
_UI_TdXMLElement_xmlContent_feature=Contenu XML
|
||||
_UI_TdXMLContent_xmlElements_feature=Eléments XML
|
||||
_UI_TdXMLContent_xmlElements_feature=Eléments XML
|
||||
_UI_TdXMLDocument_xsdFilePath_feature=Chemin d'accès au fichier XSD
|
||||
_UI_FileFormat_UNIX_literal=Unix
|
||||
_UI_FileFormat_MAC_literal=MAC
|
||||
@@ -1053,12 +1051,8 @@ _UI_RuleType_BASIC_literal=BASIC
|
||||
_UI_RuleType_CUSTOM_literal=CUSTOM
|
||||
_UI_Function_Empty_literal=Vide
|
||||
_UI_Function_Lower_Case_literal=Minuscules
|
||||
_UI_Function_Lower_Case_literal=Minuscules
|
||||
_UI_Function_Upper_Case_literal=Majuscules
|
||||
_UI_Function_Upper_Case_literal=Majuscules
|
||||
_UI_Function_Lower_Case_First_literal=Lower_Case_First
|
||||
_UI_Function_Lower_Case_First_literal=Lower_Case_First
|
||||
_UI_Function_Upper_Case_First_literal=Upper_Case_First
|
||||
_UI_Function_Upper_Case_First_literal=Upper_Case_First
|
||||
_UI_Function_Length_literal=Length
|
||||
_UI_Function_Match_literal=Correspond
|
||||
@@ -1070,8 +1064,6 @@ _UI_Operator_Greater_Or_Equal_To_literal=Sup
|
||||
_UI_Operator_Lower_Or_Equal_To_literal=Inférieur_ou_égal_à
|
||||
_UI_ConditionType_logicalOperator_feature=Opérateur logique
|
||||
_UI_LogicalOperator_AND_literal=and
|
||||
_UI_LogicalOperator_AND_literal=and
|
||||
_UI_LogicalOperator_OR_literal=OR
|
||||
_UI_LogicalOperator_OR_literal=OR
|
||||
_UI_ValidationRulesConnection_isDisallow_feature=Is Disallow
|
||||
_UI_ValidationRulesConnection_isRejectLink_feature=Is Reject Link
|
||||
|
||||
@@ -622,7 +622,6 @@ _UI_TdSoftwareSystem_type=Td \u30BD\u30D5\u30C8\u30A6\u30A7\u30A2\u30B7\u30B9\u3
|
||||
_UI_TdMachine_type=TD\u30DE\u30B7\u30F3
|
||||
_UI_TdXMLElement_type=TD XML\u8981\u7D20
|
||||
_UI_TdXMLContent_type=TD XML\u30B3\u30F3\u30C6\u30F3\u30C4
|
||||
_UI_TdXMLContent_type=TD XML\u30B3\u30F3\u30C6\u30F3\u30C4
|
||||
_UI_TdXMLDocument_type=TD XML\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8
|
||||
_UI_Metadata_connections_feature=\u63A5\u7D9A\u8A2D\u5B9A
|
||||
_UI_Connection_version_feature=\u30D0\u30FC\u30B8\u30E7\u30F3
|
||||
@@ -886,7 +885,6 @@ _UI_TdXMLElement_ownedDocument_feature=\u6240\u6709\u3055\u308C\u3066\u3044\u308
|
||||
_UI_TdXMLElement_javaType_feature=Java\u30BF\u30A4\u30D7
|
||||
_UI_TdXMLElement_xmlContent_feature=XML\u30B3\u30F3\u30C6\u30F3\u30C4
|
||||
_UI_TdXMLContent_xmlElements_feature=XML\u8981\u7D20
|
||||
_UI_TdXMLContent_xmlElements_feature=XML\u8981\u7D20
|
||||
_UI_TdXMLDocument_xsdFilePath_feature=XSD\u30D5\u30A1\u30A4\u30EB\u30D1\u30B9
|
||||
_UI_FileFormat_UNIX_literal=UNIX
|
||||
_UI_FileFormat_MAC_literal=MAC
|
||||
@@ -1061,12 +1059,8 @@ _UI_RuleType_BASIC_literal=\u30D9\u30FC\u30B7\u30C3\u30AF
|
||||
_UI_RuleType_CUSTOM_literal=\u30E6\u30FC\u30B6\u30FC\u5B9A\u7FA9
|
||||
_UI_Function_Empty_literal=\u7A7A
|
||||
_UI_Function_Lower_Case_literal=\u5C0F\u6587\u5B57
|
||||
_UI_Function_Lower_Case_literal=\u5C0F\u6587\u5B57
|
||||
_UI_Function_Upper_Case_literal=\u5927\u6587\u5B57
|
||||
_UI_Function_Upper_Case_literal=\u5927\u6587\u5B57
|
||||
_UI_Function_Lower_Case_First_literal=\u5C0F\u6587\u5B57\u512A\u5148
|
||||
_UI_Function_Lower_Case_First_literal=\u5C0F\u6587\u5B57\u512A\u5148
|
||||
_UI_Function_Upper_Case_First_literal=\u5927\u6587\u5B57\u512A\u5148
|
||||
_UI_Function_Upper_Case_First_literal=\u5927\u6587\u5B57\u512A\u5148
|
||||
_UI_Function_Length_literal=\u9577\u3055
|
||||
_UI_Function_Match_literal=\u4E00\u81F4
|
||||
@@ -1078,8 +1072,6 @@ _UI_Operator_Greater_Or_Equal_To_literal=>=
|
||||
_UI_Operator_Lower_Or_Equal_To_literal=<=
|
||||
_UI_ConditionType_logicalOperator_feature=\u30ED\u30B8\u30C3\u30AF\u30AA\u30DA\u30EC\u30FC\u30BF
|
||||
_UI_LogicalOperator_AND_literal=AND
|
||||
_UI_LogicalOperator_AND_literal=AND
|
||||
_UI_LogicalOperator_OR_literal=\u307E\u305F\u306F
|
||||
_UI_LogicalOperator_OR_literal=\u307E\u305F\u306F
|
||||
_UI_ValidationRulesConnection_isDisallow_feature=\u7981\u6B62
|
||||
_UI_ValidationRulesConnection_isRejectLink_feature=\u30EA\u30B8\u30A7\u30AF\u30C8\u30EA\u30F3\u30AF
|
||||
|
||||
@@ -605,7 +605,6 @@ _UI_TdSoftwareSystem_type=Td\u8F6F\u4EF6\u7CFB\u7EDF
|
||||
_UI_TdMachine_type=Td \u8BBE\u5907
|
||||
_UI_TdXMLElement_type=TdXML\u5143\u7D20
|
||||
_UI_TdXMLContent_type=Td XML\u5185\u5BB9
|
||||
_UI_TdXMLContent_type=Td XML\u5185\u5BB9
|
||||
_UI_TdXMLDocument_type=Td XML \u6587\u6863
|
||||
_UI_Metadata_connections_feature=\u8FDE\u63A5
|
||||
_UI_Connection_version_feature=\u7248\u672C
|
||||
@@ -865,7 +864,6 @@ _UI_TdXMLElement_ownedDocument_feature=\u81EA\u6709\u6587\u4EF6
|
||||
_UI_TdSqlDataType_unsignedAttribute_feature=\u672A\u7B7E\u540D\u5C5E\u6027
|
||||
_UI_TdSqlDataType_caseSensitive_feature=\u5927\u5C0F\u5199\u654F\u611F
|
||||
_UI_TdSqlDataType_autoIncrement_feature=\u81EA\u589E
|
||||
_UI_TdSqlDataType_localTypeName_feature=\u672C\u5730\u7C7B\u578B\u540D\u79F0
|
||||
_UI_TdSqlDataType_localTypeName_feature=\u672C\u5730\u7C7B\u578B\u540D\u79F0
|
||||
_UI_TdSqlDataType_searchable_feature=\u53EF\u68C0\u7D22\u7684
|
||||
_UI_TdXMLElement_xsdElementDeclaration_feature=Xsd \u5143\u7D20\u58F0\u660E
|
||||
@@ -1036,12 +1034,8 @@ _UI_RuleType_BASIC_literal=\u57FA\u672C\u7684
|
||||
_UI_ValidationRulesConnection_refSchema_feature=\u53C2\u8003\u6A21\u5F0F
|
||||
_UI_ValidationRulesConnection_refColumnNames_feature=Ref \u5217\u540D
|
||||
_UI_ValidationRulesConnection_javaCondition_feature=Java\u6761\u4EF6\u5224\u65AD
|
||||
_UI_ValidationRulesConnection_sqlCondition_feature=SQL \u6761\u4EF6
|
||||
_UI_ValidationRulesConnection_conditions_feature=\u6761\u4EF6
|
||||
_UI_ValidationRulesConnection_sqlCondition_feature=SQL \u6761\u4EF6
|
||||
_UI_ValidationRulesConnection_conditions_feature=\u6761\u4EF6
|
||||
_UI_RuleType_CUSTOM_literal=\u81EA\u5B9A\u4E49
|
||||
_UI_Function_Empty_literal=\u7a7a
|
||||
_UI_RuleType_REFERENCE_literal=\u5F15\u7528
|
||||
_UI_RuleType_BASIC_literal=\u57FA\u672C\u7684
|
||||
_UI_RuleType_CUSTOM_literal=\u81EA\u5B9A\u4E49
|
||||
@@ -1053,8 +1047,6 @@ _UI_Operator_Greater_Or_Equal_To_literal=\u5927\u4E8E\u7B49\u4E8E
|
||||
_UI_Function_Length_literal=\u957F\u5EA6
|
||||
_UI_Function_Match_literal=\u5339\u914D
|
||||
_UI_Operator_Equals_literal=\u7B49\u4E8E
|
||||
_UI_Operator_Not_Equal_To_literal=\u4E0D\u7B49\u4E8E
|
||||
_UI_Operator_Greater_Than_literal=\u5927\u4E8E
|
||||
_UI_Operator_Not_Equal_To_literal=\u4E0D\u7B49\u4E8E
|
||||
_UI_Operator_Greater_Than_literal=\u5927\u4E8E
|
||||
_UI_Operator_Lower_Than_literal=\u5C0F\u4E8E
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tcommon-studio-se</artifactId>
|
||||
<version>7.0.1-SNAPSHOT</version>
|
||||
<version>7.0.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.model.edit.nl</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tcommon-studio-se</artifactId>
|
||||
<version>7.0.1-SNAPSHOT</version>
|
||||
<version>7.0.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.model.migration.nl</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tcommon-studio-se</artifactId>
|
||||
<version>7.0.1-SNAPSHOT</version>
|
||||
<version>7.0.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.model.nl</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tcommon-studio-se</artifactId>
|
||||
<version>7.0.1-SNAPSHOT</version>
|
||||
<version>7.0.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.presentation.onboarding.nl</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tcommon-studio-se</artifactId>
|
||||
<version>7.0.1-SNAPSHOT</version>
|
||||
<version>7.0.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.rcp.nl</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tcommon-studio-se</artifactId>
|
||||
<version>7.0.1-SNAPSHOT</version>
|
||||
<version>7.0.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.registration.nl</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tcommon-studio-se</artifactId>
|
||||
<version>7.0.1-SNAPSHOT</version>
|
||||
<version>7.0.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.repository.items.importexport.nl</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tcommon-studio-se</artifactId>
|
||||
<version>7.0.1-SNAPSHOT</version>
|
||||
<version>7.0.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.repository.items.importexport.ui.nl</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tcommon-studio-se</artifactId>
|
||||
<version>7.0.1-SNAPSHOT</version>
|
||||
<version>7.0.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.repository.localprovider.nl</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tcommon-studio-se</artifactId>
|
||||
<version>7.0.1-SNAPSHOT</version>
|
||||
<version>7.0.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.repository.mdm.nl</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tcommon-studio-se</artifactId>
|
||||
<version>7.0.1-SNAPSHOT</version>
|
||||
<version>7.0.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.repository.metadata.nl</artifactId>
|
||||
|
||||
@@ -368,7 +368,6 @@ JobScriptsExportWizard.exportJob=Export Job
|
||||
JobScriptsExportWizardPage.ApplyToChildren=Apply to children
|
||||
JobScriptsExportWizardPage.OverrideParameterValues=Override parameter's values
|
||||
JobScriptsExportWizardPage.ExportJob=Export jobs to an archive file on the local file system.
|
||||
JobScriptsExportWizardPage.ExportJob=Export jobs to an archive file on the local file system.
|
||||
JobScriptsExportWizardPage.chooseResource=You should choose at least one resource to export
|
||||
JobScriptsExportWizardPage.contextPerlScripts=Context scripts
|
||||
ParametersValuesDialog_Name=name
|
||||
@@ -692,7 +691,6 @@ AddListDialog.CHECKSIZE=Please check the size of the array\!
|
||||
AddListDialog.Error=Error
|
||||
AddListDialog.INPUTINDEX=please set index of current array
|
||||
WebServiceUI.Add_list_element=Add list element
|
||||
WebServiceUI.Add_list_element=Add list element
|
||||
WebServiceUI.COLUMN=Column
|
||||
WebServiceUI.Denormalize=Denormalize
|
||||
WebServiceUI.ELEMENT=Element
|
||||
|
||||
@@ -367,7 +367,6 @@ JobScriptsExportWizard.exportJob=Exporter le Job
|
||||
JobScriptsExportWizardPage.ApplyToChildren=Appliquer aux enfants
|
||||
JobScriptsExportWizardPage.OverrideParameterValues=Ecraser la valeur des paramètres
|
||||
JobScriptsExportWizardPage.ExportJob=Exporter des Jobs vers un fichier archive dans le système local de fichiers.
|
||||
JobScriptsExportWizardPage.ExportJob=Exporter des Jobs vers un fichier archive dans le système local de fichiers.
|
||||
JobScriptsExportWizardPage.chooseResource=Sélectionnez au moins une ressource à exporter
|
||||
JobScriptsExportWizardPage.contextPerlScripts=Scripts de contexte
|
||||
ParametersValuesDialog_Name=Nom
|
||||
@@ -685,7 +684,6 @@ AddListDialog.CHECKSIZE=V
|
||||
AddListDialog.Error=ERROR
|
||||
AddListDialog.INPUTINDEX=Veuillez définir l'index de la collection courante.
|
||||
WebServiceUI.Add_list_element=Ajouter un élément à la liste
|
||||
WebServiceUI.Add_list_element=Ajouter un élément à la liste
|
||||
WebServiceUI.COLUMN=Colonne
|
||||
WebServiceUI.Denormalize=Dénormaliser
|
||||
WebServiceUI.ELEMENT=Elément
|
||||
|
||||
@@ -368,7 +368,6 @@ JobScriptsExportWizard.exportJob=\u30B8\u30E7\u30D6\u306E\u30A8\u30AF\u30B9\u30D
|
||||
JobScriptsExportWizardPage.ApplyToChildren=\u5B50\u306B\u9069\u7528
|
||||
JobScriptsExportWizardPage.OverrideParameterValues=\u30D1\u30E9\u30E1\u30FC\u30BF\u5024\u306E\u4E0A\u66F8\u304D
|
||||
JobScriptsExportWizardPage.ExportJob=\u30ED\u30FC\u30AB\u30EB\u30D5\u30A1\u30A4\u30EB\u30B7\u30B9\u30C6\u30E0\u306B\u30B8\u30E7\u30D6\u30A2\u30FC\u30AB\u30A4\u30D6\u3092\u30A8\u30AF\u30B9\u30DD\u30FC\u30C8
|
||||
JobScriptsExportWizardPage.ExportJob=\u30ED\u30FC\u30AB\u30EB\u30D5\u30A1\u30A4\u30EB\u30B7\u30B9\u30C6\u30E0\u306B\u30B8\u30E7\u30D6\u30A2\u30FC\u30AB\u30A4\u30D6\u3092\u30A8\u30AF\u30B9\u30DD\u30FC\u30C8
|
||||
JobScriptsExportWizardPage.chooseResource=\u30A8\u30AF\u30B9\u30DD\u30FC\u30C8\u3059\u308B\u30EA\u30BD\u30FC\u30B9\u3092\u5C11\u306A\u304F\u3068\u30821\u3064\u9078\u629E\u3057\u306A\u3051\u308C\u3070\u306A\u308A\u307E\u305B\u3093
|
||||
JobScriptsExportWizardPage.contextPerlScripts=\u30B3\u30F3\u30C6\u30AD\u30B9\u30C8\u30B9\u30AF\u30EA\u30D7\u30C8
|
||||
ParametersValuesDialog_Name=\u540D\u524D
|
||||
@@ -692,7 +691,6 @@ AddListDialog.CHECKSIZE=\u914D\u5217\u306E\u30B5\u30A4\u30BA\u3092\u78BA\u8A8D\u
|
||||
AddListDialog.Error=\u30A8\u30E9\u30FC
|
||||
AddListDialog.INPUTINDEX=\u73FE\u5728\u306E\u914D\u5217\u306B\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9\u3092\u8A2D\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044
|
||||
WebServiceUI.Add_list_element=\u30EA\u30B9\u30C8\u8981\u7D20\u306E\u8FFD\u52A0
|
||||
WebServiceUI.Add_list_element=\u30EA\u30B9\u30C8\u8981\u7D20\u306E\u8FFD\u52A0
|
||||
WebServiceUI.COLUMN=\u30AB\u30E9\u30E0
|
||||
WebServiceUI.Denormalize=\u975E\u6B63\u898F\u5316
|
||||
WebServiceUI.ELEMENT=\u30E2\u30B8\u30E5\u30FC\u30EB
|
||||
|
||||
@@ -323,7 +323,6 @@ JobScriptsExportWSWizardPage.newJobVersion={0} \u7248\u672C
|
||||
JobScriptsExportWSWizardPage.newJobVersion.Label=\u9009\u62E9{0}\u7248\u672C
|
||||
JobScriptsExportWizardPage.ApplyToChildren=\u66f4\u65b0\u5b50\u7c7b
|
||||
JobScriptsExportWizardPage.ExportJob=\u5c06\u4f5c\u4e1a\u811a\u672c\u5bfc\u51fa\u5230\u672c\u5730\u7cfb\u7edf\u7684\u5b58\u6863\u91cc
|
||||
JobScriptsExportWizardPage.ExportJob=\u5c06\u4f5c\u4e1a\u811a\u672c\u5bfc\u51fa\u5230\u672c\u5730\u7cfb\u7edf\u7684\u5b58\u6863\u91cc
|
||||
JobScriptsExportWizardPage.contextPerlScripts=\u73af\u5883\u811a\u672c
|
||||
ParametersValuesDialog_Name=\u4f5c\u4e1a\u540d
|
||||
ParametersValuesDialog_Value=\u503c
|
||||
@@ -458,6 +457,7 @@ RepositoryPreferencePage.RefreshTitle=\u5237\u65B0\u5E93
|
||||
RepositoryReviewDialog.metadataTitle=\u5143\u6570\u636E
|
||||
RepositoryReviewDialog.repositoryContent=\u5E93\u5185\u5BB9
|
||||
RepositoryReviewDialog.waringTitle=\u8B66\u544A
|
||||
SelectDatabaseJarDialog.add=\u589E\u52A0
|
||||
SelectDatabaseJarDialog.delete=\u5220\u9664
|
||||
SelectDatabaseJarDialog.warningTitle=\u8B66\u544A
|
||||
SelectDeleteProjectDialog.DeselectAll=\u5168\u90E8\u4E0D\u9009
|
||||
@@ -540,7 +540,6 @@ AddListDialog.CHECKSIZE=\u8BF7\u68C0\u67E5\u6570\u7EC4\u957F\u5EA6
|
||||
AddListDialog.CHECKSIZE=\u8BF7\u68C0\u67E5\u6570\u7EC4\u957F\u5EA6
|
||||
AddListDialog.Error=\u9519\u8BEF
|
||||
AddListDialog.INPUTINDEX=\u8BF7\u8BBE\u7F6E\u5F53\u524D\u6570\u7EC4\u7684\u7D22\u5F15
|
||||
WebServiceUI.Add_list_element=\u6DFB\u52A0\u5217\u8868\u5143\u7D20
|
||||
WebServiceUI.Add_list_element=\u6DFB\u52A0\u5217\u8868\u5143\u7D20
|
||||
WebServiceUI.COLUMN=\u5217
|
||||
WebServiceUI.Denormalize=\u975E\u89C4\u8303\u5316
|
||||
@@ -808,6 +807,7 @@ WSDLSchemaStep1Form.ENDPOINTURI=\u7AEF\u70B9URI
|
||||
WSDLSchemaStep1Form.ENDPOINTURI=\u7AEF\u70B9URI
|
||||
WSDLSchemaStep1Form.MethodName=\u65B9\u6CD5\u540D
|
||||
WSDLSchemaStep1Form.NeedAuth=\u9700\u8981\u9A8C\u8BC1?
|
||||
WSDLSchemaStep1Form.ParColumnValue=\u503c
|
||||
WSDLSchemaStep1Form.ParameterAdd=\u589E\u52A0
|
||||
WSDLSchemaStep1Form.ParameterRemove=\u53BB\u9664
|
||||
WSDLSchemaStep1Form.Parameters=\u53C2\u6570
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tcommon-studio-se</artifactId>
|
||||
<version>7.0.1-SNAPSHOT</version>
|
||||
<version>7.0.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.repository.view.nl</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tcommon-studio-se</artifactId>
|
||||
<version>7.0.1-SNAPSHOT</version>
|
||||
<version>7.0.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.resources.nl</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tcommon-studio-se</artifactId>
|
||||
<version>7.0.1-SNAPSHOT</version>
|
||||
<version>7.0.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.commons.feature</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tcommon-studio-se</artifactId>
|
||||
<version>7.0.1-SNAPSHOT</version>
|
||||
<version>7.0.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.core.feature</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tcommon-studio-se</artifactId>
|
||||
<version>7.0.1-SNAPSHOT</version>
|
||||
<version>7.0.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.fragment.jars.feature</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tcommon-studio-se</artifactId>
|
||||
<version>7.0.1-SNAPSHOT</version>
|
||||
<version>7.0.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.help.feature</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tcommon-studio-se</artifactId>
|
||||
<version>7.0.1-SNAPSHOT</version>
|
||||
<version>7.0.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.jdt.feature</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tcommon-studio-se</artifactId>
|
||||
<version>7.0.1-SNAPSHOT</version>
|
||||
<version>7.0.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.libraries.jdbc.feature</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tcommon-studio-se</artifactId>
|
||||
<version>7.0.1-SNAPSHOT</version>
|
||||
<version>7.0.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.m2e.feature</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tcommon-studio-se</artifactId>
|
||||
<version>7.0.1-SNAPSHOT</version>
|
||||
<version>7.0.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.model.migration.feature</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tcommon-studio-se</artifactId>
|
||||
<version>7.0.1-SNAPSHOT</version>
|
||||
<version>7.0.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tcommon-studio-se</artifactId>
|
||||
<version>7.0.1-SNAPSHOT</version>
|
||||
<version>7.0.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.rcp.feature</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tcommon-studio-se</artifactId>
|
||||
<version>7.0.1-SNAPSHOT</version>
|
||||
<version>7.0.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.update.p2.feature</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tcommon-studio-se</artifactId>
|
||||
<version>7.0.1-SNAPSHOT</version>
|
||||
<version>7.0.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.updates.feature</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tcommon-studio-se</artifactId>
|
||||
<version>7.0.1-SNAPSHOT</version>
|
||||
<version>7.0.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.utils.feature</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tcommon-studio-se</artifactId>
|
||||
<version>7.0.1-SNAPSHOT</version>
|
||||
<version>7.0.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.common.ui.runtime</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tcommon-studio-se</artifactId>
|
||||
<version>7.0.1-SNAPSHOT</version>
|
||||
<version>7.0.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.commons.runtime</artifactId>
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend</groupId>
|
||||
<artifactId>org.talend.tos</artifactId>
|
||||
<version>7.0.1-SNAPSHOT</version>
|
||||
<version>7.0.1</version>
|
||||
<relativePath>../pom_server.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tcommon-studio-se</artifactId>
|
||||
<version>7.0.1-SNAPSHOT</version>
|
||||
<version>7.0.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.commons.ui</artifactId>
|
||||
|
||||
@@ -14,6 +14,7 @@ package org.talend.commons.ui.gmf.util;
|
||||
|
||||
import java.util.concurrent.Semaphore;
|
||||
|
||||
import org.eclipse.swt.graphics.DeviceData;
|
||||
import org.eclipse.swt.widgets.Display;
|
||||
import org.eclipse.swt.widgets.Shell;
|
||||
import org.eclipse.ui.IWorkbenchWindow;
|
||||
@@ -111,23 +112,38 @@ public class DisplayUtils {
|
||||
* @throws Exception
|
||||
*/
|
||||
public static void syncExecInNewUIThread(Runnable runnable) throws Exception {
|
||||
syncExecInNewUIThread(runnable, null);
|
||||
}
|
||||
|
||||
public static void syncExecInNewUIThread(Runnable runnable, DeviceData deviceData) throws Exception {
|
||||
final Semaphore semaphore = new Semaphore(1, true);
|
||||
semaphore.acquire();
|
||||
Thread thread = new Thread(new Runnable() {
|
||||
|
||||
@Override
|
||||
public void run() {
|
||||
Display display = new Display();
|
||||
Display display = null;
|
||||
if (deviceData == null) {
|
||||
display = new Display();
|
||||
} else {
|
||||
display = new Display(deviceData);
|
||||
}
|
||||
try {
|
||||
Thread currentThread = Thread.currentThread();
|
||||
boolean releasedLock = false;
|
||||
while (!currentThread.isInterrupted()) {
|
||||
if (!display.readAndDispatch()) {
|
||||
if (!releasedLock) {
|
||||
semaphore.release();
|
||||
releasedLock = true;
|
||||
try {
|
||||
if (!display.readAndDispatch()) {
|
||||
if (!releasedLock) {
|
||||
semaphore.release();
|
||||
releasedLock = true;
|
||||
}
|
||||
Thread.sleep(50);
|
||||
}
|
||||
Thread.sleep(50);
|
||||
} catch (InterruptedException e) {
|
||||
throw e;
|
||||
} catch (Exception e) {
|
||||
ExceptionHandler.process(e);
|
||||
}
|
||||
}
|
||||
} catch (InterruptedException e) {
|
||||
|
||||
@@ -24,7 +24,7 @@ import org.eclipse.ui.IWorkbenchPart;
|
||||
* $Id: ITreeContextualAction.java 7196 2007-11-26 04:19:19Z bqian $
|
||||
*
|
||||
*/
|
||||
public interface ITreeContextualAction extends IAction {
|
||||
public interface ITreeContextualAction extends IAction, Cloneable {
|
||||
|
||||
/**
|
||||
* Initialise the action on a given tree with the actual selection.<br/>
|
||||
@@ -76,4 +76,6 @@ public interface ITreeContextualAction extends IAction {
|
||||
public void setGroupId(String groupId);
|
||||
|
||||
public String getGroupId();
|
||||
|
||||
public ITreeContextualAction clone() throws CloneNotSupportedException;
|
||||
}
|
||||
|
||||
@@ -27,6 +27,7 @@ import org.eclipse.swt.graphics.Rectangle;
|
||||
import org.eclipse.swt.widgets.Control;
|
||||
import org.eclipse.swt.widgets.Shell;
|
||||
import org.talend.commons.ui.runtime.image.ImageUtils;
|
||||
import org.talend.commons.utils.system.EnvironmentUtils;
|
||||
|
||||
/**
|
||||
* <code>ImageCapture</code> provides utilities to capture images.
|
||||
@@ -53,11 +54,7 @@ public class ImageCapture {
|
||||
*
|
||||
* @param control
|
||||
*/
|
||||
public static Image capture(Control control) {
|
||||
|
||||
// First try not conclusive...
|
||||
// So I should use org.eclipse.ve.internal.swt.targetvm.win32.ImageCapture class which work perfectly
|
||||
|
||||
public static Image capture(Control control) {
|
||||
Shell shell = control.getShell();
|
||||
Rectangle boundsShell = shell.getBounds();
|
||||
|
||||
@@ -71,7 +68,13 @@ public class ImageCapture {
|
||||
GC gc = new GC(control);
|
||||
Image image = new Image(control.getDisplay(), control.getSize().x, control.getSize().y);
|
||||
|
||||
gc.copyArea(image, 0, 0);
|
||||
boolean skipCopyArea = false;
|
||||
if (EnvironmentUtils.isMacOsSytem()) {
|
||||
skipCopyArea = true;
|
||||
}
|
||||
if (!skipCopyArea) {
|
||||
gc.copyArea(image, 0, 0);
|
||||
}
|
||||
gc.dispose();
|
||||
return image;
|
||||
// return getImage(control, control.getSize().x, control.getSize().y, true);
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tcommon-studio-se</artifactId>
|
||||
<version>7.0.1-SNAPSHOT</version>
|
||||
<version>7.0.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.core.repository</artifactId>
|
||||
|
||||
@@ -2,20 +2,10 @@ package org.talend.core.repository.logintask;
|
||||
|
||||
import java.lang.reflect.InvocationTargetException;
|
||||
|
||||
import org.eclipse.core.resources.IWorkspace;
|
||||
import org.eclipse.core.resources.IWorkspaceDescription;
|
||||
import org.eclipse.core.resources.ResourcesPlugin;
|
||||
import org.eclipse.core.runtime.CoreException;
|
||||
import org.eclipse.core.runtime.IProgressMonitor;
|
||||
import org.eclipse.core.runtime.OperationCanceledException;
|
||||
import org.eclipse.core.runtime.SubMonitor;
|
||||
import org.eclipse.jface.operation.IRunnableWithProgress;
|
||||
import org.talend.commons.CommonsPlugin;
|
||||
import org.talend.commons.utils.time.TimeMeasure;
|
||||
import org.talend.core.GlobalServiceRegister;
|
||||
import org.talend.core.ICoreService;
|
||||
import org.talend.core.repository.i18n.Messages;
|
||||
import org.talend.designer.runprocess.IRunProcessService;
|
||||
import org.talend.login.AbstractLoginTask;
|
||||
import org.talend.repository.ProjectManager;
|
||||
|
||||
@@ -30,56 +20,7 @@ public class SyncLibrariesLoginTask extends AbstractLoginTask implements IRunnab
|
||||
|
||||
@Override
|
||||
public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
|
||||
TimeMeasure.display = CommonsPlugin.isDebugMode();
|
||||
TimeMeasure.displaySteps = CommonsPlugin.isDebugMode();
|
||||
TimeMeasure.measureActive = CommonsPlugin.isDebugMode();
|
||||
|
||||
TimeMeasure.begin("SyncLibraries");
|
||||
|
||||
SubMonitor subMonitor = SubMonitor.convert(monitor, 1);
|
||||
SubMonitor currentMonitor = subMonitor.newChild(1, SubMonitor.SUPPRESS_NONE);
|
||||
currentMonitor.beginTask(Messages.getString("ProxyRepositoryFactory.synchronizeLibraries"), 1); //$NON-NLS-1$
|
||||
coreService.syncLibraries(currentMonitor);
|
||||
TimeMeasure.step("SyncLibraries", "sync components libraries");
|
||||
if (monitor != null && monitor.isCanceled()) {
|
||||
throw new OperationCanceledException(""); //$NON-NLS-1$
|
||||
}
|
||||
// remove the auto-build to enhance the build speed and application's use
|
||||
IWorkspace workspace = ResourcesPlugin.getWorkspace();
|
||||
IWorkspaceDescription description = workspace.getDescription();
|
||||
description.setAutoBuilding(false);
|
||||
try {
|
||||
workspace.setDescription(description);
|
||||
} catch (CoreException e) {
|
||||
// do nothing
|
||||
}
|
||||
coreService.createStatsLogAndImplicitParamter(ProjectManager.getInstance().getCurrentProject());
|
||||
if (monitor != null && monitor.isCanceled()) {
|
||||
throw new OperationCanceledException(""); //$NON-NLS-1$
|
||||
}
|
||||
|
||||
if (monitor != null && monitor.isCanceled()) {
|
||||
throw new OperationCanceledException(""); //$NON-NLS-1$
|
||||
}
|
||||
IRunProcessService runProcessService = getRunProcessService();
|
||||
if (runProcessService != null) {
|
||||
runProcessService.initializeRootPoms();
|
||||
}
|
||||
TimeMeasure.end("SyncLibraries");
|
||||
TimeMeasure.display = false;
|
||||
TimeMeasure.displaySteps = false;
|
||||
TimeMeasure.measureActive = false;
|
||||
}
|
||||
|
||||
/**
|
||||
* DOC nrousseau Comment method "getRunProcessService".
|
||||
* @return
|
||||
*/
|
||||
private IRunProcessService getRunProcessService() {
|
||||
if (GlobalServiceRegister.getDefault().isServiceRegistered(IRunProcessService.class)) {
|
||||
return (IRunProcessService) GlobalServiceRegister.getDefault().getService(IRunProcessService.class);
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -326,4 +326,14 @@ public abstract class AbstractRepositoryFactory implements IRepositoryFactory {
|
||||
public void setStorage(String storage) {
|
||||
this.storage = storage;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isRepositoryBusy() {
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public RepositoryWorkUnit getWorkUnitInProgress() {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -432,6 +432,13 @@ public interface IRepositoryFactory {
|
||||
public List<ILockBean> getAllRemoteLocks();
|
||||
|
||||
public void loadProjectAndSetContext(IProject eclipseProject) throws PersistenceException;
|
||||
|
||||
public void loadProjectAndSetContext(Project project, IProject eclipseProject, boolean updateCurrentProject)
|
||||
throws PersistenceException;
|
||||
|
||||
public byte[] getReferenceSettingContent(Project project, String branch) throws PersistenceException;
|
||||
|
||||
public boolean isRepositoryBusy();
|
||||
|
||||
public RepositoryWorkUnit getWorkUnitInProgress();
|
||||
}
|
||||
|
||||
@@ -78,6 +78,7 @@ import org.talend.core.ICoreService;
|
||||
import org.talend.core.IESBService;
|
||||
import org.talend.core.ITDQRepositoryService;
|
||||
import org.talend.core.PluginChecker;
|
||||
import org.talend.core.context.CommandLineContext;
|
||||
import org.talend.core.context.Context;
|
||||
import org.talend.core.context.RepositoryContext;
|
||||
import org.talend.core.exception.TalendInternalPersistenceException;
|
||||
@@ -1585,6 +1586,11 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
|
||||
this.repositoryFactoryFromProvider.loadProjectAndSetContext(eclipseProject);
|
||||
}
|
||||
|
||||
public void loadProjectAndSetContext(Project project, IProject eclipseProject, boolean updateCurrentProject)
|
||||
throws PersistenceException {
|
||||
this.repositoryFactoryFromProvider.loadProjectAndSetContext(project, eclipseProject, updateCurrentProject);
|
||||
}
|
||||
|
||||
/**
|
||||
* DOC smallet Comment method "emptyTempFolder".
|
||||
*
|
||||
@@ -1862,8 +1868,8 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
|
||||
return this.repositoryFactoryFromProvider.getModulesNeededForJobs();
|
||||
}
|
||||
|
||||
private void initEmfProjectContent() throws PersistenceException, BusinessException {
|
||||
getRepositoryContext().setProject(null);
|
||||
@Override
|
||||
public void initEmfProjectContent() throws PersistenceException, BusinessException {
|
||||
Project[] projects = readProject();
|
||||
emfProjectContentMap.clear();
|
||||
if (projects != null && projects.length > 0) {
|
||||
@@ -1908,6 +1914,7 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
|
||||
SubMonitor currentMonitor = subMonitor.newChild(1, SubMonitor.SUPPRESS_NONE);
|
||||
currentMonitor.beginTask(Messages.getString("ProxyRepositoryFactory.logonInProgress"), 1); //$NON-NLS-1$
|
||||
project.setReferenceProjectProvider(null);
|
||||
getRepositoryContext().setProject(null);
|
||||
initEmfProjectContent();
|
||||
if (getEmfProjectContent(project.getTechnicalLabel()) != null) {
|
||||
project.setEmfProject(getEmfProjectContent(project.getTechnicalLabel()));
|
||||
@@ -1942,6 +1949,14 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
|
||||
}
|
||||
}
|
||||
|
||||
ICoreService coreService = getCoreService();
|
||||
if (coreService != null) {
|
||||
currentMonitor = subMonitor.newChild(1, SubMonitor.SUPPRESS_NONE);
|
||||
currentMonitor.beginTask(Messages.getString("ProxyRepositoryFactory.synchronizeLibraries"), 1); //$NON-NLS-1$
|
||||
coreService.syncLibraries(currentMonitor);
|
||||
TimeMeasure.step("SyncLibraries", "sync components libraries"); //$NON-NLS-1$
|
||||
}
|
||||
|
||||
currentMonitor = subMonitor.newChild(1, SubMonitor.SUPPRESS_NONE);
|
||||
currentMonitor.beginTask("Execute before logon migrations tasks", 1); //$NON-NLS-1$
|
||||
ProjectManager.getInstance().getMigrationRecords().clear();
|
||||
@@ -1987,7 +2002,13 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
|
||||
throw new OperationCanceledException(""); //$NON-NLS-1$
|
||||
}
|
||||
|
||||
ICoreService coreService = getCoreService();
|
||||
boolean isCommandLineLocalRefProject = false;
|
||||
CommandLineContext commandLineContext = (CommandLineContext) CoreRuntimePlugin.getInstance().getContext()
|
||||
.getProperty(Context.COMMANDLINE_CONTEXT_KEY);
|
||||
if (commandLineContext != null && commandLineContext.isLogonRefProject()) {
|
||||
isCommandLineLocalRefProject = true;
|
||||
}
|
||||
|
||||
if (coreService != null) {
|
||||
// clean workspace
|
||||
currentMonitor.beginTask(Messages.getString("ProxyRepositoryFactory.cleanWorkspace"), 1); //$NON-NLS-1$
|
||||
@@ -2016,12 +2037,14 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
|
||||
currentMonitor = subMonitor.newChild(1, SubMonitor.SUPPRESS_NONE);
|
||||
currentMonitor.beginTask(Messages.getString("ProxyRepositoryFactory.synch.repo.items"), 1); //$NON-NLS-1$
|
||||
|
||||
try {
|
||||
coreService.syncAllRoutines();
|
||||
// PTODO need refactor later, this is not good, I think
|
||||
coreService.syncAllBeans();
|
||||
} catch (SystemException e1) {
|
||||
//
|
||||
if (!isCommandLineLocalRefProject) {
|
||||
try {
|
||||
coreService.syncAllRoutines();
|
||||
// PTODO need refactor later, this is not good, I think
|
||||
coreService.syncAllBeans();
|
||||
} catch (SystemException e1) {
|
||||
//
|
||||
}
|
||||
}
|
||||
}
|
||||
if (monitor != null && monitor.isCanceled()) {
|
||||
@@ -2052,7 +2075,7 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
|
||||
// ignore
|
||||
}
|
||||
|
||||
if (runProcessService != null) {
|
||||
if (runProcessService != null && !isCommandLineLocalRefProject) {
|
||||
runProcessService.initializeRootPoms();
|
||||
|
||||
TimeMeasure.step("logOnProject", "install / setup root poms"); //$NON-NLS-1$ //$NON-NLS-2$
|
||||
@@ -2459,4 +2482,12 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
|
||||
public byte[] getReferenceSettingContent(Project project, String branch) throws PersistenceException {
|
||||
return repositoryFactoryFromProvider.getReferenceSettingContent(project, branch);
|
||||
}
|
||||
|
||||
public boolean isRepositoryBusy() {
|
||||
return repositoryFactoryFromProvider.isRepositoryBusy();
|
||||
}
|
||||
|
||||
public RepositoryWorkUnit getWorkUnitInProgress() {
|
||||
return repositoryFactoryFromProvider.getWorkUnitInProgress();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -14,10 +14,15 @@ package org.talend.core.repository.recyclebin;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Comparator;
|
||||
import java.util.Date;
|
||||
import java.util.HashMap;
|
||||
import java.util.HashSet;
|
||||
import java.util.Iterator;
|
||||
import java.util.LinkedList;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
|
||||
import org.eclipse.core.resources.IProject;
|
||||
import org.eclipse.core.runtime.IPath;
|
||||
@@ -50,20 +55,22 @@ import org.talend.repository.ProjectManager;
|
||||
*/
|
||||
public class RecycleBinManager {
|
||||
|
||||
private static Map<String, RecycleBin> projectRecyclebins;
|
||||
|
||||
public static final String TALEND_RECYCLE_BIN_INDEX = "recycle_bin.index"; //$NON-NLS-1$
|
||||
|
||||
private static RecycleBinManager manager;
|
||||
|
||||
private RecycleBinManager() {
|
||||
private Map<String, RecycleBin> projectRecyclebins;
|
||||
|
||||
private Map<RecycleBin, RecycleBin> lastSavedRecycleBinMap;
|
||||
|
||||
private RecycleBinManager() {
|
||||
lastSavedRecycleBinMap = new HashMap<>();
|
||||
projectRecyclebins = new HashMap<>();
|
||||
}
|
||||
|
||||
public static RecycleBinManager getInstance() {
|
||||
if (manager == null) {
|
||||
manager = new RecycleBinManager();
|
||||
projectRecyclebins = new HashMap<String, RecycleBin>();
|
||||
}
|
||||
return manager;
|
||||
}
|
||||
@@ -74,11 +81,15 @@ public class RecycleBinManager {
|
||||
|
||||
public void clearCache() {
|
||||
projectRecyclebins.clear();
|
||||
lastSavedRecycleBinMap.clear();
|
||||
}
|
||||
|
||||
public void clearCache(Project project) {
|
||||
String projectTechnicalLabel = project.getTechnicalLabel();
|
||||
projectRecyclebins.remove(projectTechnicalLabel);
|
||||
RecycleBin removedRecycleBin = projectRecyclebins.remove(projectTechnicalLabel);
|
||||
if (removedRecycleBin != null) {
|
||||
lastSavedRecycleBinMap.remove(removedRecycleBin);
|
||||
}
|
||||
}
|
||||
|
||||
public void clearIndex(Project project) {
|
||||
@@ -202,6 +213,13 @@ public class RecycleBinManager {
|
||||
// if there is any exception, just set a new resource
|
||||
projectRecyclebins.put(project.getTechnicalLabel(), RecycleBinFactory.eINSTANCE.createRecycleBin());
|
||||
}
|
||||
|
||||
RecycleBin recycleBin = projectRecyclebins.get(project.getTechnicalLabel());
|
||||
if (recycleBin != null) {
|
||||
RecycleBin lastSavedRecycleBin = EcoreUtil.copy(recycleBin);
|
||||
lastSavedRecycleBinMap.put(recycleBin, lastSavedRecycleBin);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
public RecycleBin loadRecycleBin(IPath recycleBinIndexPath) throws Exception {
|
||||
@@ -219,14 +237,25 @@ public class RecycleBinManager {
|
||||
loadRecycleBin(project);
|
||||
}
|
||||
try {
|
||||
RecycleBin recycleBin = projectRecyclebins.get(project.getTechnicalLabel());
|
||||
boolean recycleBinChanged = true;
|
||||
if (recycleBin != null) {
|
||||
recycleBinChanged = !equals(recycleBin, lastSavedRecycleBinMap.get(recycleBin));
|
||||
}
|
||||
|
||||
if (!recycleBinChanged) {
|
||||
return;
|
||||
}
|
||||
|
||||
Resource resource = getResource(project);
|
||||
if (resource == null) {
|
||||
resource = createRecycleBinResource(project);
|
||||
}
|
||||
resource.getContents().clear();
|
||||
projectRecyclebins.get(project.getTechnicalLabel()).setLastUpdate(new Date());
|
||||
resource.getContents().add(projectRecyclebins.get(project.getTechnicalLabel()));
|
||||
recycleBin.setLastUpdate(new Date());
|
||||
resource.getContents().add(recycleBin);
|
||||
EmfHelper.saveResource(resource);
|
||||
lastSavedRecycleBinMap.put(recycleBin, EcoreUtil.copy(recycleBin));
|
||||
} catch (PersistenceException e) {
|
||||
ExceptionHandler.process(e);
|
||||
}
|
||||
@@ -267,4 +296,123 @@ public class RecycleBinManager {
|
||||
resource.getDefaultLoadOptions().put(XMLResource.OPTION_USE_LEXICAL_HANDLER, Boolean.TRUE);
|
||||
return resource;
|
||||
}
|
||||
|
||||
public static boolean equals(RecycleBin r1, RecycleBin r2) {
|
||||
if (r1 == null && r2 == null) {
|
||||
return true;
|
||||
}
|
||||
if (r1 == null || r2 == null) {
|
||||
return false;
|
||||
}
|
||||
boolean isEquals = false;
|
||||
Set<String> r1DeletedFolders = new HashSet<>(r1.getDeletedFolders());
|
||||
Set<String> r2DeletedFolders = new HashSet<>(r2.getDeletedFolders());
|
||||
|
||||
/**
|
||||
* 1. check deleted folders
|
||||
*/
|
||||
if (r1DeletedFolders.size() == r2DeletedFolders.size()) {
|
||||
r1DeletedFolders.removeAll(r2DeletedFolders);
|
||||
if (r1DeletedFolders.isEmpty()) {
|
||||
isEquals = true;
|
||||
} else {
|
||||
isEquals = false;
|
||||
}
|
||||
} else {
|
||||
isEquals = false;
|
||||
}
|
||||
|
||||
/**
|
||||
* 2. check deleted items
|
||||
*/
|
||||
if (isEquals) {
|
||||
EList<TalendItem> r1DeletedItems = r1.getDeletedItems();
|
||||
EList<TalendItem> r2DeletedItems = r2.getDeletedItems();
|
||||
if (r1DeletedItems.size() == r2DeletedItems.size()) {
|
||||
List<TalendItem> r1DeletedItemList = new LinkedList<>(r1DeletedItems);
|
||||
List<TalendItem> r2DeletedItemList = new LinkedList<>(r2DeletedItems);
|
||||
TalendItemComparator talendItemComparator = new TalendItemComparator();
|
||||
r1DeletedItemList.sort(talendItemComparator);
|
||||
r2DeletedItemList.sort(talendItemComparator);
|
||||
Iterator<TalendItem> iter1 = r1DeletedItemList.iterator();
|
||||
Iterator<TalendItem> iter2 = r2DeletedItemList.iterator();
|
||||
boolean differentList = false;
|
||||
while (iter1.hasNext() && iter2.hasNext()) {
|
||||
TalendItem item1 = iter1.next();
|
||||
TalendItem item2 = iter2.next();
|
||||
if (talendItemComparator.compare(item1, item2) != 0) {
|
||||
differentList = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (differentList) {
|
||||
isEquals = false;
|
||||
} else {
|
||||
isEquals = true;
|
||||
}
|
||||
} else {
|
||||
isEquals = false;
|
||||
}
|
||||
}
|
||||
return isEquals;
|
||||
}
|
||||
|
||||
public static int compare(TalendItem item1, TalendItem item2) {
|
||||
if (item1 == null && item2 == null) {
|
||||
return 0;
|
||||
}
|
||||
if (item1 == null) {
|
||||
return -1;
|
||||
}
|
||||
if (item2 == null) {
|
||||
return 1;
|
||||
}
|
||||
int result = 0;
|
||||
|
||||
String type1 = item1.getType();
|
||||
String type2 = item2.getType();
|
||||
if (type1 == null) {
|
||||
type1 = "";
|
||||
}
|
||||
if (type2 == null) {
|
||||
type2 = "";
|
||||
}
|
||||
result = type1.compareTo(type2);
|
||||
if (result != 0) {
|
||||
return result;
|
||||
}
|
||||
|
||||
String path1 = item1.getPath();
|
||||
String path2 = item2.getPath();
|
||||
if (path1 == null) {
|
||||
path1 = "";
|
||||
}
|
||||
if (path2 == null) {
|
||||
path2 = "";
|
||||
}
|
||||
result = path1.compareTo(path2);
|
||||
if (result != 0) {
|
||||
return result;
|
||||
}
|
||||
|
||||
String id1 = item1.getId();
|
||||
String id2 = item2.getId();
|
||||
if (id1 == null) {
|
||||
id1 = "";
|
||||
}
|
||||
if (id2 == null) {
|
||||
id2 = "";
|
||||
}
|
||||
result = id1.compareTo(id2);
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
private static class TalendItemComparator implements Comparator<TalendItem> {
|
||||
|
||||
@Override
|
||||
public int compare(TalendItem arg0, TalendItem arg1) {
|
||||
return RecycleBinManager.compare(arg0, arg1);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tcommon-studio-se</artifactId>
|
||||
<version>7.0.1-SNAPSHOT</version>
|
||||
<version>7.0.1</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.core.runtime</artifactId>
|
||||
|
||||
@@ -0,0 +1,27 @@
|
||||
// ============================================================================
|
||||
//
|
||||
// Copyright (C) 2006-2018 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.context;
|
||||
|
||||
public class CommandLineContext {
|
||||
|
||||
private boolean isLogonRefProject;
|
||||
|
||||
public boolean isLogonRefProject() {
|
||||
return isLogonRefProject;
|
||||
}
|
||||
|
||||
public void setLogonRefProject(boolean isLogonRefProject) {
|
||||
this.isLogonRefProject = isLogonRefProject;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -33,6 +33,8 @@ public final class Context {
|
||||
|
||||
public static final String REPOSITORY_CONTEXT_KEY = "repositoryContext"; //$NON-NLS-1$
|
||||
|
||||
public static final String COMMANDLINE_CONTEXT_KEY = "commandlineContext"; //$NON-NLS-1$
|
||||
|
||||
private static final String BREAKPOINTS = "BREAKPOINTS"; //$NON-NLS-1$
|
||||
|
||||
/**
|
||||
|
||||
@@ -80,6 +80,16 @@ public class RepositoryContext {
|
||||
&& user.getGitAuthenticationInfo() == null) {
|
||||
oldGitAuthentification = this.user.getGitAuthenticationInfo();
|
||||
}
|
||||
String oldLdapId = null;
|
||||
if (this.user != null && user != null && StringUtils.equals(this.user.getLogin(), user.getLogin())
|
||||
&& user.getLdapId() == null) {
|
||||
oldLdapId = this.user.getLdapId();
|
||||
}
|
||||
String oldLdaplogin = null;
|
||||
if (this.user != null && user != null && StringUtils.equals(this.user.getLogin(), user.getLogin())
|
||||
&& user.getLdapLogin() == null) {
|
||||
oldLdaplogin = this.user.getLdapLogin();
|
||||
}
|
||||
this.user = user;
|
||||
if (oldAuthentification != null) {
|
||||
this.user.setAuthenticationInfo(oldAuthentification);
|
||||
@@ -87,6 +97,12 @@ public class RepositoryContext {
|
||||
if (oldGitAuthentification != null) {
|
||||
this.user.setGitAuthenticationInfo(oldGitAuthentification);
|
||||
}
|
||||
if (oldLdapId != null) {
|
||||
this.user.setLdapId(oldLdapId);
|
||||
}
|
||||
if (oldLdaplogin != null) {
|
||||
this.user.setLdapLogin(oldLdaplogin);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -68,9 +68,9 @@ public enum EDatabaseVersion4Drivers {
|
||||
INFORMIX(new DbVersion4Drivers(EDatabaseTypeName.INFORMIX, "ifxjdbc.jar")), //$NON-NLS-1$
|
||||
|
||||
SAS_9_1(new DbVersion4Drivers(EDatabaseTypeName.SAS, "SAS 9.1", "SAS_9.1", new String[] { "sas.core.jar", //$NON-NLS-1$
|
||||
"sas.intrnet.javatools.jar", "sas.svc.connection.jar" })), //$NON-NLS-1$ //$NON-NLS-2$
|
||||
"sas.intrnet.javatools.jar", "sas.svc.connection.jar", "org.apache.log4j_1.2.15.v201012070815.jar" })), //$NON-NLS-1$ //$NON-NLS-2$
|
||||
SAS_9_2(new DbVersion4Drivers(EDatabaseTypeName.SAS,
|
||||
"SAS 9.2", "SAS_9.2", new String[] { "sas.core.jar", "sas.security.sspi.jar", "sas.svc.connection.jar" })), //$NON-NLS-1$ //$NON-NLS-2$
|
||||
"SAS 9.2", "SAS_9.2", new String[] { "sas.core.jar", "sas.security.sspi.jar", "sas.svc.connection.jar", "org.apache.log4j_1.2.15.v201012070815.jar" })), //$NON-NLS-1$ //$NON-NLS-2$
|
||||
SAPHana(new DbVersion4Drivers(EDatabaseTypeName.SAPHana, "HDB 1.0", "HDB_1_0", "ngdbc.jar")), //$NON-NLS-1$
|
||||
// MYSQL, add for 9594
|
||||
MYSQL_5(new DbVersion4Drivers(EDatabaseTypeName.MYSQL, "MySQL 5", "MYSQL_5", "mysql-connector-java-5.1.30-bin.jar")), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
|
||||
|
||||
@@ -46,6 +46,8 @@ public class ModuleNeeded {
|
||||
|
||||
private boolean required;
|
||||
|
||||
private boolean excluded;
|
||||
|
||||
private boolean mrRequired = false; // That indicates if the module is
|
||||
// required by M/R job.
|
||||
|
||||
@@ -293,6 +295,14 @@ public class ModuleNeeded {
|
||||
this.required = required;
|
||||
}
|
||||
|
||||
public boolean isExcluded() {
|
||||
return this.excluded;
|
||||
}
|
||||
|
||||
public void setExcluded(boolean excluded) {
|
||||
this.excluded = excluded;
|
||||
}
|
||||
|
||||
public ELibraryInstallStatus getStatus() {
|
||||
ILibraryManagerService libManagerService = (ILibraryManagerService) GlobalServiceRegister.getDefault()
|
||||
.getService(ILibraryManagerService.class);
|
||||
@@ -627,6 +637,9 @@ public class ModuleNeeded {
|
||||
*/
|
||||
public void setMavenUri(String mavenUri) {
|
||||
this.mavenUriFromConfiguration = MavenUrlHelper.addTypeForMavenUri(mavenUri, getModuleName());
|
||||
if (!StringUtils.isEmpty(mavenUriFromConfiguration)) {
|
||||
this.mavenUri = mavenUriFromConfiguration;
|
||||
}
|
||||
}
|
||||
|
||||
public boolean isDynamic() {
|
||||
|
||||
@@ -45,6 +45,14 @@ public interface ISAPConstant {
|
||||
|
||||
public static final String CHANGING = "CHANGING";//$NON-NLS-1$
|
||||
|
||||
public static final String PARAMETER_TYPE = "PARAMETER_TYPE";//$NON-NLS-1$
|
||||
|
||||
public static final String PARAMETER_TYPE_IMPORT = "IMPORT";//$NON-NLS-1$
|
||||
|
||||
public static final String PARAMETER_TYPE_CHANGING = "CHANGING";//$NON-NLS-1$
|
||||
|
||||
public static final String PARAMETER_TYPE_TABLES = "TABLES";//$NON-NLS-1$
|
||||
|
||||
/*
|
||||
*
|
||||
*/
|
||||
|
||||
@@ -26,8 +26,9 @@ import org.apache.avro.SchemaBuilder.FieldBuilder;
|
||||
import org.apache.avro.SchemaBuilder.PropBuilder;
|
||||
import org.apache.avro.SchemaBuilder.RecordBuilder;
|
||||
import org.apache.commons.lang.StringUtils;
|
||||
import org.apache.log4j.Level;
|
||||
import org.eclipse.emf.common.util.EList;
|
||||
import org.talend.commons.utils.data.list.UniqueStringGenerator;
|
||||
import org.talend.commons.exception.ExceptionHandler;
|
||||
import org.talend.core.GlobalServiceRegister;
|
||||
import org.talend.core.ICoreService;
|
||||
import org.talend.core.model.metadata.builder.connection.ConnectionFactory;
|
||||
@@ -158,51 +159,58 @@ public final class MetadataToolAvroHelper {
|
||||
String tt = in.getTalendType();
|
||||
|
||||
Schema type = null;
|
||||
// Numeric types.
|
||||
if (JavaTypesManager.LONG.getId().equals(tt)) {
|
||||
type = AvroUtils._long();
|
||||
defaultValue = StringUtils.isEmpty((String)defaultValue) ? null : Long.parseLong(defaultValue.toString());
|
||||
} else if (JavaTypesManager.INTEGER.getId().equals(tt)) {
|
||||
type = AvroUtils._int();
|
||||
defaultValue = StringUtils.isEmpty((String)defaultValue) ? null : Integer.parseInt(defaultValue.toString());
|
||||
} else if (JavaTypesManager.SHORT.getId().equals(tt)) {
|
||||
type = AvroUtils._short();
|
||||
defaultValue = StringUtils.isEmpty((String)defaultValue) ? null : Integer.parseInt(defaultValue.toString());
|
||||
} else if (JavaTypesManager.BYTE.getId().equals(tt)) {
|
||||
type = AvroUtils._byte();
|
||||
defaultValue = StringUtils.isEmpty((String)defaultValue) ? null : Integer.parseInt(defaultValue.toString());
|
||||
} else if (JavaTypesManager.DOUBLE.getId().equals(tt)) {
|
||||
type = AvroUtils._double();
|
||||
defaultValue = StringUtils.isEmpty((String)defaultValue) ? null : Double.parseDouble(defaultValue.toString());
|
||||
} else if (JavaTypesManager.FLOAT.getId().equals(tt)) {
|
||||
type = AvroUtils._float();
|
||||
defaultValue = StringUtils.isEmpty((String)defaultValue) ? null : Float.parseFloat(defaultValue.toString());
|
||||
} else if (JavaTypesManager.BIGDECIMAL.getId().equals(tt)) {
|
||||
// decimal(precision, scale) == column length and precision?
|
||||
type = AvroUtils._decimal();
|
||||
}
|
||||
|
||||
// Other primitive types that map directly to Avro.
|
||||
else if (JavaTypesManager.BOOLEAN.getId().equals(tt)) {
|
||||
type = AvroUtils._boolean();
|
||||
defaultValue = StringUtils.isEmpty((String)defaultValue) ? null : Boolean.parseBoolean(defaultValue.toString());
|
||||
} else if (JavaTypesManager.BYTE_ARRAY.getId().equals(tt)) {
|
||||
type = AvroUtils._bytes();
|
||||
} else if (JavaTypesManager.DATE.getId().equals(tt)) {
|
||||
if (matchTag(in, DiSchemaConstants.TALEND6_COLUMN_DATE_DATE)) {
|
||||
type = AvroUtils._logicalDate();
|
||||
} else if (matchTag(in, DiSchemaConstants.TALEND6_COLUMN_DATE_TIMESTAMP)) {
|
||||
type = AvroUtils._logicalTimestamp();
|
||||
} else {
|
||||
// FIXME - this one should go away
|
||||
type = AvroUtils._date();
|
||||
}
|
||||
}
|
||||
// String-ish types.
|
||||
else if (JavaTypesManager.STRING.getId().equals(tt) || JavaTypesManager.FILE.getId().equals(tt)
|
||||
|| JavaTypesManager.DIRECTORY.getId().equals(tt) || JavaTypesManager.VALUE_LIST.getId().equals(tt)
|
||||
|| JavaTypesManager.CHARACTER.getId().equals(tt) || JavaTypesManager.PASSWORD.getId().equals(tt)) {
|
||||
type = AvroUtils._string();
|
||||
|
||||
try {
|
||||
// Numeric types.
|
||||
if (JavaTypesManager.LONG.getId().equals(tt)) {
|
||||
type = AvroUtils._long();
|
||||
defaultValue = StringUtils.isEmpty((String)defaultValue) ? null : Long.parseLong(defaultValue.toString());
|
||||
} else if (JavaTypesManager.INTEGER.getId().equals(tt)) {
|
||||
type = AvroUtils._int();
|
||||
defaultValue = StringUtils.isEmpty((String)defaultValue) ? null : Integer.parseInt(defaultValue.toString());
|
||||
} else if (JavaTypesManager.SHORT.getId().equals(tt)) {
|
||||
type = AvroUtils._short();
|
||||
defaultValue = StringUtils.isEmpty((String)defaultValue) ? null : Integer.parseInt(defaultValue.toString());
|
||||
} else if (JavaTypesManager.BYTE.getId().equals(tt)) {
|
||||
type = AvroUtils._byte();
|
||||
defaultValue = StringUtils.isEmpty((String)defaultValue) ? null : Integer.parseInt(defaultValue.toString());
|
||||
} else if (JavaTypesManager.DOUBLE.getId().equals(tt)) {
|
||||
type = AvroUtils._double();
|
||||
defaultValue = StringUtils.isEmpty((String)defaultValue) ? null : Double.parseDouble(defaultValue.toString());
|
||||
} else if (JavaTypesManager.FLOAT.getId().equals(tt)) {
|
||||
type = AvroUtils._float();
|
||||
defaultValue = StringUtils.isEmpty((String)defaultValue) ? null : Float.parseFloat(defaultValue.toString());
|
||||
} else if (JavaTypesManager.BIGDECIMAL.getId().equals(tt)) {
|
||||
// decimal(precision, scale) == column length and precision?
|
||||
type = AvroUtils._decimal();
|
||||
}
|
||||
|
||||
// Other primitive types that map directly to Avro.
|
||||
else if (JavaTypesManager.BOOLEAN.getId().equals(tt)) {
|
||||
type = AvroUtils._boolean();
|
||||
defaultValue = StringUtils.isEmpty((String)defaultValue) ? null : Boolean.parseBoolean(defaultValue.toString());
|
||||
} else if (JavaTypesManager.BYTE_ARRAY.getId().equals(tt)) {
|
||||
type = AvroUtils._bytes();
|
||||
} else if (JavaTypesManager.DATE.getId().equals(tt)) {
|
||||
if (matchTag(in, DiSchemaConstants.TALEND6_COLUMN_DATE_DATE)) {
|
||||
type = AvroUtils._logicalDate();
|
||||
} else if (matchTag(in, DiSchemaConstants.TALEND6_COLUMN_DATE_TIMESTAMP)) {
|
||||
type = AvroUtils._logicalTimestamp();
|
||||
} else {
|
||||
// FIXME - this one should go away
|
||||
type = AvroUtils._date();
|
||||
}
|
||||
}
|
||||
// String-ish types.
|
||||
else if (JavaTypesManager.STRING.getId().equals(tt) || JavaTypesManager.FILE.getId().equals(tt)
|
||||
|| JavaTypesManager.DIRECTORY.getId().equals(tt) || JavaTypesManager.VALUE_LIST.getId().equals(tt)
|
||||
|| JavaTypesManager.CHARACTER.getId().equals(tt) || JavaTypesManager.PASSWORD.getId().equals(tt)) {
|
||||
type = AvroUtils._string();
|
||||
}
|
||||
} catch(Exception e) {
|
||||
//ignore it now as we can't process the complex expression for the default value, and the default value is not useful for runtime like the old javajet tjdbcxxx
|
||||
//TODO support the expression calculate, not sure it's necessary and sometimes, more complex like globalMap.get(xxx) which only have meaning after running the job.
|
||||
ExceptionHandler.process(e, Level.WARN);
|
||||
}
|
||||
|
||||
// Types with Document/Unknown elements, store as binary
|
||||
|
||||
@@ -37,6 +37,7 @@ import org.eclipse.jface.dialogs.MessageDialog;
|
||||
import org.eclipse.swt.events.KeyEvent;
|
||||
import org.eclipse.swt.widgets.Display;
|
||||
import org.eclipse.swt.widgets.Shell;
|
||||
import org.talend.commons.CommonsPlugin;
|
||||
import org.talend.commons.exception.PersistenceException;
|
||||
import org.talend.commons.runtime.model.components.IComponentConstants;
|
||||
import org.talend.commons.runtime.model.repository.ERepositoryStatus;
|
||||
@@ -739,7 +740,7 @@ public final class MetadataToolHelper {
|
||||
}
|
||||
Set<MetadataTable> tables = null;
|
||||
IGenericWizardService wizardService = null;
|
||||
if (GlobalServiceRegister.getDefault().isServiceRegistered(IGenericWizardService.class)) {
|
||||
if (!CommonsPlugin.isHeadless() && GlobalServiceRegister.getDefault().isServiceRegistered(IGenericWizardService.class)) {
|
||||
wizardService = (IGenericWizardService) GlobalServiceRegister.getDefault()
|
||||
.getService(IGenericWizardService.class);
|
||||
}
|
||||
|
||||
@@ -100,8 +100,8 @@ import org.talend.cwm.helper.TaggedValueHelper;
|
||||
*/
|
||||
public class RepositoryToComponentProperty {
|
||||
|
||||
public static Object getValue(Connection connection, String value, IMetadataTable table, String targetComponent) {
|
||||
|
||||
public static Object getValue(Connection connection, String value, IMetadataTable table, String targetComponent, Map<Object, Object> contextMap) {
|
||||
|
||||
if (connection instanceof HL7Connection) {
|
||||
return getHL7Value((HL7Connection) connection, value);
|
||||
}
|
||||
@@ -155,7 +155,7 @@ public class RepositoryToComponentProperty {
|
||||
|
||||
for (IDragAndDropServiceHandler handler : DragAndDropManager.getHandlers()) {
|
||||
if (handler.canHandle(connection)) {
|
||||
return handler.getComponentValue(connection, value, table, targetComponent);
|
||||
return handler.getComponentValue(connection, value, table, targetComponent, contextMap);
|
||||
}
|
||||
}
|
||||
return null;
|
||||
@@ -163,7 +163,7 @@ public class RepositoryToComponentProperty {
|
||||
}
|
||||
|
||||
public static Object getValue(Connection connection, String value, IMetadataTable table) {
|
||||
return getValue(connection, value, table, null);
|
||||
return getValue(connection, value, table, null, null);
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -12,6 +12,7 @@
|
||||
// ============================================================================
|
||||
package org.talend.core.model.process;
|
||||
|
||||
import org.talend.daikon.properties.property.Property;
|
||||
|
||||
/**
|
||||
* DOC cmeng class global comment. Detailled comment
|
||||
@@ -20,4 +21,5 @@ public interface IGenericElementParameter extends IElementParameter {
|
||||
|
||||
public void setAskPropagate(Boolean askPropagate);
|
||||
|
||||
public Property getProperty();
|
||||
}
|
||||
|
||||
@@ -33,6 +33,7 @@ import org.talend.core.model.general.Project;
|
||||
import org.talend.core.model.properties.Item;
|
||||
import org.talend.core.model.properties.JobletProcessItem;
|
||||
import org.talend.core.model.properties.ProcessItem;
|
||||
import org.talend.core.model.properties.ProjectReference;
|
||||
import org.talend.core.model.properties.Property;
|
||||
import org.talend.core.model.properties.SQLPatternItem;
|
||||
import org.talend.core.model.relationship.Relation;
|
||||
@@ -904,12 +905,17 @@ public final class ProcessUtils {
|
||||
}
|
||||
|
||||
if (needBeans && GlobalServiceRegister.getDefault().isServiceRegistered(IProxyRepositoryService.class)) {
|
||||
IProxyRepositoryService service = (IProxyRepositoryService) GlobalServiceRegister.getDefault().getService(
|
||||
IProxyRepositoryService.class);
|
||||
IProxyRepositoryService service = (IProxyRepositoryService) GlobalServiceRegister.getDefault()
|
||||
.getService(IProxyRepositoryService.class);
|
||||
ERepositoryObjectType beansType = ERepositoryObjectType.valueOf("BEANS"); //$NON-NLS-1$
|
||||
try {
|
||||
IProxyRepositoryFactory factory = service.getProxyRepositoryFactory();
|
||||
List<IRepositoryViewObject> all = factory.getAll(project, beansType);
|
||||
List<ProjectReference> references = ProjectManager.getInstance().getCurrentProject()
|
||||
.getProjectReferenceList(true);
|
||||
for (ProjectReference ref : references) {
|
||||
all.addAll(factory.getAll(new Project(ref.getReferencedProject()), beansType));
|
||||
}
|
||||
if (!all.isEmpty()) { // has bean
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -19,6 +19,7 @@ import java.util.Comparator;
|
||||
import java.util.HashMap;
|
||||
import java.util.HashSet;
|
||||
import java.util.Iterator;
|
||||
import java.util.LinkedList;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
@@ -28,6 +29,7 @@ import org.apache.log4j.Level;
|
||||
import org.apache.log4j.Logger;
|
||||
import org.eclipse.core.runtime.IProgressMonitor;
|
||||
import org.eclipse.core.runtime.NullProgressMonitor;
|
||||
import org.eclipse.emf.common.util.EList;
|
||||
import org.talend.commons.exception.ExceptionHandler;
|
||||
import org.talend.commons.exception.PersistenceException;
|
||||
import org.talend.core.model.general.Project;
|
||||
@@ -134,6 +136,8 @@ public class RelationshipItemBuilder {
|
||||
|
||||
private boolean modified = false;
|
||||
|
||||
private boolean autoSave = true;
|
||||
|
||||
private Project aimProject;
|
||||
|
||||
private IProxyRepositoryFactory proxyRepositoryFactory;
|
||||
@@ -471,8 +475,11 @@ public class RelationshipItemBuilder {
|
||||
itemToTest.setVersion(version);
|
||||
if (!itemsRelations.containsKey(itemToTest)) {
|
||||
try {
|
||||
Item item = proxyRepositoryFactory.getLastVersion(itemId).getProperty().getItem();
|
||||
addOrUpdateItem(item, false);
|
||||
IRepositoryViewObject object = proxyRepositoryFactory.getLastVersion(itemId);
|
||||
if (object != null) {
|
||||
Item item = object.getProperty().getItem();
|
||||
addOrUpdateItem(item, false);
|
||||
}
|
||||
} catch (PersistenceException e) {
|
||||
log.error(e.getMessage());
|
||||
}
|
||||
@@ -660,6 +667,16 @@ public class RelationshipItemBuilder {
|
||||
return false;
|
||||
}
|
||||
|
||||
public void autoSaveRelations() {
|
||||
if (!isAutoSave()) {
|
||||
return;
|
||||
}
|
||||
saveRelations();
|
||||
}
|
||||
|
||||
/**
|
||||
* <font color="red">{@link #autoSaveRelations()} is recommanded</font>
|
||||
*/
|
||||
public void saveRelations() {
|
||||
if (!loaded && !modified) {
|
||||
return;
|
||||
@@ -693,13 +710,7 @@ public class RelationshipItemBuilder {
|
||||
|
||||
// sort by type
|
||||
List<Relation> relationItemsList = new ArrayList<Relation>(currentProjectItemsRelations.get(relation));
|
||||
Collections.sort(relationItemsList, new Comparator<Relation>() {
|
||||
|
||||
@Override
|
||||
public int compare(Relation o1, Relation o2) {
|
||||
return o1.getType().compareTo(o2.getType());
|
||||
}
|
||||
});
|
||||
Collections.sort(relationItemsList, new RelationComparator());
|
||||
List<ItemRelation> usedRelationList = new ArrayList<ItemRelation>();
|
||||
List<ItemRelation> oldRelatedItems = new ArrayList<ItemRelation>(itemRelations.getRelatedItems());
|
||||
for (Relation relatedItem : relationItemsList) {
|
||||
@@ -733,16 +744,29 @@ public class RelationshipItemBuilder {
|
||||
emfRelatedItem.setVersion(relatedItem.getVersion());
|
||||
itemRelations.getRelatedItems().add(emfRelatedItem);
|
||||
}
|
||||
EList relatedItems = itemRelations.getRelatedItems();
|
||||
// get unused relation items
|
||||
oldRelatedItems.removeAll(usedRelationList);
|
||||
// remove unused relation items
|
||||
itemRelations.getRelatedItems().removeAll(oldRelatedItems);
|
||||
relatedItems.removeAll(oldRelatedItems);
|
||||
|
||||
// sort result
|
||||
List relatedItemsList = new LinkedList<>(relatedItems);
|
||||
Collections.sort(relatedItemsList, new ItemRelationComparator());
|
||||
relatedItems.clear();
|
||||
relatedItems.addAll(relatedItemsList);
|
||||
if (!exist) {
|
||||
currentProject.getEmfProject().getItemsRelations().add(itemRelations);
|
||||
}
|
||||
}
|
||||
oldRelations.removeAll(usedList);
|
||||
currentProject.getEmfProject().getItemsRelations().removeAll(oldRelations);
|
||||
EList itemsRelations = currentProject.getEmfProject().getItemsRelations();
|
||||
itemsRelations.removeAll(oldRelations);
|
||||
List itemRelationsList = new LinkedList<>(itemsRelations);
|
||||
Collections.sort(itemRelationsList, new ItemRelationsComparator());
|
||||
itemsRelations.clear();
|
||||
itemsRelations.addAll(itemRelationsList);
|
||||
|
||||
try {
|
||||
getProxyRepositoryFactory().saveProject(currentProject);
|
||||
} catch (PersistenceException e) {
|
||||
@@ -877,7 +901,7 @@ public class RelationshipItemBuilder {
|
||||
return;
|
||||
}
|
||||
}
|
||||
saveRelations();
|
||||
autoSaveRelations();
|
||||
monitor.done();
|
||||
loaded = true;
|
||||
|
||||
@@ -970,7 +994,7 @@ public class RelationshipItemBuilder {
|
||||
}
|
||||
}
|
||||
|
||||
public boolean supportRelation(Item item) {
|
||||
public static boolean supportRelation(Item item) {
|
||||
IItemRelationshipHandler[] itemRelationshipHandlers = RelationshipRegistryReader.getInstance()
|
||||
.getItemRelationshipHandlers();
|
||||
for (IItemRelationshipHandler handler : itemRelationshipHandlers) {
|
||||
@@ -1060,11 +1084,69 @@ public class RelationshipItemBuilder {
|
||||
modified = true;
|
||||
}
|
||||
if (!fromMigration && modified) {
|
||||
saveRelations();
|
||||
autoSaveRelations();
|
||||
}
|
||||
}
|
||||
|
||||
public void removeItemRelations(Item item) {
|
||||
public Set<Relation> getItemRelations(Item item) {
|
||||
if (!loaded) {
|
||||
loadRelations();
|
||||
}
|
||||
|
||||
ProcessType processType = null;
|
||||
if (item instanceof ProcessItem) {
|
||||
processType = ((ProcessItem) item).getProcess();
|
||||
}
|
||||
if (item instanceof JobletProcessItem) {
|
||||
processType = ((JobletProcessItem) item).getJobletProcess();
|
||||
}
|
||||
|
||||
Set<Relation> relations = Collections.EMPTY_SET;
|
||||
if (processType != null) {
|
||||
Relation relation = new Relation();
|
||||
relation.setId(item.getProperty().getId());
|
||||
relation.setType(getTypeFromItem(item));
|
||||
relation.setVersion(item.getProperty().getVersion());
|
||||
|
||||
Map<Relation, Set<Relation>> itemRelations = getRelatedRelations(item);
|
||||
|
||||
relations = itemRelations.get(relation);
|
||||
}
|
||||
return relations;
|
||||
}
|
||||
|
||||
public Set<Relation> removeItemRelations(Item item) {
|
||||
if (!loaded) {
|
||||
loadRelations();
|
||||
}
|
||||
modified = true;
|
||||
|
||||
ProcessType processType = null;
|
||||
if (item instanceof ProcessItem) {
|
||||
processType = ((ProcessItem) item).getProcess();
|
||||
}
|
||||
if (item instanceof JobletProcessItem) {
|
||||
processType = ((JobletProcessItem) item).getJobletProcess();
|
||||
}
|
||||
|
||||
Set<Relation> removedRelations = Collections.EMPTY_SET;
|
||||
if (processType != null) {
|
||||
Relation relation = new Relation();
|
||||
relation.setId(item.getProperty().getId());
|
||||
relation.setType(getTypeFromItem(item));
|
||||
relation.setVersion(item.getProperty().getVersion());
|
||||
|
||||
Map<Relation, Set<Relation>> itemRelations = getRelatedRelations(item);
|
||||
|
||||
if (itemRelations.containsKey(relation)) {
|
||||
removedRelations = itemRelations.remove(relation);
|
||||
autoSaveRelations();
|
||||
}
|
||||
}
|
||||
return removedRelations;
|
||||
}
|
||||
|
||||
public void putItemRelations(Item item, Set<Relation> relations) {
|
||||
if (!loaded) {
|
||||
loadRelations();
|
||||
}
|
||||
@@ -1086,11 +1168,8 @@ public class RelationshipItemBuilder {
|
||||
|
||||
Map<Relation, Set<Relation>> itemRelations = getRelatedRelations(item);
|
||||
|
||||
if (itemRelations.containsKey(relation)) {
|
||||
itemRelations.get(relation).clear();
|
||||
itemRelations.remove(relation);
|
||||
saveRelations();
|
||||
}
|
||||
itemRelations.put(relation, relations);
|
||||
autoSaveRelations();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1108,4 +1187,176 @@ public class RelationshipItemBuilder {
|
||||
public Map<Relation, Set<Relation>> getCurrentProjectItemsRelations() {
|
||||
return this.currentProjectItemsRelations;
|
||||
}
|
||||
|
||||
public void setAutoSave(boolean autoSave) {
|
||||
this.autoSave = autoSave;
|
||||
}
|
||||
|
||||
public boolean isAutoSave() {
|
||||
return this.autoSave;
|
||||
}
|
||||
|
||||
public boolean isSame(Set<Relation> r1, Set<Relation> r2) {
|
||||
if (r1 == null && r2 == null) {
|
||||
return true;
|
||||
}
|
||||
if (r1 == null || r2 == null) {
|
||||
return false;
|
||||
}
|
||||
if (r1.size() != r2.size()) {
|
||||
return false;
|
||||
}
|
||||
List<Relation> r1List = new LinkedList<>(r1);
|
||||
List<Relation> r2List = new LinkedList<>(r2);
|
||||
RelationComparator comparator = new RelationComparator();
|
||||
r1List.sort(comparator);
|
||||
r2List.sort(comparator);
|
||||
Iterator<Relation> r1Iter = r1List.iterator();
|
||||
Iterator<Relation> r2Iter = r2List.iterator();
|
||||
while (r1Iter.hasNext() && r2Iter.hasNext()) {
|
||||
Relation r1Relation = r1Iter.next();
|
||||
Relation r2Relation = r2Iter.next();
|
||||
if (r1Relation == null || r2Relation == null) {
|
||||
return false;
|
||||
}
|
||||
if (comparator.compare(r1Relation, r2Relation) != 0) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
public static class RelationComparator implements Comparator<Relation> {
|
||||
|
||||
@Override
|
||||
public int compare(Relation o1, Relation o2) {
|
||||
String o1Type = o1.getType();
|
||||
String o2Type = o2.getType();
|
||||
if (o1Type == null) {
|
||||
o1Type = "";
|
||||
}
|
||||
if (o2Type == null) {
|
||||
o2Type = "";
|
||||
}
|
||||
int result = o1Type.compareTo(o2Type);
|
||||
if (result != 0) {
|
||||
return result;
|
||||
}
|
||||
String o1Id = o1.getId();
|
||||
String o2Id = o2.getId();
|
||||
if (o1Id == null) {
|
||||
o1Id = "";
|
||||
}
|
||||
if (o2Id == null) {
|
||||
o2Id = "";
|
||||
}
|
||||
result = o1Id.compareTo(o2Id);
|
||||
if (result != 0) {
|
||||
return result;
|
||||
}
|
||||
String o1Version = o1.getVersion();
|
||||
String o2Version = o2.getVersion();
|
||||
if (o1Version == null) {
|
||||
o1Version = "";
|
||||
}
|
||||
if (o2Version == null) {
|
||||
o2Version = "";
|
||||
}
|
||||
return o1Version.compareTo(o2Version);
|
||||
}
|
||||
}
|
||||
|
||||
public static class ItemRelationComparator implements Comparator<Object> {
|
||||
|
||||
@Override
|
||||
public int compare(Object arg0, Object arg1) {
|
||||
if (arg0 instanceof ItemRelation && arg1 instanceof ItemRelation) {
|
||||
ItemRelation itemRelation0 = (ItemRelation) arg0;
|
||||
ItemRelation itemRelation1 = (ItemRelation) arg1;
|
||||
String type0 = itemRelation0.getType();
|
||||
String type1 = itemRelation1.getType();
|
||||
if (type0 == null) {
|
||||
type0 = "";
|
||||
}
|
||||
if (type1 == null) {
|
||||
type1 = "";
|
||||
}
|
||||
int result = type0.compareTo(type1);
|
||||
if (result != 0) {
|
||||
return result;
|
||||
}
|
||||
String id0 = itemRelation0.getId();
|
||||
String id1 = itemRelation1.getId();
|
||||
if (id0 == null) {
|
||||
id0 = "";
|
||||
}
|
||||
if (id1 == null) {
|
||||
id1 = "";
|
||||
}
|
||||
result = id0.compareTo(id1);
|
||||
if (result != 0) {
|
||||
return result;
|
||||
}
|
||||
String version0 = itemRelation0.getVersion();
|
||||
String version1 = itemRelation1.getVersion();
|
||||
if (version0 == null) {
|
||||
version0 = "";
|
||||
}
|
||||
if (version1 == null) {
|
||||
version1 = "";
|
||||
}
|
||||
return version0.compareTo(version1);
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
public static class ItemRelationsComparator implements Comparator<Object> {
|
||||
|
||||
@Override
|
||||
public int compare(Object o1, Object o2) {
|
||||
if (o1 instanceof ItemRelations && o2 instanceof ItemRelations) {
|
||||
ItemRelations itemRelations1 = (ItemRelations) o1;
|
||||
ItemRelations itemRelations2 = (ItemRelations) o2;
|
||||
ItemRelation baseItem1 = itemRelations1.getBaseItem();
|
||||
ItemRelation baseItem2 = itemRelations2.getBaseItem();
|
||||
if (baseItem1 != null && baseItem2 != null) {
|
||||
String type1 = baseItem1.getType();
|
||||
String type2 = baseItem2.getType();
|
||||
if (type1 == null) {
|
||||
type1 = "";
|
||||
}
|
||||
if (type2 == null) {
|
||||
type2 = "";
|
||||
}
|
||||
int result = type1.compareTo(type2);
|
||||
if (result != 0) {
|
||||
return result;
|
||||
}
|
||||
String id1 = baseItem1.getId();
|
||||
String id2 = baseItem2.getId();
|
||||
if (id1 == null) {
|
||||
id1 = "";
|
||||
}
|
||||
if (id2 == null) {
|
||||
id2 = "";
|
||||
}
|
||||
result = id1.compareTo(id2);
|
||||
if (result != 0) {
|
||||
return result;
|
||||
}
|
||||
String version1 = baseItem1.getVersion();
|
||||
String version2 = baseItem2.getVersion();
|
||||
if (version1 == null) {
|
||||
version1 = "";
|
||||
}
|
||||
if (version2 == null) {
|
||||
version2 = "";
|
||||
}
|
||||
return version1.compareTo(version2);
|
||||
}
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1480,4 +1480,20 @@ public class ERepositoryObjectType extends DynaEnum<ERepositoryObjectType> {
|
||||
}
|
||||
return allTypes;
|
||||
}
|
||||
|
||||
public static List<ERepositoryObjectType> getAllTypesOfCodes() {
|
||||
List<ERepositoryObjectType> allTypes = new ArrayList<ERepositoryObjectType>();
|
||||
if (ERepositoryObjectType.ROUTINES != null) {
|
||||
allTypes.add(ERepositoryObjectType.ROUTINES);
|
||||
}
|
||||
ERepositoryObjectType beansType = ERepositoryObjectType.valueOf("BEANS"); //$NON-NLS-1$
|
||||
if (beansType != null) {
|
||||
allTypes.add(beansType);
|
||||
}
|
||||
if (ERepositoryObjectType.PIG_UDF != null) {
|
||||
allTypes.add(ERepositoryObjectType.PIG_UDF);
|
||||
}
|
||||
return allTypes;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -159,8 +159,9 @@ public abstract class AbstractUpdateManager implements IUpdateManager {
|
||||
public void checkAllModification() {
|
||||
clearResult();
|
||||
IUpdateItemType[] allUpdateItemTypes = UpdateManagerProviderDetector.INSTANCE.getAllUpdateItemTypes();
|
||||
Map<Object, Object> contextData = new HashMap<Object, Object>();
|
||||
for (IUpdateItemType type : allUpdateItemTypes) {
|
||||
List<UpdateResult> result = getUpdatesNeeded(type);
|
||||
List<UpdateResult> result = getUpdatesNeeded(type, false, contextData);
|
||||
if (result != null) {
|
||||
getUpdatesNeeded().addAll(result);
|
||||
}
|
||||
|
||||
@@ -14,6 +14,7 @@ package org.talend.core.model.update;
|
||||
|
||||
import java.beans.PropertyChangeEvent;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* ggu class global comment. Detailled comment
|
||||
@@ -58,6 +59,8 @@ public interface IUpdateManager {
|
||||
public List<UpdateResult> getUpdatesNeeded(IUpdateItemType type);
|
||||
|
||||
public List<UpdateResult> getUpdatesNeeded(IUpdateItemType type, boolean onlySimpleShow);
|
||||
|
||||
public List<UpdateResult> getUpdatesNeeded(IUpdateItemType itemType, boolean onlySimpleShow, Map<Object, Object> contextData);
|
||||
|
||||
public boolean executeUpdates(List<UpdateResult> results);
|
||||
|
||||
|
||||
@@ -34,7 +34,7 @@ public abstract class AbstractDragAndDropServiceHandler implements IDragAndDropS
|
||||
*/
|
||||
@Override
|
||||
public Object getComponentValue(Connection connection, String value, IMetadataTable table) {
|
||||
return getComponentValue(connection, value, table, null);
|
||||
return getComponentValue(connection, value, table, null, null);
|
||||
}
|
||||
|
||||
/*
|
||||
|
||||
@@ -236,7 +236,7 @@ public final class ContextParameterUtils {
|
||||
//ignore the exception
|
||||
}
|
||||
|
||||
return result.toString();
|
||||
return result == null ? null : result.toString();
|
||||
}
|
||||
|
||||
private static Map<String, Object> getVarMapForScriptEngine(final IContext context) {
|
||||
|
||||
@@ -13,6 +13,7 @@
|
||||
package org.talend.core.model.utils;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import org.talend.components.api.properties.ComponentProperties;
|
||||
import org.talend.core.model.components.IComponent;
|
||||
@@ -49,7 +50,7 @@ public interface IDragAndDropServiceHandler {
|
||||
*/
|
||||
public Object getComponentValue(Connection connection, String value, IMetadataTable table);
|
||||
|
||||
public Object getComponentValue(Connection connection, String value, IMetadataTable table, String targetComponent);
|
||||
public Object getComponentValue(Connection connection, String value, IMetadataTable table, String targetComponent, Map<Object, Object> contextMap);
|
||||
|
||||
/**
|
||||
* DOC hwang Comment method "filterNeededComponents".
|
||||
|
||||
@@ -26,5 +26,7 @@ public class NexusConstants {
|
||||
|
||||
public static final String SLASH = "/";//$NON-NLS-1$
|
||||
|
||||
public static final String SNAPSHOTS = "@snapshots";
|
||||
public static final String SNAPSHOTS = "@snapshots";//$NON-NLS-1$
|
||||
|
||||
public static final String DISALLOW_RELEASES = "@noreleases";//$NON-NLS-1$
|
||||
}
|
||||
|
||||
@@ -13,7 +13,6 @@
|
||||
package org.talend.core.runtime.maven;
|
||||
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
import org.talend.core.nexus.TalendMavenResolver;
|
||||
|
||||
/**
|
||||
* DOC ggu class global comment. Detailled comment
|
||||
@@ -25,7 +24,15 @@ public class MavenArtifact implements Cloneable {
|
||||
private static final char ARTIFACT_SEPARATOR = '-';
|
||||
|
||||
private String repositoryUrl, groupId, artifactId, version, type, classifier, description, url, license, licenseUrl,
|
||||
distribution, username, password;
|
||||
distribution, username, password, lastUpdated;
|
||||
|
||||
public String getLastUpdated() {
|
||||
return this.lastUpdated;
|
||||
}
|
||||
|
||||
public void setLastUpdated(String lastUpdated) {
|
||||
this.lastUpdated = lastUpdated;
|
||||
}
|
||||
|
||||
public String getRepositoryUrl() {
|
||||
return repositoryUrl;
|
||||
|
||||
@@ -33,7 +33,7 @@ public class LastGenerationInfo {
|
||||
|
||||
private HashMap<String, Set<ModuleNeeded>> modulesNeededWithSubjobPerJob;
|
||||
|
||||
private Set<ModuleNeeded> highPriorityModuleNeeded;
|
||||
private HashMap<String, Set<ModuleNeeded>> highPriorityModuleNeeded;
|
||||
|
||||
private HashMap<String, Set<String>> routinesNeededWithSubjobPerJob;
|
||||
|
||||
@@ -55,7 +55,7 @@ public class LastGenerationInfo {
|
||||
modulesNeededPerJob = new HashMap<String, Set<ModuleNeeded>>();
|
||||
contextPerJob = new HashMap<String, Set<String>>();
|
||||
modulesNeededWithSubjobPerJob = new HashMap<String, Set<ModuleNeeded>>();
|
||||
highPriorityModuleNeeded = new LinkedHashSet<ModuleNeeded>();
|
||||
highPriorityModuleNeeded = new HashMap<>();
|
||||
lastGeneratedjobs = new HashSet<JobInfo>();
|
||||
routinesNeededPerJob = new HashMap<String, Set<String>>();
|
||||
pigudfNeededPerJob = new HashMap<String, Set<String>>();
|
||||
@@ -257,13 +257,29 @@ public class LastGenerationInfo {
|
||||
}
|
||||
return routinesNeededPerJob.get(key);
|
||||
}
|
||||
|
||||
public Set<ModuleNeeded> getHighPriorityModuleNeeded() {
|
||||
return highPriorityModuleNeeded;
|
||||
|
||||
public Set<ModuleNeeded> getHighPriorityModuleNeeded(String jobId, String jobVersion) {
|
||||
String key = getProcessKey(jobId, jobVersion);
|
||||
if (!highPriorityModuleNeeded.containsKey(key)) {
|
||||
highPriorityModuleNeeded.put(key, new LinkedHashSet<>());
|
||||
}
|
||||
return highPriorityModuleNeeded.get(key);
|
||||
}
|
||||
|
||||
public void setHighPriorityModuleNeeded(ModuleNeeded moduleNeeded) {
|
||||
highPriorityModuleNeeded.add(moduleNeeded);
|
||||
|
||||
public void setHighPriorityModuleNeeded(String jobId, String jobVersion, Set<ModuleNeeded> moduleNeeded) {
|
||||
String key = getProcessKey(jobId, jobVersion);
|
||||
if (!highPriorityModuleNeeded.containsKey(key)) {
|
||||
highPriorityModuleNeeded.put(key, new LinkedHashSet<>());
|
||||
}
|
||||
highPriorityModuleNeeded.get(key).addAll(moduleNeeded);
|
||||
}
|
||||
|
||||
public void clearHighPriorityModuleNeeded() {
|
||||
highPriorityModuleNeeded.clear();
|
||||
}
|
||||
|
||||
private String getProcessKey(String jobId, String jobVersion) {
|
||||
return jobId + "_" + jobVersion; //$NON-NLS-1$
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -67,4 +67,6 @@ public interface TalendProcessOptionConstants {
|
||||
|
||||
public static final int MODULES_FOR_MR = 1 << 4;
|
||||
|
||||
public static final int MODULES_EXCLUDE_SHADED = 1 << 5;
|
||||
|
||||
}
|
||||
|
||||
@@ -17,6 +17,7 @@ import java.util.Map;
|
||||
|
||||
import org.talend.core.IService;
|
||||
import org.talend.core.model.process.IElementParameter;
|
||||
import org.talend.core.model.process.INode;
|
||||
|
||||
/**
|
||||
* created by ycbai on 2016年3月24日 Detailled comment
|
||||
@@ -38,5 +39,7 @@ public interface IGenericService extends IService {
|
||||
*
|
||||
*/
|
||||
public List<Map<String, String>> getAllGenericComponentsInfo();
|
||||
|
||||
public void resetReferenceValue(INode curNode, String oldConnectionName, String newConnectionName);
|
||||
|
||||
}
|
||||
|
||||
@@ -13,6 +13,7 @@
|
||||
package org.talend.core.runtime.services;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import org.eclipse.swt.graphics.Image;
|
||||
import org.eclipse.swt.widgets.Composite;
|
||||
@@ -123,6 +124,11 @@ public interface IGenericWizardService extends IService {
|
||||
*/
|
||||
public List<ComponentProperties> getAllComponentProperties(Connection connection, String tableLabel);
|
||||
|
||||
public List<ComponentProperties> getAllComponentProperties(Connection connection, String tableLabel, boolean withEvaluator);
|
||||
|
||||
public List<ComponentProperties> getAllComponentProperties(Connection connection, String tableLabel, boolean withEvaluator,
|
||||
boolean forComponentValue, Map<Object, Object> contextMap);
|
||||
|
||||
/**
|
||||
* Get the new repository type (the type from component framework) by the old repository type name.
|
||||
*
|
||||
|
||||
@@ -13,6 +13,7 @@
|
||||
package org.talend.core.ui;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Set;
|
||||
|
||||
import org.eclipse.core.resources.IFile;
|
||||
import org.eclipse.core.resources.IFolder;
|
||||
@@ -23,6 +24,7 @@ import org.eclipse.ui.IEditorPart;
|
||||
import org.talend.commons.exception.PersistenceException;
|
||||
import org.talend.core.IService;
|
||||
import org.talend.core.model.components.IComponent;
|
||||
import org.talend.core.model.general.ModuleNeeded;
|
||||
import org.talend.core.model.general.Project;
|
||||
import org.talend.core.model.process.INode;
|
||||
import org.talend.core.model.process.IProcess;
|
||||
@@ -125,4 +127,7 @@ public interface ITestContainerProviderService extends IService {
|
||||
public List<ProcessItem> getTestContainersByVersion(ProcessItem item);
|
||||
|
||||
boolean isTestContainerEditor(IEditorPart editor);
|
||||
|
||||
Set<ModuleNeeded> getAllJobTestcaseModules(ProcessItem item) throws PersistenceException;
|
||||
|
||||
}
|
||||
|
||||
@@ -19,7 +19,9 @@ import java.util.Collection;
|
||||
import java.util.Collections;
|
||||
import java.util.Date;
|
||||
import java.util.HashMap;
|
||||
import java.util.HashSet;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
|
||||
import org.eclipse.core.resources.IFile;
|
||||
import org.eclipse.core.resources.IFolder;
|
||||
@@ -79,6 +81,8 @@ public abstract class AbstractRoutineSynchronizer implements ITalendSynchronizer
|
||||
}
|
||||
|
||||
private Collection<RoutineItem> getAll(ERepositoryObjectType type, boolean syncRef) throws SystemException {
|
||||
// init code project
|
||||
getRunProcessService().getTalendCodeJavaProject(type);
|
||||
// remove routine with same name in reference project
|
||||
final Map<String, RoutineItem> beansList = new HashMap<String, RoutineItem>();
|
||||
for (IRepositoryViewObject obj : getRepositoryService().getProxyRepositoryFactory().getAll(type)) {
|
||||
@@ -95,27 +99,37 @@ public abstract class AbstractRoutineSynchronizer implements ITalendSynchronizer
|
||||
return (IRepositoryService) GlobalServiceRegister.getDefault().getService(IRepositoryService.class);
|
||||
}
|
||||
|
||||
private void getReferencedProjectRoutine(final Map<String, RoutineItem> beansList, final Project project,
|
||||
ERepositoryObjectType routineType, boolean syncRef) throws SystemException {
|
||||
for (IRepositoryViewObject obj : getRepositoryService().getProxyRepositoryFactory().getAll(project, routineType)) {
|
||||
private Set<IRepositoryViewObject> getReferencedProjectRoutine(final Map<String, RoutineItem> beansList,
|
||||
final Project project, ERepositoryObjectType routineType, boolean syncRef) throws SystemException {
|
||||
// init ref code project
|
||||
if (syncRef) {
|
||||
getRunProcessService().getTalendCodeJavaProject(routineType, project.getTechnicalLabel());
|
||||
}
|
||||
Set<IRepositoryViewObject> routines = new HashSet<>();
|
||||
routines.addAll(getRepositoryService().getProxyRepositoryFactory().getAll(project, routineType));
|
||||
for (IRepositoryViewObject obj : routines) {
|
||||
final String key = obj.getProperty().getLabel();
|
||||
// it does not have a routine with same name
|
||||
if (!beansList.containsKey(key)) {
|
||||
beansList.put(key, (RoutineItem) obj.getProperty().getItem());
|
||||
}
|
||||
if (syncRef) {
|
||||
// sync routine
|
||||
syncRoutine((RoutineItem) obj.getProperty().getItem(), false, true, true);
|
||||
}
|
||||
}
|
||||
for (ProjectReference projectReference : project.getProjectReferenceList()) {
|
||||
routines.addAll(getReferencedProjectRoutine(beansList, new Project(projectReference.getReferencedProject()),
|
||||
routineType, syncRef));
|
||||
}
|
||||
if (syncRef) {
|
||||
routines.stream().forEach(obj -> {
|
||||
try {
|
||||
syncRoutine((RoutineItem) obj.getProperty().getItem(), project.getTechnicalLabel(), true, true);
|
||||
} catch (SystemException e) {
|
||||
ExceptionHandler.process(e);
|
||||
}
|
||||
});
|
||||
// sync system routine
|
||||
syncSystemRoutine(project);
|
||||
}
|
||||
|
||||
for (ProjectReference projectReference : project.getProjectReferenceList()) {
|
||||
getReferencedProjectRoutine(beansList, new Project(projectReference.getReferencedProject()), routineType, syncRef);
|
||||
}
|
||||
return routines;
|
||||
}
|
||||
|
||||
protected void syncSystemRoutine(Project project) throws SystemException {
|
||||
@@ -128,24 +142,17 @@ public abstract class AbstractRoutineSynchronizer implements ITalendSynchronizer
|
||||
}
|
||||
|
||||
protected IFile getRoutineFile(RoutineItem routineItem) throws SystemException {
|
||||
return getRoutineFile(routineItem, true);
|
||||
return getRoutineFile(routineItem, ProjectManager.getInstance().getCurrentProject().getTechnicalLabel());
|
||||
}
|
||||
|
||||
protected IFile getRoutineFile(RoutineItem routineItem, boolean currentProject) throws SystemException {
|
||||
Project project;
|
||||
if (currentProject) {
|
||||
project = ProjectManager.getInstance().getCurrentProject();
|
||||
} else {
|
||||
String projectTechName = ProjectManager.getInstance().getProject(routineItem).getTechnicalLabel();
|
||||
project = ProjectManager.getInstance().getProjectFromProjectTechLabel(projectTechName);
|
||||
}
|
||||
ITalendProcessJavaProject talendProcessJavaProject = getRunProcessService().getTalendCodeJavaProject(ERepositoryObjectType.getItemType(routineItem), project);
|
||||
protected IFile getRoutineFile(RoutineItem routineItem, String projectTechName) throws SystemException {
|
||||
ITalendProcessJavaProject talendProcessJavaProject = getRunProcessService()
|
||||
.getTalendCodeJavaProject(ERepositoryObjectType.getItemType(routineItem), projectTechName);
|
||||
if (talendProcessJavaProject == null) {
|
||||
return null;
|
||||
}
|
||||
IFolder routineFolder = talendProcessJavaProject.getSrcSubFolder(null, routineItem.getPackageType());
|
||||
IFile file = routineFolder.getFile(routineItem.getProperty().getLabel() + JavaUtils.JAVA_EXTENSION);
|
||||
return file;
|
||||
return routineFolder.getFile(routineItem.getProperty().getLabel() + JavaUtils.JAVA_EXTENSION);
|
||||
}
|
||||
|
||||
private IFile getProcessFile(ProcessItem item) throws SystemException {
|
||||
@@ -193,30 +200,31 @@ public abstract class AbstractRoutineSynchronizer implements ITalendSynchronizer
|
||||
|
||||
@Override
|
||||
public void syncRoutine(RoutineItem routineItem, boolean copyToTemp) throws SystemException {
|
||||
syncRoutine(routineItem, true, copyToTemp, false);
|
||||
syncRoutine(routineItem, ProjectManager.getInstance().getCurrentProject().getTechnicalLabel(), copyToTemp, false);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void syncRoutine(RoutineItem routineItem, boolean copyToTemp, boolean forceUpdate) throws SystemException {
|
||||
syncRoutine(routineItem, true, copyToTemp, forceUpdate);
|
||||
syncRoutine(routineItem, ProjectManager.getInstance().getCurrentProject().getTechnicalLabel(), copyToTemp, forceUpdate);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void syncRoutine(RoutineItem routineItem, boolean currentProject, boolean copyToTemp, boolean forceUpdate) throws SystemException {
|
||||
public void syncRoutine(RoutineItem routineItem, String projectTechName, boolean copyToTemp, boolean forceUpdate)
|
||||
throws SystemException {
|
||||
boolean needSync = false;
|
||||
if (routineItem != null) {
|
||||
if (forceUpdate || !isRoutineUptodate(routineItem)) {
|
||||
needSync = true;
|
||||
} else {
|
||||
IFile file = getRoutineFile(routineItem, currentProject);
|
||||
IFile file = getRoutineFile(routineItem, projectTechName);
|
||||
if (file != null && !file.exists()) {
|
||||
needSync = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
if (needSync) {
|
||||
doSyncRoutine(routineItem, currentProject, copyToTemp);
|
||||
if (currentProject) {
|
||||
doSyncRoutine(routineItem, projectTechName, copyToTemp);
|
||||
if (ProjectManager.getInstance().getCurrentProject().getTechnicalLabel().equals(projectTechName)) {
|
||||
setRoutineAsUptodate(routineItem);
|
||||
}
|
||||
}
|
||||
@@ -224,14 +232,14 @@ public abstract class AbstractRoutineSynchronizer implements ITalendSynchronizer
|
||||
|
||||
public void syncRoutine(RoutineItem routineItem) throws SystemException {
|
||||
if (routineItem != null) {
|
||||
doSyncRoutine(routineItem, true, true);
|
||||
doSyncRoutine(routineItem, ProjectManager.getInstance().getCurrentProject().getTechnicalLabel(), true);
|
||||
setRoutineAsUptodate(routineItem);
|
||||
}
|
||||
}
|
||||
|
||||
private void doSyncRoutine(RoutineItem routineItem, boolean currentProject, boolean copyToTemp) throws SystemException {
|
||||
private void doSyncRoutine(RoutineItem routineItem, String projectTechName, boolean copyToTemp) throws SystemException {
|
||||
try {
|
||||
IFile file = getRoutineFile(routineItem, currentProject);
|
||||
IFile file = getRoutineFile(routineItem, projectTechName);
|
||||
if (file == null) {
|
||||
return;
|
||||
}
|
||||
@@ -374,7 +382,7 @@ public abstract class AbstractRoutineSynchronizer implements ITalendSynchronizer
|
||||
@Override
|
||||
public void syncAllBeansForLogOn() throws SystemException {
|
||||
for (RoutineItem beanItem : getBeans(true)) {
|
||||
syncRoutine(beanItem, true, true, true);
|
||||
syncRoutine(beanItem, true, true);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -45,7 +45,8 @@ public interface ITalendSynchronizer {
|
||||
|
||||
void syncRoutine(RoutineItem routineItem, boolean copyToTemp, boolean forceUpdate) throws SystemException;
|
||||
|
||||
void syncRoutine(RoutineItem routineItem, boolean currentProject, boolean copyToTemp, boolean forceUpdate) throws SystemException;
|
||||
void syncRoutine(RoutineItem routineItem, String projectTechName, boolean copyToTemp, boolean forceUpdate)
|
||||
throws SystemException;
|
||||
|
||||
IFile getFile(Item item) throws SystemException;
|
||||
|
||||
|
||||
@@ -193,4 +193,7 @@ public interface IDesignerCoreService extends IService {
|
||||
public void setTACReadTimeout(int timeout);
|
||||
|
||||
boolean isDelegateNode(INode node);
|
||||
|
||||
boolean isNeedContextInJar(IProcess process);
|
||||
|
||||
}
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user