From 9e734a858875f66ddf68d24465d7ad396fdeaaf4 Mon Sep 17 00:00:00 2001 From: David Inglis Date: Wed, 3 Sep 2003 20:35:38 +0000 Subject: [PATCH] see change log --- core/org.eclipse.cdt.ui/ChangeLog | 15 ++++++++ .../ui/{ => dialogs}/AbstractCOptionPage.java | 2 +- .../ui/{ => dialogs}/BinaryParserBlock.java | 2 +- .../ui/{ => dialogs}/ErrorParserBlock.java | 37 ++++++++++++++----- .../ui/{ => dialogs}/ICOptionContainer.java | 2 +- .../cdt/ui/{ => dialogs}/ICOptionPage.java | 2 +- .../cdt/ui/{ => dialogs}/IndexerBlock.java | 2 +- .../cdt/ui/{ => dialogs}/ReferenceBlock.java | 4 +- .../{ => dialogs}/TabFolderOptionBlock.java | 3 +- .../wizards/NewCProjectWizardOptionPage.java | 4 +- 10 files changed, 53 insertions(+), 20 deletions(-) rename core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/{ => dialogs}/AbstractCOptionPage.java (97%) rename core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/{ => dialogs}/BinaryParserBlock.java (99%) rename core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/{ => dialogs}/ErrorParserBlock.java (85%) rename core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/{ => dialogs}/ICOptionContainer.java (94%) rename core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/{ => dialogs}/ICOptionPage.java (96%) rename core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/{ => dialogs}/IndexerBlock.java (99%) rename core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/{ => dialogs}/ReferenceBlock.java (98%) rename core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/{ => dialogs}/TabFolderOptionBlock.java (98%) diff --git a/core/org.eclipse.cdt.ui/ChangeLog b/core/org.eclipse.cdt.ui/ChangeLog index 52ad6ec79bf..df8989811a9 100644 --- a/core/org.eclipse.cdt.ui/ChangeLog +++ b/core/org.eclipse.cdt.ui/ChangeLog @@ -1,3 +1,18 @@ +2003-09-03 David Inglis + - src/org/eclipse/cdt/ui/TabFolderOptionBlock.java + - src/org/eclipse/cdt/ui/AbstractCOptionPage.java + - src/org/eclipse/cdt/ui/BinaryParserBlock.java + - src/org/eclipse/cdt/ui/ErrorParserBlock.java + - src/org/eclipse/cdt/ui/ICOptionContainer.java + - src/org/eclipse/cdt/ui/ICOptionPage.java + - src/org/eclipse/cdt/ui/IndexerBlock.java + - src/org/eclipse/cdt/ui/ReferenceBlock.java + - src/org/eclipse/cdt/ui/TabFolderOptionBlock.java + moved to org.eclipse.cdt.ui.dialogs package. + + * src/org/eclipse/cdt/ui/wizards/NewCProjectWizardOptionPage.java + change due to refactor + 2003-09-03 Alain Magloire Change to abstract and let the client provides the saving algorithm. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/AbstractCOptionPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/AbstractCOptionPage.java similarity index 97% rename from core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/AbstractCOptionPage.java rename to core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/AbstractCOptionPage.java index 9bcfa8829bf..0fd4dc35a9a 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/AbstractCOptionPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/AbstractCOptionPage.java @@ -8,7 +8,7 @@ * Contributors: * QNX Software Systems - Initial API and implementation ***********************************************************************/ -package org.eclipse.cdt.ui; +package org.eclipse.cdt.ui.dialogs; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IProgressMonitor; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/BinaryParserBlock.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/BinaryParserBlock.java similarity index 99% rename from core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/BinaryParserBlock.java rename to core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/BinaryParserBlock.java index 9f0a3a242d6..229417cd736 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/BinaryParserBlock.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/BinaryParserBlock.java @@ -1,4 +1,4 @@ -package org.eclipse.cdt.ui; +package org.eclipse.cdt.ui.dialogs; /*********************************************************************** * Copyright (c) 2003 IBM Corporation and others. * All rights reserved. This program and the accompanying materials diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/ErrorParserBlock.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/ErrorParserBlock.java similarity index 85% rename from core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/ErrorParserBlock.java rename to core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/ErrorParserBlock.java index 302ce31eaec..5a0dbad9819 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/ErrorParserBlock.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/ErrorParserBlock.java @@ -8,12 +8,13 @@ * Contributors: * QNX Software Systems - Initial API and implementation ***********************************************************************/ -package org.eclipse.cdt.ui; +package org.eclipse.cdt.ui.dialogs; import java.util.ArrayList; import java.util.HashMap; import java.util.Iterator; import java.util.List; +import java.util.StringTokenizer; import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.cdt.internal.ui.wizards.dialogfields.CheckedListDialogField; @@ -39,6 +40,8 @@ public abstract class ErrorParserBlock extends AbstractCOptionPage { private static final String LABEL = PREFIX + ".label"; // $NON-NLS-1$ private static final String DESC = PREFIX + ".desc"; // $NON-NLS-1$ + private final static String PREF_ERROR_PARSER = "errorOutputParser"; // $NON-NLS-1$ + private static String[] EMPTY = new String[0]; private Preferences fPrefs; private HashMap mapParsers = new HashMap(); @@ -57,8 +60,6 @@ public abstract class ErrorParserBlock extends AbstractCOptionPage { } public ErrorParserBlock(Preferences prefs) { - //super(CUIPlugin.getResourceString(LABEL)); - //setDescription(CUIPlugin.getResourceString(DESC)); super("Error Parsers"); setDescription("Set the error parser for this project"); } @@ -81,7 +82,17 @@ public abstract class ErrorParserBlock extends AbstractCOptionPage { } protected String[] getErrorParserIDs(Preferences prefs) { - return CCorePlugin.getDefault().getPreferenceErrorParserIDs(prefs); + String parserIDs = prefs.getString(PREF_ERROR_PARSER); + String[] empty = new String[0]; + if (parserIDs != null && parserIDs.length() > 0) { + StringTokenizer tok = new StringTokenizer(parserIDs, ";"); + List list = new ArrayList(tok.countTokens()); + while (tok.hasMoreElements()) { + list.add(tok.nextToken()); + } + return (String[]) list.toArray(empty); + } + return empty; } /** @@ -99,7 +110,11 @@ public abstract class ErrorParserBlock extends AbstractCOptionPage { public abstract void saveErrorParsers(IProject project, String[] parserIDs); public void saveErrorParsers(Preferences prefs, String[] parserIDs) { - CCorePlugin.getDefault().setPreferenceErrorParser(prefs, parserIDs); + StringBuffer buf = new StringBuffer(); + for (int i = 0; i < parserIDs.length; i++) { + buf.append(parserIDs[i]).append(';'); + } + prefs.setValue(PREF_ERROR_PARSER, buf.toString()); } protected void initMapParsers() { @@ -149,15 +164,15 @@ public abstract class ErrorParserBlock extends AbstractCOptionPage { String[] buttonLabels = new String[] { /* 0 */ - "up", //$NON-NLS-1$ + "Up", //$NON-NLS-1$ /* 1 */ - "down", //$NON-NLS-1$ + "Down", //$NON-NLS-1$ /* 2 */ null, /* 3 */ - "checkall", //$NON-NLS-1$ + "Select All", //$NON-NLS-1$ /* 4 */ - "uncheckall" //$NON-NLS-1$ + "Unselect All" //$NON-NLS-1$ }; fErrorParserList = new CheckedListDialogField(null, buttonLabels, getLabelProvider()); @@ -181,7 +196,7 @@ public abstract class ErrorParserBlock extends AbstractCOptionPage { if (monitor == null) { monitor = new NullProgressMonitor(); } - monitor.beginTask("Reference Projects", 1); + monitor.beginTask("Setting Error Parsers...", 1); List list = fErrorParserList.getCheckedElements(); String[] parserIDs = (String[])list.toArray(EMPTY); @@ -190,6 +205,8 @@ public abstract class ErrorParserBlock extends AbstractCOptionPage { } else { saveErrorParsers(project, parserIDs); } + monitor.worked(1); + monitor.done(); } } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/ICOptionContainer.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/ICOptionContainer.java similarity index 94% rename from core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/ICOptionContainer.java rename to core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/ICOptionContainer.java index 068237de9b3..e7b0c630acf 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/ICOptionContainer.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/ICOptionContainer.java @@ -1,4 +1,4 @@ -package org.eclipse.cdt.ui; +package org.eclipse.cdt.ui.dialogs; /*********************************************************************** * Copyright (c) 2003 IBM Corporation and others. diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/ICOptionPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/ICOptionPage.java similarity index 96% rename from core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/ICOptionPage.java rename to core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/ICOptionPage.java index 5f429095b28..e8e642e1553 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/ICOptionPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/ICOptionPage.java @@ -1,4 +1,4 @@ -package org.eclipse.cdt.ui; +package org.eclipse.cdt.ui.dialogs; /*********************************************************************** * Copyright (c) 2003 IBM Corporation and others. * All rights reserved. This program and the accompanying materials diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/IndexerBlock.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/IndexerBlock.java similarity index 99% rename from core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/IndexerBlock.java rename to core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/IndexerBlock.java index 8c34c97fe97..155e8b01cf3 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/IndexerBlock.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/IndexerBlock.java @@ -1,4 +1,4 @@ -package org.eclipse.cdt.ui; +package org.eclipse.cdt.ui.dialogs; /*********************************************************************** * Copyright (c) 2003 IBM Corporation and others. * All rights reserved. This program and the accompanying materials diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/ReferenceBlock.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/ReferenceBlock.java similarity index 98% rename from core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/ReferenceBlock.java rename to core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/ReferenceBlock.java index 3ab6f405e24..48d3e7850f9 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/ReferenceBlock.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/ReferenceBlock.java @@ -1,4 +1,4 @@ -package org.eclipse.cdt.ui; +package org.eclipse.cdt.ui.dialogs; /*********************************************************************** * Copyright (c) 2003 IBM Corporation and others. * All rights reserved. This program and the accompanying materials @@ -14,7 +14,7 @@ import java.util.ArrayList; import org.eclipse.cdt.core.model.CoreModel; import org.eclipse.cdt.internal.ui.CPluginImages; -import org.eclipse.cdt.utils.ui.controls.ControlFactory; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IProjectDescription; import org.eclipse.core.resources.IWorkspace; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/TabFolderOptionBlock.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/TabFolderOptionBlock.java similarity index 98% rename from core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/TabFolderOptionBlock.java rename to core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/TabFolderOptionBlock.java index 167679bd78a..acdb20f7d86 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/TabFolderOptionBlock.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/TabFolderOptionBlock.java @@ -1,4 +1,4 @@ -package org.eclipse.cdt.ui; +package org.eclipse.cdt.ui.dialogs; /*********************************************************************** * Copyright (c) 2003 IBM Corporation and others. * All rights reserved. This program and the accompanying materials @@ -14,6 +14,7 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; +import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.cdt.utils.ui.controls.TabFolderLayout; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IProgressMonitor; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/NewCProjectWizardOptionPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/NewCProjectWizardOptionPage.java index 95c80e88637..1303e22da99 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/NewCProjectWizardOptionPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/wizards/NewCProjectWizardOptionPage.java @@ -8,8 +8,8 @@ ***********************************************************************/ package org.eclipse.cdt.ui.wizards; -import org.eclipse.cdt.ui.TabFolderOptionBlock; -import org.eclipse.cdt.ui.ICOptionContainer; +import org.eclipse.cdt.ui.dialogs.ICOptionContainer; +import org.eclipse.cdt.ui.dialogs.TabFolderOptionBlock; import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.jface.resource.ImageDescriptor;