Skip to content

Commit

Permalink
Merge pull request #15 from alyssaruth/logger-9
Browse files Browse the repository at this point in the history 
Remove blacklist stuff and more logger refs
  • Loading branch information
@alyssaruth
alyssaruth authored Sep 3, 2024
2 parents 68f00b1 + 036f889 commit c5edaff
Show file tree
Hide file tree
Showing 28 changed files with 484 additions and 912 deletions.
13 changes: 3 additions & 10 deletions client/src/main/java/object/DisabledComboBoxModel.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,16 +23,9 @@ public void setSelectedItem(Object arg0)
Debug.stackTrace("Calling setSelectedItem on an object which is not a ComboBoxItem: " + arg0);
return;
}

try
{
ComboBoxItem<E> item = (ComboBoxItem<E>)arg0;
setSelectedComboBoxItem(item);
}
catch (ClassCastException cce)
{
Debug.stackTrace(cce);
}

ComboBoxItem<E> item = (ComboBoxItem<E>)arg0;
setSelectedComboBoxItem(item);
}
public void setSelectedComboBoxItem(ComboBoxItem<E> comboBoxItem)
{
Expand Down
12 changes: 2 additions & 10 deletions client/src/main/java/object/FlagImage.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -113,16 +113,8 @@ public String toIndexString()
return codeStr + "~" + toolTipText + "~" + iconNames;
}

public static final ImageIcon getImageIconForFlagName(String flagName)
public static ImageIcon getImageIconForFlagName(String flagName)
{
try
{
return new ImageIcon(FlagImage.class.getResource("/flags/" + flagName + ".png"));
}
catch (Throwable t)
{
Debug.stackTrace(t, "Unable to get image for " + flagName);
return null;
}
return new ImageIcon(FlagImage.class.getResource("/flags/" + flagName + ".png"));
}
}
34 changes: 12 additions & 22 deletions client/src/main/java/object/ReplayTableCentreRenderer.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,33 +7,23 @@
import javax.swing.SwingConstants;
import javax.swing.table.DefaultTableCellRenderer;

import util.Debug;

public class ReplayTableCentreRenderer extends DefaultTableCellRenderer
{
@Override
public Component getTableCellRendererComponent(JTable table, Object
value, boolean isSelected, boolean hasFocus, int row, int column)
{
try
{
super.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column);
setHorizontalAlignment(SwingConstants.CENTER);
setFont(new Font("Arial",Font.BOLD,15));

if ((table instanceof ReplayTable))
{
ReplayTable replayTable = (ReplayTable)table;
int modelRow = table.convertRowIndexToModel(row);
setForeground(replayTable.getColorForRow(modelRow));
}

return this;
}
catch (Throwable t)
{
Debug.stackTrace(t);
return this;
}
super.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column);
setHorizontalAlignment(SwingConstants.CENTER);
setFont(new Font("Arial",Font.BOLD,15));

if (table instanceof ReplayTable)
{
ReplayTable replayTable = (ReplayTable)table;
int modelRow = replayTable.convertRowIndexToModel(row);
setForeground(replayTable.getColorForRow(modelRow));
}

return this;
}
}
73 changes: 33 additions & 40 deletions client/src/main/java/online/screen/AccountSettingsDialog.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,46 +30,39 @@ public class AccountSettingsDialog extends JDialog

public AccountSettingsDialog(String username, String email)
{
try
{
this.username = username;
this.email = email;

getRootPane().setDefaultButton(btnOk);
setTitle("Account Settings");
setSize(300, 150);
setResizable(false);
getContentPane().setLayout(null);
textFieldEmail.setBounds(86, 40, 198, 22);
getContentPane().add(textFieldEmail);
textFieldEmail.setColumns(10);
JLabel lblUsername = new JLabel("Username");
lblUsername.setBounds(10, 10, 66, 22);
getContentPane().add(lblUsername);
textFieldUsername.setBounds(86, 10, 198, 22);
getContentPane().add(textFieldUsername);
textFieldUsername.setColumns(10);
JLabel lblEmail = new JLabel("Email");
lblEmail.setBounds(10, 40, 46, 22);
getContentPane().add(lblEmail);
okCancelPanel.setLocation(0, 77);
okCancelPanel.setSize(294, 33);
getContentPane().add(okCancelPanel);
okCancelPanel.add(btnOk);
okCancelPanel.add(btnChangePassword);
okCancelPanel.add(btnCancel);
textFieldUsername.setEditable(false);

btnChangePassword.addActionListener(this);
btnOk.addActionListener(this);
btnCancel.addActionListener(this);

init();
}
catch (Throwable t)
{
Debug.stackTrace(t);
}
this.username = username;
this.email = email;

getRootPane().setDefaultButton(btnOk);
setTitle("Account Settings");
setSize(300, 150);
setResizable(false);
getContentPane().setLayout(null);
textFieldEmail.setBounds(86, 40, 198, 22);
getContentPane().add(textFieldEmail);
textFieldEmail.setColumns(10);
JLabel lblUsername = new JLabel("Username");
lblUsername.setBounds(10, 10, 66, 22);
getContentPane().add(lblUsername);
textFieldUsername.setBounds(86, 10, 198, 22);
getContentPane().add(textFieldUsername);
textFieldUsername.setColumns(10);
JLabel lblEmail = new JLabel("Email");
lblEmail.setBounds(10, 40, 46, 22);
getContentPane().add(lblEmail);
okCancelPanel.setLocation(0, 77);
okCancelPanel.setSize(294, 33);
getContentPane().add(okCancelPanel);
okCancelPanel.add(btnOk);
okCancelPanel.add(btnChangePassword);
okCancelPanel.add(btnCancel);
textFieldUsername.setEditable(false);

btnChangePassword.addActionListener(this);
btnOk.addActionListener(this);
btnCancel.addActionListener(this);

init();
}

