Revision 44744 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/featuretype/FeatureAttributeTreeModel.java

View differences:

FeatureAttributeTreeModel.java
126 126 
      if (showRelations && this.childs == null) {
127 127 
        FeatureAttributeDescriptor descriptor = this.getValue();
128 128 
        try {
129 
          this.childs = Collections.EMPTY_LIST;
129 130 
          switch (descriptor.getRelationType()) {
130 131 
            case DynField.RELATION_TYPE_IDENTITY:
131 132 
            case DynField.RELATION_TYPE_COLLABORATION:
......
158 159 
                    stores.add(fullName);
159 160 
                  }
160 161 
                }
161 
              } else {
162 
                this.childs = Collections.EMPTY_LIST;
163 162 
              }
164 163 
              break;
165 164 

  		




  ......




  170
  169
  
    
                FeatureAttributeEmulatorExpression emulatorExp = (FeatureAttributeEmulatorExpression) emulator;


  		




  171
  170
  
    
                Code code = emulatorExp.getExpression().getCode();


  		




  172
  171
  
    
                if( code.code()==Code.CALLER ) {


  		




  173
  
  
    
                  Function function = ((Code.Caller)code).function();


  		




  174
  
  
    
                  if( function != null && StringUtils.equalsIgnoreCase(function.name(), "SELECT") ) {


  		




  
  172
  
    
//                  Function function = ((Code.Caller)code).function();


  		




  
  173
  
    
                  if( StringUtils.equalsIgnoreCase(((Code.Caller)code).name(), "SELECT") ) {


  		




  175
  174
  
    
                    Codes parameters = ((Code.Caller)code).parameters();


  		




  176
  175
  
    
                    String tableName = (String) ((Code.Constant)(parameters.get("TABLE"))).value();


  		




  177
  176
  
    
                    DataManager dataManager = DALLocator.getDataManager();


  		




  ......




  203
  202
  
    
                  }


  		




  204
  203
  
    
                }


  		




  205
  204
  
    
              }


  		




  206
  
  
    
              this.childs = Collections.EMPTY_LIST;


  		




  207
  205
  
    
              break;


  		




  208
  206
  
    

  		




  209
  207
  
    
            case DynField.RELATION_TYPE_NONE: 


  		




  210
  208
  
    
            default:


  		




  211
  
  
    
              this.childs = Collections.EMPTY_LIST;


  		




  212
  209
  
    
              break;


  		




  213
  210
  
    
          }


  		




  214
  211
  
    
        } catch(Exception ex) {


  		












Also available in:  Unified diff