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

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/preferences/MarkOccurrencesConfigurationBlock.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/preferences/MarkOccurrencesConfigurationBlock.java
index dab1aa8..cd88ab4 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/preferences/MarkOccurrencesConfigurationBlock.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/preferences/MarkOccurrencesConfigurationBlock.java
@@ -16,8 +16,12 @@ import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
 
-import org.eclipse.core.runtime.IStatus;
+import net.sourceforge.phpdt.internal.ui.dialogs.StatusInfo;
+import net.sourceforge.phpdt.internal.ui.util.PixelConverter;
+import net.sourceforge.phpdt.ui.PreferenceConstants;
 
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.jface.text.Assert;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.events.SelectionListener;
@@ -28,146 +32,197 @@ import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Label;
 
-import org.eclipse.jface.text.Assert;
-
-import net.sourceforge.phpdt.ui.PreferenceConstants;
-
-import net.sourceforge.phpdt.internal.ui.dialogs.StatusInfo;
-import net.sourceforge.phpdt.internal.ui.util.PixelConverter;
-
 /**
  * Configures Java Editor hover preferences.
- *
+ * 
  * @since 2.1
  */
-class MarkOccurrencesConfigurationBlock implements IPreferenceConfigurationBlock {
+class MarkOccurrencesConfigurationBlock implements
+		IPreferenceConfigurationBlock {
 
 	private OverlayPreferenceStore fStore;
 
+	private Map fCheckBoxes = new HashMap();
 
-	private Map fCheckBoxes= new HashMap();
-	private SelectionListener fCheckBoxListener= new SelectionListener() {
+	private SelectionListener fCheckBoxListener = new SelectionListener() {
 		public void widgetDefaultSelected(SelectionEvent e) {
 		}
+
 		public void widgetSelected(SelectionEvent e) {
-			Button button= (Button) e.widget;
-			fStore.setValue((String) fCheckBoxes.get(button), button.getSelection());
+			Button button = (Button) e.widget;
+			fStore.setValue((String) fCheckBoxes.get(button), button
+					.getSelection());
 		}
 	};
 
 	/**
 	 * List of master/slave listeners when there's a dependency.
-	 *
+	 * 
 	 * @see #createDependency(Button, String, Control)
 	 * @since 3.0
 	 */
-	private ArrayList fMasterSlaveListeners= new ArrayList();
+	private ArrayList fMasterSlaveListeners = new ArrayList();
 
 	private StatusInfo fStatus;
 
 	public MarkOccurrencesConfigurationBlock(OverlayPreferenceStore store) {
 		Assert.isNotNull(store);
-		fStore= store;
+		fStore = store;
 
 		fStore.addKeys(createOverlayStoreKeys());
 	}
 
 	private OverlayPreferenceStore.OverlayKey[] createOverlayStoreKeys() {
 
-		ArrayList overlayKeys= new ArrayList();
-
-		overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN, PreferenceConstants.EDITOR_MARK_OCCURRENCES));
-//		overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN, PreferenceConstants.EDITOR_MARK_TYPE_OCCURRENCES));
-//		overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN, PreferenceConstants.EDITOR_MARK_METHOD_OCCURRENCES));
-//		overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN, PreferenceConstants.EDITOR_MARK_CONSTANT_OCCURRENCES));
-//		overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN, PreferenceConstants.EDITOR_MARK_FIELD_OCCURRENCES));
-//		overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN, PreferenceConstants.EDITOR_MARK_LOCAL_VARIABLE_OCCURRENCES));
-//		overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN, PreferenceConstants.EDITOR_MARK_EXCEPTION_OCCURRENCES));
-//		overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN, PreferenceConstants.EDITOR_MARK_METHOD_EXIT_POINTS));
-//		overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN, PreferenceConstants.EDITOR_MARK_IMPLEMENTORS));
-		overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN, PreferenceConstants.EDITOR_STICKY_OCCURRENCES));
-
-		OverlayPreferenceStore.OverlayKey[] keys= new OverlayPreferenceStore.OverlayKey[overlayKeys.size()];
+		ArrayList overlayKeys = new ArrayList();
+
+		overlayKeys.add(new OverlayPreferenceStore.OverlayKey(
+				OverlayPreferenceStore.BOOLEAN,
+				PreferenceConstants.EDITOR_MARK_OCCURRENCES));
+		// overlayKeys.add(new
+		// OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN,
+		// PreferenceConstants.EDITOR_MARK_TYPE_OCCURRENCES));
+		// overlayKeys.add(new
+		// OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN,
+		// PreferenceConstants.EDITOR_MARK_METHOD_OCCURRENCES));
+		// overlayKeys.add(new
+		// OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN,
+		// PreferenceConstants.EDITOR_MARK_CONSTANT_OCCURRENCES));
+		// overlayKeys.add(new
+		// OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN,
+		// PreferenceConstants.EDITOR_MARK_FIELD_OCCURRENCES));
+		// overlayKeys.add(new
+		// OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN,
+		// PreferenceConstants.EDITOR_MARK_LOCAL_VARIABLE_OCCURRENCES));
+		// overlayKeys.add(new
+		// OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN,
+		// PreferenceConstants.EDITOR_MARK_EXCEPTION_OCCURRENCES));
+		// overlayKeys.add(new
+		// OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN,
+		// PreferenceConstants.EDITOR_MARK_METHOD_EXIT_POINTS));
+		// overlayKeys.add(new
+		// OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN,
+		// PreferenceConstants.EDITOR_MARK_IMPLEMENTORS));
+		overlayKeys.add(new OverlayPreferenceStore.OverlayKey(
+				OverlayPreferenceStore.BOOLEAN,
+				PreferenceConstants.EDITOR_STICKY_OCCURRENCES));
+
+		OverlayPreferenceStore.OverlayKey[] keys = new OverlayPreferenceStore.OverlayKey[overlayKeys
+				.size()];
 		overlayKeys.toArray(keys);
 		return keys;
 	}
 
 	/**
 	 * Creates page for mark occurrences preferences.
-	 *
-	 * @param parent the parent composite
+	 * 
+	 * @param parent
+	 *            the parent composite
 	 * @return the control for the preference page
 	 */
 	public Control createControl(Composite parent) {
 
-		Composite composite= new Composite(parent, SWT.NONE);
-		GridLayout layout= new GridLayout();
-		layout.numColumns= 1;
+		Composite composite = new Composite(parent, SWT.NONE);
+		GridLayout layout = new GridLayout();
+		layout.numColumns = 1;
 		composite.setLayout(layout);
 
 		String label;
 
-		label= PreferencesMessages.getString("JavaEditorPreferencePage.markOccurrences");
-		Button master= addCheckBox(composite, label, PreferenceConstants.EDITOR_MARK_OCCURRENCES, 0); //$NON-NLS-1$
-
-//		label= PreferencesMessages.MarkOccurrencesConfigurationBlock_markTypeOccurrences;
-//		Button slave= addCheckBox(composite, label, PreferenceConstants.EDITOR_MARK_TYPE_OCCURRENCES, 0); //$NON-NLS-1$
-//		createDependency(master, PreferenceConstants.EDITOR_STICKY_OCCURRENCES, slave);
-//
-//		label= PreferencesMessages.MarkOccurrencesConfigurationBlock_markMethodOccurrences;
-//		slave= addCheckBox(composite, label, PreferenceConstants.EDITOR_MARK_METHOD_OCCURRENCES, 0); //$NON-NLS-1$
-//		createDependency(master, PreferenceConstants.EDITOR_MARK_METHOD_OCCURRENCES, slave);
-//
-//		label= PreferencesMessages.MarkOccurrencesConfigurationBlock_markConstantOccurrences;
-//		slave= addCheckBox(composite, label, PreferenceConstants.EDITOR_MARK_CONSTANT_OCCURRENCES, 0); //$NON-NLS-1$
-//		createDependency(master, PreferenceConstants.EDITOR_MARK_CONSTANT_OCCURRENCES, slave);
-//
-//		label= PreferencesMessages.MarkOccurrencesConfigurationBlock_markFieldOccurrences;
-//		slave= addCheckBox(composite, label, PreferenceConstants.EDITOR_MARK_FIELD_OCCURRENCES, 0); //$NON-NLS-1$
-//		createDependency(master, PreferenceConstants.EDITOR_MARK_FIELD_OCCURRENCES, slave);
-//
-//		label= PreferencesMessages.MarkOccurrencesConfigurationBlock_markLocalVariableOccurrences;
-//		slave= addCheckBox(composite, label, PreferenceConstants.EDITOR_MARK_LOCAL_VARIABLE_OCCURRENCES, 0); //$NON-NLS-1$
-//		createDependency(master, PreferenceConstants.EDITOR_MARK_LOCAL_VARIABLE_OCCURRENCES, slave);
-//
-//		label= PreferencesMessages.MarkOccurrencesConfigurationBlock_markExceptionOccurrences;
-//		slave= addCheckBox(composite, label, PreferenceConstants.EDITOR_MARK_EXCEPTION_OCCURRENCES, 0); //$NON-NLS-1$
-//		createDependency(master, PreferenceConstants.EDITOR_MARK_EXCEPTION_OCCURRENCES, slave);
-//
-//		label= PreferencesMessages.MarkOccurrencesConfigurationBlock_markMethodExitPoints;
-//		slave= addCheckBox(composite, label, PreferenceConstants.EDITOR_MARK_METHOD_EXIT_POINTS, 0); //$NON-NLS-1$
-//		createDependency(master, PreferenceConstants.EDITOR_MARK_METHOD_EXIT_POINTS, slave);
-//
-//		label= PreferencesMessages.MarkOccurrencesConfigurationBlock_markImplementors;
-//		slave= addCheckBox(composite, label, PreferenceConstants.EDITOR_MARK_IMPLEMENTORS, 0); //$NON-NLS-1$
-//		createDependency(master, PreferenceConstants.EDITOR_MARK_IMPLEMENTORS, slave);
+		label = PreferencesMessages
+				.getString("JavaEditorPreferencePage.markOccurrences");
+		Button master = addCheckBox(composite, label,
+				PreferenceConstants.EDITOR_MARK_OCCURRENCES, 0); //$NON-NLS-1$
+
+		// label=
+		// PreferencesMessages.MarkOccurrencesConfigurationBlock_markTypeOccurrences;
+		// Button slave= addCheckBox(composite, label,
+		// PreferenceConstants.EDITOR_MARK_TYPE_OCCURRENCES, 0); //$NON-NLS-1$
+		// createDependency(master,
+		// PreferenceConstants.EDITOR_STICKY_OCCURRENCES, slave);
+		//
+		// label=
+		// PreferencesMessages.MarkOccurrencesConfigurationBlock_markMethodOccurrences;
+		// slave= addCheckBox(composite, label,
+		// PreferenceConstants.EDITOR_MARK_METHOD_OCCURRENCES, 0); //$NON-NLS-1$
+		// createDependency(master,
+		// PreferenceConstants.EDITOR_MARK_METHOD_OCCURRENCES, slave);
+		//
+		// label=
+		// PreferencesMessages.MarkOccurrencesConfigurationBlock_markConstantOccurrences;
+		// slave= addCheckBox(composite, label,
+		// PreferenceConstants.EDITOR_MARK_CONSTANT_OCCURRENCES, 0);
+		// //$NON-NLS-1$
+		// createDependency(master,
+		// PreferenceConstants.EDITOR_MARK_CONSTANT_OCCURRENCES, slave);
+		//
+		// label=
+		// PreferencesMessages.MarkOccurrencesConfigurationBlock_markFieldOccurrences;
+		// slave= addCheckBox(composite, label,
+		// PreferenceConstants.EDITOR_MARK_FIELD_OCCURRENCES, 0); //$NON-NLS-1$
+		// createDependency(master,
+		// PreferenceConstants.EDITOR_MARK_FIELD_OCCURRENCES, slave);
+		//
+		// label=
+		// PreferencesMessages.MarkOccurrencesConfigurationBlock_markLocalVariableOccurrences;
+		// slave= addCheckBox(composite, label,
+		// PreferenceConstants.EDITOR_MARK_LOCAL_VARIABLE_OCCURRENCES, 0);
+		// //$NON-NLS-1$
+		// createDependency(master,
+		// PreferenceConstants.EDITOR_MARK_LOCAL_VARIABLE_OCCURRENCES, slave);
+		//
+		// label=
+		// PreferencesMessages.MarkOccurrencesConfigurationBlock_markExceptionOccurrences;
+		// slave= addCheckBox(composite, label,
+		// PreferenceConstants.EDITOR_MARK_EXCEPTION_OCCURRENCES, 0);
+		// //$NON-NLS-1$
+		// createDependency(master,
+		// PreferenceConstants.EDITOR_MARK_EXCEPTION_OCCURRENCES, slave);
+		//
+		// label=
+		// PreferencesMessages.MarkOccurrencesConfigurationBlock_markMethodExitPoints;
+		// slave= addCheckBox(composite, label,
+		// PreferenceConstants.EDITOR_MARK_METHOD_EXIT_POINTS, 0); //$NON-NLS-1$
+		// createDependency(master,
+		// PreferenceConstants.EDITOR_MARK_METHOD_EXIT_POINTS, slave);
+		//
+		// label=
+		// PreferencesMessages.MarkOccurrencesConfigurationBlock_markImplementors;
+		// slave= addCheckBox(composite, label,
+		// PreferenceConstants.EDITOR_MARK_IMPLEMENTORS, 0); //$NON-NLS-1$
+		// createDependency(master,
+		// PreferenceConstants.EDITOR_MARK_IMPLEMENTORS, slave);
 
 		addFiller(composite);
 
-		label= PreferencesMessages.getString("JavaEditorPreferencePage.stickyOccurrences");
-		Button slave= addCheckBox(composite, label, PreferenceConstants.EDITOR_STICKY_OCCURRENCES, 0); //$NON-NLS-1$
-		createDependency(master, PreferenceConstants.EDITOR_STICKY_OCCURRENCES, slave);
+		label = PreferencesMessages
+				.getString("JavaEditorPreferencePage.stickyOccurrences");
+		Button slave = addCheckBox(composite, label,
+				PreferenceConstants.EDITOR_STICKY_OCCURRENCES, 0); //$NON-NLS-1$
+		createDependency(master, PreferenceConstants.EDITOR_STICKY_OCCURRENCES,
+				slave);
 
 		return composite;
 	}
 
 	private void addFiller(Composite composite) {
-		PixelConverter pixelConverter= new PixelConverter(composite);
+		PixelConverter pixelConverter = new PixelConverter(composite);
 
-		Label filler= new Label(composite, SWT.LEFT );
-		GridData gd= new GridData(GridData.HORIZONTAL_ALIGN_FILL);
-		gd.horizontalSpan= 2;
-		gd.heightHint= pixelConverter.convertHeightInCharsToPixels(1) / 2;
+		Label filler = new Label(composite, SWT.LEFT);
+		GridData gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
+		gd.horizontalSpan = 2;
+		gd.heightHint = pixelConverter.convertHeightInCharsToPixels(1) / 2;
 		filler.setLayoutData(gd);
 	}
 
