Changeset 28114 in osm for applications/editors/josm/plugins/opendata/src/org

Timestamp:

2012-03-19T00:45:17+01:00 (12 years ago)

Author:

donvip

Message:

opendata: View embedded licenses

Location:

applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core

Files:

• actions/ViewLicenseAction.java (added)
• gui/AskLicenseAgreementDialog.java (modified) (1 diff)
• gui/ViewLicenseDialog.java (added)
• layers/OdDataLayer.java (modified) (2 diffs)

applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/gui/AskLicenseAgreementDialog.java

@@ -3 +3 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
-import java.awt.Dimension;
-import java.awt.event.ActionEvent;
 import java.io.IOException;
 
-import javax.swing.Icon;
-import javax.swing.JEditorPane;
-import javax.swing.JOptionPane;
-import javax.swing.JScrollPane;
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.plugins.opendata.core.licenses.License;
 
-import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.gui.ExtendedDialog;
-import org.openstreetmap.josm.plugins.opendata.core.licenses.License;
-import org.openstreetmap.josm.tools.ImageProvider;
-
-public class AskLicenseAgreementDialog extends ExtendedDialog {
-
-        private final License license;
-        private final JEditorPane htmlPane;
-        private boolean summary;
+public class AskLicenseAgreementDialog extends ViewLicenseDialog {
         
         public AskLicenseAgreementDialog(License license) throws IOException {
-                super(Main.parent, tr("License Agreement"), new String[] {tr("Accept"), "", tr("Refuse")});
+                super(license, Main.parent, tr("License Agreement"), new String[] {tr("Accept"), "", tr("Refuse")});
                 
-                this.license = license;
-                this.htmlPane = new JEditorPane();
-                //htmlPane.setEditorKitForContentType(pdfEditorKit.getContentType(), pdfEditorKit);
-                htmlPane.setEditable(false);
-                if (license.getSummaryURL() != null) {
-                        htmlPane.setPage(license.getSummaryURL());
-                        summary = true;
-                } else {
-                        htmlPane.setPage(license.getURL());
-                        summary = false;
-                }
-                JScrollPane scrollPane = new JScrollPane(htmlPane);
-                scrollPane.setPreferredSize(new Dimension(800, 600));
-        
-        setButtonIcons(new Icon[] {
-                ImageProvider.get("ok"),
-                ImageProvider.get("agreement24"),
-                ImageProvider.get("cancel"),
-                });
         setToolTipTexts(new String[] {
                 tr("I understand and accept these terms and conditions"),
                 tr("View the full text of this license"),
                 tr("I refuse these terms and conditions. Cancel download.")});
-        if (license.getIcon() != null) {
-                setIcon(license.getIcon());
-        } else {
-                setIcon(JOptionPane.INFORMATION_MESSAGE);
-        }
-        setCancelButton(3);
-        setMinimumSize(new Dimension(300, 200));
-        setContent(scrollPane, false);
-        }
-
-        @Override
-        protected void buttonAction(int buttonIndex, ActionEvent evt) {
-                if (buttonIndex == 1) {
-                        try {
-                                if (summary) {
-                                        buttons.get(1).setText(tr("View summary"));
-                                        htmlPane.setPage(license.getURL());
-                                } else {
-                                        buttons.get(1).setText(tr("View full text"));
-                                        htmlPane.setPage(license.getSummaryURL());
-                                }
-                        } catch (IOException e) {
-                                e.printStackTrace();
-                        }
-                        summary = !summary;
-                } else {
-                        super.buttonAction(buttonIndex, evt);
-                }
-        }
-
-        @Override
-        public void setupDialog() {
-                super.setupDialog();
-                buttons.get(1).setEnabled(license.getSummaryURL() != null && license.getURL() != null);
-                if (summary) {
-                        buttons.get(1).setText(tr("View full text"));
-                } else {
-                        buttons.get(1).setText(tr("View summary"));
-                }
         }
 }

applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/layers/OdDataLayer.java

@@ -36 +36 @@
 import org.openstreetmap.josm.plugins.opendata.core.OdConstants;
 import org.openstreetmap.josm.plugins.opendata.core.actions.OpenLinkAction;
+import org.openstreetmap.josm.plugins.opendata.core.actions.ViewLicenseAction;
 import org.openstreetmap.josm.plugins.opendata.core.datasets.AbstractDataSetHandler;
 import org.openstreetmap.josm.plugins.opendata.core.io.OsmDownloader;
@@ -161 +162 @@
                                 result.add(new OpenLinkAction(lic.getURL(), ICON_AGREEMENT_24, 
                                                 tr("View License"), tr("Launch browser to the license page of the selected data set")));
-                        } else {
-                                // TODO: view embedded licenses
                         }
                         if (lic.getSummaryURL() != null && lic.getSummaryURL().getProtocol().startsWith("http")) {
                                 result.add(new OpenLinkAction(lic.getSummaryURL(), ICON_AGREEMENT_24, 
                                                 tr("View License (summary)"), tr("Launch browser to the summary license page of the selected data set")));
-                        } else {
-                                // TODO: view embedded licenses
+                        }
+                        if ((lic.getURL() != null && !lic.getURL().getProtocol().startsWith("http")) || (lic.getSummaryURL() != null && !lic.getSummaryURL().getProtocol().startsWith("http"))) {
+                                result.add(new ViewLicenseAction(lic, tr("View License"), tr("View the license of the selected data set")));
                         }
                 }