projects
/
sixth-3d-demos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Code refactoring
[sixth-3d-demos.git]
/
src
/
main
/
java
/
eu
/
svjatoslav
/
sixth
/
e3d
/
examples
/
launcher
/
MenuPanel.java
diff --git
a/src/main/java/eu/svjatoslav/sixth/e3d/examples/launcher/MenuPanel.java
b/src/main/java/eu/svjatoslav/sixth/e3d/examples/launcher/MenuPanel.java
index
30c7ee3
..
0a60798
100644
(file)
--- a/
src/main/java/eu/svjatoslav/sixth/e3d/examples/launcher/MenuPanel.java
+++ b/
src/main/java/eu/svjatoslav/sixth/e3d/examples/launcher/MenuPanel.java
@@
-1,10
+1,8
@@
/*
/*
- * Sixth 3D engine demos. Copyright ©2012-2018, Svjatoslav Agejenko, svjatoslav@svjatoslav.eu
+ * Sixth 3D engine demos. Author: Svjatoslav Agejenko.
+ * This project is released under Creative Commons Zero (CC0) 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
- * or later as published by the Free Software Foundation.
- */
+*/
package eu.svjatoslav.sixth.e3d.examples.launcher;
package eu.svjatoslav.sixth.e3d.examples.launcher;
@@
-12,7
+10,6
@@
import eu.svjatoslav.sixth.e3d.examples.*;
import javax.swing.*;
import java.awt.event.ActionEvent;
import javax.swing.*;
import java.awt.event.ActionEvent;
-import java.io.IOException;
class MenuPanel extends JPanel {
private static final long serialVersionUID = 2012721856427052560L;
class MenuPanel extends JPanel {
private static final long serialVersionUID = 2012721856427052560L;
@@
-23,15
+20,14
@@
class MenuPanel extends JPanel {
sequentialGroup.addComponent(new JLabel("Choose an example to launch:"));
sequentialGroup.addComponent(new JButton(new ShowOctree()));
sequentialGroup.addComponent(new JButton(new ShowMathGraphs()));
sequentialGroup.addComponent(new JLabel("Choose an example to launch:"));
sequentialGroup.addComponent(new JButton(new ShowOctree()));
sequentialGroup.addComponent(new JButton(new ShowMathGraphs()));
- sequentialGroup.addComponent(new JButton(new ShowPoint
c
loud()));
+ sequentialGroup.addComponent(new JButton(new ShowPoint
C
loud()));
sequentialGroup.addComponent(new JButton(new ShowRain()));
sequentialGroup.addComponent(new JButton(new ShowRain()));
- sequentialGroup.addComponent(new JButton(new ShowSinusMap()));
sequentialGroup.addComponent(new JButton(new ShowTextEditors()));
sequentialGroup.addComponent(new JButton(new ShowGameOfLife()));
sequentialGroup.addComponent(new JButton(new ShowRandomPolygons()));
}
sequentialGroup.addComponent(new JButton(new ShowTextEditors()));
sequentialGroup.addComponent(new JButton(new ShowGameOfLife()));
sequentialGroup.addComponent(new JButton(new ShowRandomPolygons()));
}
- private class ShowTextEditors extends AbstractAction {
+ private
static
class ShowTextEditors extends AbstractAction {
ShowTextEditors() {
putValue(NAME, "Text editors");
}
ShowTextEditors() {
putValue(NAME, "Text editors");
}
@@
-42,34
+38,20
@@
class MenuPanel extends JPanel {
}
}
}
}
- private class ShowSinusMap extends AbstractAction {
- public ShowSinusMap() {
- putValue(NAME, "Wireframe sphere and ploygon landscape");
- }
-
- @Override
- public void actionPerformed(final ActionEvent e) {
- SphereDemo.main(null);
- }
- }
- private class ShowRain extends AbstractAction {
-
public
ShowRain() {
+ private
static
class ShowRain extends AbstractAction {
+ ShowRain() {
putValue(NAME, "Raining numbers");
}
@Override
public void actionPerformed(final ActionEvent e) {
putValue(NAME, "Raining numbers");
}
@Override
public void actionPerformed(final ActionEvent e) {
- try {
- RainingNumbersDemo.main(null);
- } catch (final IOException e1) {
- e1.printStackTrace();
- }
+ RainingNumbersDemo.main(null);
}
}
}
}
- private
class ShowPointc
loud extends AbstractAction {
-
public ShowPointc
loud() {
+ private
static class ShowPointC
loud extends AbstractAction {
+
ShowPointC
loud() {
putValue(NAME, "Pointcloud galaxy");
}
putValue(NAME, "Pointcloud galaxy");
}
@@
-79,23
+61,19
@@
class MenuPanel extends JPanel {
}
}
}
}
- private class ShowMathGraphs extends AbstractAction {
-
public
ShowMathGraphs() {
+ private
static
class ShowMathGraphs extends AbstractAction {
+ ShowMathGraphs() {
putValue(NAME, "Mathematical graphs");
}
@Override
public void actionPerformed(final ActionEvent e) {
putValue(NAME, "Mathematical graphs");
}
@Override
public void actionPerformed(final ActionEvent e) {
- try {
- GraphDemo.main(null);
- } catch (final IOException e1) {
- e1.printStackTrace();
- }
+ GraphDemo.main(null);
}
}
}
}
- private class ShowRandomPolygons extends AbstractAction {
-
public
ShowRandomPolygons() {
+ private
static
class ShowRandomPolygons extends AbstractAction {
+ ShowRandomPolygons() {
putValue(NAME, "Random polygons");
}
putValue(NAME, "Random polygons");
}
@@
-105,8
+83,8
@@
class MenuPanel extends JPanel {
}
}
}
}
- private class ShowOctree extends AbstractAction {
-
public
ShowOctree() {
+ private
static
class ShowOctree extends AbstractAction {
+ ShowOctree() {
putValue(NAME, "Volumetric Octree");
}
putValue(NAME, "Volumetric Octree");
}
@@
-116,8
+94,8
@@
class MenuPanel extends JPanel {
}
}
}
}
- private class ShowGameOfLife extends AbstractAction {
-
public
ShowGameOfLife() {
+ private
static
class ShowGameOfLife extends AbstractAction {
+ ShowGameOfLife() {
putValue(NAME, "Game of Life");
}
putValue(NAME, "Game of Life");
}