Adding two small options for code formatter (zhil's patch). These features are being...

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

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/preferences/CodeFormatterPreferencePage.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/preferences/CodeFormatterPreferencePage.java
index f448ac6..e08920c 100644 (file)
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/preferences/CodeFormatterPreferencePage.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/preferences/CodeFormatterPreferencePage.java
@@ -61,6 +61,10 @@ public class CodeFormatterPreferencePage extends PreferencePage implements
 
        private static final String PREF_STYLE_COMPACT_ASSIGNEMENT = JavaCore.FORMATTER_COMPACT_ASSIGNMENT;
 
+       private static final String PREF_STYLE_COMPACT_STRING_CONCATENATION = JavaCore.FORMATTER_COMPACT_STRING_CONCATENATION;
+
+       private static final String PREF_STYLE_COMPACT_ARRAYS = JavaCore.FORMATTER_COMPACT_ARRAYS;
+       
        private static final String PREF_TAB_CHAR = JavaCore.FORMATTER_TAB_CHAR;
 
        private static final String PREF_TAB_SIZE = JavaCore.FORMATTER_TAB_SIZE;
@@ -87,7 +91,9 @@ public class CodeFormatterPreferencePage extends PreferencePage implements
                                PREF_NEWLINE_CONTROL_STATEMENT, PREF_NEWLINE_CLEAR_ALL,
                                // PREF_NEWLINE_ELSE_IF,
                                PREF_NEWLINE_EMPTY_BLOCK, PREF_LINE_SPLIT,
-                               PREF_STYLE_COMPACT_ASSIGNEMENT, PREF_TAB_CHAR, PREF_TAB_SIZE };
+                               PREF_STYLE_COMPACT_ASSIGNEMENT, PREF_STYLE_COMPACT_STRING_CONCATENATION,
+                               PREF_STYLE_COMPACT_ARRAYS,
+                               PREF_TAB_CHAR, PREF_TAB_SIZE };
        }
 
        /**
@@ -298,6 +304,16 @@ public class CodeFormatterPreferencePage extends PreferencePage implements
                                .getString("CodeFormatterPreferencePage.style_compact_assignement.label"); //$NON-NLS-1$
                addCheckBox(styleComposite, label, PREF_STYLE_COMPACT_ASSIGNEMENT,
                                new String[] { COMPACT, NORMAL });
+               
+               label = PHPUIMessages
+               .getString("CodeFormatterPreferencePage.style_compact_string_concatenation.label"); //$NON-NLS-1$
+               addCheckBox(styleComposite, label, PREF_STYLE_COMPACT_STRING_CONCATENATION,
+               new String[] { COMPACT, NORMAL });
+               
+               label = PHPUIMessages
+               .getString("CodeFormatterPreferencePage.style_compact_arrays.label"); //$NON-NLS-1$
+               addCheckBox(styleComposite, label, PREF_STYLE_COMPACT_ARRAYS,
+               new String[] { COMPACT, NORMAL });              
 
                label = PHPUIMessages
                                .getString("CodeFormatterPreferencePage.tab_char.label"); //$NON-NLS-1$