Projects >> wonder >>0254a59b7f1e37f7c1937c036537b889bb71217d

Chunk
Conflicting content 
    
    public Integer startDay() {
    	// Get first day of week from current localizer Locale.
<<<<<<< HEAD
    	return new Integer(new GregorianCalendar(locale()).getFirstDayOfWeek() - 1);
=======
    	return Integer.valueOf(new GregorianCalendar(locale()).getFirstDayOfWeek() - 1);
>>>>>>> 6154e35930182cabcb4263e92f47de27c6c4fefe
    }
    
    private NSArray localizeStringArray(NSArray strings) {
Solution content 
    
    public Integer startDay() {
    	// Get first day of week from current localizer Locale.
    	return Integer.valueOf(new GregorianCalendar(locale()).getFirstDayOfWeek() - 1);
    }
    
    private NSArray localizeStringArray(NSArray strings) {
File
AjaxDatePicker.java
Developer's decision
Version 2
Kind of conflict
Method invocation
Return statement
Chunk
Conflicting content 
 * @author mschrag
 */
public class AjaxTree extends WOComponent {
<<<<<<< HEAD
=======
	/**
	 * Do I need to update serialVersionUID?
	 * See section 5.6 Type Changes Affecting Serialization on page 51 of the 
	 * Java Object Serialization Spec
	 */
	private static final long serialVersionUID = 1L;

>>>>>>> 6154e35930182cabcb4263e92f47de27c6c4fefe
	private static final Logger log = Logger.getLogger(AjaxTree.class);
	private AjaxTreeModel _treeModel;
Solution content 
 * @author mschrag
 */
public class AjaxTree extends WOComponent {
	/**
	 * Do I need to update serialVersionUID?
	 * See section 5.6 Type Changes Affecting Serialization on page 51 of the 
	 * Java Object Serialization Spec
	 */
	private static final long serialVersionUID = 1L;

	private static final Logger log = Logger.getLogger(AjaxTree.class);
	private AjaxTreeModel _treeModel;
File
AjaxTree.java
Developer's decision
Version 2
Kind of conflict
Attribute
Comment
Chunk
Conflicting content 
import com.webobjects.appserver.WOContext;
import com.webobjects.directtoweb.D2WContext;
import com.webobjects.directtoweb.D2WHead;
<<<<<<< HEAD
=======
import com.webobjects.directtoweb.ERD2WContext;
>>>>>>> 6154e35930182cabcb4263e92f47de27c6c4fefe
import com.webobjects.foundation.NSSelector;

import er.directtoweb.ERD2WFactory;
Solution content 
import com.webobjects.appserver.WOContext;
import com.webobjects.directtoweb.D2WContext;
import com.webobjects.directtoweb.D2WHead;
import com.webobjects.directtoweb.ERD2WContext;
import com.webobjects.foundation.NSSelector;

import er.directtoweb.ERD2WFactory;
File
ERD2WHead.java
Developer's decision
Version 2
Kind of conflict
Import
Chunk
Conflicting content 
package er.extensions.appserver;
<<<<<<< HEAD
=======

>>>>>>> 6154e35930182cabcb4263e92f47de27c6c4fefe
import java.text.SimpleDateFormat;
import java.util.Enumeration;
import java.util.Map;
Solution content 
package er.extensions.appserver;

import java.text.SimpleDateFormat;
import java.util.Enumeration;
import java.util.Map;
File
ERXRequest.java
Developer's decision
Version 1
Kind of conflict
Blank
Chunk
Conflicting content 
package er.extensions.batching;

<<<<<<< HEAD
=======
import java.io.Serializable;

>>>>>>> 6154e35930182cabcb4263e92f47de27c6c4fefe
import com.webobjects.appserver.WOActionResults;
import com.webobjects.appserver.WOContext;
import com.webobjects.appserver.WODisplayGroup;
Solution content 
package er.extensions.batching;

import java.io.Serializable;

import com.webobjects.appserver.WOActionResults;
import com.webobjects.appserver.WOContext;
import com.webobjects.appserver.WODisplayGroup;
File
ERXFlickrBatchNavigation.java
Developer's decision
Version 2
Kind of conflict
Import
Chunk
Conflicting content 
	public NSArray possibleBatchSizes() {
		Object value = valueForBinding("batchSizes");
		if(value == null) {
<<<<<<< HEAD
			return new NSArray(new Integer[] {10, 50, 100, 0});
=======
			return new NSArray(new Integer[] {Integer.valueOf(10), Integer.valueOf(50), Integer.valueOf(100), Integer.valueOf(0)});
>>>>>>> 6154e35930182cabcb4263e92f47de27c6c4fefe
		}
		NSMutableArray result = new NSMutableArray();
		if (value instanceof String) {
Solution content 
	public NSArray possibleBatchSizes() {
		Object value = valueForBinding("batchSizes");
		if(value == null) {
			return new NSArray(new Integer[] {Integer.valueOf(10), Integer.valueOf(50), Integer.valueOf(100), Integer.valueOf(0)});
		}
		NSMutableArray result = new NSMutableArray();
		if (value instanceof String) {
File
ERXFlickrBatchNavigation.java
Developer's decision
Version 2
Kind of conflict
Method invocation
Return statement
Chunk
Conflicting content 
/**
 * @deprecated Use {@link IERXPercentComplete} instead
 */
<<<<<<< HEAD
=======
@Deprecated
>>>>>>> 6154e35930182cabcb4263e92f47de27c6c4fefe
public interface ERXTaskPercentComplete extends IERXPercentComplete { }
Solution content 
/**
 * @deprecated Use {@link IERXPercentComplete} instead
 */
@Deprecated
public interface ERXTaskPercentComplete extends IERXPercentComplete { }
File
ERXTaskPercentComplete.java
Developer's decision
Version 2
Kind of conflict
Annotation
Chunk
Conflicting content 
		}
	}
	
<<<<<<< HEAD
	protected void _initWithParentObjectStore(EOObjectStore parent) {
		/* NOTE: This method is called from EOEditingContext's constructor. Doing nothing here to avoid the following race condition:
		 * - new ERXEC() is called, it starts with invoking EOEditingContext constructor
		 * - EOEditingContext constructor registers notifications' handlers
		 * - One of the handlers gets triggered in another thread
		 * - As some handlers are overriden in ERXEC, the ERXEC's handler is called - which means that ERXEC's method is invoked when ERXEC is still
		 * under construction. This leads to disaster as all instance variables are not initialized at the time of the method call.
		 */
	}
=======
//	protected void _initWithParentObjectStore(EOObjectStore parent) {
//		/* NOTE: This method is called from EOEditingContext's constructor. Doing nothing here to avoid the following race condition:
//		 * - new ERXEC() is called, it starts with invoking EOEditingContext constructor
//		 * - EOEditingContext constructor registers notifications' handlers
//		 * - One of the handlers gets triggered in another thread
//		 * - As some handlers are overriden in ERXEC, the ERXEC's handler is called - which means that ERXEC's method is invoked when ERXEC is still
//		 * under construction. This leads to disaster as all instance variables are not initialized at the time of the method call.
//		 */
//	}
>>>>>>> 6154e35930182cabcb4263e92f47de27c6c4fefe

	/** Utility to delete a bunch of objects. 
	 * @param objects */
Solution content 
//		/* NOTE: This method is called from EOEditingContext's constructor. Doing nothing here to avoid the following race condition:
//		 * - new ERXEC() is called, it starts with invoking EOEditingContext constructor
		}
	}
	
//	protected void _initWithParentObjectStore(EOObjectStore parent) {
//		 * - EOEditingContext constructor registers notifications' handlers
//		 * - One of the handlers gets triggered in another thread
//		 * - As some handlers are overriden in ERXEC, the ERXEC's handler is called - which means that ERXEC's method is invoked when ERXEC is still
//		 * under construction. This leads to disaster as all instance variables are not initialized at the time of the method call.
//		 */
//	}

	/** Utility to delete a bunch of objects. 
	 * @param objects */
File
ERXEC.java
Developer's decision
Version 2
Kind of conflict
Comment
Method declaration
Chunk
Conflicting content 
    }
    
    /**
<<<<<<< HEAD
     * @deprecated use writeInputStreamToFile(InputStream is, File f) instead
=======
     * @deprecated use {@link #writeInputStreamToFile(InputStream, File)}
>>>>>>> 6154e35930182cabcb4263e92f47de27c6c4fefe
     */
    @Deprecated
	public static void writeInputStreamToFile(File f, InputStream is) throws IOException {
Solution content 
    }
    
    /**
     * @deprecated use {@link #writeInputStreamToFile(InputStream, File)}
     */
    @Deprecated
	public static void writeInputStreamToFile(File f, InputStream is) throws IOException {
File
ERXFileUtilities.java
Developer's decision
Version 2
Kind of conflict
Comment
Chunk
Conflicting content 
/**
 * @deprecated use {@link IERXStatus} instead.
 */
<<<<<<< HEAD
=======
@Deprecated
>>>>>>> 6154e35930182cabcb4263e92f47de27c6c4fefe
public interface ERXStatusInterface extends IERXStatus { }
Solution content 
/**
 * @deprecated use {@link IERXStatus} instead.
 */
@Deprecated
public interface ERXStatusInterface extends IERXStatus { }
File
ERXStatusInterface.java
Developer's decision
Version 2
Kind of conflict
Annotation
Chunk
Conflicting content 
    }
    
    /**
<<<<<<< HEAD
=======
     * Tests if a given string object can be parsed into
     * an integer.
     * @param s string to be parsed
     * @return true if the string is not null
     *      and can be parsed to an int
     */
    public static boolean stringIsParseableInteger(String s) {
        try {
            Integer.parseInt(s);
            return true;
        } catch (NumberFormatException e) {
            return false;
        }
    }
    
    /**
>>>>>>> 6154e35930182cabcb4263e92f47de27c6c4fefe
     * Wrapper for {@link Integer#valueOf(String)} that catches
     * the NumberFormatException.
     *
Solution content 
    }
    
    /**
     * Tests if a given string object can be parsed into
     * an integer.
     * @param s string to be parsed
     * @return true if the string is not null
     *      and can be parsed to an int
     */
    public static boolean stringIsParseableInteger(String s) {
        try {
            Integer.parseInt(s);
            return true;
        } catch (NumberFormatException e) {
            return false;
        }
    }
    
    /**
     * Wrapper for {@link Integer#valueOf(String)} that catches
     * the NumberFormatException.
     *
File
ERXStringUtilities.java
Developer's decision
Version 2
Kind of conflict
Comment
Method declaration
Chunk
Conflicting content 
	 * @return the string without HTML characters in it
	 */
	public static String stripHtml(String str, boolean convertChars) {
<<<<<<< HEAD
 		String stripped = str;
 		if (stripped != null) {
 			stripped = stripped.replaceAll("<[^>]*>", " ");
=======
		String stripped = str;
		if (stripped != null) {
			stripped = stripped.replaceAll("<[^>]*>", " ");
>>>>>>> 6154e35930182cabcb4263e92f47de27c6c4fefe
			if(convertChars) {
				stripped = stripped.replaceAll("\\s+", " ");
				stripped = stripped.replaceAll("’", "'");
Solution content 
	 * @return the string without HTML characters in it
	 */
	public static String stripHtml(String str, boolean convertChars) {
 		String stripped = str;
 		if (stripped != null) {
 			stripped = stripped.replaceAll("<[^>]*>", " ");
			if(convertChars) {
				stripped = stripped.replaceAll("\\s+", " ");
				stripped = stripped.replaceAll("’", "'");
File
ERXStringUtilities.java
Developer's decision
Version 1
Kind of conflict
If statement
Method invocation
Variable
Chunk
Conflicting content 
				stripped = stripped.replaceAll("®", "(C)");
				stripped = stripped.replaceAll("®", "(R)");
				stripped = stripped.replaceAll("™", "(TM)");
<<<<<<< HEAD
			stripped = stripped.trim();
			}
 		}
 		return stripped;
 	}


	/**
	 * @deprecated  Replaced by stripHtml(str, false)
	 */
	public static String stripHtml(String str) {
		return stripHtml(str, false);
=======
				stripped = stripped.trim();
			}
		}
		return stripped;
>>>>>>> 6154e35930182cabcb4263e92f47de27c6c4fefe
	}
	
	/**
Solution content 
				stripped = stripped.replaceAll("®", "(C)");
				stripped = stripped.replaceAll("®", "(R)");
				stripped = stripped.replaceAll("™", "(TM)");
			stripped = stripped.trim();
			}
 		}
 		return stripped;
 	}

	/**
File
ERXStringUtilities.java
Developer's decision
Version 2
Kind of conflict
Comment
Method invocation
Method signature
Return statement
Variable
Chunk
Conflicting content 
import er.extensions.eof.qualifiers.ERXFullTextQualifier;
import er.extensions.foundation.ERXProperties;
import er.extensions.foundation.ERXStringUtilities;
<<<<<<< HEAD
=======
import er.extensions.validation.ERXValidationException;
import er.extensions.validation.ERXValidationFactory;
>>>>>>> 6154e35930182cabcb4263e92f47de27c6c4fefe

/**
 * ERXSQLHelper provides support for additional database-vender-specific
Solution content 
import er.extensions.eof.qualifiers.ERXFullTextQualifier;
import er.extensions.foundation.ERXProperties;
import er.extensions.foundation.ERXStringUtilities;
import er.extensions.validation.ERXValidationException;
import er.extensions.validation.ERXValidationFactory;

/**
 * ERXSQLHelper provides support for additional database-vender-specific
File
ERXSQLHelper.java
Developer's decision
Version 2
Kind of conflict
Import
Chunk
Conflicting content 
		else if (value instanceof Date) {
			formattedValue = ERXRestUtils.dateFormat(false, context).format(value);
		}
<<<<<<< HEAD
=======
		else if (value instanceof LocalDate) {
			formattedValue = ERXRestUtils.jodaLocalDateFormat(false, context).print((LocalDate)value);
		}
>>>>>>> 6154e35930182cabcb4263e92f47de27c6c4fefe
		else if (value instanceof NSData && ((NSData)value).length() == 24) {
			formattedValue = NSPropertyListSerialization.stringFromPropertyList(value);
		}
Solution content 
		else if (value instanceof Date) {
			formattedValue = ERXRestUtils.dateFormat(false, context).format(value);
		}
		else if (value instanceof LocalDate) {
			formattedValue = ERXRestUtils.jodaLocalDateFormat(false, context).print((LocalDate)value);
		}
		else if (value instanceof NSData && ((NSData)value).length() == 24) {
			formattedValue = NSPropertyListSerialization.stringFromPropertyList(value);
		}
File
ERXRestUtils.java
Developer's decision
Version 2
Kind of conflict
If statement
Method invocation
Variable
Chunk
Conflicting content 
			return ERXRestUtils.coerceValueToString(obj, _context);
		}
	}
<<<<<<< HEAD

=======
	
	public static class JodaTimeProcessor implements JsonValueProcessor {
		private ERXRestContext _context;
		
		public JodaTimeProcessor(ERXRestContext context) {
			_context = context;
		}
		
		public Object processArrayValue(Object obj, JsonConfig jsonconfig) {
			return ERXRestUtils.coerceValueToString(obj, _context);
		}

		public Object processObjectValue(String s, Object obj, JsonConfig jsonconfig) {
			return ERXRestUtils.coerceValueToString(obj, _context);
		}
	}
	
>>>>>>> 6154e35930182cabcb4263e92f47de27c6c4fefe
	public static JsonConfig createDefaultConfig(ERXRestContext context) {
		JsonConfig config = new JsonConfig();
		config.registerJsonValueProcessor(NSTimestamp.class, new NSTimestampProcessor(context));
Solution content 
			return ERXRestUtils.coerceValueToString(obj, _context);
		}
	}

	public static class JodaTimeProcessor implements JsonValueProcessor {
		private ERXRestContext _context;
		
		public JodaTimeProcessor(ERXRestContext context) {
			_context = context;
		}
		
		public Object processArrayValue(Object obj, JsonConfig jsonconfig) {
			return ERXRestUtils.coerceValueToString(obj, _context);
		}

		public Object processObjectValue(String s, Object obj, JsonConfig jsonconfig) {
			return ERXRestUtils.coerceValueToString(obj, _context);
		}
	}
	
	public static JsonConfig createDefaultConfig(ERXRestContext context) {
		JsonConfig config = new JsonConfig();
		config.registerJsonValueProcessor(NSTimestamp.class, new NSTimestampProcessor(context));
File
_ERXJSONConfig.java
Developer's decision
Version 2
Kind of conflict
Class declaration