Compare commits

..

24 Commits

Author SHA1 Message Date
hzhao-talendbj
d3f3c8bca2 change version to 0.0.0 2024-01-05 11:00:44 +08:00
hzhao-talendbj
6aad4768fc Merge remote-tracking branch 'origin/master' into hzhao/master/TUP-40750 2024-01-05 10:52:44 +08:00
hzhao-talendbj
49efbbbfe6 Merge remote-tracking branch 'origin/master' into hzhao/master/TUP-40750 2024-01-04 18:34:05 +08:00
hzhao-talendbj
184c761a4f feat(TUP-40750): fix
"org.eclipse.core.variables.VariablesPlugin.getDefault()" is null issue
2024-01-04 18:31:52 +08:00
hzhao-talendbj
94cd11879a feat(TUP-40750): workaround to pass the m2e.core.ui issue 2024-01-04 15:32:49 +08:00
hzhao-talendbj
bda52474e1 feat(TUP-40750): fix codec/compress issue 2024-01-03 10:50:11 +08:00
hzhao-talendbj
55720de775 feat(TUP-40750): change project template 2024-01-02 17:25:41 +08:00
bhe-talendbj
0da816162d feat(TUP-40272): revert disable maven natrue 2024-01-02 15:05:43 +08:00
bhe-talendbj
be0117dd1f feat(TUP-40272): remove unnessary code changes 2024-01-02 11:50:38 +08:00
bhe-talendbj
72ed9c5446 feat(TUP-40272): Merge branch 'master' into bhe/feat/TUP-40272_1 2024-01-02 11:40:43 +08:00
hzhao-talendbj
f3b80e8be8 Merge remote-tracking branch 'origin/master' into hzhao/master/TUP-40750 2024-01-02 11:35:20 +08:00
hzhao-talendbj
6b5cd74113 feat(TUP-40750): Upgrade eclipse to 2023-12 2024-01-02 11:34:48 +08:00
bhe-talendbj
17d3f2282f feat(TUP-40272): remove unnecessary enable maven nature 2024-01-02 11:26:12 +08:00
hzhao-talendbj
32c8cb428b feat(TUP-40750): Upgrade eclipse to 2023-12 2023-12-29 11:35:05 +08:00
bhe-talendbj
7cb74ea8ee feat(TUP-40272): remove m2e core ui 2023-12-28 15:00:15 +08:00
bhe-talendbj
fe99d698a5 feat(TUP-40272): remove m2e core ui 2023-12-28 14:56:02 +08:00
bhe-talendbj
aec6b5ed75 feat(TUP-40272): fix pom 2023-12-28 10:05:14 +08:00
bhe-talendbj
1f16f85fb8 feat(TUP-40272): Merge branch 'master' into bhe/feat/TUP-40272_1 2023-12-28 09:49:31 +08:00
bhe-talendbj
714d2a5032 feat(TUP-40272): add m2e extension points 2023-12-28 09:49:17 +08:00
bhe-talendbj
5c56d75907 feat(TUP-40272): Merge branch 'master' into bhe/feat/TUP-40272_1 2023-12-27 16:05:51 +08:00
bhe-talendbj
94d176597f feat(TUP-40272): fix feature 2023-12-26 17:06:09 +08:00
bhe-talendbj
f2fa8ebcb9 feat(TUP-40272): customize m2e launcher 2023-12-26 16:46:32 +08:00
bhe-talendbj
580d53c4e0 feat(TUP-40272): Merge branch 'master' into bhe/feat/TUP-40272_1 2023-12-26 16:43:15 +08:00
bhe-talendbj
fbd4a515fd feat(TUP-40272): remove m2e ui 2023-12-26 15:54:49 +08:00
358 changed files with 1275 additions and 2327 deletions

View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature id="org.talend.commons.feature" label="Commons Feature" version="8.0.2.qualifier" provider-name=".Talend SA.">
<feature id="org.talend.commons.feature" label="Commons Feature" version="8.8.8.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>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>8.0.2-SNAPSHOT</version>
<version>8.8.8-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.commons.feature</artifactId>

View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature id="org.talend.core.feature" label="Core Feature" version="8.0.2.qualifier" provider-name=".Talend SA.">
<feature id="org.talend.core.feature" label="Core Feature" version="8.8.8.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>
@@ -32,7 +32,7 @@
<import plugin="net.jeeeyul.swtend" version="0.0.0" match="greaterOrEqual"/>
<import plugin="org.apache.commons.collections" version="0.0.0" match="greaterOrEqual"/>
<import plugin="org.apache.commons.discovery" version="0.0.0" match="greaterOrEqual"/>
<import plugin="org.apache.commons.commons-io" version="0.0.0" match="greaterOrEqual"/>
<import plugin="org.apache.commons.io" version="0.0.0" match="greaterOrEqual"/>
<import plugin="org.apache.httpcomponents.httpclient" version="0.0.0" match="greaterOrEqual"/>
<import plugin="org.apache.httpcomponents.httpcore" version="0.0.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.compare" version="0.0.0" match="greaterOrEqual"/>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>8.0.2-SNAPSHOT</version>
<version>8.8.8-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.core.feature</artifactId>

View File

@@ -2,7 +2,7 @@
<feature
id="org.talend.fragment.jars.common.feature"
label="Fragment Jars in Common"
version="8.0.2.qualifier">
version="8.8.8.qualifier">
<description url="http://www.example.com/description">
[Enter Feature Description here.]

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>8.0.2-SNAPSHOT</version>
<version>8.8.8-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.fragment.jars.common.feature</artifactId>

View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature id="org.talend.help.feature" label="Help Feature" version="8.0.2.qualifier" provider-name=".Talend SA.">
<feature id="org.talend.help.feature" label="Help Feature" version="8.8.8.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>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>8.0.2-SNAPSHOT</version>
<version>8.8.8-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.help.feature</artifactId>

View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature id="org.talend.jdt.feature" label="Feature" version="8.0.2.qualifier">
<feature id="org.talend.jdt.feature" label="Feature" version="8.8.8.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>

View File

@@ -1,32 +1,32 @@
<?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.2-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.jdt.feature</artifactId>
<packaging>eclipse-feature</packaging>
<build>
<plugins>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>target-platform-configuration</artifactId>
<version>${tycho.version}</version>
<configuration combine.self="override">
<executionEnvironmentDefault>JavaSE-17</executionEnvironmentDefault>
<environments>
<environment>
<os>${osgi.os}</os>
<ws>${osgi.ws}</ws>
<arch>${osgi.arch}</arch>
</environment>
</environments>
</configuration>
</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.8.8-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.jdt.feature</artifactId>
<packaging>eclipse-feature</packaging>
<build>
<plugins>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>target-platform-configuration</artifactId>
<version>${tycho.version}</version>
<configuration combine.self="override">
<executionEnvironmentDefault>JavaSE-17</executionEnvironmentDefault>
<environments>
<environment>
<os>${osgi.os}</os>
<ws>${osgi.ws}</ws>
<arch>${osgi.arch}</arch>
</environment>
</environments>
</configuration>
</plugin>
</plugins>
</build>
</project>

View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature id="org.talend.libraries.jdbc.feature" label="Jdbc_feature Feature" version="8.0.2.qualifier" provider-name=".Talend SA.">
<feature id="org.talend.libraries.jdbc.feature" label="Jdbc_feature Feature" version="8.8.8.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>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>8.0.2-SNAPSHOT</version>
<version>8.8.8-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.libraries.jdbc.feature</artifactId>

View File

@@ -2,7 +2,7 @@
<feature
id="org.talend.m2e.feature"
label="%featureName"
version="8.0.2.qualifier"
version="8.8.8.qualifier"
provider-name="%providerName">
<install-handler/>

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@@ -1,51 +1,31 @@
<?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.2-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.m2e.feature</artifactId>
<packaging>eclipse-feature</packaging>
<build>
<plugins>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>target-platform-configuration</artifactId>
<version>${tycho.version}</version>
<configuration combine.self="override">
<executionEnvironmentDefault>JavaSE-17</executionEnvironmentDefault>
<environments>
<environment>
<os>linux</os>
<ws>gtk</ws>
<arch>x86_64</arch>
</environment>
<environment>
<os>linux</os>
<ws>gtk</ws>
<arch>aarch64</arch>
</environment>
<environment>
<os>win32</os>
<ws>win32</ws>
<arch>x86_64</arch>
</environment>
<environment>
<os>macosx</os>
<ws>cocoa</ws>
<arch>x86_64</arch>
</environment>
<environment>
<os>macosx</os>
<ws>cocoa</ws>
<arch>aarch64</arch>
</environment>
</environments>
</configuration>
</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.8.8-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.m2e.feature</artifactId>
<packaging>eclipse-feature</packaging>
<build>
<plugins>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>target-platform-configuration</artifactId>
<version>${tycho.version}</version>
<configuration combine.self="override">
<executionEnvironmentDefault>JavaSE-17</executionEnvironmentDefault>
<environments>
<environment>
<os>${osgi.os}</os>
<ws>${osgi.ws}</ws>
<arch>${osgi.arch}</arch>
</environment>
</environments>
</configuration>
</plugin>
</plugins>
</build>
</project>

View File

@@ -2,7 +2,7 @@
<feature
id="org.talend.platform.feature"
label="Platform featrue"
version="8.0.2.qualifier"
version="8.8.8.qualifier"
provider-name=".Talend SA.">
<description url="http://www.talend.com/online/featuresdescription.html#platform-feature">

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>8.0.2-SNAPSHOT</version>
<version>8.8.8-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.platform.feature</artifactId>

View File

@@ -2,7 +2,7 @@
<feature
id="org.talend.rcp.feature"
label="RCP Feature"
version="8.0.2.qualifier"
version="8.8.8.qualifier"
provider-name=".Talend SA.">
<description url="http://www.talend.com/online/featuresdescription.html#rcp-feature">

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>8.0.2-SNAPSHOT</version>
<version>8.8.8-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.rcp.feature</artifactId>

