Projects >> Wildbook >>084cdb5ea80ce99eee9a7c489147b43945f8bd41

Chunk
Conflicting content
public class SubmitAction extends Action {

<<<<<<< HEAD

=======
  String mailList = "no";
  Calendar date = Calendar.getInstance();
  Random ran = new Random();
  String uniqueID = (new Integer(date.get(Calendar.DAY_OF_MONTH))).toString() + (new Integer(date.get(Calendar.MONTH) + 1)).toString() + (new Integer(date.get(Calendar.YEAR))).toString() + (new Integer(date.get(Calendar.HOUR_OF_DAY))).toString() + (new Integer(date.get(Calendar.MINUTE))).toString() + (new Integer(date.get(Calendar.SECOND))).toString() + (new Integer(ran.nextInt(99))).toString();
  String size = "";
  String elevation = "";
  String depth = "";
  String measureUnits = "", location = "", sex = "unknown", comments = "", primaryImageName = "", guess = "no estimate provided";
  String submitterName = "", submitterEmail = "", submitterPhone = "", submitterAddress = "";
  String photographerName = "", photographerEmail = "", photographerPhone = "", photographerAddress = "";
  Vector additionalImageNames = new Vector();
  int encounterNumber = 0;
  int day = 1, month = 1, year = 2003, hour = 12;
  String lat = "", longitude = "", latDirection = "", longDirection = "", scars = "None";
  String minutes = "00", gpsLongitudeMinutes = "", gpsLongitudeSeconds = "", gpsLatitudeMinutes = "", gpsLatitudeSeconds = "", submitterID = "N/A";
  String locCode = "", informothers = "";
  String livingStatus = "";
  Shepherd myShepherd;
>>>>>>> 0ad14674c3145a83f806429e198dafa9e9293e94

  public ActionForward execute(ActionMapping mapping,
                               ActionForm form,
Solution content
public class SubmitAction extends Action {



  public ActionForward execute(ActionMapping mapping,
                               ActionForm form,
File
SubmitAction.java
Developer's decision
Version 1
Kind of conflict
Attribute
Method invocation