Changeset 26639 in osm

Timestamp:

2011-09-11T12:48:35+02:00 (13 years ago)

Author:

akks

Message:

'Utilsplugin2: configuring custom URLs'

Location:

applications/editors/josm/plugins/utilsplugin2

Files:

• build.xml (modified) (1 diff)
• src/utilsplugin2/OpenPageAction.java (modified) (3 diffs)
• src/utilsplugin2/UtilsPlugin2.java (modified) (4 diffs)
• src/utilsplugin2/UtilsPluginPreferences.java (modified) (10 diffs)
• src/utilsplugin2/selection/IntersectedWaysRecursiveAction.java (modified) (1 diff)

applications/editors/josm/plugins/utilsplugin2/build.xml

@@ -30 +30 @@
 <project name="utilsplugin2" default="dist" basedir=".">
     <!-- enter the SVN commit message -->
-    <property name="commit.message" value="Utilsplugin2: added setting tab"/>
+    <property name="commit.message" value="Utilsplugin2: configuring custom URLs"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
     <property name="plugin.main.version" value="4395"/>

applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/OpenPageAction.java

@@ -10 +10 @@
 import java.awt.event.KeyEvent;
 import java.net.URLEncoder;
-import java.util.ArrayList;
 import java.util.Collection;
 
+import java.util.List;
 import java.util.regex.Matcher;
 
 import java.util.regex.Pattern;
 import javax.swing.BorderFactory;
+import javax.swing.JComboBox;
 import javax.swing.JOptionPane;
 
@@ -63 +64 @@
             return;
         }
+        if (Main.pref.getBoolean("utilsplugin2.askurl",false)==true) 
+            ChooseURLAction.showConfigDialog();
         
         String addr = Main.pref.get("utilsplugin2.customurl", defaultURL);
@@ -122 +125 @@
         setEnabled(selection != null );
     }
+
 }

applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/UtilsPlugin2.java

@@ -10 +10 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.actions.JosmAction;
 import org.openstreetmap.josm.gui.MainMenu;
 import org.openstreetmap.josm.gui.MapFrame;
@@ -42 +43 @@
     JMenuItem selModifiedWays;
     
+    JMenuItem selectURL;
+    
     public UtilsPlugin2(PluginInformation info) {
         super(info);
@@ -73 +76 @@
         selModifiedWays = MainMenu.add(selectionMenu, new SelectModWaysAction());
         undoSelection = MainMenu.add(selectionMenu, new UndoSelectionAction());
+        
+        selectURL = MainMenu.add(toolsMenu, new ChooseURLAction());
+        
+
     }
 
@@ -102 +109 @@
         selModifiedWays.setEnabled(enabled);
         undoSelection.setEnabled(enabled);
+        selectURL.setEnabled(enabled);
     }
     @Override

applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/UtilsPluginPreferences.java

@@ -5 +5 @@
 package utilsplugin2;
 
+import java.util.Scanner;
+import java.awt.event.ActionEvent;
+import javax.swing.JButton;
 import java.util.List;
 import javax.swing.table.TableModel;
@@ -16 +19 @@
 import javax.swing.event.TableModelEvent;
 import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.gui.ExtendedDialog;
 import org.openstreetmap.josm.gui.widgets.HistoryComboBox;
 import org.openstreetmap.josm.gui.widgets.HtmlPanel;
 import java.awt.GridBagConstraints;
+import java.awt.event.ActionListener;
+import java.io.BufferedReader;
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileReader;
+import java.io.FileWriter;
+import java.io.PrintWriter;
 import javax.swing.JPanel;
 import javax.swing.ListSelectionModel;
@@ -35 +44 @@
     HistoryComboBox combo1=new HistoryComboBox();
     JTable table;
+    JButton resetButton;
+    JButton loadButton;
+    JButton saveButton;
 
     @Override
@@ -46 +58 @@
         // FIXME: get rid of hardcoded URLS
         List<String> items = (List<String>) Main.pref.getCollection("utilsplugin2.urlHistory");
-        if (items==null || items.size()==0) {
-            items= new ArrayList<String>();
-            items.add("Wikipedia");
-            items.add("http://en.wikipedia.org/w/index.php?search={name}&fulltext=Search");
-            items.add("Wikipedia RU");
-            items.add(defaultURL);
-            items.add("LatLon buildings");
-            items.add("http://latlon.org/buildings?zoom=17&lat={#lat}&lon={#lon}&layers=B");
-            items.add("AMDMi3 Russian streets");
-            items.add("http://addresses.amdmi3.ru/?zoom=11&lat={#lat}&lon={#lon}&layers=B00");
-            items.add("Element history");
-            items.add("http://www.openstreetmap.org/browse/{#type}/{#id}/history");
-            items.add("Browse element");
-            items.add("http://www.openstreetmap.org/browse/{#type}/{#id}");
+        if (items==null) {
+            items = resetURLList();
+            fillRows(items);
         }
         String addr = Main.pref.get("utilsplugin2.customurl", defaultURL);
         //System.out.println("pref:"+addr);
+        
+        resetButton = new JButton(tr("Reset"));
+        resetButton.addActionListener(new ActionListener() {
+            public void actionPerformed(ActionEvent e) {
+                fillRows(resetURLList());
+            }
+        });
+        
+        saveButton = new JButton(tr("Save to file"));
+        saveButton.addActionListener(new ActionListener() {
+            public void actionPerformed(ActionEvent e) {
+                saveURLList();
+            }
+        });
+        
+        loadButton = new JButton(tr("Load from file"));
+        loadButton.addActionListener(new ActionListener() {
+            public void actionPerformed(ActionEvent e) {
+                fillRows(loadURLList());
+            }
+        });
         
         table=new JTable(new DefaultTableModel(null,new String[]{"Title","URL"}));
@@ -71 +93 @@
                 + " <b>&#123;#id&#125;</b> is replaced with the element ID<br/>"
                 + " <b>&#123;#type&#125;</b> is replaced with \"node\",\"way\" or \"relation\" <br/>"
-                + " <b>&#123;#lat&#125; , &#123;#lon&#125;</b> is replaced with element latitude/longitude"));
-        //help.setBorder(BorderFactory.createEtchedBorder(EtchedBorder.));
-
-        all.add(new JLabel(tr("Custom URL configuration")),GBC.eop().insets(5,10,0,0));
+                + " <b>&#123;#lat&#125; , &#123;#lon&#125;</b> is replaced with element latitude/longitude <br/>"
+                + " Your can manually load settings from file <b>customurl.txt</b> in JOSM folder"));
+        
+        all.add(new JLabel(tr("Custom URL configuration")),GBC.std().insets(5,10,0,0));
+        all.add(resetButton,GBC.std().insets(25,10,0,0));
+        all.add(loadButton,GBC.std().insets(25,10,0,0));
+        all.add(saveButton,GBC.eol().insets(25,10,0,0));
         all.add(help,GBC.eop().insets(5,10,0,0));
         
@@ -87 +112 @@
                 int column = e.getColumn();
                 DefaultTableModel model = (DefaultTableModel)(e.getSource());
-                String columnName = model.getColumnName(column);
                 if (row<0  || column<0) return;
                 String data = (String)model.getValueAt(row, column);
