Remove some try statements and switches
This commit is contained in:
		| @@ -1,5 +1,7 @@ | ||||
| package dev.lh; | ||||
|  | ||||
| import static java.awt.Color.*; | ||||
|  | ||||
| import java.awt.*; | ||||
| import java.util.Random; | ||||
|  | ||||
| @@ -27,30 +29,56 @@ public class FoodFactory { | ||||
| 	 * @since Snake 1.0 | ||||
| 	 */ | ||||
| 	public static enum Food { | ||||
|  | ||||
| 		/** | ||||
| 		 * Use if white food is wanted. | ||||
| 		 */ | ||||
| 		white, | ||||
| 		white( | ||||
| 			WHITE, 40 | ||||
| 		), | ||||
|  | ||||
| 		/** | ||||
| 		 * Use if yellow food is wanted. | ||||
| 		 */ | ||||
| 		yellow, | ||||
| 		yellow( | ||||
| 			YELLOW, 15 | ||||
| 		), | ||||
|  | ||||
| 		/** | ||||
| 		 * Use if orange food is wanted. | ||||
| 		 */ | ||||
| 		orange, | ||||
| 		orange( | ||||
| 			ORANGE, 6 | ||||
| 		), | ||||
|  | ||||
| 		/** | ||||
| 		 * Use if red food is wanted. | ||||
| 		 */ | ||||
| 		red, | ||||
| 		red( | ||||
| 			RED, 2 | ||||
| 		), | ||||
|  | ||||
| 		/** | ||||
| 		 * Use if blue food is wanted. | ||||
| 		 */ | ||||
| 		blue | ||||
| 		blue( | ||||
| 			BLUE, 1 | ||||
| 		); | ||||
|  | ||||
| 		/** | ||||
| 		 * The color of the food item. | ||||
| 		 */ | ||||
| 		public final Color color; | ||||
|  | ||||
| 		/** | ||||
| 		 * The length bonus of the food item. | ||||
| 		 */ | ||||
| 		public final int lengthBonus; | ||||
|  | ||||
| 		private Food(Color color, int lengthBonus) { | ||||
| 			this.color = color; | ||||
| 			this.lengthBonus = lengthBonus; | ||||
| 		} | ||||
| 	} | ||||
|  | ||||
| 	private static FoodFactory foodFactory = new FoodFactory(); | ||||
| @@ -142,23 +170,7 @@ public class FoodFactory { | ||||
| 	 * @since Snake 1.0 | ||||
| 	 */ | ||||
| 	public void colorOfFood(Graphics g) { | ||||
| 		switch (nextFood) { | ||||
| 			case white: | ||||
| 				g.setColor(Color.white); | ||||
| 				break; | ||||
| 			case yellow: | ||||
| 				g.setColor(Color.yellow); | ||||
| 				break; | ||||
| 			case orange: | ||||
| 				g.setColor(Color.orange); | ||||
| 				break; | ||||
| 			case red: | ||||
| 				g.setColor(Color.red); | ||||
| 				break; | ||||
| 			case blue: | ||||
| 				g.setColor(Color.blue); | ||||
| 				break; | ||||
| 		} | ||||
| 		g.setColor(nextFood.color); | ||||
| 	} | ||||
|  | ||||
| 	/** | ||||
| @@ -172,7 +184,7 @@ public class FoodFactory { | ||||
|  | ||||
| 	/** | ||||
| 	 * @param snakeHead the the head of a {@link Snake} object | ||||
| 	 * @return true if the current food intersects with the snakehead | ||||
| 	 * @return true if the current food intersects with the snake head | ||||
| 	 * @since Snake 1.0 | ||||
| 	 */ | ||||
| 	public boolean checkCollision(Rectangle snakeHead) { | ||||
| @@ -186,24 +198,6 @@ public class FoodFactory { | ||||
| 	 * @since Snake 1.0 | ||||
| 	 */ | ||||
| 	public int getAdditionalLength() { | ||||
| 		int snakeAdditionalLength = 0; | ||||
| 		switch (nextFood) { | ||||
| 			case white: | ||||
| 				snakeAdditionalLength = 40; | ||||
| 				break; | ||||
| 			case yellow: | ||||
| 				snakeAdditionalLength = 15; | ||||
| 				break; | ||||
| 			case orange: | ||||
| 				snakeAdditionalLength = 6; | ||||
| 				break; | ||||
| 			case red: | ||||
| 				snakeAdditionalLength = 2; | ||||
| 				break; | ||||
| 			case blue: | ||||
| 				snakeAdditionalLength = 1; | ||||
| 				break; | ||||
| 		} | ||||
| 		return snakeAdditionalLength; | ||||
| 		return nextFood.lengthBonus; | ||||
| 	} | ||||
| } | ||||
|   | ||||
| @@ -3,8 +3,8 @@ package dev.lh; | ||||
| import java.awt.Graphics; | ||||
|  | ||||
| /** | ||||
|  * This interface contains everything that needs to updated regularly.<br> | ||||
|  * <br> | ||||
|  * This interface contains everything that needs to be updated regularly. | ||||
|  * <p> | ||||
|  * Project: <strong>Snake</strong><br> | ||||
|  * File: <strong>Updateable.java</strong><br> | ||||
|  * Created: <strong>11 Mar 2020</strong><br> | ||||
|   | ||||
| @@ -31,8 +31,6 @@ public class Endscreen extends JDialog { | ||||
| 	 */ | ||||
| 	public Endscreen(int score) { | ||||
| 		this.score = score; | ||||
| 		try { | ||||
|  | ||||
| 		setTitle("Endscreen"); | ||||
| 		setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE); | ||||
| 		setBounds(100, 100, 700, 700); | ||||
| @@ -43,7 +41,10 @@ public class Endscreen extends JDialog { | ||||
|  | ||||
| 		JButton btnNewButton = new JButton("Play again"); | ||||
| 		btnNewButton.setMnemonic(KeyEvent.VK_ENTER); | ||||
| 			btnNewButton.addActionListener(e -> { Main.startGame(); dispose(); }); | ||||
| 		btnNewButton.addActionListener(e -> { | ||||
| 			Main.startGame(); | ||||
| 			dispose(); | ||||
| 		}); | ||||
| 		btnNewButton.setFont(new Font("Times New Roman", Font.PLAIN, 15)); | ||||
| 		contentPanel.add(btnNewButton, BorderLayout.SOUTH); | ||||
|  | ||||
| @@ -52,11 +53,11 @@ public class Endscreen extends JDialog { | ||||
| 		contentPanel.add(lblDeinPunktestand, BorderLayout.NORTH); | ||||
|  | ||||
| 		Image resultImage = Toolkit.getDefaultToolkit() | ||||
| 				.getImage(this.getClass().getResource((score < goodOrBadResult) ? "/Try_Again.jpg" : "/1211548-200.png")); | ||||
| 			.getImage( | ||||
| 				this.getClass() | ||||
| 					.getResource((score < goodOrBadResult) ? "/Try_Again.jpg" : "/1211548-200.png") | ||||
| 			); | ||||
| 		resultImage.flush(); | ||||
| 		} catch (Exception e) { | ||||
| 			e.printStackTrace(); | ||||
| 		} | ||||
| 	} | ||||
|  | ||||
| 	/** | ||||
|   | ||||
| @@ -22,12 +22,13 @@ import dev.lh.Main; | ||||
| public class StartScreen extends JFrame { | ||||
|  | ||||
| 	private static final long serialVersionUID = 6055940532003735543L; | ||||
| 	private JPanel				contentPane; | ||||
|  | ||||
| 	/** | ||||
| 	 * Closes the application. | ||||
| 	 */ | ||||
| 	public static void close() { System.exit(0); } | ||||
| 	public static void close() { | ||||
| 		System.exit(0); | ||||
| 	} | ||||
|  | ||||
| 	/** | ||||
| 	 * Launches Snake. | ||||
| @@ -43,12 +44,11 @@ public class StartScreen extends JFrame { | ||||
| 	 * Create the frame. | ||||
| 	 */ | ||||
| 	public StartScreen() { | ||||
| 		try { | ||||
| 			// readInHighscores(); | ||||
| 		setTitle("Snake - Startscreen"); | ||||
| 		setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); | ||||
| 		setBounds(500, 200, 550, 550); | ||||
| 			contentPane = new JPanel(); | ||||
|  | ||||
| 		JPanel contentPane = new JPanel(); | ||||
| 		contentPane.setBorder(new EmptyBorder(5, 5, 5, 5)); | ||||
| 		setContentPane(contentPane); | ||||
|  | ||||
| @@ -66,8 +66,5 @@ public class StartScreen extends JFrame { | ||||
| 		contentPane.add(buPlay); | ||||
| 		contentPane.setLayout(null); | ||||
| 		setVisible(true); | ||||
| 		} catch (Exception e) { | ||||
| 			e.printStackTrace(); | ||||
| 		} | ||||
| 	} | ||||
| } | ||||
|   | ||||
		Reference in New Issue
	
	Block a user