/ - Diff - EDIT - EDIT Project Management

« Previous | Next »

Revision 98b72f8e

Added by Cherian Mathew over 8 years ago

ID 98b72f8ed96eb1b023f10c56ebe6ed6d62cc69c9
Parent 85515c31
Child aee16929

ConceptRelationshipComposite : added methods to update controls
EditConceptRelationshipComposite : added bi-directional capability

     import eu.etaxonomy.cdm.vaadin.jscomponent.D3ConceptRelationshipTree;
     import eu.etaxonomy.cdm.vaadin.jscomponent.D3ConceptRelationshipTree.Direction;
     import eu.etaxonomy.cdm.vaadin.presenter.ConceptRelationshipPresenter;
     import eu.etaxonomy.cdm.vaadin.session.BasicEvent;
     import eu.etaxonomy.cdm.vaadin.session.CdmChangeEvent;
     import eu.etaxonomy.cdm.vaadin.session.CdmChangeEvent.Action;
     import eu.etaxonomy.cdm.vaadin.session.IBasicEventListener;
     import eu.etaxonomy.cdm.vaadin.session.ICdmChangeListener;
     import eu.etaxonomy.cdm.vaadin.session.ISelectionListener;
     import eu.etaxonomy.cdm.vaadin.session.SelectionEvent;
-...
      * @date 9 Apr 2015
+     *
      */
     public class ConceptRelationshipComposite extends CustomComponent implements ISelectionListener, ICdmChangeListener {
     public class ConceptRelationshipComposite extends CustomComponent implements ISelectionListener, ICdmChangeListener, IBasicEventListener {
         /*- VaadinEditorProperties={"grid":"RegularGrid,20","showGrid":true,"snapToGrid":true,"snapToObject":true,"movingGuides":false,"snappingDistance":10} */
-...
             CdmVaadinSessionUtilities.getCurrentSelectionService().register(this);
             CdmVaadinSessionUtilities.getCurrentCdmDataChangeService().register(this);
             CdmVaadinSessionUtilities.getCurrentBasicEventService().register(this);
             listener = new ConceptRelationshipPresenter(d3ConceptRelationShipTree);
             addUIListeners();
-...
+        }
         private void init() {
             editButton.setEnabled(false);
             deleteButton.setEnabled(false);
             enableControls(false);
             initD3ConceptRelationShipTree();
+        }
-...
         public void setSelectedTaxonRelUuid(UUID selectedTaxonRelUuid) {
             this.selectedTaxonRelUuid = selectedTaxonRelUuid;
             if(selectedTaxonRelUuid == null) {
                 editButton.setEnabled(false);
                 deleteButton.setEnabled(false);
             } else {
             updateControls();
+        }
         private void enableControls(boolean enabled) {
             newButton.setEnabled(enabled);
             editButton.setEnabled(enabled);
             deleteButton.setEnabled(enabled);
+        }
         private void updateControls() {
             enableControls(false);
             if(fromTaxonIun != null) {
                 newButton.setEnabled(true);
+            }
             if(selectedTaxonRelUuid != null) {
                 editButton.setEnabled(true);
                 deleteButton.setEnabled(true);
+            }
-...
                 fromTaxonIun = (IdUuidName)event.getSelectedObjects().get(0);
                 view.setPrimaryStatusCompositeUuid((UUID)event.getSelectedObjects().get(1));
                 refreshRelationshipView(view.getDirection());
                 updateControls();
+            }
+        }
-...
                 setSelectedTaxonRelUuid(null);
                 refreshRelationshipView(view.getDirection());
+            }
+        }
-...
+            }
+        }
         /* (non-Javadoc)
          * @see eu.etaxonomy.cdm.vaadin.session.IBasicEventListener#onAction(eu.etaxonomy.cdm.vaadin.session.BasicEvent)
          */
         @Override
         public void onAction(BasicEvent event) {
             if(ConceptRelationshipComposite.UPDATE_START_ID.equals(event.getEventId())) {
                 enableControls(false);
+            }
             if(ConceptRelationshipComposite.UPDATE_END_ID.equals(event.getEventId())) {
                 updateControls();
+            }
+        }
         @AutoGenerated
         private VerticalLayout buildMainLayout() {
             // common part: create layout
-...
+        }
+    }

     import com.vaadin.ui.Button.ClickEvent;
     import com.vaadin.ui.Button.ClickListener;
     import com.vaadin.ui.ComboBox;
     import com.vaadin.ui.Component;
     import com.vaadin.ui.CustomComponent;
     import com.vaadin.ui.DragAndDropWrapper;
     import com.vaadin.ui.HorizontalLayout;
