Minor code changes

Author: ebourg

core/src/main/java/org/pushingpixels/flamingo/api/svg/IndentingPrintWriter.java

@@ -24,14 +24,14 @@
  */
 class IndentingPrintWriter extends PrintWriter {
 
-    private String indentation = "        ";
+    private static final String INDENTATION = "        ";
 
     public IndentingPrintWriter(PrintWriter out) {
         super(out);
     }
 
     @Override
     public void println(String s) {
-        super.println(indentation + s);
+        super.println(INDENTATION + s);
     }
 }

core/src/main/java/org/pushingpixels/flamingo/api/svg/SvgBatchConverter.java

@@ -5,6 +5,7 @@
 import java.io.PrintWriter;
 
 public class SvgBatchConverter {
+
     /**
      * Main method for testing.
      *

core/src/main/java/org/pushingpixels/flamingo/api/svg/SvgTranscoder.java

@@ -115,13 +115,13 @@ public class SvgTranscoder {
 
     /** The current paint, as a Java declaration. */
     private String currentPaint;
-    
+
     /** The current stroke, as a Java declaration. */
     private String currentStroke;
 
     /** The current shape. */
     private Shape currentShape;
-    
+
     /**
      * Creates a new transcoder.
      *
@@ -241,7 +241,7 @@ public void transcode(BridgeContext context) throws IOException {
             bounds = new Rectangle2D.Double(0, 0, context.getDocumentSize().getWidth(), context.getDocumentSize().getHeight());
         }
 
-        Map<Template.Token, Object> params = new HashMap<Template.Token, Object>();
+        Map<Template.Token, Object> params = new HashMap<>();
         params.put(Template.Token.PACKAGE, javaPackageName != null ? "package " + javaPackageName + ";" : "");
         params.put(Template.Token.CLASSNAME, javaClassName);
         params.put(Template.Token.X, (int) Math.ceil(bounds.getX()));
@@ -304,7 +304,7 @@ private void transcodeCompositeShapePainter(CompositeShapePainter painter) {
      * @param painter Fill shape painter.
      */
     private void transcodeFillShapePainter(FillShapePainter painter) {
-        Paint paint = (Paint) painter.getPaint();
+        Paint paint = painter.getPaint();
         if (paint == null) {
             return;
         }
@@ -328,7 +328,7 @@ private void transcodePaintChange(Paint paint) {
      * @param painter Stroke shape painter.
      */
     private void transcodeStrokeShapePainter(StrokeShapePainter painter) {
-        Paint paint = (Paint) painter.getPaint();
+        Paint paint = painter.getPaint();
         if (paint == null) {
             return;
         }

core/src/main/java/org/pushingpixels/flamingo/api/svg/Template.java

@@ -32,7 +32,7 @@
  */
 public class Template {
 
-    public static enum Token {
+    public enum Token {
         PACKAGE, CLASSNAME, PAINTING_CODE, X, Y, WIDTH, HEIGHT
     }
 

core/src/main/java/org/pushingpixels/flamingo/api/svg/TextSplitter.java

@@ -59,14 +59,14 @@ static String insert(String content, String separator, int limit) {
     }
 
     static List<Chunk> getChunks(String content) {
-        List<Chunk> chunks = new LinkedList<Chunk>();
+        List<Chunk> chunks = new LinkedList<>();
 
         Chunk chunk = new Chunk();
         chunks.add(chunk);
 
         try {
             LineNumberReader reader = new LineNumberReader(new StringReader(content));
-            String line = null;
+            String line;
             while ((line = reader.readLine()) != null) {
                 if (line.trim().length() == 0) {
                     chunk = new Chunk();

gui/src/main/java/org/pushingpixels/flamingo/api/svg/gui/BasicListCellRenderer.java

@@ -27,12 +27,12 @@
  * 
  * @author Emmanuel Bourg
  */
-abstract class BasicListCellRenderer implements ListCellRenderer {
+abstract class BasicListCellRenderer<E> implements ListCellRenderer<E> {
     private ListCellRenderer delegate;
     private Class uiClass;
 
     @Override
-    public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) {
+    public Component getListCellRendererComponent(JList<? extends E> list, E value, int index, boolean isSelected, boolean cellHasFocus) {
         if (list.getUI().getClass() != uiClass) {
             uiClass = list.getUI().getClass();
             if ("ComboBox.list".equals(list.getName())) {

gui/src/main/java/org/pushingpixels/flamingo/api/svg/gui/SVGApplication.java

@@ -48,6 +48,7 @@
 import javax.swing.SwingUtilities;
 import javax.swing.SwingWorker;
 import javax.swing.UIManager;
+import javax.swing.WindowConstants;
 import javax.swing.filechooser.FileNameExtensionFilter;
 
 import net.miginfocom.swing.MigLayout;
@@ -76,7 +77,7 @@ public static void main(String[] args) throws Exception {
         JFrame frame = new JFrame(APPNAME);
         SVGApplication app = new SVGApplication(frame);
         frame.getContentPane().add(app.createComponents());
-        frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+        frame.setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE);
         frame.setSize(640, 480);
         Dimension screen = Toolkit.getDefaultToolkit().getScreenSize();
         frame.setLocation((int) (screen.getWidth() - frame.getWidth()) / 2, (int) (screen.getHeight() - frame.getHeight()) / 2);
@@ -100,8 +101,8 @@ private static List<Image> getApplicationIcons() {
     private JLabel label = new JLabel();
     private JSVGCanvas svgCanvas = new JSVGCanvas();
     private String lastDir;
-    private JComboBox<Template> comboTemplates = new JComboBox<Template>();
-    private JComboBox<NamingStrategy> comboNaming = new JComboBox<NamingStrategy>();
+    private JComboBox<Template> comboTemplates = new JComboBox<>();
+    private JComboBox<NamingStrategy> comboNaming = new JComboBox<>();
 
     public SVGApplication(JFrame frame) {
         this.frame = frame;
@@ -124,13 +125,13 @@ public JComponent createToolbar() {
                 new Template("plain.template"),
                 new Template("resizable.template")
             };
-            comboTemplates.setModel(new DefaultComboBoxModel<Template>(templates));
+            comboTemplates.setModel(new DefaultComboBoxModel<>(templates));
         } catch (IOException e) {
             e.printStackTrace();
         }
         comboTemplates.setRenderer(new TemplateListCellRenderer());
 
-        comboNaming.setModel(new DefaultComboBoxModel<NamingStrategy>(new NamingStrategy[] {
+        comboNaming.setModel(new DefaultComboBoxModel<>(new NamingStrategy[] {
                 new CamelCaseNamingStrategy(),
                 new IconSuffixNamingStrategy(new CamelCaseNamingStrategy()),
                 new DefaultNamingStrategy()