Revision 10718

View differences:

branches/piloto3d/extensions/extCatalogYNomenclator/build.xml
27 27
	<property name="andamiLibs" location="${andami}/lib"/>
28 28
	<property name="fmapLibs" location="../libFMap/lib" />
29 29
	<property name="compile-classpath" value="${andamiJar}:${gvsigJar}:${dist}/lib/catCliProto.jar:${andamiLibs}/castor-0.9.5.3-xml.jar:${fmapLibs}/cms.jar:${appCatalogDir}/lib/commons-httpclient-2.0.2.jar:${fmapLibs}/driver-manager-1.1.jar:${fmapLibs}/fmap.jar:${fmapLibs}/gdbms-0.8-SNAPSHOT.jar:${andamiLibs}/gvsig-i18n.jar:${andamiLibs}/iver-utiles.jar:${appCatalogDir}/lib/ostermillerutils_1_04_03_for_java_1_4.jar:${dist}/lib/${postgisPlugin}.jar:${fmapLibs}/postgis-jdbc-driver.jar:${fmapLibs}/postgresql-74.213.jar" />
30
	<property name="JavaSourceVersion" value="1.4"/>
31
	<property name="JavaTargetVersion" value="1.4"/>
30 32

  
31 33
    
32 34
  
......
41 43
  	
42 44
  </target>
43 45

  
46
	<target name="import-build-number">
47
	  	<copy todir=".">
48
	  		<fileset file="${buildNumberFile}"/>
49
	  	</copy>
50
	</target>
51

  
44 52
  <target name="generate-without-source"
45 53
  		description="generate the distribution without the source file">
46 54
  		<!-- depends="wcs-driver" -->
......
54 62
    <jar jarfile="${dist}/lib/${catalogPlugin}.jar" basedir="${build}" includes="es/gva/cit/gvsig/catalogClient/**"/>
55 63
  	<jar jarfile="${dist}/lib/${gazzetterPlugin}.jar" basedir="${build}" includes="es/gva/cit/gvsig/gazetteer/**"/>
56 64
  	<copy file="config/config.xml" todir="${dist}"/>
65
  	<copy file="build.number" todir="${dist}"/>
57 66
    <copy file="config/plugin.dtd" todir="${dist}"/>
58 67
    <copy todir="${dist}">
59 68
    	<fileset dir="config" includes="text*.properties"/>
......
88 97
    <!-- Put everything in ${build} into the MyProject-${DSTAMP}.jar file -->
89 98
    <jar jarfile="${dist}/${catalogPlugin}.jar" basedir="${build}"/>
90 99
    <copy file="config/config.xml" todir="${dist}"/>
100
	<copy file="build.number" todir="${dist}"/>
91 101
    <copy file="config/plugin.dtd" todir="${dist}"/>
92 102
    <copy todir="${dist}">
93 103
    	<fileset dir="config" includes="text*.properties"/>
......
127 137
  		<jar jarfile="${dist}/lib/${remoteClientPlugin}.jar" basedir="${remoteClientsDir}/bin"/>
128 138
	    <javac  srcdir="${src}"
129 139
                destdir="${build}"
130
				source="1.4"
131
				target="1.4"
140
	    		source="${JavaSourceVersion}"
141
				target="${JavaTargetVersion}"
132 142
	    		debug="${debug}"
133 143
			   	debuglevel="${debuglevel}"
134 144
	 			classpath="${compile-classpath}" />
......
143 153

  
144 154
	<target name="copy-data-files">
145 155
	  	<copy file="config/config.xml" todir="${dist}"/>
156
		<copy file="build.number" todir="${dist}"/>
146 157
	    <copy file="config/plugin.dtd" todir="${dist}"/>
147 158
	    <copy todir="${dist}">
148 159
	    	<fileset dir="config" includes="text*.properties"/>
