Revision 31676

View differences:

branches/v2_0_0_prep/extensions/org.gvsig.annotation/.classpath
5 5 
  <classpathentry kind="src" path="src/main/resources" excluding="config/**|about/**|images/**|locale/**|**/*.java"/>
6 6 
  <classpathentry kind="output" path="target/classes"/>
7 7 
  <classpathentry kind="var" path="M2_REPO/javax/media/jai_codec/1.1.3/jai_codec-1.1.3.jar"/>
8 
  <classpathentry kind="var" path="M2_REPO/javax/media/jai_core/1.1.3/jai_core-1.1.3.jar"/>
9 
  <classpathentry kind="var" path="M2_REPO/org/gvsig/legacy/batik/batik-awt-util/gvsig/batik-awt-util-gvsig.jar"/>
10 
  <classpathentry kind="var" path="M2_REPO/org/gvsig/legacy/batik/batik-bridge/gvsig/batik-bridge-gvsig.jar"/>
11 
  <classpathentry kind="var" path="M2_REPO/org/gvsig/legacy/batik/batik-gvt/gvsig/batik-gvt-gvsig.jar"/>
12 
  <classpathentry kind="var" path="M2_REPO/org/gvsig/legacy/batik/batik-script/gvsig/batik-script-gvsig.jar"/>
13 
  <classpathentry kind="var" path="M2_REPO/org/gvsig/legacy/batik/batik-util/gvsig/batik-util-gvsig.jar"/>
8 
  <classpathentry kind="var" path="M2_REPO/javax/media/jai_core/1.1.3/jai_core-1.1.3.jar">
9 
    <attributes>
10 
      <attribute value="jar:file:/home/csanchez/.m2/repositoryDesktop/javax/media/jai_core/1.1.3/jai_core-1.1.3-javadoc.jar!/" name="javadoc_location"/>
11 
    </attributes>
12 
  </classpathentry>
13 
  <classpathentry kind="var" path="M2_REPO/javax/help/javahelp/2.0.05/javahelp-2.0.05.jar" sourcepath="M2_REPO/javax/help/javahelp/2.0.05/javahelp-2.0.05-sources.jar">
14 
    <attributes>
15 
      <attribute value="jar:file:/home/csanchez/.m2/repositoryDesktop/javax/help/javahelp/2.0.05/javahelp-2.0.05-javadoc.jar!/" name="javadoc_location"/>
16 
    </attributes>
17 
  </classpathentry>
18 
  <classpathentry kind="var" path="M2_REPO/javax/units/jsr108/0.01/jsr108-0.01.jar"/>
19 
  <classpathentry kind="var" path="M2_REPO/org/apache/xmlgraphics/batik-anim/1.7/batik-anim-1.7.jar"/>
20 
  <classpathentry kind="var" path="M2_REPO/org/apache/xmlgraphics/batik-awt-util/1.7/batik-awt-util-1.7.jar"/>
21 
  <classpathentry kind="var" path="M2_REPO/org/apache/xmlgraphics/batik-bridge/1.7/batik-bridge-1.7.jar"/>
22 
  <classpathentry kind="var" path="M2_REPO/org/apache/xmlgraphics/batik-css/1.7/batik-css-1.7.jar"/>
23 
  <classpathentry kind="var" path="M2_REPO/org/apache/xmlgraphics/batik-dom/1.7/batik-dom-1.7.jar"/>
24 
  <classpathentry kind="var" path="M2_REPO/org/apache/xmlgraphics/batik-ext/1.7/batik-ext-1.7.jar"/>
25 
  <classpathentry kind="var" path="M2_REPO/org/apache/xmlgraphics/batik-gvt/1.7/batik-gvt-1.7.jar"/>
26 
  <classpathentry kind="var" path="M2_REPO/org/apache/xmlgraphics/batik-js/1.7/batik-js-1.7.jar"/>
27 
  <classpathentry kind="var" path="M2_REPO/org/apache/xmlgraphics/batik-parser/1.7/batik-parser-1.7.jar"/>