@@ -100 +124 @@
 
     private void fillRows(List<String> items) {
+        if (items==null) return;
         int p=0,row=0;
         String name, url;
-        String data[][] = new String[][] {{"",""}};
         DefaultTableModel model = (DefaultTableModel) table.getModel();
+        model.setRowCount(0);
         int n=items.size();
         while (true) {
@@ -123 +148 @@
     public boolean ok() {
         String addr=combo1.getText();
+        List<String> lst = readItemsFromTable();
+        Main.pref.putCollection("utilsplugin2.urlHistory",lst);
+        try {
+            Main.pref.save();
+        } catch (IOException ex) {
+            Logger.getLogger(UtilsPluginPreferences.class.getName()).log(Level.SEVERE, null, ex);
+        }
+        return false;
+    }
+
+    private List<String> resetURLList() {
+        ArrayList<String> items=new ArrayList<String>();
+            items= new ArrayList<String>();
+            items.add("Wikipedia");
+            items.add("http://en.wikipedia.org/w/index.php?search={name}&fulltext=Search");
+            items.add("Wikipedia RU");
+            items.add(defaultURL);
+            items.add("LatLon buildings");
+            items.add("http://latlon.org/buildings?zoom=17&lat={#lat}&lon={#lon}&layers=B");
+            items.add("AMDMi3 Russian streets");
+            items.add("http://addresses.amdmi3.ru/?zoom=11&lat={#lat}&lon={#lon}&layers=B00");
+            items.add("Element history [demo, =Ctrl-Shift-H]");
+            items.add("http://www.openstreetmap.org/browse/{#type}/{#id}/history");
+            items.add("Browse element [demo, =Ctrl-Shift-I]");
+            items.add("http://www.openstreetmap.org/browse/{#type}/{#id}");
+        Main.pref.putCollection("utilsplugin2.urlHistory",items);
+        return items;
+    }
+    
+    private List<String> loadURLList() {
+        ArrayList<String> items=new ArrayList<String>();
+        BufferedReader fr=null;
+        try {
+        File f = new File (Main.pref.getPreferencesDir(),"customurl.txt");
+        fr = new BufferedReader(new FileReader(f));
+        String s;
+        while ((s = fr.readLine()) !=null ) items.add(s);
+        } catch (IOException e) {
+            e.printStackTrace();
+        } finally {
+            try { if (fr!=null) fr.close(); } catch (Exception e) {}
+        }
+        return items;
+        
+    }
+    
+    private void saveURLList() {
+        List<String> items=readItemsFromTable();
+        File f = new File (Main.pref.getPreferencesDir(),"customurl.txt");
+        PrintWriter fw=null;
+        try {
+        fw=new PrintWriter(f);
+        for (String s : items) {
+            fw.println(s);
+        }
+        } catch (IOException e) {
+            e.printStackTrace();
+        } finally {
+            try { if (fw!=null) fw.close(); } catch (Exception e) {}
+        }
+    }
+
+    private List<String> readItemsFromTable() {
         TableModel model = (table.getModel());
         String v;
@@ -134 +222 @@
             lst.add(v);
         }
-        Main.pref.putCollection("utilsplugin2.urlHistory",lst);
         int row=table.getSelectedRow();
         if (row!=-1) {
@@ -140 +227 @@
             Main.pref.put("utilsplugin2.customurl",v);
         }
-        
-        try {
-            Main.pref.save();
-        } catch (IOException ex) {
-            Logger.getLogger(UtilsPluginPreferences.class.getName()).log(Level.SEVERE, null, ex);
-        }
-        return false;
-    }
-
-    
+        return lst;
+    }
 }

applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/selection/IntersectedWaysRecursiveAction.java

@@ -25 +25 @@
         super(tr("All intersecting ways"), "intwayall", tr("Select all intersecting ways"),
                 Shortcut.registerShortcut("tools:intwayall", tr("Tool: {0}","All intersecting ways"),
-                KeyEvent.VK_I, Shortcut.GROUP_MENU, KeyEvent.SHIFT_DOWN_MASK|KeyEvent.CTRL_DOWN_MASK), true);
+                KeyEvent.VK_I, Shortcut.GROUP_MENU, KeyEvent.CTRL_DOWN_MASK|KeyEvent.ALT_DOWN_MASK), true);
         putValue("help", ht("/Action/SelectAllIntersectingWays"));