From d019bcd6477cfa0b6cb119d5bbb498b337497f22 Mon Sep 17 00:00:00 2001 From: Matthew Piggott Date: Mon, 18 Apr 2011 11:03:20 -0400 Subject: Rename POM Editor preferences to User Interface preferences. --- .../OSGI-INF/l10n/bundle.properties | 1 - org.eclipse.m2e.editor/plugin.xml | 12 ------ .../org/eclipse/m2e/editor/internal/Messages.java | 3 -- .../m2e/editor/internal/messages.properties | 3 +- .../org/eclipse/m2e/editor/pom/MavenPomEditor.java | 21 +--------- .../m2e/editor/pom/PomEditorPreferencePage.java | 46 ---------------------- 6 files changed, 3 insertions(+), 83 deletions(-) delete mode 100644 org.eclipse.m2e.editor/src/org/eclipse/m2e/editor/pom/PomEditorPreferencePage.java (limited to 'org.eclipse.m2e.editor') 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 @@ - @@ -37,7 +36,6 @@ - @@ -51,15 +49,5 @@ - - - - - - - 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$ - } -} -- cgit v1.2.3