Menu
▾
▴
[Jboss-svn-commits] JBL Code SVN: r1838 - trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects
|
From: <jbo...@li...> - 2005-12-18 00:31:03
|
Author: unibrew
Date: 2005-12-17 19:30:58 -0500 (Sat, 17 Dec 2005)
New Revision: 1838
Modified:
trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/Poll.java
trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/PollDescriptor.java
trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/PollTools.java
trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/PollsDescriptor.java
trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/PollsWatcher.java
Log:
[JBLAB-407] Poll's source update.
Modified: trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/Poll.java
===================================================================
--- trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/Poll.java 2005-12-17 18:31:51 UTC (rev 1837)
+++ trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/Poll.java 2005-12-18 00:30:58 UTC (rev 1838)
@@ -1,6 +1,7 @@
package org.jboss.forge.common.projects;
-import java.util.Hashtable;
+import java.util.Collections;
+import java.util.LinkedHashMap;
import java.util.Map;
import java.util.Set;
@@ -11,7 +12,7 @@
private Map<String,Integer> votes;
public Poll (Set<String>answers,String question, String pollId) {
- votes = new Hashtable<String,Integer>(answers.size());
+ votes = Collections.synchronizedMap(new LinkedHashMap<String,Integer>(answers.size()));
for (String answer : answers){
votes.put(answer,new Integer(0));
}
@@ -21,7 +22,7 @@
public Poll (Map<String,Integer>votes,String question, String pollId) {
this.votes = votes;
- if (votes==null) this.votes = new Hashtable<String,Integer>();
+ if (votes==null) this.votes = Collections.synchronizedMap(new LinkedHashMap<String,Integer>());
this.question = question;
this.pollId = pollId;
}
Modified: trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/PollDescriptor.java
===================================================================
--- trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/PollDescriptor.java 2005-12-17 18:31:51 UTC (rev 1837)
+++ trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/PollDescriptor.java 2005-12-18 00:30:58 UTC (rev 1838)
@@ -25,10 +25,10 @@
import java.io.IOException;
import java.io.InputStream;
-import java.util.HashSet;
+import java.util.Collections;
+import java.util.LinkedHashSet;
import java.util.LinkedList;
import java.util.List;
-import java.util.Random;
import java.util.Set;
import org.apache.xerces.parsers.DOMParser;
@@ -80,7 +80,7 @@
n = nodes.item(i);
if (n.getNodeType() == Node.ELEMENT_NODE) {
String tempQuestion = null;
- Set<String> tempAnswers = new HashSet<String>();
+ Set<String> tempAnswers = Collections.synchronizedSet(new LinkedHashSet<String>());
System.out.println("[POLLSDESCRIPTOR] IN POLLS");
if (n.getNodeName().equals(POLL)) {
System.out.println("[POLLSDESCRIPTOR] IN POLL");
Modified: trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/PollTools.java
===================================================================
--- trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/PollTools.java 2005-12-17 18:31:51 UTC (rev 1837)
+++ trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/PollTools.java 2005-12-18 00:30:58 UTC (rev 1838)
@@ -416,6 +416,7 @@
poll.put("question",pollObj.getQuestion());
poll.put("actionUrl",response.createActionURL().toString());
poll.put("pollId",pollObj.getPollId());
+ poll.put("project",projectId);
for (String answer : pollObj.getAnswers()) {
DelegateContext answerCtx = poll.next("answer");
Modified: trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/PollsDescriptor.java
===================================================================
--- trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/PollsDescriptor.java 2005-12-17 18:31:51 UTC (rev 1837)
+++ trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/PollsDescriptor.java 2005-12-18 00:30:58 UTC (rev 1838)
@@ -26,7 +26,9 @@
import java.io.File;
import java.io.InputStream;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.Hashtable;
+import java.util.LinkedHashMap;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
@@ -275,7 +277,7 @@
}
}
- removePollsFromVoting(pollsToDelete);
+ removePollsFromVoting(pollsToDelete,projectId);
addPollsForVoting (descPolls,projectId);
@@ -317,11 +319,11 @@
* @param pollsToDelete
* List<String> of polls which should be removed.
*/
- private synchronized void removePollsFromVoting (List<Poll> pollsToDelete) {
+ private synchronized void removePollsFromVoting (List<Poll> pollsToDelete,final String projectId) {
// Removing polls which shouldn't be tracked any more.
for (Poll poll:pollsToDelete) {
database.removePollDataFile(poll.getPollId());
- polls.remove(poll);
+ polls.get(projectId).remove(poll);
}
}
@@ -391,6 +393,7 @@
org.jboss.shotoku.Node xmlFile = contentManager.getNode(pathToPollsXml);
xmlFile.setContent(xmlString);
xmlFile.save ("[Polls] Main xml descriptor file update.");
+ changeStatus=false;
System.out.println ("AFTER SYNCHRONIZING MAIN XML FILE");
} catch (Exception e) {
e.printStackTrace();
@@ -544,7 +547,7 @@
for (int j=0;j< pollNodes.getLength() ; j++) {
pollNode = pollNodes.item(j);
String tempQuestion = null;
- Map<String,Integer> answerVotes = new Hashtable<String,Integer>();
+ Map<String,Integer> answerVotes = Collections.synchronizedMap(new LinkedHashMap<String,Integer>());
String tempPollId = null;
if (pollNode.getNodeType()== Node.ELEMENT_NODE && pollNode.getNodeName().equals(POLL)) {
NodeList properties = pollNode.getChildNodes();
Modified: trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/PollsWatcher.java
===================================================================
--- trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/PollsWatcher.java 2005-12-17 18:31:51 UTC (rev 1837)
+++ trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/PollsWatcher.java 2005-12-18 00:30:58 UTC (rev 1838)
@@ -23,7 +23,6 @@
package org.jboss.forge.common.projects;
-import java.util.Collection;
import java.util.Set;
import org.jboss.forge.common.service.NodeWatcher;
|
