sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1517882 - in /sis/branches/JDK7/storage/sis-shapefile/src/main/java/org/apache/sis/storage/shapefile: Feature.java ShapeFile.java
Date Tue, 27 Aug 2013 16:57:06 GMT
Author: desruisseaux
Date: Tue Aug 27 16:57:05 2013
New Revision: 1517882

URL: http://svn.apache.org/r1517882
Log:
Replaced the Feature from sis-shapefile module by DefaultFeature from sis-feature module.

Removed:
    sis/branches/JDK7/storage/sis-shapefile/src/main/java/org/apache/sis/storage/shapefile/Feature.java
Modified:
    sis/branches/JDK7/storage/sis-shapefile/src/main/java/org/apache/sis/storage/shapefile/ShapeFile.java

Modified: sis/branches/JDK7/storage/sis-shapefile/src/main/java/org/apache/sis/storage/shapefile/ShapeFile.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/storage/sis-shapefile/src/main/java/org/apache/sis/storage/shapefile/ShapeFile.java?rev=1517882&r1=1517881&r2=1517882&view=diff
==============================================================================
--- sis/branches/JDK7/storage/sis-shapefile/src/main/java/org/apache/sis/storage/shapefile/ShapeFile.java
[UTF-8] (original)
+++ sis/branches/JDK7/storage/sis-shapefile/src/main/java/org/apache/sis/storage/shapefile/ShapeFile.java
[UTF-8] Tue Aug 27 16:57:05 2013
@@ -28,6 +28,7 @@ import com.esri.core.geometry.Point;
 import com.esri.core.geometry.Polygon;
 import com.esri.core.geometry.Polyline;
 
+import org.apache.sis.feature.DefaultFeature;
 import org.apache.sis.storage.DataStoreException;
 
 
@@ -69,7 +70,7 @@ public class ShapeFile {
     // reserve 4 bytes
 
     public ArrayList<FieldDescriptor> FDArray = new ArrayList<FieldDescriptor>();
-    public Map<Integer, Feature> FeatureMap = new HashMap<Integer, Feature>();
+    public Map<Integer, DefaultFeature> FeatureMap = new HashMap<Integer, DefaultFeature>();
 
 
 
@@ -150,7 +151,7 @@ public class ShapeFile {
             data = new byte[4];
             rf.order(ByteOrder.LITTLE_ENDIAN);
             int ShapeType = rf.getInt();
-            Feature f = new Feature();
+            DefaultFeature f = new DefaultFeature();
             f.setRecord(new HashMap<String, String>());
 
             if (ShapeType == ShapeTypeEnum.Point.getValue()) {



Mime
View raw message