Revision 172

View differences:

org.gvsig.sextante/trunk/org.gvsig.sextante.app/org.gvsig.sextante.app.algorithm/org.gvsig.sextante.app.algorithm.intersection/src/main/java/org/gvsig/sextante/app/algorithm/intersection/IntersectionOperation.java
23 23
import java.util.Iterator;
24 24
import java.util.List;
25 25

  
26
import com.vividsolutions.jts.geom.Geometry;
27
import com.vividsolutions.jts.precision.EnhancedPrecisionOp;
28

  
29
import es.unex.sextante.core.Sextante;
30

  
26 31
import org.gvsig.fmap.dal.exception.DataException;
27 32
import org.gvsig.fmap.dal.feature.EditableFeature;
28 33
import org.gvsig.fmap.dal.feature.Feature;
......
33 38
import org.gvsig.sextante.app.algorithm.base.util.GeometryUtil;
34 39
import org.gvsig.tools.dispose.DisposableIterator;
35 40

  
36
import com.vividsolutions.jts.geom.Geometry;
37
import com.vividsolutions.jts.precision.EnhancedPrecisionOp;
38

  
39
import es.unex.sextante.core.Sextante;
40

  
41 41
/**
42 42
 * Builds a geometry with the intersection between two layers
43 43
 * 
org.gvsig.sextante/trunk/org.gvsig.sextante.app/org.gvsig.sextante.app.algorithm/org.gvsig.sextante.app.algorithm.intersection/src/main/java/org/gvsig/sextante/app/algorithm/intersection/IntersectionLibrary.java
45 45
				IntersectionLibrary.class.getClassLoader(),
46 46
				IntersectionLibrary.class.getClass().getName());
47 47
		setLanguageStrings("org.gvsig.sextante.app.algorithm.intersection.intersection");
48
		Sextante.addGeoProcess(IntersectionAlgorithm.class, text);
48
        Sextante.addGeoalgorithm("gvSIG", IntersectionAlgorithm.class, text);
49 49
	}
50 50

  
51 51
}
org.gvsig.sextante/trunk/org.gvsig.sextante.app/org.gvsig.sextante.app.algorithm/org.gvsig.sextante.app.algorithm.intersection/src/main/java/org/gvsig/sextante/app/algorithm/intersection/IntersectionAlgorithm.java
20 20
 */
21 21
package org.gvsig.sextante.app.algorithm.intersection;
22 22

  
23
import org.gvsig.fmap.dal.exception.DataException;
24
import org.gvsig.fmap.dal.feature.FeatureSet;
25
import org.gvsig.fmap.dal.feature.FeatureStore;
26
import org.gvsig.fmap.dal.feature.FeatureType;
27
import org.gvsig.sextante.app.extension.core.gvGeoAlgorithm;
28
import org.gvsig.sextante.app.extension.core.gvVectorLayer;
29

  
30 23
import es.unex.sextante.core.Sextante;
31 24
import es.unex.sextante.dataObjects.IVectorLayer;
32 25
import es.unex.sextante.exceptions.GeoAlgorithmExecutionException;
33 26
import es.unex.sextante.exceptions.RepeatedParameterNameException;
34 27
import es.unex.sextante.outputs.OutputVectorLayer;
35 28

  
29
import org.gvsig.fmap.dal.exception.DataException;
30
import org.gvsig.fmap.dal.feature.FeatureSet;
31
import org.gvsig.fmap.dal.feature.FeatureStore;
32
import org.gvsig.fmap.dal.feature.FeatureType;
33
import org.gvsig.geoprocess.core.gvGeoAlgorithm;
34
import org.gvsig.geoprocess.core.gvVectorLayer;
35

  
36 36
/**
37 37
 * Intersection algorithm
38 38
 * @author <a href="mailto:nachobrodin@gmail.com">Nacho Brodin</a>
......
50 50
	public void defineCharacteristics() {
51 51
		setName(Sextante.getText("Intersection"));
52 52
		setGroup(Sextante.getText("gvSIG_Algorithms"));
53
		setGeneratesUserDefinedRasterOutput(false);
53
        // setGeneratesUserDefinedRasterOutput(false);
54 54
		
55 55
		try {
56 56
			m_Parameters.addInputVectorLayer(LAYER, 
org.gvsig.sextante/trunk/org.gvsig.sextante.app/org.gvsig.sextante.app.algorithm/org.gvsig.sextante.app.algorithm.intersection/pom.xml
9 9
	<parent>
10 10
		<groupId>org.gvsig</groupId>
11 11
		<artifactId>org.gvsig.sextante.app.algorithm</artifactId>
12
		<version>0.6.0-SNAPSHOT</version>
12
		<version>1.0.0-SNAPSHOT</version>
13 13
	</parent>
14 14
	
15 15
	<dependencies>
16 16
		<dependency>
17 17
		    <groupId>org.gvsig</groupId>
18 18
   			<artifactId>org.gvsig.sextante.app.algorithm.base</artifactId>
19
   			<version>0.6.0-SNAPSHOT</version>
19
   			<version>1.0.0-SNAPSHOT</version>
20 20
            <scope>compile</scope>
21 21
   		</dependency>
22 22
	</dependencies>
org.gvsig.sextante/trunk/org.gvsig.sextante.app/org.gvsig.sextante.app.algorithm/org.gvsig.sextante.app.algorithm.clip/src/main/java/org/gvsig/sextante/app/algorithm/clip/ClipLibrary.java
45 45
				ClipLibrary.class.getClassLoader(),
46 46
				ClipLibrary.class.getClass().getName());
47 47
		setLanguageStrings("org.gvsig.sextante.app.algorithm.clip.clip");
48
		Sextante.addGeoProcess(ClipAlgorithm.class, text);
48
        Sextante.addGeoalgorithm("gvSIG", ClipAlgorithm.class, text);
49 49
	}
50 50

  
51 51
}
org.gvsig.sextante/trunk/org.gvsig.sextante.app/org.gvsig.sextante.app.algorithm/org.gvsig.sextante.app.algorithm.clip/src/main/java/org/gvsig/sextante/app/algorithm/clip/ClipAlgorithm.java
20 20
 */
