Subversion Repositories SmartDukaan

Rev

Rev 28019 | Rev 30755 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 28019 Rev 29785
Line 9... Line 9...
9 
    private List<Integer> catalogIds;
 9 
    private List<Integer> catalogIds;
10 
    private List<Integer> excludeCatalogIds;
 10 
    private List<Integer> excludeCatalogIds;
11 
    private boolean smartPhone;
 11 
    private boolean smartPhone;
12 
    private boolean featuredPhone;
 12 
    private boolean featuredPhone;
13 
    private List<String> brands;
 13 
    private List<String> brands;
- 
 
 14 
    private List<Integer> itemIds;
14 
 
 15 
 
15 
    public List<Integer> getExcludeCatalogIds() {
 16 
    public List<Integer> getExcludeCatalogIds() {
16 
		return excludeCatalogIds;
 17 
		return excludeCatalogIds;
17 
	}
 18 
	}
18 
 
 19 
 
Line 20... Line 21...
20 
 
 21 
 
21 
	public void setExcludeCatalogIds(List<Integer> excludeCatalogIds) {
 22 
	public void setExcludeCatalogIds(List<Integer> excludeCatalogIds) {
22 
		this.excludeCatalogIds = excludeCatalogIds;
 23 
		this.excludeCatalogIds = excludeCatalogIds;
23 
	}
 24 
	}
24 
 
 25 
 
25 
 
 - 
 
26 
 
 - 
 
27 
	public float getStartPrice() {
 26 
	public float getStartPrice() {
28 
        return startPrice;
 27 
        return startPrice;
29 
    }
 28 
    }
30
29
- 
 
 30 
 
- 
 
 31 
    public List<Integer> getItemIds() {
- 
 
 32 
		return itemIds;
31
33 
	}
- 
 
 34 
 
- 
 
 35 
	public void setItemIds(List<Integer> itemIds) {
- 
 
 36 
		this.itemIds = itemIds;
- 
 
 37 
	}
- 
 
 38 
 
32 
 
 39 
 
33 
 
 40 
 
34 
    public int getId() {
 41 
	public int getId() {
35 
		return id;
 42 
		return id;
36 
	}
 43 
	}
37 
 
 44 
 
38 
	public void setId(int id) {
 45 
	public void setId(int id) {
39 
		this.id = id;
 46 
		this.id = id;
Line 99... Line 106...
99 
 
 106 
 
100 
    @Override
 107 
    @Override
101 
	public String toString() {
 108 
	public String toString() {
102 
		return "ItemCriteria [id=" + id + ", startPrice=" + startPrice + ", endPrice=" + endPrice + ", catalogIds="
 109 
		return "ItemCriteria [id=" + id + ", startPrice=" + startPrice + ", endPrice=" + endPrice + ", catalogIds="
103 
				+ catalogIds + ", excludeCatalogIds=" + excludeCatalogIds + ", smartPhone=" + smartPhone
 110 
				+ catalogIds + ", excludeCatalogIds=" + excludeCatalogIds + ", smartPhone=" + smartPhone
104 
				+ ", featuredPhone=" + featuredPhone + ", brands=" + brands + "]";
 111 
				+ ", featuredPhone=" + featuredPhone + ", brands=" + brands + ", itemIds=" + itemIds + "]";
105 
	}
 112 
	}
106 
 
 113 
 
107 
 
 114 
 
108 
    @Override
 115 
    @Override
109 
	public int hashCode() {
 116 
	public int hashCode() {
Line 113... Line 120...
113 
		result = prime * result + ((catalogIds == null) ? 0 : catalogIds.hashCode());
 120 
		result = prime * result + ((catalogIds == null) ? 0 : catalogIds.hashCode());
114 
		result = prime * result + Float.floatToIntBits(endPrice);
 121 
		result = prime * result + Float.floatToIntBits(endPrice);
115 
		result = prime * result + ((excludeCatalogIds == null) ? 0 : excludeCatalogIds.hashCode());
 122 
		result = prime * result + ((excludeCatalogIds == null) ? 0 : excludeCatalogIds.hashCode());
116 
		result = prime * result + (featuredPhone ? 1231 : 1237);
 123 
		result = prime * result + (featuredPhone ? 1231 : 1237);
117 
		result = prime * result + id;
 124 
		result = prime * result + id;
- 
 
 125 
		result = prime * result + ((itemIds == null) ? 0 : itemIds.hashCode());
118 
		result = prime * result + (smartPhone ? 1231 : 1237);
 126 
		result = prime * result + (smartPhone ? 1231 : 1237);
119 
		result = prime * result + Float.floatToIntBits(startPrice);
 127 
		result = prime * result + Float.floatToIntBits(startPrice);
120 
		return result;
 128 
		return result;
121 
	}
 129 
	}
122 
 
 130 
 
Line 149... Line 157...
149 
			return false;
 157 
			return false;
150 
		if (featuredPhone != other.featuredPhone)
 158 
		if (featuredPhone != other.featuredPhone)
151 
			return false;
 159 
			return false;
152 
		if (id != other.id)
 160 
		if (id != other.id)
153 
			return false;
 161 
			return false;
- 
 
 162 
		if (itemIds == null) {
- 
 
 163 
			if (other.itemIds != null)
- 
 
 164 
				return false;
- 
 
 165 
		} else if (!itemIds.equals(other.itemIds))
- 
 
 166 
			return false;
154 
		if (smartPhone != other.smartPhone)
 167 
		if (smartPhone != other.smartPhone)
155 
			return false;
 168 
			return false;
156 
		if (Float.floatToIntBits(startPrice) != Float.floatToIntBits(other.startPrice))
 169 
		if (Float.floatToIntBits(startPrice) != Float.floatToIntBits(other.startPrice))
157 
			return false;
 170 
			return false;
158 
		return true;
 171 
		return true;