28 
  <classpathentry kind="var" path="M2_REPO/org/apache/xmlgraphics/batik-script/1.7/batik-script-1.7.jar"/>
29 
  <classpathentry kind="var" path="M2_REPO/org/apache/xmlgraphics/batik-svg-dom/1.7/batik-svg-dom-1.7.jar"/>
30 
  <classpathentry kind="var" path="M2_REPO/org/apache/xmlgraphics/batik-util/1.7/batik-util-1.7.jar"/>
31 
  <classpathentry kind="var" path="M2_REPO/org/apache/xmlgraphics/batik-xml/1.7/batik-xml-1.7.jar"/>
14 32 
  <classpathentry kind="var" path="M2_REPO/bouncycastle/bcmail-jdk14/138/bcmail-jdk14-138.jar"/>
15 33 
  <classpathentry kind="var" path="M2_REPO/bouncycastle/bcprov-jdk14/138/bcprov-jdk14-138.jar"/>
16 
  <classpathentry kind="var" path="M2_REPO/org/gvsig/legacy/castor/gvsig/castor-gvsig.jar"/>
17 
  <classpathentry kind="var" path="M2_REPO/org/gvsig/legacy/geoapi/gvsig/geoapi-gvsig.jar"/>
18 
  <classpathentry kind="var" path="M2_REPO/org/gvsig/legacy/gt2-legacy/gvsig/gt2-legacy-gvsig.jar"/>
19 
  <classpathentry kind="var" path="M2_REPO/org/gvsig/legacy/gt2-main/gvsig/gt2-main-gvsig.jar"/>
20 
  <classpathentry kind="var" path="M2_REPO/org/gvsig/legacy/gt2-postgis/gvsig/gt2-postgis-gvsig.jar"/>
21 
  <classpathentry kind="var" path="M2_REPO/org/gvsig/legacy/gt2sidx/gvsig/gt2sidx-gvsig.jar"/>
34 
  <classpathentry kind="var" path="M2_REPO/castor/castor/0.9.5.3/castor-0.9.5.3.jar"/>
35 
  <classpathentry kind="var" path="M2_REPO/net/sf/flib-jcalendar/unknown/flib-jcalendar-unknown.jar"/>
36 
  <classpathentry kind="var" path="M2_REPO/org/opengis/geoapi/2.0/geoapi-2.0.jar"/>
37 
  <classpathentry kind="var" path="M2_REPO/geojava/geojava/unknown/geojava-unknown.jar"/>
38 
  <classpathentry kind="var" path="M2_REPO/org/geotools/gt2-legacy/unknown/gt2-legacy-unknown.jar"/>
39 
  <classpathentry kind="var" path="M2_REPO/org/geotools/gt2-main/unknown/gt2-main-unknown.jar"/>
22 40 
  <classpathentry kind="var" path="M2_REPO/com/lowagie/itext/2.1.4/itext-2.1.4.jar" sourcepath="M2_REPO/com/lowagie/itext/2.1.4/itext-2.1.4-sources.jar">
23 41 
    <attributes>
24 
      <attribute value="jar:file:/home/csanchez/.m2/repository/com/lowagie/itext/2.1.4/itext-2.1.4-javadoc.jar!/" name="javadoc_location"/>
42 
      <attribute value="jar:file:/home/csanchez/.m2/repositoryDesktop/com/lowagie/itext/2.1.4/itext-2.1.4-javadoc.jar!/" name="javadoc_location"/>
25 43 
    </attributes>
26 44 
  </classpathentry>
27 
  <classpathentry kind="var" path="M2_REPO/org/gvsig/legacy/javaws/gvsig/javaws-gvsig.jar"/>
28 
  <classpathentry kind="var" path="M2_REPO/org/gvsig/legacy/jcalendar/gvsig/jcalendar-gvsig.jar"/>
29 
  <classpathentry kind="var" path="M2_REPO/org/gvsig/legacy/jcommon/gvsig/jcommon-gvsig.jar"/>
30 
  <classpathentry kind="var" path="M2_REPO/org/gvsig/legacy/jfreechart/gvsig/jfreechart-gvsig.jar"/>
