Compare commits
198 Commits
APPINT-336
...
pyzhou/TDI
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
4c2d98a9a1 | ||
|
|
486adba4a0 | ||
|
|
767fb94ff3 | ||
|
|
1543d95ed5 | ||
|
|
3d53cc3e60 | ||
|
|
ff80ce3ac4 | ||
|
|
9401dfdfa2 | ||
|
|
8f794d57eb | ||
|
|
139ee4790a | ||
|
|
e8c59475c0 | ||
|
|
b30ceb1644 | ||
|
|
8339e97e6f | ||
|
|
dbc7b38790 | ||
|
|
a4c10d3e7f | ||
|
|
129274171f | ||
|
|
d2a1b44dc5 | ||
|
|
6976cb5f7c | ||
|
|
6acab4ee3f | ||
|
|
b68673389c | ||
|
|
06aea8f475 | ||
|
|
c41901deea | ||
|
|
0a926f8c03 | ||
|
|
53f53ace47 | ||
|
|
ad29b74b2a | ||
|
|
56ae308496 | ||
|
|
c3b356d954 | ||
|
|
5eaf89d87e | ||
|
|
b2f0466ce3 | ||
|
|
6f07c4da98 | ||
|
|
80a1ccd382 | ||
|
|
27dfb6a195 | ||
|
|
330e31abb6 | ||
|
|
8763339c06 | ||
|
|
e6946750e0 | ||
|
|
e914973534 | ||
|
|
668987a61b | ||
|
|
0accf530d1 | ||
|
|
44341a7f9b | ||
|
|
ff46e1bab5 | ||
|
|
46b4b3a8db | ||
|
|
eb9690239d | ||
|
|
7bbef8f4b2 | ||
|
|
df8f2bee44 | ||
|
|
ec8bf846c8 | ||
|
|
61a97e6f00 | ||
|
|
09cc2ab88d | ||
|
|
8abfa5691b | ||
|
|
5d90e3ddf9 | ||
|
|
51e101a2d6 | ||
|
|
e501f74225 | ||
|
|
bbe564d285 | ||
|
|
ca6dd0414d | ||
|
|
7c81cea780 | ||
|
|
c4196919f7 | ||
|
|
fccaad16b0 | ||
|
|
78295beef0 | ||
|
|
ce8da37a4a | ||
|
|
7e29ffef3b | ||
|
|
9a72cf74ae | ||
|
|
9b02401b3f | ||
|
|
de0005397b | ||
|
|
1b99ea876d | ||
|
|
1cf24c225c | ||
|
|
340f3e3029 | ||
|
|
b625946c87 | ||
|
|
1944bc03fe | ||
|
|
f8ae64d1a6 | ||
|
|
ca2ebecc4e | ||
|
|
3e276b2faa | ||
|
|
5ed90797f0 | ||
|
|
b8d9189565 | ||
|
|
9c80461254 | ||
|
|
b301fec008 | ||
|
|
f369769f4d | ||
|
|
66b27d8a65 | ||
|
|
de1c6ab17e | ||
|
|
fd64f25f47 | ||
|
|
7cece59991 | ||
|
|
3515f254e8 | ||
|
|
4124061a46 | ||
|
|
3c9cc66ffa | ||
|
|
21aed909e7 | ||
|
|
9987c00841 | ||
|
|
5cf8ee359c | ||
|
|
a33889b88d | ||
|
|
c7aefba2a6 | ||
|
|
e906b6925b | ||
|
|
bdc5ccd55b | ||
|
|
0e1b35e7de | ||
|
|
4ba66eddcd | ||
|
|
b5bed2a301 | ||
|
|
fc33cddda6 | ||
|
|
f5e702a00e | ||
|
|
ccab416ff2 | ||
|
|
f1393a7d51 | ||
|
|
ce12083ea6 | ||
|
|
a669d7f92a | ||
|
|
72668901f0 | ||
|
|
7dd57d3b8a | ||
|
|
b83974b619 | ||
|
|
2f2db71457 | ||
|
|
38befbe884 | ||
|
|
74c96bca38 | ||
|
|
0fe5142ec4 | ||
|
|
8810097d4b | ||
|
|
440986e764 | ||
|
|
290bcee6eb | ||
|
|
6b2b710b9f | ||
|
|
21232bf4e4 | ||
|
|
ed81969198 | ||
|
|
f19b61bb60 | ||
|
|
455ed6e133 | ||
|
|
f4925493d8 | ||
|
|
b52a7c0c15 | ||
|
|
77bfe5f89f | ||
|
|
3beb45da54 | ||
|
|
e0b63e2692 | ||
|
|
e18d768d45 | ||
|
|
c926c78297 | ||
|
|
4a473f97bd | ||
|
|
fe3969b4da | ||
|
|
3ef0cbce5f | ||
|
|
6d68cd1e26 | ||
|
|
897730f107 | ||
|
|
b23971ce4b | ||
|
|
091637fba2 | ||
|
|
8fa6b6e972 | ||
|
|
dc2d37a3f2 | ||
|
|
76ba5fa734 | ||
|
|
aab581232e | ||
|
|
7293f33b65 | ||
|
|
89e5ab0ae6 | ||
|
|
efdc58a2a2 | ||
|
|
d0a82b708b | ||
|
|
86e9c0287b | ||
|
|
93b6012426 | ||
|
|
3eaf1769d9 | ||
|
|
045405ff29 | ||
|
|
feba8702bc | ||
|
|
70b21e3faf | ||
|
|
5be1510aed | ||
|
|
a437c4d2b5 | ||
|
|
3871353f4b | ||
|
|
c451cc14b3 | ||
|
|
6201ede2a4 | ||
|
|
570cefddf5 | ||
|
|
ff17aa0b4d | ||
|
|
a6848c5f64 | ||
|
|
77c1caf679 | ||
|
|
9bdee7ea3c | ||
|
|
74f469e17f | ||
|
|
cb9d039027 | ||
|
|
7c8d50725a | ||
|
|
01bf5e8539 | ||
|
|
a565767101 | ||
|
|
8d63a02566 | ||
|
|
7115862cc3 | ||
|
|
1cc3a2935d | ||
|
|
2f423ba276 | ||
|
|
3484f0f782 | ||
|
|
7594d7d541 | ||
|
|
3d8ca2eddb | ||
|
|
c7552be2ed | ||
|
|
a0f44a7991 | ||
|
|
fdadf536c9 | ||
|
|
c0fe39749a | ||
|
|
86c0efb4a3 | ||
|
|
d1568a294d | ||
|
|
683228e53a | ||
|
|
7c774542aa | ||
|
|
f384da5e85 | ||
|
|
08b62b8f69 | ||
|
|
b8689e25c1 | ||
|
|
aca3de12e6 | ||
|
|
d11a664df6 | ||
|
|
1602306e93 | ||
|
|
497a7b63e0 | ||
|
|
635210a114 | ||
|
|
6f8bc10c6f | ||
|
|
606aa40664 | ||
|
|
16791ae92d | ||
|
|
fdb83c5620 | ||
|
|
59f8f6c3ce | ||
|
|
0cfdb4ecdd | ||
|
|
0029c41b81 | ||
|
|
761ac868c5 | ||
|
|
40c7bbd422 | ||
|
|
93024e2d02 | ||
|
|
594b972bd2 | ||
|
|
082b262552 | ||
|
|
147d0826db | ||
|
|
0ac05064df | ||
|
|
d26e65929e | ||
|
|
acf4f73876 | ||
|
|
6ebca7beda | ||
|
|
cf73cae37e | ||
|
|
7d6625d66c | ||
|
|
a4acc6db37 |
@@ -1,6 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
|
||||
<feature id="org.talend.commons.feature" label="Commons Feature" version="8.8.8.qualifier" provider-name=".Talend SA.">
|
||||
<feature id="org.talend.commons.feature" label="Commons Feature" version="8.0.1.qualifier" provider-name=".Talend SA.">
|
||||
<description url="http://www.talend.com/online/featuresdescription.html#commons-feature">Complete description about this feature at http://www.talend.com/online/featuresdescription.html#commons-feature</description>
|
||||
<copyright url="http://www.talend.com/online/copyright.txt">Copyright Talend 2006, 2007</copyright>
|
||||
<license>The licence are describe in branding feature</license>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tcommon-studio-se</artifactId>
|
||||
<version>8.8.8-SNAPSHOT</version>
|
||||
<version>8.0.1-SNAPSHOT</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.commons.feature</artifactId>
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
|
||||
<feature id="org.talend.core.feature" label="Core Feature" version="8.8.8.qualifier" provider-name=".Talend SA.">
|
||||
<feature id="org.talend.core.feature" label="Core Feature" version="8.0.1.qualifier" provider-name=".Talend SA.">
|
||||
<description url="http://www.talend.com/online/featuresdescription.html#core-feature">Complete description about this feature at http://www.talend.com/online/featuresdescription.html#core-feature</description>
|
||||
<copyright url="http://www.talend.com/online/copyright.txt">Copyright Talend 2006, 2007</copyright>
|
||||
<license>The licence are describe in branding feature</license>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tcommon-studio-se</artifactId>
|
||||
<version>8.8.8-SNAPSHOT</version>
|
||||
<version>8.0.1-SNAPSHOT</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.core.feature</artifactId>
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
<feature
|
||||
id="org.talend.fragment.jars.common.feature"
|
||||
label="Fragment Jars in Common"
|
||||
version="8.8.8.qualifier">
|
||||
version="8.0.1.qualifier">
|
||||
|
||||
<description url="http://www.example.com/description">
|
||||
[Enter Feature Description here.]
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tcommon-studio-se</artifactId>
|
||||
<version>8.8.8-SNAPSHOT</version>
|
||||
<version>8.0.1-SNAPSHOT</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.fragment.jars.common.feature</artifactId>
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<feature id="org.talend.help.feature" label="Help Feature" version="8.8.8.qualifier" provider-name=".Talend SA.">
|
||||
<feature id="org.talend.help.feature" label="Help Feature" version="8.0.1.qualifier" provider-name=".Talend SA.">
|
||||
<description url="http://www.talend.com/online/featuresdescription.html#help-feature">Complete description about this feature at http://www.talend.com/online/featuresdescription.html#help-feature</description>
|
||||
<copyright url="http://www.talend.com/online/copyright.txt">Copyright Talend 2006, 2007</copyright>
|
||||
<license>The licence are describe in branding feature</license>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tcommon-studio-se</artifactId>
|
||||
<version>8.8.8-SNAPSHOT</version>
|
||||
<version>8.0.1-SNAPSHOT</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.help.feature</artifactId>
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
|
||||
<feature id="org.talend.libraries.jdbc.feature" label="Jdbc_feature Feature" version="8.8.8.qualifier" provider-name=".Talend SA.">
|
||||
<feature id="org.talend.libraries.jdbc.feature" label="Jdbc_feature Feature" version="8.0.1.qualifier" provider-name=".Talend SA.">
|
||||
<description url="http://www.example.com/description">[Enter Feature Description here.]</description>
|
||||
<copyright url="http://www.example.com/copyright">[Enter Copyright Description here.]</copyright>
|
||||
<license url="http://www.example.com/license">[Enter License Description here.]</license>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tcommon-studio-se</artifactId>
|
||||
<version>8.8.8-SNAPSHOT</version>
|
||||
<version>8.0.1-SNAPSHOT</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.libraries.jdbc.feature</artifactId>
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
<feature
|
||||
id="org.talend.platform.feature"
|
||||
label="Platform featrue"
|
||||
version="8.8.8.qualifier"
|
||||
version="8.0.1.qualifier"
|
||||
provider-name=".Talend SA.">
|
||||
|
||||
<description url="http://www.talend.com/online/featuresdescription.html#platform-feature">
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tcommon-studio-se</artifactId>
|
||||
<version>8.8.8-SNAPSHOT</version>
|
||||
<version>8.0.1-SNAPSHOT</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.platform.feature</artifactId>
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
<feature
|
||||
id="org.talend.rcp.feature"
|
||||
label="RCP Feature"
|
||||
version="8.8.8.qualifier"
|
||||
version="8.0.1.qualifier"
|
||||
provider-name=".Talend SA.">
|
||||
|
||||
<description url="http://www.talend.com/online/featuresdescription.html#rcp-feature">
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tcommon-studio-se</artifactId>
|
||||
<version>8.8.8-SNAPSHOT</version>
|
||||
<version>8.0.1-SNAPSHOT</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.rcp.feature</artifactId>
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
|
||||
<feature id="org.talend.update.p2.feature" label="P2-feature" version="8.8.8.qualifier">
|
||||
<feature id="org.talend.update.p2.feature" label="P2-feature" version="8.0.1.qualifier">
|
||||
<description url="http://www.example.com/description">[Enter Feature Description here.]</description>
|
||||
<copyright url="http://www.example.com/copyright">[Enter Copyright Description here.]</copyright>
|
||||
<license url="http://www.example.com/license">[Enter License Description here.]</license>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tcommon-studio-se</artifactId>
|
||||
<version>8.8.8-SNAPSHOT</version>
|
||||
<version>8.0.1-SNAPSHOT</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.update.p2.feature</artifactId>
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
|
||||
<feature id="org.talend.updates.feature" label="Updates-feature" version="8.8.8.qualifier" provider-name=".Talend SA.">
|
||||
<feature id="org.talend.updates.feature" label="Updates-feature" version="8.0.1.qualifier" provider-name=".Talend SA.">
|
||||
<copyright url="http://www.talend.com/about-us">[Enter Copyright Description here.]</copyright>
|
||||
<plugin id="org.talend.updates.runtime" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
|
||||
</feature>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tcommon-studio-se</artifactId>
|
||||
<version>8.8.8-SNAPSHOT</version>
|
||||
<version>8.0.1-SNAPSHOT</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.updates.feature</artifactId>
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
|
||||
<feature id="org.talend.utils.feature" label="Utils_feature Feature" version="8.8.8.qualifier">
|
||||
<feature id="org.talend.utils.feature" label="Utils_feature Feature" version="8.0.1.qualifier">
|
||||
<description url="http://www.example.com/description">This feature contains the Talend utilities plugin and its dependencies.</description>
|
||||
<copyright url="http://www.example.com/copyright">[Enter Copyright Description here.]</copyright>
|
||||
<license url="http://www.example.com/license">[Enter License Description here.]</license>
|
||||
@@ -21,11 +21,11 @@
|
||||
<import plugin="org.junit" version="4.13.2" match="greaterOrEqual"/>
|
||||
<import plugin="org.slf4j.api" version="0.0.0" match="greaterOrEqual"/>
|
||||
<import plugin="org.slf4j.binding.log4j12" version="0.0.0" match="greaterOrEqual"/>
|
||||
<import plugin="org.talend.studio.studio-utils" version="0.0.0" match="greaterOrEqual"/>
|
||||
</requires>
|
||||
<plugin id="org.talend.daikon" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
|
||||
<plugin id="org.talend.daikon.exception" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
|
||||
<plugin id="org.talend.daikon.crypto.utils" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
|
||||
<plugin id="org.talend.studio.studio-utils" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
|
||||
<plugin id="org.talend.utils" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
|
||||
<plugin id="org.talend.platform.logging" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
|
||||
</feature>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tcommon-studio-se</artifactId>
|
||||
<version>8.8.8-SNAPSHOT</version>
|
||||
<version>8.0.1-SNAPSHOT</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.utils.feature</artifactId>
|
||||
|
||||
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
|
||||
Bundle-ManifestVersion: 2
|
||||
Bundle-Name: Common UI runtime Plug-in
|
||||
Bundle-SymbolicName: org.talend.common.ui.runtime;singleton:=true
|
||||
Bundle-Version: 8.8.8.qualifier
|
||||
Bundle-Version: 8.0.1.qualifier
|
||||
Require-Bundle: org.eclipse.core.runtime,
|
||||
org.apache.commons.collections,
|
||||
org.talend.libraries.dom4j-jaxen,
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tcommon-studio-se</artifactId>
|
||||
<version>8.8.8-SNAPSHOT</version>
|
||||
<version>8.0.1-SNAPSHOT</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.common.ui.runtime</artifactId>
|
||||
|
||||
@@ -28,11 +28,21 @@ public interface ColorConstants {
|
||||
|
||||
static final Color YELLOW_COLOR = new Color(null, 255, 173, 37);// 254, 182, 84
|
||||
|
||||
static final Color RED_COLOR = new Color(null, new RGB(204,87,89));// 255
|
||||
static final Color RED_COLOR = new Color(null, new RGB(204, 87, 89));// 255
|
||||
|
||||
static final Color VERTICAL_SEPERATOR_LINE_COLOR = new Color(null, 162, 179, 195);
|
||||
|
||||
static final Color LOCHMARA_COLOR = new Color(null, 6, 117, 193);
|
||||
|
||||
static final Color WATHET_COLOR = new Color(null, 135, 206, 235);
|
||||
|
||||
static final Color INFO_COLOR = new Color(null, 205, 227, 242);
|
||||
// static final Color INFO_COLOR = YELLOW_GREEN_COLOR;
|
||||
|
||||
static final Color WARN_COLOR = new Color(null, 252, 230, 217);
|
||||
|
||||
static final Color ERR_COLOR = new Color(null, 255, 235, 235);
|
||||
|
||||
static final Color SUCCEED_COLOR = new Color(null, 221, 242, 217);
|
||||
|
||||
}
|
||||
|
||||
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
|
||||
Bundle-ManifestVersion: 2
|
||||
Bundle-Name: Common Runtime Plug-in
|
||||
Bundle-SymbolicName: org.talend.commons.runtime;singleton:=true
|
||||
Bundle-Version: 8.8.8.qualifier
|
||||
Bundle-Version: 8.0.1.qualifier
|
||||
Require-Bundle: org.apache.log4j;visibility:=reexport,
|
||||
org.apache.commons.commons-beanutils,
|
||||
org.apache.commons.collections,
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tcommon-studio-se</artifactId>
|
||||
<version>8.8.8-SNAPSHOT</version>
|
||||
<version>8.0.1-SNAPSHOT</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.commons.runtime</artifactId>
|
||||
|
||||
@@ -95,10 +95,9 @@
|
||||
<version>2.12.0</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>log4j</groupId>
|
||||
<artifactId>log4j</artifactId>
|
||||
<version>1.2.16</version>
|
||||
<type>bundle</type>
|
||||
<groupId>ch.qos.reload4j</groupId>
|
||||
<artifactId>reload4j</artifactId>
|
||||
<version>1.2.19</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
||||
|
||||
@@ -58,6 +58,8 @@ public class CommonsPlugin implements BundleActivator {
|
||||
// TESB-17856: For commandline builds ESB Micorservice bundle
|
||||
private static boolean isESBMicorservice = false;
|
||||
|
||||
private static Boolean isJunitWorking;
|
||||
|
||||
private static Boolean isDevMode = null;
|
||||
|
||||
private static ServiceTracker proxyTracker;
|
||||
@@ -137,6 +139,35 @@ public class CommonsPlugin implements BundleActivator {
|
||||
return "org.talend.rcp.branding.tuj.product".equals(Platform.getProduct().getId()); //$NON-NLS-1$
|
||||
}
|
||||
|
||||
public static boolean isJunitWorking() {
|
||||
if (isJunitWorking == null) {
|
||||
try {
|
||||
String[] args = Platform.getCommandLineArgs();
|
||||
String applicationId = null;
|
||||
|
||||
for (int i = 0; i < args.length - 1; i++) {
|
||||
if (args[i].equalsIgnoreCase("-application")) { //$NON-NLS-1$
|
||||
applicationId = args[i + 1];
|
||||
}
|
||||
}
|
||||
|
||||
if (applicationId != null
|
||||
&& (applicationId.equals("org.eclipse.swtbot.eclipse.junit.headless.swtbottestapplication") //$NON-NLS-1$
|
||||
|| applicationId.equals("org.eclipse.pde.junit.runtime.uitestapplication"))) { //$NON-NLS-1$
|
||||
isJunitWorking = true;
|
||||
} else {
|
||||
isJunitWorking = false;
|
||||
}
|
||||
} catch (Throwable e) {
|
||||
isJunitWorking = false;
|
||||
}
|
||||
}
|
||||
if (isJunitWorking == null) {
|
||||
isJunitWorking = false;
|
||||
}
|
||||
return isJunitWorking;
|
||||
}
|
||||
|
||||
/**
|
||||
* Answer the file associated with name. This handles the case of running as a plugin and running standalone which
|
||||
* happens during testing.
|
||||
|
||||
@@ -1 +1 @@
|
||||
talend.version=8.8.8
|
||||
talend.version=8.0.1
|
||||
|
||||
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
|
||||
Bundle-ManifestVersion: 2
|
||||
Bundle-Name: Common UI Plug-in
|
||||
Bundle-SymbolicName: org.talend.commons.ui;singleton:=true
|
||||
Bundle-Version: 8.8.8.qualifier
|
||||
Bundle-Version: 8.0.1.qualifier
|
||||
Require-Bundle: org.eclipse.core.runtime,
|
||||
org.eclipse.core.resources,
|
||||
org.eclipse.jface.text,
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tcommon-studio-se</artifactId>
|
||||
<version>8.8.8-SNAPSHOT</version>
|
||||
<version>8.0.1-SNAPSHOT</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.commons.ui</artifactId>
|
||||
|
||||
@@ -0,0 +1,38 @@
|
||||
// ============================================================================
|
||||
//
|
||||
// Copyright (C) 2006-2021 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.commons.ui.swt.dialogs;
|
||||
|
||||
import org.eclipse.jface.wizard.IWizard;
|
||||
import org.eclipse.swt.graphics.Color;
|
||||
|
||||
|
||||
/**
|
||||
* DOC cmeng class global comment. Detailled comment
|
||||
*/
|
||||
public interface ITalendWizard extends IWizard {
|
||||
|
||||
Color getBackgroundColor();
|
||||
|
||||
Color getForegroundColor();
|
||||
|
||||
int getHorizonPadding();
|
||||
|
||||
int getVerticalPadding();
|
||||
|
||||
int getVerticalMargin();
|
||||
|
||||
int getHorizonMargin();
|
||||
|
||||
boolean hideDefaultMessageArea();
|
||||
|
||||
}
|
||||
@@ -0,0 +1,26 @@
|
||||
// ============================================================================
|
||||
//
|
||||
// Copyright (C) 2006-2021 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.commons.ui.swt.dialogs;
|
||||
|
||||
import org.eclipse.jface.dialogs.IDialogPage;
|
||||
import org.eclipse.jface.wizard.IWizardContainer2;
|
||||
|
||||
|
||||
/**
|
||||
* DOC cmeng class global comment. Detailled comment
|
||||
*/
|
||||
public interface ITalendWizardContainer extends IWizardContainer2 {
|
||||
|
||||
void showMoreInfoLink(IDialogPage page, String name, String link);
|
||||
|
||||
}
|
||||
@@ -0,0 +1,968 @@
|
||||
// ============================================================================
|
||||
//
|
||||
// Copyright (C) 2006-2021 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.commons.ui.swt.dialogs;
|
||||
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
import org.eclipse.jface.dialogs.IDialogConstants;
|
||||
import org.eclipse.jface.dialogs.IDialogPage;
|
||||
import org.eclipse.jface.dialogs.IMessageProvider;
|
||||
import org.eclipse.jface.resource.JFaceResources;
|
||||
import org.eclipse.jface.window.ToolTip;
|
||||
import org.eclipse.jface.wizard.IWizard;
|
||||
import org.eclipse.jface.wizard.ProgressMonitorPart;
|
||||
import org.eclipse.swt.SWT;
|
||||
import org.eclipse.swt.custom.StyledText;
|
||||
import org.eclipse.swt.events.DisposeEvent;
|
||||
import org.eclipse.swt.events.DisposeListener;
|
||||
import org.eclipse.swt.events.PaintEvent;
|
||||
import org.eclipse.swt.events.PaintListener;
|
||||
import org.eclipse.swt.graphics.Color;
|
||||
import org.eclipse.swt.graphics.Font;
|
||||
import org.eclipse.swt.graphics.FontData;
|
||||
import org.eclipse.swt.graphics.GC;
|
||||
import org.eclipse.swt.graphics.Image;
|
||||
import org.eclipse.swt.graphics.ImageData;
|
||||
import org.eclipse.swt.graphics.Point;
|
||||
import org.eclipse.swt.graphics.Rectangle;
|
||||
import org.eclipse.swt.layout.FormAttachment;
|
||||
import org.eclipse.swt.layout.FormData;
|
||||
import org.eclipse.swt.layout.FormLayout;
|
||||
import org.eclipse.swt.layout.GridData;
|
||||
import org.eclipse.swt.layout.GridLayout;
|
||||
import org.eclipse.swt.program.Program;
|
||||
import org.eclipse.swt.widgets.Button;
|
||||
import org.eclipse.swt.widgets.Canvas;
|
||||
import org.eclipse.swt.widgets.Composite;
|
||||
import org.eclipse.swt.widgets.Control;
|
||||
import org.eclipse.swt.widgets.Display;
|
||||
import org.eclipse.swt.widgets.Event;
|
||||
import org.eclipse.swt.widgets.Label;
|
||||
import org.eclipse.swt.widgets.Shell;
|
||||
import org.eclipse.ui.forms.events.HyperlinkAdapter;
|
||||
import org.eclipse.ui.forms.events.HyperlinkEvent;
|
||||
import org.eclipse.ui.forms.widgets.Hyperlink;
|
||||
import org.talend.commons.exception.ExceptionHandler;
|
||||
import org.talend.commons.ui.runtime.ColorConstants;
|
||||
|
||||
/**
|
||||
* DOC cmeng class global comment. Detailled comment
|
||||
*/
|
||||
public class TalendWizardDialog extends WizardDialog implements ITalendWizardContainer {
|
||||
|
||||
private boolean useNewStyle = false;
|
||||
|
||||
private Color backgroundColor;
|
||||
|
||||
private Color foregroundColor;
|
||||
|
||||
private static Font titleBigFont;
|
||||
|
||||
private Canvas titleLabelWithAnimation;
|
||||
|
||||
private Canvas messagePanel;
|
||||
|
||||
private Color msgPanelColor = ColorConstants.INFO_COLOR;
|
||||
|
||||
private Composite topPanel;
|
||||
|
||||
private Label errIcon;
|
||||
|
||||
private StyledText errMsgTxt;
|
||||
|
||||
private Hyperlink moreInfoLink;
|
||||
|
||||
private String moreInfoUrl;
|
||||
|
||||
private volatile Thread titleAnimationSchedulerThread;
|
||||
|
||||
private volatile boolean threadShowingMsg = false;
|
||||
|
||||
private Image bigTitleImg;
|
||||
|
||||
private Image smallTitleImg;
|
||||
|
||||
private String title;
|
||||
|
||||
private int messageTopY;
|
||||
|
||||
private volatile double percentage = 1.0;
|
||||
|
||||
private boolean hideMessageArea = false;
|
||||
|
||||
public TalendWizardDialog(Shell parentShell, IWizard newWizard) {
|
||||
super(parentShell, newWizard);
|
||||
useNewStyle = true;
|
||||
if (newWizard instanceof ITalendWizard) {
|
||||
ITalendWizard talendWizard = (ITalendWizard) newWizard;
|
||||
backgroundColor = talendWizard.getBackgroundColor();
|
||||
foregroundColor = talendWizard.getForegroundColor();
|
||||
hideMessageArea = talendWizard.hideDefaultMessageArea();
|
||||
}
|
||||
// this.setTitleAreaColor(new RGB(205, 227, 242));
|
||||
}
|
||||
|
||||
private Thread createTitleAnimationSchedulerThread(boolean showMessage) {
|
||||
return new Thread(new Runnable() {
|
||||
|
||||
@Override
|
||||
public void run() {
|
||||
titleAnimationSchedulerThread(showMessage);
|
||||
}
|
||||
}, "title anmimation, show: " + showMessage);
|
||||
}
|
||||
|
||||
private void titleAnimationSchedulerThread(boolean showMessage) {
|
||||
int totalTime = 500;
|
||||
int split = 30;
|
||||
int sleepTime = totalTime / split;
|
||||
double percentPerFrame = 1.0 / split;
|
||||
for (int i = 1; i < split; i++) {
|
||||
double curX = 1 - percentPerFrame * i;
|
||||
double donePercent = Math.sqrt(1 - curX * curX);
|
||||
onTitleAreaRefresh(donePercent, showMessage);
|
||||
if (Thread.currentThread().isInterrupted()) {
|
||||
break;
|
||||
}
|
||||
try {
|
||||
Thread.sleep(sleepTime);
|
||||
} catch (InterruptedException e) {
|
||||
onTitleAnimationInterupted(showMessage);
|
||||
return;
|
||||
}
|
||||
}
|
||||
onTitleAreaRefresh(1.0, showMessage);
|
||||
}
|
||||
|
||||
private void onTitleAnimationInterupted(boolean showMessage) {
|
||||
this.percentage = 1.0;
|
||||
}
|
||||
|
||||
private boolean isHideMessageArea() {
|
||||
return hideMessageArea;
|
||||
}
|
||||
|
||||
private void onTitleAreaRefresh(double donePercent, boolean showMessage) {
|
||||
if (isHideMessageArea()) {
|
||||
return;
|
||||
}
|
||||
topPanel.getDisplay().syncExec(() -> {
|
||||
onTitleAreaRefreshFrame(donePercent, showMessage);
|
||||
});
|
||||
}
|
||||
|
||||
private void onTitleAreaRefreshFrame(double donePercent, boolean showMessage) {
|
||||
if (isHideMessageArea()) {
|
||||
return;
|
||||
}
|
||||
this.percentage = donePercent;
|
||||
sortPanelOrder();
|
||||
if (!showMessage) {
|
||||
messagePanel.setVisible(false);
|
||||
} else {
|
||||
messagePanel.setVisible(true);
|
||||
// errIcon.setVisible(true);
|
||||
}
|
||||
Point size = topPanel.getSize();
|
||||
int totalY = size.y - messageTopY;
|
||||
int y = 0;
|
||||
if (showMessage) {
|
||||
y = messageTopY + (int) ((1.0 - donePercent) * totalY);
|
||||
} else {
|
||||
y = messageTopY + (int) (donePercent * totalY);
|
||||
}
|
||||
|
||||
FormData fd = (FormData) messagePanel.getLayoutData();
|
||||
fd.top = new FormAttachment(0, y);
|
||||
this.titleLabelWithAnimation.redraw();
|
||||
topPanel.layout();
|
||||
}
|
||||
|
||||
public void setNewErrorStyle(boolean newErrStyle) {
|
||||
this.useNewStyle = newErrStyle;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected Control createContents(Composite parent) {
|
||||
if (useNewStyle()) {
|
||||
parent.setBackground(backgroundColor);
|
||||
parent.setForeground(foregroundColor);
|
||||
}
|
||||
Control panel = super.createContents(parent);
|
||||
try {
|
||||
if (useNewStyle()) {
|
||||
sortPanelOrder();
|
||||
workArea.setBackground(backgroundColor);
|
||||
workArea.setForeground(foregroundColor);
|
||||
pageContainer.setBackground(backgroundColor);
|
||||
pageContainer.setForeground(foregroundColor);
|
||||
}
|
||||
} catch (Exception e) {
|
||||
ExceptionHandler.process(e);
|
||||
}
|
||||
return panel;
|
||||
}
|
||||
|
||||
private boolean useNewStyle() {
|
||||
return this.useNewStyle;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected Control createDialogArea(Composite parent) {
|
||||
Composite panel = (Composite) super.createDialogArea(parent);
|
||||
if (useNewStyle()) {
|
||||
this.titleBarSeparator.dispose();
|
||||
this.separator.dispose();
|
||||
}
|
||||
return panel;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected ProgressMonitorPart createProgressMonitorPart(Composite composite, GridLayout pmlayout) {
|
||||
if (useNewStyle()) {
|
||||
composite.setBackground(backgroundColor);
|
||||
composite.setForeground(foregroundColor);
|
||||
// progMonitor.setBackground(backgroundColor);
|
||||
// progMonitor.setForeground(foregroundColor);
|
||||
}
|
||||
ProgressMonitorPart progMonitor = super.createProgressMonitorPart(composite, pmlayout);
|
||||
return progMonitor;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected Control createButtonBar(Composite parent) {
|
||||
if (!useNewStyle()) {
|
||||
return super.createButtonBar(parent);
|
||||
}
|
||||
Composite composite = new Composite(parent, SWT.NONE);
|
||||
composite.setBackground(backgroundColor);
|
||||
composite.setForeground(foregroundColor);
|
||||
GridLayout layout = new GridLayout();
|
||||
layout.marginWidth = 0;
|
||||
layout.marginHeight = 0;
|
||||
layout.horizontalSpacing = 0;
|
||||
composite.setLayout(layout);
|
||||
composite.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, false));
|
||||
composite.setFont(parent.getFont());
|
||||
|
||||
Control helpControl = null;
|
||||
// create help control if needed
|
||||
if (isHelpAvailable()) {
|
||||
helpControl = createHelpControl(composite);
|
||||
((GridData) helpControl.getLayoutData()).horizontalIndent = convertHorizontalDLUsToPixels(
|
||||
IDialogConstants.HORIZONTAL_MARGIN);
|
||||
}
|
||||
createButtonsForButtonBar(composite);
|
||||
|
||||
Button helpButton = getButton(IDialogConstants.HELP_ID);
|
||||
Button finishButton = getButton(IDialogConstants.FINISH_ID);
|
||||
Button cancelButton = getButton(IDialogConstants.CANCEL_ID);
|
||||
Button backButton = getButton(IDialogConstants.BACK_ID);
|
||||
Button nextButton = getButton(IDialogConstants.NEXT_ID);
|
||||
|
||||
FormLayout formLayout = new FormLayout();
|
||||
formLayout.marginWidth = getHorizonMargin();
|
||||
formLayout.marginHeight = getVerticalPadding();
|
||||
composite.setLayout(formLayout);
|
||||
final int HORIZON_ALIGN = getHorizonPadding();
|
||||
|
||||
cancelButton.setBackground(backgroundColor);
|
||||
cancelButton.setForeground(foregroundColor);
|
||||
FormData cancelData = new FormData();
|
||||
cancelData.left = new FormAttachment(0);
|
||||
cancelData.top = new FormAttachment(composite, 0, SWT.CENTER);
|
||||
cancelData.width = getButtonWidth(cancelButton);
|
||||
cancelButton.setLayoutData(cancelData);
|
||||
|
||||
Control tmpCtrl = cancelButton;
|
||||
|
||||
if (helpControl != null) {
|
||||
helpControl.setBackground(backgroundColor);
|
||||
helpControl.setForeground(foregroundColor);
|
||||
FormData formData = new FormData();
|
||||
formData.left = new FormAttachment(tmpCtrl, HORIZON_ALIGN, SWT.RIGHT);
|
||||
formData.top = new FormAttachment(tmpCtrl, 0, SWT.CENTER);
|
||||
helpControl.setLayoutData(formData);
|
||||
tmpCtrl = helpControl;
|
||||
}
|
||||
if (helpButton != null) {
|
||||
helpButton.setBackground(backgroundColor);
|
||||
helpButton.setForeground(foregroundColor);
|
||||
FormData formData = new FormData();
|
||||
formData.left = new FormAttachment(tmpCtrl, HORIZON_ALIGN, SWT.RIGHT);
|
||||
formData.top = new FormAttachment(tmpCtrl, 0, SWT.CENTER);
|
||||
formData.width = getButtonWidth(helpButton);
|
||||
helpButton.setLayoutData(formData);
|
||||
tmpCtrl = helpButton;
|
||||
}
|
||||
finishButton.setBackground(backgroundColor);
|
||||
finishButton.setForeground(foregroundColor);
|
||||
FormData finishData = new FormData();
|
||||
finishData.right = new FormAttachment(100);
|
||||
finishData.top = new FormAttachment(composite, 0, SWT.CENTER);
|
||||
finishData.width = getButtonWidth(finishButton);
|
||||
finishButton.setLayoutData(finishData);
|
||||
tmpCtrl = finishButton;
|
||||
|
||||
if (nextButton != null) {
|
||||
nextButton.setBackground(backgroundColor);
|
||||
nextButton.setForeground(foregroundColor);
|
||||
FormData nextData = new FormData();
|
||||
Composite nextParentCtrl = nextButton.getParent();
|
||||
nextParentCtrl.setBackground(backgroundColor);
|
||||
nextParentCtrl.setForeground(foregroundColor);
|
||||
nextData.right = new FormAttachment(tmpCtrl, -HORIZON_ALIGN, SWT.LEFT);
|
||||
nextData.top = new FormAttachment(tmpCtrl, 0, SWT.CENTER);
|
||||
nextParentCtrl.setLayoutData(nextData);
|
||||
}
|
||||
if (backButton != null) {
|
||||
backButton.setBackground(backgroundColor);
|
||||
backButton.setForeground(foregroundColor);
|
||||
}
|
||||
|
||||
return composite;
|
||||
}
|
||||
|
||||
private int getButtonWidth(Button btn) {
|
||||
int widthHint = convertHorizontalDLUsToPixels(IDialogConstants.BUTTON_WIDTH);
|
||||
Point minSize = btn.computeSize(SWT.DEFAULT, SWT.DEFAULT, true);
|
||||
return Math.max(widthHint, minSize.x);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected Control createTitleArea(Composite parent) {
|
||||
Control titleCtrl = null;
|
||||
if (useNewStyle()) {
|
||||
final int horizonPadding = getHorizonPadding();
|
||||
final int horizonMargin = getHorizonMargin();
|
||||
final int verticalPadding = getVerticalPadding();
|
||||
final int msgMargin = getMargin();
|
||||
Control oldTitleArea = super.createTitleArea(parent);
|
||||
topPanel = new Composite(parent, SWT.NONE);
|
||||
titleCtrl = topPanel;
|
||||
// topPanel.setBackground(ColorConstants.RED_COLOR);
|
||||
topPanel.setBackground(backgroundColor);
|
||||
topPanel.setForeground(foregroundColor);
|
||||
FormData topPanelFd = new FormData();
|
||||
topPanelFd.top = new FormAttachment(0);
|
||||
topPanelFd.left = new FormAttachment(0);
|
||||
topPanelFd.right = new FormAttachment(100);
|
||||
// topPanelFd.bottom = new FormAttachment(oldTitleArea, 0, SWT.BOTTOM);
|
||||
Label tmpLabel = new Label(parent, SWT.NONE);
|
||||
// tmpLabel.setFont(getTitleBigFont());
|
||||
tmpLabel.setFont(JFaceResources.getBannerFont());
|
||||
tmpLabel.setText("Test");
|
||||
tmpLabel.pack();
|
||||
Point size = tmpLabel.getSize();
|
||||
tmpLabel.setFont(null);
|
||||
tmpLabel.setText("Test");
|
||||
tmpLabel.pack();
|
||||
Point errSize = tmpLabel.getSize();
|
||||
tmpLabel.dispose();
|
||||
if (isHideMessageArea()) {
|
||||
topPanelFd.height = 0;
|
||||
} else {
|
||||
topPanelFd.height = verticalPadding + size.y + verticalPadding + errSize.y + msgMargin * 2;
|
||||
}
|
||||
topPanel.setLayoutData(topPanelFd);
|
||||
topPanel.setLayout(new FormLayout());
|
||||
// sortPanelOrder();
|
||||
|
||||
titleLabelWithAnimation = new Canvas(topPanel, SWT.DOUBLE_BUFFERED);
|
||||
titleLabelWithAnimation.addPaintListener(new PaintListener() {
|
||||
|
||||
@Override
|
||||
public void paintControl(PaintEvent e) {
|
||||
drawTitle(e);
|
||||
}
|
||||
});
|
||||
titleLabelWithAnimation.setBackground(backgroundColor);
|
||||
titleLabelWithAnimation.setForeground(foregroundColor);
|
||||
titleLabelWithAnimation.addDisposeListener(new DisposeListener() {
|
||||
|
||||
@Override
|
||||
public void widgetDisposed(DisposeEvent e) {
|
||||
if (bigTitleImg != null && !bigTitleImg.isDisposed()) {
|
||||
bigTitleImg.dispose();
|
||||
}
|
||||
if (smallTitleImg != null && !smallTitleImg.isDisposed()) {
|
||||
smallTitleImg.dispose();
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
FormData fd = new FormData();
|
||||
fd.top = new FormAttachment(0, verticalPadding);
|
||||
fd.left = new FormAttachment(0, horizonMargin);
|
||||
fd.right = new FormAttachment(100);
|
||||
fd.bottom = new FormAttachment(100);
|
||||
titleLabelWithAnimation.setLayoutData(fd);
|
||||
|
||||
messagePanel = new Canvas(topPanel, SWT.DOUBLE_BUFFERED);
|
||||
messagePanel.addPaintListener(new PaintListener() {
|
||||
|
||||
@Override
|
||||
public void paintControl(PaintEvent e) {
|
||||
drawMessageBackground(e, messagePanel);
|
||||
// int len = 160;
|
||||
// int a = 10;
|
||||
// int a_Len = a + (int) (percentage * (size.x - a));
|
||||
// int b_Len = a_Len + len;
|
||||
// if (a_Len < size.x || b_Len < size.x) {
|
||||
// if (size.x <= a_Len) {
|
||||
// a_Len = size.x;
|
||||
// }
|
||||
// if (size.x <= b_Len) {
|
||||
// b_Len = size.x;
|
||||
// }
|
||||
// e.gc.setBackground(ColorConstants.WHITE_COLOR);
|
||||
// e.gc.fillPolygon(new int[] { a_Len, 0, size.x, 0, size.x, size.y, b_Len, size.y });
|
||||
// }
|
||||
}
|
||||
});
|
||||
messagePanel.setBackground(backgroundColor);
|
||||
messagePanel.setForeground(foregroundColor);
|
||||
fd = new FormData();
|
||||
tmpLabel = new Label(topPanel, SWT.NONE);
|
||||
tmpLabel.setFont(JFaceResources.getBannerFont());
|
||||
tmpLabel.setText("Test");
|
||||
tmpLabel.pack();
|
||||
size = tmpLabel.getSize();
|
||||
tmpLabel.dispose();
|
||||
messageTopY = verticalPadding + size.y + verticalPadding;
|
||||
fd.top = new FormAttachment(0, messageTopY);
|
||||
// fd.left = new FormAttachment(0, convertHorizontalDLUsToPixels(IDialogConstants.HORIZONTAL_SPACING));
|
||||
// fd.right = new FormAttachment(100, -convertHorizontalDLUsToPixels(IDialogConstants.HORIZONTAL_SPACING));
|
||||
fd.left = new FormAttachment(0, horizonMargin);
|
||||
fd.right = new FormAttachment(100, -horizonMargin);
|
||||
fd.bottom = new FormAttachment(100);
|
||||
messagePanel.setLayoutData(fd);
|
||||
messagePanel.setLayout(new FormLayout());
|
||||
|
||||
errIcon = new Label(messagePanel, SWT.NONE);
|
||||
errIcon.setBackground(msgPanelColor);
|
||||
errIcon.setForeground(foregroundColor);
|
||||
fd = new FormData();
|
||||
fd.top = new FormAttachment(0, msgMargin);
|
||||
fd.left = new FormAttachment(0, msgMargin);
|
||||
errIcon.setLayoutData(fd);
|
||||
|
||||
moreInfoLink = new Hyperlink(messagePanel, SWT.NONE);
|
||||
moreInfoLink.setText("");
|
||||
moreInfoLink.setBackground(msgPanelColor);
|
||||
moreInfoLink.setUnderlined(true);
|
||||
moreInfoLink.addHyperlinkListener(new HyperlinkAdapter() {
|
||||
|
||||
@Override
|
||||
public void linkActivated(HyperlinkEvent e) {
|
||||
onMoreInfoLinkClicked(e);
|
||||
}
|
||||
});
|
||||
|
||||
errMsgTxt = new StyledText(messagePanel, SWT.READ_ONLY | SWT.WRAP);
|
||||
errMsgTxt.setEditable(false);
|
||||
errMsgTxt.setBackground(msgPanelColor);
|
||||
errMsgTxt.setForeground(org.eclipse.draw2d.ColorConstants.black);
|
||||
|
||||
fd = new FormData();
|
||||
fd.top = new FormAttachment(errMsgTxt, 0, SWT.CENTER);
|
||||
fd.right = new FormAttachment(100, -msgMargin);
|
||||
moreInfoLink.setLayoutData(fd);
|
||||
|
||||
fd = new FormData();
|
||||
fd.top = new FormAttachment(errIcon, 0, SWT.TOP);
|
||||
fd.left = new FormAttachment(errIcon, horizonPadding, SWT.RIGHT);
|
||||
fd.right = new FormAttachment(moreInfoLink, -horizonPadding, SWT.LEFT);
|
||||
fd.bottom = new FormAttachment(100, -msgMargin);
|
||||
errMsgTxt.setLayoutData(fd);
|
||||
|
||||
parent.setBackground(backgroundColor);
|
||||
// parent.setBackground(ColorConstants.YELLOW_COLOR);
|
||||
titleImageLabel.setBackground(backgroundColor);
|
||||
titleLabel.setBackground(backgroundColor);
|
||||
titleLabel.moveBelow(null);
|
||||
messageImageLabel.setBackground(backgroundColor);
|
||||
leftFillerLabel.setBackground(backgroundColor);
|
||||
bottomFillerLabel.setBackground(backgroundColor);
|
||||
messageLabel.setBackground(backgroundColor);
|
||||
} else {
|
||||
titleCtrl = super.createTitleArea(parent);
|
||||
}
|
||||
return titleCtrl;
|
||||
}
|
||||
|
||||
private Composite createToolTipContent(Composite parent) {
|
||||
Composite result = new Composite(parent, SWT.NONE);
|
||||
final int msgMargin = getMargin();
|
||||
final int horizonPadding = getHorizonPadding();
|
||||
result.setBackground(null);
|
||||
result.setLayout(new FormLayout());
|
||||
Canvas msgPanel = new Canvas(result, SWT.DOUBLE_BUFFERED);
|
||||
FormData fd = new FormData();
|
||||
fd.top = new FormAttachment(0);
|
||||
fd.left = new FormAttachment(0);
|
||||
fd.width = messagePanel.getSize().x;
|
||||
fd.bottom = new FormAttachment(100);
|
||||
msgPanel.setLayoutData(fd);
|
||||
msgPanel.addPaintListener(new PaintListener() {
|
||||
|
||||
@Override
|
||||
public void paintControl(PaintEvent e) {
|
||||
drawMessageBackground(e, msgPanel);
|
||||
}
|
||||
});
|
||||
msgPanel.setBackground(messagePanel.getBackground());
|
||||
msgPanel.setForeground(messagePanel.getForeground());
|
||||
msgPanel.setLayout(new FormLayout());
|
||||
|
||||
Label errIconLabel = new Label(msgPanel, SWT.NONE);
|
||||
errIconLabel.setBackground(errIcon.getBackground());
|
||||
errIconLabel.setForeground(errIcon.getForeground());
|
||||
errIconLabel.setImage(errIcon.getImage());
|
||||
fd = new FormData();
|
||||
fd.top = new FormAttachment(0, msgMargin);
|
||||
fd.left = new FormAttachment(0, msgMargin);
|
||||
errIconLabel.setLayoutData(fd);
|
||||
|
||||
Hyperlink link = new Hyperlink(msgPanel, SWT.NONE);
|
||||
link.setText(moreInfoLink.getText());
|
||||
link.setBackground(moreInfoLink.getBackground());
|
||||
link.setUnderlined(moreInfoLink.isUnderlined());
|
||||
|
||||
StyledText msgTxt = new StyledText(msgPanel, SWT.READ_ONLY | SWT.WRAP);
|
||||
msgTxt.setBackground(errMsgTxt.getBackground());
|
||||
msgTxt.setForeground(errMsgTxt.getForeground());
|
||||
msgTxt.setText(errMsgTxt.getText());
|
||||
|
||||
fd = new FormData();
|
||||
fd.top = new FormAttachment(msgTxt, 0, SWT.CENTER);
|
||||
fd.right = new FormAttachment(100, -msgMargin);
|
||||
link.setLayoutData(fd);
|
||||
|
||||
fd = new FormData();
|
||||
fd.top = new FormAttachment(errIconLabel, 0, SWT.TOP);
|
||||
fd.left = new FormAttachment(errIconLabel, horizonPadding, SWT.RIGHT);
|
||||
fd.right = new FormAttachment(link, -horizonPadding, SWT.LEFT);
|
||||
msgTxt.setLayoutData(fd);
|
||||
return result;
|
||||
}
|
||||
|
||||
private void onMoreInfoLinkClicked(HyperlinkEvent e) {
|
||||
Program.launch(moreInfoUrl);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void resetWorkAreaAttachments(Control top) {
|
||||
FormData childData = new FormData();
|
||||
childData.top = new FormAttachment(topPanel, 0, SWT.BOTTOM);
|
||||
childData.right = new FormAttachment(100, 0);
|
||||
childData.left = new FormAttachment(0, 0);
|
||||
childData.bottom = new FormAttachment(100, 0);
|
||||
workArea.setLayoutData(childData);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void layoutForNewMessage(boolean forceLayout) {
|
||||
if (!useNewStyle()) {
|
||||
super.layoutForNewMessage(forceLayout);
|
||||
return;
|
||||
}
|
||||
// if (forceLayout) {
|
||||
// return;
|
||||
// }
|
||||
if (hasMessage()) {
|
||||
messagePanel.setVisible(true);
|
||||
// Image image = messageImageLabel.getImage();
|
||||
// if (image == null) {
|
||||
// image = messageImage;
|
||||
// }
|
||||
// if (image != null && messageImageLabel.isVisible()) {
|
||||
//// this.errIcon.setVisible(true);
|
||||
// this.errIcon.setImage(image);
|
||||
// } else {
|
||||
// this.errIcon.setImage(null);
|
||||
//// this.errIcon.setVisible(false);
|
||||
// }
|
||||
updateMsgPanelColor(pageMessageType);
|
||||
// topPanel.layout();
|
||||
messagePanel.layout();
|
||||
Point messageSize = errMsgTxt.getSize();
|
||||
int messageLabelUnclippedHeight = errMsgTxt.computeSize(messageSize.x, SWT.DEFAULT, true).y;
|
||||
boolean messageLabelClipped = messageLabelUnclippedHeight > messageSize.y;
|
||||
if (errMsgTxt.getData() instanceof ToolTip) {
|
||||
ToolTip toolTip = (ToolTip) errMsgTxt.getData();
|
||||
toolTip.hide();
|
||||
toolTip.deactivate();
|
||||
errMsgTxt.setData(null);
|
||||
}
|
||||
if (messageLabelClipped) {
|
||||
ToolTip tooltip = new ToolTip(errMsgTxt, ToolTip.NO_RECREATE, false) {
|
||||
|
||||
@Override
|
||||
protected Composite createToolTipContentArea(Event event, Composite parent) {
|
||||
return createToolTipContent(parent);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Point getLocation(Point tipSize, Event event) {
|
||||
return errMsgTxt.getShell().toDisplay(messagePanel.getLocation());
|
||||
}
|
||||
};
|
||||
errMsgTxt.setData(tooltip);
|
||||
tooltip.setPopupDelay(0);
|
||||
tooltip.activate();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void setImageLabelVisible(boolean visible) {
|
||||
super.setImageLabelVisible(visible);
|
||||
if (useNewStyle()) {
|
||||
messagePanel.setVisible(visible);
|
||||
if (visible) {
|
||||
errIcon.setImage(messageImageLabel.getImage());
|
||||
} else {
|
||||
errIcon.setImage(null);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private void sortPanelOrder() {
|
||||
if (isHideMessageArea()) {
|
||||
return;
|
||||
}
|
||||
if (this.topPanel == null) {
|
||||
return;
|
||||
}
|
||||
this.titleImageLabel.moveAbove(null);
|
||||
this.topPanel.moveBelow(this.titleImageLabel);
|
||||
messagePanel.moveAbove(titleLabelWithAnimation);
|
||||
if (!hasMessage()) {
|
||||
messagePanel.setVisible(false);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void setLayoutsForNormalMessage(int verticalSpacing, int horizontalSpacing) {
|
||||
if (isHideMessageArea()) {
|
||||
return;
|
||||
}
|
||||
super.setLayoutsForNormalMessage(verticalSpacing, horizontalSpacing);
|
||||
if (useNewStyle()) {
|
||||
if (this.topPanel != null) {
|
||||
onTitleAreaRefreshFrame(1.0, false);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private static Font getTitleBigFont() {
|
||||
if (titleBigFont != null) {
|
||||
return titleBigFont;
|
||||
}
|
||||
Font bannerFont = JFaceResources.getBannerFont();
|
||||
FontData[] fontData = bannerFont.getFontData();
|
||||
for (FontData fd : fontData) {
|
||||
fd.setHeight(fd.getHeight() + 7);
|
||||
}
|
||||
titleBigFont = new Font(Display.getDefault(), fontData);
|
||||
return titleBigFont;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void updateMessage(String newMessage) {
|
||||
if (isHideMessageArea()) {
|
||||
return;
|
||||
}
|
||||
boolean hadMsg = hasMessage();
|
||||
super.updateMessage(newMessage);
|
||||
this.errMsgTxt.setText(this.messageLabel.getText());
|
||||
boolean hasMsg = hasMessage();
|
||||
messagePanel.setVisible(hasMsg);
|
||||
if (hadMsg != hasMsg) {
|
||||
startAnimation();
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setErrorMessage(String newErrorMessage) {
|
||||
if (isHideMessageArea()) {
|
||||
return;
|
||||
}
|
||||
if (StringUtils.isNotBlank(newErrorMessage)) {
|
||||
this.pageMessageType = IMessageProvider.ERROR;
|
||||
updateMsgPanelColor(this.pageMessageType);
|
||||
}
|
||||
super.setErrorMessage(newErrorMessage);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void showMessage(String newMessage, Image newImage) {
|
||||
if (isHideMessageArea()) {
|
||||
return;
|
||||
}
|
||||
super.showMessage(newMessage, newImage);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setMessage(String newMessage, int newType) {
|
||||
if (isHideMessageArea()) {
|
||||
return;
|
||||
}
|
||||
if (StringUtils.isNotBlank(newMessage)) {
|
||||
updateMsgPanelColor(newType);
|
||||
}
|
||||
super.setMessage(newMessage, newType);
|
||||
}
|
||||
|
||||
private void updateMsgPanelColor(int type) {
|
||||
Color foreColor = getMsgPanelForegroundColor(type);
|
||||
msgPanelColor = getMsgPanelBackgroundColor(type);
|
||||
errIcon.setBackground(msgPanelColor);
|
||||
errMsgTxt.setBackground(msgPanelColor);
|
||||
errMsgTxt.setForeground(foreColor);
|
||||
moreInfoLink.setBackground(msgPanelColor);
|
||||
// moreInfoLink.setForeground(getMoreInfoLinkForegroundColor(type));
|
||||
messagePanel.redraw();
|
||||
}
|
||||
|
||||
private Color getMsgPanelBackgroundColor(int type) {
|
||||
Color color = ColorConstants.INFO_COLOR;
|
||||
switch (type) {
|
||||
case IMessageProvider.NONE:
|
||||
case IMessageProvider.INFORMATION:
|
||||
color = ColorConstants.INFO_COLOR;
|
||||
break;
|
||||
case IMessageProvider.WARNING:
|
||||
color = ColorConstants.WARN_COLOR;
|
||||
break;
|
||||
case IMessageProvider.ERROR:
|
||||
color = ColorConstants.ERR_COLOR;
|
||||
break;
|
||||
}
|
||||
return color;
|
||||
}
|
||||
|
||||
private Color getMsgPanelForegroundColor(int type) {
|
||||
Color color = ColorConstants.WHITE_COLOR;
|
||||
switch (type) {
|
||||
case IMessageProvider.WARNING:
|
||||
color = org.eclipse.draw2d.ColorConstants.black;
|
||||
break;
|
||||
case IMessageProvider.NONE:
|
||||
case IMessageProvider.INFORMATION:
|
||||
case IMessageProvider.ERROR:
|
||||
color = ColorConstants.WHITE_COLOR;
|
||||
break;
|
||||
}
|
||||
return color;
|
||||
}
|
||||
|
||||
private Color getMoreInfoLinkForegroundColor(int type) {
|
||||
Color color = null;
|
||||
switch (type) {
|
||||
case IMessageProvider.NONE:
|
||||
case IMessageProvider.INFORMATION:
|
||||
case IMessageProvider.ERROR:
|
||||
color = ColorConstants.WHITE_COLOR;
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
return color;
|
||||
}
|
||||
|
||||
private void startAnimation() {
|
||||
boolean hasMsg = hasMessage();
|
||||
if (this.titleAnimationSchedulerThread != null) {
|
||||
if (hasMsg == threadShowingMsg) {
|
||||
return;
|
||||
} else {
|
||||
this.titleAnimationSchedulerThread.interrupt();
|
||||
}
|
||||
}
|
||||
threadShowingMsg = hasMsg;
|
||||
titleAnimationSchedulerThread = createTitleAnimationSchedulerThread(threadShowingMsg);
|
||||
titleAnimationSchedulerThread.start();
|
||||
}
|
||||
|
||||
private boolean hasMessage() {
|
||||
return StringUtils.isNotBlank(messageLabel.getText());
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setTitle(String newTitle) {
|
||||
super.setTitle(newTitle);
|
||||
if (StringUtils.equals(newTitle, title) && this.bigTitleImg != null) {
|
||||
return;
|
||||
}
|
||||
if (this.titleAnimationSchedulerThread != null) {
|
||||
this.titleAnimationSchedulerThread.interrupt();
|
||||
}
|
||||
this.title = newTitle;
|
||||
if (this.bigTitleImg != null) {
|
||||
this.bigTitleImg.dispose();
|
||||
}
|
||||
this.bigTitleImg = createTitleImage(getTitleBigFont(), this.title);
|
||||
if (this.smallTitleImg != null) {
|
||||
this.smallTitleImg.dispose();
|
||||
}
|
||||
this.smallTitleImg = createTitleImage(JFaceResources.getBannerFont(), this.title);
|
||||
this.titleLabelWithAnimation.redraw();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void showMoreInfoLink(IDialogPage page, String name, String link) {
|
||||
if (isHideMessageArea()) {
|
||||
return;
|
||||
}
|
||||
if (getCurrentPage() != page) {
|
||||
return;
|
||||
}
|
||||
if (StringUtils.isBlank(name)) {
|
||||
moreInfoLink.setText("");
|
||||
moreInfoLink.setEnabled(false);
|
||||
} else {
|
||||
moreInfoLink.setEnabled(true);
|
||||
moreInfoLink.setText(name);
|
||||
}
|
||||
moreInfoUrl = link;
|
||||
this.moreInfoLink.pack();
|
||||
this.moreInfoLink.redraw();
|
||||
this.messagePanel.layout();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setTitleImage(Image newTitleImage) {
|
||||
super.setTitleImage(newTitleImage);
|
||||
if (this.titleAreaImage != null) {
|
||||
if (this.messageTopY < this.titleAreaImage.getBounds().height) {
|
||||
FormData fd = (FormData) messagePanel.getLayoutData();
|
||||
Rectangle imgBounds = this.titleAreaImage.getBounds();
|
||||
fd.right = new FormAttachment(100, -getHorizonPadding() - imgBounds.width);
|
||||
FormData panelFd = (FormData) this.topPanel.getLayoutData();
|
||||
int imageY = imgBounds.height;
|
||||
int topPanelY = panelFd.height;
|
||||
if (topPanelY < imageY) {
|
||||
panelFd.height = imageY;
|
||||
// fd.right = new FormAttachment(this.titleImageLabel, -getMargin(), SWT.LEFT);
|
||||
this.topPanel.getParent().layout();
|
||||
} else {
|
||||
}
|
||||
this.topPanel.layout();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private Image createTitleImage(Font font, String title) {
|
||||
Label tmpLabel = new Label(titleLabel.getParent(), SWT.NONE);
|
||||
tmpLabel.setText(title);
|
||||
tmpLabel.setFont(font);
|
||||
tmpLabel.pack();
|
||||
Point size = tmpLabel.getSize();
|
||||
tmpLabel.dispose();
|
||||
|
||||
int width = size.x;
|
||||
if (StringUtils.isEmpty(title)) {
|
||||
width = 1;
|
||||
}
|
||||
Image tmpImg = new Image(Display.getDefault(), width, size.y);
|
||||
GC gc = new GC(tmpImg);
|
||||
gc.setAntialias(SWT.ON);
|
||||
gc.setInterpolation(SWT.HIGH);
|
||||
gc.setFont(font);
|
||||
gc.setAlpha(0);
|
||||
gc.drawRectangle(0, 0, width, size.y);
|
||||
gc.setAlpha(255);
|
||||
gc.drawText(title, 0, 0, true);
|
||||
gc.dispose();
|
||||
|
||||
ImageData imageData = tmpImg.getImageData();
|
||||
imageData.transparentPixel = imageData.getPixel(0, 0);
|
||||
tmpImg.dispose();
|
||||
|
||||
return new Image(Display.getDefault(), imageData);
|
||||
}
|
||||
|
||||
private void drawTitle(PaintEvent e) {
|
||||
double p = percentage;
|
||||
Rectangle sBounds = smallTitleImg.getBounds();
|
||||
Rectangle bBounds = bigTitleImg.getBounds();
|
||||
int width = bBounds.width - sBounds.width;
|
||||
int height = bBounds.height - sBounds.height;
|
||||
Rectangle baseBounds = sBounds;
|
||||
Image finalImg = bigTitleImg;
|
||||
finalImg = bigTitleImg;
|
||||
int totalHight = e.height;
|
||||
int middleY = (totalHight - bBounds.height) / 2;
|
||||
// int startY = getMargin();
|
||||
int startY = 0;
|
||||
int baseY = startY;
|
||||
int y = (int) (p * (middleY - startY));
|
||||
if (hasMessage()) {
|
||||
y = -y;
|
||||
width = -width;
|
||||
height = -height;
|
||||
baseBounds = bBounds;
|
||||
baseY = middleY;
|
||||
finalImg = smallTitleImg;
|
||||
}
|
||||
|
||||
Point newSize = new Point((int) (baseBounds.width + p * width), (int) (baseBounds.height + p * height));
|
||||
GC gc = e.gc;
|
||||
gc.setAntialias(SWT.ON);
|
||||
gc.setInterpolation(SWT.HIGH);
|
||||
if (p <= 1.0) {
|
||||
gc.drawImage(bigTitleImg, 0, 0, bBounds.width, bBounds.height, 0, baseY + y, newSize.x, newSize.y);
|
||||
} else {
|
||||
Rectangle bounds = finalImg.getBounds();
|
||||
gc.drawImage(finalImg, 0, 0, bounds.width, bounds.height, 0, baseY + y, bounds.width, bounds.height);
|
||||
}
|
||||
}
|
||||
|
||||
private void drawMessageBackground(PaintEvent e, Control ctrl) {
|
||||
e.gc.setBackground(msgPanelColor);
|
||||
e.gc.setAntialias(SWT.ON);
|
||||
e.gc.setInterpolation(SWT.HIGH);
|
||||
Point size = ctrl.getSize();
|
||||
e.gc.fillRoundRectangle(0, 0, size.x, size.y, 15, 15);
|
||||
}
|
||||
|
||||
private int getHorizonPadding() {
|
||||
IWizard wizard = this.getWizard();
|
||||
if (wizard instanceof ITalendWizard) {
|
||||
return ((ITalendWizard) wizard).getHorizonPadding();
|
||||
}
|
||||
return 5;
|
||||
}
|
||||
|
||||
private int getVerticalPadding() {
|
||||
IWizard wizard = this.getWizard();
|
||||
if (wizard instanceof ITalendWizard) {
|
||||
return ((ITalendWizard) wizard).getVerticalPadding();
|
||||
}
|
||||
return 5;
|
||||
}
|
||||
|
||||
private int getHorizonMargin() {
|
||||
IWizard wizard = this.getWizard();
|
||||
if (wizard instanceof ITalendWizard) {
|
||||
return ((ITalendWizard) wizard).getHorizonMargin();
|
||||
}
|
||||
return 5;
|
||||
}
|
||||
|
||||
private int getMargin() {
|
||||
return 10;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,244 @@
|
||||
// ============================================================================
|
||||
//
|
||||
// Copyright (C) 2006-2021 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.commons.ui.swt.dialogs;
|
||||
|
||||
import java.lang.reflect.Field;
|
||||
|
||||
import org.eclipse.jface.dialogs.IDialogConstants;
|
||||
import org.eclipse.jface.dialogs.TitleAreaDialog;
|
||||
import org.eclipse.jface.resource.JFaceColors;
|
||||
import org.eclipse.jface.wizard.IWizard;
|
||||
import org.eclipse.jface.wizard.ProgressMonitorPart;
|
||||
import org.eclipse.jface.wizard.WizardDialog;
|
||||
import org.eclipse.swt.SWT;
|
||||
import org.eclipse.swt.graphics.Color;
|
||||
import org.eclipse.swt.graphics.Point;
|
||||
import org.eclipse.swt.graphics.RGB;
|
||||
import org.eclipse.swt.layout.FormAttachment;
|
||||
import org.eclipse.swt.layout.FormData;
|
||||
import org.eclipse.swt.layout.FormLayout;
|
||||
import org.eclipse.swt.layout.GridData;
|
||||
import org.eclipse.swt.layout.GridLayout;
|
||||
import org.eclipse.swt.widgets.Button;
|
||||
import org.eclipse.swt.widgets.Composite;
|
||||
import org.eclipse.swt.widgets.Control;
|
||||
import org.eclipse.swt.widgets.Display;
|
||||
import org.eclipse.swt.widgets.Label;
|
||||
import org.eclipse.swt.widgets.Shell;
|
||||
import org.talend.commons.exception.ExceptionHandler;
|
||||
import org.talend.commons.ui.runtime.ColorConstants;
|
||||
|
||||
|
||||
/**
|
||||
* DOC cmeng class global comment. Detailled comment
|
||||
*/
|
||||
public class TalendWizardDialog_backup extends WizardDialog {
|
||||
|
||||
private boolean useNewErrorStyle = false;
|
||||
|
||||
/**
|
||||
* Warning color: #FCE6D9 <br/>
|
||||
* info color: #CDE3F2
|
||||
*/
|
||||
|
||||
public TalendWizardDialog_backup(Shell parentShell, IWizard newWizard) {
|
||||
super(parentShell, newWizard);
|
||||
useNewErrorStyle = true;
|
||||
this.setTitleAreaColor(new RGB(205, 227, 242));
|
||||
}
|
||||
|
||||
public void setNewErrorStyle(boolean newErrStyle) {
|
||||
this.useNewErrorStyle = newErrStyle;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected Control createContents(Composite parent) {
|
||||
parent.setBackground(ColorConstants.WHITE_COLOR);
|
||||
Control panel = super.createContents(parent);
|
||||
Display display = parent.getDisplay();
|
||||
Color background = JFaceColors.getBannerBackground(display);
|
||||
Color foreground = JFaceColors.getBannerForeground(display);
|
||||
try {
|
||||
Field workAreaField = TitleAreaDialog.class.getDeclaredField("workArea");
|
||||
workAreaField.setAccessible(true);
|
||||
Composite workArea = (Composite) workAreaField.get(this);
|
||||
workArea.setBackground(ColorConstants.WHITE_COLOR);
|
||||
Field pageContainerField = WizardDialog.class.getDeclaredField("pageContainer");
|
||||
pageContainerField.setAccessible(true);
|
||||
Composite pageContainer = (Composite) pageContainerField.get(this);
|
||||
pageContainer.setBackground(ColorConstants.WHITE_COLOR);
|
||||
if (useNewErrorStyle()) {
|
||||
FormData formData = (FormData) workArea.getLayoutData();
|
||||
formData.top = new FormAttachment(0);
|
||||
}
|
||||
Field bottomFillerLabelField = TitleAreaDialog.class.getDeclaredField("bottomFillerLabel");
|
||||
bottomFillerLabelField.setAccessible(true);
|
||||
Composite bottomFillerLabel = (Composite) bottomFillerLabelField.get(this);
|
||||
bottomFillerLabel.setVisible(false);
|
||||
} catch (Exception e) {
|
||||
ExceptionHandler.process(e);
|
||||
}
|
||||
return panel;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setMessage(String newMessage) {
|
||||
if (useNewErrorStyle()) {
|
||||
ExceptionHandler.log(newMessage);
|
||||
} else {
|
||||
super.setMessage(newMessage);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setMessage(String newMessage, int newType) {
|
||||
if (useNewErrorStyle()) {
|
||||
ExceptionHandler.log(newMessage);
|
||||
} else {
|
||||
super.setMessage(newMessage, newType);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setErrorMessage(String newErrorMessage) {
|
||||
if (useNewErrorStyle()) {
|
||||
ExceptionHandler.log(newErrorMessage);
|
||||
} else {
|
||||
super.setErrorMessage(newErrorMessage);
|
||||
}
|
||||
}
|
||||
|
||||
private boolean useNewErrorStyle() {
|
||||
return this.useNewErrorStyle;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected Control createDialogArea(Composite parent) {
|
||||
Composite panel = (Composite) super.createDialogArea(parent);
|
||||
Control[] children = panel.getChildren();
|
||||
for (Control child : children) {
|
||||
child.setBackground(ColorConstants.WHITE_COLOR);
|
||||
if (child instanceof Label) {
|
||||
int style = child.getStyle();
|
||||
if (0 < (style & SWT.HORIZONTAL) && 0 < (style & SWT.SEPARATOR)) {
|
||||
child.setVisible(false);
|
||||
}
|
||||
}
|
||||
}
|
||||
return panel;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected ProgressMonitorPart createProgressMonitorPart(Composite composite, GridLayout pmlayout) {
|
||||
ProgressMonitorPart progMonitor = super.createProgressMonitorPart(composite, pmlayout);
|
||||
progMonitor.setBackground(ColorConstants.WHITE_COLOR);
|
||||
return progMonitor;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected Control createButtonBar(Composite parent) {
|
||||
Composite composite = new Composite(parent, SWT.NONE);
|
||||
composite.setBackground(ColorConstants.WHITE_COLOR);
|
||||
GridLayout layout = new GridLayout();
|
||||
layout.marginWidth = 0;
|
||||
layout.marginHeight = 0;
|
||||
layout.horizontalSpacing = 0;
|
||||
composite.setLayout(layout);
|
||||
composite.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, false));
|
||||
composite.setFont(parent.getFont());
|
||||
|
||||
Control helpControl = null;
|
||||
// create help control if needed
|
||||
if (isHelpAvailable()) {
|
||||
helpControl = createHelpControl(composite);
|
||||
((GridData) helpControl.getLayoutData()).horizontalIndent = convertHorizontalDLUsToPixels(
|
||||
IDialogConstants.HORIZONTAL_MARGIN);
|
||||
}
|
||||
createButtonsForButtonBar(composite);
|
||||
|
||||
Button helpButton = getButton(IDialogConstants.HELP_ID);
|
||||
Button finishButton = getButton(IDialogConstants.FINISH_ID);
|
||||
Button cancelButton = getButton(IDialogConstants.CANCEL_ID);
|
||||
Button backButton = getButton(IDialogConstants.BACK_ID);
|
||||
Button nextButton = getButton(IDialogConstants.NEXT_ID);
|
||||
|
||||
FormLayout formLayout = new FormLayout();
|
||||
formLayout.marginWidth = 10;
|
||||
formLayout.marginHeight = 20;
|
||||
composite.setLayout(formLayout);
|
||||
final int HORIZON_ALIGN = 5;
|
||||
|
||||
FormData cancelData = new FormData();
|
||||
cancelData.left = new FormAttachment(0);
|
||||
cancelData.top = new FormAttachment(composite, 0, SWT.CENTER);
|
||||
cancelData.width = getButtonWidth(cancelButton);
|
||||
cancelButton.setLayoutData(cancelData);
|
||||
|
||||
Control tmpCtrl = cancelButton;
|
||||
|
||||
if (helpControl != null) {
|
||||
FormData formData = new FormData();
|
||||
formData.left = new FormAttachment(tmpCtrl, HORIZON_ALIGN, SWT.RIGHT);
|
||||
formData.top = new FormAttachment(tmpCtrl, 0, SWT.CENTER);
|
||||
helpControl.setLayoutData(formData);
|
||||
tmpCtrl = helpControl;
|
||||
}
|
||||
if (helpButton != null) {
|
||||
FormData formData = new FormData();
|
||||
formData.left = new FormAttachment(tmpCtrl, HORIZON_ALIGN, SWT.RIGHT);
|
||||
formData.top = new FormAttachment(tmpCtrl, 0, SWT.CENTER);
|
||||
formData.width = getButtonWidth(helpButton);
|
||||
helpButton.setLayoutData(formData);
|
||||
tmpCtrl = helpButton;
|
||||
}
|
||||
FormData finishData = new FormData();
|
||||
finishData.right = new FormAttachment(100);
|
||||
finishData.top = new FormAttachment(composite, 0, SWT.CENTER);
|
||||
finishData.width = getButtonWidth(finishButton);
|
||||
finishButton.setLayoutData(finishData);
|
||||
tmpCtrl = finishButton;
|
||||
|
||||
if (nextButton != null) {
|
||||
FormData nextData = new FormData();
|
||||
Composite nextParentCtrl = nextButton.getParent();
|
||||
nextData.right = new FormAttachment(tmpCtrl, -HORIZON_ALIGN, SWT.LEFT);
|
||||
nextData.top = new FormAttachment(tmpCtrl, 0, SWT.CENTER);
|
||||
nextParentCtrl.setLayoutData(nextData);
|
||||
}
|
||||
if (false) {
|
||||
if (nextButton != null) {
|
||||
FormData nextData = new FormData();
|
||||
nextData.right = new FormAttachment(tmpCtrl, -HORIZON_ALIGN, SWT.LEFT);
|
||||
nextData.top = new FormAttachment(tmpCtrl, 0, SWT.CENTER);
|
||||
nextData.width = getButtonWidth(nextButton);
|
||||
nextButton.setLayoutData(nextData);
|
||||
}
|
||||
if (backButton != null) {
|
||||
FormData backData = new FormData();
|
||||
backData.right = new FormAttachment(tmpCtrl, -HORIZON_ALIGN, SWT.LEFT);
|
||||
backData.top = new FormAttachment(tmpCtrl, 0, SWT.CENTER);
|
||||
backData.width = getButtonWidth(backButton);
|
||||
backButton.setLayoutData(backData);
|
||||
}
|
||||
}
|
||||
|
||||
return composite;
|
||||
}
|
||||
|
||||
private int getButtonWidth(Button btn) {
|
||||
int widthHint = convertHorizontalDLUsToPixels(IDialogConstants.BUTTON_WIDTH);
|
||||
Point minSize = btn.computeSize(SWT.DEFAULT, SWT.DEFAULT, true);
|
||||
return Math.max(widthHint, minSize.x);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,693 @@
|
||||
// ============================================================================
|
||||
//
|
||||
// Copyright (C) 2006-2021 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.commons.ui.swt.dialogs;
|
||||
|
||||
import org.eclipse.jface.dialogs.Dialog;
|
||||
import org.eclipse.jface.dialogs.IDialogConstants;
|
||||
import org.eclipse.jface.dialogs.IMessageProvider;
|
||||
import org.eclipse.jface.dialogs.TrayDialog;
|
||||
import org.eclipse.jface.resource.JFaceColors;
|
||||
import org.eclipse.jface.resource.JFaceResources;
|
||||
import org.eclipse.jface.window.ToolTip;
|
||||
import org.eclipse.swt.SWT;
|
||||
import org.eclipse.swt.accessibility.ACC;
|
||||
import org.eclipse.swt.accessibility.AccessibleAttributeAdapter;
|
||||
import org.eclipse.swt.accessibility.AccessibleAttributeEvent;
|
||||
import org.eclipse.swt.graphics.Color;
|
||||
import org.eclipse.swt.graphics.Image;
|
||||
import org.eclipse.swt.graphics.Point;
|
||||
import org.eclipse.swt.graphics.RGB;
|
||||
import org.eclipse.swt.layout.FormAttachment;
|
||||
import org.eclipse.swt.layout.FormData;
|
||||
import org.eclipse.swt.layout.FormLayout;
|
||||
import org.eclipse.swt.layout.GridData;
|
||||
import org.eclipse.swt.layout.GridLayout;
|
||||
import org.eclipse.swt.widgets.Composite;
|
||||
import org.eclipse.swt.widgets.Control;
|
||||
import org.eclipse.swt.widgets.Display;
|
||||
import org.eclipse.swt.widgets.Event;
|
||||
import org.eclipse.swt.widgets.Label;
|
||||
import org.eclipse.swt.widgets.Shell;
|
||||
import org.eclipse.swt.widgets.Text;
|
||||
|
||||
/**
|
||||
* A dialog that has a title area for displaying a title and an image as well as a common area for displaying a
|
||||
* description, a message, or an error message.
|
||||
* <p>
|
||||
* This dialog class may be subclassed.
|
||||
*/
|
||||
public class TitleAreaDialog extends TrayDialog {
|
||||
|
||||
/**
|
||||
* Image registry key for error message image.
|
||||
*/
|
||||
public static final String DLG_IMG_TITLE_ERROR = DLG_IMG_MESSAGE_ERROR;
|
||||
|
||||
/**
|
||||
* Image registry key for banner image (value <code>"dialog_title_banner_image"</code>).
|
||||
*/
|
||||
public static final String DLG_IMG_TITLE_BANNER = "dialog_title_banner_image";//$NON-NLS-1$
|
||||
|
||||
/**
|
||||
* Message type constant used to display an info icon with the message.
|
||||
*
|
||||
* @since 2.0
|
||||
* @deprecated
|
||||
*/
|
||||
@Deprecated
|
||||
public static final String INFO_MESSAGE = "INFO_MESSAGE"; //$NON-NLS-1$
|
||||
|
||||
/**
|
||||
* Message type constant used to display a warning icon with the message.
|
||||
*
|
||||
* @since 2.0
|
||||
* @deprecated
|
||||
*/
|
||||
@Deprecated
|
||||
public static final String WARNING_MESSAGE = "WARNING_MESSAGE"; //$NON-NLS-1$
|
||||
|
||||
// Space between an image and a label
|
||||
private static final int H_GAP_IMAGE = 5;
|
||||
|
||||
// Minimum dialog width (in dialog units)
|
||||
private static final int MIN_DIALOG_WIDTH = 350;
|
||||
|
||||
// Minimum dialog height (in dialog units)
|
||||
private static final int MIN_DIALOG_HEIGHT = 150;
|
||||
|
||||
protected Label titleLabel;
|
||||
|
||||
protected Label titleImageLabel;
|
||||
|
||||
protected Label bottomFillerLabel;
|
||||
|
||||
protected Label leftFillerLabel;
|
||||
|
||||
private RGB titleAreaRGB;
|
||||
|
||||
Color titleAreaColor;
|
||||
|
||||
protected String message = ""; //$NON-NLS-1$
|
||||
|
||||
protected String errorMessage;
|
||||
|
||||
protected Label messageLabel;
|
||||
|
||||
protected Composite workArea;
|
||||
|
||||
protected Label messageImageLabel;
|
||||
|
||||
protected Image messageImage;
|
||||
|
||||
private boolean showingError = false;
|
||||
|
||||
private boolean titleImageLargest = true;
|
||||
|
||||
private int messageLabelHeight;
|
||||
|
||||
protected Image titleAreaImage;
|
||||
|
||||
/**
|
||||
* Instantiate a new title area dialog.
|
||||
*
|
||||
* @param parentShell the parent SWT shell
|
||||
*/
|
||||
public TitleAreaDialog(Shell parentShell) {
|
||||
super(parentShell);
|
||||
}
|
||||
|
||||
/*
|
||||
* @see Dialog.createContents(Composite)
|
||||
*/
|
||||
@Override
|
||||
protected Control createContents(Composite parent) {
|
||||
// create the overall composite
|
||||
Composite contents = new Composite(parent, SWT.NONE);
|
||||
contents.setLayoutData(new GridData(GridData.FILL_BOTH));
|
||||
// initialize the dialog units
|
||||
initializeDialogUnits(contents);
|
||||
FormLayout layout = new FormLayout();
|
||||
contents.setLayout(layout);
|
||||
// Now create a work area for the rest of the dialog
|
||||
workArea = new Composite(contents, SWT.NONE);
|
||||
// workArea.setBackground(ColorConstants.RED_COLOR);
|
||||
GridLayout childLayout = new GridLayout();
|
||||
childLayout.marginHeight = 0;
|
||||
childLayout.marginWidth = 0;
|
||||
childLayout.verticalSpacing = 0;
|
||||
workArea.setLayout(childLayout);
|
||||
Control top = createTitleArea(contents);
|
||||
resetWorkAreaAttachments(top);
|
||||
workArea.setFont(JFaceResources.getDialogFont());
|
||||
// initialize the dialog units
|
||||
initializeDialogUnits(workArea);
|
||||
// create the dialog area and button bar
|
||||
dialogArea = createDialogArea(workArea);
|
||||
buttonBar = createButtonBar(workArea);
|
||||
|
||||
// need to react to new size of title area
|
||||
getShell().addListener(SWT.Resize, event -> layoutForNewMessage(true));
|
||||
return contents;
|
||||
}
|
||||
|
||||
/**
|
||||
* Creates and returns the contents of the upper part of this dialog (above the button bar).
|
||||
* <p>
|
||||
* The <code>Dialog</code> implementation of this framework method creates and returns a new <code>Composite</code>
|
||||
* with no margins and spacing. Subclasses should override.
|
||||
* </p>
|
||||
*
|
||||
* @param parent The parent composite to contain the dialog area
|
||||
* @return the dialog area control
|
||||
*/
|
||||
@Override
|
||||
protected Control createDialogArea(Composite parent) {
|
||||
// create the top level composite for the dialog area
|
||||
Composite composite = new Composite(parent, SWT.NONE);
|
||||
GridLayout layout = new GridLayout();
|
||||
layout.marginHeight = 0;
|
||||
layout.marginWidth = 0;
|
||||
layout.verticalSpacing = 0;
|
||||
layout.horizontalSpacing = 0;
|
||||
composite.setLayout(layout);
|
||||
composite.setLayoutData(new GridData(GridData.FILL_BOTH));
|
||||
composite.setFont(parent.getFont());
|
||||
// Build the separator line
|
||||
titleBarSeparator = new Label(composite, SWT.HORIZONTAL | SWT.SEPARATOR);
|
||||
titleBarSeparator.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
|
||||
return composite;
|
||||
}
|
||||
|
||||
protected Label titleBarSeparator;
|
||||
|
||||
/**
|
||||
* Creates the dialog's title area.
|
||||
*
|
||||
* @param parent the SWT parent for the title area widgets
|
||||
* @return Control with the highest x axis value.
|
||||
*/
|
||||
protected Control createTitleArea(Composite parent) {
|
||||
|
||||
// Determine the background color of the title bar
|
||||
Display display = parent.getDisplay();
|
||||
Color background;
|
||||
Color foreground;
|
||||
if (titleAreaRGB != null) {
|
||||
titleAreaColor = new Color(display, titleAreaRGB);
|
||||
background = titleAreaColor;
|
||||
foreground = null;
|
||||
} else {
|
||||
background = JFaceColors.getBannerBackground(display);
|
||||
foreground = JFaceColors.getBannerForeground(display);
|
||||
}
|
||||
|
||||
parent.setBackground(background);
|
||||
int verticalSpacing = convertVerticalDLUsToPixels(IDialogConstants.VERTICAL_SPACING);
|
||||
int horizontalSpacing = convertHorizontalDLUsToPixels(IDialogConstants.HORIZONTAL_SPACING);
|
||||
// Dialog image @ right
|
||||
titleImageLabel = new Label(parent, SWT.CENTER);
|
||||
titleImageLabel.setBackground(background);
|
||||
if (titleAreaImage == null || titleAreaImage.isDisposed())
|
||||
titleImageLabel.setImage(JFaceResources.getImage(DLG_IMG_TITLE_BANNER));
|
||||
else
|
||||
titleImageLabel.setImage(titleAreaImage);
|
||||
|
||||
FormData imageData = new FormData();
|
||||
imageData.top = new FormAttachment(0, 0);
|
||||
// Note: do not use horizontalSpacing on the right as that would be a
|
||||
// regression from
|
||||
// the R2.x style where there was no margin on the right and images are
|
||||
// flush to the right
|
||||
// hand side. see reopened comments in 41172
|
||||
imageData.right = new FormAttachment(100, 0); // horizontalSpacing
|
||||
titleImageLabel.setLayoutData(imageData);
|
||||
// Title label @ top, left
|
||||
titleLabel = new Label(parent, SWT.LEFT);
|
||||
JFaceColors.setColors(titleLabel, foreground, background);
|
||||
titleLabel.setFont(JFaceResources.getBannerFont());
|
||||
titleLabel.setText(" ");//$NON-NLS-1$
|
||||
FormData titleData = new FormData();
|
||||
titleData.top = new FormAttachment(0, verticalSpacing);
|
||||
titleData.right = new FormAttachment(titleImageLabel);
|
||||
titleData.left = new FormAttachment(0, horizontalSpacing);
|
||||
titleLabel.setLayoutData(titleData);
|
||||
// Message image @ bottom, left
|
||||
messageImageLabel = new Label(parent, SWT.CENTER);
|
||||
messageImageLabel.setBackground(background);
|
||||
// Message label @ bottom, center
|
||||
// messageLabel = new Text(parent, SWT.WRAP | SWT.READ_ONLY);
|
||||
messageLabel = new Label(parent, SWT.WRAP);
|
||||
JFaceColors.setColors(messageLabel, foreground, background);
|
||||
messageLabel.setText(" \n "); // two lines//$NON-NLS-1$
|
||||
messageLabel.setFont(JFaceResources.getDialogFont());
|
||||
// Bug 248410 - This snippet will only work with Windows screen readers.
|
||||
messageLabel.getAccessible().addAccessibleAttributeListener(new AccessibleAttributeAdapter() {
|
||||
|
||||
@Override
|
||||
public void getAttributes(AccessibleAttributeEvent e) {
|
||||
e.attributes = new String[] { "container-live", //$NON-NLS-1$
|
||||
"polite", "live", "polite", //$NON-NLS-1$//$NON-NLS-2$//$NON-NLS-3$
|
||||
"container-live-role", "status", }; //$NON-NLS-1$ //$NON-NLS-2$
|
||||
}
|
||||
});
|
||||
messageLabelHeight = messageLabel.computeSize(SWT.DEFAULT, SWT.DEFAULT).y;
|
||||
// Filler labels
|
||||
leftFillerLabel = new Label(parent, SWT.CENTER);
|
||||
leftFillerLabel.setBackground(background);
|
||||
bottomFillerLabel = new Label(parent, SWT.CENTER);
|
||||
bottomFillerLabel.setBackground(background);
|
||||
setLayoutsForNormalMessage(verticalSpacing, horizontalSpacing);
|
||||
determineTitleImageLargest();
|
||||
if (titleImageLargest)
|
||||
return titleImageLabel;
|
||||
return messageLabel;
|
||||
}
|
||||
|
||||
/**
|
||||
* Determine if the title image is larger than the title message and message area. This is used for layout
|
||||
* decisions.
|
||||
*/
|
||||
private void determineTitleImageLargest() {
|
||||
int titleY = titleImageLabel.computeSize(SWT.DEFAULT, SWT.DEFAULT).y;
|
||||
int verticalSpacing = convertVerticalDLUsToPixels(IDialogConstants.VERTICAL_SPACING);
|
||||
int labelY = titleLabel.computeSize(SWT.DEFAULT, SWT.DEFAULT).y;
|
||||
labelY += verticalSpacing;
|
||||
labelY += messageLabelHeight;
|
||||
labelY += verticalSpacing;
|
||||
titleImageLargest = titleY > labelY;
|
||||
}
|
||||
|
||||
/**
|
||||
* Set the layout values for the messageLabel, messageImageLabel and fillerLabel for the case where there is a
|
||||
* normal message.
|
||||
*
|
||||
* @param verticalSpacing int The spacing between widgets on the vertical axis.
|
||||
* @param horizontalSpacing int The spacing between widgets on the horizontal axis.
|
||||
*/
|
||||
protected void setLayoutsForNormalMessage(int verticalSpacing, int horizontalSpacing) {
|
||||
FormData messageImageData = new FormData();
|
||||
messageImageData.top = new FormAttachment(titleLabel, verticalSpacing);
|
||||
messageImageData.left = new FormAttachment(0, H_GAP_IMAGE);
|
||||
messageImageLabel.setLayoutData(messageImageData);
|
||||
FormData messageLabelData = new FormData();
|
||||
messageLabelData.top = new FormAttachment(titleLabel, verticalSpacing);
|
||||
messageLabelData.right = new FormAttachment(titleImageLabel);
|
||||
messageLabelData.left = new FormAttachment(messageImageLabel, horizontalSpacing);
|
||||
messageLabelData.height = messageLabelHeight;
|
||||
if (titleImageLargest)
|
||||
messageLabelData.bottom = new FormAttachment(titleImageLabel, 0, SWT.BOTTOM);
|
||||
messageLabel.setLayoutData(messageLabelData);
|
||||
FormData fillerData = new FormData();
|
||||
fillerData.left = new FormAttachment(0, horizontalSpacing);
|
||||
fillerData.top = new FormAttachment(messageImageLabel, 0);
|
||||
fillerData.bottom = new FormAttachment(messageLabel, 0, SWT.BOTTOM);
|
||||
bottomFillerLabel.setLayoutData(fillerData);
|
||||
FormData data = new FormData();
|
||||
data.top = new FormAttachment(messageImageLabel, 0, SWT.TOP);
|
||||
data.left = new FormAttachment(0, 0);
|
||||
data.bottom = new FormAttachment(messageImageLabel, 0, SWT.BOTTOM);
|
||||
data.right = new FormAttachment(messageImageLabel, 0);
|
||||
leftFillerLabel.setLayoutData(data);
|
||||
}
|
||||
|
||||
/**
|
||||
* The <code>TitleAreaDialog</code> implementation of this <code>Window</code> methods returns an initial size which
|
||||
* is at least some reasonable minimum.
|
||||
*
|
||||
* @return the initial size of the dialog
|
||||
*/
|
||||
@Override
|
||||
protected Point getInitialSize() {
|
||||
Point shellSize = super.getInitialSize();
|
||||
return new Point(Math.max(convertHorizontalDLUsToPixels(MIN_DIALOG_WIDTH), shellSize.x),
|
||||
Math.max(convertVerticalDLUsToPixels(MIN_DIALOG_HEIGHT), shellSize.y));
|
||||
}
|
||||
|
||||
/**
|
||||
* Retained for backward compatibility.
|
||||
*
|
||||
* Returns the title area composite. There is no composite in this implementation so the shell is returned.
|
||||
*
|
||||
* @return Composite
|
||||
* @deprecated
|
||||
*/
|
||||
@Deprecated
|
||||
protected Composite getTitleArea() {
|
||||
return getShell();
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns the title image label.
|
||||
*
|
||||
* @return the title image label
|
||||
*/
|
||||
protected Label getTitleImageLabel() {
|
||||
return titleImageLabel;
|
||||
}
|
||||
|
||||
/**
|
||||
* Display the given error message. The currently displayed message is saved and will be redisplayed when the error
|
||||
* message is set to <code>null</code>.
|
||||
*
|
||||
* @param newErrorMessage the newErrorMessage to display or <code>null</code>
|
||||
*/
|
||||
public void setErrorMessage(String newErrorMessage) {
|
||||
// Any change?
|
||||
if (errorMessage == null ? newErrorMessage == null : errorMessage.equals(newErrorMessage))
|
||||
return;
|
||||
errorMessage = newErrorMessage;
|
||||
|
||||
// Clear or set error message.
|
||||
if (errorMessage == null) {
|
||||
if (showingError) {
|
||||
// we were previously showing an error
|
||||
showingError = false;
|
||||
}
|
||||
// show the message
|
||||
// avoid calling setMessage in case it is overridden to call
|
||||
// setErrorMessage,
|
||||
// which would result in a recursive infinite loop
|
||||
if (message == null) // this should probably never happen since
|
||||
// setMessage does this conversion....
|
||||
message = ""; //$NON-NLS-1$
|
||||
updateMessage(message);
|
||||
messageImageLabel.setImage(messageImage);
|
||||
setImageLabelVisible(messageImage != null);
|
||||
} else {
|
||||
// Add in a space for layout purposes but do not
|
||||
// change the instance variable
|
||||
String displayedErrorMessage = " " + errorMessage; //$NON-NLS-1$
|
||||
updateMessage(displayedErrorMessage);
|
||||
if (!showingError) {
|
||||
// we were not previously showing an error
|
||||
showingError = true;
|
||||
messageImageLabel.setImage(JFaceResources.getImage(DLG_IMG_TITLE_ERROR));
|
||||
setImageLabelVisible(true);
|
||||
}
|
||||
}
|
||||
layoutForNewMessage(false);
|
||||
}
|
||||
|
||||
/**
|
||||
* Re-layout the labels for the new message.
|
||||
*
|
||||
* @param forceLayout <code>true</code> to force a layout of the shell
|
||||
*/
|
||||
protected void layoutForNewMessage(boolean forceLayout) {
|
||||
int verticalSpacing = convertVerticalDLUsToPixels(IDialogConstants.VERTICAL_SPACING);
|
||||
int horizontalSpacing = convertHorizontalDLUsToPixels(IDialogConstants.HORIZONTAL_SPACING);
|
||||
// If there are no images then layout as normal
|
||||
if (errorMessage == null && messageImage == null) {
|
||||
setImageLabelVisible(false);
|
||||
setLayoutsForNormalMessage(verticalSpacing, horizontalSpacing);
|
||||
} else {
|
||||
messageImageLabel.setVisible(true);
|
||||
bottomFillerLabel.setVisible(true);
|
||||
leftFillerLabel.setVisible(true);
|
||||
/**
|
||||
* Note that we do not use horizontalSpacing here as when the background of the messages changes there will
|
||||
* be gaps between the icon label and the message that are the background color of the shell. We add a
|
||||
* leading space elsewhere to compendate for this.
|
||||
*/
|
||||
FormData data = new FormData();
|
||||
data.left = new FormAttachment(0, H_GAP_IMAGE);
|
||||
data.top = new FormAttachment(titleLabel, verticalSpacing);
|
||||
messageImageLabel.setLayoutData(data);
|
||||
data = new FormData();
|
||||
data.top = new FormAttachment(messageImageLabel, 0);
|
||||
data.left = new FormAttachment(0, 0);
|
||||
data.bottom = new FormAttachment(messageLabel, 0, SWT.BOTTOM);
|
||||
data.right = new FormAttachment(messageImageLabel, 0, SWT.RIGHT);
|
||||
bottomFillerLabel.setLayoutData(data);
|
||||
data = new FormData();
|
||||
data.top = new FormAttachment(messageImageLabel, 0, SWT.TOP);
|
||||
data.left = new FormAttachment(0, 0);
|
||||
data.bottom = new FormAttachment(messageImageLabel, 0, SWT.BOTTOM);
|
||||
data.right = new FormAttachment(messageImageLabel, 0);
|
||||
leftFillerLabel.setLayoutData(data);
|
||||
FormData messageLabelData = new FormData();
|
||||
messageLabelData.top = new FormAttachment(titleLabel, verticalSpacing);
|
||||
messageLabelData.right = new FormAttachment(titleImageLabel);
|
||||
messageLabelData.left = new FormAttachment(messageImageLabel, 0);
|
||||
messageLabelData.height = messageLabelHeight;
|
||||
if (titleImageLargest)
|
||||
messageLabelData.bottom = new FormAttachment(titleImageLabel, 0, SWT.BOTTOM);
|
||||
messageLabel.setLayoutData(messageLabelData);
|
||||
}
|
||||
|
||||
if (forceLayout) {
|
||||
getShell().layout();
|
||||
} else {
|
||||
// Do not layout before the dialog area has been created
|
||||
// to avoid incomplete calculations.
|
||||
if (dialogArea != null)
|
||||
workArea.getParent().layout(true);
|
||||
}
|
||||
|
||||
Point messageSize = messageLabel.getSize();
|
||||
int messageLabelUnclippedHeight = messageLabel.computeSize(messageSize.x, SWT.DEFAULT, true).y;
|
||||
boolean messageLabelClipped = messageLabelUnclippedHeight > messageSize.y;
|
||||
if (messageLabel.getData() instanceof ToolTip) {
|
||||
ToolTip toolTip = (ToolTip) messageLabel.getData();
|
||||
toolTip.hide();
|
||||
toolTip.deactivate();
|
||||
messageLabel.setData(null);
|
||||
}
|
||||
if (messageLabelClipped) {
|
||||
ToolTip tooltip = new ToolTip(messageLabel, ToolTip.NO_RECREATE, false) {
|
||||
|
||||
@Override
|
||||
protected Composite createToolTipContentArea(Event event, Composite parent) {
|
||||
Composite result = new Composite(parent, SWT.NONE);
|
||||
result.setBackground(parent.getDisplay().getSystemColor(SWT.COLOR_INFO_BACKGROUND));
|
||||
result.setLayout(new GridLayout());
|
||||
Text text = new Text(result, SWT.WRAP);
|
||||
text.setBackground(parent.getDisplay().getSystemColor(SWT.COLOR_INFO_BACKGROUND));
|
||||
text.setForeground(parent.getDisplay().getSystemColor(SWT.COLOR_INFO_FOREGROUND));
|
||||
text.setText(messageLabel.getText());
|
||||
GridData gridData = new GridData();
|
||||
gridData.widthHint = messageSize.x;
|
||||
text.setLayoutData(gridData);
|
||||
Dialog.applyDialogFont(result);
|
||||
return result;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Point getLocation(Point tipSize, Event event) {
|
||||
return messageLabel.getShell().toDisplay(messageLabel.getLocation());
|
||||
}
|
||||
};
|
||||
messageLabel.setData(tooltip);
|
||||
tooltip.setPopupDelay(0);
|
||||
tooltip.activate();
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Set the message text. If the message line currently displays an error, the message is saved and will be
|
||||
* redisplayed when the error message is set to <code>null</code>.
|
||||
* <p>
|
||||
* Shortcut for <code>setMessage(newMessage, IMessageProvider.NONE)</code>
|
||||
* </p>
|
||||
* This method should be called after the dialog has been opened as it updates the message label immediately.
|
||||
*
|
||||
* @param newMessage the message, or <code>null</code> to clear the message
|
||||
*/
|
||||
public void setMessage(String newMessage) {
|
||||
setMessage(newMessage, IMessageProvider.NONE);
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets the message for this dialog with an indication of what type of message it is.
|
||||
* <p>
|
||||
* The valid message types are one of <code>NONE</code>, <code>INFORMATION</code>,<code>WARNING</code>, or
|
||||
* <code>ERROR</code>.
|
||||
* </p>
|
||||
* <p>
|
||||
* Note that for backward compatibility, a message of type <code>ERROR</code> is different than an error message
|
||||
* (set using <code>setErrorMessage</code>). An error message overrides the current message until the error message
|
||||
* is cleared. This method replaces the current message and does not affect the error message.
|
||||
* </p>
|
||||
*
|
||||
* @param newMessage the message, or <code>null</code> to clear the message
|
||||
* @param newType the message type
|
||||
* @since 2.0
|
||||
*/
|
||||
public void setMessage(String newMessage, int newType) {
|
||||
Image newImage = null;
|
||||
if (newMessage != null) {
|
||||
switch (newType) {
|
||||
case IMessageProvider.NONE:
|
||||
break;
|
||||
case IMessageProvider.INFORMATION:
|
||||
newImage = JFaceResources.getImage(DLG_IMG_MESSAGE_INFO);
|
||||
break;
|
||||
case IMessageProvider.WARNING:
|
||||
newImage = JFaceResources.getImage(DLG_IMG_MESSAGE_WARNING);
|
||||
break;
|
||||
case IMessageProvider.ERROR:
|
||||
newImage = JFaceResources.getImage(DLG_IMG_MESSAGE_ERROR);
|
||||
break;
|
||||
}
|
||||
}
|
||||
showMessage(newMessage, newImage);
|
||||
}
|
||||
|
||||
/**
|
||||
* Show the new message and image.
|
||||
*
|
||||
* @param newMessage
|
||||
* @param newImage
|
||||
*/
|
||||
protected void showMessage(String newMessage, Image newImage) {
|
||||
// https://bugs.eclipse.org/bugs/show_bug.cgi?id=249915
|
||||
if (newMessage == null)
|
||||
newMessage = ""; //$NON-NLS-1$
|
||||
|
||||
// Any change?
|
||||
if (message.equals(newMessage) && messageImage == newImage) {
|
||||
return;
|
||||
}
|
||||
message = newMessage;
|
||||
|
||||
// Message string to be shown - if there is an image then add in
|
||||
// a space to the message for layout purposes
|
||||
String shownMessage = (newImage == null) ? message : " " + message; //$NON-NLS-1$
|
||||
messageImage = newImage;
|
||||
if (!showingError) {
|
||||
// we are not showing an error
|
||||
updateMessage(shownMessage);
|
||||
messageImageLabel.setImage(messageImage);
|
||||
setImageLabelVisible(messageImage != null);
|
||||
layoutForNewMessage(false);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Update the contents of the messageLabel.
|
||||
*
|
||||
* @param newMessage the message to use
|
||||
*/
|
||||
protected void updateMessage(String newMessage) {
|
||||
String oldMessage = messageLabel.getText();
|
||||
messageLabel.setText(newMessage);
|
||||
// Bug 248410 - This snippet will only work with Windows screen readers.
|
||||
messageLabel.getAccessible().sendEvent(ACC.EVENT_ATTRIBUTE_CHANGED, null);
|
||||
messageLabel.getAccessible().sendEvent(ACC.EVENT_TEXT_CHANGED, new Object[] { Integer.valueOf(ACC.TEXT_DELETE),
|
||||
Integer.valueOf(0), Integer.valueOf(oldMessage.length()), oldMessage });
|
||||
messageLabel.getAccessible().sendEvent(ACC.EVENT_TEXT_CHANGED, new Object[] { Integer.valueOf(ACC.TEXT_INSERT),
|
||||
Integer.valueOf(0), Integer.valueOf(newMessage.length()), newMessage });
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets the title to be shown in the title area of this dialog.
|
||||
*
|
||||
* @param newTitle the title show
|
||||
*/
|
||||
public void setTitle(String newTitle) {
|
||||
if (titleLabel == null)
|
||||
return;
|
||||
String title = newTitle;
|
||||
if (title == null)
|
||||
title = "";//$NON-NLS-1$
|
||||
titleLabel.setText(title);
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets the title bar color for this dialog.
|
||||
*
|
||||
* @param color the title bar color
|
||||
*/
|
||||
public void setTitleAreaColor(RGB color) {
|
||||
titleAreaRGB = color;
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets the title image to be shown in the title area of this dialog.
|
||||
*
|
||||
* @param newTitleImage the title image to be shown
|
||||
*/
|
||||
public void setTitleImage(Image newTitleImage) {
|
||||
|
||||
titleAreaImage = newTitleImage;
|
||||
if (titleImageLabel != null) {
|
||||
titleImageLabel.setImage(newTitleImage);
|
||||
determineTitleImageLargest();
|
||||
Control top;
|
||||
if (titleImageLargest)
|
||||
top = titleImageLabel;
|
||||
else
|
||||
top = messageLabel;
|
||||
resetWorkAreaAttachments(top);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Make the label used for displaying error images visible depending on boolean.
|
||||
*
|
||||
* @param visible If <code>true</code> make the image visible, if not then make it not visible.
|
||||
*/
|
||||
protected void setImageLabelVisible(boolean visible) {
|
||||
messageImageLabel.setVisible(visible);
|
||||
bottomFillerLabel.setVisible(visible);
|
||||
leftFillerLabel.setVisible(visible);
|
||||
}
|
||||
|
||||
/**
|
||||
* Reset the attachment of the workArea to now attach to top as the top control.
|
||||
*
|
||||
* @param top
|
||||
*/
|
||||
protected void resetWorkAreaAttachments(Control top) {
|
||||
FormData childData = new FormData();
|
||||
childData.top = new FormAttachment(top);
|
||||
childData.right = new FormAttachment(100, 0);
|
||||
childData.left = new FormAttachment(0, 0);
|
||||
childData.bottom = new FormAttachment(100, 0);
|
||||
workArea.setLayoutData(childData);
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns the current message text for this dialog. This message is displayed in the message line of the dialog
|
||||
* when the error message is <code>null</code>. If there is a non-null error message, this message is not shown, but
|
||||
* is stored so that it can be shown in the message line whenever {@link #setErrorMessage(String)} is called with a
|
||||
* <code>null</code> parameter.
|
||||
*
|
||||
* @return the message text, which is never <code>null</code>.
|
||||
*
|
||||
* @see #setMessage(String)
|
||||
* @see #setErrorMessage(String)
|
||||
*
|
||||
* @since 3.6
|
||||
*/
|
||||
|
||||
public String getMessage() {
|
||||
return message;
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns the current error message being shown in the dialog, or <code>null</code> if there is no error message
|
||||
* being shown.
|
||||
*
|
||||
* @return the error message, which may be <code>null</code>.
|
||||
*
|
||||
* @see #setErrorMessage(String)
|
||||
* @see #setMessage(String)
|
||||
*
|
||||
* @since 3.6
|
||||
*/
|
||||
|
||||
public String getErrorMessage() {
|
||||
return errorMessage;
|
||||
}
|
||||
}
|
||||
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,233 @@
|
||||
// ============================================================================
|
||||
//
|
||||
// Copyright (C) 2006-2021 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.commons.ui.swt.formtools;
|
||||
|
||||
import org.eclipse.swt.SWT;
|
||||
import org.eclipse.swt.events.FocusListener;
|
||||
import org.eclipse.swt.events.SelectionListener;
|
||||
import org.eclipse.swt.layout.GridData;
|
||||
import org.eclipse.swt.widgets.Button;
|
||||
import org.eclipse.swt.widgets.Composite;
|
||||
import org.eclipse.swt.widgets.Control;
|
||||
import org.eclipse.swt.widgets.Label;
|
||||
import org.eclipse.swt.widgets.Listener;
|
||||
|
||||
/**
|
||||
* Create a Label and a Checkbox.
|
||||
*/
|
||||
public class LabelledCheckbox implements LabelledWidget{
|
||||
|
||||
private Button button;
|
||||
|
||||
private Label label;
|
||||
|
||||
/**
|
||||
* Create a Label and a Text.
|
||||
*
|
||||
* @param composite
|
||||
* @param string
|
||||
*/
|
||||
public LabelledCheckbox(Composite composite, String string) {
|
||||
createLabelledButton(composite, string, 1, true);
|
||||
}
|
||||
|
||||
/**
|
||||
* Create a Label and a Text.
|
||||
*
|
||||
* @param composite
|
||||
* @param string
|
||||
* @param isFill
|
||||
*/
|
||||
public LabelledCheckbox(Composite composite, String string, boolean isFill) {
|
||||
createLabelledButton(composite, string, 1, isFill);
|
||||
}
|
||||
|
||||
/**
|
||||
* Create a Label and a Button width specific styleField.
|
||||
*
|
||||
* @param composite
|
||||
* @param string
|
||||
* @param int horizontalSpan
|
||||
*/
|
||||
public LabelledCheckbox(Composite composite, String string, int horizontalSpan) {
|
||||
createLabelledButton(composite, string, horizontalSpan, true);
|
||||
}
|
||||
|
||||
/**
|
||||
* Create a Label and a Button width specific styleField.
|
||||
*
|
||||
* @param composite
|
||||
* @param string
|
||||
* @param int horizontalSpan
|
||||
* @param styleField
|
||||
*/
|
||||
public LabelledCheckbox(Composite composite, String string, int horizontalSpan, int styleField) {
|
||||
createLabelledButton(composite, string, horizontalSpan, true);
|
||||
}
|
||||
|
||||
/**
|
||||
* Create a Label and a Button width Gridata option FILL.
|
||||
*
|
||||
* @param composite
|
||||
* @param string
|
||||
* @param styleField
|
||||
* @param int horizontalSpan
|
||||
* @param isFill
|
||||
*/
|
||||
public LabelledCheckbox(Composite composite, String string, int horizontalSpan, boolean isFill) {
|
||||
createLabelledButton(composite, string, horizontalSpan, isFill);
|
||||
}
|
||||
|
||||
/**
|
||||
* Create a Label and a Button width specific styleField and Gridata option FILL.
|
||||
*
|
||||
* @param composite
|
||||
* @param string
|
||||
* @param int horizontalSpan
|
||||
* @param styleField
|
||||
* @param isFill
|
||||
*/
|
||||
public LabelledCheckbox(Composite composite, String string, int horizontalSpan, int styleField, boolean isFill) {
|
||||
createLabelledButton(composite, string, horizontalSpan, isFill);
|
||||
}
|
||||
|
||||
/**
|
||||
* Create a Label and a Button width specific styleField and Gridata option FILL.
|
||||
*
|
||||
* @param composite
|
||||
* @param string
|
||||
* @param int horizontalSpan
|
||||
* @param styleField
|
||||
* @param isFill
|
||||
*/
|
||||
private void createLabelledButton(Composite composite, String string, int horizontalSpan, boolean isFill) {
|
||||
label = new Label(composite, SWT.LEFT);
|
||||
if (string != null) {
|
||||
label.setText(string);
|
||||
}
|
||||
|
||||
button = new Button(composite, SWT.CHECK);
|
||||
int gridDataStyle = SWT.NONE;
|
||||
if (isFill) {
|
||||
gridDataStyle = SWT.FILL;
|
||||
}
|
||||
GridData gridData = new GridData(gridDataStyle, SWT.CENTER, true, false);
|
||||
gridData.horizontalSpan = horizontalSpan;
|
||||
button.setLayoutData(gridData);
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* setToolTipText to Text Object.
|
||||
*
|
||||
* @param string
|
||||
*/
|
||||
public void setToolTipText(final String string) {
|
||||
button.setToolTipText(string);
|
||||
}
|
||||
|
||||
/**
|
||||
* is Checkbox Selected.
|
||||
*
|
||||
* @return boolean
|
||||
*/
|
||||
public Boolean isSelected() {
|
||||
return button.getSelection();
|
||||
}
|
||||
|
||||
/**
|
||||
* setText to Label Object.
|
||||
*
|
||||
* @param string
|
||||
*/
|
||||
public void setLabelText(final String string) {
|
||||
if (string != null) {
|
||||
label.setText(string);
|
||||
} else {
|
||||
label.setText(""); //$NON-NLS-1$
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* setEditable to Button and Label Object.
|
||||
*
|
||||
* @param boolean
|
||||
*/
|
||||
public void forceFocus() {
|
||||
setEnabled(true);
|
||||
button.forceFocus();
|
||||
}
|
||||
|
||||
/**
|
||||
* setEnabled to Button and Label Object.
|
||||
*
|
||||
* @param boolean
|
||||
*/
|
||||
public void setEnabled(final boolean visible) {
|
||||
button.setEnabled(visible);
|
||||
label.setEnabled(visible);
|
||||
}
|
||||
|
||||
/**
|
||||
* setVisible to Button and Label Object.
|
||||
*
|
||||
* @param boolean
|
||||
*/
|
||||
public void setVisible(final boolean visible) {
|
||||
button.setVisible(visible);
|
||||
label.setVisible(visible);
|
||||
}
|
||||
|
||||
public void setVisible(final boolean visible, final boolean exclude) {
|
||||
Control[] controls = new Control[] { label, button };
|
||||
for (Control control : controls) {
|
||||
control.setVisible(visible);
|
||||
if (control.getLayoutData() instanceof GridData) {
|
||||
((GridData) control.getLayoutData()).exclude = exclude;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* addListener to Button Object.
|
||||
*
|
||||
* @param eventType
|
||||
* @param listener
|
||||
*/
|
||||
public void addListener(int eventType, Listener listener) {
|
||||
button.addListener(eventType, listener);
|
||||
}
|
||||
|
||||
/**
|
||||
* addFocusListener to Button Object.
|
||||
*
|
||||
* @param listener
|
||||
*/
|
||||
public void addFocusListener(FocusListener listener) {
|
||||
button.addFocusListener(listener);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void set(String value) {
|
||||
button.setSelection(Boolean.parseBoolean(value));
|
||||
}
|
||||
|
||||
public void addSelectionListener(SelectionListener listener) {
|
||||
button.addSelectionListener(listener);
|
||||
}
|
||||
|
||||
public boolean getSelection() {
|
||||
return button.getSelection();
|
||||
}
|
||||
}
|
||||
@@ -33,7 +33,7 @@ import org.eclipse.swt.widgets.Text;
|
||||
* $Id: LabelledText.java 7038 2007-11-15 14:05:48Z plegall $
|
||||
*
|
||||
*/
|
||||
public class LabelledText {
|
||||
public class LabelledText implements LabelledWidget{
|
||||
|
||||
private Text text;
|
||||
|
||||
@@ -297,6 +297,16 @@ public class LabelledText {
|
||||
label.setVisible(visible);
|
||||
}
|
||||
|
||||
public void setVisible(final boolean visible, final boolean exclude) {
|
||||
Control[] controls = new Control[] { label, text };
|
||||
for (Control control : controls) {
|
||||
control.setVisible(visible);
|
||||
if (control.getLayoutData() instanceof GridData) {
|
||||
((GridData) control.getLayoutData()).exclude = exclude;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public boolean isVisiable() {
|
||||
return text.isVisible() && label.isVisible();
|
||||
}
|
||||
@@ -472,4 +482,9 @@ public class LabelledText {
|
||||
text.getParent().layout();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void set(String value) {
|
||||
this.setText(value);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -0,0 +1,9 @@
|
||||
package org.talend.commons.ui.swt.formtools;
|
||||
|
||||
public interface LabelledWidget {
|
||||
|
||||
// Set the value of the widget
|
||||
public void set(String value);
|
||||
|
||||
public void setVisible(boolean visible, boolean exclude);
|
||||
}
|
||||
@@ -0,0 +1,28 @@
|
||||
// ============================================================================
|
||||
//
|
||||
// Copyright (C) 2006-2021 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.commons.ui.swt.wizard;
|
||||
|
||||
|
||||
/**
|
||||
* DOC cmeng class global comment. Detailled comment
|
||||
*/
|
||||
public class TalendWizard {
|
||||
|
||||
/**
|
||||
* DOC cmeng TalendWizard constructor comment.
|
||||
*/
|
||||
public TalendWizard() {
|
||||
// TODO Auto-generated constructor stub
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,55 @@
|
||||
// ============================================================================
|
||||
//
|
||||
// Copyright (C) 2006-2021 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.commons.ui.swt.wizard;
|
||||
|
||||
import org.eclipse.jface.dialogs.Dialog;
|
||||
import org.eclipse.swt.widgets.Composite;
|
||||
import org.eclipse.swt.widgets.Control;
|
||||
import org.eclipse.swt.widgets.Shell;
|
||||
|
||||
|
||||
/**
|
||||
* DOC cmeng class global comment. Detailled comment
|
||||
*/
|
||||
public class TalendWizardDialog extends Dialog {
|
||||
|
||||
public TalendWizardDialog(Shell parentShell) {
|
||||
super(parentShell);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected Control createContents(Composite parent) {
|
||||
return super.createContents(parent);
|
||||
}
|
||||
|
||||
public static void main(String[] args) throws Exception {
|
||||
int sleep = 1000 / 60;
|
||||
double time = 1.0 / 50;
|
||||
int total = 0;
|
||||
for (int i = 1; i <= 25; i++) {
|
||||
double curTime = time * i;
|
||||
double value = 1.0 - Math.sqrt(1 - curTime * curTime);
|
||||
int lengh = (int) (250 * value);
|
||||
total += lengh;
|
||||
System.out.println(i + "\t:" + lengh + ", total: " + total);
|
||||
}
|
||||
for (int i = 25; i <= 50; i++) {
|
||||
double curTime = 1 - time * i;
|
||||
double value = 1.0 - Math.sqrt(1 - curTime * curTime);
|
||||
int lengh = (int) (250 * value);
|
||||
total += lengh;
|
||||
System.out.println(i + "\t:" + lengh + ", total: " + total);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,28 @@
|
||||
// ============================================================================
|
||||
//
|
||||
// Copyright (C) 2006-2021 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.commons.ui.swt.wizard;
|
||||
|
||||
|
||||
/**
|
||||
* DOC cmeng class global comment. Detailled comment
|
||||
*/
|
||||
public class TalendWizardPage {
|
||||
|
||||
/**
|
||||
* DOC cmeng TalendWizardPage constructor comment.
|
||||
*/
|
||||
public TalendWizardPage() {
|
||||
// TODO Auto-generated constructor stub
|
||||
}
|
||||
|
||||
}
|
||||
@@ -3,7 +3,7 @@ Automatic-Module-Name: org.talend.core.repository
|
||||
Bundle-ManifestVersion: 2
|
||||
Bundle-Name: Core Repository Plug-in
|
||||
Bundle-SymbolicName: org.talend.core.repository;singleton:=true
|
||||
Bundle-Version: 8.8.8.qualifier
|
||||
Bundle-Version: 8.0.1.qualifier
|
||||
Require-Bundle: org.eclipse.ui,
|
||||
org.eclipse.ui.ide,
|
||||
org.apache.commons.collections,
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tcommon-studio-se</artifactId>
|
||||
<version>8.8.8-SNAPSHOT</version>
|
||||
<version>8.0.1-SNAPSHOT</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.core.repository</artifactId>
|
||||
|
||||
@@ -168,7 +168,8 @@ ProjectRepositoryNode.sapFunctions.inputSchema=Input
|
||||
ProjectRepositoryNode.sapFunctions.outputSchema=Output
|
||||
ProjectRepositoryNode.sapIDocs=SAP iDocs
|
||||
ProjectRepositoryNode.sapTables=SAP Tables
|
||||
ProjectRepositoryNode.sapBWAdvancedDataStoreObject=SAP ADSO
|
||||
ProjectRepositoryNode.sapBWAdvancedDataStoreObject.input=SAP ADSO (Input)
|
||||
ProjectRepositoryNode.sapBWAdvancedDataStoreObject.output=SAP ADSO (Output)
|
||||
ProjectRepositoryNode.sapBWDataSource=SAP DataSource
|
||||
ProjectRepositoryNode.sapBWDataStoreObject=SAP DSO
|
||||
ProjectRepositoryNode.sapBWInfoCube=SAP InfoCube
|
||||
|
||||
@@ -168,7 +168,8 @@ ProjectRepositoryNode.sapFunctions.inputSchema=Lecture
|
||||
ProjectRepositoryNode.sapFunctions.outputSchema=Sortie
|
||||
ProjectRepositoryNode.sapIDocs=SAP IDoc
|
||||
ProjectRepositoryNode.sapTables=Tables SAP
|
||||
ProjectRepositoryNode.sapBWAdvancedDataStoreObject=ADSO SAP
|
||||
ProjectRepositoryNode.sapBWAdvancedDataStoreObject.input=SAP ADSO (Entr\u00E9e)
|
||||
ProjectRepositoryNode.sapBWAdvancedDataStoreObject.output=SAP ADSO (Sortie)
|
||||
ProjectRepositoryNode.sapBWDataSource=Source des donn\u00E9es SAP
|
||||
ProjectRepositoryNode.sapBWDataStoreObject=Objet Data Store SAP
|
||||
ProjectRepositoryNode.sapBWInfoCube=InfoCube SAP
|
||||
|
||||
@@ -168,7 +168,8 @@ ProjectRepositoryNode.sapFunctions.inputSchema=\u5165\u529B
|
||||
ProjectRepositoryNode.sapFunctions.outputSchema=\u51FA\u529B
|
||||
ProjectRepositoryNode.sapIDocs=SAP iDocs
|
||||
ProjectRepositoryNode.sapTables=SAP\u30C6\u30FC\u30D6\u30EB
|
||||
ProjectRepositoryNode.sapBWAdvancedDataStoreObject=SAP ADSO
|
||||
ProjectRepositoryNode.sapBWAdvancedDataStoreObject.input=SAP ADSO (\u5165\u529B)
|
||||
ProjectRepositoryNode.sapBWAdvancedDataStoreObject.output=SAP ADSO (\u51FA\u529B)
|
||||
ProjectRepositoryNode.sapBWDataSource=SAP DataSource
|
||||
ProjectRepositoryNode.sapBWDataStoreObject=SAP DSO
|
||||
ProjectRepositoryNode.sapBWInfoCube=SAP InfoCube
|
||||
|
||||
@@ -168,7 +168,8 @@ ProjectRepositoryNode.sapFunctions.inputSchema=\u8F93\u5165
|
||||
ProjectRepositoryNode.sapFunctions.outputSchema=\u8F93\u51FA
|
||||
ProjectRepositoryNode.sapIDocs=SAP iDocs
|
||||
ProjectRepositoryNode.sapTables=SAP \u8868
|
||||
ProjectRepositoryNode.sapBWAdvancedDataStoreObject=SAP ADSO
|
||||
ProjectRepositoryNode.sapBWAdvancedDataStoreObject.input=SAP ADSO (\u8F93\u5165)
|
||||
ProjectRepositoryNode.sapBWAdvancedDataStoreObject.output=SAP ADSO (\u8F93\u51FA)
|
||||
ProjectRepositoryNode.sapBWDataSource=SAP DataSource
|
||||
ProjectRepositoryNode.sapBWDataStoreObject=SAP DSO
|
||||
ProjectRepositoryNode.sapBWInfoCube=SAP InfoCube
|
||||
|
||||
@@ -74,6 +74,7 @@ import org.talend.core.model.properties.ValidationRulesConnectionItem;
|
||||
import org.talend.core.model.repository.DynaEnum;
|
||||
import org.talend.core.model.repository.ERepositoryObjectType;
|
||||
import org.talend.core.model.repository.Folder;
|
||||
import org.talend.core.model.repository.GITConstant;
|
||||
import org.talend.core.model.repository.IRepositoryContentHandler;
|
||||
import org.talend.core.model.repository.IRepositoryObject;
|
||||
import org.talend.core.model.repository.IRepositoryPrefConstants;
|
||||
@@ -82,7 +83,6 @@ import org.talend.core.model.repository.RepositoryContentManager;
|
||||
import org.talend.core.model.repository.RepositoryManager;
|
||||
import org.talend.core.model.repository.RepositoryNodeProviderRegistryReader;
|
||||
import org.talend.core.model.repository.RepositoryViewObject;
|
||||
import org.talend.core.model.repository.GITConstant;
|
||||
import org.talend.core.repository.i18n.Messages;
|
||||
import org.talend.core.repository.model.repositoryObject.MetadataColumnRepositoryObject;
|
||||
import org.talend.core.repository.model.repositoryObject.MetadataTableRepositoryObject;
|
||||
@@ -368,8 +368,8 @@ public class ProjectRepositoryNode extends RepositoryNode implements IProjectRep
|
||||
}
|
||||
String[] contentRight = contentType.getUserRight();
|
||||
if (contentRight != null && contentRight.length > 0 && userRights != null && userRights.length > 0) {
|
||||
for (int i = 0; i < contentRight.length; i++) {
|
||||
if (!ArrayUtils.contains(userRights, contentRight[i])) {
|
||||
for (String element : contentRight) {
|
||||
if (!ArrayUtils.contains(userRights, element)) {
|
||||
removeNode(this, node);
|
||||
}
|
||||
}
|
||||
@@ -1731,22 +1731,25 @@ public class ProjectRepositoryNode extends RepositoryNode implements IProjectRep
|
||||
node.getChildren().add(iDocNode);
|
||||
createSAPIDocNodes(repObj, metadataConnection, iDocNode);
|
||||
|
||||
// 4. BW AdvancedDataStoreObject:
|
||||
createSAPBWAdvancedDataStoreObjectNodes(repObj, metadataConnection, node, validationRules);
|
||||
// 4. BW AdvancedDataStoreObject Input:
|
||||
createSAPBWAdvancedDataStoreObjectInputNodes(repObj, metadataConnection, node, validationRules);
|
||||
|
||||
// 5. BW DataSource:
|
||||
// 5. BW AdvancedDataStoreObject Output:
|
||||
createSAPBWAdvancedDataStoreObjectOutputNodes(repObj, metadataConnection, node, validationRules);
|
||||
|
||||
// 6. BW DataSource:
|
||||
createSAPBWDataSourceNodes(repObj, metadataConnection, node, validationRules);
|
||||
|
||||
// 6. BW DataStoreObject:
|
||||
// 7. BW DataStoreObject:
|
||||
createSAPBWDataStoreObjectNodes(repObj, metadataConnection, node, validationRules);
|
||||
|
||||
// 7. BW InfoCube:
|
||||
// 8. BW InfoCube:
|
||||
createSAPBWInfoCubeNodes(repObj, metadataConnection, node, validationRules);
|
||||
|
||||
// 8. BW InfoObject:
|
||||
// 9. BW InfoObject:
|
||||
createSAPBWInfoObjectNodes(repObj, metadataConnection, node, validationRules);
|
||||
|
||||
// 8. BW Business Content Extractor:
|
||||
// 10. BW Business Content Extractor:
|
||||
createSAPContentExtractorNodes(repObj, metadataConnection, node, validationRules);
|
||||
} else if (metadataConnection instanceof SalesforceSchemaConnection) {
|
||||
createSalesforceModuleNodes(repObj, metadataConnection, node, validationRules);
|
||||
@@ -1789,12 +1792,12 @@ public class ProjectRepositoryNode extends RepositoryNode implements IProjectRep
|
||||
|
||||
}
|
||||
|
||||
private void createSAPBWAdvancedDataStoreObjectNodes(IRepositoryViewObject repObj, Connection metadataConnection,
|
||||
private void createSAPBWAdvancedDataStoreObjectInputNodes(IRepositoryViewObject repObj, Connection metadataConnection,
|
||||
RepositoryNode node, List<IRepositoryViewObject> validationRules) {
|
||||
StableRepositoryNode container = new StableRepositoryNode(node,
|
||||
Messages.getString("ProjectRepositoryNode.sapBWAdvancedDataStoreObject"), ECoreImage.FOLDER_CLOSE_ICON); //$NON-NLS-1$
|
||||
Messages.getString("ProjectRepositoryNode.sapBWAdvancedDataStoreObject.input"), ECoreImage.FOLDER_CLOSE_ICON); //$NON-NLS-1$
|
||||
container.setChildrenObjectType(ERepositoryObjectType.METADATA_CON_TABLE);
|
||||
container.setProperties(EProperties.CONTENT_TYPE, ERepositoryObjectType.METADATA_SAP_BW_ADVANCEDDATASTOREOBJECT);
|
||||
container.setProperties(EProperties.CONTENT_TYPE, ERepositoryObjectType.METADATA_SAP_BW_ADVANCEDDATASTOREOBJECT_INPUT);
|
||||
|
||||
IRepositoryNode cacheNode = nodeCache.getCache(container);
|
||||
if (cacheNode != null && cacheNode instanceof StableRepositoryNode) {
|
||||
@@ -1806,8 +1809,38 @@ public class ProjectRepositoryNode extends RepositoryNode implements IProjectRep
|
||||
node.getChildren().add(container);
|
||||
|
||||
EList<SAPBWTable> advancedDataStoreObjects = ((SAPConnection) metadataConnection).getBWAdvancedDataStoreObjects();
|
||||
EList tables = new BasicEList();
|
||||
tables.addAll(advancedDataStoreObjects);
|
||||
EList<SAPBWTable> tables = new BasicEList<SAPBWTable>();
|
||||
for (SAPBWTable bwTable : advancedDataStoreObjects) {
|
||||
if (!SAPBWTableHelper.ADSO_OUTPUT.equals(bwTable.getCategory())) {
|
||||
tables.add(bwTable);
|
||||
}
|
||||
}
|
||||
createTables(container, repObj, tables, ERepositoryObjectType.METADATA_CON_TABLE, validationRules);
|
||||
}
|
||||
|
||||
private void createSAPBWAdvancedDataStoreObjectOutputNodes(IRepositoryViewObject repObj, Connection metadataConnection,
|
||||
RepositoryNode node, List<IRepositoryViewObject> validationRules) {
|
||||
StableRepositoryNode container = new StableRepositoryNode(node,
|
||||
Messages.getString("ProjectRepositoryNode.sapBWAdvancedDataStoreObject.output"), ECoreImage.FOLDER_CLOSE_ICON); //$NON-NLS-1$
|
||||
container.setChildrenObjectType(ERepositoryObjectType.METADATA_CON_TABLE);
|
||||
container.setProperties(EProperties.CONTENT_TYPE, ERepositoryObjectType.METADATA_SAP_BW_ADVANCEDDATASTOREOBJECT_OUTPUT);
|
||||
|
||||
IRepositoryNode cacheNode = nodeCache.getCache(container);
|
||||
if (cacheNode != null && cacheNode instanceof StableRepositoryNode) {
|
||||
container = (StableRepositoryNode) cacheNode;
|
||||
container.getChildren().clear();
|
||||
} else {
|
||||
nodeCache.addCache(container, true);
|
||||
}
|
||||
node.getChildren().add(container);
|
||||
|
||||
EList<SAPBWTable> advancedDataStoreObjects = ((SAPConnection) metadataConnection).getBWAdvancedDataStoreObjects();
|
||||
EList<SAPBWTable> tables = new BasicEList<SAPBWTable>();
|
||||
for (SAPBWTable bwTable : advancedDataStoreObjects) {
|
||||
if (SAPBWTableHelper.ADSO_OUTPUT.equals(bwTable.getCategory())) {
|
||||
tables.add(bwTable);
|
||||
}
|
||||
}
|
||||
createTables(container, repObj, tables, ERepositoryObjectType.METADATA_CON_TABLE, validationRules);
|
||||
}
|
||||
|
||||
@@ -1937,8 +1970,8 @@ public class ProjectRepositoryNode extends RepositoryNode implements IProjectRep
|
||||
private void createSalesforceModuleNodes(IRepositoryViewObject rebObj, Connection metadataConnection,
|
||||
RepositoryNode connectionNode, List<IRepositoryViewObject> validationRules) {
|
||||
EList modules = ((SalesforceSchemaConnection) metadataConnection).getModules();
|
||||
for (int i = 0; i < modules.size(); i++) {
|
||||
SalesforceModuleUnit unit = (SalesforceModuleUnit) modules.get(i);
|
||||
for (Object module : modules) {
|
||||
SalesforceModuleUnit unit = (SalesforceModuleUnit) module;
|
||||
RepositoryNode tableNode = createSalesforceNode(rebObj, connectionNode, unit);
|
||||
|
||||
createTables(tableNode, rebObj, unit.getTables(), ERepositoryObjectType.METADATA_CON_TABLE, validationRules);
|
||||
@@ -1961,8 +1994,8 @@ public class ProjectRepositoryNode extends RepositoryNode implements IProjectRep
|
||||
if (functions == null || functions.isEmpty()) {
|
||||
return;
|
||||
}
|
||||
for (int i = 0; i < functions.size(); i++) {
|
||||
SAPFunctionUnit unit = (SAPFunctionUnit) functions.get(i);
|
||||
for (Object function : functions) {
|
||||
SAPFunctionUnit unit = (SAPFunctionUnit) function;
|
||||
RepositoryNode tableNode = createSAPNode(rebObj, functionNode, unit);
|
||||
|
||||
// create input and output container
|
||||
@@ -2002,8 +2035,8 @@ public class ProjectRepositoryNode extends RepositoryNode implements IProjectRep
|
||||
if (iDocs == null || iDocs.isEmpty()) {
|
||||
return;
|
||||
}
|
||||
for (int i = 0; i < iDocs.size(); i++) {
|
||||
SAPIDocUnit unit = (SAPIDocUnit) iDocs.get(i);
|
||||
for (Object iDoc : iDocs) {
|
||||
SAPIDocUnit unit = (SAPIDocUnit) iDoc;
|
||||
RepositoryNode tableNode = createSAPNode(rebObj, iDocNode, unit);
|
||||
if (SubItemHelper.isDeleted(unit)) {
|
||||
// recBin.getChildren().add(tableNode);
|
||||
|
||||
@@ -155,6 +155,7 @@ import org.talend.core.runtime.util.ItemDateParser;
|
||||
import org.talend.core.runtime.util.JavaHomeUtil;
|
||||
import org.talend.core.runtime.util.SharedStudioUtils;
|
||||
import org.talend.core.service.ICoreUIService;
|
||||
import org.talend.core.service.IDetectCVEService;
|
||||
import org.talend.core.utils.CodesJarResourceCache;
|
||||
import org.talend.cwm.helper.SubItemHelper;
|
||||
import org.talend.cwm.helper.TableHelper;
|
||||
@@ -2607,6 +2608,14 @@ public final class ProxyRepositoryFactory implements IProxyRepositoryFactory {
|
||||
dynamicDistrManager.reset(null);
|
||||
}
|
||||
}
|
||||
|
||||
// clear detect CVE cache
|
||||
if (GlobalServiceRegister.getDefault().isServiceRegistered(IDetectCVEService.class)) {
|
||||
IDetectCVEService detectCVESvc = GlobalServiceRegister.getDefault().getService(IDetectCVEService.class);
|
||||
if (detectCVESvc != null) {
|
||||
detectCVESvc.clearCache();
|
||||
}
|
||||
}
|
||||
|
||||
CodesJarResourceCache.reset();
|
||||
|
||||
|
||||
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
|
||||
Bundle-ManifestVersion: 2
|
||||
Bundle-Name: Core Runtime Plug-in
|
||||
Bundle-SymbolicName: org.talend.core.runtime;singleton:=true
|
||||
Bundle-Version: 8.8.8.qualifier
|
||||
Bundle-Version: 8.0.1.qualifier
|
||||
Bundle-Localization: plugin
|
||||
Bundle-Vendor: .Talend SA.
|
||||
Export-Package: org.talend.analysistask,
|
||||
@@ -137,3 +137,7 @@ Bundle-ClassPath: .,
|
||||
lib/delight-rhino-sandbox-0.0.15.jar,
|
||||
lib/rhino-1.7.13.jar
|
||||
Eclipse-RegisterBuddy: org.talend.testutils
|
||||
Import-Package: org.talend.core.repository.model,
|
||||
org.talend.core.repository.services,
|
||||
org.talend.core.services
|
||||
|
||||
|
||||
@@ -16,7 +16,6 @@ bin.includes = META-INF/,\
|
||||
lib/delight-rhino-sandbox-0.0.15.jar,\
|
||||
lib/rhino-1.7.13.jar,\
|
||||
plugin_de.properties,\
|
||||
plugin_en.properties,\
|
||||
plugin_fr.properties,\
|
||||
plugin_it.properties,\
|
||||
plugin_ja.properties,\
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tcommon-studio-se</artifactId>
|
||||
<version>8.8.8-SNAPSHOT</version>
|
||||
<version>8.0.1-SNAPSHOT</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.core.runtime</artifactId>
|
||||
|
||||
@@ -39,4 +39,9 @@ public interface ITDQCryptoFileService extends IService {
|
||||
*/
|
||||
public void generateCryptoFile(String passwordM1, String cryptoMethod, String cryptoFilePath);
|
||||
|
||||
/**
|
||||
* Generate Encrypty file
|
||||
*/
|
||||
public void generateCryptoFile(String passwordM1, String cryptoMethod, String cryptoFilePath, int algoVersion);
|
||||
|
||||
}
|
||||
|
||||
@@ -0,0 +1,91 @@
|
||||
// ============================================================================
|
||||
//
|
||||
// Copyright (C) 2006-2022 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.database;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashSet;
|
||||
import java.util.List;
|
||||
import java.util.Set;
|
||||
|
||||
/**
|
||||
* DOC jding class global comment. Detailled comment
|
||||
*/
|
||||
public enum ERedshiftDriver {
|
||||
|
||||
DRIVER_V2("Driver v2", new String[] { "redshift-jdbc42-2.1.0.3.jar", "antlr4-runtime-4.8-1.jar" }),
|
||||
DRIVER_V1("Driver v1", new String[] { "redshift-jdbc42-no-awssdk-1.2.55.1083.jar", "antlr4-runtime-4.8-1.jar" });
|
||||
|
||||
private String displayName;
|
||||
|
||||
private Set<String> drivers = new HashSet<String>();
|
||||
|
||||
private ERedshiftDriver(String displayName, String[] driverStr) {
|
||||
this.displayName = displayName;
|
||||
for (String driver : driverStr) {
|
||||
drivers.add(driver);
|
||||
}
|
||||
}
|
||||
|
||||
public String getDisplayName() {
|
||||
return displayName;
|
||||
}
|
||||
|
||||
public void setDisplayName(String displayName) {
|
||||
this.displayName = displayName;
|
||||
}
|
||||
|
||||
public Set<String> getDrivers() {
|
||||
return drivers;
|
||||
}
|
||||
|
||||
public void setDrivers(Set<String> drivers) {
|
||||
this.drivers = drivers;
|
||||
}
|
||||
|
||||
public static Set<String> getDriversByVersion(String version) {
|
||||
Set<String> drivers = new HashSet<String>();
|
||||
ERedshiftDriver redshiftDriver = ERedshiftDriver.valueOf(version);
|
||||
if (redshiftDriver != null) {
|
||||
return redshiftDriver.getDrivers();
|
||||
}
|
||||
return drivers;
|
||||
}
|
||||
|
||||
public static String[] getRedshiftDriverDisplayNames() {
|
||||
List<String> names = new ArrayList<String>();
|
||||
for (ERedshiftDriver eRedshiftDriver : ERedshiftDriver.values()) {
|
||||
names.add(eRedshiftDriver.getDisplayName());
|
||||
}
|
||||
return names.toArray(new String[0]);
|
||||
}
|
||||
|
||||
public static String getDisplayNameByEName(String eName) {
|
||||
String displayName = eName;
|
||||
ERedshiftDriver eRedshiftDriver = ERedshiftDriver.valueOf(eName);
|
||||
if (eRedshiftDriver != null) {
|
||||
displayName = eRedshiftDriver.getDisplayName();
|
||||
}
|
||||
return displayName;
|
||||
}
|
||||
|
||||
public static String getEnameByDisplayName(String displayName) {
|
||||
String eName = DRIVER_V1.name();
|
||||
for (ERedshiftDriver eRedshiftDriver : ERedshiftDriver.values()) {
|
||||
if (eRedshiftDriver.getDisplayName().equals(displayName)) {
|
||||
eName = eRedshiftDriver.name();
|
||||
}
|
||||
}
|
||||
return eName;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -225,11 +225,19 @@ public class ConnParameterKeys {
|
||||
public static final String CONN_PARA_KEY_SYNAPSE_FS_HOSTNAME = "CONN_PARA_KEY_SYNAPSE_FS_HOSTNAME"; //$NON-NLS-1$
|
||||
|
||||
public static final String CONN_PARA_KEY_SYNAPSE_FS_CONTAINER = "CONN_PARA_KEY_SYNAPSE_FS_CONTAINER"; //$NON-NLS-1$
|
||||
|
||||
|
||||
public static final String CONN_PARA_KEY_SYNAPSE_AUTH_MODE = "CONN_PARA_KEY_SYNAPSE_AUTH_MODE";
|
||||
|
||||
public static final String CONN_PARA_KEY_SYNAPSE_FS_USERNAME = "CONN_PARA_KEY_SYNAPSE_FS_USERNAME"; //$NON-NLS-1$
|
||||
|
||||
|
||||
public static final String CONN_PARA_KEY_SYNAPSE_FS_PASSWORD = "CONN_PARA_KEY_SYNAPSE_FS_PASSWORD"; //$NON-NLS-1$
|
||||
|
||||
public static final String CONN_PARA_KEY_SYNAPSE_APPLICATION_ID = "CONN_PARA_KEY_SYNAPSE_APPLICATION_ID"; //$NON-NLS-1$
|
||||
|
||||
public static final String CONN_PARA_KEY_SYNAPSE_DIRECTORY_ID = "CONN_PARA_KEY_SYNAPSE_DIRECTORY_ID"; //$NON-NLS-1$
|
||||
|
||||
public static final String CONN_PARA_KEY_SYNAPSE_CLIENT_KEY = "CONN_PARA_KEY_SYNAPSE_CLIENT_KEY"; //$NON-NLS-1$
|
||||
|
||||
public static final String CONN_PARA_KEY_SYNAPSE_FS_STORAGE = "CONN_PARA_KEY_SYNAPSE_FS_STORAGE"; //$NON-NLS-1$
|
||||
|
||||
public static final String CONN_PARA_KEY_SYNAPSE_DEPLOY_BLOB = "CONN_PARA_KEY_SYNAPSE_DEPLOY_BLOB"; //$NON-NLS-1$
|
||||
@@ -316,17 +324,23 @@ public class ConnParameterKeys {
|
||||
/**
|
||||
* Google Dataproc keys.
|
||||
*/
|
||||
public static final String CONN_PARA_KEY_GOOGLE_PROJECT_ID = "CONN_PARA_KEY_GOOGLE_PROJECT_ID"; //$NON-NLS-1$
|
||||
public static final String CONN_PARA_KEY_GOOGLE_PROJECT_ID = "CONN_PARA_KEY_GOOGLE_PROJECT_ID";
|
||||
|
||||
public static final String CONN_PARA_KEY_GOOGLE_CLUSTER_ID = "CONN_PARA_KEY_GOOGLE_CLUSTER_ID";//$NON-NLS-1$
|
||||
|
||||
public static final String CONN_PARA_KEY_GOOGLE_REGION = "CONN_PARA_KEY_GOOGLE_REGION"; //$NON-NLS-1$
|
||||
|
||||
public static final String CONN_PARA_KEY_GOOGLE_JARS_BUCKET = "CONN_PARA_KEY_GOOGLE_JARS_BUCKET"; //$NON-NLS-1$
|
||||
public static final String CONN_PARA_KEY_GOOGLE_CLUSTER_ID = "CONN_PARA_KEY_GOOGLE_CLUSTER_ID";
|
||||
|
||||
public static final String CONN_PARA_KEY_GOOGLE_REGION = "CONN_PARA_KEY_GOOGLE_REGION";
|
||||
|
||||
public static final String CONN_PARA_KEY_GOOGLE_JARS_BUCKET = "CONN_PARA_KEY_GOOGLE_JARS_BUCKET";
|
||||
|
||||
public static final String CONN_PARA_KEY_PROVIDE_GOOGLE_CREDENTIALS = "CONN_PARA_KEY_PROVIDE_GOOGLE_CREDENTIALS";
|
||||
|
||||
public static final String CONN_PARA_KEY_AUTH_MODE = "CONN_PARA_KEY_AUTH_MODE";
|
||||
|
||||
public static final String CONN_PARA_KEY_DEFINE_PATH_TO_GOOGLE_CREDENTIALS = "CONN_PARA_KEY_DEFINE_PATH_TO_GOOGLE_CREDENTIALS"; //$NON-NLS-1$
|
||||
|
||||
public static final String CONN_PARA_KEY_PATH_TO_GOOGLE_CREDENTIALS = "CONN_PARA_KEY_PATH_TO_GOOGLE_CREDENTIALS"; //$NON-NLS-1$
|
||||
|
||||
public static final String CONN_PARA_OAUTH2_TOKEN_TO_GOOGLE_CREDENTIALS = "CONN_PARA_OAUTH2_TOKEN_TO_GOOGLE_CREDENTIALS"; //$NON-NLS-1$
|
||||
|
||||
/**DataBricks*/
|
||||
public static final String CONN_PARA_KEY_DATABRICKS_ENDPOINT="CONN_PARA_KEY_DATABRICKS_ENDPOINT";
|
||||
@@ -361,5 +375,21 @@ public class ConnParameterKeys {
|
||||
|
||||
public static final String CONN_PARA_KEY_KNOX_DIRECTORY="CONN_PARA_KEY_KNOX_DIRECTORY";
|
||||
|
||||
// CDE
|
||||
public static final String CONN_PARA_KEY_CDE_API_ENDPOINT="CONN_PARA_KEY_CDE_API_ENDPOINT";
|
||||
public static final String CONN_PARA_KEY_CDE_TOKEN="CONN_PARA_KEY_CDE_TOKEN";
|
||||
public static final String CONN_PARA_KEY_CDE_AUTO_GENERATE_TOKEN="CONN_PARA_KEY_CDE_AUTO_GENERATE_TOKEN";
|
||||
public static final String CONN_PARA_KEY_CDE_TOKEN_ENDPOINT="CONN_PARA_KEY_CDE_TOKEN_ENDPOINT";
|
||||
public static final String CONN_PARA_KEY_CDE_WORKLOAD_USER="CONN_PARA_KEY_CDE_WORKLOAD_USER";
|
||||
public static final String CONN_PARA_KEY_CDE_WORKLOAD_PASSWORD = "CONN_PARA_KEY_CDE_WORKLOAD_PASSWORD";
|
||||
|
||||
/**
|
||||
* Redshift
|
||||
*/
|
||||
public static final String CONN_PARA_KEY_REDSHIFT_DRIVER = "CONN_PARA_KEY_REDSHIFT_DRIVER";
|
||||
|
||||
public static final String CONN_PARA_KEY_REDSHIFT_STRINGPARA = "CONN_PARA_KEY_REDSHIFT_STRINGPARA";
|
||||
|
||||
public static final String CONN_PARA_KEY_REDSHIFT_PARATABLE = "CONN_PARA_KEY_REDSHIFT_PARATABLE";
|
||||
|
||||
}
|
||||
|
||||
@@ -13,10 +13,12 @@
|
||||
package org.talend.core.database.conn.version;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashSet;
|
||||
import java.util.List;
|
||||
import java.util.Set;
|
||||
|
||||
import org.talend.core.database.EDatabaseTypeName;
|
||||
import org.talend.core.database.ERedshiftDriver;
|
||||
import org.talend.core.database.conn.DatabaseConnConstants;
|
||||
|
||||
/**
|
||||
@@ -61,7 +63,7 @@ public enum EDatabaseVersion4Drivers {
|
||||
SQLITE(new DbVersion4Drivers(EDatabaseTypeName.SQLITE, "sqlitejdbc-v056.jar")), //$NON-NLS-1$
|
||||
FIREBIRD(new DbVersion4Drivers(EDatabaseTypeName.FIREBIRD, "jaybird-full-2.1.1.jar")), //$NON-NLS-1$
|
||||
TERADATA(new DbVersion4Drivers(EDatabaseTypeName.TERADATA,
|
||||
new String[] { "terajdbc4-16.20.00.02.jar", "tdgssconfig-16.20.00.02.jar" })), //$NON-NLS-1$ //$NON-NLS-2$
|
||||
new String[] { "terajdbc4-17.10.00.27.jar" })), //$NON-NLS-1$ //$NON-NLS-2$
|
||||
JAVADB_DERBYCLIENT(new DbVersion4Drivers(EDatabaseTypeName.JAVADB_DERBYCLIENT, "derbyclient.jar")), //$NON-NLS-1$
|
||||
NETEZZA(new DbVersion4Drivers(EDatabaseTypeName.NETEZZA, "nzjdbc.jar")), //$NON-NLS-1$
|
||||
INFORMIX(new DbVersion4Drivers(EDatabaseTypeName.INFORMIX, "ifxjdbc.jar")), //$NON-NLS-1$
|
||||
@@ -81,10 +83,11 @@ public enum EDatabaseVersion4Drivers {
|
||||
"Microsoft SQL Server 2012", "Microsoft SQL Server 2012", "jtds-1.3.1-patch-20190523.jar")), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
|
||||
MSSQL_PROP(new DbVersion4Drivers(EDatabaseTypeName.MSSQL,
|
||||
"Microsoft", "MSSQL_PROP", //$NON-NLS-1$ //$NON-NLS-2$
|
||||
new String[] { "mssql-jdbc.jar", "slf4j-api-1.7.29.jar", "slf4j-log4j12-1.7.29.jar", "adal4j-1.6.7.jar", //$NON-NLS-1$
|
||||
"commons-lang3-3.10.jar", "commons-codec-1.14.jar", "gson-2.8.6.jar", "oauth2-oidc-sdk-9.7.jar",
|
||||
"json-smart-2.4.7.jar", "nimbus-jose-jwt-8.11.jar", "javax.mail-1.6.2.jar", "log4j-1.2.17.jar",
|
||||
"accessors-smart-2.4.7.jar", "asm-9.1.jar","content-type-2.1.jar" })),
|
||||
new String[] { "mssql-jdbc.jar", "slf4j-api-1.7.29.jar", "slf4j-log4j12-1.7.29.jar", "msal4j-1.11.0.jar", //$NON-NLS-1$
|
||||
"oauth2-oidc-sdk-9.7.jar", "log4j-1.2.17.jar", "jackson-core-2.13.2.jar",
|
||||
"jackson-databind-2.13.2.2.jar", "jackson-annotations-2.13.2.jar", "jcip-annotations-1.0-1.jar",
|
||||
"json-smart-2.4.7.jar", "nimbus-jose-jwt-9.9.3.jar", "accessors-smart-2.4.7.jar", "asm-9.1.jar",
|
||||
"content-type-2.1.jar", "lang-tag-1.5.jar" })),
|
||||
|
||||
VERTICA_9(new DbVersion4Drivers(EDatabaseTypeName.VERTICA, "VERTICA 9.X", "VERTICA_9_0", "vertica-jdbc-9.3.1-0.jar")), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
|
||||
|
||||
@@ -292,6 +295,9 @@ public enum EDatabaseVersion4Drivers {
|
||||
if (version.equalsIgnoreCase(v4d.getVersionValue())) {
|
||||
drivers.addAll(v4d.getProviderDrivers());
|
||||
}
|
||||
if (drivers.isEmpty()) {
|
||||
drivers.addAll(getDriversByDriverVersion(v4d, version));
|
||||
}
|
||||
}
|
||||
} else {
|
||||
// only check the version value
|
||||
@@ -303,6 +309,14 @@ public enum EDatabaseVersion4Drivers {
|
||||
return drivers;
|
||||
}
|
||||
|
||||
private static Set<String> getDriversByDriverVersion(EDatabaseVersion4Drivers v4d, String version) {
|
||||
Set<String> drivers = new HashSet<String>();
|
||||
if (REDSHIFT == v4d) {
|
||||
drivers = ERedshiftDriver.getDriversByVersion(version);
|
||||
}
|
||||
return drivers;
|
||||
}
|
||||
|
||||
public static boolean containTypeAndVersion(final String dbType, final String version) {
|
||||
if (version == null) {
|
||||
return false;
|
||||
|
||||
@@ -83,6 +83,12 @@ public enum EHadoopProperties {
|
||||
GOOGLE_REGION,
|
||||
|
||||
GOOGLE_JARS_BUCKET,
|
||||
|
||||
AUTH_MODE,
|
||||
|
||||
PATH_TO_GOOGLE_CREDENTIALS,
|
||||
|
||||
OAUTH_ACCESS_TOKEN,
|
||||
|
||||
HD_WEBHCAT_HOSTNAME,
|
||||
|
||||
@@ -112,10 +118,18 @@ public enum EHadoopProperties {
|
||||
|
||||
SYNAPSE_STORAGE_CONTAINER,
|
||||
|
||||
ADLSGEN2AUTH,
|
||||
|
||||
SYNAPSE_STORAGE_USERNAME,
|
||||
|
||||
SYNAPSE_STORAGE_PASSWORD,
|
||||
|
||||
SYNAPSE_APPLICATION_ID,
|
||||
|
||||
SYNAPSE_DIRECTORY_ID,
|
||||
|
||||
SYNAPSE_CLIENT_KEY,
|
||||
|
||||
DEPLOY_FOLDER,
|
||||
|
||||
SPARK_DRIVER_MEM,
|
||||
|
||||
@@ -0,0 +1,75 @@
|
||||
// ============================================================================
|
||||
//
|
||||
// Copyright (C) 2006-2020 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.hadoop.version;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
public enum EDataprocAuthType {
|
||||
|
||||
OAUTH_API("OAuth2 Access Token"), //$NON-NLS-1$
|
||||
|
||||
SERVICE_ACCOUNT("Service account"); //$NON-NLS-1$
|
||||
|
||||
private String displayName;
|
||||
|
||||
EDataprocAuthType(String displayName) {
|
||||
this.displayName = displayName;
|
||||
}
|
||||
|
||||
public String getName() {
|
||||
return name();
|
||||
}
|
||||
|
||||
public String getDisplayName() {
|
||||
return this.displayName;
|
||||
}
|
||||
|
||||
public static List<String> getAllDataprocAuthTypes() {
|
||||
return getAllDataprocAuthTypes(true);
|
||||
}
|
||||
|
||||
public static List<String> getAllDataprocAuthTypes(boolean display) {
|
||||
List<String> types = new ArrayList<String>();
|
||||
EDataprocAuthType[] values = values();
|
||||
for (EDataprocAuthType authType : values) {
|
||||
if (display) {
|
||||
types.add(authType.getDisplayName());
|
||||
} else {
|
||||
types.add(authType.getName());
|
||||
}
|
||||
}
|
||||
return types;
|
||||
}
|
||||
|
||||
public static EDataprocAuthType getDataprocAuthTypeByDisplayName(String name) {
|
||||
return getDataprocAuthTypeByName(name, true);
|
||||
}
|
||||
|
||||
public static EDataprocAuthType getDataprocAuthTypeByName(String type, boolean display) {
|
||||
if (type != null) {
|
||||
for (EDataprocAuthType authType : values()) {
|
||||
if (display) {
|
||||
if (type.equalsIgnoreCase(authType.getDisplayName())) {
|
||||
return authType;
|
||||
}
|
||||
} else {
|
||||
if (type.equalsIgnoreCase(authType.getName())) {
|
||||
return authType;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
return null;
|
||||
}
|
||||
}
|
||||
@@ -24,13 +24,13 @@ import java.util.Set;
|
||||
|
||||
import org.apache.commons.lang.StringUtils;
|
||||
import org.eclipse.emf.common.util.EMap;
|
||||
import org.talend.commons.exception.ExceptionHandler;
|
||||
import org.talend.commons.runtime.model.components.IComponentConstants;
|
||||
import org.talend.commons.utils.resource.FileExtensions;
|
||||
import org.talend.core.GlobalServiceRegister;
|
||||
import org.talend.core.ICoreService;
|
||||
import org.talend.core.IRepositoryContextService;
|
||||
import org.talend.core.database.EDatabase4DriverClassName;
|
||||
import org.talend.core.database.EDatabaseTypeName;
|
||||
import org.talend.core.database.ERedshiftDriver;
|
||||
import org.talend.core.database.conn.ConnParameterKeys;
|
||||
import org.talend.core.database.conn.template.EDatabaseConnTemplate;
|
||||
import org.talend.core.model.metadata.Dbms;
|
||||
@@ -54,6 +54,7 @@ import org.talend.core.model.metadata.builder.connection.SAPBWTable;
|
||||
import org.talend.core.prefs.SSLPreferenceConstants;
|
||||
import org.talend.core.runtime.CoreRuntimePlugin;
|
||||
import org.talend.core.utils.KeywordsValidator;
|
||||
import org.talend.core.utils.TalendQuoteUtils;
|
||||
import org.talend.cwm.helper.ConnectionHelper;
|
||||
import org.talend.cwm.helper.SAPBWTableHelper;
|
||||
import org.talend.cwm.helper.TaggedValueHelper;
|
||||
@@ -61,6 +62,10 @@ import org.talend.cwm.relational.RelationalFactory;
|
||||
import org.talend.model.bridge.ReponsitoryContextBridge;
|
||||
import org.talend.repository.model.IProxyRepositoryFactory;
|
||||
|
||||
import com.fasterxml.jackson.core.JsonProcessingException;
|
||||
import com.fasterxml.jackson.core.type.TypeReference;
|
||||
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||
|
||||
import orgomg.cwm.objectmodel.core.TaggedValue;
|
||||
|
||||
/**
|
||||
@@ -223,8 +228,9 @@ public final class ConvertionHelper {
|
||||
} else {
|
||||
result.setDbType(connection.getDatabaseType());
|
||||
}
|
||||
String dbVersionString = getDriverVersionString(connection);
|
||||
result.setDriverJarPath(connection.getDriverJarPath());
|
||||
result.setDbVersionString(connection.getDbVersionString());
|
||||
result.setDbVersionString(dbVersionString);
|
||||
result.setDriverClass(connection.getDriverClass());
|
||||
result.setFileFieldName(connection.getFileFieldName());
|
||||
result.setId(connection.getId());
|
||||
@@ -265,6 +271,22 @@ public final class ConvertionHelper {
|
||||
|
||||
}
|
||||
|
||||
private static String getDriverVersionString(DatabaseConnection dbConn) {
|
||||
String dbVersionString = dbConn.getDbVersionString();
|
||||
if (EDatabaseTypeName.REDSHIFT.getDisplayName().equals(dbConn.getDatabaseType())) {
|
||||
EMap<String, String> parameters = dbConn.getParameters();
|
||||
if (parameters != null) {
|
||||
String driverString = parameters.get(ConnParameterKeys.CONN_PARA_KEY_REDSHIFT_DRIVER);
|
||||
if (StringUtils.isNotBlank(driverString)) {
|
||||
dbVersionString = driverString;
|
||||
} else {
|
||||
dbVersionString = ERedshiftDriver.DRIVER_V1.name();
|
||||
}
|
||||
}
|
||||
}
|
||||
return dbVersionString;
|
||||
}
|
||||
|
||||
/**
|
||||
* Copies other parameters from <code>DatabaseConnection</code> to <code>IMetadataConnection</code>. Added by Marvin
|
||||
* Wang on Aug.8, 2012.
|
||||
@@ -705,6 +727,25 @@ public final class ConvertionHelper {
|
||||
origValueConn.getParameters().get(ConnParameterKeys.CONN_PARA_KEY_SSL_KEY_STORE_PASSWORD), false));
|
||||
}
|
||||
}
|
||||
} else if (EDatabaseTypeName.REDSHIFT.getDisplayName().equals(origValueConn.getDatabaseType())) {
|
||||
Properties info = new Properties();
|
||||
EMap<String, String> parameters = origValueConn.getParameters();
|
||||
if (parameters != null
|
||||
&& ERedshiftDriver.DRIVER_V2.name().equals(parameters.get(ConnParameterKeys.CONN_PARA_KEY_REDSHIFT_DRIVER))
|
||||
&& !Boolean.valueOf(parameters.get(ConnParameterKeys.CONN_PARA_KEY_REDSHIFT_STRINGPARA))) {
|
||||
additionParamStr = "";
|
||||
String tableValue = parameters.get(ConnParameterKeys.CONN_PARA_KEY_REDSHIFT_PARATABLE);
|
||||
if (StringUtils.isNotBlank(tableValue)) {
|
||||
List<Map<String, Object>> entryProperties = getEntryProperties(tableValue);
|
||||
for (Map<String, Object> entryMap : entryProperties) {
|
||||
String key = TalendQuoteUtils.removeQuotes(String.valueOf(entryMap.get("KEY")));
|
||||
if (StringUtils.isNotBlank(key)) {
|
||||
String value = TalendQuoteUtils.removeQuotes(String.valueOf(entryMap.get("VALUE")));
|
||||
updateAdditionParam(sgb, info, key, value);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
return additionParamStr + sgb.toString();
|
||||
}
|
||||
@@ -714,4 +755,27 @@ public final class ConvertionHelper {
|
||||
sgb.append("&").append(key).append("=").append(value);//$NON-NLS-1$ //$NON-NLS-2$
|
||||
}
|
||||
}
|
||||
|
||||
public static List<Map<String, Object>> getEntryProperties(String paramString) {
|
||||
List<Map<String, Object>> tableProperties = new ArrayList<Map<String, Object>>();
|
||||
try {
|
||||
ObjectMapper objectMapper = new ObjectMapper();
|
||||
tableProperties = objectMapper.readValue(paramString, new TypeReference<List<Map<String, Object>>>() {
|
||||
});
|
||||
} catch (Exception e) {
|
||||
ExceptionHandler.process(e);
|
||||
}
|
||||
return tableProperties;
|
||||
}
|
||||
|
||||
public static String getEntryPropertiesString(List<Map<String, Object>> entryProperties) {
|
||||
String entryString = "";
|
||||
try {
|
||||
ObjectMapper objectMapper = new ObjectMapper();
|
||||
entryString = objectMapper.writeValueAsString(entryProperties);
|
||||
} catch (JsonProcessingException e) {
|
||||
ExceptionHandler.process(e);
|
||||
}
|
||||
return entryString;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -664,6 +664,26 @@ public class ComponentToRepositoryProperty {
|
||||
connection.setAdditionalParams(value);
|
||||
}
|
||||
}
|
||||
if ("USE_STRING_PROPERTIES".equals(param.getRepositoryValue())) {
|
||||
String value = getParameterValue(connection, node, param);
|
||||
if (value != null) {
|
||||
connection.getParameters().put(ConnParameterKeys.CONN_PARA_KEY_REDSHIFT_STRINGPARA, value);
|
||||
}
|
||||
}
|
||||
if ("DRIVER_VERSION".equals(param.getRepositoryValue())) {
|
||||
String value = getParameterValue(connection, node, param);
|
||||
if (value != null) {
|
||||
connection.getParameters().put(ConnParameterKeys.CONN_PARA_KEY_REDSHIFT_DRIVER, value);
|
||||
}
|
||||
}
|
||||
if ("ENTRY_PROPERTIES".equals(param.getRepositoryValue())) {
|
||||
Object value = param.getValue();
|
||||
if (value instanceof List) {
|
||||
List<Map<String, Object>> entryProperties = (List<Map<String, Object>>) value;
|
||||
connection.getParameters().put(ConnParameterKeys.CONN_PARA_KEY_REDSHIFT_PARATABLE,
|
||||
ConvertionHelper.getEntryPropertiesString(entryProperties));
|
||||
}
|
||||
}
|
||||
if ("FILE".equals(param.getRepositoryValue())) { //$NON-NLS-1$
|
||||
String value = getParameterValue(connection, node, param);
|
||||
if (value != null) {
|
||||
|
||||
@@ -29,6 +29,7 @@ import org.talend.commons.ui.utils.PathUtils;
|
||||
import org.talend.components.api.properties.ComponentProperties;
|
||||
import org.talend.core.GlobalServiceRegister;
|
||||
import org.talend.core.database.EDatabaseTypeName;
|
||||
import org.talend.core.database.ERedshiftDriver;
|
||||
import org.talend.core.database.conn.ConnParameterKeys;
|
||||
import org.talend.core.database.conn.template.EDatabaseConnTemplate;
|
||||
import org.talend.core.database.conn.version.EDatabaseVersion4Drivers;
|
||||
@@ -43,6 +44,7 @@ import org.talend.core.model.metadata.MappingType;
|
||||
import org.talend.core.model.metadata.MetadataTalendType;
|
||||
import org.talend.core.model.metadata.MetadataToolHelper;
|
||||
import org.talend.core.model.metadata.MultiSchemasUtil;
|
||||
import org.talend.core.model.metadata.builder.ConvertionHelper;
|
||||
import org.talend.core.model.metadata.builder.connection.AdditionalConnectionProperty;
|
||||
import org.talend.core.model.metadata.builder.connection.BRMSConnection;
|
||||
import org.talend.core.model.metadata.builder.connection.Concept;
|
||||
@@ -1039,6 +1041,21 @@ public class RepositoryToComponentProperty {
|
||||
if (value.equals("PROPERTIES_STRING")) { //$NON-NLS-1$
|
||||
return getAppropriateValue(connection, connection.getAdditionalParams());
|
||||
}
|
||||
if (value.equals("USE_STRING_PROPERTIES")) {
|
||||
return Boolean.valueOf(connection.getParameters().get(ConnParameterKeys.CONN_PARA_KEY_REDSHIFT_STRINGPARA));
|
||||
}
|
||||
if (value.equals("ENTRY_PROPERTIES")) {
|
||||
return ConvertionHelper
|
||||
.getEntryProperties(connection.getParameters().get(ConnParameterKeys.CONN_PARA_KEY_REDSHIFT_PARATABLE));
|
||||
}
|
||||
if (value.equals("DRIVER_VERSION")) {
|
||||
String driverVersion = connection.getParameters().get(ConnParameterKeys.CONN_PARA_KEY_REDSHIFT_DRIVER);
|
||||
if (org.apache.commons.lang.StringUtils.isBlank(driverVersion)) {
|
||||
driverVersion = ERedshiftDriver.DRIVER_V1.name();
|
||||
}
|
||||
return driverVersion;
|
||||
}
|
||||
|
||||
if (value.equals("DRIVER")) { //$NON-NLS-1$
|
||||
String dbVersionString = connection.getDbVersionString();
|
||||
if (dbVersionString != null && EDatabaseConnTemplate.MSSQL.getDBDisplayName().equals(databaseType)) {
|
||||
|
||||
@@ -34,8 +34,6 @@ public abstract class AbstractConnection implements IConnection, IAdditionalInfo
|
||||
private IMetadataTable metadataTable;
|
||||
|
||||
private String name;
|
||||
|
||||
private String originalName;
|
||||
|
||||
private INode source;
|
||||
|
||||
@@ -108,16 +106,6 @@ public abstract class AbstractConnection implements IConnection, IAdditionalInfo
|
||||
uniqueName = name;
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getOriginalName() {
|
||||
return originalName;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setOriginalName(String orignalName) {
|
||||
this.originalName = orignalName;
|
||||
}
|
||||
|
||||
@Override
|
||||
public INode getSource() {
|
||||
|
||||
@@ -58,8 +58,6 @@ public interface IConnection extends IElement {
|
||||
* @return
|
||||
*/
|
||||
public String getName();
|
||||
|
||||
public String getOriginalName();
|
||||
|
||||
public String getUniqueName();
|
||||
|
||||
@@ -130,8 +128,6 @@ public interface IConnection extends IElement {
|
||||
void updateName();
|
||||
|
||||
void setName(String newName);
|
||||
|
||||
void setOriginalName(String originalName);
|
||||
|
||||
void reconnect();
|
||||
|
||||
|
||||
@@ -58,6 +58,11 @@ public interface IProcess extends IElement {
|
||||
|
||||
public static final String SCREEN_OFFSET_Y = "SCREEN_OFFSET_Y"; //$NON-NLS-1$
|
||||
|
||||
public static final String PROP_ERR_ON_COMPONENT_MISSING = "error.on.component.missing";
|
||||
|
||||
public static final boolean ERR_ON_COMPONENT_MISSING = Boolean
|
||||
.valueOf(System.getProperty(PROP_ERR_ON_COMPONENT_MISSING, Boolean.TRUE.toString()));
|
||||
|
||||
public String getName();
|
||||
|
||||
public String getId();
|
||||
|
||||
@@ -571,8 +571,11 @@ public class ERepositoryObjectType extends DynaEnum<ERepositoryObjectType> {
|
||||
*/
|
||||
public final static ERepositoryObjectType PROCESS_SPARKSTREAMING = ERepositoryObjectType.valueOf("PROCESS_SPARKSTREAMING");
|
||||
|
||||
public final static ERepositoryObjectType METADATA_SAP_BW_ADVANCEDDATASTOREOBJECT = ERepositoryObjectType
|
||||
.valueOf("METADATA_SAP_BW_ADVANCEDDATASTOREOBJECT"); //$NON-NLS-1$
|
||||
public final static ERepositoryObjectType METADATA_SAP_BW_ADVANCEDDATASTOREOBJECT_INPUT = ERepositoryObjectType
|
||||
.valueOf("METADATA_SAP_BW_ADVANCEDDATASTOREOBJECT_INPUT"); //$NON-NLS-1$
|
||||
|
||||
public final static ERepositoryObjectType METADATA_SAP_BW_ADVANCEDDATASTOREOBJECT_OUTPUT = ERepositoryObjectType
|
||||
.valueOf("METADATA_SAP_BW_ADVANCEDDATASTOREOBJECT_OUTPUT"); //$NON-NLS-1$
|
||||
|
||||
public final static ERepositoryObjectType METADATA_SAP_BW_DATASOURCE = ERepositoryObjectType
|
||||
.valueOf("METADATA_SAP_BW_DATASOURCE"); //$NON-NLS-1$
|
||||
@@ -919,7 +922,7 @@ public class ERepositoryObjectType extends DynaEnum<ERepositoryObjectType> {
|
||||
} else if (type.getType().equals("TEST_CONTAINER")) {
|
||||
return "test case";
|
||||
} else if (GlobalServiceRegister.getDefault().isServiceRegistered(ICamelDesignerCoreService.class)) {
|
||||
ICamelDesignerCoreService camelService = (ICamelDesignerCoreService) GlobalServiceRegister.getDefault()
|
||||
ICamelDesignerCoreService camelService = GlobalServiceRegister.getDefault()
|
||||
.getService(ICamelDesignerCoreService.class);
|
||||
String deleteFolderName = camelService.getDeleteFolderName(type);
|
||||
if (deleteFolderName != null) {
|
||||
@@ -1465,7 +1468,7 @@ public class ERepositoryObjectType extends DynaEnum<ERepositoryObjectType> {
|
||||
allTypes.add(ERepositoryObjectType.SPARK_STREAMING_JOBLET);
|
||||
}
|
||||
if (GlobalServiceRegister.getDefault().isServiceRegistered(IESBService.class)) {
|
||||
IESBService esbService = (IESBService) GlobalServiceRegister.getDefault().getService(IESBService.class);
|
||||
IESBService esbService = GlobalServiceRegister.getDefault().getService(IESBService.class);
|
||||
ERepositoryObjectType serviceType = esbService.getServicesType();
|
||||
if (serviceType != null) {
|
||||
allTypes.add(serviceType);
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
// 9 rue Pages 92150 Suresnes, France
|
||||
//
|
||||
// ============================================================================
|
||||
package org.talend.core.services;
|
||||
package org.talend.core.service;
|
||||
|
||||
import java.io.File;
|
||||
import java.text.ParseException;
|
||||
@@ -76,7 +76,17 @@ public interface IDetectCVEService extends IService {
|
||||
*/
|
||||
ImpactedItem detect(Item item, Set<CVEData> datas, boolean includeNotFixed);
|
||||
|
||||
/**
|
||||
* Persist final cve report
|
||||
* @param impactedItems impacted items
|
||||
* @param reportFile - report file path
|
||||
*/
|
||||
void writeReport(List<ImpactedItem> impactedItems, File reportFile);
|
||||
|
||||
/**
|
||||
* Clear CVE cache
|
||||
*/
|
||||
void clearCache();
|
||||
|
||||
public static String mavenUri2GAV(String uri) {
|
||||
if (MavenUrlHelper.isMvnUrl(uri)) {
|
||||
@@ -1,9 +1,21 @@
|
||||
package org.talend.core.utils;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import org.talend.commons.utils.Version;
|
||||
import org.talend.commons.utils.VersionUtils;
|
||||
import org.talend.core.GlobalServiceRegister;
|
||||
import org.talend.core.model.process.IProcess;
|
||||
import org.talend.core.model.repository.ERepositoryObjectType;
|
||||
import org.talend.core.model.repository.IRepositoryViewObject;
|
||||
import org.talend.core.repository.model.ProjectRepositoryNode;
|
||||
import org.talend.core.repository.services.IGitInfoService;
|
||||
import org.talend.core.services.IGITProviderService;
|
||||
import org.talend.core.ui.branding.IBrandingService;
|
||||
import org.talend.repository.model.IProxyRepositoryFactory;
|
||||
import org.talend.repository.model.IRepositoryNode;
|
||||
import org.talend.repository.model.IRepositoryService;
|
||||
|
||||
//============================================================================
|
||||
//
|
||||
@@ -49,5 +61,35 @@ public class TrackerUtil {
|
||||
|
||||
public static String getRedshiftTracker() {
|
||||
return "--Talend -v " + getVersion();
|
||||
}
|
||||
|
||||
private static void addRepositoryInfo(IProcess process) throws Exception {
|
||||
GlobalServiceRegister serviceRegister = GlobalServiceRegister.getDefault();
|
||||
|
||||
IRepositoryNode node = ProjectRepositoryNode.getInstance().getRootRepositoryNode(
|
||||
ERepositoryObjectType.GIT_ROOT);
|
||||
System.out.println("node:"+node);
|
||||
|
||||
|
||||
process.getPropertyValue(getAWSTracker());
|
||||
IRepositoryService service = (IRepositoryService) GlobalServiceRegister.getDefault().getService(IRepositoryService.class);
|
||||
IProxyRepositoryFactory factory = service.getProxyRepositoryFactory();
|
||||
List<IRepositoryViewObject> list = factory.getAll(ERepositoryObjectType.GIT_ROOT, false, true);
|
||||
System.out.println("IRepositoryViewObject list:");
|
||||
list.forEach(System.out::println);
|
||||
|
||||
|
||||
|
||||
System.out.println("serviceRegister:"+serviceRegister);
|
||||
IGITProviderService gitProviderService = null;
|
||||
if (serviceRegister.isServiceRegistered(IGITProviderService.class)) {
|
||||
gitProviderService = (IGITProviderService) GlobalServiceRegister.getDefault().getService(IGITProviderService.class);
|
||||
System.out.println("gitProviderService:"+gitProviderService);
|
||||
}
|
||||
IGitInfoService gitInfoService = serviceRegister.getService(IGitInfoService.class);
|
||||
Map<String, String> gitInfo = gitInfoService.getGitInfo(node.getObject().getProperty());
|
||||
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@@ -65,10 +65,12 @@ public class ReferenceProjectProvider implements IReferenceProjectProvider {
|
||||
loadFromContent = true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void initSettings() throws BusinessException, PersistenceException {
|
||||
loadSettings();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void loadSettings() throws PersistenceException {
|
||||
referenceProjectList = null;
|
||||
TypeReference<ReferenceProjectConfiguration> typeReference = new TypeReference<ReferenceProjectConfiguration>() {
|
||||
@@ -151,11 +153,7 @@ public class ReferenceProjectProvider implements IReferenceProjectProvider {
|
||||
public void saveSettings() throws PersistenceException, IOException {
|
||||
IProject iProject = ResourceUtils.getProject(project.getTechnicalLabel());
|
||||
IFile file = iProject.getFolder(CONFIGURATION_FOLDER_NAME).getFile(CONFIGURATION_FILE_NAME);
|
||||
if (referenceProjectConfig == null) {
|
||||
referenceProjectConfig = new ReferenceProjectConfiguration();
|
||||
}
|
||||
ObjectMapper objectMapper = new ObjectMapper();
|
||||
String content = objectMapper.writerWithDefaultPrettyPrinter().writeValueAsString(referenceProjectConfig);
|
||||
String content = toFileContents();
|
||||
ByteArrayInputStream source = new ByteArrayInputStream(content.getBytes());
|
||||
try {
|
||||
if (!file.exists()) {
|
||||
@@ -168,6 +166,15 @@ public class ReferenceProjectProvider implements IReferenceProjectProvider {
|
||||
}
|
||||
}
|
||||
|
||||
public String toFileContents() throws IOException {
|
||||
if (referenceProjectConfig == null) {
|
||||
referenceProjectConfig = new ReferenceProjectConfiguration();
|
||||
}
|
||||
ObjectMapper objectMapper = new ObjectMapper();
|
||||
return objectMapper.writerWithDefaultPrettyPrinter().writeValueAsString(referenceProjectConfig);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isHasConfigurationFile() {
|
||||
return hasConfigurationFile;
|
||||
}
|
||||
|
||||
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
|
||||
Bundle-ManifestVersion: 2
|
||||
Bundle-Name: Core UI Plug-in
|
||||
Bundle-SymbolicName: org.talend.core.ui;singleton:=true
|
||||
Bundle-Version: 8.8.8.qualifier
|
||||
Bundle-Version: 8.0.1.qualifier
|
||||
Require-Bundle: org.apache.commons.lang,
|
||||
org.apache.commons.collections,
|
||||
org.eclipse.gef;visibility:=reexport,
|
||||
|
||||
@@ -9,7 +9,6 @@ bin.includes = .,\
|
||||
lib/jna-platform.jar,\
|
||||
lib/jna.jar,\
|
||||
lib/oshi-core.jar,\
|
||||
plugin_en.properties,\
|
||||
plugin_fr.properties,\
|
||||
plugin_ja.properties,\
|
||||
plugin_sk.properties,\
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tcommon-studio-se</artifactId>
|
||||
<version>8.8.8-SNAPSHOT</version>
|
||||
<version>8.0.1-SNAPSHOT</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.core.ui</artifactId>
|
||||
|
||||
@@ -16,6 +16,7 @@ import java.text.MessageFormat;
|
||||
|
||||
import org.apache.commons.lang.StringUtils;
|
||||
import org.eclipse.jface.fieldassist.IContentProposal;
|
||||
import org.talend.commons.utils.PasswordEncryptUtil;
|
||||
import org.talend.core.language.ECodeLanguage;
|
||||
import org.talend.core.model.process.IContextParameter;
|
||||
import org.talend.core.model.utils.ContextParameterUtils;
|
||||
@@ -76,11 +77,15 @@ public class ContextParameterProposal implements IContentProposal {
|
||||
} else {
|
||||
desc = Messages.getString("ContextParameterProposal.NoCommentAvaiable"); //$NON-NLS-1$
|
||||
}
|
||||
String type = contextParameter.getType();
|
||||
String value = contextParameter.getValue();
|
||||
if (PasswordEncryptUtil.isPasswordType(type)) {
|
||||
value = "******"; //$NON-NLS-1$
|
||||
}
|
||||
// TDI-30683:fix the NPE pb and another description match pb(need move "\n" from message.propreties to code).
|
||||
MessageFormat format = new MessageFormat(getDescriptionMessagePattern());
|
||||
if (contextParameter.getContext() != null) {
|
||||
Object[] replaceArgs = new Object[] { desc, contextParameter.getContext().getName(), contextParameter.getType(),
|
||||
contextParameter.getValue() };
|
||||
Object[] replaceArgs = new Object[] { desc, contextParameter.getContext().getName(), type, value };
|
||||
return format.format(replaceArgs);
|
||||
}
|
||||
return desc;
|
||||
|
||||
@@ -2,6 +2,7 @@ package org.talend.core.ui.services;
|
||||
|
||||
import java.io.Serializable;
|
||||
|
||||
import org.eclipse.core.runtime.IProgressMonitor;
|
||||
import org.eclipse.jface.viewers.ISelection;
|
||||
import org.eclipse.swt.widgets.Composite;
|
||||
import org.eclipse.swt.widgets.Shell;
|
||||
@@ -26,6 +27,8 @@ public interface IGitUIProviderService extends IService {
|
||||
|
||||
public void openPushFailedDialog(Object pushResult);
|
||||
|
||||
boolean migrateOption(IProgressMonitor monitor, String newVersion, boolean hasUpdate) throws Exception;
|
||||
|
||||
public static IGitUIProviderService get() {
|
||||
GlobalServiceRegister register = GlobalServiceRegister.getDefault();
|
||||
if (!register.isServiceRegistered(IGitUIProviderService.class)) {
|
||||
|
||||
@@ -3,7 +3,7 @@ Automatic-Module-Name: org.talend.core
|
||||
Bundle-ManifestVersion: 2
|
||||
Bundle-Name: Core Plug-in
|
||||
Bundle-SymbolicName: org.talend.core;singleton:=true
|
||||
Bundle-Version: 8.8.8.qualifier
|
||||
Bundle-Version: 8.0.1.qualifier
|
||||
Bundle-Activator: org.talend.core.CorePlugin
|
||||
Bundle-Localization: plugin
|
||||
Eclipse-LazyStart: true
|
||||
|
||||
@@ -9,7 +9,6 @@ bin.includes = META-INF/,\
|
||||
schema/,\
|
||||
lib/,\
|
||||
plugin_de.properties,\
|
||||
plugin_en.properties,\
|
||||
plugin_es.properties,\
|
||||
plugin_fr.properties,\
|
||||
plugin_it.properties,\
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tcommon-studio-se</artifactId>
|
||||
<version>8.8.8-SNAPSHOT</version>
|
||||
<version>8.0.1-SNAPSHOT</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.core</artifactId>
|
||||
|
||||
@@ -693,7 +693,6 @@ public class ProcessorUtilities {
|
||||
|
||||
processor.setArguments(argumentsMap);
|
||||
|
||||
handelDQComponents(selectedProcessItem, currentProcess);
|
||||
// generate the code of the father after the childrens
|
||||
// so the code won't have any error during the check, and it will help to check
|
||||
// if the generation is really needed.
|
||||
@@ -709,6 +708,8 @@ public class ProcessorUtilities {
|
||||
*/
|
||||
generateBuildInfo(jobInfo, progressMonitor, isMainJob, currentProcess, currentJobName, processor, option);
|
||||
|
||||
handelDQComponents(selectedProcessItem, currentProcess);
|
||||
|
||||
copyDependenciedResources(currentProcess);
|
||||
|
||||
return processor;
|
||||
@@ -1237,8 +1238,6 @@ public class ProcessorUtilities {
|
||||
|
||||
processor.setArguments(argumentsMap);
|
||||
|
||||
handelDQComponents(selectedProcessItem, currentProcess);
|
||||
|
||||
generateContextInfo(jobInfo, selectedContextName, statistics, trace, needContext, progressMonitor,
|
||||
currentProcess, currentJobName, processor, isMainJob, codeGenerationNeeded);
|
||||
|
||||
@@ -1254,6 +1253,8 @@ public class ProcessorUtilities {
|
||||
generateBuildInfo(jobInfo, progressMonitor, isMainJob, currentProcess, currentJobName, processor, option);
|
||||
TimeMeasure.step(idTimer, "generateBuildInfo");
|
||||
|
||||
handelDQComponents(selectedProcessItem, currentProcess);
|
||||
|
||||
copyDependenciedResources(currentProcess);
|
||||
|
||||
return processor;
|
||||
@@ -1710,14 +1711,6 @@ public class ProcessorUtilities {
|
||||
needChildrenModules = false;
|
||||
}
|
||||
}
|
||||
|
||||
Object buildType = jobInfo.getProcessor().getProperty().getAdditionalProperties().get(TalendProcessArgumentConstant.ARG_BUILD_TYPE);
|
||||
boolean isOSGI = "OSGI".equals(buildType) || "ROUTE".equals(buildType);
|
||||
boolean isRoute = ERepositoryObjectType.getType(jobInfo.getProcessor().getProperty()).equals(ERepositoryObjectType.PROCESS_ROUTE);
|
||||
|
||||
if (isOSGI && isRoute) {
|
||||
needChildrenModules = false;
|
||||
}
|
||||
|
||||
if (needChildrenModules) {
|
||||
addSubjobModuleNeededToParentJob(jobInfo, subJobInfo);
|
||||
|
||||
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
|
||||
Bundle-ManifestVersion: 2
|
||||
Bundle-Name: %pluginName
|
||||
Bundle-SymbolicName: org.talend.cwm.mip.edit; singleton:=true
|
||||
Bundle-Version: 8.8.8.qualifier
|
||||
Bundle-Version: 8.0.1.qualifier
|
||||
Bundle-ClassPath: .
|
||||
Bundle-Activator: orgomg.cwm.objectmodel.core.provider.Cwm_mipEditPlugin$Implementation
|
||||
Bundle-Vendor: %providerName
|
||||
|
||||
@@ -10,7 +10,6 @@ bin.includes = .,\
|
||||
plugin.xml,\
|
||||
plugin.properties,\
|
||||
plugin_de.properties,\
|
||||
plugin_en.properties,\
|
||||
plugin_es.properties,\
|
||||
plugin_fr.properties,\
|
||||
plugin_it.properties,\
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tcommon-studio-se</artifactId>
|
||||
<version>8.8.8-SNAPSHOT</version>
|
||||
<version>8.0.1-SNAPSHOT</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.cwm.mip.edit</artifactId>
|
||||
|
||||
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
|
||||
Bundle-ManifestVersion: 2
|
||||
Bundle-Name: %pluginName
|
||||
Bundle-SymbolicName: org.talend.cwm.mip.editor; singleton:=true
|
||||
Bundle-Version: 8.8.8.qualifier
|
||||
Bundle-Version: 8.0.1.qualifier
|
||||
Bundle-ClassPath: .
|
||||
Bundle-Activator: orgomg.cwm.objectmodel.core.presentation.Cwm_mipEditorPlugin$Implementation
|
||||
Bundle-Vendor: %providerName
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tcommon-studio-se</artifactId>
|
||||
<version>8.8.8-SNAPSHOT</version>
|
||||
<version>8.0.1-SNAPSHOT</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.cwm.mip.editor</artifactId>
|
||||
|
||||
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
|
||||
Bundle-ManifestVersion: 2
|
||||
Bundle-Name: %pluginName
|
||||
Bundle-SymbolicName: org.talend.cwm.mip; singleton:=true
|
||||
Bundle-Version: 8.8.8.qualifier
|
||||
Bundle-Version: 8.0.1.qualifier
|
||||
Bundle-ClassPath: .
|
||||
Bundle-Vendor: %providerName
|
||||
Bundle-Localization: plugin
|
||||
|
||||
@@ -13,7 +13,6 @@ bin.includes = .,\
|
||||
model/,\
|
||||
dist/,\
|
||||
plugin_de.properties,\
|
||||
plugin_en.properties,\
|
||||
plugin_fr.properties,\
|
||||
plugin_it.properties,\
|
||||
plugin_ja.properties,\
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tcommon-studio-se</artifactId>
|
||||
<version>8.8.8-SNAPSHOT</version>
|
||||
<version>8.0.1-SNAPSHOT</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.cwm.mip</artifactId>
|
||||
|
||||
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
|
||||
Bundle-ManifestVersion: 2
|
||||
Bundle-Name: Datatools XML Plug-in
|
||||
Bundle-SymbolicName: org.talend.datatools.xml
|
||||
Bundle-Version: 8.8.8.qualifier
|
||||
Bundle-Version: 8.0.1.qualifier
|
||||
Require-Bundle: org.eclipse.xsd,
|
||||
org.apache.commons.commons-beanutils,
|
||||
org.apache.commons.lang,
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tcommon-studio-se</artifactId>
|
||||
<version>8.8.8-SNAPSHOT</version>
|
||||
<version>8.0.1-SNAPSHOT</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.datatools.xml</artifactId>
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<classpath>
|
||||
|
||||
<classpathentry exported="true" kind="lib" path="lib/wagon-http-lightweight.jar" sourcepath="D:/.m2/repository/org/apache/maven/wagon/wagon-http-lightweight/3.0.0/wagon-http-lightweight-3.0.0-sources.jar"/>
|
||||
<classpathentry exported="true" kind="lib" path="lib/maven-resolver-transport-file.jar"/>
|
||||
<classpathentry exported="true" kind="lib" path="lib/maven-resolver-transport-http.jar"/>
|
||||
@@ -30,5 +31,4 @@
|
||||
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
|
||||
<classpathentry kind="src" path="src/main/java"/>
|
||||
<classpathentry kind="output" path="target/classes"/>
|
||||
|
||||
</classpath>
|
||||
|
||||
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
|
||||
Bundle-ManifestVersion: 2
|
||||
Bundle-Name: Aether
|
||||
Bundle-SymbolicName: org.talend.designer.maven.aether
|
||||
Bundle-Version: 8.8.8.qualifier
|
||||
Bundle-Version: 8.0.1.qualifier
|
||||
Bundle-Activator: org.talend.designer.maven.aether.Activator
|
||||
Require-Bundle: org.eclipse.core.runtime,
|
||||
org.talend.libraries.jackson,
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tcommon-studio-se</artifactId>
|
||||
<version>8.8.8-SNAPSHOT</version>
|
||||
<version>8.0.1-SNAPSHOT</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.maven.aether</artifactId>
|
||||
|
||||
@@ -3,7 +3,7 @@ Automatic-Module-Name: org.talend.designer.maven.repo.tck
|
||||
Bundle-ManifestVersion: 2
|
||||
Bundle-Name: Maven repo Tck Plug-in
|
||||
Bundle-SymbolicName: org.talend.designer.maven.repo.tck;singleton:=true
|
||||
Bundle-Version: 8.8.8.qualifier
|
||||
Bundle-Version: 8.0.1.qualifier
|
||||
Bundle-Localization: plugin
|
||||
Eclipse-LazyStart: true
|
||||
Require-Bundle: org.talend.core,
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tcommon-studio-se</artifactId>
|
||||
<version>8.8.8-SNAPSHOT</version>
|
||||
<version>8.0.1-SNAPSHOT</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.maven.repo.tck</artifactId>
|
||||
@@ -12,6 +12,7 @@
|
||||
<properties>
|
||||
<jackson.version>2.12.1</jackson.version>
|
||||
<slf4j.version>1.7.32</slf4j.version>
|
||||
<tycho.buildtimestamp.format>${timestamp}</tycho.buildtimestamp.format>
|
||||
</properties>
|
||||
<repositories>
|
||||
<repository>
|
||||
|
||||
@@ -3,7 +3,7 @@ Automatic-Module-Name: org.talend.designer.maven.repo.tcksdk
|
||||
Bundle-ManifestVersion: 2
|
||||
Bundle-Name: Maven repo Tcksdk Plug-in
|
||||
Bundle-SymbolicName: org.talend.designer.maven.repo.tcksdk;singleton:=true
|
||||
Bundle-Version: 8.8.8.qualifier
|
||||
Bundle-Version: 8.0.1.qualifier
|
||||
Bundle-Localization: plugin
|
||||
Eclipse-LazyStart: true
|
||||
Require-Bundle: org.talend.core,
|
||||
|
||||
@@ -1,468 +1,481 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tcommon-studio-se</artifactId>
|
||||
<version>8.8.8-SNAPSHOT</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.maven.repo.tcksdk</artifactId>
|
||||
<packaging>eclipse-plugin</packaging>
|
||||
<properties>
|
||||
<tcomp.version>${component-runtime.version}</tcomp.version>
|
||||
<cxf.version>3.5.1</cxf.version>
|
||||
<geronimo.version>1.0.2</geronimo.version>
|
||||
<jackson.version>2.12.1</jackson.version>
|
||||
<jcache.version>1.0.5</jcache.version>
|
||||
<jcache_spec.version>1.0-alpha-1</jcache_spec.version>
|
||||
<johnzon.version>1.2.16</johnzon.version>
|
||||
<meecrowave.version>1.2.13</meecrowave.version>
|
||||
<microprofile.version>1.2.1</microprofile.version>
|
||||
<owb.version>2.0.26</owb.version>
|
||||
<slf4j.version>1.7.32</slf4j.version>
|
||||
<tomcat.version>9.0.59</tomcat.version>
|
||||
<xbean.version>4.20</xbean.version>
|
||||
<log4j2.version>2.17.1</log4j2.version>
|
||||
</properties>
|
||||
<repositories>
|
||||
<repository>
|
||||
<id>talend_open</id>
|
||||
<releases>
|
||||
<enabled>true</enabled>
|
||||
</releases>
|
||||
<snapshots>
|
||||
<enabled>false</enabled>
|
||||
</snapshots>
|
||||
<url>https://artifacts-oss.talend.com/nexus/content/repositories/TalendOpenSourceRelease/</url>
|
||||
</repository>
|
||||
<repository>
|
||||
<id>talend_open_snapshots</id>
|
||||
<releases>
|
||||
<enabled>false</enabled>
|
||||
</releases>
|
||||
<snapshots>
|
||||
<enabled>true</enabled>
|
||||
</snapshots>
|
||||
<url>https://artifacts-oss.talend.com/nexus/content/repositories/TalendOpenSourceSnapshot/</url>
|
||||
</repository>
|
||||
<repository>
|
||||
<id>sonatype_snapshots</id>
|
||||
<releases>
|
||||
<enabled>false</enabled>
|
||||
</releases>
|
||||
<snapshots>
|
||||
<enabled>true</enabled>
|
||||
</snapshots>
|
||||
<url>https://oss.sonatype.org/content/repositories/snapshots/</url>
|
||||
</repository>
|
||||
</repositories>
|
||||
|
||||
<dependencyManagement>
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>org.apache.logging.log4j</groupId>
|
||||
<artifactId>log4j-core</artifactId>
|
||||
<version>${log4j2.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.logging.log4j</groupId>
|
||||
<artifactId>log4j-api</artifactId>
|
||||
<version>${log4j2.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.logging.log4j</groupId>
|
||||
<artifactId>log4j-slf4j-impl</artifactId>
|
||||
<version>${log4j2.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.logging.log4j</groupId>
|
||||
<artifactId>log4j-jul</artifactId>
|
||||
<version>${log4j2.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.logging.log4j</groupId>
|
||||
<artifactId>log4j-jcl</artifactId>
|
||||
<version>${log4j2.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.logging.log4j</groupId>
|
||||
<artifactId>log4j-1.2-api</artifactId>
|
||||
<version>${log4j2.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.logging.log4j</groupId>
|
||||
<artifactId>log4j-to-slf4j</artifactId>
|
||||
<version>${log4j2.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.logging.log4j</groupId>
|
||||
<artifactId>log4j-web</artifactId>
|
||||
<version>${log4j2.version}</version>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>org.talend.sdk.component</groupId>
|
||||
<artifactId>component-runtime</artifactId>
|
||||
<version>${component-runtime.version}</version>
|
||||
<type>pom</type>
|
||||
<scope>import</scope>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
</dependencyManagement>
|
||||
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>org.apache.cxf</groupId>
|
||||
<artifactId>cxf-core</artifactId>
|
||||
<version>${cxf.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.cxf</groupId>
|
||||
<artifactId>cxf-integration-cdi</artifactId>
|
||||
<version>${cxf.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.cxf</groupId>
|
||||
<artifactId>cxf-rt-frontend-jaxrs</artifactId>
|
||||
<version>${cxf.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.cxf</groupId>
|
||||
<artifactId>cxf-rt-rs-client</artifactId>
|
||||
<version>${cxf.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.cxf</groupId>
|
||||
<artifactId>cxf-rt-security</artifactId>
|
||||
<version>${cxf.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.cxf</groupId>
|
||||
<artifactId>cxf-rt-transports-http</artifactId>
|
||||
<version>${cxf.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.geronimo</groupId>
|
||||
<artifactId>geronimo-jcache-simple</artifactId>
|
||||
<version>${jcache.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.geronimo</groupId>
|
||||
<artifactId>geronimo-opentracing-common</artifactId>
|
||||
<version>${geronimo.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.geronimo</groupId>
|
||||
<artifactId>geronimo-opentracing</artifactId>
|
||||
<version>${geronimo.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.geronimo.specs</groupId>
|
||||
<artifactId>geronimo-jcache_1.0_spec</artifactId>
|
||||
<version>${jcache_spec.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.johnzon</groupId>
|
||||
<artifactId>johnzon-core</artifactId>
|
||||
<version>${johnzon.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.johnzon</groupId>
|
||||
<artifactId>johnzon-jaxrs</artifactId>
|
||||
<version>${johnzon.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.johnzon</groupId>
|
||||
<artifactId>johnzon-jsonb</artifactId>
|
||||
<version>${johnzon.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.johnzon</groupId>
|
||||
<artifactId>johnzon-mapper</artifactId>
|
||||
<version>${johnzon.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.meecrowave</groupId>
|
||||
<artifactId>meecrowave-core</artifactId>
|
||||
<version>${meecrowave.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.openwebbeans</groupId>
|
||||
<artifactId>openwebbeans-el22</artifactId>
|
||||
<version>${owb.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.openwebbeans</groupId>
|
||||
<artifactId>openwebbeans-impl</artifactId>
|
||||
<version>${owb.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.openwebbeans</groupId>
|
||||
<artifactId>openwebbeans-se</artifactId>
|
||||
<version>${owb.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.openwebbeans</groupId>
|
||||
<artifactId>openwebbeans-spi</artifactId>
|
||||
<version>${owb.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.openwebbeans</groupId>
|
||||
<artifactId>openwebbeans-web</artifactId>
|
||||
<version>${owb.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.tomcat</groupId>
|
||||
<artifactId>tomcat-api</artifactId>
|
||||
<version>${tomcat.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.tomcat</groupId>
|
||||
<artifactId>tomcat-catalina</artifactId>
|
||||
<version>${tomcat.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.tomcat</groupId>
|
||||
<artifactId>tomcat-coyote</artifactId>
|
||||
<version>${tomcat.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.tomcat</groupId>
|
||||
<artifactId>tomcat-jaspic-api</artifactId>
|
||||
<version>${tomcat.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.tomcat</groupId>
|
||||
<artifactId>tomcat-jni</artifactId>
|
||||
<version>${tomcat.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.tomcat</groupId>
|
||||
<artifactId>tomcat-juli</artifactId>
|
||||
<version>${tomcat.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.tomcat</groupId>
|
||||
<artifactId>tomcat-servlet-api</artifactId>
|
||||
<version>${tomcat.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.tomcat</groupId>
|
||||
<artifactId>tomcat-util-scan</artifactId>
|
||||
<version>${tomcat.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.tomcat</groupId>
|
||||
<artifactId>tomcat-util</artifactId>
|
||||
<version>${tomcat.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.tomcat</groupId>
|
||||
<artifactId>tomcat-websocket-api</artifactId>
|
||||
<version>${tomcat.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.tomcat</groupId>
|
||||
<artifactId>tomcat-websocket</artifactId>
|
||||
<version>${tomcat.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.xbean</groupId>
|
||||
<artifactId>xbean-asm9-shaded</artifactId>
|
||||
<version>${xbean.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.xbean</groupId>
|
||||
<artifactId>xbean-finder-shaded</artifactId>
|
||||
<version>${xbean.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.xbean</groupId>
|
||||
<artifactId>xbean-finder</artifactId>
|
||||
<version>${xbean.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.xbean</groupId>
|
||||
<artifactId>xbean-reflect</artifactId>
|
||||
<version>${xbean.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.eclipse.microprofile.opentracing</groupId>
|
||||
<artifactId>microprofile-opentracing-api</artifactId>
|
||||
<version>${microprofile.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.talend.sdk.component</groupId>
|
||||
<artifactId>component-api</artifactId>
|
||||
<version>${component-runtime.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.talend.sdk.component</groupId>
|
||||
<artifactId>component-runtime-design-extension</artifactId>
|
||||
<version>${component-runtime.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.talend.sdk.component</groupId>
|
||||
<artifactId>component-runtime-di</artifactId>
|
||||
<version>${component-runtime.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.talend.sdk.component</groupId>
|
||||
<artifactId>component-runtime-impl</artifactId>
|
||||
<version>${component-runtime.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.talend.sdk.component</groupId>
|
||||
<artifactId>component-runtime-manager</artifactId>
|
||||
<version>${component-runtime.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.talend.sdk.component</groupId>
|
||||
<artifactId>component-server</artifactId>
|
||||
<version>${component-runtime.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.talend.sdk.component</groupId>
|
||||
<artifactId>component-server-api</artifactId>
|
||||
<version>${component-runtime.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.talend.sdk.component</groupId>
|
||||
<artifactId>component-server-extension-api</artifactId>
|
||||
<version>${component-runtime.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.talend.sdk.component</groupId>
|
||||
<artifactId>component-server-model</artifactId>
|
||||
<version>${component-runtime.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.talend.sdk.component</groupId>
|
||||
<artifactId>component-spi</artifactId>
|
||||
<version>${component-runtime.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.talend.sdk.component</groupId>
|
||||
<artifactId>container-core</artifactId>
|
||||
<version>${component-runtime.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.talend.sdk.component</groupId>
|
||||
<artifactId>slf4j-standard</artifactId>
|
||||
<version>${component-runtime.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.talend.sdk.component</groupId>
|
||||
<artifactId>vault-client</artifactId>
|
||||
<version>${component-runtime.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.slf4j</groupId>
|
||||
<artifactId>slf4j-api</artifactId>
|
||||
<version>${slf4j.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.slf4j</groupId>
|
||||
<artifactId>slf4j-jdk14</artifactId>
|
||||
<version>${slf4j.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.slf4j</groupId>
|
||||
<artifactId>slf4j-log4j12</artifactId>
|
||||
<version>${slf4j.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.slf4j</groupId>
|
||||
<artifactId>slf4j-simple</artifactId>
|
||||
<version>${slf4j.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>commons-cli</groupId>
|
||||
<artifactId>commons-cli</artifactId>
|
||||
<version>1.4</version>
|
||||
</dependency>
|
||||
<!-- https://mvnrepository.com/artifact/org.apache.commons/commons-text -->
|
||||
<dependency>
|
||||
<groupId>org.apache.commons</groupId>
|
||||
<artifactId>commons-text</artifactId>
|
||||
<version>1.4</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
<build>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-deploy-plugin</artifactId>
|
||||
<version>2.8.2</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>default-deploy</id>
|
||||
<phase>deploy</phase>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-clean-plugin</artifactId>
|
||||
<version>3.1.0</version>
|
||||
<configuration>
|
||||
<filesets>
|
||||
<fileset>
|
||||
<directory>${project.basedir}/repository</directory>
|
||||
<includes>
|
||||
<include>**/*</include>
|
||||
</includes>
|
||||
<followSymlinks>false</followSymlinks>
|
||||
</fileset>
|
||||
<fileset>
|
||||
<directory>${project.basedir}/tmp</directory>
|
||||
<includes>
|
||||
<include>**/*</include>
|
||||
</includes>
|
||||
<followSymlinks>false</followSymlinks>
|
||||
</fileset>
|
||||
</filesets>
|
||||
</configuration>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-dependency-plugin</artifactId>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>copy-dependencies-jar</id>
|
||||
<phase>generate-sources</phase>
|
||||
<goals>
|
||||
<goal>copy-dependencies</goal>
|
||||
</goals>
|
||||
<configuration>
|
||||
<outputDirectory>${project.basedir}/tmp</outputDirectory>
|
||||
<includeScope>runtime</includeScope>
|
||||
<useRepositoryLayout>true</useRepositoryLayout>
|
||||
</configuration>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-antrun-plugin</artifactId>
|
||||
<version>1.8</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>zip-maven-repository</id>
|
||||
<phase>generate-sources</phase>
|
||||
<configuration>
|
||||
<tasks>
|
||||
<zip destfile="${project.basedir}/repository/maven_repository.zip" basedir="${project.basedir}/tmp/" />
|
||||
<delete dir="${project.basedir}/tmp/" />
|
||||
</tasks>
|
||||
</configuration>
|
||||
<goals>
|
||||
<goal>run</goal>
|
||||
</goals>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
</project>
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tcommon-studio-se</artifactId>
|
||||
<version>8.0.1-SNAPSHOT</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.maven.repo.tcksdk</artifactId>
|
||||
<packaging>eclipse-plugin</packaging>
|
||||
<properties>
|
||||
<tcomp.version>${component-runtime.version}</tcomp.version>
|
||||
<cxf.version>3.5.1</cxf.version>
|
||||
<geronimo.version>1.0.2</geronimo.version>
|
||||
<jackson.version>2.12.1</jackson.version>
|
||||
<jcache.version>1.0.5</jcache.version>
|
||||
<jcache_spec.version>1.0-alpha-1</jcache_spec.version>
|
||||
<johnzon.version>1.2.16</johnzon.version>
|
||||
<meecrowave.version>1.2.13</meecrowave.version>
|
||||
<microprofile.version>1.2.1</microprofile.version>
|
||||
<owb.version>2.0.26</owb.version>
|
||||
<slf4j.version>1.7.32</slf4j.version>
|
||||
<tomcat.version>9.0.59</tomcat.version>
|
||||
<xbean.version>4.20</xbean.version>
|
||||
<reload4j.version>1.2.19</reload4j.version>
|
||||
<log4j2.version>2.17.1</log4j2.version>
|
||||
<tycho.buildtimestamp.format>${timestamp}</tycho.buildtimestamp.format>
|
||||
</properties>
|
||||
<repositories>
|
||||
<repository>
|
||||
<id>talend_open</id>
|
||||
<releases>
|
||||
<enabled>true</enabled>
|
||||
</releases>
|
||||
<snapshots>
|
||||
<enabled>false</enabled>
|
||||
</snapshots>
|
||||
<url>https://artifacts-oss.talend.com/nexus/content/repositories/TalendOpenSourceRelease/</url>
|
||||
</repository>
|
||||
<repository>
|
||||
<id>talend_open_snapshots</id>
|
||||
<releases>
|
||||
<enabled>false</enabled>
|
||||
</releases>
|
||||
<snapshots>
|
||||
<enabled>true</enabled>
|
||||
</snapshots>
|
||||
<url>https://artifacts-oss.talend.com/nexus/content/repositories/TalendOpenSourceSnapshot/</url>
|
||||
</repository>
|
||||
<repository>
|
||||
<id>sonatype_snapshots</id>
|
||||
<releases>
|
||||
<enabled>false</enabled>
|
||||
</releases>
|
||||
<snapshots>
|
||||
<enabled>true</enabled>
|
||||
</snapshots>
|
||||
<url>https://oss.sonatype.org/content/repositories/snapshots/</url>
|
||||
</repository>
|
||||
</repositories>
|
||||
|
||||
<dependencyManagement>
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>org.apache.logging.log4j</groupId>
|
||||
<artifactId>log4j-core</artifactId>
|
||||
<version>${log4j2.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.logging.log4j</groupId>
|
||||
<artifactId>log4j-api</artifactId>
|
||||
<version>${log4j2.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.logging.log4j</groupId>
|
||||
<artifactId>log4j-slf4j-impl</artifactId>
|
||||
<version>${log4j2.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.logging.log4j</groupId>
|
||||
<artifactId>log4j-jul</artifactId>
|
||||
<version>${log4j2.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.logging.log4j</groupId>
|
||||
<artifactId>log4j-jcl</artifactId>
|
||||
<version>${log4j2.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.logging.log4j</groupId>
|
||||
<artifactId>log4j-1.2-api</artifactId>
|
||||
<version>${log4j2.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.logging.log4j</groupId>
|
||||
<artifactId>log4j-to-slf4j</artifactId>
|
||||
<version>${log4j2.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.logging.log4j</groupId>
|
||||
<artifactId>log4j-web</artifactId>
|
||||
<version>${log4j2.version}</version>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>org.talend.sdk.component</groupId>
|
||||
<artifactId>component-runtime</artifactId>
|
||||
<version>${component-runtime.version}</version>
|
||||
<type>pom</type>
|
||||
<scope>import</scope>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
</dependencyManagement>
|
||||
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>org.apache.cxf</groupId>
|
||||
<artifactId>cxf-core</artifactId>
|
||||
<version>${cxf.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.cxf</groupId>
|
||||
<artifactId>cxf-integration-cdi</artifactId>
|
||||
<version>${cxf.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.cxf</groupId>
|
||||
<artifactId>cxf-rt-frontend-jaxrs</artifactId>
|
||||
<version>${cxf.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.cxf</groupId>
|
||||
<artifactId>cxf-rt-rs-client</artifactId>
|
||||
<version>${cxf.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.cxf</groupId>
|
||||
<artifactId>cxf-rt-security</artifactId>
|
||||
<version>${cxf.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.cxf</groupId>
|
||||
<artifactId>cxf-rt-transports-http</artifactId>
|
||||
<version>${cxf.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.geronimo</groupId>
|
||||
<artifactId>geronimo-jcache-simple</artifactId>
|
||||
<version>${jcache.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.geronimo</groupId>
|
||||
<artifactId>geronimo-opentracing-common</artifactId>
|
||||
<version>${geronimo.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.geronimo</groupId>
|
||||
<artifactId>geronimo-opentracing</artifactId>
|
||||
<version>${geronimo.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.geronimo.specs</groupId>
|
||||
<artifactId>geronimo-jcache_1.0_spec</artifactId>
|
||||
<version>${jcache_spec.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.johnzon</groupId>
|
||||
<artifactId>johnzon-core</artifactId>
|
||||
<version>${johnzon.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.johnzon</groupId>
|
||||
<artifactId>johnzon-jaxrs</artifactId>
|
||||
<version>${johnzon.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.johnzon</groupId>
|
||||
<artifactId>johnzon-jsonb</artifactId>
|
||||
<version>${johnzon.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.johnzon</groupId>
|
||||
<artifactId>johnzon-mapper</artifactId>
|
||||
<version>${johnzon.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.meecrowave</groupId>
|
||||
<artifactId>meecrowave-core</artifactId>
|
||||
<version>${meecrowave.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.openwebbeans</groupId>
|
||||
<artifactId>openwebbeans-el22</artifactId>
|
||||
<version>${owb.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.openwebbeans</groupId>
|
||||
<artifactId>openwebbeans-impl</artifactId>
|
||||
<version>${owb.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.openwebbeans</groupId>
|
||||
<artifactId>openwebbeans-se</artifactId>
|
||||
<version>${owb.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.openwebbeans</groupId>
|
||||
<artifactId>openwebbeans-spi</artifactId>
|
||||
<version>${owb.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.openwebbeans</groupId>
|
||||
<artifactId>openwebbeans-web</artifactId>
|
||||
<version>${owb.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.tomcat</groupId>
|
||||
<artifactId>tomcat-api</artifactId>
|
||||
<version>${tomcat.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.tomcat</groupId>
|
||||
<artifactId>tomcat-catalina</artifactId>
|
||||
<version>${tomcat.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.tomcat</groupId>
|
||||
<artifactId>tomcat-coyote</artifactId>
|
||||
<version>${tomcat.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.tomcat</groupId>
|
||||
<artifactId>tomcat-jaspic-api</artifactId>
|
||||
<version>${tomcat.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.tomcat</groupId>
|
||||
<artifactId>tomcat-jni</artifactId>
|
||||
<version>${tomcat.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.tomcat</groupId>
|
||||
<artifactId>tomcat-juli</artifactId>
|
||||
<version>${tomcat.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.tomcat</groupId>
|
||||
<artifactId>tomcat-servlet-api</artifactId>
|
||||
<version>${tomcat.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.tomcat</groupId>
|
||||
<artifactId>tomcat-util-scan</artifactId>
|
||||
<version>${tomcat.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.tomcat</groupId>
|
||||
<artifactId>tomcat-util</artifactId>
|
||||
<version>${tomcat.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.tomcat</groupId>
|
||||
<artifactId>tomcat-websocket-api</artifactId>
|
||||
<version>${tomcat.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.tomcat</groupId>
|
||||
<artifactId>tomcat-websocket</artifactId>
|
||||
<version>${tomcat.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.xbean</groupId>
|
||||
<artifactId>xbean-asm9-shaded</artifactId>
|
||||
<version>${xbean.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.xbean</groupId>
|
||||
<artifactId>xbean-finder-shaded</artifactId>
|
||||
<version>${xbean.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.xbean</groupId>
|
||||
<artifactId>xbean-finder</artifactId>
|
||||
<version>${xbean.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.xbean</groupId>
|
||||
<artifactId>xbean-reflect</artifactId>
|
||||
<version>${xbean.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.eclipse.microprofile.opentracing</groupId>
|
||||
<artifactId>microprofile-opentracing-api</artifactId>
|
||||
<version>${microprofile.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.talend.sdk.component</groupId>
|
||||
<artifactId>component-api</artifactId>
|
||||
<version>${component-runtime.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.talend.sdk.component</groupId>
|
||||
<artifactId>component-runtime-design-extension</artifactId>
|
||||
<version>${component-runtime.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.talend.sdk.component</groupId>
|
||||
<artifactId>component-runtime-di</artifactId>
|
||||
<version>${component-runtime.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.talend.sdk.component</groupId>
|
||||
<artifactId>component-runtime-impl</artifactId>
|
||||
<version>${component-runtime.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.talend.sdk.component</groupId>
|
||||
<artifactId>component-runtime-manager</artifactId>
|
||||
<version>${component-runtime.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.talend.sdk.component</groupId>
|
||||
<artifactId>component-server</artifactId>
|
||||
<version>${component-runtime.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.talend.sdk.component</groupId>
|
||||
<artifactId>component-server-api</artifactId>
|
||||
<version>${component-runtime.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.talend.sdk.component</groupId>
|
||||
<artifactId>component-server-extension-api</artifactId>
|
||||
<version>${component-runtime.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.talend.sdk.component</groupId>
|
||||
<artifactId>component-server-model</artifactId>
|
||||
<version>${component-runtime.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.talend.sdk.component</groupId>
|
||||
<artifactId>component-spi</artifactId>
|
||||
<version>${component-runtime.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.talend.sdk.component</groupId>
|
||||
<artifactId>container-core</artifactId>
|
||||
<version>${component-runtime.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.talend.sdk.component</groupId>
|
||||
<artifactId>slf4j-standard</artifactId>
|
||||
<version>${component-runtime.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.talend.sdk.component</groupId>
|
||||
<artifactId>vault-client</artifactId>
|
||||
<version>${component-runtime.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.slf4j</groupId>
|
||||
<artifactId>slf4j-api</artifactId>
|
||||
<version>${slf4j.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.slf4j</groupId>
|
||||
<artifactId>slf4j-jdk14</artifactId>
|
||||
<version>${slf4j.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.slf4j</groupId>
|
||||
<artifactId>slf4j-log4j12</artifactId>
|
||||
<version>${slf4j.version}</version>
|
||||
<exclusions>
|
||||
<exclusion>
|
||||
<groupId>log4j</groupId>
|
||||
<artifactId>log4j</artifactId>
|
||||
</exclusion>
|
||||
</exclusions>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>ch.qos.reload4j</groupId>
|
||||
<artifactId>reload4j</artifactId>
|
||||
<version>${reload4j.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.slf4j</groupId>
|
||||
<artifactId>slf4j-simple</artifactId>
|
||||
<version>${slf4j.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>commons-cli</groupId>
|
||||
<artifactId>commons-cli</artifactId>
|
||||
<version>1.4</version>
|
||||
</dependency>
|
||||
<!-- https://mvnrepository.com/artifact/org.apache.commons/commons-text -->
|
||||
<dependency>
|
||||
<groupId>org.apache.commons</groupId>
|
||||
<artifactId>commons-text</artifactId>
|
||||
<version>1.4</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
<build>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-deploy-plugin</artifactId>
|
||||
<version>2.8.2</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>default-deploy</id>
|
||||
<phase>deploy</phase>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-clean-plugin</artifactId>
|
||||
<version>3.1.0</version>
|
||||
<configuration>
|
||||
<filesets>
|
||||
<fileset>
|
||||
<directory>${project.basedir}/repository</directory>
|
||||
<includes>
|
||||
<include>**/*</include>
|
||||
</includes>
|
||||
<followSymlinks>false</followSymlinks>
|
||||
</fileset>
|
||||
<fileset>
|
||||
<directory>${project.basedir}/tmp</directory>
|
||||
<includes>
|
||||
<include>**/*</include>
|
||||
</includes>
|
||||
<followSymlinks>false</followSymlinks>
|
||||
</fileset>
|
||||
</filesets>
|
||||
</configuration>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-dependency-plugin</artifactId>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>copy-dependencies-jar</id>
|
||||
<phase>generate-sources</phase>
|
||||
<goals>
|
||||
<goal>copy-dependencies</goal>
|
||||
</goals>
|
||||
<configuration>
|
||||
<outputDirectory>${project.basedir}/tmp</outputDirectory>
|
||||
<includeScope>runtime</includeScope>
|
||||
<useRepositoryLayout>true</useRepositoryLayout>
|
||||
</configuration>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-antrun-plugin</artifactId>
|
||||
<version>1.8</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>zip-maven-repository</id>
|
||||
<phase>generate-sources</phase>
|
||||
<configuration>
|
||||
<tasks>
|
||||
<zip destfile="${project.basedir}/repository/maven_repository.zip" basedir="${project.basedir}/tmp/" />
|
||||
<delete dir="${project.basedir}/tmp/" />
|
||||
</tasks>
|
||||
</configuration>
|
||||
<goals>
|
||||
<goal>run</goal>
|
||||
</goals>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
</project>
|
||||
|
||||
@@ -3,7 +3,7 @@ Automatic-Module-Name: org.talend.designer.maven.repo.tcompv0
|
||||
Bundle-ManifestVersion: 2
|
||||
Bundle-Name: Maven repo Tcompv0 Plug-in
|
||||
Bundle-SymbolicName: org.talend.designer.maven.repo.tcompv0;singleton:=true
|
||||
Bundle-Version: 8.8.8.qualifier
|
||||
Bundle-Version: 8.0.1.qualifier
|
||||
Bundle-Localization: plugin
|
||||
Eclipse-LazyStart: true
|
||||
Require-Bundle: org.talend.core,
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tcommon-studio-se</artifactId>
|
||||
<version>8.8.8-SNAPSHOT</version>
|
||||
<version>8.0.1-SNAPSHOT</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.maven.repo.tcompv0</artifactId>
|
||||
@@ -17,6 +17,7 @@
|
||||
<talend_releases>https://artifacts-oss.talend.com/nexus/content/repositories/TalendOpenSourceRelease/</talend_releases>
|
||||
<talend_snapshots_ee>https://artifacts-zl.talend.com/nexus/content/repositories/snapshots/</talend_snapshots_ee>
|
||||
<talend_releases_ee>https://artifacts-zl.talend.com/nexus/content/repositories/releases/</talend_releases_ee>
|
||||
<tycho.buildtimestamp.format>${timestamp}</tycho.buildtimestamp.format>
|
||||
</properties>
|
||||
<repositories>
|
||||
<repository>
|
||||
|
||||
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
|
||||
Bundle-ManifestVersion: 2
|
||||
Bundle-Name: TOS Maven dependencies
|
||||
Bundle-SymbolicName: org.talend.designer.maven.tos
|
||||
Bundle-Version: 8.8.8.qualifier
|
||||
Bundle-Version: 8.0.1.qualifier
|
||||
Fragment-Host: org.talend.designer.maven;bundle-version="6.2.1"
|
||||
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
|
||||
Eclipse-BundleShape: dir
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>tcommon-studio-se</artifactId>
|
||||
<version>8.8.8-SNAPSHOT</version>
|
||||
<version>8.0.1-SNAPSHOT</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>org.talend.designer.maven.tos</artifactId>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>org.talend.studio</groupId>
|
||||
<artifactId>studio-maven-repository-tos</artifactId>
|
||||
<version>8.8.8-SNAPSHOT</version>
|
||||
<version>8.0.1-SNAPSHOT</version>
|
||||
<relativePath>../../../</relativePath>
|
||||
</parent>
|
||||
<artifactId>build-helper-maven-plugin-3-0-0-tos</artifactId>
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user