Skip to content

Commit

Permalink
feat : 불필요한 코드 수정
Browse files Browse the repository at this point in the history
  • Loading branch information
Kim-minseok123 committed Jun 4, 2023
1 parent d379975 commit fa48eb5
Show file tree
Hide file tree
Showing 13 changed files with 38 additions and 46 deletions.
23 changes: 12 additions & 11 deletions AddPartyView.java
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
import javax.swing.event.*;

import java.util.*;
import java.text.*;

/**
* Constructor for GUI used to Add Parties to the waiting party queue.
Expand All @@ -44,7 +43,7 @@ public class AddPartyView {
private ButtonCommand command;
private JFrame win;
private JButton addPatron, newPatron, remPatron, finished;
private JList partyList, allBowlers;
private JList<String> partyList, allBowlers;
private Vector<String> party, bowlerdb;

private ControlDeskView controlDesk;
Expand Down Expand Up @@ -73,7 +72,7 @@ public AddPartyView(ControlDeskView controlDesk, int max) {
empty.add("(Empty)");

AddPartyViewClickEvent listener = new AddPartyViewClickEvent();
partyList = new JList(empty);
partyList = new JList<>(empty);
partyList.setFixedCellWidth(120);
partyList.setVisibleRowCount(5);
partyList.addListSelectionListener(listener);
Expand All @@ -92,7 +91,7 @@ public AddPartyView(ControlDeskView controlDesk, int max) {
System.err.println("File Error");
bowlerdb = new Vector<String>();
}
allBowlers = new JList(bowlerdb);
allBowlers = new JList<>(bowlerdb);
allBowlers.setVisibleRowCount(8);
allBowlers.setFixedCellWidth(120);
JScrollPane bowlerPane = new JScrollPane(allBowlers);
Expand All @@ -105,8 +104,6 @@ public AddPartyView(ControlDeskView controlDesk, int max) {
JPanel buttonPanel = new JPanel();
buttonPanel.setLayout(new GridLayout(4, 1));

Insets buttonMargin = new Insets(4, 4, 4, 4);

addPatron = createButton("Add to Party", new JPanel(), listener);
remPatron = createButton("Remove Member", new JPanel(), listener);
newPatron = createButton("New Patron", new JPanel(), listener);
Expand Down Expand Up @@ -156,7 +153,7 @@ public String getSelectedMember() {
public int getMaxSize() {
return maxSize;
}
public JList getPartyList() {
public JList<String> getPartyList() {
return partyList;
}
public JFrame getWindow() {
Expand Down Expand Up @@ -195,12 +192,16 @@ public void actionPerformed(ActionEvent e) {

public void valueChanged(ListSelectionEvent e) {
if (e.getSource().equals(allBowlers)) {
selectedNick =
((String) ((JList) e.getSource()).getSelectedValue());
if (e.getSource() instanceof JList) {
JList<?> selectedNicks = (JList<?>) e.getSource();
selectedNick = (String) selectedNicks.getSelectedValue();
}
}
if (e.getSource().equals(partyList)) {
selectedMember =
((String) ((JList) e.getSource()).getSelectedValue());
if (e.getSource() instanceof JList) {
JList<?> source = (JList<?>) e.getSource();
selectedMember = (String) source.getSelectedValue();
}
}
}

Expand Down
1 change: 0 additions & 1 deletion ControlDesk.java
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@
*/

import java.util.*;
import java.io.*;

