refactored tree, no more dropdown for feed editing

src/main/java/com/commafeed/frontend/model/request/CategoryModificationRequest.java

@@ -12,15 +12,18 @@ import com.wordnik.swagger.annotations.ApiProperty;
 @SuppressWarnings("serial")
 @XmlRootElement
 @XmlAccessorType(XmlAccessType.FIELD)
-@ApiClass("Rename Request")
-public class RenameRequest implements Serializable {
+@ApiClass("Category modification request")
+public class CategoryModificationRequest implements Serializable {
 
 	@ApiProperty(value = "id", required = true)
 	private Long id;
 
-	@ApiProperty(value = "mark as read or unread")
+	@ApiProperty(value = "new name")
 	private String name;
 
+	@ApiProperty(value = "new parent category id")
+	private String parentId;
+
 	public Long getId() {
 		return id;
 	}
@@ -37,4 +40,12 @@ public class RenameRequest implements Serializable {
 		this.name = name;
 	}
 
+	public String getParentId() {
+		return parentId;
+	}
+
+	public void setParentId(String parentId) {
+		this.parentId = parentId;
+	}
+
 }

src/main/java/com/commafeed/frontend/model/request/FeedModificationRequest.java

@@ -0,0 +1,51 @@
+package com.commafeed.frontend.model.request;
+
+import java.io.Serializable;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlRootElement;
+
+import com.wordnik.swagger.annotations.ApiClass;
+import com.wordnik.swagger.annotations.ApiProperty;
+
+@SuppressWarnings("serial")
+@XmlRootElement
+@XmlAccessorType(XmlAccessType.FIELD)
+@ApiClass("Feed modification request")
+public class FeedModificationRequest implements Serializable {
+
+	@ApiProperty(value = "id", required = true)
+	private Long id;
+
+	@ApiProperty(value = "new name")
+	private String name;
+
+	@ApiProperty(value = "new parent category id")
+	private String categoryId;
+
+	public Long getId() {
+		return id;
+	}
+
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public String getCategoryId() {
+		return categoryId;
+	}
+
+	public void setCategoryId(String categoryId) {
+		this.categoryId = categoryId;
+	}
+
+}