Fixed 50: load standards from custom lib

Author: skiera

META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: PHP Tool Codesniffer
 Bundle-SymbolicName: org.phpsrc.eclipse.pti.tools.codesniffer;singleton:=true
-Bundle-Version: 1.2.3.R20100314000000
+Bundle-Version: 1.2.4.R20100413000000
 Bundle-Activator: org.phpsrc.eclipse.pti.tools.codesniffer.PHPCodeSnifferPlugin
 Bundle-Vendor: Sven Kiera
 Require-Bundle: org.eclipse.ui,

src/org/phpsrc/eclipse/pti/tools/codesniffer/PHPCodeSnifferPlugin.java

@@ -34,6 +34,8 @@
 import org.osgi.framework.BundleContext;
 import org.phpsrc.eclipse.pti.core.AbstractPHPToolPlugin;
 import org.phpsrc.eclipse.pti.library.pear.PHPLibraryPEARPlugin;
+import org.phpsrc.eclipse.pti.library.pear.core.preferences.PEARPreferences;
+import org.phpsrc.eclipse.pti.library.pear.core.preferences.PEARPreferencesFactory;
 import org.phpsrc.eclipse.pti.tools.codesniffer.core.preferences.PHPCodeSnifferPreferences;
 import org.phpsrc.eclipse.pti.tools.codesniffer.core.preferences.PHPCodeSnifferPreferencesFactory;
 
