gered/Llanfair
Archived
1
0
Fork 0
Code Issues 9 Pull requests Packages Projects Releases 5 Wiki Activity

little style cleanups and use tabs for indentation (read below...)

Browse source 
the only reason i'm bothering with doing something semi-drastic like
changing the entire indentation style from spaces to tabs is because
i prefer tabs, but more importantly, since all my editors are configured
to use tabs, i will likely accidentally introduce tab indenting
somewhere without realizing it and then everything would end up being
inconsistent. would rather just solve this problem right now. :)
This commit is contained in:
Gered 2015-11-29 23:54:54 -05:00
parent 378024c3b0
commit 5aebf5eefd
32 changed files with 7641 additions and 7699 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/main/java/org/fenix/llanfair/Actions.java
View file

@ -2,23 +2,6 @@ package org.fenix.llanfair;
import com.thoughtworks.xstream.XStream;
import com.thoughtworks.xstream.io.xml.DomDriver;
import java.awt.Dimension;
import java.awt.event.ActionEvent;
import java.io.BufferedInputStream;
import java.io.BufferedOutputStream;
import java.io.BufferedReader;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.FileReader;
import java.io.InputStream;
import java.io.ObjectInputStream;
import java.net.MalformedURLException;
import java.net.URL;
import java.util.ResourceBundle;
import javax.swing.Action;
import javax.swing.JFileChooser;
import javax.swing.JOptionPane;
import org.fenix.llanfair.config.Settings;
import org.fenix.llanfair.dialog.EditRun;
import org.fenix.llanfair.dialog.EditSettings;
@ -26,6 +9,14 @@ import org.fenix.llanfair.extern.WSplit;
import org.fenix.utils.about.AboutDialog;
import org.jnativehook.keyboard.NativeKeyEvent;
import javax.swing.*;
import java.awt.*;
import java.awt.event.ActionEvent;
import java.io.*;
import java.net.MalformedURLException;
import java.net.URL;
import java.util.ResourceBundle;
/**
* Regroups all actions, in the meaning of {@link Action}, used by Llanfair.
* All inputs and menu items callbacks are processed by this delegate to

12
src/main/java/org/fenix/llanfair/Counters.java
View file

@ -1,16 +1,14 @@
package org.fenix.llanfair;
import org.fenix.utils.TableModelSupport;
import javax.swing.*;
import javax.swing.event.TableModelListener;
import javax.swing.table.TableModel;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
import javax.swing.Icon;
import javax.swing.event.TableModelListener;
import javax.swing.table.TableModel;
import org.fenix.llanfair.Language;
import org.fenix.utils.TableModelSupport;
/**
*
* @author Xavier "Xunkar" Sencert

3
src/main/java/org/fenix/llanfair/Language.java
View file

@ -1,9 +1,10 @@
package org.fenix.llanfair;
import org.fenix.utils.Resources;
import java.util.HashMap;
import java.util.Locale;
import java.util.Map;
import org.fenix.utils.Resources;
/**
* Enumeration of all externalized strings used by {@code Llanfair}. While it is

17
src/main/java/org/fenix/llanfair/MenuItem.java
View file

@ -1,19 +1,16 @@
package org.fenix.llanfair;
import org.fenix.llanfair.Run.State;
import org.fenix.llanfair.config.Settings;
import org.fenix.utils.locale.LocaleEvent;
import javax.swing.*;
import javax.swing.event.EventListenerList;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.io.File;
import java.util.Arrays;
import java.util.List;
import javax.swing.Icon;
import javax.swing.JMenu;
import javax.swing.JMenuItem;
import javax.swing.JPopupMenu;
import javax.swing.JSeparator;
import javax.swing.event.EventListenerList;
import org.fenix.utils.locale.LocaleEvent;
import org.fenix.llanfair.Run.State;
import org.fenix.llanfair.config.Settings;
/**
* Enumerates the menu items available in the right-click context menu of
@ -63,7 +60,7 @@ enum MenuItem implements ActionListener {
* @param isEndOfGroup indicates if this item is a group ender
* @param activeStates list of active run states of this item
*/
private MenuItem( boolean isEndOfGroup, Run.State... activeStates ) {
MenuItem(boolean isEndOfGroup, Run.State... activeStates) {
this.isEndOfGroup = isEndOfGroup;
this.activeStates = Arrays.asList( activeStates );

20
src/main/java/org/fenix/llanfair/Run.java
View file

@ -1,5 +1,12 @@
package org.fenix.llanfair;
import org.fenix.llanfair.config.Settings;
import org.fenix.utils.TableModelSupport;
import org.fenix.utils.config.Configuration;
import javax.swing.*;
import javax.swing.event.TableModelListener;
import javax.swing.table.TableModel;
import java.beans.PropertyChangeListener;
import java.beans.PropertyChangeSupport;
import java.io.IOException;
@ -8,15 +15,6 @@ import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
import javax.swing.Icon;
import javax.swing.event.TableModelListener;
import javax.swing.table.TableModel;
import org.fenix.llanfair.Language;
import org.fenix.llanfair.config.Settings;
import org.fenix.utils.TableModelSupport;
import org.fenix.utils.config.Configuration;
/**
* Modélise une course comportant un certain nombre de segments. Une fois une
@ -545,7 +543,7 @@ public class Run implements TableModel, Serializable {
// ---------------------------------------------------------------- SETTERS
public<T> T getSetting( String key ) {
return configuration.<T>get( key );
return configuration.get(key);
}
public void putSetting( String key, Object value ) {
@ -1105,7 +1103,7 @@ public class Run implements TableModel, Serializable {
*
* @author Xavier "Xunkar" Sencert
*/
public static enum State {
public enum State {
// ---------------------------------------------------- ENUMERATES

3
src/main/java/org/fenix/llanfair/config/Accuracy.java
View file

@ -1,8 +1,9 @@
package org.fenix.llanfair.config;
import java.io.Serializable;
import org.fenix.llanfair.Language;
import java.io.Serializable;
public enum Accuracy implements Serializable {

3
src/main/java/org/fenix/llanfair/config/Compare.java
View file

@ -1,8 +1,9 @@
package org.fenix.llanfair.config;
import java.io.Serializable;
import org.fenix.llanfair.Language;
import java.io.Serializable;
/**
*
* @author Xavier

3
src/main/java/org/fenix/llanfair/config/Merge.java
View file

@ -1,8 +1,9 @@
package org.fenix.llanfair.config;
import java.io.Serializable;
import org.fenix.llanfair.Language;
import java.io.Serializable;
/**
*
* @author Xavier

4
src/main/java/org/fenix/llanfair/config/Settings.java
View file

@ -373,9 +373,9 @@ public class Settings {
retrieve();
}
if ( run != null && run.containsSetting( key ) ) {
return run.<T>getSetting( key );
return run.getSetting(key);
}
return global.<T>get( key );
return global.get(key);
}
/**

7
src/main/java/org/fenix/llanfair/dialog/LlanfairDialog.java
View file

@ -1,12 +1,11 @@
package org.fenix.llanfair.dialog;
import org.fenix.llanfair.Llanfair;
import javax.swing.*;
import java.awt.event.WindowAdapter;
import java.awt.event.WindowEvent;
import javax.swing.JDialog;
import org.fenix.llanfair.Llanfair;
/**
* LlanfairDialog
*

8
src/main/java/org/fenix/llanfair/dialog/SettingsTab.java
View file

@ -1,12 +1,12 @@
package org.fenix.llanfair.dialog;
import org.fenix.llanfair.config.Settings;
import org.fenix.utils.gui.LinkedCheckBox;
import javax.swing.*;
import java.awt.event.ItemEvent;
import java.util.HashMap;
import java.util.Map;
import javax.swing.JPanel;
import org.fenix.llanfair.Language;
import org.fenix.llanfair.config.Settings;
import org.fenix.utils.gui.LinkedCheckBox;
/**
*

30
src/main/java/org/fenix/llanfair/dialog/TabComponents.java
View file

@ -1,29 +1,19 @@
package org.fenix.llanfair.dialog;
import java.awt.Dimension;
import java.awt.Font;
import java.awt.GraphicsEnvironment;
import java.awt.GridBagLayout;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.util.ArrayList;
import java.util.List;
import javax.swing.BorderFactory;
import javax.swing.JCheckBox;
import javax.swing.JComboBox;
import javax.swing.JLabel;
import javax.swing.JPanel;
import javax.swing.JSpinner;
import javax.swing.SpinnerNumberModel;
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
import org.fenix.llanfair.Language;
import org.fenix.llanfair.Segment;
import org.fenix.llanfair.config.Settings;
import org.fenix.utils.gui.GBC;
import javax.swing.*;
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
import java.awt.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.util.ArrayList;
import java.util.List;
/**
*
* @author Xavier "Xunkar" Sencert
@ -49,7 +39,7 @@ public class TabComponents extends SettingsTab
SCB_SETTINGS.add(Settings.COR_STMR);
SCB_SETTINGS.add(Settings.COR_ICON);
SCB_SETTINGS.add(Settings.HDR_TTLE);
};
}
private JComboBox iconSizes;

30
src/main/java/org/fenix/llanfair/dialog/TabGeneral.java
View file

@ -1,31 +1,19 @@
package org.fenix.llanfair.dialog;
import java.awt.Component;
import java.awt.GridBagLayout;
import java.awt.GridLayout;
import org.fenix.llanfair.Language;
import org.fenix.llanfair.Llanfair;
import org.fenix.llanfair.config.Accuracy;
import org.fenix.llanfair.config.Compare;
import org.fenix.llanfair.config.Settings;
import org.fenix.utils.gui.GBC;
import javax.swing.*;
import java.awt.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.util.Enumeration;
import java.util.Locale;
import javax.swing.AbstractButton;
import javax.swing.ButtonGroup;
import javax.swing.DefaultListCellRenderer;
import javax.swing.JCheckBox;
import javax.swing.JComboBox;
import javax.swing.JLabel;
import javax.swing.JList;
import javax.swing.JPanel;
import javax.swing.JRadioButton;
import org.fenix.llanfair.Language;
import org.fenix.llanfair.Llanfair;
import org.fenix.llanfair.config.Settings;
import org.fenix.llanfair.config.Compare;
import org.fenix.llanfair.config.Accuracy;
import org.fenix.utils.gui.GBC;
import org.fenix.utils.Resources;
/**
*
* @author Xavier "Xunkar" Sencert

27
src/main/java/org/fenix/llanfair/dialog/TabHistory.java
View file

@ -1,29 +1,18 @@
package org.fenix.llanfair.dialog;
import java.awt.Dimension;
import java.awt.Font;
import java.awt.GraphicsEnvironment;
import java.awt.GridBagLayout;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import javax.swing.BorderFactory;
import javax.swing.JCheckBox;
import javax.swing.JComboBox;
import javax.swing.JLabel;
import javax.swing.JPanel;
import javax.swing.JSpinner;
import javax.swing.JTextField;
import javax.swing.SpinnerNumberModel;
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
import org.fenix.llanfair.Language;
import org.fenix.llanfair.Segment;
import org.fenix.llanfair.config.Settings;
import org.fenix.llanfair.config.Merge;
import org.fenix.llanfair.config.Settings;
import org.fenix.utils.gui.GBC;
import javax.swing.*;
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
import java.awt.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
class TabHistory extends SettingsTab implements ActionListener, ChangeListener {
// ------------------------------------------------------------- ATTRIBUTES

18
src/main/java/org/fenix/llanfair/dialog/TabHotkeys.java
View file

@ -1,16 +1,5 @@
package org.fenix.llanfair.dialog;
import java.awt.Color;
import java.awt.Dimension;
import java.awt.GridBagLayout;
import java.awt.event.MouseEvent;
import java.awt.event.MouseListener;
import java.util.ArrayList;
import java.util.List;
import javax.swing.JLabel;
import javax.swing.JTextField;
import org.fenix.llanfair.Language;
import org.fenix.llanfair.config.Settings;
import org.fenix.utils.gui.GBC;
@ -18,6 +7,13 @@ import org.jnativehook.GlobalScreen;
import org.jnativehook.keyboard.NativeKeyEvent;
import org.jnativehook.keyboard.NativeKeyListener;
import javax.swing.*;
import java.awt.*;
import java.awt.event.MouseEvent;
import java.awt.event.MouseListener;
import java.util.ArrayList;
import java.util.List;
/**
*
* @author Xavier "Xunkar" Sencert

7
src/main/java/org/fenix/llanfair/extern/WSplit.java vendored
View file

@ -1,13 +1,14 @@
package org.fenix.llanfair.extern;
import java.io.BufferedReader;
import java.io.IOException;
import javax.swing.ImageIcon;
import org.fenix.llanfair.Llanfair;
import org.fenix.llanfair.Run;
import org.fenix.llanfair.Segment;
import org.fenix.llanfair.Time;
import javax.swing.*;
import java.io.BufferedReader;
import java.io.IOException;
/**
* Utility class that provides method to interface with WSplit.
*

26
src/main/java/org/fenix/llanfair/gui/Core.java
View file

@ -1,30 +1,22 @@
package org.fenix.llanfair.gui;
import java.awt.Color;
import java.awt.Dimension;
import java.awt.FontMetrics;
import java.awt.Graphics;
import java.awt.GridBagLayout;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.beans.PropertyChangeEvent;
import javax.swing.Icon;
import javax.swing.JLabel;
import javax.swing.JPanel;
import javax.swing.Timer;
import javax.swing.event.TableModelEvent;
import org.fenix.llanfair.Language;
import org.fenix.llanfair.Run;
import org.fenix.llanfair.Run.State;
import org.fenix.llanfair.Segment;
import org.fenix.llanfair.config.Settings;
import org.fenix.llanfair.Time;
import org.fenix.utils.gui.GBC;
import org.fenix.llanfair.config.Settings;
import org.fenix.utils.Images;
import org.fenix.utils.gui.GBC;
import org.fenix.utils.locale.LocaleEvent;
import javax.swing.*;
import javax.swing.event.TableModelEvent;
import java.awt.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.beans.PropertyChangeEvent;
/**
* Core panel displaying the main informations for a run, namely: the run and
* segment timers and the current segment being runned.

2
src/main/java/org/fenix/utils/Images.java
View file

@ -40,7 +40,7 @@ public class Images {
g2.setRenderingHint(RenderingHints.KEY_RENDERING, RenderingHints.VALUE_RENDER_QUALITY);
g2.scale(scale, scale);
icon.paintIcon((Component)null, g2, 0, 0);
icon.paintIcon(null, g2, 0, 0);
g2.dispose();
return new ImageIcon(buffer);
}

2
src/main/java/org/fenix/utils/TableModelSupport.java
View file

@ -64,7 +64,7 @@ public class TableModelSupport {
}
private void fire(TableModelEvent event) {
TableModelListener[] tableListeners = (TableModelListener[])this.listeners.getListeners(TableModelListener.class);
TableModelListener[] tableListeners = this.listeners.getListeners(TableModelListener.class);
TableModelListener[] arr$ = tableListeners;
int len$ = tableListeners.length;

10
src/main/java/org/fenix/utils/about/AboutDialog.java
View file

@ -16,8 +16,8 @@ import java.net.URL;
public class AboutDialog extends JDialog implements ActionListener {
private JLabel icon = new JLabel();
private JLabel message;
private HyperLabel website;
private HyperLabel donate;
private org.fenix.utils.about.HyperLabel website;
private org.fenix.utils.about.HyperLabel donate;
private JButton okButton;
public AboutDialog(Window owner, String title) {
@ -64,12 +64,12 @@ public class AboutDialog extends JDialog implements ActionListener {
if(url == null) {
throw new NullPointerException("Donate URL is null");
} else {
this.donate = new HyperLabel(url, icon);
this.donate = new org.fenix.utils.about.HyperLabel(url, icon);
}
}
public void setWebsite(URL url) {
this.setWebsite(url, (String)null);
this.setWebsite(url, null);
}
public void setWebsite(URL url, String text) {
@ -80,7 +80,7 @@ public class AboutDialog extends JDialog implements ActionListener {
text = url.toString();
}
this.website = new HyperLabel(url, text);
this.website = new org.fenix.utils.about.HyperLabel(url, text);
}
}

1
src/main/java/org/fenix/utils/config/Configuration.java
View file

@ -171,7 +171,6 @@ public class Configuration implements Serializable {
try {
stream.close();
} catch (Exception var11) {
;
}
}

2
src/main/java/org/fenix/utils/locale/LocaleDelegate.java
View file

@ -40,7 +40,7 @@ public class LocaleDelegate {
}
private static void fireLocalChanged(Locale oldLocale, Locale newLocale) {
LocaleListener[] arr$ = (LocaleListener[])listeners.getListeners(LocaleListener.class);
LocaleListener[] arr$ = listeners.getListeners(LocaleListener.class);
int len$ = arr$.length;
for(int i$ = 0; i$ < len$; ++i$) {