/ - Diff - EDIT - EDIT Project Management

« Previous | Next »

Revision a453d164

Added by Cherian Mathew about 7 years ago

ID a453d164bb5b25fe3ef5bb6480890ca57ec305eb
Parent 871819aa
Child 90cf504a

StatusComposite : seperated init and refresh methods for the txa table, using seperate method to set visible comun ids
LeafNodeTaxonContainer : corrected isSynonym method

         private static final String IN_VIEW_PREFIX = "in view : ";
         private boolean isTaxaTableInitialised = false;
         private boolean isFiltertableInitialised = false;
         private String selectedTaxaTableMenuItem = null;
         ContextMenu taxaTableContextMenu;
         private List<String> columnIds;
         /**
          * The constructor should first build the main layout, set the
          * composition root and then do any custom initialization.
-...
             return null;
+        }
         private void initTaxaTable(int classificationId) {
         private void initTaxaTable() {
             taxaTreeTable.setMultiSelect(taxaTreeTableMultiSelectMode);
             taxaTreeTable.setImmediate(false);
             taxaTreeTable.setDragMode(TableDragMode.ROW);
             if(listener != null) {
                 List<String> columnIds = new ArrayList<String>();
                 columnIds.add(LeafNodeTaxonContainer.NAME_ID);
                 taxaTreeTable.setColumnExpandRatio(LeafNodeTaxonContainer.NAME_ID, 1);
                 columnIds.add(LeafNodeTaxonContainer.PB_ID);
                 taxaTreeTable.setColumnWidth(LeafNodeTaxonContainer.PB_ID, 25);
                 if(!isTaxaTableInitialised) {
                     taxaTreeTable.addGeneratedColumn(LeafNodeTaxonContainer.PB_ID, new TaxonTableCheckBoxGenerator());
+                }
             columnIds = new ArrayList<String>();
             columnIds.add(LeafNodeTaxonContainer.NAME_ID);
             taxaTreeTable.setColumnExpandRatio(LeafNodeTaxonContainer.NAME_ID, 1);
             columnIds.add(LeafNodeTaxonContainer.PB_ID);
             taxaTreeTable.setColumnWidth(LeafNodeTaxonContainer.PB_ID, 25);
                 try {
                     taxaTreeTable.setContainerDataSource(listener.loadTaxa(classificationId), columnIds);
                 } catch (SQLException e) {
                     //TODO : throw up warning dialog
                     e.printStackTrace();
+                }
             taxaTreeTable.addGeneratedColumn(LeafNodeTaxonContainer.PB_ID, new TaxonTableCheckBoxGenerator());
                 taxaTreeTable.setCellStyleGenerator(new Table.CellStyleGenerator() {
                     @Override
                     public String getStyle(Table source, Object itemId, Object propertyId) {
                         if(source.getItem(itemId) == null) {
                             return null;
+                        }
                         if(listener.isSynonym(itemId)) {
                             // this is a synonym, so we activate the corresponding css class
                             return "synonym";
                         } else {
                             return "taxon";
+                        }
             taxaTreeTable.setCellStyleGenerator(new Table.CellStyleGenerator() {
                 @Override
                 public String getStyle(Table source, Object itemId, Object propertyId) {
                     if(source.getItem(itemId) == null) {
                         return null;
+                    }
                     if(listener.isSynonym(itemId)) {
                         // this is a synonym, so we activate the corresponding css class
                         return "synonym";
                     } else {
                         return "taxon";
+                    }
                 });
                 taxaTreeTable.setSortContainerPropertyId(LeafNodeTaxonContainer.NAME_ID);
                 // NOTE : Not really sure why we need to refresh the container here.
                 // in the case of 'Table' this is not required
                 listener.refresh();
                 updateInViewLabel();
                 isTaxaTableInitialised = true;
+            }
+                }
             });
             taxaTableContextMenu = new ContextMenu();
             taxaTableContextMenu.setAsContextMenuOf(taxaTreeTable);
             addTaxaTreeContextMenuItemListener();
             isTaxaTableInitialised = true;
+        }
         private void refreshTaxaTable(int classificationId) {
             if(!isTaxaTableInitialised) {
                 initTaxaTable();
+            }
             try {
                 // Cannot use the setContainerDataSource method which has the column ids as
                 // second argument, since this method is taken from the Table class and
                 // hence the container strategy is not set to null, implying that the old
                 // preorder list is not cleaned up - potential bug in the tree table api ?
                 taxaTreeTable.setContainerDataSource(listener.loadTaxa(classificationId));
                 taxaTreeTable.setVisibleColumns(LeafNodeTaxonContainer.NAME_ID, LeafNodeTaxonContainer.PB_ID);
             } catch (SQLException e) {
                 //TODO : throw up warning dialog
                 e.printStackTrace();
+            }
             // We need to set the sort property id to null and then
             // reset it to the name column else the sort is not performed
             // since the sort property id has not changed - potential bug
             // in the tree table api ?
             taxaTreeTable.setSortContainerPropertyId(null);
             taxaTreeTable.setSortContainerPropertyId(LeafNodeTaxonContainer.NAME_ID);
             updateInViewLabel();
+        }
-...
+            }
+        }
         private void initFilterTable() {
             filterTable.setNullSelectionAllowed(false);
             final IndexedContainer container = new IndexedContainer();
-...
                     if (classificationComboBox.getValue() != null) {
                         Object selected = classificationComboBox.getValue();
                         int classificationId = (Integer)((RowId)selected).getId()[0];
                         initTaxaTable(classificationId);
                         refreshTaxaTable(classificationId);
                         initFilterTable();
                         setEnabledAll(true);
+                    }

             taxonSynonymMap = new HashMap<Object,List<Object>>();
             initFilters();
             addContainerFilter(classificationFilter);
             enableCacheFlushNotifications();
             //addContainerFilter(rankFilter);
+        }
-...
          */
         @Override
         public boolean areChildrenAllowed(Object itemId) {
             Property hasSynProperty = getItem(itemId).getItemProperty(HAS_SYN_ID);
             if(hasSynProperty == null) {
                 return false;
+            }
             return (Long)hasSynProperty.getValue() > 0;
            return (Long)hasSynProperty.getValue() > 0;
+        }
         /* (non-Javadoc)
-...
+        }
         public boolean isSynonym(Object itemId) {
             return synonymContainer.containsId(itemId);
             Property hasSynProperty = getItem(itemId).getItemProperty(HAS_SYN_ID);
             return hasSynProperty == null;
+        }
         public void removeTaxonFromCache(Object itemId) {

Also available in: Unified diff

Project

General

Profile

EDIT

Revision a453d164

Added by Cherian Mathew about 7 years ago