Changeset 13477 in osm for applications/editors/josm/plugins

Timestamp:

2009-02-01T14:23:24+01:00 (16 years ago)

Author:

hampelratte

Message:

moved adding of nickname and date to super class

Location:

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

Files:

• AddCommentAction.java (modified) (2 diffs)
• NewIssueAction.java (modified) (2 diffs)
• OsbAction.java (modified) (2 diffs)

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

@@ -35 +35 @@
 
 import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.plugins.osb.ConfigKeys;
 import org.openstreetmap.josm.plugins.osb.api.EditAction;
 
@@ -50 +49 @@
     @Override
     protected void doActionPerformed(ActionEvent e) throws Exception {
-        // get the user nickname
-        String nickname = Main.pref.get(ConfigKeys.OSB_NICKNAME);
-        if(nickname == null || nickname.length() == 0) {
-            nickname = JOptionPane.showInputDialog(Main.parent, tr("Please enter a user name"));
-            if(nickname == null) {
-                nickname = tr("NoName");
-            } else {
-                Main.pref.put(ConfigKeys.OSB_NICKNAME, nickname);
-            }
-        }
-
         String comment = JOptionPane.showInputDialog(Main.parent, tr("Enter your comment"));
         if(comment != null) {
-            comment = comment.concat(" [").concat(nickname).concat("]");
+            comment = addMesgInfo(comment);
             editAction.execute(getSelectedNode(), comment);
         }

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

@@ -93 +93 @@
 
     private void addNewIssue(MouseEvent e) {
-        // get the user nickname
-        String nickname = Main.pref.get(ConfigKeys.OSB_NICKNAME);
-        if(nickname == null || nickname.length() == 0) {
-            nickname = JOptionPane.showInputDialog(Main.parent, tr("Please enter a user name"));
-            if(nickname == null) {
-                nickname = "NoName";
-            } else {
-                Main.pref.put(ConfigKeys.OSB_NICKNAME, nickname);
-            }
-        }
-
         // get the comment
         String result = JOptionPane.showInputDialog(Main.parent,
@@ -112 +101 @@
         if(result != null && result.length() > 0) {
             try {
-                result = result.concat(" [").concat(nickname).concat("]");
+                result = addMesgInfo(result);
                 Node n = newAction.execute(e.getPoint(), result);
                 plugin.getDataSet().addPrimitive(n);

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

@@ -28 +28 @@
 package org.openstreetmap.josm.plugins.osb.gui.action;
 
+import static org.openstreetmap.josm.tools.I18n.tr;
+
 import java.awt.event.ActionEvent;
+import java.text.DateFormat;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
+import java.util.Locale;
 
 import javax.swing.AbstractAction;
+import javax.swing.JOptionPane;
 
+import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.osm.Node;
+import org.openstreetmap.josm.plugins.osb.ConfigKeys;
 
 public abstract class OsbAction extends AbstractAction {
@@ -77 +85 @@
         observers.remove(obs);
     }
+    
+    protected String addMesgInfo(String msg) {
+        // get the user nickname
+        String nickname = Main.pref.get(ConfigKeys.OSB_NICKNAME);
+        if(nickname == null || nickname.length() == 0) {
+            nickname = JOptionPane.showInputDialog(Main.parent, tr("Please enter a user name"));
+            if(nickname == null) {
+                nickname = "NoName";
+            } else {
+                Main.pref.put(ConfigKeys.OSB_NICKNAME, nickname);
+            }
+        }
+        
+        // concatenate nickname and date, if date should be included
+        String info = nickname;
+        if(Main.pref.getBoolean(ConfigKeys.OSB_INCLUDE_DATE)) {
+            // get the date
+            DateFormat df = DateFormat.getDateTimeInstance(DateFormat.SHORT, DateFormat.LONG, Locale.getDefault());
+            String date = df.format(new Date());
+            
+            // concatenate nickname and date
+            info = info.concat(", ").concat(date);
+        }
+        
+        // add user and date info to the message
+        msg = msg.concat(" [").concat(info).concat("]");
+        
+        return msg;
+    }
 }