Revision 15406

View differences:

import/ext3D/branches/ext3D_v1.1/ext3Dgui/build.xml
11 11
	<property name="logos-dir" location="../_fwAndami/theme" />
12 12
	<property name="gvsig-lib" location="../_fwAndami/gvSIG/extensiones/com.iver.cit.gvsig/lib" />
13 13
	<property name="ext3Dgui-lib" value="../_fwAndami/gvSIG/extensiones/com.iver.ai2.gvsig3dgui/lib" />
14
	
14

  
15 15
	<!--property name="binaries-dir" location="../binaries" /-->
16 16

  
17 17
	<target name="batch-build" description="Builds all. This is called by appgvSIG script" depends="distribution">
......
27 27
	<target name="distribution" description="increment build number and generate the distribution without the source file" depends="buildNumber,generate-without-source">
28 28
	</target>
29 29

  
30
	<target name="init">		
30
	<target name="init">
31 31
		<!-- Create the time stamp -->
32 32
		<tstamp />
33 33
		<!-- Create the build directory structure used by compile -->
......
43 43
		<mkdir dir="${dist}/lib" />
44 44
		<!--mkdir dir="${dist}/binaries" /-->
45 45
		<!-- Put everything in ${build} into the MyProject-${DSTAMP}.jar file
46
         Except classes to be instantiated in core gvSIG -->		
46
         Except classes to be instantiated in core gvSIG -->
47 47
		<jar jarfile="${dist}/lib/${plugin}.jar" basedir="${build}" />
48 48

  
49 49
		<copy file="config/config.xml" todir="${dist}" />
......
54 54
			<fileset dir="config" includes="text*.properties" />
55 55
		</copy>
56 56
		<copy todir="${dist}/images">
57
			<fileset dir="images/" includes="**/**" excludes="**/*.db"/>
58
		</copy>	
59
		
57
			<fileset dir="images/" includes="**/**" excludes="**/*.db" />
58
		</copy>
59

  
60 60
		<!--copy todir="lib/">			
61 61
			<fileset dir="${dist}/lib/" includes="*.jar" />
62 62
		</copy-->
63
		
63

  
64 64
		<copy todir="${dist}/lib">
65 65
			<fileset dir="lib/" includes="**/**" />
66
		</copy>		
66
		</copy>
67 67
		<copy todir="${extension-dir}/${plugin}">
68 68
			<fileset dir="${dist}" includes="**/**" />
69 69
		</copy>
70
		<delete dir="${dist}"/>	
70
		<delete dir="${dist}" />
71 71
	</target>
72
	
73
	<target name="clean" description="clean up" >				
74
		<delete dir="${dist}"/>	
75
		<delete dir="${build}"/>	
72

  
73
	<target name="clean" description="clean up">
74
		<delete dir="${dist}" />
75
		<delete dir="${build}" />
76 76
	</target>
77
	
77

  
78 78
	<target name="copy-images">
79 79
		<mkdir dir="${logos-dir}" />
80 80
		<copy todir="${logos-dir}">
......
91 91

  
92 92
	<!-- Properties to base3D -->
93 93
	<property name="andami" location="../_fwAndami" />
94
	<property name="utiles" location="../libIverUtiles" />
95
	<property name="core" location="../JDialogSkin" />
96
	<property name="driver" location="../libDriverManager" />
97
	<property name="cms" location="../libCq_CMS_praster" />
98
	<!--property name="cms" location="../libCq CMS for java" /-->
94
	<property name="core" location="../JDialogSkin" />
95
	<property name="projection" location="../libProjection" />
96
	<property name="raster" location="../libRaster" />
97
	<property name="dxf" location="../libDXF" />
98
	<property name="remote" location="../libRemoteServices" />
99
	<property name="gdbms" location="../libGDBMS" />
99 100
	<property name="fmap" location="../libFMap" />
100
	<property name="gvSIG" location="../appgvSIG" />
101
	<property name="remote" location="../libRemoteServices" />
102
	<property name="gdbms" location="../libGDBMS" />
103
	<property name="i18n" location="../libInternationalization" />
104
	<property name="global.installBaseDir" location="${andami}" />
105
	<property name="libui" location="../libUIComponent_praster" />
101
	<property name="gvSIG" location="../appgvSIG" />
102
	<property name="rasterToolSE" location="../extRasterTools-SE" />
103
	<property name="appcatalog" location="../appCatalogAndGazetteerClient" />
104
	<property name="catalog" location="../extCatalogAndGazetteer" />
106 105

  
107 106
	<!-- Properties to extension3D -->
108
	<property name="appcatalog" location="../appCatalogYNomenclatorClient" />
109
	<property name="catalog" location="../extCatalogYNomenclator" />
110 107
	<property name="wcs" location="../extWCS" />
111 108
	<property name="wfs" location="../extWFS2" />
