implemented toString() method, which generates a string representation

32 files changed, 135 lines added, 44 lines removed

of an item

Changes

--- Collective Congress/src/org/colcon/web/client/ui/LinkPanel.java 7866546288cdd1eb54eb2d236d046fb7b073279f

+++ Collective Congress/src/org/colcon/web/client/ui/LinkPanel.java 4c75cb29b3b856c05be3c820e583aad50b371ec4

@@ -21,7 +21,7 @@

-    this(client, style, Item.parseId(path), path);

+    this(client, style, Item.pathToId(path), path);

--- Collective Congress/src/org/colcon/web/model/Agent.java 7866546288cdd1eb54eb2d236d046fb7b073279f

+++ Collective Congress/src/org/colcon/web/model/Agent.java 4c75cb29b3b856c05be3c820e583aad50b371ec4

@@ -8,6 +8,8 @@

+  public String getType(){return "agent";}

--- Collective Congress/src/org/colcon/web/model/Ballot.java 7866546288cdd1eb54eb2d236d046fb7b073279f

+++ Collective Congress/src/org/colcon/web/model/Ballot.java 4c75cb29b3b856c05be3c820e583aad50b371ec4

@@ -7,6 +7,8 @@

+  public String getType(){return "ballot";}

--- Collective Congress/src/org/colcon/web/model/Command.java 7866546288cdd1eb54eb2d236d046fb7b073279f

+++ Collective Congress/src/org/colcon/web/model/Command.java 4c75cb29b3b856c05be3c820e583aad50b371ec4

@@ -8,6 +8,8 @@

+  public String getType(){return "command";}

--- Collective Congress/src/org/colcon/web/model/CommandNews.java 7866546288cdd1eb54eb2d236d046fb7b073279f

+++ Collective Congress/src/org/colcon/web/model/CommandNews.java 4c75cb29b3b856c05be3c820e583aad50b371ec4

@@ -7,6 +7,8 @@

+  public String getType(){return "command_news";}

--- Collective Congress/src/org/colcon/web/model/Container.java 7866546288cdd1eb54eb2d236d046fb7b073279f

+++ Collective Congress/src/org/colcon/web/model/Container.java 4c75cb29b3b856c05be3c820e583aad50b371ec4

@@ -12,6 +12,8 @@

+  public String getType(){return "container";}

@@ -33,10 +35,10 @@

-  public String getText()

+  /*public String getText()

-  }

+  }*/

@@ -249,4 +251,28 @@

+  public String toString()

+  {

+    String str = super.toString();

+    if(children.size() > 0)

+      str += " -children\n{\n";

+    for(String key : children.keySet())

+    {

+      IItem child = children.get(key);

+      if(child == null)

+        continue;

+      str += "  " + child.toString() + " ;\n";

+    }

+    str += "}";

+    str = str.trim();

+    return str;

+  }

--- Collective Congress/src/org/colcon/web/model/Group.java 7866546288cdd1eb54eb2d236d046fb7b073279f

+++ Collective Congress/src/org/colcon/web/model/Group.java 4c75cb29b3b856c05be3c820e583aad50b371ec4

@@ -12,6 +12,8 @@

+  public String getType(){return "group";}

@@ -60,10 +62,10 @@

-  public String getText()

+  /*public String getText()

-  }

+  }*/

--- Collective Congress/src/org/colcon/web/model/Item.java 7866546288cdd1eb54eb2d236d046fb7b073279f

+++ Collective Congress/src/org/colcon/web/model/Item.java 4c75cb29b3b856c05be3c820e583aad50b371ec4

@@ -1,7 +1,7 @@

-import java.util.HashMap;

+import java.util.LinkedHashMap;

@@ -10,11 +10,14 @@

+  public String getType(){return "item";}

+    TYPE = "type",

@@ -24,7 +27,7 @@

-    this(new HashMap<String, String>());

+    this(new LinkedHashMap<String, String>());

@@ -34,15 +37,16 @@

-    args = new HashMap<String, String>();

+    args = new LinkedHashMap<String, String>();

+    setArg(TYPE, getType());

-    return getPath();

+    return getType() + " " + getId() ;

@@ -100,11 +104,6 @@

-    //TODO: format date (commented code causes error in terminal)

-    //DateTimeFormat format = DateTimeFormat.getFormat("d MMM yyyy ', ' h:mm a");

-    //return format.format(date);

@@ -118,7 +117,29 @@

-  public static String parseId(String path)

+  public String toString()

+  {

+    String str = "";

+    for(String key : args.keySet())

+    {

+      String value = args.get(key);

+      if(value == null)

+        value = "";

+      if(value.split(" ").length > 1)

+        value = '{' + value + '}';

+      str += '-' + key + ' ' + value + ' ';

+    }

+    str = str.trim();

+    return str;

+  }

+  public static String pathToId(String path)

--- Collective Congress/src/org/colcon/web/model/Law.java 7866546288cdd1eb54eb2d236d046fb7b073279f

+++ Collective Congress/src/org/colcon/web/model/Law.java 4c75cb29b3b856c05be3c820e583aad50b371ec4

@@ -8,6 +8,8 @@

+  public String getType(){return "law";}

