Skip to content

Commit b7818cd

Browse files
praveen-skppraveen-skp
authored
Merge branch 'eclipse-platform:master' into group_close_editor_options_in_preference
2 parents 79068d2 + 7d29a59 commit b7818cd

File tree

14 files changed

+208
-21
lines changed

14 files changed

+208
-21
lines changed

‎README.md‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,11 @@ For more information, refer to the [Eclipse Platform project page](https://proje
1616

1717
Contributions are most welcome. There are many ways to contribute, from entering high quality bug reports, to contributing code or documentation changes.
1818

19-
For a complete guide, see the https://github.com/eclipse-platform/.github/blob/main/CONTRIBUTING.md.
19+
For a complete guide, see the [CONTRIBUTING](https://github.com/eclipse-platform/.github/blob/main/CONTRIBUTING.md) page.
20+
21+
[![Create Eclipse Development Environment for Eclipse Platform UI](https://download.eclipse.org/oomph/www/setups/svg/Eclipse_Platform_UI.svg)](
22+
https://www.eclipse.org/setups/installer/?url=https://raw.githubusercontent.com/eclipse-platform/eclipse.platform.ui/master/releng/org.eclipse.ui.releng/platformUIConfiguration.setup&show=true
23+
"Click to open Eclipse-Installer Auto Launch or drag into your running installer")
2024

2125

2226
## Test Dependencies
@@ -27,10 +31,10 @@ Please install them by installing "Eclipse Test Framework" from the [current rel
2731

2832
## How to Build on the Command Line
2933

30-
You need Maven 3.8.x installed. After this you can run the build via the following command:
34+
You need Maven 3.9.x installed. After this you can run the build via the following command:
3135

3236
```
33-
mvn clean verify -Pbuild-individual-bundles
37+
mvn clean verify
3438
```
3539

3640

‎bundles/org.eclipse.e4.ui.workbench.renderers.swt/src/org/eclipse/e4/ui/workbench/renderers/swt/ContributedPartRenderer.java‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,10 @@ public boolean setFocus() {
103103
Object object = part.getObject();
104104
if (object != null && isEnabled()) {
105105
IPresentationEngine pe = part.getContext().get(IPresentationEngine.class);
106-
pe.focusGui(part);
107-
return true;
106+
if (pe != null) {
107+
pe.focusGui(part);
108+
return true;
109+
}
108110
}
109111
return super.setFocus();
110112
} finally {

‎bundles/org.eclipse.jface.text/projection/org/eclipse/jface/text/source/projection/ProjectionAnnotationModel.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,10 @@ public boolean collapseAll(int offset, int length) {
147147
*/
148148
protected boolean expandAll(int offset, int length, boolean fireModelChanged) {
149149

150+
if (offset < 0 || length < 0) {
151+
return false;
152+
}
153+
150154
boolean expanding= false;
151155

152156
Iterator<Annotation> iterator= getAnnotationIterator(offset, length, true, true);

‎bundles/org.eclipse.ui.ide.application/src/org/eclipse/ui/internal/ide/application/IDEWorkbenchAdvisor.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ public void initialize(IWorkbenchConfigurer configurer) {
226226
jfaceComparatorIsSet = true;
227227
}
228228

229-
if (!Platform.inDevelopmentMode()) {
229+
if (!Platform.inDevelopmentMode() && !JUnitTestUtil.isJunitTestRunning()) {
230230
new AutoRegisterSchemeHandlersJob().schedule();
231231
}
232232
}

‎bundles/org.eclipse.ui.ide.application/src/org/eclipse/ui/internal/ide/application/JUnitTestUtil.java‎

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
/*******************************************************************************
2+
* Copyright (c) 2024 SAP SE.
3+
*
4+
* This program and the accompanying materials
5+
* are made available under the terms of the Eclipse Public License 2.0
6+
* which accompanies this distribution, and is available at
7+
* https://www.eclipse.org/legal/epl-2.0/
8+
*
9+
* SPDX-License-Identifier: EPL-2.0
10+
*
11+
* Contributors:
12+
* Matthias Becker / Sebastian Ratz - initial API and implementation
13+
*******************************************************************************/
14+
package org.eclipse.ui.internal.ide.application;
15+
16+
import java.util.Set;
17+
import java.util.concurrent.atomic.AtomicBoolean;
18+
19+
import org.eclipse.core.runtime.Platform;
20+
import org.eclipse.core.runtime.ServiceCaller;
21+
import org.eclipse.osgi.service.environment.EnvironmentInfo;
22+
23+
public class JUnitTestUtil {
24+
private static Boolean cachedIsJunitTestRunning = null;
25+
26+
public static boolean isJunitTestRunning() {
27+
if (cachedIsJunitTestRunning == null) {
28+
try {
29+
if (Platform.isRunning()) {
30+
AtomicBoolean result = new AtomicBoolean();
31+
cachedIsJunitTestRunning = ServiceCaller.callOnce(JUnitTestUtil.class, EnvironmentInfo.class, envInfo -> {
32+
String application = envInfo.getProperty("eclipse.application"); //$NON-NLS-1$
33+
result.set(application != null && Set.of( //
34+
// see org.eclipse.pde.internal.launching.IPDEConstants
35+
"org.eclipse.pde.junit.runtime.nonuithreadtestapplication", // //$NON-NLS-1$
36+
"org.eclipse.pde.junit.runtime.uitestapplication", // //$NON-NLS-1$
37+
"org.eclipse.pde.junit.runtime.coretestapplication", // //$NON-NLS-1$
38+
// bundle "org.eclipse.test" (Platform tests)
39+
"org.eclipse.test.uitestapplication", //$NON-NLS-1$
40+
"org.eclipse.test.coretestapplication", // //$NON-NLS-1$
41+
// see org.eclipse.tycho.surefire.AbstractTestMojo
42+
"org.eclipse.tycho.surefire.osgibooter.uitest", //$NON-NLS-1$
43+
"org.eclipse.tycho.surefire.osgibooter.headlesstest") // //$NON-NLS-1$
44+
.contains(application));
45+
});
46+
cachedIsJunitTestRunning = result.get();
47+
} else {
48+
cachedIsJunitTestRunning = true; // probably
49+
}
50+
} catch (Throwable t) {
51+
// log
52+
cachedIsJunitTestRunning = false;
53+
}
54+
}
55+
56+
return cachedIsJunitTestRunning;
57+
}
58+
59+
}

‎releng/build.properties‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎releng/org.eclipse.ui.releng/.project‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<projectDescription>
3-
<name>org.eclipse.ui.releng</name>
3+
<name>org.eclipse.platform.ui.setup</name>
44
<comment></comment>
55
<projects>
66
</projects>

‎releng/org.eclipse.ui.releng/platformUIConfiguration.setup‎

Lines changed: 86 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,86 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<setup:Configuration
3+
xmi:version="2.0"
4+
xmlns:xmi="http://www.omg.org/XMI"
5+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
6+
xmlns:setup="http://www.eclipse.org/oomph/setup/1.0"
7+
label="Eclipse Platform UI">
8+
<annotation
9+
source="http://www.eclipse.org/oomph/setup/BrandingInfo">
10+
<detail
11+
key="imageURI">
12+
<value>https://www.eclipse.org/downloads/images/committers.png</value>
13+
</detail>
14+
<detail
15+
key="badgeLabel">
16+
<value>Eclipse Platform UI</value>
17+
</detail>
18+
</annotation>
19+
<installation
20+
name="eclipse.platform.ui.installation"
21+
label="Eclipse Platform UI Installation">
22+
<setupTask
23+
xsi:type="setup:VariableTask"
24+
name="installation.id.default"
25+
value="eclipse-platform-ui"/>
26+
<productVersion
27+
href="index:/org.eclipse.setup#//@productCatalogs[name='org.eclipse.applications']/@products[name='eclipse.platform.sdk']/@versions[name='latest']"/>
28+
<description>The Eclipse Platform UI installation provides the latest tools needed to work with the project's source code.</description>
29+
</installation>
30+
<workspace
31+
name="eclipse.platform.ui.workspace"
32+
label="Eclipse Platform UI Workspace">
33+
<setupTask
34+
xsi:type="setup:VariableTask"
35+
name="workspace.id.default"
36+
value="eclipse-platform-ui-ws"/>
37+
<setupTask
38+
xsi:type="setup:CompoundTask"
39+
name="User Preferences">
40+
<annotation
41+
source="http://www.eclipse.org/oomph/setup/UserPreferences">
42+
<detail
43+
key="/instance/org.eclipse.oomph.setup.ui/showToolBarContributions">
44+
<value>record</value>
45+
</detail>
46+
</annotation>
47+
<setupTask
48+
xsi:type="setup:CompoundTask"
49+
name="org.eclipse.oomph.setup.ui">
50+
<setupTask
51+
xsi:type="setup:PreferenceTask"
52+
key="/instance/org.eclipse.oomph.setup.ui/showToolBarContributions"
53+
value="true"/>
54+
</setupTask>
55+
<setupTask
56+
xsi:type="setup:CompoundTask"
57+
name="org.eclipse.ui.ide">
58+
<setupTask
59+
xsi:type="setup:PreferenceTask"
60+
key="/instance/org.eclipse.ui.ide/WORKSPACE_NAME"
61+
value="Eclipse Platform UI"/>
62+
</setupTask>
63+
</setupTask>
64+
<setupTask
65+
xsi:type="setup:VariableTask"
66+
name="eclipse.git.authentication.style"
67+
defaultValue="anonymous"/>
68+
<stream
69+
href="index:/org.eclipse.setup#//@projectCatalogs[name='org.eclipse']/@projects[name='platform']/@projects[name='ui']/@streams[name='master']"/>
70+
<description>The Eclipse Platform UI workspace provides all the source code of the project.</description>
71+
</workspace>
72+
<description>
73+
&lt;p>
74+
The &lt;code>Eclipse Platform UI&lt;/code> configuration provisions a dedicated development environment for the complete set of projects that comprise the Eclipse Platform UI,
75+
i.e. the projects that are contained in the &lt;a href=&quot;https://github.com/eclipse-platform/eclipse.platform.ui&quot;>eclipse.platform.ui&lt;/a> repository.
76+
&lt;/p>
77+
&lt;p>
78+
The installation is based on the latest successful integration build of the &lt;code>Eclipse Platform SDK&lt;/code>,
79+
the PDE target platform, like the installation, is also based on the latest integration build,
80+
and the API baseline is based on the most recent release.
81+
&lt;p>
82+
&lt;/p>
83+
Please &lt;a href=&quot;https://wiki.eclipse.org/Eclipse_Platform_SDK_Provisioning&quot;>read the tutorial instructions&lt;/a> for more details.
84+
&lt;/p>
85+
</description>
86+
</setup:Configuration>

‎releng/org.eclipse.ui.releng/platformUi.setup‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,11 @@
1313
xsi:schemaLocation="http://www.eclipse.org/oomph/setup/git/1.0 https://raw.githubusercontent.com/eclipse-oomph/oomph/master/setups/models/Git.ecore http://www.eclipse.org/oomph/predicates/1.0 https://raw.githubusercontent.com/eclipse-oomph/oomph/master/setups/models/Predicates.ecore http://www.eclipse.org/oomph/setup/targlets/1.0 https://raw.githubusercontent.com/eclipse-oomph/oomph/master/setups/models/SetupTarglets.ecore http://www.eclipse.org/oomph/setup/workingsets/1.0 https://raw.githubusercontent.com/eclipse-oomph/oomph/master/setups/models/SetupWorkingSets.ecore http://www.eclipse.org/oomph/workingsets/1.0 https://raw.githubusercontent.com/eclipse-oomph/oomph/master/setups/models/WorkingSets.ecore"
1414
name="ui"
1515
label="UI">
16+
<annotation
17+
source="http://www.eclipse.org/oomph/setup/ConfigurationReference">
18+
<reference
19+
href="platformUIConfiguration.setup#/"/>
20+
</annotation>
1621
<setupTask
1722
xsi:type="setup:EclipseIniTask"
1823
option="-Doomph.redirection.platform.ui"

‎releng/org.eclipse.ui.releng/platformUiTools.p2f‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,11 @@
2222
<repository location='https://download.eclipse.org/tools/orbit/downloads/drops/R20230531010532/repository'/>
2323
</repositories>
2424
</iu>
25+
<iu id='javax.inject' name='javax.inject' version='0.0.0'>
26+
<repositories size='1'>
27+
<repository location='https://download.eclipse.org/tools/orbit/downloads/drops/R20230531010532/repository'/>
28+
</repositories>
29+
</iu>
2530
<iu id='assertj-core' name='assertj-core' version='3.21.0'>
2631
<repositories size='1'>
2732
<repository location='https://download.eclipse.org/eclipse/updates/I-builds'/>
@@ -97,11 +102,6 @@
97102
<repository location='https://download.eclipse.org/tm4e/releases/latest/'/>
98103
</repositories>
99104
</iu>
100-
<iu id='de.jcup.basheditor.feature.group' name='Schell script editor' version='0.0.0'>
101-
<repositories size='1'>
102-
<repository location='https://de-jcup.github.io/update-site-eclipse-bash-editor/update-site'/>
103-
</repositories>
104-
</iu>
105105
<iu id='zipeditor.feature.group' name='ZipEditor' version='0.0.0'>
106106
<repositories size='1'>
107107
<repository location='https://zipeditor.sourceforge.net/update'/>

0 commit comments

Comments
 (0)