Projects >> Wildbook >>afdee55c88dd2ce2b8609b86f2f10834a2fc394a

Chunk
Conflicting content 
    Properties localesProps = new Properties();
    if(useLocales){
      try {
<<<<<<< HEAD
        localesProps=ShepherdProperties.getProperties("locationIDGPS.properties", "");
=======
        localesProps=ShepherdProperties.getProperties("locationIDGPS.properties", "",context);
>>>>>>> 1d7502bf3931e5eb9871e61d84df332801be7e1e
      } 
      catch (Exception ioe) {
        ioe.printStackTrace();
Solution content 
    Properties localesProps = new Properties();
    if(useLocales){
      try {
        localesProps=ShepherdProperties.getProperties("locationIDGPS.properties", "",context);
      } 
      catch (Exception ioe) {
        ioe.printStackTrace();
File
MarkedIndividual.java
Developer's decision
Version 2
Kind of conflict
Method invocation
Variable
Chunk
Conflicting content 
    Properties localesProps = new Properties();
    if(useLocales){
      try {
<<<<<<< HEAD
        localesProps=ShepherdProperties.getProperties("locationIDGPS.properties", "");
=======
        localesProps=ShepherdProperties.getProperties("locationIDGPS.properties", "",context);
>>>>>>> 1d7502bf3931e5eb9871e61d84df332801be7e1e
      } 
      catch (Exception ioe) {
        ioe.printStackTrace();
Solution content 
    Properties localesProps = new Properties();
    if(useLocales){
      try {
        localesProps=ShepherdProperties.getProperties("locationIDGPS.properties", "",context);
      } 
      catch (Exception ioe) {
        ioe.printStackTrace();
File
Occurrence.java
Developer's decision
Version 2
Kind of conflict
Method invocation
Variable
Chunk
Conflicting content 
    /*
    for (String key : values) {
      String label = findLabel(key, langCode,context);
<<<<<<< HEAD
=======
      list.add(new OptionDesc(key, label));
    }
    */
    int valuesSize=values.size();
    for(int i=0;i>>>>>> 1d7502bf3931e5eb9871e61d84df332801be7e1e
      list.add(new OptionDesc(key, label));
      
    }
Solution content 
    /*
    for (String key : values) {
      String label = findLabel(key, langCode,context);
      list.add(new OptionDesc(key, label));
    }
    */
    int valuesSize=values.size();
    for(int i=0;i
File
Util.java
Developer's decision
Version 2
Kind of conflict
Comment
For statement
Method invocation
Variable
Chunk
Conflicting content 
}


<<<<<<< HEAD
=======
	public static String dataDir(String context, String rootWebappPath) {
		File webappsDir = new File(rootWebappPath).getParentFile();
		File shepherdDataDir = new File(webappsDir, CommonConfiguration.getDataDirectoryName(context));
    if(!shepherdDataDir.exists()){shepherdDataDir.mkdir();}
		return shepherdDataDir.getAbsolutePath();
	}

	//like above, but can pass a subdir to append
	public static String dataDir(String context, String rootWebappPath, String subdir) {
		return dataDir(context, rootWebappPath) + File.separator + subdir;
	}


>>>>>>> 1d7502bf3931e5eb9871e61d84df332801be7e1e
}
Solution content 
}


	public static String dataDir(String context, String rootWebappPath) {
		File webappsDir = new File(rootWebappPath).getParentFile();
		File shepherdDataDir = new File(webappsDir, CommonConfiguration.getDataDirectoryName(context));
    if(!shepherdDataDir.exists()){shepherdDataDir.mkdir();}
		return shepherdDataDir.getAbsolutePath();
	}

	//like above, but can pass a subdir to append
	public static String dataDir(String context, String rootWebappPath, String subdir) {
		return dataDir(context, rootWebappPath) + File.separator + subdir;
	}


}
File
ServletUtilities.java
Developer's decision
Version 2
Kind of conflict
Comment
Method declaration
Chunk
Conflicting content 

      	try {
<<<<<<< HEAD
        	props=ShepherdProperties.getProperties("submitActionClass.properties", "");
=======
        	props=ShepherdProperties.getProperties("submitActionClass.properties", "",context);
>>>>>>> 1d7502bf3931e5eb9871e61d84df332801be7e1e

        	Enumeration m_enum = props.propertyNames();
        	while (m_enum.hasMoreElements()) {
Solution content 

      	try {
        	props=ShepherdProperties.getProperties("submitActionClass.properties", "",context);

        	Enumeration m_enum = props.propertyNames();
        	while (m_enum.hasMoreElements()) {
File
SubmitAction.java
Developer's decision
Version 2
Kind of conflict
Method invocation
Variable
Chunk
Conflicting content 
        //load the optional locales
        Properties props = new Properties();
        try {
<<<<<<< HEAD
          props=ShepherdProperties.getProperties("locationIDGPS.properties", "");
=======
          props=ShepherdProperties.getProperties("locationIDGPS.properties", "",context);
>>>>>>> 1d7502bf3931e5eb9871e61d84df332801be7e1e
        
        } catch (Exception e) {
          System.out.println("     Could not load locales.properties EncounterSearchExportExcelFile.");
Solution content 
        //load the optional locales
        Properties props = new Properties();
        try {
          props=ShepherdProperties.getProperties("locationIDGPS.properties", "",context);
        
        } catch (Exception e) {
          System.out.println("     Could not load locales.properties EncounterSearchExportExcelFile.");
File
EncounterSearchExportExcelFile.java
Developer's decision
Version 2
Kind of conflict
Method invocation
Variable
Chunk
Conflicting content 
                System.out.println("     I hit an error getting locales in searchResults.jsp.");
              }
            }
<<<<<<< HEAD
            if (enc.getCountry()!=null) {
              Label lCountry = new Label(25, count, enc.getCountry());
              sheet.addCell(lCountry);
            }
            if (!enc.getSex().equals("unknown")) {
              Label lSex = new Label(26, count, enc.getSex());
=======
            if ((enc.getSex()!=null)&&(!enc.getSex().equals("unknown"))) {
              Label lSex = new Label(25, count, enc.getSex());
>>>>>>> 1d7502bf3931e5eb9871e61d84df332801be7e1e
              sheet.addCell(lSex);
            }
            if(enc.getComments()!=null){
Solution content 
                System.out.println("     I hit an error getting locales in searchResults.jsp.");
              }
            }
            if ((enc.getSex()!=null)&&(!enc.getSex().equals("unknown"))) {
              Label lSex = new Label(25, count, enc.getSex());
              sheet.addCell(lSex);
            }
            if(enc.getComments()!=null){
File
EncounterSearchExportExcelFile.java
Developer's decision
Version 2
Kind of conflict
If statement
Method invocation
Variable
Chunk
Conflicting content 
        Properties props = new Properties();
        try {
          //props.load(getClass().getResourceAsStream("/bundles/locales.properties"));
<<<<<<< HEAD
          props=ShepherdProperties.getProperties("locationIDGPS.properties", "");
=======
          props=ShepherdProperties.getProperties("locationIDGPS.properties", "",context);
>>>>>>> 1d7502bf3931e5eb9871e61d84df332801be7e1e
          
        } catch (Exception e) {
          System.out.println("     Could not load locationIDGPS.properties in class GenalexExportCodominantMSDataBySize.");
Solution content 
        Properties props = new Properties();
        try {
          //props.load(getClass().getResourceAsStream("/bundles/locales.properties"));
          props=ShepherdProperties.getProperties("locationIDGPS.properties", "",context);
          
        } catch (Exception e) {
          System.out.println("     Could not load locationIDGPS.properties in class GenalexExportCodominantMSDataBySize.");
File
GenalexExportCodominantMSDataBySize.java
Developer's decision
Version 2
Kind of conflict
Method invocation
Variable
Chunk
Conflicting content 
  haploprops=ShepherdProperties.getProperties("haplotypeColorCodes.properties", "",context);

    Properties localeprops = new Properties();
<<<<<<< HEAD
   localeprops=ShepherdProperties.getProperties("locationIDGPS.properties", "");
=======
   localeprops=ShepherdProperties.getProperties("locationIDGPS.properties", "", context);
>>>>>>> 1d7502bf3931e5eb9871e61d84df332801be7e1e

   List allSpecies=CommonConfiguration.getIndexedValues("genusSpecies",context);
   int numSpecies=allSpecies.size();
Solution content 
  haploprops=ShepherdProperties.getProperties("haplotypeColorCodes.properties", "",context);

    Properties localeprops = new Properties();
   localeprops=ShepherdProperties.getProperties("locationIDGPS.properties", "", context);

   List allSpecies=CommonConfiguration.getIndexedValues("genusSpecies",context);
   int numSpecies=allSpecies.size();
File
GetIndividualSearchGoogleMapsPoints.java
Developer's decision
Version 2
Kind of conflict
Method invocation
Variable
Chunk
Conflicting content 
        //load the optional locales
        Properties props = new Properties();
        try {
<<<<<<< HEAD
          props=ShepherdProperties.getProperties("locationIDGPS.properties", "");
=======
          props=ShepherdProperties.getProperties("locationIDGPS.properties", "",context);
>>>>>>> 1d7502bf3931e5eb9871e61d84df332801be7e1e
        } catch (Exception e) {
          //System.out.println("     Could not load locationIDGPS.properties in class GenalexExportCodominantMSDataBySize.");
          e.printStackTrace();
Solution content 
        //load the optional locales
        Properties props = new Properties();
        try {
          props=ShepherdProperties.getProperties("locationIDGPS.properties", "",context);
        } catch (Exception e) {
          //System.out.println("     Could not load locationIDGPS.properties in class GenalexExportCodominantMSDataBySize.");
          e.printStackTrace();
File
SOCPROGExport.java
Developer's decision
Version 2
Kind of conflict
Method invocation
Variable
Chunk
Conflicting content 
  
  @Test
  public void testSubmit() {
<<<<<<< HEAD
    beginAt("/submit.jsp");
    //clickLinkWithExactText("Participate");
=======
    setScriptingEnabled(false);
    beginAt("/index.jsp");
    clickLinkWithExactText("Participate");
>>>>>>> 1d7502bf3931e5eb9871e61d84df332801be7e1e
    // necessary fields
    // encounter date (day, month, year, hour, minutes)
    // sighting location
Solution content 
  
  @Test
  public void testSubmit() {
    setScriptingEnabled(false);
    beginAt("/index.jsp");
    clickLinkWithExactText("Participate");
    // necessary fields
    // encounter date (day, month, year, hour, minutes)
    // sighting location
File
SubmitIT.java
Developer's decision
Version 2
Kind of conflict
Comment
Method invocation
Chunk
Conflicting content 
    selectOption("hour", "12 am");
    selectOption("minutes", ":00");
    setTextField("location", "the world");
<<<<<<< HEAD
    setTextField("submitterName", "Test User");
    setTextField("submitterEmail", "mnoreply@donotreply.com");
    setTextField("theFile1", "src/main/webapp/images/logbook.gif");
=======
    setTextField("submitterName", "mark");
    setTextField("submitterEmail", "mark.mcbride@gmail.com");
    setTextField("theFiles", "src/main/webapp/images/logbook.gif");
>>>>>>> 1d7502bf3931e5eb9871e61d84df332801be7e1e
    submit("Submit");
    assertResponseCode(200);
  }
Solution content 
    selectOption("hour", "12 am");
    selectOption("minutes", ":00");
    setTextField("location", "the world");
    setTextField("submitterName", "mark");
    setTextField("submitterEmail", "mark.mcbride@gmail.com");
    setTextField("theFiles", "src/main/webapp/images/logbook.gif");
    submit("Submit");
    assertResponseCode(200);
  }
File
SubmitIT.java
Developer's decision
Version 2
Kind of conflict
Method invocation