21 21
package org.gvsig.sextante.app.algorithm.clip;
22 22

  
23
import es.unex.sextante.core.Sextante;
24
import es.unex.sextante.dataObjects.IVectorLayer;
25
import es.unex.sextante.exceptions.GeoAlgorithmExecutionException;
26
import es.unex.sextante.exceptions.RepeatedParameterNameException;
27
import es.unex.sextante.outputs.OutputVectorLayer;
28

  
23 29
import org.gvsig.fmap.dal.exception.DataException;
24 30
import org.gvsig.fmap.dal.feature.FeatureSet;
25 31
import org.gvsig.fmap.dal.feature.FeatureStore;
26 32
import org.gvsig.fmap.dal.feature.FeatureType;
33
import org.gvsig.geoprocess.core.gvGeoAlgorithm;
34
import org.gvsig.geoprocess.core.gvVectorLayer;
27 35
import org.gvsig.sextante.app.algorithm.base.core.ScalableUnionOperation;
28
import org.gvsig.sextante.app.extension.core.gvGeoAlgorithm;
29
import org.gvsig.sextante.app.extension.core.gvVectorLayer;
30 36

  
31
import es.unex.sextante.core.Sextante;
32
import es.unex.sextante.dataObjects.IVectorLayer;
33
import es.unex.sextante.exceptions.GeoAlgorithmExecutionException;
34
import es.unex.sextante.exceptions.RepeatedParameterNameException;
35
import es.unex.sextante.outputs.OutputVectorLayer;
36

  
37 37
/**
38 38
 * Clip algorithm
39 39
 * @author <a href="mailto:nachobrodin@gmail.com">Nacho Brodin</a>
......
51 51
	public void defineCharacteristics(){
52 52
		setName(Sextante.getText("Clip"));
53 53
		setGroup(Sextante.getText("gvSIG_Algorithms"));
54
		setGeneratesUserDefinedRasterOutput(false);
54
        // setGeneratesUserDefinedRasterOutput(false);
55 55
		
56 56
		try {
57 57
			m_Parameters.addInputVectorLayer(LAYER, 
org.gvsig.sextante/trunk/org.gvsig.sextante.app/org.gvsig.sextante.app.algorithm/org.gvsig.sextante.app.algorithm.clip/pom.xml
9 9
	<parent>
10 10
		<groupId>org.gvsig</groupId>
11 11
		<artifactId>org.gvsig.sextante.app.algorithm</artifactId>
12
		<version>0.6.0-SNAPSHOT</version>
12
		<version>1.0.0-SNAPSHOT</version>
13 13
	</parent>
14 14
	
15 15
	<dependencies>
16 16
		<dependency>
17 17
		    <groupId>org.gvsig</groupId>
18 18
   			<artifactId>org.gvsig.sextante.app.algorithm.base</artifactId>
19
   			<version>0.6.0-SNAPSHOT</version>
19
   			<version>1.0.0-SNAPSHOT</version>
20 20
            <scope>compile</scope>
21 21
   		</dependency>
22 22
	</dependencies>
org.gvsig.sextante/trunk/org.gvsig.sextante.app/org.gvsig.sextante.app.algorithm/org.gvsig.sextante.app.algorithm.convexhull/src/main/java/org/gvsig/sextante/app/algorithm/convexhull/ConvexHullAlgorithm.java
23 23
import java.util.Iterator;
24 24
import java.util.List;
25 25

  
26
import org.gvsig.fmap.dal.DataSet;
26
import es.unex.sextante.core.GeoAlgorithm;
27
import es.unex.sextante.core.Sextante;
28
import es.unex.sextante.dataObjects.IVectorLayer;
29
import es.unex.sextante.exceptions.GeoAlgorithmExecutionException;
30
import es.unex.sextante.exceptions.RepeatedParameterNameException;
31
import es.unex.sextante.outputs.OutputVectorLayer;
32

  
27 33
import org.gvsig.fmap.dal.exception.DataException;
28 34
import org.gvsig.fmap.dal.feature.Feature;
35
import org.gvsig.fmap.dal.feature.FeatureSelection;
29 36
import org.gvsig.fmap.dal.feature.FeatureSet;
30 37
import org.gvsig.fmap.dal.feature.FeatureStore;
31
import org.gvsig.fmap.dal.feature.impl.DefaultFeatureSelection;
32 38
import org.gvsig.fmap.geom.Geometry;
39
import org.gvsig.geoprocess.core.gvVectorLayer;
33 40
import org.gvsig.sextante.app.algorithm.base.util.GeometryUtil;
34
import org.gvsig.sextante.app.extension.core.gvVectorLayer;
35 41
import org.gvsig.tools.dispose.DisposableIterator;
36 42

  
37
import es.unex.sextante.core.GeoAlgorithm;
38
import es.unex.sextante.core.Sextante;
39
import es.unex.sextante.dataObjects.IVectorLayer;
40
import es.unex.sextante.exceptions.GeoAlgorithmExecutionException;
41
import es.unex.sextante.exceptions.RepeatedParameterNameException;
42
import es.unex.sextante.outputs.OutputVectorLayer;
43

  
44 43
/**
45 44
 * Convex Hull Algorithm
46 45
 * @author Nacho Brodin (nachobrodin@gmail.com)
......
53 52
	public void defineCharacteristics(){
54 53
		setName(Sextante.getText("Convex Hull"));
55 54
		setGroup(Sextante.getText("gvSIG_Algorithms"));
56
		setGeneratesUserDefinedRasterOutput(false);
55
        // setGeneratesUserDefinedRasterOutput(false);
57 56
		try {
58 57
			m_Parameters.addInputVectorLayer(LAYER, 
59 58
												Sextante.getText("Input_layer"), 
......
92 91
			
93 92
			DisposableIterator it = null;
94 93
			if(selectedGeom) {
95
				DataSet ds = store.getSelection();
96
				it = ((DefaultFeatureSelection)ds).iterator();
94
                FeatureSelection ds = store.getFeatureSelection();
95
                it = ds.iterator();
97 96
				//if(!it.hasNext())Mensaje de no hay geometrias seleccionadas
98 97
			} else
99 98
				it = features.iterator();
org.gvsig.sextante/trunk/org.gvsig.sextante.app/org.gvsig.sextante.app.algorithm/org.gvsig.sextante.app.algorithm.convexhull/src/main/java/org/gvsig/sextante/app/algorithm/convexhull/ConvexHullOperation.java
76 76
*/
77 77
package org.gvsig.sextante.app.algorithm.convexhull;
78 78

  
79
import com.vividsolutions.jts.geom.Geometry;
80
import com.vividsolutions.jts.geom.GeometryCollection;
81
import com.vividsolutions.jts.geom.GeometryFactory;
82

  
83
import es.unex.sextante.core.Sextante;
84

  
79 85
import org.gvsig.fmap.dal.exception.DataException;
80 86
import org.gvsig.fmap.dal.feature.FeatureStore;
81 87
import org.gvsig.fmap.geom.GeometryLocator;
......
86 92
import org.gvsig.fmap.geom.operation.fromjts.FromJTS;
87 93
import org.gvsig.sextante.app.algorithm.base.util.GeometryUtil;
88 94

  
89
import com.vividsolutions.jts.geom.Geometry;
90
import com.vividsolutions.jts.geom.GeometryCollection;
91
import com.vividsolutions.jts.geom.GeometryFactory;
92

  
93
import es.unex.sextante.core.Sextante;
94

  
95 95
/**
96 96
 * Convex Hull operation
97 97
 * @author Nacho Brodin (nachobrodin@gmail.com)
org.gvsig.sextante/trunk/org.gvsig.sextante.app/org.gvsig.sextante.app.algorithm/org.gvsig.sextante.app.algorithm.convexhull/src/main/java/org/gvsig/sextante/app/algorithm/convexhull/ConvexHullParametersPanel.java
98 98
	}
99 99
	
100 100
	@Override
101
	public boolean assignParameters() {
102
		return false;
101
    public void assignParameters() {
102
        // Nothing to do
103 103
	}
104 104

  
105 105
	@Override
org.gvsig.sextante/trunk/org.gvsig.sextante.app/org.gvsig.sextante.app.algorithm/org.gvsig.sextante.app.algorithm.convexhull/src/main/java/org/gvsig/sextante/app/algorithm/convexhull/ConvexHullLibrary.java
45 45
				ConvexHullLibrary.class.getClassLoader(),
46 46
				ConvexHullLibrary.class.getClass().getName());
47 47
		setLanguageStrings("org.gvsig.sextante.app.algorithm.convexhull.convexhull");
48
		Sextante.addGeoProcess(ConvexHullAlgorithm.class, text);
48
        Sextante.addGeoalgorithm("gvSIG", ConvexHullAlgorithm.class, text);
49 49
	}
50 50

  
51 51
}
org.gvsig.sextante/trunk/org.gvsig.sextante.app/org.gvsig.sextante.app.algorithm/org.gvsig.sextante.app.algorithm.convexhull/pom.xml
9 9
	<parent>
10 10
		<groupId>org.gvsig</groupId>
11 11
		<artifactId>org.gvsig.sextante.app.algorithm</artifactId>
12
		<version>0.6.0-SNAPSHOT</version>
12
		<version>1.0.0-SNAPSHOT</version>
13 13
	</parent>
14 14
	
15 15
	<dependencies>
16 16
		<dependency>
17 17
		    <groupId>org.gvsig</groupId>
18 18
   			<artifactId>org.gvsig.sextante.app.algorithm.base</artifactId>
19
   			<version>0.6.0-SNAPSHOT</version>
19
   			<version>1.0.0-SNAPSHOT</version>
20 20
            <scope>compile</scope>
21 21
   		</dependency>
22 22
	</dependencies>
org.gvsig.sextante/trunk/org.gvsig.sextante.app/org.gvsig.sextante.app.algorithm/org.gvsig.sextante.app.algorithm.dissolve/src/main/java/org/gvsig/sextante/app/algorithm/dissolve/AdjacencyDissolveRule.java
23 23

  
24 24
import java.util.HashMap;
25 25

  
26
import com.vividsolutions.jts.geom.Geometry;
27

  
26 28
import org.gvsig.fmap.dal.feature.Feature;
27 29

  
28
import com.vividsolutions.jts.geom.Geometry;
29

  
30 30
/**
31 31
 * 
32 32
 * @author <a href="mailto:nachobrodin@gmail.com">Nacho Brodin</a>
org.gvsig.sextante/trunk/org.gvsig.sextante.app/org.gvsig.sextante.app.algorithm/org.gvsig.sextante.app.algorithm.dissolve/src/main/java/org/gvsig/sextante/app/algorithm/dissolve/AtomicDissolveOperation.java
25 25
import java.util.Iterator;
26 26
import java.util.List;
27 27

  
28
import org.gvsig.fmap.dal.DataSet;
28
import com.vividsolutions.jts.geom.Geometry;
29

  
30
import es.unex.sextante.core.Sextante;
31

  
29 32
import org.gvsig.fmap.dal.exception.DataException;
30
import org.gvsig.tools.dispose.DisposableIterator;
31 33
import org.gvsig.fmap.dal.feature.EditableFeature;
32 34
import org.gvsig.fmap.dal.feature.Feature;
35
import org.gvsig.fmap.dal.feature.FeatureSelection;
33 36
import org.gvsig.fmap.dal.feature.FeatureSet;
34 37
import org.gvsig.fmap.dal.feature.FeatureStore;
35
import org.gvsig.fmap.dal.feature.impl.DefaultFeatureSelection;
36 38
import org.gvsig.sextante.app.algorithm.base.core.GeometryOperation;
37 39
import org.gvsig.sextante.app.algorithm.base.util.GeometryUtil;
38

  
39
import com.vividsolutions.jts.geom.Geometry;
40

  
41
import es.unex.sextante.core.Sextante;
40
import org.gvsig.tools.dispose.DisposableIterator;
42 41
/**
43 42
 * Atomic dissolve operation
44 43
 * @author <a href="mailto:nachobrodin@gmail.com">Nacho Brodin</a>
......
174 173
		summary.loadDefaultSummarizes(this.feature);
175 174

  
176 175
		if(selectedGeom) {
177
			DataSet ds = inFeatureStore.getSelection();
178
			it = ((DefaultFeatureSelection)ds).iterator();
179
		} else
176
            FeatureSelection ds = inFeatureStore.getFeatureSelection();
177
            it = ds.iterator();
178
        } else {
180 179
			it = featuresSet.iterator();
180
        }
181 181
		
182 182
		featAnalized = 0;
183 183
		while( it.hasNext() ) {
org.gvsig.sextante/trunk/org.gvsig.sextante.app/org.gvsig.sextante.app.algorithm/org.gvsig.sextante.app.algorithm.dissolve/src/main/java/org/gvsig/sextante/app/algorithm/dissolve/DissolveOperation.java
25 25
import java.util.Iterator;
26 26
import java.util.List;
27 27

  
28
import org.gvsig.fmap.dal.DataSet;
28
import com.vividsolutions.jts.geom.Geometry;
29

  
30
import es.unex.sextante.core.Sextante;
31

  
29 32
import org.gvsig.fmap.dal.exception.DataException;
30 33
import org.gvsig.fmap.dal.feature.EditableFeature;
31 34
import org.gvsig.fmap.dal.feature.Feature;
35
import org.gvsig.fmap.dal.feature.FeatureSelection;
32 36
import org.gvsig.fmap.dal.feature.FeatureSet;
33 37
import org.gvsig.fmap.dal.feature.FeatureStore;
34
import org.gvsig.fmap.dal.feature.impl.DefaultFeatureSelection;
35 38
import org.gvsig.fmap.geom.exception.CreateGeometryException;
36 39
import org.gvsig.sextante.app.algorithm.base.core.GeometryOperation;
37 40
import org.gvsig.sextante.app.algorithm.base.util.GeometryUtil;
38 41
import org.gvsig.tools.dispose.DisposableIterator;
39

  
40
import com.vividsolutions.jts.geom.Geometry;
41

  
42
import es.unex.sextante.core.Sextante;
43 42
/**
44 43
 * Dissolve operation
45 44
 * @author <a href="mailto:nachobrodin@gmail.com">Nacho Brodin</a>
......
132 131
		DisposableIterator it = null;
133 132

  
134 133
		if(selectedGeom) {
135
			DataSet ds = inFeatStore.getSelection();
136
			it = ((DefaultFeatureSelection)ds).iterator();
137
			numberOfFeatures = (int)((DefaultFeatureSelection)ds).getSelectedCount();
134
            FeatureSelection ds = inFeatStore.getFeatureSelection();
135
            it = ds.iterator();
136
            numberOfFeatures = (int) ds.getSelectedCount();
138 137
		} else {
139 138
			it = featuresSet.iterator();
140 139
			numberOfFeatures = (int)featuresSet.getSize();
org.gvsig.sextante/trunk/org.gvsig.sextante.app/org.gvsig.sextante.app.algorithm/org.gvsig.sextante.app.algorithm.dissolve/src/main/java/org/gvsig/sextante/app/algorithm/dissolve/IDissolveRule.java
20 20

  
21 21
package org.gvsig.sextante.app.algorithm.dissolve;
22 22

  
23
import com.vividsolutions.jts.geom.Geometry;
24

  
23 25
import org.gvsig.fmap.dal.feature.Feature;
24 26

  
25
import com.vividsolutions.jts.geom.Geometry;
26 27

  
27

  
28 28
/**
29 29
 * Forces to IDissolveCriteria to fetch geometries from 
30 30
 * ReadableVectorial (for performance reasons, once a criteria
org.gvsig.sextante/trunk/org.gvsig.sextante.app/org.gvsig.sextante.app.algorithm/org.gvsig.sextante.app.algorithm.dissolve/src/main/java/org/gvsig/sextante/app/algorithm/dissolve/DissolveParametersPanel.java
32 32
import javax.swing.JLabel;
33 33
import javax.swing.JPanel;
34 34

  
35
import org.gvsig.gui.beans.table.TableContainer;
36
import org.gvsig.gui.beans.table.exceptions.NotInitializeException;
37
import org.gvsig.sextante.app.extension.core.CompositeSourceOutputChannel;
38
import org.gvsig.sextante.app.extension.gui.AlgorithmOutputPanel;
39

  
40 35
import es.unex.sextante.core.GeoAlgorithm;
41 36
import es.unex.sextante.core.ObjectAndDescription;
42 37
import es.unex.sextante.core.OutputObjectsSet;
......
47 42
import es.unex.sextante.gui.core.SextanteGUI;
48 43
import es.unex.sextante.outputs.Output;
49 44

  
45
import org.gvsig.geoprocess.core.CompositeSourceOutputChannel;
46
import org.gvsig.geoprocess.gui.AlgorithmOutputPanel;
47
import org.gvsig.gui.beans.table.TableContainer;
48
import org.gvsig.gui.beans.table.exceptions.NotInitializeException;
49

  
50 50
/**
51 51
 * Panel for dissolve algorithm
52 52
 * @author <a href="mailto:nachobrodin@gmail.com">Nacho Brodin</a>
......
264 264
	}
265 265
	
266 266
	@Override
267
	public boolean assignParameters() {
267
    public void assignParameters() {
268 268
		try {
269 269
			ParametersSet params = m_Algorithm.getParameters();
270 270
			params.getParameter(DissolveAlgorithm.LAYER).setParameterValue(getSelectedVectorLayer());
......
277 277
			OutputObjectsSet ooSet = m_Algorithm.getOutputObjects();
278 278
			Output out = ooSet.getOutput(DissolveAlgorithm.RESULT);
279 279
			out.setOutputChannel(new CompositeSourceOutputChannel(getAlgorithmOutputPanel().getOutputParameters()));
280
			return true;
281 280
		} catch (Exception e) {
282 281
			Sextante.addErrorToLog(e);
283
			return false;
284 282
		}
285 283
	}
286 284
	
org.gvsig.sextante/trunk/org.gvsig.sextante.app/org.gvsig.sextante.app.algorithm/org.gvsig.sextante.app.algorithm.dissolve/src/main/java/org/gvsig/sextante/app/algorithm/dissolve/DissolveLibrary.java
20 20
 */
