/ - Diff - Application: gvSIG desktop - gvSIG

     public interface FeatureStoreProviderFactory extends DataStoreProviderFactory {
         /**
          * Returns a list of {@link DataTypes} supported
          * by this FeatureStoreProviderFactory
+         *
+         *
          * @return  list of {@link DataTypes} supported
          * by this FeatureStoreProviderFactory or null
          * if it has no restrictions on data types
          */
         public List getSupportedDataTypes();
     	/**
     	 * {@link Geometry}
+    	 *
+    	 *
     	 * Return a matrix (list of pairs) (int, int]
     	 * [Geometry.TYPE,GEOMETRY.SUBTYPE]
     	 * with types and subtypes supported by this provider.
+    	 *
+    	 *
     	 * If the provider has not vector support
     	 * or has not restrictions over geometry types return null.
+    	 *
+    	 *
     	 * @return Matrix of Geometry.TYPES, SUBTYPES or null
     	 */
     	public List getSupportedGeometryTypesSubtypes();
     	/**
+    	 *
+    	 *
     	 * @return whether this factory allows mandatory attributes
     	 * in the generated stores' feature types.
     	 * in the generated stores' feature types.
     	 */
     	public boolean allowsMandatoryAttributes();
     	/**
+    	 *
+    	 *
          * @return whether this factory allows primary key attributes
          * in the generated stores' feature types.
          * in the generated stores' feature types.
     	 */
     	public boolean allowsPrimaryKeyAttributes();
     	/**
+    	 *
+    	 *
     	 * @return a new instance of a default feature type
     	 * (changes to that feature type do not affect following calls)
     	 */
     	public FeatureType createDefaultFeatureType();
     	/**
+    	 *
+    	 *
     	 * @return whether stores created by this factory
     	 * allow several geometry types.
     	 * Actually redundant after adding
     	 * getSupportedGeometryTypesSubtypes())
     	 */
     	// public int allowMultipleGeometryTypes();
     	public int allowEditableFeatureType();
             public int useLocalIndexesCanImprovePerformance();
         public int useLocalIndexesCanImprovePerformance();
         /**
          * Returns max size for attributes names
          * returns -1 if it is undefined
          * @return
          */
         public int getMaxAttributeNameSize();
+    }

     import org.gvsig.tools.service.spi.ProviderFactory;
     public interface DataStoreProviderFactory extends ProviderFactory {
     	public static final int UNKNOWN = 0;
     	public static final int YES = 1;
     	public static final int NO = 2;
     	/**
     	 * Returns the name of the provider
+    	 *
+    	 *
     	 * @return name of the provider
     	 */
     	public String getName();
     	/**
     	 * Return a short descripion about the provider
+    	 *
+    	 *
     	 * @return description about the provider
     	 */
     	public String getDescription();
     	/**
     	 * The provider has read support
+    	 *
+    	 *
     	 * @return YES if has read support
     	 */
     	public int allowRead();
     	/**
     	 * The provider has write support
+    	 *
+    	 *
     	 * @return YES if has write support
     	 */
     	public int allowWrite();
     	/**
     	 * The provider can create new stores.
+    	 *
+    	 *
     	 * @return YES if has creation support
     	 */
     	public int allowCreate();
-...
     	/**
     	 * The provider has tabular support.
     	 * This support is the minimum requisite for a FeatureStore.
+    	 *
+    	 *
     	 * @return YES if has write support
     	 */
     	public int hasTabularSupport();
     	/**
     	 * The provider has vectorial support.
+    	 *
+    	 *
     	 * @return YES if has vectorial support
     	 */
     	public int hasVectorialSupport();
     	/**
     	 * The provider has raster support.
+    	 *
+    	 *
     	 * @return YES if has raster support
     	 */
     	public int hasRasterSupport();
     	/**
     	 * Builds a specific provider
+    	 *
+    	 *
     	 * @return the provider
     	 */
     	public DataStoreProvider createProvider(DataParameters parameters, DataStoreProviderServices providerServices) throws InitializeException;
         /**
          * Returns max size for attributes names
          * returns -1 if it is undefined
          * @return
          */
         public int getMaxAttributeNameSize();
+    }

trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.dal/org.gvsig.fmap.dal.spi/src/main/java/org/gvsig/fmap/dal/feature/spi/AbstractFeatureStoreProviderFactory.java
45	45	public int allowMultipleGeometryTypes() {
46	46	return UNKNOWN;
47	47	}
48
	48
49	49	public int allowEditableFeatureType() {
50	50	return UNKNOWN;
51	51	}
52
	52
53	53	public List getSupportedDataTypes() {
54	54	// null means all supported
55	55	return null;
56	56	}
57
	57
58	58	public List getSupportedGeometryTypesSubtypes() {
59	59	// null means all supported
60	60	return null;
61	61	}
62
	62
63	63	public boolean allowsMandatoryAttributes() {
64	64	return true;
65	65	}
66
	66
67	67	public boolean allowsPrimaryKeyAttributes() {
68	68	return true;
69	69	}
70	70
71	71	public int useLocalIndexesCanImprovePerformance() {
72	72	return UNKNOWN;
73		}
	73	}
74	74
75	75	/**
76	76	* @return dummy feature type. Must be overridden by subclasses
77		*
	77	*
78	78	*/
79	79	public FeatureType createDefaultFeatureType() {
80	80	DataManager dm = DALLocator.getDataManager();
81	81	EditableFeatureType eft = dm.createFeatureType();
82
	82
83	83	if (allowEditableFeatureType() == DataStoreProviderFactory.YES) {
84	84	return eft;
85	85	} else {
...	...
87	87	}
88	88	}
89	89
	90	@Override
	91	public int getMaxAttributeNameSize() {
	92	return -1;
	93	}
90	94	}

     import org.gvsig.fmap.dal.feature.FeatureType;
     import org.gvsig.fmap.dal.feature.spi.AbstractFeatureStoreProviderFactory;
     import org.gvsig.fmap.dal.spi.DataStoreProviderServices;
     import org.gvsig.fmap.dal.store.dbf.utils.DbaseFile;
     import org.gvsig.fmap.geom.Geometry;
     import org.gvsig.fmap.geom.GeometryLocator;
     import org.gvsig.fmap.geom.type.GeometryType;
