Changeset 3453

Timestamp:

09/02/10 10:36:03 (17 months ago)

Author:

jlops

Message:

small changes to interface of Matrix

Location:

molgenis_distro/3.5/handwritten/java/Matrix

Files:

• DBMatrix.java (modified) (4 diffs)
• EAVMatrix.java (added)
• MatrixBean.java (modified) (1 diff)
• PagableDataModel.java (modified) (3 diffs)
• PagableMatrix.java (added)

molgenis_distro/3.5/handwritten/java/Matrix/DBMatrix.java

@@ -23 +23 @@
 import app.JpaDatabase;
 
-public class DBMatrix<T> implements IMatrix1<T, Column, Integer> {
+public class DBMatrix<T> implements PagableMatrix<T, Column, Integer> {
         private T[][] data;
         private static JpaDatabase db;
@@ -50 +50 @@
         }
         
-        
+        @Override
         public List<String> getColumnGroups() {
                 String ql = "SELECT DISTINCT SUBSTRING(oFeature.name, 1, LOCATE('.',oFeature.name) - 1) " +
@@ -57 +57 @@
         }
         
+        @Override
         public List<String> getColumnsGroup(String columnGroupName) {
                 String ql = "SELECT DISTINCT SUBSTRING(oFeature.name, LOCATE('.',oFeature.name) + 1) " +
@@ -82 +83 @@
         private boolean observationsLoaded = false;
         
+        @Override
         public void loadData(int numberOfRows, int offset) throws NumberFormatException, DatabaseException, SQLException, ParseException
         {

molgenis_distro/3.5/handwritten/java/Matrix/MatrixBean.java

@@ -42 +42 @@
         
         private void loadObservableFeatureGroups() {
-                featureGroups = ((DBMatrix)super.getMatrix()).getColumnGroups();
+                featureGroups = super.getMatrix().getColumnGroups();
         }
         
         private void loadObservableFeatureNamesByGroup(String featureGroupName) {
-                features = ((DBMatrix)super.getMatrix()).getColumnsGroup(featureGroupName);
+                features = super.getMatrix().getColumnsGroup(featureGroupName);
         }
         

molgenis_distro/3.5/handwritten/java/Matrix/PagableDataModel.java

@@ -27 +27 @@
     private boolean refresh = false; //refresh database if column or filter changes
 
-        private IMatrix1<T, Column, Integer> matrix;
+        private PagableMatrix<T, Column, Integer> matrix;
         
-        public PagableDataModel(IMatrix1<T, Column, Integer> matrix) {
+        public PagableDataModel(PagableMatrix<T, Column, Integer> matrix) {
                 this.matrix = matrix;
         }
@@ -55 +55 @@
 
             try {
-                ((DBMatrix)matrix).loadData(numberOfRows, firstRow);
+                matrix.loadData(numberOfRows, firstRow);
                 
                 Collection<Column> columns = matrix.getColumns();
@@ -177 +177 @@
         }
         
-        public IMatrix1<T, Column, Integer> getMatrix() {
+        public PagableMatrix<T, Column, Integer> getMatrix() {
                 return matrix;
         }