converted to MVC structure and changes in control desk

Author: sidgupta2205

.project

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>SE_Project</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+	</buildSpec>
+	<natures>
+	</natures>
+</projectDescription>

BowlingAlley/code/AddPartyView.java renamed to BowlingAlley/code/Views/AddPartyView.java

@@ -1,3 +1,4 @@
+package Views;
 /* AddPartyView.java
  *
  *  Version:
@@ -31,6 +32,9 @@
 import javax.swing.border.*;
 import javax.swing.event.*;
 
+import models.Bowler;
+import controllers.BowlerFile;
+
 import java.util.*;
 import java.text.*;
 
@@ -48,7 +52,9 @@ public class AddPartyView implements ActionListener, ListSelectionListener {
 	private JFrame win;
 	private JButton addPatron, newPatron, remPatron, finished;
 	private JList partyList, allBowlers;
-	private Vector party, bowlerdb;
+	Vector party;
+
+	private Vector bowlerdb;
 	private Integer lock;
 
 	private ControlDeskView controlDesk;

BowlingAlley/code/ControlDeskView.java renamed to BowlingAlley/code/Views/ControlDeskView.java

@@ -1,3 +1,4 @@
+package Views;
 /* ControlDeskView.java
  *
  *  Version:
@@ -12,14 +13,30 @@
  * Class for representation of the control desk
  *
  */
