Project

General

Profile

Revision 77dad5ec

ID77dad5ec2e95d4ecf9a45158c26f2f7b9b68779d
Parent 41061791
Child 11bdf5c4

Added by Andreas Müller 12 months ago

ref #6794 rename getFeatureNode -> getTermNode in cdmlib-print

View differences:

cdmlib-print/src/main/java/eu/etaxonomy/cdm/print/IXMLEntityFactory.java
72 72
	 * @param uuid
73 73
	 * @return
74 74
	 */
75
	public Element getFeatureNode(UUID uuid);
75
	public Element getTermNode(UUID uuid);
76 76
	
77 77
	/**
78 78
	 * 
79 79
	 * @param uuid
80 80
	 * @return
81 81
	 */
82
	public Element getFeatureForFeatureNode(UUID uuid);
82
	public Element getFeatureForTermNode(UUID uuid);
83 83
	
84 84
	/***************** Harvesting methods *********************/
85 85
	
cdmlib-print/src/main/java/eu/etaxonomy/cdm/print/LocalXMLEntityFactory.java
81 81
    private FeatureTreeController featureTreeController;
82 82

  
83 83
    @Autowired
84
    private FeatureNodeController featureNodeController;
84
    private FeatureNodeController termNodeController;
85 85

  
86 86
    @Autowired
87 87
    private PolytomousKeyNodeDtoController polytomousKeyNodeDtoController;
......
122 122
    			.getBean("featureTreeListController");
123 123
    	featureTreeController = (FeatureTreeController) applicationConfiguration
124 124
    			.getBean("featureTreeController");
125
    	featureNodeController = (FeatureNodeController) applicationConfiguration
125
    	termNodeController = (FeatureNodeController) applicationConfiguration
126 126
    			.getBean("featureNodeController");
127 127

  
128 128
    	taxonPortalController = (TaxonPortalController) applicationConfiguration
......
205 205
    }
206 206

  
207 207
    @Override
208
    public Element getFeatureNode(UUID uuid) {
208
    public Element getTermNode(UUID uuid) {
209 209
        xmlView.setJsonConfig(jsonConfig);
210 210
        Object resultObject = null;
211 211
        try {
212
            resultObject = featureNodeController.doGet(uuid, null, null);
212
            resultObject = termNodeController.doGet(uuid, null, null);
213 213
        } catch (IOException e) {
214 214
            monitor.warning(e.getLocalizedMessage(), e);
215 215
            logger.error(e);
......
220 220
    }
221 221

  
222 222
    @Override
223
    public Element getFeatureForFeatureNode(UUID uuid) {
223
    public Element getFeatureForTermNode(UUID uuid) {
224 224
        xmlView.setJsonConfig(jsonConfig);
225 225
        Object resultObject = null;
226 226
        try {
227
            resultObject = featureNodeController.getCdmBaseProperty(uuid,
227
            resultObject = termNodeController.getCdmBaseProperty(uuid,
228 228
                    "feature", null);
229 229
        } catch (IOException e) {
230 230
            monitor.warning(e.getLocalizedMessage(), e);
cdmlib-print/src/main/java/eu/etaxonomy/cdm/print/RemoteXMLEntityFactory.java
242 242
		return processElementList(result);
243 243
	}
244 244

  
245
	public Element getFeatureNode(UUID featureNodeUuid) {
245
	public Element getTermNode(UUID featureNodeUuid) {
246 246
		Element result = queryService(featureNodeUuid, FEATURENODE);
247 247
		return result;
248 248
	}
249 249

  
250
	public Element getFeatureForFeatureNode(UUID featureNodeUuid) {
250
	public Element getFeatureForTermNode(UUID featureNodeUuid) {
251 251
		Element result = queryService(featureNodeUuid, FEATURENODE_FEATURE);
252 252
		return result;
253 253
	}
cdmlib-print/src/main/java/eu/etaxonomy/cdm/print/XMLHarvester.java
58 58
	private void createSimplifiedFeatureTree(Element featureTreeElement) {
59 59
		Element root = featureTreeElement.getChild("root");
60 60
		
61
		Element realRoot = factory.getFeatureNode(XMLHelper.getUuid(root));
61
		Element realRoot = factory.getTermNode(XMLHelper.getUuid(root));
62 62
		
63 63
		progressMonitor.subTask("Generating simplified Feature Tree.");
64 64
		simplifiedFeatureTree = featureTreeRecursive(realRoot);
......
79 79
				for(Element childNode : childFeatureNodes){
80 80

  
81 81
					UUID uuid = XMLHelper.getUuid(childNode);
82
					Element featureNodeElement = factory.getFeatureNode(uuid);
83
					Element featureElement = factory.getFeatureForFeatureNode(uuid);
82
					Element featureNodeElement = factory.getTermNode(uuid);
83
					Element featureElement = factory.getFeatureForTermNode(uuid);
84 84

  
85 85

  
86 86
					try {

Also available in: Unified diff

Add picture from clipboard (Maximum size: 40 MB)