package eyeglassesmain;

public class Glasses {
	private final int number;
	private final double Rsph;
	private final double Rcyl;
	private final int Raxis;
	private final double Lsph;
	private final double Lcyl;
	private final int Laxis;
	private final String frame;
	private final String lens;
	
	public Glasses(int Number, double rsph, double rcyl, int raxis, double lsph,
			double lcyl, int laxis, String frame, String lens) {
		super();
		
		if(raxis > 180){
			raxis = raxis - 180;
		} else if(raxis < 0){
			raxis = raxis + 180;
		} else if(raxis == 0){
			raxis = 180;
		}
		
		if(laxis > 180){
			laxis = laxis - 180;
		} else if(laxis < 0){
			laxis = laxis + 180;
		} else if(laxis == 0){
			laxis = 180;
		}
		
		number = Number;
		Rsph = rsph;
		Rcyl = rcyl;
		Raxis = raxis;
		Lsph = lsph;
		Lcyl = lcyl;
		Laxis = laxis;
		this.frame = frame;
		this.lens = lens;
	}
	
	@Override
	public String toString(){
		return String.format("%d\t%s\t%s\t%d\t%s\t%s\t%d\t%s\t%s",number, Rsph, Rcyl, Raxis, Lsph, Lcyl, Laxis, frame, lens);
	}
	
	public int getNumber(){
		return number;
	}

	public double getRsph() {
		return Rsph;
	}

	public double getRcyl() {
		return Rcyl;
	}

	public int getRaxis() {
		return Raxis;
	}

	public double getLsph() {
		return Lsph;
	}

	public double getLcyl() {
		return Lcyl;
	}

	public int getLaxis() {
		return Laxis;
	}

	public String getFrame() {
		return frame;
	}

	public String getLens() {
		return lens;
	}
}

@@ -944,33 +944,41 @@
 t(%22%25d%5Ct%25
-s%5Ct%25s%5Ct%25d%5Ct%25s%5Ct%25s
+.2f%5Ct%25.2f%5Ct%25d%5Ct%25.2f%5Ct%25.2f
 %5Ct%25d%5Ct%25s

Fix formatting