/ - Diff - Application: gvSIG desktop - gvSIG

     import java.util.LinkedHashSet;
     import java.util.List;
     import java.util.Set;
     import org.cresques.cts.IProjection;
     import org.gvsig.fmap.dal.DataServerExplorer;
     import org.gvsig.fmap.dal.DataStoreParameters;
-...
         private NewLayerProviderFactory type;
         private NewLayerProvider provider;
         private boolean addTableToProject = true;
         private IProjection defaultProjection;
         /**
          * {@link DefaultNewLayerService} constructor
-...
+                }
+            }
+        }
         @Override
         public void setDefaultProjection(IProjection projection) {
             this.defaultProjection = projection;
+        }
         @Override
         public IProjection getDefaultProjection() {
             return this.defaultProjection;
+        }
+    }

             this.setFinishButtonEnabled(false);
             this.setBackButtonEnabled(false);
             this.setNextButtonEnabled(false);
             ToolsSwingUtils.ensureRowsCols(this, 25, 100, 35, 140);
     //        ToolsSwingUtils.ensureRowsCols(this, 25, 100, 35, 140);
             Dimension screensize = ToolsSwingUtils.getDesktopPanelSize();
             ToolsSwingUtils.ensureHeightWitdh(
                     this,
                     Math.max(3*(screensize.height/4), ToolsSwingUtils.rows2px(35)),
                     Math.max(2*(screensize.width/4), ToolsSwingUtils.cols2px(140)),
 *(screensize.height/8),
 *(screensize.width/4)
             );
+        }
         @Override

             DataSwingManager dataSwingManager = DALSwingLocator.getSwingManager();
             EditableFeatureType ft = dataManager.createFeatureType();
             this.featureTypeEditor = dataSwingManager.createFeatureTypePanel();
             this.featureTypeEditor.setDefaultProjection(this.wizard.getService().getDefaultProjection());
             this.featureTypeEditor.setMode(MODE_EDIT_ALL);
             this.featureTypeEditor.put(ft);
+        }
-...
         @Override
         public void enterPanel() {
             this.featureTypeEditor.setDefaultProjection(this.wizard.getService().getDefaultProjection());
             EditableFeatureType ft = this.provider.getFeatureType();
             if (ft!= null) {
                 this.featureTypeEditor.put(ft);

     package org.gvsig.newlayer;
     import java.util.List;
     import org.cresques.cts.IProjection;
     import org.gvsig.fmap.dal.DataServerExplorer;
     import org.gvsig.fmap.dal.DataStoreParameters;
-...
     //    public MapContext getMapContext();
         public void addNewLayerServiceListener(NewLayerServiceListener listener);
         public IProjection getDefaultProjection();
         public void setDefaultProjection(IProjection projection);
+    }

     import org.gvsig.fmap.dal.DataTypes;
     import org.gvsig.fmap.dal.feature.EditableFeatureAttributeDescriptor;
     import org.gvsig.fmap.geom.Geometry;
     import org.gvsig.newlayer.NewLayerService;
     import org.gvsig.newlayer.prov.file.NewLayerFileProviderParameters;
     /**
-...
      */
     public class NewLayerShapeProviderParameters extends NewLayerFileProviderParameters {
         public NewLayerShapeProviderParameters() {
             super();
         public NewLayerShapeProviderParameters(NewLayerService service) {
             super(service);
             EditableFeatureAttributeDescriptor attr = this.featureType.add("GEOMETRY", DataTypes.GEOMETRY);
             attr.setSRS("EPSG:4326");
             if( service.getDefaultProjection()==null ) {
                 attr.setSRS("EPSG:4326");
             } else {
                 attr.setSRS(service.getDefaultProjection());
+            }
             attr.setGeometryType(Geometry.TYPES.LINE, Geometry.SUBTYPES.GEOM2D);
+        }

         protected NewLayerShapeProvider(NewLayerService service) {
             super(service);
             this.parameters = new NewLayerShapeProviderParameters();
             this.parameters = new NewLayerShapeProviderParameters(service);
+        }
         @Override

         protected NewLayerCSVProvider(NewLayerService service) {
             super(service);
             this.parameters = new NewLayerCSVProviderParameters();
             this.parameters = new NewLayerCSVProviderParameters(service);
+        }
         @Override

     import org.gvsig.fmap.dal.DataTypes;
     import org.gvsig.fmap.dal.feature.EditableFeatureAttributeDescriptor;
     import org.gvsig.fmap.geom.Geometry;
     import org.gvsig.newlayer.NewLayerService;
     import org.gvsig.newlayer.prov.file.NewLayerFileProviderParameters;
     /**
-...
      */
     public class NewLayerCSVProviderParameters extends NewLayerFileProviderParameters {
         public NewLayerCSVProviderParameters() {
             super();
         public NewLayerCSVProviderParameters(NewLayerService service) {
             super(service);
             EditableFeatureAttributeDescriptor attr = this.featureType.add("GEOMETRY", DataTypes.GEOMETRY);
             attr.setSRS("EPSG:4326");
             if( service.getDefaultProjection()==null ) {
                 attr.setSRS("EPSG:4326");
             } else {
                 attr.setSRS(service.getDefaultProjection());
+            }
             attr.setGeometryType(Geometry.TYPES.POINT, Geometry.SUBTYPES.GEOM2D);
+        }

         protected AbstractNewLayerFileProvider(NewLayerService service) {
             super(service);
             this.parameters = new NewLayerFileProviderParameters();
             this.parameters = new NewLayerFileProviderParameters(service);
+        }
         @Override

     import java.io.File;
     import org.gvsig.fmap.dal.DALLocator;
     import org.gvsig.fmap.dal.feature.EditableFeatureType;
     import org.gvsig.newlayer.NewLayerService;
     /**
+     *
-...
         private File file;
         protected EditableFeatureType featureType;
         public NewLayerFileProviderParameters() {
         public NewLayerFileProviderParameters(NewLayerService service) {
             this.featureType = DALLocator.getDataManager().createFeatureType();
+        }

     package org.gvsig.fmap.dal.swing.featuretype;
     import org.cresques.cts.IProjection;
     import org.gvsig.fmap.dal.feature.EditableFeatureType;
     import org.gvsig.fmap.dal.feature.FeatureType;
     import org.gvsig.tools.swing.api.ChangeListenerSupport;
-...
         public int getMode();
         public boolean isEditing();
         public void setDefaultProjection(IProjection projection);
+    }

         private ToManyController toManyController;
         private JSplitPane splAttrTags;
         private FeatureType featureType;
         private IProjection defaultProjection;
         private static class ToOneController {
-...
                 descriptor.setDataProfileName((String) ListElement.getSelected(this.cboDataProfile));
                 switch (descriptor.getType()) {
                     case DataTypes.GEOMETRY:
                         if( ListElement.getSelected(this.cboGeometryType)==null
                                 || ListElement.getSelected(this.cboGeometrySubtype)==null
                                 || this.pickerCRS.get() == null ){
                                 ThreadSafeDialogsManager dialogs = ToolsSwingLocator.getThreadSafeDialogsManager();
                                 dialogs.messageDialog(
                                         i18n.getTranslation("_Geometry_not_configured"),
                                         null,
                                         i18n.getTranslation("_Warning"),
                                         JOptionPane.WARNING_MESSAGE
                                 );
                                 return null;
+                        }
                         GeometryManager geomManager = GeometryLocator.getGeometryManager();
                         GeometryType geomType = geomManager.getGeometryType(
                                 (int) ListElement.getSelected(this.cboGeometryType),
-...
             this.availableValuesController.clean();
             this.tagsController.clean();
             this.toOneController.clean();
             this.pickerCRS.set(defaultProjection);
+        }
         @Override
-...
             FeatureType featureType = descriptor.getFeatureType();
             DefaultComboBoxModel groupModel = new DefaultComboBoxModel();
             this.pickerCRS.set(defaultProjection);
             if (featureType != null) {
                 FeatureStore store = descriptor.getFeatureType().getStore();
                 this.featureStoreElement.setFeatureStore(store);
-...
             Expression expression = descriptor.getAvailableValuesFilter();
             this.pickerValuesFilter.set(expression);
             this.pickerCRS.set(descriptor.getSRS());
             if (descriptor.getGeomType() != null) {
                 ListElement.setSelected(cboGeometryType, descriptor.getGeomType().getType());
                 ListElement.setSelected(cboGeometrySubtype, descriptor.getGeomType().getSubType());
             if( descriptor.getType() == DataTypes.GEOMETRY ) {
                 if( descriptor.getSRS()==null ) {
                     this.pickerCRS.set(defaultProjection);
                 } else {
                     this.pickerCRS.set(descriptor.getSRS());
+                }
                 if (descriptor.getGeomType() != null) {
                     ListElement.setSelected(cboGeometryType, descriptor.getGeomType().getType());
                     ListElement.setSelected(cboGeometrySubtype, descriptor.getGeomType().getSubType());
+                }
             } else {
                 this.pickerCRS.set(defaultProjection);
                 ListElement.setSelected(cboGeometryType, null);
                 ListElement.setSelected(cboGeometrySubtype, null);
+            }
             ListElement.setSelected(cboFieldType, dataType.getType());
             if( ListElement.getSelected(cboFieldType)==null ) {
-...
                 this.pickerIntervalEnd.setEditable(false);
                 this.tabAditionalFields.setEnabledAt(1, true);
                 this.tabAditionalFields.setEnabledAt(2, false);
                 break;
               case DataTypes.INSTANT:
               case DataTypes.INTERVAL:
-...
         );
+      }
       public void setDefaultProjection(IProjection projection) {
           this.defaultProjection = projection;
+      }
+    }

     import javax.swing.event.TableModelEvent;
     import javax.swing.table.AbstractTableModel;
     import org.apache.commons.lang3.StringUtils;
     import org.cresques.cts.IProjection;
     import org.gvsig.configurableactions.ConfigurableActionsMamager;
     import org.gvsig.expressionevaluator.ExpressionUtils;
     import org.gvsig.featureform.swing.impl.DefaultJFeatureForm;
-...
         private JSplitPane splAttributes;
         private FeatureRuleController ruleController;
         private JSplitPane splTags;
         private IProjection defaultProjection;
         private class FeatureTypeTableModel extends AbstractTableModel {
-...
+                }
             });
             this.descriptorPanel = new DefaultFeatureAttributePanel();
             this.descriptorPanel.setDefaultProjection(this.defaultProjection);
             this.pnlField.setLayout(new BorderLayout());
             this.pnlField.add(this.descriptorPanel, BorderLayout.CENTER);
             this.descriptorPanel.setEnabled(false);
-...
             cfgActionsManager.addConfigurableAction(CONFIGURABLE_PANEL_ID, new PreviewFormAction());
             cfgActionsManager.addConfigurableAction(CONFIGURABLE_PANEL_ID, new ForceSynchronizeAction());
+      }
         @Override
         public void setDefaultProjection(IProjection projection) {
             this.defaultProjection = projection;
             if( this.descriptorPanel!=null ) {
                 this.descriptorPanel.setDefaultProjection(projection);
+            }
+        }
+    }

     import org.gvsig.app.ApplicationManager;
     import org.gvsig.app.project.Project;
     import org.gvsig.app.project.ProjectManager;
     import org.gvsig.app.project.documents.Document;
     import org.gvsig.app.project.documents.table.TableDocument;
     import org.gvsig.app.project.documents.table.TableManager;
     import org.gvsig.app.project.documents.table.gui.FeatureTableDocumentPanel;
     import org.gvsig.app.project.documents.view.ViewDocument;
     import org.gvsig.configurableactions.ConfigurableActionsMamager;
     import org.gvsig.fmap.dal.DALLocator;
     import org.gvsig.fmap.dal.DataManager;
-...
                     final FeatureType featureType = featureStore.getDefaultFeatureType();
                     final EditableFeatureType editableFeatureType = featureType.getEditable();
                     final FeatureTypePanel panel = dataSwingManager.createFeatureTypePanel();
                     ViewDocument viewdoc = (ViewDocument) application.getCurrentProject().getFirstDocument(ViewDocument.class);
                     if( viewdoc != null ) {
                         panel.setDefaultProjection(viewdoc.getProjection());
+                    }
                     final ConfigurableActionsMamager cfgActionsManager = ToolsUtilLocator.getConfigurableActionsMamager();
                     ConfigurableActionsMamager.ActionsController actionController =

trunk/org.gvsig.desktop/org.gvsig.desktop.plugin/org.gvsig.newlayer.app/org.gvsig.newlayer.app.mainplugin/src/main/java/org/gvsig/newlayer/app/extension/NewLayerExtension.java
71	71	if (view != null) {
72	72	NewLayerManager manager = NewLayerLocator.getManager();
73	73	NewLayerService service = manager.createNewLayerService();
	74	service.setDefaultProjection(view.getProjection());
74	75	service.addNewLayerServiceListener(new NewLayerServiceAdapter() {
75	76	@Override
76	77	public void postCreateTable(NewLayerService service) {

Application: gvSIG desktop

Revision 47433