fixes for bugs

https://bugs.eclipse.org/bugs/show_bug.cgi?id=51612
 - JavaEditorPreferencePage.java

https://bugs.eclipse.org/bugs/show_bug.cgi?id=51598
 - org.eclipse.jdt.ui/plugin.xml

https://bugs.eclipse.org/bugs/show_bug.cgi?id=51604
https://bugs.eclipse.org/bugs/show_bug.cgi?id=51644
 - PreferenceMessages

3 files changed, 20 insertions, 7 deletions

diff --git a/org.eclipse.jdt.ui/plugin.xml b/org.eclipse.jdt.ui/plugin.xml
index 6eadaee3c6..ea34e92239 100644
--- a/org.eclipse.jdt.ui/plugin.xml
+++ b/org.eclipse.jdt.ui/plugin.xml
@@ -617,6 +617,8 @@
             highlightPreferenceValue="true"
             textStylePreferenceKey="linked.focus.text.style"
             textStylePreferenceValue="BOX"
+            verticalRulerPreferenceKey="linked.focus.verticalruler"
+            verticalRulerPreferenceValue="false"
             overviewRulerPreferenceKey="linked.focus.overviewruler">
       </specification>      
       <specification
@@ -639,6 +641,8 @@
             highlightPreferenceValue="true"
             textStylePreferenceKey="linked.slave.text.style"
             textStylePreferenceValue="NONE"
+            verticalRulerPreferenceKey="linked.slave.verticalruler"
+            verticalRulerPreferenceValue="false"
             overviewRulerPreferenceKey="linked.slave.overviewruler">
       </specification>      
       <specification
@@ -661,6 +665,8 @@
             highlightPreferenceValue="false"
             textStylePreferenceKey="linked.target.text.style"
             textStylePreferenceValue="BOX"
+            verticalRulerPreferenceKey="linked.target.verticalruler"
+            verticalRulerPreferenceValue="false"
             overviewRulerPreferenceKey="linked.target.overviewruler">
       </specification>
       <specification
@@ -683,6 +689,8 @@
             highlightPreferenceValue="false"
             textStylePreferenceKey="linked.exit.text.style"
             textStylePreferenceValue="IBEAM"
+            verticalRulerPreferenceKey="linked.exit.verticalruler"
+            verticalRulerPreferenceValue="false"
             overviewRulerPreferenceKey="linked.exit.overviewruler">
       </specification>
 	</extension>
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/JavaEditorPreferencePage.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/JavaEditorPreferencePage.java
index 41e5e8cb69..c8b5e03402 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/JavaEditorPreferencePage.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/JavaEditorPreferencePage.java
@@ -86,7 +86,7 @@ import org.eclipse.jdt.internal.ui.javaeditor.JavaSourceViewer;
 import org.eclipse.jdt.internal.ui.text.IJavaPartitions;
 import org.eclipse.jdt.internal.ui.util.TabFolderLayout;
 
