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

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..0c6ef51 100755
--- a/src/main/java/eu/svjatoslav/sixth/e3d/gui/ViewFrame.java
+++ b/src/main/java/eu/svjatoslav/sixth/e3d/gui/ViewFrame.java
@@ -1,12 +1,7 @@
 /*
- * Sixth 3D engine. Copyright ©2012-2016, 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
- * or later as published by the Free Software Foundation.
- *
+ * Sixth 3D engine. Author: Svjatoslav Agejenko.
+ * This project is released under Creative Commons Zero (CC0) license.
  */
-
 package eu.svjatoslav.sixth.e3d.gui;
 
 import javax.swing.*;
@@ -16,11 +11,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 +27,9 @@ public class ViewFrame extends JFrame implements ViewListener, WindowListener {
             }
         });
 
-        view = new View();
-
-        add(getView());
+        viewPanel = new ViewPanel();
 
-        getView().addViewListener(this);
+        add(getViewPanel());
 
         setSize(800, 600);
 
@@ -48,7 +41,7 @@ public class ViewFrame extends JFrame implements ViewListener, WindowListener {
         addWindowListener(this);
     }
 
-    public void addResizeListener() {
+    private void addResizeListener() {
         addComponentListener(new ComponentListener() {
             // This method is called after the component's size changes
             @Override
@@ -86,18 +79,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 +102,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 +125,7 @@ public class ViewFrame extends JFrame implements ViewListener, WindowListener {
 
     @Override
     public void windowDeiconified(final WindowEvent e) {
-        view.repaintDuringNextViewUpdate();
+        viewPanel.repaintDuringNextViewUpdate();
     }
 
     @Override
@@ -142,7 +134,7 @@ public class ViewFrame extends JFrame implements ViewListener, WindowListener {
 
     @Override
     public void windowOpened(final WindowEvent e) {
-        view.repaintDuringNextViewUpdate();
+        viewPanel.repaintDuringNextViewUpdate();
     }
 
 }