diff --git a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/Messages.java b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/Messages.java index e7501e8..bf6eb7e 100644 --- a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/Messages.java +++ b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/Messages.java @@ -374,6 +374,8 @@ public static String MavenPreferencePage_hide; + public static String MavenPreferencePage_importnametpl; + public static String MavenPreferencePage_update; public static String MavenProjectPreferencePage_btnResolve; diff --git a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/messages.properties b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/messages.properties index 8879791..0a2a1ba 100644 --- a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/messages.properties +++ b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/messages.properties @@ -175,6 +175,7 @@ MavenPomWizard_title=Maven POM wizard MavenPreferencePage_download=Download repository index updates on startup MavenPreferencePage_hide=Hide folders of physically nested modules (experimental) +MavenPreferencePage_importnametpl=Default naming template MavenPreferencePage_update=Update Maven projects on startup MavenPreferencePage_warnIncompleteMapping=Hide warning for incomplete mapping MavenProjectPreferencePage_btnResolve=Resolve dependencies from &Workspace projects diff --git a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/preferences/MavenPreferencePage.java b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/preferences/MavenPreferencePage.java index 239f759..c099018 100644 --- a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/preferences/MavenPreferencePage.java +++ b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/preferences/MavenPreferencePage.java @@ -12,7 +12,9 @@ package org.eclipse.m2e.core.ui.internal.preferences; import org.eclipse.jface.preference.BooleanFieldEditor; +import org.eclipse.jface.preference.ComboFieldEditor; import org.eclipse.jface.preference.FieldEditorPreferencePage; +import org.eclipse.jface.preference.StringFieldEditor; import org.eclipse.swt.SWT; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; @@ -41,6 +43,7 @@ * blocks needed to manipulate various types of preferences. Each field editor * knows how to save and restore itself. */ + @Override public void createFieldEditors() { addField(new BooleanFieldEditor(MavenPreferenceConstants.P_OFFLINE, Messages.preferencesOffline, @@ -76,6 +79,9 @@ addField(new BooleanFieldEditor(MavenPreferenceConstants.P_HIDE_FOLDERS_OF_NESTED_PROJECTS, // Messages.MavenPreferencePage_hide, getFieldEditorParent())); + addField(new StringFieldEditor(MavenPreferenceConstants.P_DEFAULT_IMPORT_NAME_TEMPLATE, // + Messages.MavenPreferencePage_importnametpl, getFieldEditorParent())); + GridData comboCompositeGridData = new GridData(); comboCompositeGridData.verticalIndent = 25; comboCompositeGridData.horizontalSpan = 3; @@ -87,6 +93,7 @@ comboComposite.setLayout(new GridLayout(2, false)); // addSeparator(); + } private void addSeparator() { diff --git a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/AbstractMavenWizardPage.java b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/AbstractMavenWizardPage.java index 4c961dd..b101968 100644 --- a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/AbstractMavenWizardPage.java +++ b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/AbstractMavenWizardPage.java @@ -26,6 +26,7 @@ import org.eclipse.jface.wizard.WizardPage; import org.eclipse.m2e.core.MavenPlugin; import org.eclipse.m2e.core.internal.MavenPluginActivator; +import org.eclipse.m2e.core.internal.preferences.MavenPreferenceConstants; import org.eclipse.m2e.core.project.ProjectImportConfiguration; import org.eclipse.m2e.core.ui.internal.M2EUIPluginActivator; import org.eclipse.m2e.core.ui.internal.Messages; @@ -94,11 +95,13 @@ resolverConfigurationComponent = new ResolverConfigurationComponent(composite, importConfiguration, true); resolverConfigurationComponent.setLayoutData(gridData); + resolverConfigurationComponent.template.setText(M2EUIPluginActivator.getDefault().getPreferenceStore().getString(MavenPreferenceConstants.P_DEFAULT_IMPORT_NAME_TEMPLATE)); addFieldWithHistory("projectNameTemplate", resolverConfigurationComponent.template); //$NON-NLS-1$ } } /** Loads the advanced settings data when the page is displayed. */ + @Override public void setVisible(boolean visible) { if(visible) { if(!isHistoryLoaded) { @@ -119,6 +122,7 @@ } /** Saves the history when the page is disposed. */ + @Override public void dispose() { saveInputHistory(); super.dispose(); diff --git a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/preferences/MavenPreferenceConstants.java b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/preferences/MavenPreferenceConstants.java index c89df1c..d454f98 100644 --- a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/preferences/MavenPreferenceConstants.java +++ b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/preferences/MavenPreferenceConstants.java @@ -88,4 +88,7 @@ /** boolean **/ public static final String P_DEFAULT_POM_EDITOR_PAGE = "eclipse.m2.defaultPomEditorPage"; //$NON-NLS-1$ + + /** string **/ + public static final String P_DEFAULT_IMPORT_NAME_TEMPLATE = PREFIX + "importNameTemplate"; //$NON-NLS-1$ }