31 
  <classpathentry kind="var" path="M2_REPO/org/gvsig/legacy/jh/gvsig/jh-gvsig.jar"/>
32 
  <classpathentry kind="var" path="M2_REPO/org/gvsig/legacy/JimiProClasses/gvsig/JimiProClasses-gvsig.jar"/>
33 
  <classpathentry kind="var" path="M2_REPO/org/gvsig/legacy/jpedalSTD/gvsig/jpedalSTD-gvsig.jar"/>
34 
  <classpathentry kind="var" path="M2_REPO/org/gvsig/legacy/jts/gvsig/jts-gvsig.jar"/>
35 
  <classpathentry kind="var" path="M2_REPO/org/gvsig/legacy/JUF/gvsig/JUF-gvsig.jar"/>
45 
  <classpathentry kind="lib" path="/home/csanchez/Java/jdk1.5.0_19/jre/lib/javaws.jar"/>
46 
  <classpathentry kind="var" path="M2_REPO/jfree/jcommon/1.0.12/jcommon-1.0.12.jar" sourcepath="M2_REPO/jfree/jcommon/1.0.12/jcommon-1.0.12-sources.jar">
47 
    <attributes>
48 
      <attribute value="jar:file:/home/csanchez/.m2/repositoryDesktop/jfree/jcommon/1.0.12/jcommon-1.0.12-javadoc.jar!/" name="javadoc_location"/>
49 
    </attributes>
50 
  </classpathentry>
51 
  <classpathentry kind="var" path="M2_REPO/jecw/jecw/0.0.5/jecw-0.0.5.jar"/>
52 
  <classpathentry kind="var" path="M2_REPO/jfree/jfreechart/1.0.7/jfreechart-1.0.7.jar" sourcepath="M2_REPO/jfree/jfreechart/1.0.7/jfreechart-1.0.7-sources.jar">
53 
    <attributes>
54 
      <attribute value="jar:file:/home/csanchez/.m2/repositoryDesktop/jfree/jfreechart/1.0.7/jfreechart-1.0.7-javadoc.jar!/" name="javadoc_location"/>
55 
    </attributes>
56 
  </classpathentry>
57 
  <classpathentry kind="var" path="M2_REPO/com/sun/jimi/1.1/jimi-1.1.jar"/>
58 
  <classpathentry kind="var" path="M2_REPO/jmrsid/jmrsid/0.0.6/jmrsid-0.0.6.jar"/>
59 
  <classpathentry kind="var" path="M2_REPO/org/jpedal/jpedal/unknown/jpedal-unknown.jar"/>
60 
  <classpathentry kind="var" path="M2_REPO/net/sf/jsi/unknown/jsi-unknown.jar"/>
61 
  <classpathentry kind="var" path="M2_REPO/com/vividsolutions/jts/1.9/jts-1.9.jar" sourcepath="M2_REPO/com/vividsolutions/jts/1.9/jts-1.9-sources.jar"/>
36 62 
  <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar" sourcepath="M2_REPO/junit/junit/3.8.1/junit-3.8.1-sources.jar"/>
37 
  <classpathentry kind="var" path="M2_REPO/org/gvsig/legacy/JWizardComponent/1.2.2/JWizardComponent-1.2.2.jar"/>
38 
  <classpathentry kind="var" path="M2_REPO/org/gvsig/legacy/kxml2/gvsig/kxml2-gvsig.jar"/>
63 
  <classpathentry kind="var" path="M2_REPO/jwizardcomponent/jwizardcomponent/1.2.2/jwizardcomponent-1.2.2.jar"/>
64 
  <classpathentry kind="var" path="M2_REPO/net/sf/kxml/kxml2/2.2.2/kxml2-2.2.2.jar"/>
39 65 
  <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14.jar" sourcepath="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14-sources.jar"/>
40 
  <classpathentry kind="var" path="M2_REPO/org/gvsig/legacy/looks/gvsig/looks-gvsig.jar"/>
