Skip to content

Commit

Permalink
Fixed Authors
Browse files Browse the repository at this point in the history
  • Loading branch information
Zahra Thabet committed Dec 16, 2018
1 parent 9aeb7ac commit a13f800
Show file tree
Hide file tree
Showing 14 changed files with 36 additions and 46 deletions.
6 changes: 3 additions & 3 deletions CharSelectionPanel.java
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@
* foreground panel to the front it resolved the issue for one of the problem
* areas, but we could not find out how to solve the other.
*
* @author zthabet
* @author nbryant2
* @author gbronzi
* @author Zahra Thabet
* @author Nolen Belle Bryant
* @author Giulia Bronzi
*
* @version 12.17.18
*/
Expand Down
10 changes: 5 additions & 5 deletions DeathPanel.java
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@
* Creates a death panel for when a player dies in The Wellesley Trail.
* Provides the user with options of restarting or quitting the game.
*
* @author nbryant2
* @author gbronzi
* @author zthabet
* @author Nolen Belle Bryant
* @author Giulia Bronzi
* @author Zahra Thabet
* @version 12.17.18
*/
public class DeathPanel extends JPanel {
Expand Down Expand Up @@ -81,7 +81,8 @@ public void actionPerformed(ActionEvent event){
JPanel startPanel = (JPanel)death.getParent().getParent();
JPanel layeredPane =
(JPanel)startPanel.getParent().getParent().getParent();
JRootPane rootPane = (JRootPane)layeredPane.getParent().getParent().getParent();
JRootPane rootPane = (JRootPane)layeredPane.getParent()
.getParent().getParent();
JFrame frame = (JFrame) rootPane.getParent();
frame.dispose();
}
Expand All @@ -100,7 +101,6 @@ private JPanel death(){

cont.addActionListener(new ButtonListener());
quit.addActionListener(new ButtonListener());
//death.prefferedSize(

death.add(cont);
death.add(quit);
Expand Down
6 changes: 3 additions & 3 deletions GraduationPanel.java
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
/**
* Creates a panel for the end of the game. Does not lead to any other panel.
*
* @author gbronzi
* @author zthabet
* @author nbryant2
* @author Giulia Bronzi
* @author Zahra Thabet
* @author Nolen Belle Bryant
* @version 12.17.18
*/
public class GraduationPanel extends JPanel
Expand Down
5 changes: 2 additions & 3 deletions InstructionsPanel.java
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,8 @@
/**
* Instructions panel for The Wellesley Trail
*
* @author gbronzi
* @author nbryant2
* @author zthabet
* @author Giulia Bronzi
* @author Nolen Belle Bryant
* @version 12.17.18
*/
public class InstructionsPanel extends JPanel
Expand Down
7 changes: 3 additions & 4 deletions MemoryPanel.java
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,9 @@
* JTextField which the user inputs answers into and the other is for the
* variouse buttons.
*
* @author nbryant2
* @author zthabet
* @author gbronzi
* @version (12.17.18)
* @author Nolen Belle Bryant
* @author Giulia Bronzi
* @version 12.17.18
*/
public class MemoryPanel extends JPanel {

Expand Down
5 changes: 2 additions & 3 deletions ModMemoryPanel.java
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,8 @@
* accommodate the buttons version.
*
*
* @author nbryant2
* @author zthabet
* @author gbronzi
* @author Nolen Belle Bryant
* @author Giulia Bronzi
* @version 12.17.18
*/
public class ModMemoryPanel extends MemoryPanel {
Expand Down
5 changes: 2 additions & 3 deletions Option.java
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,8 @@
* answer to a question. The Option object was designed to be stored along with
* a corresponding question in a Situation object.
*
* @author gbronzi
* @author nbryant2
* @author zthabet
* @author Giulia Bronzi
* @author Zahra Thabet
* @version 12.17.18
*/
public class Option
Expand Down
6 changes: 3 additions & 3 deletions Person.java
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
* The Person class holds all the information for each of the six archetypes.
* A person object can have its scores manipulated.
*
* @author gbronzi
* @author zthabet
* @author nbryant2
* @author Giulia Bronzi
* @author Zahra Thabet
* @author Nolen Belle Bryant
* @version 12.17.18
*/
public class Person
Expand Down
6 changes: 3 additions & 3 deletions RunningPanel.java
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
* individual methods for the creation of each panel which represents a game
* screen
*
* @author nbryant2
* @author zthabet
* @author gbronzi
* @author Nolen Belle Bryant
* @author Zahra Thabet
* @author Giulia Bronzi
* @version 12.17.18
*/
public class RunningPanel extends JPanel {
Expand Down
5 changes: 2 additions & 3 deletions Situation.java
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,8 @@
* implementation in a binary tree of Situation objects in that the selection
* of an Option object will lead to one of two other Situation objects.
*
* @author gbronzi
* @author nbryant2
* @author zthabet
* @author Zahra Thabet
* @author Giulia Bronzi
* @version 12.17.18
*/
public class Situation
Expand Down
6 changes: 3 additions & 3 deletions SituationPanel.java
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
* Buttons pressed in this panel also affect a Person object whose sleep,
* smart, and social scores are displayed.
*
* @author gbronzi
* @author nbryant2
* @author zthabet
* @author Zahra Thabet
* @author Nolen Belle Bryant
* @author Giulia Bronzi
* @version 12.17.18
*/
public class SituationPanel extends JPanel{
Expand Down
4 changes: 1 addition & 3 deletions StartPanel.java
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,7 @@
/**
* Creates a start panel for The Wellesley Trail
*
* @author zthabet
* @author gbronzi
* @author nbryant2
* @author Nolen Belle Bryant
* @version 12.17.18
*/

Expand Down
6 changes: 3 additions & 3 deletions TrailGUI.java
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
* TrailGUI controls the game. It begins at the startPanel and moves forward
* through the other panels and games
*
* @author zthabet
* @author nbryant2
* @author gbronzi
* @author Zahra Thabet
* @author Nolen Belle Bryant
* @author Giulia Bronzi
* @version 12.17.18
*/
public class TrailGUI
Expand Down
5 changes: 1 addition & 4 deletions TrailsBinaryTree.java
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,7 @@
*represent choices made in the four years of the Wellesley Trail. Each Vector
*represents a different year or period of time in the Wellesley experience.
*
* @author zthabet
* @author gbronzi
* @author nbryant2
*
* @author Zahra Thabet
* @version 12.17.18
*/
public class TrailsBinaryTree
Expand Down

0 comments on commit a13f800

Please sign in to comment.