Commit 114f8c97 authored by arbennett's avatar arbennett
Browse files

Merge remote-tracking branch 'origin/next' into jay/projectSupport

parents b883244f 8eaf022a
......@@ -30,7 +30,15 @@ import itertools
import subprocess
if sys.version_info >= (3,0):
if sys.version_info < (2,7):
print("")
print("--------------------------- ERROR -----------------------------")
print(" Unsupported Python version: " + sys.version_info.major + "." + sys.version_info.minor)
print(" Please update to Python 2.7 or greater to use the installer.")
print("--------------------------- ERROR -----------------------------")
print("")
exit()
elif sys.version_info >= (3,0):
import urllib.request as urllib2
else:
import urllib2
......
......@@ -24,7 +24,7 @@ import org.eclipse.ice.datastructures.form.Material;
public class MaterialSelection {
/**
* The mateiral for this selection (the row)
* The material for this selection (the row)
*/
private Material material;
......@@ -81,11 +81,28 @@ public class MaterialSelection {
} else {
MaterialSelection selection = (MaterialSelection) other;
equal = this.material.equals(selection.material)
&& this.selectedProperty
.equals(selection.selectedProperty);
&& this.selectedProperty.equals(selection.selectedProperty);
}
}
return equal;
}
/**
* Returns the hashCode of the object.
*
* @return The hashCode of the Object.
*/
@Override
public int hashCode() {
// Call the super's hashCode.
int hash = super.hashCode();
// Add local hashes.
hash = 31 * hash + material.hashCode();
hash = 31 * hash + selectedProperty.hashCode();
return hash;
}
}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment