Index: /applications/editors/josm/plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/data/TrustSignatures.java =================================================================== --- /applications/editors/josm/plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/data/TrustSignatures.java (revision 30741) +++ /applications/editors/josm/plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/data/TrustSignatures.java (revision 30742) @@ -135,7 +135,7 @@ try (BCPGOutputStream bOut = new BCPGOutputStream(aOut)) { - for (PGPSignature sig : l) { - sig.encode(bOut); - } + for (PGPSignature sig : l) { + sig.encode(bOut); + } } @@ -159,5 +159,5 @@ try (BCPGOutputStream bOut = new BCPGOutputStream(aOut)) { - sig.encode(bOut); + sig.encode(bOut); } Index: /applications/editors/josm/plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/TrustDialog.java =================================================================== --- /applications/editors/josm/plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/TrustDialog.java (revision 30741) +++ /applications/editors/josm/plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/TrustDialog.java (revision 30742) @@ -1,34 +1,29 @@ package org.openstreetmap.josm.plugins.trustosm.gui.dialogs; -import static org.openstreetmap.josm.tools.I18n.marktr; import static org.openstreetmap.josm.tools.I18n.tr; import java.awt.BasicStroke; -import java.awt.BorderLayout; import java.awt.Color; import java.awt.Component; import java.awt.Font; import java.awt.Graphics2D; -import java.awt.GridLayout; import java.awt.Point; import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; import java.awt.event.FocusEvent; import java.awt.event.FocusListener; import java.awt.event.KeyEvent; import java.awt.geom.GeneralPath; +import java.util.ArrayList; import java.util.Arrays; -import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Map.Entry; import java.util.TreeMap; -import java.util.Map.Entry; import javax.swing.BoxLayout; import javax.swing.JLabel; import javax.swing.JPanel; -import javax.swing.JScrollPane; import javax.swing.JTable; import javax.swing.JTree; @@ -44,4 +39,5 @@ import org.openstreetmap.josm.Main; +import org.openstreetmap.josm.actions.JosmAction; import org.openstreetmap.josm.data.Bounds; import org.openstreetmap.josm.data.SelectionChangedListener; @@ -68,11 +64,5 @@ import org.openstreetmap.josm.tools.Shortcut; -public class TrustDialog extends ToggleDialog implements ActionListener, SelectionChangedListener, MapViewPaintable { - - /** - * - */ - private static final long serialVersionUID = -3324984194315776740L; - +public class TrustDialog extends ToggleDialog implements SelectionChangedListener, MapViewPaintable { public final static Color BGCOLOR_NO_SIG = new Color(234, 234, 234); @@ -83,5 +73,4 @@ public final static Color BGCOLOR_UPDATED_ITEM = new Color(249,221,95); - /** Use a TrustGPGPreparer to sign or validate signatures */ //private final TrustGPGPreparer gpg; @@ -101,5 +90,4 @@ private Collection osmData; - private final List selectedSegments = new ArrayList<>(); private final List selectedPrimitives = new ArrayList<>(); @@ -107,5 +95,4 @@ /** The JTree for showing the geometry */ private final JTree geomTree; - /** @@ -113,8 +100,4 @@ */ private final DefaultTableModel propertyData = new DefaultTableModel() { - /** - * - */ - private static final long serialVersionUID = -1252801283184909691L; @Override public boolean isCellEditable(int row, int column) { return false; @@ -125,8 +108,4 @@ }; private final JTable propertyTable = new JTable(propertyData) { - /** - * - */ - private static final long serialVersionUID = 1L; @Override @@ -146,10 +125,6 @@ /** The JTable for members of a relation */ - private final DefaultTableModel memberData = new DefaultTableModel() { - - /** - * - */ - private static final long serialVersionUID = 1L; + /*private final DefaultTableModel memberData = new DefaultTableModel() { + @Override public boolean isCellEditable(int row, int column) { return false; @@ -160,8 +135,4 @@ }; private final JTable memberTable = new JTable(memberData) { - /** - * - */ - private static final long serialVersionUID = 1L; @Override @@ -178,6 +149,5 @@ return c; } - }; - + };*/ /** @@ -198,5 +168,5 @@ propertyTable.getColumnModel().getColumn(1).setCellRenderer(new DefaultTableCellRenderer(){ /** - * + * */ private static final long serialVersionUID = 8003207668070727861L; @@ -232,9 +202,4 @@ geomTree.setCellRenderer(new DefaultTreeCellRenderer(){ - /** - * - */ - private static final long serialVersionUID = -3070210847060314196L; - @Override public Component getTreeCellRendererComponent(JTree tree, Object value, @@ -253,7 +218,5 @@ setText(osm.getDisplayName(DefaultNameFormatter.getInstance())); - if (osm instanceof Node) { - Node osmNode = (Node) osm; TrustSignatures sigs; String id = TrustOsmPrimitive.createUniqueObjectIdentifier(osm); @@ -289,9 +252,8 @@ return this; } - - }); geomTree.addTreeSelectionListener(new TreeSelectionListener() { + @Override public void valueChanged(TreeSelectionEvent e) { // unhighlight everything @@ -328,5 +290,4 @@ } - }); @@ -343,5 +304,4 @@ } - }); @@ -353,10 +313,7 @@ dataPanel.add(geomTree); - checkButton = new SideButton(marktr("Check"), "checksignatures", "TrustOSM", - tr("Check all available signatures for selected object."), this); - signButton = new SideButton(marktr("Sign"), "sign", "TrustOSM", - tr("Digital sign selected Tags, if you believe they are correct."), this); - showButton = new SideButton(marktr("Show"), "showsig", "TrustOSM", - tr("Show all available signatures for selected attribute."), this); + checkButton = new SideButton(new CheckAction()); + signButton = new SideButton(new SignAction()); + showButton = new SideButton(new ShowAction()); createLayout(dataPanel, true, Arrays.asList(new SideButton[] { @@ -366,8 +323,12 @@ } - @Override - public void actionPerformed(ActionEvent e) { - String actionCommand = e.getActionCommand(); - if (actionCommand.equals("Check")) { + private class CheckAction extends JosmAction { + + public CheckAction() { + super(tr("Check"), "checksignatures", tr("Check all available signatures for selected object."), null, false); + } + + @Override + public void actionPerformed(ActionEvent e) { for (OsmPrimitive osm : osmData) { String id = TrustOsmPrimitive.createUniqueObjectIdentifier(osm); @@ -378,5 +339,15 @@ updateTable(); geomTree.repaint(); - } else if (actionCommand.equals("Sign")) { + } + } + + private class SignAction extends JosmAction { + + public SignAction() { + super(tr("Sign"), "sign", tr("Digital sign selected Tags, if you believe they are correct."), null, false); + } + + @Override + public void actionPerformed(ActionEvent e) { for (int i : propertyTable.getSelectedRows()) { String key = (String)propertyTable.getValueAt(i, 0); @@ -439,5 +410,15 @@ updateTable(); geomTree.repaint(); - } else if (actionCommand.equals("Show")) { + } + } + + private class ShowAction extends JosmAction { + + public ShowAction() { + super(tr("Show"), "showsig", tr("Show all available signatures for selected attribute."), null, false); + } + + @Override + public void actionPerformed(ActionEvent e) { for (int i : propertyTable.getSelectedRows()) { String key = (String)propertyTable.getValueAt(i, 0); @@ -449,5 +430,5 @@ } } - if (geomTree.getSelectionPaths()!=null) + if (geomTree.getSelectionPaths()!=null) { for (TreePath tp : geomTree.getSelectionPaths()) { Object o = ((DefaultMutableTreeNode) tp.getLastPathComponent()).getUserObject(); @@ -473,7 +454,8 @@ } } - - } - } + } + } + } + /* public void showSignaturesDialog(TrustOSMItem trust, String key) { @@ -557,9 +539,7 @@ } - } return new DefaultTreeModel(root); - } @@ -663,5 +643,4 @@ if (Main.map.mapView == null) return; - Graphics2D g2 = g; g2.setColor(PaintColors.HIGHLIGHT.get()); @@ -680,4 +659,3 @@ g2.setStroke(new BasicStroke(1)); } - } Index: /applications/editors/josm/plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/TrustPreferenceEditor.java =================================================================== --- /applications/editors/josm/plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/TrustPreferenceEditor.java (revision 30741) +++ /applications/editors/josm/plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/TrustPreferenceEditor.java (revision 30742) @@ -16,10 +16,10 @@ import org.openstreetmap.josm.Main; -import org.openstreetmap.josm.gui.preferences.PreferenceSetting; +import org.openstreetmap.josm.gui.preferences.DefaultTabPreferenceSetting; import org.openstreetmap.josm.gui.preferences.PreferenceTabbedPane; import org.openstreetmap.josm.plugins.trustosm.TrustOSMplugin; import org.openstreetmap.josm.tools.GBC; -public class TrustPreferenceEditor implements PreferenceSetting { +public class TrustPreferenceEditor extends DefaultTabPreferenceSetting { private final JCheckBox showSignedDeleted = new JCheckBox(tr("Show deleted tags and notes if they were signed before")); @@ -27,11 +27,13 @@ private final JRadioButton separateHomedir = new JRadioButton(tr("Use separate GnuPG directory ({0}) to store new keys and configs.", TrustOSMplugin.getGpgPath())); + public TrustPreferenceEditor() { + super("trustosm", tr("Trust OSM Settings"), tr("Change GPG and privacy settings of the trustosm plugin.")); + } + @Override public void addGui(final PreferenceTabbedPane gui) { - // TODO Auto-generated method stub - JPanel p = gui.createPreferenceTab("trustosm", tr("Trust OSM Settings"), tr("Change GPG and privacy settings of the trustosm plugin.")); + JPanel p = gui.createPreferenceTab(this); JTabbedPane tabs = new JTabbedPane(); p.add(tabs, GBC.eol().fill(GBC.BOTH)); - JPanel gpgsettings = new JPanel(new GridBagLayout()); @@ -52,5 +54,4 @@ gpgsettings.add(defaultHomedir, GBC.eol().insets(40,0,0,0)); - gpgsettings.add(Box.createVerticalGlue(), GBC.eol().fill(GBC.BOTH)); JScrollPane scrollpane = new JScrollPane(gpgsettings); @@ -58,9 +59,7 @@ tabs.add(tr("GnuPG"), scrollpane); - JPanel dialogsettings = new JPanel(new GridBagLayout()); tabs.add(tr("Dialog"), dialogsettings); dialogsettings.add(showSignedDeleted, GBC.eol().fill(GBC.HORIZONTAL).insets(20,0,0,5)); - } @@ -72,5 +71,3 @@ return false; } - - } Index: /applications/editors/josm/plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/util/NameGenerator.java =================================================================== --- /applications/editors/josm/plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/util/NameGenerator.java (revision 30741) +++ /applications/editors/josm/plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/util/NameGenerator.java (revision 30742) @@ -85,22 +85,22 @@ */ public void refresh() throws IOException{ - try ( - FileReader input = new FileReader(fileName); - BufferedReader bufRead = new BufferedReader(input); - ) { - String line=""; - while (line != null){ - line = bufRead.readLine(); - if (line != null && !line.equals("")) { - if(line.charAt(0) == '-') { - pre.add(line.substring(1).toLowerCase()); - } else if (line.charAt(0) == '+') { - sur.add(line.substring(1).toLowerCase()); - } else { - mid.add(line.toLowerCase()); - } - } - } - } + try ( + FileReader input = new FileReader(fileName); + BufferedReader bufRead = new BufferedReader(input); + ) { + String line=""; + while (line != null){ + line = bufRead.readLine(); + if (line != null && !line.equals("")) { + if(line.charAt(0) == '-') { + pre.add(line.substring(1).toLowerCase()); + } else if (line.charAt(0) == '+') { + sur.add(line.substring(1).toLowerCase()); + } else { + mid.add(line.toLowerCase()); + } + } + } + } } Index: /applications/editors/josm/plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/util/TrustGPG.java =================================================================== --- /applications/editors/josm/plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/util/TrustGPG.java (revision 30741) +++ /applications/editors/josm/plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/util/TrustGPG.java (revision 30742) @@ -281,11 +281,11 @@ public void writeGpgFiles() throws FileNotFoundException, IOException { - String path = Main.pref.getPluginsDirectory().getPath(); + String path = Main.pref.getPluginsDirectory().getPath(); try (FileOutputStream pubOut = new FileOutputStream(path + "/trustosm/gnupg/pubring.gpg"); FileOutputStream secOut = new FileOutputStream(path + "/trustosm/gnupg/secring.gpg")) { - pgpSec.encode(secOut); - pgpPub.encode(pubOut); - pubOut.flush(); - secOut.flush(); + pgpSec.encode(secOut); + pgpPub.encode(pubOut); + pubOut.flush(); + secOut.flush(); } } Index: /applications/editors/josm/plugins/trustosm/src/tools/NameGenerator.java =================================================================== --- /applications/editors/josm/plugins/trustosm/src/tools/NameGenerator.java (revision 30741) +++ /applications/editors/josm/plugins/trustosm/src/tools/NameGenerator.java (revision 30742) @@ -86,21 +86,21 @@ public void refresh() throws IOException{ try ( - FileReader input = new FileReader(fileName); - BufferedReader bufRead = new BufferedReader(input); + FileReader input = new FileReader(fileName); + BufferedReader bufRead = new BufferedReader(input); ) { - String line=""; - - while (line != null) { - line = bufRead.readLine(); - if (line != null && !line.equals("")) { - if (line.charAt(0) == '-') { - pre.add(line.substring(1).toLowerCase()); - } else if (line.charAt(0) == '+') { - sur.add(line.substring(1).toLowerCase()); - } else{ - mid.add(line.toLowerCase()); - } - } - } + String line=""; + + while (line != null) { + line = bufRead.readLine(); + if (line != null && !line.equals("")) { + if (line.charAt(0) == '-') { + pre.add(line.substring(1).toLowerCase()); + } else if (line.charAt(0) == '+') { + sur.add(line.substring(1).toLowerCase()); + } else{ + mid.add(line.toLowerCase()); + } + } + } } }