66 
  <classpathentry kind="var" path="M2_REPO/com/jgoodies/looks/2.1.4/looks-2.1.4.jar" sourcepath="M2_REPO/com/jgoodies/looks/2.1.4/looks-2.1.4-sources.jar">
67 
    <attributes>
68 
      <attribute value="jar:file:/home/csanchez/.m2/repositoryDesktop/com/jgoodies/looks/2.1.4/looks-2.1.4-javadoc.jar!/" name="javadoc_location"/>
69 
    </attributes>
70 
  </classpathentry>
41 71 
  <classpathentry kind="src" path="/_fwAndami"/>
42 72 
  <classpathentry kind="src" path="/appgvSIG"/>
43 73 
  <classpathentry kind="src" path="/libCompat"/>
......
50 80 
  <classpathentry kind="src" path="/libFMap_geometries"/>
51 81 
  <classpathentry kind="src" path="/libFMap_mapcontext"/>
52 82 
  <classpathentry kind="src" path="/libInternationalization"/>
53 
  <classpathentry kind="var" path="M2_REPO/org/gvsig/org.gvsig.jgdal/2.0/org.gvsig.jgdal-2.0.jar" sourcepath="M2_REPO/org/gvsig/org.gvsig.jgdal/2.0/org.gvsig.jgdal-2.0-sources.jar">
54 
    <attributes>
55 
      <attribute value="jar:file:/home/csanchez/.m2/repository/org/gvsig/org.gvsig.jgdal/2.0/org.gvsig.jgdal-2.0-javadoc.jar!/" name="javadoc_location"/>
56 
    </attributes>
57 
  </classpathentry>
58 
  <classpathentry kind="var" path="M2_REPO/org/gvsig/org.gvsig.jpotrace/2.0-SNAPSHOT/org.gvsig.jpotrace-2.0-SNAPSHOT.jar"/>
83 
  <classpathentry kind="src" path="/libjni-gdal"/>
84 
  <classpathentry kind="src" path="/libjni-potrace"/>
85 
  <classpathentry kind="var" path="M2_REPO/org/gvsig/org.gvsig.maven.base.tools/2.0-SNAPSHOT/org.gvsig.maven.base.tools-2.0-SNAPSHOT.jar"/>
59 86 
  <classpathentry kind="src" path="/libMetadata"/>
60 87 
  <classpathentry kind="src" path="/libProjection"/>
61 88 
  <classpathentry kind="src" path="/libRaster"/>
......
64 91 
  <classpathentry kind="src" path="/libEvaluator_SQLJEP"/>
65 92 
  <classpathentry kind="src" path="/libUIComponent"/>
66 93 
  <classpathentry kind="src" path="/libIverUtiles"/>
67 
  <classpathentry kind="var" path="M2_REPO/org/gvsig/legacy/pdf-transcoder/gvsig/pdf-transcoder-gvsig.jar"/>
68 94 
  <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-api/1.5.5/slf4j-api-1.5.5.jar" sourcepath="M2_REPO/org/slf4j/slf4j-api/1.5.5/slf4j-api-1.5.5-sources.jar"/>
69 95 
  <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-log4j12/1.5.5/slf4j-log4j12-1.5.5.jar" sourcepath="M2_REPO/org/slf4j/slf4j-log4j12/1.5.5/slf4j-log4j12-1.5.5-sources.jar"/>
70 
  <classpathentry kind="var" path="M2_REPO/org/gvsig/legacy/spatialindex/gvsig/spatialindex-gvsig.jar"/>
71 
  <classpathentry kind="var" path="M2_REPO/org/gvsig/legacy/sqljep/gvsig/sqljep-gvsig.jar"/>
72 
  <classpathentry kind="var" path="M2_REPO/org/gvsig/legacy/tempFileManager/gvsig/tempFileManager-gvsig.jar"/>
73 
  <classpathentry kind="var" path="M2_REPO/org/gvsig/legacy/units/gvsig/units-gvsig.jar"/>
74 
  <classpathentry kind="var" path="M2_REPO/org/gvsig/legacy/vecmath/gvsig/vecmath-gvsig.jar"/>
