Skip to content

Commit 6871c1f

Browse files
trancexpresstrancexpress
committed
2 parents bdb4764 + 86aa0ac commit 6871c1f

File tree

642 files changed

+212926
-2021
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

642 files changed

+212926
-2021
lines changed

‎.mvn/jvm.config‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
11
-XX:+PrintFlagsFinal
2-
-Xmx1500m

‎Jenkinsfile‎

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@ pipeline {
1111
maven 'apache-maven-latest'
1212
jdk 'temurin-jdk21-latest'
1313
}
14+
environment {
15+
MAVEN_OPTS = '-Xmx1500m'
16+
}
1417
stages {
1518
stage('Build') {
1619
steps {
@@ -29,12 +32,16 @@ pipeline {
2932
post {
3033
always {
3134
archiveArtifacts artifacts: '.*log,**/target/**/.*log', allowEmptyArchive: true
32-
junit '**/target/surefire-reports/TEST-*.xml'
35+
junit allowEmptyResults: true, testResults: '**/target/surefire-reports/TEST-*.xml'
3336
discoverGitReferenceBuild referenceJob: 'eclipse.platform/master'
34-
recordIssues(publishAllIssues:false, ignoreQualityGate:true,
35-
tool: eclipse(name: 'Compiler and API Tools', pattern: '**/target/compilelogs/*.xml'),
36-
qualityGates: [[threshold: 1, type: 'DELTA', unstable: true]])
37-
recordIssues publishAllIssues:false, tools: [mavenConsole(), javaDoc()]
37+
recordIssues enabledForFailure: true, publishAllIssues:false, ignoreQualityGate:true,
38+
tools: [
39+
eclipse(name: 'Compiler', pattern: '**/target/compilelogs/*.xml'),
40+
javaDoc(),
41+
issues(name: 'API Tools', id: 'apitools', pattern: '**/target/apianalysis/*.xml')
42+
],
43+
qualityGates: [[threshold: 1, type: 'DELTA', unstable: true]]
44+
recordIssues enabledForFailure: true, publishAllIssues:false, tools: [mavenConsole()]
3845
}
3946
}
4047
}

‎ant/org.eclipse.ant.tests.ui/META-INF/MANIFEST.MF‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
22
Bundle-ManifestVersion: 2
33
Bundle-Name: %pluginName
44
Bundle-SymbolicName: org.eclipse.ant.tests.ui; singleton:=true
5-
Bundle-Version: 3.12.0.qualifier
5+
Bundle-Version: 3.12.100.qualifier
66
Bundle-ClassPath: anttestsui.jar
77
Bundle-Vendor: %providerName
88
Bundle-Localization: plugin

‎ant/org.eclipse.ant.tests.ui/forceQualifierUpdate.txt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,5 @@
22
Bug 403352 - Update all parent versions to match our build stream
33
Bug 509973 - Comparator errors in I20170105-0320
44
https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/issues/1184
5-
https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/issues/1659
5+
https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/issues/1659
6+
https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/issues/2995

‎ant/org.eclipse.ant.tests.ui/test plugin/org/eclipse/ant/tests/ui/testplugin/AbstractAntUITest.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -372,7 +372,6 @@ protected void launchWithDebug(String buildFileName) throws CoreException {
372372
*
373373
* @param buildFileName
374374
* build file to launch
375-
* @see ProjectCreationDecorator
376375
*/
377376
protected ILaunchConfiguration getLaunchConfiguration(String buildFileName) {
378377
IFile file = getJavaProject().getProject().getFolder("launchConfigurations").getFile(buildFileName + ".launch"); //$NON-NLS-1$ //$NON-NLS-2$

‎ant/org.eclipse.ant.tests.ui/test plugin/org/eclipse/ant/tests/ui/testplugin/AntUIPerformanceTests.java‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*******************************************************************************
2-
* Copyright (c) 2004, 2008 IBM Corporation and others.
2+
* Copyright (c) 2004, 2025 IBM Corporation and others.
33
*
44
* This program and the accompanying materials
55
* are made available under the terms of the Eclipse Public License 2.0
@@ -21,9 +21,7 @@
2121
import org.junit.platform.suite.api.Suite;
2222

2323
/**
24-
* Performance Test suite for the Ant UI. All of the tests in this suite rely on
25-
* the setup that occurs in the ProjectCreationDecorator suite. It must always
26-
* run before any of the other test suites.
24+
* Performance Test suite for the Ant UI.
2725
*/
2826
@Suite
2927
@SelectClasses({ OpenAntEditorTest.class, OpenLaunchConfigurationDialogTests.class, SeparateVMTests.class })

‎ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/AntUIImages.java‎

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -54,52 +54,52 @@ public class AntUIImages {
5454
*/
5555
private static void declareImages() {
5656
// Ant Editor images
57-
declareRegistryImage(IAntUIConstants.IMG_PROPERTY, OBJECT + "property_obj.png"); //$NON-NLS-1$
58-
declareRegistryImage(IAntUIConstants.IMG_TASK_PROPOSAL, OBJECT + "task_obj.png"); //$NON-NLS-1$
59-
declareRegistryImage(IAntUIConstants.IMG_TEMPLATE_PROPOSAL, OBJECT + "template_obj.png"); //$NON-NLS-1$
57+
declareRegistryImage(IAntUIConstants.IMG_PROPERTY, OBJECT + "property_obj.svg"); //$NON-NLS-1$
58+
declareRegistryImage(IAntUIConstants.IMG_TASK_PROPOSAL, OBJECT + "task_obj.svg"); //$NON-NLS-1$
59+
declareRegistryImage(IAntUIConstants.IMG_TEMPLATE_PROPOSAL, OBJECT + "template_obj.svg"); //$NON-NLS-1$
6060

61-
declareRegistryImage(IAntUIConstants.IMG_SEGMENT_EDIT, T_ETOOL + "segment_edit.png"); //$NON-NLS-1$
62-
declareRegistryImage(IAntUIConstants.IMG_MARK_OCCURRENCES, T_ETOOL + "mark_occurrences.png"); //$NON-NLS-1$
61+
declareRegistryImage(IAntUIConstants.IMG_SEGMENT_EDIT, T_ETOOL + "segment_edit.svg"); //$NON-NLS-1$
62+
declareRegistryImage(IAntUIConstants.IMG_MARK_OCCURRENCES, T_ETOOL + "mark_occurrences.svg"); //$NON-NLS-1$
6363

6464
// Ant View Actions
65-
declareRegistryImage(IAntUIConstants.IMG_ANT, OBJECT + "ant.png"); //$NON-NLS-1$
66-
declareRegistryImage(IAntUIConstants.IMG_REMOVE, LOCALTOOL + "remove_co.png"); //$NON-NLS-1$
67-
declareRegistryImage(IAntUIConstants.IMG_REMOVE_ALL, LOCALTOOL + "removeall_co.png"); //$NON-NLS-1$
68-
declareRegistryImage(IAntUIConstants.IMG_ADD, LOCALTOOL + "add_co.png"); //$NON-NLS-1$
69-
declareRegistryImage(IAntUIConstants.IMG_RUN, LOCALTOOL + "run_tool.png"); //$NON-NLS-1$
70-
declareRegistryImage(IAntUIConstants.IMG_SEARCH, LOCALTOOL + "search.png"); //$NON-NLS-1$
71-
72-
declareRegistryImage(IAntUIConstants.IMG_FILTER_INTERNAL_TARGETS, LOCALTOOL + "filter_internal_targets.png"); //$NON-NLS-1$
73-
declareRegistryImage(IAntUIConstants.IMG_FILTER_IMPORTED_ELEMENTS, LOCALTOOL + "filter_imported_elements.png"); //$NON-NLS-1$
74-
declareRegistryImage(IAntUIConstants.IMG_FILTER_PROPERTIES, LOCALTOOL + "filter_properties.png"); //$NON-NLS-1$
75-
declareRegistryImage(IAntUIConstants.IMG_FILTER_TOP_LEVEL, LOCALTOOL + "filter_top_level.png"); //$NON-NLS-1$
76-
declareRegistryImage(IAntUIConstants.IMG_LINK_WITH_EDITOR, LOCALTOOL + "synced.png"); //$NON-NLS-1$
77-
declareRegistryImage(IAntUIConstants.IMG_SORT_OUTLINE, LOCALTOOL + "alpha_mode.png"); //$NON-NLS-1$
78-
declareRegistryImage(IAntUIConstants.IMG_REFRESH, LOCALTOOL + "refresh.png"); //$NON-NLS-1$
65+
declareRegistryImage(IAntUIConstants.IMG_ANT, OBJECT + "ant.svg"); //$NON-NLS-1$
66+
declareRegistryImage(IAntUIConstants.IMG_REMOVE, LOCALTOOL + "remove_co.svg"); //$NON-NLS-1$
67+
declareRegistryImage(IAntUIConstants.IMG_REMOVE_ALL, LOCALTOOL + "removeall_co.svg"); //$NON-NLS-1$
68+
declareRegistryImage(IAntUIConstants.IMG_ADD, LOCALTOOL + "add_co.svg"); //$NON-NLS-1$
69+
declareRegistryImage(IAntUIConstants.IMG_RUN, LOCALTOOL + "run_tool.svg"); //$NON-NLS-1$
70+
declareRegistryImage(IAntUIConstants.IMG_SEARCH, LOCALTOOL + "search.svg"); //$NON-NLS-1$
71+
72+
declareRegistryImage(IAntUIConstants.IMG_FILTER_INTERNAL_TARGETS, LOCALTOOL + "filter_internal_targets.svg"); //$NON-NLS-1$
73+
declareRegistryImage(IAntUIConstants.IMG_FILTER_IMPORTED_ELEMENTS, LOCALTOOL + "filter_imported_elements.svg"); //$NON-NLS-1$
74+
declareRegistryImage(IAntUIConstants.IMG_FILTER_PROPERTIES, LOCALTOOL + "filter_properties.svg"); //$NON-NLS-1$
75+
declareRegistryImage(IAntUIConstants.IMG_FILTER_TOP_LEVEL, LOCALTOOL + "filter_top_level.svg"); //$NON-NLS-1$
76+
declareRegistryImage(IAntUIConstants.IMG_LINK_WITH_EDITOR, LOCALTOOL + "synced.svg"); //$NON-NLS-1$
77+
declareRegistryImage(IAntUIConstants.IMG_SORT_OUTLINE, LOCALTOOL + "alpha_mode.svg"); //$NON-NLS-1$
78+
declareRegistryImage(IAntUIConstants.IMG_REFRESH, LOCALTOOL + "refresh.svg"); //$NON-NLS-1$
7979

8080
// Ant View Labels
81-
declareRegistryImage(IAntUIConstants.IMG_ANT_PROJECT, OBJECT + "ant_buildfile.png"); //$NON-NLS-1$
82-
declareRegistryImage(IAntUIConstants.IMG_ANT_TARGET, OBJECT + "targetpublic_obj.png"); //$NON-NLS-1$
83-
declareRegistryImage(IAntUIConstants.IMG_ANT_TARGET_INTERNAL, OBJECT + "targetinternal_obj.png"); //$NON-NLS-1$
84-
declareRegistryImage(IAntUIConstants.IMG_ANT_DEFAULT_TARGET, OBJECT + "defaulttarget_obj.png"); //$NON-NLS-1$
85-
declareRegistryImage(IAntUIConstants.IMG_ANT_TARGET_ERROR, OBJECT + "ant_target_err.png"); //$NON-NLS-1$
81+
declareRegistryImage(IAntUIConstants.IMG_ANT_PROJECT, OBJECT + "ant_buildfile.svg"); //$NON-NLS-1$
82+
declareRegistryImage(IAntUIConstants.IMG_ANT_TARGET, OBJECT + "targetpublic_obj.svg"); //$NON-NLS-1$
83+
declareRegistryImage(IAntUIConstants.IMG_ANT_TARGET_INTERNAL, OBJECT + "targetinternal_obj.svg"); //$NON-NLS-1$
84+
declareRegistryImage(IAntUIConstants.IMG_ANT_DEFAULT_TARGET, OBJECT + "defaulttarget_obj.svg"); //$NON-NLS-1$
85+
declareRegistryImage(IAntUIConstants.IMG_ANT_TARGET_ERROR, OBJECT + "ant_target_err.svg"); //$NON-NLS-1$
8686

8787
// ANT objects
88-
declareRegistryImage(IAntUIConstants.IMG_TAB_CLASSPATH, OBJECT + "classpath.png"); //$NON-NLS-1$
89-
declareRegistryImage(IAntUIConstants.IMG_ANT_TYPE, OBJECT + "type.png"); //$NON-NLS-1$
90-
declareRegistryImage(IAntUIConstants.IMG_ANT_TASKDEF, OBJECT + "taskdef_obj.png"); //$NON-NLS-1$
91-
declareRegistryImage(IAntUIConstants.IMG_ANT_MACRODEF, OBJECT + "macrodef_obj.png"); //$NON-NLS-1$
92-
declareRegistryImage(IAntUIConstants.IMG_ANT_IMPORT, OBJECT + "import_obj.png"); //$NON-NLS-1$
88+
declareRegistryImage(IAntUIConstants.IMG_TAB_CLASSPATH, OBJECT + "classpath.svg"); //$NON-NLS-1$
89+
declareRegistryImage(IAntUIConstants.IMG_ANT_TYPE, OBJECT + "type.svg"); //$NON-NLS-1$
90+
declareRegistryImage(IAntUIConstants.IMG_ANT_TASKDEF, OBJECT + "taskdef_obj.svg"); //$NON-NLS-1$
91+
declareRegistryImage(IAntUIConstants.IMG_ANT_MACRODEF, OBJECT + "macrodef_obj.svg"); //$NON-NLS-1$
92+
declareRegistryImage(IAntUIConstants.IMG_ANT_IMPORT, OBJECT + "import_obj.svg"); //$NON-NLS-1$
9393
declareRegistryImage(IAntUIConstants.IMG_ANT_ECLIPSE_RUNTIME_OBJECT, OBJECT + "eclipse16.png"); //$NON-NLS-1$
9494

9595
declareRegistryImage(IAntUIConstants.IMG_WIZARD_BANNER, WIZ + "ant_wiz.png"); //$NON-NLS-1$
9696
declareRegistryImage(IAntUIConstants.IMG_EXPORT_WIZARD_BANNER, WIZ + "export_ant_wiz.png"); //$NON-NLS-1$
9797
declareRegistryImage(IAntUIConstants.IMG_TAB_ANT_TARGETS, LOCALTOOL + "ant_targets.png"); //$NON-NLS-1$
9898

9999
// Overlays
100-
declareRegistryImage(IAntUIConstants.IMG_OVR_ERROR, OVR + "error_co.png"); //$NON-NLS-1$
101-
declareRegistryImage(IAntUIConstants.IMG_OVR_WARNING, OVR + "warning_co.png"); //$NON-NLS-1$
102-
declareRegistryImage(IAntUIConstants.IMG_OVR_IMPORT, OVR + "import_co.png"); //$NON-NLS-1$
100+
declareRegistryImage(IAntUIConstants.IMG_OVR_ERROR, OVR + "error_co.svg"); //$NON-NLS-1$
101+
declareRegistryImage(IAntUIConstants.IMG_OVR_WARNING, OVR + "warning_co.svg"); //$NON-NLS-1$
102+
declareRegistryImage(IAntUIConstants.IMG_OVR_IMPORT, OVR + "import_co.svg"); //$NON-NLS-1$
103103
}
104104

105105
/**

‎ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/views/actions/EditorImageDescriptor.java‎

Lines changed: 6 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,19 @@
11
/*******************************************************************************
2-
* Copyright (c) 2000, 2005 IBM Corporation and others.
2+
* Copyright (c) 2000, 2025 IBM Corporation and others.
33
*
44
* This program and the accompanying materials
55
* are made available under the terms of the Eclipse Public License 2.0
66
* which accompanies this distribution, and is available at
77
* https://www.eclipse.org/legal/epl-2.0/
88
*
99
* SPDX-License-Identifier: EPL-2.0
10-
*
10+
*
1111
* Contributors:
1212
* IBM Corporation - initial API and implementation
1313
*******************************************************************************/
1414
package org.eclipse.ant.internal.ui.views.actions;
1515

1616
import org.eclipse.jface.resource.ImageDescriptor;
17-
import org.eclipse.swt.graphics.Image;
1817
import org.eclipse.swt.graphics.ImageData;
1918
import org.eclipse.swt.program.Program;
2019
import org.eclipse.ui.ISharedImages;
@@ -36,11 +35,9 @@ public EditorImageDescriptor(Program program) {
3635

3736
@Override
3837
public boolean equals(Object o) {
39-
if (!(o instanceof EditorImageDescriptor)) {
38+
if (!(o instanceof EditorImageDescriptor other)) {
4039
return false;
4140
}
42-
EditorImageDescriptor other = (EditorImageDescriptor) o;
43-
4441
// See if there is a name - compare it if so and compare the programs if not
4542
String otherName = other.program.getName();
4643
if (otherName == null) {
@@ -49,22 +46,14 @@ public boolean equals(Object o) {
4946
return otherName.equals(program.getName());
5047
}
5148

52-
/**
53-
* Returns an SWT Image that is described by the information in this descriptor. Each call returns a new Image.
54-
*/
55-
public Image getImage() {
56-
return createImage();
57-
}
58-
5949
@Override
60-
public ImageData getImageData() {
61-
62-
ImageData defaultImage = PlatformUI.getWorkbench().getSharedImages().getImageDescriptor(ISharedImages.IMG_OBJ_FILE).getImageData();
50+
public ImageData getImageData(int zoom) {
51+
ImageData defaultImage = PlatformUI.getWorkbench().getSharedImages().getImageDescriptor(ISharedImages.IMG_OBJ_FILE).getImageData(zoom);
6352
if (defaultImage == null) {
6453
return null;
6554
}
6655
ImageData data = null;
67-
if (program == null || ((data = program.getImageData()) == null)) {
56+
if (program == null || ((data = program.getImageData(zoom)) == null)) {
6857
return defaultImage;
6958
}
7059

‎ant/org.eclipse.ant.ui/META-INF/MANIFEST.MF‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
22
Bundle-ManifestVersion: 2
33
Bundle-Name: %pluginName
44
Bundle-SymbolicName: org.eclipse.ant.ui; singleton:=true
5-
Bundle-Version: 3.10.0.qualifier
5+
Bundle-Version: 3.10.100.qualifier
66
Bundle-Activator: org.eclipse.ant.internal.ui.AntUIPlugin
77
Bundle-Vendor: %providerName
88
Bundle-Localization: plugin
@@ -56,3 +56,4 @@ Require-Bundle: org.eclipse.ui.ide;bundle-version="[3.2.0,4.0.0)";resolution:=op
5656
Bundle-ActivationPolicy: lazy
5757
Bundle-RequiredExecutionEnvironment: JavaSE-21
5858
Automatic-Module-Name: org.eclipse.ant.ui
59+
Require-Capability: eclipse.swt;filter:="(image.format=svg)"

0 commit comments

Comments
 (0)