mirrors
/
freecol
mirror of https://github.com/FreeCol/freecol.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Clean up and remove unnecessary method overloads in Utility

This commit is contained in:
Sebastian Zhorel 2015-08-14 16:56:20 +02:00
parent f026207330
commit 792014fcfb
2 changed files with 22 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/net/sf/freecol/client/gui/panel/ReportTradePanel.java
View File

@ -223,7 +223,7 @@ public final class ReportTradePanel extends ReportPanel {
}
private JLabel createLeftLabel(String key) {
JLabel result = Utility.localizedLabel(key, JLabel.LEADING);
JLabel result = Utility.localizedLabel(key);
result.setBorder(Utility.LEFTCELLBORDER);
return result;
}

65
src/net/sf/freecol/client/gui/panel/Utility.java
View File

@ -233,7 +233,14 @@ public final class Utility {
* @return The default <code>JTextPane</code> to use.
*/
public static JTextPane getDefaultTextPane() {
return getDefaultTextPane(null);
DefaultStyledDocument document
= new DefaultStyledDocument(STYLE_CONTEXT);
JTextPane textPane = new JTextPane(document);
textPane.setOpaque(false);
textPane.setEditable(false);
textPane.setLogicalStyle(STYLE_CONTEXT.getStyle("regular"));
return textPane;
}
/**
@ -243,14 +250,7 @@ public final class Utility {
* @return A suitable <code>JTextPane</code>.
*/
public static JTextPane getDefaultTextPane(String text) {
DefaultStyledDocument document
= new DefaultStyledDocument(STYLE_CONTEXT);
JTextPane textPane = new JTextPane(document);
textPane.setOpaque(false);
textPane.setEditable(false);
textPane.setLogicalStyle(STYLE_CONTEXT.getStyle("regular"));
JTextPane textPane = getDefaultTextPane();
textPane.setText(text);
return textPane;
}
@ -353,16 +353,6 @@ public final class Utility {
return new JCheckBoxMenuItem(Messages.message(key), value);
}
/**
* Get a JLabel with a named object.
*
* @param named The <code>Named</code> to use.
* @return The <code>JLabel</code>.
*/
public static JLabel localizedLabel(Named named) {
return localizedLabel(named.getNameKey());
}
/**
* Gets a default header for panels containing a localized message.
*
@ -410,6 +400,16 @@ public final class Utility {
SwingConstants.LEADING, size);
}
/**
* Get a JLabel with a named object.
*
* @param named The <code>Named</code> to use.
* @return The <code>JLabel</code>.
*/
public static JLabel localizedLabel(Named named) {
return localizedLabel(named.getNameKey());
}
/**
* Get a JLabel with Messages.message(key) as text.
*
@ -417,30 +417,7 @@ public final class Utility {
* @return The <code>JLabel</code>.
*/
public static JLabel localizedLabel(String key) {
return localizedLabel(key, SwingConstants.LEADING);
}
/**
* Get a JLabel with Messages.message(key) as text.
*
* @param key The key to use.
* @param alignment The alignment.
* @return The <code>JLabel</code>.
*/
public static JLabel localizedLabel(String key, int alignment) {
return localizedLabel(key, null, alignment);
}
/**
* Get a JLabel with Messages.message(key) as text.
*
* @param key The key to use.
* @param icon The icon to use.
* @param alignment The alignment.
* @return The <code>JLabel</code>.
*/
public static JLabel localizedLabel(String key, Icon icon, int alignment) {
return localizedLabel(StringTemplate.key(key), icon, alignment);
return localizedLabel(StringTemplate.key(key));
}
/**
@ -450,7 +427,7 @@ public final class Utility {
* @return The <code>JLabel</code>.
*/
public static JLabel localizedLabel(StringTemplate template) {
return localizedLabel(template, null, SwingConstants.LEADING);
return new JLabel(Messages.message(template));
}
/**