From 3af158b7d9a63029a5d607519bf923392c7a6069 Mon Sep 17 00:00:00 2001
From: Oleg Krasilnikov <oleg.krasilnikov@intel.com>
Date: Wed, 28 Feb 2007 10:00:15 +0000
Subject: [PATCH] Bug #175504: explicit workspace/filesystem setting

---
 .../icons/dlcl16/config-tool.gif              | Bin 368 -> 353 bytes
 .../cdt/ui/newui/AbstractExportTab.java       |  26 +++++----
 .../org/eclipse/cdt/ui/newui/ExpDialog.java   |  50 ++++++++++++++----
 .../eclipse/cdt/ui/newui/ExpIncludeTab.java   |  10 ++--
 .../cdt/ui/newui/ExpLibraryPathTab.java       |   9 ++--
 .../eclipse/cdt/ui/newui/ExpLibraryTab.java   |   9 ++--
 .../eclipse/cdt/ui/newui/ExpSymbolTab.java    |   7 +--
 .../eclipse/cdt/ui/newui/IncludeDialog.java   |  29 ++++++++--
 .../org/eclipse/cdt/ui/newui/IncludeTab.java  |   4 +-
 .../eclipse/cdt/ui/newui/LibraryPathTab.java  |   4 +-
 .../org/eclipse/cdt/ui/newui/LibraryTab.java  |   4 +-
 .../cdt/ui/newui/PluginResources.properties   |   6 +++
 12 files changed, 109 insertions(+), 49 deletions(-)

diff --git a/core/org.eclipse.cdt.ui/icons/dlcl16/config-tool.gif b/core/org.eclipse.cdt.ui/icons/dlcl16/config-tool.gif
index c984fba7039a0465a1858a1161e7d5e1bb4c8c31..4539ebd91f40cbb6e5e3349fb81269d7573b1988 100644
GIT binary patch
literal 353
zcmZ?wbhEHb6krfwxXQpVdGhr6i<b6Jo%8AQ*DqhcUAcPw^Ovtc1Z1z;wCm%iFL3UU
zA3s;DUJn%i_We6h5Jdg>v3~m=p!l|ZhkpM2dG_MPhfkioeD(6dlLwC<KYI53;mem#
zE?zwQ=JoTB?_YoZ`1b$*|7p|)ia%Kx85mR;bQpjD<R=EUI)_OG9y(I}$GVG7`mix6
z_^DqwsiJq(J3&Mvfk}c#y+Jn4fiX}#rI2M!>ZR6Tj+S}SU3S9zOVmo`8JVPog=K5~
zGZ^LgnFRf7Wd&HInfh2ccstT0dDw-fu}ZVE*Q9YKb91w;&JTBqlH}rI<YG=PTp<}8
Py20JY+vBjaBZD;n=+vmD

