Revision 47282 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

View differences:

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