-	private Button addCheckBox(Composite parent, String label, String key, int indentation) {
-		Button checkBox= new Button(parent, SWT.CHECK);
+	private Button addCheckBox(Composite parent, String label, String key,
+			int indentation) {
+		Button checkBox = new Button(parent, SWT.CHECK);
 		checkBox.setText(label);
 
-		GridData gd= new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING);
-		gd.horizontalIndent= indentation;
-		gd.horizontalSpan= 2;
+		GridData gd = new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING);
+		gd.horizontalIndent = indentation;
+		gd.horizontalSpan = 2;
 		checkBox.setLayoutData(gd);
 		checkBox.addSelectionListener(fCheckBoxListener);
 
@@ -176,24 +231,26 @@ class MarkOccurrencesConfigurationBlock implements IPreferenceConfigurationBlock
 		return checkBox;
 	}
 
-	private void createDependency(final Button master, String masterKey, final Control slave) {
+	private void createDependency(final Button master, String masterKey,
+			final Control slave) {
 		indent(slave);
-		boolean masterState= fStore.getBoolean(masterKey);
+		boolean masterState = fStore.getBoolean(masterKey);
 		slave.setEnabled(masterState);
-		SelectionListener listener= new SelectionListener() {
+		SelectionListener listener = new SelectionListener() {
 			public void widgetSelected(SelectionEvent e) {
 				slave.setEnabled(master.getSelection());
 			}
 
-			public void widgetDefaultSelected(SelectionEvent e) {}
+			public void widgetDefaultSelected(SelectionEvent e) {
+			}
 		};
 		master.addSelectionListener(listener);
 		fMasterSlaveListeners.add(listener);
 	}
 
 	private static void indent(Control control) {
-		GridData gridData= new GridData();
-		gridData.horizontalIndent= 20;
+		GridData gridData = new GridData();
+		gridData.horizontalIndent = 20;
 		control.setLayoutData(gridData);
 	}
 
@@ -203,19 +260,19 @@ class MarkOccurrencesConfigurationBlock implements IPreferenceConfigurationBlock
 
 	void initializeFields() {
 
-		Iterator iter= fCheckBoxes.keySet().iterator();
+		Iterator iter = fCheckBoxes.keySet().iterator();
 		while (iter.hasNext()) {
-			Button b= (Button) iter.next();
-			String key= (String) fCheckBoxes.get(b);
+			Button b = (Button) iter.next();
+			String key = (String) fCheckBoxes.get(b);
 			b.setSelection(fStore.getBoolean(key));
 		}
 
-        // Update slaves
-        iter= fMasterSlaveListeners.iterator();
-        while (iter.hasNext()) {
-            SelectionListener listener= (SelectionListener)iter.next();
-            listener.widgetSelected(null);
-        }
+		// Update slaves
+		iter = fMasterSlaveListeners.iterator();
+		while (iter.hasNext()) {
+			SelectionListener listener = (SelectionListener) iter.next();
+			listener.widgetSelected(null);
+		}
 
 	}
 
@@ -233,7 +290,7 @@ class MarkOccurrencesConfigurationBlock implements IPreferenceConfigurationBlock
 
 	IStatus getStatus() {
 		if (fStatus == null)
-			fStatus= new StatusInfo();
+			fStatus = new StatusInfo();
 		return fStatus;
 	}