Cleaned up PHP Prefs (Code Assist, typing)

[phpeclipse.git] / net.sourceforge.phpeclipse / src / net / sourceforge / phpdt / internal / ui / preferences / CompilerConfigurationBlock.java

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/preferences/CompilerConfigurationBlock.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/preferences/CompilerConfigurationBlock.java
index 5d64871..684d617 100644 (file)
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/preferences/CompilerConfigurationBlock.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/preferences/CompilerConfigurationBlock.java
@@ -13,11 +13,15 @@ package net.sourceforge.phpdt.internal.ui.preferences;
 import java.util.ArrayList;
 import java.util.Map;
 
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IStatus;
+import net.sourceforge.phpdt.core.IJavaProject;
+import net.sourceforge.phpdt.core.JavaCore;
+import net.sourceforge.phpdt.internal.ui.dialogs.StatusInfo;
+import net.sourceforge.phpdt.internal.ui.dialogs.StatusUtil;
+import net.sourceforge.phpdt.internal.ui.util.PixelConverter;
+import net.sourceforge.phpdt.internal.ui.util.TabFolderLayout;
+import net.sourceforge.phpdt.internal.ui.wizards.IStatusChangeListener;
 
+import org.eclipse.core.runtime.IStatus;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
@@ -28,21 +32,14 @@ import org.eclipse.swt.widgets.TabFolder;
 import org.eclipse.swt.widgets.TabItem;
 import org.eclipse.swt.widgets.Text;
 
-import net.sourceforge.phpdt.core.IJavaProject;
-import net.sourceforge.phpdt.core.JavaCore;
-
-import net.sourceforge.phpdt.internal.ui.dialogs.StatusInfo;
-import net.sourceforge.phpdt.internal.ui.dialogs.StatusUtil;
-import net.sourceforge.phpdt.internal.ui.util.PixelConverter;
-import net.sourceforge.phpdt.internal.ui.util.TabFolderLayout;
-import net.sourceforge.phpdt.internal.ui.wizards.IStatusChangeListener;
-
 /**
   */
 public class CompilerConfigurationBlock extends OptionsConfigurationBlock {
 
        // Preference store keys, see JavaCore.getOptions
     private static final String PREF_PB_PHP_VAR_DEPRECATED= JavaCore.COMPILER_PB_PHP_VAR_DEPRECATED;
+    private static final String PREF_PB_PHP_KEYWORD= JavaCore.COMPILER_PB_PHP_KEYWORD;
+    private static final String PREF_PB_PHP_UPPERCASE_IDENTIFIER= JavaCore.COMPILER_PB_PHP_UPPERCASE_IDENTIFIER;
        
 //     private static final String PREF_LOCAL_VARIABLE_ATTR=  JavaCore.COMPILER_LOCAL_VARIABLE_ATTR;
 //     private static final String PREF_LINE_NUMBER_ATTR= JavaCore.COMPILER_LINE_NUMBER_ATTR;
@@ -151,7 +148,7 @@ public class CompilerConfigurationBlock extends OptionsConfigurationBlock {
 //     private IStatus fComplianceStatus, fMaxNumberProblemsStatus, fResourceFilterStatus;
 
        public CompilerConfigurationBlock(IStatusChangeListener context, IJavaProject project) {
-               super(context, project);
+               super(context, project, getKeys());
                
                fComplianceControls= new ArrayList();
                        
@@ -166,8 +163,10 @@ public class CompilerConfigurationBlock extends OptionsConfigurationBlock {
                
        }
        
-       private final String[] KEYS= new String[] {
+       private final static String[] KEYS= new String[] {
            PREF_PB_PHP_VAR_DEPRECATED,
+           PREF_PB_PHP_KEYWORD,
+           PREF_PB_PHP_UPPERCASE_IDENTIFIER,
 //             PREF_LOCAL_VARIABLE_ATTR, 
 //             PREF_LINE_NUMBER_ATTR, PREF_SOURCE_FILE_ATTR, PREF_CODEGEN_UNUSED_LOCAL,
 //             PREF_CODEGEN_TARGET_PLATFORM, 
@@ -214,7 +213,7 @@ public class CompilerConfigurationBlock extends OptionsConfigurationBlock {
 //             PREF_PB_MISSING_JAVADOC_COMMENTS_OVERRIDING
        };      
        
-       protected String[] getAllKeys() {
+       private static  String[] getKeys() {
                return KEYS;    
        }
        
@@ -304,7 +303,13 @@ public class CompilerConfigurationBlock extends OptionsConfigurationBlock {
 
                String label= PreferencesMessages.getString("CompilerConfigurationBlock.pb_var_deprecated.label"); //$NON-NLS-1$
                addComboBox(composite, label, PREF_PB_PHP_VAR_DEPRECATED, errorWarningIgnore, errorWarningIgnoreLabels, 0);                     
-
+               
+               label= PreferencesMessages.getString("CompilerConfigurationBlock.pb_keyword.label"); //$NON-NLS-1$
+               addComboBox(composite, label, PREF_PB_PHP_KEYWORD, errorWarningIgnore, errorWarningIgnoreLabels, 0);                    
+               
+               label= PreferencesMessages.getString("CompilerConfigurationBlock.pb_uppercase_identifier.label"); //$NON-NLS-1$
+               addComboBox(composite, label, PREF_PB_PHP_UPPERCASE_IDENTIFIER, errorWarningIgnore, errorWarningIgnoreLabels, 0);                       
+               
                label= PreferencesMessages.getString("CompilerConfigurationBlock.pb_overriding_pkg_dflt.label"); //$NON-NLS-1$
 //             addComboBox(composite, label, PREF_PB_OVERRIDING_PACKAGE_DEFAULT_METHOD, errorWarningIgnore, errorWarningIgnoreLabels, 0);