-...
     public class SHPStoreProviderFactory extends AbstractFeatureStoreProviderFactory implements FeatureStoreProviderFactory{
         private static final Logger logger = LoggerFactory.getLogger(SHPStoreProviderFactory.class);
         public static final String DEFAULT_GEOMETRY_FIELD_NAME = "GEOMETRY";
         public static final int DEFAULT_GEOMETRY_TYPE = Geometry.TYPES.SURFACE;
         public static final int DEFAULT_GEOMETRY_SUBTYPE = Geometry.SUBTYPES.GEOM2D;
     	protected SHPStoreProviderFactory(String name, String description) {
     		super(name, description);
+    	}
-...
     	public DynObject createParameters() {
     		return new SHPStoreParameters();
+    	}
     	public int allowCreate() {
     		return YES;
+    	}
     	public int allowWrite() {
     		return YES;
+    	}
-...
     	public int allowRead() {
     		return YES;
+    	}
     	public int hasRasterSupport() {
     		return NO;
+    	}
     	public int hasTabularSupport() {
     		return YES;
+    	}
     	public int hasVectorialSupport() {
     		return YES;
+    	}
-...
     	public int allowMultipleGeometryTypes() {
     		return NO;
+    	}
         public int allowEditableFeatureType() {
             return YES;
+        }
-...
         public int useLocalIndexesCanImprovePerformance() {
             return YES;
+        }
         public List getSupportedDataTypes() {
             DataTypesManager manager = ToolsLocator.getDataTypesManager();
             List resp = new ArrayList<Integer>();
-...
             resp.add(manager.get(DataTypes.GEOMETRY));
             return resp;
+        }
         public List getSupportedGeometryTypesSubtypes() {
             // null means all supported
             int[] item = null;
-...
             item[0] = Geometry.TYPES.POINT;
             item[1] = Geometry.SUBTYPES.GEOM2D;
             resp.add(item);
             item = new int[2];
             item[0] = Geometry.TYPES.CURVE;
             item[1] = Geometry.SUBTYPES.GEOM2D;
             resp.add(item);
             item = new int[2];
             item[0] = Geometry.TYPES.SURFACE;
             item[1] = Geometry.SUBTYPES.GEOM2D;
             resp.add(item);
             item = new int[2];
             item[0] = Geometry.TYPES.MULTIPOINT;
             item[1] = Geometry.SUBTYPES.GEOM2D;
-...
             item[0] = Geometry.TYPES.POINT;
             item[1] = Geometry.SUBTYPES.GEOM3D;
             resp.add(item);
             item = new int[2];
             item[0] = Geometry.TYPES.CURVE;
             item[1] = Geometry.SUBTYPES.GEOM3D;
             resp.add(item);
             item = new int[2];
             item[0] = Geometry.TYPES.SURFACE;
             item[1] = Geometry.SUBTYPES.GEOM3D;
             resp.add(item);
             item = new int[2];
             item[0] = Geometry.TYPES.MULTIPOINT;
             item[1] = Geometry.SUBTYPES.GEOM3D;
-...
             item[0] = Geometry.TYPES.POINT;
             item[1] = Geometry.SUBTYPES.GEOM2DM;
             resp.add(item);
             item = new int[2];
             item[0] = Geometry.TYPES.CURVE;
             item[1] = Geometry.SUBTYPES.GEOM2DM;
             resp.add(item);
             item = new int[2];
             item[0] = Geometry.TYPES.SURFACE;
             item[1] = Geometry.SUBTYPES.GEOM2DM;
             resp.add(item);
             item = new int[2];
             item[0] = Geometry.TYPES.MULTIPOINT;
             item[1] = Geometry.SUBTYPES.GEOM2DM;
             resp.add(item);
             // ======================================
             return resp;
+        }
         public boolean allowsMandatoryAttributes() {
             return false;
+        }
         public boolean allowsPrimaryKeyAttributes() {
             return false;
+        }
         /**
          * @return  dummy feature type. Must be overridden by subclasses
+         *
+         *
          */
         public FeatureType createDefaultFeatureType() {
             DataManager dm = DALLocator.getDataManager();
             EditableFeatureType eft = dm.createFeatureType();
             EditableFeatureAttributeDescriptor efatd =
                 eft.add(DEFAULT_GEOMETRY_FIELD_NAME, DataTypes.GEOMETRY);
-...
             return eft.getNotEditableCopy();
+        }
     	@Override
     	public int getMaxAttributeNameSize() {
     	    return DbaseFile.MAX_FIELD_NAME_LENGTH;
+    	}
+    }

     /**
      * gvSIG. Desktop Geographic Information System.
+     *
      * Copyright (C) 2007-2013 gvSIG Association.
+     *
      * This program is free software; you can redistribute it and/or
      * modify it under the terms of the GNU General Public License
      * as published by the Free Software Foundation; either version 3
      * of the License, or (at your option) any later version.
+     *
      * This program is distributed in the hope that it will be useful,
      * but WITHOUT ANY WARRANTY; without even the implied warranty of
      * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
      * GNU General Public License for more details.
+     *
      * You should have received a copy of the GNU General Public License
      * along with this program; if not, write to the Free Software
      * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
      * MA  02110-1301, USA.
+     *
      * For any additional information, do not hesitate to contact us
      * at info AT gvsig.com, or visit our website www.gvsig.com.
      */
     package org.gvsig.fmap.dal.store.dbf;
     import java.util.ArrayList;
     import java.util.List;
     import org.gvsig.fmap.dal.DataParameters;
     import org.gvsig.fmap.dal.DataStoreProvider;
     import org.gvsig.fmap.dal.exception.InitializeException;
     import org.gvsig.fmap.dal.feature.FeatureStoreProviderFactory;
     import org.gvsig.fmap.dal.feature.spi.AbstractFeatureStoreProviderFactory;
     import org.gvsig.fmap.dal.spi.DataStoreProviderServices;
     import org.gvsig.fmap.dal.store.dbf.utils.DbaseFile;
     import org.gvsig.tools.ToolsLocator;
     import org.gvsig.tools.dataTypes.DataType;
     import org.gvsig.tools.dataTypes.DataTypes;
     import org.gvsig.tools.dataTypes.DataTypesManager;
     import org.gvsig.tools.dynobject.DynObject;
     import org.slf4j.Logger;
     import org.slf4j.LoggerFactory;
     public class DBFStoreProviderFactory extends AbstractFeatureStoreProviderFactory implements FeatureStoreProviderFactory{
         private static final Logger logger = LoggerFactory.getLogger(DBFStoreProviderFactory.class);
     	protected DBFStoreProviderFactory(String name, String description) {
     		super(name, description);
+    	}
     	public DataStoreProvider createProvider(DataParameters parameters,
     			DataStoreProviderServices providerServices)
     			throws InitializeException {
     		return new DBFStoreProvider((DBFStoreParameters) parameters, providerServices);
+    	}
     	public DynObject createParameters() {
     		return new DBFStoreParameters();
+    	}
     	public int allowCreate() {
     		return YES;
+    	}
     	public int allowWrite() {
     		return YES;
+    	}
     	public int allowRead() {
     		return YES;
+    	}
     	public int hasRasterSupport() {
     		return NO;
+    	}
     	public int hasTabularSupport() {
     		return YES;
+    	}
     	public int hasVectorialSupport() {
     		return NO;
+    	}
     	public int allowMultipleGeometryTypes() {
     		return NO;
+    	}
         public int allowEditableFeatureType() {
             return YES;
+        }
         public int useLocalIndexesCanImprovePerformance() {
             return YES;
+        }
         public List<DataType> getSupportedDataTypes() {
             DataTypesManager manager = ToolsLocator.getDataTypesManager();
             ArrayList<DataType> resp = new ArrayList<DataType>();
             resp.add(manager.get(DataTypes.STRING));
             resp.add(manager.get(DataTypes.INT));
             resp.add(manager.get(DataTypes.FLOAT));
             resp.add(manager.get(DataTypes.DATE));
             return resp;
+        }
         public boolean allowsMandatoryAttributes() {
             return false;
+        }
         public boolean allowsPrimaryKeyAttributes() {
             return false;
+        }
     	public int getMaxAttributeNameSize() {
     	    return DbaseFile.MAX_FIELD_NAME_LENGTH;
+    	}
+    }

     		try {
     			if (!dataman.getStoreProviders().contains(DBFStoreProvider.NAME)) {
     				dataman.registerStoreProvider(DBFStoreProvider.NAME,
     						DBFStoreProvider.class, DBFStoreParameters.class);
     			    dataman.registerStoreProviderFactory(new DBFStoreProviderFactory(DBFStoreProvider.NAME, DBFStoreProvider.DESCRIPTION));
+    			}
     		} catch (RuntimeException e) {
     			exs.add(e);

     import java.util.Set;
     import org.cresques.cts.IProjection;
     import org.slf4j.Logger;
     import org.slf4j.LoggerFactory;
     import org.gvsig.fmap.dal.DALLocator;
     import org.gvsig.fmap.dal.DataManager;
     import org.gvsig.fmap.dal.DataQuery;
-...
     import org.gvsig.tools.undo.UndoException;
     import org.gvsig.tools.undo.command.Command;
     import org.gvsig.tools.visitor.Visitor;
     import org.slf4j.Logger;
     import org.slf4j.LoggerFactory;
     public class DefaultFeatureStore extends AbstractDisposable implements
         DataStoreInitializer, FeatureStoreProviderServices, FeatureStore, Observer {
-...
+            }
             return null;
+        }
         public Iterator iterator() {
             try {
                 return this.getFeatureSet().fastIterator();

trunk/org.gvsig.desktop/org.gvsig.desktop.plugin/org.gvsig.app.document.table.app/org.gvsig.app.document.table.app.mainplugin/src/main/resources-plugin/i18n/text.properties
41	41	_Cannot_rename_geometry_field=No es posible renombrar el campo geom\u00E9trico
42	42	_Please_insert_new_field_name=Introduzca el nombre del nuevo campo
43	43	_Cannot_delete_geometry_field=No es posible eliminar el campo geom\u00E9trico
	44	_Name_too_long=Nombre demasiado largo
44	45	_No_input_name=No se ha introducido un nombre
45	46	_Find_and_select_duplicates=Detectar y seleccionar duplicados
46	47	_No_repetitions_found=No se han encontrado repeticiones

trunk/org.gvsig.desktop/org.gvsig.desktop.plugin/org.gvsig.app.document.table.app/org.gvsig.app.document.table.app.mainplugin/src/main/resources-plugin/i18n/text_en.properties
41	41	_Cannot_rename_geometry_field=Renaming geometry field is not allowed
42	42	_Please_insert_new_field_name=Insert new field name
43	43	_Cannot_delete_geometry_field=Deleting geometry field is not allowed
	44	_Name_too_long=Name is too long
44	45	_No_input_name=No input name
45	46	_Find_and_select_duplicates=Find and select duplicates
46	47	_No_repetitions_found=No repetitions found

     /**
      * To create new FeatureAttributeDescriptor from the interface.
+     *
+     *
      * @author Vicente Caballero Navarro
+     *
+     *
      */
     public class CreateNewAttributePanel extends JPanel implements IWindow {
         /**
+    	 *
+    	 *
     	 */
         private static final long serialVersionUID = 6447641307779709964L;
         private static final String DEFAULT_FIELD_LENGTH = "50";
-...
         private JPanel jPanel = null;
         private AcceptCancelPanel jPanelOkCancel = null;
         private JPanel jPnlFields = null;
         private int maxAttributeNameSize=-1;
         private KeyListener checkInt = new KeyListener() {
             public void keyPressed(KeyEvent e) {
-...
         /**
          * This method initializes this
+         *
+         *
          * @return void
          */
         private void initialize() {
-...
         /**
          * This method initializes jTxtFieldName
+         *
+         *
          * @return javax.swing.JTextField
          */
         private JTextField getJTxtFieldName() {
-...
         /**
          * This method initializes jCboFieldType
+         *
+         *
          * @return javax.swing.JComboBox
          */
         private JComboBox getJCboFieldType() {
-...
         /**
          * This method initializes jTxtFieldLength
+         *
+         *
          * @return javax.swing.JTextField
          */
         private JTextField getJTxtFieldLength() {
-...
         /**
          * This method initializes jTxtFieldPrecision
+         *
+         *
          * @return javax.swing.JTextField
          */
         private JTextField getJTxtFieldPrecision() {
-...
         /**
          * This method initializes jTxtDefaultValue
+         *
+         *
          * @return javax.swing.JTextField
          */
         private JTextField getJTxtDefaultValue() {
-...
             Object defaultValueAttr = "";
             nameAttr = getJTxtFieldName().getText();
             if (nameAttr == null || nameAttr.length() == 0) {
                 JOptionPane.showMessageDialog(
                         this,
                         Messages.getText("_No_input_name"),
-...
                         JOptionPane.ERROR_MESSAGE);
                 return null;
+            }
             if (maxAttributeNameSize>0){
                 if (nameAttr.length()>maxAttributeNameSize){
                     JOptionPane.showMessageDialog(
                         this,
                         Messages.getText("_Name_too_long"),
                         Messages.getText("_Rename_column"),
                         JOptionPane.ERROR_MESSAGE);
                 return null;
+                }
+            }
             String strType =
                 (String) getJCboFieldType().getModel().getSelectedItem();
             typeAttr = ToolsLocator.getDataTypesManager().getType(strType);
-...
         /**
          * This method initializes jPanel
+         *
+         *
          * @return javax.swing.JPanel
          */
         private JPanel getJPanel() {
-...
         /**
          * This method initializes jPanelOkCancel
+         *
+         *
          * @return javax.swing.JPanel
          */
         private AcceptCancelPanel getJPanelOkCancel() {
-...
         /**
          * This method initializes jPnlFields
+         *
+         *
          * @return javax.swing.JPanel
          */
         private JPanel getJPnlFields() {
-...
             return WindowInfo.DIALOG_PROFILE;
+        }
         public void setMaxAttributeNameSize(int maxAttributeNameSize) {
             this.maxAttributeNameSize = maxAttributeNameSize;
+        }
+    }

     import org.gvsig.andami.ui.mdiManager.IWindow;
     import org.gvsig.andami.ui.mdiManager.WindowInfo;
     import org.gvsig.app.project.documents.table.TableOperations;
     import org.gvsig.fmap.dal.DALLocator;
     import org.gvsig.fmap.dal.DataManager;
     import org.gvsig.fmap.dal.DataTypes;
     import org.gvsig.fmap.dal.exception.DataException;
     import org.gvsig.fmap.dal.feature.EditableFeatureAttributeDescriptor;
     import org.gvsig.fmap.dal.feature.EditableFeatureType;
     import org.gvsig.fmap.dal.feature.FeatureAttributeDescriptor;
     import org.gvsig.fmap.dal.feature.FeatureStore;
     import org.gvsig.fmap.dal.feature.FeatureStoreProviderFactory;
     import org.gvsig.i18n.Messages;
     import org.gvsig.tools.swing.api.ToolsSwingLocator;
     import org.slf4j.Logger;
-...
     /**
      * To modify FeatureTypes from the interface.
+     *
+     *
      * @author Vicente Caballero Navarro
+     *
+     *
      */
     public class FeatureTypeEditingPanel extends JPanel implements IWindow {
-...
         private class MyTableModel extends AbstractTableModel {
             /**
+    		 *
+    		 *
     		 */
             private static final long serialVersionUID = -2847526298987536118L;
-...
         /**
          * This method initializes
+         *
+         *
          * @throws DataException
+         *
+         *
          */
         public FeatureTypeEditingPanel(FeatureStore fs) throws DataException {
             super();
-...
         /**
          * This method initializes this
+         *
+         *
          */
         private void initialize() {
             FlowLayout flowLayout = new FlowLayout();
-...
         /**
          * This method initializes jScrollPane
+         *
+         *
          * @return javax.swing.JScrollPane
          */
         private JScrollPane getJScrollPane() {
-...
         /**
          * This method initializes jTableFields
+         *
+         *
          * @return javax.swing.JTable
          */
         private JTable getJTableFields() {
-...
         /**
          * This method initializes jBtnNewField
+         *
+         *
          * @return javax.swing.JButton
          */
         private JButton getJBtnNewField() {
-...
                     public void actionPerformed(java.awt.event.ActionEvent e) {
                         ActionListener okAction;
                         DataManager dataManager = DALLocator.getDataManager();
                         FeatureStoreProviderFactory factory =
                                 (FeatureStoreProviderFactory) dataManager.
                                 getStoreProviderFactory(featureStore.getProviderName());
                         panelNewField.setMaxAttributeNameSize(factory.getMaxAttributeNameSize());
                         okAction = new java.awt.event.ActionListener() {
                             public void actionPerformed(java.awt.event.ActionEvent e) {
-...
         /**
          * This method initializes jButton
+         *
+         *
          * @return javax.swing.JButton
          */
         private JButton getJBtnDelete() {
-...
                             for (int i = selecteds.length - 1; i >= 0; i--) {
                                 String fieldName =
                                     (String) tm.getValueAt(selecteds[i], 0);
                                 String old_geom_fld = editableType.getDefaultGeometryAttributeName();
                                 if (old_geom_fld.compareTo(fieldName) == 0) {
                                     JOptionPane.showMessageDialog(
-...
         /**
          * This method initializes jBtnRenameField
+         *
+         *
          * @return javax.swing.JButton
          */
         private JButton getJBtnRenameField() {
-...
                             for (int i = selecteds.length - 1; i >= 0; i--) {
                                 String fieldName =
                                     (String) tm.getValueAt(selecteds[i], 0);
                                 String old_geom_fld = editableType.getDefaultGeometryAttributeName();
                                 /*
                                  * old_geom_fld is null if we are dealing with
-...
                                 if (newName == null) {
                                     continue;
+                                }
                                 if (newName.length() == 0)  {
                                     JOptionPane.showMessageDialog(
                                             jTableFields,
-...
                                             JOptionPane.ERROR_MESSAGE);
                                     continue;
+                                }
                                 if (editableType.getIndex(newName) != -1) {
                                     NotificationManager.showMessageInfo(
                                         PluginServices.getText(this,
                                             "field_already_exists"), null);
                                     continue;
+                                }
                                 try {
                                     EditableFeatureAttributeDescriptor efad =
                                         (EditableFeatureAttributeDescriptor)
                                         editableType.getAttributeDescriptor(fieldName);
                                     efad.setName(newName);
                                 } catch (Exception de) {
                                     JOptionPane.showMessageDialog(
                                         jTableFields,
-...
         /**
          * This method initializes jBtnOK
+         *
+         *
          * @return javax.swing.JButton
          */
         private JButton getJBtnOK() {
-...
         /**
          * This method initializes jButton
+         *
+         *
          * @return javax.swing.JButton
          */
         private JButton getJBtnCancel() {
-...
         /**
          * This method initializes jPanelButtons
+         *
+         *
          * @return javax.swing.JPanel
          */
         private JPanel getJPanelButtons() {

     import org.gvsig.app.project.documents.table.gui.FeatureTableDocumentPanel;
     import org.gvsig.editing.EditingNotification;
     import org.gvsig.editing.EditingNotificationManager;
     import org.gvsig.fmap.dal.DALLocator;
     import org.gvsig.fmap.dal.DataManager;
     import org.gvsig.fmap.dal.DataTypes;
     import org.gvsig.fmap.dal.exception.DataException;
     import org.gvsig.fmap.dal.feature.EditableFeature;
-...
     import org.gvsig.fmap.dal.feature.FeatureSelection;
     import org.gvsig.fmap.dal.feature.FeatureSet;
     import org.gvsig.fmap.dal.feature.FeatureStore;
     import org.gvsig.fmap.dal.feature.FeatureStoreProviderFactory;
     import org.gvsig.fmap.dal.feature.FeatureType;
     import org.gvsig.fmap.dal.feature.exception.StoreUpdateFeatureTypeException;
     import org.gvsig.fmap.mapcontrol.MapControlLocator;
-...
     /**
      * Feature Table Operations.
+     *
+     *
      * @author Vicente Caballero Navarro
+     *
+     *
      */
     public class TableOperations {
         private static Logger logger = LoggerFactory.getLogger(TableOperations.class);
         public static final int MAX_FIELD_LENGTH = 254;
         private static TableOperations fto = null;
         private ArrayList<Feature> selectedFeatures = new ArrayList<Feature>();
         private boolean cutting = false;
         private FeatureTableDocumentPanel tablePanel = null;
         private FeatureStore featureStore;
-...
+        }
         public void deleteFeatures() throws DataException {
             FeatureTableModel _ftm = this.tablePanel.getTablePanel().getTableModel();
             List<TableModelListener> tmll = removeTableModelListeners(_ftm);
             DisposableIterator feat_iter = null;
             Feature feat = null;
             try {
                 FeatureSelection selection = featureStore.createFeatureSelection();
                 selection.select((FeatureSet) featureStore.getSelection());
                 feat_iter = selection.fastIterator();
-...
                 if (feat_iter != null) {
                 	feat_iter.dispose();
+                }
                 addTableModelListeners(_ftm, tmll);
+            }
+        }
-...
         private void addTableModelListeners(
             FeatureTableModel _model,
             List<TableModelListener> _list) {
             Iterator<TableModelListener> iter = _list.iterator();
             while (iter.hasNext()) {
                 _model.addTableModelListener(iter.next());
-...
          * @return
          */
         private List<TableModelListener> removeTableModelListeners(FeatureTableModel ftm) {
             TableModelListener[] ll = ftm.getListeners(TableModelListener.class);
             List<TableModelListener> resp = new ArrayList<TableModelListener>();
             int n = ll.length;
             for (int i=0; i<n; i++) {
                 resp.add(ll[i]);
-...
                     feature);
             return true;
+        }
         private boolean updateFeatureType(EditableFeatureType featureType) throws DataException {
             EditingNotificationManager editingNotification = MapControlLocator.getEditingNotificationManager();
             EditingNotification notification = editingNotification.notifyObservers(
                     this,
-...
+        }
         public void insertAttributes(FeatureTable table) throws DataException {
     		EditableFeatureType eft = featureStore.getDefaultFeatureType().getEditable();
     		List<String> tmpfnames = new ArrayList<String>();
-...
     		CreateNewAttributePanel panelNewField = new CreateNewAttributePanel();
     		panelNewField.setCurrentFieldNames(tmpfnames.toArray(new String[0]));
     	    DataManager dataManager = DALLocator.getDataManager();
     	    FeatureStoreProviderFactory factory =
     	            (FeatureStoreProviderFactory) dataManager.
     	            getStoreProviderFactory(featureStore.getProviderName());
     		panelNewField.setMaxAttributeNameSize(factory.getMaxAttributeNameSize());
     		panelNewField.setOkAction(new NewFieldActionListener(panelNewField, eft));
     		ApplicationLocator.getManager().getUIManager().addWindow(panelNewField);
     		featureStore.update(eft);
+        }
         public void renameAttributes(FeatureTable table) throws DataException {
             FeatureType _ft = featureStore.getDefaultFeatureType();
             FeatureAttributeDescriptor[] selecteds =
-...
                     		Messages.getText("field_already_exists"), null);
                     return;
+                }
                 renameAttribute(featureStore, selecteds[i].getName(), newName);
+            }
             // featureStore.finishEditing();
             // featureStore.edit(FeatureStore.MODE_FULLEDIT);
+        }
         /**
          * This method renames a field in three steps:
+         *
+         *
          * (1) add new field using type and size of old field.
          * (2) copy value from old field to new field.
          * (3) remove old field.
+         *
+         *
          * @param fs
          * @param name
          * @param newName
-...
             FeatureType dft = null;
             try {
                 dft = fs.getDefaultFeatureType();
                 if (dft instanceof EditableFeatureType) {
                     eft = (EditableFeatureType) dft;
                 } else {
                     eft = dft.getEditable();
+                }
                 EditableFeatureAttributeDescriptor efad =
                     (EditableFeatureAttributeDescriptor) eft.getAttributeDescriptor(name);
                 efad.setName(newName);
                 fs.update(eft);
             } catch (DataException de) {
                 Component root_comp =
                     ApplicationLocator.getManager().getRootComponent();
-...
                 // did not even add new field
                 return false;
+            }
             boolean error_when_inserting = false;
             try {
                 // ========== copy value old field -> new field
-...
                     fset.update(efeat);
+                }
                 diter.dispose();
                 // Closing editing to check that store admits new field
                 fs.finishEditing();
             } catch (DataException ex) {
                 logger.info("Error while renaming att to: " + newName, ex);
                 String final_msg = getLastMessage(ex);
                 JOptionPane.showMessageDialog(
-...
                     JOptionPane.ERROR_MESSAGE);
                 error_when_inserting = true;
+            }
             if (error_when_inserting) {
                 try {
                     // Trying to remove new field and leave table as it was
-...
                 // Not changed
                 return false;
+            }
             try {
                 // Finally reopen editing and delete old field
                 fs.edit(FeatureStore.MODE_FULLEDIT);
                 eft = fs.getDefaultFeatureType().getEditable();
                 eft.remove(name);
                 fs.update(eft);
             } catch (DataException ex) {
                 logger.info("Unable to rename attribute (" + name + " --> " + newName + ")", ex);
                 ApplicationLocator.getManager().message(
-...
             */
+        }
         /**
          * Renames field in feature store
+         *
+         *
          * @param fs
          * @param oldname
          * @param newname
          * @return
          * @return
          * @throws DataException
          */
         public static void renameColumn(FeatureStore fs,
             String oldname, String newname) throws DataException {
             FeatureType _ft = fs.getDefaultFeatureType();
             if (_ft.getIndex(newname) != -1) {
                 throw new StoreUpdateFeatureTypeException(
-...
             renameAttribute(fs, oldname, newname);
             // fs.finishEditing();
+        }
         public class NewFieldActionListener implements ActionListener {
         	private CreateNewAttributePanel panel = null;
         	private EditableFeatureType eft = null;
         	public NewFieldActionListener(CreateNewAttributePanel p, EditableFeatureType t) {
         		eft = t;
         		panel = p;
+        	}
     		public void actionPerformed(ActionEvent e) {
                 try {
                     EditableFeatureAttributeDescriptor ead = panel.loadFieldDescription(eft);
-...
                 } catch (ParseException e2) {
                     NotificationManager.addError(e2);
+                }
+    		}
+        }
+    }

Application: gvSIG desktop

Revision 42533