Revision 24759 branches/v2_0_0_prep/applications/appgvSIG/src/com/iver/cit/gvsig/project/documents/layout/fframes/FFrameTable.java

View differences:

FFrameTable.java
92 92
import java.awt.image.BufferedImage;
93 93
import java.util.ArrayList;
94 94

  
95
import javax.swing.ImageIcon;
95
import org.gvsig.fmap.dal.exception.ReadException;
96 96

  
97
import org.gvsig.fmap.data.ReadException;
98
import org.gvsig.fmap.geom.Geometry;
99
import org.gvsig.fmap.mapcontext.rendering.symbols.SimpleLineSymbol;
100

  
101 97
import com.iver.andami.PluginServices;
102
import com.iver.cit.gvsig.AddLayer;
103 98
import com.iver.cit.gvsig.ProjectExtension;
104 99
import com.iver.cit.gvsig.project.Project;
105 100
import com.iver.cit.gvsig.project.documents.exceptions.OpenException;
......
336 331
    }
337 332
*/
338 333
    public void setSelected(Point2D p,MouseEvent e) {
339
        if (!selectFFrameBasic)
340
            super.setSelected(p,e);
341
        else{
334
        if (!selectFFrameBasic) {
335
			super.setSelected(p,e);
336
		} else{
342 337
            setSelectedGroup(p,e);
343 338
        }
344 339
    }
345 340

  
346 341
    public boolean contains(Point2D p) {
347
        if (!selectFFrameBasic)
348
            return super.contains(p);
342
        if (!selectFFrameBasic) {
343
			return super.contains(p);
344
		}
349 345
        return contains(p);
350 346
    }
351 347

  
352 348
    public void drawHandlers(Graphics2D g) {
353
        if (!selectFFrameBasic)
354
            super.drawHandlers(g);
355
        else{
349
        if (!selectFFrameBasic) {
350
			super.drawHandlers(g);
351
		} else{
356 352
            drawHandlersGroup(g);
357 353

  
358 354
        }
359 355
    }
360 356

  
361 357
    public int getContains(Point2D p) {
362
        if (!selectFFrameBasic)
363
            return super.getContains(p);
358
        if (!selectFFrameBasic) {
359
			return super.getContains(p);
360
		}
364 361
        return getContainsGroup(p);
365 362
    }
366 363

  
......
368 365
        //TODO Esto de momento lo dejo que no se pueda mover
369 366
    	//cuando se tiene seleccionada la herramienta de selecci�n de un FFrameBasic.
370 367
    	Rectangle2D r= super.getMovieRect(difx,dify);
371
        if (!selectFFrameBasic)
372
            return r;
368
        if (!selectFFrameBasic) {
369
			return r;
370
		}
373 371
        r= super.getMovieRect(0,0);
374 372
        return r;
375 373
    }
......
389 387

  
390 388
            if (i==0){
391 389
                r=((IFFrame)selected.get(i)).getMovieRect(difX,difY);
392
            }else
393
                r.add(((IFFrame)selected.get(i)).getMovieRect(difX,difY));
390
            } else {
391
				r.add(((IFFrame)selected.get(i)).getMovieRect(difX,difY));
392
			}
394 393
        }
395 394
        return r;
396 395
    }
......
537 536
    }
538 537

  
539 538
	public Image getMapCursor(Point2D p) {
540
		if (!selectFFrameBasic)
539
		if (!selectFFrameBasic) {
541 540
			return super.getMapCursor(p);
541
		}
542 542
       	return getMapCursorGroup(p);
543 543
    }
544 544
	public Image getMapCursorGroup(Point2D p){

Also available in: Unified diff