Revision 26005
| branches/v2_0_0_prep/libraries/libFMap_dal/src/org/gvsig/fmap/dal/feature/impl/FeatureManager.java | ||
|---|---|---|
| 54 | 54 |
import org.gvsig.fmap.dal.feature.FeatureStore; |
| 55 | 55 |
import org.gvsig.fmap.dal.feature.FeatureType; |
| 56 | 56 |
import org.gvsig.fmap.dal.feature.impl.expansionadapter.ExpansionAdapter; |
| 57 |
import org.gvsig.fmap.geom.Geometry; |
|
| 58 | 57 |
|
| 59 | 58 |
|
| 60 | 59 |
/** |
| ... | ... | |
| 153 | 152 |
} |
| 154 | 153 |
} |
| 155 | 154 |
int num = intNum.intValue(); |
| 156 |
if (num==-1) |
|
| 157 |
return null; |
|
| 155 |
if (num==-1) {
|
|
| 156 |
return null; |
|
| 157 |
} |
|
| 158 | 158 |
Feature feature=(Feature)expansionAdapter.getObject(num); |
| 159 | 159 |
if (featureType== null){
|
| 160 | 160 |
featureType = store.getDefaultFeatureType(); |
| ... | ... | |
| 174 | 174 |
if (orgIndex<0){
|
| 175 | 175 |
continue; |
| 176 | 176 |
} |
| 177 |
if (featureType.getDefaultGeometryAttributeName().equals( |
|
| 178 |
fad.getName())){
|
|
| 179 |
newFeature.setGeometry(fad.getIndex(), (Geometry)feature.get(orgIndex)); |
|
| 180 |
} else{
|
|
| 181 |
newFeature.set(fad.getIndex(), feature.get(orgIndex)); |
|
| 182 |
} |
|
| 177 |
newFeature.set(fad.getIndex(), feature.get(orgIndex)); |
|
| 183 | 178 |
} |
| 184 |
return newFeature.getNotEditableCopy();
|
|
| 179 |
return newFeature.getNotEditableCopy(); |
|
| 185 | 180 |
} |
| 186 | 181 |
|
| 187 | 182 |
/** |
| ... | ... | |
| 198 | 193 |
oldNum=((Integer)added.get(id)).intValue(); |
| 199 | 194 |
added.put(id,new Integer(num)); |
| 200 | 195 |
}else{
|
| 201 |
if (modifiedFromOriginal.get(id)!=null) |
|
| 202 |
oldNum=((Integer)modifiedFromOriginal.get(id)).intValue(); |
|
| 196 |
if (modifiedFromOriginal.get(id)!=null) {
|
|
| 197 |
oldNum=((Integer)modifiedFromOriginal.get(id)).intValue(); |
|
| 198 |
} |
|
| 203 | 199 |
modifiedFromOriginal.put(id,new Integer(num)); |
| 204 | 200 |
} |
| 205 | 201 |
return oldNum; |
Also available in: Unified diff