21 21
package org.gvsig.sextante.app.algorithm.dissolve;
22 22

  
23
import java.util.HashMap;
24

  
25
import javax.swing.ImageIcon;
26

  
27
import es.unex.sextante.core.GeoAlgorithm;
23 28
import es.unex.sextante.core.Sextante;
29
import es.unex.sextante.gui.core.IAlgorithmProvider;
30
import es.unex.sextante.gui.core.ILogHandler;
24 31
import es.unex.sextante.gui.core.SextanteGUI;
32
import es.unex.sextante.gui.settings.Setting;
25 33

  
26 34
import org.gvsig.i18n.Messages;
27 35
import org.gvsig.sextante.app.algorithm.base.core.AlgorithmAbstractLibrary;
......
46 54
				DissolveLibrary.class.getClassLoader(),
47 55
				DissolveLibrary.class.getClass().getName());
48 56
		setLanguageStrings("org.gvsig.sextante.app.algorithm.dissolve.dissolve");
49
		Sextante.addGeoProcess(DissolveAlgorithm.class, text);
50
		SextanteGUI.addCustomParametersPanel(DissolveAlgorithm.class, DissolveParametersPanel.class, null);
57
        Sextante.addGeoalgorithm("gvSIG", DissolveAlgorithm.class, text);
