From: Olivier Lamy Date: Fri, 17 Feb 2012 15:40:41 +0000 (+0000) Subject: rename class. it's always complicated to find the good name but the previous was... X-Git-Tag: archiva-1.4-M3~1259 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=fa2a45d627d1161b7a710efb511d3f57512aa7ae;p=archiva.git rename class. it's always complicated to find the good name but the previous was very bad :-). git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1245618 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/model/BrowseIdEntry.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/model/BrowseIdEntry.java deleted file mode 100644 index 598a4fd2a..000000000 --- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/model/BrowseIdEntry.java +++ /dev/null @@ -1,71 +0,0 @@ -package org.apache.archiva.rest.api.model; -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -import javax.xml.bind.annotation.XmlRootElement; - -/** - * @author Olivier Lamy - * @since 1.4-M3 - */ -@XmlRootElement( name = "browseIdEntry" ) -public class BrowseIdEntry - implements Comparable -{ - - private String name; - - private boolean project; - - public BrowseIdEntry() - { - // no op - } - - public BrowseIdEntry( String name, boolean project ) - { - this.name = name; - this.project = project; - } - - public String getName() - { - return name; - } - - public void setName( String name ) - { - this.name = name; - } - - public boolean isProject() - { - return project; - } - - public void setProject( boolean project ) - { - this.project = project; - } - - public int compareTo( BrowseIdEntry browseGroupIdEntry ) - { - return this.name.compareTo( browseGroupIdEntry.name ); - } -} diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/model/BrowseResult.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/model/BrowseResult.java index b7a9cdd5b..57dcd4943 100644 --- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/model/BrowseResult.java +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/model/BrowseResult.java @@ -29,25 +29,25 @@ import java.util.List; @XmlRootElement( name = "browseResult" ) public class BrowseResult { - private List browseIdEntries; + private List browseResultEntries; public BrowseResult() { // no op } - public BrowseResult( List browseIdEntries ) + public BrowseResult( List browseResultEntries ) { - this.browseIdEntries = browseIdEntries; + this.browseResultEntries = browseResultEntries; } - public List getBrowseIdEntries() + public List getBrowseResultEntries() { - return browseIdEntries == null ? Collections.emptyList() : browseIdEntries; + return browseResultEntries == null ? Collections.emptyList() : browseResultEntries; } - public void setBrowseIdEntries( List browseIdEntries ) + public void setBrowseResultEntries( List browseResultEntries ) { - this.browseIdEntries = browseIdEntries; + this.browseResultEntries = browseResultEntries; } } diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/model/BrowseResultEntry.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/model/BrowseResultEntry.java new file mode 100644 index 000000000..be7eae2b6 --- /dev/null +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/model/BrowseResultEntry.java @@ -0,0 +1,71 @@ +package org.apache.archiva.rest.api.model; +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import javax.xml.bind.annotation.XmlRootElement; + +/** + * @author Olivier Lamy + * @since 1.4-M3 + */ +@XmlRootElement( name = "browseResultEntry" ) +public class BrowseResultEntry + implements Comparable +{ + + private String name; + + private boolean project; + + public BrowseResultEntry() + { + // no op + } + + public BrowseResultEntry( String name, boolean project ) + { + this.name = name; + this.project = project; + } + + public String getName() + { + return name; + } + + public void setName( String name ) + { + this.name = name; + } + + public boolean isProject() + { + return project; + } + + public void setProject( boolean project ) + { + this.project = project; + } + + public int compareTo( BrowseResultEntry browseGroupResultEntry ) + { + return this.name.compareTo( browseGroupResultEntry.name ); + } +} diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultBrowseService.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultBrowseService.java index 5545add34..b269a564e 100644 --- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultBrowseService.java +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultBrowseService.java @@ -21,7 +21,7 @@ package org.apache.archiva.rest.services; import org.apache.archiva.metadata.repository.MetadataResolutionException; import org.apache.archiva.metadata.repository.MetadataResolver; import org.apache.archiva.metadata.repository.RepositorySession; -import org.apache.archiva.rest.api.model.BrowseIdEntry; +import org.apache.archiva.rest.api.model.BrowseResultEntry; import org.apache.archiva.rest.api.model.BrowseResult; import org.apache.archiva.rest.api.services.ArchivaRestServiceException; import org.apache.archiva.rest.api.services.BrowseService; @@ -87,14 +87,14 @@ public class DefaultBrowseService repositorySession.close(); } - List browseGroupIdEntries = new ArrayList( namespaces.size() ); + List browseGroupResultEntries = new ArrayList( namespaces.size() ); for ( String namespace : namespaces ) { - browseGroupIdEntries.add( new BrowseIdEntry( namespace, false ) ); + browseGroupResultEntries.add( new BrowseResultEntry( namespace, false ) ); } - Collections.sort( browseGroupIdEntries ); - return new BrowseResult( browseGroupIdEntries ); + Collections.sort( browseGroupResultEntries ); + return new BrowseResult( browseGroupResultEntries ); } public BrowseResult browseGroupId( String groupId ) @@ -144,17 +144,17 @@ public class DefaultBrowseService { repositorySession.close(); } - List browseGroupIdEntries = new ArrayList( namespaces.size() + projects.size() ); + List browseGroupResultEntries = new ArrayList( namespaces.size() + projects.size() ); for ( String namespace : namespaces ) { - browseGroupIdEntries.add( new BrowseIdEntry( namespace, false ) ); + browseGroupResultEntries.add( new BrowseResultEntry( namespace, false ) ); } for ( String project : projects ) { - browseGroupIdEntries.add( new BrowseIdEntry( project, true ) ); + browseGroupResultEntries.add( new BrowseResultEntry( project, true ) ); } - Collections.sort( browseGroupIdEntries ); - return new BrowseResult( browseGroupIdEntries ); + Collections.sort( browseGroupResultEntries ); + return new BrowseResult( browseGroupResultEntries ); } diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/css/archiva.css b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/css/archiva.css index 209491362..6284e7a8b 100644 --- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/css/archiva.css +++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/css/archiva.css @@ -78,4 +78,8 @@ .browse-list{ list-style-image: url("../images/folder.png") +} + +.force-upper-case{ + text-transform: uppercase; } \ No newline at end of file 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 386791682..b77624b4c 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 @@ -18,8 +18,8 @@ */ $(function() { - BrowseViewModel=function(browseIdEntries,parentGroupdId){ - this.browseIdEntries=browseIdEntries; + BrowseViewModel=function(browseResultEntries,parentGroupdId){ + this.browseResultEntries=browseResultEntries; this.parentGroupdId=parentGroupdId; displayGroupId=function(groupId){ displayGroupDetail(groupId,".."); @@ -38,9 +38,9 @@ $(function() { type: "GET", dataType: 'json', success: function(data) { - var browseIdEntries = mapBrowseIdEntries(data); - $.log("size:"+browseIdEntries.length); - var browseViewModel = new BrowseViewModel(browseIdEntries); + var browseResultEntries = mapbrowseResultEntries(data); + $.log("size:"+browseResultEntries.length); + var browseViewModel = new BrowseViewModel(browseResultEntries); ko.applyBindings(browseViewModel,mainContent.get(0)); } @@ -59,8 +59,8 @@ $(function() { type: "GET", dataType: 'json', success: function(data) { - var browseIdEntries = mapBrowseIdEntries(data); - var browseViewModel = new BrowseViewModel(browseIdEntries,parentGroupdId); + var browseResultEntries = mapbrowseResultEntries(data); + var browseViewModel = new BrowseViewModel(browseResultEntries,parentGroupdId); ko.applyBindings(browseViewModel,mainContent.get(0)); } @@ -74,17 +74,17 @@ $(function() { $("#main-content" ).html("coming soon :-)"); } - mapBrowseIdEntries=function(data){ - if (data.browseResult && data.browseResult.browseIdEntries) { - return $.isArray(data.browseResult.browseIdEntries) ? - $.map(data.browseResult.browseIdEntries,function(item){ - return new BrowseIdEntry(item.name, item.project); - }): [data.browseResult.browseIdEntries]; + mapbrowseResultEntries=function(data){ + if (data.browseResult && data.browseResult.browseResultEntries) { + return $.isArray(data.browseResult.browseResultEntries) ? + $.map(data.browseResult.browseResultEntries,function(item){ + return new BrowseResultEntry(item.name, item.project); + }): [data.browseResult.browseResultEntries]; } return []; } - BrowseIdEntry=function(name,project){ + BrowseResultEntry=function(name,project){ this.name=name; this.project=project; } diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/search.html b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/search.html index 119b2a49a..b78c99244 100644 --- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/search.html +++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/search.html @@ -44,10 +44,10 @@