75 
  <classpathentry kind="var" path="M2_REPO/org/gvsig/legacy/xerces/gvsig/xerces-gvsig.jar"/>
76 
  <classpathentry kind="var" path="M2_REPO/org/gvsig/legacy/xml-apis/gvsig/xml-apis-gvsig.jar"/>
77 
  <classpathentry kind="var" path="M2_REPO/org/gvsig/legacy/xml-apis-ext/gvsig/xml-apis-ext-gvsig.jar"/>
78 
  <classpathentry kind="var" path="M2_REPO/org/gvsig/legacy/xmlrpc/gvsig/xmlrpc-gvsig.jar"/>
79 
  <classpathentry kind="var" path="M2_REPO/org/gvsig/legacy/zql/gvsig/zql-gvsig.jar"/>
96 
  <classpathentry kind="var" path="M2_REPO/spatialindex/spatialindex/unknown/spatialindex-unknown.jar"/>
97 
  <classpathentry kind="var" path="M2_REPO/net/sf/sqljep/0.2/sqljep-0.2.jar"/>
98 
  <classpathentry kind="var" path="M2_REPO/xalan/xalan/2.6.0/xalan-2.6.0.jar"/>
99 
  <classpathentry kind="var" path="M2_REPO/xerces/xercesImpl/2.5.0/xercesImpl-2.5.0.jar"/>
100 
  <classpathentry kind="var" path="M2_REPO/xml-apis/xml-apis/1.3.04/xml-apis-1.3.04.jar" sourcepath="M2_REPO/xml-apis/xml-apis/1.3.04/xml-apis-1.3.04-sources.jar"/>
101 
  <classpathentry kind="var" path="M2_REPO/xml-apis/xml-apis-ext/1.3.04/xml-apis-ext-1.3.04.jar"/>
102 
  <classpathentry kind="var" path="M2_REPO/xmlpull/xmlpull/1.1.3.1/xmlpull-1.1.3.1.jar"/>
103 
  <classpathentry kind="var" path="M2_REPO/zql/zql/unknown/zql-unknown.jar"/>
80 104 
  <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
81 105 
</classpath>
branches/v2_0_0_prep/extensions/org.gvsig.annotation/.project
1 1 
<projectDescription>
2 2 
  <name>org.gvsig.annotation</name>
3 
  <comment>[PUT EXTENSION DESCRIPTION HERE]</comment>
3 
  <comment>This Extension allow create new annotation shapefile with label data and
4 
						 geographical information about where the label is. Also, the tags can be edited
5 
						 without modify any layer data and load as label layer.</comment>
4 6 
  <projects>
5 7 
    <project>_fwAndami</project>
6 8 
    <project>appgvSIG</project>
......
14 16 
    <project>libFMap_geometries</project>
15 17 
    <project>libFMap_mapcontext</project>
16 18 
    <project>libInternationalization</project>
19 
    <project>libjni-gdal</project>
20 
    <project>libjni-potrace</project>
17 21 
    <project>libMetadata</project>
18 22 
    <project>libProjection</project>
19 23 
    <project>libRaster</project>
branches/v2_0_0_prep/extensions/org.gvsig.annotation/src/test/java/org/gvsig/annotation/AnnotationShapeTest.java
86 86 
		try {
87 87 
			FeatureStore store1 = openStore(originalFile);
88 88
89 
			//CRATE SHAPE NEW PARAMETERS AND DATA SERVER EXPLORER
89 
			//CREATE SHAPE NEW PARAMETERS AND DATA SERVER EXPLORER
90 90
91 91 
			//Setting the New File Path.
92 92 
            FilesystemServerExplorerParameters explorerParams=(FilesystemServerExplorerParameters) dataManager.createServerExplorerParameters(FilesystemServerExplorer.NAME);
branches/v2_0_0_prep/extensions/org.gvsig.annotation/src/main/java/org/gvsig/annotation/AnnotationRecoverExtension.java
82 82
83 83 
		//Registering Annotation extension.
84 84 
		extensionPointManager.add(ACTIVATEANNOTATIONLAYER, "Recover shapefile as annotation layer");
85 
		if (annotationManager==null){
86 
			annotationManager = AnnotationLocator.getAnnotationManager();
87 
		}
85 88 
	}