112 109
	<property name="wms" location="../extWMS" />
......
120 117
	</target>
121 118

  
122 119
	<target name="base3D" description="Builds the application for 3D">
123
		<ant dir="${i18n}" target="batch-build" inheritAll="false">
124
			<property name="debug" value="${debug}" />
125
			<property name="debuglevel" value="${debuglevel}" />
126
			<property name="encoding" value="ISO_8859_1" />
127
		</ant>
128
		<ant dir="${utiles}" target="batch-build" inheritAll="false">
129
			<property name="debug" value="${debug}" />
130
			<property name="debuglevel" value="${debuglevel}" />
131
			<property name="encoding" value="ISO_8859_1" />
132
		</ant>
133 120
		<ant dir="${andami}" target="batch-build" inheritAll="false">
134 121
			<property name="debug" value="${debug}" />
135 122
			<property name="debuglevel" value="${debuglevel}" />
136 123
			<property name="encoding" value="ISO_8859_1" />
137 124
		</ant>
138
		<ant dir="${libui}" target="batch-build" inheritAll="false">
139
			<property name="debug" value="${debug}" />
140
			<property name="debuglevel" value="${debuglevel}" />
141
			<property name="installBaseDir" value="${global.installBaseDir}" />
142
			<property name="encoding" value="ISO_8859_1" />
143
		</ant>
144 125
		<ant dir="${core}" target="batch-build" inheritAll="false">
145 126
			<property name="debug" value="${debug}" />
146 127
			<property name="debuglevel" value="${debuglevel}" />
147 128
			<property name="encoding" value="ISO_8859_1" />
148
		</ant>
149
		<ant dir="${cms}" target="batch-build" inheritAll="false">
150
			<property name="debug" value="${debug}" />
151
			<property name="debuglevel" value="${debuglevel}" />
152
			<property name="encoding" value="ISO_8859_1" />
153
		</ant>
154
		<ant dir="${driver}" target="batch-build" inheritAll="false">
155
			<property name="debug" value="${debug}" />
156
			<property name="debuglevel" value="${debuglevel}" />
157
			<property name="encoding" value="ISO_8859_1" />
158
		</ant>
159
		<ant dir="${remote}" target="batch-build" inheritAll="false">
160
			<property name="debug" value="${debug}" />
161
			<property name="debuglevel" value="${debuglevel}" />
162
			<property name="encoding" value="ISO_8859_1" />
163
		</ant>
164
		<ant dir="${fmap}" target="batch-build" inheritAll="false">
165
			<property name="debug" value="${debug}" />
166
			<property name="debuglevel" value="${debuglevel}" />
167
			<property name="encoding" value="ISO_8859_1" />
168
		</ant>
129
		</ant>
130
		<ant dir="${projection}" target="batch-build" inheritAll="false">
131
			<property name="debug" value="${debug}" />
132
			<property name="debuglevel" value="${debuglevel}" />
133
			<property name="encoding" value="ISO_8859_1" />
134
		</ant>
135
		<ant dir="${raster}" target="batch-build" inheritAll="false">
136
			<property name="debug" value="${debug}" />
137
			<property name="debuglevel" value="${debuglevel}" />
138
			<property name="encoding" value="ISO_8859_1" />
139
		</ant>
140
		<ant dir="${dxf}" target="batch-build" inheritAll="false">
141
			<property name="debug" value="${debug}" />
142
			<property name="debuglevel" value="${debuglevel}" />
143
			<property name="encoding" value="ISO_8859_1" />
144
		</ant>
145
		<ant dir="${remote}" target="batch-build" inheritAll="false">
146
			<property name="debug" value="${debug}" />
147
			<property name="debuglevel" value="${debuglevel}" />
148
			<property name="encoding" value="ISO_8859_1" />
149
		</ant>
150
		<!--ant dir="${gdbms}" target="batch-build" inheritAll="false">
151
					<property name="debug" value="${debug}" />
152
					<property name="debuglevel" value="${debuglevel}" />
153
					<property name="encoding" value="ISO_8859_1" />
154
				</ant>
155
				-->
156
		<ant dir="${fmap}" target="batch-build" inheritAll="false">
157
			<property name="debug" value="${debug}" />
158
			<property name="debuglevel" value="${debuglevel}" />
159
			<property name="encoding" value="ISO_8859_1" />
160
		</ant>
169 161
		<ant dir="${gvSIG}" target="batch-build" inheritAll="false">
170 162
			<property name="debug" value="${debug}" />
171 163
			<property name="debuglevel" value="${debuglevel}" />
172 164
			<property name="encoding" value="ISO_8859_1" />
173
		</ant>
174
	</target>
175

  
176
	<target name="extensions3D" depends="base3D">
177

  
165
		</ant>
166
		<ant dir="${rasterToolSE}" target="batch-build" inheritAll="false">
