Revision 341

View differences:

org.gvsig.toolbox/trunk/org.gvsig.toolbox/org.gvsig.toolbox.gui/pom.xml
4 4
    <groupId>org.gvsig</groupId>
5 5
    <artifactId>org.gvsig.toolbox.gui</artifactId>
6 6
    <packaging>jar</packaging>
7
    <name>${artifactId}</name>
7
    <name>${project.artifactId}</name>
8 8
	
9 9
    <parent>
10 10
        <groupId>org.gvsig</groupId>
......
87 87
            <artifactId>org.gvsig.fmap.dal.swing.api</artifactId>
88 88
            <scope>compile</scope>
89 89
        </dependency>
90
        <dependency>
91
            <groupId>org.gvsig</groupId>
92
            <artifactId>org.gvsig.app.document.table.app.mainplugin</artifactId>
93
            <version>2.0.239-SNAPSHOT</version>
94
            <type>jar</type>
95
        </dependency>
96 90
    </dependencies>
97 91
</project>
org.gvsig.toolbox/trunk/org.gvsig.toolbox/org.gvsig.toolbox.gui/src/main/java/es/unex/sextante/gui/algorithm/DefaultParametersPanel.java
56 56
import es.unex.sextante.dataObjects.ITable;
57 57
import es.unex.sextante.dataObjects.IVectorLayer;
58 58
import es.unex.sextante.exceptions.NullParameterAdditionalInfoException;
59
import es.unex.sextante.exceptions.NullParameterValueException;
60 59
import es.unex.sextante.exceptions.WrongInputException;
61 60
import es.unex.sextante.exceptions.WrongOutputChannelDataException;
62 61
import es.unex.sextante.exceptions.WrongOutputIDException;
......
92 91
import es.unex.sextante.parameters.ParameterTableFilter;
93 92
import es.unex.sextante.parameters.ParameterVectorLayer;
94 93
import es.unex.sextante.parameters.RasterLayerAndBand;
95
import java.util.logging.Level;
96
import java.util.logging.Logger;
97 94
import javax.swing.ImageIcon;
98
import javax.swing.JComponent;
99
import org.apache.commons.lang3.tuple.Pair;
100
import org.gvsig.app.project.documents.table.TableDocument;
101 95
import org.gvsig.fmap.dal.feature.FeatureStore;
102
import org.gvsig.fmap.mapcontext.layers.vectorial.VectorLayer;
103
import org.gvsig.temporarystorage.TemporaryStorageGroup;
104 96
import org.gvsig.tools.swing.api.ToolsSwingLocator;
105 97
import org.gvsig.tools.swing.icontheme.IconTheme;
106
import org.gvsig.temporarystorage.TemporaryStorageLocator;
107
import org.gvsig.temporarystorage.TemporaryStorageManager;
108 98

  
109 99
/**
110 100
 * A panel to introduce parameters for a geoalgorithm, created automatically based on the parameters needed by that geoalgorithm
......
786 776
       }
787 777
       TableFilterPanel tableFilterPanel;
788 778
       //          IVectorLayer ivlayer = parameter.getParameterValueAsVectorLayer();
789
       List<ITable> layers = getTables();
790
       if (layers.size() > 0) {
791
           ITable ivlayer = layers.get(0);
792
           TableDocument layer = (TableDocument) ivlayer.getBaseDataObject();
793
           FeatureStore store = layer.getFeatureStore();
779
       List<ITable> tables = getTables();
780
       if (tables.size() > 0) {
781
           ITable table = tables.get(0);
782
           FeatureStore store = table.getFeatureStore();
794 783
           tableFilterPanel = new TableFilterPanel(store);
795 784
       } else {
796 785
           tableFilterPanel = new TableFilterPanel();
......
820 809
       List<IVectorLayer> layers = getVectorLayers(shapeTypes);
821 810
       if (layers.size() > 0) {
822 811
           IVectorLayer ivlayer = layers.get(0);
823
           VectorLayer layer = (VectorLayer) ivlayer.getBaseDataObject();
824
           FeatureStore store = layer.getFeatureStore();
812
           FeatureStore store = ivlayer.getFeatureStore();
825 813
           tableFilterPanel = new TableFilterPanel(store);
826 814
       } else {
827 815
           tableFilterPanel = new TableFilterPanel();
......
1323 1311
                  }
1324 1312
                  if (item instanceof TableFilterPanel) {
1325 1313
                    TableFilterPanel pane = (TableFilterPanel) item;
1326
                    VectorLayer ivector = (VectorLayer) layer.getBaseDataObject();
1327
                    pane.setStore(ivector.getFeatureStore());
1314
                    pane.setStore(layer.getFeatureStore());
1328 1315
                  }
1329 1316
               }
1330 1317
            }
......
1378 1365
                        }
1379 1366
                        if (item instanceof TableFilterPanel) {
1380 1367
                            TableFilterPanel pane = (TableFilterPanel) item;
1381
                            VectorLayer ivector = (VectorLayer) layer.getBaseDataObject();
1382
                            pane.setStore(ivector.getFeatureStore());
1368
                            pane.setStore(layer.getFeatureStore());
1383 1369
                        }
1384 1370
                    }
1385 1371
                }
......
1463 1449
                     }
1464 1450
                     if (item instanceof TableFilterPanel) {
1465 1451
                         TableFilterPanel pane = (TableFilterPanel) item;
1466
                         TableDocument ivector = (TableDocument) table.getBaseDataObject();
1467
                         pane.setStore(ivector.getFeatureStore());
1452
                         pane.setStore(table.getFeatureStore());
1468 1453

  
1469 1454
                     }
1470 1455
                 }
org.gvsig.toolbox/trunk/org.gvsig.toolbox/org.gvsig.toolbox.algorithm/pom.xml
5 5
	<groupId>org.gvsig</groupId>
6 6
	<artifactId>org.gvsig.toolbox.algorithm</artifactId>
7 7
	<packaging>jar</packaging>
8
	<name>${artifactId}</name>
8
	<name>${project.artifactId}</name>
9 9
	
10 10
	<parent>
11 11
		<groupId>org.gvsig</groupId>
org.gvsig.toolbox/trunk/org.gvsig.toolbox/org.gvsig.toolbox.core/pom.xml
1 1
<?xml version="1.0" encoding="UTF-8"?>
2 2
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
3
	<modelVersion>4.0.0</modelVersion>
4
	<groupId>org.gvsig</groupId>
5
	<artifactId>org.gvsig.toolbox.core</artifactId>
6
	<packaging>jar</packaging>
7
	<name>${artifactId}</name>
3
    <modelVersion>4.0.0</modelVersion>
4
    <groupId>org.gvsig</groupId>
5
    <artifactId>org.gvsig.toolbox.core</artifactId>
6
    <packaging>jar</packaging>
7
    <name>${project.artifactId}</name>
8 8
	
9
	<parent>
10
		<groupId>org.gvsig</groupId>
11
		<artifactId>org.gvsig.toolbox</artifactId>
12
		<version>1.0.59-SNAPSHOT</version>
13
	</parent>
9
    <parent>
10
        <groupId>org.gvsig</groupId>
11
        <artifactId>org.gvsig.toolbox</artifactId>
12
        <version>1.0.59-SNAPSHOT</version>
13
    </parent>
14 14
	
15
	<dependencies>
16
	    <dependency>
15
    <dependencies>
16
        <dependency>
17 17
            <groupId>org.gvsig</groupId>
18 18
            <artifactId>org.gvsig.i18n</artifactId>
19 19
            <scope>compile</scope>
20 20
        </dependency>
21
		<dependency>
22
			<groupId>org.gvsig</groupId>
23
			<artifactId>org.gvsig.toolbox.math</artifactId>
24
		</dependency>
25
		<dependency>
26
			<groupId>jfree</groupId>
27
			<artifactId>jfreechart</artifactId>
28
		</dependency>
29
		<dependency>
30
			<groupId>com.vividsolutions</groupId>
31
			<artifactId>jts</artifactId>
32
		</dependency>
33
		<dependency>
34
			<groupId>net.sf.kxml</groupId>
35
			<artifactId>kxml2</artifactId>
36
		</dependency>
37
		<dependency>
38
		  <groupId>org.gvsig</groupId>
39
		  <artifactId>org.gvsig.fmap.geometry.api</artifactId>
40
		</dependency>
41
	 <dependency>
42
	  <groupId>org.gvsig</groupId>
43
	  <artifactId>org.gvsig.expressionevaluator.lib.api</artifactId>
21
        <dependency>
22
            <groupId>org.gvsig</groupId>
23
            <artifactId>org.gvsig.toolbox.math</artifactId>
24
        </dependency>
25
        <dependency>
26
            <groupId>jfree</groupId>
27
            <artifactId>jfreechart</artifactId>
28
        </dependency>
29
        <dependency>
30
            <groupId>com.vividsolutions</groupId>
31
            <artifactId>jts</artifactId>
32
        </dependency>
33
        <dependency>
34
            <groupId>net.sf.kxml</groupId>
35
            <artifactId>kxml2</artifactId>
36
        </dependency>
37
        <dependency>
38
            <groupId>org.gvsig</groupId>
39
            <artifactId>org.gvsig.fmap.geometry.api</artifactId>
44 40
            <scope>compile</scope>
45
	 </dependency>
46
	</dependencies>
41
        </dependency>
42
        <dependency>
43
            <groupId>org.gvsig</groupId>
44
            <artifactId>org.gvsig.fmap.dal.api</artifactId>
45
            <scope>compile</scope>
46
        </dependency>
47
        <dependency>
48
            <groupId>org.gvsig</groupId>
49
            <artifactId>org.gvsig.expressionevaluator.lib.api</artifactId>
50
            <scope>compile</scope>
51
        </dependency>
52
    </dependencies>
47 53

  
48 54
</project>
org.gvsig.toolbox/trunk/org.gvsig.toolbox/org.gvsig.toolbox.core/src/main/java/es/unex/sextante/dataObjects/IVectorLayer.java
7 7
import org.gvsig.tools.exception.BaseException;
8 8

  
9 9
import es.unex.sextante.dataObjects.vectorFilters.IVectorLayerFilter;
10
import org.gvsig.fmap.dal.feature.FeatureStore;
10 11

  
11 12
/**
12 13
 * This is the base interface that all vector layers have to implement to be able to be used by SEXTANTE algorithms.
......
177 178
   
178 179
   public boolean hasSelection();
179 180

  
181
   public FeatureStore getFeatureStore();
180 182
}
org.gvsig.toolbox/trunk/org.gvsig.toolbox/org.gvsig.toolbox.core/src/main/java/es/unex/sextante/dataObjects/AbstractTable.java
1 1
package es.unex.sextante.dataObjects;
2 2

  
3
import org.gvsig.fmap.dal.feature.FeatureStore;
4

  
3 5
/**
4 6
 * A convenience class which implements some of the methods of the ITable interface. Extending this class is recommended instead
5 7
 * of implementing the interface directly
......
59 61

  
60 62
   }
61 63

  
64
    @Override
65
    public FeatureStore getFeatureStore() {
66
        return null;
67
    }
62 68

  
63 69
}
org.gvsig.toolbox/trunk/org.gvsig.toolbox/org.gvsig.toolbox.core/src/main/java/es/unex/sextante/dataObjects/AbstractVectorLayer.java
10 10

  
11 11
import es.unex.sextante.dataObjects.vectorFilters.IVectorLayerFilter;
12 12
import es.unex.sextante.exceptions.IteratorException;
13
import org.gvsig.fmap.dal.feature.FeatureStore;
13 14

  
14 15

  
15 16
/**
......
176 177

  
177 178
   }
178 179

  
180
    @Override
181
    public FeatureStore getFeatureStore() {
182
        return null;
183
    }
179 184

  
180 185
}
org.gvsig.toolbox/trunk/org.gvsig.toolbox/org.gvsig.toolbox.core/src/main/java/es/unex/sextante/dataObjects/ITable.java
1 1
package es.unex.sextante.dataObjects;
2 2

  
3
import org.gvsig.fmap.dal.feature.FeatureStore;
4

  
3 5
/**
4 6
 * This is the base interface that all table objects have to implement to be able to be used by SEXTANTE algorithms.
5 7
 *
......
106 108
    */
107 109
   public int getFieldIndexByName(String fieldName);
108 110

  
109

  
111
   public FeatureStore getFeatureStore();
110 112
}
org.gvsig.toolbox/trunk/org.gvsig.toolbox/org.gvsig.toolbox.math/pom.xml
5 5
	<groupId>org.gvsig</groupId>
6 6
	<artifactId>org.gvsig.toolbox.math</artifactId>
7 7
	<packaging>jar</packaging>
8
	<name>${artifactId}</name>
8
	<name>${project.artifactId}</name>
9 9
	
10 10
	<parent>
11 11
		<groupId>org.gvsig</groupId>
org.gvsig.toolbox/trunk/org.gvsig.toolbox/pom.xml
5 5
	<groupId>org.gvsig</groupId>
6 6
	<artifactId>org.gvsig.toolbox</artifactId>
7 7
	<packaging>pom</packaging>
8
	<name>${artifactId}</name>
8
	<name>${project.artifactId}</name>
9 9
	<version>1.0.59-SNAPSHOT</version>
10 10

  
11 11
	<parent>

Also available in: Unified diff