import fr.gouv.finances.cp.utils.PropertiesExpansion;
import fr.gouv.finances.dgfip.xemelios.auth.Collectivite;
+import fr.gouv.finances.dgfip.xemelios.auth.XemeliosUser;
import fr.gouv.finances.dgfip.xemelios.auth.impl.std.db.DataHelper;
import fr.gouv.finances.dgfip.xemelios.auth.impl.std.db.DataHelper.CollectiviteLib;
import java.awt.event.ActionEvent;
import java.awt.event.KeyEvent;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.Hashtable;
import javax.swing.AbstractAction;
import javax.swing.JComponent;
private DataHelper.StdUser user;
private TableCollectivitesModel collectivitesUserModel;
private boolean bRet;
+ private XemeliosUser connectedUser;
private PropertiesExpansion applicationProperties;
/** Creates new form DlgCollectivitesUtilisateur */
- public DlgCollectivitesUtilisateur(java.awt.Dialog parent, DataHelper.StdUser user, PropertiesExpansion applicationProperties) {
+ public DlgCollectivitesUtilisateur(java.awt.Dialog parent, DataHelper.StdUser user, PropertiesExpansion applicationProperties, XemeliosUser connectedUser) {
super(parent, "Collectivités", true);
this.user=user;
this.applicationProperties = applicationProperties;
+ this.connectedUser = connectedUser;
collectivitesUserModel = new TableCollectivitesModel(user.getCollectivites());
initComponents();
tblCollectivitesUser.getSelectionModel().addListSelectionListener(new ListSelectionListener() {
+ @Override
public void valueChanged(ListSelectionEvent e) {
pbRemoveCollectivite.setEnabled(tblCollectivitesUser.getSelectedRowCount()>0);
}
}//GEN-LAST:event_pbOkActionPerformed
private void pbAddCollectiviteActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_pbAddCollectiviteActionPerformed
- DlgSelectCollectivite dlg = new DlgSelectCollectivite(this, this.applicationProperties);
+ DlgSelectCollectivite dlg = new DlgSelectCollectivite(this, connectedUser, this.applicationProperties);
if(dlg.run()) {
for(CollectiviteLib coll: dlg.getSelectedData()) {
collectivitesUserModel.addCollectivite(coll);
private void pbRemoveCollectiviteActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_pbRemoveCollectiviteActionPerformed
int[] rows = tblCollectivitesUser.getSelectedRows();
- Arrays.sort(rows);
+ ArrayList<CollectiviteLib> toRemove = new ArrayList<CollectiviteLib>();
for(int i=rows.length-1;i>=0;i--) {
- collectivitesUserModel.removeRow(rows[i]);
+ toRemove.add(collectivitesUserModel.getDataAtRow(tblCollectivitesUser.convertRowIndexToModel(rows[i])));
}
+ collectivitesUserModel.data.removeAll(toRemove);
+ collectivitesUserModel.fireTableDataChanged();
}//GEN-LAST:event_pbRemoveCollectiviteActionPerformed
*/
private static final long serialVersionUID = 1L;
+ @Override
public void actionPerformed(ActionEvent evt) {
pbCancelActionPerformed(evt);
}
this.data=data;
}
+ @Override
public int getRowCount() {
return data.size();
}
+ @Override
public int getColumnCount() {
return 3;
}
+ @Override
public Object getValueAt(int rowIndex, int columnIndex) {
CollectiviteLib coll = data.get(rowIndex);
switch(columnIndex) {
}
return coll;
}
- public CollectiviteLib removeRow(int row) {
- CollectiviteLib ret = data.remove(row);
- fireTableRowsDeleted(row, row);
- return ret;
+ public CollectiviteLib getDataAtRow(int row) {
+ return data.get(row);
}
+// public CollectiviteLib removeRow(int row) {
+// CollectiviteLib ret = data.remove(row);
+// fireTableRowsDeleted(row, row);
+// return ret;
+// }
@Override
public String getColumnName(int column) {