summaryrefslogtreecommitdiffstatsabout
diff options
context:
space:
mode:
authorMatthew Piggott2011-01-25 14:57:29 (EST)
committer Milos Kleint2011-01-26 09:50:19 (EST)
commitf307734f881650a73301992c8ff06d1b55b077c7 (patch)
tree2255f68752eb1020d4f0f71265e87df389b775f5
parentda280382d3d4a63c458048793d83723e04d8e88a (diff)
downloadm2e-core-f307734f881650a73301992c8ff06d1b55b077c7.zip
m2e-core-f307734f881650a73301992c8ff06d1b55b077c7.tar.gz
m2e-core-f307734f881650a73301992c8ff06d1b55b077c7.tar.bz2
Bug 335370 - Remove Problem Reporting preference page
Signed-off-by: Milos Kleint <milos@sonatype.com>
-rw-r--r--org.eclipse.m2e.core/plugin.properties1
-rw-r--r--org.eclipse.m2e.core/plugin.xml6
-rw-r--r--org.eclipse.m2e.core/src/org/eclipse/m2e/core/embedder/IMavenConfiguration.java6
-rw-r--r--org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/embedder/MavenConfigurationImpl.java8
-rw-r--r--org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/preferences/MavenPreferenceConstants.java6
-rw-r--r--org.eclipse.m2e.core/src/org/eclipse/m2e/core/messages.properties2
-rw-r--r--org.eclipse.m2e.core/src/org/eclipse/m2e/core/ui/internal/preferences/ProblemReportingPreferencePage.java57
7 files changed, 0 insertions, 86 deletions
diff --git a/org.eclipse.m2e.core/plugin.properties b/org.eclipse.m2e.core/plugin.properties
index e915b51..0391a97 100644
--- a/org.eclipse.m2e.core/plugin.properties
+++ b/org.eclipse.m2e.core/plugin.properties
@@ -86,7 +86,6 @@ command.addplugin.description = Add Maven Plugin
keyword.label = maven
page.installations.name = Installations
page.usersettings.name = User Settings
-page.reporting.name = Problem Reporting
page.archetypes.name = Archetypes
wizard.checkout.name = Checkout Maven Projects from SCM
wizard.checkout.description = Check out Maven Project from SVN
diff --git a/org.eclipse.m2e.core/plugin.xml b/org.eclipse.m2e.core/plugin.xml
index eac0806..b12df48 100644
--- a/org.eclipse.m2e.core/plugin.xml
+++ b/org.eclipse.m2e.core/plugin.xml
@@ -710,12 +710,6 @@
name="%page.usersettings.name">
<keywordReference id="org.eclipse.m2e.core.maven"/>
</page>
- <page id="org.eclipse.m2e.core.preferences.ProblemReportingPreferencePage"
- category="org.eclipse.m2e.core.preferences.Maven2PreferencePage"
- class="org.eclipse.m2e.core.ui.internal.preferences.ProblemReportingPreferencePage"
- name="%page.reporting.name">
- <keywordReference id="org.eclipse.m2e.core.maven"/>
- </page>
<page id="org.eclipse.m2e.core.preferences.MavenArchetypesPreferencePage"
category="org.eclipse.m2e.core.preferences.Maven2PreferencePage"
class="org.eclipse.m2e.core.ui.internal.preferences.MavenArchetypesPreferencePage"
diff --git a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/embedder/IMavenConfiguration.java b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/embedder/IMavenConfiguration.java
index 1aed83b..73e22f3 100644
--- a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/embedder/IMavenConfiguration.java
+++ b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/embedder/IMavenConfiguration.java
@@ -43,12 +43,6 @@ public interface IMavenConfiguration {
public boolean isDownloadJavaDoc();
- // problem reporting
-
- public String getJiraUsername();
-
- public String getJiraPassword();
-
// maven execution
public boolean isDebugOutput();
diff --git a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/embedder/MavenConfigurationImpl.java b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/embedder/MavenConfigurationImpl.java
index fd78688..1205a00 100644
--- a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/embedder/MavenConfigurationImpl.java
+++ b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/embedder/MavenConfigurationImpl.java
@@ -37,14 +37,6 @@ public class MavenConfigurationImpl implements IMavenConfiguration, IPropertyCha
return preferenceStore.getString(MavenPreferenceConstants.P_GLOBAL_SETTINGS_FILE);
}
- public String getJiraPassword() {
- return preferenceStore.getString(MavenPreferenceConstants.P_JIRA_PASSWORD);
- }
-
- public String getJiraUsername() {
- return preferenceStore.getString(MavenPreferenceConstants.P_JIRA_USERNAME);
- }
-
public String getUserSettingsFile() {
return preferenceStore.getString(MavenPreferenceConstants.P_USER_SETTINGS_FILE);
}
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 46dfeae..7e5485b 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
@@ -70,12 +70,6 @@ public interface MavenPreferenceConstants {
/** boolean */
public static final String P_UPDATE_PROJECTS = PREFIX + "updateProjects"; //$NON-NLS-1$
- /** String */
- public static final String P_JIRA_USERNAME = PREFIX + "jiraUsername"; //$NON-NLS-1$
-
- /** String */
- public static final String P_JIRA_PASSWORD = PREFIX + "jiraPassword"; //$NON-NLS-1$
-
/** boolean */
public static final String P_HIDE_FOLDERS_OF_NESTED_PROJECTS = PREFIX + "hideFoldersOfNestedProjects"; //$NON-NLS-1$
diff --git a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/messages.properties b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/messages.properties
index 14080ec..5af79ea 100644
--- a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/messages.properties
+++ b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/messages.properties
@@ -146,7 +146,5 @@ wizard.project.page.project.validator.projectExists=Project "{0}" already exists
wizard.project.page.project.validator.projectLocation=Enter a location for the project.
wizard.project.page.project.validator.projectName=Enter a project name.
wizard.project.title=New Maven Project
-jira.username=Jira username (will use default user if empty)
-jira.password=Jira password
pomEditor.defaultPage=Open XML page in the POM editor by default
pomEditor.showAdvancedTabs=Show advanced tabs in the POM editor \ No newline at end of file
diff --git a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/ui/internal/preferences/ProblemReportingPreferencePage.java b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/ui/internal/preferences/ProblemReportingPreferencePage.java
deleted file mode 100644
index 90abeaf..0000000
--- a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/ui/internal/preferences/ProblemReportingPreferencePage.java
+++ /dev/null
@@ -1,57 +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.core.ui.internal.preferences;
-
-import org.eclipse.jface.preference.FieldEditorPreferencePage;
-import org.eclipse.jface.preference.StringFieldEditor;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPreferencePage;
-
-import org.eclipse.m2e.core.MavenPlugin;
-import org.eclipse.m2e.core.core.Messages;
-import org.eclipse.m2e.core.internal.preferences.MavenPreferenceConstants;
-
-
-public class ProblemReportingPreferencePage extends FieldEditorPreferencePage implements IWorkbenchPreferencePage {
-
- final MavenPlugin plugin;
- private Composite parent;
-
- public ProblemReportingPreferencePage() {
- super(GRID);
- setPreferenceStore(MavenPlugin.getDefault().getPreferenceStore());
-
- plugin = MavenPlugin.getDefault();
- }
-
- 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 StringFieldEditor(MavenPreferenceConstants.P_JIRA_USERNAME, Messages.getString("jira.username"), parent)); //$NON-NLS-1$
-
- StringFieldEditor passwordEditor = new StringFieldEditor(MavenPreferenceConstants.P_JIRA_PASSWORD, Messages.getString("jira.password"), parent); //$NON-NLS-1$
-
- addField(passwordEditor);
- Text passwordField = passwordEditor.getTextControl(parent);
- passwordField.setEchoChar('*');
- }
-}