Changeset 9471 in josm for trunk/src/org/openstreetmap/josm/io/session/OsmDataSessionExporter.java

Timestamp:

2016-01-15T21:25:13+01:00 (8 years ago)

Author:

Don-vip

Message:

session - refactoring to reduce code duplication

File:

• trunk/src/org/openstreetmap/josm/io/session/OsmDataSessionExporter.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/io/session/OsmDataSessionExporter.java

@@ -2 +2 @@
 package org.openstreetmap.josm.io.session;
 
-import static org.openstreetmap.josm.tools.I18n.tr;
-
-import java.awt.CardLayout;
-import java.awt.Font;
-import java.awt.GridBagLayout;
-import java.awt.Insets;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.event.ItemEvent;
-import java.awt.event.ItemListener;
-import java.io.File;
-import java.io.IOException;
 import java.io.OutputStream;
 import java.io.OutputStreamWriter;
 import java.io.PrintWriter;
 import java.io.Writer;
-import java.net.MalformedURLException;
-import java.net.URI;
-import java.net.URL;
 import java.nio.charset.StandardCharsets;
 
-import javax.swing.AbstractAction;
-import javax.swing.ButtonGroup;
-import javax.swing.JButton;
-import javax.swing.JLabel;
-import javax.swing.JPanel;
-import javax.swing.JRadioButton;
-import javax.swing.SwingConstants;
-
-import org.openstreetmap.josm.actions.SaveAction;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
-import org.openstreetmap.josm.gui.util.GuiHelper;
-import org.openstreetmap.josm.gui.widgets.JosmTextField;
 import org.openstreetmap.josm.io.OsmWriter;
 import org.openstreetmap.josm.io.OsmWriterFactory;
-import org.openstreetmap.josm.io.session.SessionWriter.ExportSupport;
-import org.openstreetmap.josm.tools.GBC;
-import org.openstreetmap.josm.tools.ImageProvider;
-import org.w3c.dom.Element;
 
 /**
@@ -46 +16 @@
  * @since 4685
  */
