/ - Diff - EDIT - EDIT Project Management

       <groupId>eu.etaxonomy</groupId>
       <artifactId>cdm-vaadin</artifactId>
       <packaging>war</packaging>
       <version>3.5.0-SNAPSHOT</version>
       <version>3.5.1-SNAPSHOT</version>
       <name>Vaadin Web Application</name>
       <properties>

     import com.vaadin.ui.Table;
     import com.vaadin.ui.Table.ColumnHeaderMode;
     import com.vaadin.ui.TextField;
     import com.vaadin.ui.Tree.ExpandEvent;
     import com.vaadin.ui.Tree.ExpandListener;
     import com.vaadin.ui.TreeTable;
     import com.vaadin.ui.VerticalLayout;
-...
         private static final Logger logger = Logger.getLogger(StatusComposite.class);
         private StatusComponentListener listener;
         private Object currentClickedTaxonItemId;
         private static final String SELECT_FILTER = "Select filter ...";
         private static final String SELECT_CLASSIFICATION = "Select classification ...";
         private static final String ADD_TAXON_SYNONYM = "Add ...";
-...
             buildMainLayout();
             setCompositionRoot(mainLayout);
             searchHorizontalLayout.addLayoutClickListener(new LayoutClickListener() {
                 @Override
                 public void layoutClick(LayoutClickEvent event) {
                     if (event.getChildComponent() == searchTextField && searchTextField.getValue().equals(FILTER_TAXA_INPUT)) {
                        searchTextField.setValue("");
+                    }
+                }
             });
             addUIListeners();
             initAddComboBox();
             initSearchTextField();
             initClearSearchButton();
-...
             clearSearchButton.setEnabled(enable);
