Subversion Repositories SmartDukaan

Rev

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

Rev 21924 Rev 22009
Line 91... Line 91...
91
	}
91
	}
92
    public void setMaxCODLimit(float maxCODLimit) {
92
    public void setMaxCODLimit(float maxCODLimit) {
93
		this.maxCODLimit = maxCODLimit;
93
		this.maxCODLimit = maxCODLimit;
94
	}
94
	}
95
    
95
    
96
    
-
 
97
	@Override
96
	@Override
98
	public int hashCode() {
97
	public int hashCode() {
99
		final int prime = 31;
98
		final int prime = 31;
100
		int result = 1;
99
		int result = 1;
101
		result = prime * result + (active ? 1231 : 1237);
-
 
102
		result = prime * result + Float.floatToIntBits(bundleWeightLimit);
-
 
103
		result = prime * result + (groupShipmentAllowed ? 1231 : 1237);
-
 
104
		result = prime * result + id;
100
		result = prime * result + id;
105
		result = prime * result + Float.floatToIntBits(maxCODLimit);
-
 
106
		result = prime * result + ((name == null) ? 0 : name.hashCode());
-
 
107
		result = prime * result + pickup;
-
 
108
		return result;
101
		return result;
109
	}
102
	}
110
	@Override
103
	@Override
111
	public boolean equals(Object obj) {
104
	public boolean equals(Object obj) {
112
		if (this == obj)
105
		if (this == obj)
Line 114... Line 107...
114
		if (obj == null)
107
		if (obj == null)
115
			return false;
108
			return false;
116
		if (getClass() != obj.getClass())
109
		if (getClass() != obj.getClass())
117
			return false;
110
			return false;
118
		Provider other = (Provider) obj;
111
		Provider other = (Provider) obj;
119
		if (active != other.active)
-
 
120
			return false;
-
 
121
		if (Float.floatToIntBits(bundleWeightLimit) != Float.floatToIntBits(other.bundleWeightLimit))
-
 
122
			return false;
-
 
123
		if (groupShipmentAllowed != other.groupShipmentAllowed)
-
 
124
			return false;
-
 
125
		if (id != other.id)
112
		if (id != other.id)
126
			return false;
113
			return false;
127
		if (Float.floatToIntBits(maxCODLimit) != Float.floatToIntBits(other.maxCODLimit))
-
 
128
			return false;
-
 
129
		if (name == null) {
-
 
130
			if (other.name != null)
-
 
131
				return false;
-
 
132
		} else if (!name.equals(other.name))
-
 
133
			return false;
-
 
134
		if (pickup != other.pickup)
-
 
135
			return false;
-
 
136
		return true;
114
		return true;
137
	}
115
	}
138
	@Override
116
	@Override
139
	public String toString() {
117
	public String toString() {
140
		return "Provider [id=" + id + ", name=" + name + ", active=" + active + ", pickup=" + pickup
118
		return "Provider [id=" + id + ", name=" + name + ", active=" + active + ", pickup=" + pickup