Merge branch 'deadmoose'

.classpath

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src/main/java"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>

.gitignore

@@ -0,0 +1 @@
+target

.project

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>pythagoras</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>

src/main/java/pythagoras/f/IShape.java

@@ -19,13 +19,13 @@ public interface IShape
     boolean contains (IPoint point);
 
     /** Returns true if this shape completely contains the specified rectangle. */
-    boolean contains (float x, float y, float w, float h);
+    boolean contains (float x, float y, float width, float height);
 
     /** Returns true if this shape completely contains the supplied rectangle. */
     boolean contains (IRectangle r);
 
     /** Returns true if this shape intersects the specified rectangle. */
-    boolean intersects (float x, float y, float w, float h);
+    boolean intersects (float x, float y, float width, float height);
 
     /** Returns true if this shape intersects the supplied rectangle. */
     boolean intersects (IRectangle r);

src/main/java/pythagoras/f/Rectangle.java

@@ -27,9 +27,7 @@ public class Rectangle extends AbstractRectangle implements Serializable
      * Constructs a rectangle at (0,0) and with dimensions (0,0).
      */
     public Rectangle () {
-    }
-
-    /**
+    }     /**
      * Constructs a rectangle with the supplied upper-left corner and dimensions (0,0).
      */
     public Rectangle (IPoint p) {
@@ -182,7 +180,7 @@ public class Rectangle extends AbstractRectangle implements Serializable
     }
 
     @Override // from RectangularShape
-    public void setFrame (float x, float y, float w, float h) {
-        setBounds(x, y, w, h);
+    public void setFrame (float x, float y, float width, float height) {
+        setBounds(x, y, width, height);
     }
 }

src/main/java/pythagoras/f/RectangularShape.java

@@ -13,7 +13,7 @@ public abstract class RectangularShape implements IRectangularShape
     /**
      * Sets the location and size of the framing rectangle of this shape to the specified values.
      */
-    public abstract void setFrame (float x, float y, float w, float h);
+    public abstract void setFrame (float x, float y, float width, float height);
 
     /**
      * Sets the location and size of the framing rectangle of this shape to the supplied values.