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

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/preferences/JavaEditorPreferencePage.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/preferences/JavaEditorPreferencePage.java
index 1e949f7..a857b52 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/preferences/JavaEditorPreferencePage.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/preferences/JavaEditorPreferencePage.java
@@ -289,8 +289,8 @@ public class JavaEditorPreferencePage extends PreferencePage
   private Button fBackgroundCustomRadioButton;
   private Button fBackgroundColorButton;
   private Button fBoldCheckBox;
-  //	private Button fAddJavaDocTagsButton;
-  //	private Button fEscapeStringsButton;
+  private Button fAddJavaDocTagsButton;
+  private Button fEscapeStringsButton;
   //	private Button fGuessMethodArgumentsButton;
   private SourceViewer fPreviewViewer;
   private Color fBackgroundColor;
@@ -523,12 +523,12 @@ public class JavaEditorPreferencePage extends PreferencePage
         .add(new OverlayPreferenceStore.OverlayKey(
             OverlayPreferenceStore.BOOLEAN,
             PreferenceConstants.EDITOR_SMART_PASTE));
-    //		overlayKeys.add(new
-    // OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN,
-    // PreferenceConstants.EDITOR_CLOSE_STRINGS));
-    //		overlayKeys.add(new
-    // OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN,
-    // PreferenceConstants.EDITOR_CLOSE_BRACKETS));
+    		overlayKeys.add(new
+     OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN,
+     PreferenceConstants.EDITOR_CLOSE_STRINGS_PHP));
+    		overlayKeys.add(new
+     OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN,
+     PreferenceConstants.EDITOR_CLOSE_BRACKETS_PHP));
     overlayKeys
         .add(new OverlayPreferenceStore.OverlayKey(
             OverlayPreferenceStore.BOOLEAN,
@@ -540,21 +540,21 @@ public class JavaEditorPreferencePage extends PreferencePage
         .add(new OverlayPreferenceStore.OverlayKey(
             OverlayPreferenceStore.BOOLEAN,
             PreferenceConstants.EDITOR_WRAP_STRINGS));
-    //		overlayKeys.add(new
-    // OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN,
-    // PreferenceConstants.EDITOR_ESCAPE_STRINGS));
+    		overlayKeys.add(new
+     OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN,
+     PreferenceConstants.EDITOR_ESCAPE_STRINGS));
     overlayKeys.add(new OverlayPreferenceStore.OverlayKey(
         OverlayPreferenceStore.BOOLEAN,
         PreferenceConstants.EDITOR_ADD_JAVADOC_TAGS));
     overlayKeys.add(new OverlayPreferenceStore.OverlayKey(
         OverlayPreferenceStore.BOOLEAN,
         PreferenceConstants.EDITOR_SMART_HOME_END));
-    //		overlayKeys.add(new
-    // OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN,
-    // PreferenceConstants.EDITOR_SUB_WORD_NAVIGATION));
-    //		overlayKeys.add(new
-    // OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN,
-    // PreferenceConstants.EDITOR_DISABLE_OVERWRITE_MODE));
+    		overlayKeys.add(new
+     OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN,
+     PreferenceConstants.EDITOR_SUB_WORD_NAVIGATION));
+    		overlayKeys.add(new
+     OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN,
+     PreferenceConstants.EDITOR_DISABLE_OVERWRITE_MODE));
     //		overlayKeys.add(new
     // OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN,
     // PreferenceConstants.EDITOR_SHOW_TEXT_HOVER_AFFORDANCE));
@@ -1151,82 +1151,82 @@ public class JavaEditorPreferencePage extends PreferencePage
     GridLayout layout = new GridLayout();
     layout.numColumns = 1;
     composite.setLayout(layout);
