Index: applications/editors/josm/plugins/pdfimport/src/org/openstreetmap/josm/plugins/pdfimport/FilePlacement18.java =================================================================== --- applications/editors/josm/plugins/pdfimport/src/org/openstreetmap/josm/plugins/pdfimport/FilePlacement18.java (revision 35816) +++ applications/editors/josm/plugins/pdfimport/src/org/openstreetmap/josm/plugins/pdfimport/FilePlacement18.java (revision 35817) @@ -30,6 +30,6 @@ import org.openstreetmap.josm.data.osm.Node; import org.openstreetmap.josm.data.osm.OsmPrimitive; -import org.openstreetmap.josm.data.projection.Projection; import org.openstreetmap.josm.gui.MainApplication; +import org.openstreetmap.josm.tools.Logging; public class FilePlacement18 extends FilePlacement { @@ -81,4 +81,5 @@ }); } + public void SetCoor(EastNorth en) { x.requestFocusInWindow(); // make shure focus-lost events will be triggered later @@ -87,6 +88,7 @@ y.setValue(en.getY()); } + public EastNorth getCorr() { - return new EastNorth(x.getValue(),y.getValue()); + return new EastNorth(x.getValue(), y.getValue()); } } @@ -113,9 +115,9 @@ public PlacementPanel(FilePlacement18 parrent) { - if (parrent==null) throw new IllegalArgumentException(); - fc=parrent; - } - - private PlacementPanel () { + if (parrent == null) throw new IllegalArgumentException(); + fc = parrent; + } + + private PlacementPanel() { } @@ -123,8 +125,8 @@ private class Monitor implements FocusListener { - private PlacementPanel target=null; + private PlacementPanel target; public Monitor(PlacementPanel home) { - target=home; + target = home; } @@ -137,5 +139,6 @@ try { target.Verify(); - } catch (Exception ee) { + } catch (Exception ex) { + Logging.trace(ex); } } @@ -245,5 +248,4 @@ cGetButton.fill = GridBagConstraints.NONE; - GridBagConstraints c = new GridBagConstraints(); /* * Projection @@ -253,15 +255,15 @@ * Max Corner */ - panel.add(new JLabel(tr("Top right (max) corner:"),SwingConstants.CENTER), cCornerHeading); - c = (GridBagConstraints) cLine.clone(); - c.weightx = 0.0; panel.add(new JLabel(tr("X:"),SwingConstants.RIGHT),c); + panel.add(new JLabel(tr("Top right (max) corner:"), SwingConstants.CENTER), cCornerHeading); + GridBagConstraints c = (GridBagConstraints) cLine.clone(); + c.weightx = 0.0; panel.add(new JLabel(tr("X:"), SwingConstants.RIGHT), c); c.weightx = 1.0; panel.add(maxXField, c); - c.weightx = 0.0; panel.add(new JLabel(tr("East:"),SwingConstants.RIGHT),c); + c.weightx = 0.0; panel.add(new JLabel(tr("East:"), SwingConstants.RIGHT), c); c.weightx = 1.0; panel.add(maxEastField, c); c.gridy = 4; - c.weightx = 0.0; panel.add(new JLabel(tr("Y:"),SwingConstants.RIGHT),c); + c.weightx = 0.0; panel.add(new JLabel(tr("Y:"), SwingConstants.RIGHT), c); c.weightx = 1.0; panel.add(maxYField, c); - c.weightx = 0.0; panel.add(new JLabel(tr("North:"),SwingConstants.RIGHT),c); + c.weightx = 0.0; panel.add(new JLabel(tr("North:"), SwingConstants.RIGHT), c); c.weightx = 1.0; panel.add(maxNorthField, c); panel.add(getMaxButton, cGetButton); @@ -269,15 +271,15 @@ * Min Corner */ - panel.add(new JLabel(tr("Bottom left (min) corner:"),SwingConstants.CENTER), cCornerHeading); + panel.add(new JLabel(tr("Bottom left (min) corner:"), SwingConstants.CENTER), cCornerHeading); c = (GridBagConstraints) cLine.clone(); - c.weightx = 0.0; panel.add(new JLabel(tr("X:"),SwingConstants.RIGHT),c); + c.weightx = 0.0; panel.add(new JLabel(tr("X:"), SwingConstants.RIGHT), c); c.weightx = 1.0; panel.add(minXField, c); - c.weightx = 0.0; panel.add(new JLabel(tr("East:"),SwingConstants.RIGHT),c); + c.weightx = 0.0; panel.add(new JLabel(tr("East:"), SwingConstants.RIGHT), c); c.weightx = 1.0; panel.add(minEastField, c); c.gridy = 8; - c.weightx = 0.0; panel.add(new JLabel(tr("Y:"),SwingConstants.RIGHT),c); + c.weightx = 0.0; panel.add(new JLabel(tr("Y:"), SwingConstants.RIGHT), c); c.weightx = 1.0; panel.add(minYField, c); - c.weightx = 0.0; panel.add(new JLabel(tr("North:"),SwingConstants.RIGHT),c); + c.weightx = 0.0; panel.add(new JLabel(tr("North:"), SwingConstants.RIGHT), c); c.weightx = 1.0; panel.add(minNorthField, c); @@ -306,6 +308,4 @@ LatLon ll = ((Node) selected.iterator().next()).getCoor(); -// FilePlacement pl = new FilePlacement(); -// return pl.reverseTransform(ll); return new EastNorth(ll.lon() * 1000, ll.lat() * 1000); } @@ -352,11 +352,9 @@ f.SetCoor(en); } - - } - - } - - private PlacementPanel panel=null; - private boolean valid=false; // the data is consistent and the object ready to use for transformation + } + } + + private PlacementPanel panel; + private boolean valid; // the data is consistent and the object ready to use for transformation public boolean isValid() { @@ -366,4 +364,5 @@ return valid; } + public void setDependsOnValid(JComponent c) { panel.setDependsOnValid(c); @@ -371,10 +370,10 @@ public JPanel getGui() { - if (panel==null) panel = new PlacementPanel(this); - if (panel.panel==null) panel.build(); + if (panel == null) panel = new PlacementPanel(this); + if (panel.panel == null) panel.build(); return panel.panel; } - public FilePlacement18 () { + public FilePlacement18() { panel = new PlacementPanel(this); } @@ -383,8 +382,8 @@ File file = new File(baseFile + ".placement"); Properties p = new Properties(); - try (FileInputStream s = new FileInputStream(file)){ + try (FileInputStream s = new FileInputStream(file)) { p.load(s); s.close(); - }; + } fromProperties(p); } @@ -402,20 +401,4 @@ } - private Projection getProjection(Properties p, String name) { - String projectionCode = p.getProperty("Projection", null); - if (projectionCode != null) { - return ProjectionInfo.getProjectionByCode(p.getProperty("Projection", null)); - } - return null; - } - - private double getDouble(Properties p, String name, double defaultValue) { - try { - return Double.parseDouble(p.getProperty(name)); - } catch (Exception e) { - return defaultValue; - } - } - @Override protected void fromProperties(Properties p) { @@ -423,4 +406,3 @@ panel.load(); } - } Index: applications/editors/josm/plugins/pdfimport/src/org/openstreetmap/josm/plugins/pdfimport/GuiProjections.java =================================================================== --- applications/editors/josm/plugins/pdfimport/src/org/openstreetmap/josm/plugins/pdfimport/GuiProjections.java (revision 35816) +++ applications/editors/josm/plugins/pdfimport/src/org/openstreetmap/josm/plugins/pdfimport/GuiProjections.java (revision 35817) @@ -45,5 +45,5 @@ * Component to choose a Projection */ - public Chooser() { + Chooser() { setEditable(false); setToolTipText(tr("Projection of the PDF-Document")); @@ -55,13 +55,13 @@ } addActionListener(monitor); - setProjection (ProjectionRegistry.getProjection()); + setProjection(ProjectionRegistry.getProjection()); } - public void setProjection (Projection p) { + public void setProjection(Projection p) { /* * set current Projection to @p * update internal variables */ - if (p==null) return; // better keep the old one + if (p == null) return; // better keep the old one projection = p; pName.setText(p.toString()); @@ -96,22 +96,21 @@ */ Logging.debug("New projection encountered"); - ProjectionChoice px = new SingleProjectionChoice(p.toString(), localId, projectionCode) ; + ProjectionChoice px = new SingleProjectionChoice(p.toString(), localId, projectionCode); addItem(px); setSelectedItem(px); } + /** + * monitor user selection and set internal var accordingly + */ private class Monitor implements ActionListener { - /* - * (non-Javadoc) - * @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent) - * - * monitor user selection and set internal var accordingly - */ + @Override public void actionPerformed(ActionEvent e) { try { - ProjectionChoice pc = (ProjectionChoice)((Chooser) e.getSource()).getSelectedItem(); - setProjection(pc.getProjection()); - } catch (Exception X) { + ProjectionChoice pc = (ProjectionChoice) ((Chooser) e.getSource()).getSelectedItem(); + setProjection(pc.getProjection()); + } catch (Exception ex) { + Logging.debug(ex); } } @@ -119,5 +118,5 @@ } - public GuiProjections(){ + public GuiProjections() { build(); } @@ -143,14 +142,18 @@ private String userHints(Projection p) { - /* - * Provide some hints about projection @p - */ - String s=""; + // Provide some hints about projection @p + String s = ""; ProjectionBounds bd; try { - bd=p.getWorldBoundsBoxEastNorth(); - s += String.format("(%3$.0f %4$.0f) : (%5$.0f %6$.0f)", bd.getCenter().east(),bd.getCenter().north(), bd.getMin().east(),bd.getMin().north(),bd.getMax().east(),bd.getMax().north()); + bd = p.getWorldBoundsBoxEastNorth(); + s += String.format("(%3$.0f %4$.0f) : (%5$.0f %6$.0f)", + bd.getCenter().east(), + bd.getCenter().north(), + bd.getMin().east(), + bd.getMin().north(), + bd.getMax().east(), + bd.getMax().north()); } catch (Exception e) { - e.toString(); + Logging.debug(e); // Leave it, if we cant get it } @@ -159,7 +162,7 @@ private void build() { - pCode = new JLabel("code",SwingConstants.RIGHT); - pName = new JLabel("Name",SwingConstants.RIGHT); - pInfo = new JLabel("Info",SwingConstants.RIGHT); + pCode = new JLabel("code", SwingConstants.RIGHT); + pName = new JLabel("Name", SwingConstants.RIGHT); + pInfo = new JLabel("Info", SwingConstants.RIGHT); chooser = new Chooser(); @@ -170,9 +173,9 @@ panel = new GuiPanel(new GridBagLayout()); - panel.add(new JLabel(tr("Projection:"),SwingConstants.RIGHT),c); - panel.add(pCode,c); - c.weightx = 1.0; c.gridx = 2; panel.add(chooser,c); + panel.add(new JLabel(tr("Projection:"), SwingConstants.RIGHT), c); + panel.add(pCode, c); + c.weightx = 1.0; c.gridx = 2; panel.add(chooser, c); c.weightx = 0.0; c.gridy = 1; c.gridx = 0; c.gridwidth = 3; c.anchor = GridBagConstraints.LINE_END; - panel.add(pInfo,c); + panel.add(pInfo, c); } } Index: applications/editors/josm/plugins/pdfimport/src/org/openstreetmap/josm/plugins/pdfimport/LoadPdfDialog.java =================================================================== --- applications/editors/josm/plugins/pdfimport/src/org/openstreetmap/josm/plugins/pdfimport/LoadPdfDialog.java (revision 35816) +++ applications/editors/josm/plugins/pdfimport/src/org/openstreetmap/josm/plugins/pdfimport/LoadPdfDialog.java (revision 35817) @@ -299,5 +299,5 @@ placement.save(pdfFile); } catch (IOException e) { - e.toString(); + Logging.debug(e); } removeLayer(); @@ -314,5 +314,4 @@ } }, new ActionListener() { - @Override public void actionPerformed(ActionEvent e) { Index: applications/editors/josm/plugins/pdfimport/src/org/openstreetmap/josm/plugins/pdfimport/PathOptimizerConfig.java =================================================================== --- applications/editors/josm/plugins/pdfimport/src/org/openstreetmap/josm/plugins/pdfimport/PathOptimizerConfig.java (revision 35816) +++ applications/editors/josm/plugins/pdfimport/src/org/openstreetmap/josm/plugins/pdfimport/PathOptimizerConfig.java (revision 35817) @@ -1,5 +1,3 @@ -/** - * License: GPL. For details, see LICENSE file. - */ +// License: GPL. For details, see LICENSE file. package org.openstreetmap.josm.plugins.pdfimport; @@ -17,8 +15,4 @@ import javax.swing.SwingConstants; -/** - * @author Nzara - * - */ public class PathOptimizerConfig { /* @@ -52,5 +46,5 @@ return panel; } - + public boolean save() { /* @@ -82,5 +76,5 @@ Preferences.setLayerSegment(splitOnSingleSegmentCheck.getValue()); Preferences.setLayerOrtho(splitOnOrthogonalCheck.getValue()); - + return true; } @@ -95,9 +89,9 @@ removeSmallObjectsSize = new GuiFieldDouble(Preferences.getRemoveSmallValue()); - removeSmallObjectsCheck = new GuiFieldBool(tr("Remove objects smaller than"),Preferences.isRemoveSmall()); + removeSmallObjectsCheck = new GuiFieldBool(tr("Remove objects smaller than"), Preferences.isRemoveSmall()); removeSmallObjectsCheck.setCompanion(removeSmallObjectsSize); - removeLargeObjectsSize = new GuiFieldDouble((Preferences.getRemoveLargeValue())); - removeLargeObjectsCheck = new GuiFieldBool(tr("Remove objects larger than"),Preferences.isRemoveLarge()); + removeLargeObjectsSize = new GuiFieldDouble(Preferences.getRemoveLargeValue()); + removeLargeObjectsCheck = new GuiFieldBool(tr("Remove objects larger than"), Preferences.isRemoveLarge()); removeLargeObjectsCheck.setCompanion(removeLargeObjectsSize); @@ -106,13 +100,13 @@ colorFilterCheck.setCompanion(colorFilterColor); - removeParallelSegmentsTolerance = new GuiFieldDouble((Preferences.getRemoveParallelValue())); - removeParallelSegmentsCheck = new GuiFieldBool(tr("Remove parallel lines"),Preferences.isRemoveParallel()); + removeParallelSegmentsTolerance = new GuiFieldDouble(Preferences.getRemoveParallelValue()); + removeParallelSegmentsCheck = new GuiFieldBool(tr("Remove parallel lines"), Preferences.isRemoveParallel()); removeParallelSegmentsCheck.setCompanion(removeParallelSegmentsTolerance); - limitPathCount = new GuiFieldInteger((Preferences.getLimitPathValue())); - limitPathCountCheck = new GuiFieldBool(tr("Take only first X paths"),Preferences.isLimitPath()); + limitPathCount = new GuiFieldInteger(Preferences.getLimitPathValue()); + limitPathCountCheck = new GuiFieldBool(tr("Take only first X paths"), Preferences.isLimitPath()); limitPathCountCheck.setCompanion(limitPathCount); - splitOnColorChangeCheck = new GuiFieldBool(tr("Color/width change"),Preferences.isLayerAttribChange()); + splitOnColorChangeCheck = new GuiFieldBool(tr("Color/width change"), Preferences.isLayerAttribChange()); splitOnShapeClosedCheck = new GuiFieldBool(tr("Shape closed"), Preferences.isLayerClosed()); @@ -147,17 +141,17 @@ panel.add(mergeCloseNodesCheck, cLeft); - panel.add(new JLabel(tr("Tolerance:"),SwingConstants.RIGHT), cMiddle); + panel.add(new JLabel(tr("Tolerance:"), SwingConstants.RIGHT), cMiddle); panel.add(mergeCloseNodesTolerance, cRight); panel.add(removeSmallObjectsCheck, cLeft); - panel.add(new JLabel(tr("Tolerance:"),SwingConstants.RIGHT), cMiddle); + panel.add(new JLabel(tr("Tolerance:"), SwingConstants.RIGHT), cMiddle); panel.add(removeSmallObjectsSize, cRight); panel.add(removeLargeObjectsCheck, cLeft); - panel.add(new JLabel(tr("Tolerance:"),SwingConstants.RIGHT), cMiddle); + panel.add(new JLabel(tr("Tolerance:"), SwingConstants.RIGHT), cMiddle); panel.add(removeLargeObjectsSize, cRight); panel.add(removeParallelSegmentsCheck, cLeft); - panel.add(new JLabel(tr("Max distance:"),SwingConstants.RIGHT), cMiddle); + panel.add(new JLabel(tr("Max distance:"), SwingConstants.RIGHT), cMiddle); panel.add(removeParallelSegmentsTolerance, cRight); @@ -174,5 +168,5 @@ cRight.gridy = 8; panel.add(splitOnSingleSegmentCheck, cRight); cMiddle.gridy = 9; panel.add(splitOnColorChangeCheck, cMiddle); - cRight.gridy = 9;panel.add(splitOnOrthogonalCheck, cRight); + cRight.gridy = 9; panel.add(splitOnOrthogonalCheck, cRight); } } Index: applications/editors/josm/plugins/pdfimport/src/org/openstreetmap/josm/plugins/pdfimport/PreferenceSettingsGui.java =================================================================== --- applications/editors/josm/plugins/pdfimport/src/org/openstreetmap/josm/plugins/pdfimport/PreferenceSettingsGui.java (revision 35816) +++ applications/editors/josm/plugins/pdfimport/src/org/openstreetmap/josm/plugins/pdfimport/PreferenceSettingsGui.java (revision 35817) @@ -1,5 +1,3 @@ -/** - * License: GPL. For details, see LICENSE file. - */ +// License: GPL. For details, see LICENSE file. package org.openstreetmap.josm.plugins.pdfimport; @@ -17,66 +15,61 @@ import org.openstreetmap.josm.tools.GBC; -/** - * @author Nzara - * - */ public class PreferenceSettingsGui { - private class ModeChoice { - public Preferences.GuiMode guiMode; - public String name; + private static class ModeChoice { + public Preferences.GuiMode guiMode; + public String name; - ModeChoice(Preferences.GuiMode guiMode, String name) { - this.guiMode = guiMode; - this.name = name; - } + ModeChoice(Preferences.GuiMode guiMode, String name) { + this.guiMode = guiMode; + this.name = name; + } - public String toString() { - return name; - } - } + @Override + public String toString() { + return name; + } + } - private ModeChoice[] choices = { - new ModeChoice(Preferences.GuiMode.Auto, tr("Auto")), - new ModeChoice(Preferences.GuiMode.Simple, tr("Basic")), - new ModeChoice(Preferences.GuiMode.Expert, tr("Extended")) - }; + private ModeChoice[] choices = { + new ModeChoice(Preferences.GuiMode.Auto, tr("Auto")), + new ModeChoice(Preferences.GuiMode.Simple, tr("Basic")), + new ModeChoice(Preferences.GuiMode.Expert, tr("Extended")) + }; - private final String guiAuto = tr("Auto"); - private final String guiBasic = tr("Basic"); - private final String guiExtended = tr("Extended"); - - private String[] guiPrefs = {guiAuto, guiBasic, guiExtended}; - private JComboBox guiPrefsCombo = new JComboBox<>(guiPrefs); - private JPanel panel; + private final String guiAuto = tr("Auto"); + private final String guiBasic = tr("Basic"); + private final String guiExtended = tr("Extended"); - public JPanel getGui() { - if (panel == null) - build(); - int guiCode = Preferences.getGuiCode(); - if (guiCode == 1) guiPrefsCombo.setSelectedItem(guiExtended); - if (guiCode == 2) guiPrefsCombo.setSelectedItem(guiBasic); - return panel; - } + private String[] guiPrefs = {guiAuto, guiBasic, guiExtended}; + private JComboBox guiPrefsCombo = new JComboBox<>(guiPrefs); + private JPanel panel; - public boolean save() { - String s = (String) guiPrefsCombo.getSelectedItem(); - if (s==guiAuto) Preferences.setGuiCode(0); - if (s==guiBasic) Preferences.setGuiCode(2); - if (s==guiExtended) Preferences.setGuiCode(1); - - return true; - } + public JPanel getGui() { + if (panel == null) + build(); + int guiCode = Preferences.getGuiCode(); + if (guiCode == 1) guiPrefsCombo.setSelectedItem(guiExtended); + if (guiCode == 2) guiPrefsCombo.setSelectedItem(guiBasic); + return panel; + } - private void build() { - panel = new JPanel(new FlowLayout(FlowLayout.LEADING)); -// panel.setAlignmentX(Component.LEFT_ALIGNMENT); - panel.setBorder(BorderFactory.createTitledBorder(tr("User Interface"))); - JLabel l = new JLabel(tr("Interactions:")); - panel.add(l, GBC.std()); - panel.add(guiPrefsCombo, GBC.eop()); - guiPrefsCombo.setBackground(Color.red); - guiPrefsCombo.setAlignmentX(Component.RIGHT_ALIGNMENT); - } + public boolean save() { + String s = (String) guiPrefsCombo.getSelectedItem(); + if (s == guiAuto) Preferences.setGuiCode(0); + if (s == guiBasic) Preferences.setGuiCode(2); + if (s == guiExtended) Preferences.setGuiCode(1); + return true; + } + + private void build() { + panel = new JPanel(new FlowLayout(FlowLayout.LEADING)); + panel.setBorder(BorderFactory.createTitledBorder(tr("User Interface"))); + JLabel l = new JLabel(tr("Interactions:")); + panel.add(l, GBC.std()); + panel.add(guiPrefsCombo, GBC.eop()); + guiPrefsCombo.setBackground(Color.red); + guiPrefsCombo.setAlignmentX(Component.RIGHT_ALIGNMENT); + } } Index: applications/editors/josm/plugins/pdfimport/src/org/openstreetmap/josm/plugins/pdfimport/Preferences.java =================================================================== --- applications/editors/josm/plugins/pdfimport/src/org/openstreetmap/josm/plugins/pdfimport/Preferences.java (revision 35816) +++ applications/editors/josm/plugins/pdfimport/src/org/openstreetmap/josm/plugins/pdfimport/Preferences.java (revision 35817) @@ -10,5 +10,5 @@ public enum GuiMode { Auto, Expert, Simple - }; + } public static String getLoadDir() { @@ -50,5 +50,5 @@ public static void setMergeNodes(boolean v) { - Config.getPref().putBoolean(Preferences.prefix + "mergeNodes",v); + Config.getPref().putBoolean(Preferences.prefix + "mergeNodes", v); } @@ -70,5 +70,5 @@ public static void setRemoveSmall(boolean v) { - Config.getPref().putBoolean(Preferences.prefix + "removeSmall",v); + Config.getPref().putBoolean(Preferences.prefix + "removeSmall", v); } @@ -86,5 +86,5 @@ public static void setRemoveLarge(boolean v) { - Config.getPref().putBoolean(Preferences.prefix + "removeLarge",v); + Config.getPref().putBoolean(Preferences.prefix + "removeLarge", v); } @@ -102,5 +102,5 @@ public static void setRemoveParallel(boolean v) { - Config.getPref().putBoolean(Preferences.prefix + "removeParallel",v); + Config.getPref().putBoolean(Preferences.prefix + "removeParallel", v); } @@ -118,5 +118,5 @@ public static void setLimitPath(boolean v) { - Config.getPref().putBoolean(Preferences.prefix + "limitPath",v); + Config.getPref().putBoolean(Preferences.prefix + "limitPath", v); } @@ -134,5 +134,5 @@ public static void setLimitColor(boolean v) { - Config.getPref().putBoolean(Preferences.prefix + "limitColor",v); + Config.getPref().putBoolean(Preferences.prefix + "limitColor", v); } @@ -150,5 +150,5 @@ public static void setDebugTags(boolean v) { - Config.getPref().putBoolean(Preferences.prefix + "debugTags",v); + Config.getPref().putBoolean(Preferences.prefix + "debugTags", v); } @@ -158,14 +158,13 @@ public static void setLayerClosed(boolean v) { - Config.getPref().putBoolean(Preferences.prefix + "layerClosed",v); + Config.getPref().putBoolean(Preferences.prefix + "layerClosed", v); } public static boolean isLayerSegment() { - boolean v =Config.getPref().getBoolean(Preferences.prefix + "layerSegment"); return Config.getPref().getBoolean(Preferences.prefix + "layerSegment"); } public static void setLayerSegment(boolean v) { - Config.getPref().putBoolean(Preferences.prefix + "layerSegment",v); + Config.getPref().putBoolean(Preferences.prefix + "layerSegment", v); } @@ -175,5 +174,5 @@ public static void setLayerAttribChange(boolean v) { - Config.getPref().putBoolean(Preferences.prefix + "layerAttribChanges",v); + Config.getPref().putBoolean(Preferences.prefix + "layerAttribChanges", v); } @@ -183,5 +182,5 @@ public static void setLayerOrtho(boolean v) { - Config.getPref().putBoolean(Preferences.prefix + "layerOrtho",v); + Config.getPref().putBoolean(Preferences.prefix + "layerOrtho", v); } @@ -197,4 +196,3 @@ prefix = p + "."; } - } Index: applications/editors/josm/plugins/pdfimport/src/org/openstreetmap/josm/plugins/pdfimport/Preview.java =================================================================== --- applications/editors/josm/plugins/pdfimport/src/org/openstreetmap/josm/plugins/pdfimport/Preview.java (revision 35816) +++ applications/editors/josm/plugins/pdfimport/src/org/openstreetmap/josm/plugins/pdfimport/Preview.java (revision 35817) @@ -1,5 +1,3 @@ -/** - * License: GPL. For details, see LICENSE file. - */ +// License: GPL. For details, see LICENSE file. package org.openstreetmap.josm.plugins.pdfimport; @@ -7,22 +5,15 @@ import org.openstreetmap.josm.gui.layer.OsmDataLayer; -import com.drew.lang.annotations.NotNull; - -/** - * @author Nzara - * - */ public class Preview { public static OsmDataLayer dataLayer; public static FilePlacement placement; - - public static synchronized void set (@NotNull OsmDataLayer dataLayer, @NotNull FilePlacement placement) { + + public static synchronized void set(OsmDataLayer dataLayer, FilePlacement placement) { clear(); Preview.dataLayer = dataLayer; Preview.placement = placement; - MainApplication.getLayerManager().addLayer(dataLayer); + MainApplication.getLayerManager().addLayer(dataLayer); + } - } - public static void clear() { if (Preview.dataLayer != null) { @@ -33,9 +24,7 @@ Preview.placement = null; } - + public void save() { // TODO: implement } - - } Index: applications/editors/josm/plugins/pdfimport/src/org/openstreetmap/josm/plugins/pdfimport/ProjectionInfo.java =================================================================== --- applications/editors/josm/plugins/pdfimport/src/org/openstreetmap/josm/plugins/pdfimport/ProjectionInfo.java (revision 35816) +++ applications/editors/josm/plugins/pdfimport/src/org/openstreetmap/josm/plugins/pdfimport/ProjectionInfo.java (revision 35817) @@ -12,5 +12,4 @@ public final class ProjectionInfo { private static Map allCodesPC = new HashMap<>(); - private static Map allCodes = new HashMap<>(); static { @@ -34,14 +33,4 @@ throw new IllegalArgumentException(); } - -// Projection p = allCodes.get(code); -// if (p != null) return p; -// ProjectionChoice pc = allCodesPC.get(code); -// if (pc == null) return null; -// Collection pref = pc.getPreferencesFromCode(code); -// pc.setPreferences(pref); -// p = pc.getProjection(); -// allCodes.put(code, p); -// return p; } } Index: applications/editors/josm/plugins/pdfimport/src/org/openstreetmap/josm/plugins/pdfimport/pdfbox/PageDrawer.java =================================================================== --- applications/editors/josm/plugins/pdfimport/src/org/openstreetmap/josm/plugins/pdfimport/pdfbox/PageDrawer.java (revision 35816) +++ applications/editors/josm/plugins/pdfimport/src/org/openstreetmap/josm/plugins/pdfimport/pdfbox/PageDrawer.java (revision 35817) @@ -71,5 +71,4 @@ * @param g The graphics context to draw onto. * @param p The page to draw. - * @param pageDimension The size of the page to draw. * * @throws IOException If there is an IO error while drawing the page. @@ -189,12 +188,7 @@ } - /** * Draw the AWT image. Called by Invoke. * Moved into PageDrawer so that Invoke doesn't have to reach in here for Graphics as that breaks extensibility. - * - * @param awtImage The image to draw. - * @param at The transformation to use when drawing. - * */ public void drawImage() {