/ - Diff - Application: gvSIG desktop - gvSIG

Revision 47417

     import java.awt.Component;
     import java.util.Collection;
     import java.util.HashMap;
     import java.util.List;
     import java.util.Map;
     import java.util.function.Predicate;
-...
     import org.gvsig.fmap.dal.swing.report.ReportActionFactory.ReportCustomActionFactory;
     import org.gvsig.fmap.dal.swing.searchPostProcess.SearchPostProcessFactory;
     import org.gvsig.fmap.dal.swing.searchpanel.FeatureStoreSearchPanel;
     import org.gvsig.fmap.dal.swing.searchpanel.FeatureStoreSearchPanel.SearchResultsPanelFactory;
     import org.gvsig.fmap.dal.swing.searchpanel.SearchConditionPanel;
     import org.gvsig.fmap.dal.swing.searchpanel.SearchConditionPanel.SearchConditionPanelFactory;
     import org.gvsig.fmap.dal.swing.searchpanel.SearchParameters;
     import org.gvsig.fmap.dal.swing.storesrepository.StoresRepositoryController;
     import org.gvsig.tools.dynform.DynFormDefinition;
     import org.gvsig.tools.dynobject.DynStruct;
     import org.gvsig.tools.util.Factory;
     /**
-...
         public List<ReportAction> getReportActions(DataStore store, Predicate filter);
         public void registerSearchResultsPanel(SearchResultsPanelFactory factory);
         public Iterable<SearchResultsPanelFactory> getSearchResultsPanels();
+    }

     import org.gvsig.fmap.dal.feature.FeatureQuery;
     import org.gvsig.fmap.dal.feature.FeatureStore;
     import org.gvsig.fmap.dal.feature.FeatureType;
     import org.gvsig.fmap.dal.swing.DALActionFactory;
     import org.gvsig.fmap.dal.swing.DALActionFactory.DALActionContext;
     import org.gvsig.fmap.dal.swing.featuretable.SimpleFeaturesTableModel;
     import org.gvsig.tools.dispose.Disposable;
     import org.gvsig.tools.swing.api.ActionListenerSupport;
     import org.gvsig.tools.swing.api.Component;
     import org.gvsig.tools.util.Factory;
     import org.gvsig.tools.util.PropertiesSupport;
     /**
-...
      * @author jjdelcerro
      */
     public interface FeatureStoreSearchPanel extends  Component, ActionListenerSupport, Disposable, PropertiesSupport {
       public interface SearchResultsPanelFactory extends Factory<Component> {
         @Override
         public Component create(Object... os);
         public String getTitle();
+      }
         public static final String CONFIGURABLE_PANEL_ID = "FeatureStoreSearchPanel";
         public static final String ACTION_CONTEXT_NAME = "FeatureStoreSearchPanel";
-...
         public String getLastErrorMessage();
         public void addResultPanel(String name, String title, Component component);
         public void removeResultPanel(String name);
         public DALActionContext getSearchActionContext();
+    }

     import org.gvsig.fmap.dal.swing.report.ReportActionFactory.ReportCustomActionFactory;
     import org.gvsig.fmap.dal.swing.searchPostProcess.SearchPostProcessFactory;
     import org.gvsig.fmap.dal.swing.searchpanel.FeatureStoreSearchPanel;
     import org.gvsig.fmap.dal.swing.searchpanel.FeatureStoreSearchPanel.SearchResultsPanelFactory;
     import org.gvsig.fmap.dal.swing.searchpanel.SearchConditionPanel.SearchConditionPanelFactory;
     import org.gvsig.fmap.dal.swing.searchpanel.SearchParameters;
     import org.gvsig.fmap.dal.swing.storesrepository.StoresRepositoryController;
-...
     import org.gvsig.tools.swing.api.pickercontroller.PickerController;
     import org.gvsig.tools.swing.api.threadsafedialogs.ThreadSafeDialogsManager;
     import org.gvsig.tools.swing.api.windowmanager.WindowManager;
     import org.gvsig.tools.util.Factory;
     import org.slf4j.Logger;
     import org.slf4j.LoggerFactory;