58
        SextanteGUI.addAlgorithmProvider(new IAlgorithmProvider() {
59
            
60
            public void update() {
61
                // Nothing to do
62
            }
63
            
64
            public void initialize() {
65
                // Nothing to do
66
            }
67
            
68
            public Setting getSettings() {
69
                return new Setting() {
70
                    
71
                    @Override
72
                    public String getName() {
73
                        return "gvSIG.DissolveAlgorithm";
74
                    }
75
                    
76
                    @Override
77
                    public HashMap<String, String> getInitValues() {
78
                        // TODO Auto-generated method stub
79
                        return null;
80
                    }
81
                    
82
                    @Override
83
                    public void createPanel() {
84
                        // TODO Auto-generated method stub
85
                        
86
                    }
87
                };
88
            }
89
            
90
            public String getName() {
91
                return "gvSIG.DissolveAlgorithm";
92
            }
93
            
94
            public ILogHandler getLogHandler() {
95
                // TODO Auto-generated method stub
96
                return null;
97
            }
98
            
99
            public ImageIcon getIcon() {
100
                // TODO Auto-generated method stub
101
                return null;
102
            }
103
            
104
            public HashMap<String, Class> getCustomParameterPanels() {
105
                HashMap<String, Class> panels = new HashMap<String, Class>(1);
106
                panels.put((new DissolveAlgorithm()).getCommandLineName(),
107
                    DissolveParametersPanel.class);
108
                return panels;
109
            }
110
            
111
            public HashMap<String, Class> getCustomModelerParameterPanels() {
112
                // TODO Auto-generated method stub
113
                return null;
114
            }
115
            
116
            public HashMap<String, GeoAlgorithm> getAlgorithms() {
117
                HashMap<String, GeoAlgorithm> algs =
118
                    new HashMap<String, GeoAlgorithm>(1);
119
                algs.put(getName(), new DissolveAlgorithm());
120
                return algs;
121
            }
122
            
123
            public String getAlgorithmHelpFilename(GeoAlgorithm arg0, boolean arg1) {
124
                // TODO Auto-generated method stub
125
                return null;
126
            }
127
            
128
            public Object getAlgorithmHelp(GeoAlgorithm arg0) {
129
                // TODO Auto-generated method stub
130
                return null;
131
            }
132
            
133
            public boolean canEditHelp() {
134
                // TODO Auto-generated method stub
135
                return false;
136
            }
137
        });
51 138
	}
52 139

  
53 140
}
org.gvsig.sextante/trunk/org.gvsig.sextante.app/org.gvsig.sextante.app.algorithm/org.gvsig.sextante.app.algorithm.dissolve/src/main/java/org/gvsig/sextante/app/algorithm/dissolve/Summary.java
20 20
 */
21 21
package org.gvsig.sextante.app.algorithm.dissolve;
22 22

  
23
import es.unex.sextante.core.Sextante;
24

  
23 25
import org.gvsig.fmap.dal.feature.EditableFeature;
24 26
import org.gvsig.fmap.dal.feature.Feature;
25 27
import org.gvsig.fmap.dal.feature.FeatureAttributeDescriptor;
26 28
import org.gvsig.fmap.dal.feature.FeatureType;
27 29

  
28
import es.unex.sextante.core.Sextante;
29

  
30 30
/**
31 31
 * <p>
32 32
 * Computes summary functions. There are four summary functions, maximum, minimum,
org.gvsig.sextante/trunk/org.gvsig.sextante.app/org.gvsig.sextante.app.algorithm/org.gvsig.sextante.app.algorithm.dissolve/src/main/java/org/gvsig/sextante/app/algorithm/dissolve/DissolveAlgorithm.java
23 23
import java.util.ArrayList;
24 24
import java.util.HashMap;
25 25

  
26
import org.gvsig.fmap.dal.exception.DataException;
27
import org.gvsig.fmap.dal.feature.FeatureAttributeDescriptor;
28
import org.gvsig.fmap.dal.feature.FeatureSet;
29
import org.gvsig.fmap.dal.feature.FeatureStore;
30
import org.gvsig.fmap.dal.feature.FeatureType;
31
import org.gvsig.sextante.app.extension.core.gvGeoAlgorithm;
32
import org.gvsig.sextante.app.extension.core.gvVectorLayer;
33

  
34 26
import es.unex.sextante.additionalInfo.AdditionalInfoNumericalValue;
35 27
import es.unex.sextante.core.Sextante;
36 28
import es.unex.sextante.dataObjects.IVectorLayer;
......
39 31
import es.unex.sextante.exceptions.UnsupportedOutputChannelException;
40 32
import es.unex.sextante.outputs.OutputVectorLayer;
41 33

  
34
import org.gvsig.fmap.dal.exception.DataException;
35
import org.gvsig.fmap.dal.feature.FeatureAttributeDescriptor;
36
import org.gvsig.fmap.dal.feature.FeatureSet;
37
import org.gvsig.fmap.dal.feature.FeatureStore;
38
import org.gvsig.fmap.dal.feature.FeatureType;
39
import org.gvsig.geoprocess.core.gvGeoAlgorithm;
40
import org.gvsig.geoprocess.core.gvVectorLayer;
41

  
42 42
/**
43 43
 * Dissolve algorithm
44 44
 * @author <a href="mailto:nachobrodin@gmail.com">Nacho Brodin</a>
......
62 62
	public void defineCharacteristics(){
63 63
		setName(Sextante.getText("Dissolve"));
64 64
		setGroup(Sextante.getText("gvSIG_Algorithms"));
65
		setGeneratesUserDefinedRasterOutput(false);
65
        // setGeneratesUserDefinedRasterOutput(false);
66 66
		try {
67 67
			m_Parameters.addInputVectorLayer(LAYER, 
68 68
												Sextante.getText( "Input_layer"), 
......
204 204
			return ((gvVectorLayer)output).getFeatureStore();
205 205
		} catch (UnsupportedOutputChannelException e) {
206 206
			Sextante.addErrorToLog(e);
207
		}
207
        } catch (GeoAlgorithmExecutionException e) {
208
            Sextante.addErrorToLog(e);
209
        }
208 210
		return null;
209 211
	}
210 212
}
org.gvsig.sextante/trunk/org.gvsig.sextante.app/org.gvsig.sextante.app.algorithm/org.gvsig.sextante.app.algorithm.dissolve/src/main/java/org/gvsig/sextante/app/algorithm/dissolve/DissolveRule.java
23 23
import java.util.HashMap;
24 24
import java.util.Iterator;
25 25

  
26
import com.vividsolutions.jts.geom.Geometry;
27

  
26 28
import org.gvsig.fmap.dal.feature.Feature;
27 29

  
28
import com.vividsolutions.jts.geom.Geometry;
29

  
30 30
/**
31 31
 * Decides if dissolve two features based in an alphanumeric criteria:
32 32
 * two features will be dissolved if they have the same value for
org.gvsig.sextante/trunk/org.gvsig.sextante.app/org.gvsig.sextante.app.algorithm/org.gvsig.sextante.app.algorithm.dissolve/pom.xml
9 9
	<parent>
10 10
		<groupId>org.gvsig</groupId>
11 11
		<artifactId>org.gvsig.sextante.app.algorithm</artifactId>
12
		<version>0.6.0-SNAPSHOT</version>
12
		<version>1.0.0-SNAPSHOT</version>
13 13
	</parent>
14 14
	
15 15
	<dependencies>
16 16
		<dependency>
17 17
		    <groupId>org.gvsig</groupId>
18 18
   			<artifactId>org.gvsig.sextante.app.algorithm.base</artifactId>
19
   			<version>0.6.0-SNAPSHOT</version>
19
   			<version>1.0.0-SNAPSHOT</version>
20 20
            <scope>compile</scope>
21 21
   		</dependency>
22 22
	</dependencies>
org.gvsig.sextante/trunk/org.gvsig.sextante.app/org.gvsig.sextante.app.algorithm/org.gvsig.sextante.app.algorithm.union/pom.xml
9 9
	<parent>
10 10
		<groupId>org.gvsig</groupId>
11 11
		<artifactId>org.gvsig.sextante.app.algorithm</artifactId>
12
		<version>0.6.0-SNAPSHOT</version>
12
		<version>1.0.0-SNAPSHOT</version>
13 13
	</parent>
14 14
	
15 15
	<dependencies>
16 16
		<dependency>
17 17
		    <groupId>org.gvsig</groupId>
18 18
   			<artifactId>org.gvsig.sextante.app.algorithm.base</artifactId>
19
   			<version>0.6.0-SNAPSHOT</version>
19
   			<version>1.0.0-SNAPSHOT</version>
20 20
            <scope>compile</scope>
21 21
   		</dependency>
22 22
   		<dependency>
23 23
		    <groupId>org.gvsig</groupId>
24 24
   			<artifactId>org.gvsig.sextante.app.algorithm.intersection</artifactId>
25
   			<version>0.6.0-SNAPSHOT</version>
25
   			<version>1.0.0-SNAPSHOT</version>
26 26
            <scope>compile</scope>
27 27
   		</dependency>
28 28
   		<dependency>
29 29
		    <groupId>org.gvsig</groupId>
30 30
   			<artifactId>org.gvsig.sextante.app.algorithm.difference</artifactId>
31
   			<version>0.6.0-SNAPSHOT</version>
31
   			<version>1.0.0-SNAPSHOT</version>
32 32
            <scope>compile</scope>
33 33
   		</dependency>
34 34
	</dependencies>
org.gvsig.sextante/trunk/org.gvsig.sextante.app/org.gvsig.sextante.app.algorithm/org.gvsig.sextante.app.algorithm.union/src/main/java/org/gvsig/sextante/app/algorithm/union/UnionLibrary.java
45 45
				UnionLibrary.class.getClassLoader(),
46 46
				UnionLibrary.class.getClass().getName());
47 47
		setLanguageStrings("org.gvsig.sextante.app.algorithm.union.union");
48
		Sextante.addGeoProcess(UnionAlgorithm.class, text);
48
        Sextante.addGeoalgorithm("gvSIG", UnionAlgorithm.class, text);
49 49
	}
50 50

  
51 51
}
org.gvsig.sextante/trunk/org.gvsig.sextante.app/org.gvsig.sextante.app.algorithm/org.gvsig.sextante.app.algorithm.union/src/main/java/org/gvsig/sextante/app/algorithm/union/UnionAlgorithm.java
20 20
 */
