Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Resolve #1308: Fix E4 editor boolean parameters #1465

Merged

Conversation

stewedbeef
Copy link
Contributor

@stewedbeef stewedbeef commented Nov 9, 2024

Fixes #1308

@eclipse-pde-bot
Copy link
Contributor

This pull request changes some projects for the first time in this development cycle.
Therefore the following files need a version increment:

e4tools/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
e4tools/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
features/org.eclipse.e4.core.tools.feature/feature.xml

An additional commit containing all the necessary changes was pushed to the top of this PR's branch. To obtain these changes (for example if you want to push more changes) either fetch from your fork or apply the git patch.

Git patch
From 602ab529a52587990466b13388c6d04dd65dc399 Mon Sep 17 00:00:00 2001
From: Eclipse PDE Bot <[email protected]>
Date: Sat, 9 Nov 2024 06:18:03 +0000
Subject: [PATCH] Version bump(s) for 4.34 stream


diff --git a/e4tools/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
index e93a68e6c9..8c540a8dd6 100644
--- a/e4tools/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
+++ b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.e4.tools.emf.ui;singleton:=true
-Bundle-Version: 4.8.500.qualifier
+Bundle-Version: 4.8.600.qualifier
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-17
diff --git a/e4tools/bundles/org.eclipse.e4.tools.emf.ui/pom.xml b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
index 914221efff..8484d0cbec 100644
--- a/e4tools/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
+++ b/e4tools/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
@@ -21,7 +21,7 @@
 
   <groupId>eclipse.platform.ui</groupId>
   <artifactId>org.eclipse.e4.tools.emf.ui</artifactId>
-  <version>4.8.500-SNAPSHOT</version>
+  <version>4.8.600-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
   <properties>
diff --git a/features/org.eclipse.e4.core.tools.feature/feature.xml b/features/org.eclipse.e4.core.tools.feature/feature.xml
index 5f9b6df946..fe474fda39 100644
--- a/features/org.eclipse.e4.core.tools.feature/feature.xml
+++ b/features/org.eclipse.e4.core.tools.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.e4.core.tools.feature"
       label="%featureName"
-      version="4.30.300.qualifier"
+      version="4.30.400.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
-- 
2.47.0

Further information are available in Common Build Issues - Missing version increments.

@HannesWell
Copy link
Member

HannesWell commented Nov 14, 2024

Thank you for this PR aiming to resolve #1308.

Could you be so kind and provide an example to verify this change?

Furthermore please squash all your commits into one with a meaningful message that covers the change as whole and force push it to the branch of this PR.
If you want to record your team members in the commit you can add them as co-authors to the commit message using the format:
Co-authored-by: name <[email protected]>

But your co-authors also have to sign the Eclipse ECA: https://www.eclipse.org/legal/eca/faq/

Copy link

github-actions bot commented Nov 15, 2024

Test Results

   285 files  ±0     285 suites  ±0   52m 22s ⏱️ +55s
 3 586 tests ±0   3 510 ✅ ±0   76 💤 ±0  0 ❌ ±0 
10 950 runs  ±0  10 719 ✅ ±0  231 💤 ±0  0 ❌ ±0 

Results for commit 9ba1335. ± Comparison against base commit 29ff363.

♻️ This comment has been updated with latest results.

@stewedbeef stewedbeef force-pushed the fix_e4_editor_boolean_parameters branch from 41bcb34 to bc2d9a0 Compare November 17, 2024 09:40
@stewedbeef
Copy link
Contributor Author

Example as follows from the E4 spies window reachable by shift-alt-F9:

  • Before:
    pde_e4_fix_before
  • After:
    pde_e4_fix_after

As for the squashing, does that include squashing the version bump made by the bot?

@HannesWell HannesWell force-pushed the fix_e4_editor_boolean_parameters branch from bc2d9a0 to 835e7a1 Compare November 17, 2024 19:42
Copy link
Member

@HannesWell HannesWell left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Example as follows from the E4 spies window reachable by shift-alt-F9:

Thanks for the example, that made it simpler to reproduce it.
The code looks good and the changes in the labels as well. Thanks for this diligent work!

As for the squashing, does that include squashing the version bump made by the bot?

Yes. Please keep that commit separated.

In general this seems ready for submission, but unfortunately we are currently in the quiet-period before the December release and have to await the start of the next development cycle, which should start in one to two weeks, before this can be submitted.

In the meantime could you please enhance the commit message by appending a reference to the fixed issue, i.e. by adding to the message, before the list of co-authors the line:
Fixes https://github.com/eclipse-pde/eclipse.pde/issues/1308

and additionally use your full name in the author and committer fields and for your co-authors. Ideally you also use real mails and not only github-noreply mails.
Then again please force push the updated commit to this PR's branch (and you fetch from this repository and rebase on top of the current master).

@laeubi are you fine with this as well?

@stewedbeef stewedbeef force-pushed the fix_e4_editor_boolean_parameters branch 2 times, most recently from 923c0c4 to 2cf2167 Compare November 22, 2024 22:41
@basonbang basonbang force-pushed the fix_e4_editor_boolean_parameters branch from 2cf2167 to c197ce1 Compare November 23, 2024 00:35
@stewedbeef
Copy link
Contributor Author

stewedbeef commented Nov 23, 2024

Sorry for the delay. We rebased it and fixed the commit message and names.

@HannesWell HannesWell force-pushed the fix_e4_editor_boolean_parameters branch from c197ce1 to 9ba1335 Compare November 27, 2024 17:40
Copy link
Member

@HannesWell HannesWell left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you for the update and thanks again for this PR.
The master is now open again, submitting.

@HannesWell HannesWell merged commit 017b0b4 into eclipse-pde:master Nov 27, 2024
14 of 18 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

E4 editr use inconsitent style for boolean parameters
4 participants