Revision 2183 trunk/applications/appgvSIG/src/com/iver/cit/gvsig/gui/layout/fframes/FFrameScaleBar.java

View differences:

FFrameScaleBar.java
939 939

  
940 940
		for (int i = 0; i < fframes.size(); i++) {
941 941
			if (fframes.get(i) instanceof FFrameView) {
942
				if (fframeview.getView().getName().equals(((FFrameView) fframes
942
				if (fframeview !=null && fframeview.getView().getName().equals(((FFrameView) fframes
943 943
															   .get(i)).getView()
944 944
															   .getName())) {
945 945
					xml.putProperty("index", i);
......
963 963
	 * @see com.iver.cit.gvsig.gui.layout.fframes.IFFrame#setXMLEntity(com.iver.utiles.XMLEntity,
964 964
	 * 		com.iver.cit.gvsig.project.Project)
965 965
	 */
966
	public void setXMLEntity(XMLEntity xml, Layout l) {
966
	public void setXMLEntity03(XMLEntity xml, Layout l) {
967 967
		if (xml.getIntProperty("m_Selected") != 0) {
968 968
			this.setSelected(true);
969 969
		} else {
......
1015 1015
	}
1016 1016

  
1017 1017
	/**
1018
	 * @see com.iver.cit.gvsig.gui.layout.fframes.IFFrame#setXMLEntity(com.iver.utiles.XMLEntity,
1019
	 * 		com.iver.cit.gvsig.project.Project)
1020
	 */
1021
	public void setXMLEntity(XMLEntity xml, Layout l) {
1022
		if (xml.getIntProperty("m_Selected") != 0) {
1023
			this.setSelected(true);
1024
		} else {
1025
			this.setSelected(false);
1026
		}
1027

  
1028
		this.m_bIntervalSet = xml.getBooleanProperty("m_bIntervalSet");
1029
		this.m_dif = xml.getDoubleProperty("m_dif");
1030
		this.m_hasleft = xml.getIntProperty("m_hasleft");
1031
		this.m_nameUnit = xml.getStringProperty("m_nameUnit");
1032
		this.m_numUnit = xml.getDoubleProperty("m_numUnit");
1033

  
1034
		this.m_height = xml.getDoubleProperty("m_height");
1035

  
1036
		this.m_style = xml.getIntProperty("m_style");
1037
		this.m_interval = xml.getLongProperty("m_interval");
1038
		this.m_numinterval = xml.getIntProperty("m_numinterval");
1039
		this.m_numleft = xml.getIntProperty("m_numleft");
1040
		this.m_mapUnits = xml.getIntProperty("m_mapUnits");
1041
		this.m_f = new Font(xml.getStringProperty("fontName"),
1042
				xml.getIntProperty("fontStyle"), 9);
1043

  
1044
		/*FFrameView fv=(FFrameView) FFrameView.createFFrame(xml.getChild(0),
1045
		   p);
1046
		   int indice = xml.getIntProperty("indice");
1047
		   if (indice != -1) {
1048
		           ProjectView view = (ProjectView) p.getViews().get(indice);
1049
		           fv.setView((ProjectView) view);
1050
		           fv.getFMap().setViewPort(((ProjectView) p.getViews().get(indice)).getMapContext().getViewPort());
1051
		   }
1052
		
1053
		   this.setFFrameView(fv);
1054
		 */
1055
		ArrayList fframes = l.getFFrames();
1056
		if (xml.contains("index")){
1057
		fframeview = (FFrameView) fframes.get(xml.getIntProperty("index"));
1058
		}
1059
		if (xml.contains("description")) { //Comprobar que es de la versi?n que cambia el di?logo.
1060
			this.barcolor = StringUtilities.string2Color(xml.getStringProperty(
1061
						"barcolor"));
1062
			this.textcolor = StringUtilities.string2Color(xml.getStringProperty(
1063
						"textcolor"));
1064
			this.showNameUnits = xml.getBooleanProperty("showNameUnits");
1065
			this.showDescription = xml.getBooleanProperty("showDescription");
1066
			this.aboveName = xml.getBooleanProperty("aboveName");
1067
			this.aboveIntervals = xml.getBooleanProperty("aboveIntervals");
1068
			this.aboveDescription = xml.getBooleanProperty("aboveDescription");
1069
			this.description = xml.getStringProperty("description");
1070
		}
1071
	}
1072

  
1073
	/**
1018 1074
	 * @see com.iver.cit.gvsig.gui.layout.fframes.IFFrame#getNameFFrame()
1019 1075
	 */
1020 1076
	public String getNameFFrame() {

Also available in: Unified diff