-...
         private final Map<String,SearchPostProcessFactory> searchPostProcess;
         private Map<String,SearchConditionPanelFactory> searchConditionPanelFactories;
         private Integer useLabels;
         private HashMap<String, SearchResultsPanelFactory> searchResultsPanelFactories;
         public DefaultDataSwingManager() {
             this.featureStoreActions = new LinkedHashMap<>();
-...
+        }
         @Override
         public void registerSearchResultsPanel(SearchResultsPanelFactory factory) {
           if( this.searchResultsPanelFactories==null ) {
             this.searchResultsPanelFactories = new HashMap<>();
+          }
           this.searchResultsPanelFactories.put(factory.getName(), factory);
+        }
         @Override
         public Iterable<SearchResultsPanelFactory> getSearchResultsPanels() {
           if( this.searchResultsPanelFactories==null ) {
             return Collections.EMPTY_LIST;
+          }
           return this.searchResultsPanelFactories.values();
+        }
         @Override
         public FeatureAttributesSelectionPanel createFeatureAttributeSelectionPanel() {
           FeatureAttributesSelectionPanel p = new DefaultFeatureAttributesSelectionPanel();
           return p;

     import org.gvsig.tools.folders.FoldersManager;
     import org.gvsig.tools.i18n.I18nManager;
     import org.gvsig.tools.swing.api.ActionListenerSupport;
     import org.gvsig.tools.swing.api.Component;
     import org.gvsig.tools.swing.api.SupportIsEnable;
     import org.gvsig.tools.swing.api.SupportIsVisible;
     import org.gvsig.tools.swing.api.ToolsSwingLocator;
-...
             private boolean initialized;
             private boolean postProcessEnabled;
             private boolean groupByEnabled;
             private Map<String,AdditionalResultsPanel> additionalResultsPanels;
             private static class AdditionalResultsPanel implements Component {
                 private final String name;
                 private final String title;
                 private int index;
                 private final Component component;
                 public AdditionalResultsPanel(String name, String title, Component component, int index) {
                     this.name = name;
                     this.title = title;
                     this.component = component;
                     this.index = index;
+                }
                 public AdditionalResultsPanel(String name, String title, Component component) {
                     this(name, title, component,-1);
+                }
                 public String getName() {
                     return this.name;
+                }
                 public String getTitle() {
                     return title;
+                }
                 public int getIndex() {
                     return this.index;
+                }
                 @Override
                 public JComponent asJComponent() {
                     return this.component.asJComponent();
+                }
                 public void setIndex(int index) {
                     this.index = index;
+                }
                 public void fireActionEvent(ActionEvent e) {
                     if( this.component instanceof ActionListenerSupport ) {
                         ((ActionListenerSupport)this.component).fireActionEvent(e);
+                    }
+                }
                 public void doDispose() {
                     DisposeUtils.dispose(this.component);
+                }
+            }
     	public static class UseLabelsYesAction extends AbstractAction {
     		@SuppressWarnings("OverridableMethodCallInConstructor")
-...
     		@Override
     		public DataStore getStore() {
     			if (this.panel.currentPostProcess == null || this.panel.tabResults.getSelectedIndex() == 0) {
     			if (this.panel.currentPostProcess != null && this.panel.tabResults.getSelectedIndex() == 1) {
     				return this.panel.postProcessStore;
     			} else {
     				return this.panel.getStore();
     			} else {
     				return this.panel.postProcessStore;
+    			}
+    		}
-...
     		@Override
     		public FeatureQuery getQuery() {
     			if (this.panel.currentPostProcess == null || this.panel.tabResults.getSelectedIndex() == 0) {
     			if (this.panel.currentPostProcess != null && this.panel.tabResults.getSelectedIndex() == 1) {
                                 return this.panel.postProcessQuery;
     			} else {
                                 SearchParameters searchParams = this.panel.parameters;
                                 FeatureQuery query = searchParams.getQueryToApply();
                                 if( panel.useSelection() ) {
                                     query = panel.addSelection(panel.store, query);
+                                }
                                 return query;
     			} else {
                                 return this.panel.postProcessQuery;
+    			}
+    		}
+    	}
-...
     		this.acctionListeners = ToolsSwingLocator.getToolsSwingManager().createActionListenerSupport();
     		this.actions = new HashMap<>();
     		this.parameters = new DefaultSearchParameters();
                     this.additionalResultsPanels = new HashMap<>();
     		FeatureQuery featureQuery = this.store.createFeatureQuery();
     		featureQuery.retrievesAllAttributes();
     		this.parameters.setQuery(featureQuery);
-...
+    		}
     		this.store = null;
     		this.tblResults.setModel(new DefaultTableModel());
                     for (AdditionalResultsPanel additionalResultsPanel : this.additionalResultsPanels.values()) {
                         additionalResultsPanel.doDispose();
+                    }
+    	}
     	@Override
-...
     					this.tabSearchMode.add(factory.getName(), panel.asJComponent());
+    				}
     			} catch (Throwable th) {
     				LOGGER.warn("Can't create search panel '" + factoryName + "'.");
     				LOGGER.warn("Can't create search panel '" + factoryName + "'.", th);
+    			}
+    		}
-...
     		this.tblResults.setComponentPopupMenu(new TablePopupMenu(this.tblResults));
     		this.tabResults.addChangeListener((ChangeEvent evt) -> {
     			SwingUtilities.invokeLater(() -> {
     				if (tabResults.getSelectedIndex() == 0) {
     				switch(tabResults.getSelectedIndex()) {
                                         case 1:
     					updateNumberElementsMsg(resultPostProcessModel);
                                             break;
                                         case 0:
                                         default:
     					updateNumberElementsMsg(resultModel);
     				} else {
     					updateNumberElementsMsg(resultPostProcessModel);
+    				}
     			});
     		});
-...
                     if (this.filterOnlyMode || !this.postProcessEnabled) {
     			this.btnSearchPostProcess.setVisible(false);
+    		}
     		for (SearchResultsPanelFactory factory : DALSwingLocator.getManager().getSearchResultsPanels()) {
     			String factoryName = "unknown";
     			try {
                                 factoryName = factory.getName();
                                 this.addResultPanel(
                                         factory.getName(),
                                         factory.getTitle(),
                                         factory.create(this)
                                     );
     			} catch (Throwable th) {
     				LOGGER.warn("Can't create results panel '" + factoryName + "'.",th);
+    			}
+    		}
                     for (AdditionalResultsPanel panel : this.additionalResultsPanels.values()) {
                         panel.setIndex(this.tabResults.getTabCount());
                         this.tabResults.addTab(panel.getTitle(), panel.asJComponent());
+                    }
                     this.initialized = true;
     		//this.tblResults.add
                     if (this.automaticallySearch){
                         if (this.bookmarks.hasBookmark(this.store.getName())) {
                                 Bookmark<DefaultSearchParameters> initBookmark = this.bookmarks.get(this.store.getName());
-...
                                 if(this.initialized){
     				I18nManager i18n = ToolsLocator.getI18nManager();
     				try {
                     			this.tabResults.setSelectedIndex(0);
                                             if( this.tabResults.getSelectedIndex()==1 ) {
                                                 this.tabResults.setSelectedIndex(0);
+                                            }
     					TableModel oldmodel = tblResults.getModel();
     					tblResults.setModel(resultModel);
     					resultModel.setCellRenderers(tblResults, getCustomRenderers(searchParams));
-...
     					if (this.parameters != null && this.parameters.getQuery() != null) {
     						this.history.add(searchParams);
+    					}
                                             this.fireSearchEvent();
     				} catch (Exception ex) {
     					LOGGER.warn(" Errors occurred during search getting old model", ex);
     					status.setTitle(i18n.getTranslation("_Errors_occurred_during_search"));
-...
                     if( ArrayUtils.isEmpty(selectedRows) ) {
                         return null;
+                    }
     		if (this.tabResults.getSelectedIndex() == 0) {
     		if (this.tabResults.getSelectedIndex() == 1) {
                         if (this.currentPostProcess == null) {
                                 return null;
+                        }
                         try {
                                 FeatureSelection selection = this.store.createFeatureSelection();
                                 List<Feature> features = ((SimpleFeaturesTableModelImpl) this.tblResults.getModel()).getFeatures();
                                 List<Feature> features = ((SimpleFeaturesTableModelImpl) this.tblSearchPostProcessResults.getModel()).getFeatures();
                                 for (int i = 0; i < selectedRows.length ; i++) {
                                     Feature feature = features.get(selectedRows[i]);
                                     selection.select(feature);
-...
                                 return null;
+                        }
     		} else {
                         if (this.currentPostProcess == null) {
                                 return null;
+                        }
                         try {
                                 FeatureSelection selection = this.store.createFeatureSelection();
                                 List<Feature> features = ((SimpleFeaturesTableModelImpl) this.tblSearchPostProcessResults.getModel()).getFeatures();
                                 List<Feature> features = ((SimpleFeaturesTableModelImpl) this.tblResults.getModel()).getFeatures();
                                 for (int i = 0; i < selectedRows.length ; i++) {
                                     Feature feature = features.get(selectedRows[i]);
                                     selection.select(feature);
-...
                     if( selectedRows.length > maxfeatures ) {
                         this.taskStatusController.message("Too many items selecteds");
+                    }
     		if (this.tabResults.getSelectedIndex() == 0) {
                         try {
                                 FeatureType ftype = this.store.getDefaultFeatureType();
                                 ExpressionBuilder builder = ExpressionUtils.createExpressionBuilder();
                                 List<Feature> features = ((SimpleFeaturesTableModelImpl) this.tblResults.getModel()).getFeatures();
                                 for (int i = 0; i < selectedRows.length && i<maxfeatures ; i++) {
                                     Feature feature = features.get(selectedRows[i]);
                                     for (FeatureAttributeDescriptor attrdesc : ftype.getPrimaryKey()) {
                                             builder.and(
                                                     builder.eq(
                                                             builder.column(attrdesc.getName()),
                                                             builder.constant(feature.get(attrdesc.getName()))
+                                                    )
                                             );
+                                    }
+                                }
                                 Expression filter = ExpressionUtils.createExpression(builder.toString());
                                 return filter;
                         } catch (Exception ex) {
                                 LOGGER.warn("Can't build search for the selected feature.", ex);
                                 return null;
+                        }
     		} else {
     		if (this.tabResults.getSelectedIndex() == 1) {
     			if (this.currentPostProcess == null) {
     				return null;
+    			}
-...
     				LOGGER.warn("Can't build search for the selected feature.", ex);
     				return null;
+    			}
     		} else {
                         try {
                                 FeatureType ftype = this.store.getDefaultFeatureType();
                                 ExpressionBuilder builder = ExpressionUtils.createExpressionBuilder();
                                 List<Feature> features = ((SimpleFeaturesTableModelImpl) this.tblResults.getModel()).getFeatures();
                                 for (int i = 0; i < selectedRows.length && i<maxfeatures ; i++) {
                                     Feature feature = features.get(selectedRows[i]);
                                     for (FeatureAttributeDescriptor attrdesc : ftype.getPrimaryKey()) {
                                             builder.and(
                                                     builder.eq(
                                                             builder.column(attrdesc.getName()),
                                                             builder.constant(feature.get(attrdesc.getName()))
+                                                    )
                                             );
+                                    }
+                                }
                                 Expression filter = ExpressionUtils.createExpression(builder.toString());
                                 return filter;
                         } catch (Exception ex) {
                                 LOGGER.warn("Can't build search for the selected feature.", ex);
                                 return null;
+                        }
+    		}
+            }
-...
     		if (!this.initialized) { //this.conditionPanels == null) {
     			return null;
+    		}
     		if (this.tabResults.getSelectedIndex() == 0) {
     			int selectedRow = this.tblResults.getSelectedRow();
     		if (this.tabResults.getSelectedIndex() == 1) {
     			if (this.currentPostProcess == null) {
     				return null;
+    			}
     			int selectedRow = this.tblSearchPostProcessResults.getSelectedRow();
     			if (selectedRow < 0) {
     				return null;
+    			}
     			try {
     				List<Feature> features = ((SimpleFeaturesTableModelImpl) this.tblResults.getModel()).getFeatures();
     				List<Feature> features = ((SimpleFeaturesTableModelImpl) this.tblSearchPostProcessResults.getModel()).getFeatures();
     				Feature feature = features.get(selectedRow);
     				ExpressionBuilder builder = ExpressionUtils.createExpressionBuilder();
     				FeatureType ftype = this.store.getDefaultFeatureType();
     				FeatureType ftype = this.postProcessStore.getDefaultFeatureType();
     				for (FeatureAttributeDescriptor attrdesc : ftype.getPrimaryKey()) {
     					builder.and(
     						builder.eq(
-...
     				return null;
+    			}
     		} else {
     			if (this.currentPostProcess == null) {
     				return null;
+    			}
     			int selectedRow = this.tblSearchPostProcessResults.getSelectedRow();
     			int selectedRow = this.tblResults.getSelectedRow();
     			if (selectedRow < 0) {
     				return null;
+    			}
     			try {
     				List<Feature> features = ((SimpleFeaturesTableModelImpl) this.tblSearchPostProcessResults.getModel()).getFeatures();
     				List<Feature> features = ((SimpleFeaturesTableModelImpl) this.tblResults.getModel()).getFeatures();
     				Feature feature = features.get(selectedRow);
     				ExpressionBuilder builder = ExpressionUtils.createExpressionBuilder();
     				FeatureType ftype = this.postProcessStore.getDefaultFeatureType();
     				FeatureType ftype = this.store.getDefaultFeatureType();
     				for (FeatureAttributeDescriptor attrdesc : ftype.getPrimaryKey()) {
     					builder.and(
     						builder.eq(
-...
     		if (!this.initialized) { //this.conditionPanels == null) {
     			return 0;
+    		}
     		if (this.currentPostProcess == null || this.tabResults.getSelectedIndex() == 0) {
     			return this.tblResults.getSelectedRowCount();
     		if (this.currentPostProcess != null && this.tabResults.getSelectedIndex() == 1) {
             		return this.tblSearchPostProcessResults.getSelectedRowCount();
+    		}
     		return this.tblSearchPostProcessResults.getSelectedRowCount();
                     return this.tblResults.getSelectedRowCount();
+    	}
     	@Override
-...
             query.retrievesAllAttributes();
             return query;
+        }
         @Override
         public void addResultPanel(String name, String title, Component component) {
             int index = -1;
             if( this.additionalResultsPanels.containsKey(name) ) {
                 index = this.additionalResultsPanels.get(name).getIndex();
+            }
             AdditionalResultsPanel panel = new AdditionalResultsPanel(name, title, component, index);
             this.additionalResultsPanels.put(name, panel);
             if( this.initialized ) {
                 if( index < 0 ) {
                     panel.setIndex(this.tabResults.getTabCount());
                     this.tabResults.addTab(panel.getTitle(), panel.asJComponent());
                 } else {
                     this.tabResults.setComponentAt(index, panel.asJComponent());
                     this.tabResults.setTitleAt(index, panel.getTitle());
+                }
+            }
+        }
         @Override
         public void removeResultPanel(String name) {
             int index = -1;
             if( this.additionalResultsPanels.containsKey(name) ) {
                 index = this.additionalResultsPanels.get(name).getIndex();
+            }
             this.additionalResultsPanels.remove(name);
             if( this.initialized ) {
                 this.tabResults.removeTabAt(index);
+            }
+        }
         @Override
         public DALActionFactory.DALActionContext getSearchActionContext() {
             return new SearchActionContext(this);
+        }
         private void fireSearchEvent() {
             ActionEvent e = new ActionEvent(this, 1, "search");
             for (AdditionalResultsPanel additionalResultsPanel : this.additionalResultsPanels.values()) {
                 additionalResultsPanel.fireActionEvent(e);
+            }
+        }
         // https://docs.oracle.com/javase/tutorial/uiswing/components/layeredpane.html
+    }

Also available in: Unified diff