Author: glandais Date: 2008-02-22 16:53:26 +0000 (Fri, 22 Feb 2008) New Revision: 1202 Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/StorageServiceHelper.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/DataEntityModel.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/DetailTableModel.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/ListTabModel.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/QueryModel.java Log: Matching entities&services update Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/StorageServiceHelper.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/StorageServiceHelper.java 2008-02-22 16:51:29 UTC (rev 1201) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/StorageServiceHelper.java 2008-02-22 16:53:26 UTC (rev 1202) @@ -102,15 +102,15 @@ } } - public static MetaData[] getData(SimExplorerContext context, boolean remote, boolean onlyLatest, String query, long newFirstIndex, int width, int rowOrder) { + public static MetaData[] getData(SimExplorerContext context, boolean remote, boolean onlyLatest, String query, long newFirstIndex, int width, String column, boolean ascending) { StorageService service = getService(context, remote); String token = context.getToken(); try { MetaData[] data; if (query == null || query.isEmpty()) { - data = service.findApplications(token, onlyLatest, (int) newFirstIndex, width, rowOrder); + data = service.findApplications(token, onlyLatest, (int) newFirstIndex, width, column, ascending); } else { - data = service.findFullText(token, query, onlyLatest, (int) newFirstIndex, width, rowOrder); + data = service.findFullText(token, query, onlyLatest, (int) newFirstIndex, width, column, ascending); } return data; } catch (SimExplorerException e) { Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/DataEntityModel.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/DataEntityModel.java 2008-02-22 16:51:29 UTC (rev 1201) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/DataEntityModel.java 2008-02-22 16:53:26 UTC (rev 1202) @@ -123,7 +123,7 @@ } // compute type of data - type = EntityHelper.Type.valueOf(le.getMetaData().getType()); + type = EntityHelper.Type.getType(le.getMetaData().getElementClass()); // compute real data selected if (type.isLe()) { @@ -167,7 +167,7 @@ synch(remote, null, null); } else { synch(remote, data.getUuid(), data.getVersion()); - EntityHelper.Type type = EntityHelper.Type.valueOf(data.getType()); + EntityHelper.Type type = EntityHelper.Type.getType(data.getElementClass()); setType(type); } setMeta(data); Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/DetailTableModel.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/DetailTableModel.java 2008-02-22 16:51:29 UTC (rev 1201) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/DetailTableModel.java 2008-02-22 16:53:26 UTC (rev 1202) @@ -18,6 +18,8 @@ * ##% */ package fr.cemagref.simexplorer.is.ui.swing.model; +import fr.cemagref.simexplorer.is.entities.data.Descriptor; +import fr.cemagref.simexplorer.is.entities.data.LoggableElement; import fr.cemagref.simexplorer.is.entities.metadata.MetaData; import static org.codelutin.i18n.I18n._; import static org.codelutin.i18n.I18n.n_; @@ -34,8 +36,8 @@ */ public class DetailTableModel extends AbstractTableModel { - protected MetaData data; - protected List<String> descriptors; + protected LoggableElement data; + protected List<Descriptor> descriptors; private static final long serialVersionUID = -2377632046940030206L; protected final String[] columnNames = { @@ -61,11 +63,10 @@ } if (columnIndex == 0) { // key - result = getDescriptors().get(rowIndex); + result = getDescriptors().get(rowIndex).getName(); } else if (columnIndex == 1) { // value - String propertyDescriptor = getDescriptors().get(rowIndex); - result = data.getDescriptors().get(propertyDescriptor); + result = getDescriptors().get(rowIndex).getValue(); } return result; } @@ -75,18 +76,18 @@ return _(columnNames[column]); } - public List<String> getDescriptors() { + public List<Descriptor> getDescriptors() { if (descriptors == null) { - descriptors = new ArrayList<String>(); + descriptors = new ArrayList<Descriptor>(); } return descriptors; } - public void setData(MetaData data) { + public void setData(LoggableElement data) { this.data = data; getDescriptors().clear(); if (data != null) { - getDescriptors().addAll(data.getDescriptors().keySet()); + getDescriptors().addAll(data.getDescriptors()); Collections.sort(getDescriptors()); } } Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/ListTabModel.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/ListTabModel.java 2008-02-22 16:51:29 UTC (rev 1201) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/ListTabModel.java 2008-02-22 16:53:26 UTC (rev 1202) @@ -136,7 +136,7 @@ queryModel = getQuery(); // obtain datas from service - MetaData[] data = StorageServiceHelper.getData(context, remote, queryModel.isOnlyLatest(), queryModel.getQuery(), (int) model.getFirstIndex(), model.getWidth(), queryModel.getDateOrder()); + MetaData[] data = StorageServiceHelper.getData(context, remote, queryModel.isOnlyLatest(), queryModel.getQuery(), (int) model.getFirstIndex(), model.getWidth(), queryModel.getSortColumn().getColumn(), queryModel.isSortAscending()); // save in model setList(data); Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/QueryModel.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/QueryModel.java 2008-02-22 16:51:29 UTC (rev 1201) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/QueryModel.java 2008-02-22 16:53:26 UTC (rev 1202) @@ -17,6 +17,7 @@ * ##% */ package fr.cemagref.simexplorer.is.ui.swing.model; +import fr.cemagref.simexplorer.is.storage.SortColumn; import fr.cemagref.simexplorer.is.storage.database.DatabaseConstants; import java.io.Serializable; @@ -34,7 +35,9 @@ protected boolean onlyLatest = true; - protected int dateOrder = DatabaseConstants.SORT_DATE_NONE; + protected SortColumn sortColumn = SortColumn.None; + + protected boolean sortAscending = true; private static final long serialVersionUID = -5018101346037499469L; @@ -42,8 +45,8 @@ return query != null && !query.isEmpty(); } - public int getDateOrder() { - return dateOrder; + public SortColumn getSortColumn() { + return sortColumn; } public boolean isOnlyLatest() { @@ -58,10 +61,18 @@ return simpleQuery; } - public void setDateOrder(int dateOrder) { - this.dateOrder = dateOrder; + public void setSortColumn(SortColumn sortColumn) { + this.sortColumn = sortColumn; } + public boolean isSortAscending() { + return sortAscending; + } + + public void setSortAscending(boolean sortAscending) { + this.sortAscending = sortAscending; + } + public void setOnlyLatest(boolean onlyLatest) { this.onlyLatest = onlyLatest; } @@ -78,6 +89,7 @@ simpleQuery = true; query = null; onlyLatest = true; - dateOrder = -1; + sortColumn = SortColumn.None; + sortAscending = true; } }