Commits

firefly  committed f780738

Organized imports.

  • Participants
  • Parent commits 67758ff

Comments (0)

Files changed (17)

File src/frontend/Startup.java

 import javax.swing.JPanel;
 import javax.swing.SwingUtilities;
 
+import modules.FrontendLink;
 import modules.FrontendModuleManager;
-import modules.FrontendLink;
 import scene.Camera;
 import scene.Scene;
 import scene.io.XmlIO;

File src/modules/FrontendLink.java

 package modules;
 
+import javax.swing.JPanel;
+
+import scene.Scene;
 import frontend.GraphicPanel;
 import frontend.Settings;
-import javax.swing.JPanel;
-import scene.Scene;
 
 /**
  * Connection between module and front-end. Allowing the module some restricted front-end access.

File src/modules/FrontendModuleManager.java

 import java.awt.Container;
 import java.util.ArrayList;
 
-import frontend.GraphicPanel;
 import scene.Scene;
 import util.module.ModuleManager;
+import frontend.GraphicPanel;
 
 public class FrontendModuleManager extends ModuleManager<FrontendModule> {
 

File src/modules/frontend/SettingsModule.java

 import java.awt.Container;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-
-import javax.swing.JButton;
-import javax.swing.JLabel;
-import javax.swing.JPanel;
-
-import modules.FrontendModule;
-import modules.FrontendLink;
-import scene.Scene;
-import frontend.GraphicPanel;
 import java.awt.image.RenderedImage;
 import java.io.File;
 import java.io.IOException;
 import java.util.Calendar;
 import java.util.logging.Level;
 import java.util.logging.Logger;
+
 import javax.imageio.ImageIO;
-import modules.raytracer.RaytracerModule;
+import javax.swing.JButton;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+
+import modules.FrontendLink;
+import modules.FrontendModule;
+import scene.Scene;
+import frontend.GraphicPanel;
 
 /**
  * Prototype module currently only used for testing. A front-end module with no graphics panel.

File src/modules/opengl/OpenGLModule.java

 
 import java.awt.Container;
 
-import javax.swing.JCheckBox;
-import javax.swing.event.ChangeEvent;
-import javax.swing.event.ChangeListener;
-
+import modules.FrontendLink;
 import modules.FrontendModule;
-import modules.FrontendLink;
 import opengl.OpenGLPanel;
 import frontend.GraphicPanel;
 

File src/modules/raytracer/RaytracerModule.java

 package modules.raytracer;
 
-import raytracer.RaytracingStatistics;
 import java.awt.Container;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 
 import javax.swing.JButton;
 
+import modules.FrontendLink;
 import modules.FrontendModule;
-import modules.FrontendLink;
 import raytracer.RaySettings;
 import raytracer.Raytracer;
+import raytracer.RaytracerCallback;
+import raytracer.RaytracerPanel;
+import raytracer.RaytracingStatistics;
 import scene.Scene;
 import frontend.GraphicPanel;
-import java.awt.image.RenderedImage;
-import java.io.File;
-import java.io.IOException;
-import java.util.Calendar;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import javax.imageio.ImageIO;
-import raytracer.RaytracerCallback;
-import raytracer.RaytracerPanel;
 
 /**
  * Front-end module for ray tracer.

File src/opengl/Debugger.java

 package opengl;
 
 import javax.media.opengl.GL;
-import com.sun.opengl.util.GLUT;
 
+import raytracer.MaterialRayData;
 import raytracer.Ray;
 import raytracer.RaySettings;
 import raytracer.Raytracer;
 import raytracer.RaytracerCallback;
-import raytracer.MaterialRayData;
 import scene.Scene;
 import scene.shapes.IntersectionData;
 import util.Vector3d;
+
+import com.sun.opengl.util.GLUT;
+
 import frontend.Settings;
 
 public class Debugger extends OpenGLHelper {

File src/opengl/OpenGLPanel.java

 import java.awt.BorderLayout;
 import java.awt.Image;
 import java.awt.image.BufferedImage;
+import java.awt.image.RenderedImage;
 
 import javax.media.opengl.GL;
 import javax.media.opengl.GLAutoDrawable;
 
 import frontend.GraphicPanel;
 import frontend.Settings;
-import java.awt.image.RenderedImage;
 
 /**
  *

File src/opengl/ShapeDrawer.java

 
 import javax.media.opengl.GL;
 
+import scene.shapes.GroupShape;
 import scene.shapes.Plane;
+import scene.shapes.Polygon;
 import scene.shapes.Shape;
 import scene.shapes.Sphere;
+import util.Vector3d;
 
 import com.sun.opengl.util.GLUT;
-import scene.shapes.GroupShape;
-import scene.shapes.Polygon;
-import util.Vector3d;
 
 public class ShapeDrawer {
 

File src/raytracer/RaySettings.java

 package raytracer;
 
+import java.awt.Dimension;
+
 import frontend.Settings;
 import frontend.SpecificSettings;
-import java.awt.Dimension;
 
 public class RaySettings extends SpecificSettings {
 	public int maxBounces = 10;

File src/raytracer/Raytracer.java

 
 import javax.swing.Timer;
 
-
 import scene.Scene;
 import scene.shapes.Cuboid;
 import scene.shapes.IntersectionData;
 import scene.shapes.Quad;
 import scene.shapes.Shape;
 import scene.shapes.Sphere;
-
 import util.Vector3d;
 
 public class Raytracer {

File src/scene/io/XmlIO.java

 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
 
-
 import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;

File src/scene/shapes/IntersectionData.java

 package scene.shapes;
 
 import raytracer.Ray;
-import raytracer.VectorColor;
-import scene.Scene;
 import util.Vector3d;
 
 public class IntersectionData {

File src/scene/shapes/Material.java

 package scene.shapes;
 
 import java.awt.Color;
-import java.io.File;
-import java.io.IOException;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import javax.imageio.ImageIO;
-import org.w3c.dom.css.RGBColor;
-
 
 import raytracer.MaterialRayData;
 import raytracer.Ray;

File src/scene/shapes/Polygon.java

 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
+
 import raytracer.Ray;
 import util.Vector3d;
 

File src/scene/shapes/Texture.java

 
 import java.util.Map;
 
-
 import raytracer.VectorColor;
 import util.Vector3d;
 

File src/util/module/ModuleManager.java

 package util.module;
 
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
-import java.util.ArrayList;
 
 public class ModuleManager<T extends Module> {