projects
/
sixth-3d.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Ignore IntelliJ project files
[sixth-3d.git]
/
src
/
main
/
java
/
eu
/
svjatoslav
/
sixth
/
e3d
/
gui
/
ViewFrame.java
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
..
1383c72
100755
(executable)
--- 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-201
6
, Svjatoslav Agejenko, svjatoslav@svjatoslav.eu
+ * Sixth 3D engine. Copyright ©2012-201
8
, 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
*
* 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;
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 static final long serialVersionUID = -7037635097739548470L;
- private final View
view
;
+ private final View
Panel viewPanel
;
public ViewFrame() {
setTitle("3D engine");
public ViewFrame() {
setTitle("3D engine");
@@
-32,11
+32,9
@@
public class ViewFrame extends JFrame implements ViewListener, WindowListener {
}
});
}
});
- view
= new View
();
+ view
Panel = new ViewPanel
();
- add(getView());
-
- getView().addViewListener(this);
+ add(getViewPanel());
setSize(800, 600);
setSize(800, 600);
@@
-48,7
+46,7
@@
public class ViewFrame extends JFrame implements ViewListener, WindowListener {
addWindowListener(this);
}
addWindowListener(this);
}
- p
ublic
void addResizeListener() {
+ p
rivate
void addResizeListener() {
addComponentListener(new ComponentListener() {
// This method is called after the component's size changes
@Override
addComponentListener(new ComponentListener() {
// This method is called after the component's size changes
@Override
@@
-86,18
+84,17
@@
public class ViewFrame extends JFrame implements ViewListener, WindowListener {
@Override
public void componentShown(final ComponentEvent e) {
@Override
public void componentShown(final ComponentEvent e) {
- view.repaintDuringNextViewUpdate();
+ view
Panel
.repaintDuringNextViewUpdate();
}
});
}
}
});
}
- @Override
public void exit() {
public void exit() {
- if (getView() != null) {
- getView().stop();
- getView().setEnabled(false);
- getView().setVisible(false);
+ if (getView
Panel
() != null) {
+ getView
Panel
().stop();
+ getView
Panel
().setEnabled(false);
+ getView
Panel
().setVisible(false);
}
dispose();
}
}
dispose();
}
@@
-110,13
+107,13
@@
public class ViewFrame extends JFrame implements ViewListener, WindowListener {
/**
* @return the view
*/
/**
* @return the view
*/
- public View
getView
() {
- return view;
+ public View
Panel getViewPanel
() {
+ return view
Panel
;
}
@Override
public void windowActivated(final WindowEvent e) {
}
@Override
public void windowActivated(final WindowEvent e) {
- view.repaintDuringNextViewUpdate();
+ view
Panel
.repaintDuringNextViewUpdate();
}
@Override
}
@Override
@@
-133,7
+130,7
@@
public class ViewFrame extends JFrame implements ViewListener, WindowListener {
@Override
public void windowDeiconified(final WindowEvent e) {
@Override
public void windowDeiconified(final WindowEvent e) {
- view.repaintDuringNextViewUpdate();
+ view
Panel
.repaintDuringNextViewUpdate();
}
@Override
}
@Override
@@
-142,7
+139,7
@@
public class ViewFrame extends JFrame implements ViewListener, WindowListener {
@Override
public void windowOpened(final WindowEvent e) {
@Override
public void windowOpened(final WindowEvent e) {
- view.repaintDuringNextViewUpdate();
+ view
Panel
.repaintDuringNextViewUpdate();
}
}
}
}