Changeset 12537 in josm for trunk/src/org/openstreetmap/josm/gui/io

Timestamp:

2017-07-30T00:22:46+02:00 (7 years ago)

Author:

Don-vip

Message:

PMD - VariableNamingConventions

Location:

trunk/src/org/openstreetmap/josm/gui/io

Files:

• LayerNameAndFilePathTableCell.java (modified) (4 diffs)
• SaveLayersTableColumnModel.java (modified) (3 diffs)
• UploadDialog.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/io/LayerNameAndFilePathTableCell.java

@@ -38 +38 @@
  */
 class LayerNameAndFilePathTableCell extends JPanel implements TableCellRenderer, TableCellEditor {
-    private static final Color colorError = new Color(255, 197, 197);
+    private static final Color COLOR_ERROR = new Color(255, 197, 197);
     private static final String ELLIPSIS = '…' + File.separator;
 
@@ -46 +46 @@
     private final JButton btnFileChooser = new JButton(new LaunchFileChooserAction());
 
-    private static final GBC defaultCellStyle = GBC.eol().fill(GBC.HORIZONTAL).insets(2, 0, 2, 0);
+    private static final GBC DEFAULT_CELL_STYLE = GBC.eol().fill(GBC.HORIZONTAL).insets(2, 0, 2, 0);
 
     private final transient CellEditorSupport cellEditorSupport = new CellEditorSupport(this);
@@ -137 +137 @@
         lblLayerName.setIcon(info.getLayer().getIcon());
         lblLayerName.setText(info.getName());
-        add(lblLayerName, defaultCellStyle);
+        add(lblLayerName, DEFAULT_CELL_STYLE);
         return tr("The bold text is the name of the layer.");
     }
@@ -164 +164 @@
         }
 
-        lblFilename.setBackground(error ? colorError : getBackground());
-        btnFileChooser.setBackground(error ? colorError : getBackground());
-
-        add(lblFilename, defaultCellStyle);
+        lblFilename.setBackground(error ? COLOR_ERROR : getBackground());
+        btnFileChooser.setBackground(error ? COLOR_ERROR : getBackground());
+
+        add(lblFilename, DEFAULT_CELL_STYLE);
         return tr("Click cell to change the file path.") + "<br/>" + tooltip;
     }

trunk/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java

@@ -27 +27 @@
         private final JLabel needsUpload = new JLabel(tr("should be uploaded"));
         private final JLabel needsSave = new JLabel(tr("should be saved"));
-        private static final GBC defaultCellStyle = GBC.eol().fill(GBC.HORIZONTAL).insets(2, 0, 2, 0);
+        private static final GBC DEFAULT_CELL_STYLE = GBC.eol().fill(GBC.HORIZONTAL).insets(2, 0, 2, 0);
 
         /**
@@ -48 +48 @@
                 String htmlInfoName = Utils.escapeReservedCharactersHTML(info.getName());
                 if (info.getLayer().requiresUploadToServer() && !info.getLayer().isUploadDiscouraged()) {
-                    panel.add(needsUpload, defaultCellStyle);
+                    panel.add(needsUpload, DEFAULT_CELL_STYLE);
                     sb.append(tr("Layer ''{0}'' has modifications which should be uploaded to the server.", htmlInfoName));
 
                 } else {
                     if (info.isUploadable()) {
-                        panel.add(pnlEmpty, defaultCellStyle);
+                        panel.add(pnlEmpty, DEFAULT_CELL_STYLE);
                     }
                     if (info.getLayer().requiresUploadToServer()) {
@@ -64 +64 @@
 
                 if (info.getLayer().requiresSaveToFile()) {
-                    panel.add(needsSave, defaultCellStyle);
+                    panel.add(needsSave, DEFAULT_CELL_STYLE);
                     sb.append(tr("Layer ''{0}'' has modifications which should be saved to its associated file ''{1}''.",
                             htmlInfoName, info.getFile().toString()));
                 } else {
                     if (info.isSavable()) {
-                        panel.add(pnlEmpty, defaultCellStyle);
+                        panel.add(pnlEmpty, DEFAULT_CELL_STYLE);
                     }
                     sb.append(tr("Layer ''{0}'' has no modifications to be saved.", htmlInfoName));

trunk/src/org/openstreetmap/josm/gui/io/UploadDialog.java

@@ -75 +75 @@
 
     /** list of custom components that can be added by plugins at JOSM startup */
-    private static final Collection<Component> customComponents = new ArrayList<>();
+    private static final Collection<Component> CUSTOM_COMPONENTS = new ArrayList<>();
 
     /** the "created_by" changeset OSM key */
@@ -136 +136 @@
 
         // Custom components
-        for (Component c : customComponents) {
+        for (Component c : CUSTOM_COMPONENTS) {
             pnl.add(c, GBC.eol().fill(GBC.HORIZONTAL));
         }
@@ -406 +406 @@
     public static boolean addCustomComponent(Component c) {
         if (c != null) {
-            return customComponents.add(c);
+            return CUSTOM_COMPONENTS.add(c);
         }
         return false;