A massive organize imports and formatting of the sources using default Eclipse code...

[phpeclipse.git] / net.sourceforge.phpeclipse / src / net / sourceforge / phpdt / internal / ui / preferences / JavaPreferencesSettings.java

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/preferences/JavaPreferencesSettings.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/preferences/JavaPreferencesSettings.java
index 3ea2cf3..bbb7687 100644 (file)
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/preferences/JavaPreferencesSettings.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/preferences/JavaPreferencesSettings.java
@@ -12,54 +12,53 @@ package net.sourceforge.phpdt.internal.ui.preferences;
 
 import java.util.StringTokenizer;
 
+import net.sourceforge.phpdt.internal.corext.codemanipulation.CodeGenerationSettings;
+import net.sourceforge.phpdt.internal.corext.util.CodeFormatterUtil;
+import net.sourceforge.phpdt.ui.PreferenceConstants;
+
 import org.eclipse.jface.preference.IPreferenceStore;
 
-import net.sourceforge.phpdt.ui.PreferenceConstants;
+public class JavaPreferencesSettings {
 
-import net.sourceforge.phpdt.internal.corext.codemanipulation.CodeGenerationSettings;
-import net.sourceforge.phpdt.internal.corext.util.CodeFormatterUtil;
- 
-public class JavaPreferencesSettings  {
-       
        public static CodeGenerationSettings getCodeGenerationSettings() {
-               IPreferenceStore store= PreferenceConstants.getPreferenceStore();
-               
-               CodeGenerationSettings res= new CodeGenerationSettings();
-               res.createComments= store.getBoolean(PreferenceConstants.CODEGEN_ADD_COMMENTS);
-               res.useKeywordThis= store.getBoolean(PreferenceConstants.CODEGEN_KEYWORD_THIS);
-               res.importOrder= getImportOrderPreference(store);
-               res.importThreshold= getImportNumberThreshold(store);
-               res.tabWidth= CodeFormatterUtil.getTabWidth();
+               IPreferenceStore store = PreferenceConstants.getPreferenceStore();
+
+               CodeGenerationSettings res = new CodeGenerationSettings();
+               res.createComments = store
+                               .getBoolean(PreferenceConstants.CODEGEN_ADD_COMMENTS);
+               res.useKeywordThis = store
+                               .getBoolean(PreferenceConstants.CODEGEN_KEYWORD_THIS);
+               // res.importOrder= getImportOrderPreference(store);
+               res.importThreshold = getImportNumberThreshold(store);
+               res.tabWidth = CodeFormatterUtil.getTabWidth();
                return res;
        }
 
        public static int getImportNumberThreshold(IPreferenceStore prefs) {
-               int threshold= prefs.getInt(PreferenceConstants.ORGIMPORTS_ONDEMANDTHRESHOLD);
+               int threshold = prefs
+                               .getInt(PreferenceConstants.ORGIMPORTS_ONDEMANDTHRESHOLD);
                if (threshold < 0) {
-                       threshold= Integer.MAX_VALUE;
+                       threshold = Integer.MAX_VALUE;
                }
                return threshold;
        }
 
+       // public static String[] getImportOrderPreference(IPreferenceStore prefs) {
+       // String str= prefs.getString(PreferenceConstants.ORGIMPORTS_IMPORTORDER);
+       // if (str != null) {
+       // return unpackList(str, ";"); //$NON-NLS-1$
+       // }
+       // return new String[0];
+       // }
 
-       public static String[] getImportOrderPreference(IPreferenceStore prefs) {
-               String str= prefs.getString(PreferenceConstants.ORGIMPORTS_IMPORTORDER);
-               if (str != null) {
-                       return unpackList(str, ";"); //$NON-NLS-1$
-               }
-               return new String[0];
-       }
-               
        private static String[] unpackList(String str, String separator) {
-               StringTokenizer tok= new StringTokenizer(str, separator); //$NON-NLS-1$
-               int nTokens= tok.countTokens();
-               String[] res= new String[nTokens];
-               for (int i= 0; i < nTokens; i++) {
-                       res[i]= tok.nextToken().trim();
+               StringTokenizer tok = new StringTokenizer(str, separator); //$NON-NLS-1$
+               int nTokens = tok.countTokens();
+               String[] res = new String[nTokens];
+               for (int i = 0; i < nTokens; i++) {
+                       res[i] = tok.nextToken().trim();
                }
                return res;
        }
-       
-               
-}
 
+}