@@ -44,6 +46,7 @@ public class PHPCodeSnifferPlugin extends AbstractPHPToolPlugin {
 
 	// The plug-in ID
 	public static final String PLUGIN_ID = "org.phpsrc.eclipse.pti.tools.codesniffer";
+	private static final String DEFAULT_PEAR_LIB_PATH = "/php/library/PEAR/PHP/CodeSniffer/Standards";
 
 	// The shared instance
 	private static PHPCodeSnifferPlugin plugin;
@@ -61,7 +64,7 @@ public PHPCodeSnifferPlugin() {
 	 * org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext
 	 * )
 	 */
-	
+
 	public void start(BundleContext context) throws Exception {
 		super.start(context);
 		plugin = this;
@@ -74,7 +77,7 @@ public void start(BundleContext context) throws Exception {
 	 * org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext
 	 * )
 	 */
-	
+
 	public void stop(BundleContext context) throws Exception {
 		plugin = null;
 		super.stop(context);
@@ -89,16 +92,36 @@ public static PHPCodeSnifferPlugin getDefault() {
 		return plugin;
 	}
 
-	public String[] getCodeSnifferStandards() {
-		IPath sp = PHPLibraryPEARPlugin.getDefault().resolvePluginResource(
-				"/php/library/PEAR/PHP/CodeSniffer/Standards");
+	public String[] getCodeSnifferStandards(String lib) {
+		String libPath = null;
+		if (lib != null && !"".equals(lib) && !lib.startsWith("<")) {
+			PEARPreferences prefs = PEARPreferencesFactory.factoryByName(lib);
+			if (prefs != null)
+				libPath = prefs.getLibraryPath();
+		}
 
-		File[] dirs = new File(sp.toString()).listFiles(new FileFilter() {
+		File standardPath = null;
+		if (libPath != null) {
+			standardPath = new File(libPath + "/PHP/CodeSniffer/Standards");
+			if (!standardPath.exists())
+				standardPath = new File(libPath + "/PEAR/PHP/CodeSniffer/Standards");
+		} else {
+			standardPath = new File(PHPLibraryPEARPlugin.getDefault().resolvePluginResource(DEFAULT_PEAR_LIB_PATH)
+					.toPortableString());
+		}
+
+		if (standardPath == null || !standardPath.exists())
+			return new String[0];
+
+		File[] dirs = standardPath.listFiles(new FileFilter() {
 			public boolean accept(File f) {
 				return f.isDirectory() && !f.getName().startsWith(".");
 			}
 		});
 
+		if (dirs == null)
+			return new String[0];
+
 		String[] standards = new String[dirs.length];
 		for (int i = 0; i < dirs.length; i++) {
 			standards[i] = dirs[i].getName();
@@ -107,7 +130,6 @@ public boolean accept(File f) {
 		return standards;
 	}
 
-	
 	public IPath[] getPluginIncludePaths(IProject project) {
 		PHPCodeSnifferPreferences prefs = PHPCodeSnifferPreferencesFactory.factory(project);
 		IPath[] pearPaths = PHPLibraryPEARPlugin.getDefault().getPluginIncludePaths(prefs.getPearLibraryName());

src/org/phpsrc/eclipse/pti/tools/codesniffer/ui/preferences/PHPCodeSnifferConfigurationBlock.java

@@ -48,10 +48,13 @@
 import org.eclipse.php.internal.ui.wizards.fields.ListDialogField;
 import org.eclipse.php.internal.ui.wizards.fields.StringDialogField;
 import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.events.SelectionListener;
 import org.eclipse.swt.graphics.Font;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Combo;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Group;
@@ -221,8 +224,6 @@ public PHPCodeSnifferConfigurationBlock(IStatusChangeListener context, IProject
 		fStandardsList.setTableColumns(new ListDialogField.ColumnsDescription(data, columnsHeaders, true));
 		fStandardsList.setViewerSorter(new ViewerSorter());
 
-		unpackStandards();
-
 		if (fStandardsList.getSize() > 0) {
 			fStandardsList.selectFirstElement();
 		} else {
@@ -252,9 +253,8 @@ public PHPCodeSnifferConfigurationBlock(IStatusChangeListener context, IProject
 
 	private static Key[] getKeys() {
 		return new Key[] { PREF_PHP_EXECUTABLE, PREF_PEAR_LIBRARY, PREF_DEBUG_PRINT_OUTPUT, PREF_CUSTOM_STANDARD_NAMES,
-				PREF_CUSTOM_STANDARD_PATHS, PREF_DEFAULT_STANDARD_NAME, PREF_DEFAULT_STANDARD_PATH,
-				PREF_ACTIVE_STANDARDS, PREF_DEFAULT_TAB_WITH, PREF_FILE_EXTENSIONS, PREF_IGNORE_PATTERN,
-				PREF_IGNORE_SNIFFS };
+				PREF_CUSTOM_STANDARD_PATHS, PREF_ACTIVE_STANDARDS, PREF_DEFAULT_TAB_WITH, PREF_FILE_EXTENSIONS,
+				PREF_IGNORE_PATTERN, PREF_IGNORE_SNIFFS };
 	}
 
 	protected Composite createToolContents(Composite parent) {
@@ -316,6 +316,16 @@ private Composite createStandardsTabContent(Composite folder) {
 		createDialogFieldsWithInfoText(folder, new DialogField[] { fIgnoreSniffs }, "Ignore Sniffs",
 				new String[] { "Sniffs are separated by a comma" });
 
+		unpackStandards(pearLibraryCombo.getText());
+		pearLibraryCombo.addSelectionListener(new SelectionListener() {
+			public void widgetSelected(SelectionEvent e) {
+				unpackStandards(((Combo) e.widget).getText());
+			}
+
+			public void widgetDefaultSelected(SelectionEvent e) {
+			}
+		});
+
 		return markersGroup;
 	}
 
@@ -437,7 +447,7 @@ protected Key getPEARLibraryKey() {
 	 */
 
 	protected void updateControls() {
-		unpackStandards();
+		unpackStandards(pearLibraryCombo.getText());
 		unpackTabWidth();
 		unpackFileExtensions();
 		unpackIgnorePattern();
@@ -468,7 +478,7 @@ private void unpackIgnoreSniffs() {
 			fIgnoreSniffs.setText(ignoreSniffs);
 	}
 
-	private void unpackStandards() {
+	private void unpackStandards(String libName) {
 		String activeStandards = getValue(PREF_ACTIVE_STANDARDS);
 		ArrayList<String> activeList = new ArrayList<String>();
 
@@ -483,7 +493,7 @@ private void unpackStandards() {
 
 		String customStandardPrefs = getValue(PREF_CUSTOM_STANDARD_NAMES);
 
-		String[] standards = PHPCodeSnifferPlugin.getDefault().getCodeSnifferStandards();
+		String[] standards = PHPCodeSnifferPlugin.getDefault().getCodeSnifferStandards(libName);
 		String[] customStandards = {};
 		String[] customPaths = {};