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

diff --git a/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpdt/internal/ui/preferences/CodeFormatterPreferencePage.java b/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpdt/internal/ui/preferences/CodeFormatterPreferencePage.java
index 8803804..f7fc07f 100644
--- a/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpdt/internal/ui/preferences/CodeFormatterPreferencePage.java
+++ b/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpdt/internal/ui/preferences/CodeFormatterPreferencePage.java
@@ -4,9 +4,9 @@
  */
 package net.sourceforge.phpdt.internal.ui.preferences;
 
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
+//import java.io.BufferedReader;
+//import java.io.IOException;
+//import java.io.InputStreamReader;
 import java.util.ArrayList;
 import java.util.Hashtable;
 
@@ -14,20 +14,20 @@ import net.sourceforge.phpdt.core.ICodeFormatter;
 import net.sourceforge.phpdt.core.JavaCore;
 import net.sourceforge.phpdt.core.ToolFactory;
 import net.sourceforge.phpdt.internal.ui.PHPUIMessages;
-import net.sourceforge.phpdt.internal.ui.dialogs.StatusInfo;
-import net.sourceforge.phpdt.internal.ui.dialogs.StatusUtil;
+//import net.sourceforge.phpdt.internal.ui.dialogs.StatusInfo;
+//import net.sourceforge.phpdt.internal.ui.dialogs.StatusUtil;
 import net.sourceforge.phpdt.internal.ui.util.TabFolderLayout;
 //import net.sourceforge.phpeclipse.PHPeclipsePlugin;
 import net.sourceforge.phpeclipse.ui.WebUI;
 
-import org.eclipse.core.runtime.IStatus;
+//import org.eclipse.core.runtime.IStatus;
 import org.eclipse.jface.preference.PreferencePage;
-import org.eclipse.jface.text.Document;
+//import org.eclipse.jface.text.Document;
 import org.eclipse.jface.text.IDocument;
 import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
+//import org.eclipse.swt.events.ModifyEvent;
 import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionEvent;
+//import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.events.SelectionListener;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
@@ -112,19 +112,19 @@ public class CodeFormatterPreferencePage extends PreferencePage implements
 	 * 
 	 * @deprecated Inline to avoid reference to preference page
 	 */
-	public static boolean isCompactingAssignment() {
-		return COMPACT.equals(JavaCore.getOptions().get(
-				PREF_STYLE_COMPACT_ASSIGNEMENT));
-	}
+//	public static boolean isCompactingAssignment() {
+//		return COMPACT.equals(JavaCore.getOptions().get(
+//				PREF_STYLE_COMPACT_ASSIGNEMENT));
+//	}
 
 	/**
 	 * Gets the current compating assignement configuration
 	 * 
 	 * @deprecated Inline to avoid reference to preference page
 	 */