+        }
         private void initTaxaTable(int classificationId) {
             taxaTreeTable.setSelectable(true);
-...
                 columnIds.add(LeafNodeTaxonContainer.PB_ID);
                 taxaTreeTable.setColumnWidth(LeafNodeTaxonContainer.PB_ID, 25);
                 ValueChangeListener pbListener = new ValueChangeListener() {
                     @Override
                     public void valueChange(ValueChangeEvent event) {
                         boolean value = (Boolean) event.getProperty().getValue();
                         Notification.show("Changing Published Flag", "Implement me", Type.WARNING_MESSAGE);
+                    }
                 };
                 taxaTreeTable.addGeneratedColumn(LeafNodeTaxonContainer.PB_ID, new BooleanCheckBoxGenerator(pbListener));
                 taxaTreeTable.addGeneratedColumn(LeafNodeTaxonContainer.PB_ID, new TaxonTableCheckBoxGenerator());
                 try {
                     taxaTreeTable.setContainerDataSource(listener.loadTaxa(classificationId), columnIds);
                 } catch (SQLException e) {
-...
                     e.printStackTrace();
+                }
                 taxaTreeTable.addExpandListener(new ExpandListener() {
                     @Override
                     public void nodeExpand(ExpandEvent event) {
                         //listener.addChildren(event.getItemId());
+                    }
                 });
                 taxaTreeTable.setCellStyleGenerator(new Table.CellStyleGenerator() {
-...
                     public String getStyle(Table source, Object itemId, Object propertyId) {
                         Property hasSynProperty = source.getItem(itemId).getItemProperty(LeafNodeTaxonContainer.HAS_SYN_ID);
                         if(hasSynProperty == null) {
                             // this is a synonym
                             // this is a synonym, so we activate the corresponding css class
                             return "synonym";
+                        }
                         return null;
-...
+                    }
+                }
             };
             filterTable.addGeneratedColumn(PROPERTY_SELECTED_ID, new BooleanCheckBoxGenerator(selectedListener));
             filterTable.addGeneratedColumn(PROPERTY_SELECTED_ID, new CheckBoxGenerator(selectedListener));
+        }
-...
+        }
         private void initClearSearchButton() {
             //ThemeResource resource = new ThemeResource("icons/32/cancel.png");
             clearSearchButton.setIcon(FontAwesome.REFRESH);
             clearSearchButton.setCaption("");
+        }
         private void addUIListeners() {
             searchHorizontalLayout.addLayoutClickListener(new LayoutClickListener() {
                 @Override
                 public void layoutClick(LayoutClickEvent event) {
                     if (event.getChildComponent() == searchTextField && searchTextField.getValue().equals(FILTER_TAXA_INPUT)) {
                        searchTextField.setValue("");
+                    }
+                }
             });
             addClassificationComboBoxListener();
             addAddComboBoxListener();
             addSearchTextFieldListener();
-...
+        }
         class BooleanCheckBoxGenerator implements Table.ColumnGenerator {
         class TaxonTableCheckBoxGenerator implements Table.ColumnGenerator {
             /**
              * Generates the cell containing an open image when boolean is true
              */
             @Override
             public Component generateCell(Table source, final Object itemId, Object columnId) {
                 if(source.getItem(itemId) != null) {
                     Property prop = source.getItem(itemId).getItemProperty(columnId);
                     if(prop == null) {
                         return null;
+                    }
                     CheckBox cb = new CheckBox(null, prop);
                     ValueChangeListener pbListener = new ValueChangeListener() {
                         @Override
                         public void valueChange(ValueChangeEvent event) {
                             boolean value = (Boolean) event.getProperty().getValue();
                             listener.updatePublished(value, itemId);
+                        }
                     };
                     cb.addValueChangeListener(pbListener);
                     cb.setData(itemId);
                     return cb;
                 } else {
                     return null;
+                }
+            }
+        }
         class CheckBoxGenerator implements Table.ColumnGenerator {
             private final ValueChangeListener listener;
             private final ValueChangeListener vcListener;
             public BooleanCheckBoxGenerator(ValueChangeListener listener) {
                 this.listener = listener;
             public CheckBoxGenerator(ValueChangeListener vcListener) {
                 this.vcListener = vcListener;
+            }
             /**
              * Generates the cell containing an open image when boolean is true
              */
             @Override
             public Component generateCell(Table source, Object itemId, Object columnId) {
             public Component generateCell(Table source, final Object itemId, Object columnId) {
                 if(source.getItem(itemId) != null) {
                     Property prop = source.getItem(itemId).getItemProperty(columnId);
                     if(prop == null) {
                         return null;
+                    }
                     CheckBox cb = new CheckBox(null, prop);
                     cb.addValueChangeListener(listener);
                     cb.addValueChangeListener(vcListener);
                     cb.setData(itemId);
                     return cb;
                 } else {

         private static final Logger logger = Logger.getLogger(LeafNodeTaxonContainer.class);
         public static final String ID = "Id";
         public static final String UUID_ID = "Uuid";
         public static final String NAME_ID = "Name";
         public static final String ACCTAXON_ID = "AccTaxonId";
         public static final String PB_ID = "Pb";
-...
          * @throws SQLException
          */
         public LeafNodeTaxonContainer(int classificationId) throws SQLException {
             super(CdmQueryFactory.generateTaxonBaseQuery(ID, NAME_ID, PB_ID, UNP_ID, RANK_ID, HAS_SYN_ID));
             super(CdmQueryFactory.generateTaxonBaseQuery(ID, UUID_ID,NAME_ID, PB_ID, UNP_ID, RANK_ID, HAS_SYN_ID));
             this.synonymContainer = new CdmSQLContainer(CdmQueryFactory.generateSynonymofTaxonQuery(ID, NAME_ID));
             this.classificationId = classificationId;
             taxonSynonymMap = new HashMap<Object,List<Object>>();

     package eu.etaxonomy.cdm.vaadin.presenter;
     import java.sql.SQLException;
     import java.util.UUID;
     import com.vaadin.data.util.sqlcontainer.query.generator.filter.QueryBuilder;
     import eu.etaxonomy.cdm.api.service.ITaxonService;
     import eu.etaxonomy.cdm.model.common.CdmBase;
     import eu.etaxonomy.cdm.model.taxon.Taxon;
     import eu.etaxonomy.cdm.vaadin.container.CdmSQLContainer;
     import eu.etaxonomy.cdm.vaadin.container.LeafNodeTaxonContainer;
     import eu.etaxonomy.cdm.vaadin.util.CdmSQLStringDecorator;
     import eu.etaxonomy.cdm.vaadin.util.CdmSpringContextHelper;
     import eu.etaxonomy.cdm.vaadin.view.IStatusComposite;
     import eu.etaxonomy.cdm.vaadin.view.IStatusComposite.StatusComponentListener;
-...
         private LeafNodeTaxonContainer container;
         private ITaxonService taxonService;
         private int totalNoOfTaxa = 0;
-...
             // TODO: Need to evaluate the various sql dialects and make sure that these
             // queries are compatible with all
             QueryBuilder.setStringDecorator(new CdmSQLStringDecorator());
             initServices();
+        }
         private void initServices() {
             taxonService = CdmSpringContextHelper.getTaxonService();
+        }
         @Override
         public void removeFilters() {
-...
+        }
         @Override
         public void updatePublished(boolean pb, Object itemId) {
             UUID uuid = UUID.fromString((String)container.getItem(itemId).getItemProperty(LeafNodeTaxonContainer.UUID_ID).getValue());
             Taxon taxon = CdmBase.deproxy(taxonService.load(uuid), Taxon.class);
             boolean currentPb = taxon.isPublish();
             if(currentPb != pb) {
                 taxon.setPublish(pb);
                 taxonService.merge(taxon);
+            }
+        }
+    }

     public class CdmQueryFactory {
         public static QueryDelegate generateTaxonBaseQuery(String id,
                 String uuid_id,
                 String name_id,
                 String pb_id,
                 String unp_id,
-...
                     "INNER JOIN TaxonNameBase tnb on tb.name_id=tnb.id " +
                     "INNER JOIN DefinedTermBase dtb on tnb.rank_id=dtb.id  ";
             String SELECT_QUERY="SELECT tb.id as " + id +
                     ", tb.uuid as " + uuid_id +
                     ", tnb.titleCache as " + name_id +
                     ", tb.publish as " + pb_id +
                     ", tb.unplaced as " + unp_id +

     import com.vaadin.data.util.sqlcontainer.connection.JDBCConnectionPool;
     import com.vaadin.server.VaadinServlet;
     import eu.etaxonomy.cdm.api.service.ITaxonService;
     import eu.etaxonomy.cdm.vaadin.container.CdmSpringConnectionPool;
     public class CdmSpringContextHelper {
-...
             JDBCConnectionPool connectionPool = new CdmSpringConnectionPool(bean.getConnection());
             return connectionPool;
+        }
         public static ITaxonService getTaxonService() {
             return (ITaxonService)CdmSpringContextHelper.newInstance().getBean("taxonServiceImpl");
+        }
+    }

              * @param parentItemId
              */
             public void addChildren(Object parentItemId);
             /**
              * @param pb
              * @param itemId
              */
             public void updatePublished(boolean pb, Object itemId);
+        }
         public void setListener(StatusComponentListener listener);

     	display: inline-block;
     	width: 19px;
     	overflow: hidden;
+    }
     /**
      * Custom settings below
      */
     .mytheme .v-table-cell-content-removable {
         color: green;
         background-image: url("icons/32/cancel.png");
         background-repeat: no-repeat;
         background-position: 5px;
         text-indent: 20px;
+    }
     .mytheme .v-gridlayout-spacing-on {
       padding-left: 2px;
       padding-right: 2px;
       padding-top: 2px;
       padding-bottom: 2px;
+    }

Project

General

Profile

EDIT

Revision aceb7b1d

Added by Cherian Mathew about 9 years ago