-...
     import eu.etaxonomy.cdm.vaadin.util.CdmVaadinOperation;
     import eu.etaxonomy.cdm.vaadin.util.CdmVaadinSessionUtilities;
     import eu.etaxonomy.cdm.vaadin.util.CdmVaadinUtilities;
+    ;
     /**
      * @author cmathew
-...
         private Label typeLabel;
         @AutoGenerated
         private Label leftLabel;
         @AutoGenerated
         private VerticalLayout fromTaxonVLayout;
         @AutoGenerated
         private Label fromTaxonValue;
         @AutoGenerated
         private Label fromTaxonLabel;
         private VerticalLayout toTaxonVLayout;
         private Label toTaxonLabeL;
         private TextField toTaxonTextField;
         private DragAndDropWrapper toTaxonLayoutWrapper;
         private TextField leftTaxonTextField, rightTaxonTextField;
         private Component leftTaxonComponent, rightTaxonComponent;
         private TextField fromTaxonTextField, toTaxonTextField;
         private Label leftTaxonLabel, rightTaxonLabel;
         private final EditConceptRelationshipPresenter presenter;
-...
                 IdUuidName toTaxonIdUuidName,
                 Action action,
                 Direction direction) {
             this();
             this.direction = direction;
             this(direction);
             init(fromTaxonIdUuidName, taxonRTypeIdUuidName, toTaxonIdUuidName, action);
+        }
-...
                 UUID relUuid,
                 Action action,
                 Direction direction) {
             this();
             this(direction);
             this.relUuid = relUuid;
             this.direction = direction;
             Map<String, IdUuidName> map = presenter.getRelTypeToTaxonIunMap(fromTaxonIun.getUuid(), relUuid);
             taxonRTypeIun = map.get(EditConceptRelationshipPresenter.REL_TYPE_KEY);
             toTaxonIun = map.get(EditConceptRelationshipPresenter.TO_TAXON_KEY);
             init(fromTaxonIun, taxonRTypeIun, toTaxonIun, action);
+        }
         /**
          * The constructor should first build the main layout, set the
          * composition root and then do any custom initialization.
-...
          * The constructor will not be automatically regenerated by the
          * visual editor.
          */
         public EditConceptRelationshipComposite() {
         private EditConceptRelationshipComposite(Direction direction) {
             this.direction = direction;
             buildMainLayout();
             buildToTaxon();
             initDirectionComponents();
             setCompositionRoot(mainLayout);
             direction = Direction.LEFT_RIGHT;
             this.presenter = new EditConceptRelationshipPresenter();
             addUIListeners();
+        }
         public void init(IdUuidName fromTaxonIdUuidName,
                 IdUuidName taxonRTypeIdUuidName,
                 IdUuidName toTaxonIdUuidName,
-...
             this.toTaxonIun = toTaxonIdUuidName;
             this.action = action;
             initFromTaxonLabel();
             initFromTaxon();
             initConceptRComboBox();
             initToTaxon();
             initDirectionLabels();
+        }
         public void setWindow(Window window) {
             this.window = window;
+        }
         private void initFromTaxonLabel() {
             fromTaxonValue.setValue(fromTaxonIun.getName());
         private void initFromTaxon() {
             if(fromTaxonIun != null) {
                 fromTaxonTextField.setReadOnly(false);
                 fromTaxonTextField.setValue(fromTaxonIun.getName());
                 fromTaxonTextField.setReadOnly(true);
+            }
             if(toTaxonIun != null) {
                 toTaxonTextField.setReadOnly(false);
                 toTaxonTextField.setValue(toTaxonIun.getName());
                 toTaxonTextField.setReadOnly(true);
+            }
+        }
         private void initDirectionLabels() {
         private void initDirectionComponents() {
             initTaxonComponents();
             leftLabel.addStyleName("cr-arrow");
             leftLabel.setContentMode(ContentMode.HTML);
-...
             rightLabel.addStyleName("cr-arrow");
             rightLabel.setContentMode(ContentMode.HTML);
             rightTaxonTextField.setReadOnly(false);
             leftTaxonTextField.setReadOnly(false);
             switch(direction) {
             case LEFT_RIGHT:
                 leftLabel.setValue(FontAwesome.LONG_ARROW_RIGHT.getHtml());
                 rightLabel.setValue(FontAwesome.LONG_ARROW_RIGHT.getHtml());
                 leftLabel.setValue(FontAwesome.CARET_RIGHT.getHtml());
                 rightLabel.setValue(FontAwesome.CARET_RIGHT.getHtml());
                 leftTaxonLabel.setValue("From Taxon");
                 rightTaxonLabel.setValue("To Taxon");
                 fromTaxonTextField = leftTaxonTextField;
                 toTaxonTextField = rightTaxonTextField;
                 rightTaxonTextField.setValue(DRAG_TAXON_HINT);
                 rightTaxonComponent = intiDragDropWrapper(rightTaxonComponent, rightTaxonTextField);
                 break;
             case RIGHT_LEFT:
                 leftLabel.setValue(FontAwesome.LONG_ARROW_LEFT.getHtml());
                 rightLabel.setValue(FontAwesome.LONG_ARROW_LEFT.getHtml());
                 leftLabel.setValue(FontAwesome.CARET_LEFT.getHtml());
                 rightLabel.setValue(FontAwesome.CARET_LEFT.getHtml());
                 leftTaxonLabel.setValue("To Taxon");
                 rightTaxonLabel.setValue("From Taxon");
                 leftTaxonTextField.setValue(DRAG_TAXON_HINT);
                 fromTaxonTextField = rightTaxonTextField;
                 toTaxonTextField = leftTaxonTextField;
                 leftTaxonComponent = intiDragDropWrapper(leftTaxonComponent, leftTaxonTextField);
                 break;
+            }
             rightTaxonTextField.setReadOnly(true);
             leftTaxonTextField.setReadOnly(true);
             horizontalLayout.addComponent(leftTaxonComponent,0);
             horizontalLayout.setComponentAlignment(leftTaxonComponent, new Alignment(48));
             horizontalLayout.addComponent(rightTaxonComponent);
             horizontalLayout.setComponentAlignment(rightTaxonComponent, new Alignment(48));
             leftLabel.setSizeUndefined();
             rightLabel.setSizeUndefined();
+        }
         private void initConceptRComboBox() {
-...
+            }
+        }
         private void buildToTaxon() {
             toTaxonVLayout = buildToTaxonVLayout();
             toTaxonLayoutWrapper = new DragAndDropWrapper(toTaxonVLayout);
         private void initTaxonComponents() {
             // init left taxon layout
             leftTaxonLabel = new Label();
             leftTaxonTextField = new TextField();
             leftTaxonComponent = buildTaxonVLayout(leftTaxonLabel, leftTaxonTextField);
             // init right taxon layout
             rightTaxonLabel = new Label();
             rightTaxonTextField = new TextField();
             rightTaxonComponent = buildTaxonVLayout(rightTaxonLabel, rightTaxonTextField);
+        }
         private DragAndDropWrapper intiDragDropWrapper(Component toTaxonLayout, final TextField toTaxonTextField) {
             DragAndDropWrapper toTaxonLayoutWrapper = new DragAndDropWrapper(toTaxonLayout);
             toTaxonLayoutWrapper.setImmediate(false);
             toTaxonLayoutWrapper.setWidth("-1px");
             toTaxonLayoutWrapper.setHeight("-1px");
             toTaxonTextField.setReadOnly(true);
             toTaxonLayoutWrapper.setDropHandler(new DropHandler() {
-...
+                    }
+                }
             });
             horizontalLayout.addComponent(toTaxonLayoutWrapper);
             horizontalLayout.setComponentAlignment(toTaxonLayoutWrapper, new Alignment(48));
             return toTaxonLayoutWrapper;
+        }
         private void initToTaxon() {
             toTaxonTextField.setReadOnly(false);
             if(toTaxonIun == null) {
                 toTaxonTextField.setValue(DRAG_TAXON_HINT);
             } else {
                 toTaxonTextField.setValue(toTaxonIun.getName());
+            }
             toTaxonTextField.setReadOnly(true);
+        }
         private void addUIListeners() {
             addSaveButtonListener();
-...
                     try {
                         conceptRComboBox.validate();
                         toTaxonTextField.validate();
                         rightTaxonTextField.validate();
                         if(toTaxonIun == null) {
                             // FIXME: Not efficient - figure out a way
                             // of validation including the null check
-...
             showInDialog(windowTitle, ecrc);
+        }
         private VerticalLayout buildToTaxonVLayout() {
         private VerticalLayout buildTaxonVLayout(Label taxonDirLabel, TextField taxonTextField) {
             // common part: create layout
             toTaxonVLayout = new VerticalLayout();
             toTaxonVLayout.setImmediate(false);
             toTaxonVLayout.setWidth("-1px");
             toTaxonVLayout.setHeight("-1px");
             toTaxonVLayout.setMargin(false);
             toTaxonVLayout.setSpacing(true);
             // toTaxonLabeL
             toTaxonLabeL = new Label();
             toTaxonLabeL.setImmediate(false);
             toTaxonLabeL.setWidth("-1px");
             toTaxonLabeL.setHeight("-1px");
             toTaxonLabeL.setValue("To Taxon");
             toTaxonVLayout.addComponent(toTaxonLabeL);
             toTaxonVLayout.setComponentAlignment(toTaxonLabeL, new Alignment(48));
             // toTaxonTextField
             toTaxonTextField = new TextField();
             toTaxonTextField.setImmediate(false);
             toTaxonTextField.setWidth("-1px");
             toTaxonTextField.setHeight("-1px");
             toTaxonTextField.setInvalidAllowed(false);
             toTaxonTextField.setRequired(true);
             toTaxonTextField.setInputPrompt("Drag Taxon here ...");
             toTaxonVLayout.addComponent(toTaxonTextField);
             toTaxonVLayout.setComponentAlignment(toTaxonTextField, new Alignment(48));
             return toTaxonVLayout;
             VerticalLayout vLayout = new VerticalLayout();
             vLayout.setImmediate(false);
             vLayout.setWidth("-1px");
             vLayout.setHeight("-1px");
             vLayout.setMargin(false);
             vLayout.setSpacing(true);
             taxonDirLabel.setImmediate(false);
             taxonDirLabel.setWidth("-1px");
             taxonDirLabel.setHeight("-1px");
             vLayout.addComponent(taxonDirLabel);
             vLayout.setComponentAlignment(taxonDirLabel, new Alignment(48));
             taxonTextField.setImmediate(false);
             taxonTextField.setWidth("-1px");
             taxonTextField.setHeight("-1px");
             taxonTextField.setInvalidAllowed(false);
             taxonTextField.setRequired(true);
             taxonTextField.setReadOnly(true);
             vLayout.addComponent(taxonTextField);
             vLayout.setComponentAlignment(taxonTextField, new Alignment(48));
             return vLayout;
+        }
         @AutoGenerated
-...
             // common part: create layout
             mainLayout = new VerticalLayout();
             mainLayout.setImmediate(false);
             mainLayout.setWidth("700px");
             mainLayout.setWidth("740px");
             mainLayout.setHeight("170px");
             mainLayout.setMargin(false);
             mainLayout.setSpacing(true);
             // top-level component properties
             setWidth("700px");
             setWidth("740px");
             setHeight("170px");
             // horizontalLayout
-...
             horizontalLayout.setMargin(true);
             horizontalLayout.setSpacing(true);
             // fromTaxonVLayout
             fromTaxonVLayout = buildFromTaxonVLayout();
             horizontalLayout.addComponent(fromTaxonVLayout);
             horizontalLayout.setComponentAlignment(fromTaxonVLayout, new Alignment(48));
             // leftLabel
             leftLabel = new Label();
             leftLabel.setImmediate(false);
             leftLabel.setWidth("-1px");
             leftLabel.setHeight("-1px");
             leftLabel.setHeight("30px");
             leftLabel.setValue("Label");
             horizontalLayout.addComponent(leftLabel);
             horizontalLayout.setComponentAlignment(leftLabel, new Alignment(24));
-...
             // typeVLayout
             typeVLayout = buildTypeVLayout();
             horizontalLayout.addComponent(typeVLayout);
             horizontalLayout.setExpandRatio(typeVLayout, 1.0f);
             horizontalLayout.setComponentAlignment(typeVLayout, new Alignment(48));
             // rightLabel
             rightLabel = new Label();
             rightLabel.setImmediate(false);
             rightLabel.setWidth("-1px");
             rightLabel.setHeight("-1px");
             rightLabel.setHeight("30px");
             rightLabel.setValue("Label");
             horizontalLayout.addComponent(rightLabel);
             horizontalLayout.setComponentAlignment(rightLabel, new Alignment(24));
-...
             return horizontalLayout;
+        }
         @AutoGenerated
         private VerticalLayout buildFromTaxonVLayout() {
             // common part: create layout
             fromTaxonVLayout = new VerticalLayout();
             fromTaxonVLayout.setImmediate(false);
             fromTaxonVLayout.setWidth("-1px");
             fromTaxonVLayout.setHeight("-1px");
             fromTaxonVLayout.setMargin(false);
             fromTaxonVLayout.setSpacing(true);
             // fromTaxonLabel
             fromTaxonLabel = new Label();
             fromTaxonLabel.setImmediate(false);
             fromTaxonLabel.setWidth("-1px");
             fromTaxonLabel.setHeight("-1px");
             fromTaxonLabel.setValue("From Taxon");
             fromTaxonVLayout.addComponent(fromTaxonLabel);
             fromTaxonVLayout.setComponentAlignment(fromTaxonLabel, new Alignment(48));
             // fromTaxonValue
             fromTaxonValue = new Label();
             fromTaxonValue.setImmediate(false);
             fromTaxonValue.setWidth("-1px");
             fromTaxonValue.setHeight("-1px");
             fromTaxonValue.setValue("Taxon Name");
             fromTaxonVLayout.addComponent(fromTaxonValue);
             fromTaxonVLayout.setComponentAlignment(fromTaxonValue, new Alignment(48));
             return fromTaxonVLayout;
+        }
         @AutoGenerated
         private VerticalLayout buildTypeVLayout() {
             // common part: create layout
-...
             // conceptRComboBox
             conceptRComboBox = new ComboBox();
             conceptRComboBox.setImmediate(false);
             conceptRComboBox.setWidth("-1px");
             conceptRComboBox.setWidth("260px");
             conceptRComboBox.setHeight("-1px");
             conceptRComboBox.setRequired(true);
             typeVLayout.addComponent(conceptRComboBox);
             typeVLayout.setExpandRatio(conceptRComboBox, 1.0f);
             typeVLayout.setComponentAlignment(conceptRComboBox, new Alignment(48));
             return typeVLayout;

Also available in: Unified diff

Project

General

Profile

EDIT

Revision 98b72f8e

Added by Cherian Mathew over 8 years ago