-/*
+/**
  * The page for setting the editor options.
  */
 public class JavaEditorPreferencePage extends PreferencePage implements IWorkbenchPreferencePage {
@@ -95,6 +95,7 @@ public class JavaEditorPreferencePage extends PreferencePage implements IWorkben
 	private static final String COMPILER_TASK_TAGS= JavaCore.COMPILER_TASK_TAGS;	
 	private static final String DELIMITER= PreferencesMessages.getString("JavaEditorPreferencePage.navigation.delimiter"); //$NON-NLS-1$
 
+	/** The keys of the overlay store. */
 	public final OverlayPreferenceStore.OverlayKey[] fKeys;	
 	private final String[][] fSyntaxColorListModel= new String[][] {
 		{ PreferencesMessages.getString("JavaEditorPreferencePage.multiLineComment"), PreferenceConstants.EDITOR_MULTI_LINE_COMMENT_COLOR }, //$NON-NLS-1$
@@ -206,6 +207,9 @@ public class JavaEditorPreferencePage extends PreferencePage implements IWorkben
 	private Button fCompletionOverwritesRadioButton;
 	private Button fStickyOccurrencesButton;
 	
+	/**
+	 * Creates a new preference page.
+	 */
 	public JavaEditorPreferencePage() {
 		setDescription(PreferencesMessages.getString("JavaEditorPreferencePage.description")); //$NON-NLS-1$
 		setPreferenceStore(JavaPlugin.getDefault().getPreferenceStore());
@@ -748,6 +752,7 @@ public class JavaEditorPreferencePage extends PreferencePage implements IWorkben
 		gd= new GridData(GridData.FILL_HORIZONTAL);
 		gd.horizontalAlignment= GridData.BEGINNING;
         gd.horizontalSpan= 2;
+		gd.horizontalIndent= 20;
 		fDecorationStyleCombo.setLayoutData(gd);
 		
 		fHighlightInTextCheckBox= new Button(optionsComposite, SWT.CHECK);
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/PreferencesMessages.properties b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/PreferencesMessages.properties
index dbda3b3edb..07d9ae9bd4 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/PreferencesMessages.properties
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/PreferencesMessages.properties
@@ -624,23 +624,23 @@ WorkInProgress.quickdiff.appearanceOptions= Appearance color options:
 WorkInProgress.editor=Editor
 WorkInProgress.formatComments= Enable formatting of Javadoc, multi- and single line comments (reopen editor for activation)
 WorkInProgress.smartTyping.label= Enable the following functions in Smart Insert typing mode
-WorkInProgress.smartTyping.smartSemicolon= Smart Semicolon
-WorkInProgress.smartTyping.smartOpeningBrace= Smart Opening Brace
+WorkInProgress.smartTyping.smartSemicolon= Smart &Semicolon
+WorkInProgress.smartTyping.smartOpeningBrace= Smart Opening &Brace
 WorkInProgress.smartTyping.smartTab= Smart &Tab
 WorkInProgress.formatter= Code Fomatter
 WorkInProgress.formatter.option= Enable new code fomatter (press 'Apply' before going to the formatter preference page)
 WorkInProgress.quickassist.group= Quick Assist
 WorkInProgress.quickassist.option= Enable light bulb for quick assists
-WorkInProgress.showQuickDiffPerDefault=Always show Quick Diff coloring
+WorkInProgress.showQuickDiffPerDefault=Always show &Quick Diff coloring
 WorkInProgress.quickdiff.referenceprovidertitle=Quick Diff reference providers:
-WorkInProgress.quickdiff.setDefault=Make Default
+WorkInProgress.quickdiff.setDefault=Make &Default
 WorkInProgress.quickdiff.defaultlabel= (default)
 WorkInProgress.quickdiff.characterMode= Show changes using &characters instead of colors (on line number bar only)
 WorkInProgress.search= Search
 WorkInProgress.search.small_menu=Use reduced search menu
 WorkInProgress.newsearch.option=Use new search view
 WorkInProgress.search.ignore_imports=Ignore references in imports statements
-WorkInProgress.rollover= Enable annotation roll-over
+WorkInProgress.rollover= Enable annotation &roll-over (does not affect already open editors)
 
 JavadocPreferencePage.title=Javadoc
 
@@ -673,7 +673,7 @@ SpellingPreferencePage.preferences.advanced=&Advanced
 
 
 JavaEditorPreferencePage.AnnotationDecoration.NONE=None
-JavaEditorPreferencePage.AnnotationDecoration.SQUIGGLIES=Squigglies
+JavaEditorPreferencePage.AnnotationDecoration.SQUIGGLIES=Squiggles
 JavaEditorPreferencePage.AnnotationDecoration.UNDERLINE=Underline
 JavaEditorPreferencePage.AnnotationDecoration.BOX=Box
 JavaEditorPreferencePage.AnnotationDecoration.IBEAM=IBeam