View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature id="org.talend.update.p2.feature" label="P2-feature" version="8.0.2.qualifier">
<feature id="org.talend.update.p2.feature" label="P2-feature" version="8.8.8.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>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>8.0.2-SNAPSHOT</version>
<version>8.8.8-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.update.p2.feature</artifactId>

View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature id="org.talend.updates.feature" label="Updates-feature" version="8.0.2.qualifier" provider-name=".Talend SA.">
<feature id="org.talend.updates.feature" label="Updates-feature" version="8.8.8.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>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>8.0.2-SNAPSHOT</version>
<version>8.8.8-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.updates.feature</artifactId>

View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature id="org.talend.utils.feature" label="Utils_feature Feature" version="8.0.2.qualifier">
<feature id="org.talend.utils.feature" label="Utils_feature Feature" version="8.8.8.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>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>8.0.2-SNAPSHOT</version>
<version>8.8.8-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.utils.feature</artifactId>

View File

@@ -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.0.2.qualifier
Bundle-Version: 8.8.8.qualifier
Require-Bundle: org.eclipse.core.runtime,
org.apache.commons.collections,
org.talend.libraries.dom4j-jaxen,

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 229 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 35 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 30 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 30 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 33 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 30 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 31 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 38 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 33 KiB

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>8.0.2-SNAPSHOT</version>
<version>8.8.8-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.common.ui.runtime</artifactId>

View File

