Revision 226

View differences:

org.gvsig.projection.jcrs/trunk/org.gvsig.projection.app.jcrs/org.gvsig.projection.app.jcrs.common/src/main/java/org/gvsig/crs/gui/CRSMainTrPanel.java
68 68
import org.gvsig.crs.gui.panels.TransformationNadgridsPanel;
69 69
import org.gvsig.crs.gui.panels.TransformationRecentsPanel;
70 70
import org.gvsig.crs.gui.panels.TransformationVistaPanel;
71
import org.gvsig.fmap.crs.CRSFactory;
71 72
import org.slf4j.Logger;
72 73
import org.slf4j.LoggerFactory;
73 74

  
......
137 138
	String dataSource = "";
138 139
	ICrs curProj = null;
139 140
	
141
	public CRSMainTrPanel(ICrs proj) {
142
            // Para evitar errores, si no disponemos de target creamos uno
143
            // por defecto.
144
            ICrs crs = (ICrs) CRSFactory.getCRS("EPSG:4326");
145
            int target = crs.getCode();
146
            CrsWkt crsWkttarget = crs.getCrsWkt();
147
            initialize(target, crsWkttarget, proj);
148
        }
149
        
140 150
	public CRSMainTrPanel(int target, CrsWkt crsWkttarget, ICrs proj) {			
141
		curProj = proj;
151
            initialize(target, crsWkttarget, proj);
152
        }
153
	
154
        private void initialize(int target, CrsWkt crsWkttarget, ICrs proj) {
155
                curProj = proj;
142 156
		crsMainPanel = new CRSMainPanel(target, curProj);		
143 157
		viewPan = crsMainPanel;
144 158
		
org.gvsig.projection.jcrs/trunk/org.gvsig.projection.app.jcrs/org.gvsig.projection.app.jcrs.common/src/main/java/org/gvsig/crs/gui/CRSSelectionTrDialog.java
106 106
    public JPanel getContentPanel() {
107 107
        if (contentPane == null) {	    	
108 108
            IProjection projectionOfActiveView = getProjectionOfActiveView();
109
            int target = ((ICrs) projectionOfActiveView).getCode();
110
            CrsWkt crsWktTarget = ((ICrs) projectionOfActiveView).getCrsWkt();
111
            if (crsWktTarget.getDatumName().equals("")){	    		
109
            if( projectionOfActiveView!=null ) {
110
                int target = ((ICrs) projectionOfActiveView).getCode();
111
                CrsWkt crsWktTarget = ((ICrs) projectionOfActiveView).getCrsWkt();
112
                if (crsWktTarget.getDatumName().equals("")){	    		
113
                }
114
                contentPane = new CRSMainTrPanel(target, crsWktTarget, curProj);        	
115
            } else {
116
                contentPane = new CRSMainTrPanel(curProj);        	
112 117
            }
113
            contentPane = new CRSMainTrPanel(target, crsWktTarget, curProj);        	
114 118

  
115 119
        }
116 120
        return contentPane;

Also available in: Unified diff