Changeset 5003 in josm

Timestamp:

2012-02-19T23:17:34+01:00 (12 years ago)

Author:

xeen

Message:

fix #3409

Location:

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

Files:

• ActionFlagsTableCell.java (added)
• LayerNameAndFilePathTableCell.java (added)
• SaveFlagCellEditor.java (deleted)
• SaveLayerInfoCellRenderer.java (deleted)
• SaveLayersDialog.java (modified) (10 diffs)
• SaveLayersModel.java (modified) (5 diffs)
• SaveLayersTable.java (modified) (2 diffs)
• SaveLayersTableColumnModel.java (modified) (1 diff)

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

@@ -9 +9 @@
 import java.awt.Dimension;
 import java.awt.FlowLayout;
+import java.awt.Graphics2D;
 import java.awt.GridBagConstraints;
 import java.awt.GridBagLayout;
+import java.awt.Image;
 import java.awt.event.ActionEvent;
 import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
+import java.awt.image.BufferedImage;
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
@@ -24 +27 @@
 import javax.swing.AbstractAction;
 import javax.swing.DefaultListCellRenderer;
+import javax.swing.ImageIcon;
 import javax.swing.JComponent;
 import javax.swing.JDialog;
@@ -33 +37 @@
 import javax.swing.KeyStroke;
 import javax.swing.WindowConstants;
+import javax.swing.event.TableModelEvent;
+import javax.swing.event.TableModelListener;
 
 import org.openstreetmap.josm.Main;
@@ -45 +51 @@
 import org.openstreetmap.josm.tools.WindowGeometry;
 
