[refactor] zoomBild -> zoomImage

src/main/java/github/weichware10/toolbox/zoommaps/ZoomCalculator.java

@@ -25,7 +25,7 @@ public class ZoomCalculator {
     private TrialData data;
     ConfigClient configClient;
     ZoomMapsController controller;
-    ZoomBild zoomBild;
+    ZoomImage zoomImage;
     final String question;
     final String imageUrl;
 
@@ -50,8 +50,8 @@ public ZoomCalculator(TrialData data, ConfigClient configClient, ZoomMapsControl
         question = configClient.getConfig().getQuestion();
         speed = configClient.getConfig().getZoomMapsConfiguration().getSpeed();
         controller.setQuestion(question);
-        zoomBild = new ZoomBild(imageUrl, controller.getImageView(), this);
-        position = new Point3D(zoomBild.imageSize[0] / 2, zoomBild.imageSize[1] / 2, 0);
+        zoomImage = new ZoomImage(imageUrl, controller.getImageView(), this);
+        position = new Point3D(zoomImage.imageSize[0] / 2, zoomImage.imageSize[1] / 2, 0);
     }
 
     /**
@@ -63,8 +63,8 @@ public void processInput(Point2D raw, int direction) {
         if (Math.abs(direction) != 1) {
             throw new IllegalArgumentException("direction has not be of magnitude 1");
         }
-        Point2D img = zoomBild.getImageCoordinates(raw);
-        Rectangle2D viewport = zoomBild.move(img, direction * speed);
+        Point2D img = zoomImage.getImageCoordinates(raw);
+        Rectangle2D viewport = zoomImage.move(img, direction * speed);
         data.addDataPoint(viewport);
     }
 }

src/main/java/github/weichware10/toolbox/zoommaps/ZoomBild.java → src/main/java/github/weichware10/toolbox/zoommaps/ZoomImage.java

@@ -15,21 +15,21 @@
  * Ändert den aktuellen Bildausschnitt mit Hilfe gegebener Koordianten
  * und gibt die neuen Koordinaten an ZoomCalculator zurück.
  */
-public class ZoomBild {
+public class ZoomImage {
 
     public final double[] imageSize;
     private ImageView imageView;
 
     /**
-     * Instanziiert ein neues ZoomBild.
+     * Instanziiert ein neues ZoomImage.
      *
      * @param location - die Quelle der zu benutzenden Bilddatei
      * @throws MalformedURLException
      * @throws IllegalArgumentException
      * @throws FileNotFoundException
      * @throws IOException
      */
-    public ZoomBild(String location, ImageView imageView, ZoomCalculator zoomCalculator)
+    public ZoomImage(String location, ImageView imageView, ZoomCalculator zoomCalculator)
             throws MalformedURLException, IllegalArgumentException, FileNotFoundException,
             IOException  {
         this.imageView = imageView;

src/main/java/github/weichware10/toolbox/zoommaps/ZoomTutorial.java

@@ -5,7 +5,7 @@
 import github.weichware10.util.config.ConfigClient;
 
 /**
- * Zeigt das Tutorial ZoomBild in einem allgemeinen Tutorialfenster.
+ * Zeigt das Tutorial ZoomImage in einem allgemeinen Tutorialfenster.
  */
 public class ZoomTutorial extends Tutorial {
 

src/test/java/github/weichware10/toolbox/zoommaps/ZoomBildTest.java → src/test/java/github/weichware10/toolbox/zoommaps/ZoomImageTest.java

@@ -9,9 +9,9 @@
 import org.junit.Test;
 
 /**
- * Testet ZoomBild, bzw. die Größe des Outputs der Funktion move.
+ * Testet ZoomImage, bzw. die Größe des Outputs der Funktion move.
  */
-public class ZoomBildTest {
+public class ZoomImageTest {
     /**
      * Testet ob ein Array mit der richtigen Länge erstellt wird.
      *
@@ -25,8 +25,8 @@ public class ZoomBildTest {
     @Ignore
     public void testOutputSize() throws MalformedURLException, IllegalArgumentException,
             FileNotFoundException, IOException {
-        String location = ZoomBildTest.class.getResource("owl.jpeg").toString();
-        ZoomBild zoombild = new ZoomBild(location, new ImageView(), null);
+        String location = ZoomImageTest.class.getResource("owl.jpeg").toString();
+        ZoomImage zoombild = new ZoomImage(location, new ImageView(), null);
         Point3D position = new Point3D(0, 1, 2);
         // assertEquals("Array-length should be three", 3, zoombild.move(position));
     }
@@ -42,6 +42,6 @@ public void testOutputSize() throws MalformedURLException, IllegalArgumentExcept
     @Test(expected = MalformedURLException.class) // erwartet, dass Fehler auftritt
     public void shouldThrowAtWrongPicture() throws MalformedURLException, IllegalArgumentException,
             FileNotFoundException, IOException {
-        new ZoomBild("www.thisisnotapicture.com/owl.html", new ImageView(), null);
+        new ZoomImage("www.thisisnotapicture.com/owl.html", new ImageView(), null);
     }
 }