21 21
package org.gvsig.sextante.app.algorithm.union;
22 22

  
23
import es.unex.sextante.core.Sextante;
24
import es.unex.sextante.dataObjects.IVectorLayer;
25
import es.unex.sextante.exceptions.GeoAlgorithmExecutionException;
26
import es.unex.sextante.exceptions.NullParameterValueException;
27
import es.unex.sextante.exceptions.RepeatedParameterNameException;
28
import es.unex.sextante.exceptions.WrongParameterIDException;
29
import es.unex.sextante.exceptions.WrongParameterTypeException;
30
import es.unex.sextante.outputs.OutputVectorLayer;
31

  
23 32
import org.gvsig.fmap.dal.exception.DataException;
24 33
import org.gvsig.fmap.dal.exception.ReadException;
25 34
import org.gvsig.fmap.dal.feature.FeatureSet;
26 35
import org.gvsig.fmap.dal.feature.FeatureStore;
27 36
import org.gvsig.fmap.dal.feature.FeatureType;
28 37
import org.gvsig.fmap.geom.Geometry;
38
import org.gvsig.geoprocess.core.gvGeoAlgorithm;
39
import org.gvsig.geoprocess.core.gvVectorLayer;
29 40
import org.gvsig.sextante.app.algorithm.base.core.GeometryOperation;
30 41
import org.gvsig.sextante.app.algorithm.base.core.ScalableUnionOperation;
31 42
import org.gvsig.sextante.app.algorithm.difference.DifferenceOperation;
32 43
import org.gvsig.sextante.app.algorithm.intersection.IntersectionOperation;
33
import org.gvsig.sextante.app.extension.core.gvGeoAlgorithm;
34
import org.gvsig.sextante.app.extension.core.gvVectorLayer;
35 44

  
36
import es.unex.sextante.core.Sextante;
37
import es.unex.sextante.dataObjects.IVectorLayer;
38
import es.unex.sextante.exceptions.GeoAlgorithmExecutionException;
39
import es.unex.sextante.exceptions.NullParameterValueException;
40
import es.unex.sextante.exceptions.RepeatedParameterNameException;
41
import es.unex.sextante.exceptions.WrongParameterIDException;
42
import es.unex.sextante.exceptions.WrongParameterTypeException;
43
import es.unex.sextante.outputs.OutputVectorLayer;
44

  
45 45
/**
46 46
 * Union algorithm
47 47
 * @author <a href="mailto:nachobrodin@gmail.com">Nacho Brodin</a>
......
60 60
	public void defineCharacteristics() {
61 61
		setName(Sextante.getText("Union"));
62 62
		setGroup(Sextante.getText("gvSIG_Algorithms"));
63
		setGeneratesUserDefinedRasterOutput(false);
63
        // setGeneratesUserDefinedRasterOutput(false);
64 64
		
65 65
		try {
66 66
			m_Parameters.addInputVectorLayer(LAYER1, 
org.gvsig.sextante/trunk/org.gvsig.sextante.app/org.gvsig.sextante.app.algorithm/pom.xml
11 11
	<parent>
12 12
		<groupId>org.gvsig</groupId>
13 13
		<artifactId>org.gvsig.sextante.app</artifactId>
14
		<version>0.6.0-SNAPSHOT</version>
14
		<version>1.0.0-SNAPSHOT</version>
15 15
	</parent>
16 16

  
17 17
	<dependencies>
18 18
		<dependency>
19 19
			<groupId>org.gvsig</groupId>
20 20
			<artifactId>org.gvsig.sextante.app.extension</artifactId>
21
			<version>0.6.0-SNAPSHOT</version>
21
			<version>1.0.0-SNAPSHOT</version>
22 22
		</dependency>
23 23
		<dependency>
24 24
			<groupId>com.vividsolutions</groupId>
......
42 42
			<scope>compile</scope>
43 43
		</dependency>
44 44
		<dependency>
45
			<groupId>es.unex</groupId>
45
			<groupId>es.unex.sextante</groupId>
46 46
			<artifactId>sextante</artifactId>
47 47
            <scope>compile</scope>
48 48
		</dependency>
49
		<dependency>
50
			<groupId>org.gvsig</groupId>
51
			<artifactId>org.gvsig.tools.lib</artifactId>
52
			<scope>compile</scope>
53
		</dependency>
54
		<dependency>
55
			<groupId>org.gvsig</groupId>
56
			<artifactId>org.gvsig.i18n</artifactId>
57
			<scope>compile</scope>
58
		</dependency>
59
		<dependency>
60
			<groupId>org.gvsig</groupId>
61
			<artifactId>org.gvsig.ui</artifactId>
62
			<scope>compile</scope>
63
		</dependency>
64
		<dependency>
65
			<groupId>org.gvsig</groupId>
66
			<artifactId>org.gvsig.projection</artifactId>
67
			<scope>compile</scope>
68
		</dependency>
69
		<dependency>
70
			<groupId>org.gvsig</groupId>
71
			<artifactId>org.gvsig.fmap.control</artifactId>
72
			<scope>compile</scope>
73
		</dependency>
74
		<dependency>
75
			<groupId>org.gvsig</groupId>
76
			<artifactId>org.gvsig.metadata.lib.basic.api</artifactId>
77
			<scope>compile</scope>
78
		</dependency>
79
		<dependency>
80
			<groupId>org.gvsig</groupId>
81
			<artifactId>org.gvsig.timesupport.lib.api</artifactId>
82
			<scope>compile</scope>
83
		</dependency>
49 84
	</dependencies>
50 85

  
51 86
	<build>
org.gvsig.sextante/trunk/org.gvsig.sextante.app/org.gvsig.sextante.app.algorithm/org.gvsig.sextante.app.algorithm.buffer/src/main/java/org/gvsig/sextante/app/algorithm/buffer/BufferLibrary.java
45 45
				BufferLibrary.class.getClassLoader(),
46 46
				BufferLibrary.class.getClass().getName());
47 47
		setLanguageStrings("org.gvsig.sextante.app.algorithm.buffer.buffer");
48
		Sextante.addGeoProcess(BufferAlgorithm.class, text);
48
        Sextante.addGeoalgorithm("gvSIG", BufferAlgorithm.class, text);
49 49
	}
50 50
	
51 51
}
org.gvsig.sextante/trunk/org.gvsig.sextante.app/org.gvsig.sextante.app.algorithm/org.gvsig.sextante.app.algorithm.buffer/src/main/java/org/gvsig/sextante/app/algorithm/buffer/FieldDistance.java
20 20
 */
21 21
package org.gvsig.sextante.app.algorithm.buffer;
22 22

  
23

  
23 24
import org.cresques.cts.IProjection;
25

  
24 26
import org.gvsig.fmap.dal.feature.Feature;
25
import org.gvsig.sextante.app.extension.core.MapTools;
27
import org.gvsig.geoprocess.core.MapTools;
26 28

  
27 29
/**
28 30
 * Computes a constant size of each geometry built
org.gvsig.sextante/trunk/org.gvsig.sextante.app/org.gvsig.sextante.app.algorithm/org.gvsig.sextante.app.algorithm.buffer/src/main/java/org/gvsig/sextante/app/algorithm/buffer/BufferAlgorithm.java
22 22

  
23 23
import javax.swing.JOptionPane;
24 24

  
25
import org.gvsig.fmap.dal.exception.DataException;
26
import org.gvsig.fmap.dal.feature.FeatureSet;
27
import org.gvsig.fmap.dal.feature.FeatureStore;
28
import org.gvsig.fmap.dal.feature.FeatureType;
29
import org.gvsig.sextante.app.extension.core.gvGeoAlgorithm;
30
import org.gvsig.sextante.app.extension.core.gvVectorLayer;
31

  
32 25
import es.unex.sextante.additionalInfo.AdditionalInfoNumericalValue;
33 26
import es.unex.sextante.core.Sextante;
34 27
import es.unex.sextante.dataObjects.IVectorLayer;
......
39 32
import es.unex.sextante.exceptions.UnsupportedOutputChannelException;
40 33
import es.unex.sextante.outputs.OutputVectorLayer;
41 34

  
35
import org.gvsig.fmap.dal.exception.DataException;
36
import org.gvsig.fmap.dal.feature.FeatureSet;
37
import org.gvsig.fmap.dal.feature.FeatureStore;
38
import org.gvsig.fmap.dal.feature.FeatureType;
39
import org.gvsig.geoprocess.core.gvGeoAlgorithm;
40
import org.gvsig.geoprocess.core.gvVectorLayer;
41

  
42 42
/**
43 43
 * Geoprocess that computes a buffer area around each feature's geometry of the
44 44
 * input layer. <br>
......
66 66
	public void defineCharacteristics() {
67 67
		setName(Sextante.getText("Buffer"));
68 68
		setGroup(Sextante.getText("gvSIG_Algorithms"));
69
		setGeneratesUserDefinedRasterOutput(false);
69
        // setGeneratesUserDefinedRasterOutput(false);
70 70
		String [] sOptions = {Sextante.getText("poly_out"),
71 71
								Sextante.getText("poly_in"),
72 72
								Sextante.getText("poly_inandout")};
......
193 193
			return ((gvVectorLayer)output).getFeatureStore();
194 194
		} catch (UnsupportedOutputChannelException e) {
195 195
			Sextante.addErrorToLog(e);
196
		}
196
        } catch (GeoAlgorithmExecutionException e) {
197
            Sextante.addErrorToLog(e);
198
        }
197 199
		return null;
198 200
	}
199 201

  
org.gvsig.sextante/trunk/org.gvsig.sextante.app/org.gvsig.sextante.app.algorithm/org.gvsig.sextante.app.algorithm.buffer/src/main/java/org/gvsig/sextante/app/algorithm/buffer/InBufferOperation.java
20 20
 */