private final JTextField textFieldUsername = new JTextField();
Expand Down
73 changes: 33 additions & 40 deletions client/src/main/java/online/screen/ChangePasswordDialog.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,46 +30,39 @@ public class ChangePasswordDialog extends JDialog

public ChangePasswordDialog(String username, boolean allowCancel)
{
try
{
this.username = username;
this.allowCancel = allowCancel;

setTitle("Change Password");
getRootPane().setDefaultButton(btnOk);
setSize(300, 200);
setResizable(false);
setDefaultCloseOperation(DO_NOTHING_ON_CLOSE);
getContentPane().setLayout(null);
lblCurrentPassword.setFont(new Font("Tahoma", Font.PLAIN, 11));
lblCurrentPassword.setBounds(10, 10, 140, 22);
getContentPane().add(lblCurrentPassword);
passwordFieldOld.setBounds(150, 10, 130, 22);
getContentPane().add(passwordFieldOld);
lblNewPassword.setFont(new Font("Tahoma", Font.PLAIN, 11));
lblNewPassword.setBounds(10, 40, 140, 22);
getContentPane().add(lblNewPassword);
passwordFieldNew.setBounds(150, 40, 130, 22);
getContentPane().add(passwordFieldNew);
lblConfirmNewPassword.setFont(new Font("Tahoma", Font.PLAIN, 11));
lblConfirmNewPassword.setBounds(10, 70, 140, 22);
getContentPane().add(lblConfirmNewPassword);
passwordFieldConfirmNew.setBounds(150, 70, 130, 22);
getContentPane().add(passwordFieldConfirmNew);
buttonPanel.setBounds(0, 115, 294, 33);
getContentPane().add(buttonPanel);
buttonPanel.add(btnOk);
buttonPanel.add(btnCancel);

btnOk.addActionListener(this);
btnCancel.addActionListener(this);

init();
}
catch (Throwable t)
{
Debug.stackTrace(t);
}
this.username = username;
this.allowCancel = allowCancel;

setTitle("Change Password");
getRootPane().setDefaultButton(btnOk);
setSize(300, 200);
setResizable(false);
setDefaultCloseOperation(DO_NOTHING_ON_CLOSE);
getContentPane().setLayout(null);
lblCurrentPassword.setFont(new Font("Tahoma", Font.PLAIN, 11));
lblCurrentPassword.setBounds(10, 10, 140, 22);
getContentPane().add(lblCurrentPassword);
passwordFieldOld.setBounds(150, 10, 130, 22);
getContentPane().add(passwordFieldOld);
lblNewPassword.setFont(new Font("Tahoma", Font.PLAIN, 11));
lblNewPassword.setBounds(10, 40, 140, 22);
getContentPane().add(lblNewPassword);
passwordFieldNew.setBounds(150, 40, 130, 22);
getContentPane().add(passwordFieldNew);
lblConfirmNewPassword.setFont(new Font("Tahoma", Font.PLAIN, 11));
lblConfirmNewPassword.setBounds(10, 70, 140, 22);
getContentPane().add(lblConfirmNewPassword);
passwordFieldConfirmNew.setBounds(150, 70, 130, 22);
getContentPane().add(passwordFieldConfirmNew);
buttonPanel.setBounds(0, 115, 294, 33);
getContentPane().add(buttonPanel);
buttonPanel.add(btnOk);
buttonPanel.add(btnCancel);

btnOk.addActionListener(this);
btnCancel.addActionListener(this);

init();
}

private final JLabel lblCurrentPassword = new JLabel("Current Password");
Expand Down
Loading

0 comments on commit c5edaff

Please sign in to comment.