Revision 31496 branches/v2_0_0_prep/applications/appgvSIG/src/org/gvsig/app/project/documents/layout/fframes/FFrame.java

View differences:

FFrame.java
60 60
import org.gvsig.andami.messages.NotificationManager;
61 61
import org.gvsig.app.extension.ProjectExtension;
62 62
import org.gvsig.app.project.Project;
63
import org.gvsig.app.project.Project;
64
import org.gvsig.app.project.ProjectManager;
63 65
import org.gvsig.app.project.documents.exceptions.OpenException;
64 66
import org.gvsig.app.project.documents.exceptions.SaveException;
65 67
import org.gvsig.app.project.documents.layout.FLayoutUtilities;
66
import org.gvsig.app.project.documents.layout.gui.Layout;
68
import org.gvsig.app.project.documents.layout.gui.LayoutPanel;
67 69
import org.gvsig.app.project.documents.layout.gui.dialogs.Tag;
68 70
import org.gvsig.tools.ToolsLocator;
69 71
import org.gvsig.tools.extensionpoint.ExtensionPoint;
......
97 99
    private double m_rotation = 0;
98 100
    private int level = -1;
99 101
	private Rectangle2D lastMoveRect;
100
	private Layout layout;
102
	private LayoutPanel layout;
101 103
	protected FrameFactory factory;
102 104
//	protected PrintRequestAttributeSet printingProperties;
103 105
	private static final Image iNEResize = PluginServices.getIconTheme()
......
791 793
        level = l;
792 794
    }
793 795

  
794
    /**
795
     * DOCUMENT ME!
796
     *
797
     * @param layout DOCUMENT ME!
798
     *
799
     * @return DOCUMENT ME!
800
     */
801
    public IFFrame cloneFFrame(Layout layout) {
802
        Project p = ((ProjectExtension) PluginServices.getExtension(ProjectExtension.class)).getProject();
796
    public IFFrame cloneFFrame(LayoutPanel layout) {        
797
    	// Project p = ((ProjectExtension) PluginServices.getExtension(ProjectExtension.class)).getProject();
798
        Project p = ProjectManager.getInstance().getCurrentProject();
803 799
        IFFrame frame = null;
804 800

  
805 801
        try {
......
842 838
        return xml;
843 839
    }
844 840

  
845
	public void setLayout(Layout layout) {
841
	public void setLayout(LayoutPanel layout) {
846 842
		this.layout=layout;
847 843
	}
848 844

  
849
	public Layout getLayout() {
845
	public LayoutPanel getLayout() {
850 846
		return layout;
851 847
	}
852 848

  
853
	public static IFFrame createFromXML(XMLEntity xml, Project p, Layout layout)
849
	public static IFFrame createFromXML(XMLEntity xml, Project p, LayoutPanel layout)
854 850
		throws OpenException {
855 851
		FrameFactory flf = null;
856 852
		try{

Also available in: Unified diff