add triangle.java and others changed