[Jtimer-commits] r2996 - in branches/ng-jtimer/src/main: java/org/chorem/jtimer/entities java/org/chorem/jtimer/web webapp/js

6 Jun 2014

Author: obruce
Date: 2014-06-06 11:15:16 +0200 (Fri, 06 Jun 2014)
New Revision: 2996

Url: http://forge.chorem.org/projects/jtimer/repository/revisions/2996

Log:
Changement Pair, correction controller upTask


Removed:
   branches/ng-jtimer/src/main/java/org/chorem/jtimer/entities/Pair.java
Modified:
   branches/ng-jtimer/src/main/java/org/chorem/jtimer/entities/TodoList.java
   branches/ng-jtimer/src/main/java/org/chorem/jtimer/web/RestApplication.java
   branches/ng-jtimer/src/main/java/org/chorem/jtimer/web/TiersServerResource.java
   branches/ng-jtimer/src/main/java/org/chorem/jtimer/web/TimeResource.java
   branches/ng-jtimer/src/main/webapp/js/controllers.js

Deleted: branches/ng-jtimer/src/main/java/org/chorem/jtimer/entities/Pair.java
===================================================================

--- branches/ng-jtimer/src/main/java/org/chorem/jtimer/entities/Pair.java	2014-06-05 16:19:13 UTC (rev 2995)
+++ branches/ng-jtimer/src/main/java/org/chorem/jtimer/entities/Pair.java	2014-06-06 09:15:16 UTC (rev 2996)
@@ -1,46 +0,0 @@
-package org.chorem.jtimer.entities;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-/**
- * Created by olivia on 05/06/14.
- * <p/>
- * Project name : jtimer
- * <p/>
- * Package name : org.chorem.jtimer.entities
- *
- * Cette classe represente un duo d'element type cle/valeur
- * @param <K> la cle
- * @param <V> la valeur
- */
-public class Pair<K,V>{
-
-    protected static final Log log = LogFactory.getLog(Pair.class);
-
-    private K key; //la clef de la pair
-    private V value; //la valeur de la pair
-
-    public Pair(K key, V value){
-        this.key = key;
-        this.value = value;
-
-        log.info(this.key.toString() + this.value.toString());
-    }
-
-    public V getValue() {
-        return value;
-    }
-
-    public void setValue(V value) {
-        this.value = value;
-    }
-
-    public K getKey() {
-        return key;
-    }
-
-    public void setKey(K key) {
-        this.key = key;
-    }
-}

Modified: branches/ng-jtimer/src/main/java/org/chorem/jtimer/entities/TodoList.java
===================================================================
--- branches/ng-jtimer/src/main/java/org/chorem/jtimer/entities/TodoList.java	2014-06-05 16:19:13 UTC (rev 2995)
+++ branches/ng-jtimer/src/main/java/org/chorem/jtimer/entities/TodoList.java	2014-06-06 09:15:16 UTC (rev 2996)
@@ -1,7 +1,9 @@
 package org.chorem.jtimer.entities;
 
-import java.util.LinkedList;
+import org.apache.commons.lang3.tuple.Pair;
+
 import java.util.Queue;
+import java.util.concurrent.LinkedTransferQueue;
 
 /**
  * Created by olivia on 03/06/14.
@@ -34,12 +36,12 @@
      */
     private TodoList(){
 
-        createdTasks = new LinkedList<>();
-        updatedTasks = new LinkedList<>();
-        deletedTasks = new LinkedList<>();
-        createdTimes = new LinkedList<>();
-        updatedTimes = new LinkedList<>();
-        deletedTimes = new LinkedList<>();
+        createdTasks = new LinkedTransferQueue<>();
+        updatedTasks = new LinkedTransferQueue<>();
+        deletedTasks = new LinkedTransferQueue<>();
+        createdTimes = new LinkedTransferQueue<>();
+        updatedTimes = new LinkedTransferQueue<>();
+        deletedTimes = new LinkedTransferQueue<>();
 
     }
 
@@ -71,7 +73,7 @@
         deletedTasks.add(taskId);
     }
 
