X-Git-Url: http://secure.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 76fbddd..3244c02 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
@@ -1,35 +1,62 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2001, 2002 International Business Machines Corp. and others.
+ * Copyright (c) 2000, 2004 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v0.5 
+ * are made available under the terms of the Common Public License v1.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
+ * http://www.eclipse.org/legal/cpl-v10.html
  * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
- ******************************************************************************/
+ *******************************************************************************/
 package net.sourceforge.phpdt.internal.codeassist.impl;
 
 import java.util.Map;
 
+import net.sourceforge.phpdt.core.compiler.CharOperation;
+
 public class AssistOptions {
 	/**
 	 * Option IDs
 	 */
 	public static final String OPTION_PerformVisibilityCheck =
-		"org.eclipse.jdt.core.codeComplete.visibilityCheck"; 	//$NON-NLS-1$
+		"net.sourceforge.phpdt.core.codeComplete.visibilityCheck"; 	//$NON-NLS-1$
 	public static final String OPTION_ForceImplicitQualification =
-		"org.eclipse.jdt.core.codeComplete.forceImplicitQualification"; 	//$NON-NLS-1$
+		"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
 	}
 
 	/** 
@@ -39,34 +66,104 @@ public class AssistOptions {
 		if (settings == null)
 			return;
 
-		// filter options which are related to the assist component
-		Object[] entries = settings.entrySet().toArray();
-		for (int i = 0, max = entries.length; i < max; i++) {
-			Map.Entry entry = (Map.Entry) entries[i];
-			if (!(entry.getKey() instanceof String))
-				continue;
-			if (!(entry.getValue() instanceof String))
-				continue;
-			String optionID = (String) entry.getKey();
-			String optionValue = (String) entry.getValue();
+		set(settings);
+	}
+	public void set(Map optionsMap) {
 
-			if (optionID.equals(OPTION_PerformVisibilityCheck)) {
-				if (optionValue.equals(ENABLED)) {
-					this.checkVisibility = true;
-				} else
-					if (optionValue.equals(DISABLED)) {
-						this.checkVisibility = false;
-					}
-				continue;
-			} else if (optionID.equals(OPTION_ForceImplicitQualification)) {
-				if (optionValue.equals(ENABLED)) {
-					this.forceImplicitQualification = true;
-				} else
-					if (optionValue.equals(DISABLED)) {
-						this.forceImplicitQualification = false;
-					}
-				continue;
-			} 
+		Object optionValue;
+		if ((optionValue = optionsMap.get(OPTION_PerformVisibilityCheck)) != null) {
+			if (ENABLED.equals(optionValue)) {
+				this.checkVisibility = true;
+			} else if (DISABLED.equals(optionValue)) {
+				this.checkVisibility = false;
+			}
+		}
+		if ((optionValue = optionsMap.get(OPTION_ForceImplicitQualification)) != null) {
+			if (ENABLED.equals(optionValue)) {
+				this.forceImplicitQualification = true;
+			} else if (DISABLED.equals(optionValue)) {
+				this.forceImplicitQualification = false;
+			}
+		}
+		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());
+				} else {
+					this.fieldPrefixes = null;
+				}
+			}
+		}
+		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());
+				} else {
+					this.staticFieldPrefixes = null;
+				}
+			}
+		}
+		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());
+				} else {
+					this.localPrefixes = null;
+				}
+			}
+		}
+		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());
+				} else {
+					this.argumentPrefixes = null;
+				}
+			}
+		}
+		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());
+				} else {
+					this.fieldSuffixes = null;
+				}
+			}
+		}
+		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());
+				} else {
+					this.staticFieldSuffixes = null;
+				}
+			}
+		}
+		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());
+				} else {
+					this.localSuffixes = null;
+				}
+			}
+		}
+		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());
+				} else {
+					this.argumentSuffixes = null;
+				}
+			}
 		}
 	}
-}
\ No newline at end of file
+}