/ - Diff - EDIT - EDIT Project Management

     import org.eclipse.swt.layout.GridLayout;
     import org.eclipse.swt.widgets.Button;
     import org.eclipse.swt.widgets.Composite;
     import org.eclipse.swt.widgets.Dialog;
     import org.eclipse.swt.widgets.Label;
     import org.eclipse.swt.widgets.Text;
     import eu.etaxonomy.cdm.model.name.TaxonNameBase;
     import eu.etaxonomy.taxeditor.dialogs.FilteredNameSelectionDialog;
     import eu.etaxonomy.taxeditor.model.NomenclaturalCodeHelper;
     import eu.etaxonomy.taxeditor.model.Resources;
     import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
     /**
-...
     		Label lblName = new Label(this, SWT.NONE);
     		lblName.setLayoutData(new GridData());
     		lblName.setText("Choose a name either by searching or by entering it as free text:");
     		lblName.setText("Choose a name:");
     		// Create 3-columned composite for name input
     		Composite nameComposite = new Composite(this, SWT.NONE);
-...
     		// Create name input
     		txtName = new Text(nameComposite, SWT.BORDER);
     		txtName.setEnabled(false);
     		txtName.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
     		txtName.addModifyListener(new ModifyListener() {
     			public void modifyText(ModifyEvent e) {
-...
     				clearName();
+    			}
     		});
     		// Create message re: editing names
     		Label lblNewNameFeedback = new Label(this, SWT.NONE);
     		lblNewNameFeedback.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, true, false));
     		lblNewNameFeedback.setFont(
     				Resources.italicizeFont(lblNewNameFeedback.getFont()));
     		lblNewNameFeedback.setText("Existing names can not be edited.");
+    	}
     	/**
-...
     	/**
+    	 *
     	 */
     	protected void popupSearch() {
     //		Dialog dialog = new NameSearchDialog(getShell());
     //        Object value = ((NameSearchDialog) dialog).open();
     //
     //		if (value instanceof TaxonNameBase) {
     //			setSavedName((TaxonNameBase<?, ?>) value);
     //		}
     		TaxonNameBase name = FilteredNameSelectionDialog.selectName(getShell());
     	protected void popupSearch() {
     		TaxonNameBase name = FilteredNameSelectionDialog.selectName(getShell(), savedName);
     		if(name != null){
     			setSavedName(name);
+    		}
-...
     	 * @return
     	 */
     	public TaxonNameBase<?, ?> getName() {
     		TaxonNameBase<?, ?> name = null;
     	    if (savedName != null) {
     	    	name = savedName;
     		} else {
     			if (!txtName.getText().equals("")) {
     				name = PreferencesUtil.getPreferredNomenclaturalCode().getNewTaxonNameInstance(null);
     				name.setTitleCache(txtName.getText());
+    			}
+    		}
     		return name;
     		return savedName;
+    	}
+    }

     		if (homotypicGroupOfAcceptedTaxon != null) {
     			List<Synonym> homotypicSynonyms = homotypicGroupOfAcceptedTaxon.getSynonymsInGroup(taxon.getSec());
     			for (Synonym synonym : homotypicSynonyms) {
     				// Make sure synonym belongs to the taxon
     				// TODO why? doesn't taxon.getHomotypicGroup.getSynonymsInGroup return synonyms of the taxon only? I would think so!
     				if (synonym.getAcceptedTaxa().contains(taxon)) {
     					createSynonym(synonym);
+    				}
     				createSynonym(synonym);
+    			}
+    		}
     		// Draw heterotypic synonym groups
     		List<HomotypicalGroup> heterotypicSynonymGroups = taxon.getHeterotypicSynonymyGroups();
     		for (HomotypicalGroup homotypicalGroup : heterotypicSynonymGroups) {
     			// Make sure this is not the taxon's homotypic group
     			// TODO why? doesn't taxon.getHeterotypicSynonymyGroups return only the heterotypic synonymy groups of the taxon and not the homotypic group? I would think so!
     			if (!homotypicalGroup.equals(homotypicGroupOfAcceptedTaxon)) {
     				List<Synonym> heterotypicSynonyms = homotypicalGroup.
     						getSynonymsInGroup(taxon.getSec());
     				for (Synonym synonym : heterotypicSynonyms) {
     					// Make sure synonym belongs to the taxon
     					// TODO why? doesn't taxon.getHeterotypicSynonymyGroups return synonyms of the taxon only? I would think so!
     					if (synonym.getAcceptedTaxa().contains(taxon)) {
     						createSynonym(synonym);
+    					}
+    				}
     			List<Synonym> heterotypicSynonyms = homotypicalGroup.
     					getSynonymsInGroup(taxon.getSec());
     			for (Synonym synonym : heterotypicSynonyms) {
     				 createSynonym(synonym);
+    			}
+    		}

     		Label lblReference = new Label(this, SWT.NONE);
     		lblReference.setLayoutData(new GridData());
     		lblReference.setText("Choose a reference either by searching or entering it as free text:");
     		lblReference.setText("Choose a reference:");
     		// Create 3-columned composite for reference input
     		Composite refComposite = new Composite(this, SWT.NONE);
-...
     		// Create reference input
     		txtReference = new Text(refComposite, SWT.BORDER);
     		txtReference.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
     		txtReference.setEnabled(false);
     		// Create reference search button
     		Button btnSearchReference = new Button(refComposite, SWT.NONE);
-...
     				clearReference();
+    			}
     		});
     		// Create message re: editing references
     		Label lblNewRefFeedback = new Label(this, SWT.NONE);
     		lblNewRefFeedback.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, true, false));
     		lblNewRefFeedback.setFont(
     				Resources.italicizeFont(lblNewRefFeedback.getFont()));
     		lblNewRefFeedback.setText("Existing references can only be edited in property sheet.");
     		Label lblMicroref = new Label(this, SWT.NONE);
     		lblMicroref.setText("Enter reference detail (e.g., page no.):");
