\r
// Nomenclatural reference\r
if (id.equals(P_ID_NOMENCLATURAL_REF)) { \r
- descriptors.addElement(new ReferenceSearchDescriptor(P_ID_NOMENCLATURAL_REF,P_NOMENCLATURAL_REF, name.getNomenclaturalReference(), getNomenclaturalReferenceTypes()) {\r
+ descriptors.addElement(new ReferenceSearchDescriptor(P_ID_NOMENCLATURAL_REF, P_NOMENCLATURAL_REF, (ReferenceBase) name.getNomenclaturalReference()) {\r
protected void saveReference(ReferenceBase reference) {\r
setPropertyValue(P_ID_NOMENCLATURAL_REF, reference);\r
}\r
- }); \r
+ }); \r
+// descriptors.addElement(new ReferenceSearchDescriptor(P_ID_NOMENCLATURAL_REF,P_NOMENCLATURAL_REF, name.getNomenclaturalReference(), getNomenclaturalReferenceTypes()) {\r
+// protected void saveReference(ReferenceBase reference) {\r
+// setPropertyValue(P_ID_NOMENCLATURAL_REF, reference);\r
+// }\r
+// });\r
}\r
\r
// Microreference\r
return name;\r
}\r
\r
+ @Deprecated\r
protected ReferenceType[] getNomenclaturalReferenceTypes() {\r
return new ReferenceType[] { \r
ReferenceType.Article,\r
// descriptors.addElement(\r
// new PropertyDescriptor(P_ID_NOMENCLATURAL_REF,P_NOMENCLATURAL_REF));\r
// \r
- descriptors.addElement(new ReferenceSearchDescriptor(P_ID_NOMENCLATURAL_REF,P_NOMENCLATURAL_REF, name.getNomenclaturalReference(), getNomenclaturalReferenceTypes()) {\r
+ descriptors.addElement(new ReferenceSearchDescriptor(P_ID_NOMENCLATURAL_REF,P_NOMENCLATURAL_REF, (ReferenceBase) name.getNomenclaturalReference()) {\r
protected void saveReference(ReferenceBase reference) {\r
setPropertyValue(P_ID_NOMENCLATURAL_REF, reference);\r
}\r
private ReferenceBase existingReference;\r
private ReferenceType[] requiredTypes;\r
\r
- public ReferenceSearchDescriptor(Object id, String displayName, ReferenceBase existingReference) {\r
+ public ReferenceSearchDescriptor(Object id, String displayName, ReferenceBase reference) {\r
super(id, displayName);\r
\r
this.existingReference = existingReference;\r
if (reference != null) {\r
if (requiredTypes != null && !isRequiredType(reference)) {\r
MessageDialog.openInformation(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), \r
- "Invalid Reference", "'" + reference.getTitleCache() + \r
+ "Invalid Reference", "'" + reference.getTitle() + \r
"' is not one of the following allowed reference types:\n\n" + getTabbedRequiredTypeString());\r
} else {\r
saveReference(reference);\r
return false;\r
}\r
\r
- abstract protected void saveReference(ReferenceBase<?> reference); \r
+ abstract protected void saveReference(ReferenceBase reference); \r
}\r
package eu.etaxonomy.taxeditor.propertysheet.tabbed;
import org.apache.log4j.Logger;
+import org.eclipse.ui.views.properties.tabbed.ITabbedPropertySheetPageContributor;
import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage;
import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
import eu.etaxonomy.cdm.api.conversation.IConversationEnabled;
import eu.etaxonomy.cdm.persistence.hibernate.CdmDataChangeMap;
-import eu.etaxonomy.taxeditor.editor.AbstractTaxonEditor;
/**
* @author n.hoffmann
private static final Logger logger = Logger
.getLogger(EditorTabbedPropertySheetPage.class);
- private AbstractTaxonEditor editor;
+ private ITabbedPropertySheetPageContributor editor;
/**
* @param tabbedPropertySheetPageContributor
*/
- public EditorTabbedPropertySheetPage(AbstractTaxonEditor tabbedPropertySheetPageContributor) {
+ public EditorTabbedPropertySheetPage(ITabbedPropertySheetPageContributor tabbedPropertySheetPageContributor) {
super(tabbedPropertySheetPageContributor);
editor = tabbedPropertySheetPageContributor;
-
}
* @see eu.etaxonomy.cdm.api.conversation.IConversationEnabled#getConversationHolder()
*/
public ConversationHolder getConversationHolder() {
- return editor.getConversationHolder();
+ return ((IConversationEnabled) editor).getConversationHolder();
}
/* (non-Javadoc)
/**
* @return the editor
*/
- public AbstractTaxonEditor getEditor() {
+ public ITabbedPropertySheetPageContributor getEditor() {
return editor;
}
import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage;
import eu.etaxonomy.cdm.common.CdmUtils;
+import eu.etaxonomy.cdm.model.reference.INomenclaturalReference;
import eu.etaxonomy.cdm.model.reference.ReferenceBase;
import eu.etaxonomy.taxeditor.editor.EditorUtil;
import eu.etaxonomy.taxeditor.editor.Page;
private static final Logger logger = Logger
.getLogger(NomRefPropertySection.class);
- private ReferenceBase<?> reference;
+ private INomenclaturalReference reference;
private String microReference;
*/
public TabbedPropertyView() {
// TODO Auto-generated constructor stub
+ logger.warn("Creating tabbed properties view");
}
/* (non-Javadoc)