From 1da24d6f38187275c878614f35336d62b9733560 Mon Sep 17 00:00:00 2001
From: jdm13003 <jonathon.mcrae@uconn.edu>
Date: Wed, 13 Apr 2016 14:48:44 -0400
Subject: [PATCH] Got rid of the excess stuff

---
 src/gui/Gui.java          | 70 ---------------------------------------
 src/images/Shipinter.java | 25 --------------
 src/main/Main.java        | 11 ------
 src/model/Model.java      |  5 ---
 src/ship/PlayerShip.java  |  7 ----
 src/ship/ship.java        | 17 ----------
 6 files changed, 135 deletions(-)
 delete mode 100644 src/gui/Gui.java
 delete mode 100644 src/images/Shipinter.java
 delete mode 100644 src/main/Main.java
 delete mode 100644 src/model/Model.java
 delete mode 100644 src/ship/PlayerShip.java
 delete mode 100644 src/ship/ship.java

diff --git a/src/gui/Gui.java b/src/gui/Gui.java
deleted file mode 100644
index 37eacec..0000000
--- a/src/gui/Gui.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package main;
-
-
-
-import java.awt.Dimension;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.image.BufferStrategy;
-
-
-
-
-import javax.swing.JFrame;
-import javax.swing.JMenu;
-import javax.swing.JMenuBar;
-import javax.swing.JMenuItem;
-import javax.swing.JPanel;
-
-public class Game implements ActionListener {
-    BufferStrategy strategy;
-    public Game() {
-	JFrame container = new JFrame("CSE 2102");
-	container.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
-	
-	JPanel panel = (JPanel) container.getContentPane();
-	panel.setPreferredSize(new Dimension(800,600));
-	panel.setLayout(null);
-	
-	panel.setBounds(0,0,800,600);
-	
-	panel.setIgnoreRepaint(true);
-	
-	JMenuBar jmenubar = new JMenuBar();
-	
-	JMenu jmGameOptions = new JMenu("Game");
-	
-	JMenuItem jmiOpen = new JMenuItem("Open");
-	jmGameOptions.add(jmiOpen);
-	jmiOpen.addActionListener(this);
-	
-	JMenuItem jmiClose = new JMenuItem("Close");
-	jmGameOptions.add(jmiClose);
-	jmiClose.addActionListener(this);
-	
-	JMenuItem jmiSave = new JMenuItem("Save");
-	jmGameOptions.add(jmiSave);
-	jmiSave.addActionListener(this);
-	
-	JMenuItem jmiExit = new JMenuItem("Exit");
-	jmGameOptions.add(jmiExit);
-	jmiExit.addActionListener(this);
-	
-	jmenubar.add(jmGameOptions);
-	
-	
-	container.setJMenuBar(jmenubar);
-	container.setVisible(true);
-    
-	
-	
-	container.pack();
-	container.setResizable(false);
-	
-	
-    }
-    public void actionPerformed(ActionEvent ae) {
-	String comStr = ae.getActionCommand();
-	System.out.println(comStr + " Selected");
-    }
-}
diff --git a/src/images/Shipinter.java b/src/images/Shipinter.java
deleted file mode 100644
index 54070b2..0000000
--- a/src/images/Shipinter.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package images;
-
-import java.awt.Image;
-// The fuck does shipinter stand for?
-// Also, don't forget to PascalCase class names.
-// I won't fix this one.
-public class Shipinter {
-	Image image;
-	public Shipinter(Image shipID){
-		this.image = shipID;
-	}
-    // WHY IS THE IMAGE PARAMETER CALLED SHIPID?
-	//added a method to retrieve the size of the ship, so it can be drawn onto the actual game.
-    // You'll need to have a method to either get the image or to draw it-Eyal
-	//the Size is stored in an array where [1] is the width and [2] is the height
-	//it can be used for both player ships and enemy ships
-    public int[] getsize(){
-		int[] shipsize;
-		shipsize = new int[2];
-		shipsize[1] = image.getWidth(null);
-		shipsize[2] = image.getHeight(null);
-		return shipsize;
-	}
-	
-}
diff --git a/src/main/Main.java b/src/main/Main.java
deleted file mode 100644
index 2b8058b..0000000
--- a/src/main/Main.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package main;
-
-import java.awt.Dimension;
-// I think it's ugly to have two separate classes. Just have one class.
-// I won't change this, though.
-import javax.swing.*;
-public class Main extends JFrame{
-	public static void main(String[] args){
-		new Game();	
-	}
-}
diff --git a/src/model/Model.java b/src/model/Model.java
deleted file mode 100644
index 6f63ffc..0000000
--- a/src/model/Model.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package model;
-
-public class Model {
-
-}
diff --git a/src/ship/PlayerShip.java b/src/ship/PlayerShip.java
deleted file mode 100644
index b79e65c..0000000
--- a/src/ship/PlayerShip.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package ship;
-
-public class PlayerShip extends ship{
-    public void move() {} // WHY ISN'T THIS IN SHIP?
-    // MAYBE SHIP SHOULD BE AN INTERFACE?
-    // ALSO ABSTRACT METHODS ARE BANNED FROM CONCRETE CLASSES.
-}
diff --git a/src/ship/ship.java b/src/ship/ship.java
deleted file mode 100644
index f368575..0000000
--- a/src/ship/ship.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package ship;
-
-/*
-NO
-NO
-NO
-NO
-NO
-NO
-EACH SHIP SHOULD HAVE ITS OWN POSITION.
-(also, it doesn't hurt to keep positions as doubles and round them)
- */
-
-public class ship {
-	static int posx;
-	static int posy;	
-}