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

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/preferences/JavaEditorHoverConfigurationBlock.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/preferences/JavaEditorHoverConfigurationBlock.java
index d3a5b50..d0aefce 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/preferences/JavaEditorHoverConfigurationBlock.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/preferences/JavaEditorHoverConfigurationBlock.java
@@ -50,39 +50,49 @@ import org.eclipse.swt.widgets.Text;
  */
 class JavaEditorHoverConfigurationBlock {
 
-	private static final String DELIMITER= PreferencesMessages.getString("JavaEditorHoverConfigurationBlock.delimiter"); //$NON-NLS-1$
+	private static final String DELIMITER = PreferencesMessages
+			.getString("JavaEditorHoverConfigurationBlock.delimiter"); //$NON-NLS-1$
 
 	// Data structure to hold the values which are edited by the user
 	private static class HoverConfig {
-		
+
 		private String fModifierString;
+
 		private boolean fIsEnabled;
+
 		private int fStateMask;
 
 		private HoverConfig(String modifier, int stateMask, boolean enabled) {
-			fModifierString= modifier;
-			fIsEnabled= enabled;
-			fStateMask= stateMask;
+			fModifierString = modifier;
+			fIsEnabled = enabled;
+			fStateMask = stateMask;
 		}
 	}
 
 	private IPreferenceStore fStore;
+
 	private HoverConfig[] fHoverConfigs;
+
 	private Text fModifierEditor;
+
 	private Button fEnableField;
+
 	private List fHoverList;
+
 	private Text fDescription;
-//	private Button fShowHoverAffordanceCheckbox;
-	
+
+	private Button fShowHoverAffordanceCheckbox;
+
 	private JavaEditorPreferencePage fMainPreferencePage;
 
 	private StatusInfo fStatus;
 
-	public JavaEditorHoverConfigurationBlock(JavaEditorPreferencePage mainPreferencePage, IPreferenceStore store) {
+	public JavaEditorHoverConfigurationBlock(
+			JavaEditorPreferencePage mainPreferencePage, IPreferenceStore store) {
 		Assert.isNotNull(mainPreferencePage);
 		Assert.isNotNull(store);
-		fMainPreferencePage= mainPreferencePage;
-		fStore= store;
+		fMainPreferencePage = mainPreferencePage;
+		fStore = store;
 	}
 
 	/**
@@ -90,106 +100,134 @@ class JavaEditorHoverConfigurationBlock {
 	 */
 	public Control createControl(Composite parent) {
 
-		PixelConverter pixelConverter= new PixelConverter(parent);
+		PixelConverter pixelConverter = new PixelConverter(parent);
 
-		Composite hoverComposite= new Composite(parent, SWT.NULL);
-		GridLayout layout= new GridLayout();
-		layout.numColumns= 2;
+		Composite hoverComposite = new Composite(parent, SWT.NULL);
+		GridLayout layout = new GridLayout();
+		layout.numColumns = 2;
 		hoverComposite.setLayout(layout);
-		GridData gd= new GridData(GridData.GRAB_HORIZONTAL | GridData.VERTICAL_ALIGN_FILL);
+		GridData gd = new GridData(GridData.GRAB_HORIZONTAL
+				| GridData.VERTICAL_ALIGN_FILL);
 		hoverComposite.setLayoutData(gd);
 
-		Label label= new Label(hoverComposite, SWT.NONE);
-		label.setText(PreferencesMessages.getString("JavaEditorHoverConfigurationBlock.hoverPreferences")); //$NON-NLS-1$
-		gd= new GridData(GridData.FILL_HORIZONTAL);
-		gd.horizontalAlignment= GridData.BEGINNING;
-		gd.horizontalSpan= 2;
+		Label label = new Label(hoverComposite, SWT.NONE);
+		label
+				.setText(PreferencesMessages
+						.getString("JavaEditorHoverConfigurationBlock.hoverPreferences")); //$NON-NLS-1$
+		gd = new GridData(GridData.FILL_HORIZONTAL);
+		gd.horizontalAlignment = GridData.BEGINNING;
+		gd.horizontalSpan = 2;
 		label.setLayoutData(gd);
-		gd= new GridData(GridData.GRAB_HORIZONTAL | GridData.VERTICAL_ALIGN_FILL);
+		gd = new GridData(GridData.GRAB_HORIZONTAL
+				| GridData.VERTICAL_ALIGN_FILL);
 
 		// Hover list
-		fHoverList= new List(hoverComposite, SWT.SINGLE | SWT.V_SCROLL | SWT.BORDER);
-		gd= new GridData(GridData.VERTICAL_ALIGN_BEGINNING | GridData.FILL_HORIZONTAL);
-		int listHeight= 10 * fHoverList.getItemHeight();
-		gd.heightHint= listHeight;
+		fHoverList = new List(hoverComposite, SWT.SINGLE | SWT.V_SCROLL
+				| SWT.BORDER);
+		gd = new GridData(GridData.VERTICAL_ALIGN_BEGINNING
+				| GridData.FILL_HORIZONTAL);
+		int listHeight = 10 * fHoverList.getItemHeight();
+		gd.heightHint = listHeight;
 		fHoverList.setLayoutData(gd);
 		fHoverList.addSelectionListener(new SelectionListener() {
 			public void widgetSelected(SelectionEvent e) {
 				handleHoverListSelection();
 			}
+
 			public void widgetDefaultSelected(SelectionEvent e) {
 			}
 		});
 
-
-		Composite stylesComposite= new Composite(hoverComposite, SWT.NONE);
-		layout= new GridLayout();
-		layout.marginHeight= 0;
-		layout.marginWidth= 0;
-		layout.numColumns= 2;
+		Composite stylesComposite = new Composite(hoverComposite, SWT.NONE);
+		layout = new GridLayout();
+		layout.marginHeight = 0;
+		layout.marginWidth = 0;
+		layout.numColumns = 2;
 		stylesComposite.setLayout(layout);
-		gd= new GridData(GridData.FILL_HORIZONTAL);
-		gd.heightHint= listHeight + (2 * fHoverList.getBorderWidth());
+		gd = new GridData(GridData.FILL_HORIZONTAL);
+		gd.heightHint = listHeight + (2 * fHoverList.getBorderWidth());
 		stylesComposite.setLayoutData(gd);
 
-		// Enabled checkbox		
-		fEnableField= new Button(stylesComposite, SWT.CHECK);
-		fEnableField.setText(PreferencesMessages.getString("JavaEditorHoverConfigurationBlock.enabled")); //$NON-NLS-1$
-		gd= new GridData(GridData.FILL_HORIZONTAL);
-		gd.horizontalAlignment= GridData.BEGINNING;
-		gd.horizontalSpan= 2;
+		// Enabled checkbox
+		fEnableField = new Button(stylesComposite, SWT.CHECK);
+		fEnableField.setText(PreferencesMessages
+				.getString("JavaEditorHoverConfigurationBlock.enabled")); //$NON-NLS-1$
+		gd = new GridData(GridData.FILL_HORIZONTAL);
+		gd.horizontalAlignment = GridData.BEGINNING;
+		gd.horizontalSpan = 2;
 		fEnableField.setLayoutData(gd);
 		fEnableField.addSelectionListener(new SelectionListener() {
 			public void widgetSelected(SelectionEvent e) {
-				int i= fHoverList.getSelectionIndex();
-				boolean state= fEnableField.getSelection();
+				int i = fHoverList.getSelectionIndex();
+				boolean state = fEnableField.getSelection();
 				fModifierEditor.setEnabled(state);
-				fHoverConfigs[i].fIsEnabled= state;
+				fHoverConfigs[i].fIsEnabled = state;
 				handleModifierModified();
 			}
+
 			public void widgetDefaultSelected(SelectionEvent e) {
 			}
 		});
 
 		// Text field for modifier string
-		label= new Label(stylesComposite, SWT.LEFT);
-		label.setText(PreferencesMessages.getString("JavaEditorHoverConfigurationBlock.keyModifier")); //$NON-NLS-1$
-		fModifierEditor= new Text(stylesComposite, SWT.BORDER);
-		gd= new GridData(GridData.HORIZONTAL_ALIGN_FILL);
+		label = new Label(stylesComposite, SWT.LEFT);
+		label.setText(PreferencesMessages
+				.getString("JavaEditorHoverConfigurationBlock.keyModifier")); //$NON-NLS-1$
+		fModifierEditor = new Text(stylesComposite, SWT.BORDER);
+		gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
 		fModifierEditor.setLayoutData(gd);
 
 		fModifierEditor.addKeyListener(new KeyListener() {
 			private boolean isModifierCandidate;
+
 			public void keyPressed(KeyEvent e) {
-				isModifierCandidate= e.keyCode > 0 && e.character == 0 && e.stateMask == 0;
+				isModifierCandidate = e.keyCode > 0 && e.character == 0
+						&& e.stateMask == 0;
 			}
-		
+
 			public void keyReleased(KeyEvent e) {
-				if (isModifierCandidate && e.stateMask > 0 && e.stateMask == e.stateMask && e.character == 0) {// && e.time -time < 1000) {
-					String text= fModifierEditor.getText();
-					Point selection= fModifierEditor.getSelection();
-					int i= selection.x - 1;
+				if (isModifierCandidate && e.stateMask > 0
+						&& e.stateMask == e.stateMask && e.character == 0) {// &&
+																			// e.time
+																			// -time
+																			// <
+																			// 1000)
+																			// {
+					String text = fModifierEditor.getText();
+					Point selection = fModifierEditor.getSelection();
+					int i = selection.x - 1;
 					while (i > -1 && Character.isWhitespace(text.charAt(i))) {
 						i--;
 					}
-					boolean needsPrefixDelimiter= i > -1 && !String.valueOf(text.charAt(i)).equals(DELIMITER);
+					boolean needsPrefixDelimiter = i > -1
+							&& !String.valueOf(text.charAt(i))
+									.equals(DELIMITER);
 
-					i= selection.y;
-					while (i < text.length() && Character.isWhitespace(text.charAt(i))) {
+					i = selection.y;
+					while (i < text.length()
+							&& Character.isWhitespace(text.charAt(i))) {
 						i++;
 					}
-					boolean needsPostfixDelimiter= i < text.length() && !String.valueOf(text.charAt(i)).equals(DELIMITER);
+					boolean needsPostfixDelimiter = i < text.length()
+							&& !String.valueOf(text.charAt(i))
+									.equals(DELIMITER);
 
 					String insertString;
 
 					if (needsPrefixDelimiter && needsPostfixDelimiter)
-						insertString= PreferencesMessages.getFormattedString("JavaEditorHoverConfigurationBlock.insertDelimiterAndModifierAndDelimiter", new String[] {Action.findModifierString(e.stateMask)}); //$NON-NLS-1$
+						insertString = PreferencesMessages
+								.getFormattedString(
+										"JavaEditorHoverConfigurationBlock.insertDelimiterAndModifierAndDelimiter", new String[] { Action.findModifierString(e.stateMask) }); //$NON-NLS-1$
 					else if (needsPrefixDelimiter)
-						insertString= PreferencesMessages.getFormattedString("JavaEditorHoverConfigurationBlock.insertDelimiterAndModifier", new String[] {Action.findModifierString(e.stateMask)}); //$NON-NLS-1$
+						insertString = PreferencesMessages
+								.getFormattedString(
+										"JavaEditorHoverConfigurationBlock.insertDelimiterAndModifier", new String[] { Action.findModifierString(e.stateMask) }); //$NON-NLS-1$
 					else if (needsPostfixDelimiter)
-						insertString= PreferencesMessages.getFormattedString("JavaEditorHoverConfigurationBlock.insertModifierAndDelimiter", new String[] {Action.findModifierString(e.stateMask)}); //$NON-NLS-1$
+						insertString = PreferencesMessages
+								.getFormattedString(
+										"JavaEditorHoverConfigurationBlock.insertModifierAndDelimiter", new String[] { Action.findModifierString(e.stateMask) }); //$NON-NLS-1$
 					else
-						insertString= Action.findModifierString(e.stateMask);
+						insertString = Action.findModifierString(e.stateMask);
 
 					if (insertString != null)
 						fModifierEditor.insert(insertString);
@@ -204,29 +242,32 @@ class JavaEditorHoverConfigurationBlock {
 		});
 
 		// Description
-		Label descriptionLabel= new Label(stylesComposite, SWT.LEFT);
-		descriptionLabel.setText(PreferencesMessages.getString("JavaEditorHoverConfigurationBlock.description")); //$NON-NLS-1$
-		gd= new GridData(GridData.VERTICAL_ALIGN_BEGINNING);
-		gd.horizontalSpan= 2;
+		Label descriptionLabel = new Label(stylesComposite, SWT.LEFT);
+		descriptionLabel.setText(PreferencesMessages
+				.getString("JavaEditorHoverConfigurationBlock.description")); //$NON-NLS-1$
+		gd = new GridData(GridData.VERTICAL_ALIGN_BEGINNING);
+		gd.horizontalSpan = 2;
 		descriptionLabel.setLayoutData(gd);
-		fDescription= new Text(stylesComposite, SWT.LEFT | SWT.WRAP | SWT.MULTI | SWT.READ_ONLY | SWT.BORDER);
-		gd= new GridData(GridData.FILL_BOTH);
-		gd.horizontalSpan= 2;
+		fDescription = new Text(stylesComposite, SWT.LEFT | SWT.WRAP
+				| SWT.MULTI | SWT.READ_ONLY | SWT.BORDER);
+		gd = new GridData(GridData.FILL_BOTH);
+		gd.horizontalSpan = 2;
 		fDescription.setLayoutData(gd);
 
 		// Vertical filler
-		Label filler= new Label(hoverComposite, SWT.LEFT);
-		gd= new GridData(GridData.BEGINNING | GridData.VERTICAL_ALIGN_FILL);
-		gd.heightHint= pixelConverter.convertHeightInCharsToPixels(1) / 3;
+		Label filler = new Label(hoverComposite, SWT.LEFT);
+		gd = new GridData(GridData.BEGINNING | GridData.VERTICAL_ALIGN_FILL);
+		gd.heightHint = pixelConverter.convertHeightInCharsToPixels(1) / 3;
 		filler.setLayoutData(gd);
 
 		// Affordance checkbox
-//		fShowHoverAffordanceCheckbox= new Button(hoverComposite, SWT.CHECK);
-//		fShowHoverAffordanceCheckbox.setText(PreferencesMessages.getString("JavaEditorHoverConfigurationBlock.showAffordance")); //$NON-NLS-1$
-//		gd= new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING);
-//		gd.horizontalIndent= 0;
-//		gd.horizontalSpan= 2;
-//		fShowHoverAffordanceCheckbox.setLayoutData(gd);
+		fShowHoverAffordanceCheckbox = new Button(hoverComposite, SWT.CHECK);
+		fShowHoverAffordanceCheckbox.setText(PreferencesMessages
+				.getString("JavaEditorHoverConfigurationBlock.showAffordance")); //$NON-NLS-1$
+		gd = new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING);
+		gd.horizontalIndent = 0;
+		gd.horizontalSpan = 2;
+		fShowHoverAffordanceCheckbox.setLayoutData(gd);
 
 		initialize();
 
@@ -235,14 +276,17 @@ class JavaEditorHoverConfigurationBlock {
 	}
 
 	private JavaEditorTextHoverDescriptor[] getContributedHovers() {
-		return PHPeclipsePlugin.getDefault().getJavaEditorTextHoverDescriptors();		
+		return PHPeclipsePlugin.getDefault()
+				.getJavaEditorTextHoverDescriptors();
 	}
 
 	void initialize() {
-		JavaEditorTextHoverDescriptor[] hoverDescs= getContributedHovers();
-		fHoverConfigs= new HoverConfig[hoverDescs.length];
-		for (int i= 0; i < hoverDescs.length; i++) {
-			fHoverConfigs[i]= new HoverConfig(hoverDescs[i].getModifierString(), hoverDescs[i].getStateMask(), hoverDescs[i].isEnabled());
+		JavaEditorTextHoverDescriptor[] hoverDescs = getContributedHovers();
+		fHoverConfigs = new HoverConfig[hoverDescs.length];
+		for (int i = 0; i < hoverDescs.length; i++) {
+			fHoverConfigs[i] = new HoverConfig(hoverDescs[i]
+					.getModifierString(), hoverDescs[i].getStateMask(),
+					hoverDescs[i].isEnabled());
 			fHoverList.add(hoverDescs[i].getLabel());
 		}
 		initializeFields();
@@ -257,33 +301,38 @@ class JavaEditorHoverConfigurationBlock {
 				}
 			}
 		});
-//		fShowHoverAffordanceCheckbox.setSelection(fStore.getBoolean(PreferenceConstants.EDITOR_SHOW_TEXT_HOVER_AFFORDANCE));
+		fShowHoverAffordanceCheckbox
+				.setSelection(fStore
+						.getBoolean(PreferenceConstants.EDITOR_SHOW_TEXT_HOVER_AFFORDANCE));
 	}
 
 	void performOk() {
-		StringBuffer buf= new StringBuffer();
-		StringBuffer maskBuf= new StringBuffer();
-		for (int i= 0; i < fHoverConfigs.length; i++) {
+		StringBuffer buf = new StringBuffer();
+		StringBuffer maskBuf = new StringBuffer();
+		for (int i = 0; i < fHoverConfigs.length; i++) {
 			buf.append(getContributedHovers()[i].getId());
 			buf.append(JavaEditorTextHoverDescriptor.VALUE_SEPARATOR);
 			if (!fHoverConfigs[i].fIsEnabled)
 				buf.append(JavaEditorTextHoverDescriptor.DISABLED_TAG);
-			String modifier= fHoverConfigs[i].fModifierString;
+			String modifier = fHoverConfigs[i].fModifierString;
 			if (modifier == null || modifier.length() == 0)
-				modifier= JavaEditorTextHoverDescriptor.NO_MODIFIER;
+				modifier = JavaEditorTextHoverDescriptor.NO_MODIFIER;
 			buf.append(modifier);
 			buf.append(JavaEditorTextHoverDescriptor.VALUE_SEPARATOR);
-			
+
 			maskBuf.append(getContributedHovers()[i].getId());
 			maskBuf.append(JavaEditorTextHoverDescriptor.VALUE_SEPARATOR);
 			maskBuf.append(fHoverConfigs[i].fStateMask);
 			maskBuf.append(JavaEditorTextHoverDescriptor.VALUE_SEPARATOR);
 		}
-		fStore.setValue(PreferenceConstants.EDITOR_TEXT_HOVER_MODIFIERS, buf.toString());
-		fStore.setValue(PreferenceConstants.EDITOR_TEXT_HOVER_MODIFIER_MASKS, maskBuf.toString());
-		
-//		fStore.setValue(PreferenceConstants.EDITOR_SHOW_TEXT_HOVER_AFFORDANCE, fShowHoverAffordanceCheckbox.getSelection());
-		
+		fStore.setValue(PreferenceConstants.EDITOR_TEXT_HOVER_MODIFIERS, buf
+				.toString());
+		fStore.setValue(PreferenceConstants.EDITOR_TEXT_HOVER_MODIFIER_MASKS,
+				maskBuf.toString());
+
+		fStore.setValue(PreferenceConstants.EDITOR_SHOW_TEXT_HOVER_AFFORDANCE,
+				fShowHoverAffordanceCheckbox.getSelection());
+
 		PHPeclipsePlugin.getDefault().resetJavaEditorTextHoverDescriptors();
 	}
 
@@ -294,99 +343,126 @@ class JavaEditorHoverConfigurationBlock {
 
 	private void restoreFromPreferences() {
 
-//		fShowHoverAffordanceCheckbox.setSelection(fStore.getBoolean(PreferenceConstants.EDITOR_SHOW_TEXT_HOVER_AFFORDANCE));
+		fShowHoverAffordanceCheckbox
+				.setSelection(fStore
+						.getBoolean(PreferenceConstants.EDITOR_SHOW_TEXT_HOVER_AFFORDANCE));
 
-		String compiledTextHoverModifiers= fStore.getString(PreferenceConstants.EDITOR_TEXT_HOVER_MODIFIERS);
-		
-		StringTokenizer tokenizer= new StringTokenizer(compiledTextHoverModifiers, JavaEditorTextHoverDescriptor.VALUE_SEPARATOR);
-		HashMap idToModifier= new HashMap(tokenizer.countTokens() / 2);
+		String compiledTextHoverModifiers = fStore
+				.getString(PreferenceConstants.EDITOR_TEXT_HOVER_MODIFIERS);
+
+		StringTokenizer tokenizer = new StringTokenizer(
+				compiledTextHoverModifiers,
+				JavaEditorTextHoverDescriptor.VALUE_SEPARATOR);
+		HashMap idToModifier = new HashMap(tokenizer.countTokens() / 2);
 
 		while (tokenizer.hasMoreTokens()) {
-			String id= tokenizer.nextToken();
+			String id = tokenizer.nextToken();
 			if (tokenizer.hasMoreTokens())
 				idToModifier.put(id, tokenizer.nextToken());
 		}
 
-		String compiledTextHoverModifierMasks= PHPeclipsePlugin.getDefault().getPreferenceStore().getString(PreferenceConstants.EDITOR_TEXT_HOVER_MODIFIER_MASKS);
+		String compiledTextHoverModifierMasks = PHPeclipsePlugin.getDefault()
+				.getPreferenceStore().getString(
+						PreferenceConstants.EDITOR_TEXT_HOVER_MODIFIER_MASKS);
 
-		tokenizer= new StringTokenizer(compiledTextHoverModifierMasks, JavaEditorTextHoverDescriptor.VALUE_SEPARATOR);
-		HashMap idToModifierMask= new HashMap(tokenizer.countTokens() / 2);
+		tokenizer = new StringTokenizer(compiledTextHoverModifierMasks,
+				JavaEditorTextHoverDescriptor.VALUE_SEPARATOR);
+		HashMap idToModifierMask = new HashMap(tokenizer.countTokens() / 2);
 
 		while (tokenizer.hasMoreTokens()) {
-			String id= tokenizer.nextToken();
+			String id = tokenizer.nextToken();
 			if (tokenizer.hasMoreTokens())
 				idToModifierMask.put(id, tokenizer.nextToken());
 		}
 
-		for (int i= 0; i < fHoverConfigs.length; i++) {
-			String modifierString= (String)idToModifier.get(getContributedHovers()[i].getId());
-			boolean enabled= true;
+		for (int i = 0; i < fHoverConfigs.length; i++) {
+			String modifierString = (String) idToModifier
+					.get(getContributedHovers()[i].getId());
+			boolean enabled = true;
 			if (modifierString == null)
-				modifierString= JavaEditorTextHoverDescriptor.DISABLED_TAG;
-			
-			if (modifierString.startsWith(JavaEditorTextHoverDescriptor.DISABLED_TAG)) {
-				enabled= false;
-				modifierString= modifierString.substring(1);
+				modifierString = JavaEditorTextHoverDescriptor.DISABLED_TAG;
+
+			if (modifierString
+					.startsWith(JavaEditorTextHoverDescriptor.DISABLED_TAG)) {
+				enabled = false;
+				modifierString = modifierString.substring(1);
 			}
 
-			if (modifierString.equals(JavaEditorTextHoverDescriptor.NO_MODIFIER))
-				modifierString= ""; //$NON-NLS-1$
+			if (modifierString
+					.equals(JavaEditorTextHoverDescriptor.NO_MODIFIER))
+				modifierString = ""; //$NON-NLS-1$
 
-			fHoverConfigs[i].fModifierString= modifierString;
-			fHoverConfigs[i].fIsEnabled= enabled;
-			fHoverConfigs[i].fStateMask= JavaEditorTextHoverDescriptor.computeStateMask(modifierString);
+			fHoverConfigs[i].fModifierString = modifierString;
+			fHoverConfigs[i].fIsEnabled = enabled;
+			fHoverConfigs[i].fStateMask = JavaEditorTextHoverDescriptor
+					.computeStateMask(modifierString);
 
 			if (fHoverConfigs[i].fStateMask == -1) {
 				try {
-					fHoverConfigs[i].fStateMask= Integer.parseInt((String)idToModifierMask.get(getContributedHovers()[i].getId()));
+					fHoverConfigs[i].fStateMask = Integer
+							.parseInt((String) idToModifierMask
+									.get(getContributedHovers()[i].getId()));
 				} catch (NumberFormatException ex) {
-					fHoverConfigs[i].fStateMask= -1;
+					fHoverConfigs[i].fStateMask = -1;
 				}
 			}
 		}
 	}
 
 	private void handleModifierModified() {
-		int i= fHoverList.getSelectionIndex();
-		String modifiers= fModifierEditor.getText();
-		fHoverConfigs[i].fModifierString= modifiers;
-		fHoverConfigs[i].fStateMask= JavaEditorTextHoverDescriptor.computeStateMask(modifiers);
+		int i = fHoverList.getSelectionIndex();
+		String modifiers = fModifierEditor.getText();
+		fHoverConfigs[i].fModifierString = modifiers;
+		fHoverConfigs[i].fStateMask = JavaEditorTextHoverDescriptor
+				.computeStateMask(modifiers);
 		if (fHoverConfigs[i].fIsEnabled && fHoverConfigs[i].fStateMask == -1)
-			fStatus= new StatusInfo(IStatus.ERROR, PreferencesMessages.getFormattedString("JavaEditorHoverConfigurationBlock.modifierIsNotValid", fHoverConfigs[i].fModifierString)); //$NON-NLS-1$
+			fStatus = new StatusInfo(
+					IStatus.ERROR,
+					PreferencesMessages
+							.getFormattedString(
+									"JavaEditorHoverConfigurationBlock.modifierIsNotValid", fHoverConfigs[i].fModifierString)); //$NON-NLS-1$
 		else
-			fStatus= new StatusInfo();
+			fStatus = new StatusInfo();
 		updateStatus();
 	}
 
-	private void handleHoverListSelection() {	
-		int i= fHoverList.getSelectionIndex();
-		boolean enabled= fHoverConfigs[i].fIsEnabled;
+	private void handleHoverListSelection() {
+		int i = fHoverList.getSelectionIndex();
+		boolean enabled = fHoverConfigs[i].fIsEnabled;
 		fEnableField.setSelection(enabled);
 		fModifierEditor.setEnabled(enabled);
 		fModifierEditor.setText(fHoverConfigs[i].fModifierString);
-		String description= getContributedHovers()[i].getDescription();
+		String description = getContributedHovers()[i].getDescription();
 		if (description == null)
-			description= ""; //$NON-NLS-1$
+			description = ""; //$NON-NLS-1$
 		fDescription.setText(description);
 	}
 
 	IStatus getStatus() {
 		if (fStatus == null)
-			fStatus= new StatusInfo();
+			fStatus = new StatusInfo();
 		return fStatus;
 	}
 
 	private void updateStatus() {
-		int i= 0;
-		HashMap stateMasks= new HashMap(fHoverConfigs.length);
+		int i = 0;
+		HashMap stateMasks = new HashMap(fHoverConfigs.length);
 		while (fStatus.isOK() && i < fHoverConfigs.length) {
 			if (fHoverConfigs[i].fIsEnabled) {
-				String label= getContributedHovers()[i].getLabel();
-				Integer stateMask= new Integer(fHoverConfigs[i].fStateMask);
+				String label = getContributedHovers()[i].getLabel();
+				Integer stateMask = new Integer(fHoverConfigs[i].fStateMask);
 				if (fHoverConfigs[i].fStateMask == -1)
-					fStatus= new StatusInfo(IStatus.ERROR, PreferencesMessages.getFormattedString("JavaEditorHoverConfigurationBlock.modifierIsNotValidForHover", new String[] {fHoverConfigs[i].fModifierString, label})); //$NON-NLS-1$
+					fStatus = new StatusInfo(
+							IStatus.ERROR,
+							PreferencesMessages
+									.getFormattedString(
+											"JavaEditorHoverConfigurationBlock.modifierIsNotValidForHover", new String[] { fHoverConfigs[i].fModifierString, label })); //$NON-NLS-1$
 				else if (stateMasks.containsKey(stateMask))
-					fStatus= new StatusInfo(IStatus.ERROR, PreferencesMessages.getFormattedString("JavaEditorHoverConfigurationBlock.duplicateModifier", new String[] {label, (String)stateMasks.get(stateMask)})); //$NON-NLS-1$
+					fStatus = new StatusInfo(
+							IStatus.ERROR,
+							PreferencesMessages
+									.getFormattedString(
+											"JavaEditorHoverConfigurationBlock.duplicateModifier", new String[] { label, (String) stateMasks.get(stateMask) })); //$NON-NLS-1$
 				else
 					stateMasks.put(stateMask, label);
 			}