Changeset 34201 in osm for applications/editors/josm/plugins/pdfimport/src

Timestamp:

2018-05-18T19:25:09+02:00 (7 years ago)

Author:

nzara

Message:

Block uploading of imported layers

Location:

applications/editors/josm/plugins/pdfimport/src/pdfimport

Files:

• LoadPdfDialog.java (modified) (5 diffs)
• PdfImportPlugin.java (modified) (2 diffs)

applications/editors/josm/plugins/pdfimport/src/pdfimport/LoadPdfDialog.java

@@ -50 +50 @@
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.osm.UploadPolicy;
 import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.SideButton;
@@ -570 +571 @@
                         data = loadPDF(newFileName, monitor.createSubTaskMonitor(500, false));
                         OsmBuilder.Mode mode = LoadPdfDialog.this.debugModeCheck.isSelected() ? OsmBuilder.Mode.Debug : OsmBuilder.Mode.Draft;
+//                        OsmBuilder.Mode mode = Logging.isDebugEnabled() ? OsmBuilder.Mode.Debug : OsmBuilder.Mode.Draft;
 
                         if (data != null) {
                             LoadPdfDialog.this.newLayer = LoadPdfDialog.this.makeLayer(
-                                    tr("PDF file preview"), new FilePlacement(), mode, monitor.createSubTaskMonitor(500, false));
+                                    tr("PDF preview: ") + newFileName.getName(), new FilePlacement(), mode, monitor.createSubTaskMonitor(500, false));
                         }
 
@@ -632 +634 @@
                         SwingRenderingProgressMonitor monitor = new SwingRenderingProgressMonitor(progressRenderer);
                         LoadPdfDialog.this.newLayer = LoadPdfDialog.this.makeLayer(
-                                tr("Imported PDF: ") + pdfFile, placement, OsmBuilder.Mode.Final, monitor);
+                                tr("PDF: ") + pdfFile.getName(), placement, OsmBuilder.Mode.Final, monitor);
                         progressRenderer.finish();
                     }
@@ -738 +740 @@
         //get PDF file to load
         if (loadChooser == null) {
-                loadChooser = new JFileChooser(Config.getPref().get("plugins.pdfimport.loadDir"));
+                loadChooser = new JFileChooser(Config.getPref().get("pdfimport.loadDir"));
                 loadChooser.setAcceptAllFileFilterUsed(false);
                 loadChooser.setMultiSelectionEnabled(false);
@@ -1056 +1058 @@
         monitor.setCustomText(tr("Postprocessing layer"));
         OsmDataLayer result = new OsmDataLayer(data, name, null);
+        data.setUploadPolicy(UploadPolicy.BLOCKED);
+        result.setUploadDiscouraged(true);
+        result.setBackgroundLayer(true);
         result.onPostLoadFromFile();
 

applications/editors/josm/plugins/pdfimport/src/pdfimport/PdfImportPlugin.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
 package pdfimport;
-
-import static org.openstreetmap.josm.tools.I18n.tr;
 
 import org.openstreetmap.josm.gui.MainApplication;
@@ -14 +12 @@
 public class PdfImportPlugin extends Plugin {
 
-    protected String name;
-
     public PdfImportPlugin(PluginInformation info) {
         super(info);
-        name = tr("Import PDF file");
         MainMenu.add(MainApplication.getMenu().imagerySubMenu, new PdfImportAction());
     }