[Fudaa-svn-commit] SF.net SVN: fudaa:[7690] trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa /fudaa/tr

[<de...@us...>]

Revision: 7690
          http://fudaa.svn.sourceforge.net/fudaa/?rev=7690&view=rev
Author:   deniger
Date:     2012-10-02 20:34:57 +0000 (Tue, 02 Oct 2012)
Log Message:
-----------
correction position labels

Modified Paths:
--------------
    trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/TrLauncherDefault.java
    trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/data/TrPostDataCreatedPlus.java

Modified: trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/TrLauncherDefault.java
===================================================================
--- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/TrLauncherDefault.java	2012-10-02 19:34:57 UTC (rev 7689)
+++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/TrLauncherDefault.java	2012-10-02 20:34:57 UTC (rev 7690)
@@ -73,8 +73,8 @@
 
     infoSoft = new BuInformationsSoftware();
     infoSoft.name = "prepro";
-    infoSoft.version = "1.2RC13";
-    infoSoft.date = "2012-08-28";
+    infoSoft.version = "1.2RC14";
+    infoSoft.date = "2012-10-02";
     infoSoft.rights = TrResource.getS("Tous droits r\xE9serv\xE9s") + ". CETMEF (c)2003-2009";
     infoSoft.contact = "fre...@fu...";
     infoSoft.license = "GPL2";

Modified: trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/data/TrPostDataCreatedPlus.java
===================================================================
--- trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/data/TrPostDataCreatedPlus.java	2012-10-02 19:34:57 UTC (rev 7689)
+++ trunk/soft/fudaa-prepro/ui/src/main/java/org/fudaa/fudaa/tr/post/data/TrPostDataCreatedPlus.java	2012-10-02 20:34:57 UTC (rev 7690)
@@ -53,6 +53,9 @@
   @Override
   public double buildDataFor(final int _idxTime, final int _idxObject) {
     try {
+      if (src_.isElementVar(v1_) != src_.isElementVar(v2_)) {
+        return buildDataFor(_idxTime).getValue(_idxObject);
+      }
       return src_.getData(v1_, _idxTime, _idxObject) + src_.getData(v2_, _idxTime, _idxObject);
     } catch (final IOException _e) {
       FuLog.warning(_e);

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.