class ControlDesk extends Thread {
private static final int SLEEPMS = 250;
Expand Down
4 changes: 2 additions & 2 deletions ControlDeskView.java
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ public class ControlDeskView implements ControlDeskObserver {

private JButton addParty, finished, assign;
private JFrame win;
private JList partyList;
private JList<String> partyList;

/** The maximum number of members in a party */
private int maxMembers;
Expand Down Expand Up @@ -91,7 +91,7 @@ public ControlDeskView(ControlDesk controlDesk, int maxMembers) {
Vector<String> empty = new Vector<>();
empty.add("(Empty)");

partyList = new JList(empty);
partyList = new JList<>(empty);
partyList.setFixedCellWidth(120);
partyList.setVisibleRowCount(10);
JScrollPane partyPane = new JScrollPane(partyList);
Expand Down
2 changes: 0 additions & 2 deletions EmailReportSender.java
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@ public void send(String recipient, String content) {
new BufferedWriter(
new OutputStreamWriter(s.getOutputStream(), "8859_1"));

String boundary = "DataSeparatorString";

// here you are supposed to send your username
sendln(in, out, "HELO world");
sendln(in, out, "MAIL FROM: <[email protected]>");
Expand Down
6 changes: 3 additions & 3 deletions EndGameReport.java
Original file line number Diff line number Diff line change
Expand Up @@ -122,9 +122,9 @@ public static void main( String args[] ) {
for ( int i=0; i<4; i++ ) {
bowlers.add( new Bowler( "aaaaa", "aaaaa", "aaaaa" ) );
}
Party party = new Party( bowlers );
String partyName="wank";
EndGameReport e = new EndGameReport( partyName, party );
// Party party = new Party( bowlers );
// String partyName="wank";
// EndGameReport e = new EndGameReport( partyName, party );
}
public class EndGameReportClickEvent implements ActionListener, ListSelectionListener {

Expand Down
4 changes: 1 addition & 3 deletions LaneStatusView.java
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@
import java.awt.*;
import java.awt.event.*;
import javax.swing.*;
import javax.swing.border.*;
import javax.swing.event.*;

public class LaneStatusView implements LaneObserver, PinsetterObserver {

Expand Down Expand Up @@ -136,7 +134,7 @@ public void receiveLaneEvent(LaneEvent le) {
}

public void receivePinsetterEvent(PinsetterEvent pe) {
pinsDown.setText( ( new Integer(pe.totalPinsDown()) ).toString() );
pinsDown.setText(String.valueOf(pe.totalPinsDown()));
// foul.setText( ( new Boolean(pe.isFoulCommited()) ).toString() );

}
Expand Down
11 changes: 5 additions & 6 deletions LaneView.java
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ public class LaneView implements LaneObserver {
Container cpanel;
Vector<Bowler> bowlers;
int cur;
Iterator bowlIt;
Iterator<Bowler> bowlIt;

JPanel[][] balls;
JLabel[][] ballLabel;
Expand All @@ -42,7 +42,7 @@ public LaneView(Lane lane, int laneNum) {

frame.addWindowListener(new WindowAdapter() {
public void windowClosing(WindowEvent e) {
frame.hide();
frame.setVisible(false);
}
});

Expand All @@ -51,11 +51,11 @@ public void windowClosing(WindowEvent e) {
}

public void show() {
frame.show();
frame.setVisible(true);
}

public void hide() {
frame.hide();
frame.setVisible(false);
}

private JPanel makeFrame(Party party) {
Expand Down Expand Up @@ -190,8 +190,7 @@ private void updateScoreLabels(int numBowlers, int[][] lescores, LaneEvent le){
private void updateCumlativeScores(int[][] lescores, int frameNum, int k){ // 누적 점수 업데이트 메소드
for (int i = 0; i <= frameNum - 1; i++) {
if (lescores[k][i] != 0)
scoreLabel[k][i].setText(
(new Integer(lescores[k][i])).toString());
scoreLabel[k][i].setText(String.valueOf(lescores[k][i]));
}
}

Expand Down
7 changes: 0 additions & 7 deletions NewPatronView.java
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,6 @@
import java.awt.event.*;
import javax.swing.*;
import javax.swing.border.*;
import javax.swing.event.*;


import java.util.*;
import java.text.*;

public class NewPatronView {
private static final int TEXT_FIELD_SIZE = 15;
Expand Down Expand Up @@ -76,8 +71,6 @@ public NewPatronView(AddPartyView v) {
JPanel buttonPanel = new JPanel();
buttonPanel.setLayout(new GridLayout(4, 1));

Insets buttonMargin = new Insets(4, 4, 4, 4);

finished = createButton("Add Patron", new JPanel(), listener);
abort = createButton("Abort", new JPanel(), listener);

Expand Down
7 changes: 3 additions & 4 deletions PinSetterView.java
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,14 @@
*/

import java.awt.*;
import java.awt.event.*;
import javax.swing.*;
import java.util.Vector;


public class PinSetterView implements PinsetterObserver {


private Vector pinVect = new Vector ( );
private Vector<JLabel> pinVect = new Vector<> ( );
private JPanel firstRoll;
private JPanel secondRoll;

Expand Down Expand Up @@ -204,11 +203,11 @@ public void receivePinsetterEvent(PinsetterEvent pe){
}

public void show() {
frame.show();
frame.setVisible(true);
}

public void hide() {
frame.hide();
frame.setVisible(false);
}

public static void main ( String args [ ] ) {
Expand Down
5 changes: 2 additions & 3 deletions Pinsetter.java
Original file line number Diff line number Diff line change
Expand Up @@ -71,12 +71,11 @@
*/

import java.util.*;
import java.lang.Boolean;

public class Pinsetter {

private Random rnd;
private Vector subscribers;
private Vector<PinsetterObserver> subscribers;

private boolean[] pins;
/* 0-9 of state of pine, true for standing,
Expand Down Expand Up @@ -116,7 +115,7 @@ private void sendEvent(int jdpins) { // send events when our state is changd
public Pinsetter() {
pins = new boolean[10];
rnd = new Random();
subscribers = new Vector();
subscribers = new Vector<>();
foul = false;
reset();
}
Expand Down
1 change: 0 additions & 1 deletion PrintableText.java
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
import java.awt.print.*;
import java.awt.geom.*;
import java.awt.font.*;
import java.text.*;

public class PrintableText implements Printable {
String text;
Expand Down
10 changes: 10 additions & 0 deletions SCOREHISTORY.DAT
Original file line number Diff line number Diff line change
Expand Up @@ -41,3 +41,13 @@ Mike 14:50 06/04/2023 152
Jim 14:50 06/04/2023 177
Mike 14:51 06/04/2023 111
Jim 14:51 06/04/2023 129
Mike 15:42 06/04/2023 139
Tom 15:42 06/04/2023 102
Mike 15:48 06/04/2023 108
Jim 15:48 06/04/2023 122
Mike 15:59 06/04/2023 181
Jim 15:59 06/04/2023 175
TomH 15:59 06/04/2023 128
Lana 15:59 06/04/2023 110
Mike 16:12 06/04/2023 124
Tom 16:12 06/04/2023 121
3 changes: 0 additions & 3 deletions drive.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
import java.util.Vector;
import java.io.*;

public class drive {

public static void main(String[] args) {
Expand Down

0 comments on commit fa48eb5

Please sign in to comment.