Changeset 14748 in osm for applications/editors/josm

Timestamp:

2009-04-25T23:15:22+02:00 (16 years ago)

Author:

hampelratte

Message:

• replaced joptionpanes with a custom dialog
• added a history to the dialog input fields

Location:

applications/editors/josm/plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui

Files:

• action/AddCommentAction.java (modified) (2 diffs)
• action/CloseIssueAction.java (modified) (3 diffs)
• action/NewIssueAction.java (modified) (3 diffs)
• dialogs (added)
• dialogs/TextInputDialog.java (added)
• historycombobox (added)
• historycombobox/ComboBoxHistory.java (added)
• historycombobox/EventConsumingPlainDocument.java (added)
• historycombobox/HistoryChangedListener.java (added)
• historycombobox/JHistoryComboBox.java (added)
• historycombobox/StringUtils.java (added)
• historycombobox/SuggestingJHistoryComboBox.java (added)
• historycombobox/SuggestionListener.java (added)

applications/editors/josm/plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java

@@ -31 +31 @@
 
 import java.awt.event.ActionEvent;
-
-import javax.swing.JOptionPane;
+import java.util.List;
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.plugins.osb.OsbPlugin;
 import org.openstreetmap.josm.plugins.osb.api.EditAction;
+import org.openstreetmap.josm.plugins.osb.gui.dialogs.TextInputDialog;
+import org.openstreetmap.josm.plugins.osb.gui.historycombobox.HistoryChangedListener;
+import org.openstreetmap.josm.plugins.osb.gui.historycombobox.StringUtils;
 
 public class AddCommentAction extends OsbAction {
@@ -49 +52 @@
     @Override
     protected void doActionPerformed(ActionEvent e) throws Exception {
-        String comment = JOptionPane.showInputDialog(Main.parent, tr("Enter your comment"));
+        List<String> history = StringUtils.stringToList(Main.pref.get("osb.comment.history"), "§§§");
+        HistoryChangedListener l = new HistoryChangedListener() {
+            public void historyChanged(List<String> history) {
+                Main.pref.put("osb.comment.history", StringUtils.listToString(history, "§§§"));
+            }
+        };
+        String comment = TextInputDialog.showDialog(
+                Main.map,
+                tr("Add a comment"), 
+                tr("Enter your comment"),
+                OsbPlugin.loadIcon("add_comment22.png"),
+                history, l);
+        
         if(comment != null) {
             comment = addMesgInfo(comment);

applications/editors/josm/plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java

@@ -31 +31 @@
 
 import java.awt.event.ActionEvent;
-
-import javax.swing.JOptionPane;
+import java.util.List;
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.plugins.osb.OsbPlugin;
 import org.openstreetmap.josm.plugins.osb.api.CloseAction;
+import org.openstreetmap.josm.plugins.osb.api.EditAction;
+import org.openstreetmap.josm.plugins.osb.gui.dialogs.TextInputDialog;
+import org.openstreetmap.josm.plugins.osb.gui.historycombobox.HistoryChangedListener;
+import org.openstreetmap.josm.plugins.osb.gui.historycombobox.StringUtils;
 
 public class CloseIssueAction extends OsbAction {
@@ -42 +46 @@
 
     private CloseAction closeAction = new CloseAction();
+    private EditAction commentAction = new EditAction();
 
     public CloseIssueAction() {
@@ -49 +54 @@
     @Override
     protected void doActionPerformed(ActionEvent e) throws Exception {
-        int closeOk = JOptionPane.showConfirmDialog(Main.parent,
-                tr("Really mark this issue as ''done''?"),
+        List<String> history = StringUtils.stringToList(Main.pref.get("osb.comment.history"), "§§§");
+        HistoryChangedListener l = new HistoryChangedListener() {
+            public void historyChanged(List<String> history) {
+                Main.pref.put("osb.comment.history", StringUtils.listToString(history, "§§§"));
+            }
+        };
+        String comment = TextInputDialog.showDialog(Main.map,
                 tr("Really close?"),
-                JOptionPane.YES_NO_OPTION);
+                tr("<html>Really mark this issue as ''done''?<br><br>You may add an optional comment:</html>"),
+                OsbPlugin.loadIcon("icon_valid22.png"),
+                history, l);
 
-        if(closeOk == JOptionPane.YES_OPTION) {
-            int addComment = JOptionPane.showConfirmDialog(Main.parent,
-                    tr("Do you want to add a comment?"),
-                    tr("Add comment?"),
-                    JOptionPane.YES_NO_OPTION);
-            if(addComment == JOptionPane.YES_OPTION) {
-                new AddCommentAction().doActionPerformed(new ActionEvent(this, 0, "add_comment"));
+        if(comment != null) {
+            if(comment.length() > 0) {
+                commentAction.execute(getSelectedNode(), comment);
             }
             closeAction.execute(getSelectedNode());

applications/editors/josm/plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java

@@ -35 +35 @@
 import java.awt.event.MouseListener;
 import java.io.IOException;
+import java.util.List;
 
 import javax.swing.JOptionPane;
@@ -44 +45 @@
 import org.openstreetmap.josm.plugins.osb.OsbPlugin;
 import org.openstreetmap.josm.plugins.osb.api.NewAction;
+import org.openstreetmap.josm.plugins.osb.gui.dialogs.TextInputDialog;
+import org.openstreetmap.josm.plugins.osb.gui.historycombobox.HistoryChangedListener;
+import org.openstreetmap.josm.plugins.osb.gui.historycombobox.StringUtils;
 
 public class NewIssueAction extends OsbAction implements MouseListener {
@@ -93 +97 @@
 
     private void addNewIssue(MouseEvent e) {
-        // get the comment
-        String result = JOptionPane.showInputDialog(Main.parent,
+        List<String> history = StringUtils.stringToList(Main.pref.get("osb.new.history"), "§§§");
+        HistoryChangedListener l = new HistoryChangedListener() {
+            public void historyChanged(List<String> history) {
+                Main.pref.put("osb.new.history", StringUtils.listToString(history, "§§§"));
+            }
+        };
+        String result = TextInputDialog.showDialog(
+                Main.map,
+                tr("Create issue"), 
                 tr("Describe the problem precisely"),
-                tr("Create issue"),
-                JOptionPane.QUESTION_MESSAGE);
+                OsbPlugin.loadIcon("icon_error_add22.png"),
+                history, l);
 
         if(result != null && result.length() > 0) {