Revision 47784 trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.dal/org.gvsig.fmap.dal.swing/org.gvsig.fmap.dal.swing.impl/src/main/java/org/gvsig/fmap/dal/swing/impl/searchpanel/SearchConditionFieldController.java

View differences:

SearchConditionFieldController.java
305 305

  
306 306
        @Override
307 307
        public String getLabel() {
308
            String theLabel = DALSwingLocator.getDataSwingManager().getAttributeDescriptorLabel(attrdesc, showStoreName ? store.getName() : null);
308
            DataSwingManager dataSwingManager = DALSwingLocator.getDataSwingManager();
309
            String theLabel;
310
            FeatureAttributeDescriptor parentDescriptor = this.getParentDescriptor();
311
            if( parentDescriptor==null ) {
312
                theLabel = dataSwingManager.getAttributeDescriptorLabel(attrdesc, showStoreName ? store.getName() : null);
313
            } else {
314
                switch (parentDescriptor.getRelationType()) {
315
                    case DynField.RELATION_TYPE_COLLABORATION:
316
                    case DynField.RELATION_TYPE_IDENTITY:
317
                        theLabel = dataSwingManager.getAttributeDescriptorLabel(attrdesc)+" de "+store.getName();
318
                        break; // "_XFieldNameX_of_XTableNameX"
319

  
320
                    case DynField.RELATION_TYPE_AGGREGATE:
321
                    case DynField.RELATION_TYPE_COMPOSITION:
322
                        theLabel = "\u2203 "+store.getName()+" que "+dataSwingManager.getAttributeDescriptorLabel(attrdesc);
323
                        break; // "_With_some_XTableNameX_that_XFieldNameX". U+2203 -> Exsite alguno
324
                    default:
325
                        theLabel = dataSwingManager.getAttributeDescriptorLabel(attrdesc, showStoreName ? store.getName() : null);                        
326
                }
327
            }
309 328
            switch (this.presentationMode) {
310 329
                case Search.OrderedAttribute.TYPE_REGURAL:
311 330
                    break;
......
1387 1406
                FeatureType featureType = featureAttributeDescriptor.getFeatureType();
1388 1407
                String storeName = featureType.getStore().getName();
1389 1408
                pathArray.add(storeName);
1390
            }
1409
                }
1391 1410
            arrayBuilder.add(pathArray);
1392 1411
        }
1393 1412
        String relational = this.getRelationalOperator();

Also available in: Unified diff