-public class OsmDataSessionExporter extends AbstractSessionExporter<OsmDataLayer> {
-
-    private JRadioButton link;
-    private JRadioButton include;
+public class OsmDataSessionExporter extends GenericSessionExporter<OsmDataLayer> {
 
     /**
@@ -56 +23 @@
      */
     public OsmDataSessionExporter(OsmDataLayer layer) {
-        super(layer);
-    }
-
-    private class LayerSaveAction extends AbstractAction {
-        /**
-         * Constructs a new {@code LayerSaveAction}.
-         */
-        LayerSaveAction() {
-            putValue(SMALL_ICON, new ImageProvider("save").setWidth(16).get());
-            putValue(SHORT_DESCRIPTION, layer.requiresSaveToFile() ?
-                    tr("Layer contains unsaved data - save to file.") :
-                    tr("Layer does not contain unsaved data."));
-            updateEnabledState();
-        }
-
-        @Override
-        public void actionPerformed(ActionEvent e) {
-            SaveAction.getInstance().doSave(layer);
-            updateEnabledState();
-        }
-
-        public final void updateEnabledState() {
-            setEnabled(layer.requiresSaveToFile());
-        }
+        super(layer, "osm-data", "0.1", "osm");
     }
 
     @Override
-    public JPanel getExportPanel() {
-        final JPanel p = new JPanel(new GridBagLayout());
-        JPanel topRow = new JPanel(new GridBagLayout());
-        export.setSelected(true);
-        final JLabel lbl = new JLabel(layer.getName(), layer.getIcon(), SwingConstants.LEFT);
-        lbl.setToolTipText(layer.getToolTipText());
-        lbl.setLabelFor(export);
-        JLabel lblData = new JLabel(tr("Data:"));
-        /* I18n: Refer to a OSM data file in session file */ link = new JRadioButton(tr("local file"));
-        link.putClientProperty("actionname", "link");
-        link.setToolTipText(tr("Link to a OSM data file on your local disk."));
-        /* I18n: Include OSM data in session file */ include = new JRadioButton(tr("include"));
-        include.setToolTipText(tr("Include OSM data in the .joz session file."));
-        include.putClientProperty("actionname", "include");
-        ButtonGroup group = new ButtonGroup();
-        group.add(link);
-        group.add(include);
-
-        JPanel cardLink = new JPanel(new GridBagLayout());
-        final File file = layer.getAssociatedFile();
-        final LayerSaveAction saveAction = new LayerSaveAction();
-        final JButton save = new JButton(saveAction);
-        if (file != null && file.exists()) {
-            JosmTextField tf = new JosmTextField();
-            tf.setText(file.getPath());
-            tf.setEditable(false);
-            cardLink.add(tf, GBC.std());
-            save.setMargin(new Insets(0, 0, 0, 0));
-            cardLink.add(save, GBC.eol().insets(2, 0, 0, 0));
-        } else {
-            cardLink.add(new JLabel(tr("No file association")), GBC.eol());
-        }
-
-        JPanel cardInclude = new JPanel(new GridBagLayout());
-        JLabel lblIncl = new JLabel(tr("OSM data will be included in the session file."));
-        lblIncl.setFont(lblIncl.getFont().deriveFont(Font.PLAIN));
-        cardInclude.add(lblIncl, GBC.eol().fill(GBC.HORIZONTAL));
-
-        final CardLayout cl = new CardLayout();
-        final JPanel cards = new JPanel(cl);
-        cards.add(cardLink, "link");
-        cards.add(cardInclude, "include");
-
-        if (file != null && file.exists()) {
-            link.setSelected(true);
-        } else {
-            link.setEnabled(false);
-            link.setToolTipText(tr("No file association"));
-            include.setSelected(true);
-            cl.show(cards, "include");
-        }
-
-        link.addActionListener(new ActionListener() {
-            @Override
-            public void actionPerformed(ActionEvent e) {
-                cl.show(cards, "link");
-            }
-        });
-        include.addActionListener(new ActionListener() {
-            @Override
-            public void actionPerformed(ActionEvent e) {
-                cl.show(cards, "include");
-            }
-        });
-
-        topRow.add(export, GBC.std());
-        topRow.add(lbl, GBC.std());
-        topRow.add(GBC.glue(1, 0), GBC.std().fill(GBC.HORIZONTAL));
-        p.add(topRow, GBC.eol().fill(GBC.HORIZONTAL));
-        p.add(lblData, GBC.std().insets(10, 0, 0, 0));
-        p.add(link, GBC.std());
-        p.add(include, GBC.eol());
-        p.add(cards, GBC.eol().insets(15, 0, 3, 3));
-
-        export.addItemListener(new ItemListener() {
-            @Override
-            public void itemStateChanged(ItemEvent e) {
-                if (e.getStateChange() == ItemEvent.DESELECTED) {
-                    GuiHelper.setEnabledRec(p, false);
-                    export.setEnabled(true);
-                } else {
-                    GuiHelper.setEnabledRec(p, true);
-                    save.setEnabled(saveAction.isEnabled());
-                    link.setEnabled(file != null && file.exists());
-                }
-            }
-        });
-        return p;
-    }
-
-    @Override
-    public boolean requiresZip() {
-        return include.isSelected();
-    }
-
-    @Override
-    public Element export(ExportSupport support) throws IOException {
-        Element layerEl = support.createElement("layer");
-        layerEl.setAttribute("type", "osm-data");
-        layerEl.setAttribute("version", "0.1");
-
-        Element file = support.createElement("file");
-        layerEl.appendChild(file);
-
-        if (requiresZip()) {
-            String zipPath = "layers/" + String.format("%02d", support.getLayerIndex()) + "/data.osm";
-            file.appendChild(support.createTextNode(zipPath));
-            addDataFile(support.getOutputStreamZip(zipPath));
-        } else {
-            URI uri = layer.getAssociatedFile().toURI();
-            URL url = null;
-            try {
-                url = uri.toURL();
-            } catch (MalformedURLException e) {
-                throw new IOException(e);
-            }
-            file.appendChild(support.createTextNode(url.toString()));
-        }
-        return layerEl;
-    }
-
     protected void addDataFile(OutputStream out) {
         Writer writer = new OutputStreamWriter(out, StandardCharsets.UTF_8);