-    //		String label=
-    // PreferencesMessages.getString("JavaEditorPreferencePage.overwriteMode");
-    // //$NON-NLS-1$
-    //		addCheckBox(composite, label,
-    // PreferenceConstants.EDITOR_DISABLE_OVERWRITE_MODE, 1);
-    //		addFiller(composite);
-    //		
-    //		label=
-    // PreferencesMessages.getString("JavaEditorPreferencePage.smartHomeEnd");
-    // //$NON-NLS-1$
-    //		addCheckBox(composite, label, PreferenceConstants.EDITOR_SMART_HOME_END,
-    // 1);
-    //
-    //		label=
-    // PreferencesMessages.getString("JavaEditorPreferencePage.subWordNavigation");
-    // //$NON-NLS-1$
-    //		addCheckBox(composite, label,
-    // PreferenceConstants.EDITOR_SUB_WORD_NAVIGATION, 1);
-    addFiller(composite);
+    		String label=
+     PreferencesMessages.getString("JavaEditorPreferencePage.overwriteMode");
+     //$NON-NLS-1$
+    		addCheckBox(composite, label,
+     PreferenceConstants.EDITOR_DISABLE_OVERWRITE_MODE, 1);
+    		addFiller(composite);
+    		
+    		label=
+     PreferencesMessages.getString("JavaEditorPreferencePage.smartHomeEnd");
+     //$NON-NLS-1$
+    		addCheckBox(composite, label, PreferenceConstants.EDITOR_SMART_HOME_END,
+     1);
+    
+    		label=
+     PreferencesMessages.getString("JavaEditorPreferencePage.subWordNavigation");
+     //$NON-NLS-1$
+    		addCheckBox(composite, label,
+     PreferenceConstants.EDITOR_SUB_WORD_NAVIGATION, 1);
+    addFiller(composite); 
     Group group = new Group(composite, SWT.NONE);
     layout = new GridLayout();
     layout.numColumns = 2;
     group.setLayout(layout);
     group.setText(PreferencesMessages
         .getString("JavaEditorPreferencePage.typing.description")); //$NON-NLS-1$
