Merge pull request #127 from Esri/stolstov/restore_interface

Restore signature of OGCGeometry.fromJson and fromGeoJson

Author: stolstov

src/main/java/com/esri/core/geometry/ogc/OGCGeometry.java

@@ -12,7 +12,6 @@
 
 import com.esri.core.geometry.Envelope;
 import com.esri.core.geometry.Envelope1D;
-import com.esri.core.geometry.GeoJsonExportFlags;
 import com.esri.core.geometry.Geometry;
 import com.esri.core.geometry.GeometryCursor;
 import com.esri.core.geometry.GeometryCursorAppend;
@@ -30,7 +29,6 @@
 import com.esri.core.geometry.OperatorFactoryLocal;
 import com.esri.core.geometry.OperatorImportFromESRIShape;
 import com.esri.core.geometry.OperatorImportFromGeoJson;
-import com.esri.core.geometry.OperatorImportFromJson;
 import com.esri.core.geometry.OperatorImportFromWkb;
 import com.esri.core.geometry.OperatorImportFromWkt;
 import com.esri.core.geometry.OperatorIntersection;
@@ -496,7 +494,7 @@ public static OGCGeometry fromEsriShape(ByteBuffer buffer) {
 	}
 
 	public static OGCGeometry fromJson(String string)
-			throws Exception {
+			throws JsonParseException, IOException {
 		JsonFactory factory = new JsonFactory();
 		JsonParser jsonParserPt = factory.createJsonParser(string);
 		jsonParserPt.nextToken();
@@ -506,7 +504,7 @@ public static OGCGeometry fromJson(String string)
 	}
 
 	public static OGCGeometry fromGeoJson(String string)
-			throws Exception {
+			throws JSONException {
 		OperatorImportFromGeoJson op = (OperatorImportFromGeoJson) OperatorFactoryLocal
 				.getInstance().getOperator(Operator.Type.ImportFromGeoJson);
 		MapOGCStructure mapOGCStructure = op.executeOGC(0, string, null);