Revision 44836
| trunk/org.gvsig.desktop/org.gvsig.desktop.plugin/org.gvsig.app/org.gvsig.app.mainplugin/src/main/resources-plugin/i18n/text.properties | ||
|---|---|---|
| 1446 | 1446 |
_H2_Spatial_loading_parameters=Par\u00e1metros de carga de H2-Spatial |
| 1447 | 1447 |
_DBF_loading_parameters=Par\u00e1metros de carga del DBF |
| 1448 | 1448 |
_SHP_loading_parameters=Par\u00e1metros de carga del SHP |
| 1449 |
_Errors_occurred_during_search=Se han producido errores durante la busqueda |
|
| trunk/org.gvsig.desktop/org.gvsig.desktop.plugin/org.gvsig.app/org.gvsig.app.mainplugin/src/main/resources-plugin/i18n/text_en.properties | ||
|---|---|---|
| 1366 | 1366 |
_H2_Spatial_loading_parameters=H2-Spatial loading parameters |
| 1367 | 1367 |
_DBF_loading_parameters=DBF loading parameters |
| 1368 | 1368 |
_SHP_loading_parameters=SHP loading parameters |
| 1369 |
_Errors_occurred_during_search=Errors occurred during search |
|
| trunk/org.gvsig.desktop/org.gvsig.desktop.library/org.gvsig.expressionevaluator/org.gvsig.expressionevaluator.lib/org.gvsig.expressionevaluator.lib.api/src/main/java/org/gvsig/expressionevaluator/spi/AbstractSymbolTable.java | ||
|---|---|---|
| 88 | 88 |
if (this.symbolTables.contains(symbolTable)) {
|
| 89 | 89 |
return false; |
| 90 | 90 |
} |
| 91 |
this.symbolTables.add(symbolTable); |
|
| 91 |
this.symbolTables.add(0,symbolTable);
|
|
| 92 | 92 |
return true; |
| 93 | 93 |
} |
| 94 | 94 |
|
| trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.dal/org.gvsig.fmap.dal.impl/src/test/java/org/gvsig/expressionevaluator/TestExpressionBuilder.java | ||
|---|---|---|
| 98 | 98 |
assertEquals("EXISTS(SELECT(TUPLE(\"LID_ACCIDENTE\"), \"ARENA2_VEHICULOS\", ((\"ARENA2_VEHICULOS\".\"ID_ACCIDENTE\" = \"ARENA2_ACCIDENTES\".\"LID_ACCIDENTE\") AND (\"MODELO\" = '307')), TUPLE(), TUPLE(), 1), 'EXISTS123')", code.toString());
|
| 99 | 99 |
} |
| 100 | 100 |
|
| 101 |
public void testForeintValue1() {
|
|
| 102 |
DataManager dataManager = DALLocator.getDataManager(); |
|
| 103 |
DALExpressionBuilder builder = dataManager.createDALExpressionBuilder(); |
|
| 104 |
|
|
| 105 |
ExpressionBuilder.Function value = builder.foreing_value("SENTIDO", "DESCRIPCION");
|
|
| 106 |
String s = value.toString(new DALFormatter()); |
|
| 107 |
assertEquals("FOREING_VALUE(ARRAY['SENTIDO','DESCRIPCION'])", s);
|
|
| 108 |
|
|
| 109 |
} |
|
| 101 | 110 |
} |
| 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/featuretable/SimpleFeaturesTableModel.java | ||
|---|---|---|
| 31 | 31 |
private final List<String> columnNames; |
| 32 | 32 |
private final FeatureType featureType; |
| 33 | 33 |
private FilteredLogger logger; |
| 34 |
private boolean errors; |
|
| 34 | 35 |
|
| 35 | 36 |
public SimpleFeaturesTableModel(FeatureStore store) throws DataException {
|
| 36 | 37 |
this(store.getDefaultFeatureType(), null, store.getFeatures()); |
| ... | ... | |
| 45 | 46 |
this.logger = new FilteredLogger(LOGGER, "SimpleFeaturesTableModel", 10); |
| 46 | 47 |
this.features = features; |
| 47 | 48 |
this.featureType = featureType; |
| 49 |
this.errors = false; |
|
| 48 | 50 |
if (columnNames == null || columnNames.isEmpty()) {
|
| 49 | 51 |
this.columnNames = new ArrayList<>(); |
| 50 | 52 |
Search search = (Search) ToolsLocator.getComplementsManager().get( |
| ... | ... | |
| 72 | 74 |
if (this.features == null) {
|
| 73 | 75 |
return 0; |
| 74 | 76 |
} |
| 75 |
return this.features.size(); |
|
| 77 |
try {
|
|
| 78 |
return this.features.size(); |
|
| 79 |
} catch(Throwable ex) {
|
|
| 80 |
this.errors = true; |
|
| 81 |
LOGGER.warn("Can't calculate row count.",ex);
|
|
| 82 |
return 0; |
|
| 83 |
} |
|
| 76 | 84 |
} |
| 77 | 85 |
|
| 86 |
public boolean hasErrors() {
|
|
| 87 |
return this.errors; |
|
| 88 |
} |
|
| 89 |
|
|
| 78 | 90 |
@Override |
| 79 | 91 |
public int getColumnCount() {
|
| 80 | 92 |
return this.columnNames.size(); |
| ... | ... | |
| 163 | 175 |
} |
| 164 | 176 |
return value; |
| 165 | 177 |
} catch (Throwable th) {
|
| 178 |
this.errors = true; |
|
| 166 | 179 |
logger.warn("Can't get cell value at "+rowIndex+", "+columnIndex+".", th);
|
| 167 | 180 |
return null; |
| 168 | 181 |
} |
| 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/DefaultSearchPanel.java | ||
|---|---|---|
| 658 | 658 |
} finally {
|
| 659 | 659 |
SwingUtilities.invokeLater(() -> {
|
| 660 | 660 |
I18nManager i18n = ToolsLocator.getI18nManager(); |
| 661 |
TableModel m = (TableModel) model.getValue();
|
|
| 661 |
SimpleFeaturesTableModel m = (SimpleFeaturesTableModel) model.getValue();
|
|
| 662 | 662 |
tblResults.setModel(m); |
| 663 |
lblMsg.setText(String.format("%d " + i18n.getTranslation("_elements"), m.getRowCount()));
|
|
| 663 |
if( m.hasErrors() ) {
|
|
| 664 |
lblMsg.setText("_Errors_occurred_during_search");
|
|
| 665 |
} else {
|
|
| 666 |
lblMsg.setText(String.format("%d " + i18n.getTranslation("_elements"), m.getRowCount()));
|
|
| 667 |
} |
|
| 664 | 668 |
setEnabled(true); |
| 665 | 669 |
}); |
| 666 | 670 |
if (this.parameters != null && this.parameters.getQuery() != null) {
|
Also available in: Unified diff