@@ -40,8 +40,6 @@ public class ExceptionMessageDialog extends MessageDialog {
private String exceptionString = null;
private int[] diabledButtonIndex = new int[] {};
private boolean expandedOnOpen = false;
public ExceptionMessageDialog(Shell parentShell, String dialogTitle, Image dialogTitleImage, String dialogMessage,
int dialogImageType, String[] dialogButtonLabels, int defaultIndex, Throwable ex) {
@@ -87,8 +85,6 @@ public class ExceptionMessageDialog extends MessageDialog {
text.setText(exceptionString);
text.setEditable(false);
errorComposite.setClient(text);
errorComposite.setExpanded(expandedOnOpen);
return errorComposite;
}
@@ -154,22 +150,6 @@ public class ExceptionMessageDialog extends MessageDialog {
this.exceptionString = exceptionString;
}
/**
* @return the expandedOnOpen
*/
public boolean isExpandedOnOpen() {
return expandedOnOpen;
}
/**
* @param expandedOnOpen the expandedOnOpen to set
*/
public void setExpandedOnOpen(boolean expandedOnOpen) {
this.expandedOnOpen = expandedOnOpen;
}
public void setDisabledButtons(int[] index) {
this.diabledButtonIndex = index;
}

View File

@@ -15,7 +15,7 @@ ColorStyledText.SelectAllItem.Text=\u3059\u3079\u3066\u9078\u629E
ContentProposalAdapterExtended.close=\u9589\u3058\u308B
ContentProposalAdapterExtended.closeFocusout=\u30D5\u30A9\u30FC\u30AB\u30B9\u30A2\u30A6\u30C8\u3092\u9589\u3058\u308B
ControlUtils.Unsupported1=\u3053\u306E\u30B3\u30F3\u30C8\u30ED\u30FC\u30EB({0})\u306F\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002\u5FC5\u8981\u3067\u3042\u308C\u3070\u3001\u30B1\u30FC\u30B9\u3092\u8FFD\u52A0\u3057\u3066\u304F\u3060\u3055\u3044...
CopyPushButton.CopyButton.Tip=\u9078\u629E\u9805\u76EE\u3092\u30B3\u30D4\u30FC
CopyPushButton.CopyButton.Tip=\u9078\u629E\u3057\u305F\u30A2\u30A4\u30C6\u30E0\u3092\u30B3\u30D4\u30FC
Curve2D.MaxNum.Be0=maximumSegments\u306F\u6B63\u6570\u304B0\u306B\u3057\u3066\u304F\u3060\u3055\u3044
Curve2D.MinNum.Be0=minimumSegments\u306F\u6B63\u6570\u307E\u305F\u306F0\u306B\u3057\u3066\u304F\u3060\u3055\u3044
DateDialog.textContent=\u65E5\u6642\u3092\u9078\u629E

View File

@@ -41,16 +41,21 @@ public enum ECoreImage implements IImage {
DEFAULT_WIZ("/icons1/defaultWizard.png"), //$NON-NLS-1$
PROJECT_WIZ("/icons1/project_wiz.png"), //$NON-NLS-1$
RECYCLE_BIN_EMPTY_ICON("/icons1/recyclebinempty.png"), //$NON-NLS-1$
RECYCLE_BIN_FULL_ICON("/icons1/recyclebinfull.png"), //$NON-NLS-1$
FOLDER_OPEN_ICON("/icons1/folder_open.png"), //$NON-NLS-1$
FOLDER_CLOSE_ICON("/icons1/folder_close.png"), //$NON-NLS-1$
FOLDER_WIZ("/icons1/folder_wiz.gif"), //$NON-NLS-1$
BUSINESS_PROCESS_ICON("/icons1/businessProcess.png"), //$NON-NLS-1$
BUSINESS_PROCESS_WIZ("/icons1/business_wiz.png"), //$NON-NLS-1$
PROCESS_ICON("/icons1/process_icon.png"), //$NON-NLS-1$
PROCESS_ICON_EDITOR("/icons1/process_icon_editor.png"), //$NON-NLS-1$
PROCESS_WIZ("/icons1/process_wiz.png"), //$NON-NLS-1$
PROCESS_TEMPLATE_ICON("/icons1/process_icon.png"), //$NON-NLS-1$
PROCESS_TEMPLATE_WIZ("/icons1/process_template_wiz.png"), //$NON-NLS-1$
PROCESS_STANDARD_GENERIC_CATEGORY_CLOSE_ICON("/icons1/process_standard_generic_category_close.png"), //$NON-NLS-1$
PROCESS_STANDARD_GENERIC_CATEGORY_OPEN_ICON("/icons1/process_standard_generic_category_open.png"), //$NON-NLS-1$
PROCESS_STREAMING_GENERIC_CATEGORY_CLOSE_ICON("/icons1/process_streaming_generic_category_close.png"), //$NON-NLS-1$
@@ -66,6 +71,7 @@ public enum ECoreImage implements IImage {
JOBLET_STANDARD_ICON("/icons1/joblet_standard.png"), //$NON-NLS-1$
CONTEXT_ICON("/icons1/context_icon.png"), //$NON-NLS-1$
CONTEXT_CONF_ICON("/icons1/context_conf_icon.gif"), //$NON-NLS-1$
CONTEXT_WIZ("/icons1/context_wiz.png"), //$NON-NLS-1$
CODE_ICON("/icons1/code.png"), //$NON-NLS-1$
ROUTES_ICON("/icons1/routes_icon.png"), //$NON-NLS-1$
ROUTELET_ICON("/icons1/routelet.png"), //$NON-NLS-1$
@@ -75,6 +81,7 @@ public enum ECoreImage implements IImage {
JOB_SCRIPTS_ICON("/icons1/job_scripts.png"), //$NON-NLS-1$
JOB_SCRIPTS_TOOLBAR_ICON("/icons1/job_script_toolbar.png"), //$NON-NLS-1$
FTP_ICON("/icons1/ftp.png"), //$NON-NLS-1$
ROUTINE_WIZ("/icons1/routine_wiz.png"), //$NON-NLS-1$
SNIPPETS_ICON("/icons1/snippet.png"), //$NON-NLS-1$
// Note Component icon
NOTE_SMALL_ICON("/icons1/Note_icon16.png"), //$NON-NLS-1$
@@ -84,23 +91,30 @@ public enum ECoreImage implements IImage {
// SUBROUTINE_ICON("/icons1/subroutine.gif"),
DOCUMENTATION_ICON("/icons1/documentation.png"), //$NON-NLS-1$
DOCUMENTATION_SINGLE_ICON("/icons1/Documentation_feuillet.png"), //$NON-NLS-1$
DOCUMENTATION_WIZ("/icons1/documentation_wiz.png"), //$NON-NLS-1$
METADATA_ICON("/icons1/metadata.png"), //$NON-NLS-1$
METADATA_CONNECTION_ICON("/icons1/connection.gif"), //$NON-NLS-1$
METADATA_CONNECTION_WIZ("/icons1/connection_wiz.png"), //$NON-NLS-1$
METADATA_CDC_CONN_ICON("/icons1/cdc_conn.png"), //$NON-NLS-1$
METADATA_HL7_CONNECTION_ICON("/icons1/hl7.png"), //$NON-NLS-1$
METADATA_HL7_CONNECTION_WIZ("/icons1/hl7.png"), //$NON-NLS-1$
METADATA_BRMS_CONNECTION_ICON("/icons1/rules_wiz.gif"), //$NON-NLS-1$
METADATA_BRMS_CONNECTION_WIZ("/icons1/rules_wiz.gif"), //$NON-NLS-1$
METADATA_EBCDIC_CONNECTION_ICON("/icons1/copybook.png"), //$NON-NLS-1$
METADATA_EBCDIC_CONNECTION_WIZ("/icons1/copybook_wiz.png"), //$NON-NLS-1$
METADATA_MDM_CONNECTION_ICON("/icons1/MDM_16px.png"), //$NON-NLS-1$
METADATA_MDM_CONNECTION_WIZ("/icons1/talendMDM_wiz.png"), //$NON-NLS-1$
METADATA_RULES_ICON("/icons1/rules_wiz.gif"), //$NON-NLS-1$
METADATA_RULES_WIZ("/icons1/rules_wiz.gif"), //$NON-NLS-1$
METADATA_SAPCONNECTION_ICON("/icons1/sapconnection.png"), //$NON-NLS-1$
METADATA_SAPCONNECTION_WIZ("/icons1/connection_wiz.gif"), //$NON-NLS-1$
METADATA_BIGQUERYCONNECTION_ICON("/icons1/bigqueryconnection.png"), //$NON-NLS-1$
@@ -108,23 +122,32 @@ public enum ECoreImage implements IImage {
METADATA_SQLPATTERN_ICON("/icons1/SQLPattern.png"), //$NON-NLS-1$
METADATA_SQLPATTERN_ICON_EDITOR("/icons1/SQLPattern_editor.png"), //$NON-NLS-1$
METADATA_SQLPATTERN_WIZ("/icons1/defaultWizard.png"), //$NON-NLS-1$
METADATA_TABLE_ICON("/icons1/table.gif"), //$NON-NLS-1$
METADATA_COLUMN_ICON("/icons1/columns.gif"), //$NON-NLS-1$
METADATA_TABLE_WIZ("/icons1/table_wiz.png"), //$NON-NLS-1$
METADATA_VIEW_ICON("/icons1/view.gif"), //$NON-NLS-1$
METADATA_SYNONYM_ICON("/icons1/synonym.gif"), //$NON-NLS-1$
METADATA_QUERY_ICON("/icons1/query.gif"), //$NON-NLS-1$
METADATA_FILE_DELIMITED_ICON("/icons1/filedelimited.gif"), //$NON-NLS-1$
METADATA_FILE_DELIMITED_WIZ("/icons1/delimited_wiz.png"), //$NON-NLS-1$
METADATA_FILE_POSITIONAL_ICON("/icons1/filepositional.gif"), //$NON-NLS-1$
METADATA_FILE_POSITIONAL_WIZ("/icons1/positional_wiz.png"), //$NON-NLS-1$
METADATA_FILE_REGEXP_ICON("/icons1/fileregexp.gif"), //$NON-NLS-1$
METADATA_FILE_REGEXP_WIZ("/icons1/regexp_wiz.png"), //$NON-NLS-1$
METADATA_FILE_XML_ICON("/icons1/filexml.gif"), //$NON-NLS-1$
METADATA_FILE_XML_WIZ("/icons1/xml_wiz.png"), //$NON-NLS-1$
METADATA_FILE_EXCEL_ICON("/icons1/fileexcel.gif"), //$NON-NLS-1$
METADATA_FILE_EXCEL_WIZ("/icons1/excel_wiz.png"), //$NON-NLS-1$
METADATA_FILE_LDIF_ICON("/icons1/fileldif.gif"), //$NON-NLS-1$
METADATA_FILE_LDIF_WIZ("/icons1/ldif_wiz.png"), //$NON-NLS-1$
METADATA_GENERIC_ICON("/icons1/genericSchema_icon.png"), //$NON-NLS-1$
METADATA_LDAP_SCHEMA_ICON("/icons1/ldap_icon.png"), //$NON-NLS-1$
METADATA_WSDL_SCHEMA_ICON("/icons1/wsdl_icon.png"), //$NON-NLS-1$
METADATA_SALESFORCE_SCHEMA_ICON("/icons1/salesforce_icon.png"), //$NON-NLS-1$
METADATA_VALIDATION_RULES_ICON("/icons1/metadata.png"), //$NON-NLS-1$
METADATA_VALIDATION_RULES_WIZ("/icons1/delimited_wiz.png"), //$NON-NLS-1$
METADATA_EDIFACT_ICON("/icons1/EDIField.png"), //$NON-NLS-1$
MODULE_INSTALLED_ICON("/icons1/checked.gif"), //$NON-NLS-1$
MODULE_ERROR_ICON("/icons1/error.gif"), //$NON-NLS-1$

View File

@@ -39,7 +39,6 @@ public enum EImage implements IImage {
EDIT_ICON("/icons/write_obj.gif"), //$NON-NLS-1$
READ_ICON("/icons/read_obj.gif"), //$NON-NLS-1$
WRAP_ICON("/icons/wrap.png"), //$NON-NLS-1$
QUESTION_ICON("/icons/question.gif"), //$NON-NLS-1$
HELP_ICON("/icons/help.png"), //$NON-NLS-1$
MOREINFO_ICON("/icons/moreInfo.png"), //$NON-NLS-1$
@@ -50,6 +49,8 @@ public enum EImage implements IImage {
IMPORT_ICON("/icons/import.gif"), //$NON-NLS-1$
EXPORT_ICON("/icons/export.gif"), //$NON-NLS-1$
EXPORT_WIZ_ICON("/icons/export_wiz.png"), //$NON-NLS-1$
EXPORT_ZIP_ICON("/icons/exportzip_wiz.png"), //$NON-NLS-1$
EXPORT_JOB_ICON("/icons/export_job.png"), //$NON-NLS-1$
EXPORT_HTML_ICON("/icons/export_html.png"), //$NON-NLS-1$
@@ -142,6 +143,7 @@ public enum EImage implements IImage {
COLLECTOR_ICON("/icons/collector.png"), //$NON-NLS-1$
REPARTITION_ICON("/icons/repartition.png"), //$NON-NLS-1$
HADOOP_WIZ_ICON("/icons/hadoop-logo-wiz.png"), //$NON-NLS-1$
SEPARATOR_ICON("/icons/separator.gif"), //$NON-NLS-1$

View File

@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: Common Runtime Plug-in
Bundle-SymbolicName: org.talend.commons.runtime;singleton:=true
Automatic-Module-Name: org.talend.commons.runtime
Bundle-Version: 8.0.2.qualifier
Bundle-Version: 8.8.8.qualifier
Require-Bundle: org.apache.log4j,
org.apache.commons.commons-beanutils,
org.apache.commons.collections,
@@ -12,6 +12,7 @@ Require-Bundle: org.apache.log4j,
org.eclipse.emf.ecore.xmi,
org.talend.libraries.apache,
com.ibm.icu,
org.apache.commons.io,
org.talend.utils,
org.eclipse.core.net,
org.eclipse.m2e.core,
@@ -19,6 +20,7 @@ Require-Bundle: org.apache.log4j,
org.eclipse.core.resources,
org.talend.studio.studio-utils,
org.talend.daikon,
org.apache.commons.commons-codec,
org.apache.commons.lang3
Export-Package: org.talend.commons,
org.talend.commons.exception,
@@ -65,7 +67,4 @@ Bundle-ClassPath: .,
fakejdbc_driver.jar
Bundle-Vendor: .Talend SA.
Bundle-ActivationPolicy: lazy
Import-Package: org.apache.commons.codec,
org.apache.commons.codec.binary,
org.apache.commons.io,
org.apache.xerces.jaxp
Import-Package: org.apache.xerces.jaxp

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>8.0.2-SNAPSHOT</version>
<version>8.8.8-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.commons.runtime</artifactId>

View File

@@ -23,19 +23,10 @@ public class FatalException extends RuntimeException {
@SuppressWarnings("unused")//$NON-NLS-1$
private static final long serialVersionUID = 1L;
public static final int CODE_INCOMPATIBLE_UPDATE = 10;
private int code;
public FatalException(String message, Throwable cause) {
super(message, cause);
}
public FatalException(int code, String message) {
super(message);
this.code = code;
}
public FatalException(String message) {
super(message);
}
@@ -43,9 +34,4 @@ public class FatalException extends RuntimeException {
public FatalException(Throwable cause) {
super(cause);
}
public int getCode() {
return code;
}
}

View File

@@ -1 +1 @@
talend.version=8.0.1
talend.version=8.8.8

View File

@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: Common UI Plug-in
Bundle-SymbolicName: org.talend.commons.ui;singleton:=true
Automatic-Module-Name: org.talend.commons.ui
Bundle-Version: 8.0.2.qualifier
Bundle-Version: 8.8.8.qualifier
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.core.resources,
org.eclipse.jface.text,

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>8.0.2-SNAPSHOT</version>
<version>8.8.8-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.commons.ui</artifactId>

View File

@@ -15,7 +15,7 @@ ColorStyledText.SelectAllItem.Text=\u3059\u3079\u3066\u9078\u629E
ContentProposalAdapterExtended.close=\u9589\u3058\u308B
ContentProposalAdapterExtended.closeFocusout=\u30D5\u30A9\u30FC\u30AB\u30B9\u30A2\u30A6\u30C8\u3092\u9589\u3058\u308B
ControlUtils.Unsupported1=\u3053\u306E\u30B3\u30F3\u30C8\u30ED\u30FC\u30EB({0})\u306F\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002\u5FC5\u8981\u3067\u3042\u308C\u3070\u3001\u30B1\u30FC\u30B9\u3092\u8FFD\u52A0\u3057\u3066\u304F\u3060\u3055\u3044...
CopyPushButton.CopyButton.Tip=\u9078\u629E\u9805\u76EE\u3092\u30B3\u30D4\u30FC
CopyPushButton.CopyButton.Tip=\u9078\u629E\u3057\u305F\u30A2\u30A4\u30C6\u30E0\u3092\u30B3\u30D4\u30FC
Curve2D.MaxNum.Be0=maximumSegments\u306F\u6B63\u6570\u304B0\u306B\u3057\u3066\u304F\u3060\u3055\u3044
Curve2D.MinNum.Be0=minimumSegments\u306F\u6B63\u307E\u305F\u306F0\u306B\u3057\u3066\u304F\u3060\u3055\u3044
DateDialog.textContent=\u65E5\u6642\u3092\u9078\u629E

View File

@@ -46,7 +46,7 @@ public class MyURLClassLoader extends URLClassLoader {
private Map pclasses = new HashMap();
public MyURLClassLoader(String fileName) throws IOException {
this(new File(fileName).toURI().toURL());
this(new File(fileName).toURL());
}
public MyURLClassLoader(URL url) {

View File

@@ -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.0.2.qualifier
Bundle-Version: 8.8.8.qualifier
Require-Bundle: org.eclipse.ui,
org.eclipse.ui.ide,
org.apache.commons.collections,

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>8.0.2-SNAPSHOT</version>
<version>8.8.8-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.core.repository</artifactId>

View File

@@ -155,6 +155,7 @@ ProjectRepositoryNode.invalidItem=\u00C9l\u00E9ment invalide
ProjectRepositoryNode.columns=Colonnes
ProjectRepositoryNode.validationRules=R\u00E8gles de validation
ProjectRepositoryNode.cdcFoundation=Fondation CDC
ProjectRepositoryNode.cdcFoundation.deprecated=Fondation CDC (d\u00E9pr\u00E9ci\u00E9)
ProjectRepositoryNode.genericSchema=Sch\u00E9mas g\u00E9n\u00E9riques
ProjectRepositoryNode.queries=Requ\u00EAtes
ProjectRepositoryNode.synonymSchemas=Sch\u00E9mas synonymes

View File

@@ -155,6 +155,7 @@ ProjectRepositoryNode.invalidItem=\u65E0\u6548\u9879\u76EE
ProjectRepositoryNode.columns=\u5217
ProjectRepositoryNode.validationRules=\u9A8C\u8BC1\u89C4\u5219
ProjectRepositoryNode.cdcFoundation=CDC Foundation
ProjectRepositoryNode.cdcFoundation.deprecated=CDC Foundation (\u5DF2\u5F03\u7528)
ProjectRepositoryNode.genericSchema=\u901A\u7528 schema
ProjectRepositoryNode.queries=\u67E5\u8BE2
ProjectRepositoryNode.synonymSchemas=\u540C\u4E49\u5B57 schema

View File

@@ -30,6 +30,8 @@ import org.eclipse.jface.wizard.Wizard;
import org.osgi.framework.FrameworkUtil;
import org.talend.commons.exception.PersistenceException;
import org.talend.commons.ui.runtime.exception.ExceptionHandler;
import org.talend.commons.ui.runtime.image.ECoreImage;
import org.talend.commons.ui.runtime.image.ImageProvider;
import org.talend.core.model.repository.ERepositoryObjectType;
import org.talend.core.repository.i18n.Messages;
import org.talend.core.repository.model.ProxyRepositoryFactory;
@@ -75,6 +77,7 @@ public class FolderWizard extends Wizard {
this.path = path;
this.type = type;
this.defaultLabel = defaultLabel;
setDefaultPageImageDescriptor(ImageProvider.getImageDesc(ECoreImage.FOLDER_WIZ));
}
/**

View File

@@ -856,13 +856,13 @@ public class XmiResourceManager {
URI orgPropertyResourceURI = EcoreUtil.getURI(originalItem.getProperty());
URI orgRelativePlateformDestUri = orgPropertyResourceURI.trimFileExtension().appendFileExtension(
FileConstants.SCREENSHOT_EXTENSION);
URL orgFileURL = FileLocator.resolve(new java.net.URL(
URL orgFileURL = FileLocator.toFileURL(new java.net.URL(
"platform:/resource" + orgRelativePlateformDestUri.toPlatformString(true))); //$NON-NLS-1$
URI newPropertyResourceURI = EcoreUtil.getURI(newItem.getProperty());
URI newRelativePlateformDestUri = newPropertyResourceURI.trimFileExtension().appendFileExtension(
FileConstants.SCREENSHOT_EXTENSION);
URL newFileURL = FileLocator.resolve(new java.net.URL(
URL newFileURL = FileLocator.toFileURL(new java.net.URL(
"platform:/resource" + newRelativePlateformDestUri.toPlatformString(true))); //$NON-NLS-1$
os = new FileOutputStream(newFileURL.getFile());

View File

@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: Core Runtime Plug-in
Bundle-SymbolicName: org.talend.core.runtime;singleton:=true
Automatic-Module-Name: org.talend.core.runtime
Bundle-Version: 8.0.2.qualifier
Bundle-Version: 8.8.8.qualifier
Bundle-Localization: plugin
Bundle-Vendor: .Talend SA.
Export-Package: org.json.simple,

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>8.0.2-SNAPSHOT</version>
<version>8.8.8-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.core.runtime</artifactId>

View File

@@ -49,8 +49,6 @@ tDqReportRun=java.base/java.lang,java.base/java.nio
tWebService=java.base/java.lang
tWebServiceInput=java.base/java.lang
tRESTClient=java.base/sun.net.www.protocol.https,java.base/java.net
# TCK framework
TCK_COMMON_ARGS=java.base/java.io,java.base/java.lang.invoke,java.base/java.lang.reflect,java.base/java.lang,java.base/java.net,java.base/java.nio,java.base/java.util,java.base/sun.nio.ch,java.base/sun.net.www.protocol.https

View File

@@ -55,7 +55,7 @@ public enum EDatabaseVersion4Drivers {
//
JAVADB_EMBEDED(new DbVersion4Drivers(EDatabaseTypeName.JAVADB_EMBEDED, "derby-10.14.2.0.jar")), //$NON-NLS-1$
SQLITE(new DbVersion4Drivers(EDatabaseTypeName.SQLITE, new String[] { "slf4j-api-1.7.34.jar", "sqlite-jdbc-3.44.1.0.jar" })), //$NON-NLS-1$
SQLITE(new DbVersion4Drivers(EDatabaseTypeName.SQLITE, "sqlite-jdbc-3.40.0.0.jar")), //$NON-NLS-1$
FIREBIRD(new DbVersion4Drivers(EDatabaseTypeName.FIREBIRD, "jaybird-2.1.1.jar")), //$NON-NLS-1$
TERADATA(new DbVersion4Drivers(EDatabaseTypeName.TERADATA,
new String[] { "terajdbc4-17.10.00.27.jar" })), //$NON-NLS-1$

View File

@@ -167,6 +167,7 @@ public class HadoopCustomVersionDefineDialog extends TitleAreaDialog {
super.create();
setTitle(Messages.getString("HadoopCustomVersionDialog.title")); //$NON-NLS-1$
setMessage(Messages.getString("HadoopCustomVersionDialog.msg")); //$NON-NLS-1$
setTitleImage(ImageProvider.getImage(EImage.HADOOP_WIZ_ICON));
if (getShell() != null) {
getShell().getDisplay().asyncExec(new Runnable() {

View File

@@ -27,6 +27,8 @@ import org.eclipse.swt.widgets.FileDialog;
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.swt.widgets.Text;
import org.talend.commons.ui.runtime.image.EImage;
import org.talend.commons.ui.runtime.image.ImageProvider;
import org.talend.commons.ui.swt.formtools.LabelledCombo;
import org.talend.core.GlobalServiceRegister;
import org.talend.core.hadoop.HadoopConstants;
@@ -111,6 +113,7 @@ public class HadoopVersionDialog extends TitleAreaDialog {
super.create();
setTitle(Messages.getString("HadoopVersionDialog.title")); //$NON-NLS-1$
setMessage(Messages.getString("HadoopVersionDialog.msg")); //$NON-NLS-1$
setTitleImage(ImageProvider.getImage(EImage.HADOOP_WIZ_ICON));
}
@Override

View File

@@ -45,8 +45,6 @@ import org.talend.designer.core.model.utils.emf.talendfile.TalendFileFactory;
*/
public class JobContextManager implements IContextManager {
private boolean isWrapContextText;
private IContext defaultContext = new JobContext(IContext.DEFAULT);
private List<IContext> listContext = new ArrayList<IContext>();
@@ -104,14 +102,6 @@ public class JobContextManager implements IContextManager {
private Map<ContextItem, List<IContext>> renameContextGroupMap = new HashMap<ContextItem, List<IContext>>();
public boolean isWrapContextText() {
return isWrapContextText;
}
public void setWrapContextText(boolean isWrapContextText) {
this.isWrapContextText = isWrapContextText;
}
public Map<ContextItem, List<IContext>> getAddContextGroupMap() {
return this.addContextGroupMap;
}

View File

@@ -20,6 +20,7 @@ import org.apache.commons.lang.StringUtils;
import org.eclipse.core.runtime.Path;
import org.eclipse.core.runtime.Platform;
import org.talend.commons.exception.ExceptionHandler;
import org.talend.core.pendo.PendoDataTrackFactory;
import org.talend.core.runtime.i18n.Messages;
import org.talend.core.service.ICloudSignOnService;
import org.talend.repository.model.RepositoryConstants;
@@ -253,13 +254,7 @@ public class ConnectionBean implements Cloneable {
String user = conDetails.getString(USER);
if (isToken()) {
String url = getDynamicFields().get(RepositoryConstants.REPOSITORY_URL);
if (ICloudSignOnService.get() != null) {
try {
user = ICloudSignOnService.get().getTokenUser(url, getPassword());
} catch (Exception e) {
ExceptionHandler.process(e);
}
}
user = PendoDataTrackFactory.getInstance().getTmcUser(url, getPassword());
if (StringUtils.isNotBlank(user)) {
setUser(user);
}

View File

@@ -63,4 +63,11 @@ public class PendoDataTrackFactory {
}
}
public String getTmcUser(String url, String token) {
if (coreRuntimeService != null) {
return coreRuntimeService.getTmcUser(url, token);
}
return "";
}
}

View File

@@ -28,7 +28,7 @@ public interface ICloudSignOnService extends IService {
boolean hasValidToken() throws Exception;
String getTokenUser(String url, String token) throws Exception;
String getTokenUser(String url, TokenMode token) throws Exception;
void signonCloud(LoginEventListener listener) throws Exception;
@@ -61,7 +61,7 @@ public interface ICloudSignOnService extends IService {
* @param dataCenter data center of TMC
* @return Introspected PAT
*/
PAT introspectPAT(String pat, String dataCenter) throws Exception;
PAT introspectPAT(String pat, String dataCenter);
/**
* Introspect pat and check whether pat is allowed
@@ -70,5 +70,5 @@ public interface ICloudSignOnService extends IService {
* @param tmcUrl tmc url
* @return valid or not
*/
boolean validatePAT(String pat, String tmcUrl) throws Exception;
boolean validatePAT(String pat, String tmcUrl);
}

View File

@@ -23,6 +23,8 @@ import org.talend.core.pendo.properties.IPendoDataProperties;
*/
public interface ICoreTisRuntimeService extends IService {
String getTmcUser(String url, String token);
AbstractPendoTrackManager getPendoProjectLoginManager();
AbstractPendoTrackManager getPendoGenericManager(TrackEvent event, IPendoDataProperties peoperties);

View File

@@ -149,10 +149,6 @@ public interface IStudioLiteP2Service extends IService {
void cleanM2(IProgressMonitor monitor);
boolean isCompatibleUpdate() throws Exception;
String getCompatibleMessage() throws Exception;
public static IStudioLiteP2Service get() {
if (GlobalServiceRegister.getDefault().isServiceRegistered(IStudioLiteP2Service.class)) {
return GlobalServiceRegister.getDefault().getService(IStudioLiteP2Service.class);
@@ -235,13 +231,10 @@ public interface IStudioLiteP2Service extends IService {
@Deprecated
void setRelease(IProgressMonitor monitor, URI uri) throws Exception;
@Deprecated
URI getLocalRelease(IProgressMonitor monitor) throws Exception;
@Deprecated
void setLocalRelease(IProgressMonitor monitor, URI uri) throws Exception;
@Deprecated
String getTmcRelease(IProgressMonitor monitor) throws Exception;
boolean isUpdateEditable();

View File

@@ -12,7 +12,12 @@
// ============================================================================
package org.talend.core.utils;
import org.talend.commons.ui.runtime.image.ECoreImage;
import org.talend.commons.ui.runtime.image.IImage;
import org.talend.core.GlobalServiceRegister;
import org.talend.core.hadoop.HadoopConstants;
import org.talend.core.service.IMRProcessService;
import org.talend.core.service.IStormProcessService;
/**
* created by kongxiaohan on Sep 15, 2015 Detailled comment
@@ -21,8 +26,20 @@ import org.talend.commons.ui.runtime.image.IImage;
public class JobImageUtil {
public static IImage getWizardIcon(String jobType, String framework) {
return null;
if (HadoopConstants.JOBTYPEBDSTREAMING.equals(jobType)) {
if (GlobalServiceRegister.getDefault().isServiceRegistered(IStormProcessService.class)) {
IStormProcessService stormProcessService = (IStormProcessService) GlobalServiceRegister.getDefault().getService(
IStormProcessService.class);
return stormProcessService.getStormWizardIcon(framework);
}
} else if (HadoopConstants.JOBTYPEBDBATCH.equals(jobType)) {
if (GlobalServiceRegister.getDefault().isServiceRegistered(IMRProcessService.class)) {
IMRProcessService mrProcessService = (IMRProcessService) GlobalServiceRegister.getDefault().getService(
IMRProcessService.class);
return mrProcessService.getMRWizardIcon(framework);
}
}
return ECoreImage.PROCESS_WIZ;
}
}

View File

@@ -36,7 +36,4 @@ public interface IReferenceProjectProvider {
public void initSettings() throws BusinessException, PersistenceException;
public boolean isHasConfigurationFile();
void resetReferenceProjectList();
}

View File

@@ -251,12 +251,6 @@ public class ReferenceProjectProvider implements IReferenceProjectProvider {
public static void removeTacReferenceList(String projectLabel) {
tacReferenceMap.remove(projectLabel);
}
@Override
public void resetReferenceProjectList() {
referenceProjectList = null;
}
}
class ReferenceProjectConfiguration {

View File

@@ -22,7 +22,6 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
import org.apache.log4j.Logger;
import org.eclipse.core.runtime.CoreException;
import org.talend.core.model.properties.Item;
import org.talend.core.model.properties.ProcessItem;
@@ -42,7 +41,6 @@ import org.talend.repository.model.IRepositoryNode;
*
*/
public class ExportFileResource {
private static Logger LOGGER = Logger.getLogger(ExportFileResource.class);
private Item item;
@@ -103,7 +101,7 @@ public class ExportFileResource {
String decodeStr = URLDecoder.decode(url.toString(), "UTF-8"); //$NON-NLS-1$
url = new URL(decodeStr);
} catch (Exception e) {
LOGGER.warn(e);
e.printStackTrace(); // only for debug.
}
return url;

View File

@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: Core UI Plug-in
Bundle-SymbolicName: org.talend.core.ui;singleton:=true
Automatic-Module-Name: org.talend.core.ui
Bundle-Version: 8.0.2.qualifier
Bundle-Version: 8.8.8.qualifier
Require-Bundle: org.apache.commons.lang,
org.apache.commons.collections,
org.eclipse.gef,
@@ -32,6 +32,7 @@ Require-Bundle: org.apache.commons.lang,
org.talend.themes.core,
ca.odell.glazedlists,
org.talend.core,
org.apache.commons.io,
org.apache.httpcomponents.httpcore,
org.apache.httpcomponents.httpclient,
org.apache.ant,
@@ -50,14 +51,11 @@ Require-Bundle: org.apache.commons.lang,
org.talend.daikon,
org.apache.commons.logging,
org.apache.commons.lang3,
org.apache.commons.commons-codec,
org.eclipse.jface.notifications,
org.eclipse.swt,
javax.inject
Import-Package: org.apache.commons.codec,
org.apache.commons.codec.binary,
org.apache.commons.codec.digest,
org.apache.commons.io,
org.eclipse.jdt.internal.ui.workingsets,
Import-Package: org.eclipse.jdt.internal.ui.workingsets,
org.slf4j
Export-Package: org.talend.core.ui,
org.talend.core.ui.actions,

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>8.0.2-SNAPSHOT</version>
<version>8.8.8-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.core.ui</artifactId>

View File

@@ -108,8 +108,6 @@ public class ContextNebulaGridComposite extends AbstractContextTabEditComposite
private Button manageEnvironmentsButton;
private Button wrapButton;
private ContextManagerHelper helper;
private List<Button> buttonList;
@@ -231,11 +229,8 @@ public class ContextNebulaGridComposite extends AbstractContextTabEditComposite
}
private void createButtonsGroup(Composite parentComposite) {
boolean isRepositoryContext = (modelManager instanceof ContextComposite)
&& ((ContextComposite) modelManager).isRepositoryContext();
int columnNum = isRepositoryContext ? 5 : 7;
buttonsComp = new Composite(parentComposite, SWT.NULL);
buttonsComp.setLayout(GridLayoutFactory.swtDefaults().spacing(10, 0).margins(5, 0).numColumns(columnNum).create());
buttonsComp.setLayout(GridLayoutFactory.swtDefaults().spacing(5, 0).margins(5, 0).numColumns(7).create());
GridDataFactory.swtDefaults().align(SWT.FILL, SWT.DOWN).grab(true, false).applyTo(buttonsComp);
buttonList.clear();
addButton = createAddPushButton(buttonsComp);
@@ -243,6 +238,8 @@ public class ContextNebulaGridComposite extends AbstractContextTabEditComposite
removeButton = createRemovePushButton(buttonsComp);
buttonList.add(removeButton);
boolean isRepositoryContext = (modelManager instanceof ContextComposite)
&& ((ContextComposite) modelManager).isRepositoryContext();
if (!isRepositoryContext) {// for bug 7393
moveUpButton = createMoveUpPushButton(buttonsComp);
buttonList.add(moveUpButton);
@@ -256,16 +253,14 @@ public class ContextNebulaGridComposite extends AbstractContextTabEditComposite
}
createEnvironmentsGroup(buttonsComp);
wrapButton = createWrapButton(buttonsComp);
}
private void createEnvironmentsGroup(Composite parentComposite) {
Composite environmentsComp = new Composite(parentComposite, SWT.NULL);
GridLayout gridLayout = new GridLayout(2, false);
gridLayout.horizontalSpacing = 10;
environmentsComp.setLayout(gridLayout);
environmentsComp.setLayout(new GridLayout(2, false));
GridData contextComboData = new GridData();
contextComboData.grabExcessHorizontalSpace = true;
contextComboData.horizontalAlignment = GridData.END;
environmentsComp.setLayoutData(contextComboData);
viewEnvironmentsCombo = new CCombo(environmentsComp, SWT.BORDER);
@@ -552,35 +547,6 @@ public class ContextNebulaGridComposite extends AbstractContextTabEditComposite
return selectContextVariablesPushButton;
}
private Button createWrapButton(final Composite parent) {
Button wrapToggleButton = new Button(parent, SWT.TOGGLE);
wrapToggleButton.setBackground(parent.getBackground());
GridData gridData = new GridData();
gridData.grabExcessHorizontalSpace = true;
gridData.horizontalAlignment = GridData.END;
Image image = ImageProvider.getImage(EImage.WRAP_ICON);
IContextManager contextManager = getContextManager();
if (contextManager instanceof JobContextManager) {
JobContextManager jobContextManager = (JobContextManager) contextManager;
wrapToggleButton.setSelection(jobContextManager.isWrapContextText());
}
wrapToggleButton.setImage(image);
wrapToggleButton.addSelectionListener(new SelectionAdapter() {
@Override
public void widgetSelected(SelectionEvent e) {
IContextManager contextManager = getContextManager();
if (contextManager instanceof JobContextManager) {
JobContextManager jobContextManager = (JobContextManager) contextManager;
jobContextManager.setWrapContextText(wrapToggleButton.getSelection());
}
refresh();
}
});
return wrapToggleButton;
}
private void setButtonEnableState() {
boolean enableState = !modelManager.isReadOnly();
if (this.addButton != null) {
@@ -604,13 +570,6 @@ public class ContextNebulaGridComposite extends AbstractContextTabEditComposite
if (contextsCombo != null) {
this.contextsCombo.setEnabled(enableState);
}
if (wrapButton != null) {
IContextManager contextManager = getContextManager();
if (contextManager instanceof JobContextManager) {
JobContextManager jobContextManager = (JobContextManager) contextManager;
wrapButton.setSelection(jobContextManager.isWrapContextText());
}
}
}
public Object createNewEntry() {

View File

@@ -20,7 +20,6 @@ import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import org.apache.commons.lang.StringUtils;
import org.eclipse.jface.layout.GridDataFactory;
import org.eclipse.jface.viewers.ISelectionChangedListener;
import org.eclipse.jface.viewers.ISelectionProvider;
@@ -35,7 +34,6 @@ import org.eclipse.nebula.widgets.nattable.config.DefaultComparator;
import org.eclipse.nebula.widgets.nattable.config.IConfigRegistry;
import org.eclipse.nebula.widgets.nattable.data.IColumnPropertyAccessor;
import org.eclipse.nebula.widgets.nattable.data.IDataProvider;
import org.eclipse.nebula.widgets.nattable.edit.event.DataUpdateEvent;
import org.eclipse.nebula.widgets.nattable.extension.glazedlists.DetailGlazedListsEventLayer;
import org.eclipse.nebula.widgets.nattable.extension.glazedlists.GlazedListsDataProvider;
import org.eclipse.nebula.widgets.nattable.extension.glazedlists.GlazedListsSortModel;
@@ -58,18 +56,10 @@ import org.eclipse.nebula.widgets.nattable.group.ColumnGroupModel.ColumnGroup;
import org.eclipse.nebula.widgets.nattable.group.ColumnGroupReorderLayer;
import org.eclipse.nebula.widgets.nattable.hideshow.ColumnHideShowLayer;
import org.eclipse.nebula.widgets.nattable.hideshow.RowHideShowLayer;
import org.eclipse.nebula.widgets.nattable.layer.AbstractIndexLayerTransform;
import org.eclipse.nebula.widgets.nattable.layer.AbstractLayerTransform;
import org.eclipse.nebula.widgets.nattable.layer.DataLayer;
import org.eclipse.nebula.widgets.nattable.layer.ILayer;
import org.eclipse.nebula.widgets.nattable.layer.ILayerListener;
import org.eclipse.nebula.widgets.nattable.layer.cell.ColumnOverrideLabelAccumulator;
import org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell;
import org.eclipse.nebula.widgets.nattable.layer.config.DefaultColumnHeaderStyleConfiguration;
import org.eclipse.nebula.widgets.nattable.layer.event.ILayerEvent;
import org.eclipse.nebula.widgets.nattable.layer.event.RowDeleteEvent;
import org.eclipse.nebula.widgets.nattable.layer.event.RowInsertEvent;
import org.eclipse.nebula.widgets.nattable.layer.event.RowStructuralChangeEvent;
import org.eclipse.nebula.widgets.nattable.painter.cell.TextPainter;
import org.eclipse.nebula.widgets.nattable.painter.layer.NatGridLayerPainter;
import org.eclipse.nebula.widgets.nattable.reorder.ColumnReorderLayer;
@@ -102,9 +92,7 @@ import org.eclipse.swt.widgets.Event;
import org.talend.commons.exception.PersistenceException;
import org.talend.commons.ui.runtime.ColorConstants;
import org.talend.core.GlobalServiceRegister;
import org.talend.core.model.context.JobContextManager;
import org.talend.core.model.process.IContext;
import org.talend.core.model.process.IContextManager;
import org.talend.core.model.process.IContextParameter;
import org.talend.core.model.repository.ERepositoryObjectType;
import org.talend.core.model.repository.IRepositoryViewObject;
@@ -161,10 +149,6 @@ public class ContextTreeTable {
private final static int fixedTypeWidth = 100;
private final static int minDefultHeight = 20;
private final static int maxDefaultWidth = 400;
public ContextTreeTable(IContextModelManager manager) {
this.manager = manager;
}
@@ -437,101 +421,6 @@ public class ContextTreeTable {
currentNatTabSel = (IStructuredSelection) event.getSelection();
}
});
this.natTable.addLayerListener(new ILayerListener() {
@Override
public void handleLayerEvent(ILayerEvent event) {
// DataUpdateEvent->Data change, RowInsertEvent->node expand, RowDeleteEvent->node collapse
if (event instanceof DataUpdateEvent) {
// data changed then execute here no need compare value
DataUpdateEvent dataEvent = (DataUpdateEvent) event;
ILayer layer = dataEvent.getLayer();
DataLayer dataLayer = getDataLayer(layer);
if (dataLayer == null) {
return;
}
int rowPosition = dataEvent.getRowPosition();
int columnPosition = dataEvent.getColumnPosition();
if (layer instanceof GridLayer) {
GridLayer gridLayer = (GridLayer) layer;
rowPosition = rowPosition - gridLayer.getColumnHeaderLayer().getRowCount();
columnPosition = columnPosition - gridLayer.getRowHeaderLayer().getColumnCount();
}
String text = dataEvent.getNewValue() == null ? "" : dataEvent.getNewValue().toString();
GC gc = new GCFactory(natTable).createGC();
Point point = gc.textExtent(text, SWT.DRAW_MNEMONIC);
int textLength = point.x;
int currentColumnWidth = layer.getColumnWidthByPosition(columnPosition);
if (textLength > layer.getColumnWidthByPosition(columnPosition)) {
if (textLength > maxDefaultWidth) {
int columnWidth = Math.max(currentColumnWidth, maxDefaultWidth);
dataLayer.setColumnWidthByPosition(columnPosition, columnWidth);
} else {
int columnWidth = getColumWidth(gc, dataLayer, columnPosition);
dataLayer.setColumnWidthByPosition(columnPosition, columnWidth);
}
}
int promptColPos = dataLayer.getColumnPositionByIndex(3);
IContextManager contextManager = manager.getContextManager();
if (contextManager instanceof JobContextManager) {
JobContextManager jobContextManager = (JobContextManager) contextManager;
if (jobContextManager.isWrapContextText()) {
int rowHeight = getRowHeight(gc, dataLayer, rowPosition, promptColPos);
dataLayer.setRowHeightByPosition(rowPosition, rowHeight);
}
}
gc.dispose();
} else if (event instanceof RowInsertEvent || event instanceof RowDeleteEvent) {
RowStructuralChangeEvent changeEvent = (RowStructuralChangeEvent) event;
ILayer layer = changeEvent.getLayer();
DataLayer dataLayer = getDataLayer(layer);
List<Integer> checkPos = new ArrayList<Integer>();
checkPos.add(3);
adjustCellWidthHeight(dataLayer, checkPos);
}
}
});
}
private DataLayer getDataLayer(ILayer layer) {
DataLayer dataLayer = null;
if (layer instanceof GridLayer) {
GridLayer gridLayer = (GridLayer) layer;
ILayer bodyLayer = gridLayer.getBodyLayer();
if (bodyLayer instanceof AbstractLayerTransform) {
AbstractLayerTransform childLayer = (AbstractLayerTransform) bodyLayer;
dataLayer = findDataLayerByUnderlyingLayer(childLayer);
}
} else if (layer instanceof DataLayer) {
dataLayer = (DataLayer) layer;
} else if (layer instanceof AbstractLayerTransform || layer instanceof AbstractIndexLayerTransform) {
dataLayer = findDataLayerByUnderlyingLayer(layer);
}
return dataLayer;
}
private DataLayer findDataLayerByUnderlyingLayer(ILayer layer) {
// only 1 underlyingLayer set on AbstractLayerTransform / AbstractIndexLayerTransform
ILayer underlyingLayer = null;
if (layer instanceof AbstractLayerTransform) {
AbstractLayerTransform layerTransform = (AbstractLayerTransform) layer;
underlyingLayer = layerTransform.getUnderlyingLayerByPosition(0, 0);
} else if (layer instanceof AbstractIndexLayerTransform) {
AbstractIndexLayerTransform layerTransform = (AbstractIndexLayerTransform) layer;
underlyingLayer = layerTransform.getUnderlyingLayerByPosition(0, 0);
}
if (underlyingLayer instanceof DataLayer) {
return (DataLayer) underlyingLayer;
} else if (underlyingLayer instanceof AbstractLayerTransform) {
AbstractLayerTransform childLayer = (AbstractLayerTransform) underlyingLayer;
return findDataLayerByUnderlyingLayer(childLayer);
} else if (underlyingLayer instanceof AbstractIndexLayerTransform) {
AbstractIndexLayerTransform childLayer = (AbstractIndexLayerTransform) underlyingLayer;
return findDataLayerByUnderlyingLayer(childLayer);
}
return null;
}
private List<Integer> getAllCheckPosBehaviour(IContextModelManager manager, ColumnGroupModel contextGroupModel) {
@@ -559,108 +448,58 @@ public class ContextTreeTable {
dataLayer.setColumnWidthByPosition(i, averageWidth);
}
} else {
adjustCellWidthHeight(dataLayer, checkColumnsPos);
}
}
int typeColumnPos = dataLayer.getColumnPositionByIndex(1);
private void adjustCellWidthHeight(DataLayer dataLayer, List<Integer> checkColumnsPos) {
int typeColumnPos = dataLayer.getColumnPositionByIndex(1);
GC gc = new GCFactory(natTable).createGC();
for (int i = 0; i < dataLayer.getColumnCount(); i++) {
boolean findCheck = false;
boolean findType = false;
if (typeColumnPos == i) {
findType = true;
dataLayer.setColumnWidthByPosition(i, fixedTypeWidth);
}
for (int checkPos : checkColumnsPos) {
if (checkPos == i) {
findCheck = true;
dataLayer.setColumnWidthByPosition(i, fixedCheckBoxWidth);
int leftWidth = maxWidth - fixedTypeWidth - fixedCheckBoxWidth * checkColumnsPos.size() - cornerWidth * 2;
int currentColumnsCount = dataColumnsCount - checkColumnsPos.size() - 1;
int averageWidth = leftWidth / currentColumnsCount;
for (int i = 0; i < dataLayer.getColumnCount(); i++) {
boolean findHide = false;
boolean findCheck = false;
boolean findType = false;
if (typeColumnPos == i) {
findType = true;
dataLayer.setColumnWidthByPosition(i, fixedTypeWidth);
}
}
if (!findCheck && !findType) {
int colW = getColumWidth(gc, dataLayer, i);
dataLayer.setColumnWidthByPosition(i, colW);
}
}
// setColumnWidthByPosition final scaled by DPI, set height according final width
int promptColPos = dataLayer.getColumnPositionByIndex(3);
IContextManager contextManager = manager.getContextManager();
if (contextManager instanceof JobContextManager) {
JobContextManager jobContextManager = (JobContextManager) contextManager;
if (jobContextManager.isWrapContextText()) {
for (int i = 0; i < dataLayer.getPreferredRowCount(); i++) {
int rowHeight = getRowHeight(gc, dataLayer, i, promptColPos);
dataLayer.setRowHeightByPosition(i, rowHeight);
for (int checkPos : checkColumnsPos) {
if (checkPos == i) {
findCheck = true;
dataLayer.setColumnWidthByPosition(i, fixedCheckBoxWidth);
}
}
if (!findHide && !findCheck && !findType) {
int colW = getColumWidth(dataLayer, i, averageWidth);
dataLayer.setColumnWidthByPosition(i, colW);
}
}
}
gc.dispose();
}
private int getColumWidth(GC gc, DataLayer dataLayer, int colPos) {
private int getColumWidth(DataLayer dataLayer, int colPos, int avgWidth) {
int colWidth = fixedTypeWidth;
GC gc = new GCFactory(natTable).createGC();
int max = 0;
String text = "";
for (int i = 0; i < dataLayer.getPreferredRowCount(); i++) {
Object dataValueByPosition = dataLayer.getDataValueByPosition(colPos, i);
if (dataValueByPosition == null || StringUtils.isBlank(dataValueByPosition.toString())) {
if (dataValueByPosition == null) {
continue;
}
text = dataValueByPosition.toString();
Point size = gc.textExtent(text, SWT.DRAW_MNEMONIC);
int textWidth = size.x;
if (textWidth > max) {
max = textWidth;
int temp = size.x;
if (temp > max) {
max = temp;
}
}
gc.dispose();
if (max > colWidth) {
max = (int) (max - text.getBytes().length * 1.5);
if (max > maxDefaultWidth) {
max = maxDefaultWidth;
}
}
return colWidth > max ? colWidth : max;
}
private int getRowHeight(GC gc, DataLayer dataLayer, int rowPos, int promptColPos) {
int maxHeight = minDefultHeight;
for (int j = 0; j < dataLayer.getColumnCount(); j++) {
// only check value column height
if (j <= promptColPos) {
continue;
}
Object dataValueByPosition = dataLayer.getDataValueByPosition(j, rowPos);
if (dataValueByPosition == null || StringUtils.isBlank(dataValueByPosition.toString())) {
continue;
}
String text = dataValueByPosition.toString();
Point size = gc.textExtent(text, SWT.DRAW_MNEMONIC);
int textWidth = size.x;
int textHeight = size.y;
String[] lines = text.split(TextPainter.NEW_LINE_REGEX);
int columnWidth = dataLayer.getColumnWidthByPosition(j);
if (textWidth >= columnWidth || lines.length > 1) {
int heightCount = 0;
for (String line : lines) {
int lineWidth = gc.textExtent(line).x;
if (lineWidth < columnWidth) {
heightCount++;
} else {
heightCount += lineWidth / columnWidth;
heightCount += lineWidth % columnWidth == 0 ? 0 : 1;
}
}
int cellheight = textHeight * heightCount;
maxHeight = Math.max(maxHeight, dataLayer.downScaleRowHeight(cellheight));
} else {
maxHeight = Math.max(maxHeight, textHeight);
}
}
return maxHeight;
}
private void addCustomSelectionBehaviour(SelectionLayer layer) {
// need control the selection style when select the rows.
DefaultSelectionStyleConfiguration selectStyleConfig = new DefaultSelectionStyleConfiguration();

View File

@@ -1,84 +0,0 @@
// ============================================================================
//
// Copyright (C) 2006-2023 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.ui.context;
import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.ModifyEvent;
import org.eclipse.swt.events.ModifyListener;
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.Shell;
import org.eclipse.swt.widgets.Text;
import org.talend.commons.ui.runtime.ITalendThemeService;
import org.talend.commons.ui.swt.colorstyledtext.ColorStyledText;
/**
* DOC jding class global comment. Detailled comment
*/
public class StringTextDialog extends Dialog {
private String content;
private Text text;
public StringTextDialog(Shell parentShell) {
super(parentShell);
}
public StringTextDialog(Shell parentShell, String content) {
super(parentShell);
this.content = content;
}
@Override
protected boolean isResizable() {
return true;
}
@Override
protected void configureShell(Shell shell) {
super.configureShell(shell);
shell.setText("Enter the value");
}
@Override
protected Control createDialogArea(Composite parent) {
Composite composite = new Composite(parent, SWT.NONE);
GridData gd = new GridData(GridData.FILL_BOTH);
gd.widthHint = 640;
gd.heightHint = 260;
composite.setLayoutData(gd);
composite.setLayout(new GridLayout());
text = new Text(composite, SWT.WRAP | SWT.BORDER | SWT.MULTI | SWT.V_SCROLL | SWT.LEFT);
text.setForeground(ITalendThemeService.getColor(ColorStyledText.PREFERENCE_COLOR_FOREGROUND).orElse(null));
text.setBackground(ITalendThemeService.getColor(ColorStyledText.PREFERENCE_COLOR_BACKGROUND).orElse(null));
text.setLayoutData(new GridData(GridData.FILL_BOTH));
text.setText(content);
text.addModifyListener(new ModifyListener() {
@Override
public void modifyText(ModifyEvent e) {
content = text.getText();
}
});
return composite;
}
public String getTextContent() {
return content;
}
}

View File

@@ -37,9 +37,7 @@ import org.eclipse.nebula.widgets.nattable.painter.cell.ImagePainter;
import org.eclipse.nebula.widgets.nattable.style.CellStyleAttributes;
import org.eclipse.nebula.widgets.nattable.style.CellStyleUtil;
import org.eclipse.nebula.widgets.nattable.style.DisplayMode;
import org.eclipse.nebula.widgets.nattable.style.HorizontalAlignmentEnum;
import org.eclipse.nebula.widgets.nattable.style.Style;
import org.eclipse.nebula.widgets.nattable.style.VerticalAlignmentEnum;
import org.eclipse.nebula.widgets.nattable.ui.util.CellEdgeEnum;
import org.eclipse.nebula.widgets.nattable.util.GUIHelper;
import org.eclipse.swt.graphics.Color;
@@ -130,11 +128,7 @@ public class ContextNatTableConfiguration extends AbstractRegistryConfiguration
configRegistry.registerConfigAttribute(CellConfigAttributes.CELL_STYLE, cellStyleDefault, DisplayMode.NORMAL,
ContextTableConstants.COLUMN_CHECK_PROPERTY);
Style valueCellStyleDefault = new Style();
valueCellStyleDefault.setAttributeValue(CellStyleAttributes.BACKGROUND_COLOR, ColorConstants.getTableBackgroundColor());
valueCellStyleDefault.setAttributeValue(CellStyleAttributes.HORIZONTAL_ALIGNMENT, HorizontalAlignmentEnum.LEFT);
valueCellStyleDefault.setAttributeValue(CellStyleAttributes.VERTICAL_ALIGNMENT, VerticalAlignmentEnum.TOP);
configRegistry.registerConfigAttribute(CellConfigAttributes.CELL_STYLE, valueCellStyleDefault, DisplayMode.NORMAL,
configRegistry.registerConfigAttribute(CellConfigAttributes.CELL_STYLE, cellStyleDefault, DisplayMode.NORMAL,
ContextTableConstants.COLUMN_CONTEXT_VALUE);
Style cellStyleSelect = new Style();
@@ -152,10 +146,6 @@ public class ContextNatTableConfiguration extends AbstractRegistryConfiguration
configRegistry.registerConfigAttribute(CellConfigAttributes.CELL_STYLE, cellStyleSelect, DisplayMode.SELECT,
ContextTableConstants.COLUMN_CHECK_PROPERTY);
Style valueCellStyleSelect = new Style();
valueCellStyleSelect.setAttributeValue(CellStyleAttributes.BACKGROUND_COLOR, GUIHelper.COLOR_TITLE_INACTIVE_BACKGROUND);
valueCellStyleSelect.setAttributeValue(CellStyleAttributes.FONT, GUIHelper.DEFAULT_FONT);
valueCellStyleSelect.setAttributeValue(CellStyleAttributes.HORIZONTAL_ALIGNMENT, HorizontalAlignmentEnum.LEFT);
configRegistry.registerConfigAttribute(CellConfigAttributes.CELL_STYLE, cellStyleSelect, DisplayMode.SELECT,
ContextTableConstants.COLUMN_CONTEXT_VALUE);
}
@@ -327,13 +317,6 @@ public class ContextNatTableConfiguration extends AbstractRegistryConfiguration
ProxyDynamicCellEditor cutomCellEditor = new ProxyDynamicCellEditor(dataProvider, manager, modelManager);
configRegistry.registerConfigAttribute(EditConfigAttributes.CELL_EDITOR, cutomCellEditor, DisplayMode.EDIT,
ContextTableConstants.COLUMN_CONTEXT_VALUE);
ContextAutoResizeTextPainter customPainter = new ContextAutoResizeTextPainter(true, false, false);
customPainter.setWordWrapping(true);
ContextNatTableBackGroudPainter backGroudPainter = new ContextNatTableBackGroudPainter(customPainter, dataProvider);
configRegistry.registerConfigAttribute(CellConfigAttributes.CELL_PAINTER, backGroudPainter, DisplayMode.NORMAL,
ContextTableConstants.COLUMN_CONTEXT_VALUE);
configRegistry.registerConfigAttribute(CellConfigAttributes.CELL_PAINTER, backGroudPainter, DisplayMode.SELECT,
ContextTableConstants.COLUMN_CONTEXT_VALUE);
}
private void registerColumnFiveTextEditor(IConfigRegistry configRegistry) {

View File

@@ -15,7 +15,6 @@ package org.talend.core.ui.context.nattableTree;
import java.util.ArrayList;
import java.util.List;
import org.apache.commons.lang.StringUtils;
import org.eclipse.nebula.widgets.nattable.style.CellStyleAttributes;
import org.eclipse.nebula.widgets.nattable.style.HorizontalAlignmentEnum;
import org.eclipse.nebula.widgets.nattable.style.IStyle;
@@ -110,12 +109,9 @@ public class ContextValuesNatText extends Composite {
if (NatTableCellEditorFactory.isPassword(realPara.getType())) {
widgetStyle = SWT.PASSWORD | HorizontalAlignmentEnum.getSWTStyle(cellStyle);
}
if (NatTableCellEditorFactory.isResource(realPara.getType()) || NatTableCellEditorFactory.isList(realPara.getType())) {
if (NatTableCellEditorFactory.isResource(realPara.getType())) {
widgetStyle = SWT.READ_ONLY | HorizontalAlignmentEnum.getSWTStyle(cellStyle);
}
if (NatTableCellEditorFactory.isString(realPara.getType())) {
widgetStyle = widgetStyle | SWT.WRAP | SWT.MULTI | SWT.V_SCROLL;
}
text = new Text(this, widgetStyle);
text.setBackground(cellStyle.getAttributeValue(CellStyleAttributes.BACKGROUND_COLOR));
text.setForeground(cellStyle.getAttributeValue(CellStyleAttributes.FOREGROUND_COLOR));
@@ -239,7 +235,6 @@ public class ContextValuesNatText extends Composite {
*/
protected String getTransformedSelection(boolean focusOnText) {
Object result = null;
validateValue();
result = cellFactory.openCustomCellEditor(realPara, getShell());
String finalResult = "";
if (result == null || result.equals("")) {
@@ -256,14 +251,6 @@ public class ContextValuesNatText extends Composite {
return finalResult;
}
private void validateValue() {
// possible value modified manually
// notify focuslost to commit value might execute after dialog open in some os
if (NatTableCellEditorFactory.isString(realPara.getType()) && !StringUtils.equals(realPara.getValue(), text.getText())) {
realPara.setValue(text.getText());
}
}
protected String getTransformedTextForDialog(boolean focusOnText) {
String result = "";
result = getTransformedSelection(focusOnText);

View File

@@ -25,8 +25,6 @@ import org.eclipse.nebula.widgets.nattable.style.Style;
import org.eclipse.nebula.widgets.nattable.util.GUIHelper;
import org.eclipse.nebula.widgets.nattable.widget.EditModeEnum;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.FocusAdapter;
import org.eclipse.swt.events.FocusEvent;
import org.eclipse.swt.events.KeyAdapter;
import org.eclipse.swt.events.KeyEvent;
import org.eclipse.swt.widgets.Composite;
@@ -80,33 +78,6 @@ public class CustomTextCellEditor extends AbstractCellEditor {
this.cellStyle = cellStyle;
this.commitOnUpDown = commitOnUpDown;
this.moveSelectionOnEnter = moveSelectionOnEnter;
this.focusListener = new FocusAdapter() {
@Override
public void focusLost(FocusEvent e) {
// overwrite org.eclipse.nebula.widgets.nattable.edit.editor.AbstractCellEditor.InlineFocusListener
// set closeAfterCommit to false
if (!commit(MoveDirectionEnum.NONE, false)) {
if (!e.widget.isDisposed() && e.widget instanceof Control) {
((Control) e.widget).forceFocus();
}
} else {
if (!CustomTextCellEditor.this.parent.isDisposed()) {
CustomTextCellEditor.this.parent.forceFocus();
}
}
}
};
}
@Override
public void addEditorControlListeners() {
Control editorControl = getEditorControl();
if (editorControl != null && !editorControl.isDisposed() && this.editMode == EditModeEnum.INLINE) {
editorControl.addFocusListener(this.focusListener);
editorControl.addTraverseListener(this.traverseListener);
}
}
/*

View File

@@ -27,7 +27,6 @@ import org.talend.core.model.metadata.types.JavaTypesManager;
import org.talend.core.model.process.IContextParameter;
import org.talend.core.service.IResourcesDependenciesService;
import org.talend.core.ui.context.MultiStringSelectionDialog;
import org.talend.core.ui.context.StringTextDialog;
import org.talend.core.utils.TalendQuoteUtils;
/**
@@ -45,7 +44,7 @@ public class NatTableCellEditorFactory {
String currentType = para.getType();
if (currentType != null) {
if (isFile(currentType) || isDate(currentType) || isDirectory(currentType) || isList(currentType)
|| isResource(currentType) || isString(currentType)) {
|| isResource(currentType)) {
return true;
}
}
@@ -68,8 +67,6 @@ public class NatTableCellEditorFactory {
defalutDataValue = para.getDisplayValue();
} else if (isResource(currentType)) {
transformResult = openResourcesDialogForCellEditor(parentShell, para);
} else if (isString(currentType)) {
transformResult = openStringDialogFoeCellEditor(parentShell, para);
}
}
return transformResult;
@@ -143,15 +140,6 @@ public class NatTableCellEditorFactory {
return ContextNatTableUtils.getSpecialTypeDisplayValue(JavaTypesManager.RESOURCE.getId(), value);
}
private String openStringDialogFoeCellEditor(Shell parentShell, IContextParameter para) {
StringTextDialog stringTextDialog = new StringTextDialog(parentShell, para.getValue());
int open = stringTextDialog.open();
if (open == Dialog.OK) {
return stringTextDialog.getTextContent();
}
return "";
}
public static String getAddQuoteString(String path) {
ECodeLanguage codeLanguage = LanguageManager.getCurrentLanguage();
if (codeLanguage == ECodeLanguage.PERL) {
@@ -196,10 +184,6 @@ public class NatTableCellEditorFactory {
return MetadataToolHelper.isResource(value);
}
public static boolean isString(final String value) {
return JavaTypesManager.STRING.getId().equals(value);
}
/**
* For the different value between display value and real value, due to nattable model comes from context, if set
* new context parameter value in this factory, then the UpdateDataCommandHandler of nattable will treat this as no

View File

@@ -146,13 +146,4 @@ public class ProxyDynamicCellEditor extends AbstractCellEditor {
return super.commit(direction, closeAfterCommit, skipValidation);
}
@Override
public void addEditorControlListeners() {
if (dynamicEditor != null) {
dynamicEditor.addEditorControlListeners();
} else {
super.addEditorControlListeners();
}
}
}

View File

@@ -30,8 +30,6 @@ public interface IGitUIProviderService extends IService {
public String[] changeCredentials(Shell parent, Serializable uriIsh, String initUser, boolean canStoreCredentials);
boolean checkPendingChanges();
boolean checkUncommittedFiles();
public void openPushFailedDialog(Object pushResult);

View File

@@ -3,13 +3,14 @@ Automatic-Module-Name: org.talend.core
Bundle-ManifestVersion: 2
Bundle-Name: Core Plug-in
Bundle-SymbolicName: org.talend.core;singleton:=true
Bundle-Version: 8.0.2.qualifier
Bundle-Version: 8.8.8.qualifier
Bundle-Activator: org.talend.core.CorePlugin
Bundle-Localization: plugin
Bundle-ActivationPolicy: lazy
Require-Bundle: org.eclipse.debug.core,
org.eclipse.ui.workbench,
org.eclipse.jdt.core,
org.apache.commons.io,
org.apache.commons.lang,
org.apache.commons.collections,
org.apache.log4j,
@@ -60,8 +61,7 @@ Export-Package: org.talend.core,
org.talend.core.services.resource,
org.talend.core.views,
org.talend.designer.runprocess
Import-Package: org.apache.commons.io,
org.eclipse.m2e.core,
Import-Package: org.eclipse.m2e.core,
org.eclipse.m2e.core.embedder,
org.slf4j,
org.slf4j.spi

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>8.0.2-SNAPSHOT</version>
<version>8.8.8-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.core</artifactId>

View File

@@ -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.0.2.qualifier
Bundle-Version: 8.8.8.qualifier
Bundle-ClassPath: .
Bundle-Activator: orgomg.cwm.objectmodel.core.provider.Cwm_mipEditPlugin$Implementation
Bundle-Vendor: %providerName

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>8.0.2-SNAPSHOT</version>
<version>8.8.8-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.cwm.mip.edit</artifactId>

View File

@@ -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.0.2.qualifier
Bundle-Version: 8.8.8.qualifier
Bundle-ClassPath: .
Bundle-Activator: orgomg.cwm.objectmodel.core.presentation.Cwm_mipEditorPlugin$Implementation
Bundle-Vendor: %providerName

View File

@@ -333,7 +333,7 @@ _UI_InformationsetModelWizard_description = Cr\u00E9er un mod\u00E8le Informatio
_UI_InformationsetEditor_label = \u00C9diteur de mod\u00E8le Informationset
_UI_InformationsetEditorFilenameDefaultBase = Mon
_UI_InformationsetEditorFilenameDefaultBase = INVISIBLE dans l'interface
_UI_InformationsetEditorFilenameExtension = informationset
_UI_InformationreportingModelWizard_label = Mod\u00E8le Informationreporting

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.talend.studio</groupId>
<artifactId>tcommon-studio-se</artifactId>
<version>8.0.2-SNAPSHOT</version>
<version>8.8.8-SNAPSHOT</version>
<relativePath>../../../</relativePath>
</parent>
<artifactId>org.talend.cwm.mip.editor</artifactId>

Some files were not shown because too many files have changed in this diff Show More