#4 rename tableRows to dataVector

klst-de · Nov 15, 2019 · 66c4e84 · 66c4e84
1 parent d33d62c
commit 66c4e84
Showing 1 changed file with 32 additions and 31 deletions.
diff --git a/client/src/main/java/com/klst/gossip/GenericDataModel.java b/client/src/main/java/com/klst/gossip/GenericDataModel.java
@@ -19,12 +19,12 @@ public class GenericDataModel extends AbstractTableModel {
 
 	private static final Logger LOG = Logger.getLogger(GenericDataModel.class.getName());
 
-	// die Zeilen von TableModel
-	protected List<Object[]> tableRows = new Vector<Object[]>();
+	protected List<Object[]> dataVector = new Vector<Object[]>();
 //    protected Vector    dataVector; // so ist es in DefaultTableModel, <code>Vector</code> of <code>Vectors</code>
 
     private int windowNo;
-    private GridTab gridTab;
+    private GridTab gridTab;  // Tab Model - a combination of AD_Tab (the display attributes) and AD_Table information.
+
 	//private GridFieldBridge[] fields = null; // oder noch besser:
 	private GridFields fields;
 	private int rowsToLoad = -1; // der Loader liefert es
@@ -42,8 +42,8 @@ public String toString() {
 
 	// name wie in DefaultTableModel
 	Vector<Object[]> getDataVector() {
-        return (Vector<Object[]>)tableRows;
-    }
+		return (Vector<Object[]>) dataVector;
+	}
 
     /*
      * (non-Javadoc)
@@ -74,7 +74,8 @@ public Object getValueAt(int rowIndex, int columnIndex) {
 //        return rowVector.elementAt(column);
 
 		if(rowIndex >= getRowCount()) {
-			return new Object();
+			return null;
+//			return new Object();
 		}
 		if(columnIndex < getColumnCount()) {
 			return getRow(rowIndex)[columnIndex];
@@ -107,7 +108,7 @@ public boolean isCellEditable(int rowIndex, int columnIndex) {
 	// if data model is editable:
 	// TODO public void setValueAt(Object aValue, int rowIndex, int columnIndex);
 
-    public Object[] getRow(int rowIndex) {
+    Object[] getRow(int rowIndex) {
         return getDataVector().get(rowIndex);
     }
 
@@ -157,32 +158,32 @@ public void add(Object[] row) {
         fireTableRowsInserted(index, index);
     }
 
-    public String getName() {
-    	return this.gridTab.getName();
-    }
-    
-    public String getDbTableName() {
-    	return this.gridTab.get_TableName();
-    }
-    
+	public String getName() {
+		return this.gridTab.getName();
+	}
+
+	public String getDbTableName() {
+		return this.gridTab.get_TableName();
+	}
+
 	public int getWindowNo() {
 		return this.windowNo;
 	}
-	
-    public GridFields getColumns() { // ===> this.columnModel
-    	return this.fields;
-    }
-    
-    public int getRowsToLoad() {
-    	return this.rowsToLoad;
-    }
-    
-    public void setRowsToLoad(int rowsToLoad) {
-    	this.rowsToLoad = rowsToLoad;
-    }
-    
-    public void clear() {
-    	getDataVector().clear();
-    }
+
+	public GridFields getColumns() { // ===> this.columnModel
+		return this.fields;
+	}
+
+	public int getRowsToLoad() {
+		return this.rowsToLoad;
+	}
+
+	public void setRowsToLoad(int rowsToLoad) {
+		this.rowsToLoad = rowsToLoad;
+	}
+
+	public void clear() {
+		getDataVector().clear();
+	}
 
 }