21 21
package org.gvsig.sextante.app.algorithm.buffer;
22 22

  
23
import org.gvsig.fmap.dal.exception.DataException;
24
import org.gvsig.fmap.dal.feature.EditableFeature;
25
import org.gvsig.fmap.dal.feature.Feature;
26
import org.gvsig.fmap.geom.exception.CreateGeometryException;
27
import org.gvsig.sextante.app.algorithm.base.util.GeometryUtil;
28
import org.gvsig.sextante.app.algorithm.base.util.JTSFacade;
29
import org.gvsig.sextante.app.extension.core.MapTools;
30

  
31 23
import com.vividsolutions.jts.geom.Geometry;
32 24
import com.vividsolutions.jts.operation.buffer.BufferOp;
33 25
import com.vividsolutions.jts.operation.buffer.BufferParameters;
......
36 28
import es.unex.sextante.core.Sextante;
37 29
import es.unex.sextante.dataObjects.IVectorLayer;
38 30

  
31
import org.gvsig.fmap.dal.exception.DataException;
32
import org.gvsig.fmap.dal.feature.EditableFeature;
33
import org.gvsig.fmap.dal.feature.Feature;
34
import org.gvsig.fmap.geom.exception.CreateGeometryException;
35
import org.gvsig.geoprocess.core.MapTools;
36
import org.gvsig.sextante.app.algorithm.base.util.GeometryUtil;
37
import org.gvsig.sextante.app.algorithm.base.util.JTSFacade;
38

  
39 39
/**
40 40
 * Buffer operation
41 41
 * @author <a href="mailto:nachobrodin@gmail.com">Nacho Brodin</a>
org.gvsig.sextante/trunk/org.gvsig.sextante.app/org.gvsig.sextante.app.algorithm/org.gvsig.sextante.app.algorithm.buffer/src/main/java/org/gvsig/sextante/app/algorithm/buffer/OutBufferOperation.java
20 20
 */
21 21
package org.gvsig.sextante.app.algorithm.buffer;
22 22

  
23
import org.gvsig.fmap.dal.exception.DataException;
24
import org.gvsig.fmap.dal.feature.EditableFeature;
25
import org.gvsig.fmap.dal.feature.Feature;
26
import org.gvsig.fmap.geom.exception.CreateGeometryException;
27
import org.gvsig.sextante.app.algorithm.base.util.GeometryUtil;
28
import org.gvsig.sextante.app.algorithm.base.util.JTSFacade;
29
import org.gvsig.sextante.app.extension.core.MapTools;
30

  
31 23
import com.vividsolutions.jts.geom.Geometry;
32 24
import com.vividsolutions.jts.operation.buffer.BufferOp;
33 25
import com.vividsolutions.jts.operation.buffer.BufferParameters;
......
36 28
import es.unex.sextante.core.Sextante;
37 29
import es.unex.sextante.dataObjects.IVectorLayer;
38 30

  
31
import org.gvsig.fmap.dal.exception.DataException;
32
import org.gvsig.fmap.dal.feature.EditableFeature;
33
import org.gvsig.fmap.dal.feature.Feature;
34
import org.gvsig.fmap.geom.exception.CreateGeometryException;
35
import org.gvsig.geoprocess.core.MapTools;
36
import org.gvsig.sextante.app.algorithm.base.util.GeometryUtil;
37
import org.gvsig.sextante.app.algorithm.base.util.JTSFacade;
38

  
39 39
/**
40 40
 * Buffer operation
41 41
 * @author <a href="mailto:nachobrodin@gmail.com">Nacho Brodin</a>
org.gvsig.sextante/trunk/org.gvsig.sextante.app/org.gvsig.sextante.app.algorithm/org.gvsig.sextante.app.algorithm.buffer/src/main/java/org/gvsig/sextante/app/algorithm/buffer/ConstantDistance.java
20 20
 */
21 21
package org.gvsig.sextante.app.algorithm.buffer;
22 22

  
23

  
23 24
import org.cresques.cts.IProjection;
25

  
24 26
import org.gvsig.fmap.dal.feature.Feature;
25
import org.gvsig.sextante.app.extension.core.MapTools;
27
import org.gvsig.geoprocess.core.MapTools;
26 28

  
27 29
/**
28 30
 * Computes a constant size of each geometry built
org.gvsig.sextante/trunk/org.gvsig.sextante.app/org.gvsig.sextante.app.algorithm/org.gvsig.sextante.app.algorithm.buffer/src/main/java/org/gvsig/sextante/app/algorithm/buffer/InOutBufferOperation.java
23 23
import java.util.ArrayList;
24 24
import java.util.Stack;
25 25

  
26
import org.gvsig.fmap.dal.exception.DataException;
27
import org.gvsig.fmap.dal.feature.EditableFeature;
28
import org.gvsig.fmap.dal.feature.Feature;
29
import org.gvsig.fmap.geom.exception.CreateGeometryException;
30
import org.gvsig.sextante.app.algorithm.base.util.GeometryUtil;
31
import org.gvsig.sextante.app.algorithm.base.util.JTSFacade;
32
import org.gvsig.sextante.app.extension.core.MapTools;
33

  
34 26
import com.vividsolutions.jts.geom.Geometry;
35 27
import com.vividsolutions.jts.geom.GeometryCollection;
36 28
import com.vividsolutions.jts.geom.GeometryFactory;
......
43 35
import es.unex.sextante.core.Sextante;
44 36
import es.unex.sextante.dataObjects.IVectorLayer;
45 37

  
38
import org.gvsig.fmap.dal.exception.DataException;
39
import org.gvsig.fmap.dal.feature.EditableFeature;
40
import org.gvsig.fmap.dal.feature.Feature;
41
import org.gvsig.fmap.geom.exception.CreateGeometryException;
42
import org.gvsig.geoprocess.core.MapTools;
43
import org.gvsig.sextante.app.algorithm.base.util.GeometryUtil;
44
import org.gvsig.sextante.app.algorithm.base.util.JTSFacade;
45

  
46 46
/**
47 47
 * Buffer operation
48 48
 * @author <a href="mailto:nachobrodin@gmail.com">Nacho Brodin</a>
org.gvsig.sextante/trunk/org.gvsig.sextante.app/org.gvsig.sextante.app.algorithm/org.gvsig.sextante.app.algorithm.buffer/pom.xml
9 9
	<parent>
10 10
		<groupId>org.gvsig</groupId>
11 11
		<artifactId>org.gvsig.sextante.app.algorithm</artifactId>
12
		<version>0.6.0-SNAPSHOT</version>
12
		<version>1.0.0-SNAPSHOT</version>
13 13
	</parent>
14 14
	
15 15
	<dependencies>
16 16
		<dependency>
17 17
		    <groupId>org.gvsig</groupId>
18 18
   			<artifactId>org.gvsig.sextante.app.algorithm.base</artifactId>
19
   			<version>0.6.0-SNAPSHOT</version>
19
   			<version>1.0.0-SNAPSHOT</version>
20 20
            <scope>compile</scope>
21 21
   		</dependency>
22 22
   		<dependency>
23 23
		    <groupId>org.gvsig</groupId>
24 24
   			<artifactId>org.gvsig.sextante.app.algorithm.dissolve</artifactId>
25
   			<version>0.6.0-SNAPSHOT</version>
25
   			<version>1.0.0-SNAPSHOT</version>
26 26
            <scope>compile</scope>
27 27
   		</dependency>
28 28
	</dependencies>
org.gvsig.sextante/trunk/org.gvsig.sextante.app/org.gvsig.sextante.app.algorithm/org.gvsig.sextante.app.algorithm.base/src/main/java/org/gvsig/sextante/app/algorithm/base/core/GeometryOperation.java
23 23
import java.util.Iterator;
24 24
import java.util.List;
25 25

  
26

  
26 27
import org.gvsig.fmap.dal.DataSet;
27 28
import org.gvsig.fmap.dal.exception.DataException;
28 29
import org.gvsig.fmap.dal.feature.EditableFeature;
......
30 31
import org.gvsig.fmap.dal.feature.FeatureSelection;
31 32
import org.gvsig.fmap.dal.feature.FeatureSet;
32 33
import org.gvsig.fmap.dal.feature.FeatureStore;
33
import org.gvsig.sextante.app.extension.core.IProgressModel;
34
import org.gvsig.geoprocess.core.IProgressModel;
34 35
import org.gvsig.tools.dispose.DisposableIterator;
35 36

  
36 37
/**
org.gvsig.sextante/trunk/org.gvsig.sextante.app/org.gvsig.sextante.app.algorithm/org.gvsig.sextante.app.algorithm.base/src/main/java/org/gvsig/sextante/app/algorithm/base/core/AlgorithmAbstractLibrary.java
26 26
import java.util.MissingResourceException;
27 27
import java.util.ResourceBundle;
28 28

  
29

  
30
import org.gvsig.geoprocess.GeoProcessLibrary;
29 31
import org.gvsig.tools.library.AbstractLibrary;
30 32

  
31 33
/**
......
38 40

  
39 41
    @Override
40 42
    public void doRegistration() {
41
        registerAsImplementationOf(getClass());
43
        registerAsServiceOf(GeoProcessLibrary.class);
42 44
    }
43 45

  
44 46
	/**
org.gvsig.sextante/trunk/org.gvsig.sextante.app/org.gvsig.sextante.app.algorithm/org.gvsig.sextante.app.algorithm.base/src/main/java/org/gvsig/sextante/app/algorithm/base/core/ScalableUnionOperation.java
37 37
import org.gvsig.fmap.dal.feature.FeatureSet;
38 38
import org.gvsig.fmap.dal.feature.FeatureStore;
39 39
import org.gvsig.fmap.geom.Geometry.TYPES;
40
import org.gvsig.geoprocess.core.gvVectorLayer;
40 41
import org.gvsig.sextante.app.algorithm.base.util.GeometryUtil;
41 42
import org.gvsig.sextante.app.algorithm.base.util.JTSFacade;
42 43
import org.gvsig.sextante.app.algorithm.base.visitor.exception.VisitorException;
43
import org.gvsig.sextante.app.extension.core.gvVectorLayer;
44 44
import org.gvsig.tools.dispose.DisposableIterator;
45 45

  
46 46
/**
org.gvsig.sextante/trunk/org.gvsig.sextante.app/org.gvsig.sextante.app.algorithm/org.gvsig.sextante.app.algorithm.base/pom.xml
9 9
	<parent>
10 10
		<groupId>org.gvsig</groupId>
11 11
		<artifactId>org.gvsig.sextante.app.algorithm</artifactId>
12
		<version>0.6.0-SNAPSHOT</version>
12
		<version>1.0.0-SNAPSHOT</version>
13 13
	</parent>
14
	<description>Basic geoprocess algotimths for geoprocess. include:
14
	<description>Basic geoprocess algorimths for geoprocessing:
15 15

  
16 16
- Buffer
17 17
- Clip
org.gvsig.sextante/trunk/org.gvsig.sextante.app/org.gvsig.sextante.app.algorithm/org.gvsig.sextante.app.algorithm.difference/src/main/java/org/gvsig/sextante/app/algorithm/difference/DifferenceAlgorithm.java
20 20
 */