86 89
87 90 
	/**
......
96 99
97 100 
	private void activateAnnotation() {
98 101 
		map.beginAtomicEvent();
99 
		annotationManager = AnnotationLocator.getAnnotationManager();
100 102 
		//Only checks the first layer if it is an annotation layer to activate it
101 103 
		FLyrVect layer = (FLyrVect) map.getLayers().getActives()[0];
102 104 
		FeatureStore store = (FeatureStore) layer.getDataStore();
branches/v2_0_0_prep/extensions/org.gvsig.annotation/src/main/java/org/gvsig/annotation/impl/DefaultAnnotationManager.java
47 47 
	private int posColor;
48 48 
	private int posHeight;
49 49 
	private int posRotate;
50 
	private boolean rightType;
50 51
51 52 
	/**
52 53 
	 * Initialize set preference values
......
315 316 
	public ILabelingStrategy activate(FeatureStore annotationStore,int cartographicSupport) throws DataException {
316 317 
		boolean resul = checkIsAnnotation(annotationStore);
317 318 
		if (resul==true){
319 
			if (rightType==false){
320 
				//TODO EXPORTAR A FORMATO CORRECTO ANNOTATION gvSIG 2.0
321 
				//CREATE SHAPE NEW PARAMETERS AND DATA SERVER EXPLORER
322 
				//Create new Shape file with the right fields
323 
	     	}
318 324 
			//Open AnnotationLayer
319 325 
			return open(annotationStore,cartographicSupport);
320 326 
		}
......
323 329 

  		




  324
  330
  
    
	public boolean checkIsAnnotation(FeatureStore annotationStore) throws DataException {


  		




  325
  331
  
    
		int fieldsIncluded=0;


  		




  326
  
  
    
		boolean rightType=false;


  		




  
  332
  
    
		rightType=true;


  		




  
  333
  
    
		


  		




  327
  334
  
    
		//Checking that the store has the right fields


  		




  328
  335
  
    
		FeatureSet annotationFeatures = annotationStore.getFeatureSet();


  		




  329
  336
  
    
		FeatureType type = annotationFeatures.getDefaultFeatureType();


  		




  330
  337
  
    
		fieldsNames = type.getAttributeDescriptors();


  		




  331
  338
  
    
		for(int i=0;i<fieldsNames.length;i++){


  		




  332
  339
  
    
			if(fieldsNames[i].getName().compareToIgnoreCase("TEXT")==0){


  		




  333
  
  
    
					if(fieldsNames[i].getDataType()==DataTypes.STRING)


  		




  334
  
  
    
						rightType=true;


  		




  335
  
  
    
					else


  		




  336
  
  
    
						rightType=false;


  		




  337
  
  
    
					fieldsIncluded++;


  		




  
  340
  
    
				getPreferences().setMappedNumColumnText(i);


  		




  
  341
  
    
				if(fieldsNames[i].getDataType()==DataTypes.STRING)


  		




  
  342
  
    
					rightType=true;


  		




  
  343
  
    
				else


  		




  
  344
  
    
					rightType=false;


  		




  
  345
  
    
				fieldsIncluded++;


  		




  338
  346
  
    
			}else if(fieldsNames[i].getName().compareToIgnoreCase("TYPEFONT")==0){


  		




  339
  
  
    
					if(fieldsNames[i].getDataType()==DataTypes.STRING)


  		




  340
  
  
    
						rightType=true;


  		




  341
  
  
    
					else 


  		




  342
  
  
    
						rightType=false;


  		




  343
  
  
    
					fieldsIncluded++;


  		




  
  347
  
    
				getPreferences().setMappedColumnNumTypeFont(i);


  		




  
  348
  
    
				if(fieldsNames[i].getDataType()==DataTypes.STRING)


  		




  
  349
  
    
					rightType=true;


  		




  
  350
  
    
				else 


  		




  
  351
  
    
					rightType=false;


  		




  
  352
  
    
				fieldsIncluded++;


  		




  344
  353
  
    
			}else if(fieldsNames[i].getName().compareToIgnoreCase("STYLEFONT")==0){


  		




  345
  
  
    
					if(fieldsNames[i].getDataType()==DataTypes.INT)


  		




  346
  
  
    
						rightType=true;


  		




  347
  
  
    
					else


  		




  348
  
  
    
						rightType=false;


  		




  349
  
  
    
					fieldsIncluded++;


  		




  
  354
  
    
				getPreferences().setMappedColumnNumStyleFont(i);


  		




  
  355
  
    
				if(fieldsNames[i].getDataType()==DataTypes.INT)


  		




  
  356
  
    
					rightType=true;


  		




  
  357
  
    
				else


  		




  
  358
  
    
					rightType=false;


  		




  
  359
  
    
				fieldsIncluded++;


  		




  350
  360
  
    
			}else if(fieldsNames[i].getName().compareToIgnoreCase("COLOR")==0){


  		




  351
  
  
    
					if(fieldsNames[i].getDataType()==DataTypes.INT)


  		




  352
  
  
    
						rightType=true;


  		




  353
  
  
    
					else


  		




  354
  
  
    
						rightType=false;


  		




  355
  
  
    
					fieldsIncluded++;


  		




  
  361
  
    
				getPreferences().setMappedNumColumnColor(i);


  		




  
  362
  
    
				if(fieldsNames[i].getDataType()==DataTypes.INT)


  		




  
  363
  
    
					rightType=true;


  		




  
  364
  
    
				else


  		




  
  365
  
    
					rightType=false;


  		




  
  366
  
    
				fieldsIncluded++;


  		




  356
  367
  
    
			}else if(fieldsNames[i].getName().compareToIgnoreCase("ROTATE")==0){


  		




  357
  
  
    
					if(fieldsNames[i].getDataType()==DataTypes.DOUBLE)


  		




  358
  
  
    
						rightType=true;


  		




  359
  
  
    
					else


  		




  360
  
  
    
						rightType=false;


  		




  361
  
  
    
					fieldsIncluded++;


  		




  
  368
  
    
				getPreferences().setMappedColumnNumRotate(i);


  		




  
  369
  
    
				if(fieldsNames[i].getDataType()==DataTypes.DOUBLE)


  		




  
  370
  
    
					rightType=true;


  		




  
  371
  
    
				else


  		




  
  372
  
    
					rightType=false;


  		




  
  373
  
    
				fieldsIncluded++;


  		




  362
  374
  
    
			}else if(fieldsNames[i].getName().compareToIgnoreCase("HEIGHT")==0){


  		




  363
  
  
    
					if((fieldsNames[i].getDataType()==DataTypes.DOUBLE)||(fieldsNames[i].getDataType()==DataTypes.INT))	


  		




  364
  
  
    
						rightType=true;


  		




  365
  
  
    
					else


  		




  366
  
  
    
						rightType=false;


  		




  367
  
  
    
					fieldsIncluded++;


  		




  
  375
  
    
				getPreferences().setMappedNumColumnText(i);


  		




  
  376
  
    
				if((fieldsNames[i].getDataType()==DataTypes.DOUBLE)||(fieldsNames[i].getDataType()==DataTypes.INT))	


  		




  
  377
  
    
					rightType=true;


  		




  
  378
  
    
				else


  		




  
  379
  
    
					rightType=false;


  		




  
  380
  
    
				fieldsIncluded++;


  		




  368
  381
  
    
			}


  		




  369
  382
  
    
		}


  		




  370
  
  
    
		if ((fieldsIncluded==6)&&(rightType==true)){


  		




  371
  
  
    
			//Open AnnotationLayer


  		




  
  383
  
    
		if (fieldsIncluded==6){


  		




  372
  384
  
    
			return true;


  		




  373
  385
  
    
		}


  		




  374
  386
  
    
		return false;


  		












Also available in:  Unified diff