Revision 43213
trunk/org.gvsig.desktop/org.gvsig.desktop.library/org.gvsig.fmap.control/pom.xml | ||
---|---|---|
105 | 105 |
<artifactId>org.gvsig.timesupport.lib.api</artifactId> |
106 | 106 |
<scope>compile</scope> |
107 | 107 |
</dependency> |
108 |
<dependency> |
|
109 |
<groupId>org.swinglabs</groupId> |
|
110 |
<artifactId>swing-layout</artifactId> |
|
111 |
<scope>compile</scope> |
|
112 |
</dependency> |
|
108 | 113 |
|
109 | 114 |
<!-- TEST --> |
110 | 115 |
|
111 | 116 |
trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.projection/org.gvsig.projection.cresques/org.gvsig.projection.cresques.ui/pom.xml | ||
---|---|---|
13 | 13 |
<dependencies> |
14 | 14 |
<dependency> |
15 | 15 |
<groupId>org.gvsig</groupId> |
16 |
<artifactId>org.gvsig.andami</artifactId> |
|
17 |
<scope>compile</scope> |
|
18 |
</dependency> |
|
19 |
<dependency> |
|
20 |
<groupId>org.gvsig</groupId> |
|
21 | 16 |
<artifactId>org.gvsig.projection.api</artifactId> |
22 | 17 |
<scope>compile</scope> |
23 | 18 |
</dependency> |
24 | 19 |
<dependency> |
25 | 20 |
<groupId>org.gvsig</groupId> |
26 | 21 |
<artifactId>org.gvsig.projection.cresques.impl</artifactId> |
27 |
<version>${project.version}</version> |
|
28 | 22 |
<scope>compile</scope> |
29 | 23 |
</dependency> |
30 | 24 |
<dependency> |
... | ... | |
37 | 31 |
<artifactId>org.gvsig.tools.lib</artifactId> |
38 | 32 |
<scope>compile</scope> |
39 | 33 |
</dependency> |
40 |
|
|
41 |
<!-- |
|
42 |
<dependency> |
|
43 |
<groupId>org.geotools</groupId> |
|
44 |
<artifactId>gt2-legacy</artifactId> |
|
45 |
<scope>compile</scope> |
|
46 |
</dependency> |
|
47 |
<dependency> |
|
48 |
<groupId>org.geotools</groupId> |
|
49 |
<artifactId>gt2-main</artifactId> |
|
50 |
<scope>compile</scope> |
|
51 |
</dependency> |
|
52 |
<dependency> |
|
53 |
<groupId>org.geotools</groupId> |
|
54 |
<artifactId>gt2-referencing</artifactId> |
|
55 |
<scope>compile</scope> |
|
56 |
</dependency> |
|
57 |
<dependency> |
|
58 |
<groupId>geojava</groupId> |
|
59 |
<artifactId>geojava</artifactId> |
|
60 |
<scope>compile</scope> |
|
61 |
</dependency> |
|
62 |
<dependency> |
|
63 |
<groupId>javax.media</groupId> |
|
64 |
<artifactId>jai_core</artifactId> |
|
65 |
<scope>compile</scope> |
|
66 |
</dependency> |
|
67 |
<dependency> |
|
68 |
<groupId>javax.media</groupId> |
|
69 |
<artifactId>jai_codec</artifactId> |
|
70 |
<scope>compile</scope> |
|
71 |
</dependency> |
|
72 |
--> |
|
73 | 34 |
</dependencies> |
74 | 35 |
|
75 | 36 |
</project> |
trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.projection/org.gvsig.projection.cresques/org.gvsig.projection.cresques.ui/src/main/java/org/gvsig/app/gui/panels/crs/ISelectCrsPanel.java | ||
---|---|---|
24 | 24 |
package org.gvsig.app.gui.panels.crs; |
25 | 25 |
|
26 | 26 |
import org.cresques.cts.IProjection; |
27 |
import org.gvsig.andami.ui.mdiManager.IWindow;
|
|
27 |
import org.gvsig.tools.swing.api.Component;
|
|
28 | 28 |
|
29 | 29 |
|
30 |
public interface ISelectCrsPanel extends IWindow {
|
|
31 |
public IProjection getProjection();
|
|
30 |
public interface ISelectCrsPanel extends Component {
|
|
31 |
public IProjection getProjection();
|
|
32 | 32 |
public void setProjection(IProjection proj); |
33 | 33 |
public boolean isOkPressed(); |
34 | 34 |
} |
trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.projection/org.gvsig.projection.cresques/org.gvsig.projection.cresques.ui/src/main/java/org/gvsig/app/project/documents/view/info/gui/CSSelectionDialog.java | ||
---|---|---|
26 | 26 |
*/ |
27 | 27 |
package org.gvsig.app.project.documents.view.info.gui; |
28 | 28 |
|
29 |
import java.awt.Dimension;
|
|
29 |
import javax.swing.JComponent;
|
|
30 | 30 |
|
31 |
import org.cresques.Messages; |
|
32 | 31 |
import org.cresques.cts.IProjection; |
33 | 32 |
import org.cresques.ui.cts.CSSelectionDialogPanel; |
34 |
import org.gvsig.andami.ui.mdiManager.WindowInfo; |
|
35 | 33 |
import org.gvsig.app.gui.panels.crs.ISelectCrsPanel; |
36 | 34 |
|
37 | 35 |
public class CSSelectionDialog extends CSSelectionDialogPanel implements ISelectCrsPanel { |
... | ... | |
95 | 93 |
getProjPanel().setProjection(proj); |
96 | 94 |
} |
97 | 95 |
|
98 |
public WindowInfo getWindowInfo() { |
|
99 |
WindowInfo m_viewinfo = |
|
100 |
new WindowInfo(WindowInfo.MODALDIALOG | WindowInfo.RESIZABLE); |
|
101 |
m_viewinfo.setTitle(Messages.getText("selecciona_sistema_de_referencia")); |
|
102 |
Dimension dim = getPreferredSize(); |
|
103 |
m_viewinfo.setWidth(dim.width); |
|
104 |
m_viewinfo.setHeight(dim.height); |
|
105 |
return m_viewinfo; |
|
106 |
} |
|
107 | 96 |
|
108 |
public Object getWindowProfile() { |
|
109 |
return WindowInfo.DIALOG_PROFILE; |
|
110 |
} |
|
97 |
@Override |
|
98 |
public JComponent asJComponent() { |
|
99 |
return this; |
|
100 |
} |
|
111 | 101 |
|
112 | 102 |
} |
trunk/org.gvsig.desktop/org.gvsig.desktop.plugin/org.gvsig.daltransform.app/org.gvsig.daltransform.app.eventtheme/src/main/java/org/gvsig/app/eventtheme/daltransform/EventThemeTransformPanel.java | ||
---|---|---|
54 | 54 |
import org.gvsig.fmap.dal.feature.FeatureStore; |
55 | 55 |
import org.gvsig.fmap.dal.feature.FeatureType; |
56 | 56 |
import org.gvsig.fmap.mapcontext.MapContext; |
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 |
/** |
... | ... | |
243 | 246 |
}else if (event.getSource() == projectionButton){ |
244 | 247 |
ISelectCrsPanel panel = CRSSelectPanel.getUIFactory().getSelectCrsPanel( |
245 | 248 |
CRSFactory.getCRS(projectionText.getText()), false); |
246 |
PluginServices.getMDIManager().addWindow(panel); |
|
249 |
ToolsSwingLocator.getWindowManager().showWindow( |
|
250 |
panel.asJComponent(), |
|
251 |
ToolsLocator.getI18nManager().getTranslation("selecciona_sistema_de_referencia"), |
|
252 |
WindowManager.MODE.DIALOG |
|
253 |
); |
|
247 | 254 |
if (panel.isOkPressed()) { |
248 | 255 |
IProjection proj = panel.getProjection(); |
249 | 256 |
projectionText.setText(proj.getAbrev()); |
trunk/org.gvsig.desktop/org.gvsig.desktop.plugin/org.gvsig.app/org.gvsig.app.mainplugin/src/main/java/org/gvsig/app/gui/preferencespage/ViewPage.java | ||
---|---|---|
59 | 59 |
import org.gvsig.tools.ToolsLocator; |
60 | 60 |
import org.gvsig.tools.dynobject.DynObject; |
61 | 61 |
import org.gvsig.tools.i18n.I18nManager; |
62 |
import org.gvsig.tools.swing.api.ToolsSwingLocator; |
|
63 |
import org.gvsig.tools.swing.api.windowmanager.WindowManager; |
|
62 | 64 |
import org.gvsig.utils.XMLEntity; |
63 | 65 |
|
64 | 66 |
/** |
... | ... | |
143 | 145 |
public void actionPerformed(ActionEvent e) { |
144 | 146 |
ISelectCrsPanel panel = CRSSelectPanel.getUIFactory().getSelectCrsPanel( |
145 | 147 |
CRSFactory.getCRS(this.txtLabel.getText()), false); |
146 |
PluginServices.getMDIManager().addWindow(panel); |
|
148 |
ToolsSwingLocator.getWindowManager().showWindow( |
|
149 |
panel.asJComponent(), |
|
150 |
ToolsLocator.getI18nManager().getTranslation("selecciona_sistema_de_referencia"), |
|
151 |
WindowManager.MODE.DIALOG |
|
152 |
); |
|
147 | 153 |
if (panel.isOkPressed()) { |
148 | 154 |
this.set(panel.getProjection()); |
149 | 155 |
this.fireChanged(); |
trunk/org.gvsig.desktop/org.gvsig.desktop.plugin/org.gvsig.projection.app/org.gvsig.projection.app.proj4j/src/main/java/org/gvsig/proj/app/mainplugin/CoordinateReferenceSystemSelectionDialog.java | ||
---|---|---|
32 | 32 |
|
33 | 33 |
import org.cresques.cts.IProjection; |
34 | 34 |
|
35 |
import org.gvsig.andami.PluginServices; |
|
36 |
import org.gvsig.andami.ui.mdiManager.IWindow; |
|
37 |
import org.gvsig.andami.ui.mdiManager.WindowInfo; |
|
38 | 35 |
import org.gvsig.app.gui.panels.crs.ISelectCrsPanel; |
39 | 36 |
import org.gvsig.proj.CoordinateReferenceSystem; |
40 | 37 |
import org.gvsig.proj.cts.DefaultIProjection; |
... | ... | |
52 | 49 |
* @author gvSIG Team |
53 | 50 |
*/ |
54 | 51 |
public class CoordinateReferenceSystemSelectionDialog extends JPanel implements |
55 |
IWindow, ISelectCrsPanel {
|
|
52 |
ISelectCrsPanel { |
|
56 | 53 |
|
57 | 54 |
private static final long serialVersionUID = 810773451033764544L; |
58 | 55 |
private boolean okPressed = false; |
... | ... | |
95 | 92 |
} |
96 | 93 |
|
97 | 94 |
@Override |
98 |
public WindowInfo getWindowInfo() { |
|
99 |
WindowInfo m_viewinfo = |
|
100 |
new WindowInfo(WindowInfo.MODALDIALOG | WindowInfo.RESIZABLE); |
|
101 |
m_viewinfo.setTitle(PluginServices.getText(this, |
|
102 |
"selecciona_sistema_de_referencia")); |
|
103 |
Dimension dim = getPreferredSize(); |
|
104 |
m_viewinfo.setWidth(dim.width); |
|
105 |
m_viewinfo.setHeight(dim.height); |
|
106 |
return m_viewinfo; |
|
107 |
} |
|
108 |
|
|
109 |
@Override |
|
110 | 95 |
public boolean isOkPressed() { |
111 | 96 |
return okPressed; |
112 | 97 |
} |
... | ... | |
149 | 134 |
} |
150 | 135 |
|
151 | 136 |
@Override |
152 |
public Object getWindowProfile() {
|
|
153 |
return WindowInfo.DIALOG_PROFILE;
|
|
154 |
} |
|
137 |
public JComponent asJComponent() {
|
|
138 |
return this;
|
|
139 |
}
|
|
155 | 140 |
} |
trunk/org.gvsig.desktop/pom.xml | ||
---|---|---|
754 | 754 |
<version>1.3.3</version> |
755 | 755 |
</dependency> |
756 | 756 |
<dependency> |
757 |
<groupId>org.swinglabs</groupId> |
|
758 |
<artifactId>swing-layout</artifactId> |
|
759 |
<version>1.0.3</version> |
|
760 |
</dependency> |
|
761 |
<dependency> |
|
757 | 762 |
<groupId>tablelayout</groupId> |
758 | 763 |
<artifactId>TableLayout</artifactId> |
759 | 764 |
<version>20050920</version> |
... | ... | |
2603 | 2608 |
|
2604 | 2609 |
<jython.artifactId>jython-standalone</jython.artifactId> |
2605 | 2610 |
<!-- External project versions --> |
2606 |
<gvsig.tools.version>3.0.107</gvsig.tools.version>
|
|
2611 |
<gvsig.tools.version>3.0.108</gvsig.tools.version>
|
|
2607 | 2612 |
<gvsig.proj.version>1.0.4</gvsig.proj.version> |
2608 | 2613 |
<gvsig.projection.api.version>2.0.22</gvsig.projection.api.version> |
2609 | 2614 |
|
Also available in: Unified diff