21 21
package org.gvsig.sextante.app.algorithm.difference;
22 22

  
23
import es.unex.sextante.core.Sextante;
24
import es.unex.sextante.dataObjects.IVectorLayer;
25
import es.unex.sextante.exceptions.GeoAlgorithmExecutionException;
26
import es.unex.sextante.exceptions.RepeatedParameterNameException;
27
import es.unex.sextante.outputs.OutputVectorLayer;
28

  
23 29
import org.gvsig.fmap.dal.exception.DataException;
24 30
import org.gvsig.fmap.dal.feature.FeatureSet;
25 31
import org.gvsig.fmap.dal.feature.FeatureStore;
26 32
import org.gvsig.fmap.dal.feature.FeatureType;
33
import org.gvsig.geoprocess.core.gvGeoAlgorithm;
34
import org.gvsig.geoprocess.core.gvVectorLayer;
27 35
import org.gvsig.sextante.app.algorithm.base.core.GeometryOperation;
28 36
import org.gvsig.sextante.app.algorithm.base.core.ScalableUnionOperation;
29
import org.gvsig.sextante.app.extension.core.gvGeoAlgorithm;
30
import org.gvsig.sextante.app.extension.core.gvVectorLayer;
31 37

  
32
import es.unex.sextante.core.Sextante;
33
import es.unex.sextante.dataObjects.IVectorLayer;
34
import es.unex.sextante.exceptions.GeoAlgorithmExecutionException;
35
import es.unex.sextante.exceptions.RepeatedParameterNameException;
36
import es.unex.sextante.outputs.OutputVectorLayer;
37

  
38 38
/**
39 39
 * Difference algorithm
40 40
 * @author <a href="mailto:nachobrodin@gmail.com">Nacho Brodin</a>
......
48 48
	public void defineCharacteristics(){
49 49
		setName(Sextante.getText("Difference"));
50 50
		setGroup(Sextante.getText("gvSIG_Algorithms"));
51
		setGeneratesUserDefinedRasterOutput(false);
51
        // setGeneratesUserDefinedRasterOutput(false);
52 52
		
53 53
		try {
54 54
			m_Parameters.addInputVectorLayer(LAYER, 
org.gvsig.sextante/trunk/org.gvsig.sextante.app/org.gvsig.sextante.app.algorithm/org.gvsig.sextante.app.algorithm.difference/src/main/java/org/gvsig/sextante/app/algorithm/difference/DifferenceOperation.java
21 21

  
22 22
package org.gvsig.sextante.app.algorithm.difference;
23 23

  
24
import com.vividsolutions.jts.geom.Geometry;
25
import com.vividsolutions.jts.precision.EnhancedPrecisionOp;
26

  
27
import es.unex.sextante.core.Sextante;
28

  
24 29
import org.gvsig.fmap.dal.exception.DataException;
25 30
import org.gvsig.fmap.dal.feature.EditableFeature;
26 31
import org.gvsig.fmap.dal.feature.Feature;
27 32
import org.gvsig.fmap.geom.exception.CreateGeometryException;
28 33
import org.gvsig.sextante.app.algorithm.base.core.GeometryOperation;
29 34
import org.gvsig.sextante.app.algorithm.base.util.GeometryUtil;
30

  
31
import com.vividsolutions.jts.geom.Geometry;
32
import com.vividsolutions.jts.precision.EnhancedPrecisionOp;
33

  
34
import es.unex.sextante.core.Sextante;
35 35
/**
36 36
 * Difference between two geometries
37 37
 * @author Nacho Brodin (nachobrodin@gmail.com)
org.gvsig.sextante/trunk/org.gvsig.sextante.app/org.gvsig.sextante.app.algorithm/org.gvsig.sextante.app.algorithm.difference/src/main/java/org/gvsig/sextante/app/algorithm/difference/DifferenceLibrary.java
45 45
				DifferenceLibrary.class.getClassLoader(),
46 46
				DifferenceLibrary.class.getClass().getName());
47 47
		setLanguageStrings("org.gvsig.sextante.app.algorithm.difference.difference");
48
		Sextante.addGeoProcess(DifferenceAlgorithm.class, text);
48
        Sextante.addGeoalgorithm("gvSIG", DifferenceAlgorithm.class, text);
49 49
	}
50 50

  
51 51
}
org.gvsig.sextante/trunk/org.gvsig.sextante.app/org.gvsig.sextante.app.algorithm/org.gvsig.sextante.app.algorithm.difference/pom.xml
9 9
	<parent>
10 10
		<groupId>org.gvsig</groupId>
11 11
		<artifactId>org.gvsig.sextante.app.algorithm</artifactId>
12
		<version>0.6.0-SNAPSHOT</version>
12
		<version>1.0.0-SNAPSHOT</version>
13 13
	</parent>
14 14
	
15 15
	<dependencies>
16 16
		<dependency>
17 17
		    <groupId>org.gvsig</groupId>
18 18
   			<artifactId>org.gvsig.sextante.app.algorithm.base</artifactId>
19
   			<version>0.6.0-SNAPSHOT</version>
19
   			<version>1.0.0-SNAPSHOT</version>
20 20
            <scope>compile</scope>
21 21
   		</dependency>
22 22
	</dependencies>
org.gvsig.sextante/trunk/org.gvsig.sextante.app/org.gvsig.sextante.app.algorithm/org.gvsig.sextante.app.algorithm.reproject/src/main/java/org/gvsig/sextante/app/algorithm/reproject/ReprojectOperation.java
23 23
import java.util.Iterator;
24 24
import java.util.List;
25 25

  
26
import es.unex.sextante.core.Sextante;
27

  
26 28
import org.cresques.cts.ICoordTrans;
27 29
import org.cresques.cts.IProjection;
30

  
28 31
import org.gvsig.fmap.dal.exception.DataException;
29 32
import org.gvsig.fmap.dal.feature.EditableFeature;
30 33
import org.gvsig.fmap.dal.feature.Feature;
31 34
import org.gvsig.fmap.geom.exception.CreateGeometryException;
32 35
import org.gvsig.sextante.app.algorithm.base.core.GeometryOperation;
33 36

  
34
import es.unex.sextante.core.Sextante;
35

  
36 37
/**
37 38
 * Operation to reproject a Feature
38 39
 * @author <a href="mailto:nachobrodin@gmail.com">Nacho Brodin</a>
org.gvsig.sextante/trunk/org.gvsig.sextante.app/org.gvsig.sextante.app.algorithm/org.gvsig.sextante.app.algorithm.reproject/src/main/java/org/gvsig/sextante/app/algorithm/reproject/ReprojectParametersPanel.java
32 32
import javax.swing.JLabel;
33 33
import javax.swing.JPanel;
34 34

  
35
import org.cresques.cts.IProjection;
36
import org.gvsig.app.gui.panels.CRSSelectPanel;
37
import org.gvsig.fmap.crs.CRSFactory;
38
import org.gvsig.sextante.app.extension.core.CompositeSourceOutputChannel;
39
import org.gvsig.sextante.app.extension.gui.AlgorithmOutputPanel;
40

  
41 35
import es.unex.sextante.core.GeoAlgorithm;
42 36
import es.unex.sextante.core.ObjectAndDescription;
43 37
import es.unex.sextante.core.OutputObjectsSet;
......
48 42
import es.unex.sextante.gui.core.SextanteGUI;
49 43
import es.unex.sextante.outputs.Output;
50 44

  
45
import org.cresques.cts.IProjection;
46

  
47
import org.gvsig.app.gui.panels.CRSSelectPanel;
48
import org.gvsig.fmap.crs.CRSFactory;
49
import org.gvsig.geoprocess.core.CompositeSourceOutputChannel;
50
import org.gvsig.geoprocess.gui.AlgorithmOutputPanel;
51

  
51 52
/**
52 53
 * Panel for reproject algorithm
53 54
 * @author <a href="mailto:nachobrodin@gmail.com">Nacho Brodin</a>
......
226 227
	}
227 228
	
228 229
	@Override
229
	public boolean assignParameters() {
230
    public void assignParameters() {
230 231
		try {
231 232
			ParametersSet params = m_Algorithm.getParameters();
232 233
			params.getParameter(ReprojectAlgorithm.LAYER).setParameterValue(getSelectedVectorLayer());
......
237 238
			OutputObjectsSet ooSet = m_Algorithm.getOutputObjects();
238 239
			Output out = ooSet.getOutput(ReprojectAlgorithm.RESULT);
239 240
			out.setOutputChannel(new CompositeSourceOutputChannel(getAlgorithmOutputPanel().getOutputParameters()));
240
			return true;
241 241
		} catch (Exception e) {
242 242
			Sextante.addErrorToLog(e);
243
			return false;
244 243
		}
245 244
	}
246 245

  
org.gvsig.sextante/trunk/org.gvsig.sextante.app/org.gvsig.sextante.app.algorithm/org.gvsig.sextante.app.algorithm.reproject/src/main/java/org/gvsig/sextante/app/algorithm/reproject/ReprojectLibrary.java
20 20
 */
