Revision 4269 org.gvsig.raster.wcs/trunk/org.gvsig.raster.wcs/org.gvsig.raster.wcs.remoteclient/src/main/java/org/gvsig/remoteclient/wcs/wcs_1_0_0/WCSCoverage1_0_0.java

View differences:

WCSCoverage1_0_0.java
26 26

  
27 27
import java.io.IOException;
28 28

  
29
import org.apache.commons.lang3.StringUtils;
29 30
import org.kxml2.io.KXmlParser;
30 31
import org.xmlpull.v1.XmlPullParserException;
31 32

  
32
import org.gvsig.compat.CompatLocator;
33
import org.gvsig.compat.lang.StringUtils;
34 33
import org.gvsig.remoteclient.utils.BoundaryBox;
35 34
import org.gvsig.remoteclient.utils.DescribeCoverageTags;
36 35
import org.gvsig.remoteclient.wcs.WCSCoverage;
......
42 41
public class WCSCoverage1_0_0 extends WCSCoverage{
43 42
	String axisDescriptionName;
44 43

  
45
    private static final StringUtils stringUtils = CompatLocator.getStringUtils();
46
    
47 44
	/* (non-Javadoc)
48 45
     * @see org.gvsig.remoteClient.wcs.WCSLayer#parse(org.kxml2.io.KXmlParser)
49 46
     */
......
84 81
                    	parser.nextTag();
85 82
                    	parser.require(KXmlParser.START_TAG, null, DescribeCoverageTags.FORMATS);
86 83
                    	while (parser.getName().compareTo(DescribeCoverageTags.FORMATS) == 0) {
87
                    		String[] formats = stringUtils.split(parser.nextText(), SEPARATOR);
84
                    		String[] formats = StringUtils.split(parser.nextText(), SEPARATOR);
88 85
                    		for (int i = 0; i < formats.length; i++) {
89 86
                    			addFormat(formats[i]);
90 87
                    		}
......
143 140
    		{
144 141
	    		case KXmlParser.START_TAG:
145 142
	    			if (parser.getName().compareTo(DescribeCoverageTags.REQUEST_RESPONSE_CRSS)==0) {
146
	    				String[] values = stringUtils.split(parser.nextText(), SEPARATOR);
143
	    				String[] values = StringUtils.split(parser.nextText(), SEPARATOR);
147 144
	    				for (int i = 0; i < values.length; i++) {
148 145
							addSRSs(values[i]);
149 146
						}
......
186 183
             switch(currentTag)
187 184
             {
188 185
                case KXmlParser.START_TAG:
189
                    if (parser.getName().compareTo(DescribeCoverageTags.NAME)==0)
186
                    if (StringUtils.equals(parser.getName(),DescribeCoverageTags.NAME))
190 187
                    	setRangeSetName(parser.nextText());
191
                    else if (parser.getName().compareTo(DescribeCoverageTags.LABEL) == 0)
188
                    else if (StringUtils.equals(parser.getName(),DescribeCoverageTags.LABEL))
192 189
                    	setRangeSetLabel(parser.nextText());
193
                    else if (parser.getName().compareToIgnoreCase(DescribeCoverageTags.AXISDESCRIPTION) == 0) {
190
                    else if (StringUtils.equalsIgnoreCase(parser.getName(),DescribeCoverageTags.AXISDESCRIPTION)) {
194 191
                    	// Reading all axe description
195 192
                    	int axisTag = parser.nextTag();
196 193
                    	boolean endAxe = false;
......
199 196
                            switch(axisTag)
200 197
                            {
201 198
                               case KXmlParser.START_TAG:
202
                            	   if (parser.getName().compareTo(DescribeCoverageTags.AXISDESCRIPTION)==0) {
199
                            	   if (StringUtils.equals(DescribeCoverageTags.AXISDESCRIPTION,parser.getName())) {
203 200
                            		   AxisDescription as = parseAxisDescription(parser);
204 201
                            		   axisPool.put(as.getName(), as);
205 202
                            		   axisDescriptionName = as.getName();
......
207 204
                            	   }
208 205
                            	   break;
209 206
                               case KXmlParser.END_TAG:
210
                                   if (parser.getName().compareToIgnoreCase(DescribeCoverageTags.AXISDESCRIPTION) == 0)
207
                                   if (StringUtils.equalsIgnoreCase(DescribeCoverageTags.AXISDESCRIPTION,parser.getName()))
211 208
                                	   endAxe = true;
212 209
                                   break;
213 210
                               case KXmlParser.TEXT:
......
216 213
                            	   break;
217 214
                            }
218 215
                            axisTag = parser.next();
219
                            if(endRangeSet && parser.getName().compareToIgnoreCase(DescribeCoverageTags.RANGESET) == 0){
216
                            if(endRangeSet && StringUtils.equalsIgnoreCase(DescribeCoverageTags.RANGESET,parser.getName())){
220 217
                            	endAxe = true;
221 218
                            	end = true;
222 219
                            }
......
226 223
                    }
227 224
                    break;
228 225
                case KXmlParser.END_TAG:
229
                    if (parser.getName().compareTo(DescribeCoverageTags.RANGESET) == 0)
226
                    if (DescribeCoverageTags.RANGESET.equals(parser.getName()))
230 227
                        end = true;
231 228
                    break;
232 229
                case KXmlParser.TEXT:
......
464 461

  
465 462
								if (parser.getName().compareTo(DescribeCoverageTags.GML_LOW) == 0) {
466 463
									value = parser.nextText();
467
									String[] ss = stringUtils.split(value, SEPARATOR);
464
									String[] ss = StringUtils.split(value, SEPARATOR);
468 465
									int[] limits = new int[ss.length];
469 466
									for (int i = 0; i < limits.length; i++) {
470 467
										limits[i] = Integer.parseInt(ss[i]);
......
472 469
									rg.addLowGridEnvelopLimit(limits);
473 470
								} else if (parser.getName().compareTo(DescribeCoverageTags.GML_HIGH) == 0) {
474 471
									value = parser.nextText();
475
									String[] ss = stringUtils.split(value, SEPARATOR);
472
									String[] ss = StringUtils.split(value, SEPARATOR);
476 473
									int[] limits = new int[ss.length];
477 474
									for (int i = 0; i < limits.length; i++) {
478 475
										limits[i] = Integer.parseInt(ss[i]);
......
543 540

  
544 541
								if (parser.getName().compareTo(DescribeCoverageTags.GML_LOW) == 0) {
545 542
									value = parser.nextText();
546
									String[] ss = stringUtils.split(value, SEPARATOR);
543
									String[] ss = StringUtils.split(value, SEPARATOR);
547 544
									int[] limits = new int[ss.length];
548 545
									for (int i = 0; i < limits.length; i++) {
549 546
										limits[i] = Integer.parseInt(ss[i]);
......
551 548
									rg.addLowGridEnvelopLimit(limits);
552 549
								} else if (parser.getName().compareTo(DescribeCoverageTags.GML_HIGH) == 0) {
553 550
									value = parser.nextText();
554
									String[] ss = stringUtils.split(value, SEPARATOR);
551
									String[] ss = StringUtils.split(value, SEPARATOR);
555 552
									int[] limits = new int[ss.length];
556 553
									for (int i = 0; i < limits.length; i++) {
557 554
										limits[i] = Integer.parseInt(ss[i]);
......
579 576
					parser.nextTag();
580 577
					if (parser.getName().compareTo(DescribeCoverageTags.GML_POS)==0) {
581 578
						value = parser.nextText();
582
						String[] ss = stringUtils.split(value, SEPARATOR);
579
						String[] ss = StringUtils.split(value, SEPARATOR);
583 580
						double[] ori = new double[ss.length];
584 581
						for (int i = 0; i < ori.length; i++) {
585 582
							ori[i] = Double.parseDouble(ss[i]);
......
588 585
					}
589 586
				} else if (parser.getName().compareTo(DescribeCoverageTags.OFFSETVECTOR) == 0) {
590 587
					value = parser.nextText();
591
					String[] ss = stringUtils.split(value, SEPARATOR);
588
					String[] ss = StringUtils.split(value, SEPARATOR);
592 589
					double[] offset = new double[ss.length];
593 590
					for (int i = 0; i < offset.length; i++) {
594 591
						offset[i] = Double.parseDouble(ss[i]);
......
633 630
                    	String[] coordinates;
634 631
                    	double minx, miny, maxx, maxy;
635 632
                    	value = parser.nextText();
636
                    	coordinates = stringUtils.split(value, SEPARATOR);
633
                    	coordinates = StringUtils.split(value, SEPARATOR);
637 634
                    	minx = Double.parseDouble(coordinates[0]);
638 635
                    	miny = Double.parseDouble(coordinates[1]);
639 636

  
......
641 638

  
642 639
                    	parser.require(KXmlParser.START_TAG, null, DescribeCoverageTags.GML_POS);
643 640
                    	value = parser.nextText();
644
                    	coordinates = stringUtils.split(value, SEPARATOR);
641
                    	coordinates = StringUtils.split(value, SEPARATOR);
645 642
                    	maxx = Double.parseDouble(coordinates[0]);
646 643
                    	maxy = Double.parseDouble(coordinates[1]);
647 644

  
......
686 683
                    	String[] coordinates;
687 684
                    	double minx, miny, maxx, maxy;
688 685
                    	value = parser.nextText();
689
                    	coordinates = stringUtils.split(value, SEPARATOR);
686
                    	coordinates = StringUtils.split(value, SEPARATOR);
690 687
                    	minx = Double.parseDouble(coordinates[0]);
691 688
                    	miny = Double.parseDouble(coordinates[1]);
692 689

  
......
694 691
                    	//parser.nextTag();
695 692
                    	parser.require(KXmlParser.START_TAG, null, DescribeCoverageTags.GML_POS);
696 693
                    	value = parser.nextText();
697
                    	coordinates = stringUtils.split(value, SEPARATOR);
694
                    	coordinates = StringUtils.split(value, SEPARATOR);
698 695
                    	maxx = Double.parseDouble(coordinates[0]);
699 696
                    	maxy = Double.parseDouble(coordinates[1]);
700 697

  

Also available in: Unified diff