Changeset 4181 for DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/dao/impl/DBIntegrityServiceImlp.java

Timestamp:

12/11/13 15:59:54 (10 years ago)

Author:

olhsha

Message:

a fragments (of a target) is now a part of the attribute link. The Dao's and unit tests are updated and work. Fixed corrupted pom (there was ill glass-fish dependency that spoiled authentication)

File:

• DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/dao/impl/DBIntegrityServiceImlp.java (modified) (3 diffs)

DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/dao/impl/DBIntegrityServiceImlp.java

@@ -135 +135 @@
     }
 
-    ////////////////////////////////////////////////////////
-    // TODO: refactor, Target grabbing should be made a separate private method
+    
     @Override
     public Annotation getAnnotation(Number annotationID) {
@@ -150 +149 @@
             TargetInfoList sis = new TargetInfoList();
             for (Number targetID : targetIDs) {
-                Target target = targetDao.getTarget(targetID);
-                TargetInfo targetInfo = new TargetInfo();
-                targetInfo.setLink(target.getLink());
-                targetInfo.setRef(target.getURI());
-                targetInfo.setVersion(target.getVersion());
+                TargetInfo targetInfo = getTargetInfoFromTarget(targetDao.getTarget(targetID));
                 sis.getTargetInfo().add(targetInfo);
             }
@@ -547 +542 @@
         return addedPermissions;
     }
+    
+     private TargetInfo getTargetInfoFromTarget(Target target) {
+        TargetInfo targetInfo = new TargetInfo();
+        targetInfo.setRef(target.getURI());
+        targetInfo.setLink(target.getLink());
+        targetInfo.setVersion(target.getVersion());
+        return targetInfo;
+    }
 }