167
			<property name="debug" value="${debug}" />
168
			<property name="debuglevel" value="${debuglevel}" />
169
			<property name="encoding" value="ISO_8859_1" />
170
		</ant>
178 171
		<condition property="appcatalog.Dir" value="${appcatalog}" else="voidTarget">
179 172
			<available file="${appcatalog}" type="dir" />
180 173
		</condition>
......
191 184
			<property name="debuglevel" value="${debuglevel}" />
192 185
			<property name="encoding" value="ISO_8859_1" />
193 186
		</ant>
187
	</target>
188

  
189
	<target name="extensions3D" depends="base3D">
190

  
194 191
		<condition property="wcs.Dir" value="${wcs}" else="voidTarget">
195 192
			<available file="${wcs}" type="dir" />
196 193
		</condition>
......
216 213
			<property name="debuglevel" value="${debuglevel}" />
217 214
			<property name="encoding" value="ISO_8859_1" />
218 215
		</ant>
219
		
216

  
220 217
		<condition property="ext3D.Dir" value="${ext3D}" else="voidTarget">
221 218
			<available file="${ext3D}" type="dir" />
222 219
		</condition>
import/ext3D/branches/ext3D_v1.1/ext3Dgui/.classpath
5 5
	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
6 6
	<classpathentry kind="src" path="/appgvSIG"/>
7 7
	<classpathentry kind="src" path="/_fwAndami"/>
8
	<classpathentry kind="lib" path="/_fwAndami/lib/beans.jar" sourcepath="/libUI/src"/>
9
	<classpathentry kind="lib" path="/libFMap/lib/cms.jar" sourcepath="/libCq CMS for java"/>
10 8
	<classpathentry combineaccessrules="false" kind="src" path="/libFMap"/>
11
	<classpathentry combineaccessrules="false" kind="src" path="/libIverUtiles"/>
12 9
	<classpathentry kind="lib" path="/libFMap/lib/driver-manager-1.1.jar" sourcepath="/libDriverManager"/>
13
	<classpathentry combineaccessrules="false" kind="src" path="/extWMS"/>
14
	<classpathentry combineaccessrules="false" kind="src" path="/extWCS"/>
15 10
	<classpathentry combineaccessrules="false" kind="src" path="/libRemoteServices"/>
16 11
	<classpathentry combineaccessrules="false" kind="src" path="/ext3D"/>
17 12
	<classpathentry kind="lib" path="/_fwAndami/gvSIG/extensiones/com.iver.cit.gvsig/lib/gvsig-exceptions.jar"/>
......
24 19
	<classpathentry kind="lib" path="lib/libjosg-planets-1.0-SNAPSHOT.jar"/>
25 20
	<classpathentry kind="lib" path="lib/libjosg-viewer-1.0-SNAPSHOT.jar"/>
26 21
	<classpathentry kind="lib" path="lib/libCacheService.jar"/>
22
	<classpathentry kind="lib" path="/_fwAndami/lib/gvsig-ui.jar"/>
23
	<classpathentry kind="lib" path="/_fwAndami/lib/iver-utiles.jar" sourcepath="/Utiles/src"/>
24
	<classpathentry kind="lib" path="/libFMap/lib/libproj.jar"/>
25
	<classpathentry kind="lib" path="/libFMap/lib/org.gvsig.fmap.raster.jar"/>
27 26
	<classpathentry kind="output" path="bin"/>
28 27
</classpath>
import/ext3D/branches/ext3D_v1.1/ext3Dgui/src/com/iver/ai2/gvsig3dgui/tocMenu/TocRefreshLayer.java
8 8
import com.iver.cit.gvsig.fmap.MapContext;
9 9
import com.iver.cit.gvsig.fmap.layers.FLayer;
10 10
import com.iver.cit.gvsig.fmap.layers.FLyrVect;
11
import com.iver.cit.gvsig.fmap.layers.FLyrWMS;
12 11
import com.iver.cit.gvsig.project.documents.view.IProjectView;
13 12
import com.iver.cit.gvsig.project.documents.view.gui.BaseView;
14 13
import com.iver.cit.gvsig.project.documents.view.toc.AbstractTocContextMenuAction;
......
42 41
				&& selectedItems[0].isAvailable() && !(item instanceof TocItemBranch)) {
43 42
			return true;
44 43
		}
45
		if (selectedItems.length == 1 && selectedItems[0] instanceof FLyrWMS
44
		// TODO Un toggle this comment to use the WFS extension
45
/*		if (selectedItems.length == 1 && selectedItems[0] instanceof FLyrWMS
46 46
				&& selectedItems[0].isAvailable() && !(item instanceof TocItemBranch)) {
47 47
			return true;
48
		}
48
		}*/
49 49
		return false;
50 50

  
51 51
	}

Also available in: Unified diff