Revision 43396

View differences:

trunk/org.gvsig.desktop/org.gvsig.desktop.library/org.gvsig.exportto/org.gvsig.exportto.swing/org.gvsig.exportto.swing.prov/org.gvsig.exportto.swing.prov.dxf/src/main/java/org/gvsig/exportto/swing/prov/dxf/ExporttoDXFService.java
34 34
import org.gvsig.fmap.dal.feature.FeatureStore;
35 35
import org.gvsig.fmap.dal.feature.NewFeatureStoreParameters;
36 36
import org.gvsig.fmap.dal.feature.OpenFeatureStoreParameters;
37
import org.gvsig.fmap.dal.serverexplorer.filesystem.FilesystemStoreParameters;
37 38
import org.gvsig.tools.task.SimpleTaskStatus;
38 39

  
39 40
/**
......
51 52
    public ExporttoDXFService(File dxfFile, FeatureStore featureStore,
52 53
        IProjection projection) {
53 54
        super(dxfFile, featureStore);
55
        if( !dxfFile.getName().toLowerCase().endsWith(".dxf") ) {
56
            this.file = new File(dxfFile.getAbsolutePath()+".dxf");
57
        }
54 58
        this.projection = projection;
55 59
        try {
56 60
            this.open();
......
67 71
    public void addParameters(
68 72
        NewFeatureStoreParameters newFeatureStoreParameters) {
69 73
        newFeatureStoreParameters.setDynValue("CRS", projection);
74
        ((FilesystemStoreParameters)newFeatureStoreParameters).setFile(file);
70 75
    }
71 76

  
72 77
    @Override
73 78
    public void addParameters(
74 79
        OpenFeatureStoreParameters openFeatureStoreParameters) {
75 80
        openFeatureStoreParameters.setDynValue("CRS", projection);
81
        ((FilesystemStoreParameters)openFeatureStoreParameters).setFile(file);
76 82
    }
77 83

  
78 84
    @Override
trunk/org.gvsig.desktop/org.gvsig.desktop.library/org.gvsig.exportto/org.gvsig.exportto.swing/org.gvsig.exportto.swing.prov/pom.xml
11 11
  </parent>
12 12

  
13 13
  <modules>
14
      <!--
15
    <module>org.gvsig.exportto.swing.prov.generic</module>  
16
    -->
17 14
    <module>org.gvsig.exportto.swing.prov.file</module>  
18 15
    <module>org.gvsig.exportto.swing.prov.shape</module>    
19
    <module>org.gvsig.exportto.swing.prov.dxf</module>  
20 16
    <module>org.gvsig.exportto.swing.prov.jdbc</module>  
21
    <!--
22
    <module>org.gvsig.exportto.swing.prov.postgresql</module>    
23
    <module>org.gvsig.exportto.swing.prov.mysql</module>      
24
    -->
25 17
    <module>org.gvsig.exportto.swing.prov.dbf</module>      
26 18
  </modules>
27 19
</project>
trunk/org.gvsig.desktop/org.gvsig.desktop.library/org.gvsig.exportto/org.gvsig.exportto.swing/org.gvsig.exportto.swing.prov/org.gvsig.exportto.swing.prov.file/src/main/java/org/gvsig/exportto/swing/prov/file/AbstractExporttoFileService.java
42 42
import org.gvsig.fmap.dal.feature.OpenFeatureStoreParameters;
43 43
import org.gvsig.fmap.dal.serverexplorer.filesystem.FilesystemServerExplorer;
44 44
import org.gvsig.fmap.dal.serverexplorer.filesystem.FilesystemServerExplorerParameters;
45
import org.gvsig.fmap.dal.serverexplorer.filesystem.FilesystemStoreParameters;
45 46
import org.gvsig.tools.task.TaskStatus;
46 47

  
47 48
/**
......
93 94

  
94 95
        FilesystemServerExplorer explorer;
95 96
        try {
96
            explorer =
97
                (FilesystemServerExplorer) dataManager.openServerExplorer(
98
                    "FilesystemExplorer", explorerParams);
99
        } catch (ValidateDataParametersException e) {
100
            throw new ExporttoServiceException(e);
101
        } catch (InitializeException e) {
102
            throw new ExporttoServiceException(e);
103
        } catch (ProviderNotRegisteredException e) {
104
            throw new ExporttoServiceException(e);
105
        }
106

  
107
        try {
108
            openFeatureStoreParameters = (OpenFeatureStoreParameters) explorer.createStoreParameters(newFile);
97
            explorer = (FilesystemServerExplorer) dataManager.openServerExplorer(
98
                    "FilesystemExplorer", explorerParams
99
            );
100
            String providerName = explorer.getProviderName(file);
101
            openFeatureStoreParameters = (OpenFeatureStoreParameters) dataManager.createStoreParameters(providerName);
102
//            openFeatureStoreParameters = (OpenFeatureStoreParameters) explorer.createStoreParameters(newFile);
109 103
            addParameters(openFeatureStoreParameters);
110 104
            newFeatureStoreParameters = (NewFeatureStoreParameters) explorer.getAddParameters(newFile);
111 105
            addParameters(newFeatureStoreParameters);
......
117 111
                );
118 112

  
119 113

  
120
        } catch (DataException e) {
114
        } catch (Exception e) {
121 115
            throw new ExporttoServiceException(e);
122 116
        }
123 117
    }
124 118

  
trunk/org.gvsig.desktop/org.gvsig.desktop.plugin/org.gvsig.exportto.app/org.gvsig.exportto.app.mainplugin/pom.xml
75 75
      <artifactId>org.gvsig.exportto.swing.spi</artifactId>
76 76
      <scope>compile</scope>
77 77
    </dependency>
78
<!--
79
    <dependency>
80
      <groupId>org.gvsig</groupId>
81
      <artifactId>org.gvsig.exportto.swing.prov.generic</artifactId>
82
      <scope>compile</scope>
83
    </dependency>
84
-->
85 78

  
79

  
86 80
    <!-- Runtime dependencies -->
87 81

  
88 82
    <dependency>
......
108 102
    </dependency>
109 103
    <dependency>
110 104
      <groupId>org.gvsig</groupId>
111
      <artifactId>org.gvsig.exportto.swing.prov.dxf</artifactId>
112
      <scope>runtime</scope>
113
    </dependency>
114
    <dependency>
115
      <groupId>org.gvsig</groupId>
116 105
      <artifactId>org.gvsig.exportto.swing.prov.jdbc</artifactId>
117 106
      <scope>runtime</scope>
118 107
    </dependency>
trunk/org.gvsig.desktop/org.gvsig.desktop.plugin/org.gvsig.exportto.app/org.gvsig.exportto.app.mainplugin/src/main/assembly/gvsig-plugin-package.xml
60 60
        <include>org.gvsig:org.gvsig.exportto.swing.spi</include>
61 61
        <include>org.gvsig:org.gvsig.exportto.swing.prov.file</include>
62 62
        <include>org.gvsig:org.gvsig.exportto.swing.prov.shape</include>
63
        <include>org.gvsig:org.gvsig.exportto.swing.prov.dxf</include>
64 63
        <include>org.gvsig:org.gvsig.exportto.swing.prov.jdbc</include>
65

  
66 64
        <include>org.gvsig:org.gvsig.exportto.swing.prov.dbf</include>
67 65
      </includes>
68 66
    </dependencySet>

Also available in: Unified diff