| Chunk |
|---|
| Conflicting content |
|---|
rasterDataNodeTypeProperties = rdnTypeProperties.toArray(
new PropertyDescriptor[rdnTypeProperties.size()]);
}
<<<<<<< HEAD
final PropertyPane parametersPane = new PropertyPane(bindingContext);
final JPanel parametersPanel = parametersPane.createPanel();
parametersPanel.setBorder(new EmptyBorder(4, 4, 4, 4));
this.form.add("Processing Parameters", new JScrollPane(parametersPanel));
setMenuBar(operatorMenu.createDefaultMenu());
=======
>>>>>>> 1ae396ad7bb6a42409da8abe016c2ca91b4effc8
}
productChangedHandler = new ProductChangedHandler();
if (!sourceProductSelectorList.isEmpty()) { |
| Solution content |
|---|
rasterDataNodeTypeProperties = rdnTypeProperties.toArray(
new PropertyDescriptor[rdnTypeProperties.size()]);
}
}
productChangedHandler = new ProductChangedHandler();
if (!sourceProductSelectorList.isEmpty()) { |
| File |
|---|
| DefaultSingleTargetProductDialog.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Method invocation |
| Variable |