Revision 47282
| trunk/org.gvsig.desktop/org.gvsig.desktop.plugin/org.gvsig.coreplugin.app/org.gvsig.coreplugin.app.mainplugin/src/main/java/org/gvsig/coreplugin/mdiManager/SingletonWindowSupport.java | ||
|---|---|---|
| 166 | 166 |
*/ |
| 167 | 167 |
public boolean equals(Object obj) {
|
| 168 | 168 |
if (obj.getClass() != SingletonWindowInfo.class) {
|
| 169 |
throw new IllegalArgumentException();
|
|
| 169 |
return false;
|
|
| 170 | 170 |
} |
| 171 | 171 |
|
| 172 | 172 |
SingletonWindowInfo s = (SingletonWindowInfo) obj; |
| trunk/org.gvsig.desktop/org.gvsig.desktop.plugin/org.gvsig.daltransform.app/org.gvsig.daltransform.app.mainplugin/src/main/java/org/gvsig/daltransform/swing/impl/DefaultJDataTransformList.java | ||
|---|---|---|
| 120 | 120 |
|
| 121 | 121 |
@Override |
| 122 | 122 |
public boolean equals(Object obj) {
|
| 123 |
if(!(obj instanceof ItemData)){
|
|
| 124 |
return false; |
|
| 125 |
} |
|
| 126 |
|
|
| 123 | 127 |
return this.transform.equals(((ItemData) obj).transform); |
| 124 | 128 |
} |
| 125 | 129 |
} |
| trunk/org.gvsig.desktop/org.gvsig.desktop.library/org.gvsig.timesupport/org.gvsig.timesupport.lib/org.gvsig.timesupport.lib.impl/src/main/java/org/gvsig/timesupport/impl/DefaultRelativeInstant.java | ||
|---|---|---|
| 143 | 143 |
return jodaDateTime.isBefore(((DefaultRelativeInstant)instant).getJodaType()); |
| 144 | 144 |
} |
| 145 | 145 |
|
| 146 |
public boolean equals(Object obj) {
|
|
| 147 |
if ((obj == null) || ((Time)obj).isAbsolute() || ((Time)obj).isInterval()){
|
|
| 146 |
public boolean equals(Object obj) {
|
|
| 147 |
if(!(obj instanceof DefaultRelativeInstant)){
|
|
| 148 | 148 |
return false; |
| 149 | 149 |
} |
| 150 |
|
|
| 150 | 151 |
return ((DefaultRelativeInstant)obj).getJodaType().equals(jodaDateTime); |
| 151 | 152 |
} |
| 152 | 153 |
|
| ... | ... | |
| 196 | 197 |
return true; |
| 197 | 198 |
} |
| 198 | 199 |
|
| 199 |
public boolean isAbsolute() {
|
|
| 200 |
public final boolean isAbsolute() {
|
|
| 200 | 201 |
return false; |
| 201 | 202 |
} |
| 202 | 203 |
|
| 203 |
public boolean isInterval() {
|
|
| 204 |
public final boolean isInterval() {
|
|
| 204 | 205 |
return false; |
| 205 | 206 |
} |
| 206 | 207 |
|
| ... | ... | |
| 217 | 218 |
return jodaDateTime; |
| 218 | 219 |
} |
| 219 | 220 |
|
| 220 |
|
|
| 221 |
|
|
| 222 |
// protected org.joda.time.Instant jodaInstant = null; |
|
| 223 |
// private static Chronology chronology = |
|
| 224 |
// TimeSupportLocator.getManager().getChronology(Chronology.ISO).withUTC(); |
|
| 225 |
// |
|
| 226 |
// DefaultRelativeInstant(long instant) {
|
|
| 227 |
// super(); |
|
| 228 |
// this.jodaInstant = new org.joda.time.Instant(instant); |
|
| 229 |
// } |
|
| 230 |
// |
|
| 231 |
// DefaultRelativeInstant(Date date) {
|
|
| 232 |
// super(); |
|
| 233 |
// this.jodaInstant = new org.joda.time.Instant(date); |
|
| 234 |
// } |
|
| 235 |
// |
|
| 236 |
// DefaultRelativeInstant(DateTime dateTime) {
|
|
| 237 |
// this(dateTime.toDate()); |
|
| 238 |
// } |
|
| 239 |
// |
|
| 240 |
// DefaultRelativeInstant(org.joda.time.Instant instant) {
|
|
| 241 |
// super(); |
|
| 242 |
// this.jodaInstant = instant; |
|
| 243 |
// } |
|
| 244 |
// |
|
| 245 |
// public Date toDate() {
|
|
| 246 |
// return jodaInstant.toDate(); |
|
| 247 |
// } |
|
| 248 |
// |
|
| 249 |
// public int compareTo(DateTime dateTime) {
|
|
| 250 |
// return jodaInstant.compareTo(((DefaultDateTime)dateTime).getJodaType()); |
|
| 251 |
// } |
|
| 252 |
// |
|
| 253 |
// public DateTime toDateTime() {
|
|
| 254 |
// return new DefaultDateTime(jodaInstant.toDateTime().toDate(), chronology); |
|
| 255 |
// } |
|
| 256 |
// |
|
| 257 |
// public long getMillis() {
|
|
| 258 |
// return jodaInstant.getMillis(); |
|
| 259 |
// } |
|
| 260 |
// |
|
| 261 |
// org.joda.time.Instant getJodaType() {
|
|
| 262 |
// return jodaInstant; |
|
| 263 |
// } |
|
| 264 |
// |
|
| 265 |
// public boolean isEqual(RelativeInstant instant) {
|
|
| 266 |
// return jodaInstant.isEqual(((DefaultRelativeInstant)instant).getJodaType()); |
|
| 267 |
// } |
|
| 268 |
// |
|
| 269 |
// public boolean isAfter(RelativeInstant instant) {
|
|
| 270 |
// return jodaInstant.isAfter(((DefaultRelativeInstant)instant).getJodaType()); |
|
| 271 |
// } |
|
| 272 |
// |
|
| 273 |
// public boolean isBefore(RelativeInstant instant) {
|
|
| 274 |
// return jodaInstant.isBefore(((DefaultRelativeInstant)instant).getJodaType()); |
|
| 275 |
// } |
|
| 276 |
// |
|
| 277 |
// public String toString() {
|
|
| 278 |
// return jodaInstant.toString(); |
|
| 279 |
// } |
|
| 280 |
// |
|
| 281 |
// public boolean equals(Object obj) {
|
|
| 282 |
// return ((DefaultRelativeInstant)obj).getJodaType().equals(jodaInstant); |
|
| 283 |
// } |
|
| 284 |
// |
|
| 285 |
// public Chronology getChronology() {
|
|
| 286 |
// return chronology; |
|
| 287 |
// } |
|
| 288 |
|
|
| 289 |
|
|
| 290 | 221 |
} |
| 291 | 222 |
|
| trunk/org.gvsig.desktop/org.gvsig.desktop.library/org.gvsig.timesupport/org.gvsig.timesupport.lib/org.gvsig.timesupport.lib.impl/src/main/java/org/gvsig/timesupport/impl/DefaultAbsoluteInstant.java | ||
|---|---|---|
| 120 | 120 |
return jodaPartial.toString(pattern); |
| 121 | 121 |
} |
| 122 | 122 |
|
| 123 |
public boolean equals(Object obj) {
|
|
| 124 |
if (((Time)obj).isRelative() || ((Time)obj).isInterval()){
|
|
| 123 |
public boolean equals(Object obj) {
|
|
| 124 |
if(!(obj instanceof DefaultAbsoluteInstant)){
|
|
| 125 | 125 |
return false; |
| 126 |
}
|
|
| 126 |
} |
|
| 127 | 127 |
return ((DefaultAbsoluteInstant)obj).getJodaType().equals(jodaPartial); |
| 128 | 128 |
} |
| 129 | 129 |
|
| ... | ... | |
| 207 | 207 |
return ((Integer)jodaPartial.get(indexes[AbsoluteIntervalType.MILLIS])).intValue(); |
| 208 | 208 |
} |
| 209 | 209 |
|
| 210 |
public boolean isRelative() {
|
|
| 210 |
public final boolean isRelative() {
|
|
| 211 | 211 |
return false; |
| 212 | 212 |
} |
| 213 | 213 |
|
| ... | ... | |
| 215 | 215 |
return true; |
| 216 | 216 |
} |
| 217 | 217 |
|
| 218 |
public boolean isInterval() {
|
|
| 218 |
public final boolean isInterval() {
|
|
| 219 | 219 |
return false; |
| 220 | 220 |
} |
| 221 | 221 |
|
| trunk/org.gvsig.desktop/org.gvsig.desktop.library/org.gvsig.timesupport/org.gvsig.timesupport.lib/org.gvsig.timesupport.lib.impl/src/main/java/org/gvsig/timesupport/impl/DefaultRelativeInterval.java | ||
|---|---|---|
| 88 | 88 |
return jodaInterval.toString(); |
| 89 | 89 |
} |
| 90 | 90 |
|
| 91 |
public boolean equals(Object obj) {
|
|
| 92 |
if ((obj == null) || ((Time)obj).isAbsolute() || ((Time)obj).isInstant()){
|
|
| 91 |
public boolean equals(Object obj) {
|
|
| 92 |
if(!(obj instanceof DefaultRelativeInterval)){
|
|
| 93 | 93 |
return false; |
| 94 | 94 |
} |
| 95 | 95 |
return ((DefaultRelativeInterval)obj).getJodaType().equals(jodaInterval); |
| ... | ... | |
| 123 | 123 |
return true; |
| 124 | 124 |
} |
| 125 | 125 |
|
| 126 |
public boolean isAbsolute() {
|
|
| 126 |
public final boolean isAbsolute() {
|
|
| 127 | 127 |
return false; |
| 128 | 128 |
} |
| 129 | 129 |
|
| ... | ... | |
| 131 | 131 |
return true; |
| 132 | 132 |
} |
| 133 | 133 |
|
| 134 |
public boolean isInstant() {
|
|
| 134 |
public final boolean isInstant() {
|
|
| 135 | 135 |
return false; |
| 136 | 136 |
} |
| 137 | 137 |
|
| trunk/org.gvsig.desktop/org.gvsig.desktop.library/org.gvsig.timesupport/org.gvsig.timesupport.lib/org.gvsig.timesupport.lib.impl/src/main/java/org/gvsig/timesupport/impl/DefaultAbsoluteInterval.java | ||
|---|---|---|
| 350 | 350 |
return jodaPeriod.toString(); |
| 351 | 351 |
} |
| 352 | 352 |
|
| 353 |
public boolean equals(Object obj) {
|
|
| 354 |
if (((Time)obj).isRelative() || ((Time)obj).isInstant()){
|
|
| 353 |
public boolean equals(Object obj) {
|
|
| 354 |
if (!(obj instanceof DefaultAbsoluteInterval)){
|
|
| 355 | 355 |
return false; |
| 356 |
}
|
|
| 356 |
} |
|
| 357 | 357 |
return ((DefaultAbsoluteInterval)obj).getJodaType().equals(jodaPeriod); |
| 358 | 358 |
} |
| 359 | 359 |
|
| ... | ... | |
| 417 | 417 |
return endAbsoluteInstant; |
| 418 | 418 |
} |
| 419 | 419 |
|
| 420 |
public boolean isRelative() {
|
|
| 420 |
public final boolean isRelative() {
|
|
| 421 | 421 |
return false; |
| 422 | 422 |
} |
| 423 | 423 |
|
| ... | ... | |
| 429 | 429 |
return true; |
| 430 | 430 |
} |
| 431 | 431 |
|
| 432 |
public boolean isInstant() {
|
|
| 432 |
public final boolean isInstant() {
|
|
| 433 | 433 |
return false; |
| 434 | 434 |
} |
| 435 | 435 |
|
| trunk/org.gvsig.desktop/org.gvsig.desktop.library/org.gvsig.timesupport/org.gvsig.timesupport.lib/org.gvsig.timesupport.lib.impl/src/main/java/org/gvsig/timesupport/impl/DefaultDuration.java | ||
|---|---|---|
| 53 | 53 |
return jodaDuration.toString(); |
| 54 | 54 |
} |
| 55 | 55 |
|
| 56 |
public boolean equals(Object obj) {
|
|
| 56 |
public boolean equals(Object obj) {
|
|
| 57 |
if(!(obj instanceof DefaultDuration)){
|
|
| 58 |
return false; |
|
| 59 |
} |
|
| 57 | 60 |
return ((DefaultDuration)obj).getJodaType().equals(jodaDuration); |
| 58 | 61 |
} |
| 59 | 62 |
|
| trunk/org.gvsig.desktop/org.gvsig.desktop.library/org.gvsig.installer/org.gvsig.installer.lib/org.gvsig.installer.lib.impl/src/main/java/org/gvsig/installer/lib/impl/DefaultVersion.java | ||
|---|---|---|
| 189 | 189 |
|
| 190 | 190 |
@Override |
| 191 | 191 |
public boolean equals(Object obj) {
|
| 192 |
if(!(obj instanceof Version)){
|
|
| 193 |
return false; |
|
| 194 |
} |
|
| 192 | 195 |
Version other = (Version) obj; |
| 193 | 196 |
if (this.mayor != other.getMayor()) {
|
| 194 | 197 |
return false; |
| trunk/org.gvsig.desktop/org.gvsig.desktop.library/org.gvsig.symbology/org.gvsig.symbology.lib/org.gvsig.symbology.lib.impl/src/main/java/org/gvsig/symbology/fmap/mapcontext/rendering/symbol/impl/AbstractSymbol.java | ||
|---|---|---|
| 171 | 171 |
public boolean equals(Object obj) {
|
| 172 | 172 |
ISymbol other = null; |
| 173 | 173 |
|
| 174 |
if (obj == null) {
|
|
| 174 |
if (!(obj instanceof ISymbol)) {
|
|
| 175 | 175 |
return false; |
| 176 | 176 |
} |
| 177 |
if (!areEquals(obj.getClass(), this.getClass())) {
|
|
| 178 |
// El try/catch y la salida al log es una medida |
|
| 179 |
// temporal hasta que averiguemos quien causa que |
|
| 180 |
// pase por aqui, ya que no parece razonable que |
|
| 181 |
// desde gvSIG se invoque con algo que no sea un ISymbol. |
|
| 182 |
try {
|
|
| 183 |
other = (ISymbol) obj; |
|
| 184 |
} catch (Exception ex) {
|
|
| 185 |
LOG.warn("Suspicious comparison between ISymbol and '" + obj.getClass().getName() + "'.", ex);
|
|
| 186 |
} |
|
| 177 |
|
|
| 178 |
other = (ISymbol) obj; |
|
| 179 |
|
|
| 180 |
if (!areEquals(other.getClass(), this.getClass())) {
|
|
| 187 | 181 |
return false; |
| 188 | 182 |
} |
| 189 | 183 |
|
| 190 |
other = (ISymbol) obj; |
|
| 191 |
|
|
| 192 | 184 |
if (!areEquals(other.getColor(), this.getColor())) {
|
| 193 | 185 |
return false; |
| 194 | 186 |
} |
Also available in: Unified diff