--- Collective Congress/src/org/colcon/web/model/Link.java 7866546288cdd1eb54eb2d236d046fb7b073279f

+++ Collective Congress/src/org/colcon/web/model/Link.java 4c75cb29b3b856c05be3c820e583aad50b371ec4

@@ -7,6 +7,8 @@

+  public String getType(){return "link";}

--- Collective Congress/src/org/colcon/web/model/LinkContainer.java 7866546288cdd1eb54eb2d236d046fb7b073279f

+++ Collective Congress/src/org/colcon/web/model/LinkContainer.java 4c75cb29b3b856c05be3c820e583aad50b371ec4

@@ -11,6 +11,8 @@

+  public String getType(){return "link_container";}

--- Collective Congress/src/org/colcon/web/model/News.java 7866546288cdd1eb54eb2d236d046fb7b073279f

+++ Collective Congress/src/org/colcon/web/model/News.java 4c75cb29b3b856c05be3c820e583aad50b371ec4

@@ -8,6 +8,8 @@

+  public String getType(){return "news";}

--- Collective Congress/src/org/colcon/web/model/Title.java 7866546288cdd1eb54eb2d236d046fb7b073279f

+++ Collective Congress/src/org/colcon/web/model/Title.java 4c75cb29b3b856c05be3c820e583aad50b371ec4

@@ -10,6 +10,8 @@

+  public String getType(){return "title";}

@@ -155,6 +157,6 @@

-    return Item.parseId(path) + " of " + Model.parseGroup(path);

+    return Item.pathToId(path) + " of " + Model.parseGroup(path);

--- Collective Congress/src/org/colcon/web/model/User.java 7866546288cdd1eb54eb2d236d046fb7b073279f

+++ Collective Congress/src/org/colcon/web/model/User.java 4c75cb29b3b856c05be3c820e583aad50b371ec4

@@ -7,6 +7,8 @@

+  public String getType(){return "user";}

@@ -48,7 +50,7 @@

-  public String getText()

+  /*public String getText()

@@ -59,7 +61,7 @@

-  }

+  }*/

--- Collective Congress/src/org/colcon/web/model/Vote.java 7866546288cdd1eb54eb2d236d046fb7b073279f

+++ Collective Congress/src/org/colcon/web/model/Vote.java 4c75cb29b3b856c05be3c820e583aad50b371ec4

@@ -10,6 +10,8 @@

+  public String getType(){return "vote";}

--- Collective Congress/src/org/colcon/web/server/CLI.java 7866546288cdd1eb54eb2d236d046fb7b073279f

+++ Collective Congress/src/org/colcon/web/server/CLI.java 4c75cb29b3b856c05be3c820e583aad50b371ec4

@@ -90,20 +90,9 @@

-      //System.out.println("> " + command);

-      String cmd = parseCmd(command);

-      if(!Model.has(cmd) || !(Model.get(cmd) instanceof ICommand))

-        return "command '" + cmd + "' not found";

-      output = execute(parseCommand(command));

-      //System.out.println(output);

-      return output;

+      return execute(parseCommand(command));

@@ -118,7 +107,10 @@

-      return "invalid command";

+      return "missing command";

+    if(!Model.has(cmd) || !(Model.get(cmd) instanceof ICommand))

+      return "command '" + cmd + "' not found";

@@ -149,7 +141,7 @@

-      return item.getClass().getSimpleName() + " " + item.getId() + ": " + item.getText();

+      return item.getText();

@@ -208,10 +200,10 @@

-      String output = item.getClass().getSimpleName() + " " + item.getId() + ": " + item.getText() + "\n\n";

+      String output = item.getText() + "\n\n";

-        output += "     " + child.getClass().getSimpleName() + " " + child.getId() + ": " + child.getText() + "\n";

+        output += "     " + child.getText() + "\n";

@@ -343,12 +335,8 @@

-    String cmd = parseCmd(command);

-    if(cmd == null || cmd.length() == 0)

-      return args;

-    args.put(CMD, cmd);

+    args.put(CMD, parseCmd(command));

+    args.put(PATH, parsePath(command));

@@ -365,10 +353,13 @@

-    if(array[0].equals("-cmd"))

-      str = parse(command).get(CMD);

+    if(array[0].equals("-cmd") && array.length > 1)

+      str = array[1];

+    if(str == null || str.trim().length() == 0)

+      return null;

@@ -380,7 +371,36 @@

+  public static String parsePath(String command)

+  {

+    if(command == null)

+      return null;

+    String[] array = command.split(" ");

+    if(array == null || array.length < 1)

+      return null;

+    String str;

+    if(!array[0].equals("-cmd") && array.length > 1 && !array[1].startsWith("-"))

+      str = array[1];

+    //else if(array.length == 2 && !array[1].startsWith("-"))

+    //  str = array[2];

+    //else if(array[2].equals("-path") && array.length > 3)

+    //  str = array[3];

+    else if(parse(command).containsKey(PATH))

+      str = parse(command).get(PATH);

+    else

+      return null;

+    String[] path = str.split("/");

+    if(!path[0].equals(Model.ROOT))

+      return Model.ROOT + '/' + str;

+    else

+      return str;

+  }

danvegeto

Collective Congress • 51 weeks ago