Revision 648

View differences:

org.gvsig.projection.jcrs/trunk/org.gvsig.projection.jcrs/org.gvsig.projection.app.jcrs/org.gvsig.projection.app.jcrs.common/src/main/java/org/gvsig/crs/JCrsExtension.java
41 41

  
42 42
package org.gvsig.crs;
43 43

  
44
import java.io.File;
45
import java.io.IOException;
46

  
47
import org.apache.commons.io.FileUtils;
48 44
import org.gvsig.andami.IconThemeHelper;
49
import org.gvsig.andami.PluginServices;
50
import org.gvsig.andami.PluginsLocator;
51 45
import org.gvsig.andami.plugins.Extension;
52 46
import org.gvsig.app.gui.panels.CRSSelectPanelFactory;
53 47
import org.gvsig.crs.gui.panels.CrsUIFactory;
org.gvsig.projection.jcrs/trunk/org.gvsig.projection.jcrs/org.gvsig.projection.app.jcrs/org.gvsig.projection.app.jcrs.common/src/main/java/org/gvsig/crs/gui/panels/ProjChooserPanel.java
54 54
import org.gvsig.crs.gui.dialog.CSSelectionDialog;
55 55
import org.gvsig.crs.gui.dialog.TRSelectionDialog;
56 56
import org.gvsig.gui.beans.swing.JButton;
57
import org.gvsig.tools.ToolsLocator;
58
import org.gvsig.tools.swing.api.ToolsSwingLocator;
59
import org.gvsig.tools.swing.api.windowmanager.WindowManager;
57 60

  
58 61

  
59 62
/**
......
136 139
					csSelect.setProjection(curProj);
137 140
					csSelect.initRecents(curProj);
138 141
					//csSelect.setLayout(new GridLayout(0,1));
139
					
140
			        PluginServices.getMDIManager().addWindow(csSelect);
142

  
143
                                        ToolsSwingLocator.getWindowManager().showWindow(
144
                                                csSelect, 
145
                                                ToolsLocator.getI18nManager().getTranslation("nuevo_crs"), 
146
                                                WindowManager.MODE.DIALOG
147
                                        );                                        
141 148
//			        abrev = curProj.getAbrev();
142 149
			        abrev = dataSource+ ":" +String.valueOf(curProj.getCode());
143 150
			        if (csSelect.isOkPressed()) {
......
164 171
			        
165 172
					trSelect.setLayout(new GridLayout(0,1));
166 173
					
167
					PluginServices.getMDIManager().addWindow(trSelect);
174
                                        ToolsSwingLocator.getWindowManager().showWindow(
175
                                                trSelect, 
176
                                                ToolsLocator.getI18nManager().getTranslation("crsAndTransformation"), 
177
                                                WindowManager.MODE.DIALOG
178
                                        );
168 179
					setTargetNad(trSelect.getTargetNad());
169 180
			        //abrev = curProj.getAbrev();
170 181
					
org.gvsig.projection.jcrs/trunk/org.gvsig.projection.jcrs/org.gvsig.projection.app.jcrs/org.gvsig.projection.app.jcrs.common/src/main/java/org/gvsig/crs/gui/listeners/CRSSelectionDialogListener.java
112 112
        		RecentCRSsPersistence persistence = new RecentCRSsPersistence();
113 113
        		persistence.addCrsData(crsData);
114 114
        		
115
        		
116
        		PluginServices.getMDIManager().closeWindow(dialog);
115
        		dialog.setVisible(false);
117 116
        		dialog.setOkPressed(true);
118 117
			}
119 118
        	else {
......
123 122
		
124 123
		if (e.getSource() == dialog.getCrsMainPanel().getJButtonCancel()){
125 124
			dialog.setProjection(dialog.getLastProj());
126
            PluginServices.getMDIManager().closeWindow(dialog);
125
            dialog.setVisible(false);
127 126
            dialog.setOkPressed(false);
128 127
		}
129 128

  
......
440 439
	        		RecentCRSsPersistence persistence = new RecentCRSsPersistence();
441 440
	        		persistence.addCrsData(crsData);
442 441
	        		
443
	        		PluginServices.getMDIManager().closeWindow(dialog);
442
	        		dialog.setVisible(false);
444 443
	        		dialog.setOkPressed(true);
445 444
				}
446 445
	        	else dialog.setOkPressed(false);	        	
......
470 469
	        		RecentCRSsPersistence persistence = new RecentCRSsPersistence();
471 470
	        		persistence.addCrsData(crsData);
472 471
	        		
473
	        		PluginServices.getMDIManager().closeWindow(dialog);
472
                                dialog.setVisible(false);
474 473
	        		dialog.setOkPressed(true);
475 474
				}
476 475
	        	else dialog.setOkPressed(false);	        		
......
500 499
	        		RecentCRSsPersistence persistence = new RecentCRSsPersistence();
501 500
	        		persistence.addCrsData(crsData);	        		
502 501
	        		
503
	        		PluginServices.getMDIManager().closeWindow(dialog);
502
                                dialog.setVisible(false);
504 503
	        		dialog.setOkPressed(true);
505 504
				}
506 505
	        	else dialog.setOkPressed(false);	        		
......
531 530
                    RecentCRSsPersistence persistence = new RecentCRSsPersistence();
532 531
                    persistence.addCrsData(crsData);                    
533 532
                    
534
                    PluginServices.getMDIManager().closeWindow(dialog);
533
                    dialog.setVisible(false);
535 534
                    dialog.setOkPressed(true);
536 535
                }
537 536
                else dialog.setOkPressed(false);                    
......
563 562
	        		RecentCRSsPersistence persistence = new RecentCRSsPersistence();
564 563
	        		persistence.addCrsData(crsData);	        		
565 564
	        		
566
	        		PluginServices.getMDIManager().closeWindow(dialog);
565
                                dialog.setVisible(false);
567 566
	        		dialog.setOkPressed(true);
568 567
				}
569 568
	        	else dialog.setOkPressed(false);	        		
......
593 592
	        		RecentCRSsPersistence persistence = new RecentCRSsPersistence();
594 593
	        		persistence.addCrsData(crsData);	        		
595 594
	        		
596
	        		PluginServices.getMDIManager().closeWindow(dialog);
595
                                dialog.setVisible(false);
597 596
	        		dialog.setOkPressed(true);
598 597
				}
599 598
	        	else dialog.setOkPressed(false);	        		
org.gvsig.projection.jcrs/trunk/org.gvsig.projection.jcrs/org.gvsig.projection.app.jcrs/org.gvsig.projection.app.jcrs.common/src/main/java/org/gvsig/crs/gui/CRSSelectionDialog.java
40 40

  
41 41
package org.gvsig.crs.gui;
42 42

  
43
import javax.swing.JComponent;
43 44
import javax.swing.JPanel;
44 45
import javax.swing.ListSelectionModel;
45 46

  
46 47
import org.cresques.cts.IProjection;
47
import org.gvsig.andami.PluginServices;
48
import org.gvsig.andami.ui.mdiManager.IWindow;
49
import org.gvsig.andami.ui.mdiManager.WindowInfo;
50 48
import org.gvsig.app.gui.panels.crs.ISelectCrsPanel;
51 49
import org.gvsig.crs.ICrs;
52 50
import org.gvsig.crs.gui.listeners.CRSSelectionDialogListener;
......
62 60
 * @author Diego Guerrero Sevilla (diego.guerrero@uclm.es)
63 61
 */
