Author: echatellier Date: 2014-03-19 11:22:46 +0100 (Wed, 19 Mar 2014) New Revision: 3896 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/3896 Log: Remove some deprecated/invalid code Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/ResultMappedStorage.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/mexico/xml/EquationDiscreteDomainXMLVisitor.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/filter/SimulationFilterDialog.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/util/JaxxUtil.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/FilterDialogUI.jaxx Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/ResultMappedStorage.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/ResultMappedStorage.java 2014-03-19 10:13:29 UTC (rev 3895) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/ResultMappedStorage.java 2014-03-19 10:22:46 UTC (rev 3896) @@ -119,7 +119,7 @@ protected TopiaContext tx; /** en cle les representation interne (get) en valeur les valeurs decoree (getKey) */ - protected BidiMap cache = new DualHashBidiMap(); + protected BidiMap<Object, Object> cache = new DualHashBidiMap<>(); public EntitySemanticsDecorator() { } Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/mexico/xml/EquationDiscreteDomainXMLVisitor.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/mexico/xml/EquationDiscreteDomainXMLVisitor.java 2014-03-19 10:13:29 UTC (rev 3895) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/mexico/xml/EquationDiscreteDomainXMLVisitor.java 2014-03-19 10:22:46 UTC (rev 3896) @@ -54,7 +54,7 @@ public void visit(Domain domain, Object label, Object value) { String content = (String)value; xmlBuffer.append("<level>"); - xmlBuffer.append(StringEscapeUtils.escapeXml(content)); + xmlBuffer.append(StringEscapeUtils.escapeXml11(content)); xmlBuffer.append("</level>"); } } Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/filter/SimulationFilterDialog.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/filter/SimulationFilterDialog.java 2014-03-19 10:13:29 UTC (rev 3895) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/filter/SimulationFilterDialog.java 2014-03-19 10:22:46 UTC (rev 3896) @@ -66,7 +66,6 @@ // ----------------- Add this code since jaxx compilator don't generate // some code for binding, bug ? TODO Fix me - @SuppressWarnings({"unchecked"}) public void applyDataBinding(String $binding) { if ($binding.equals("reset.enabled")) { if (comboResult != null) { @@ -85,7 +84,6 @@ } else super.removeDataBinding($binding); } - @SuppressWarnings({"unchecked"}) public void processDataBinding(String $dest, boolean $force) { if (!$dest.equals("reset.enabled")) { super.processDataBinding($dest, $force); @@ -103,7 +101,6 @@ private java.beans.PropertyChangeListener $DataSource410 = new jaxx.runtime.DataBindingListener(this, "reset.enabled"); - @SuppressWarnings({"UnusedDeclaration"}) public void $pr$u10(java.awt.event.ItemEvent event) { $DataSource410.propertyChange(null); } Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/util/JaxxUtil.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/util/JaxxUtil.java 2014-03-19 10:13:29 UTC (rev 3895) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/util/JaxxUtil.java 2014-03-19 10:22:46 UTC (rev 3896) @@ -34,7 +34,6 @@ /** some util generic algorithm for jaxx objects */ public class JaxxUtil { - @SuppressWarnings({"unchecked"}) public static void doReset(Map<String, ?> $objectMap) { if ($objectMap == null) return; Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/FilterDialogUI.jaxx =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/FilterDialogUI.jaxx 2014-03-19 10:13:29 UTC (rev 3895) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/FilterDialogUI.jaxx 2014-03-19 10:22:46 UTC (rev 3896) @@ -48,17 +48,15 @@ public FilterParamModel getParamModel(String paramKey) { return model.getParamModel(paramKey); } - @SuppressWarnings({"unchecked"}) + public java.util.List getOriginal() { return model.getOriginal(); } /** @return list of last filter list obtain */ - @SuppressWarnings({"unchecked"}) protected List getFilterResult() { // obtain list filtered return model.getFiltered(); } - @SuppressWarnings({"unchecked"}) public List obtainFilterResult() { // compact dialog setSize(getMinimumSize()); @@ -87,7 +85,6 @@ * * @see FilterModel#reset() */ - @SuppressWarnings({"unchecked"}) public void doReset() { content.doReset(); model.reset();