Revision 44198 trunk/org.gvsig.desktop/org.gvsig.desktop.plugin/org.gvsig.app/org.gvsig.app.mainplugin/src/main/java/org/gvsig/app/project/documents/view/expressionevaluator/viewcapturerectangle/ViewCaptureRectangleElement.java

View differences:

ViewCaptureRectangleElement.java
1 1
package org.gvsig.app.project.documents.view.expressionevaluator.viewcapturerectangle;
2 2

  
3
import java.awt.Dialog;
4
import java.awt.Window;
5 3
import org.gvsig.app.ApplicationLocator;
6 4
import org.gvsig.app.ApplicationManager;
7 5
import org.gvsig.expressionevaluator.ExpressionBuilder;
6
import org.gvsig.expressionevaluator.ExpressionBuilder.GeometrySupportType;
8 7
import org.gvsig.expressionevaluator.ExpressionEvaluatorLocator;
9 8
import org.gvsig.expressionevaluator.swing.Element.CalculatedElement;
10 9
import org.gvsig.expressionevaluator.swing.Element.SimpleElement;
......
45 44
            ExpressionBuilder builder = ExpressionEvaluatorLocator.getManager().createExpressionBuilder();
46 45
            if (this.aditionalPanel.insertAsWKT()) {
47 46
                if (this.aditionalPanel.insertAsGeometry()) {
48
                    builder.getConfig().set(
49
                            ExpressionBuilder.Config.geometry_type_support,
50
                            ExpressionBuilder.GeometrySupportType.WKT
51
                    );
52
                    return builder.geometry(geom, geom.getProjection()).toString();
47
                    builder.geometry_support_type(GeometrySupportType.WKT);
48
                    return builder.geometry(geom).toString();
53 49
                } else {
54 50
                    String wkt = geom.convertToWKT();
55 51
                    return "'" + wkt + "'";
56 52
                }
57 53
            } else {
58 54
                if (this.aditionalPanel.insertAsGeometry()) {
59
                    builder.getConfig().set(
60
                            ExpressionBuilder.Config.geometry_type_support,
61
                            ExpressionBuilder.GeometrySupportType.WKB
62
                    );
63
                    return builder.geometry(geom, geom.getProjection()).toString();
55
                    builder.geometry_support_type(GeometrySupportType.WKB);
56
                    return builder.geometry(geom).toString();
64 57
                } else {
65 58
                    byte[] wkb = geom.convertToWKB();
66 59
                    return builder.bytearray_hex(wkb);

Also available in: Unified diff