Created TKP Panel

Author: jamesrcounts

src/main/java/org/teachingextensions/WindowUtils/MultiTurtleWindow.java

@@ -13,6 +13,7 @@
 import org.teachingextensions.logo.Turtle;
 import org.teachingextensions.logo.Turtle.Animals;
 import org.teachingextensions.logo.utils.ColorUtils.PenColors;
+import org.teachingextensions.logo.utils.InterfaceUtils.TkpPanel;
 import org.teachingextensions.logo.utils.LineAndShapeUtils.LineSegment;
 
 /**
@@ -30,7 +31,7 @@ public MultiTurtleWindow()
     this.image = loadAnimal();
   }
   /**
-   * Adds a turtle instance to a window 
+   * Adds a turtle instance to a window
    * NOTE: this method must be called BEFORE calling any other methods on turtle instances
    * <p><b>Example:</b> {@code multiTurtleWindow.addTurtle(myTurtle)}</p>
    *
@@ -49,7 +50,7 @@ public void paint(Graphics g)
   {
     // We must call JPanel paint to get the correct behavior on windows...
     super.paint(g);
-    Graphics2D g2d = ProgramWindow.configureGraphics2D(g);
+    Graphics2D g2d = TkpPanel.configureGraphics2D(g);
     super.setBackground(PenColors.Blues.DarkSlateBlue);
     paintLines(g2d);
     paintTurtle(g2d);

src/main/java/org/teachingextensions/logo/utils/InterfaceUtils/TkpPanel.java

@@ -0,0 +1,121 @@
+package org.teachingextensions.logo.utils.InterfaceUtils;
+
+import org.teachingextensions.logo.utils.LineAndShapeUtils.Paintable;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.MouseListener;
+import java.util.ArrayList;
+
+public class TkpPanel {
+
+  private LazyPanel panel = new LazyPanel();
+
+  public static Graphics2D configureGraphics2D(Graphics g) {
+    Graphics2D g2d = (Graphics2D) g.create();
+    g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
+    g2d.setRenderingHint(RenderingHints.KEY_COLOR_RENDERING, RenderingHints.VALUE_COLOR_RENDER_QUALITY);
+    g2d.setRenderingHint(RenderingHints.KEY_STROKE_CONTROL, RenderingHints.VALUE_STROKE_PURE);
+    g2d.setRenderingHint(RenderingHints.KEY_DITHERING, RenderingHints.VALUE_DITHER_ENABLE);
+    return g2d;
+  }
+
+  public JPanel getPanel() {
+    return panel.getValue();
+  }
+
+  public TkpPanel add(Component component) {
+    this.panel.getValue().add(component);
+    return this;
+  }
+
+  public TkpPanel setPreferredSize(Dimension preferredSize) {
+    this.panel.getValue().setPreferredSize(preferredSize);
+    return this;
+  }
+
+  public TkpPanel setBackground(Color color) {
+    this.panel.getValue().setBackground(color);
+    return this;
+  }
+
+  public TkpPanel addMouseListener(MouseListener listener) {
+    this.panel.getValue().addMouseListener(listener);
+    return this;
+  }
+
+  public TkpPanel setVisible(boolean visible) {
+    this.panel.getValue().setVisible(visible);
+    return this;
+  }
+
+  public TkpPanel remove(Paintable item) {
+    this.panel.getValue().remove(item);
+    return this;
+  }
+
+  public TkpPanel clear() {
+    this.panel.getValue().clear();
+    return this;
+  }
+
+  public TkpPanel add(Paintable item) {
+    this.panel.getValue().add(item);
+
+    return this;
+  }
+
+  public TkpPanel repaint() {
+    this.panel.getValue().repaint();
+    return this;
+  }
+
+  private class LazyPanel {
+
+    private PaintablePanel value;
+
+    public PaintablePanel getValue() {
+      if (this.value == null) {
+        this.value = new PaintablePanel();
+      }
+
+      return this.value;
+    }
+
+
+  }
+
+  private class PaintablePanel extends JPanel {
+    public ArrayList<Paintable> interfaceElements = new ArrayList<>();
+
+    public PaintablePanel remove(Paintable item) {
+      if (interfaceElements.contains(item)) {
+        interfaceElements.remove(item);
+      }
+
+      return this;
+    }
+
+    @Override
+    public void paint(Graphics g) {
+      super.paint(g);
+      Graphics2D g2d = TkpPanel.configureGraphics2D(g);
+      for (Paintable p : interfaceElements) {
+        p.paint(g2d, this);
+      }
+      g2d.dispose();
+    }
+
+    public PaintablePanel clear() {
+      this.interfaceElements.clear();
+      return this;
+    }
+
+    protected PaintablePanel add(Paintable item) {
+      if (!interfaceElements.contains(item)) {
+        interfaceElements.add(item);
+      }
+      return this;
+    }
+  }
+}

src/main/java/org/teachingextensions/logo/utils/InterfaceUtils/TurtleFrame.java

@@ -1,6 +1,8 @@
 package org.teachingextensions.logo.utils.InterfaceUtils;
 
-import org.teachingextensions.WindowUtils.ProgramWindow;
+import org.teachingextensions.approvals.lite.util.FrameCloser;
+import org.teachingextensions.approvals.lite.util.WindowUtils;
+import org.teachingextensions.virtualproctor.VirtualProctorWeb;
 
 import javax.swing.*;
 
@@ -29,6 +31,10 @@ public TurtleFrame() {
     this(TITLE);
   }
 
+  public static void createStandardFrame(JFrame frame) {
+    WindowUtils.testFrame(frame, new VirtualProctorWeb(), new FrameCloser());
+  }
+
   public TurtleFrame addContent(JComponent panel) {
     this.frame.getValue().getContentPane().add(panel);
     return this;
@@ -40,7 +46,7 @@ public TurtleFrame setVisible(boolean visible) {
   }
 
   public TurtleFrame setStandardLayout() {
-    ProgramWindow.createStandardFrame(this.frame.getValue());
+    createStandardFrame(this.frame.getValue());
     return this;
   }
 

src/main/java/org/teachingextensions/logo/utils/PuzzleUtils/PuzzleBoard.java

@@ -9,9 +9,9 @@
 
 import javax.swing.JPanel;
 
-import org.teachingextensions.WindowUtils.ProgramWindow;
 import org.teachingextensions.approvals.lite.util.StringUtils;
 import org.teachingextensions.logo.utils.ColorUtils.PenColors;
+import org.teachingextensions.logo.utils.InterfaceUtils.TkpPanel;
 
 /**
  * Draws and animates a 9-puzzle
@@ -80,7 +80,7 @@ private static void drawTiles(Graphics2D g, Tile[] tiles)
   protected void paintComponent(Graphics g)
   {
     super.paintComponent(g);
-    Graphics2D g2d = ProgramWindow.configureGraphics2D(g);
+    Graphics2D g2d = TkpPanel.configureGraphics2D(g);
     drawBorder(g2d);
     drawField(g2d);
     drawTiles(g2d, tiles);

src/test/java/org/teachingextensions/logo/MultiTurtlePanelTest.java

@@ -11,52 +11,9 @@
 import static org.junit.Assert.assertEquals;
 
 @UseReporter({DiffReporter.class, DelayedClipboardReporter.class})
-public class MultiTurtlePanelTest
-{
+public class MultiTurtlePanelTest {
   @Test
-  public void testPaintNoTurtles()
-  {
-    JUnitUtils.assumeNotHeadless();
-    MultiTurtleWindow panel = new MultiTurtleWindow();
-    Approvals.verify(panel);
-  }
-
-
-  @Test
-  public void testPaintWithGhostTurtle()
-  {
-    JUnitUtils.assumeNotHeadless();
-    MultiTurtleWindow panel = new MultiTurtleWindow();
-    panel.addTurtle(null);
-    panel.addTurtle(new Turtle());
-    Approvals.verify(panel);
-  }
-  @Test
-  public void testPaintWithHiddenTurtle()
-  {
-    JUnitUtils.assumeNotHeadless();
-    MultiTurtleWindow panel = new MultiTurtleWindow();
-    Turtle hiddenTurtle = new Turtle();
-    hiddenTurtle.hide();
-    panel.addTurtle(hiddenTurtle);
-    panel.addTurtle(new Turtle());
-    Approvals.verify(panel);
-  }
-  @Test
-  public void testPaintWithTwoTurtle()
-  {
-    JUnitUtils.assumeNotHeadless();
-    MultiTurtleWindow panel = new MultiTurtleWindow();
-    Turtle crouchingTurtle = new Turtle();
-    crouchingTurtle.setX(35);
-    crouchingTurtle.setY(35);
-    panel.addTurtle(crouchingTurtle);
-    panel.addTurtle(new Turtle());
-    Approvals.verify(panel);
-  }
-  @Test
-  public void testTwoTurtlesDrawBeforeAdding()
-  {
+  public void testTwoTurtlesDrawBeforeAdding() {
     JUnitUtils.assumeNotHeadless();
     MultiTurtleWindow panel = new MultiTurtleWindow();
     Turtle turtle = new Turtle();
@@ -72,9 +29,9 @@ public void testTwoTurtlesDrawBeforeAdding()
     panel.addTurtle(turtle);
     Approvals.verify(panel);
   }
+
   @Test
-  public void testPaint()
-  {
+  public void testPaint() {
     JUnitUtils.assumeNotHeadless();
     MultiTurtleWindow panel = new MultiTurtleWindow();
     panel.addTurtle(null);
@@ -84,25 +41,25 @@ public void testPaint()
     turtle.move(100);
     Approvals.verify(panel);
   }
+
   @Test
-  public void testAddGhostTurtle() throws Exception
-  {
+  public void testAddGhostTurtle() throws Exception {
     JUnitUtils.assumeNotHeadless();
     MultiTurtleWindow panel = new MultiTurtleWindow();
     panel.addTurtle(null);
     assertEquals(0, panel.getTurtleCount());
   }
+
   @Test
-  public void testAddTurtle() throws Exception
-  {
+  public void testAddTurtle() throws Exception {
     JUnitUtils.assumeNotHeadless();
     MultiTurtleWindow panel = new MultiTurtleWindow();
     panel.addTurtle(new Turtle());
     assertEquals(1, panel.getTurtleCount());
   }
+
   @Test
-  public void testSetAnimal() throws Exception
-  {
+  public void testSetAnimal() throws Exception {
     JUnitUtils.assumeNotHeadless();
     MultiTurtleWindow panel = new MultiTurtleWindow();
     panel.addTurtle(new Turtle());

src/test/java/org/teachingextensions/logo/MultiTurtlePanelTest.testPaintNoTurtles.approved.png

@@ -1,7 +1,6 @@
 package org.teachingextensions.logo.tests;
 
 import org.junit.Test;
-import org.teachingextensions.WindowUtils.TurtlePanel;
 import org.teachingextensions.approvals.lite.Approvals;
 import org.teachingextensions.approvals.lite.reporters.ClipboardReporter;
 import org.teachingextensions.approvals.lite.reporters.DiffReporter;
@@ -12,20 +11,17 @@
 @UseReporter({ClipboardReporter.class, DiffReporter.class})
 public class TurtlePanelTest
 {
+
+  public static final String BACKGROUND_IMAGE = "http://teachingkidsprogramming.org/wp-content/uploads/jimcounts.jpg";
+
   @Test
   public void testImageForBackground() throws Exception
   {
     JUnitUtils.assumeNotHeadless();
-    Turtle turtle = TurtleUtils.getTurtle();
-    turtle.move(50);
-    turtle.getBackgroundWindow().setBackgroundImage(
-        "http://teachingkidsprogramming.org/blog/wp-content/uploads/teachingKidsProgramming_logo_sm.png");
-    Approvals.verify(turtle.getImage());
-  }
-  // @Test
-  public void testNamedPanel()
-  {
-    TurtlePanel panel = new TurtlePanel("Turtle Bay");
-    Approvals.verify(panel);
+    Turtle turtle1 = new Turtle();
+    turtle1.setSpeed(Turtle.TEST_SPEED);
+    turtle1.move(50);
+    turtle1.getBackgroundWindow().setBackgroundImage(BACKGROUND_IMAGE);
+    Approvals.verify(turtle1.getImage());
   }
 }