Menu
▾
▴
[Fudaa-svn-commit] SF.net SVN: fudaa:[7504] trunk/soft/fudaa-crue
|
From: <de...@us...> - 2012-07-17 14:51:09
|
Revision: 7504
http://fudaa.svn.sourceforge.net/fudaa/?rev=7504&view=rev
Author: deniger
Date: 2012-07-17 14:50:58 +0000 (Tue, 17 Jul 2012)
Log Message:
-----------
Support edition branche et changement de type
Modified Paths:
--------------
trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/edition/UniqueNomFinder.java
trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/validation/ValidationHelper.java
trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/view/PropertyEditorPanel.java
trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/list/PropertySupportSection.java
Modified: trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/edition/UniqueNomFinder.java
===================================================================
--- trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/edition/UniqueNomFinder.java 2012-07-17 14:50:26 UTC (rev 7503)
+++ trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/edition/UniqueNomFinder.java 2012-07-17 14:50:58 UTC (rev 7504)
@@ -22,8 +22,8 @@
* @author deniger ( genesis)
*/
public class UniqueNomFinder {
+
private static final String SEPARATOR = "_";
-
private int minDigits = 4;
/**
@@ -226,8 +226,11 @@
public int findMaxIdentifier(Collection<String> noms, String prefix) {
int res = 0;
for (String nom : noms) {
- if (nom.startsWith(prefix)) {
+ if (!nom.equals(prefix) && nom.startsWith(prefix)) {
String suffix = nom.substring(prefix.length());
+ if (suffix.length() > 0 && suffix.charAt(0) == '_') {
+ suffix = suffix.substring(1);
+ }
int id = 0;
try {
id = Integer.parseInt(suffix);
Modified: trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/validation/ValidationHelper.java
===================================================================
--- trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/validation/ValidationHelper.java 2012-07-17 14:50:26 UTC (rev 7503)
+++ trunk/soft/fudaa-crue/crue-server/src/main/java/org/fudaa/dodico/crue/validation/ValidationHelper.java 2012-07-17 14:50:58 UTC (rev 7504)
@@ -10,6 +10,7 @@
import java.util.Set;
import org.apache.commons.beanutils.PropertyUtils;
+import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang.StringUtils;
import org.fudaa.ctulu.CtuluLog;
import org.fudaa.ctulu.CtuluLogGroup;
@@ -112,6 +113,10 @@
validateObject(BusinessMessages.getString("valid.ElemSeuilAvecPdc", Integer.toString(++idx)), analyze, elemSeuil, propsContainer);
}
}
+ if (CollectionUtils.isEmpty(elemSeuils)) {
+ analyze.addSevereError("valid.ElemSeuilAvecPdcEmpy.Error");
+
+ }
} else if (o.getClass().equals(DonCalcSansPrtBrancheSeuilTransversal.class)) {
DonCalcSansPrtBrancheSeuilTransversal dcsp = (DonCalcSansPrtBrancheSeuilTransversal) o;
List<ElemSeuilAvecPdc> elemSeuils = dcsp.getElemSeuilAvecPdc();
@@ -121,6 +126,10 @@
validateObject(BusinessMessages.getString("valid.ElemSeuilAvecPdc", Integer.toString(++idx)), analyze, elemSeuil, propsContainer);
}
}
+ if (CollectionUtils.isEmpty(elemSeuils)) {
+ analyze.addSevereError("valid.ElemSeuilAvecPdcEmpy.Error");
+
+ }
} else if (o.getClass().equals(DonCalcSansPrtBrancheBarrageFilEau.class)) {
DonCalcSansPrtBrancheBarrageFilEau dcsp = (DonCalcSansPrtBrancheBarrageFilEau) o;
Collection<ElemSeuil> elemSeuils = dcsp.getElemSeuil();
@@ -130,6 +139,10 @@
validateObject(BusinessMessages.getString("valid.ElemSeuil", Integer.toString(++idx)), analyze, elemSeuil, propsContainer);
}
}
+ if (CollectionUtils.isEmpty(elemSeuils)) {
+ analyze.addSevereError("valid.ElemSeuilEmpy.Error");
+
+ }
}
}
Modified: trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/view/PropertyEditorPanel.java
===================================================================
--- trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/view/PropertyEditorPanel.java 2012-07-17 14:50:26 UTC (rev 7503)
+++ trunk/soft/fudaa-crue/ui-common/src/main/java/org/fudaa/fudaa/crue/common/view/PropertyEditorPanel.java 2012-07-17 14:50:58 UTC (rev 7504)
@@ -4,19 +4,14 @@
*/
package org.fudaa.fudaa.crue.common.view;
-import com.memoire.bu.BuTextField;
import java.awt.BorderLayout;
-import java.awt.FlowLayout;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
-import java.beans.PropertyDescriptor;
-import java.lang.reflect.InvocationTargetException;
import java.util.*;
import javax.swing.*;
import javax.swing.event.DocumentEvent;
import javax.swing.event.DocumentListener;
import org.apache.commons.beanutils.PropertyUtils;
-import org.apache.commons.beanutils.PropertyUtilsBean;
import org.apache.commons.lang.StringUtils;
import org.fudaa.ctulu.CtuluLog;
import org.fudaa.ctulu.CtuluLogLevel;
@@ -98,7 +93,7 @@
@Override
public void setEditable(boolean b) {
- cb.setEnabled(false);
+ cb.setEnabled(b);
}
@Override
Modified: trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/list/PropertySupportSection.java
===================================================================
--- trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/list/PropertySupportSection.java 2012-07-17 14:50:26 UTC (rev 7503)
+++ trunk/soft/fudaa-crue/ui-modelling/src/main/java/org/fudaa/fudaa/crue/modelling/list/PropertySupportSection.java 2012-07-17 14:50:58 UTC (rev 7504)
@@ -114,10 +114,13 @@
public void setAsText(String string) {
setValue(string);
}
- String[] coeurs;
+ String[] sectionNames;
@Override
public String[] getTags() {
+ if (!canWrite()) {
+ return null;
+ }
List<String> sectionNames = new ArrayList<String>();
Node[] nodes = node.getParentNode().getChildren().getNodes();
for (Node casierNode : nodes) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
