Author: olamy
Date: Fri Mar 23 14:15:58 2012
New Revision: 1304361
URL: http://svn.apache.org/viewvc?rev=1304361&view=rev
Log:
fix code duplication
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js?rev=1304361&r1=1304360&r2=1304361&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js
Fri Mar 23 14:15:58 2012
@@ -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,30 +868,33 @@ $(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 calculateCrumbEntries(self.groupId,self.artifactId,self.version);
+ }
+
+ }
- return breadCrumbEntries;
+ 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){
