From: Olivier Lamy <olamy@apache.org>
Date: Fri, 23 Mar 2012 14:15:58 +0000 (+0000)
Subject: fix code duplication
X-Git-Tag: archiva-1.4-M3~972
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=e79c008bafd71c233db74a55489ecc63662abc69;p=archiva.git

fix code duplication

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1304361 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js
index 1632acd12..8dc383f42 100644
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js
@@ -779,26 +779,7 @@ $(function() {
     this.version=version;
 
     this.crumbEntries=function(){
-      var splitted = self.groupId.split(".");
-      var breadCrumbEntries=[];
-      var curGroupId="";
-      for (var i=0;i<splitted.length;i++){
-        curGroupId+=splitted[i];
-        breadCrumbEntries.push(new BreadCrumbEntry(curGroupId,splitted[i]));
-        curGroupId+="."
-      }
-      var crumbEntryArtifact=new BreadCrumbEntry(self.groupId,self.artifactId);
-      crumbEntryArtifact.artifactId=self.artifactId;
-      crumbEntryArtifact.artifact=true;
-      breadCrumbEntries.push(crumbEntryArtifact);
-
-      var crumbEntryVersion=new BreadCrumbEntry(self.groupId,self.version);
-      crumbEntryVersion.artifactId=self.artifactId;
-      crumbEntryVersion.artifact=false;
-      crumbEntryVersion.version=self.version;
-      breadCrumbEntries.push(crumbEntryVersion);
-
-      return breadCrumbEntries;
+      return calculateCrumbEntries(self.groupId,self.artifactId,self.version);
     }
 
   }
@@ -887,32 +868,35 @@ $(function() {
     //private String fileExtension;
     this.fileExtension=fileExtension;
 
-    // FIXME it's a copy an paste from Dependency we must extract an "abstract" class with common fields
     this.crumbEntries=function(){
-      var splitted = self.groupId.split(".");
-      var breadCrumbEntries=[];
-      var curGroupId="";
-      for (var i=0;i<splitted.length;i++){
-        curGroupId+=splitted[i];
-        breadCrumbEntries.push(new BreadCrumbEntry(curGroupId,splitted[i]));
-        curGroupId+="."
-      }
-      var crumbEntryArtifact=new BreadCrumbEntry(self.groupId,self.artifactId);
-      crumbEntryArtifact.artifactId=self.artifactId;
-      crumbEntryArtifact.artifact=true;
-      breadCrumbEntries.push(crumbEntryArtifact);
-
-      var crumbEntryVersion=new BreadCrumbEntry(self.groupId,self.version);
-      crumbEntryVersion.artifactId=self.artifactId;
-      crumbEntryVersion.artifact=false;
-      crumbEntryVersion.version=self.version;
-      breadCrumbEntries.push(crumbEntryVersion);
-
-      return breadCrumbEntries;
+      return calculateCrumbEntries(self.groupId,self.artifactId,self.version);
     }
 
   }
 
+  calculateCrumbEntries=function(groupId,artifactId,version){
+    var splitted = groupId.split(".");
+    var breadCrumbEntries=[];
+    var curGroupId="";
+    for (var i=0;i<splitted.length;i++){
+      curGroupId+=splitted[i];
+      breadCrumbEntries.push(new BreadCrumbEntry(curGroupId,splitted[i]));
+      curGroupId+="."
+    }
+    var crumbEntryArtifact=new BreadCrumbEntry(groupId,artifactId);
+    crumbEntryArtifact.artifactId=artifactId;
+    crumbEntryArtifact.artifact=true;
+    breadCrumbEntries.push(crumbEntryArtifact);
+
+    var crumbEntryVersion=new BreadCrumbEntry(groupId,version);
+    crumbEntryVersion.artifactId=artifactId;
+    crumbEntryVersion.artifact=false;
+    crumbEntryVersion.version=version;
+    breadCrumbEntries.push(crumbEntryVersion);
+
+    return breadCrumbEntries;
+  }
+
   mapArtifacts=function(data){
     if (data){
       return $.isArray(data )? $.map(data,function(item){return mapArtifact(item)}) : [data];