Skip to content

Commit

Permalink
fix build error by fixing several findbugs errors
Browse files Browse the repository at this point in the history
  • Loading branch information
Jesse Eichar committed Apr 24, 2013
1 parent 8d50af3 commit c932a23
Show file tree
Hide file tree
Showing 10 changed files with 134 additions and 83 deletions.
2 changes: 1 addition & 1 deletion code_quality/findbugs-excludes.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<Class name="~.*\..*Test" />
</Match>
<Match>
<Class name="~org\.fao\.geonet\.[b-z].*" />
<Class name="~org\.fao\.geonet\.[d-zD-Z].*" />
</Match>
<Match>
<Class name="jeeves.server.JeevesEngine" />
Expand Down
2 changes: 1 addition & 1 deletion web/src/main/java/org/fao/geonet/arcgis/ArcSDEConnection.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ public void close() {
/**
* Closes the connection to ArcSDE server in case users of this class neglect to do so.
*/
public void finalize() throws Throwable {
protected void finalize() throws Throwable {
try {
seConnection.close();
}
Expand Down
32 changes: 16 additions & 16 deletions web/src/main/java/org/fao/geonet/constants/Edit.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
/**
* Constants for editing attribs.
*/
public class Edit{
public final class Edit{

/**
* Namespace used for editing.
Expand All @@ -41,7 +41,7 @@ public class Edit{
//---
//--------------------------------------------------------------------------

public class RootChild
public static final class RootChild
{
public static final String INFO = "info";
public static final String ELEMENT = "element";
Expand All @@ -57,9 +57,9 @@ public class RootChild

//--------------------------------------------------------------------------

public class Info
public static final class Info
{
public class Elem
public static final class Elem
{
public static final String ID = "id";
public static final String UUID = "uuid";
Expand Down Expand Up @@ -104,9 +104,9 @@ public class Elem

//--------------------------------------------------------------------------

public class Element
public static final class Element
{
public class Attr
public static final class Attr
{
public static final String REF = "ref";
public static final String DEL = "del";
Expand All @@ -119,7 +119,7 @@ public class Attr
public static final String MAX = "max";
}

public class Child
public static final class Child
{
public static final String TEXT = "text";
public static final String CHOOSE = "choose";
Expand All @@ -128,17 +128,17 @@ public class Child

//--------------------------------------------------------------------------

public class Attribute
public static final class Attribute
{
public class Attr
public static final class Attr
{
public static final String NAME = "name";
public static final String ADD = "add";
public static final String DEL = "del";
public static final String VALUE = "value";
}

public class Child
public static final class Child
{
public static final String TEXT = "text";
public static final String DEFAULT = "default";
Expand All @@ -147,9 +147,9 @@ public class Child

//--------------------------------------------------------------------------

public class ChildElem
public static final class ChildElem
{
public class Attr
public static final class Attr
{
public static final String NAME = "name";
public static final String PREFIX = "prefix";
Expand All @@ -161,25 +161,25 @@ public class Attr
public static final String MAX = "max";
}

public class Child
public static final class Child
{
public static final String CHOOSE = "choose";
}
}

//--------------------------------------------------------------------------

public class Choose
public static final class Choose
{
public class Attr
public static final class Attr
{
public static final String NAME = "name";
}
}

//--------------------------------------------------------------------------

public class Value
public static final class Value
{
public static final String TRUE = "true";
public static final String FALSE = "false";
Expand Down
40 changes: 20 additions & 20 deletions web/src/main/java/org/fao/geonet/constants/Geonet.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
/**
* TODO javadoc.
*/
public class Geonet {
public final class Geonet {
public static final String CONTEXT_NAME = "contextName";
// TODO make this configurable
public static final String DEFAULT_LANGUAGE = "eng";
Expand All @@ -44,7 +44,7 @@ public class Geonet {
/**
* Container for file names.
*/
public class File {
public static final class File {
public static final String SCHEMA = "schema.xsd";
public static final String SCHEMATRON = "schematron.xsl";
public static final String SCHEMATRON_XML = "schematron_xml.xsl";
Expand Down Expand Up @@ -86,14 +86,14 @@ public class File {
public static final int METADATA_MAX_BLANKS = 20;
}

public class SchemaPath {
public static final class SchemaPath {
public static final String OAI_PMH = "xml/validation/oai/OAI-PMH.xsd";
}

/**
* Container for elements.
*/
public class Elem {
public static final class Elem {
public static final String DOMAINS = "domains";
public static final String GROUPS = "groups";
public static final String GROUP = "group";
Expand Down Expand Up @@ -127,12 +127,12 @@ public class Elem {
/**
* Container for element attribs.
*/
public class Attr {}
public static final class Attr {}

/**
* Resource directory and search configuration file.
*/
public class Path {
public static final class Path {
public static final String SCHEMAS = Jeeves.Path.XML + "schemas/";
public static final String CSW = Jeeves.Path.XML + "csw/";
public static final String VALIDATION = Jeeves.Path.XML + "validation/";
Expand All @@ -153,7 +153,7 @@ public class Path {
/**
* Session constants.
*/
public class Session {
public static final class Session {
public static final String MAIN_SEARCH = "main.search";
public static final String SEARCH_RESULT = "search.result";
public static final String SEARCH_REQUEST = "search.request";
Expand All @@ -171,7 +171,7 @@ public class Session {

}

public class Settings {
public static final class Settings {
public static final String SERVER_HOST = "system/server/host";
public static final String SERVER_PORT = "system/server/port";
public static final String SERVER_SECURE_PORT = "system/server/securePort";
Expand All @@ -181,7 +181,7 @@ public class Settings {
/**
* Resource names.
*/
public class Res {
public static final class Res {
public static final String MAIN_DB = "main-db";
}

Expand All @@ -191,7 +191,7 @@ public class Res {
* @see ../services.util.MainUtil.getDefaultSearch for
* default values.
*/
public class SearchResult {
public static final class SearchResult {
/** Parameter name: {@value #TITLE} - Free text field that searches
* in the title */
public static final String TITLE = "title";
Expand Down Expand Up @@ -401,7 +401,7 @@ public class SearchResult {
/**
* TODO javadoc.
*/
public class ResultType {
public static final class ResultType {
public static final String RESULTS = "results";
public static final String HITS = "hits";
public static final String VALIDATE = "validate";
Expand All @@ -415,7 +415,7 @@ public class ResultType {
/**
* TODO java.
*/
public class Relation {
public static final class Relation {
public static final String EQUAL = "equal";
public static final String OVERLAPS = "overlaps";
public static final String ENCLOSES = "encloses";
Expand All @@ -430,15 +430,15 @@ public class Relation {
/**
* TODO javadoc.
*/
public class Output {
public static final class Output {
public static final String FULL = "full";
public static final String TEXT = "text";
}

/**
* TODO javadoc.
*/
public class SortBy {
public static final class SortBy {
public static final String RELEVANCE = "relevance";
public static final String RATING = "rating";
public static final String POPULARITY= "popularity";
Expand All @@ -454,7 +454,7 @@ public class SortBy {
/**
* Container for profile names.
*/
public class Profile {
public static final class Profile {
public static final String ADMINISTRATOR = "Administrator";
public static final String USER_ADMIN = "UserAdmin";
public static final String REVIEWER = "Reviewer";
Expand All @@ -467,7 +467,7 @@ public class Profile {
/**
* Container for config elements that are inside the configuration file.
*/
public class Config {
public static final class Config {
public static final String HTMLCACHE_DIR = "htmlCacheDir";
public static final String LUCENE_DIR = "luceneDir";
/**
Expand Down Expand Up @@ -505,7 +505,7 @@ public class Config {
/**
* Container for element values.
*/
public class Text {
public static final class Text {
public static final String ON = "on";
public static final String OFF = "off";
public static final String DOWN = "down";
Expand All @@ -515,7 +515,7 @@ public class Text {
/**
* Codelist directories.
*/
public class CodeList {
public static final class CodeList {
public static final String LOCAL = "local";
public static final String EXTERNAL = "external";
public static final String REGISTER = "register";
Expand Down Expand Up @@ -571,7 +571,7 @@ public class CodeList {
/**
* Services.
*/
public class Service {
public static final class Service {
public static final String XML_LOGIN = "xml.user.login";
public static final String XML_LOGOUT = "xml.user.logout";
public static final String XML_INFO = "xml.info";
Expand All @@ -582,7 +582,7 @@ public class Service {
public static final String MEF_EXPORT = "mef.export";
}

public static class Namespaces {
public static final class Namespaces {
public static final Namespace GCO = Namespace.getNamespace("gco", "http://www.isotc211.org/2005/gco");
public static final Namespace GEONET = Namespace.getNamespace("geonet", "http://www.fao.org/geonetwork");
public static final Namespace GMX = Namespace.getNamespace("gmx", "http://www.isotc211.org/2005/gmx");
Expand Down
10 changes: 5 additions & 5 deletions web/src/main/java/org/fao/geonet/constants/Params.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
/**
* Constants for service parameters (elements and attributes).
*/
public class Params {
public final class Params {
public static final String ACCESS = "access";
public static final String BTN = "btn";
public static final String CATEGORY = "category";
Expand Down Expand Up @@ -142,15 +142,15 @@ public class Params {
/**
* TODO javadoc.
*/
public class Access {
public static final class Access {
public static final String PUBLIC = "public";
public static final String PRIVATE = "private";
}

/**
* TODO javadoc.
*/
public class Operation {
public static final class Operation {
public static final String NEWUSER = "newuser";
public static final String EDITINFO = "editinfo";
public static final String FULLUPDATE = "fullupdate";
Expand All @@ -163,7 +163,7 @@ public class Operation {
/**
* TODO javadoc.
*/
public class Status {
public static final class Status {
public static final String UNKNOWN = "0";
public static final String DRAFT = "1";
public static final String APPROVED = "2";
Expand All @@ -175,7 +175,7 @@ public class Status {
/**
* TODO javadoc.
*/
public class Svn {
public static final class Svn {
public static final String DBURLPROP = "geonet:dburl";
public static final String OPERATOR = "geonet:operator";
public static final String USERNAME = "geonet:username";
Expand Down
Loading

0 comments on commit c932a23

Please sign in to comment.