Implementing the File chooser and variables approach at the same time

Author: Anton Krug

com.googlecode.cppcheclipse.ui/META-INF/MANIFEST.MF

@@ -12,7 +12,8 @@ Require-Bundle: org.eclipse.ui;bundle-version="3.4.0",
  org.eclipse.cdt.core;bundle-version="5.0.0",
  org.eclipse.ui.editors;bundle-version="3.4.0",
  org.eclipse.jface.text;bundle-version="3.4.0",
- org.eclipse.cdt.make.core;bundle-version="5.0.0"
+ org.eclipse.cdt.make.core;bundle-version="5.0.0",
+ org.eclipse.debug.ui
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Bundle-ActivationPolicy: lazy
 Import-Package: org.eclipse.cdt.core.model,

com.googlecode.cppcheclipse.ui/src/com/googlecode/cppcheclipse/ui/Messages.java

@@ -25,12 +25,16 @@ public class Messages extends NLS {
 	public static String BinaryPathPreferencePage_ButtonSave;
 	public static String BinaryPathPreferencePage_CheckForUpdate;
 	public static String BinaryPathPreferencePage_Description;
+	public static String BinaryPathPreferencePage_FileDialogButton;
+	public static String BinaryPathPreferencePage_FileDialogTitle;
 	public static String BinaryPathPreferencePage_NoValidPath;
 	public static String BinaryPathPreferencePage_PathToBinary;
 	public static String BinaryPathPreferencePage_UnknownVersion;
 	public static String BinaryPathPreferencePage_UpdateCheckNever;
 	public static String BinaryPathPreferencePage_UpdateCheckNotice;
 	public static String BinaryPathPreferencePage_UpdateInterval;
+	public static String BinaryPathPreferencePage_VariablesButton;
+
 	public static String BinaryPathPreferencePage_VersionTooOld;
 	public static String BinaryPathPreferencePage_LinkToCppcheck;
 	public static String Builder_IncrementalBuilderTask;

com.googlecode.cppcheclipse.ui/src/com/googlecode/cppcheclipse/ui/messages.properties

@@ -19,13 +19,16 @@ BinaryPathPreferencePage_ButtonDiscard=Discard
 BinaryPathPreferencePage_ButtonSave=Save
 BinaryPathPreferencePage_CheckForUpdate=Check for update now...
 BinaryPathPreferencePage_Description=Set path to cppcheck binary and update settings. 
+BinaryPathPreferencePage_FileDialogButton=Browse
+BinaryPathPreferencePage_FileDialogTitle=Location of the cppcheck binary
 BinaryPathPreferencePage_LinkToCppcheck=You must get this binary separately from <a href="http://sourceforge.net/projects/cppcheck/">http://sourceforge.net/projects/cppcheck/</a>.\nGiven cppcheck has version {0}.
 BinaryPathPreferencePage_NoValidPath=No valid path to cppcheck specified!
 BinaryPathPreferencePage_PathToBinary=cppcheck binary path
 BinaryPathPreferencePage_UnknownVersion=??
 BinaryPathPreferencePage_UpdateCheckNever=Never
 BinaryPathPreferencePage_UpdateCheckNotice=This update check only checks for updates to cppcheck. Last update check: {0}\nTo automatically check for updates to cppcheclipse click <A>here</A>.
 BinaryPathPreferencePage_UpdateInterval=How often should the check be run?
+BinaryPathPreferencePage_VariablesButton=Variables
 BinaryPathPreferencePage_VersionTooOld=Version of cppcheck is too old. You need at least version {0} but you only have {1}!
 
 SettingsPreferencePage_CheckAll=Check for all known issues (all)

com.googlecode.cppcheclipse.ui/src/com/googlecode/cppcheclipse/ui/preferences/BinaryPathPreferencePage.java

@@ -11,7 +11,8 @@
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.preference.BooleanFieldEditor;
 import org.eclipse.jface.preference.FieldEditorPreferencePage;
-import org.eclipse.jface.preference.StringFieldEditor;
+import org.eclipse.jface.preference.StringButtonFieldEditor;
+import org.eclipse.debug.ui.StringVariableSelectionDialog;
 import org.eclipse.jface.preference.IPreferenceNode;
 import org.eclipse.jface.preference.PreferenceDialog;
 import org.eclipse.jface.preference.PreferenceManager;
@@ -31,6 +32,7 @@
 import org.eclipse.ui.IWorkbench;
 import org.eclipse.ui.IWorkbenchPreferencePage;
 import org.eclipse.ui.PlatformUI;
+import org.eclipse.swt.widgets.FileDialog;
 import org.eclipse.ui.dialogs.PreferencesUtil;
 
 import com.googlecode.cppcheclipse.core.CppcheclipsePlugin;
@@ -57,7 +59,7 @@ public class BinaryPathPreferencePage extends FieldEditorPreferencePage
 	private RadioGroupFieldEditor updateInterval;
 	private Composite updateIntervalParent;
 	private BooleanFieldEditor automaticUpdateCheck;
-	private StringFieldEditor binaryPath;
+	private StringButtonFieldEditor binaryPath;
 	private Link updateCheckNotice;
 	private boolean hasBinaryPathChanged;
 	private Link link;
@@ -106,9 +108,12 @@ private void setCurrentVersion() {
 	@Override
 	protected void createFieldEditors() {
 		Composite parent = getFieldEditorParent();
-		binaryPath = new StringFieldEditor(IPreferenceConstants.P_BINARY_PATH,
-				Messages.BinaryPathPreferencePage_PathToBinary, -1,
-				StringFieldEditor.VALIDATE_ON_KEY_STROKE, parent) {
+		
+		final FileDialog fileDialog = new FileDialog(getShell(), SWT.OPEN);
+		fileDialog.setText(Messages.BinaryPathPreferencePage_FileDialogTitle);
+		
+		binaryPath = new StringButtonFieldEditor(IPreferenceConstants.P_BINARY_PATH,
+				Messages.BinaryPathPreferencePage_PathToBinary, parent) {
 
 			@Override
 			protected boolean checkState() {
@@ -151,11 +156,37 @@ protected void fireValueChanged(String property, Object oldValue,
 				super.fireValueChanged(property, oldValue, newValue);
 			}
 
+
+
+			@Override
+			protected String changePressed() {
+				// Browse button pressed, after selection finished, it replace the current text
+				return fileDialog.open();
+			}
+
 		};
+		binaryPath.setChangeButtonText(Messages.BinaryPathPreferencePage_FileDialogButton);
 		binaryPath.setEmptyStringAllowed(false);
 		binaryPath
 				.setErrorMessage(Messages.BinaryPathPreferencePage_NoValidPath);
 		addField(binaryPath);
+		
+		final StringVariableSelectionDialog variablesDialog = new StringVariableSelectionDialog(getShell());
+		Button variablesButton = new Button(parent, SWT.PUSH | SWT.TRAIL);
+		variablesButton.setText(Messages.BinaryPathPreferencePage_VariablesButton);
+		variablesButton.addSelectionListener(new SelectionAdapter() {
+			public void widgetSelected(SelectionEvent event) {
+				if (variablesDialog.open() == IDialogConstants.OK_ID) {
+					final String variable = variablesDialog.getVariableExpression();
+					if (variable != null) {
+						// append the selected variable to the end of the path
+						binaryPath.setStringValue(binaryPath.getStringValue() + variable);
+					}
+				}
+			}
+		});
+		
+		afterControlInsertion(variablesButton);
 
 		parent = getFieldEditorParent();
 		beforeControlInsertion(parent);