Skip to content

Commit

Permalink
Merge pull request #13 from mrietveld/master-java6
Browse files Browse the repository at this point in the history
JDK 1.6 compatibility changes
  • Loading branch information
gastaldi committed Apr 16, 2014
2 parents 828ddd4 + fb1ce7d commit b8a0057
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@

import java.text.ParsePosition;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Objects;

import org.eclipse.jdt.core.dom.ASTVisitor;
import org.eclipse.jdt.core.dom.MethodDeclaration;
Expand Down Expand Up @@ -427,7 +427,9 @@ public PropertySource<O> removeField()
@Override
public String toString()
{
return "Property " + Objects.toString(name, "<missing>");
// incompatible with java 6:
// return "Property " + Objects.toString(name, "<missing>");
return "Property: " + ((name != null) ? name.toString() : "<missing>");
}

@Override
Expand All @@ -448,7 +450,10 @@ public boolean equals(Object obj)
@Override
public int hashCode()
{
return Objects.hash(getOrigin(), getName());
// incompatible with java 6:
// return Objects.hash(getOrigin(), getName());
Object [] values = { getOrigin(), getName() };
return Arrays.hashCode(values);
}

/**
Expand Down Expand Up @@ -560,7 +565,7 @@ public Annotation<O> getAnnotation(String type)
@Override
public List<? extends Annotation<O>> getAnnotations()
{
List<Annotation<O>> annotations = new ArrayList<>();
List<Annotation<O>> annotations = new ArrayList<Annotation<O>>();
FieldSource<O> field = getField();
if (field != null)
{
Expand Down
5 changes: 5 additions & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,11 @@
<maven>3.0</maven>
</prerequisites>

<properties>
<maven.compiler.target>1.6</maven.compiler.target>
<maven.compiler.source>1.6</maven.compiler.source>
</properties>

<modules>
<module>api</module>
<module>impl</module>
Expand Down

0 comments on commit b8a0057

Please sign in to comment.