-...
+    	 *
     	 */
     	protected void popupSearch() {
             ReferenceBase reference = FilteredReferenceSelectionDialog.selectReference(getShell());
             ReferenceBase reference = FilteredReferenceSelectionDialog.selectReference(getShell(), savedReference);
     		if (reference != null) {
     			setSavedReference(reference);
+    		}
-...
     	 * @return
     	 */
     	public ReferenceBase<?> getReference() {
     		ReferenceBase<?> reference = null;
     	    if (savedReference != null) {
     	    	reference = savedReference;
     		} else {
     			if (!txtReference.getText().equals("")) {
     				reference = Generic.NewInstance();
     				reference.setTitleCache(txtReference.getText());
+    			}
+    		}
     		return reference;
     		return savedReference;
+    	}
     	public String getMicroReference() {

     	protected Vector<PropertyDescriptor> descriptors = new Vector<PropertyDescriptor>();
     	protected void addDescriptor(String id) {
     		// Reference search
     		if (id.equals(P_ID_SEARCH)) {
     //			descriptors.addElement(
     //					new ReferenceSearchDescriptor(P_ID_SEARCH, P_SEARCH, getSearchType()) {
     //						protected void saveReference(ReferenceBase reference) {
     //							setPropertyValue(P_ID_SEARCH, reference);
     //						}
     //			});
+    		}
     		// Editable cache
     		if (id.equals(P_ID_EDITABLECACHE)) {
     			descriptors.addElement(
-...
+    		}
     		boolean isProtectedCache = name.isProtectedTitleCache();
     //		boolean isProtectedCache = false;
     		// Uninomial (aka Genus)
     		if (id.equals(P_ID_UNINOMIAL)) {

taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/name/TaxonBasePropertySource.java
100	100	new PropertyDescriptor(P_ID_TAXONNAME, P_TAXONNAME));
101	101	}
102	102	if (id.equals(P_ID_TAXONSEC)) {
103		descriptors.addElement(new ReferenceSearchDescriptor(P_ID_TAXONSEC, P_TAXONSEC, IReferenceSearch.BIBREF) {
	103	descriptors.addElement(new ReferenceSearchDescriptor(P_ID_TAXONSEC, P_TAXONSEC, IReferenceSearch.BIBREF, taxonBase.getSec()) {
104	104	protected void saveReference(ReferenceBase reference) {
105	105	setPropertyValue(P_ID_TAXONSEC, reference);
106	106	}

     		// Reference search
     		if (id.equals(P_ID_SEARCH)) {
     			descriptors.addElement(
     					new ReferenceSearchDescriptor(P_ID_SEARCH, P_SEARCH, getSearchType()) {
     					new ReferenceSearchDescriptor(P_ID_SEARCH, P_SEARCH, getSearchType(), reference) {
     						protected void saveReference(ReferenceBase reference) {
     							setPropertyValue(P_ID_SEARCH, reference);
+    						}
-...
     		if (id.equals(P_ID_PROTECT_CACHE)) {
     			descriptors.addElement(
     					new ComboBoxPropertyDescriptor(P_ID_PROTECT_CACHE, P_PROTECT_CACHE,
     							new String[] {"no", "yes"}));
     //			descriptors.addElement(
     //					new CheckboxPropertyDescriptor(P_ID_PROTECT_CACHE, P_PROTECT_CACHE));
     							new String[] {"no", "yes"}));
+    		}
     		// Reference type

     abstract public class ReferenceSearchDescriptor extends PropertyDescriptor {
     	int searchType;
     	private ReferenceBase existingReference;
     	public ReferenceSearchDescriptor(Object id, String displayName, int searchType) {
     	public ReferenceSearchDescriptor(Object id, String displayName, int searchType, ReferenceBase existingReference) {
     		super(id, displayName);
     		this.searchType = searchType;
     		this.existingReference = existingReference;
+    	}
         public CellEditor createPropertyEditor(Composite parent) {
-...
     			protected Object openDialogBox(
     					Control cellEditorWindow) {
     		        ReferenceBase reference = FilteredReferenceSelectionDialog.selectReference(cellEditorWindow.getShell());
     		        ReferenceBase reference = FilteredReferenceSelectionDialog.selectReference(cellEditorWindow.getShell(), existingReference);
     				if (reference != null) {
     					saveReference(reference);
     					return new ReferencePropertySource(reference);

     package eu.etaxonomy.taxeditor.propertysheet.type.wizard;
     import java.beans.PropertyChangeEvent;
     import java.beans.PropertyChangeListener;
     import org.apache.log4j.Logger;
     import org.eclipse.core.databinding.observable.list.WritableList;
     import org.eclipse.core.runtime.Assert;
     import org.eclipse.jface.wizard.WizardPage;
     import org.eclipse.swt.SWT;
     import org.eclipse.swt.events.KeyAdapter;
     import org.eclipse.swt.events.KeyEvent;
     import org.eclipse.swt.events.SelectionAdapter;
     import org.eclipse.swt.events.SelectionEvent;
     import org.eclipse.swt.layout.GridData;
     import org.eclipse.swt.layout.GridLayout;
     import org.eclipse.swt.widgets.Button;
     import org.eclipse.swt.widgets.Composite;
     import org.eclipse.swt.widgets.Label;
     import org.eclipse.swt.widgets.Text;
     import eu.etaxonomy.cdm.model.name.NameTypeDesignation;
     import eu.etaxonomy.cdm.model.name.TaxonNameBase;
     import eu.etaxonomy.cdm.model.name.TypeDesignationBase;
     import eu.etaxonomy.cdm.model.reference.ReferenceBase;
     import eu.etaxonomy.taxeditor.dialogs.FilteredNameSelectionDialog;
     import eu.etaxonomy.taxeditor.editor.name.NameSelectComposite;
     import eu.etaxonomy.taxeditor.editor.reference.ReferenceSelectComposite;
     import eu.etaxonomy.taxeditor.model.NomenclaturalCodeHelper;
     import eu.etaxonomy.taxeditor.model.Resources;
     import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
     /**
-...
     	private TaxonNameBase<?, ?> savedName;
     	private Text txtName;
     	private Button btnClearName;
     	private Button btnRejected;
     	private Button btnConserved;
     	private Button btnLecto;
-...
     	private ReferenceSelectComposite referenceComposite;
     	private NameSelectComposite nameComposite;
     	private boolean nameSelected;
     	/**
     	 * @param typeDesignation
     	 * @param name
-...
     		Composite container = new Composite(parent, SWT.NULL);
     		container.setLayout(new GridLayout());
     		setControl(container);
     		// Create name text
     		final Label lblName = new Label(container, SWT.NONE);
     		lblName.setText("Choose a name either by searching or entering it as free text:");
     		// Create 3-columned composite for name
     		Composite nameComposite = new Composite(container, SWT.NULL);
     		nameComposite.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
     		GridLayout gridLayout = new GridLayout();
     		gridLayout.numColumns = 3;
     		gridLayout.marginHeight = 0;
     		gridLayout.marginWidth = 0;
     		nameComposite.setLayout(gridLayout);
     		// Create name input
     		// TODO replace w NameSelectComposite
     		txtName = new Text(nameComposite, SWT.BORDER);
     		txtName.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
     		txtName.addKeyListener(new KeyAdapter() {
     			@Override
     			public void keyReleased(KeyEvent e) {
     				updatePage();
+    			}
     		});
     		// Create name search button
     		Button btnSearchName = new Button(nameComposite, SWT.NONE);
     		btnSearchName.setEnabled(true);
     		btnSearchName.setLayoutData(new GridData());
     		btnSearchName.setText("Search ...");
     		btnSearchName.addSelectionListener(new SelectionAdapter() {
     			// Popup reference search
     			public void widgetSelected(SelectionEvent e) {
     				popupNameSearch();
     		// Create name input composite
     		nameComposite = new NameSelectComposite(container);
     		nameComposite.addPropertyChangeListener(new PropertyChangeListener() {
     			public void propertyChange(PropertyChangeEvent evt) {
     				setName();
+    			}
     		});
     		// Create clear name button
     		btnClearName = new Button(nameComposite, SWT.NONE);
     		btnClearName.setEnabled(false);
     		btnClearName.setText("Clear");
     		btnClearName.addSelectionListener(new SelectionAdapter() {
     			// Clear selected reference
     			public void widgetSelected(SelectionEvent e) {
     				clearName();
+    			}
     		});
     		// Set text to name text if exists, disable ability to edit name
     		if (typeDesignation != null && typeDesignation.getTypeName() != null) {
     			savedName = typeDesignation.getTypeName();
     			txtName.setText(savedName.getTitleCache());
     			txtName.setEditable(false);
     			btnClearName.setEnabled(false);
     			btnSearchName.setEnabled(false);
+    		}
     		// Tell user when he is entering a new name
     		Label lblNewNameFeedback = new Label(container, SWT.NONE);
     		lblNewNameFeedback.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, true, false));
     		lblNewNameFeedback.setFont(
     				Resources.italicizeFont(lblNewNameFeedback.getFont()));
     		lblNewNameFeedback.setText("Existing names can not be edited.");
     		if (typeDesignation != null) {
     			nameComposite.setName(typeDesignation.getTypeName());
+    		}
     		// Create 2-columned composite for name
     		Composite booleansComposite = new Composite(container, SWT.NULL);
-...
+    			}
+    		}
+    	}
     	/**
+    	 *
     	 */
     	protected void popupNameSearch() {
     		// TODO delete this when FilteredSelectionDialog works
     //		Dialog dialog = new NameSearchDialog(getShell());
     //        Object value = ((NameSearchDialog) dialog).open();
     //
     //		if (value instanceof TaxonNameBase) {
     //			setSavedName((TaxonNameBase<?, ?>) value);
     //			updatePage();
     //		}
     		setSavedName(FilteredNameSelectionDialog.selectName(getShell()));
     	private void setName() {
     		savedName = nameComposite.getName();
     		nameSelected = (savedName != null);
     		updatePage();
+    	}
     	/**
     	 * @param value
     	 */
     	private void setSavedName(TaxonNameBase<?, ?> savedName) {
     		this.savedName = savedName;
     		txtName.setText(savedName.getTitleCache());
     		txtName.setEditable(false);
     		btnClearName.setEnabled(true);
+    	}
     	/**
+    	 *
     	 */
     	protected void clearName() {
     		savedName = null;
     		txtName.setText("");
     		txtName.setEditable(true);
     		btnClearName.setEnabled(false);
     		txtName.setText("");
+    	}
     	@Override
-...
+    	}
     	public boolean isPageComplete() {
     		return (txtName.getText().length() > 0);
     		return nameComposite.getName() != null;
+    	}
     	private void updatePage() {
     		getWizard().getContainer().updateButtons();
+    	}

Project

General

Profile

EDIT

Revision 9c260783

Added by Pepe Ciardelli over 14 years ago