From: srowen <srowen@59b500cc-1b3d-0410-9834-0bbf25fbcc57>
Date: Thu, 10 Dec 2009 00:34:16 +0000 (+0000)
Subject: Issue 294, don't actually generate nonstandard ORG value for MECARD
X-Git-Url: http://git.rot13.org/?a=commitdiff_plain;h=ed15812fbade1fb156680f9eddc9a04e58c7a246;hp=db4d3d20397ccce97c6a966bd973679c564bb63d;p=zxing.git

Issue 294, don't actually generate nonstandard ORG value for MECARD

git-svn-id: http://zxing.googlecode.com/svn/trunk@1147 59b500cc-1b3d-0410-9834-0bbf25fbcc57
---

diff --git a/zxing.appspot.com/generator/src/com/google/zxing/web/generator/client/ContactInfoGenerator.java b/zxing.appspot.com/generator/src/com/google/zxing/web/generator/client/ContactInfoGenerator.java
index 6ab33608..97c2f54b 100644
--- a/zxing.appspot.com/generator/src/com/google/zxing/web/generator/client/ContactInfoGenerator.java
+++ b/zxing.appspot.com/generator/src/com/google/zxing/web/generator/client/ContactInfoGenerator.java
@@ -53,7 +53,7 @@ public class ContactInfoGenerator implements GeneratorSource {
 
   public String getText() throws GeneratorException {
     String name = getNameField();
-    String company = getCompanyField();
+    //String company = getCompanyField();
     String tel = getTelField();
     String url = getUrlField();
     String email = getEmailField();
@@ -64,15 +64,15 @@ public class ContactInfoGenerator implements GeneratorSource {
     // Build the output with obtained data.
     // note that some informations may just be "" if they were not specified.
     //return getVCard(name, company, tel, url, email, address, memo);
-    return getMeCard(name, company, tel, url, email, address, address2, memo);
+    return getMeCard(name, tel, url, email, address, address2, memo);
   }
 
-  private String getMeCard(String name, String company, String tel, String url,
+  private String getMeCard(String name, String tel, String url,
       String email, String address, String address2, String memo) {
     StringBuilder output = new StringBuilder();
     output.append("MECARD:");
     output.append("N:").append(name).append(';');
-    maybeAppend(output, "ORG:", company);
+    //maybeAppend(output, "ORG:", company); // Not standard; don't generate
     maybeAppend(output, "TEL:", tel);
     maybeAppend(output, "URL:", url);
     maybeAppend(output, "EMAIL:", email);