changes after video conference on December 3rd
diff --git a/org.eclipse.nebula.widgets.nattable.app/src/org/eclipse/nebula/widgets/nattable/app/parts/SamplePart.java b/org.eclipse.nebula.widgets.nattable.app/src/org/eclipse/nebula/widgets/nattable/app/parts/SamplePart.java
index 3241019..dd9e27d 100644
--- a/org.eclipse.nebula.widgets.nattable.app/src/org/eclipse/nebula/widgets/nattable/app/parts/SamplePart.java
+++ b/org.eclipse.nebula.widgets.nattable.app/src/org/eclipse/nebula/widgets/nattable/app/parts/SamplePart.java
@@ -16,7 +16,7 @@
import org.eclipse.e4.core.contexts.IEclipseContext;
import org.eclipse.e4.ui.di.Focus;
import org.eclipse.nebula.widgets.nattable.extension.e4.E4NatTableConfiguration;
-import org.eclipse.nebula.widgets.nattable.renderer.swt.NatTable;
+import org.eclipse.nebula.widgets.nattable.renderer.swt.SWTNatTable;
import org.eclipse.swt.SWT;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
@@ -26,7 +26,7 @@
public class SamplePart {
private Label label;
- private NatTable natTable;
+ private SWTNatTable natTable;
@Inject
private IEclipseContext context;
@@ -38,7 +38,7 @@
label = new Label(parent, SWT.NONE);
label.setText("Sample table");
- natTable = new NatTable(parent, new E4NatTableConfiguration(context));
+ natTable = new SWTNatTable(parent, new E4NatTableConfiguration(context));
natTable.setLayoutData(new GridData(GridData.FILL_BOTH));
}
diff --git a/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/core/MNatTable.java b/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/core/NatTable.java
similarity index 98%
rename from org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/core/MNatTable.java
rename to org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/core/NatTable.java
index 799bb4e..1430448 100644
--- a/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/core/MNatTable.java
+++ b/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/core/NatTable.java
@@ -24,7 +24,7 @@
* @author Dirk Fauth
*
*/
-public class MNatTable implements ILayer
+public class NatTable implements ILayer //TODO extend AbstractLayer
// , IClientAreaProvider, ILayerListener, IPersistable
{
@@ -53,7 +53,7 @@
- public MNatTable(NatTableConfiguration natConfig) {
+ public NatTable(NatTableConfiguration natConfig) {
if (natConfig != null) {
//if a NatTableConfiguration is given, start configuring it by this
//e.g. if using the E4 extension, the layers and other configurations will
@@ -320,10 +320,6 @@
for (ILayerListener layerListener : listeners) {
layerListener.handleLayerEvent(event);
}
- //TODO the following line was inserted before, can this be correct?
- //IMHO this is wrong because events are defined to be fired upwards, while
- //this line will fire the event downwards again
-// underlyingLayer.fireLayerEvent(event);
}
public void addLayerListener(ILayerListener listener) {
diff --git a/org.eclipse.nebula.widgets.nattable.renderer.swt/src/org/eclipse/nebula/widgets/nattable/renderer/swt/NatTable.java b/org.eclipse.nebula.widgets.nattable.renderer.swt/src/org/eclipse/nebula/widgets/nattable/renderer/swt/SWTNatTable.java
similarity index 85%
rename from org.eclipse.nebula.widgets.nattable.renderer.swt/src/org/eclipse/nebula/widgets/nattable/renderer/swt/NatTable.java
rename to org.eclipse.nebula.widgets.nattable.renderer.swt/src/org/eclipse/nebula/widgets/nattable/renderer/swt/SWTNatTable.java
index 2f5a97f..8b90a9e 100644
--- a/org.eclipse.nebula.widgets.nattable.renderer.swt/src/org/eclipse/nebula/widgets/nattable/renderer/swt/NatTable.java
+++ b/org.eclipse.nebula.widgets.nattable.renderer.swt/src/org/eclipse/nebula/widgets/nattable/renderer/swt/SWTNatTable.java
@@ -1,6 +1,6 @@
package org.eclipse.nebula.widgets.nattable.renderer.swt;
-import org.eclipse.nebula.widgets.nattable.core.MNatTable;
+import org.eclipse.nebula.widgets.nattable.core.NatTable;
import org.eclipse.nebula.widgets.nattable.core.NatTableConfiguration;
import org.eclipse.nebula.widgets.nattable.core.layer.ILayerListener;
import org.eclipse.nebula.widgets.nattable.core.layer.event.ILayerEvent;
@@ -20,12 +20,12 @@
* @author Dirk Fauth
*
*/
-public class NatTable extends Canvas implements PaintListener, ILayerListener {
+public class SWTNatTable extends Canvas implements PaintListener, ILayerListener {
/**
* The presentation model that contains the logic.
*/
- private MNatTable model;
+ private NatTable model;
/**
* The default style options for rendering the SWT NatTable composite.
@@ -43,7 +43,7 @@
* @param parent A composite control which will be the parent of the new instance (cannot be null).
* @param configuration The configuration that will be used to build up the new NatTable instance.
*/
- public NatTable(Composite parent, NatTableConfiguration configuration) {
+ public SWTNatTable(Composite parent, NatTableConfiguration configuration) {
this(parent, configuration, DEFAULT_STYLE_OPTIONS);
}
@@ -53,7 +53,7 @@
* @param parent A composite control which will be the parent of the new instance (cannot be null).
* @param mNatTable The NatTable model instance to build this presentation for.
*/
- public NatTable(Composite parent, MNatTable mNatTable) {
+ public SWTNatTable(Composite parent, NatTable mNatTable) {
this(parent, mNatTable, DEFAULT_STYLE_OPTIONS);
}
@@ -64,8 +64,8 @@
* @param configuration The configuration that will be used to build up the NatTable instance.
* @param style The style of control to construct.
*/
- public NatTable(Composite parent, NatTableConfiguration configuration, int style) {
- this(parent, new MNatTable(configuration), style);
+ public SWTNatTable(Composite parent, NatTableConfiguration configuration, int style) {
+ this(parent, new NatTable(configuration), style);
}
/**
@@ -75,7 +75,7 @@
* @param mNatTable The NatTable model instance to build this presentation for.
* @param style The style of control to construct.
*/
- public NatTable(Composite parent, MNatTable mNatTable, int style) {
+ public SWTNatTable(Composite parent, NatTable mNatTable, int style) {
super(parent, style);
//create a new model based on the given configuration
@@ -88,12 +88,12 @@
}
/**
- * Sets the {@link MNatTable} presentation model instance to this SWT NatTable renderer.
+ * Sets the {@link SWTNatTable} presentation model instance to this SWT NatTable renderer.
* This way it is possible to change the presentation model at runtime by keeping the
* renderer within the UI.
* @param model The presentation model to set.
*/
- public void setModel(MNatTable model) {
+ public void setModel(NatTable model) {
if (this.model != null) {
//if there is already a model set and we are setting an new model
//we have to remove ourself as a listener
@@ -159,9 +159,4 @@
scrollBar.setEnabled(false);
}
- @Override
- protected void checkSubclass() {
- //TODO this seems to be the same as in Composite, so why do we put it in here again?
- }
-
}
