| Chunk |
|---|
| Conflicting content |
|---|
* Contributors: * Original authors and others - initial API and implementation ******************************************************************************/ <<<<<<< HEAD:de.walware.ecommons.inatable.core/src/org/eclipse/nebula/widgets/nattable/NatTable.java // -cleanup, ~ package org.eclipse.nebula.widgets.nattable; import static org.eclipse.nebula.widgets.nattable.coordinate.Orientation.HORIZONTAL; import static org.eclipse.nebula.widgets.nattable.painter.cell.GraphicsUtils.check; import static org.eclipse.nebula.widgets.nattable.painter.cell.GraphicsUtils.safe; ======= package org.eclipse.nebula.widgets.nattable; import static org.eclipse.nebula.widgets.nattable.coordinate.Orientation.HORIZONTAL; >>>>>>> 39bc4895996d0f2a45e36d65784d9285278d4eb6:org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/NatTable.java import java.util.ArrayList; import java.util.Collection; |
| Solution content |
|---|
* Contributors: * Original authors and others - initial API and implementation ******************************************************************************/ // -cleanup, ~ package org.eclipse.nebula.widgets.nattable; import static org.eclipse.nebula.widgets.nattable.coordinate.Orientation.HORIZONTAL; import static org.eclipse.nebula.widgets.nattable.painter.cell.GraphicsUtils.check; import static org.eclipse.nebula.widgets.nattable.painter.cell.GraphicsUtils.safe; import java.util.ArrayList; import java.util.Collection; |
| File |
|---|
| NatTable.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Import |
| Package declaration |
| Chunk |
|---|
| Conflicting content |
|---|
import java.util.List; import java.util.Properties; <<<<<<< HEAD:de.walware.ecommons.inatable.core/src/org/eclipse/nebula/widgets/nattable/NatTable.java import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; ======= >>>>>>> 39bc4895996d0f2a45e36d65784d9285278d4eb6:org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/NatTable.java import org.eclipse.swt.SWT; import org.eclipse.swt.custom.BusyIndicator; import org.eclipse.swt.dnd.DragSource; |
| Solution content |
|---|
import java.util.List; import java.util.Properties; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.swt.SWT; import org.eclipse.swt.custom.BusyIndicator; import org.eclipse.swt.dnd.DragSource; |
| File |
|---|
| NatTable.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Import |
| Chunk |
|---|
| Conflicting content |
|---|
import org.eclipse.swt.events.FocusListener; import org.eclipse.swt.events.PaintEvent; import org.eclipse.swt.events.PaintListener; <<<<<<< HEAD:de.walware.ecommons.inatable.core/src/org/eclipse/nebula/widgets/nattable/NatTable.java ======= import org.eclipse.swt.graphics.Rectangle; >>>>>>> 39bc4895996d0f2a45e36d65784d9285278d4eb6:org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/NatTable.java import org.eclipse.swt.widgets.Canvas; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Event; |
| Solution content |
|---|
import org.eclipse.swt.events.FocusListener; import org.eclipse.swt.events.PaintEvent; import org.eclipse.swt.events.PaintListener; import org.eclipse.swt.widgets.Canvas; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Event; |
| File |
|---|
| NatTable.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Import |
| Chunk |
|---|
| Conflicting content |
|---|
import org.eclipse.nebula.widgets.nattable.conflation.VisualChangeEventConflater; import org.eclipse.nebula.widgets.nattable.coordinate.Orientation; import org.eclipse.nebula.widgets.nattable.coordinate.Range; <<<<<<< HEAD:de.walware.ecommons.inatable.core/src/org/eclipse/nebula/widgets/nattable/NatTable.java import org.eclipse.nebula.widgets.nattable.coordinate.Rectangle; import org.eclipse.nebula.widgets.nattable.coordinate.SWTUtil; import org.eclipse.nebula.widgets.nattable.edit.ActiveCellEditorRegistry; import org.eclipse.nebula.widgets.nattable.grid.command.ClientAreaResizeCommand; import org.eclipse.nebula.widgets.nattable.grid.command.InitializeGridCommand; import org.eclipse.nebula.widgets.nattable.internal.LayerListenerList; import org.eclipse.nebula.widgets.nattable.internal.NatTablePlugin; ======= import org.eclipse.nebula.widgets.nattable.edit.ActiveCellEditorRegistry; import org.eclipse.nebula.widgets.nattable.edit.command.EditUtils; import org.eclipse.nebula.widgets.nattable.grid.command.ClientAreaResizeCommand; import org.eclipse.nebula.widgets.nattable.grid.command.InitializeGridCommand; >>>>>>> 39bc4895996d0f2a45e36d65784d9285278d4eb6:org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/NatTable.java import org.eclipse.nebula.widgets.nattable.layer.HorizontalLayerDim; import org.eclipse.nebula.widgets.nattable.layer.ILayer; import org.eclipse.nebula.widgets.nattable.layer.ILayerDim; |
| Solution content |
|---|
import org.eclipse.nebula.widgets.nattable.conflation.VisualChangeEventConflater; import org.eclipse.nebula.widgets.nattable.coordinate.Orientation; import org.eclipse.nebula.widgets.nattable.coordinate.Range; import org.eclipse.nebula.widgets.nattable.coordinate.Rectangle; import org.eclipse.nebula.widgets.nattable.edit.ActiveCellEditorRegistry; import org.eclipse.nebula.widgets.nattable.grid.command.ClientAreaResizeCommand; import org.eclipse.nebula.widgets.nattable.grid.command.InitializeGridCommand; import org.eclipse.nebula.widgets.nattable.internal.LayerListenerList; import org.eclipse.nebula.widgets.nattable.internal.NatTablePlugin; import org.eclipse.nebula.widgets.nattable.layer.HorizontalLayerDim; import org.eclipse.nebula.widgets.nattable.layer.ILayer; import org.eclipse.nebula.widgets.nattable.layer.ILayerDim; |
| File |
|---|
| NatTable.java |
| Developer's decision |
|---|
| Combination |
| Kind of conflict |
|---|
| Import |
| Chunk |
|---|
| Conflicting content |
|---|
import org.eclipse.nebula.widgets.nattable.layer.LabelStack; import org.eclipse.nebula.widgets.nattable.layer.VerticalLayerDim; import org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell; <<<<<<< HEAD:de.walware.ecommons.inatable.core/src/org/eclipse/nebula/widgets/nattable/NatTable.java ======= import org.eclipse.nebula.widgets.nattable.layer.event.CellVisualUpdateEvent; >>>>>>> 39bc4895996d0f2a45e36d65784d9285278d4eb6:org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/NatTable.java import org.eclipse.nebula.widgets.nattable.layer.event.ILayerEvent; import org.eclipse.nebula.widgets.nattable.layer.event.IVisualChangeEvent; import org.eclipse.nebula.widgets.nattable.layer.stack.DummyGridLayerStack; |
| Solution content |
|---|
import org.eclipse.nebula.widgets.nattable.layer.LabelStack; import org.eclipse.nebula.widgets.nattable.layer.VerticalLayerDim; import org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell; import org.eclipse.nebula.widgets.nattable.layer.event.ILayerEvent; import org.eclipse.nebula.widgets.nattable.layer.event.IVisualChangeEvent; import org.eclipse.nebula.widgets.nattable.layer.stack.DummyGridLayerStack; |
| File |
|---|
| NatTable.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Import |
| Chunk |
|---|
| Conflicting content |
|---|
import org.eclipse.nebula.widgets.nattable.util.IClientAreaProvider;
import org.eclipse.nebula.widgets.nattable.viewport.command.RecalculateScrollBarsCommand;
<<<<<<< HEAD:de.walware.ecommons.inatable.core/src/org/eclipse/nebula/widgets/nattable/NatTable.java
public class NatTable extends Canvas implements ILayer, PaintListener, ILayerListener, IPersistable {
public static final int DEFAULT_STYLE_OPTIONS = SWT.NO_BACKGROUND | SWT.NO_REDRAW_RESIZE | SWT.DOUBLE_BUFFERED | SWT.V_SCROLL | SWT.H_SCROLL;
private IClientAreaProvider clientAreaProvider = new IClientAreaProvider() {
@Override
public Rectangle getClientArea() {
if (!isDisposed()) {
return SWTUtil.toNatTable(NatTable.this.getClientArea());
}
else return new Rectangle(0, 0, 0, 0);
}
};
private UiBindingRegistry uiBindingRegistry;
private ModeSupport modeSupport;
private final EventConflaterChain conflaterChain = new EventConflaterChain();
private final List |
| Solution content |
|---|
private ModeSupport modeSupport;
import org.eclipse.nebula.widgets.nattable.util.IClientAreaProvider;
import org.eclipse.nebula.widgets.nattable.viewport.command.RecalculateScrollBarsCommand;
public class NatTable extends Canvas implements ILayer, PaintListener, ILayerListener, IPersistable {
public static final int DEFAULT_STYLE_OPTIONS = SWT.NO_BACKGROUND | SWT.NO_REDRAW_RESIZE | SWT.DOUBLE_BUFFERED | SWT.V_SCROLL | SWT.H_SCROLL;
private final ILayerDim hDim;
private final ILayerDim vDim;
private IClientAreaProvider clientAreaProvider = new IClientAreaProvider() {
@Override
public Rectangle getClientArea() {
if (!isDisposed()) {
return SWTUtil.toNatTable(NatTable.this.getClientArea());
}
else return new Rectangle(0, 0, 0, 0);
}
};
private UiBindingRegistry uiBindingRegistry;
private final EventConflaterChain conflaterChain = new EventConflaterChain();
private final List |
| File |
|---|
| NatTable.java |
| Developer's decision |
|---|
| Combination |
| Kind of conflict |
|---|
| Attribute |
| Class signature |
| Method declaration |
| Method invocation |
| Chunk |
|---|
| Conflicting content |
|---|
public NatTable(Composite parent, boolean autoconfigure) {
this(parent, DEFAULT_STYLE_OPTIONS, autoconfigure);
}
<<<<<<< HEAD:de.walware.ecommons.inatable.core/src/org/eclipse/nebula/widgets/nattable/NatTable.java
public NatTable(Composite parent, ILayer layer) {
this(parent, DEFAULT_STYLE_OPTIONS, layer);
}
public NatTable(Composite parent, ILayer layer, boolean autoconfigure) {
this(parent, DEFAULT_STYLE_OPTIONS, layer, autoconfigure);
}
public NatTable(Composite parent, final int style) {
this(parent, style, new DummyGridLayerStack());
}
public NatTable(Composite parent, final int style, boolean autoconfigure) {
this(parent, style, new DummyGridLayerStack(), autoconfigure);
}
public NatTable(final Composite parent, final int style, ILayer layer) {
this(parent, style, layer, true);
}
public NatTable(final Composite parent, final int style, final ILayer layer, boolean autoconfigure) {
super(parent, style);
this.h = new HorizontalLayerDim |
| Solution content |
|---|
public NatTable(Composite parent, boolean autoconfigure) {
this(parent, DEFAULT_STYLE_OPTIONS, autoconfigure);
}
public NatTable(Composite parent, ILayer layer) {
this(parent, DEFAULT_STYLE_OPTIONS, layer);
}
public NatTable(Composite parent, ILayer layer, boolean autoconfigure) {
this(parent, DEFAULT_STYLE_OPTIONS, layer, autoconfigure);
}
public NatTable(Composite parent, final int style) {
this(parent, style, new DummyGridLayerStack());
}
public NatTable(Composite parent, final int style, boolean autoconfigure) {
this(parent, style, new DummyGridLayerStack(), autoconfigure);
}
public NatTable(final Composite parent, final int style, ILayer layer) {
this(parent, style, layer, true);
}
public NatTable(final Composite parent, final int style, final ILayer layer, boolean autoconfigure) {
super(parent, style);
this.hDim = new HorizontalLayerDim(this);
this.vDim = new VerticalLayerDim(this);
// Disable scroll bars by default; if a Viewport is available, it will enable the scroll bars
disableScrollBar(getHorizontalBar()); |
| File |
|---|
| NatTable.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Attribute |
| Method declaration |
| Method invocation |
| Method signature |
| Chunk |
|---|
| Conflicting content |
|---|
// Disable scroll bars by default; if a Viewport is available, it will enable the scroll bars
disableScrollBar(getHorizontalBar());
disableScrollBar(getVerticalBar());
<<<<<<< HEAD:de.walware.ecommons.inatable.core/src/org/eclipse/nebula/widgets/nattable/NatTable.java
initInternalListener();
internalSetLayer(layer);
=======
initInternalListener();
internalSetLayer(layer);
>>>>>>> 39bc4895996d0f2a45e36d65784d9285278d4eb6:org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/NatTable.java
this.autoconfigure = autoconfigure;
if (autoconfigure) {
configurations.add(new DefaultNatTableStyleConfiguration()); |
| Solution content |
|---|
// Disable scroll bars by default; if a Viewport is available, it will enable the scroll bars
disableScrollBar(getHorizontalBar());
disableScrollBar(getVerticalBar());
initInternalListener();
internalSetLayer(layer);
this.autoconfigure = autoconfigure;
if (autoconfigure) {
configurations.add(new DefaultNatTableStyleConfiguration()); |
| File |
|---|
| NatTable.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Method invocation |
| Chunk |
|---|
| Conflicting content |
|---|
configurations.add(new DefaultNatTableStyleConfiguration());
configure();
}
<<<<<<< HEAD:de.walware.ecommons.inatable.core/src/org/eclipse/nebula/widgets/nattable/NatTable.java
conflaterChain.add(getVisualChangeEventConflater());
conflaterChain.start();
addDisposeListener(new DisposeListener() {
=======
conflaterChain.add(getVisualChangeEventConflater());
conflaterChain.start();
addDisposeListener(new DisposeListener() {
>>>>>>> 39bc4895996d0f2a45e36d65784d9285278d4eb6:org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/NatTable.java
@Override
public void widgetDisposed(DisposeEvent e) {
doCommand(new DisposeResourcesCommand()); |
| Solution content |
|---|
configurations.add(new DefaultNatTableStyleConfiguration());
configure();
}
conflaterChain.add(getVisualChangeEventConflater());
conflaterChain.start();
addDisposeListener(new DisposeListener() {
@Override
public void widgetDisposed(DisposeEvent e) {
doCommand(new DisposeResourcesCommand()); |
| File |
|---|
| NatTable.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Method invocation |
| Chunk |
|---|
| Conflicting content |
|---|
ActiveCellEditorRegistry.unregisterActiveCellEditor(); layer.dispose(); } <<<<<<< HEAD:de.walware.ecommons.inatable.core/src/org/eclipse/nebula/widgets/nattable/NatTable.java ======= >>>>>>> 39bc4895996d0f2a45e36d65784d9285278d4eb6:org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/NatTable.java }); } |
| Solution content |
|---|
ActiveCellEditorRegistry.unregisterActiveCellEditor(); layer.dispose(); } }); } |
| File |
|---|
| NatTable.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Blank |
| Chunk |
|---|
| Conflicting content |
|---|
}
<<<<<<< HEAD:de.walware.ecommons.inatable.core/src/org/eclipse/nebula/widgets/nattable/NatTable.java
protected IEventConflater getVisualChangeEventConflater() {
return new VisualChangeEventConflater(this);
}
=======
@Override
public ILayerDim getDim(final Orientation orientation) {
if (orientation == null) {
throw new NullPointerException("orientation"); //$NON-NLS-1$
}
return (orientation == HORIZONTAL) ? this.hDim : this.vDim;
}
protected IEventConflater getVisualChangeEventConflater() {
return new VisualChangeEventConflater(this);
}
>>>>>>> 39bc4895996d0f2a45e36d65784d9285278d4eb6:org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/NatTable.java
private void disableScrollBar(ScrollBar scrollBar) {
if (scrollBar != null) {
scrollBar.setMinimum(0); |
| Solution content |
|---|
}
@Override
public ILayerDim getDim(final Orientation orientation) {
if (orientation == null) {
throw new NullPointerException("orientation"); //$NON-NLS-1$
}
return (orientation == HORIZONTAL) ? this.hDim : this.vDim;
}
protected IEventConflater getVisualChangeEventConflater() {
return new VisualChangeEventConflater(this);
}
private void disableScrollBar(ScrollBar scrollBar) {
if (scrollBar != null) {
scrollBar.setMinimum(0); |
| File |
|---|
| NatTable.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Annotation |
| Method declaration |
| Chunk |
|---|
| Conflicting content |
|---|
scrollBar.setEnabled(false);
}
}
<<<<<<< HEAD:de.walware.ecommons.inatable.core/src/org/eclipse/nebula/widgets/nattable/NatTable.java
public ILayer getLayer() {
return underlyingLayer;
}
=======
public ILayer getLayer() {
return underlyingLayer;
}
>>>>>>> 39bc4895996d0f2a45e36d65784d9285278d4eb6:org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/NatTable.java
public void setLayer(ILayer layer) {
if (autoconfigure) {
throw new IllegalStateException("May only set layer post construction if autoconfigure is turned off"); //$NON-NLS-1$ |
| Solution content |
|---|
scrollBar.setEnabled(false);
}
}
public ILayer getLayer() {
return underlyingLayer;
}
public void setLayer(ILayer layer) {
if (autoconfigure) {
throw new IllegalStateException("May only set layer post construction if autoconfigure is turned off"); //$NON-NLS-1$ |
| File |
|---|
| NatTable.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Method declaration |
| Chunk |
|---|
| Conflicting content |
|---|
if (autoconfigure) {
throw new IllegalStateException("May only set layer post construction if autoconfigure is turned off"); //$NON-NLS-1$
}
<<<<<<< HEAD:de.walware.ecommons.inatable.core/src/org/eclipse/nebula/widgets/nattable/NatTable.java
internalSetLayer(layer);
}
private void internalSetLayer(ILayer layer) {
if (layer != null) {
this.underlyingLayer = layer;
underlyingLayer.setClientAreaProvider(getClientAreaProvider());
underlyingLayer.addLayerListener(this);
}
}
=======
internalSetLayer(layer);
}
private void internalSetLayer(ILayer layer) {
if (layer != null) {
this.underlyingLayer = layer;
underlyingLayer.setClientAreaProvider(new IClientAreaProvider() {
@Override
public Rectangle getClientArea() {
final Rectangle clientArea = new Rectangle(0, 0, 0, 0);
if (!isDisposed()) {
getDisplay().syncExec(new Runnable() {
@Override
public void run() {
Rectangle natClientArea = NatTable.this.getClientArea();
clientArea.x = natClientArea.x;
clientArea.y = natClientArea.y;
clientArea.width = natClientArea.width;
clientArea.height = natClientArea.height;
}
});
}
return clientArea;
}
});
underlyingLayer.addLayerListener(this);
}
}
>>>>>>> 39bc4895996d0f2a45e36d65784d9285278d4eb6:org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/NatTable.java
/**
* Adds a configuration to the table.
* |
| Solution content |
|---|
if (autoconfigure) {
throw new IllegalStateException("May only set layer post construction if autoconfigure is turned off"); //$NON-NLS-1$
}
internalSetLayer(layer);
}
private void internalSetLayer(ILayer layer) {
if (layer != null) {
this.underlyingLayer = layer;
underlyingLayer.setClientAreaProvider(getClientAreaProvider());
underlyingLayer.addLayerListener(this);
}
}
/**
* Adds a configuration to the table.
* |
| File |
|---|
| NatTable.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Method declaration |
| Method invocation |
| Chunk |
|---|
| Conflicting content |
|---|
if (autoconfigure) {
throw new IllegalStateException("May only add configurations post construction if autoconfigure is turned off"); //$NON-NLS-1$
}
<<<<<<< HEAD:de.walware.ecommons.inatable.core/src/org/eclipse/nebula/widgets/nattable/NatTable.java
configurations.add(configuration);
}
=======
configurations.add(configuration);
}
>>>>>>> 39bc4895996d0f2a45e36d65784d9285278d4eb6:org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/NatTable.java
/**
* @return {@link IConfigRegistry} used to hold the configuration bindings
* by Layer, DisplayMode and Config labels. |
| Solution content |
|---|
if (autoconfigure) {
throw new IllegalStateException("May only add configurations post construction if autoconfigure is turned off"); //$NON-NLS-1$
}
configurations.add(configuration);
}
/**
* @return {@link IConfigRegistry} used to hold the configuration bindings
* by Layer, DisplayMode and Config labels. |
| File |
|---|
| NatTable.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Method invocation |
| Chunk |
|---|
| Conflicting content |
|---|
}
return configRegistry;
}
<<<<<<< HEAD:de.walware.ecommons.inatable.core/src/org/eclipse/nebula/widgets/nattable/NatTable.java
=======
>>>>>>> 39bc4895996d0f2a45e36d65784d9285278d4eb6:org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/NatTable.java
public void setConfigRegistry(IConfigRegistry configRegistry) {
if (autoconfigure) {
throw new IllegalStateException("May only set config registry post construction if autoconfigure is turned off"); //$NON-NLS-1$ |
| Solution content |
|---|
}
return configRegistry;
}
public void setConfigRegistry(IConfigRegistry configRegistry) {
if (autoconfigure) {
throw new IllegalStateException("May only set config registry post construction if autoconfigure is turned off"); //$NON-NLS-1$ |
| File |
|---|
| NatTable.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Blank |
| Chunk |
|---|
| Conflicting content |
|---|
if (autoconfigure) {
throw new IllegalStateException("May only set config registry post construction if autoconfigure is turned off"); //$NON-NLS-1$
}
<<<<<<< HEAD:de.walware.ecommons.inatable.core/src/org/eclipse/nebula/widgets/nattable/NatTable.java
this.configRegistry = configRegistry;
}
=======
this.configRegistry = configRegistry;
}
>>>>>>> 39bc4895996d0f2a45e36d65784d9285278d4eb6:org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/NatTable.java
/**
* @return Registry holding all the UIBindings contributed by the underlying layers
*/ |
| Solution content |
|---|
if (autoconfigure) {
throw new IllegalStateException("May only set config registry post construction if autoconfigure is turned off"); //$NON-NLS-1$
}
this.configRegistry = configRegistry;
}
/**
* @return Registry holding all the UIBindings contributed by the underlying layers
*/ |
| File |
|---|
| NatTable.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Attribute |
| Chunk |
|---|
| Conflicting content |
|---|
}
return uiBindingRegistry;
}
<<<<<<< HEAD:de.walware.ecommons.inatable.core/src/org/eclipse/nebula/widgets/nattable/NatTable.java
=======
>>>>>>> 39bc4895996d0f2a45e36d65784d9285278d4eb6:org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/NatTable.java
public void setUiBindingRegistry(UiBindingRegistry uiBindingRegistry) {
if (autoconfigure) {
throw new IllegalStateException("May only set UI binding registry post construction if autoconfigure is turned off"); //$NON-NLS-1$ |
| Solution content |
|---|
}
return uiBindingRegistry;
}
public void setUiBindingRegistry(UiBindingRegistry uiBindingRegistry) {
if (autoconfigure) {
throw new IllegalStateException("May only set UI binding registry post construction if autoconfigure is turned off"); //$NON-NLS-1$ |
| File |
|---|
| NatTable.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Blank |
| Chunk |
|---|
| Conflicting content |
|---|
if (autoconfigure) {
throw new IllegalStateException("May only set UI binding registry post construction if autoconfigure is turned off"); //$NON-NLS-1$
}
<<<<<<< HEAD:de.walware.ecommons.inatable.core/src/org/eclipse/nebula/widgets/nattable/NatTable.java
this.uiBindingRegistry = uiBindingRegistry;
}
public String getID() {
return id;
}
@Override
protected void checkSubclass() {
}
=======
this.uiBindingRegistry = uiBindingRegistry;
}
public String getID() {
return id;
}
@Override
protected void checkSubclass() {
}
>>>>>>> 39bc4895996d0f2a45e36d65784d9285278d4eb6:org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/NatTable.java
protected void initInternalListener() {
modeSupport = new ModeSupport(this);
modeSupport.registerModeEventHandler(Mode.NORMAL_MODE, new ConfigurableModeEventHandler(modeSupport, this)); |
| Solution content |
|---|
if (autoconfigure) {
throw new IllegalStateException("May only set UI binding registry post construction if autoconfigure is turned off"); //$NON-NLS-1$
}
this.uiBindingRegistry = uiBindingRegistry;
}
public String getID() {
return id;
}
@Override
protected void checkSubclass() {
}
protected void initInternalListener() {
modeSupport = new ModeSupport(this);
modeSupport.registerModeEventHandler(Mode.NORMAL_MODE, new ConfigurableModeEventHandler(modeSupport, this)); |
| File |
|---|
| NatTable.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Annotation |
| Attribute |
| Method declaration |
| Chunk |
|---|
| Conflicting content |
|---|
modeSupport = new ModeSupport(this);
modeSupport.registerModeEventHandler(Mode.NORMAL_MODE, new ConfigurableModeEventHandler(modeSupport, this));
modeSupport.switchMode(Mode.NORMAL_MODE);
<<<<<<< HEAD:de.walware.ecommons.inatable.core/src/org/eclipse/nebula/widgets/nattable/NatTable.java
addPaintListener(this);
addFocusListener(new FocusListener() {
=======
addPaintListener(this);
addFocusListener(new FocusListener() {
>>>>>>> 39bc4895996d0f2a45e36d65784d9285278d4eb6:org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/NatTable.java
@Override
public void focusLost(final FocusEvent arg0) {
redraw(); |
| Solution content |
|---|
modeSupport = new ModeSupport(this);
modeSupport.registerModeEventHandler(Mode.NORMAL_MODE, new ConfigurableModeEventHandler(modeSupport, this));
modeSupport.switchMode(Mode.NORMAL_MODE);
addPaintListener(this);
addFocusListener(new FocusListener() {
@Override
public void focusLost(final FocusEvent arg0) {
redraw(); |
| File |
|---|
| NatTable.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Method invocation |
| Chunk |
|---|
| Conflicting content |
|---|
public void focusLost(final FocusEvent arg0) {
redraw();
}
<<<<<<< HEAD:de.walware.ecommons.inatable.core/src/org/eclipse/nebula/widgets/nattable/NatTable.java
=======
>>>>>>> 39bc4895996d0f2a45e36d65784d9285278d4eb6:org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/NatTable.java
@Override
public void focusGained(final FocusEvent arg0) {
redraw(); |
| Solution content |
|---|
public void focusLost(final FocusEvent arg0) {
redraw();
}
@Override
public void focusGained(final FocusEvent arg0) {
redraw(); |
| File |
|---|
| NatTable.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Blank |
| Chunk |
|---|
| Conflicting content |
|---|
public void focusGained(final FocusEvent arg0) {
redraw();
}
<<<<<<< HEAD:de.walware.ecommons.inatable.core/src/org/eclipse/nebula/widgets/nattable/NatTable.java
});
addListener(SWT.Resize, new Listener() {
@Override
public void handleEvent(final Event e) {
=======
});
addListener(SWT.Resize, new Listener() {
@Override
public void handleEvent(final Event e) {
//as resizing doesn't cause the current active editor to loose focus
//we are closing the current active editor manually
if (!EditUtils.commitAndCloseActiveEditor()) {
//if committing didn't work out we need to perform a hard close
//otherwise the state of the table would be unstale
ActiveCellEditorRegistry.getActiveCellEditor().close();
}
>>>>>>> 39bc4895996d0f2a45e36d65784d9285278d4eb6:org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/NatTable.java
doCommand(new ClientAreaResizeCommand(NatTable.this));
}
}); |
| Solution content |
|---|
public void focusGained(final FocusEvent arg0) {
redraw();
}
});
addListener(SWT.Resize, new Listener() {
@Override
public void handleEvent(final Event e) {
doCommand(new ClientAreaResizeCommand(NatTable.this));
}
}); |
| File |
|---|
| NatTable.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Method invocation |
| Chunk |
|---|
| Conflicting content |
|---|
}
});
}
<<<<<<< HEAD:de.walware.ecommons.inatable.core/src/org/eclipse/nebula/widgets/nattable/NatTable.java
=======
>>>>>>> 39bc4895996d0f2a45e36d65784d9285278d4eb6:org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/NatTable.java
@Override
public boolean forceFocus() {
return super.forceFocus(); |
| Solution content |
|---|
}
});
}
@Override
public boolean forceFocus() {
return super.forceFocus(); |
| File |
|---|
| NatTable.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Blank |
| Chunk |
|---|
| Conflicting content |
|---|
public boolean forceFocus() {
return super.forceFocus();
}
<<<<<<< HEAD:de.walware.ecommons.inatable.core/src/org/eclipse/nebula/widgets/nattable/NatTable.java
// Painting ///////////////////////////////////////////////////////////////
=======
// Painting ///////////////////////////////////////////////////////////////
>>>>>>> 39bc4895996d0f2a45e36d65784d9285278d4eb6:org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/NatTable.java
public List |
| Solution content |
|---|
public boolean forceFocus() {
return super.forceFocus();
}
// Painting ///////////////////////////////////////////////////////////////
public List |
| File |
|---|
| NatTable.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Comment |
| Chunk |
|---|
| Conflicting content |
|---|
public void addOverlayPainter(IOverlayPainter overlayPainter) {
overlayPainters.add(overlayPainter);
}
<<<<<<< HEAD:de.walware.ecommons.inatable.core/src/org/eclipse/nebula/widgets/nattable/NatTable.java
public void removeOverlayPainter(IOverlayPainter overlayPainter) {
overlayPainters.remove(overlayPainter);
}
=======
public void removeOverlayPainter(IOverlayPainter overlayPainter) {
overlayPainters.remove(overlayPainter);
}
>>>>>>> 39bc4895996d0f2a45e36d65784d9285278d4eb6:org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/NatTable.java
@Override
public void paintControl(final PaintEvent event) {
paintNatTable(event); |
| Solution content |
|---|
public void addOverlayPainter(IOverlayPainter overlayPainter) {
overlayPainters.add(overlayPainter);
}
public void removeOverlayPainter(IOverlayPainter overlayPainter) {
overlayPainters.remove(overlayPainter);
}
@Override
public void paintControl(final PaintEvent event) {
paintNatTable(event); |
| File |
|---|
| NatTable.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Method declaration |
| Chunk |
|---|
| Conflicting content |
|---|
public void paintControl(final PaintEvent event) {
paintNatTable(event);
}
<<<<<<< HEAD:de.walware.ecommons.inatable.core/src/org/eclipse/nebula/widgets/nattable/NatTable.java
private void paintNatTable(final PaintEvent event) {
getLayerPainter().paintLayer(this, event.gc, 0, 0, new org.eclipse.swt.graphics.Rectangle(event.x, event.y, event.width, event.height), getConfigRegistry());
}
=======
private void paintNatTable(final PaintEvent event) {
getLayerPainter().paintLayer(this, event.gc, 0, 0, new Rectangle(event.x, event.y, event.width, event.height), getConfigRegistry());
}
>>>>>>> 39bc4895996d0f2a45e36d65784d9285278d4eb6:org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/NatTable.java
@Override
public ILayerPainter getLayerPainter() {
return layerPainter; |
| Solution content |
|---|
public void paintControl(final PaintEvent event) {
paintNatTable(event);
}
private void paintNatTable(final PaintEvent event) {
getLayerPainter().paintLayer(this, event.gc, 0, 0, new org.eclipse.swt.graphics.Rectangle(event.x, event.y, event.width, event.height), getConfigRegistry());
}
@Override
public ILayerPainter getLayerPainter() {
return layerPainter; |
| File |
|---|
| NatTable.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Method declaration |
| Chunk |
|---|
| Conflicting content |
|---|
=======
public void setLayerPainter(ILayerPainter layerPainter) {
public ILayerPainter getLayerPainter() {
return layerPainter;
}
<<<<<<< HEAD:de.walware.ecommons.inatable.core/src/org/eclipse/nebula/widgets/nattable/NatTable.java
public void setLayerPainter(ILayerPainter layerPainter) {
this.layerPainter = layerPainter;
}
this.layerPainter = layerPainter;
}
>>>>>>> 39bc4895996d0f2a45e36d65784d9285278d4eb6:org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/NatTable.java
/**
* Repaint only a specific column in the grid. This method is optimized so that only the specific column is
* repainted and nothing else. |
| Solution content |
|---|
public ILayerPainter getLayerPainter() {
return layerPainter;
}
public void setLayerPainter(ILayerPainter layerPainter) {
this.layerPainter = layerPainter;
}
/**
* Repaint only a specific column in the grid. This method is optimized so that only the specific column is
* repainted and nothing else. |
| File |
|---|
| NatTable.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Method declaration |
| Chunk |
|---|
| Conflicting content |
|---|
*
* @param columnPosition column of the grid to repaint
*/
<<<<<<< HEAD:de.walware.ecommons.inatable.core/src/org/eclipse/nebula/widgets/nattable/NatTable.java
public void repaintColumn(long columnPosition) {
if (columnPosition == Long.MIN_VALUE) {
return;
}
long xOffset = getStartXOfColumnPosition(columnPosition);
if (xOffset < 0) {
return;
}
redraw(check(xOffset), 0, getColumnWidthByPosition(columnPosition), safe(getHeight()), true);
}
=======
public void repaintColumn(int columnPosition) {
int xOffset = getStartXOfColumnPosition(columnPosition);
if (xOffset < 0) {
return;
}
redraw(xOffset, 0, getColumnWidthByPosition(columnPosition), getHeight(), true);
}
>>>>>>> 39bc4895996d0f2a45e36d65784d9285278d4eb6:org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/NatTable.java
/**
* Repaint only a specific row in the grid. This method is optimized so that only the specific row is repainted and
* nothing else. |
| Solution content |
|---|
*
* @param columnPosition column of the grid to repaint
*/
public void repaintColumn(long columnPosition) {
if (columnPosition == Long.MIN_VALUE) {
return;
}
long xOffset = getStartXOfColumnPosition(columnPosition);
if (xOffset < 0) {
return;
}
redraw(check(xOffset), 0, getColumnWidthByPosition(columnPosition), safe(getHeight()), true);
}
/**
* Repaint only a specific row in the grid. This method is optimized so that only the specific row is repainted and
* nothing else. |
| File |
|---|
| NatTable.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Method declaration |
| Chunk |
|---|
| Conflicting content |
|---|
*
* @param rowPosition row of the grid to repaint
*/
<<<<<<< HEAD:de.walware.ecommons.inatable.core/src/org/eclipse/nebula/widgets/nattable/NatTable.java
public void repaintRow(long rowPosition) {
if (rowPosition == Long.MIN_VALUE) {
return;
}
long yOffset = getStartYOfRowPosition(rowPosition);
if (yOffset < 0) {
return;
}
redraw(0, check(yOffset), safe(getWidth()), getRowHeightByPosition(rowPosition), true);
=======
public void repaintRow(int rowPosition) {
int yOffset = getStartYOfRowPosition(rowPosition);
if (yOffset < 0) {
return;
}
redraw(0, yOffset, getWidth(), getRowHeightByPosition(rowPosition), true);
}
/**
* Repaint only a specific cell in the grid. This method is optimized so that only the specific cell is repainted and
* nothing else.
*
* @param columnPosition column position of the cell to repaint
* @param rowPosition row position of the cell to repaint
*/
public void repaintCell(int columnPosition, int rowPosition) {
int xOffset = getStartXOfColumnPosition(columnPosition);
int yOffset = getStartYOfRowPosition(rowPosition);
redraw(xOffset, yOffset, getColumnWidthByPosition(columnPosition), getRowHeightByPosition(rowPosition), true);
>>>>>>> 39bc4895996d0f2a45e36d65784d9285278d4eb6:org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/NatTable.java
}
public void updateResize() { |
| Solution content |
|---|
*
* @param rowPosition row of the grid to repaint
*/
public void repaintRow(long rowPosition) {
if (rowPosition == Long.MIN_VALUE) {
return;
}
long yOffset = getStartYOfRowPosition(rowPosition);
if (yOffset < 0) {
return;
}
redraw(0, check(yOffset), safe(getWidth()), getRowHeightByPosition(rowPosition), true);
}
public void updateResize() { |
| File |
|---|
| NatTable.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Comment |
| If statement |
| Method declaration |
| Method invocation |
| Method signature |
| Variable |
| Chunk |
|---|
| Conflicting content |
|---|
public void updateResize() {
updateResize(true);
}
<<<<<<< HEAD:de.walware.ecommons.inatable.core/src/org/eclipse/nebula/widgets/nattable/NatTable.java
=======
>>>>>>> 39bc4895996d0f2a45e36d65784d9285278d4eb6:org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/NatTable.java
/**
* Update the table screen by re-calculating everything again. It should not
* be called too frequently. |
| Solution content |
|---|
public void updateResize() {
updateResize(true);
}
/**
* Update the table screen by re-calculating everything again. It should not
* be called too frequently. |
| File |
|---|
| NatTable.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Blank |
| Chunk |
|---|
| Conflicting content |
|---|
redraw(); } } <<<<<<< HEAD:de.walware.ecommons.inatable.core/src/org/eclipse/nebula/widgets/nattable/NatTable.java ======= >>>>>>> 39bc4895996d0f2a45e36d65784d9285278d4eb6:org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/NatTable.java /** * Refreshes the entire NatTable as every layer will be refreshed. */ |
| Solution content |
|---|
redraw(); } } /** * Refreshes the entire NatTable as every layer will be refreshed. */ |
| File |
|---|
| NatTable.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Blank |
| Chunk |
|---|
| Conflicting content |
|---|
public void configure(ConfigRegistry configRegistry, UiBindingRegistry uiBindingRegistry) {
throw new UnsupportedOperationException("Cannot use this method to configure NatTable. Use no-argument configure() instead."); //$NON-NLS-1$
}
<<<<<<< HEAD:de.walware.ecommons.inatable.core/src/org/eclipse/nebula/widgets/nattable/NatTable.java
=======
>>>>>>> 39bc4895996d0f2a45e36d65784d9285278d4eb6:org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/NatTable.java
/**
* Processes all the registered {@link IConfiguration} (s).
* All the underlying layers are walked and given a chance to configure. |
| Solution content |
|---|
public void configure(ConfigRegistry configRegistry, UiBindingRegistry uiBindingRegistry) {
throw new UnsupportedOperationException("Cannot use this method to configure NatTable. Use no-argument configure() instead."); //$NON-NLS-1$
}
/**
* Processes all the registered {@link IConfiguration} (s).
* All the underlying layers are walked and given a chance to configure. |
| File |
|---|
| NatTable.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Blank |
| Chunk |
|---|
| Conflicting content |
|---|
if (underlyingLayer == null) {
throw new IllegalStateException("Layer must be set before configure is called"); //$NON-NLS-1$
}
<<<<<<< HEAD:de.walware.ecommons.inatable.core/src/org/eclipse/nebula/widgets/nattable/NatTable.java
if (underlyingLayer != null) {
underlyingLayer.configure((ConfigRegistry) getConfigRegistry(), getUiBindingRegistry());
}
=======
if (underlyingLayer != null) {
underlyingLayer.configure((ConfigRegistry) getConfigRegistry(), getUiBindingRegistry());
}
>>>>>>> 39bc4895996d0f2a45e36d65784d9285278d4eb6:org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/NatTable.java
for (IConfiguration configuration : configurations) {
configuration.configureLayer(this);
configuration.configureRegistry(getConfigRegistry()); |
| Solution content |
|---|
if (underlyingLayer == null) {
throw new IllegalStateException("Layer must be set before configure is called"); //$NON-NLS-1$
}
if (underlyingLayer != null) {
underlyingLayer.configure((ConfigRegistry) getConfigRegistry(), getUiBindingRegistry());
}
for (IConfiguration configuration : configurations) {
configuration.configureLayer(this);
configuration.configureRegistry(getConfigRegistry()); |
| File |
|---|
| NatTable.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| If statement |
| Chunk |
|---|
| Conflicting content |
|---|
configuration.configureRegistry(getConfigRegistry()); configuration.configureUiBindings(getUiBindingRegistry()); } <<<<<<< HEAD:de.walware.ecommons.inatable.core/src/org/eclipse/nebula/widgets/nattable/NatTable.java ======= >>>>>>> 39bc4895996d0f2a45e36d65784d9285278d4eb6:org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/NatTable.java // Once everything is initialized and properly configured we will // now formally initialize the grid doCommand(new InitializeGridCommand(this)); |
| Solution content |
|---|
configuration.configureRegistry(getConfigRegistry()); configuration.configureUiBindings(getUiBindingRegistry()); } // Once everything is initialized and properly configured we will // now formally initialize the grid doCommand(new InitializeGridCommand(this)); |
| File |
|---|
| NatTable.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Blank |
| Chunk |
|---|
| Conflicting content |
|---|
// now formally initialize the grid
doCommand(new InitializeGridCommand(this));
}
<<<<<<< HEAD:de.walware.ecommons.inatable.core/src/org/eclipse/nebula/widgets/nattable/NatTable.java
// Events /////////////////////////////////////////////////////////////////
@Override
public void handleLayerEvent(ILayerEvent event) {
for (ILayerListener layerListener : listeners.getListeners()) {
layerListener.handleLayerEvent(event);
}
if (event instanceof IVisualChangeEvent) {
conflaterChain.addEvent(event);
}
=======
// Events /////////////////////////////////////////////////////////////////
@Override
public void handleLayerEvent(ILayerEvent event) {
for (ILayerListener layerListener : listeners) {
layerListener.handleLayerEvent(event);
}
if (event instanceof CellVisualUpdateEvent) {
CellVisualUpdateEvent update = (CellVisualUpdateEvent)event;
repaintCell(update.getColumnPosition(), update.getRowPosition());
return;
}
if (event instanceof IVisualChangeEvent) {
conflaterChain.addEvent(event);
}
>>>>>>> 39bc4895996d0f2a45e36d65784d9285278d4eb6:org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/NatTable.java
if (event instanceof CellSelectionEvent) {
Event e = new Event();
e.widget = this; |
| Solution content |
|---|
// now formally initialize the grid
doCommand(new InitializeGridCommand(this));
}
// Events /////////////////////////////////////////////////////////////////
@Override
public void handleLayerEvent(ILayerEvent event) {
for (ILayerListener layerListener : listeners.getListeners()) {
layerListener.handleLayerEvent(event);
}
if (event instanceof IVisualChangeEvent) {
conflaterChain.addEvent(event);
}
if (event instanceof CellSelectionEvent) {
Event e = new Event();
e.widget = this; |
| File |
|---|
| NatTable.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Annotation |
| Comment |
| For statement |
| If statement |
| Method signature |
| Chunk |
|---|
| Conflicting content |
|---|
try {
notifyListeners(SWT.Selection, e);
} catch (RuntimeException re) {
<<<<<<< HEAD:de.walware.ecommons.inatable.core/src/org/eclipse/nebula/widgets/nattable/NatTable.java
NatTablePlugin.log(new Status(IStatus.ERROR, NatTablePlugin.PLUGIN_ID,
"An error occurred when fireing SWT selection event.", re )); //$NON-NLS-1$
}
}
}
// ILayer /////////////////////////////////////////////////////////////////
// Persistence
=======
re.printStackTrace();
}
}
}
// ILayer /////////////////////////////////////////////////////////////////
// Persistence
>>>>>>> 39bc4895996d0f2a45e36d65784d9285278d4eb6:org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/NatTable.java
/**
* Save the state of the table to the properties object.
* {@link ILayer#saveState(String, Properties)} is invoked on all the underlying layers. |
| Solution content |
|---|
try {
notifyListeners(SWT.Selection, e);
} catch (RuntimeException re) {
NatTablePlugin.log(new Status(IStatus.ERROR, NatTablePlugin.PLUGIN_ID,
"An error occurred when fireing SWT selection event.", re )); //$NON-NLS-1$
}
}
}
// ILayer /////////////////////////////////////////////////////////////////
// Persistence
/**
* Save the state of the table to the properties object.
* {@link ILayer#saveState(String, Properties)} is invoked on all the underlying layers. |
| File |
|---|
| NatTable.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Comment |
| Method invocation |
| Chunk |
|---|
| Conflicting content |
|---|
} }); } <<<<<<< HEAD:de.walware.ecommons.inatable.core/src/org/eclipse/nebula/widgets/nattable/NatTable.java ======= >>>>>>> 39bc4895996d0f2a45e36d65784d9285278d4eb6:org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/NatTable.java /** * Restore the state of the underlying layers from the values in the properties object. * @see #saveState(String, Properties) |
| Solution content |
|---|
} }); } /** * Restore the state of the underlying layers from the values in the properties object. * @see #saveState(String, Properties) |
| File |
|---|
| NatTable.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Blank |
| Chunk |
|---|
| Conflicting content |
|---|
} }); } <<<<<<< HEAD:de.walware.ecommons.inatable.core/src/org/eclipse/nebula/widgets/nattable/NatTable.java ======= >>>>>>> 39bc4895996d0f2a45e36d65784d9285278d4eb6:org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/NatTable.java /** * @see ILayer#registerPersistable(IPersistable) */ |
| Solution content |
|---|
} }); } /** * @see ILayer#registerPersistable(IPersistable) */ |
| File |
|---|
| NatTable.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Blank |
| Chunk |
|---|
| Conflicting content |
|---|
public void registerPersistable(IPersistable persistable) {
persistables.add(persistable);
}
<<<<<<< HEAD:de.walware.ecommons.inatable.core/src/org/eclipse/nebula/widgets/nattable/NatTable.java
=======
>>>>>>> 39bc4895996d0f2a45e36d65784d9285278d4eb6:org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/NatTable.java
@Override
public void unregisterPersistable(IPersistable persistable) {
persistables.remove(persistable); |
| Solution content |
|---|
public void registerPersistable(IPersistable persistable) {
persistables.add(persistable);
}
@Override
public void unregisterPersistable(IPersistable persistable) {
persistables.remove(persistable); |
| File |
|---|
| NatTable.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Blank |
| Chunk |
|---|
| Conflicting content |
|---|
public void unregisterPersistable(IPersistable persistable) {
persistables.remove(persistable);
}
<<<<<<< HEAD:de.walware.ecommons.inatable.core/src/org/eclipse/nebula/widgets/nattable/NatTable.java
// Command
=======
// Command
>>>>>>> 39bc4895996d0f2a45e36d65784d9285278d4eb6:org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/NatTable.java
@Override
public boolean doCommand(ILayerCommand command) {
return underlyingLayer.doCommand(command); |
| Solution content |
|---|
public void unregisterPersistable(IPersistable persistable) {
persistables.remove(persistable);
}
// Command
@Override
public boolean doCommand(ILayerCommand command) {
return underlyingLayer.doCommand(command); |
| File |
|---|
| NatTable.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Comment |
| Chunk |
|---|
| Conflicting content |
|---|
public boolean doCommand(ILayerCommand command) {
return underlyingLayer.doCommand(command);
}
<<<<<<< HEAD:de.walware.ecommons.inatable.core/src/org/eclipse/nebula/widgets/nattable/NatTable.java
=======
>>>>>>> 39bc4895996d0f2a45e36d65784d9285278d4eb6:org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/NatTable.java
@Override
public void registerCommandHandler(ILayerCommandHandler> commandHandler) {
underlyingLayer.registerCommandHandler(commandHandler); |
| Solution content |
|---|
public boolean doCommand(ILayerCommand command) {
return underlyingLayer.doCommand(command);
}
@Override
public void registerCommandHandler(ILayerCommandHandler> commandHandler) {
underlyingLayer.registerCommandHandler(commandHandler); |
| File |
|---|
| NatTable.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Blank |
| Chunk |
|---|
| Conflicting content |
|---|
public void registerCommandHandler(ILayerCommandHandler> commandHandler) {
underlyingLayer.registerCommandHandler(commandHandler);
}
<<<<<<< HEAD:de.walware.ecommons.inatable.core/src/org/eclipse/nebula/widgets/nattable/NatTable.java
=======
>>>>>>> 39bc4895996d0f2a45e36d65784d9285278d4eb6:org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/NatTable.java
@Override
public void unregisterCommandHandler(Class extends ILayerCommand> commandClass) {
underlyingLayer.unregisterCommandHandler(commandClass); |
| Solution content |
|---|
public void registerCommandHandler(ILayerCommandHandler> commandHandler) {
underlyingLayer.registerCommandHandler(commandHandler);
}
@Override
public void unregisterCommandHandler(Class extends ILayerCommand> commandClass) {
underlyingLayer.unregisterCommandHandler(commandClass); |
| File |
|---|
| NatTable.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Blank |
| Chunk |
|---|
| Conflicting content |
|---|
} // Events <<<<<<< HEAD:de.walware.ecommons.inatable.core/src/org/eclipse/nebula/widgets/nattable/NatTable.java private final LayerListenerList listeners = new LayerListenerList(); ======= private final List |
| Solution content |
|---|
}
// Events
private final LayerListenerList listeners = new LayerListenerList();
@Override
public void fireLayerEvent(ILayerEvent event) {
underlyingLayer.fireLayerEvent(event); |
| File |
|---|
| NatTable.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Attribute |
| Method invocation |
| Chunk |
|---|
| Conflicting content |
|---|
public void fireLayerEvent(ILayerEvent event) {
underlyingLayer.fireLayerEvent(event);
}
<<<<<<< HEAD:de.walware.ecommons.inatable.core/src/org/eclipse/nebula/widgets/nattable/NatTable.java
=======
>>>>>>> 39bc4895996d0f2a45e36d65784d9285278d4eb6:org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/NatTable.java
@Override
public void addLayerListener(ILayerListener listener) {
listeners.add(listener); |
| Solution content |
|---|
public void fireLayerEvent(ILayerEvent event) {
underlyingLayer.fireLayerEvent(event);
}
@Override
public void addLayerListener(ILayerListener listener) {
listeners.add(listener); |
| File |
|---|
| NatTable.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Blank |
| Chunk |
|---|
| Conflicting content |
|---|
public void addLayerListener(ILayerListener listener) {
listeners.add(listener);
}
<<<<<<< HEAD:de.walware.ecommons.inatable.core/src/org/eclipse/nebula/widgets/nattable/NatTable.java
=======
>>>>>>> 39bc4895996d0f2a45e36d65784d9285278d4eb6:org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/NatTable.java
@Override
public void removeLayerListener(ILayerListener listener) {
listeners.remove(listener); |
| Solution content |
|---|
public void addLayerListener(ILayerListener listener) {
listeners.add(listener);
}
@Override
public void removeLayerListener(ILayerListener listener) {
listeners.remove(listener); |
| File |
|---|
| NatTable.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Blank |
| Chunk |
|---|
| Conflicting content |
|---|
listeners.remove(listener);
}
<<<<<<< HEAD:de.walware.ecommons.inatable.core/src/org/eclipse/nebula/widgets/nattable/NatTable.java
// Columns
@Override
public long getColumnCount() {
return underlyingLayer.getColumnCount();
}
@Override
public long getPreferredColumnCount() {
return underlyingLayer.getPreferredColumnCount();
}
@Override
public long getColumnIndexByPosition(long columnPosition) {
return underlyingLayer.getColumnIndexByPosition(columnPosition);
}
@Override
public long localToUnderlyingColumnPosition(long localColumnPosition) {
return localColumnPosition;
}
@Override
public long underlyingToLocalColumnPosition(ILayer sourceUnderlyingLayer, long underlyingColumnPosition) {
if (sourceUnderlyingLayer != underlyingLayer) {
return Long.MIN_VALUE;
}
return underlyingColumnPosition;
}
=======
@Override
public boolean hasLayerListener(Class extends ILayerListener> layerListenerClass) {
for (ILayerListener listener : listeners) {
if (listener.getClass().equals(layerListenerClass)) {
return true;
}
}
return false;
}
// Columns
@Override
public int getColumnCount() {
return underlyingLayer.getColumnCount();
}
@Override
public int getPreferredColumnCount() {
return underlyingLayer.getPreferredColumnCount();
}
@Override
public int getColumnIndexByPosition(int columnPosition) {
return underlyingLayer.getColumnIndexByPosition(columnPosition);
}
@Override
public int localToUnderlyingColumnPosition(int localColumnPosition) {
return localColumnPosition;
}
@Override
public int underlyingToLocalColumnPosition(ILayer sourceUnderlyingLayer, int underlyingColumnPosition) {
if (sourceUnderlyingLayer != underlyingLayer) {
return -1;
}
return underlyingColumnPosition;
}
>>>>>>> 39bc4895996d0f2a45e36d65784d9285278d4eb6:org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/NatTable.java
@Override
public Collection |
| Solution content |
|---|
listeners.remove(listener);
}
// Columns
@Override
public long getColumnCount() {
return underlyingLayer.getColumnCount();
}
@Override
public long getPreferredColumnCount() {
return underlyingLayer.getPreferredColumnCount();
}
@Override
public long getColumnIndexByPosition(long columnPosition) {
return underlyingLayer.getColumnIndexByPosition(columnPosition);
}
@Override
public long localToUnderlyingColumnPosition(long localColumnPosition) {
return localColumnPosition;
}
@Override
public long underlyingToLocalColumnPosition(ILayer sourceUnderlyingLayer, long underlyingColumnPosition) {
if (sourceUnderlyingLayer != underlyingLayer) {
return Long.MIN_VALUE;
}
return underlyingColumnPosition;
}
@Override
public Collection |
| File |
|---|
| NatTable.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Annotation |
| Comment |
| Method declaration |
| Chunk |
|---|
| Conflicting content |
|---|
if (sourceUnderlyingLayer != underlyingLayer) {
return null;
}
<<<<<<< HEAD:de.walware.ecommons.inatable.core/src/org/eclipse/nebula/widgets/nattable/NatTable.java
return underlyingColumnPositionRanges;
}
@Override
public ILayerDim getDim(final Orientation orientation) {
if (orientation == null) {
throw new NullPointerException("orientation"); //$NON-NLS-1$
}
return (orientation == HORIZONTAL) ? this.h : this.v;
}
// Width
@Override
public long getWidth() {
return underlyingLayer.getWidth();
}
@Override
public long getPreferredWidth() {
return underlyingLayer.getPreferredWidth();
}
@Override
public int getColumnWidthByPosition(long columnPosition) {
return underlyingLayer.getColumnWidthByPosition(columnPosition);
}
// Column resize
@Override
public boolean isColumnPositionResizable(long columnPosition) {
return underlyingLayer.isColumnPositionResizable(columnPosition);
}
// X
@Override
public long getColumnPositionByX(long x) {
if (x < 0 || x >= getWidth()) {
return Long.MIN_VALUE;
}
return underlyingLayer.getColumnPositionByX(x);
}
@Override
public long getStartXOfColumnPosition(long columnPosition) {
return underlyingLayer.getStartXOfColumnPosition(columnPosition);
}
// Underlying
@Override
public Collection |
| Solution content |
|---|
if (sourceUnderlyingLayer != underlyingLayer) {
return null;
}
return underlyingColumnPositionRanges;
}
// Width
@Override
public long getWidth() {
return underlyingLayer.getWidth();
}
@Override
public long getPreferredWidth() {
return underlyingLayer.getPreferredWidth();
}
@Override
public int getColumnWidthByPosition(long columnPosition) {
return underlyingLayer.getColumnWidthByPosition(columnPosition);
}
// Column resize
@Override
public boolean isColumnPositionResizable(long columnPosition) {
return underlyingLayer.isColumnPositionResizable(columnPosition);
}
// X
@Override
public long getColumnPositionByX(long x) {
if (x < 0 || x >= getWidth()) {
return Long.MIN_VALUE;
}
return underlyingLayer.getColumnPositionByX(x);
}
@Override
public long getStartXOfColumnPosition(long columnPosition) {
return underlyingLayer.getStartXOfColumnPosition(columnPosition);
}
// Underlying
@Override
public Collection |
| File |
|---|
| NatTable.java |
| Developer's decision |
|---|
| Combination |
| Kind of conflict |
|---|
| Annotation |
| Comment |
| Method declaration |
| Method signature |
| Return statement |
| Variable |
| Chunk |
|---|
| Conflicting content |
|---|
underlyingLayers.add(underlyingLayer);
return underlyingLayers;
}
<<<<<<< HEAD:de.walware.ecommons.inatable.core/src/org/eclipse/nebula/widgets/nattable/NatTable.java
// Rows
@Override
public long getRowCount() {
return underlyingLayer.getRowCount();
}
@Override
public long getPreferredRowCount() {
return underlyingLayer.getPreferredRowCount();
}
@Override
public long getRowIndexByPosition(long rowPosition) {
return underlyingLayer.getRowIndexByPosition(rowPosition);
}
@Override
public long localToUnderlyingRowPosition(long localRowPosition) {
return localRowPosition;
}
@Override
public long underlyingToLocalRowPosition(ILayer sourceUnderlyingLayer, long underlyingRowPosition) {
if (sourceUnderlyingLayer != underlyingLayer) {
return Long.MIN_VALUE;
}
return underlyingRowPosition;
}
=======
// Rows
@Override
public int getRowCount() {
return underlyingLayer.getRowCount();
}
@Override
public int getPreferredRowCount() {
return underlyingLayer.getPreferredRowCount();
}
@Override
public int getRowIndexByPosition(int rowPosition) {
return underlyingLayer.getRowIndexByPosition(rowPosition);
}
@Override
public int localToUnderlyingRowPosition(int localRowPosition) {
return localRowPosition;
}
@Override
public int underlyingToLocalRowPosition(ILayer sourceUnderlyingLayer, int underlyingRowPosition) {
if (sourceUnderlyingLayer != underlyingLayer) {
return -1;
}
return underlyingRowPosition;
}
>>>>>>> 39bc4895996d0f2a45e36d65784d9285278d4eb6:org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/NatTable.java
@Override
public Collection |
| Solution content |
|---|
underlyingLayers.add(underlyingLayer);
return underlyingLayers;
}
// Rows
@Override
public long getRowCount() {
return underlyingLayer.getRowCount();
}
@Override
public long getPreferredRowCount() {
return underlyingLayer.getPreferredRowCount();
}
@Override
public long getRowIndexByPosition(long rowPosition) {
return underlyingLayer.getRowIndexByPosition(rowPosition);
}
@Override
public long localToUnderlyingRowPosition(long localRowPosition) {
return localRowPosition;
}
@Override
public long underlyingToLocalRowPosition(ILayer sourceUnderlyingLayer, long underlyingRowPosition) {
if (sourceUnderlyingLayer != underlyingLayer) {
return Long.MIN_VALUE;
}
return underlyingRowPosition;
}
@Override
public Collection |
| File |
|---|
| NatTable.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Annotation |
| Comment |
| Method declaration |
| Chunk |
|---|
| Conflicting content |
|---|
}
// Y
if (sourceUnderlyingLayer != underlyingLayer) {
return null;
}
<<<<<<< HEAD:de.walware.ecommons.inatable.core/src/org/eclipse/nebula/widgets/nattable/NatTable.java
return underlyingRowPositionRanges;
}
// Height
@Override
public long getHeight() {
return underlyingLayer.getHeight();
}
@Override
public long getPreferredHeight() {
return underlyingLayer.getPreferredHeight();
}
@Override
public int getRowHeightByPosition(long rowPosition) {
return underlyingLayer.getRowHeightByPosition(rowPosition);
}
// Row resize
@Override
public boolean isRowPositionResizable(long rowPosition) {
return underlyingLayer.isRowPositionResizable(rowPosition);
@Override
public long getRowPositionByY(long y) {
if (y < 0 || y >= getHeight()) {
return Long.MIN_VALUE;
}
return underlyingLayer.getRowPositionByY(y);
}
@Override
public long getStartYOfRowPosition(long rowPosition) {
return underlyingLayer.getStartYOfRowPosition(rowPosition);
}
// Underlying
@Override
public Collection |
| Solution content |
|---|
if (sourceUnderlyingLayer != underlyingLayer) {
return null;
}
return underlyingRowPositionRanges;
}
// Height
@Override
public long getHeight() {
return underlyingLayer.getHeight();
}
@Override
public long getPreferredHeight() {
return underlyingLayer.getPreferredHeight();
}
@Override
public int getRowHeightByPosition(long rowPosition) {
return underlyingLayer.getRowHeightByPosition(rowPosition);
}
// Row resize
@Override
public boolean isRowPositionResizable(long rowPosition) {
return underlyingLayer.isRowPositionResizable(rowPosition);
}
// Y
@Override
public long getRowPositionByY(long y) {
if (y < 0 || y >= getHeight()) {
return Long.MIN_VALUE;
}
return underlyingLayer.getRowPositionByY(y);
}
@Override
public long getStartYOfRowPosition(long rowPosition) {
return underlyingLayer.getStartYOfRowPosition(rowPosition);
}
// Underlying
@Override
public Collection |
| File |
|---|
| NatTable.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Annotation |
| Comment |
| Method declaration |
| Method signature |
| Return statement |
| Variable |
| Chunk |
|---|
| Conflicting content |
|---|
underlyingLayers.add(underlyingLayer);
return underlyingLayers;
}
<<<<<<< HEAD:de.walware.ecommons.inatable.core/src/org/eclipse/nebula/widgets/nattable/NatTable.java
// Cell features
@Override
public ILayerCell getCellByPosition(long columnPosition, long rowPosition) {
return underlyingLayer.getCellByPosition(columnPosition, rowPosition);
}
@Override
public Rectangle getBoundsByPosition(long columnPosition, long rowPosition) {
return underlyingLayer.getBoundsByPosition(columnPosition, rowPosition);
}
@Override
public LabelStack getConfigLabelsByPosition(long columnPosition, long rowPosition) {
return underlyingLayer.getConfigLabelsByPosition(columnPosition, rowPosition);
}
@Override
public Object getDataValueByPosition(long columnPosition, long rowPosition) {
=======
// Cell features
@Override
public ILayerCell getCellByPosition(int columnPosition, int rowPosition) {
return underlyingLayer.getCellByPosition(columnPosition, rowPosition);
}
@Override
public Rectangle getBoundsByPosition(int columnPosition, int rowPosition) {
return underlyingLayer.getBoundsByPosition(columnPosition, rowPosition);
}
@Override
public String getDisplayModeByPosition(int columnPosition, int rowPosition) {
return underlyingLayer.getDisplayModeByPosition(columnPosition, rowPosition);
}
@Override
public LabelStack getConfigLabelsByPosition(int columnPosition, int rowPosition) {
return underlyingLayer.getConfigLabelsByPosition(columnPosition, rowPosition);
}
@Override
public Object getDataValueByPosition(int columnPosition, int rowPosition) {
>>>>>>> 39bc4895996d0f2a45e36d65784d9285278d4eb6:org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/NatTable.java
return underlyingLayer.getDataValueByPosition(columnPosition, rowPosition);
}
|
| Solution content |
|---|
underlyingLayers.add(underlyingLayer);
return underlyingLayers;
}
// Cell features
@Override
public ILayerCell getCellByPosition(long columnPosition, long rowPosition) {
return underlyingLayer.getCellByPosition(columnPosition, rowPosition);
}
@Override
public Rectangle getBoundsByPosition(long columnPosition, long rowPosition) {
return underlyingLayer.getBoundsByPosition(columnPosition, rowPosition);
}
@Override
public LabelStack getConfigLabelsByPosition(long columnPosition, long rowPosition) {
return underlyingLayer.getConfigLabelsByPosition(columnPosition, rowPosition);
}
@Override
public Object getDataValueByPosition(long columnPosition, long rowPosition) {
return underlyingLayer.getDataValueByPosition(columnPosition, rowPosition);
}
|
| File |
|---|
| NatTable.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Annotation |
| Comment |
| Method declaration |
| Method signature |
| Chunk |
|---|
| Conflicting content |
|---|
}
@Override
<<<<<<< HEAD:de.walware.ecommons.inatable.core/src/org/eclipse/nebula/widgets/nattable/NatTable.java
public ICellPainter getCellPainter(long columnPosition, long rowPosition, ILayerCell cell, IConfigRegistry configRegistry) {
return underlyingLayer.getCellPainter(columnPosition, rowPosition, cell, configRegistry);
}
// IRegionResolver
@Override
public LabelStack getRegionLabelsByXY(long x, long y) {
return underlyingLayer.getRegionLabelsByXY(x, y);
}
@Override
public ILayer getUnderlyingLayerByPosition(long columnPosition, long rowPosition) {
return underlyingLayer;
}
@Override
public IClientAreaProvider getClientAreaProvider() {
return clientAreaProvider;
}
@Override
public void setClientAreaProvider(IClientAreaProvider clientAreaProvider) {
this.clientAreaProvider = clientAreaProvider;
=======
public ICellPainter getCellPainter(int columnPosition, int rowPosition, ILayerCell cell, IConfigRegistry configRegistry) {
return underlyingLayer.getCellPainter(columnPosition, rowPosition, cell, configRegistry);
}
// IRegionResolver
@Override
public LabelStack getRegionLabelsByXY(int x, int y) {
return underlyingLayer.getRegionLabelsByXY(x, y);
}
@Override
public ILayer getUnderlyingLayerByPosition(int columnPosition, int rowPosition) {
return underlyingLayer;
}
@Override
public IClientAreaProvider getClientAreaProvider() {
return this;
}
@Override
public void setClientAreaProvider(IClientAreaProvider clientAreaProvider) {
>>>>>>> 39bc4895996d0f2a45e36d65784d9285278d4eb6:org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/NatTable.java
underlyingLayer.setClientAreaProvider(clientAreaProvider);
}
|
| Solution content |
|---|
}
@Override
public ICellPainter getCellPainter(long columnPosition, long rowPosition, ILayerCell cell, IConfigRegistry configRegistry) {
return underlyingLayer.getCellPainter(columnPosition, rowPosition, cell, configRegistry);
}
// IRegionResolver
@Override
public LabelStack getRegionLabelsByXY(long x, long y) {
return underlyingLayer.getRegionLabelsByXY(x, y);
}
@Override
public ILayer getUnderlyingLayerByPosition(long columnPosition, long rowPosition) {
return underlyingLayer;
}
@Override
public IClientAreaProvider getClientAreaProvider() {
return clientAreaProvider;
}
@Override
public void setClientAreaProvider(IClientAreaProvider clientAreaProvider) {
this.clientAreaProvider = clientAreaProvider;
underlyingLayer.setClientAreaProvider(clientAreaProvider);
}
|
| File |
|---|
| NatTable.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Annotation |
| Attribute |
| Comment |
| Method declaration |
| Method signature |
| Chunk |
|---|
| Conflicting content |
|---|
dragSource.setTransfer(transferTypes); dragSource.addDragListener(listener); } <<<<<<< HEAD:de.walware.ecommons.inatable.core/src/org/eclipse/nebula/widgets/nattable/NatTable.java ======= >>>>>>> 39bc4895996d0f2a45e36d65784d9285278d4eb6:org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/NatTable.java /** * Adds support for dropping items into this control via a user drag-and-drop * operation. |
| Solution content |
|---|
dragSource.setTransfer(transferTypes); dragSource.addDragListener(listener); } /** * Adds support for dropping items into this control via a user drag-and-drop * operation. |
| File |
|---|
| NatTable.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Blank |
| Chunk |
|---|
| Conflicting content |
|---|
dropTarget.setTransfer(transferTypes); dropTarget.addDropListener(listener); } <<<<<<< HEAD:de.walware.ecommons.inatable.core/src/org/eclipse/nebula/widgets/nattable/NatTable.java ======= >>>>>>> 39bc4895996d0f2a45e36d65784d9285278d4eb6:org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/NatTable.java } |
| Solution content |
|---|
dropTarget.setTransfer(transferTypes); dropTarget.addDropListener(listener); } } |
| File |
|---|
| NatTable.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Blank |
| Chunk |
|---|
| Conflicting content |
|---|
// ~ package org.eclipse.nebula.widgets.nattable.columnCategories.gui; <<<<<<< HEAD:de.walware.ecommons.inatable.core/src/org/eclipse/nebula/widgets/nattable/columnCategories/gui/AvailableColumnCategoriesProvider.java ======= import static org.eclipse.nebula.widgets.nattable.util.ObjectUtils.isNull; import java.util.ArrayList; >>>>>>> 39bc4895996d0f2a45e36d65784d9285278d4eb6:org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/columnCategories/gui/AvailableColumnCategoriesProvider.java import java.util.List; import org.eclipse.jface.viewers.ITreeContentProvider; |
| Solution content |
|---|
// ~ package org.eclipse.nebula.widgets.nattable.columnCategories.gui; import java.util.ArrayList; import java.util.List; import org.eclipse.jface.viewers.ITreeContentProvider; |
| File |
|---|
| AvailableColumnCategoriesProvider.java |
| Developer's decision |
|---|
| Combination |
| Kind of conflict |
|---|
| Import |
| Chunk |
|---|
| Conflicting content |
|---|
}
public Object[] getElements(Object inputElement) {
<<<<<<< HEAD:de.walware.ecommons.inatable.core/src/org/eclipse/nebula/widgets/nattable/columnCategories/gui/AvailableColumnCategoriesProvider.java
return (model.getRootCategory() != null) ?
model.getRootCategory().getChildren().toArray() : new Object[0];
=======
return isNull(model.getRootCategory())
? new Object[]{}
: getFilteredChildren(model.getRootCategory().getChildren()).toArray();
}
private List |
| Solution content |
|---|
}
public Object[] getElements(Object inputElement) {
return (model.getRootCategory() != null) ?
getFilteredChildren(model.getRootCategory().getChildren()).toArray() :
new Object[0];
}
private List |
| File |
|---|
| AvailableColumnCategoriesProvider.java |
| Developer's decision |
|---|
| Manual |
| Kind of conflict |
|---|
| For statement |
| Method invocation |
| Method signature |
| Return statement |
| Variable |
| Chunk |
|---|
| Conflicting content |
|---|
public static final String RENAMED_COLUMN_INDICATOR = "*"; //$NON-NLS-1$ public static void hideColumnEntries(List |
| Solution content |
|---|
public static final String RENAMED_COLUMN_INDICATOR = "*"; //$NON-NLS-1$ public static void hideColumnEntries(List |
| File |
|---|
| ColumnChooserUtils.java |
| Developer's decision |
|---|
| Manual |
| Kind of conflict |
|---|
| Method invocation |
| Method signature |
| Variable |
| Chunk |
|---|
| Conflicting content |
|---|
* Example a Range of selected rows: 1 - 100 * Ranges are inclusive of their start value and not inclusive of their end value, i.e. start <= x < end */ <<<<<<< HEAD:de.walware.ecommons.inatable.core/src/org/eclipse/nebula/widgets/nattable/coordinate/Range.java public final class Range implements Comparable |
| Solution content |
|---|
* Example a Range of selected rows: 1 - 100 * Ranges are inclusive of their start value and not inclusive of their end value, i.e. start <= x < end */ public final class Range implements Comparable |
| File |
|---|
| Range.java |
| Developer's decision |
|---|
| Manual |
| Kind of conflict |
|---|
| Attribute |
| Class signature |
| Comment |
| If statement |
| Method signature |
| Chunk |
|---|
| Conflicting content |
|---|
this.end = end;
}
<<<<<<< HEAD:de.walware.ecommons.inatable.core/src/org/eclipse/nebula/widgets/nattable/coordinate/Range.java
public Range(final long value) {
=======
/**
* Creates a new range which contains the specified single value.
*/
public Range(final int value) {
>>>>>>> 39bc4895996d0f2a45e36d65784d9285278d4eb6:org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/coordinate/Range.java
this.start = value;
this.end = value + 1;
} |
| Solution content |
|---|
this.end = end;
}
/**
* Creates a new range which contains the specified single value.
*/
public Range(final long value) {
this.start = value;
this.end = value + 1;
} |
| File |
|---|
| Range.java |
| Developer's decision |
|---|
| Combination |
| Kind of conflict |
|---|
| Comment |
| Method signature |
| Chunk |
|---|
| Conflicting content |
|---|
}
<<<<<<< HEAD:de.walware.ecommons.inatable.core/src/org/eclipse/nebula/widgets/nattable/coordinate/Range.java
public long size() {
return this.end - this.start;
}
@Override
public int compareTo(Range o) {
if (this.start < o.start) {
return -1;
}
if (this.start > o.start) {
return 1;
}
if (this.end < o.end) {
return -1;
}
if (this.end > o.end) {
return 1;
}
return 0;
=======
public int size() {
return end - start;
>>>>>>> 39bc4895996d0f2a45e36d65784d9285278d4eb6:org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/coordinate/Range.java
}
/** |
| Solution content |
|---|
}
public long size() {
return this.end - this.start;
}
@Override
public int compareTo(Range o) {
if (this.start < o.start) {
return -1;
}
if (this.start > o.start) {
return 1;
}
if (this.end < o.end) {
return -1;
}
if (this.end > o.end) {
return 1;
}
return 0;
}
/** |
| File |
|---|
| Range.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Annotation |
| Attribute |
| If statement |
| Method declaration |
| Method signature |
| Return statement |
| Chunk |
|---|
| Conflicting content |
|---|
/**
* @return |
| Solution content |
|---|
/**
* @return |
| File |
|---|
| Range.java |
| Developer's decision |
|---|
| Manual |
| Kind of conflict |
|---|
| Attribute |
| Comment |
| Method declaration |
| Method signature |
| Return statement |
| Chunk |
|---|
| Conflicting content |
|---|
@Override
public int hashCode() {
<<<<<<< HEAD:de.walware.ecommons.inatable.core/src/org/eclipse/nebula/widgets/nattable/coordinate/Range.java
int h = (int) (this.start ^ (this.start >>> 32));
h = Integer.rotateRight(h, 15);
h ^= (int) (this.end ^ (this.end >>> 32));
return h ^ (h >>> 7);
}
@Override
public boolean equals(Object obj) {
=======
return HashCodeBuilder.reflectionHashCode(this);
}
@Override
public boolean equals(final Object obj) {
>>>>>>> 39bc4895996d0f2a45e36d65784d9285278d4eb6:org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/coordinate/Range.java
if (this == obj) {
return true;
} |
| Solution content |
|---|
@Override
public int hashCode() {
int h = (int) (this.start ^ (this.start >>> 32));
h = Integer.rotateRight(h, 15);
h ^= (int) (this.end ^ (this.end >>> 32));
return h ^ (h >>> 7);
}
@Override
public boolean equals(Object obj) {
if (this == obj) {
return true;
} |
| File |
|---|
| Range.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Annotation |
| Cast expression |
| Method invocation |
| Method signature |
| Return statement |
| Variable |
| Chunk |
|---|
| Conflicting content |
|---|
return false; } final Range other = (Range) obj; <<<<<<< HEAD:de.walware.ecommons.inatable.core/src/org/eclipse/nebula/widgets/nattable/coordinate/Range.java return (start == other.start) && (end == other.end); ======= return ((this.start == other.start) && (this.end == other.end)); >>>>>>> 39bc4895996d0f2a45e36d65784d9285278d4eb6:org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/coordinate/Range.java } @Override |
| Solution content |
|---|
return false; } final Range other = (Range) obj; return ((this.start == other.start) && (this.end == other.end)); } @Override |
| File |
|---|
| Range.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Attribute |
| Return statement |
| Variable |
| Chunk |
|---|
| Conflicting content |
|---|
@Override
public String toString() {
<<<<<<< HEAD:de.walware.ecommons.inatable.core/src/org/eclipse/nebula/widgets/nattable/coordinate/Range.java
return getClass().getSimpleName() + " [" + start + "," + end + "]";
=======
return "Range {" + this.start + ", " + this.end + "}"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
}
public static void sortByStart(List |
| Solution content |
|---|
@Override
public String toString() {
return "Range {" + start + ", " + end + "}"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
}
} |
| File |
|---|
| Range.java |
| Developer's decision |
|---|
| Manual |
| Kind of conflict |
|---|
| Attribute |
| Comment |
| Method invocation |
| Method signature |
| Return statement |
| Chunk |
|---|
| Conflicting content |
|---|
* complicated calculation algorithm need to be implemented that checks every columns and row
* by building the spanning cell for the matching rectangle. As this would be quite time consuming
* calculations, this is not supported out of the box by NatTable.
<<<<<<< HEAD:de.walware.ecommons.inatable.core/src/org/eclipse/nebula/widgets/nattable/data/AutomaticSpanningDataProvider.java
=======
*
* @author Dirk Fauth
*
>>>>>>> 39bc4895996d0f2a45e36d65784d9285278d4eb6:org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/data/AutomaticSpanningDataProvider.java
*/
public class AutomaticSpanningDataProvider implements ISpanningDataProvider, IPersistable {
|
| Solution content |
|---|
* complicated calculation algorithm need to be implemented that checks every columns and row
* by building the spanning cell for the matching rectangle. As this would be quite time consuming
* calculations, this is not supported out of the box by NatTable.
*/
public class AutomaticSpanningDataProvider implements ISpanningDataProvider, IPersistable {
|
| File |
|---|
| AutomaticSpanningDataProvider.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Comment |
| Chunk |
|---|
| Conflicting content |
|---|
* |
| Solution content |
|---|
* |
| File |
|---|
| AutomaticSpanningDataProvider.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Attribute |
| Method invocation |
| Chunk |
|---|
| Conflicting content |
|---|
* |
| Solution content |
|---|
* |
| File |
|---|
| AutomaticSpanningDataProvider.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Attribute |
| Method invocation |
| Chunk |
|---|
| Conflicting content |
|---|
}
@Override
<<<<<<< HEAD:de.walware.ecommons.inatable.core/src/org/eclipse/nebula/widgets/nattable/data/AutomaticSpanningDataProvider.java
public Object getDataValue(long columnIndex, long rowIndex) {
=======
public Object getDataValue(int columnIndex, int rowIndex) {
>>>>>>> 39bc4895996d0f2a45e36d65784d9285278d4eb6:org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/data/AutomaticSpanningDataProvider.java
return this.underlyingDataProvider.getDataValue(columnIndex, rowIndex);
}
|
| Solution content |
|---|
}
@Override
public Object getDataValue(long columnIndex, long rowIndex) {
return this.underlyingDataProvider.getDataValue(columnIndex, rowIndex);
}
|
| File |
|---|
| AutomaticSpanningDataProvider.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Method signature |
| Chunk |
|---|
| Conflicting content |
|---|
}
@Override
<<<<<<< HEAD:de.walware.ecommons.inatable.core/src/org/eclipse/nebula/widgets/nattable/data/AutomaticSpanningDataProvider.java
public void setDataValue(long columnIndex, long rowIndex, Object newValue) {
=======
public void setDataValue(int columnIndex, int rowIndex, Object newValue) {
>>>>>>> 39bc4895996d0f2a45e36d65784d9285278d4eb6:org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/data/AutomaticSpanningDataProvider.java
this.underlyingDataProvider.setDataValue(columnIndex, rowIndex, newValue);
}
|
| Solution content |
|---|
}
@Override
public void setDataValue(long columnIndex, long rowIndex, Object newValue) {
this.underlyingDataProvider.setDataValue(columnIndex, rowIndex, newValue);
}
|
| File |
|---|
| AutomaticSpanningDataProvider.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Method signature |
| Chunk |
|---|
| Conflicting content |
|---|
}
@Override
<<<<<<< HEAD:de.walware.ecommons.inatable.core/src/org/eclipse/nebula/widgets/nattable/data/AutomaticSpanningDataProvider.java
public long getColumnCount() {
=======
public int getColumnCount() {
>>>>>>> 39bc4895996d0f2a45e36d65784d9285278d4eb6:org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/data/AutomaticSpanningDataProvider.java
return this.underlyingDataProvider.getColumnCount();
}
|
| Solution content |
|---|
}
@Override
public long getColumnCount() {
return this.underlyingDataProvider.getColumnCount();
}
|
| File |
|---|
| AutomaticSpanningDataProvider.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Method signature |
| Chunk |
|---|
| Conflicting content |
|---|
}
@Override
<<<<<<< HEAD:de.walware.ecommons.inatable.core/src/org/eclipse/nebula/widgets/nattable/data/AutomaticSpanningDataProvider.java
public long getRowCount() {
=======
public int getRowCount() {
>>>>>>> 39bc4895996d0f2a45e36d65784d9285278d4eb6:org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/data/AutomaticSpanningDataProvider.java
return this.underlyingDataProvider.getRowCount();
}
|
| Solution content |
|---|
}
@Override
public long getRowCount() {
return this.underlyingDataProvider.getRowCount();
}
|
| File |
|---|
| AutomaticSpanningDataProvider.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Method signature |
| Chunk |
|---|
| Conflicting content |
|---|
}
@Override
<<<<<<< HEAD:de.walware.ecommons.inatable.core/src/org/eclipse/nebula/widgets/nattable/data/AutomaticSpanningDataProvider.java
public DataCell getCellByPosition(long columnPosition, long rowPosition) {
long cellColumnPosition = isAutoSpanEnabledForColumn(columnPosition, rowPosition) ?
getStartColumnPosition(columnPosition, rowPosition) : columnPosition;
long cellRowPosition = isAutoSpanEnabledForRow(columnPosition, rowPosition) ?
getStartRowPosition(columnPosition, rowPosition) : rowPosition;
long columnSpan = isAutoSpanEnabledForColumn(columnPosition, rowPosition) ?
getColumnSpan(cellColumnPosition, cellRowPosition) : 1;
long rowSpan = isAutoSpanEnabledForRow(columnPosition, rowPosition) ?
=======
public DataCell getCellByPosition(int columnPosition, int rowPosition) {
int cellColumnPosition = isAutoSpanEnabledForColumn(columnPosition, rowPosition) ?
getStartColumnPosition(columnPosition, rowPosition) : columnPosition;
int cellRowPosition = isAutoSpanEnabledForRow(columnPosition, rowPosition) ?
getStartRowPosition(columnPosition, rowPosition) : rowPosition;
int columnSpan = isAutoSpanEnabledForColumn(columnPosition, rowPosition) ?
getColumnSpan(cellColumnPosition, cellRowPosition) : 1;
int rowSpan = isAutoSpanEnabledForRow(columnPosition, rowPosition) ?
>>>>>>> 39bc4895996d0f2a45e36d65784d9285278d4eb6:org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/data/AutomaticSpanningDataProvider.java
getRowSpan(cellColumnPosition, cellRowPosition) : 1;
return new DataCell(cellColumnPosition, cellRowPosition, columnSpan, rowSpan); |
| Solution content |
|---|
}
@Override
public DataCell getCellByPosition(long columnPosition, long rowPosition) {
long cellColumnPosition = isAutoSpanEnabledForColumn(columnPosition, rowPosition) ?
getStartColumnPosition(columnPosition, rowPosition) : columnPosition;
long cellRowPosition = isAutoSpanEnabledForRow(columnPosition, rowPosition) ?
getStartRowPosition(columnPosition, rowPosition) : rowPosition;
long columnSpan = isAutoSpanEnabledForColumn(columnPosition, rowPosition) ?
getColumnSpan(cellColumnPosition, cellRowPosition) : 1;
long rowSpan = isAutoSpanEnabledForRow(columnPosition, rowPosition) ?
getRowSpan(cellColumnPosition, cellRowPosition) : 1;
return new DataCell(cellColumnPosition, cellRowPosition, columnSpan, rowSpan); |
| File |
|---|
| AutomaticSpanningDataProvider.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Method invocation |
| Method signature |
| Variable |
| Chunk |
|---|
| Conflicting content |
|---|
* @param rowPosition The row position for which the column spanning should be checked
* @return |
| Solution content |
|---|
* @param rowPosition The row position for which the column spanning should be checked
* @return |
| File |
|---|
| AutomaticSpanningDataProvider.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Method signature |
| Chunk |
|---|
| Conflicting content |
|---|
* @param rowPosition The row position to check for auto spanning
* @return |
| Solution content |
|---|
* @param rowPosition The row position to check for auto spanning
* @return |
| File |
|---|
| AutomaticSpanningDataProvider.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Method signature |
| Chunk |
|---|
| Conflicting content |
|---|
* @param columnPosition The column position to check
* @return |
| Solution content |
|---|
* @param columnPosition The column position to check
* @return |
| File |
|---|
| AutomaticSpanningDataProvider.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Method signature |
| Chunk |
|---|
| Conflicting content |
|---|
* @param rowPosition The row position to check
* @return |
| Solution content |
|---|
* @param rowPosition The row position to check
* @return |
| File |
|---|
| AutomaticSpanningDataProvider.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Method signature |
| Chunk |
|---|
| Conflicting content |
|---|
* won't be auto spanned anymore.
* @param columnPositions The column positions to add for auto spanning.
*/
<<<<<<< HEAD:de.walware.ecommons.inatable.core/src/org/eclipse/nebula/widgets/nattable/data/AutomaticSpanningDataProvider.java
public void addAutoSpanningColumnPositions(Long... columnPositions) {
=======
public void addAutoSpanningColumnPositions(Integer... columnPositions) {
>>>>>>> 39bc4895996d0f2a45e36d65784d9285278d4eb6:org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/data/AutomaticSpanningDataProvider.java
this.autoSpanColumns.addAll(Arrays.asList(columnPositions));
}
|
| Solution content |
|---|
* won't be auto spanned anymore.
* @param columnPositions The column positions to add for auto spanning.
*/
public void addAutoSpanningColumnPositions(Long... columnPositions) {
this.autoSpanColumns.addAll(Arrays.asList(columnPositions));
}
|
| File |
|---|
| AutomaticSpanningDataProvider.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Method signature |
| Chunk |
|---|
| Conflicting content |
|---|
* be auto spanned anymore.
* @param rowPositions The row positions to add for auto spanning.
*/
<<<<<<< HEAD:de.walware.ecommons.inatable.core/src/org/eclipse/nebula/widgets/nattable/data/AutomaticSpanningDataProvider.java
public void addAutoSpanningRowPositions(Long... rowPositions) {
=======
public void addAutoSpanningRowPositions(Integer... rowPositions) {
>>>>>>> 39bc4895996d0f2a45e36d65784d9285278d4eb6:org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/data/AutomaticSpanningDataProvider.java
this.autoSpanRows.addAll(Arrays.asList(rowPositions));
}
|
| Solution content |
|---|
* be auto spanned anymore.
* @param rowPositions The row positions to add for auto spanning.
*/
public void addAutoSpanningRowPositions(Long... rowPositions) {
this.autoSpanRows.addAll(Arrays.asList(rowPositions));
}
|
| File |
|---|
| AutomaticSpanningDataProvider.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Method signature |
| Chunk |
|---|
| Conflicting content |
|---|
* Removes the given column positions for auto spanning.
* @param columnPositions The column positions to remove for auto spanning.
*/
<<<<<<< HEAD:de.walware.ecommons.inatable.core/src/org/eclipse/nebula/widgets/nattable/data/AutomaticSpanningDataProvider.java
public void removeAutoSpanningColumnPositions(Long... columnPositions) {
=======
public void removeAutoSpanningColumnPositions(Integer... columnPositions) {
>>>>>>> 39bc4895996d0f2a45e36d65784d9285278d4eb6:org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/data/AutomaticSpanningDataProvider.java
this.autoSpanColumns.removeAll(Arrays.asList(columnPositions));
}
|
| Solution content |
|---|
* Removes the given column positions for auto spanning.
* @param columnPositions The column positions to remove for auto spanning.
*/
public void removeAutoSpanningColumnPositions(Long... columnPositions) {
this.autoSpanColumns.removeAll(Arrays.asList(columnPositions));
}
|
| File |
|---|
| AutomaticSpanningDataProvider.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Method signature |
| Chunk |
|---|
| Conflicting content |
|---|
* Removes the given row positions for auto spanning.
* @param rowPositions The row positions to remove for auto spanning.
*/
<<<<<<< HEAD:de.walware.ecommons.inatable.core/src/org/eclipse/nebula/widgets/nattable/data/AutomaticSpanningDataProvider.java
public void removeAutoSpanningRowPositions(Long... rowPositions) {
=======
public void removeAutoSpanningRowPositions(Integer... rowPositions) {
>>>>>>> 39bc4895996d0f2a45e36d65784d9285278d4eb6:org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/data/AutomaticSpanningDataProvider.java
this.autoSpanRows.removeAll(Arrays.asList(rowPositions));
}
|
| Solution content |
|---|
* Removes the given row positions for auto spanning.
* @param rowPositions The row positions to remove for auto spanning.
*/
public void removeAutoSpanningRowPositions(Long... rowPositions) {
this.autoSpanRows.removeAll(Arrays.asList(rowPositions));
}
|
| File |
|---|
| AutomaticSpanningDataProvider.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Method signature |
| Chunk |
|---|
| Conflicting content |
|---|
* @return The column position where the spanning starts or the given column position
* if it is not spanned with the columns to the left.
*/
<<<<<<< HEAD:de.walware.ecommons.inatable.core/src/org/eclipse/nebula/widgets/nattable/data/AutomaticSpanningDataProvider.java
protected long getStartColumnPosition(long columnPosition, long rowPosition) {
=======
protected int getStartColumnPosition(int columnPosition, int rowPosition) {
>>>>>>> 39bc4895996d0f2a45e36d65784d9285278d4eb6:org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/data/AutomaticSpanningDataProvider.java
if (columnPosition <= 0 || !isAutoSpanColumn(columnPosition) || !isAutoSpanColumn(columnPosition-1)) {
return columnPosition;
} |
| Solution content |
|---|
* @return The column position where the spanning starts or the given column position
* if it is not spanned with the columns to the left.
*/
protected long getStartColumnPosition(long columnPosition, long rowPosition) {
if (columnPosition <= 0 || !isAutoSpanColumn(columnPosition) || !isAutoSpanColumn(columnPosition-1)) {
return columnPosition;
} |
| File |
|---|
| AutomaticSpanningDataProvider.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Method signature |
| Chunk |
|---|
| Conflicting content |
|---|
* @return The row position where the spanning starts or the given row position
* if it is not spanned with rows above.
*/
<<<<<<< HEAD:de.walware.ecommons.inatable.core/src/org/eclipse/nebula/widgets/nattable/data/AutomaticSpanningDataProvider.java
protected long getStartRowPosition(long columnPosition, long rowPosition) {
=======
protected int getStartRowPosition(int columnPosition, int rowPosition) {
>>>>>>> 39bc4895996d0f2a45e36d65784d9285278d4eb6:org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/data/AutomaticSpanningDataProvider.java
if (rowPosition <= 0 || !isAutoSpanRow(rowPosition) || !isAutoSpanRow(rowPosition - 1)) {
return rowPosition;
} |
| Solution content |
|---|
* @return The row position where the spanning starts or the given row position
* if it is not spanned with rows above.
*/
protected long getStartRowPosition(long columnPosition, long rowPosition) {
if (rowPosition <= 0 || !isAutoSpanRow(rowPosition) || !isAutoSpanRow(rowPosition - 1)) {
return rowPosition;
} |
| File |
|---|
| AutomaticSpanningDataProvider.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Method signature |
| Chunk |
|---|
| Conflicting content |
|---|
* @param rowPosition The row position for which the column spanning should be checked
* @return The number of columns to span
*/
<<<<<<< HEAD:de.walware.ecommons.inatable.core/src/org/eclipse/nebula/widgets/nattable/data/AutomaticSpanningDataProvider.java
protected long getColumnSpan(long columnPosition, long rowPosition) {
long span = 1;
=======
protected int getColumnSpan(int columnPosition, int rowPosition) {
int span = 1;
>>>>>>> 39bc4895996d0f2a45e36d65784d9285278d4eb6:org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/data/AutomaticSpanningDataProvider.java
while (columnPosition < getColumnCount()-1
&& isAutoSpanColumn(columnPosition) |
| Solution content |
|---|
* @param rowPosition The row position for which the column spanning should be checked
* @return The number of columns to span
*/
protected long getColumnSpan(long columnPosition, long rowPosition) {
long span = 1;
while (columnPosition < getColumnCount()-1
&& isAutoSpanColumn(columnPosition) |
| File |
|---|
| AutomaticSpanningDataProvider.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Method signature |
| Variable |
| Chunk |
|---|
| Conflicting content |
|---|
* @param rowPosition The row position to start the check for spanning
* @return The number of rows to span
*/
<<<<<<< HEAD:de.walware.ecommons.inatable.core/src/org/eclipse/nebula/widgets/nattable/data/AutomaticSpanningDataProvider.java
protected long getRowSpan(long columnPosition, long rowPosition) {
long span = 1;
=======
protected int getRowSpan(int columnPosition, int rowPosition) {
int span = 1;
>>>>>>> 39bc4895996d0f2a45e36d65784d9285278d4eb6:org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/data/AutomaticSpanningDataProvider.java
while (rowPosition < getRowCount()-1
&& isAutoSpanRow(rowPosition) |
| Solution content |
|---|
* @param rowPosition The row position to start the check for spanning
* @return The number of rows to span
*/
protected long getRowSpan(long columnPosition, long rowPosition) {
long span = 1;
while (rowPosition < getRowCount()-1
&& isAutoSpanRow(rowPosition) |
| File |
|---|
| AutomaticSpanningDataProvider.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Method signature |
| Variable |
| Chunk |
|---|
| Conflicting content |
|---|
if (autoSpanColumns.size() > 0) {
StringBuilder strBuilder = new StringBuilder();
<<<<<<< HEAD:de.walware.ecommons.inatable.core/src/org/eclipse/nebula/widgets/nattable/data/AutomaticSpanningDataProvider.java
for (Long index : autoSpanColumns) {
=======
for (Integer index : autoSpanColumns) {
>>>>>>> 39bc4895996d0f2a45e36d65784d9285278d4eb6:org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/data/AutomaticSpanningDataProvider.java
strBuilder.append(index);
strBuilder.append(IPersistable.VALUE_SEPARATOR);
} |
| Solution content |
|---|
if (autoSpanColumns.size() > 0) {
StringBuilder strBuilder = new StringBuilder();
for (Long index : autoSpanColumns) {
strBuilder.append(index);
strBuilder.append(IPersistable.VALUE_SEPARATOR);
} |
| File |
|---|
| AutomaticSpanningDataProvider.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| For statement |
| Chunk |
|---|
| Conflicting content |
|---|
if (autoSpanRows.size() > 0) {
StringBuilder strBuilder = new StringBuilder();
<<<<<<< HEAD:de.walware.ecommons.inatable.core/src/org/eclipse/nebula/widgets/nattable/data/AutomaticSpanningDataProvider.java
for (Long index : autoSpanRows) {
=======
for (Integer index : autoSpanRows) {
>>>>>>> 39bc4895996d0f2a45e36d65784d9285278d4eb6:org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/data/AutomaticSpanningDataProvider.java
strBuilder.append(index);
strBuilder.append(IPersistable.VALUE_SEPARATOR);
} |
| Solution content |
|---|
if (autoSpanRows.size() > 0) {
StringBuilder strBuilder = new StringBuilder();
for (Long index : autoSpanRows) {
strBuilder.append(index);
strBuilder.append(IPersistable.VALUE_SEPARATOR);
} |
| File |
|---|
| AutomaticSpanningDataProvider.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| For statement |
| Chunk |
|---|
| Conflicting content |
|---|
this.autoSpanColumns.clear();
property = properties.getProperty(prefix + PERSISTENCE_KEY_AUTO_SPAN_COLUMNS);
if (property != null) {
<<<<<<< HEAD:de.walware.ecommons.inatable.core/src/org/eclipse/nebula/widgets/nattable/data/AutomaticSpanningDataProvider.java
List |
| Solution content |
|---|
this.autoSpanColumns.clear();
property = properties.getProperty(prefix + PERSISTENCE_KEY_AUTO_SPAN_COLUMNS);
if (property != null) {
List |
| File |
|---|
| AutomaticSpanningDataProvider.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Method invocation |
| Variable |
| While statement |
| Chunk |
|---|
| Conflicting content |
|---|
this.autoSpanRows.clear();
property = properties.getProperty(prefix + PERSISTENCE_KEY_AUTO_SPAN_ROWS);
if (property != null) {
<<<<<<< HEAD:de.walware.ecommons.inatable.core/src/org/eclipse/nebula/widgets/nattable/data/AutomaticSpanningDataProvider.java
List |
| Solution content |
|---|
this.autoSpanRows.clear();
property = properties.getProperty(prefix + PERSISTENCE_KEY_AUTO_SPAN_ROWS);
if (property != null) {
List |
| File |
|---|
| AutomaticSpanningDataProvider.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Method invocation |
| Variable |
| While statement |
| Chunk |
|---|
| Conflicting content |
|---|
this.autoSpanRows.addAll(newAutoSpanRows); } } <<<<<<< HEAD:de.walware.ecommons.inatable.core/src/org/eclipse/nebula/widgets/nattable/data/AutomaticSpanningDataProvider.java } ======= } >>>>>>> 39bc4895996d0f2a45e36d65784d9285278d4eb6:org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/data/AutomaticSpanningDataProvider.java |
| Solution content |
|---|
this.autoSpanRows.addAll(newAutoSpanRows); } } } |
| File |
|---|
| AutomaticSpanningDataProvider.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Other |
| Chunk |
|---|
| Conflicting content |
|---|
if (cells.size() == 1 ||
(cells.size() > 1 && supportMultiEdit(cells, cellEditor, configRegistry))) {
<<<<<<< HEAD:de.walware.ecommons.inatable.core/src/org/eclipse/nebula/widgets/nattable/edit/EditController.java
//as the EditSelectionCommandHandler already ensured that all cells have the same
//configuration, we can simply use any cell for multi cell edit handling
ICellEditDialog dialog = CellEditDialogFactory.createCellEditDialog(
parent != null ? parent.getShell() : null, initialCanonicalValue,
cells.get(0), cellEditor, configRegistry);
long returnValue = dialog.open();
=======
>>>>>>> 39bc4895996d0f2a45e36d65784d9285278d4eb6:org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/edit/EditController.java
if (cellEditor.openMultiEditDialog()) {
//as the EditSelectionCommandHandler already ensured that all cells have the same |
| Solution content |
|---|
if (cells.size() == 1 ||
(cells.size() > 1 && supportMultiEdit(cells, cellEditor, configRegistry))) {
if (cellEditor.openMultiEditDialog()) {
//as the EditSelectionCommandHandler already ensured that all cells have the same |
| File |
|---|
| EditController.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Comment |
| Method invocation |
| Variable |
| Chunk |
|---|
| Conflicting content |
|---|
&& EditUtils.isEditorSame(this.selectionLayer, configRegistry)
&& EditUtils.isConverterSame(this.selectionLayer, configRegistry)) {
//check how many cells are selected
<<<<<<< HEAD:de.walware.ecommons.inatable.core/src/org/eclipse/nebula/widgets/nattable/edit/command/EditSelectionCommandHandler.java
List |
| Solution content |
|---|
&& EditUtils.isEditorSame(this.selectionLayer, configRegistry)
&& EditUtils.isConverterSame(this.selectionLayer, configRegistry)) {
//check how many cells are selected
Collection |
| File |
|---|
| EditSelectionCommandHandler.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| If statement |
| Method invocation |
| Variable |
| Chunk |
|---|
| Conflicting content |
|---|
//of the cell to edit inline corresponding to the NatTable. On firing the event, a //translation process is triggered, converting the information to the correct values //needed for inline editing <<<<<<< HEAD:de.walware.ecommons.inatable.core/src/org/eclipse/nebula/widgets/nattable/edit/command/EditSelectionCommandHandler.java PositionCoordinate selectedCell = selectedCellPositions.get(0); ILayerCell cell = this.selectionLayer.getCellByPosition(selectedCell.columnPosition, selectedCell.rowPosition); ======= ILayerCell cell = selectedCells.iterator().next(); >>>>>>> 39bc4895996d0f2a45e36d65784d9285278d4eb6:org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/edit/command/EditSelectionCommandHandler.java this.selectionLayer.fireLayerEvent( new InlineCellEditEvent( this.selectionLayer, |
| Solution content |
|---|
//of the cell to edit inline corresponding to the NatTable. On firing the event, a //translation process is triggered, converting the information to the correct values //needed for inline editing ILayerCell cell = selectedCells.iterator().next(); this.selectionLayer.fireLayerEvent( new InlineCellEditEvent( this.selectionLayer, |
| File |
|---|
| EditSelectionCommandHandler.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Method invocation |
| Variable |
| Chunk |
|---|
| Conflicting content |
|---|
configRegistry,
(initialValue != null ? initialValue : cell.getDataValue())));
}
<<<<<<< HEAD:de.walware.ecommons.inatable.core/src/org/eclipse/nebula/widgets/nattable/edit/command/EditSelectionCommandHandler.java
else if (selectedCellPositions.size() > 1) {
//collect the selected ILayerCells for further processing
List |
| Solution content |
|---|
configRegistry,
(initialValue != null ? initialValue : cell.getDataValue())));
}
else if (selectedCells.size() > 1) {
//determine the initial value
Object initialEditValue = initialValue;
if (initialValue == null && EditUtils.isValueSame(this.selectionLayer)) { |
| File |
|---|
| EditSelectionCommandHandler.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Comment |
| For statement |
| If statement |
| Method invocation |
| Variable |
| Chunk |
|---|
| Conflicting content |
|---|
if (initialValue == null && EditUtils.isValueSame(this.selectionLayer)) {
ILayerCell cell = selectedCells.iterator().next();
initialEditValue = this.selectionLayer.getDataValueByPosition(
<<<<<<< HEAD:de.walware.ecommons.inatable.core/src/org/eclipse/nebula/widgets/nattable/edit/command/EditSelectionCommandHandler.java
selectedCellPositions.get(0).columnPosition, selectedCellPositions.get(0).rowPosition);
=======
cell.getColumnPosition(), cell.getRowPosition());
>>>>>>> 39bc4895996d0f2a45e36d65784d9285278d4eb6:org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/edit/command/EditSelectionCommandHandler.java
}
EditController.editCells(selectedCells, parent, initialEditValue, configRegistry); |
| Solution content |
|---|
if (initialValue == null && EditUtils.isValueSame(this.selectionLayer)) {
ILayerCell cell = selectedCells.iterator().next();
initialEditValue = this.selectionLayer.getDataValueByPosition(
cell.getColumnPosition(), cell.getRowPosition());
}
EditController.editCells(selectedCells, parent, initialEditValue, configRegistry); |
| File |
|---|
| EditSelectionCommandHandler.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Method invocation |
| Chunk |
|---|
| Conflicting content |
|---|
* at least one cell is not editable.
*/
public static boolean allCellsEditable(SelectionLayer selectionLayer, IConfigRegistry configRegistry) {
<<<<<<< HEAD:de.walware.ecommons.inatable.core/src/org/eclipse/nebula/widgets/nattable/edit/command/EditUtils.java
List |
| Solution content |
|---|
* at least one cell is not editable.
*/
public static boolean allCellsEditable(SelectionLayer selectionLayer, IConfigRegistry configRegistry) {
Collection |
| File |
|---|
| EditUtils.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| For statement |
| Method invocation |
| Variable |
| Chunk |
|---|
| Conflicting content |
|---|
*/
public static boolean isValueSame(SelectionLayer selectionLayer) {
Object lastSelectedValue = null;
<<<<<<< HEAD:de.walware.ecommons.inatable.core/src/org/eclipse/nebula/widgets/nattable/edit/command/EditUtils.java
List |
| Solution content |
|---|
*/
public static boolean isValueSame(SelectionLayer selectionLayer) {
Object lastSelectedValue = null;
Collection |
| File |
|---|
| EditUtils.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| For statement |
| Method invocation |
| Variable |
| Chunk |
|---|
| Conflicting content |
|---|
// -depend package org.eclipse.nebula.widgets.nattable.edit.command; <<<<<<< HEAD:de.walware.ecommons.inatable.core/src/org/eclipse/nebula/widgets/nattable/edit/command/UpdateDataCommandHandler.java import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; ======= import org.apache.commons.lang.ObjectUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; >>>>>>> 39bc4895996d0f2a45e36d65784d9285278d4eb6:org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/edit/command/UpdateDataCommandHandler.java import org.eclipse.nebula.widgets.nattable.command.AbstractLayerCommandHandler; import org.eclipse.nebula.widgets.nattable.command.ILayerCommandHandler; import org.eclipse.nebula.widgets.nattable.internal.NatTablePlugin; |
| Solution content |
|---|
// -depend package org.eclipse.nebula.widgets.nattable.edit.command; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.nebula.widgets.nattable.command.AbstractLayerCommandHandler; import org.eclipse.nebula.widgets.nattable.command.ILayerCommandHandler; import org.eclipse.nebula.widgets.nattable.data.IDataProvider; import org.eclipse.nebula.widgets.nattable.internal.NatTablePlugin; |
| File |
|---|
| UpdateDataCommandHandler.java |
| Developer's decision |
|---|
| Manual |
| Kind of conflict |
|---|
| Import |
| Chunk |
|---|
| Conflicting content |
|---|
@Override
protected boolean doCommand(UpdateDataCommand command) {
try {
<<<<<<< HEAD:de.walware.ecommons.inatable.core/src/org/eclipse/nebula/widgets/nattable/edit/command/UpdateDataCommandHandler.java
long columnPosition = command.getColumnPosition();
long rowPosition = command.getRowPosition();
dataLayer.getDataProvider().setDataValue(columnPosition, rowPosition, command.getNewValue());
dataLayer.fireLayerEvent(new CellVisualChangeEvent(dataLayer, columnPosition, rowPosition));
return true;
} catch (UnsupportedOperationException e) {
NatTablePlugin.log(new Status(IStatus.ERROR, NatTablePlugin.PLUGIN_ID,
"Failed to update value to: " + command.getNewValue(), e ));
return false;
}
}
=======
int columnPosition = command.getColumnPosition();
int rowPosition = command.getRowPosition();
if (!ObjectUtils.equals(
dataLayer.getDataValue(columnPosition, rowPosition), command.getNewValue())) {
dataLayer.setDataValue(columnPosition, rowPosition, command.getNewValue());
dataLayer.fireLayerEvent(new CellVisualChangeEvent(dataLayer, columnPosition, rowPosition));
//TODO implement a new event which is a mix of PropertyUpdateEvent and CellVisualChangeEvent
}
return true;
} catch(Exception e) {
log.error("Failed to update value to: "+command.getNewValue(), e); //$NON-NLS-1$
return false;
}
}
>>>>>>> 39bc4895996d0f2a45e36d65784d9285278d4eb6:org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/edit/command/UpdateDataCommandHandler.java
} |
| Solution content |
|---|
@Override
protected boolean doCommand(UpdateDataCommand command) {
try {
long columnPosition = command.getColumnPosition();
long rowPosition = command.getRowPosition();
final IDataProvider dataProvider = dataLayer.getDataProvider();
Object oldValue = dataProvider.getDataValue(columnPosition, rowPosition);
Object newValue = command.getNewValue();
if ((oldValue != null) ? !oldValue.equals(newValue) : null != newValue) {
dataProvider.setDataValue(columnPosition, rowPosition, newValue);
dataLayer.fireLayerEvent(new CellVisualChangeEvent(dataLayer, columnPosition, rowPosition));
//TODO implement a new event which is a mix of PropertyUpdateEvent and CellVisualChangeEvent
}
return true;
} catch (UnsupportedOperationException e) {
NatTablePlugin.log(new Status(IStatus.ERROR, NatTablePlugin.PLUGIN_ID,
"Failed to update value to: " + command.getNewValue(), e ));
return false;
}
}
} |
| File |
|---|
| UpdateDataCommandHandler.java |
| Developer's decision |
|---|
| Manual |
| Kind of conflict |
|---|
| Catch clause |
| If statement |
| Method invocation |
| Return statement |
| Variable |
| Chunk |
|---|
| Conflicting content |
|---|
import org.eclipse.nebula.widgets.nattable.style.DisplayMode;
import org.eclipse.nebula.widgets.nattable.style.IStyle;
import org.eclipse.nebula.widgets.nattable.widget.EditModeEnum;
<<<<<<< HEAD:de.walware.ecommons.inatable.core/src/org/eclipse/nebula/widgets/nattable/edit/editor/AbstractCellEditor.java
=======
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.FocusAdapter;
import org.eclipse.swt.events.FocusEvent;
import org.eclipse.swt.events.FocusListener;
import org.eclipse.swt.events.TraverseEvent;
import org.eclipse.swt.events.TraverseListener;
import org.eclipse.swt.graphics.Rectangle;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
>>>>>>> 39bc4895996d0f2a45e36d65784d9285278d4eb6:org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/edit/editor/AbstractCellEditor.java
/**
* Abstract implementation of {@link ICellEditor} that wraps SWT controls to be |
| Solution content |
|---|
import org.eclipse.nebula.widgets.nattable.style.DisplayMode;
import org.eclipse.nebula.widgets.nattable.style.IStyle;
import org.eclipse.nebula.widgets.nattable.widget.EditModeEnum;
/**
* Abstract implementation of {@link ICellEditor} that wraps SWT controls to be |
| File |
|---|
| AbstractCellEditor.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Import |
| Chunk |
|---|
| Conflicting content |
|---|
// ~ package org.eclipse.nebula.widgets.nattable.edit.editor; <<<<<<< HEAD:de.walware.ecommons.inatable.core/src/org/eclipse/nebula/widgets/nattable/edit/editor/CheckBoxCellEditor.java import java.util.List; ======= import org.eclipse.nebula.widgets.nattable.painter.cell.CheckBoxPainter; import org.eclipse.nebula.widgets.nattable.selection.SelectionLayer.MoveDirectionEnum; import org.eclipse.nebula.widgets.nattable.widget.EditModeEnum; >>>>>>> 39bc4895996d0f2a45e36d65784d9285278d4eb6:org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/edit/editor/CheckBoxCellEditor.java import org.eclipse.swt.SWT; import org.eclipse.swt.events.MouseAdapter; import org.eclipse.swt.events.MouseEvent; |
| Solution content |
|---|
// ~ package org.eclipse.nebula.widgets.nattable.edit.editor; import org.eclipse.swt.SWT; import org.eclipse.swt.events.MouseAdapter; import org.eclipse.swt.events.MouseEvent; |
| File |
|---|
| CheckBoxCellEditor.java |
| Developer's decision |
|---|
| None |
| Kind of conflict |
|---|
| Import |
| Chunk |
|---|
| Conflicting content |
|---|
* Contributors: * Original authors and others - initial API and implementation ******************************************************************************/ <<<<<<< HEAD:de.walware.ecommons.inatable.core/src/org/eclipse/nebula/widgets/nattable/edit/editor/ComboBoxCellEditor.java // ~ ======= >>>>>>> 39bc4895996d0f2a45e36d65784d9285278d4eb6:org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/edit/editor/ComboBoxCellEditor.java package org.eclipse.nebula.widgets.nattable.edit.editor; import java.util.ArrayList; |
| Solution content |
|---|
* Contributors: * Original authors and others - initial API and implementation ******************************************************************************/ // ~ package org.eclipse.nebula.widgets.nattable.edit.editor; import java.util.ArrayList; |
| File |
|---|
| ComboBoxCellEditor.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Package declaration |
| Chunk |
|---|
| Conflicting content |
|---|
import java.util.ArrayList; import java.util.List; <<<<<<< HEAD:de.walware.ecommons.inatable.core/src/org/eclipse/nebula/widgets/nattable/edit/editor/ComboBoxCellEditor.java ======= import org.eclipse.nebula.widgets.nattable.data.convert.IDisplayConverter; import org.eclipse.nebula.widgets.nattable.selection.SelectionLayer.MoveDirectionEnum; import org.eclipse.nebula.widgets.nattable.util.ArrayUtil; import org.eclipse.nebula.widgets.nattable.widget.EditModeEnum; import org.eclipse.nebula.widgets.nattable.widget.NatCombo; >>>>>>> 39bc4895996d0f2a45e36d65784d9285278d4eb6:org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/edit/editor/ComboBoxCellEditor.java import org.eclipse.swt.SWT; import org.eclipse.swt.events.FocusAdapter; import org.eclipse.swt.events.FocusEvent; |
| Solution content |
|---|
import java.util.ArrayList; import java.util.List; import org.eclipse.swt.SWT; import org.eclipse.swt.events.FocusAdapter; import org.eclipse.swt.events.FocusEvent; |
| File |
|---|
| ComboBoxCellEditor.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Import |
| Chunk |
|---|
| Conflicting content |
|---|
import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Text;
<<<<<<< HEAD:de.walware.ecommons.inatable.core/src/org/eclipse/nebula/widgets/nattable/edit/editor/ComboBoxCellEditor.java
import org.eclipse.nebula.widgets.nattable.data.convert.IDisplayConverter;
import org.eclipse.nebula.widgets.nattable.util.ArrayUtil;
import org.eclipse.nebula.widgets.nattable.widget.EditModeEnum;
import org.eclipse.nebula.widgets.nattable.widget.NatCombo;
=======
>>>>>>> 39bc4895996d0f2a45e36d65784d9285278d4eb6:org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/edit/editor/ComboBoxCellEditor.java
/**
* {@link ICellEditor} implementation to provide combo box editing behaviour.
* Uses the {@link NatCombo} as editor control which provides free editing in |
| Solution content |
|---|
import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Text;
import org.eclipse.nebula.widgets.nattable.data.convert.IDisplayConverter;
import org.eclipse.nebula.widgets.nattable.util.ArrayUtil;
import org.eclipse.nebula.widgets.nattable.widget.EditModeEnum;
import org.eclipse.nebula.widgets.nattable.widget.NatCombo;
/**
* {@link ICellEditor} implementation to provide combo box editing behaviour.
* Uses the {@link NatCombo} as editor control which provides free editing in |
| File |
|---|
| ComboBoxCellEditor.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Import |
| Chunk |
|---|
| Conflicting content |
|---|
public void keyPressed(KeyEvent event) {
if ((event.keyCode == SWT.CR)
|| (event.keyCode == SWT.KEYPAD_CR)) {
<<<<<<< HEAD:de.walware.ecommons.inatable.core/src/org/eclipse/nebula/widgets/nattable/edit/editor/ComboBoxCellEditor.java
commit(null, editMode == EditModeEnum.INLINE);
=======
commit(MoveDirectionEnum.NONE, editMode == EditModeEnum.INLINE);
>>>>>>> 39bc4895996d0f2a45e36d65784d9285278d4eb6:org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/edit/editor/ComboBoxCellEditor.java
} else if (event.keyCode == SWT.ESC){
close();
} |
| Solution content |
|---|
public void keyPressed(KeyEvent event) {
if ((event.keyCode == SWT.CR)
|| (event.keyCode == SWT.KEYPAD_CR)) {
commit(null, editMode == EditModeEnum.INLINE);
} else if (event.keyCode == SWT.ESC){
close();
} |
| File |
|---|
| ComboBoxCellEditor.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Method invocation |
| Chunk |
|---|
| Conflicting content |
|---|
combo.addMouseListener(new MouseAdapter() {
@Override
public void mouseUp(MouseEvent e) {
<<<<<<< HEAD:de.walware.ecommons.inatable.core/src/org/eclipse/nebula/widgets/nattable/edit/editor/ComboBoxCellEditor.java
commit(null, (!multiselect && editMode == EditModeEnum.INLINE));
=======
commit(MoveDirectionEnum.NONE, (!multiselect && editMode == EditModeEnum.INLINE));
>>>>>>> 39bc4895996d0f2a45e36d65784d9285278d4eb6:org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/edit/editor/ComboBoxCellEditor.java
}
});
|
| Solution content |
|---|
combo.addMouseListener(new MouseAdapter() {
@Override
public void mouseUp(MouseEvent e) {
commit(null, (!multiselect && editMode == EditModeEnum.INLINE));
}
});
|
| File |
|---|
| ComboBoxCellEditor.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Method invocation |
| Chunk |
|---|
| Conflicting content |
|---|
import org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell; import org.eclipse.nebula.widgets.nattable.ui.matcher.IMouseEventMatcher; import org.eclipse.nebula.widgets.nattable.widget.EditModeEnum; <<<<<<< HEAD:de.walware.ecommons.inatable.core/src/org/eclipse/nebula/widgets/nattable/edit/editor/ICellEditor.java ======= import org.eclipse.swt.graphics.Rectangle; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; >>>>>>> 39bc4895996d0f2a45e36d65784d9285278d4eb6:org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/edit/editor/ICellEditor.java /** * Interface for implementing editors that can be used in a NatTable. |
| Solution content |
|---|
import org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell; import org.eclipse.nebula.widgets.nattable.ui.matcher.IMouseEventMatcher; import org.eclipse.nebula.widgets.nattable.widget.EditModeEnum; /** * Interface for implementing editors that can be used in a NatTable. |
| File |
|---|
| ICellEditor.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Import |
| Chunk |
|---|
| Conflicting content |
|---|
*/ void removeEditorControlListeners(); <<<<<<< HEAD:de.walware.ecommons.inatable.core/src/org/eclipse/nebula/widgets/nattable/edit/editor/ICellEditor.java ======= /** * This method is used to calculate the bounds of the edit control when opened inline. * By default it should return the given cell bounds to match the cell structure in NatTable. * For several cases it might be useful to return the preferred size to show all content * rather than trimming the control to the cell size. * |
| Solution content |
|---|
*/ void removeEditorControlListeners(); /** * This method is used to calculate the bounds of the edit control when opened inline. * By default it should return the given cell bounds to match the cell structure in NatTable. * For several cases it might be useful to return the preferred size to show all content * rather than trimming the control to the cell size. * |
| File |
|---|
| ICellEditor.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Comment |
| Method interface |
| Chunk |
|---|
| Conflicting content |
|---|
@Override
public Text createEditorControl(Composite parent) {
<<<<<<< HEAD:de.walware.ecommons.inatable.core/src/org/eclipse/nebula/widgets/nattable/edit/editor/MultiLineTextCellEditor.java
int style = CellStyleUtil.getHorizontalAlignmentSWT(this.cellStyle, SWT.NONE)
| SWT.MULTI | SWT.BORDER | SWT.V_SCROLL;
=======
boolean openInline = openInline(this.configRegistry, this.labelStack.getLabels());
int style = HorizontalAlignmentEnum.getSWTStyle(this.cellStyle) | SWT.MULTI | SWT.BORDER;
if (!openInline) {
//if the editor control is opened in a dialog, we add scrolling as the size of the
//control is dependent on the dialog size
style = style | SWT.V_SCROLL;
}
>>>>>>> 39bc4895996d0f2a45e36d65784d9285278d4eb6:org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/edit/editor/MultiLineTextCellEditor.java
if (lineWrap) {
style = style | SWT.WRAP;
} |
| Solution content |
|---|
@Override
public Text createEditorControl(Composite parent) {
boolean openInline = openInline(this.configRegistry, this.labelStack.getLabels());
int style = CellStyleUtil.getHorizontalAlignmentSWT(this.cellStyle, SWT.NONE) | SWT.MULTI | SWT.BORDER;
if (!openInline) {
//if the editor control is opened in a dialog, we add scrolling as the size of the
//control is dependent on the dialog size
style = style | SWT.V_SCROLL;
}
if (lineWrap) {
style = style | SWT.WRAP;
} |
| File |
|---|
| MultiLineTextCellEditor.java |
| Developer's decision |
|---|
| Manual |
| Kind of conflict |
|---|
| If statement |
| Method invocation |
| Variable |
| Chunk |
|---|
| Conflicting content |
|---|
(event.keyCode == SWT.CR
|| event.keyCode == SWT.KEYPAD_CR)) {
<<<<<<< HEAD:de.walware.ecommons.inatable.core/src/org/eclipse/nebula/widgets/nattable/edit/editor/TextCellEditor.java
Direction move = null;
=======
boolean commit = (event.stateMask == SWT.ALT) ? false : true;
MoveDirectionEnum move = MoveDirectionEnum.NONE;
>>>>>>> 39bc4895996d0f2a45e36d65784d9285278d4eb6:org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/edit/editor/TextCellEditor.java
if (moveSelectionOnEnter && editMode == EditModeEnum.INLINE) {
if (event.stateMask == 0) {
move = Direction.DOWN; |
| Solution content |
|---|
(event.keyCode == SWT.CR
|| event.keyCode == SWT.KEYPAD_CR)) {
boolean commit = (event.stateMask == SWT.ALT) ? false : true;
Direction move = null;
if (moveSelectionOnEnter && editMode == EditModeEnum.INLINE) {
if (event.stateMask == 0) {
move = Direction.DOWN; |
| File |
|---|
| TextCellEditor.java |
| Developer's decision |
|---|
| Combination |
| Kind of conflict |
|---|
| Variable |
| Chunk |
|---|
| Conflicting content |
|---|
import org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell;
import org.eclipse.nebula.widgets.nattable.style.DisplayMode;
import org.eclipse.nebula.widgets.nattable.widget.EditModeEnum;
<<<<<<< HEAD:de.walware.ecommons.inatable.core/src/org/eclipse/nebula/widgets/nattable/edit/gui/AbstractDialogCellEditor.java
=======
import org.eclipse.swt.graphics.Rectangle;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
>>>>>>> 39bc4895996d0f2a45e36d65784d9285278d4eb6:org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/edit/gui/AbstractDialogCellEditor.java
/**
* Abstract implementation of a {@link ICellEditor} that is also a {@link ICellEditDialog}. |
| Solution content |
|---|
import org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell;
import org.eclipse.nebula.widgets.nattable.style.DisplayMode;
import org.eclipse.nebula.widgets.nattable.widget.EditModeEnum;
/**
* Abstract implementation of a {@link ICellEditor} that is also a {@link ICellEditDialog}. |
| File |
|---|
| AbstractDialogCellEditor.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Import |
| Chunk |
|---|
| Conflicting content |
|---|
*/ void exportLayerEnd(OutputStream outputStream, String layerName) throws IOException; <<<<<<< HEAD:de.walware.ecommons.inatable.core/src/org/eclipse/nebula/widgets/nattable/export/ILayerExporter.java void exportRowBegin(OutputStream outputStream, long rowPosition) throws IOException; void exportRowEnd(OutputStream outputStream, long rowPosition) throws IOException; ======= /** * Starts the export operation of one row. * Is used for example to initialize a row in a sheet or open some * tags in a XML format. * @param outputStream The OutputStream to write the export to. * @param rowPosition The position of the row to export. * @throws IOException If an error occurred during writing the export. */ void exportRowBegin(OutputStream outputStream, int rowPosition) throws IOException; /** * Ends the export operation of one row. * @param outputStream The OutputStream to write the export to. * @param rowPosition The position of the row that was exported. * Usually not necessary, but in case there is caching involved in a * custom ILayerExporter implementation, this can be used to retrieve * the row again. * @throws IOException If an error occurred during writing the export. */ void exportRowEnd(OutputStream outputStream, int rowPosition) throws IOException; >>>>>>> 39bc4895996d0f2a45e36d65784d9285278d4eb6:org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/export/ILayerExporter.java /** * Exports one cell. |
| Solution content |
|---|
*/ void exportLayerEnd(OutputStream outputStream, String layerName) throws IOException; /** * Starts the export operation of one row. * Is used for example to initialize a row in a sheet or open some * tags in a XML format. * @param outputStream The OutputStream to write the export to. * @param rowPosition The position of the row to export. * @throws IOException If an error occurred during writing the export. */ void exportRowBegin(OutputStream outputStream, long rowPosition) throws IOException; /** * Ends the export operation of one row. * @param outputStream The OutputStream to write the export to. * @param rowPosition The position of the row that was exported. * Usually not necessary, but in case there is caching involved in a * custom ILayerExporter implementation, this can be used to retrieve * the row again. * @throws IOException If an error occurred during writing the export. */ void exportRowEnd(OutputStream outputStream, long rowPosition) throws IOException; /** * Exports one cell. |
| File |
|---|
| ILayerExporter.java |
| Developer's decision |
|---|
| Combination |
| Kind of conflict |
|---|
| Comment |
| Method interface |
| Chunk |
|---|
| Conflicting content |
|---|
import org.eclipse.nebula.widgets.nattable.summaryrow.command.CalculateSummaryRowValuesCommand; import org.eclipse.nebula.widgets.nattable.util.IClientAreaProvider; import org.eclipse.swt.SWT; <<<<<<< HEAD:de.walware.ecommons.inatable.core/src/org/eclipse/nebula/widgets/nattable/export/NatExporter.java import org.eclipse.nebula.widgets.nattable.coordinate.Rectangle; ======= import org.eclipse.swt.graphics.Rectangle; import org.eclipse.swt.program.Program; >>>>>>> 39bc4895996d0f2a45e36d65784d9285278d4eb6:org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/export/NatExporter.java import org.eclipse.swt.widgets.ProgressBar; import org.eclipse.swt.widgets.Shell; |
| Solution content |
|---|
import org.eclipse.nebula.widgets.nattable.summaryrow.command.CalculateSummaryRowValuesCommand; import org.eclipse.nebula.widgets.nattable.util.IClientAreaProvider; |
| File |
|---|
| NatExporter.java |
| Developer's decision |
|---|
| None |
| Kind of conflict |
|---|
| Import |
| Chunk |
|---|
| Conflicting content |
|---|
outputStream.write(asBytes(" |