SAK-17206 revert patch due to missing file

git-svn-id: https://source.sakaiproject.org/svn/polls/trunk@76871 66ffb92e-73f9-0310-93c1-f5514f145a0a
jsnider2 · Apr 30, 2010 · 2de76b8 · 2de76b8
1 parent c2782d3
commit 2de76b8
Show file tree

Hide file tree

Showing 22 changed files with 110 additions and 642 deletions.
diff --git a/polls/api/src/java/org/sakaiproject/poll/logic/ExternalLogic.java b/polls/api/src/java/org/sakaiproject/poll/logic/ExternalLogic.java
@@ -72,14 +72,6 @@ public interface ExternalLogic {
 	 */
 	public String getCurrentuserReference();
 
-	/**
-	 * Given a userId, return the associated userEid
-	 * @param userId The userId
-	 * @return
-	 * 	The userEid
-	 */
-	public String getUserEidFromId(String userId);
-
 	/**
 	 * is the current user allowed to perform the action in the current location?
 	 * @param permission
@@ -142,10 +134,10 @@ public interface ExternalLogic {
 
 	/**
 	 * 
-	 * @param siteId
+	 * @param locationReference
 	 * @return
 	 */
-	public String getSiteTile(String siteId);
+	public String getSiteTile(String locationReference);
 
 	/**
 	 * Get a site reference "/site/ABCD from its id (ABCD)
@@ -175,16 +167,4 @@ public interface ExternalLogic {
 	 */
 	public boolean userIsViewingAsRole();
 
-	/**
-	 * Notify a list of users that an option they voted for in a poll has been deleted.
-	 * 
-	 * @param userEids
-	 * 	A List of user EID's that identify the users to be notified
-	 * @param pollQuestion
-	 * 	The text of the poll whose option was deleted
-	 * @param siteTitle
-	 * 	The title of the site that owns the option's poll
-	 */
-	public void notifyDeletedOption(List<String> userEids, String siteTitle, String pollQuestion);
-
 }
diff --git a/polls/api/src/java/org/sakaiproject/poll/logic/PollListManager.java b/polls/api/src/java/org/sakaiproject/poll/logic/PollListManager.java
@@ -47,29 +47,15 @@ public interface PollListManager extends EntityProducer {
     public static final String PERMISSION_EDIT_OWN = "poll.editOwn";
 
     public static final String REF_POLL_TYPE ="poll";
-
-    /**
-     * Delete an option from the database.
-     * 
-     * @param option - The option to delete
-     */
     public void deleteOption(Option option);
 
-    /**
-     * Delete a poll option, either "hard" or "soft".
-     * 
-     * @param option - The option to delete
-     * @param soft - <b>true</b> if you want to "soft" delete (flag the 'deleted' field) or <b>false</b> to "hard" delete (remove from database) 
-     */
-    public void deleteOption(Option option, boolean soft);
-
     /**
      * Delete a poll
      * @param t - the poll object to remove
      * @return - true for success, false if failure
      */
     public boolean deletePoll(Poll t) throws SecurityException, IllegalArgumentException;
-    
+
     /**
      * Gets all the task objects for the site
      * @param siteId - the siteId of the site
@@ -101,25 +87,15 @@ public interface PollListManager extends EntityProducer {
      * @throws IllegalArgumentException if the pollId is invalid
      */
     public List<Option> getOptionsForPoll(Long pollId);
-
-    /**
-     * Get options for the given poll that are not flagged as deleted.
-     * @param pollId the id of the poll
-     * @return
-     * 	the options for the given poll that are not deleted OR empt if there are
-     * 	no "visible" options for this poll
-     * @throws IllegalArgumentException if the pollId is invalid
-     */
-    public List<Option> getVisibleOptionsForPoll(Long pollId);
-
+
     /**
      * Get all options for a specific poll
      * @param the poll
      * @return all options OR empty if there are no options for this poll
      * @throws IllegalArgumentException if the pollId is invalid
      */
     public List<Option> getOptionsForPoll(Poll poll);
-    
+
     /**
      *  get a poll by its Entity  Reference  
      */

diff --git a/polls/api/src/java/org/sakaiproject/poll/logic/PollVoteManager.java b/polls/api/src/java/org/sakaiproject/poll/logic/PollVoteManager.java
@@ -93,11 +93,5 @@ public interface PollVoteManager {
      * @return
      */
     public boolean pollIsVotable(Poll poll);
-
-    /**
-     * Delete the given vote
-     * @param vote The vote to delete
-     */
-    public void deleteVote(Vote vote);
 
 }
diff --git a/polls/api/src/java/org/sakaiproject/poll/model/Option.java b/polls/api/src/java/org/sakaiproject/poll/model/Option.java
@@ -97,7 +97,7 @@ public void setId(Long id) {
     }
 
     public Boolean getDeleted() {
-		return (deleted == null) ? Boolean.FALSE : deleted;
+		return deleted;
 	}
 
 	public void setDeleted(Boolean deleted) {

diff --git a/polls/api/src/java/org/sakaiproject/poll/util/PollUtil.java b/polls/api/src/java/org/sakaiproject/poll/util/PollUtil.java
@@ -46,7 +46,6 @@ public static Element optionToXml(Option option, Document doc, Stack<Element> st
         element.setAttribute("id", option.getUUId());
         element.setAttribute("optionid", option.getOptionId().toString());
         element.setAttribute("title", option.getOptionText());
-        element.setAttribute("deleted", option.getDeleted().toString());
         stack.pop();
 
         return element;

diff --git a/polls/impl/pom.xml b/polls/impl/pom.xml
@@ -35,10 +35,6 @@
             <groupId>org.sakaiproject.entitybroker</groupId>
             <artifactId>entitybroker-api</artifactId>
         </dependency>
-        <dependency>
-        	<groupId>org.sakaiproject.emailtemplateservice</groupId>
-        	<artifactId>emailtemplateservice-api</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.sakaiproject</groupId>
             <artifactId>generic-dao</artifactId>