-    public void pushCreatedTime(Pair<String,String> time) {
+    public void pushCreatedTime(Pair time) {
         createdTimes.add(time);
     }
 

Modified: branches/ng-jtimer/src/main/java/org/chorem/jtimer/web/RestApplication.java
===================================================================
--- branches/ng-jtimer/src/main/java/org/chorem/jtimer/web/RestApplication.java	2014-06-05 16:19:13 UTC (rev 2995)
+++ branches/ng-jtimer/src/main/java/org/chorem/jtimer/web/RestApplication.java	2014-06-06 09:15:16 UTC (rev 2996)
@@ -1,8 +1,8 @@
 package org.chorem.jtimer.web;
 
+import org.apache.commons.lang3.tuple.Pair;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.chorem.jtimer.entities.Pair;
 import org.chorem.jtimer.entities.TodoList;
 import org.chorem.jtimer.storage.Storage;
 import org.restlet.Application;
@@ -25,7 +25,7 @@
     protected static final Log log = LogFactory.getLog(RestApplication.class);
 
     /** Determine si la connexion est établie */ //TODO obruce 05/06/2014 to change when configuration available
-    protected boolean connected = false;
+    protected boolean connected = true;
 
     /** Todolist instance */
     protected TodoList todoList;
@@ -66,11 +66,12 @@
         
         context.getAttributes().put(Storage.class.getName(), storage);
 
+        //initialisation de la todoList
+        todoList = TodoList.getInstance();
 
         //Initialisation du timer
         timer.schedule(new TodoTask(), new Date(), (long) 10000); //TODO obruce change timer time
 
-        todoList = TodoList.getInstance();
     }
 
     /**

Modified: branches/ng-jtimer/src/main/java/org/chorem/jtimer/web/TiersServerResource.java
===================================================================
--- branches/ng-jtimer/src/main/java/org/chorem/jtimer/web/TiersServerResource.java	2014-06-05 16:19:13 UTC (rev 2995)
+++ branches/ng-jtimer/src/main/java/org/chorem/jtimer/web/TiersServerResource.java	2014-06-06 09:15:16 UTC (rev 2996)
@@ -1,5 +1,6 @@
 package org.chorem.jtimer.web;
 
+import org.apache.commons.lang3.tuple.Pair;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.http.client.methods.CloseableHttpResponse;
@@ -10,7 +11,6 @@
 import org.apache.http.entity.StringEntity;
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClients;
-import org.chorem.jtimer.entities.Pair;
 
 /**
  * Created by olivia on 03/06/14.
@@ -134,14 +134,14 @@
     }
 
 
-    public boolean postTime(Pair<String, String> time) {
+    public boolean postTime(Pair time) {
 
         boolean success = false;
 
         CloseableHttpClient httpclient = HttpClients.createDefault();
         HttpPost httpPost = new HttpPost(path+ "time/"+ time.getKey()+dispatch);
 
-        StringEntity myEntity = new StringEntity(time.getValue(),ContentType.create("application/json", "UTF-8"));
+        StringEntity myEntity = new StringEntity((String) time.getValue(),ContentType.create("application/json", "UTF-8"));
 
         //On ajoute l'entite
         httpPost.setEntity(myEntity);

Modified: branches/ng-jtimer/src/main/java/org/chorem/jtimer/web/TimeResource.java
===================================================================
--- branches/ng-jtimer/src/main/java/org/chorem/jtimer/web/TimeResource.java	2014-06-05 16:19:13 UTC (rev 2995)
+++ branches/ng-jtimer/src/main/java/org/chorem/jtimer/web/TimeResource.java	2014-06-06 09:15:16 UTC (rev 2996)
@@ -9,9 +9,9 @@
 import com.google.gson.JsonPrimitive;
 import com.google.gson.JsonSerializationContext;
 import com.google.gson.JsonSerializer;
+import org.apache.commons.lang3.tuple.Pair;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.chorem.jtimer.entities.Pair;
 import org.chorem.jtimer.entities.TimerTime;
 import org.chorem.jtimer.entities.TodoList;
 import org.chorem.jtimer.storage.Storage;
@@ -144,7 +144,7 @@
 
             if (dispatch) {
                 String taskId = (String) getRequest().getAttributes().get("taskId");
-                Pair p = new Pair<String, String>(taskId, jsonRepr);
+                Pair p = Pair.of(taskId, jsonRepr);
                 log.info(" la pair cree" + p.toString()+ p.getKey().toString()+p.getValue().toString());
                 todoList.pushCreatedTime(p);
             }
@@ -170,7 +170,7 @@
 
             if (dispatch) {
                 String taskId = (String) getRequest().getAttributes().get("taskId");
-                todoList.pushUpdatedTime(new Pair<String, String>(taskId, jsonRepr));
+                todoList.pushUpdatedTime(Pair.of(taskId, jsonRepr));
             }
         }
 

Modified: branches/ng-jtimer/src/main/webapp/js/controllers.js
===================================================================
--- branches/ng-jtimer/src/main/webapp/js/controllers.js	2014-06-05 16:19:13 UTC (rev 2995)
+++ branches/ng-jtimer/src/main/webapp/js/controllers.js	2014-06-06 09:15:16 UTC (rev 2996)
@@ -212,6 +212,7 @@
      */
     var updateTasksFromServ = function(){
         console.log("updateTasksFromServ debut");
+
         serverTaskAccess.query({date : ($scope.taskAccess-delayAccess)}, function (response) {
 
             angular.forEach(response, function (item) {
@@ -234,7 +235,7 @@
 
                 }else if(item.removed == 0){
 
-                    console.log("Nouvelle tache" +item);
+                    console.log("Nouvelle tache" +item.name);
 
                     var newTask = new Task( item.name, item.taskId, item.parent);
 
@@ -249,12 +250,15 @@
 
                     }else{
                         //Un noeud avec un parent est ajoute à l'arbre de son parent
-                        $scope.data.tasks[newTask.taskId] = newTask;
-                        save();
 
                         //On ajoute le node à l'arbre
-                        if ($scope.tree) {
-                            $scope.tree.getNode(item.parent).addChild($scope.createTreeNode(newTask));
+                        if ($scope.tree.getNode(item.parent)) {
+                             $scope.data.tasks[newTask.taskId] = newTask;
+                             save();
+                             $scope.tree.getNode(item.parent).addChild($scope.createTreeNode(newTask));
+                        }else{
+                            $scope.data.tasks[newTask.taskId] = newTask;
+                            save();
                         }
 
                         //Les temps sont recuperes du serveur

    

[Jtimer-commits] r2996 - in branches/ng-jtimer/src/main: java/org/chorem/jtimer/entities java/org/chorem/jtimer/web webapp/js

obruce＠users.chorem.org