Revision 45393 branches/org.gvsig.desktop-cvsgis1/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/DefaultSearchPanel.java

View differences:

DefaultSearchPanel.java
64 64 
import org.gvsig.fmap.dal.swing.DALActionFactory;
65 65 
import org.gvsig.fmap.dal.swing.DALSwingLocator;
66 66 
import org.gvsig.fmap.dal.swing.featurequery.FeatureQueryCalculatedColumnsPanel;
67 
import org.gvsig.fmap.dal.swing.impl.featuretable.SimpleFeaturesTableModel;
67 
import org.gvsig.fmap.dal.swing.impl.featuretable.SimpleFeaturesTableModelImpl;
68 68 
import org.gvsig.fmap.dal.swing.impl.featurequery.DefaultFeatureQueryGroupByPanel;
69 69 
import org.gvsig.fmap.dal.swing.searchpanel.FeatureStoreSearchPanel;
70 70 
import org.gvsig.fmap.dal.swing.searchpanel.SearchConditionPanel;
......
85 85 
import org.slf4j.LoggerFactory;
86 86 
import org.gvsig.fmap.dal.swing.featurequery.FeatureQueryGroupByPanel;
87 87 
import org.gvsig.fmap.dal.swing.featurequery.FeatureQueryOrderPanel;
88 
import org.gvsig.fmap.dal.swing.featuretable.SimpleFeaturesTableModel;
88 89 
import org.gvsig.fmap.dal.swing.impl.featurequery.DefaultFeatureQueryCalculatedColumnsPanel;
89 90 
import org.gvsig.fmap.dal.swing.featuretype.FeatureAttributesSelectionPanel;
90 91 
import org.gvsig.fmap.dal.swing.searchpanel.SearchParameters;
......
732 733 
                FacadeOfAFeaturePagingHelper facade = (FacadeOfAFeaturePagingHelper) features;
733 734 
                FeatureType ftype = facade.getFeaturePagingHelper().getFeatureSet().getDefaultFeatureType();
734 735 
                    // al modelo le pasamos el ftype de esas features
735 
                    SimpleFeaturesTableModel tableModel = new SimpleFeaturesTableModel(
736 
                    SimpleFeaturesTableModelImpl tableModel = new SimpleFeaturesTableModelImpl(
736 737 
                            ftype,
737 738 
                            resultColumnNames,
738 739 
                            features
......
750 751 
                        TableModel oldmodel = tblResults.getModel();
751 752 
                        SimpleFeaturesTableModel m = (SimpleFeaturesTableModel) model.getValue();
752 753 
                        tblResults.setModel(m);
753 
                        SimpleFeaturesTableModel.setCellRenderers(tblResults);
754 
                        if (oldmodel instanceof SimpleFeaturesTableModel) {
755 
                            ((SimpleFeaturesTableModel) oldmodel).dispose();
754 
                        m.setCellRenderers(tblResults);
755 
                        if (oldmodel instanceof SimpleFeaturesTableModelImpl) {
756 
                            ((SimpleFeaturesTableModelImpl) oldmodel).dispose();
756 757 
                        }
757 758 
                        if (m.hasErrors()) {
758 759 
                            lblMsg.setText(i18n.getTranslation("_Errors_occurred_during_search"));
......
793 794
794 795 
        }
795 796 
        FeatureType ftype = this.store.getDefaultFeatureTypeQuietly();
796 
        SimpleFeaturesTableModel emptyTableModel = new SimpleFeaturesTableModel(
797 
        SimpleFeaturesTableModelImpl emptyTableModel = new SimpleFeaturesTableModelImpl(
797 798 
                ftype,
798 799 
                resultColumnNames,
799 800 
                null
......
808 809 
        if (this.conditionPanels == null) {
809 810 
            return;
810 811 
        }
811 
        SimpleFeaturesTableModel model;
812 
        SimpleFeaturesTableModelImpl model;
812 813 
//        model = (SimpleFeaturesTableModel) this.tblResults.getModel();
813 814 
        List<Feature> features = store.getFeatures(this.parameters.getQuery());
814 815 
        FacadeOfAFeaturePagingHelper facade = (FacadeOfAFeaturePagingHelper) features;
815 816 
        FeatureType ftype = facade.getFeaturePagingHelper().getFeatureSet().getDefaultFeatureType();
816 
        model = new SimpleFeaturesTableModel(
817 
        model = new SimpleFeaturesTableModelImpl(
817 818 
                ftype,
818 819 
                this.parameters.getResultColumnNames(),
819 820 
                features
......
876 877 
            return null;
877 878 
        }
878 879 
        try {
879 
            List<Feature> features = ((SimpleFeaturesTableModel) this.tblResults.getModel()).getFeatures();
880 
            List<Feature> features = ((SimpleFeaturesTableModelImpl) this.tblResults.getModel()).getFeatures();
880 881 
            Feature feature = features.get(selectedRow);
881 882 

  		




  882
  883
  
    
            ExpressionBuilder builder = ExpressionUtils.createExpressionBuilder();


  		












Also available in:  Unified diff