Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Piggott2011-04-18 11:03:20 -0400
committerMatthew Piggott2011-04-18 11:03:20 -0400
commitd019bcd6477cfa0b6cb119d5bbb498b337497f22 (patch)
treeedfb892d4bec1997cc9342b01db786b940075a90
parent459c9465a07d9a2b7bb75b0d59a87e40fe1b54ff (diff)
downloadm2e-core-d019bcd6477cfa0b6cb119d5bbb498b337497f22.tar.gz
m2e-core-d019bcd6477cfa0b6cb119d5bbb498b337497f22.tar.xz
m2e-core-d019bcd6477cfa0b6cb119d5bbb498b337497f22.zip
Rename POM Editor preferences to User Interface preferences.
-rw-r--r--org.eclipse.m2e.core.ui/plugin.properties1
-rw-r--r--org.eclipse.m2e.core.ui/plugin.xml6
-rw-r--r--org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/Messages.java4
-rw-r--r--org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/messages.properties1
-rw-r--r--org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/preferences/MavenPreferencePage.java3
-rw-r--r--org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/preferences/MavenPreferenceConstants.java4
-rw-r--r--org.eclipse.m2e.editor/OSGI-INF/l10n/bundle.properties1
-rw-r--r--org.eclipse.m2e.editor/plugin.xml12
-rw-r--r--org.eclipse.m2e.editor/src/org/eclipse/m2e/editor/internal/Messages.java3
-rw-r--r--org.eclipse.m2e.editor/src/org/eclipse/m2e/editor/internal/messages.properties3
-rw-r--r--org.eclipse.m2e.editor/src/org/eclipse/m2e/editor/pom/MavenPomEditor.java21
-rw-r--r--org.eclipse.m2e.editor/src/org/eclipse/m2e/editor/pom/PomEditorPreferencePage.java46
12 files changed, 18 insertions, 87 deletions
diff --git a/org.eclipse.m2e.core.ui/plugin.properties b/org.eclipse.m2e.core.ui/plugin.properties
index 84f283b9..7a97328d 100644
--- a/org.eclipse.m2e.core.ui/plugin.properties
+++ b/org.eclipse.m2e.core.ui/plugin.properties
@@ -73,6 +73,7 @@ keyword.label = maven
page.installations.name = Installations
page.usersettings.name = User Settings
page.archetypes.name = Archetypes
+page.userinterface.name = User Interface
category.general.name = General
wizard.install.name = Install or deploy an artifact to a Maven repository
wizard.install.description = Install or Deploy an artifact (archive) into a Maven repository
diff --git a/org.eclipse.m2e.core.ui/plugin.xml b/org.eclipse.m2e.core.ui/plugin.xml
index ba1fa6b9..f1c6e433 100644
--- a/org.eclipse.m2e.core.ui/plugin.xml
+++ b/org.eclipse.m2e.core.ui/plugin.xml
@@ -617,6 +617,12 @@
name="%page.archetypes.name">
<keywordReference id="org.eclipse.m2e.core.maven"/>
</page>
+ <page id="org.eclipse.m2e.core.ui.preferences.UserInterfacePreferencePage"
+ category="org.eclipse.m2e.core.preferences.Maven2PreferencePage"
+ class="org.eclipse.m2e.core.ui.internal.preferences.UserInterfacePreferencePage"
+ name="%page.userinterface.name">
+ <keywordReference id="org.eclipse.m2e.maven"/>
+ </page>
</extension>
<extension point="org.eclipse.ui.newWizards">
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 c15badfc..21e14e20 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
@@ -857,7 +857,9 @@ public class Messages extends NLS {
public static String wizardProjectPageMaven2ValidatorGroupIDinvalid;
public static String wizardProjectPageMaven2ValidatorArtifactIDinvalid;
-
+
+ public static String pomEditorDefaultPage;
+
static {
// initialize resource bundle
NLS.initializeMessages(BUNDLE_NAME, Messages.class);
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 d1dd7590..a11849ef 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
@@ -418,3 +418,4 @@ wizardProjectPageProjectTitle=New Maven project
wizardProjectPageProjectValidatorInvalidLocation=Invalid project location path
wizardProjectPageProjectValidatorProjectLocation=Enter a location for the project.
wizardProjectTitle=New Maven Project
+pomEditorDefaultPage=Open XML page in the POM editor by default \ No newline at end of file
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 db48314e..239f759c 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
@@ -75,9 +75,6 @@ public class MavenPreferencePage extends FieldEditorPreferencePage implements IW
addField(new BooleanFieldEditor(MavenPreferenceConstants.P_HIDE_FOLDERS_OF_NESTED_PROJECTS, //
Messages.MavenPreferencePage_hide, getFieldEditorParent()));
-
- addField(new BooleanFieldEditor(MavenPreferenceConstants.P_WARN_INCOMPLETE_MAPPING,
- Messages.MavenPreferencePage_warnIncompleteMapping, getFieldEditorParent()));
GridData comboCompositeGridData = new GridData();
comboCompositeGridData.verticalIndent = 25;
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 54abe3e4..c89df1c8 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
@@ -83,5 +83,9 @@ public interface MavenPreferenceConstants {
/** boolean */
public static final String P_FULL_INDEX= PREFIX+"fullIndex"; //$NON-NLS-1$
+ /** boolean **/
public static final String P_WARN_INCOMPLETE_MAPPING = PREFIX + "warn_incomplete_mapping"; //$NON-NLS-1$
+
+ /** boolean **/
+ public static final String P_DEFAULT_POM_EDITOR_PAGE = "eclipse.m2.defaultPomEditorPage"; //$NON-NLS-1$
}
diff --git a/org.eclipse.m2e.editor/OSGI-INF/l10n/bundle.properties b/org.eclipse.m2e.editor/OSGI-INF/l10n/bundle.properties
index 130c1c08..b45ccbdc 100644
--- a/org.eclipse.m2e.editor/OSGI-INF/l10n/bundle.properties
+++ b/org.eclipse.m2e.editor/OSGI-INF/l10n/bundle.properties
@@ -2,7 +2,6 @@
Bundle-Vendor = Eclipse.org - m2e
Bundle-Name = Maven Integration for Eclipse (Editors)
editor.name = Maven POM Editor
-page.name = POM Editor
extension-point.pageFactory.name = Maven POM editor page factory
extension-point.lifecycleMapping.name = Lifecycle Mapping Editor Contribution
extension-point.pluginConfiguration.name = Plugin Configuration Editor Contribution
diff --git a/org.eclipse.m2e.editor/plugin.xml b/org.eclipse.m2e.editor/plugin.xml
index 8086b99c..0ead110c 100644
--- a/org.eclipse.m2e.editor/plugin.xml
+++ b/org.eclipse.m2e.editor/plugin.xml
@@ -23,7 +23,6 @@
</extension>
<extension point="org.eclipse.ui.popupMenus">
-
<objectContribution id="org.eclipse.m2e.classpathMenuWrapper.showDependencyHierarchy"
objectClass="org.eclipse.jdt.internal.ui.packageview.ClassPathContainer$RequiredProjectWrapper"
adaptable="true">
@@ -37,7 +36,6 @@
<test property="org.eclipse.m2e.hasProjectArtifactKey"/>
</enablement>
</objectContribution>
-
<objectContribution id="org.eclipse.m2e.classpathMenu.showDependencyHierarchy"
objectClass="org.eclipse.jdt.core.IPackageFragmentRoot"
adaptable="true">
@@ -51,15 +49,5 @@
<test property="org.eclipse.m2e.hasProjectArtifactKey"/>
</enablement>
</objectContribution>
-
- </extension>
-
- <extension point="org.eclipse.ui.preferencePages">
- <page id="org.eclipse.m2e.editor.pom.PomEditorPreferencePage"
- category="org.eclipse.m2e.core.preferences.Maven2PreferencePage"
- class="org.eclipse.m2e.editor.pom.PomEditorPreferencePage"
- name="%page.name">
- <keywordReference id="org.eclipse.m2e.maven"/>
- </page>
</extension>
</plugin>
diff --git a/org.eclipse.m2e.editor/src/org/eclipse/m2e/editor/internal/Messages.java b/org.eclipse.m2e.editor/src/org/eclipse/m2e/editor/internal/Messages.java
index b4a23f31..93cb5414 100644
--- a/org.eclipse.m2e.editor/src/org/eclipse/m2e/editor/internal/Messages.java
+++ b/org.eclipse.m2e.editor/src/org/eclipse/m2e/editor/internal/Messages.java
@@ -269,9 +269,6 @@ public class Messages extends NLS {
public static String ShowDependencyHierarchyAction_job_openPomEditor;
-
- public static String pomEditorDefaultPage;
-
static {
// initialize resource bundle
NLS.initializeMessages(BUNDLE_NAME, Messages.class);
diff --git a/org.eclipse.m2e.editor/src/org/eclipse/m2e/editor/internal/messages.properties b/org.eclipse.m2e.editor/src/org/eclipse/m2e/editor/internal/messages.properties
index 94b17b46..880e27ce 100644
--- a/org.eclipse.m2e.editor/src/org/eclipse/m2e/editor/internal/messages.properties
+++ b/org.eclipse.m2e.editor/src/org/eclipse/m2e/editor/internal/messages.properties
@@ -124,5 +124,4 @@ PropertiesSection_title_addProperty=Add property
PropertiesSection_title_editProperty=Edit property
PropertyPairLabelProvider_0={0} : {1}
SearchControl_lblSearch=Filter:
-ShowDependencyHierarchyAction_job_openPomEditor=Opening POM editor
-pomEditorDefaultPage=Open XML page in the POM editor by default \ No newline at end of file
+ShowDependencyHierarchyAction_job_openPomEditor=Opening POM editor \ No newline at end of file
diff --git a/org.eclipse.m2e.editor/src/org/eclipse/m2e/editor/pom/MavenPomEditor.java b/org.eclipse.m2e.editor/src/org/eclipse/m2e/editor/pom/MavenPomEditor.java
index 812786a6..2475c702 100644
--- a/org.eclipse.m2e.editor/src/org/eclipse/m2e/editor/pom/MavenPomEditor.java
+++ b/org.eclipse.m2e.editor/src/org/eclipse/m2e/editor/pom/MavenPomEditor.java
@@ -56,11 +56,11 @@ import org.eclipse.m2e.core.MavenPlugin;
import org.eclipse.m2e.core.core.IMavenConstants;
import org.eclipse.m2e.core.embedder.ArtifactKey;
import org.eclipse.m2e.core.internal.MavenPluginActivator;
+import org.eclipse.m2e.core.internal.preferences.MavenPreferenceConstants;
import org.eclipse.m2e.core.project.IMavenProjectChangedListener;
import org.eclipse.m2e.core.project.IMavenProjectFacade;
import org.eclipse.m2e.core.project.MavenProjectChangedEvent;
import org.eclipse.m2e.core.ui.internal.M2EUIPluginActivator;
-import org.eclipse.m2e.core.ui.internal.actions.OpenPomAction.MavenPathStorageEditorInput;
import org.eclipse.m2e.core.ui.internal.actions.OpenPomAction.MavenStorageEditorInput;
import org.eclipse.m2e.core.ui.internal.actions.SelectionUtil;
import org.eclipse.m2e.editor.MavenEditorPlugin;
@@ -344,23 +344,6 @@ public class MavenPomEditor extends FormEditor implements IResourceChangeListene
});
}
- /**
- * Show or hide the advanced pages within the editor (based on the default setting)
- */
- protected void showAdvancedPages(){
- showAdvancedPages(M2EUIPluginActivator.getDefault().getPreferenceStore()
- .getBoolean(PomEditorPreferencePage.P_SHOW_ADVANCED_TABS));
- }
-
- /**
- * Show or hide the advanced pages within the editor (forced)
- */
- protected void showAdvancedPages(boolean showAdvancedTabs){
- if(!showAdvancedTabs) {
- return;
- }
- }
-
protected void addPages() {
overviewPage = new OverviewPage(this);
@@ -380,7 +363,7 @@ public class MavenPomEditor extends FormEditor implements IResourceChangeListene
protected void selectActivePage(){
boolean showXML = M2EUIPluginActivator.getDefault().getPreferenceStore()
- .getBoolean(PomEditorPreferencePage.P_DEFAULT_POM_EDITOR_PAGE);
+ .getBoolean(MavenPreferenceConstants.P_DEFAULT_POM_EDITOR_PAGE);
if(showXML){
setActivePage(null);
}
diff --git a/org.eclipse.m2e.editor/src/org/eclipse/m2e/editor/pom/PomEditorPreferencePage.java b/org.eclipse.m2e.editor/src/org/eclipse/m2e/editor/pom/PomEditorPreferencePage.java
deleted file mode 100644
index b81bbbf5..00000000
--- a/org.eclipse.m2e.editor/src/org/eclipse/m2e/editor/pom/PomEditorPreferencePage.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008-2010 Sonatype, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Sonatype, Inc. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.m2e.editor.pom;
-
-import org.eclipse.jface.preference.BooleanFieldEditor;
-import org.eclipse.jface.preference.FieldEditorPreferencePage;
-import org.eclipse.m2e.core.ui.internal.M2EUIPluginActivator;
-import org.eclipse.m2e.editor.internal.Messages;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPreferencePage;
-
-public class PomEditorPreferencePage extends FieldEditorPreferencePage implements IWorkbenchPreferencePage {
- public static final String P_DEFAULT_POM_EDITOR_PAGE = "eclipse.m2.defaultPomEditorPage"; //$NON-NLS-1$
- public static final String P_SHOW_ADVANCED_TABS = "eclipse.m2.showAdvancedTabs"; //$NON-NLS-1$
-
- private Composite parent;
-
- public PomEditorPreferencePage() {
- super(GRID);
- setPreferenceStore(M2EUIPluginActivator.getDefault().getPreferenceStore());
- }
-
- public void init(IWorkbench workbench) {
- }
-
- /*
- * Creates the field editors. Field editors are abstractions of the common GUI
- * blocks needed to manipulate various types of preferences. Each field editor
- * knows how to save and restore itself.
- */
- public void createFieldEditors() {
- parent = getFieldEditorParent();
- addField(new BooleanFieldEditor(P_DEFAULT_POM_EDITOR_PAGE, Messages.pomEditorDefaultPage, parent)); //$NON-NLS-1$
-// addField(new BooleanFieldEditor(P_SHOW_ADVANCED_TABS, Messages.getString("pomEditor.showAdvancedTabs"), parent)); //$NON-NLS-1$
- }
-}

Back to the top