-	public static boolean useSpaces() {
-		return SPACE.equals(JavaCore.getOptions().get(PREF_TAB_CHAR));
-	}
+//	public static boolean useSpaces() {
+//		return SPACE.equals(JavaCore.getOptions().get(PREF_TAB_CHAR));
+//	}
 
 	private static int getPositiveIntValue(String string, int dflt) {
 		try {
@@ -188,37 +188,37 @@ public class CodeFormatterPreferencePage extends PreferencePage implements
 
 	// private SourceViewer fSourceViewer;
 
-	public CodeFormatterPreferencePage() {
-		setPreferenceStore(WebUI.getDefault().getPreferenceStore());
-		setDescription(PHPUIMessages
-				.getString("CodeFormatterPreferencePage.description")); //$NON-NLS-1$
-
-		fWorkingValues = JavaCore.getOptions();
-		fCheckBoxes = new ArrayList();
-		fTextBoxes = new ArrayList();
-
-		fButtonSelectionListener = new SelectionListener() {
-			public void widgetDefaultSelected(SelectionEvent e) {
-			}
-
-			public void widgetSelected(SelectionEvent e) {
-				if (!e.widget.isDisposed()) {
-					controlChanged((Button) e.widget);
-				}
-			}
-		};
-
-		fTextModifyListener = new ModifyListener() {
-			public void modifyText(ModifyEvent e) {
-				if (!e.widget.isDisposed()) {
-					textChanged((Text) e.widget);
-				}
-			}
-		};
-
-		fPreviewDocument = new Document();
-		fPreviewText = loadPreviewFile("CodeFormatterPreviewCode.txt"); //$NON-NLS-1$	
-	}
+//	public CodeFormatterPreferencePage() {
+//		setPreferenceStore(WebUI.getDefault().getPreferenceStore());
+//		setDescription(PHPUIMessages
+//				.getString("CodeFormatterPreferencePage.description")); //$NON-NLS-1$
+//
+//		fWorkingValues = JavaCore.getOptions();
+//		fCheckBoxes = new ArrayList();
+//		fTextBoxes = new ArrayList();
+//
+//		fButtonSelectionListener = new SelectionListener() {
+//			public void widgetDefaultSelected(SelectionEvent e) {
+//			}
+//
+//			public void widgetSelected(SelectionEvent e) {
+//				if (!e.widget.isDisposed()) {
+//					controlChanged((Button) e.widget);
+//				}
+//			}
+//		};
+//
+//		fTextModifyListener = new ModifyListener() {
+//			public void modifyText(ModifyEvent e) {
+//				if (!e.widget.isDisposed()) {
+//					textChanged((Text) e.widget);
+//				}
+//			}
+//		};
+//
+//		fPreviewDocument = new Document();
+//		fPreviewText = loadPreviewFile("CodeFormatterPreviewCode.txt"); //$NON-NLS-1$	
+//	}
 
 	/*
 	 * @see IWorkbenchPreferencePage#init()
@@ -408,36 +408,36 @@ public class CodeFormatterPreferencePage extends PreferencePage implements
 		return textBox;
 	}
 
-	private void controlChanged(Button button) {
-		ControlData data = (ControlData) button.getData();
-		boolean selection = button.getSelection();
-		String newValue = data.getValue(selection);
-		fWorkingValues.put(data.getKey(), newValue);
-		updatePreview();
-
-		if (PREF_TAB_CHAR.equals(data.getKey())) {
-			updateStatus(new StatusInfo());
-			if (selection) {
-				fTabSizeTextBox.setText((String) fWorkingValues
-						.get(PREF_TAB_SIZE));
-			}
-		}
-	}
-
-	private void textChanged(Text textControl) {
-		String key = (String) textControl.getData();
-		String number = textControl.getText();
-		IStatus status = validatePositiveNumber(number);
-		if (!status.matches(IStatus.ERROR)) {
-			fWorkingValues.put(key, number);
-		}
-		// if (PREF_TAB_SIZE.equals(key)) {
-		// fSourceViewer.getTextWidget().setTabs(getPositiveIntValue(number,
-		// 0));
-		// }
-		updateStatus(status);
-		updatePreview();
-	}
+//	private void controlChanged(Button button) {
+//		ControlData data = (ControlData) button.getData();
+//		boolean selection = button.getSelection();
+//		String newValue = data.getValue(selection);
+//		fWorkingValues.put(data.getKey(), newValue);
+//		updatePreview();
+//
+//		if (PREF_TAB_CHAR.equals(data.getKey())) {
+//			updateStatus(new StatusInfo());
+//			if (selection) {
+//				fTabSizeTextBox.setText((String) fWorkingValues
+//						.get(PREF_TAB_SIZE));
+//			}
+//		}
+//	}
+
+//	private void textChanged(Text textControl) {
+//		String key = (String) textControl.getData();
+//		String number = textControl.getText();
+//		IStatus status = validatePositiveNumber(number);
+//		if (!status.matches(IStatus.ERROR)) {
+//			fWorkingValues.put(key, number);
+//		}
+//		// if (PREF_TAB_SIZE.equals(key)) {
+//		// fSourceViewer.getTextWidget().setTabs(getPositiveIntValue(number,
+//		// 0));
+//		// }
+//		updateStatus(status);
+//		updatePreview();
+//	}
 
 	/*
 	 * @see IPreferencePage#performOk()
@@ -466,30 +466,30 @@ public class CodeFormatterPreferencePage extends PreferencePage implements
 		super.performDefaults();
 	}
 
-	private String loadPreviewFile(String filename) {
-		String separator = System.getProperty("line.separator"); //$NON-NLS-1$
-		StringBuffer btxt = new StringBuffer(512);
-		BufferedReader rin = null;
-		try {
-			rin = new BufferedReader(new InputStreamReader(getClass()
-					.getResourceAsStream(filename)));
-			String line;
-			while ((line = rin.readLine()) != null) {
-				btxt.append(line);
-				btxt.append(separator);
-			}
-		} catch (IOException io) {
-			WebUI.log(io);
-		} finally {
-			if (rin != null) {
-				try {
-					rin.close();
-				} catch (IOException e) {
-				}
-			}
-		}
-		return btxt.toString();
-	}
+//	private String loadPreviewFile(String filename) {
+//		String separator = System.getProperty("line.separator"); //$NON-NLS-1$
+//		StringBuffer btxt = new StringBuffer(512);
+//		BufferedReader rin = null;
+//		try {
+//			rin = new BufferedReader(new InputStreamReader(getClass()
+//					.getResourceAsStream(filename)));
+//			String line;
+//			while ((line = rin.readLine()) != null) {
+//				btxt.append(line);
+//				btxt.append(separator);
+//			}
+//		} catch (IOException io) {
+//			WebUI.log(io);
+//		} finally {
+//			if (rin != null) {
+//				try {
+//					rin.close();
+//				} catch (IOException e) {
+//				}
+//			}
+//		}
+//		return btxt.toString();
+//	}
 
 	private void updatePreview() {
 		ICodeFormatter formatter = ToolFactory
@@ -514,45 +514,45 @@ public class CodeFormatterPreferencePage extends PreferencePage implements
 		}
 	}
 
-	private IStatus validatePositiveNumber(String number) {
-		StatusInfo status = new StatusInfo();
-		if (number.length() == 0) {
-			status.setError(PHPUIMessages
-					.getString("CodeFormatterPreferencePage.empty_input")); //$NON-NLS-1$
-		} else {
-			try {
-				int value = Integer.parseInt(number);
-				if (value < 0) {
-					status
-							.setError(PHPUIMessages
-									.getFormattedString(
-											"CodeFormatterPreferencePage.invalid_input", number)); //$NON-NLS-1$
-				}
-			} catch (NumberFormatException e) {
-				status.setError(PHPUIMessages.getFormattedString(
-						"CodeFormatterPreferencePage.invalid_input", number)); //$NON-NLS-1$
-			}
-		}
-		return status;
-	}
-
-	private void updateStatus(IStatus status) {
-		if (!status.matches(IStatus.ERROR)) {
-			// look if there are more severe errors
-			for (int i = 0; i < fTextBoxes.size(); i++) {
-				Text curr = (Text) fTextBoxes.get(i);
-				if (!(curr == fTabSizeTextBox && usesTabs())) {
-					IStatus currStatus = validatePositiveNumber(curr.getText());
-					status = StatusUtil.getMoreSevere(currStatus, status);
-				}
-			}
-		}
-		setValid(!status.matches(IStatus.ERROR));
-		StatusUtil.applyToStatusLine(this, status);
-	}
-
-	private boolean usesTabs() {
-		return TAB.equals(fWorkingValues.get(PREF_TAB_CHAR));
-	}
+//	private IStatus validatePositiveNumber(String number) {
+//		StatusInfo status = new StatusInfo();
+//		if (number.length() == 0) {
+//			status.setError(PHPUIMessages
+//					.getString("CodeFormatterPreferencePage.empty_input")); //$NON-NLS-1$
+//		} else {
+//			try {
+//				int value = Integer.parseInt(number);
+//				if (value < 0) {
+//					status
+//							.setError(PHPUIMessages
+//									.getFormattedString(
+//											"CodeFormatterPreferencePage.invalid_input", number)); //$NON-NLS-1$
+//				}
+//			} catch (NumberFormatException e) {
+//				status.setError(PHPUIMessages.getFormattedString(
+//						"CodeFormatterPreferencePage.invalid_input", number)); //$NON-NLS-1$
+//			}
+//		}
+//		return status;
+//	}
+
+//	private void updateStatus(IStatus status) {
+//		if (!status.matches(IStatus.ERROR)) {
+//			// look if there are more severe errors
+//			for (int i = 0; i < fTextBoxes.size(); i++) {
+//				Text curr = (Text) fTextBoxes.get(i);
+//				if (!(curr == fTabSizeTextBox && usesTabs())) {
+//					IStatus currStatus = validatePositiveNumber(curr.getText());
+//					status = StatusUtil.getMoreSevere(currStatus, status);
+//				}
+//			}
+//		}
+//		setValid(!status.matches(IStatus.ERROR));
+//		StatusUtil.applyToStatusLine(this, status);
+//	}
+
+//	private boolean usesTabs() {
+//		return TAB.equals(fWorkingValues.get(PREF_TAB_CHAR));
+//	}
 
 }