branches/piloto3d/extensions/extCatalogYNomenclator/config/text_en.properties
1 1
#Translations for language [en]
2
#Mon Oct 30 09:38:21 CET 2006
2
#Mon Feb 26 16:06:24 CET 2007
3 3
abstract=Abstract
4 4
addLayer=Add Layer
5 5
allWords=Every word
branches/piloto3d/extensions/extCatalogYNomenclator/config/text_gl.properties
1 1
#Translations for language [gl]
2
#Mon Oct 30 09:38:21 CET 2006
3
arcims_load=
2
#Mon Feb 26 16:06:24 CET 2007
3
arcims_load=Carga de ArcIms
4 4
arcims_server_error=Erro no servidor ArcIMS
5 5
catalog_search=B\u00fasqueda de xeodatos
6 6
Error_accediendo_a_los_datos=Erro de acceso aos datos
......
19 19
pluginNotFoundTitle=Carga de capas
20 20
postgisError=Ocorr\u00e9u un erro ao cargar a base de datos
21 21
postgisLoad=Carga de Postgis
22
Recursos\ Disponibles=
22
Recursos\ Disponibles=Recursos Dispo\u00f1\u00edbeis
23 23
search_results=Resultados da b\u00fasqueda
24 24
server=Servidor
25 25
wcsError=Ocorr\u00e9u un erro ao cargar a cobertura
branches/piloto3d/extensions/extCatalogYNomenclator/config/text_cs.properties
1 1
#Translations for language [cs]
2
#Mon Nov 06 09:04:31 CET 2006
2
#Mon Feb 26 16:06:24 CET 2007
3 3
arcims_load=
4 4
arcims_server_error=
5 5
catalog_search=Vyhledat geodata
branches/piloto3d/extensions/extCatalogYNomenclator/config/text_fr.properties
1 1
#Translations for language [fr]
2
#Mon Oct 30 09:38:21 CET 2006
2
#Mon Feb 26 16:06:24 CET 2007
3 3
arcims_load=
4 4
arcims_server_error=
5 5
catalog_search=Rechercher des g\u00e9odonn\u00e9es
branches/piloto3d/extensions/extCatalogYNomenclator/config/text_eu.properties
1 1
#Translations for language [eu]
2
#Mon Oct 30 09:38:21 CET 2006
2
#Mon Feb 26 16:06:24 CET 2007
3 3
arcims_load=
4 4
arcims_server_error=Errorea ArcIMS zerbitzarian
5 5
catalog_search=Geodatuak bilatzea
branches/piloto3d/extensions/extCatalogYNomenclator/config/text_nl.properties
1
#Translations for language [nl]
2
#Mon Feb 26 16:06:24 CET 2007
3
arcims_load=
4
arcims_server_error=
5
catalog_search=
6
Error_accediendo_a_los_datos=
7
gazetteer_connect=
8
gazetteer_search=
9
layer=
10
link=Link
11
linkError=
12
linkLoad=
13
loadWMS=
14
mantainold=
15
metadata_catalog=
16
metadata_tree=
17
parameters=
18
pluginNotFound=
19
pluginNotFoundTitle=
20
postgisError=
21
postgisLoad=
22
Recursos\ Disponibles=
23
search_results=
24
server=
25
wcsError=
26
wcsLoad=
27
wfsError=
28
wfsLoad=
29
wmsError=
0 30

  
branches/piloto3d/extensions/extCatalogYNomenclator/config/text_pl.properties
1
#Translations for language [po]
2
#Mon Mar 12 10:04:20 CET 2007
3
arcims_load=
4
arcims_server_error=
5
catalog_search=
6
Error_accediendo_a_los_datos=
7
gazetteer_connect=
8
gazetteer_search=
9
layer=Wartwa
10
link=\u0141\u0105cze
11
linkError=
12
linkLoad=
13
loadWMS=
14
mantainold=
15
metadata_catalog=
16
metadata_tree=
17
parameters=Parametry
18
pluginNotFound=
19
pluginNotFoundTitle=
20
postgisError=
21
postgisLoad=
22
Recursos\ Disponibles=
23
search_results=
24
server=Serwer
25
wcsError=
26
wcsLoad=
27
wfsError=
28
wfsLoad=
29
wmsError=
0 30

  
branches/piloto3d/extensions/extCatalogYNomenclator/config/text_it.properties
1 1
#Translations for language [it]
2
#Tue Nov 07 12:30:01 CET 2006
2
#Mon Feb 26 16:06:24 CET 2007
3 3
arcims_load=Caricamento ArcIMS
4 4
arcims_server_error=Errore del server ArcIMS
5 5
catalog_search=Ricerca dei geodati
branches/piloto3d/extensions/extCatalogYNomenclator/config/text.properties
1 1
#Translations for language [es]
2
#Mon Oct 30 09:38:21 CET 2006
2
#Mon Feb 26 16:06:24 CET 2007
3 3
abstract=Resumen
4 4
addLayer=A\u00f1adir Capa
5 5
allWords=Todas las palabras
branches/piloto3d/extensions/extCatalogYNomenclator/config/text_ro.properties
1
#Translations for language [ro]
2
#Thu Mar 01 10:01:15 CET 2007
3
arcims_load=
4
arcims_server_error=
5
catalog_search=
6
Error_accediendo_a_los_datos=
7
gazetteer_connect=
8
gazetteer_search=
9
layer=invelis
10
link=Legatura
11
linkError=
12
linkLoad=
13
loadWMS=
14
mantainold=
15
metadata_catalog=
16
metadata_tree=
17
parameters=Parametri
18
pluginNotFound=
19
pluginNotFoundTitle=
20
postgisError=
21
postgisLoad=
22
Recursos\ Disponibles=
23
search_results=
24
server=Server
25
wcsError=
26
wcsLoad=
27
wfsError=
28
wfsLoad=
29
wmsError=
0 30

  
branches/piloto3d/extensions/extCatalogYNomenclator/config/text_zh.properties
1
#Translations for language [en]
2
#Fri Nov 03 13:14:56 CET 2006
1
#Translations for language [zh]
2
#Mon Feb 26 16:06:24 CET 2007
3 3
abstract=\u7b80\u4ecb
4 4
addLayer=\u6dfb\u52a0\u56fe\u5c42
5 5
allWords=\u6240\u6709\u6587\u5b57
......
96 96
provider=\u4f9b\u5e94\u8005
97 97
purpose=\u76ee\u7684
98 98
Recursos\ Disponibles=\u53ef\u7528\u8d44\u6e90
99
reproyectar_aviso=\u56fe\u5c42\u6295\u5f71\u8ddf\u89c6\u56fe\u6295\u5f71\u4e0d\u4e00\u81f4\u3002\n\u6ce8\u610f\: \u5c06\u4f1a\u5728\u4e00\u4e9b\u8f6c\u6362\u65f6\u4e0d\u7cbe\u786e\u3002\n\u8bf7\u9605\u8bfb\u8bf4\u660e
99
reproyectar_aviso=\u56fe\u5c42\u6295\u5f71\u8ddf\u89c6\u56fe\u6295\u5f71\u4e0d\u4e00\u81f4\u3002\n\u6ce8\u610f\: \u5c06\u4f1a\u4e0d\u7cbe\u786e\u5730\u8fd0\u884c\u4e00\u4e9b\u8f6c\u6362\u3002\n\u8bf7\u9605\u8bfb\u8bf4\u660e\u3002
100 100
reproyectar_pregunta=\u60a8\u8981\u91cd\u65b0\u6295\u5f71\u5417?
101 101
resourceLinkColumn=\u94fe\u63a5
102 102
resourceShowColumn=\u663e\u793a
branches/piloto3d/extensions/extCatalogYNomenclator/config/text_ca.properties
1 1
#Translations for language [ca]
2
#Mon Oct 30 09:38:21 CET 2006
3
arcims_load=
2
#Mon Feb 26 16:06:24 CET 2007
3
arcims_load=C\u00e0rrega d'ArcIms
4 4
arcims_server_error=Error en el servidor ArcIMS
5 5
catalog_search=Recerca de geodades
6 6
Error_accediendo_a_los_datos=Error accedint a les dades
......
19 19
pluginNotFoundTitle=C\u00e0rrega de capes
20 20
postgisError=S'ha produ\u00eft un error en carregar la base de dades
21 21
postgisLoad=C\u00e0rrega de Postgis
22
Recursos\ Disponibles=
22
Recursos\ Disponibles=Recursos disponibles
23 23
search_results=Resultats de la recerca
24 24
server=Servidor
25 25
wcsError=S'ha produ\u00eft un error en carregar la cobertura
branches/piloto3d/extensions/extCatalogYNomenclator/config/text_pt.properties
1 1
#Translations for language [pt]
2
#Mon Oct 30 09:38:21 CET 2006
2
#Mon Feb 26 16:06:24 CET 2007
3 3
arcims_load=
4 4
arcims_server_error=
5 5
catalog_search=Pesquisa de geodados
branches/piloto3d/extensions/extCatalogYNomenclator/config/text_de.properties
1 1
#Translations for language [de]
2
#Mon Oct 30 09:38:21 CET 2006
2
#Mon Feb 26 16:06:24 CET 2007
3 3
arcims_load=
4 4
arcims_server_error=
5 5
catalog_search=Suche nach geodaten
branches/piloto3d/extensions/extCatalogYNomenclator/build.number
1 1
#Build Number for ANT. Do not edit!
2
#Wed Jan 31 17:34:42 CET 2007
3
build.number=899
2
#Mon Mar 12 12:41:44 CET 2007
3
build.number=903
branches/piloto3d/extensions/extCatalogYNomenclator/src/es/gva/cit/gvsig/catalogClient/gui/SearchDialog.java
71 71
 * @modified by Jorge Piera
