Revision: 5104
http://sourceforge.net/p/jump-pilot/code/5104
Author: michaudm
Date: 2016-10-25 21:29:10 +0000 (Tue, 25 Oct 2016)
Log Message:
-----------
Change how the layer is choosen (see FR 243)
Modified Paths:
--------------
core/trunk/src/org/openjump/core/ui/plugin/layer/ExtractLayersByAttribute.java
core/trunk/src/org/openjump/core/ui/plugin/layer/ExtractLayersByGeometry.java
Modified:
core/trunk/src/org/openjump/core/ui/plugin/layer/ExtractLayersByAttribute.java
===================================================================
---
core/trunk/src/org/openjump/core/ui/plugin/layer/ExtractLayersByAttribute.java
2016-10-25 21:05:00 UTC (rev 5103)
+++
core/trunk/src/org/openjump/core/ui/plugin/layer/ExtractLayersByAttribute.java
2016-10-25 21:29:10 UTC (rev 5104)
@@ -34,7 +34,6 @@
package org.openjump.core.ui.plugin.layer;
import java.util.ArrayList;
-import java.util.Collection;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
@@ -42,7 +41,6 @@
import java.util.Vector;
import javax.swing.DefaultComboBoxModel;
-import javax.swing.Icon;
import javax.swing.ImageIcon;
import javax.swing.JComboBox;
import javax.swing.JComponent;
@@ -86,7 +84,6 @@
I18N.get("org.openjump.core.ui.plugin.layer.ExtractLayersByAttribute._EMPTY_");
private Layer sourceLayer = null;
- private JComboBox layerAttributeComboBox = null;
private boolean textAttributeFound = false;
private String textAttribute = null;
@@ -104,9 +101,9 @@
{
EnableCheckFactory checkFactory = new
EnableCheckFactory(workbenchContext);
return new MultiEnableCheck()
- .add(checkFactory.createWindowWithSelectionManagerMustBeActiveCheck())
- .add(checkFactory.createExactlyNLayersMustBeSelectedCheck(1))
- .add(new EnableCheck() {
+
.add(checkFactory.createWindowWithSelectionManagerMustBeActiveCheck())
+ .add(checkFactory.createExactlyNLayersMustBeSelectedCheck(1))
+ .add(new EnableCheck() {
// At one point, this EnableCheck should be added to
// EnableCheckFactory with it's own I18N key string
public String check(JComponent component) {
@@ -125,8 +122,8 @@
public boolean execute(PlugInContext context) throws Exception {
sourceLayer = context.getSelectedLayer(0);
- MultiInputDialog dialog = new
MultiInputDialog(context.getWorkbenchFrame(),
- getName(), true);
+ MultiInputDialog dialog =
+ new
MultiInputDialog(context.getWorkbenchFrame(), getName(), true);
setDialogFields(dialog);
GUIUtil.centreOnWindow(dialog);
@@ -141,13 +138,13 @@
private void setDialogFields( final MultiInputDialog dialog) {
dialog.setSideBarDescription(DIALOGMSG);
- layerAttributeComboBox = dialog.addComboBox(LAYER_ATTRIBUTE,
null, new ArrayList(), null);
- List names = attributeNames();
- layerAttributeComboBox.setModel(new DefaultComboBoxModel(new
Vector(names)));
+ JComboBox<String> layerAttributeComboBox =
+ dialog.addComboBox(LAYER_ATTRIBUTE, null, new
ArrayList<String>(), null);
+ List<String> names = attributeNames();
+ layerAttributeComboBox.setModel(new DefaultComboBoxModel<>(new
Vector<>(names)));
String layerName = null;
textAttributeFound = false;
- for (Iterator i = names.iterator(); i.hasNext();) {
- String attribute = (String) i.next();
+ for (String attribute : names) {
if (attribute.equalsIgnoreCase(LAYER)) {
layerName = attribute;
} else if (attribute.equalsIgnoreCase(TEXT)) {
@@ -161,8 +158,8 @@
}
}
- private List attributeNames() {
- ArrayList candidateAttributeNames = new ArrayList();
+ private List<String> attributeNames() {
+ ArrayList<String> candidateAttributeNames = new ArrayList<>();
FeatureSchema schema =
sourceLayer.getFeatureCollectionWrapper().getFeatureSchema();
for (int i = 0; i < schema.getAttributeCount(); i++) {
String name = schema.getAttributeName(i);
Modified:
core/trunk/src/org/openjump/core/ui/plugin/layer/ExtractLayersByGeometry.java
===================================================================
---
core/trunk/src/org/openjump/core/ui/plugin/layer/ExtractLayersByGeometry.java
2016-10-25 21:05:00 UTC (rev 5103)
+++
core/trunk/src/org/openjump/core/ui/plugin/layer/ExtractLayersByGeometry.java
2016-10-25 21:29:10 UTC (rev 5104)
@@ -29,7 +29,8 @@
* USA
*
* (850)862-7321
- */package org.openjump.core.ui.plugin.layer;
+ */
+package org.openjump.core.ui.plugin.layer;
import java.util.*;
@@ -39,13 +40,6 @@
import com.vividsolutions.jts.geom.Geometry;
import com.vividsolutions.jts.geom.GeometryCollection;
-import com.vividsolutions.jts.geom.LineString;
-import com.vividsolutions.jts.geom.LinearRing;
-import com.vividsolutions.jts.geom.MultiLineString;
-import com.vividsolutions.jts.geom.MultiPoint;
-import com.vividsolutions.jts.geom.MultiPolygon;
-import com.vividsolutions.jts.geom.Point;
-import com.vividsolutions.jts.geom.Polygon;
import com.vividsolutions.jump.I18N;
import com.vividsolutions.jump.feature.Feature;
import com.vividsolutions.jump.feature.FeatureCollection;
@@ -87,7 +81,7 @@
public class ExtractLayersByGeometry extends AbstractThreadedUiPlugIn {
private final static String EXTRACT_LAYERS_BY_GEOMETRY_TYPE = I18N
-
.get("org.openjump.core.ui.plugin.layer.ExtractLayersByGeometry.Extract-Layers-by-Geometry-Type");
+
.get("org.openjump.core.ui.plugin.layer.ExtractLayersByGeometry.Extract-Layers-by-Geometry-Type");
private final static String EXTRACT_BY_GEOMETRY_TYPE = I18N
.get("org.openjump.core.ui.plugin.layer.ExtractLayersByGeometry.Extract-by-Geometry-Type");
@@ -100,7 +94,7 @@
.get("org.openjump.core.ui.plugin.layer.ExtractLayersByGeometry.Extract-by-Shapefile-Type-Tooltip");
private final static String EXTRACT_BY_GEOMETRY_DIMENSION = I18N
-
.get("org.openjump.core.ui.plugin.layer.ExtractLayersByGeometry.Extract-by-Geometry-Dimension");
+
.get("org.openjump.core.ui.plugin.layer.ExtractLayersByGeometry.Extract-by-Geometry-Dimension");
private final static String EXTRACT_BY_GEOMETRY_DIMENSION_TT = I18N
.get("org.openjump.core.ui.plugin.layer.ExtractLayersByGeometry.Extract-by-Geometry-Dimension-Tooltip");
@@ -116,46 +110,44 @@
private final static String ONLY_ONE_GEOMETRY_TYPE_FOUND = I18N
-
.get("org.openjump.core.ui.plugin.layer.ExtractLayersByGeometry.Only-one-geometry-type-found");
+
.get("org.openjump.core.ui.plugin.layer.ExtractLayersByGeometry.Only-one-geometry-type-found");
private final static String EMPTY = I18N
- .get("org.openjump.core.ui.plugin.layer.ExtractLayersByGeometry.empty");
+
.get("org.openjump.core.ui.plugin.layer.ExtractLayersByGeometry.empty");
private final static String POINT = I18N
- .get("org.openjump.core.ui.plugin.layer.ExtractLayersByGeometry.point");
+
.get("org.openjump.core.ui.plugin.layer.ExtractLayersByGeometry.point");
private final static String MULTIPOINT = I18N
-
.get("org.openjump.core.ui.plugin.layer.ExtractLayersByGeometry.multipoint");
- //private final static String ZERODIM = I18N
- //
.get("org.openjump.core.ui.plugin.layer.ExtractLayersByGeometry.zerodim");
+
.get("org.openjump.core.ui.plugin.layer.ExtractLayersByGeometry.multipoint");
private final static String ZERODIM = I18N
.get("org.openjump.core.ui.plugin.layer.ExtractLayersByGeometry.point");
private final static String LINESTRING = I18N
-
.get("org.openjump.core.ui.plugin.layer.ExtractLayersByGeometry.linestring");
+
.get("org.openjump.core.ui.plugin.layer.ExtractLayersByGeometry.linestring");
private final static String MULTILINESTRING = I18N
-
.get("org.openjump.core.ui.plugin.layer.ExtractLayersByGeometry.multilinestring");
+
.get("org.openjump.core.ui.plugin.layer.ExtractLayersByGeometry.multilinestring");
private final static String POLYLINE = I18N
-
.get("org.openjump.core.ui.plugin.layer.ExtractLayersByGeometry.polyline");
+
.get("org.openjump.core.ui.plugin.layer.ExtractLayersByGeometry.polyline");
private final static String ONEDIM = I18N
.get("org.openjump.core.ui.plugin.layer.ExtractLayersByGeometry.line");
private final static String POLYGON = I18N
-
.get("org.openjump.core.ui.plugin.layer.ExtractLayersByGeometry.polygon");
+
.get("org.openjump.core.ui.plugin.layer.ExtractLayersByGeometry.polygon");
private final static String MULTIPOLYGON = I18N
-
.get("org.openjump.core.ui.plugin.layer.ExtractLayersByGeometry.multipolygon");
+
.get("org.openjump.core.ui.plugin.layer.ExtractLayersByGeometry.multipolygon");
private final static String TWODIM = I18N
- .get("org.openjump.core.ui.plugin.layer.ExtractLayersByGeometry.area");
+
.get("org.openjump.core.ui.plugin.layer.ExtractLayersByGeometry.area");
private final static String GEOMETRYCOLLECTION = I18N
-
.get("org.openjump.core.ui.plugin.layer.ExtractLayersByGeometry.geometrycollection");
+
.get("org.openjump.core.ui.plugin.layer.ExtractLayersByGeometry.geometrycollection");
private final static String LAYER = GenericNames.SELECT_LAYER;
public Layer layer = null;
- boolean extractByGeometryType = true;
- boolean extractByShapefileType = false;
- boolean extractByGeometryDimension = false;
+ private boolean extractByGeometryType = true;
+ private boolean extractByShapefileType = false;
+ private boolean extractByGeometryDimension = false;
- boolean doNotExplodeGeometryCollections = true;
- boolean explodePureGeometryCollections = false;
- boolean explodeAllGeometryCollections = false;
+ private boolean doNotExplodeGeometryCollections = true;
+ private boolean explodePureGeometryCollections = false;
+ private boolean explodeAllGeometryCollections = false;
- boolean keepEmptyGeometryAppart = true;
+ private boolean keepEmptyGeometryAppart = true;
public ExtractLayersByGeometry() {
@@ -178,11 +170,9 @@
}
public boolean execute(PlugInContext context) throws Exception {
- MultiInputDialog dialog = new MultiInputDialog(context.getWorkbenchFrame(),
- getName(), true);
- if (layer == null) {
- layer = context.getCandidateLayer(0);
- }
+ MultiInputDialog dialog =
+ new MultiInputDialog(context.getWorkbenchFrame(), getName(), true);
+ layer = context.getCandidateLayer(0);
setDialogValues(dialog, context);
GUIUtil.centreOnWindow(dialog);
dialog.setVisible(true);
------------------------------------------------------------------------------
The Command Line: Reinvented for Modern Developers
Did the resurgence of CLI tooling catch you by surprise?
Reconnect with the command line and become more productive.
Learn the new .NET and ASP.NET CLI. Get your free copy!
http://sdm.link/telerik
_______________________________________________
Jump-pilot-devel mailing list
Jump-pilot-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jump-pilot-devel