literal 368
zcmZ?wbhEHb6krfwxXQp_Zy)cQP%Z1(^6=HS7w^8U+j;Eqn{Q9wetZ7zn|=NM2d}?9
zdh_kc+ix%4fBW?1TSV!^=kLG0{`l?5yKiqleS81;n_vIlk6*sU&)@&~>$my)_aD7;
z`{si?`|t0+boKPZSG!)m*}s4P{7-L={d#x$|GRVl|Nm#8Hc<S@!pOj&!k_~(8004g
zwqA!x1s*z5{caA4i#=_$`cEH=;9zl><F{b4XH3`Z0~!GbSPUfm9#~&#U{W$V@ra{j
z`5~6&Qk(KL8YFX6_+^Dd<r$fzg@tALokhd)8Rhty1j9s~TLoC8nWnRH@b){4OY*P_
wE%0V%Z*rEdV&vv#+g8R|;Ur$h#l^_QoYlOXQ!*+h&O=(<KX8x7Wk&{U08{&hR{#J2

diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/AbstractExportTab.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/AbstractExportTab.java
index 0b83fba5148..27818b238fb 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/AbstractExportTab.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/AbstractExportTab.java
@@ -60,11 +60,11 @@ public abstract class AbstractExportTab extends AbstractCPropertyTab {
 //	boolean  savedShowBI  = false;
 //	List incs;
 	
+	public static final Image IMG_FS = CPluginImages.get(CPluginImages.IMG_FILESYSTEM); 
+	public static final Image IMG_WS = CPluginImages.get(CPluginImages.IMG_WORKSPACE); 
+	public static final Image IMG_MK = CPluginImages.get(CPluginImages.IMG_OBJS_MACRO);
 	private static final String ALL = "[All]"; //$NON-NLS-1$
 	private static final String LIST = "[List]"; //$NON-NLS-1$
-	private static final Image IMG_FS = CPluginImages.get(CPluginImages.IMG_FILESYSTEM); 
-	private static final Image IMG_WS = CPluginImages.get(CPluginImages.IMG_WORKSPACE); 
-	private static final Image IMG_MK = CPluginImages.get(CPluginImages.IMG_OBJS_MACRO);
 	private static Map names_l = new HashMap();
 	private static Map names_t = new HashMap();
 	private static String[] names_ls; 	
@@ -158,8 +158,8 @@ public abstract class AbstractExportTab extends AbstractCPropertyTab {
 	 * Methods to be implemented in descendants 
 	 */
 	public abstract int getKind();
-	public abstract ICLanguageSettingEntry doAdd(String s1, String s2);
-	public abstract ICLanguageSettingEntry doEdit(String s1, String s2);
+	public abstract ICLanguageSettingEntry doAdd(String s1, String s2, boolean isWsp);
+	public abstract ICLanguageSettingEntry doEdit(String s1, String s2, boolean isWsp);
 	public abstract boolean hasValues();
 	
 	/**
@@ -175,6 +175,7 @@ public abstract class AbstractExportTab extends AbstractCPropertyTab {
 		ICExternalSetting[] vals = cfg.getExternalSettings();
 		if (vals == null || vals.length == 0) {
 			tv.setInput(null);
+			setButtons();
 			return;
 		}
 		for (int i=0; i<vals.length; i++) {
@@ -214,9 +215,9 @@ public abstract class AbstractExportTab extends AbstractCPropertyTab {
 		case 0: // add
 			dlg = new ExpDialog(usercomp.getShell(), true,
 					"Create", EMPTY_STR, EMPTY_STR, cfg,         //$NON-NLS-1$
-					null, null, getKind(), names_ls, names_ts, namesList); 
+					null, null, getKind(), names_ls, names_ts, namesList, false); 
 			if (dlg.open()) {
-				ent[0] = doAdd(dlg.text1.trim(), dlg.text2.trim());
+				ent[0] = doAdd(dlg.text1.trim(), dlg.text2.trim(), dlg.check2);
 				if (ent[0] != null)
 					if (dlg.check1) { // apply to all ?
 						ICConfigurationDescription[] cfgs = page.getCfgsEditable();
@@ -240,14 +241,14 @@ public abstract class AbstractExportTab extends AbstractCPropertyTab {
 				s2 = old.getValue();
 			} else 
 				s1 = s2 = old.getName();
-			
+			boolean isWsp = (old.entry.getFlags() & ICSettingEntry.VALUE_WORKSPACE_PATH) != 0;
 			dlg = new ExpDialog(usercomp.getShell(), false,
 					"Edit", s1, s2, cfg, //$NON-NLS-1$
 					id2name(old.setting.getCompatibleLanguageIds(), names_l),
 					id2name(old.setting.getCompatibleContentTypeIds(), names_t),
-					getKind(), names_ls, names_ts, null); 
+					getKind(), names_ls, names_ts, null, isWsp); 
 			if (dlg.open()) {
-				ent[0] = doEdit(dlg.text1.trim(), dlg.text2.trim());
+				ent[0] = doEdit(dlg.text1.trim(), dlg.text2.trim(), dlg.check2);
 				ICLanguageSettingEntry[] ls = old.setting.getEntries(getKind());
 				ICLanguageSettingEntry[] ls2 = new ICLanguageSettingEntry[ls.length];
 				for (int x=0; x<ls.length; x++) 
@@ -439,4 +440,9 @@ outer:
 		for (int i=0; i<lst.length; i++) s = s + lst[i] + '\n';
 		return s;
 	}
+	static public Image getWspImage(boolean isWsp) {
+		return isWsp ? AbstractExportTab.IMG_WS : AbstractExportTab.IMG_FS;
+	}
+	
+
 }
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/ExpDialog.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/ExpDialog.java
index 0ebdf46e43a..95fc8138ce7 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/ExpDialog.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/ExpDialog.java
@@ -34,7 +34,7 @@ import org.eclipse.cdt.core.settings.model.ICSettingEntry;
 
 public class ExpDialog extends AbstractPropertyDialog {
 	
-	protected static final String TO_ALL = "Apply to all"; //$NON-NLS-1$
+	protected static final String TO_ALL = NewUIMessages.getResourceString("ExpDialog.5"); //$NON-NLS-1$
 
 	public String[] sel_types = null;
 	public String[] sel_langs = null; 
@@ -46,13 +46,14 @@ public class ExpDialog extends AbstractPropertyDialog {
 	private Button c_langs;
 	private Button c_types;
 	private Button c_all;
+	private Button c_wsp;
 	
 	private Button b_vars;
 	private Button b_work;
 	private Button b_file;
 	private Button b_ok;
 	private Button b_ko;
-	private boolean newAction;
+	private boolean newAction, isWsp;
 	private int kind;
 	private ICConfigurationDescription cfgd;
 	private String[] names_l, names_t;
@@ -63,7 +64,7 @@ public class ExpDialog extends AbstractPropertyDialog {
 		ICConfigurationDescription _cfgd,
 		String[] _langs, String[] _types,
 		int _kind, String[] _names_l, String[] _names_t, 
-		java.util.List _existing) {
+		java.util.List _existing, boolean _isWsp) {
 		super(parent, title);
 		super.text1 = (_data1 == null) ? EMPTY_STR : _data1;
 		super.text2 = (_data2 == null) ? EMPTY_STR : _data2;
@@ -75,14 +76,20 @@ public class ExpDialog extends AbstractPropertyDialog {
 		names_l = _names_l;
 		names_t = _names_t;
 		existing = _existing;
+		isWsp = _isWsp;
 	}
 
 	protected Control createDialogArea(Composite c) {
-		c.setLayout(new GridLayout(4, true));
 		GridData gd;
+		if (c.getLayoutData() instanceof GridData) {
+			gd = (GridData)c.getLayoutData();
+			gd.horizontalIndent = 10;
+			c.setLayoutData(gd);
+		}
+		c.setLayout(new GridLayout(4, true));
 		
 		Label l1 = new Label(c, SWT.NONE);
-		l1.setText("Name:");  //$NON-NLS-1$
+		l1.setText(NewUIMessages.getResourceString("ExpDialog.6"));  //$NON-NLS-1$
 		l1.setLayoutData(new GridData(GridData.BEGINNING));
 		
 		txt1 = new Text(c, SWT.SINGLE | SWT.BORDER);
@@ -95,7 +102,7 @@ public class ExpDialog extends AbstractPropertyDialog {
 			}});
 				
 		Label l2 = new Label(c, SWT.NONE);
-		l2.setText("Value:");  //$NON-NLS-1$
+		l2.setText(NewUIMessages.getResourceString("ExpDialog.7"));  //$NON-NLS-1$
 		l2.setLayoutData(new GridData(GridData.BEGINNING));
 		
 		txt2 = new Text(c, SWT.SINGLE | SWT.BORDER);
@@ -128,9 +135,24 @@ public class ExpDialog extends AbstractPropertyDialog {
 		
 		b_work = setupButton(c, AbstractCPropertyTab.WORKSPACEBUTTON_NAME);
 		b_file = setupButton(c, AbstractCPropertyTab.FILESYSTEMBUTTON_NAME);
+
+		c_wsp = new Button(c, SWT.CHECK);
+		c_wsp.setText(NewUIMessages.getResourceString("ExpDialog.4")); //$NON-NLS-1$
+		gd = new GridData(GridData.BEGINNING);
+		gd.horizontalSpan = 3;
+		c_wsp.setLayoutData(gd);
+		c_wsp.setSelection(isWsp);
+		c_wsp.addSelectionListener(new SelectionAdapter() {
+			public void widgetSelected(SelectionEvent e) {
+				c_wsp.setImage(AbstractExportTab.getWspImage(c_wsp.getSelection()));
+			}});
+
+		c_wsp.setImage(AbstractExportTab.getWspImage(isWsp));
+		
 		if (kind == ICSettingEntry.MACRO) {
 			b_work.setVisible(false);
 			b_file.setVisible(false);
+			c_wsp.setVisible(false); 
 		}
 		
 		Group dest = new Group(c, SWT.NONE);
@@ -188,7 +210,7 @@ public class ExpDialog extends AbstractPropertyDialog {
 		c.getShell().setDefaultButton(b_ok);
 		c.pack();
 		Rectangle r = shell.getBounds();
-		r.width = 400;
+		r.width = 420;
 		shell.setBounds(r);
 		setButtons();
 		return c;
@@ -205,10 +227,10 @@ public class ExpDialog extends AbstractPropertyDialog {
 			name = txt2.getText().trim();
 		if (name.length() == 0) {
 			enabled = false;
-			message.setText("Name cannot be empty !"); //$NON-NLS-1$
+			message.setText(NewUIMessages.getResourceString("ExpDialog.8")); //$NON-NLS-1$
 		}
 		if (enabled && existing != null && existing.contains(name)) {
-			message.setText("The same name already exists !"); //$NON-NLS-1$
+			message.setText(NewUIMessages.getResourceString("ExpDialog.9")); //$NON-NLS-1$
 			enabled = false;
 		}
 		b_ok.setEnabled(enabled);
@@ -221,6 +243,7 @@ public class ExpDialog extends AbstractPropertyDialog {
 				super.text1 = txt1.getText();
 			super.text2 = txt2.getText();
 			super.check1 = c_all.getSelection();
+			super.check2 = c_wsp.getSelection();
 			sel_langs = (c_langs.getSelection()) ? null : langs.getSelection();
 			sel_types = (c_types.getSelection()) ? null : types.getSelection();
 			result = true;
@@ -239,7 +262,8 @@ public class ExpDialog extends AbstractPropertyDialog {
 			if (s != null) {
 				s = strip_wsp(s);
 				txt2.setText(s);
-				text1 = s; // to be compared with final text
+				c_wsp.setSelection(true);
+				c_wsp.setImage(AbstractExportTab.getWspImage(c_wsp.getSelection()));
 			}
 		} else if (e.widget.equals(b_file)) {
 			if (kind == ICSettingEntry.INCLUDE_PATH ||
@@ -247,7 +271,11 @@ public class ExpDialog extends AbstractPropertyDialog {
 				s = AbstractCPropertyTab.getFileSystemDirDialog(shell, txt2.getText());
 			else 
 				s = AbstractCPropertyTab.getFileSystemFileDialog(shell, txt2.getText());
-			if (s != null) txt2.setText(s);
+			if (s != null) {
+				txt2.setText(s);
+				c_wsp.setSelection(false);
+				c_wsp.setImage(AbstractExportTab.getWspImage(c_wsp.getSelection()));
+			}
 		}
 	}
 	
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/ExpIncludeTab.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/ExpIncludeTab.java
index cfc21eb4ade..910552e3fe8 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/ExpIncludeTab.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/ExpIncludeTab.java
@@ -16,15 +16,13 @@ import org.eclipse.cdt.core.settings.model.ICSettingEntry;
 
 public class ExpIncludeTab extends AbstractExportTab {
 	
-	public ICLanguageSettingEntry doAdd(String s1, String s2) {
-		int flags = 0;
-		if (s1.equals(s2))  
-			flags = ICSettingEntry.VALUE_WORKSPACE_PATH;
+	public ICLanguageSettingEntry doAdd(String s1, String s2, boolean isWsp) {
+		int flags = isWsp ? ICSettingEntry.VALUE_WORKSPACE_PATH : 0;
 		return new CIncludePathEntry(s2, flags);
 	}
 
-	public ICLanguageSettingEntry doEdit(String s1, String s2) {
-		return doAdd(s1, s2);
+	public ICLanguageSettingEntry doEdit(String s1, String s2, boolean isWsp) {
+		return doAdd(s1, s2, isWsp);
 	}
 	
 	public int getKind() { return ICSettingEntry.INCLUDE_PATH; }
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/ExpLibraryPathTab.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/ExpLibraryPathTab.java
index 51c35bc0019..54613af1a76 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/ExpLibraryPathTab.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/ExpLibraryPathTab.java
@@ -24,14 +24,13 @@ public class ExpLibraryPathTab extends AbstractExportTab implements IPathEntrySt
 		updateData(getResDesc());
 	}
 
-	public ICLanguageSettingEntry doAdd(String s1, String s2) {
-		int flags = 0;
-		if (s1.equals(s2)) flags = ICSettingEntry.VALUE_WORKSPACE_PATH;
+	public ICLanguageSettingEntry doAdd(String s1, String s2, boolean isWsp) {
+		int flags = isWsp ? ICSettingEntry.VALUE_WORKSPACE_PATH : 0;
 		return new CLibraryPathEntry(s2, flags);
 	}
 
-	public ICLanguageSettingEntry doEdit(String s1, String s2) {
-		return doAdd(s1, s2);
+	public ICLanguageSettingEntry doEdit(String s1, String s2, boolean isWsp) {
+		return doAdd(s1, s2, isWsp);
 	}
 	
 	public int getKind() { return ICSettingEntry.LIBRARY_PATH; }
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/ExpLibraryTab.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/ExpLibraryTab.java
index 7cab65881fe..23c0070c1ef 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/ExpLibraryTab.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/ExpLibraryTab.java
@@ -24,14 +24,13 @@ public class ExpLibraryTab extends AbstractExportTab implements IPathEntryStoreL
 		updateData(getResDesc());
 	}
 
-	public ICLanguageSettingEntry doAdd(String s1, String s2) {
-		int flags = 0;
-		if (s1.equals(s2)) flags = ICSettingEntry.VALUE_WORKSPACE_PATH;
+	public ICLanguageSettingEntry doAdd(String s1, String s2, boolean isWsp) {
+		int flags = isWsp ? ICSettingEntry.VALUE_WORKSPACE_PATH : 0;
 		return new CLibraryFileEntry(s2, flags);
 	}
 
-	public ICLanguageSettingEntry doEdit(String s1, String s2) {
-		return doAdd(s1, s2);
+	public ICLanguageSettingEntry doEdit(String s1, String s2, boolean isWsp) {
+		return doAdd(s1, s2, isWsp);
 	}
 	
 	public int getKind() { return ICSettingEntry.LIBRARY_FILE; }
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/ExpSymbolTab.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/ExpSymbolTab.java
index 9e41dc3803f..0b58843a6cc 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/ExpSymbolTab.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/ExpSymbolTab.java
@@ -16,12 +16,13 @@ import org.eclipse.cdt.core.settings.model.ICSettingEntry;
 
 public class ExpSymbolTab extends AbstractExportTab {
 
-	public ICLanguageSettingEntry doAdd(String s1, String s2) {
+	// isWsp is ignored for symbols
+	public ICLanguageSettingEntry doAdd(String s1, String s2, boolean isWsp) {
 		return new CMacroEntry(s1, s2, 0);
 	}
 
-	public ICLanguageSettingEntry doEdit(String s1, String s2) {
-		return doAdd(s1, s2);
+	public ICLanguageSettingEntry doEdit(String s1, String s2, boolean isWsp) {
+		return doAdd(s1, s2, isWsp);
 	}
 	
 	public int getKind() { return ICSettingEntry.MACRO; }
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/IncludeDialog.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/IncludeDialog.java
index d0a9b34766b..e28d8c49239 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/IncludeDialog.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/IncludeDialog.java
@@ -13,8 +13,10 @@ package org.eclipse.cdt.ui.newui;
 //import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.dialogs.IDialogConstants;
 import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.CLabel;
 import org.eclipse.swt.events.ModifyEvent;
 import org.eclipse.swt.events.ModifyListener;
+import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
@@ -38,7 +40,9 @@ public class IncludeDialog extends AbstractPropertyDialog {
 	private Button b_ok;
 	private Button b_ko;
 	private int mode;
+	private Button c_wsp;
 	private ICConfigurationDescription cfgd;
+	private boolean isWsp = false;
 	
 	static final int NEW_FILE = 0;
 	static final int NEW_DIR  = 1;
@@ -55,7 +59,7 @@ public class IncludeDialog extends AbstractPropertyDialog {
 		sdata = _data;
 		cfgd = _cfgd;
 		if (flags == ICSettingEntry.VALUE_WORKSPACE_PATH)
-			text2 = sdata; // preserve "workspace" state
+			isWsp = true;
 	}
 
 	protected Control createDialogArea(Composite c) {
@@ -98,6 +102,19 @@ public class IncludeDialog extends AbstractPropertyDialog {
 		b_work = setupButton(c, AbstractCPropertyTab.WORKSPACEBUTTON_NAME);
 		b_file = setupButton(c, AbstractCPropertyTab.FILESYSTEMBUTTON_NAME);
 
+		c_wsp = new Button(c, SWT.CHECK);
+		c_wsp.setText(NewUIMessages.getResourceString("ExpDialog.4")); //$NON-NLS-1$
+		gd = new GridData(GridData.BEGINNING);
+		gd.horizontalSpan = 5;
+		c_wsp.setLayoutData(gd);
+		c_wsp.setSelection(isWsp);
+		c_wsp.addSelectionListener(new SelectionAdapter() {
+			public void widgetSelected(SelectionEvent e) {
+				c_wsp.setImage(AbstractExportTab.getWspImage(c_wsp.getSelection()));
+			}});
+		
+		c_wsp.setImage(AbstractExportTab.getWspImage(isWsp));
+		
 		c.getShell().setDefaultButton(b_ok);
 		c.pack();
 		setButtons();
@@ -113,6 +130,7 @@ public class IncludeDialog extends AbstractPropertyDialog {
 		if (e.widget.equals(b_ok)) { 
 			text1 = text.getText();
 			check1 = b_add2all.getSelection();
+			check2 = c_wsp.getSelection();
 			result = true;
 			shell.dispose(); 
 		} else if (e.widget.equals(b_ko)) {
@@ -125,14 +143,19 @@ public class IncludeDialog extends AbstractPropertyDialog {
 			if (s != null) {
 				s = strip_wsp(s);
 				text.setText(s);
-				text2 = s; // to be compared with final text
+				c_wsp.setSelection(true);
+				c_wsp.setImage(AbstractExportTab.getWspImage(c_wsp.getSelection()));
 			}
 		} else if (e.widget.equals(b_file)) {
 			if ((mode & DIR_MASK)== DIR_MASK)
 				s = AbstractCPropertyTab.getFileSystemDirDialog(shell, text.getText());
 			else 
 				s = AbstractCPropertyTab.getFileSystemFileDialog(shell, text.getText());
-			if (s != null) text.setText(s);
+			if (s != null) {
+				text.setText(s);
+				c_wsp.setSelection(false);
+				c_wsp.setImage(AbstractExportTab.getWspImage(c_wsp.getSelection()));
+			}
 		} else if (e.widget.equals(b_vars)) {
 			s = AbstractCPropertyTab.getVariableDialog(shell, cfgd);
 			if (s != null) text.insert(s);
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/IncludeTab.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/IncludeTab.java
index c8b14c5d430..714ead2e1a9 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/IncludeTab.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/IncludeTab.java
@@ -34,7 +34,7 @@ public class IncludeTab extends AbstractLangsListTab {
 		if (dlg.open() && dlg.text1.trim().length() > 0 ) {
 			toAll = dlg.check1;
 			int flags = 0;
-			if (dlg.text1.equals(dlg.text2)) { // see IncludeDialog why.
+			if (dlg.check2) { // isWsp
 				flags = ICSettingEntry.VALUE_WORKSPACE_PATH;
 			}
 			return new CIncludePathEntry(dlg.text1, flags);
@@ -50,7 +50,7 @@ public class IncludeTab extends AbstractLangsListTab {
 				(ent.getFlags() & ICSettingEntry.VALUE_WORKSPACE_PATH));
 		if (dlg.open()) {
 			int flags = 0;
-			if (dlg.text1.equals(dlg.text2)) flags = ICSettingEntry.VALUE_WORKSPACE_PATH;
+			if (dlg.check2) flags = ICSettingEntry.VALUE_WORKSPACE_PATH;
 			return new CIncludePathEntry(dlg.text1, flags);
 		} else 
 			return null;
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/LibraryPathTab.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/LibraryPathTab.java
index 0e26e671fd3..8aefca012c8 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/LibraryPathTab.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/LibraryPathTab.java
@@ -48,7 +48,7 @@ public class LibraryPathTab extends AbstractLangsListTab implements IPathEntrySt
 				EMPTY_STR, getResDesc().getConfiguration(), 0);
 		if (dlg.open() && dlg.text1.trim().length() > 0 ) {
 			int flags = 0;
-			if (dlg.text1.equals(dlg.text2)) flags = ICSettingEntry.VALUE_WORKSPACE_PATH;
+			if (dlg.check2) flags = ICSettingEntry.VALUE_WORKSPACE_PATH;
 			return new CLibraryPathEntry(dlg.text1, flags);
 		}
 		return null;
@@ -62,7 +62,7 @@ public class LibraryPathTab extends AbstractLangsListTab implements IPathEntrySt
 				(ent.getFlags() & ICSettingEntry.VALUE_WORKSPACE_PATH));
 		if (dlg.open() && dlg.text1.trim().length() > 0 ) {
 			int flags = 0;
-			if (dlg.text1.equals(dlg.text2)) flags = ICSettingEntry.VALUE_WORKSPACE_PATH;
+			if (dlg.check2) flags = ICSettingEntry.VALUE_WORKSPACE_PATH;
 			return new CLibraryPathEntry(dlg.text1, flags);
 		}
 		return null;
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/LibraryTab.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/LibraryTab.java
index d8111a312c7..c9c8d0b6c7a 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/LibraryTab.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/LibraryTab.java
@@ -48,7 +48,7 @@ public class LibraryTab extends AbstractLangsListTab implements IPathEntryStoreL
 				EMPTY_STR, getResDesc().getConfiguration(), 0);
 		if (dlg.open() && dlg.text1.trim().length() > 0 ) {
 			int flags = 0;
-			if (dlg.text1.equals(dlg.text2)) flags = ICSettingEntry.VALUE_WORKSPACE_PATH;
+			if (dlg.check2) flags = ICSettingEntry.VALUE_WORKSPACE_PATH;
 			return new CLibraryFileEntry(dlg.text1, flags);
 		}
 		return null;
@@ -62,7 +62,7 @@ public class LibraryTab extends AbstractLangsListTab implements IPathEntryStoreL
 				(ent.getFlags() & ICSettingEntry.VALUE_WORKSPACE_PATH));
 		if (dlg.open() && dlg.text1.trim().length() > 0 ) {
 			int flags = 0;
-			if (dlg.text1.equals(dlg.text2)) flags = ICSettingEntry.VALUE_WORKSPACE_PATH;
+			if (dlg.check2) flags = ICSettingEntry.VALUE_WORKSPACE_PATH;
 			return new CLibraryFileEntry(dlg.text1, flags);
 		}
 		return null;
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/PluginResources.properties b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/PluginResources.properties
index 4b0abb9f176..5a8a886e93e 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/PluginResources.properties
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/PluginResources.properties
@@ -479,6 +479,12 @@ ExpDialog.0=To all configurations
 ExpDialog.1=Save to: 
 ExpDialog.2=Languages
 ExpDialog.3=Content types
+ExpDialog.4=Is workspace path
+ExpDialog.5=Apply to all
+ExpDialog.6=Name:
+ExpDialog.7=Value:
+ExpDialog.8=Name cannot be empty \!
+ExpDialog.9=The same name already exists \!
 ConfigMultiSelectionDialog.0=Select configurations
 ConfigMultiSelectionDialog.1=At least 2 configurations should be selected
 SymbolDialog.0=Name: