From ce43032bd188cbe7ae09ec9f0a55c7916d8905da Mon Sep 17 00:00:00 2001
From: Bill Kuker <bkuker@billkuker.com>
Date: Fri, 7 Aug 2009 01:27:26 +0000
Subject: [PATCH] Cleaned up many warnings

---
 src/QuadTest.java                             | 283 ------------------
 src/TriTest.java                              | 156 ----------
 src/com/billkuker/rocketry/motorsim/Burn.java |   4 +-
 .../rocketry/motorsim/QuantityChecking.aj     |   1 +
 .../rocketry/motorsim/test/MotorIOTest.java   |   2 +-
 .../rocketry/motorsim/visual/BurnPanel.java   |   1 +
 .../motorsim/visual/CrappyEditor.java         |   7 +-
 .../rocketry/motorsim/visual/Editor.java      |   2 +-
 .../visual/workbench/MotorEditor.java         |   2 +
 .../visual/workbench/WorkbenchTreeModel.java  |   1 +
 10 files changed, 15 insertions(+), 444 deletions(-)
 delete mode 100644 src/QuadTest.java
 delete mode 100644 src/TriTest.java

diff --git a/src/QuadTest.java b/src/QuadTest.java
deleted file mode 100644
index 76a000c..0000000
--- a/src/QuadTest.java
+++ /dev/null
@@ -1,283 +0,0 @@
-import java.awt.BasicStroke;
-import java.awt.Color;
-import java.awt.Graphics;
-import java.awt.Graphics2D;
-import java.awt.Shape;
-import java.awt.geom.AffineTransform;
-import java.awt.geom.Area;
-import java.awt.geom.FlatteningPathIterator;
-import java.awt.geom.GeneralPath;
-import java.awt.geom.PathIterator;
-
-import javax.swing.JFrame;
-import javax.swing.JPanel;
-
-
-public class QuadTest extends JPanel {
-
-
-	public void paint(Graphics g){
-		super.paint(g);
-		Graphics2D g2d = (Graphics2D)g;
-
-		g2d.scale(30, 30);
-
-		Area a;
-		GeneralPath p;
-
-		g2d.setStroke(new BasicStroke(.02f));
-		
-		
-		/*
-		 a = new Area(new Rectangle2D.Double(0,0,1,1));
-		//a.transform(AffineTransform.getRotateInstance(Math.PI/4.0));
-		g2d.setColor(Color.black);
-		g2d.draw(a);
-		g2d.setColor(Color.red);
-		
-		g2d.draw(square( a ));
-		System.out.println(
-				yRotatedVolume(a) + ", " +
-				yRotatedSurfaceArea(a) + "\n"
-				);
-
-		
-		a = new Area( new Ellipse2D.Double(2, 5, 4, 4));
-		g2d.setColor(Color.black);
-		g2d.draw(a);
-		g2d.setColor(Color.red);
-		
-		g2d.draw(square( a ));
-		System.out.println(
-				yRotatedVolume(a) + ", " +
-				yRotatedSurfaceArea(a) + "\n"
-				);
-		
-	
-		*/
-		p = new GeneralPath();
-		p.moveTo(0,0);
-		p.lineTo(1, 1);
-		p.lineTo(0,1);
-		p.closePath();
-		a = new Area(p);
-		g2d.translate(0, 8);
-		g2d.setColor(Color.black);
-		g2d.draw(a);
-		g2d.setColor(Color.red);
-		
-		g2d.draw(square( a ));
-		System.out.println(
-				yRotatedVolume(a) + ", " +
-				yRotatedSurfaceArea(a) + "\n"
-				);
-		
-		p = new GeneralPath();
-		p.moveTo(0,0);
-		p.lineTo(2, 2);
-		p.lineTo(0,2);
-		p.closePath();
-		a = new Area(p);
-		g2d.translate(0, 2);
-		g2d.setColor(Color.black);
-		g2d.draw(a);
-		g2d.setColor(Color.red);
-		
-		g2d.draw(square( a ));
-		System.out.println(
-				yRotatedVolume(a) + ", " +
-				yRotatedSurfaceArea(a) + "\n"
-				);
-
-		p = new GeneralPath();
-		p.moveTo(0,1);
-		p.lineTo(1,1);
-		p.lineTo(2, 2);
-		p.lineTo(0,2);
-		p.closePath();
-		a = new Area(p);
-		g2d.translate(0, 2);
-		g2d.setColor(Color.black);
-		g2d.draw(a);
-		g2d.setColor(Color.red);
-		
-		g2d.draw(square( a ));
-		System.out.println(
-				yRotatedVolume(a) + ", " +
-				yRotatedSurfaceArea(a) + "\n"
-				);
-		 
-
-	}
-	
-	
-	private double yRotatedVolume(Area a){
-		return Math.PI * area(new Area(square(a)));
-	}
-	
-	private Shape square(java.awt.geom.Area a) {
-		PathIterator i = a.getPathIterator(new AffineTransform(), 0.0001);
-		GeneralPath cur = new GeneralPath();
-
-		double last[] = {0,0};
-		while (!i.isDone()) {
-			double coords[] = new double[6];
-			int type = i.currentSegment(coords);
-			switch (type) {
-			case PathIterator.SEG_CLOSE:
-				cur.closePath();
-				break;
-			case PathIterator.SEG_MOVETO:
-				cur.moveTo(Math.pow(coords[0],2), coords[1]);
-				last[0] = coords[0];
-				last[1] = coords[1];
-				break;
-			case PathIterator.SEG_CUBICTO:
-				throw new Error("Non-flattened geometry!");
-			case PathIterator.SEG_LINETO:
-				double x = last[0];
-				double y = last[1];
-				double len = Math.sqrt(Math.pow(last[0]-coords[0], 2) + Math.pow(last[1]-coords[1], 2));
-				int steps = (int)(len / .01) + 5;
-				for (int s = 0; s < steps; s++) {
-					x += (coords[0] - last[0]) / steps;
-					y += (coords[1] - last[1]) / steps;
-					cur.lineTo(Math.pow(x, 2), y);
-				}
-				last[0] = coords[0];
-				last[1] = coords[1];
-				break;
-			case PathIterator.SEG_QUADTO:
-				throw new Error("Non-flattened geometry!");
-
-			}
-			i.next();
-		}
-		return cur;
-	}
-	
-	private double yRotatedSurfaceArea(java.awt.geom.Area a) {
-		//TODO: I think I need to handle seg_close!!
-		PathIterator i = a.getPathIterator(new AffineTransform(), .001);
-		double x = 0, y = 0;
-		double mx = 0, my = 0;
-		double len = 0;
-		while (!i.isDone()) {
-			double coords[] = new double[6];
-			int type = i.currentSegment(coords);
-			if (type == PathIterator.SEG_LINETO || type == PathIterator.SEG_CLOSE) {
-
-
-				double nx = coords[0];
-				double ny = coords[1];
-				
-				if ( type == PathIterator.SEG_CLOSE ){
-					nx = mx;
-					ny = my;
-				}
-				
-				double dy = Math.abs(y-ny);
-				double dx = Math.abs(x-nx);
-				double xl = x>nx?x:nx;
-				double xs = x<nx?x:nx;	
-				
-				double add = 0;
-				if ( dx == 0 ){
-					add = 2 * Math.PI * xl * dy;
-				} else if ( dy == 0 ){
-					 add = Math.PI * xl * xl - Math.PI * xs * xs;
-				}else{
-					double h = xl/dx * dy;
-					double s1 = Math.sqrt(xl*xl + h*h);
-					double s2 = Math.sqrt(xs*xs + (h-dy)*(h-dy));
-					add = Math.PI * (xl*s1 - xs*s2);
-				}
-				
-				len += add;
-
-				x = nx;
-				y = ny;
-			} else if (type == PathIterator.SEG_MOVETO) {
-				mx = x = coords[0];
-				my = y = coords[1];
-			} else {
-				throw new Error("Non-flattened geometry!");
-			}
-			i.next();
-		}
-		return len;
-	}
-	
-
-	
-	private double area(java.awt.geom.Area a) {
-		if ( !a.isSingular() )
-			throw new IllegalArgumentException("Can not calculate area of non-singular shape!");
-		PathIterator i = a.getPathIterator(new AffineTransform(), .001);
-		
-		
-		double x = 0, y = 0, sx = 0, sy = 0;
-		double nx, ny;
-		double area = 0;
-		while (!i.isDone()) {
-			double coords[] = new double[6];
-			int type = i.currentSegment(coords);
-			switch( type ){
-			case PathIterator.SEG_CLOSE:
-				//Go back to the start
-				nx = sx;
-				ny = sy;
-				area += x * ny;
-				area -= y * nx;
-				break;
-			case PathIterator.SEG_LINETO:
-				nx = coords[0];
-				ny = coords[1];
-				area += x * ny;
-				area -= y * nx;
-
-				//Remember the last points
-				x = nx;
-				y = ny;
-				
-				break;
-			case PathIterator.SEG_MOVETO:
-				//Remember the starting point
-				x = sx = coords[0];
-				y = sy = coords[1];
-				break;
-			default:
-				throw new Error("Bad segment type from Flattening Path Iterator");
-			}
-			i.next();
-		}
-		
-		area = area / 2.0; // Result so far is double the signed area
-		
-		if ( area < 0 ) //Depending on winding it could be negative
-			area = area * -1.0;
-		
-		
-		return area;
-	}
-
-	
-	public class FancyPathIterator extends FlatteningPathIterator{
-
-		public FancyPathIterator(PathIterator path, double error) {
-			super(path, error);
-		}
-		
-		
-		
-	}
-	
-	public static void main(String args[]){
-		JFrame f = new JFrame();
-		f.setContentPane(new QuadTest());
-		f.setDefaultCloseOperation(f.DISPOSE_ON_CLOSE);
-		f.setSize(1500,800);
-		f.setLocation(1600, 100);
-		f.show();
-	}
-}
diff --git a/src/TriTest.java b/src/TriTest.java
deleted file mode 100644
index 11716cf..0000000
--- a/src/TriTest.java
+++ /dev/null
@@ -1,156 +0,0 @@
-import java.awt.BorderLayout;
-import java.awt.Color;
-import java.awt.Graphics;
-import java.awt.Graphics2D;
-import java.awt.Shape;
-import java.awt.geom.AffineTransform;
-import java.awt.geom.Area;
-import java.awt.geom.Ellipse2D;
-import java.awt.geom.GeneralPath;
-import java.awt.geom.PathIterator;
-
-import javax.swing.JFrame;
-import javax.swing.JPanel;
-import javax.swing.JSlider;
-import javax.swing.event.ChangeEvent;
-import javax.swing.event.ChangeListener;
-
-
-public class TriTest extends JPanel {
-	
-	private class RegressableShape {
-		private Area a;
-		public RegressableShape( Shape s ){
-			if ( s instanceof Area )
-				a = (Area)s;
-			a = new Area(s);
-		}
-		
-		public Area getRegressedShape(double regression){
-			if ( regression == 0 )
-				return a;
-			
-			//Build these separatly because intersecting the line
-			//with the circle creates a small amount of error which
-			//shows up when the resulting edge is no longer exactly
-			//colinear with the original edge.
-			Area rRect = new Area();	
-			Area rCirc = new Area();
-			
-			PathIterator i = a.getPathIterator(new AffineTransform(), .001);
-			double last[] = {0,0};
-			double first[] = {0,0};
-
-			while (!i.isDone()) {
-				double coords[] = new double[6];
-				int type = i.currentSegment(coords);
-				switch (type){
-					case PathIterator.SEG_MOVETO:
-						first[0] = last[0] = coords[0];
-						first[1] = last[1] = coords[1];
-						break;
-					case PathIterator.SEG_CLOSE:
-						coords[0] = first[0];
-						coords[1] = first[1];
-					case PathIterator.SEG_LINETO:
-						//Calculate the normal to this edge
-						double dx = coords[0]-last[0];
-						double dy = coords[1]-last[1];
-						double len = Math.sqrt(dx*dx + dy*dy);						
-						double normal[] = {-dy/len,dx/len};
-						
-						//Calculate the displacement of the endpoints
-						//to create a rect
-						double displacement[] = {regression*normal[0], regression*normal[1]};
-
-						//Create that rect. Winding does not seem to matter...
-						GeneralPath p = new GeneralPath();
-						p.moveTo(last[0], last[1]);
-						p.lineTo(last[0]+displacement[0], last[1]+displacement[1]);
-						p.lineTo(coords[0]+displacement[0], coords[1]+displacement[1]);
-						p.lineTo(coords[0], coords[1]);
-						p.closePath();
-						rRect.add( new Area(p));
-
-						double er = Math.abs(regression);
-						rCirc.add(new Area(new Ellipse2D.Double(coords[0]-er, coords[1]-er, 2*er, 2*er)));
-						
-						last[0] = coords[0];
-						last[1] = coords[1];
-						break;
-					case PathIterator.SEG_CUBICTO:
-					case PathIterator.SEG_QUADTO:
-						throw new Error("Unflattend Geometry!");
-				}
-				i.next();
-			}
-			
-
-			if ( regression > 0 ){
-				//Combine all together
-				rRect.add(a);
-				rRect.add(rCirc);
-			}else{
-				Area acp = (Area)a.clone();
-				acp.subtract(rRect);
-				acp.subtract(rCirc);
-				rRect = acp;
-			}
-			return rRect;
-		}
-	}
-	
-	double r = 0;
-	
-	RegressableShape shape;
-	{
-		GeneralPath p = new GeneralPath();
-		p.moveTo(100,100);
-		p.lineTo(200, 200);
-		p.lineTo(100, 300);
-		p.closePath();
-		shape = new RegressableShape(p);
-	}
-	
-	@Override
-	public void paint(Graphics gg){
-		Graphics2D g = (Graphics2D)gg;
-		
-		g.clearRect(0, 0, 600, 600);
-
-
-		g.setColor(Color.black);
-		g.fill(shape.getRegressedShape(r));
-		g.setColor(Color.yellow);		
-		g.draw(shape.getRegressedShape(0));
-		g.setColor(Color.red);
-		g.draw(shape.getRegressedShape(r));
-
-		
-	}
-	
-	
-	public static void main( String args[] ){
-		JFrame f = new JFrame();
-		f.setDefaultCloseOperation(f.DISPOSE_ON_CLOSE);
-		final TriTest t = new TriTest();
-		f.getContentPane().setLayout(new BorderLayout());
-		f.getContentPane().add(t, BorderLayout.CENTER);
-		f.getContentPane().add(new JSlider(){{
-				setMinimum(-100);
-				setMaximum(100);
-				addChangeListener(new ChangeListener(){
-					{ setValue(0); }
-					public void stateChanged(ChangeEvent arg0) {
-						t.r = getValue();
-						t.repaint();
-					}
-				});
-			}}, BorderLayout.SOUTH);
-
-		f.setSize(400,400);
-		f.setLocation(600,600);
-		f.show();
-		
-	}
-}
diff --git a/src/com/billkuker/rocketry/motorsim/Burn.java b/src/com/billkuker/rocketry/motorsim/Burn.java
index 046dca2..ef2474b 100644
--- a/src/com/billkuker/rocketry/motorsim/Burn.java
+++ b/src/com/billkuker/rocketry/motorsim/Burn.java
@@ -146,7 +146,7 @@ public class Burn {
 			//log.debug("Mass Gen Rate: " + mGenRate);
 			
 			//Calculate specific gas constant
-			Amount specificGasConstant = Constants.R.divide(motor.getFuel().getCombustionProduct().getEffectiveMolarWeight());
+			Amount<?> specificGasConstant = Constants.R.divide(motor.getFuel().getCombustionProduct().getEffectiveMolarWeight());
 			//This unit conversion helps JScience to convert nozzle flow rate to
 			//kg/s a little later on I verified the conversion by hand and
 			//JScience checks it too.
@@ -162,7 +162,7 @@ public class Burn {
 				Amount<Area> aStar = motor.getNozzle().throatArea();
 				double k = motor.getFuel().getCombustionProduct().getRatioOfSpecificHeats();
 				double kSide = Math.sqrt(k) * Math.pow((2/(k+1)) , (((k+1)/2)/(k-1)));
-				Amount sqrtPart = specificGasConstant.times(chamberTemp).sqrt();
+				Amount<?> sqrtPart = specificGasConstant.times(chamberTemp).sqrt();
 				mNozzle = pDiff.times(aStar).times(kSide).divide(sqrtPart).to(MassFlowRate.UNIT);
 				//log.debug("Mass Exit Rate: " + mNozzle.to(MassFlowRate.UNIT));		
 			}
diff --git a/src/com/billkuker/rocketry/motorsim/QuantityChecking.aj b/src/com/billkuker/rocketry/motorsim/QuantityChecking.aj
index a17c5d1..50f674b 100644
--- a/src/com/billkuker/rocketry/motorsim/QuantityChecking.aj
+++ b/src/com/billkuker/rocketry/motorsim/QuantityChecking.aj
@@ -18,6 +18,7 @@ public aspect QuantityChecking {
 
 	declare parents: Motor || Grain || Chamber || Nozzle || Fuel extends Checked;
 
+	@SuppressWarnings("unchecked")
 	void around(Checked c, Amount amt):
 	        execution(void Checked+.set*(Amount)) && target(c) && args(amt) {
 		System.out.println(thisJoinPointStaticPart.getSignature().getName()
diff --git a/src/com/billkuker/rocketry/motorsim/test/MotorIOTest.java b/src/com/billkuker/rocketry/motorsim/test/MotorIOTest.java
index d367913..b401bc5 100644
--- a/src/com/billkuker/rocketry/motorsim/test/MotorIOTest.java
+++ b/src/com/billkuker/rocketry/motorsim/test/MotorIOTest.java
@@ -50,7 +50,7 @@ public class MotorIOTest {
 
 		MotorIO.writeMotor(m, f);
 
-		Motor r = MotorIO.readMotor(f);
+		MotorIO.readMotor(f);
 
 	}
 }
diff --git a/src/com/billkuker/rocketry/motorsim/visual/BurnPanel.java b/src/com/billkuker/rocketry/motorsim/visual/BurnPanel.java
index 4715257..9f95aeb 100644
--- a/src/com/billkuker/rocketry/motorsim/visual/BurnPanel.java
+++ b/src/com/billkuker/rocketry/motorsim/visual/BurnPanel.java
@@ -72,6 +72,7 @@ public class BurnPanel extends JPanel {
 			tp.setResizeWeight(.5);
 			
 			grain = new GrainPanel(burn.getMotor().getGrain()){
+				private static final long serialVersionUID = 1L;
 				@Override protected void addComponents(java.awt.Component crossSection, java.awt.Component slider, java.awt.Component label, java.awt.Component area, java.awt.Component volume) {
 					JSplitPane h = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, crossSection, area);	
 					add(h, BorderLayout.CENTER);
diff --git a/src/com/billkuker/rocketry/motorsim/visual/CrappyEditor.java b/src/com/billkuker/rocketry/motorsim/visual/CrappyEditor.java
index 1e3038b..c83977c 100644
--- a/src/com/billkuker/rocketry/motorsim/visual/CrappyEditor.java
+++ b/src/com/billkuker/rocketry/motorsim/visual/CrappyEditor.java
@@ -33,6 +33,7 @@ import com.billkuker.rocketry.motorsim.motors.example.CSlot;
 import com.billkuker.rocketry.motorsim.motors.example.EndBurner;
 
 public class CrappyEditor extends JFrame {
+	private static final long serialVersionUID = 1L;
 	JTabbedPane tabs;
 
 	public CrappyEditor() {
@@ -52,6 +53,7 @@ public class CrappyEditor extends JFrame {
 	}
 
 	private class Editor extends JPanel {
+		private static final long serialVersionUID = 1L;
 		RSyntaxTextArea text = new RSyntaxTextArea();
 
 		Editor(Motor m) {
@@ -60,6 +62,7 @@ public class CrappyEditor extends JFrame {
 			JPanel buttons = new JPanel(new FlowLayout());
 
 			buttons.add(new JButton("Burn!") {
+				private static final long serialVersionUID = 1L;
 				{
 					addActionListener(new ActionListener() {
 						public void actionPerformed(ActionEvent arg0) {
@@ -89,6 +92,7 @@ public class CrappyEditor extends JFrame {
 			});
 			
 			buttons.add(new JButton("End Burner Example") {
+				private static final long serialVersionUID = 1L;
 				{
 					addActionListener(new ActionListener() {
 						public void actionPerformed(ActionEvent arg0) {
@@ -99,6 +103,7 @@ public class CrappyEditor extends JFrame {
 			});
 			
 			buttons.add(new JButton("C-Slot Example") {
+				private static final long serialVersionUID = 1L;
 				{
 					addActionListener(new ActionListener() {
 						public void actionPerformed(ActionEvent arg0) {
@@ -163,6 +168,6 @@ public class CrappyEditor extends JFrame {
 	
 
 	public static void main(String args[]) {
-		new CrappyEditor().show();
+		new CrappyEditor().setVisible(true);
 	}
 }
diff --git a/src/com/billkuker/rocketry/motorsim/visual/Editor.java b/src/com/billkuker/rocketry/motorsim/visual/Editor.java
index 8de0806..9fa90ca 100644
--- a/src/com/billkuker/rocketry/motorsim/visual/Editor.java
+++ b/src/com/billkuker/rocketry/motorsim/visual/Editor.java
@@ -83,7 +83,7 @@ public class Editor extends PropertySheetPanel {
 
 	public static class AmountPropertyEditor extends PropertyEditorSupport {
 		JTextField editor = new JTextField();
-		Unit oldUnit;
+		Unit<?> oldUnit;
 
 		@Override
 		public boolean supportsCustomEditor() {
diff --git a/src/com/billkuker/rocketry/motorsim/visual/workbench/MotorEditor.java b/src/com/billkuker/rocketry/motorsim/visual/workbench/MotorEditor.java
index 30614e1..f644354 100644
--- a/src/com/billkuker/rocketry/motorsim/visual/workbench/MotorEditor.java
+++ b/src/com/billkuker/rocketry/motorsim/visual/workbench/MotorEditor.java
@@ -204,6 +204,7 @@ public class MotorEditor extends JTabbedPane implements PropertyChangeListener {
 			p.setLayout(new BoxLayout(p, BoxLayout.Y_AXIS));
 
 			p.add(new Chooser<Fuel>(fuelTypes) {
+				private static final long serialVersionUID = 1L;
 				@Override
 				protected void choiceMade(Fuel o) {
 					motor.setFuel(o);
@@ -242,6 +243,7 @@ public class MotorEditor extends JTabbedPane implements PropertyChangeListener {
 			setRightComponent(new NozzlePanel(n));
 
 			parts.add(new JTextField(motor.getName()){
+				private static final long serialVersionUID = 1L;
 				{
 					final JTextField t = this;
 					addFocusListener(new FocusListener() {
diff --git a/src/com/billkuker/rocketry/motorsim/visual/workbench/WorkbenchTreeModel.java b/src/com/billkuker/rocketry/motorsim/visual/workbench/WorkbenchTreeModel.java
index f269f79..b24b0aa 100644
--- a/src/com/billkuker/rocketry/motorsim/visual/workbench/WorkbenchTreeModel.java
+++ b/src/com/billkuker/rocketry/motorsim/visual/workbench/WorkbenchTreeModel.java
@@ -108,6 +108,7 @@ public class WorkbenchTreeModel extends DefaultTreeModel {
 		
 	}
 	
+	@SuppressWarnings("unchecked")
 	public void removeMotor(Motor m){
 		Enumeration<TreeNode> e = getRoot().children();
 		while ( e.hasMoreElements() ){
-- 
2.30.2