Avans/FestivalPlanner
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/ProjectgroepA4/FestivalPlanner into develop

Browse Source
This commit is contained in:
Yorick
2015-04-07 13:13:00 +02:00
parent ea7ecfcd56 1684976a47
commit 5a0def924a
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Objects/DrawObject.java
+6 -2
View File
@@ -172,8 +172,12 @@ public abstract class DrawObject implements Serializable
{ {
Shape ownShape = getRectangle(); Shape ownShape = getRectangle();
Rectangle2D otherRectangle = object.getTransform().createTransformedShape(object.getImageRectangle()).getBounds2D(); Rectangle2D otherRectangle = object.getTransform().createTransformedShape(object.getImageRectangle()).getBounds2D();
if (ownShape.intersects(otherRectangle)) if(ownShape != null && otherRectangle != null) {
return true; if (ownShape.intersects(otherRectangle))
return true;
else
return false;
}
else else
return false; return false;
} }