72 72
 */
73 73
public class SearchDialog extends SearchDialogPanel implements
74
		IWindow,ViewPortListener {
75
    private JDialog frame = null;
76
    public WindowInfo m_viewinfo = null;
74
		IWindow,ViewPortListener {    
75
    public WindowInfo m_windowInfo = null;
77 76
   
78
	public SearchDialog(JDialog frame,Object serverConnectFrame,CatalogClient client) {
77
	public SearchDialog(Object serverConnectFrame,CatalogClient client) {
79 78
		super(null,serverConnectFrame,client);
80
		this.frame = frame;
81 79
		setViewChangeListener();		
82 80
		loadViewPortCoordinates();
83 81
	}
......
88 86
	 * XML node returned by the query
89 87
	 */
90 88
	protected void showResults(Collection nodes) {
91
        JDialog panel = new JDialog((Frame) PluginServices.getMainFrame(), false);
92
        Frames.centerFrame(panel,610,418);
93
        panel.setTitle(Messages.getText("search_results")); 
94
        panel.setResizable(false);
95
        
96
        ShowResultsPanel.mustShowThumbnails = true;
97
		ShowResultsDialog dialog =
98
			new ShowResultsDialog(panel,client,nodes,1);
99
		
100
        panel.getContentPane().add(dialog);
101
        panel.show();      
89
	      JDialog panel = new JDialog((Frame) PluginServices.getMainFrame(), false);
90
	        Frames.centerFrame(panel,610,418);
91
	        panel.setTitle(Messages.getText("search_results")); 
92
	        panel.setResizable(false);
93
	        
94
	        ShowResultsPanel.mustShowThumbnails = true;
95
			ShowResultsDialog dialog =
96
				new ShowResultsDialog(panel,client,nodes,1);
97
			
98
	        panel.getContentPane().add(dialog);
99
	        panel.show();   	
102 100
	}
103 101
		
104 102
	/**
105 103
	 * It Closes the dialog
106 104
	 */
107 105
	public void closeJDialog() {
108
	    frame.setVisible(false);
109
		
106
		PluginServices.getMDIManager().closeWindow(this);		
110 107
	}
111 108
	
112 109
	/* (non-Javadoc)
113 110
	 * @see com.iver.andami.ui.mdiManager.View#getViewInfo()
114 111
	 */
115 112
	public WindowInfo getWindowInfo() {
116
	    if (m_viewinfo == null){
117
	        m_viewinfo = new WindowInfo(WindowInfo.MODALDIALOG);
118
	        m_viewinfo.setTitle(getName());
113
	    if (m_windowInfo == null){
114
	    	m_windowInfo = new WindowInfo(WindowInfo.PALETTE);
115
	    	m_windowInfo.setTitle(Messages.getText("catalog_search") + " [" +
116
	              getCurrentServer() + "]");		
117
	    	m_windowInfo.setHeight(125);
118
	    	m_windowInfo.setWidth(525);
119 119
	    }
120
		return m_viewinfo;
120
		return m_windowInfo;
121 121
	}
122 122

  
123 123
	
......
133 133
	  */	 
134 134
	 public void sizeButtonActionPerformed(){
135 135
		 if (isMinimized){
136
	            frame.setSize(525,507);
136
			 	getWindowInfo().setHeight(509);
137
			 	getWindowInfo().setWidth(525);
137 138
	            ppalPanel.setPreferredSize(new Dimension(514,470));
138 139
	            getLowerPanel().setPreferredSize(new Dimension(514,470));
139 140
	            getLowerPanel().setVisible(true);
140
	            frame.setVisible(true);
141 141
	            getUpperPanel().setUpIcon();
142
	        }else{
143
	            frame.setSize(525,163);
144
	            ppalPanel.setPreferredSize(new Dimension(514,150));
145
	            getLowerPanel().setPreferredSize(new Dimension(514,0));
146
	            getLowerPanel().setVisible(false);
147
	            frame.setVisible(true);
148
	            getUpperPanel().setDownIcon();
142
	        }else{	   
143
	        	getWindowInfo().setHeight(165);
144
	        	getWindowInfo().setWidth(525);	        	
145
	        	ppalPanel.setPreferredSize(new Dimension(514,150));
146
	        	getLowerPanel().setPreferredSize(new Dimension(514,0));
147
	        	getLowerPanel().setVisible(false);
148
	        	getUpperPanel().setDownIcon();
149 149
	        }
150
	        isMinimized = !isMinimized;
150
	        isMinimized = !isMinimized;	        
151 151
	 }
152 152
	
153 153
	 /**
......
156 156
	public void returnButtonActionPerformed() {  
157 157
		closeJDialog();
158 158
		ConnectDialog serverConnect = (ConnectDialog)serverConnectFrame;
159
		serverConnect.setVisible(true);
160 159
		serverConnect.getSearchButton().setEnabled(false);
161
		PluginServices.getMDIManager().addWindow(serverConnect);
160
		PluginServices.getMDIManager().addWindow(serverConnect);		
162 161
		
163
		
164 162
	} 
165 163

  
166 164
	 
branches/piloto3d/extensions/extCatalogYNomenclator/src/es/gva/cit/gvsig/catalogClient/gui/ConnectDialog.java
61 61
 * @author luisw
62 62
 */
63 63
public class ConnectDialog extends ServerConnectDialogPanel implements IWindow {
64
    /**
64
	 public WindowInfo m_windowInfo = null;
65
	
66
	/**
65 67
     * Constructor de la ventana de dialogo.
66 68
     */
67 69
    public ConnectDialog() {
......
93 95
        addCurrentHost();
94 96
        closeJDialog();
95 97

  
96
        JDialog panel = new JDialog((Frame) PluginServices.getMainFrame(), false);
97
        Frames.searchDialogPosition(panel, 525, 163);
98
        panel.setTitle(Messages.getText("catalog_search") + " [" +
99
            getCurrentServer() + "]");
100
        panel.setResizable(false);
101

  
102
        SearchDialog dialog = new SearchDialog(panel,this,getClient());
98
        SearchDialog dialog = new SearchDialog(this,getClient());
103 99
        dialog.setCurrentServer(getCurrentServer());
104

  
105
        panel.getContentPane().add(dialog);
106
        panel.show();
100
        PluginServices.getMDIManager().addCentredWindow(dialog);
107 101
    }
108 102

  
109 103
    /**
......
128 122
     * Close the dialog
129 123
     */
130 124
    public void closeJDialog() {
131
        setVisible(false);
132 125
        PluginServices.getMDIManager().closeWindow(ConnectDialog.this);
133 126
    }
134 127

  
......
136 129
     * @see com.iver.andami.ui.mdiManager.View#getViewInfo()
137 130
     */
138 131
    public WindowInfo getWindowInfo() {
139
        WindowInfo m_viewinfo = new WindowInfo(WindowInfo.MODALDIALOG);
140
        m_viewinfo.setTitle(Messages.getText("metadata_catalog"));
141

  
142
        return m_viewinfo;
132
        if (m_windowInfo == null){
133
        	m_windowInfo = new WindowInfo(WindowInfo.MODALDIALOG);
134
        	m_windowInfo.setTitle(Messages.getText("metadata_catalog"));
135
        	m_windowInfo.setHeight(200);
136
        	m_windowInfo.setWidth(600);
137
        }
138
        return m_windowInfo;
143 139
    }
144 140
}
branches/piloto3d/extensions/extCatalogYNomenclator/src/es/gva/cit/gvsig/catalogClient/loaders/WMSLayerLoader.java
41 41
package es.gva.cit.gvsig.catalogClient.loaders;
42 42

  
43 43
import java.io.IOException;
44
import java.lang.reflect.InvocationTargetException;
45 44
import java.net.MalformedURLException;
46 45
import java.net.ProtocolException;
47 46
import java.util.HashMap;
......
51 50
import org.gvsig.i18n.Messages;
52 51

  
53 52
import com.iver.andami.PluginServices;
54
import com.iver.andami.ui.mdiManager.IWindow;
55 53
import com.iver.cit.gvsig.fmap.drivers.UnsupportedVersionException;
56 54
import com.iver.cit.gvsig.fmap.layers.FLayer;
55
import com.iver.cit.gvsig.project.documents.view.gui.View;
57 56
import com.iver.utiles.extensionPoints.ExtensionPoint;
58 57
import com.iver.utiles.extensionPoints.ExtensionPointsSingleton;
59 58

  
......
88 87
		String sLayer = getResource().getName();
89 88
		
90 89
		FLayer flayer;
91
		flayer = createWMSLayer(host, sLayer);
92
		ExtensionPoint extensionPoint = (ExtensionPoint)ExtensionPointsSingleton.getInstance().get("CatalogLayersTOC");
93
		Object[] args = new Object[1];
94
		args[0] = flayer;
95
	
96
		Object wmsPropsPanel;
90
		
97 91
		try {
98
			wmsPropsPanel = extensionPoint.create("OGC:WMS",args);
99
			PluginServices.getMDIManager().addWindow((IWindow)wmsPropsPanel);
92
			flayer = createWMSLayer(host, sLayer);
100 93
			addLayerToView(flayer);
101
		} catch (SecurityException e) {
102
			// TODO Auto-generated catch block
103
			e.printStackTrace();
104
		} catch (IllegalArgumentException e) {
105
			// TODO Auto-generated catch block
106
			e.printStackTrace();
107
		} catch (NoSuchMethodException e) {
108
			// TODO Auto-generated catch block
109
			e.printStackTrace();
110
		} catch (InstantiationException e) {
111
			// TODO Auto-generated catch block
112
			e.printStackTrace();
113
		} catch (IllegalAccessException e) {
114
			// TODO Auto-generated catch block
115
			e.printStackTrace();
116
		} catch (InvocationTargetException e) {
117
			// TODO Auto-generated catch block
118
			e.printStackTrace();
119
		}	
94
		} catch (Exception e) {
95
			throw new LayerLoaderException(e.getMessage(),getWindowMessage());
96
		}   		    
97
		
120 98
	}
121 99
	
122 100
	/**
......
142 120
		Map args = new HashMap();
143 121
		args.put("host",host);
144 122
		args.put("layer",sLayer);
123
		View activeView = 
124
			(View) PluginServices.getMDIManager().getActiveWindow();
125
		args.put("SRS",activeView.getProjection().getAbrev());
145 126
		try {
146 127
			return (FLayer)extensionPoint.create("OGC:WMS", args  );
147 128
		} catch(Exception e) {
branches/piloto3d/extensions/extCatalogYNomenclator/src/es/gva/cit/gvsig/catalogClient/loaders/ARCIMSLayerLoader.java
1 1
package es.gva.cit.gvsig.catalogClient.loaders;
2 2

  
3
import java.io.IOException;
4
import java.net.MalformedURLException;
5
import java.net.ProtocolException;
3 6
import java.util.HashMap;
4 7
import java.util.Map;
5 8

  
9
import org.exolab.castor.xml.ValidationException;
6 10
import org.gvsig.i18n.Messages;
7 11

  
8 12
import com.iver.andami.PluginServices;
13
import com.iver.cit.gvsig.fmap.drivers.UnsupportedVersionException;
9 14
import com.iver.cit.gvsig.fmap.layers.FLayer;
10 15
import com.iver.cit.gvsig.project.documents.view.gui.BaseView;
11 16
import com.iver.utiles.extensionPoints.ExtensionPoint;
......
57 62
 *
58 63
 * $Id$
59 64
 * $Log$
60
 * Revision 1.1.2.2.2.1  2007-01-03 14:47:06  sbayarri
61
 * v10 synch
65
 * Revision 1.1.2.2.2.2  2007-03-12 16:43:07  jcampos
66
 * Upgrade Nomenglator extension
62 67
 *
68
 * Revision 1.1.2.4  2007/01/08 12:16:30  jcampos
69
 * Revert changes
70
 *
63 71
 * Revision 1.1.2.2  2006/11/15 00:08:16  jjdelcerro
64 72
 * *** empty log message ***
65 73
 *
branches/piloto3d/extensions/extCatalogYNomenclator/src/es/gva/cit/gvsig/catalogClient/loaders/LayerLoader.java
44 44
import java.util.TreeMap;
45 45

  
46 46
import com.iver.andami.PluginServices;
47
import com.iver.cit.gvsig.fmap.MapContext;
48
import com.iver.cit.gvsig.fmap.MapContext.LayerEventListener;
49
import com.iver.cit.gvsig.fmap.drivers.DriverIOException;
47 50
import com.iver.cit.gvsig.fmap.layers.FLayer;
51
import com.iver.cit.gvsig.fmap.layers.FLayers;
52
import com.iver.cit.gvsig.fmap.layers.LayerCollectionEvent;
53
import com.iver.cit.gvsig.fmap.layers.LayerCollectionListener;
54
import com.iver.cit.gvsig.gui.WizardPanel;
48 55
import com.iver.cit.gvsig.project.documents.view.gui.BaseView;
49 56

  
57

  
50 58
import es.gva.cit.catalogClient.schemas.discoverer.Resource;
51 59

  
52 60
/**
branches/piloto3d/extensions/extCatalogYNomenclator/src/es/gva/cit/gvsig/gazetteer/DeleteSearchesModule.java
53 53
 *
54 54
 * $Id$
55 55
 * $Log$
56
 * Revision 1.7.2.2.2.2  2007-01-23 13:46:22  sbayarri
57
 * Use BaseView instead of View
56
 * Revision 1.7.2.2.2.3  2007-03-12 16:43:07  jcampos
57
 * Upgrade Nomenglator extension
58 58
 *
59
 * Revision 1.7.2.2.2.1  2007/01/03 14:47:06  sbayarri
60
 * v10 synch
59
 * Revision 1.7.2.4  2007/01/08 12:19:13  jcampos
60
 * Revert changes
61 61
 *
62 62
 * Revision 1.7.2.2  2006/11/15 00:08:16  jjdelcerro
63 63
 * *** empty log message ***
branches/piloto3d/extensions/extCatalogYNomenclator/src/es/gva/cit/gvsig/gazetteer/loaders/FeatureLoader.java
41 41
package es.gva.cit.gvsig.gazetteer.loaders;
42 42

  
43 43
import java.awt.Color;
44
import java.awt.Dimension;
45 44
import java.awt.Toolkit;
46 45
import java.awt.geom.Point2D;
47 46
import java.awt.geom.Rectangle2D;
48 47

  
49 48
import org.cresques.cts.ICoordTrans;
49
import org.cresques.cts.IDatum;
50 50
import org.cresques.cts.IProjection;
51
import org.cresques.cts.ProjectionPool;
51 52

  
52 53
import com.iver.andami.PluginServices;
53 54
import com.iver.cit.gvsig.fmap.MapContext;
......
106 107
	 * @return true or false if fail
107 108
	 */
108 109
	public boolean load(Feature feature, Query query) {
110
		addAndDrawLabel(feature, query.getOptions().getAspect().isKeepOld(),
111
				query.getOptions().getAspect().isPaintCurrent());
112

  
109 113
		BaseView activeView = (BaseView) PluginServices.getMDIManager()
110 114
				.getActiveWindow();
111 115

  
......
113 117
			addAndDrawLabel(feature,
114 118
					query.getOptions().getAspect().isKeepOld(), query
115 119
							.getOptions().getAspect().isPaintCurrent());
116
		} 
120
		}
117 121

  
118 122
		if (query.getOptions().getAspect().isGoTo()) {
119 123
			focusCenter(feature);
......
135 139
		IProjection projection = activeView.getProjection();
136 140
		ViewPort viewPort = activeView.getMapControl().getViewPort();
137 141
		Point2D point = getReprojectedPoint(feature.getCoordinates());
138

  
142
		
143
		
139 144
		Rectangle2D zoomExtent = null;
140 145
		if (viewPort.getAdjustedExtent() == null) {
141
			 IProjection a = activeView.getMapControl().getViewPort().getProjection();
142
			 Rectangle2D ex;
143
			 ex = new Rectangle2D.Double(point.getX(), point.getY(),
144
					 0, 0);
145
			activeView.getMapControl().getMapContext().zoomToExtent(ex);
146
			
147
			double lado = 5;
148
			Rectangle2D extendOri = new Rectangle2D.Double(feature.getCoordinates().getX()
149
					- lado/ 2, feature.getCoordinates().getY() - lado
150
					/ 2, lado, lado);
151
			Rectangle2D extendRepro = coordTrans.convert(extendOri);
146 152

  
153
			activeView.getMapControl().getMapContext().zoomToExtent(extendRepro);
154

  
147 155
		} else {
148 156
			Toolkit kit = Toolkit.getDefaultToolkit();
149 157
			double dpi = kit.getScreenResolution();
......
154 162
			zoomExtent = new Rectangle2D.Double(point.getX()
155 163
					- extent.getWidth() / 2, point.getY() - extent.getHeight()
156 164
					/ 2, extent.getWidth(), extent.getHeight());
157

  
158 165
			activeView.getMapControl().getMapContext().zoomToExtent(zoomExtent);
159 166
		}
160
		System.out.println("estgoy aki");
161 167

  
162 168
	}
163 169

  
branches/piloto3d/extensions/extCatalogYNomenclator/src/es/gva/cit/gvsig/gazetteer/GazetteerModule.java
1 1
/* gvSIG. Sistema de Informaci?n Geogr?fica de la Generalitat Valenciana
2
 *
3
 * Copyright (C) 2004 IVER T.I. and Generalitat Valenciana.
4
 *
5
 * This program is free software; you can redistribute it and/or
6
 * modify it under the terms of the GNU General Public License
7
 * as published by the Free Software Foundation; either version 2
8
 * of the License, or (at your option) any later version.
9
 *
10
 * This program is distributed in the hope that it will be useful,
11
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
12
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
13
 * GNU General Public License for more details.
14
 *
15
 * You should have received a copy of the GNU General Public License
16
 * along with this program; if not, write to the Free Software
17
 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307,USA.
18
 *
19
 * For more information, contact:
20
 *
21
 *  Generalitat Valenciana
22
 *   Conselleria d'Infraestructures i Transport
23
 *   Av. Blasco Ib??ez, 50
24
 *   46010 VALENCIA
25
 *   SPAIN
26
 *
27
 *      +34 963862235
28
 *   gvsig@gva.es
29
 *      www.gvsig.gva.es
30
 *
31
 *    or
32
 *
33
 *   IVER T.I. S.A
34
 *   Salamanca 50
35
 *   46005 Valencia
36
 *   Spain
37
 *
38
 *   +34 963163400
39
 *   dac@iver.es
40
 */
2
*
3
* Copyright (C) 2004 IVER T.I. and Generalitat Valenciana.
4
*
5
* This program is free software; you can redistribute it and/or
6
* modify it under the terms of the GNU General Public License
7
* as published by the Free Software Foundation; either version 2
8
* of the License, or (at your option) any later version.
9
*
10
* This program is distributed in the hope that it will be useful,
11
* but WITHOUT ANY WARRANTY; without even the implied warranty of
12
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
13
* GNU General Public License for more details.
14
*
15
* You should have received a copy of the GNU General Public License
16
* along with this program; if not, write to the Free Software
17
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307,USA.
18
*
19
* For more information, contact:
20
*
21
*  Generalitat Valenciana
22
*   Conselleria d'Infraestructures i Transport
23
*   Av. Blasco Ib??ez, 50
24
*   46010 VALENCIA
25
*   SPAIN
26
*
27
*      +34 963862235
28
*   gvsig@gva.es
29
*      www.gvsig.gva.es
30
*
31
*    or
32
*
33
*   IVER T.I. S.A
34
*   Salamanca 50
35
*   46005 Valencia
36
*   Spain
37
*
38
*   +34 963163400
39
*   dac@iver.es
40
*/
41 41
package es.gva.cit.gvsig.gazetteer;
42 42

  
43 43
import java.util.Calendar;
......
53 53

  
54 54
import es.gva.cit.gvsig.gazetteer.gui.ConnectDialog;
55 55

  
56

  
56 57
/**
57 58
 * @author Jorge Piera Llodra (piera_jor@gva.es)
58 59
 */
59
public class GazetteerModule extends Extension {
60
public class GazetteerModule extends Extension{
60 61

  
61
	public static void main(String[] args) {
62
	}
62
    public static void main(String[] args) {
63
    }
63 64

  
64
	/*
65
	 * (non-Javadoc)
66
	 * 
67
	 * @see com.iver.andami.plugins.Extension#inicializar()
68
	 */
69
	public void initialize() {
70
		System.out.println("A?ado GazetteerModule");
65
    /* (non-Javadoc)
66
     * @see com.iver.andami.plugins.Extension#inicializar()
67
     */
68
    public void initialize() {
69
        System.out.println("A?ado GazetteerModule");
70
        
71
    }
71 72

  
72
	}
73

  
74
	/*
75
	 * (non-Javadoc)
76
	 * 
77
	 * @see com.iver.andami.plugins.Extension#execute(java.lang.String)
78
	 */
79
	public void execute(String actionCommand) {
80
		// JToolBar toolBar =
81
		// (JToolBar)PluginServices.getMainFrame().getComponentByName("Catalogo");
82
		// System.out.println("gjkmgbghb");
83
		// for (int i=0 ; i<toolBar.getComponentCount() ; i++){
84
		// System.out.println(((JButton)toolBar.getComponentAtIndex(i)).getName());
85
		// }
86
		actionConnectDialogStart();
87
	}
88

  
89
	/**
90
	 * 
91
	 * 
92
	 */
93
	private void actionConnectDialogStart() {
73
    /* (non-Javadoc)
74
     * @see com.iver.andami.plugins.Extension#execute(java.lang.String)
75
     */
76
    public void execute(String actionCommand) {
77
//    	JToolBar toolBar = (JToolBar)PluginServices.getMainFrame().getComponentByName("Catalogo");
78
//    	System.out.println("gjkmgbghb");
79
//    		for (int i=0 ; i<toolBar.getComponentCount() ; i++){
80
//    			System.out.println(((JButton)toolBar.getComponentAtIndex(i)).getName());
81
//    		}    		
82
    		actionConnectDialogStart();
83
    }
84
    
85
    /**
86
     * 
87
     *
88
     */
89
    private void actionConnectDialogStart() {
94 90
		System.out.println("Bot?n de Gazeteer pulsado");
95 91
		restoreServerList();
96 92
		ConnectDialog connectDialog = new ConnectDialog();
97 93
		PluginServices.getMDIManager().addWindow(connectDialog);
98 94
	}
95
    
96
    private void restoreServerList() {
97
    	ServerDataPersistence persistence = new ServerDataPersistence(this,ServerData.SERVER_TYPE_GAZETTEER);
98
        
99
        ServerData[] servers = persistence.getArrayOfServerData();
100
        
101
        boolean found = false;
102
        for (int i=0 ; i<servers.length ; i++){
103
            if (servers[i].getServiceType().equals(ServerData.SERVER_TYPE_GAZETTEER)){
104
                found = true;
105
            }
106
        }       
107
        
108
        if (!found){
109
            if (servers.length == 0){
110
                servers = getDefaultServers();
111
            }else{
112
                ServerData[] newServers = new ServerData[servers.length + getDefaultServers().length ];
113
                System.arraycopy(servers, 0, newServers, 0, servers.length);
114
                System.arraycopy(getDefaultServers(), 0, newServers, servers.length, getDefaultServers().length);
115
                servers = newServers;
116
            }
117
            persistence.setArrayOfServerData(servers);
118
        }
119
         
120
        for (int i = 0; i < servers.length; i++) {
121
            if (servers[i].getServiceType().equals(ServerData.SERVER_TYPE_GAZETTEER)){
122
                ConnectDialog.addServer(servers[i]);
123
            }
124
        }
125
	}		
99 126

  
100
	private void restoreServerList() {
101
		ServerDataPersistence persistence = new ServerDataPersistence(this,
102
				ServerData.SERVER_TYPE_GAZETTEER);
103

  
104
		ServerData[] servers = persistence.getArrayOfServerData();
105

  
106
		boolean found = false;
107
		for (int i = 0; i < servers.length; i++) {
108
			if (servers[i].getServiceType().equals(
109
					ServerData.SERVER_TYPE_GAZETTEER)) {
110
				found = true;
111
			}
112
		}
113

  
114
		if (!found) {
115
			if (servers.length == 0) {
116
				servers = getDefaultServers();
117
			} else {
118
				ServerData[] newServers = new ServerData[servers.length
119
						+ getDefaultServers().length];
120
				System.arraycopy(servers, 0, newServers, 0, servers.length);
121
				System.arraycopy(getDefaultServers(), 0, newServers,
122
						servers.length, getDefaultServers().length);
123
				servers = newServers;
124
			}
125
			persistence.setArrayOfServerData(servers);
126
		}
127

  
128
		for (int i = 0; i < servers.length; i++) {
129
			if (servers[i].getServiceType().equals(
130
					ServerData.SERVER_TYPE_GAZETTEER)) {
131
				ConnectDialog.addServer(servers[i]);
132
			}
133
		}
134
	}
135

  
136 127
	/**
137 128
	 * It creates a server list by default
138
	 * 
139 129
	 * @return
140 130
	 */
141
	private ServerData[] getDefaultServers() {
142
		ServerData[] servers = new ServerData[3];
143
		Calendar cal = new GregorianCalendar();
144
		Date date = cal.getTime();
131
	private ServerData[] getDefaultServers(){
132
	    ServerData[] servers = new ServerData[3];
133
	    Calendar cal = new GregorianCalendar();
134
        Date date = cal.getTime();
135
	    
136
	    servers[0] = new ServerData("http://middleware.alexandria.ucsb.edu:8080/gaz/adlgaz/dispatch",date,date,ServerData.SERVER_TYPE_GAZETTEER,ServerData.SERVER_SUBTYPE_GAZETTEER_ADL);
137
        servers[1] = new ServerData("http://demo.deegree.org:8080/gazetteer/wfs-g",date,date,ServerData.SERVER_TYPE_GAZETTEER,ServerData.SERVER_SUBTYPE_GAZETTEER_WFSG);
138
        servers[2] = new ServerData("http://193.144.250.29/webservices/services/IDEC_GeoServeisPort",date,date,ServerData.SERVER_TYPE_GAZETTEER,ServerData.SERVER_SUBTYPE_GAZETTEER_IDEC);
139
               
140
        return servers;    
141
    }
145 142

  
146
		servers[0] = new ServerData(
147
				"http://middleware.alexandria.ucsb.edu:8080/gaz/adlgaz/dispatch",
148
				date, date, ServerData.SERVER_TYPE_GAZETTEER,
149
				ServerData.SERVER_SUBTYPE_GAZETTEER_ADL);
150
		servers[1] = new ServerData(
151
				"http://demo.deegree.org:8080/gazetteer/wfs-g", date, date,
152
				ServerData.SERVER_TYPE_GAZETTEER,
153
				ServerData.SERVER_SUBTYPE_GAZETTEER_WFSG);
154
		servers[2] = new ServerData(
155
				"http://193.144.250.29/webservices/services/IDEC_GeoServeisPort",
156
				date, date, ServerData.SERVER_TYPE_GAZETTEER,
157
				ServerData.SERVER_SUBTYPE_GAZETTEER_IDEC);
143
    /* (non-Javadoc)
144
     * @see com.iver.andami.plugins.Extension#isEnabled()
145
     */
146
    public boolean isEnabled() {
147
        return true;
148
    }
158 149

  
159
		return servers;
160
	}
161

  
162
	/*
163
	 * (non-Javadoc)
164
	 * 
165
	 * @see com.iver.andami.plugins.Extension#isEnabled()
166
	 */
167
	public boolean isEnabled() {
168
		return true;
169
	}
170

  
171
	/*
172
	 * (non-Javadoc)
173
	 * 
174
	 * @see com.iver.andami.plugins.Extension#isVisible()
175
	 */
176
	public boolean isVisible() {
177
		com.iver.andami.ui.mdiManager.IWindow f = PluginServices
178
				.getMDIManager().getActiveWindow();
179

  
150
    /* (non-Javadoc)
151
     * @see com.iver.andami.plugins.Extension#isVisible()
152
     */
153
    public boolean isVisible() {
154
        com.iver.andami.ui.mdiManager.IWindow f = PluginServices.getMDIManager()
155
		.getActiveWindow();
156
		        
180 157
		if (f == null) {
181 158
			return false;
182 159
		}
183

  
184
		if (f instanceof View) {
185

  
186
			if (((View) f).getMapControl().getViewPort().getAdjustedExtent() != null) {
160
		
161
		if (f instanceof View){
162
			if (((View)f).getMapControl().getViewPort().getAdjustedExtent() != null){
187 163
				return true;
188 164
			}
189 165
		}else if (f instanceof BaseView)
190 166
			return true;
191 167

  
192 168
		return false;
193
	}
169
    }
194 170
}
branches/piloto3d/extensions/extCatalogYNomenclator/src/es/gva/cit/gvsig/gazetteer/gui/SearchDialog.java
70 70
 */
71 71
public class SearchDialog extends SearchDialogPanel
72 72
implements IWindow,ViewPortListener{
73
    private JDialog frame = null;
74
    
75
    public SearchDialog(GazetteerClient client,JDialog frame, Object serverConnectFrame){
73
	 public WindowInfo m_windowInfo = null;
74
       
75
    public SearchDialog(GazetteerClient client,Object serverConnectFrame){
76 76
        super(client,serverConnectFrame);
77
        this.frame = frame;  
77
        
78 78
        setViewChangeListener();	
79 79
    	loadViewPortCoordinates();
80 80
    }
......
83 83
     * @see com.iver.andami.ui.mdiManager.View#getViewInfo()
84 84
     */
85 85
    public WindowInfo getWindowInfo() {
86
        WindowInfo m_viewinfo=new WindowInfo(WindowInfo.MODALDIALOG);
87
		m_viewinfo.setTitle(Messages.getText( "gazetteer_search"));
88
		return m_viewinfo;
86
    	 if (m_windowInfo == null){
87
    		 m_windowInfo = new WindowInfo(WindowInfo.PALETTE);
88
    		 m_windowInfo.setTitle(Messages.getText("gazetteer_search") + " [" +
89
    				 getCurrentServer() + "]");		
90
    		 m_windowInfo.setHeight(80);
91
    		 m_windowInfo.setWidth(525);
92
    	 }
93
    	return m_windowInfo;
94
    	
89 95
    }
90 96
    
91 97
    public void ShowResultsActionPerformed(Feature[] features) {
92
        JDialog panel = new JDialog((Frame) PluginServices.getMainFrame(), false);
93
        Frames.centerFrame(panel,420,258);
94
      panel.setTitle(Messages.getText( "gazetteer_search")); 
95
        panel.setResizable(false);
96
        
97
        ShowResultsDialog dialog = new ShowResultsDialog(panel,
98
                client,
99
                features,
100
                lowerPanel.getNPaginas(),
101
                getQuery());
102
		
103
        panel.getContentPane().add(dialog);
104
        panel.show(); 	 
105
       
106
        //PluginServices.getMDIManager().addView(panel);
107
    }
98
    	JDialog panel = new JDialog((Frame) PluginServices.getMainFrame(), false);
99
    	Frames.centerFrame(panel,420,258);
100
    	panel.setTitle(Messages.getText( "gazetteer_search")); 
101
    	panel.setResizable(false);
102
    	
103
    	ShowResultsDialog dialog = new ShowResultsDialog(panel,
104
    			client,
105
    			features,
106
    			lowerPanel.getNPaginas(),
107
    			getQuery());
108
    	
109
    	panel.getContentPane().add(dialog);
110
    	panel.show(); 
111
     }
108 112
    
109 113
    public void closeButtonActionPerformed() {
110
	     frame.setVisible(false);
114
    	closeJDialog();    	
111 115
	 }
112 116
    
113 117
	 /**
......
115 119
	  */	 
116 120
	 public void sizeButtonActionPerformed(){
117 121
	        if (isMinimized){
118
	        	frame.setSize(525,520);
119
				ppalPanel.setPreferredSize(new Dimension(514,490));
122
	        	getWindowInfo().setHeight(523);
123
			 	getWindowInfo().setWidth(525);
124
	        	ppalPanel.setPreferredSize(new Dimension(514,490));
120 125
				getLowerPanel().setPreferredSize(new Dimension(514,440));
121 126
				getLowerPanel().setVisible(true);
122
				frame.setVisible(true);
123 127
				getUpperPanel().setUpIcon();
124 128
	         }else{
125
	        	frame.setSize(525,117);
126
	 			ppalPanel.setPreferredSize(new Dimension(514,91));
127
	 			getLowerPanel().setPreferredSize(new Dimension(514,0));
128
	 			getLowerPanel().setVisible(false);
129
	 			frame.setVisible(true);
130
	 			getUpperPanel().setDownIcon();
129
	        	 getWindowInfo().setHeight(120);
130
	        	 getWindowInfo().setWidth(525);
131
	        	 ppalPanel.setPreferredSize(new Dimension(514,91));
132
	        	 getLowerPanel().setPreferredSize(new Dimension(514,0));
133
	        	 getLowerPanel().setVisible(false);	 			
134
	        	 getUpperPanel().setDownIcon();
131 135
	        }
132 136
	        isMinimized = !isMinimized;
133 137
	 }
......
143 147
	} 
144 148
    
145 149
    public void closeJDialog() {
146
    	frame.setVisible(false);
150
    	PluginServices.getMDIManager().closeWindow(this);
147 151
	}
148 152
    
149 153
	 /**
branches/piloto3d/extensions/extCatalogYNomenclator/src/es/gva/cit/gvsig/gazetteer/gui/ConnectDialog.java
41 41
package es.gva.cit.gvsig.gazetteer.gui;
42 42

  
43 43

  
44
import java.awt.Frame;
45

  
46
import javax.swing.JDialog;
47

  
48 44
import org.gvsig.i18n.Messages;
49 45

  
50 46
import com.iver.andami.PluginServices;
......
53 49
import com.iver.andami.ui.mdiManager.WindowInfo;
54 50
import com.iver.utiles.swing.jcomboServer.ServerData;
55 51

  
56
import es.gva.cit.catalogClient.utils.Frames;
57 52
import es.gva.cit.gazetteer.ui.serverConnect.ServerConnectDialogPanel;
58 53

  
59 54
/**
......
61 56
 */
62 57
public class ConnectDialog extends ServerConnectDialogPanel
63 58
implements IWindow {
59
	 public WindowInfo m_windowInfo = null;
64 60

  
65 61
    /**
66 62
     * Building the dialog Window
......
85 81
    
86 82
    public void searchButtonActionPerformed() {
87 83
        addCurrentHost();
88
        closeJDialog();
89
		
90
        JDialog panel = new JDialog((Frame) PluginServices.getMainFrame(), false);
91
	    Frames.searchDialogPosition(panel,525,118);
92
	    panel.setTitle(Messages.getText( "gazetteer_search") + " ["+ getCurrentServer()+"]");
93
	    panel.setResizable(false);
94
	    
95
        SearchDialog dialog = new SearchDialog(client,panel,this);
96
		
97
        panel.getContentPane().add(dialog);
98
	    panel.show(); 
84
        closeJDialog();		
85
        
86
        SearchDialog dialog = new SearchDialog(client,this);
87
        dialog.setCurrentServer(getCurrentServer());
88
        PluginServices.getMDIManager().addCentredWindow(dialog);      
99 89
	}
100 90
    
101 91
    /**
......
131 121
	 * @see com.iver.andami.ui.mdiManager.View#getViewInfo()
132 122
	 */
133 123
	public WindowInfo getWindowInfo() {
134
		WindowInfo m_viewinfo=new WindowInfo(WindowInfo.MODALDIALOG);
135
		m_viewinfo.setTitle(Messages.getText( "gazetteer_connect"));
136
	return m_viewinfo;
124
		if (m_windowInfo == null){
125
			m_windowInfo=new WindowInfo(WindowInfo.MODALDIALOG);		
126
			m_windowInfo.setTitle(Messages.getText( "gazetteer_connect"));
127
			m_windowInfo.setHeight(225);
128
			m_windowInfo.setWidth(610);
129
		}
130
	return m_windowInfo;
137 131
	}
138 132

  
139 133
}

Also available in: Unified diff