-public class SaveLayersDialog extends JDialog {
+public class SaveLayersDialog extends JDialog implements TableModelListener {
     static public enum UserAction {
         /**
@@ -76 +82 @@
 
         model = new SaveLayersModel();
-        SaveLayersTable table;
-        JScrollPane pane = new JScrollPane(table = new SaveLayersTable(model));
+        SaveLayersTable table = new SaveLayersTable(model);
+        JScrollPane pane = new JScrollPane(table);
         model.addPropertyChangeListener(table);
+        table.getModel().addTableModelListener(this);
+
         getContentPane().add(pane, BorderLayout.CENTER);
         getContentPane().add(buildButtonRow(), BorderLayout.SOUTH);
-        table.getTableHeader().setPreferredSize(new Dimension(table.getTableHeader().getWidth(), 40));
 
         addWindowListener(new WindowClosingAdapter());
         setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
     }
+
+    private SideButton saveAndProceedActionButton = null;
 
     /**
@@ -98 +107 @@
         saveAndProceedAction = new SaveAndProceedAction();
         model.addPropertyChangeListener(saveAndProceedAction);
-        pnl.add(new SideButton(saveAndProceedAction));
+        pnl.add(saveAndProceedActionButton = new SideButton(saveAndProceedAction));
 
         discardAndProceedAction = new DiscardAndProceedAction();
@@ -327 +336 @@
 
         public void initForDiscardAndExit() {
-            putValue(NAME, tr("Discard and Exit"));
+            putValue(NAME, tr("Exit now!"));
             putValue(SHORT_DESCRIPTION, tr("Exit JOSM without saving. Unsaved changes are lost."));
             putValue(SMALL_ICON, ImageProvider.get("exit"));
@@ -333 +342 @@
 
         public void initForDiscardAndDelete() {
-            putValue(NAME, tr("Discard and Delete"));
+            putValue(NAME, tr("Delete now!"));
             putValue(SHORT_DESCRIPTION, tr("Delete layers without saving. Unsaved changes are lost."));
             putValue(SMALL_ICON, ImageProvider.get("dialogs", "delete"));
@@ -353 +362 @@
     }
 
-    class SaveAndProceedAction extends AbstractAction implements PropertyChangeListener {
+    final class SaveAndProceedAction extends AbstractAction implements PropertyChangeListener {
+        private static final int is = 24; // icon size
+        private static final String BASE_ICON = "BASE_ICON";
+        private final Image save = ImageProvider.get("save").getImage();
+        private final Image upld = ImageProvider.get("upload").getImage();
+        private final Image saveDis = new BufferedImage(is, is, BufferedImage.TYPE_4BYTE_ABGR);
+        private final Image upldDis = new BufferedImage(is, is, BufferedImage.TYPE_4BYTE_ABGR);
+
         public SaveAndProceedAction() {
+            // get disabled versions of icons
+            new JLabel(ImageProvider.get("save")).getDisabledIcon().paintIcon(new JPanel(), saveDis.getGraphics(), 0, 0);
+            new JLabel(ImageProvider.get("upload")).getDisabledIcon().paintIcon(new JPanel(), upldDis.getGraphics(), 0, 0);
             initForSaveAndExit();
         }
 
         public void initForSaveAndExit() {
-            putValue(NAME, tr("Save/Upload and Exit"));
+            putValue(NAME, tr("Perform actions before exiting"));
             putValue(SHORT_DESCRIPTION, tr("Exit JOSM with saving. Unsaved changes are uploaded and/or saved."));
-            putValue(SMALL_ICON, ImageProvider.get("exit"));
+            putValue(BASE_ICON, ImageProvider.get("exit"));
+            redrawIcon();
         }
 
         public void initForSaveAndDelete() {
-            putValue(NAME, tr("Save/Upload and Delete"));
+            putValue(NAME, tr("Perform actions before deleting"));
             putValue(SHORT_DESCRIPTION, tr("Save/Upload layers before deleting. Unsaved changes are not lost."));
-            putValue(SMALL_ICON, ImageProvider.get("dialogs", "delete"));
+            putValue(BASE_ICON, ImageProvider.get("dialogs", "delete"));
+            redrawIcon();
+        }
+
+        public void redrawIcon() {
+            try { // Can fail if model is not yet setup properly
+                Image base = ((ImageIcon) getValue(BASE_ICON)).getImage();
+                BufferedImage newIco = new BufferedImage(is*3, is, BufferedImage.TYPE_4BYTE_ABGR);
+                Graphics2D g = newIco.createGraphics();
+                g.drawImage(model.getLayersToUpload().isEmpty() ? upldDis : upld, is*0, 0, is, is, null);
+                g.drawImage(model.getLayersToSave().isEmpty()   ? saveDis : save, is*1, 0, is, is, null);
+                g.drawImage(base,                                                 is*2, 0, is, is, null);
+                putValue(SMALL_ICON, new ImageIcon(newIco));
+            } catch(Exception e) {
+                putValue(SMALL_ICON, getValue(BASE_ICON));
+            }
         }
 
@@ -546 +581 @@
         }
     }
+
+    @Override
+    public void tableChanged(TableModelEvent arg0) {
+        boolean dis = model.getLayersToSave().isEmpty() && model.getLayersToUpload().isEmpty();
+        if(saveAndProceedActionButton != null) {
+            saveAndProceedActionButton.setEnabled(!dis);
+        }
+        saveAndProceedAction.redrawIcon();
+    }
 }

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

@@ -24 +24 @@
     private Mode mode;
     private PropertyChangeSupport support;
+
+    // keep in sync with how the columns are ordered in SaveLayersTableColumnModel#build
+    private static final int columnFilename = 0;
+    private static final int columnActions = 2;
 
     public SaveLayersModel() {
@@ -83 +87 @@
     @Override
     public boolean isCellEditable(int row, int column) {
-        return column == 3 || column == 4 || column == 5;
+        return column == columnFilename || column == columnActions;
     }
 
@@ -89 +93 @@
     public void setValueAt(Object value, int row, int column) {
         switch(column) {
-            case 3 /* file name */:
-                this.layerInfo.get(row).setFile((File)value);
-                this.layerInfo.get(row).setDoSaveToFile(true);
-                break;
-            case 4 /* upload */: this.layerInfo.get(row).setDoUploadToServer((Boolean)value);break;
-            case 5 /* save */: this.layerInfo.get(row).setDoSaveToFile((Boolean)value);break;
+        case columnFilename:
+            this.layerInfo.get(row).setFile((File)value);
+            this.layerInfo.get(row).setDoSaveToFile(true);
+            break;
+        case columnActions:
+            boolean[] values = (boolean[]) value;
+            this.layerInfo.get(row).setDoUploadToServer(values[0]);
+            this.layerInfo.get(row).setDoSaveToFile(values[1]);
+            break;
         }
         fireTableDataChanged();
@@ -104 +111 @@
 
     public List<SaveLayerInfo> getLayersWithoutFilesAndSaveRequest() {
-        List<SaveLayerInfo> ret =new ArrayList<SaveLayerInfo>();
+        List<SaveLayerInfo> ret = new ArrayList<SaveLayerInfo>();
         for (SaveLayerInfo info: layerInfo) {
             if (info.isDoSaveToFile() && info.getFile() == null) {
@@ -215 +222 @@
         return ret;
     }
-
 }

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

@@ -2 +2 @@
 package org.openstreetmap.josm.gui.io;
 
+import java.awt.Dimension;
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
@@ -13 +14 @@
         super(model, new SaveLayersTableColumnModel());
         putClientProperty("terminateEditOnFocusLost", Boolean.TRUE);
+        super.setRowHeight(39);
+        super.getTableHeader().setPreferredSize(new Dimension(super.getTableHeader().getWidth(), 24));
+        super.getTableHeader().setReorderingAllowed(false);
     }
 

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

@@ -4 +4 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
+import java.awt.Component;
+import java.awt.Dimension;
+import java.awt.GridBagLayout;
+
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.JTable;
 import javax.swing.table.DefaultTableColumnModel;
-import javax.swing.table.TableCellEditor;
 import javax.swing.table.TableCellRenderer;
 import javax.swing.table.TableColumn;
 
+import org.openstreetmap.josm.tools.GBC;
+
 class SaveLayersTableColumnModel extends DefaultTableColumnModel {
+    /** small renderer class that handles the "should be uploaded/saved" texts. */
+    private static class RecommendedActionsTableCell extends JPanel implements TableCellRenderer {
+        private final static JPanel pnlEmpty = new JPanel();
+        private final static JLabel needsUpload = new JLabel(tr("should be uploaded"));
+        private final static JLabel needsSave = new JLabel(tr("should be saved"));
+        private final static GBC defaultCellStyle = GBC.eol().fill(GBC.HORIZONTAL).insets(2, 0, 2, 0);
+
+        public RecommendedActionsTableCell() {
+            setLayout(new GridBagLayout());
+            pnlEmpty.setPreferredSize(new Dimension(1, 19));
+            needsUpload.setPreferredSize(new Dimension(needsUpload.getPreferredSize().width, 19));
+            needsSave.setPreferredSize(new Dimension(needsSave.getPreferredSize().width, 19));
+        }
+
+        public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected,
+                boolean hasFocus, int row, int column) {
+            SaveLayerInfo info = (SaveLayerInfo)value;
+            StringBuilder sb = new StringBuilder();
+            sb.append("<html>");
+            if (info.getLayer().requiresUploadToServer()) {
+                add(needsUpload, defaultCellStyle);
+                sb.append(tr("Layer ''{0}'' has modifications which should be uploaded to the server.", info.getName()));
+
+            } else {
+                add(pnlEmpty, defaultCellStyle);
+                sb.append(tr("Layer ''{0}'' has no modifications to be uploaded.", info.getName()));
+            }
+            sb.append("<br/>");
+
+            if (info.getLayer().requiresSaveToFile()) {
+                add(needsSave, defaultCellStyle);
+                sb.append(tr("Layer ''{0}'' has modifications which should be saved to its associated file ''{1}''.", info.getName(), info.getFile().toString()));
+            } else {
+                add(pnlEmpty, defaultCellStyle);
+                sb.append(tr("Layer ''{0}'' has no modifications to be saved.", info.getName()));
+            }
+            sb.append("</html>");
+            setToolTipText(sb.toString());
+            return this;
+        }
+    }
+
     protected void build() {
         TableColumn col = null;
-        TableCellRenderer renderer = new SaveLayerInfoCellRenderer();
-        TableCellEditor fileNameEditor = new FilenameCellEditor();
-        TableCellEditor saveFlagEditor = new SaveFlagCellEditor();
 
-        // column 0 - Layer
-        col = new TableColumn(0);
-        col.setHeaderValue(tr("Layer"));
+        // column 0 - layer name, save path editor
+        LayerNameAndFilePathTableCell lnafptc = new LayerNameAndFilePathTableCell();
+        col = new TableColumn(0); // keep in sync with SaveLayersModel#columnFilename
+        col.setHeaderValue(tr("Layer Name and File Path"));
         col.setResizable(true);
-        col.setCellRenderer(renderer);
-        col.setPreferredWidth(100);
+        col.setCellRenderer(lnafptc);
+        col.setCellEditor(lnafptc);
+        col.setPreferredWidth(324);
         addColumn(col);
 
-        // column 1 - Upload required
+        // column 1 - actions required
         col = new TableColumn(1);
-        col.setHeaderValue(tr("Should upload?"));
+        col.setHeaderValue(tr("Recommended Actions"));
         col.setResizable(true);
-        col.setCellRenderer(renderer);
-        col.setPreferredWidth(50);
+        col.setCellRenderer(new RecommendedActionsTableCell());
+        col.setPreferredWidth(150);
         addColumn(col);
 
-        // column 2 - Save to file required
-        col = new TableColumn(2);
-        col.setHeaderValue(tr("Should save?"));
+        // column 2- actions to take
+        ActionFlagsTableCell aftc = new ActionFlagsTableCell();
+        col = new TableColumn(2); // keep in sync with SaveLayersModel#columnActions
+        col.setHeaderValue(tr("Actions To Take"));
         col.setResizable(true);
-        col.setCellRenderer(renderer);
-        col.setPreferredWidth(50);
-        addColumn(col);
-
-        // column 3 - filename
-        col = new TableColumn(3);
-        col.setHeaderValue(tr("Filename"));
-        col.setResizable(true);
-        col.setCellRenderer(renderer);
-        col.setCellEditor(fileNameEditor);
-        col.setPreferredWidth(200);
-        addColumn(col);
-
-        // column 4 - Upload
-        col = new TableColumn(4);
-        col.setHeaderValue(tr("Upload"));
-        col.setResizable(true);
-        col.setCellRenderer(renderer);
-        col.setCellEditor(saveFlagEditor);
-        col.setPreferredWidth(30);
-        addColumn(col);
-
-        // column 5 - Save
-        col = new TableColumn(5);
-        col.setHeaderValue(tr("Save"));
-        col.setResizable(true);
-        col.setCellRenderer(renderer);
-        col.setCellEditor(saveFlagEditor);
-        col.setPreferredWidth(30);
+        col.setCellRenderer(aftc);
+        col.setCellEditor(aftc);
+        col.setPreferredWidth(100);
 
         addColumn(col);