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.

Sign up for GitHub

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

Bug 571572 - UI for setting the location of the toolchain.xml files #114 #1643

Merged
merged 2 commits into from
Feb 4, 2024
Merged

Bug 571572 - UI for setting the location of the toolchain.xml files #114 #1643

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
28e32f6
Unify Maven configuration preference handling
HannesWell Feb 4, 2024
85aabd2
Bug 571572 - UI for setting the location of the toolchain.xml files #114
G-Ork Jan 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion org.eclipse.m2e.core.ui/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.m2e.core.ui;singleton:=true
Bundle-Version: 2.0.7.qualifier
Bundle-Version: 2.0.8.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-17
Bundle-Name: %Bundle-Name
Bundle-Vendor: %Bundle-Vendor
Expand Down
14 changes: 11 additions & 3 deletions org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/Messages.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -557,7 +557,7 @@ public class Messages extends NLS {

public static String MavenRepositoryView_update_one;

public static String MavenSettingsPreferencePage_userSettingsBrowseButton_text;
public static String MavenSettingsPreferencePage_settingsBrowseButton_text;

public static String MavenSettingsPreferencePage_btnUpdate;

Expand All @@ -569,6 +569,10 @@ public class Messages extends NLS {

public static String MavenSettingsPreferencePage_error_userSettingsParse;

public static String MavenSettingsPreferencePage_error_userToolchainsMissing;

public static String MavenSettingsPreferencePage_error_userToolchainsParse;

public static String MavenSettingsPreferencePage_job_indexing;

public static String MavenSettingsPreferencePage_job_updating;
Expand Down Expand Up @@ -603,6 +607,12 @@ public class Messages extends NLS {

public static String MavenWarningsPreferencePage_notCoveredMojoExecution;

public static String MavenSettingsPreferencePage_userToolchainslink1;

public static String MavenSettingsPreferencePage_userToolchainslink2;

public static String MavenSettingsPreferencePage_userToolchainslink_tooltip;

public static String MavenWarningsPreferencePage_versionDupParent;

public static String MavenWarningsPreferencePage_overridingManagedPreferences;
Expand Down Expand Up @@ -1025,8 +1035,6 @@ public class Messages extends NLS {

public static String MavenInstallationWizardPage_selectProjectTitle;

public static String MavenSettingsPreferencePage_globalSettingsBrowseButton_text;

public static String MavenProjectWizardArchetypeParametersPage_runInteractive;

static {
Expand Down
8 changes: 6 additions & 2 deletions org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/messages.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,19 +309,23 @@ MavenRepositoryView_reload_msg=This will reload the settings.xml and rebuild the
MavenRepositoryView_reload_title=Reload settings.xml
MavenRepositoryView_update_more=Update Indexes
MavenRepositoryView_update_one=Update Index
MavenSettingsPreferencePage_userSettingsBrowseButton_text=Browse...
MavenSettingsPreferencePage_settingsBrowseButton_text=Browse...
MavenSettingsPreferencePage_btnUpdate=Update Settings
MavenSettingsPreferencePage_error_globalSettingsMissing=Global settings file doesn't exist
MavenSettingsPreferencePage_error_userSettingsMissing=User settings file doesn't exist
MavenSettingsPreferencePage_error_globalSettingsParse=Unable to parse global settings file {0}
MavenSettingsPreferencePage_error_userSettingsParse=Unable to parse user settings file {0}
MavenSettingsPreferencePage_globalSettingsBrowseButton_text=Browse...
MavenSettingsPreferencePage_error_userToolchainsMissing=User toolchains file doesn't exist
MavenSettingsPreferencePage_error_userToolchainsParse=Unable to parse user toolchains file {0}
MavenSettingsPreferencePage_job_indexing=Indexing Local Repository...
MavenSettingsPreferencePage_job_updating=Updating Maven settings
MavenSettingsPreferencePage_lblLocal=Local Repository (From merged user and global settings)\:
MavenSettingsPreferencePage_userSettingslink1=User &Settings\:
MavenSettingsPreferencePage_userSettingslink2=User &Settings (<a href\="\#">open file</a>)\:
MavenSettingsPreferencePage_userSettingslink_tooltip=Open editor for user settings
MavenSettingsPreferencePage_userToolchainslink1=User &Toolchains\:
MavenSettingsPreferencePage_userToolchainslink2=User &Toolchains (<a href\="\#">open file</a>)\:
MavenSettingsPreferencePage_userToolchainslink_tooltip=Open editor for user toolchains
MavenSettingsPreferencePage_globalSettingslink1=Global &Settings\:
MavenSettingsPreferencePage_globalSettingslink2=Global &Settings (<a href\="\#">open file</a>)\:
MavenSettingsPreferencePage_globalSettingslink_tooltip=Open editor for global settings
Expand Down
Loading
Loading