64 62
public class CRSSelectionDialog extends JPanel
65
	implements  IWindow, ISelectCrsPanel{
63
	implements  ISelectCrsPanel{
66 64
	
67 65
	private static final long serialVersionUID = 1L;	
68 66
	
......
175 173
		return dataSource;
176 174
	}
177 175
	
178
	public WindowInfo getWindowInfo() {
179
		WindowInfo m_viewinfo=new WindowInfo(WindowInfo.MODALDIALOG);
180
   		m_viewinfo.setTitle(PluginServices.getText(this, "nuevo_crs"));
181
		return m_viewinfo;
182
	}
183

  
184 176
	public IProjection getLastProj() {
185 177
		return lastProj;
186 178
	}
......
197 189
		return crsMainPanel;
198 190
	}
199 191

  
200
	public Object getWindowProfile() {
201
		return WindowInfo.DIALOG_PROFILE;
202
	}
192
    @Override
193
    public JComponent asJComponent() {
194
        return this;
195
    }
203 196
}
org.gvsig.projection.jcrs/trunk/org.gvsig.projection.jcrs/org.gvsig.projection.app.jcrs/org.gvsig.projection.app.jcrs.common/src/main/java/org/gvsig/crs/gui/dialog/TRSelectionDialog.java
5 5

  
6 6
import java.awt.FlowLayout;
7 7
import java.awt.GridLayout;
8
import javax.swing.JComponent;
8 9

  
9
import org.cresques.cts.IProjection;
10
import org.gvsig.andami.PluginServices;
11
import org.gvsig.andami.ui.mdiManager.IWindow;
12
import org.gvsig.andami.ui.mdiManager.WindowInfo;
13 10
import org.gvsig.app.gui.panels.crs.ISelectCrsPanel;
14 11
import org.gvsig.crs.ICrs;
15 12
import org.gvsig.crs.gui.CRSSelectionTrDialog;
......
19 16
 * @author Luis W. Sevilla (sevilla_lui@gva.es)
20 17
 */
21 18
public class TRSelectionDialog
22
	extends CRSSelectionTrDialog implements IWindow, ISelectCrsPanel{
19
	extends CRSSelectionTrDialog implements ISelectCrsPanel{
23 20
	/**
24 21
	 * 
25 22
	 */
......
57 54
	public String getProjectionName(){
58 55
		return (String) getProjPanel().getProjection().getCrsWkt().getName();				
59 56
	}
60
	public WindowInfo getWindowInfo() {
61
		WindowInfo m_viewinfo=new WindowInfo(WindowInfo.MODALDIALOG);
62
   		m_viewinfo.setTitle(PluginServices.getText(this, "crsAndTransformation"));
63
   		//definir anchura y altura
64
   		m_viewinfo.setWidth(650);
65
   		m_viewinfo.setHeight(350);
66
		return m_viewinfo;
67
	}
68
	public Object getWindowProfile() {
69
		return WindowInfo.DIALOG_PROFILE;
70
	}
57

  
58
    @Override
59
    public JComponent asJComponent() {
60
        return this;
61
    }
71 62
}

Also available in: Unified diff