-    //		label=
-    // PreferencesMessages.getString("JavaEditorPreferencePage.wrapStrings");
-    // //$NON-NLS-1$
-    //		Button button= addCheckBox(group, label,
-    // PreferenceConstants.EDITOR_WRAP_STRINGS, 1);
-    //		
-    //		label=
-    // PreferencesMessages.getString("JavaEditorPreferencePage.escapeStrings");
-    // //$NON-NLS-1$
-    //		fEscapeStringsButton= addCheckBox(group, label,
-    // PreferenceConstants.EDITOR_ESCAPE_STRINGS, 1);
-    //		createDependency(button, fEscapeStringsButton);
-    //
-    //		label=
-    // PreferencesMessages.getString("JavaEditorPreferencePage.smartPaste");
-    // //$NON-NLS-1$
-    //		addCheckBox(group, label, PreferenceConstants.EDITOR_SMART_PASTE, 1);
-    //
-    //		label=
-    // PreferencesMessages.getString("JavaEditorPreferencePage.insertSpaceForTabs");
-    // //$NON-NLS-1$
-    //		addCheckBox(group, label, PreferenceConstants.EDITOR_SPACES_FOR_TABS,
-    // 1);
-    //
-    //		label=
-    // PreferencesMessages.getString("JavaEditorPreferencePage.closeStrings");
-    // //$NON-NLS-1$
-    //		addCheckBox(group, label, PreferenceConstants.EDITOR_CLOSE_STRINGS, 1);
-    //
-    //		label=
-    // PreferencesMessages.getString("JavaEditorPreferencePage.closeBrackets");
-    // //$NON-NLS-1$
-    //		addCheckBox(group, label, PreferenceConstants.EDITOR_CLOSE_BRACKETS, 1);
-    //
-    //		label=
-    // PreferencesMessages.getString("JavaEditorPreferencePage.closeBraces");
-    // //$NON-NLS-1$
-    //		addCheckBox(group, label, PreferenceConstants.EDITOR_CLOSE_BRACES, 1);
-    //
-    //		label=
-    // PreferencesMessages.getString("JavaEditorPreferencePage.closeJavaDocs");
-    // //$NON-NLS-1$
-    //		button= addCheckBox(group, label,
-    // PreferenceConstants.EDITOR_CLOSE_JAVADOCS, 1);
-    //
-    //		label=
-    // PreferencesMessages.getString("JavaEditorPreferencePage.addJavaDocTags");
-    // //$NON-NLS-1$
-    //		fAddJavaDocTagsButton= addCheckBox(group, label,
-    // PreferenceConstants.EDITOR_ADD_JAVADOC_TAGS, 1);
-    //		createDependency(button, fAddJavaDocTagsButton);
+    		label=
+     PreferencesMessages.getString("JavaEditorPreferencePage.wrapStrings");
+     //$NON-NLS-1$
+    		Button button= addCheckBox(group, label,
+     PreferenceConstants.EDITOR_WRAP_STRINGS, 1);
+    		
+    		label=
+     PreferencesMessages.getString("JavaEditorPreferencePage.escapeStrings");
+     //$NON-NLS-1$
+    		fEscapeStringsButton= addCheckBox(group, label,
+     PreferenceConstants.EDITOR_ESCAPE_STRINGS, 1);
+    		createDependency(button, fEscapeStringsButton);
+    
+    		label=
+     PreferencesMessages.getString("JavaEditorPreferencePage.smartPaste");
+     //$NON-NLS-1$
+    		addCheckBox(group, label, PreferenceConstants.EDITOR_SMART_PASTE, 1);
+    
+    		label=
+     PreferencesMessages.getString("JavaEditorPreferencePage.insertSpaceForTabs");
+     //$NON-NLS-1$
+    		addCheckBox(group, label, PreferenceConstants.EDITOR_SPACES_FOR_TABS,
+     1);
+    
+    		label=
+     PreferencesMessages.getString("JavaEditorPreferencePage.closeStrings");
+     //$NON-NLS-1$
+    		addCheckBox(group, label, PreferenceConstants.EDITOR_CLOSE_STRINGS_PHP, 1);
+    
+    		label=
+     PreferencesMessages.getString("JavaEditorPreferencePage.closeBrackets");
+     //$NON-NLS-1$
+    		addCheckBox(group, label, PreferenceConstants.EDITOR_CLOSE_BRACKETS_PHP, 1);
+    
+    		label=
+     PreferencesMessages.getString("JavaEditorPreferencePage.closeBraces");
+     //$NON-NLS-1$
+    		addCheckBox(group, label, PreferenceConstants.EDITOR_CLOSE_BRACES, 1);
+    
+    		label=
+     PreferencesMessages.getString("JavaEditorPreferencePage.closeJavaDocs");
+     //$NON-NLS-1$
+    		button= addCheckBox(group, label,
+     PreferenceConstants.EDITOR_CLOSE_JAVADOCS, 1);
+    
+    		label=
+     PreferencesMessages.getString("JavaEditorPreferencePage.addJavaDocTags");
+     //$NON-NLS-1$
+    		fAddJavaDocTagsButton= addCheckBox(group, label,
+     PreferenceConstants.EDITOR_ADD_JAVADOC_TAGS, 1);
+    		createDependency(button, fAddJavaDocTagsButton);
     return composite;
   }
   private void addFiller(Composite composite) {
@@ -1569,30 +1569,30 @@ public class JavaEditorPreferencePage extends PreferencePage
     item.setText(PreferencesMessages
         .getString("JavaEditorPreferencePage.colors")); //$NON-NLS-1$
     item.setControl(createSyntaxPage(folder));
-    //		item= new TabItem(folder, SWT.NONE);
-    //		item.setText(PreferencesMessages.getString("JavaEditorPreferencePage.codeAssist"));
-    // //$NON-NLS-1$
-    //		item.setControl(createContentAssistPage(folder));
+    		item= new TabItem(folder, SWT.NONE);
+    		item.setText(PreferencesMessages.getString("JavaEditorPreferencePage.codeAssist"));
+     //$NON-NLS-1$
+    		item.setControl(createContentAssistPage(folder));
     item = new TabItem(folder, SWT.NONE);
     item.setText(PreferencesMessages
         .getString("JavaEditorPreferencePage.annotationsTab.title")); //$NON-NLS-1$
     item.setControl(createAnnotationsPage(folder));
-    //		item= new TabItem(folder, SWT.NONE);
-    //		item.setText(PreferencesMessages.getString("JavaEditorPreferencePage.typing.tabTitle"));
-    // //$NON-NLS-1$
-    //		item.setControl(createTypingPage(folder));
-    //
-    //		item= new TabItem(folder, SWT.NONE);
-    //		item.setText(PreferencesMessages.getString("JavaEditorPreferencePage.hoverTab.title"));
-    // //$NON-NLS-1$
-    //		fJavaEditorHoverConfigurationBlock= new
-    // JavaEditorHoverConfigurationBlock(this, fOverlayStore);
-    //		item.setControl(fJavaEditorHoverConfigurationBlock.createControl(folder));
-    //		item= new TabItem(folder, SWT.NONE);
-    //		item.setText(PreferencesMessages.getString("JavaEditorPreferencePage.navigationTab.title"));
-    // //$NON-NLS-1$
-    //		item.setControl(createNavigationPage(folder));
-    //		
+    		item= new TabItem(folder, SWT.NONE);
+    		item.setText(PreferencesMessages.getString("JavaEditorPreferencePage.typing.tabTitle"));
+     //$NON-NLS-1$
+    		item.setControl(createTypingPage(folder));
+    
+    		item= new TabItem(folder, SWT.NONE);
+    		item.setText(PreferencesMessages.getString("JavaEditorPreferencePage.hoverTab.title"));
+     //$NON-NLS-1$
+    		fJavaEditorHoverConfigurationBlock= new
+     JavaEditorHoverConfigurationBlock(this, fOverlayStore);
+    		item.setControl(fJavaEditorHoverConfigurationBlock.createControl(folder));
+    		item= new TabItem(folder, SWT.NONE);
+    		item.setText(PreferencesMessages.getString("JavaEditorPreferencePage.navigationTab.title"));
+     //$NON-NLS-1$
+    		item.setControl(createNavigationPage(folder));
+    		
     initialize();
     Dialog.applyDialogFont(folder);
     return folder;
@@ -1669,10 +1669,10 @@ public class JavaEditorPreferencePage extends PreferencePage
     fBackgroundDefaultRadioButton.setSelection(default_);
     fBackgroundCustomRadioButton.setSelection(!default_);
     fBackgroundColorButton.setEnabled(!default_);
-    //		boolean closeJavaDocs=
-    // fOverlayStore.getBoolean(PreferenceConstants.EDITOR_CLOSE_JAVADOCS);
-    //		fAddJavaDocTagsButton.setEnabled(closeJavaDocs);
-    //		fEscapeStringsButton.setEnabled(fOverlayStore.getBoolean(PreferenceConstants.EDITOR_WRAP_STRINGS));
+    		boolean closeJavaDocs=
+     fOverlayStore.getBoolean(PreferenceConstants.EDITOR_CLOSE_JAVADOCS);
+    		fAddJavaDocTagsButton.setEnabled(closeJavaDocs);
+    		fEscapeStringsButton.setEnabled(fOverlayStore.getBoolean(PreferenceConstants.EDITOR_WRAP_STRINGS));
     //		boolean fillMethodArguments=
     // fOverlayStore.getBoolean(PreferenceConstants.CODEASSIST_FILL_ARGUMENT_NAMES);
     //		fGuessMethodArgumentsButton.setEnabled(fillMethodArguments);