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

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/core/JavaCore.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/core/JavaCore.java
index 47e6e39..ec52806 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/core/JavaCore.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/core/JavaCore.java
@@ -16,7 +16,10 @@ import net.sourceforge.phpdt.internal.core.JavaModel;
 import net.sourceforge.phpdt.internal.core.JavaModelManager;
 import net.sourceforge.phpdt.internal.core.Region;
 import net.sourceforge.phpdt.internal.core.util.MementoTokenizer;
-import net.sourceforge.phpdt.internal.corext.Assert;
+//incastrix
+//import net.sourceforge.phpdt.internal.corext.Assert;
+import org.eclipse.core.runtime.Assert;
+
 import net.sourceforge.phpeclipse.PHPeclipsePlugin;
 
 import org.eclipse.core.resources.IFile;
@@ -117,6 +120,23 @@ public class JavaCore {
 	 */
 	public static final String FORMATTER_COMPACT_ASSIGNMENT = PLUGIN_ID
 			+ ".formatter.style.assignment"; //$NON-NLS-1$
+	
+	/**
+	 * Possible configurable option ID.
+	 * 
+	 * @see #getDefaultOptions
+	 * @since 2.0
+	 */
+	public static final String FORMATTER_COMPACT_STRING_CONCATENATION = PLUGIN_ID
+			+ ".formatter.style.compactStringConcatenation"; //$NON-NLS-1$
+	/**
+	 * Possible configurable option ID.
+	 * 
+	 * @see #getDefaultOptions
+	 * @since 2.0
+	 */
+	public static final String FORMATTER_COMPACT_ARRAYS = PLUGIN_ID
+			+ ".formatter.style.compactArrays"; //$NON-NLS-1$	
 
 	/**
 	 * Possible configurable option ID.
@@ -2831,7 +2851,7 @@ public class JavaCore {
 		if (target instanceof File) {
 			File externalFile = (File) target;
 			if (externalFile.isFile()) {
-				String fileName = externalFile.getName().toLowerCase();
+				//String fileName = externalFile.getName().toLowerCase();
 				// if (fileName.endsWith(".jar" //$NON-NLS-1$
 				// ) || fileName.endsWith(".zip" //$NON-NLS-1$
 				// )) { // external binary archive
@@ -3090,6 +3110,12 @@ public class JavaCore {
 
 		preferences.setDefault(FORMATTER_COMPACT_ASSIGNMENT, NORMAL);
 		optionNames.add(FORMATTER_COMPACT_ASSIGNMENT);
+		
+		preferences.setDefault(FORMATTER_COMPACT_ARRAYS, NORMAL);
+		optionNames.add(FORMATTER_COMPACT_ARRAYS);
+		
+		preferences.setDefault(FORMATTER_COMPACT_STRING_CONCATENATION, NORMAL);
+		optionNames.add(FORMATTER_COMPACT_STRING_CONCATENATION);
 
 		preferences.setDefault(FORMATTER_TAB_CHAR, TAB);
 		optionNames.add(FORMATTER_TAB_CHAR);