Refactoring.

[sixth-3d.git] / src / main / java / eu / svjatoslav / sixth / e3d / gui / View.java

diff --git a/src/main/java/eu/svjatoslav/sixth/e3d/gui/View.java b/src/main/java/eu/svjatoslav/sixth/e3d/gui/View.java
index bd60473..615c69b 100755 (executable)
--- a/src/main/java/eu/svjatoslav/sixth/e3d/gui/View.java
+++ b/src/main/java/eu/svjatoslav/sixth/e3d/gui/View.java
@@ -23,7 +23,7 @@ public class View extends JPanel implements ComponentListener {
 
     private static final long serialVersionUID = 1683277888885045387L;
     private final List<ViewListener> viewListeners = new ArrayList<>();
-    private final List<ViewUpdateListener> viewUpdateListeners = new ArrayList<>();
+    private final List<ViewRenderListener> viewRenderListeners = new ArrayList<>();
     private final ViewContext context = new ViewContext(this);
     /**
      * Last time this view was updated
@@ -40,11 +40,11 @@ public class View extends JPanel implements ComponentListener {
     private boolean repaintDuringNextViewUpdate = true;
 
     public View() {
-        viewUpdateListeners.add(context.getAvatar());
+        viewRenderListeners.add(context.getAvatar());
 
         // initialize input tracker
         context.getUserInputTracker().bind(this);
-        viewUpdateListeners.add(context.getUserInputTracker());
+        viewRenderListeners.add(context.getUserInputTracker());
 
         initializePanelLayout();
 
@@ -57,8 +57,8 @@ public class View extends JPanel implements ComponentListener {
         getViewListeners().add(listener);
     }
 
-    public void addViewUpdateListener(final ViewUpdateListener listener) {
-        viewUpdateListeners.add(listener);
+    public void addViewUpdateListener(final ViewRenderListener listener) {
+        viewRenderListeners.add(listener);
     }
 
     @Override
@@ -235,12 +235,12 @@ public class View extends JPanel implements ComponentListener {
         lastUpdateMillis = currentTime;
 
         // notify update listeners
-        boolean rerenderView = false;
+        boolean reRenderFrame = false;
 
-        for (final ViewUpdateListener listener : viewUpdateListeners)
-            if (listener.beforeViewUpdate(context,
+        for (final ViewRenderListener listener : viewRenderListeners)
+            if (listener.beforeRender(context,
                     millisecondsPassedSinceLastUpdate))
-                rerenderView = true;
+                reRenderFrame = true;
 
         // abort rendering if window size is invalid
         if ((getWidth() <= 0) || (getHeight() <= 0))
@@ -248,10 +248,10 @@ public class View extends JPanel implements ComponentListener {
 
         if (repaintDuringNextViewUpdate) {
             repaintDuringNextViewUpdate = false;
-            rerenderView = true;
+            reRenderFrame = true;
         }
 
-        if (rerenderView) {
+        if (reRenderFrame) {
             renderFrame();
             handleDetectedComponentMouseEvents();
         }