/ - Diff - Application: gvSIG desktop - gvSIG

Revision 44610

         public EditableFeature createNewFeature(Feature defaultValues) throws DataException {
             FeatureType ft = this.getDefaultFeatureType();
             EditableFeature f = this.createNewFeature(ft, false);
     		for( FeatureAttributeDescriptor desc : ft ) {
     			try {
     				f.set(desc.getName(), defaultValues.get(desc.getName()));
     			} catch(Throwable th) {
     				// Ignore
+    			}
+    		}
             f.copyFrom(defaultValues);
             return f;
+        }

         public void copyFrom(Feature source) {
             // iterate over the attributes and copy one by one
             FeatureType sourceType = source.getType();
             Iterator it = this.getType().iterator();
             while ( it.hasNext() ) {
                 FeatureAttributeDescriptor attr = (FeatureAttributeDescriptor) it.next();
                 if( sourceType.get(attr.getName())!=null ) {
                     set(attr.getIndex(), source.get(attr.getName()));
             for (FeatureAttributeDescriptor attr : this.getType()) {
                 if (attr==null || attr.isAutomatic() || attr.isReadOnly() || attr.isComputed() ) {
                     continue;
+                }
                 Object value = source.get(attr.getName());
                 if (value == null && !attr.allowNull()) {
                     continue;
+                }
                 try {
                     set(attr.getIndex(), value);
                 } catch(Throwable th) {
                     // Ignore
+                }
+            }
+        }

Also available in: Unified diff