X-Git-Url: http://git.phpeclipse.com

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/codeassist/impl/AssistOptions.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/codeassist/impl/AssistOptions.java
index 3244c02..46d07d4 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/codeassist/impl/AssistOptions.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/codeassist/impl/AssistOptions.java
@@ -18,48 +18,58 @@ public class AssistOptions {
 	/**
 	 * Option IDs
 	 */
-	public static final String OPTION_PerformVisibilityCheck =
-		"net.sourceforge.phpdt.core.codeComplete.visibilityCheck"; 	//$NON-NLS-1$
-	public static final String OPTION_ForceImplicitQualification =
-		"net.sourceforge.phpdt.core.codeComplete.forceImplicitQualification"; 	//$NON-NLS-1$
-	public static final String OPTION_FieldPrefixes =
-		"net.sourceforge.phpdt.core.codeComplete.fieldPrefixes"; 	//$NON-NLS-1$
-	public static final String OPTION_StaticFieldPrefixes =
-		"net.sourceforge.phpdt.core.codeComplete.staticFieldPrefixes"; 	//$NON-NLS-1$
-	public static final String OPTION_LocalPrefixes =
-		"net.sourceforge.phpdt.core.codeComplete.localPrefixes"; 	//$NON-NLS-1$
-	public static final String OPTION_ArgumentPrefixes =
-		"net.sourceforge.phpdt.core.codeComplete.argumentPrefixes"; 	//$NON-NLS-1$
-	public static final String OPTION_FieldSuffixes =
-		"net.sourceforge.phpdt.core.codeComplete.fieldSuffixes"; 	//$NON-NLS-1$
-	public static final String OPTION_StaticFieldSuffixes =
-		"net.sourceforge.phpdt.core.codeComplete.staticFieldSuffixes"; 	//$NON-NLS-1$
-	public static final String OPTION_LocalSuffixes =
-		"net.sourceforge.phpdt.core.codeComplete.localSuffixes"; 	//$NON-NLS-1$
-	public static final String OPTION_ArgumentSuffixes =
-		"net.sourceforge.phpdt.core.codeComplete.argumentSuffixes"; 	//$NON-NLS-1$
+	public static final String OPTION_PerformVisibilityCheck = "net.sourceforge.phpdt.core.codeComplete.visibilityCheck"; //$NON-NLS-1$
+
+	public static final String OPTION_ForceImplicitQualification = "net.sourceforge.phpdt.core.codeComplete.forceImplicitQualification"; //$NON-NLS-1$
+
+	public static final String OPTION_FieldPrefixes = "net.sourceforge.phpdt.core.codeComplete.fieldPrefixes"; //$NON-NLS-1$
+
+	public static final String OPTION_StaticFieldPrefixes = "net.sourceforge.phpdt.core.codeComplete.staticFieldPrefixes"; //$NON-NLS-1$
+
+	public static final String OPTION_LocalPrefixes = "net.sourceforge.phpdt.core.codeComplete.localPrefixes"; //$NON-NLS-1$
+
+	public static final String OPTION_ArgumentPrefixes = "net.sourceforge.phpdt.core.codeComplete.argumentPrefixes"; //$NON-NLS-1$
+
+	public static final String OPTION_FieldSuffixes = "net.sourceforge.phpdt.core.codeComplete.fieldSuffixes"; //$NON-NLS-1$
+
+	public static final String OPTION_StaticFieldSuffixes = "net.sourceforge.phpdt.core.codeComplete.staticFieldSuffixes"; //$NON-NLS-1$
+
+	public static final String OPTION_LocalSuffixes = "net.sourceforge.phpdt.core.codeComplete.localSuffixes"; //$NON-NLS-1$
+
+	public static final String OPTION_ArgumentSuffixes = "net.sourceforge.phpdt.core.codeComplete.argumentSuffixes"; //$NON-NLS-1$
+
 	public static final String ENABLED = "enabled"; //$NON-NLS-1$
+
 	public static final String DISABLED = "disabled"; //$NON-NLS-1$
 
 	public boolean checkVisibility = false;
+
 	public boolean forceImplicitQualification = false;
+
 	public char[][] fieldPrefixes = null;
+
 	public char[][] staticFieldPrefixes = null;
+
 	public char[][] localPrefixes = null;
+
 	public char[][] argumentPrefixes = null;
+
 	public char[][] fieldSuffixes = null;
+
 	public char[][] staticFieldSuffixes = null;
+
 	public char[][] localSuffixes = null;
+
 	public char[][] argumentSuffixes = null;
 
-	/** 
+	/**
 	 * Initializing the assist options with default settings
 	 */
 	public AssistOptions() {
 		// Initializing the assist options with default settings
 	}
 
-	/** 
+	/**
 	 * Initializing the assist options with external settings
 	 */
 	public AssistOptions(Map settings) {
@@ -68,6 +78,7 @@ public class AssistOptions {
 
 		set(settings);
 	}
+
 	public void set(Map optionsMap) {
 
 		Object optionValue;
@@ -88,8 +99,9 @@ public class AssistOptions {
 		if ((optionValue = optionsMap.get(OPTION_FieldPrefixes)) != null) {
 			if (optionValue instanceof String) {
 				String stringValue = (String) optionValue;
-				if (stringValue.length() > 0){
-					this.fieldPrefixes = CharOperation.splitAndTrimOn(',', stringValue.toCharArray());
+				if (stringValue.length() > 0) {
+					this.fieldPrefixes = CharOperation.splitAndTrimOn(',',
+							stringValue.toCharArray());
 				} else {
 					this.fieldPrefixes = null;
 				}
@@ -98,8 +110,9 @@ public class AssistOptions {
 		if ((optionValue = optionsMap.get(OPTION_StaticFieldPrefixes)) != null) {
 			if (optionValue instanceof String) {
 				String stringValue = (String) optionValue;
-				if (stringValue.length() > 0){
-					this.staticFieldPrefixes = CharOperation.splitAndTrimOn(',', stringValue.toCharArray());
+				if (stringValue.length() > 0) {
+					this.staticFieldPrefixes = CharOperation.splitAndTrimOn(
+							',', stringValue.toCharArray());
 				} else {
 					this.staticFieldPrefixes = null;
 				}
@@ -108,8 +121,9 @@ public class AssistOptions {
 		if ((optionValue = optionsMap.get(OPTION_LocalPrefixes)) != null) {
 			if (optionValue instanceof String) {
 				String stringValue = (String) optionValue;
-				if (stringValue.length() > 0){
-					this.localPrefixes = CharOperation.splitAndTrimOn(',', stringValue.toCharArray());
+				if (stringValue.length() > 0) {
+					this.localPrefixes = CharOperation.splitAndTrimOn(',',
+							stringValue.toCharArray());
 				} else {
 					this.localPrefixes = null;
 				}
@@ -118,8 +132,9 @@ public class AssistOptions {
 		if ((optionValue = optionsMap.get(OPTION_ArgumentPrefixes)) != null) {
 			if (optionValue instanceof String) {
 				String stringValue = (String) optionValue;
-				if (stringValue.length() > 0){
-					this.argumentPrefixes = CharOperation.splitAndTrimOn(',', stringValue.toCharArray());
+				if (stringValue.length() > 0) {
+					this.argumentPrefixes = CharOperation.splitAndTrimOn(',',
+							stringValue.toCharArray());
 				} else {
 					this.argumentPrefixes = null;
 				}
@@ -128,8 +143,9 @@ public class AssistOptions {
 		if ((optionValue = optionsMap.get(OPTION_FieldSuffixes)) != null) {
 			if (optionValue instanceof String) {
 				String stringValue = (String) optionValue;
-				if (stringValue.length() > 0){
-					this.fieldSuffixes = CharOperation.splitAndTrimOn(',', stringValue.toCharArray());
+				if (stringValue.length() > 0) {
+					this.fieldSuffixes = CharOperation.splitAndTrimOn(',',
+							stringValue.toCharArray());
 				} else {
 					this.fieldSuffixes = null;
 				}
@@ -138,8 +154,9 @@ public class AssistOptions {
 		if ((optionValue = optionsMap.get(OPTION_StaticFieldSuffixes)) != null) {
 			if (optionValue instanceof String) {
 				String stringValue = (String) optionValue;
-				if (stringValue.length() > 0){
-					this.staticFieldSuffixes = CharOperation.splitAndTrimOn(',', stringValue.toCharArray());
+				if (stringValue.length() > 0) {
+					this.staticFieldSuffixes = CharOperation.splitAndTrimOn(
+							',', stringValue.toCharArray());
 				} else {
 					this.staticFieldSuffixes = null;
 				}
@@ -148,8 +165,9 @@ public class AssistOptions {
 		if ((optionValue = optionsMap.get(OPTION_LocalSuffixes)) != null) {
 			if (optionValue instanceof String) {
 				String stringValue = (String) optionValue;
-				if (stringValue.length() > 0){
-					this.localSuffixes = CharOperation.splitAndTrimOn(',', stringValue.toCharArray());
+				if (stringValue.length() > 0) {
+					this.localSuffixes = CharOperation.splitAndTrimOn(',',
+							stringValue.toCharArray());
 				} else {
 					this.localSuffixes = null;
 				}
@@ -158,8 +176,9 @@ public class AssistOptions {
 		if ((optionValue = optionsMap.get(OPTION_ArgumentSuffixes)) != null) {
 			if (optionValue instanceof String) {
 				String stringValue = (String) optionValue;
-				if (stringValue.length() > 0){
-					this.argumentSuffixes = CharOperation.splitAndTrimOn(',', stringValue.toCharArray());
+				if (stringValue.length() > 0) {
+					this.argumentSuffixes = CharOperation.splitAndTrimOn(',',
+							stringValue.toCharArray());
 				} else {
 					this.argumentSuffixes = null;
 				}