-
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import javax.swing.border.*;
-import javax.swing.event.*;
-
-import java.util.*;
+import java.awt.BorderLayout;
+import java.awt.Dimension;
+import java.awt.FlowLayout;
+import java.awt.Toolkit;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Vector;
+
+import javax.swing.JButton;
+import javax.swing.JFrame;
+import javax.swing.JList;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.border.TitledBorder;
+
+import controllers.ControlDeskEvent;
+import controllers.ControlDeskObserver;
+import models.ControlDesk;
+import models.Lane;
+import models.Pinsetter;
 
 public class ControlDeskView implements ActionListener, ControlDeskObserver {
 

BowlingAlley/code/GeneralView.java renamed to BowlingAlley/code/Views/GeneralView.java

@@ -1,3 +1,4 @@
+package Views;
 import javax.swing.JList;
 import javax.swing.JPanel;
 import javax.swing.border.TitledBorder;

BowlingAlley/code/LaneStatusView.java renamed to BowlingAlley/code/Views/LaneStatusView.java

@@ -1,3 +1,4 @@
+package Views;
 /**
  *
  * To change this generated comment edit the template variable "typecomment":
@@ -12,6 +13,14 @@
 import javax.swing.border.*;
 import javax.swing.event.*;
 
+import controllers.PinsetterEvent;
+import controllers.PinsetterObserver;
+import models.Bowler;
+import models.Lane;
+import controllers.LaneEvent;
+import controllers.LaneObserver;
+import models.Pinsetter;
+
 public class LaneStatusView implements ActionListener, LaneObserver, PinsetterObserver {
 
 	private JPanel jp;
@@ -133,7 +142,7 @@ public void actionPerformed( ActionEvent e ) {
 	}
 
 	public void receiveLaneEvent(LaneEvent le) {
-		curBowler.setText( ( (Bowler)le.getBowler()).getNickName() );
+		curBowler.setText( ( (Bowler)le.getBowler()).getNick() );
 		if ( le.isMechanicalProblem() ) {
 			maintenance.setBackground( Color.RED );
 		}	

BowlingAlley/code/LaneView.java renamed to BowlingAlley/code/Views/LaneView.java

@@ -1,3 +1,4 @@
+package Views;
 /*
  *  constructs a prototype Lane View
  *
@@ -6,6 +7,13 @@
 import java.awt.*;
 import java.awt.event.*;
 import javax.swing.*;
+
+import models.Bowler;
+import models.Lane;
+import controllers.LaneEvent;
+import controllers.LaneObserver;
+import models.Party;
+
 import java.util.*;
 
 public class LaneView implements LaneObserver, ActionListener {

BowlingAlley/code/NewPatronView.java renamed to BowlingAlley/code/Views/NewPatronView.java

@@ -1,3 +1,4 @@
+package Views;
 /* AddPartyView.java
  *
  *  Version

BowlingAlley/code/PinSetterView.java renamed to BowlingAlley/code/Views/PinSetterView.java

@@ -1,3 +1,4 @@
+package Views;
 /*
  * PinSetterView/.java
  *
@@ -16,6 +17,10 @@
 import java.awt.*;
 import java.awt.event.*;
 import javax.swing.*;
+
+import controllers.PinsetterEvent;
+import controllers.PinsetterObserver;
+
 import java.util.Vector;
 
 

BowlingAlley/code/BowlerFile.java renamed to BowlingAlley/code/controllers/BowlerFile.java

@@ -1,3 +1,4 @@
+package controllers;
 /* BowlerFile.java
  *
  *  Version:
@@ -20,9 +21,12 @@
  */
 
 import java.util.*;
+
+import models.Bowler;
+
 import java.io.*;
 
-class BowlerFile {
+public class BowlerFile {
 
 	/** The location of the bowelr database */
 	private static String BOWLER_DAT = "D:\\iiith\\git_repo\\IIITH\\assignments\\SE\\BowlingAlley\\code\\BOWLERS.DAT";

BowlingAlley/code/ControlDeskEvent.java renamed to BowlingAlley/code/controllers/ControlDeskEvent.java

@@ -1,3 +1,4 @@
+package controllers;
 /* ControlDeskEvent.java
  *
  *  Version:

BowlingAlley/code/ControlDeskObserver.java renamed to BowlingAlley/code/controllers/ControlDeskObserver.java

@@ -1,3 +1,4 @@
+package controllers;
 /* ControlDeskObserver.java
  *
  *  Version

BowlingAlley/code/EndGamePrompt.java renamed to BowlingAlley/code/controllers/EndGamePrompt.java

@@ -1,3 +1,4 @@
+package controllers;
 /**
  *
  * To change this generated comment edit the template variable "typecomment":

BowlingAlley/code/EndGameReport.java renamed to BowlingAlley/code/controllers/EndGameReport.java

@@ -1,3 +1,4 @@
+package controllers;
 /**
  *
  * To change this generated comment edit the template variable "typecomment":
@@ -12,6 +13,9 @@
 import javax.swing.border.*;
 import javax.swing.event.*;
 
+import models.Bowler;
+import models.Party;
+
 import java.util.*;
 import java.text.*;
 

BowlingAlley/code/LaneEvent.java renamed to BowlingAlley/code/controllers/LaneEvent.java

@@ -1,3 +1,4 @@
+package controllers;
 /*  $Id$
  *
  *  Revisions:
@@ -25,6 +26,9 @@
 
 import java.util.HashMap;
 
+import models.Bowler;
+import models.Party;
+
 public class LaneEvent {
 
 	private Party p;

BowlingAlley/code/LaneEventInterface.java renamed to BowlingAlley/code/controllers/LaneEventInterface.java

@@ -1,5 +1,9 @@
+package controllers;
 import java.util.HashMap;
 
+import models.Bowler;
+import models.Party;
+
 public interface LaneEventInterface extends java.rmi.Remote {
 	public int getFrameNum( ) throws java.rmi.RemoteException;
 	public HashMap getScore( ) throws java.rmi.RemoteException;

BowlingAlley/code/LaneObserver.java renamed to BowlingAlley/code/controllers/LaneObserver.java

@@ -1,3 +1,4 @@
+package controllers;
 /* $Id$
  *
  * Revisions:

BowlingAlley/code/LaneServer.java renamed to BowlingAlley/code/controllers/LaneServer.java

@@ -1,3 +1,4 @@
+package controllers;
 public interface LaneServer extends java.rmi.Remote {
 	public void subscribe(LaneObserver toAdd) throws java.rmi.RemoteException;
 };

BowlingAlley/code/PinsetterEvent.java renamed to BowlingAlley/code/controllers/PinsetterEvent.java

@@ -1,3 +1,4 @@
+package controllers;
 /*  $Id$
  *
  *  Revisions:

BowlingAlley/code/PinsetterObserver.java renamed to BowlingAlley/code/controllers/PinsetterObserver.java

@@ -1,3 +1,4 @@
+package controllers;
 /* $Id$
  *
  * Revisions:

BowlingAlley/code/PrintableText.java renamed to BowlingAlley/code/controllers/PrintableText.java

@@ -1,3 +1,4 @@
+package controllers;
 /**
  *
  */

BowlingAlley/code/Queue.java renamed to BowlingAlley/code/controllers/Queue.java

@@ -1,3 +1,4 @@
+package controllers;
 /* Queue.java
  *
  *  Version

BowlingAlley/code/ScoreHistoryFile.java renamed to BowlingAlley/code/controllers/ScoreHistoryFile.java

@@ -1,3 +1,4 @@
+package controllers;
 /**
  *
  * To change this generated comment edit the template variable "typecomment":
@@ -7,6 +8,9 @@
  */
 
 import java.util.*;
+
+import models.Score;
+
 import java.io.*;
 
 public class ScoreHistoryFile {

BowlingAlley/code/ScoreReport.java renamed to BowlingAlley/code/controllers/ScoreReport.java

@@ -1,3 +1,4 @@
+package controllers;
 /**
  * 
  * SMTP implementation based on code by Réal Gagnon mailto:[email protected]
@@ -7,6 +8,10 @@
 
 import java.io.*;
 import java.util.Vector;
+
+import models.Bowler;
+import models.Score;
+
 import java.util.Iterator;
 import java.net.*;
 import java.awt.*;

BowlingAlley/code/SimulateThrow.java renamed to BowlingAlley/code/controllers/SimulateThrow.java

@@ -1,8 +1,9 @@
+package controllers;
 import java.util.Random;
 
 public class SimulateThrow {
 
-	boolean foul;
+	public boolean foul;
 	public boolean[] pins; 
 	private Random rnd;
 	public SimulateThrow()

BowlingAlley/code/scoreCalcualte.java renamed to BowlingAlley/code/controllers/scoreCalculate.java

@@ -1,7 +1,12 @@
+package controllers;
 import java.io.Serializable;
 import java.util.HashMap;
 
-class scoreCalculate implements Serializable {
+import models.Bowler;
+import models.Lane;
+import models.Party;
+
+public class scoreCalculate implements Serializable {
     public final HashMap scores;
     public Party party;
     public boolean partyAssigned;
@@ -22,14 +27,7 @@ public HashMap getScores() {
         return scores;
     }
 
-    /** resetScores()
-     *
-     * resets the scoring mechanism, must be called before scoring starts
-     *
-     * @pre the party has been assigned
-     * @post scoring system is initialized
-     */
-    public void resetScores(Party party) {
+        public void resetScores(Party party) {
 
         for (Object o : party.getMembers()) {
             int[] toPut = new int[25];
@@ -40,11 +38,7 @@ public void resetScores(Party party) {
         }
     }
 
-    /** markScore()
-     *
-     * Method that marks a bowlers score on the board.
-     *
-     */
+    
      public void markScore(Lane lane,int ball,int score){
         int[] curScore;
         int index =  ( lane.frameNumber * 2 + ball);
@@ -109,16 +103,7 @@ else if (curScore[i] != -1) {
         }
     }
 
-    /** getScore()
-     *
-     * Method that calculates a bowlers score
-     *
-     * @param Cur        The bowler that is currently up
-     * @param frame    The frame the current bowler is on
-     *
-     * @param cumulScores
-     * @return			The bowlers total score
-     */
+    
 
     public void getScore(Bowler Cur, int frame, int[][] cumulScores, int bowlIndex, int ball) {
         int[] curScore;

BowlingAlley/code/drive.java

@@ -1,4 +1,9 @@
 import java.util.Vector;
+
+import Views.ControlDeskView;
+import models.Alley;
+import models.ControlDesk;
+
 import java.io.*;
 
 public class drive {

BowlingAlley/code/Alley.java renamed to BowlingAlley/code/models/Alley.java

@@ -1,3 +1,5 @@
+package models;
+
 /*
  * Alley.java
  *

BowlingAlley/code/Bowler.java renamed to BowlingAlley/code/models/Bowler.java

@@ -1,3 +1,4 @@
+package models;
 /*
  * Bowler.java
  *