X-Git-Url: http://git.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 e1700c5..7c6e28f 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
@@ -67,21 +67,26 @@ import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Combo;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Event;
 import org.eclipse.swt.widgets.Group;
 import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Link;
 import org.eclipse.swt.widgets.List;
+import org.eclipse.swt.widgets.Listener;
 import org.eclipse.swt.widgets.TabFolder;
 import org.eclipse.swt.widgets.TabItem;
 import org.eclipse.swt.widgets.Text;
 import org.eclipse.ui.IWorkbench;
 import org.eclipse.ui.IWorkbenchPreferencePage;
 import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.dialogs.PreferencesUtil;
 import org.eclipse.ui.editors.text.EditorsUI;
 import org.eclipse.ui.texteditor.AbstractDecoratedTextEditorPreferenceConstants;
 import org.eclipse.ui.texteditor.AnnotationPreference;
 import org.eclipse.ui.texteditor.ChainedPreferenceStore;
 import org.eclipse.ui.texteditor.MarkerAnnotationPreferences;
 
+
 /**
  * The page for setting the editor options.
  */
@@ -185,11 +190,6 @@ public class JavaEditorPreferencePage extends PreferencePage implements
 	private final String[][] fAppearanceColorListModel = new String[][] {
 			{
 					PreferencesMessages
-							.getString("JavaEditorPreferencePage.lineNumberForegroundColor"),
-					AbstractDecoratedTextEditorPreferenceConstants.EDITOR_LINE_NUMBER_RULER_COLOR },
-			//$NON-NLS-1$
-			{
-					PreferencesMessages
 							.getString("JavaEditorPreferencePage.matchingBracketsHighlightColor2"),
 					PreferenceConstants.EDITOR_MATCHING_BRACKETS_COLOR },
 			//$NON-NLS-1$
@@ -558,14 +558,6 @@ public class JavaEditorPreferencePage extends PreferencePage implements
 				.add(new OverlayPreferenceStore.OverlayKey(
 						OverlayPreferenceStore.BOOLEAN,
 						AbstractDecoratedTextEditorPreferenceConstants.EDITOR_OVERVIEW_RULER));
-		overlayKeys
-				.add(new OverlayPreferenceStore.OverlayKey(
-						OverlayPreferenceStore.STRING,
-						AbstractDecoratedTextEditorPreferenceConstants.EDITOR_LINE_NUMBER_RULER_COLOR));
-		overlayKeys
-				.add(new OverlayPreferenceStore.OverlayKey(
-						OverlayPreferenceStore.BOOLEAN,
-						AbstractDecoratedTextEditorPreferenceConstants.EDITOR_LINE_NUMBER_RULER));
 		overlayKeys.add(new OverlayPreferenceStore.OverlayKey(
 				OverlayPreferenceStore.BOOLEAN,
 				PreferenceConstants.EDITOR_SPACES_FOR_TABS));
@@ -984,7 +976,28 @@ public class JavaEditorPreferencePage extends PreferencePage implements
 		GridLayout layout = new GridLayout();
 		layout.numColumns = 2;
 		appearanceComposite.setLayout(layout);
+		
+		// Inserts a hyper-link to the General Editor preferences page
+		// TODO Can probably be removed post 1.5.0?
 		String label = PreferencesMessages
+				.getString("JavaEditorPreferencePage.appearanceTabLink");
+		Link link = new Link(appearanceComposite, SWT.NONE);
+		GridData gridPosition = new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING);
+		gridPosition.horizontalSpan = 2;
+		link.setLayoutData(gridPosition);
+		
+		link.setText(label);
+		link.addListener(SWT.Selection, new Listener () {
+			public void handleEvent(Event event) {
+				String u = event.text;
+				PreferencesUtil.createPreferenceDialogOn(getShell(), u, null, null);
+			}
+		});
+		String tooltip = PreferencesMessages
+				.getString("JavaEditorPreferencePage.appearanceTabTooltip");
+		link.setToolTipText(tooltip);		
+			
+		label = PreferencesMessages
 				.getString("JavaEditorPreferencePage.displayedTabWidth"); //$NON-NLS-1$
 		addTextField(appearanceComposite, label,
 				PreferenceConstants.EDITOR_TAB_WIDTH, 3, 0, true);
@@ -1003,13 +1016,6 @@ public class JavaEditorPreferencePage extends PreferencePage implements
 				AbstractDecoratedTextEditorPreferenceConstants.EDITOR_OVERVIEW_RULER,
 				0);
 		label = PreferencesMessages
-				.getString("JavaEditorPreferencePage.showLineNumbers"); //$NON-NLS-1$
-		addCheckBox(
-				appearanceComposite,
-				label,
-				AbstractDecoratedTextEditorPreferenceConstants.EDITOR_LINE_NUMBER_RULER,
-				0);
-		label = PreferencesMessages
 				.getString("JavaEditorPreferencePage.highlightMatchingBrackets"); //$NON-NLS-1$
 		addCheckBox(appearanceComposite, label,
 				PreferenceConstants.EDITOR_MATCHING_BRACKETS, 0);