fix plugin broken for layers without attribute

openjump-gis · Sep 29, 2024 · 80fac23 · 80fac23
1 parent afac708
commit 80fac23
Showing 1 changed file with 14 additions and 12 deletions.
diff --git a/...org/openjump/core/ui/plugin/tools/analysis/onelayer/MergePolygonsWithNeighbourPlugIn.java b/...org/openjump/core/ui/plugin/tools/analysis/onelayer/MergePolygonsWithNeighbourPlugIn.java
@@ -169,18 +169,20 @@ private void initDialog(PlugInContext context) {
     // Using an attribute
     List<String> attributes = AttributeTypeFilter.NO_GEOMETRY_FILTER.filter(context.getLayerManager()
         .getLayer(layerName));
-    if (!attributes.isEmpty()) {
-      dialog.addSeparator();
-      JCheckBox jcbUseAttribute = dialog.addCheckBox(sUseAttribute, useAttribute);
-      JComboBox<String> jcbAttribute = dialog.addComboBox(sAttributeToUse, attribute, attributes, null);
-      jcbAttribute.setEnabled(useAttribute);
-      JCheckBox jcbSkipNullValues = dialog.addCheckBox(sSkipNullValues, skipNullValues, null);
-      jcbSkipNullValues.setEnabled(useAttribute);
-      jcbUseAttribute.addActionListener(e -> {
-        jcbAttribute.setEnabled(jcbUseAttribute.isSelected());
-        jcbSkipNullValues.setEnabled(jcbUseAttribute.isSelected());
-        jcbSkipNullValues.setEnabled(jcbUseAttribute.isSelected());
-      });
+    dialog.addSeparator();
+    JCheckBox jcbUseAttribute = dialog.addCheckBox(sUseAttribute, useAttribute);
+    JComboBox<String> jcbAttribute = dialog.addComboBox(sAttributeToUse, attribute, attributes, null);
+    jcbAttribute.setEnabled(useAttribute);
+    JCheckBox jcbSkipNullValues = dialog.addCheckBox(sSkipNullValues, skipNullValues, null);
+    jcbSkipNullValues.setEnabled(useAttribute);
+    jcbUseAttribute.addActionListener(e -> {
+      jcbAttribute.setEnabled(jcbUseAttribute.isSelected());
+      jcbSkipNullValues.setEnabled(jcbUseAttribute.isSelected());
+      jcbSkipNullValues.setEnabled(jcbUseAttribute.isSelected());
+    });
+    if (attributes.isEmpty()) {
+      jcbUseAttribute.setSelected(false);
+      jcbUseAttribute.setEnabled(false);
     }
 
     GUIUtil.centreOnWindow(dialog);