X-Git-Url: http://www2.svjatoslav.eu/gitweb/?p=sixth-3d.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Feu%2Fsvjatoslav%2Fsixth%2Fe3d%2Fgui%2FViewFrame.java;h=874673f6d18edd561dfeffc77e1a3fc5b5084de7;hp=cb034f096e52510ed2a9e7679aa2a812b938e386;hb=96f76bab30b47db83a1c9061b8916c69657f1e13;hpb=03447008b8ee26a6463d2cd03005dc26464863db

diff --git a/src/main/java/eu/svjatoslav/sixth/e3d/gui/ViewFrame.java b/src/main/java/eu/svjatoslav/sixth/e3d/gui/ViewFrame.java
index cb034f0..874673f 100755
--- a/src/main/java/eu/svjatoslav/sixth/e3d/gui/ViewFrame.java
+++ b/src/main/java/eu/svjatoslav/sixth/e3d/gui/ViewFrame.java
@@ -1,5 +1,5 @@
 /*
- * Sixth 3D engine. Copyright ©2012-2016, Svjatoslav Agejenko, svjatoslav@svjatoslav.eu
+ * Sixth 3D engine. Copyright ©2012-2018, Svjatoslav Agejenko, svjatoslav@svjatoslav.eu
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 3 of the GNU Lesser General Public License
@@ -16,11 +16,11 @@ import java.awt.event.ComponentListener;
 import java.awt.event.WindowEvent;
 import java.awt.event.WindowListener;
 
-public class ViewFrame extends JFrame implements ViewListener, WindowListener {
+public class ViewFrame extends JFrame implements WindowListener {
 
     private static final long serialVersionUID = -7037635097739548470L;
 
-    private final View view;
+    private final ViewPanel viewPanel;
 
     public ViewFrame() {
         setTitle("3D engine");
@@ -32,11 +32,9 @@ public class ViewFrame extends JFrame implements ViewListener, WindowListener {
             }
         });
 
-        view = new View();
+        viewPanel = new ViewPanel();
 
-        add(getView());
-
-        getView().addViewListener(this);
+        add(getViewPanel());
 
         setSize(800, 600);
 
@@ -86,18 +84,17 @@ public class ViewFrame extends JFrame implements ViewListener, WindowListener {
 
             @Override
             public void componentShown(final ComponentEvent e) {
-                view.repaintDuringNextViewUpdate();
+                viewPanel.repaintDuringNextViewUpdate();
             }
 
         });
     }
 
-    @Override
     public void exit() {
-        if (getView() != null) {
-            getView().stop();
-            getView().setEnabled(false);
-            getView().setVisible(false);
+        if (getViewPanel() != null) {
+            getViewPanel().stop();
+            getViewPanel().setEnabled(false);
+            getViewPanel().setVisible(false);
         }
         dispose();
     }
@@ -110,13 +107,13 @@ public class ViewFrame extends JFrame implements ViewListener, WindowListener {
     /**
      * @return the view
      */
-    public View getView() {
-        return view;
+    public ViewPanel getViewPanel() {
+        return viewPanel;
     }
 
     @Override
     public void windowActivated(final WindowEvent e) {
-        view.repaintDuringNextViewUpdate();
+        viewPanel.repaintDuringNextViewUpdate();
     }
 
     @Override
@@ -133,7 +130,7 @@ public class ViewFrame extends JFrame implements ViewListener, WindowListener {
 
     @Override
     public void windowDeiconified(final WindowEvent e) {
-        view.repaintDuringNextViewUpdate();
+        viewPanel.repaintDuringNextViewUpdate();
     }
 
     @Override
@@ -142,7 +139,7 @@ public class ViewFrame extends JFrame implements ViewListener, WindowListener {
 
     @Override
     public void windowOpened(final WindowEvent e) {
-        view.repaintDuringNextViewUpdate();
+        viewPanel.repaintDuringNextViewUpdate();
     }
 
 }