21 21
package org.gvsig.sextante.app.algorithm.reproject;
22 22

  
23
import java.util.HashMap;
24

  
25
import javax.swing.ImageIcon;
26

  
27
import es.unex.sextante.core.GeoAlgorithm;
23 28
import es.unex.sextante.core.Sextante;
29
import es.unex.sextante.gui.core.IAlgorithmProvider;
30
import es.unex.sextante.gui.core.ILogHandler;
24 31
import es.unex.sextante.gui.core.SextanteGUI;
32
import es.unex.sextante.gui.settings.Setting;
25 33

  
26 34
import org.gvsig.i18n.Messages;
27 35
import org.gvsig.sextante.app.algorithm.base.core.AlgorithmAbstractLibrary;
......
46 54
				ReprojectLibrary.class.getClassLoader(),
47 55
				ReprojectLibrary.class.getClass().getName());
48 56
		setLanguageStrings("org.gvsig.sextante.app.algorithm.reproject.reproject");
49
		Sextante.addGeoProcess(ReprojectAlgorithm.class, text);
50
		SextanteGUI.addCustomParametersPanel(ReprojectAlgorithm.class, ReprojectParametersPanel.class, null);
57
        Sextante.addGeoalgorithm("gvSIG", ReprojectAlgorithm.class, text);
58
        SextanteGUI.addAlgorithmProvider(new IAlgorithmProvider() {
59

  
60
            public void update() {
61
                // Nothing to do
62
            }
63

  
64
            public void initialize() {
65
                // Nothing to do
66
            }
67

  
68
            public Setting getSettings() {
69
                return new Setting() {
70

  
71
                    @Override
72
                    public String getName() {
73
                        return "gvSIG.ReprojectAlgorithm";
74
                    }
75

  
76
                    @Override
77
                    public HashMap<String, String> getInitValues() {
78
                        // TODO Auto-generated method stub
79
                        return null;
80
                    }
81

  
82
                    @Override
83
                    public void createPanel() {
84
                        // TODO Auto-generated method stub
85

  
86
                    }
87
                };
88
            }
89

  
90
            public String getName() {
91
                return "gvSIG.ReprojectAlgorithm";
92
            }
93

  
94
            public ILogHandler getLogHandler() {
95
                // TODO Auto-generated method stub
96
                return null;
97
            }
98

  
99
            public ImageIcon getIcon() {
100
                // TODO Auto-generated method stub
101
                return null;
102
            }
103

  
104
            public HashMap<String, Class> getCustomParameterPanels() {
105
                HashMap<String, Class> panels = new HashMap<String, Class>(1);
106
                panels.put((new ReprojectAlgorithm()).getCommandLineName(),
107
                    ReprojectParametersPanel.class);
108
                return panels;
109
            }
110

  
111
            public HashMap<String, Class> getCustomModelerParameterPanels() {
112
                // TODO Auto-generated method stub
113
                return null;
114
            }
115

  
116
            public HashMap<String, GeoAlgorithm> getAlgorithms() {
117
                HashMap<String, GeoAlgorithm> algs =
118
                    new HashMap<String, GeoAlgorithm>(1);
119
                algs.put(getName(), new ReprojectAlgorithm());
120
                return algs;
121
            }
122

  
123
            public String getAlgorithmHelpFilename(GeoAlgorithm arg0,
124
                boolean arg1) {
125
                // TODO Auto-generated method stub
126
                return null;
127
            }
128

  
129
            public Object getAlgorithmHelp(GeoAlgorithm arg0) {
130
                // TODO Auto-generated method stub
131
                return null;
132
            }
133

  
134
            public boolean canEditHelp() {
135
                // TODO Auto-generated method stub
136
                return false;
137
            }
138
        });
51 139
	}
52 140

  
53 141
}
org.gvsig.sextante/trunk/org.gvsig.sextante.app/org.gvsig.sextante.app.algorithm/org.gvsig.sextante.app.algorithm.reproject/src/main/java/org/gvsig/sextante/app/algorithm/reproject/ReprojectAlgorithm.java
18 18
 */
19 19
package org.gvsig.sextante.app.algorithm.reproject;
20 20

  
21
import es.unex.sextante.core.Sextante;
22
import es.unex.sextante.dataObjects.IVectorLayer;
23
import es.unex.sextante.exceptions.GeoAlgorithmExecutionException;
24
import es.unex.sextante.exceptions.RepeatedParameterNameException;
25
import es.unex.sextante.outputs.OutputVectorLayer;
26

  
21 27
import org.cresques.cts.IProjection;
28

  
22 29
import org.gvsig.fmap.crs.CRSFactory;
23 30
import org.gvsig.fmap.dal.exception.DataException;
24 31
import org.gvsig.fmap.dal.feature.FeatureSet;
25 32
import org.gvsig.fmap.dal.feature.FeatureStore;
26 33
import org.gvsig.fmap.dal.feature.FeatureType;
27
import org.gvsig.sextante.app.extension.core.gvGeoAlgorithm;
28
import org.gvsig.sextante.app.extension.core.gvVectorLayer;
34
import org.gvsig.geoprocess.core.gvGeoAlgorithm;
35
import org.gvsig.geoprocess.core.gvVectorLayer;
29 36

  
... This diff was truncated because it exceeds the maximum size that can be displayed.

Also available in: Unified diff