Author: sletellier Date: 2012-01-26 15:40:44 +0100 (Thu, 26 Jan 2012) New Revision: 38 Url: http://forge.codelutin.com/repositories/revision/jmexico/38 Log: #789 Render factor with name Modified: trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/InputDesignTableModel.java trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/MexicoDecoratorProvider.java Modified: trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/InputDesignTableModel.java =================================================================== --- trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/InputDesignTableModel.java 2012-01-24 13:39:06 UTC (rev 37) +++ trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/InputDesignTableModel.java 2012-01-26 14:40:44 UTC (rev 38) @@ -75,7 +75,7 @@ @Override public int compare(Factor o1, Factor o2) { - return o1.getId().compareTo(o2.getId()); + return o1.getName().compareTo(o2.getName()); } }); Modified: trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/MexicoDecoratorProvider.java =================================================================== --- trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/MexicoDecoratorProvider.java 2012-01-24 13:39:06 UTC (rev 37) +++ trunk/jmexico-editor/src/main/java/fr/reseaumexico/editor/MexicoDecoratorProvider.java 2012-01-26 14:40:44 UTC (rev 38) @@ -32,6 +32,6 @@ @Override protected void loadDecorators() { - registerJXPathDecorator(Factor.class, "${" + Factor.PROPERTY_ID + "}$s"); + registerJXPathDecorator(Factor.class, "${" + Factor.PROPERTY_NAME + "}$s"); } }