hazza/DSpace
1
0
Fork 0
mirror of https://github.com/DSpace/DSpace.git synced 2025-10-07 01:54:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

[DS-707] Modifier order

Browse Source 
git-svn-id: http://scm.dspace.org/svn/repo/dspace/trunk@5654 9c30dcfa-912a-0410-8fc2-9e0234be79fd
This commit is contained in:
Graham Triggs
2010-10-26 18:11:31 +00:00
parent ea3df2cfa6
commit d66c14848b
37 changed files with 148 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
dspace-api/src/main/java/org/dspace/app/itemupdate/ItemUpdate.java
View File

@@ -94,15 +94,15 @@ import org.dspace.eperson.EPerson;
*/ */
public class ItemUpdate { public class ItemUpdate {
static public final String SUPPRESS_UNDO_FILENAME = "suppress_undo"; public static final String SUPPRESS_UNDO_FILENAME = "suppress_undo";
static public final String CONTENTS_FILE = "contents"; public static final String CONTENTS_FILE = "contents";
static public final String DELETE_CONTENTS_FILE = "delete_contents"; public static final String DELETE_CONTENTS_FILE = "delete_contents";
static public String HANDLE_PREFIX = null; public static String HANDLE_PREFIX = null;
static public final Map<String, String> filterAliases = new HashMap<String, String>(); public static final Map<String, String> filterAliases = new HashMap<String, String>();
static public boolean verbose = false; public static boolean verbose = false;
static static
{ {

28
dspace-api/src/main/java/org/dspace/app/statistics/Report.java
View File

@@ -60,7 +60,7 @@ public interface Report
* *
* @return a string containing the header for the report * @return a string containing the header for the report
*/ */
abstract public String header(); public abstract String header();
/** /**
* output any top headers that this page needs * output any top headers that this page needs
@@ -70,7 +70,7 @@ public interface Report
* *
* @return a string containing the header for the report * @return a string containing the header for the report
*/ */
abstract public String header(String title); public abstract String header(String title);
/** /**
* output the title in the relevant format. This requires that the title * output the title in the relevant format. This requires that the title
@@ -78,7 +78,7 @@ public interface Report
* *
* @return a string containing the title of the report * @return a string containing the title of the report
*/ */
abstract public String mainTitle(); public abstract String mainTitle();
/** /**
* output the date range in the relevant format. This requires that the * output the date range in the relevant format. This requires that the
@@ -86,7 +86,7 @@ public interface Report
* *
* @return a string containing date range information * @return a string containing date range information
*/ */
abstract public String dateRange(); public abstract String dateRange();
/** /**
* output the section header in the relevant format * output the section header in the relevant format
@@ -95,7 +95,7 @@ public interface Report
* *
* @return a string containing the formatted section header * @return a string containing the formatted section header
*/ */
abstract public String sectionHeader(String title); public abstract String sectionHeader(String title);
/** /**
* output the report block based on the passed statistics object array * output the report block based on the passed statistics object array
@@ -105,7 +105,7 @@ public interface Report
* *
* @return a string containing the formatted statistics block * @return a string containing the formatted statistics block
*/ */
abstract public String statBlock(Statistics content); public abstract String statBlock(Statistics content);
/** /**
* output the floor information in the relevant format * output the floor information in the relevant format
@@ -114,7 +114,7 @@ public interface Report
* *
* @return a string containing the formatted floor information * @return a string containing the formatted floor information
*/ */
abstract public String floorInfo(int floor); public abstract String floorInfo(int floor);
/** /**
* output the explanation of the stat block in the relevant format * output the explanation of the stat block in the relevant format
@@ -123,14 +123,14 @@ public interface Report
* *
* @return a string containing the formatted explanation * @return a string containing the formatted explanation
*/ */
abstract public String blockExplanation(String explanation); public abstract String blockExplanation(String explanation);
/** /**
* output the final footers for this file * output the final footers for this file
* *
* @return a string containing the report footer * @return a string containing the report footer
*/ */
abstract public String footer(); public abstract String footer();
/** /**
* set the main title for the report * set the main title for the report
@@ -138,33 +138,33 @@ public interface Report
* @param name the name of the service * @param name the name of the service
* @param serverName the name of the server * @param serverName the name of the server
*/ */
abstract public void setMainTitle (String name, String serverName); public abstract void setMainTitle (String name, String serverName);
/** /**
* add a statistics block to the report to the class register * add a statistics block to the report to the class register
* *
* @param stat the statistics object to be added to the report * @param stat the statistics object to be added to the report
*/ */
abstract public void addBlock(Statistics stat); public abstract void addBlock(Statistics stat);
/** /**
* render the report * render the report
* *
* @return a string containing the full content of the report * @return a string containing the full content of the report
*/ */
abstract public String render(); public abstract String render();
/** /**
* set the starting date for the report * set the starting date for the report
* *
* @param start the start date for the report * @param start the start date for the report
*/ */
abstract public void setStartDate(Date start); public abstract void setStartDate(Date start);
/** /**
* set the end date for the report * set the end date for the report
* *
* @param end the end date for the report * @param end the end date for the report
*/ */
abstract public void setEndDate(Date end); public abstract void setEndDate(Date end);
} }

2
dspace-api/src/main/java/org/dspace/content/DSpaceObject.java
View File

@@ -117,7 +117,7 @@ public abstract class DSpaceObject
* @return Name for the object, or <code>null</code> if it doesn't have * @return Name for the object, or <code>null</code> if it doesn't have
* one * one
*/ */
abstract public String getName(); public abstract String getName();
/** /**
* Generic find for when the precise type of a DSO is not known, just the * Generic find for when the precise type of a DSO is not known, just the

4
dspace-api/src/main/java/org/dspace/content/Item.java
View File

@@ -89,10 +89,10 @@ public class Item extends DSpaceObject
/** /**
* Wild card for Dublin Core metadata qualifiers/languages * Wild card for Dublin Core metadata qualifiers/languages
*/ */
public final static String ANY = "*"; public static final String ANY = "*";
/** log4j category */ /** log4j category */
private static Logger log = Logger.getLogger(Item.class); private static final Logger log = Logger.getLogger(Item.class);
/** Our context */ /** Our context */
private Context ourContext; private Context ourContext;

2
dspace-api/src/main/java/org/dspace/content/crosswalk/METSRightsCrosswalk.java
View File

@@ -93,7 +93,7 @@ public class METSRightsCrosswalk
private static final Namespace namespaces[] = { METSRights_NS }; private static final Namespace namespaces[] = { METSRights_NS };
private final static Map<Integer,String> otherTypesMapping = new HashMap<Integer,String>(); private static final Map<Integer,String> otherTypesMapping = new HashMap<Integer,String>();
static static
{ {
//Mapping of DSpace Policy Actions to METSRights PermissionType values //Mapping of DSpace Policy Actions to METSRights PermissionType values

2
dspace-api/src/main/java/org/dspace/content/crosswalk/MODSDisseminationCrosswalk.java
View File

@@ -115,7 +115,7 @@ public class MODSDisseminationCrosswalk extends SelfNamedPlugin
/** log4j category */ /** log4j category */
private static Logger log = Logger.getLogger(MODSDisseminationCrosswalk.class); private static Logger log = Logger.getLogger(MODSDisseminationCrosswalk.class);
private final static String CONFIG_PREFIX = "crosswalk.mods.properties."; private static final String CONFIG_PREFIX = "crosswalk.mods.properties.";
/** /**
* Fill in the plugin alias table from DSpace configuration entries * Fill in the plugin alias table from DSpace configuration entries

2
dspace-api/src/main/java/org/dspace/content/crosswalk/SimpleDCDisseminationCrosswalk.java
View File

@@ -83,7 +83,7 @@ public class SimpleDCDisseminationCrosswalk extends SelfNamedPlugin
private static final Namespace namespaces[] = private static final Namespace namespaces[] =
{ DC_NS, XSI_NS }; { DC_NS, XSI_NS };
private final static String aliases[] = { "SimpleDC", "DC" }; private static final String aliases[] = { "SimpleDC", "DC" };
public static String[] getPluginNames() public static String[] getPluginNames()
{ {

2
dspace-api/src/main/java/org/dspace/content/crosswalk/XHTMLHeadDisseminationCrosswalk.java
View File

@@ -96,7 +96,7 @@ public class XHTMLHeadDisseminationCrosswalk extends SelfNamedPlugin implements
+ "crosswalks" + "crosswalks"
+ File.separator + "xhtml-head-item.properties"; + File.separator + "xhtml-head-item.properties";
private final static String XHTML_NAMESPACE = "http://www.w3.org/1999/xhtml"; private static final String XHTML_NAMESPACE = "http://www.w3.org/1999/xhtml";
/** /**
* Maps DSpace metadata field to name to use in XHTML head element, e.g. * Maps DSpace metadata field to name to use in XHTML head element, e.g.

4
dspace-api/src/main/java/org/dspace/content/crosswalk/XSLTCrosswalk.java
View File

@@ -121,9 +121,9 @@ public abstract class XSLTCrosswalk extends SelfNamedPlugin
Namespace.getNamespace("dim", "http://www.dspace.org/xmlns/dspace/dim"); Namespace.getNamespace("dim", "http://www.dspace.org/xmlns/dspace/dim");
/** Prefix for all lines in the config file for XSLT plugins. */ /** Prefix for all lines in the config file for XSLT plugins. */
protected final static String CONFIG_PREFIX = "crosswalk."; protected static final String CONFIG_PREFIX = "crosswalk.";
private final static String CONFIG_STYLESHEET = ".stylesheet"; private static final String CONFIG_STYLESHEET = ".stylesheet";
/** /**
* Derive list of plugin name from DSpace configuration entries * Derive list of plugin name from DSpace configuration entries

2
dspace-api/src/main/java/org/dspace/content/crosswalk/XSLTDisseminationCrosswalk.java
View File

@@ -98,7 +98,7 @@ public class XSLTDisseminationCrosswalk
/** log4j category */ /** log4j category */
private static Logger log = Logger.getLogger(XSLTDisseminationCrosswalk.class); private static Logger log = Logger.getLogger(XSLTDisseminationCrosswalk.class);
private final static String DIRECTION = "dissemination"; private static final String DIRECTION = "dissemination";
private static String aliases[] = makeAliases(DIRECTION); private static String aliases[] = makeAliases(DIRECTION);

4
dspace-api/src/main/java/org/dspace/content/crosswalk/XSLTIngestionCrosswalk.java
View File

@@ -80,9 +80,9 @@ public class XSLTIngestionCrosswalk
implements IngestionCrosswalk implements IngestionCrosswalk
{ {
/** log4j category */ /** log4j category */
private static Logger log = Logger.getLogger(XSLTIngestionCrosswalk.class); private static final Logger log = Logger.getLogger(XSLTIngestionCrosswalk.class);
private final static String DIRECTION = "submission"; private static final String DIRECTION = "submission";
private static String aliases[] = makeAliases(DIRECTION); private static String aliases[] = makeAliases(DIRECTION);

6
dspace-api/src/main/java/org/dspace/content/dao/ItemDAOPostgres.java
View File

@@ -48,11 +48,11 @@ import java.sql.SQLException;
public class ItemDAOPostgres extends ItemDAO public class ItemDAOPostgres extends ItemDAO
{ {
private final static String selectPrimaryBitstreamID = private static final String selectPrimaryBitstreamID =
"SELECT bundle.primary_bitstream_id FROM item2bundle, bundle " + "SELECT bundle.primary_bitstream_id FROM item2bundle, bundle " +
"WHERE item2bundle.item_id=? AND item2bundle.bundle_id=bundle.bundle_id AND bundle.name=? LIMIT 1"; "WHERE item2bundle.item_id=? AND item2bundle.bundle_id=bundle.bundle_id AND bundle.name=? LIMIT 1";
private final static String selectFirstBitstreamID = private static final String selectFirstBitstreamID =
"SELECT bundle2bitstream.bitstream_id FROM item2bundle, bundle, bundle2bitstream " + "SELECT bundle2bitstream.bitstream_id FROM item2bundle, bundle, bundle2bitstream " +
"WHERE item2bundle.item_id=? AND item2bundle.bundle_id=bundle.bundle_id AND bundle.name=? " + "WHERE item2bundle.item_id=? AND item2bundle.bundle_id=bundle.bundle_id AND bundle.name=? " +
"AND bundle.bundle_id=bundle2bitstream.bundle_id LIMIT 1"; "AND bundle.bundle_id=bundle2bitstream.bundle_id LIMIT 1";
@@ -71,7 +71,7 @@ public class ItemDAOPostgres extends ItemDAO
// "ORDER BY bitstream.sequence_id" + // "ORDER BY bitstream.sequence_id" +
// ") allstreams LIMIT 1"; // ") allstreams LIMIT 1";
private final static String selectNamedBitstreamID = private static final String selectNamedBitstreamID =
"SELECT bitstream.bitstream_id FROM item2bundle, bundle, bundle2bitstream, bitstream " + "SELECT bitstream.bitstream_id FROM item2bundle, bundle, bundle2bitstream, bitstream " +
"WHERE item2bundle.item_id=? AND item2bundle.bundle_id=bundle.bundle_id AND bundle.name=? " + "WHERE item2bundle.item_id=? AND item2bundle.bundle_id=bundle.bundle_id AND bundle.name=? " +
"AND bundle.bundle_id=bundle2bitstream.bundle_id AND bundle2bitstream.bitstream_id=bitstream.bitstream_id " + "AND bundle.bundle_id=bundle2bitstream.bundle_id AND bundle2bitstream.bitstream_id=bitstream.bitstream_id " +

2
dspace-api/src/main/java/org/dspace/content/packager/DSpaceMETSIngester.java
View File

@@ -79,7 +79,7 @@ public class DSpaceMETSIngester
extends AbstractMETSIngester extends AbstractMETSIngester
{ {
// first part of required mets@PROFILE value // first part of required mets@PROFILE value
private final static String PROFILE_START = "DSpace METS SIP Profile"; private static final String PROFILE_START = "DSpace METS SIP Profile";
// just check the profile name. // just check the profile name.
@Override @Override

16
dspace-api/src/main/java/org/dspace/content/packager/METSManifest.java
View File

@@ -149,33 +149,33 @@ public class METSManifest
} }
/** log4j category */ /** log4j category */
private static Logger log = Logger.getLogger(METSManifest.class); private static final Logger log = Logger.getLogger(METSManifest.class);
/** Canonical filename of METS manifest within a package or as a bitstream. */ /** Canonical filename of METS manifest within a package or as a bitstream. */
public final static String MANIFEST_FILE = "mets.xml"; public static final String MANIFEST_FILE = "mets.xml";
/** Prefix of DSpace configuration lines that map METS metadata type to /** Prefix of DSpace configuration lines that map METS metadata type to
* crosswalk plugin names. * crosswalk plugin names.
*/ */
public final static String CONFIG_METS_PREFIX = "mets."; public static final String CONFIG_METS_PREFIX = "mets.";
/** prefix of config lines identifying local XML Schema (XSD) files */ /** prefix of config lines identifying local XML Schema (XSD) files */
private final static String CONFIG_XSD_PREFIX = CONFIG_METS_PREFIX+"xsd."; private static final String CONFIG_XSD_PREFIX = CONFIG_METS_PREFIX+"xsd.";
/** Dublin core element namespace */ /** Dublin core element namespace */
private final static Namespace dcNS = Namespace private static final Namespace dcNS = Namespace
.getNamespace("http://purl.org/dc/elements/1.1/"); .getNamespace("http://purl.org/dc/elements/1.1/");
/** Dublin core term namespace (for qualified DC) */ /** Dublin core term namespace (for qualified DC) */
private final static Namespace dcTermNS = Namespace private static final Namespace dcTermNS = Namespace
.getNamespace("http://purl.org/dc/terms/"); .getNamespace("http://purl.org/dc/terms/");
/** METS namespace -- includes "mets" prefix for use in XPaths */ /** METS namespace -- includes "mets" prefix for use in XPaths */
public final static Namespace metsNS = Namespace public static final Namespace metsNS = Namespace
.getNamespace("mets", "http://www.loc.gov/METS/"); .getNamespace("mets", "http://www.loc.gov/METS/");
/** XLink namespace -- includes "xlink" prefix prefix for use in XPaths */ /** XLink namespace -- includes "xlink" prefix prefix for use in XPaths */
public final static Namespace xlinkNS = Namespace public static final Namespace xlinkNS = Namespace
.getNamespace("xlink", "http://www.w3.org/1999/xlink"); .getNamespace("xlink", "http://www.w3.org/1999/xlink");
/** root element of the current METS manifest. */ /** root element of the current METS manifest. */

4
dspace-api/src/main/java/org/dspace/content/packager/PDFPackager.java
View File

@@ -92,9 +92,9 @@ public class PDFPackager
implements PackageIngester, PackageDisseminator implements PackageIngester, PackageDisseminator
{ {
/** log4j category */ /** log4j category */
private static Logger log = Logger.getLogger(PDFPackager.class); private static final Logger log = Logger.getLogger(PDFPackager.class);
private final static String BITSTREAM_FORMAT_NAME = "Adobe PDF"; private static final String BITSTREAM_FORMAT_NAME = "Adobe PDF";
private static String aliases[] = { "PDF", "Adobe PDF", "pdf", "application/pdf" }; private static String aliases[] = { "PDF", "Adobe PDF", "pdf", "application/pdf" };

8
dspace-api/src/main/java/org/dspace/content/packager/PackageUtils.java
View File

@@ -80,12 +80,12 @@ public class PackageUtils
{ {
/** log4j category */ /** log4j category */
private static Logger log = Logger.getLogger(DSpaceAIPDisseminator.class); private static final Logger log = Logger.getLogger(DSpaceAIPDisseminator.class);
// Map of metadata elements for Communities and Collections // Map of metadata elements for Communities and Collections
// Format is alternating key/value in a straight array; use this // Format is alternating key/value in a straight array; use this
// to initialize hash tables that convert to and from. // to initialize hash tables that convert to and from.
private final static String ccMetadataMap[] = private static final String ccMetadataMap[] =
{ {
// getMetadata() -> DC element.term // getMetadata() -> DC element.term
"name", "dc.title", "name", "dc.title",
@@ -99,8 +99,8 @@ public class PackageUtils
// HashMaps to convert Community/Collection metadata to/from Dublin Core // HashMaps to convert Community/Collection metadata to/from Dublin Core
// (useful when crosswalking Communities/Collections) // (useful when crosswalking Communities/Collections)
private final static Map<String,String> ccMetadataToDC = new HashMap<String,String>(); private static final Map<String,String> ccMetadataToDC = new HashMap<String,String>();
private final static Map<String,String> ccDCToMetadata = new HashMap<String,String>(); private static final Map<String,String> ccDCToMetadata = new HashMap<String,String>();
static static
{ {
for (int i = 0; i < ccMetadataMap.length; i += 2) for (int i = 0; i < ccMetadataMap.length; i += 2)

2
dspace-api/src/main/java/org/dspace/content/packager/RoleIngester.java
View File

@@ -405,7 +405,7 @@ public class RoleIngester implements PackageIngester
* @throws SQLException * @throws SQLException
* @throws AuthorizeException * @throws AuthorizeException
*/ */
static public void ingestStream(Context context, DSpaceObject parent, public static void ingestStream(Context context, DSpaceObject parent,
PackageParameters params, InputStream stream) PackageParameters params, InputStream stream)
throws PackageException, SQLException, AuthorizeException throws PackageException, SQLException, AuthorizeException
{ {

2
dspace-api/src/main/java/org/dspace/harvest/OAIHarvester.java
View File

@@ -1118,7 +1118,7 @@ public class OAIHarvester {
private static Stack<HarvestThread> harvestThreads; private static Stack<HarvestThread> harvestThreads;
private static Integer maxActiveThreads; private static Integer maxActiveThreads;
protected volatile static Integer activeThreads = 0; protected static volatile Integer activeThreads = 0;
public static final int HARVESTER_STATUS_RUNNING = 1; public static final int HARVESTER_STATUS_RUNNING = 1;
public static final int HARVESTER_STATUS_SLEEPING = 2; public static final int HARVESTER_STATUS_SLEEPING = 2;

22
dspace-api/src/main/java/org/dspace/sort/OrderFormat.java
View File

@@ -69,20 +69,20 @@ import org.dspace.core.PluginManager;
*/ */
public class OrderFormat public class OrderFormat
{ {
public final static String AUTHOR = "author"; public static final String AUTHOR = "author";
public final static String TITLE = "title"; public static final String TITLE = "title";
public final static String TEXT = "text"; public static final String TEXT = "text";
public final static String DATE = "date"; public static final String DATE = "date";
public final static String AUTHORITY = "authority"; public static final String AUTHORITY = "authority";
// Array of all available order delegates - avoids excessive calls to plugin manager // Array of all available order delegates - avoids excessive calls to plugin manager
private final static String[] delegates = PluginManager.getAllPluginNames(OrderFormatDelegate.class); private static final String[] delegates = PluginManager.getAllPluginNames(OrderFormatDelegate.class);
private final static OrderFormatDelegate authorDelegate = new OrderFormatAuthor(); private static final OrderFormatDelegate authorDelegate = new OrderFormatAuthor();
private final static OrderFormatDelegate titleDelegate = new OrderFormatTitle(); private static final OrderFormatDelegate titleDelegate = new OrderFormatTitle();
private final static OrderFormatDelegate textDelegate = new OrderFormatText(); private static final OrderFormatDelegate textDelegate = new OrderFormatText();
private final static OrderFormatDelegate dateDelegate = new OrderFormatDate(); private static final OrderFormatDelegate dateDelegate = new OrderFormatDate();
private final static OrderFormatDelegate authorityDelegate = new OrderFormatText(); private static final OrderFormatDelegate authorityDelegate = new OrderFormatText();
/** /**
* Generate a sort string for the given DC metadata * Generate a sort string for the given DC metadata

2
dspace-api/src/main/java/org/dspace/storage/rdbms/TableRowIterator.java
View File

@@ -55,7 +55,7 @@ import java.util.List;
*/ */
public class TableRowIterator public class TableRowIterator
{ {
private final static Logger log = Logger.getLogger(TableRowIterator.class); private static final Logger log = Logger.getLogger(TableRowIterator.class);
/** /**
* Results from a query * Results from a query
*/ */

2
dspace-jspui/dspace-jspui-api/src/main/java/org/dspace/app/webui/servlet/FeedServlet.java
View File

@@ -444,7 +444,7 @@ public class FeedServlet extends DSpaceServlet
/** /**
* Class to instrument accesses & currency of a given feed in cache * Class to instrument accesses & currency of a given feed in cache
*/ */
static private class CacheFeed private static class CacheFeed
{ {
// currency timestamp // currency timestamp
public long timeStamp = 0L; public long timeStamp = 0L;

2
dspace-oai/dspace-oai-api/src/main/java/org/dspace/app/didl/UUIDFactory.java
View File

@@ -69,7 +69,7 @@ public final class UUIDFactory
* @return a new UUID object * @return a new UUID object
* *
**/ **/
public synchronized static UUID generateUUID() public static synchronized UUID generateUUID()
{ {
return new UUID(generator.rand.nextLong(),generator.rand.nextLong()); return new UUID(generator.rand.nextLong(),generator.rand.nextLong());
} }

3
dspace-oai/dspace-oai-api/src/main/java/org/dspace/app/oai/DSpaceOAICatalog.java
View File

@@ -92,8 +92,7 @@ public class DSpaceOAICatalog extends AbstractCatalog
private static Logger log = Logger.getLogger(DSpaceOAICatalog.class); private static Logger log = Logger.getLogger(DSpaceOAICatalog.class);
/** Prefix that all our OAI identifiers have */ /** Prefix that all our OAI identifiers have */
public final static String OAI_ID_PREFIX = "oai:" public static final String OAI_ID_PREFIX = "oai:" + ConfigurationManager.getProperty("dspace.hostname") + ":";
+ ConfigurationManager.getProperty("dspace.hostname") + ":";
/** Maximum number of records returned by one request */ /** Maximum number of records returned by one request */
private final int MAX_RECORDS = ConfigurationManager.getIntProperty("oai.response.max-records", 100); private final int MAX_RECORDS = ConfigurationManager.getIntProperty("oai.response.max-records", 100);

4
dspace-sword/dspace-sword-api/src/main/java/org/purl/sword/client/GuiClient.java
View File

@@ -104,12 +104,12 @@ public class GuiClient extends JFrame implements ClientType,
* The property file that contains the main properties that can be used to * The property file that contains the main properties that can be used to
* configure the application. * configure the application.
*/ */
private final static String PROPERTY_FILE = "SwordClient.properties"; private static final String PROPERTY_FILE = "SwordClient.properties";
/** /**
* Label for the onBehalfOf property file label. * Label for the onBehalfOf property file label.
*/ */
private final static String ON_BEHALF_OF = "onBehalfOf"; private static final String ON_BEHALF_OF = "onBehalfOf";
/** /**
* The dialog to get details for the service location. * The dialog to get details for the service location.

2
dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/administrative/ItemExport.java
View File

@@ -79,7 +79,7 @@ import org.xml.sax.SAXException;
*/ */
public class ItemExport extends AbstractDSpaceTransformer implements public class ItemExport extends AbstractDSpaceTransformer implements
CacheableProcessingComponent { CacheableProcessingComponent {
private final static Message T_dspace_home = message("xmlui.general.dspace_home"); private static final Message T_dspace_home = message("xmlui.general.dspace_home");
private static final Message T_main_head = message("xmlui.administrative.ItemExport.head"); private static final Message T_main_head = message("xmlui.administrative.ItemExport.head");

62
dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/administrative/WithdrawnItems.java
View File

@@ -99,42 +99,42 @@ import org.xml.sax.SAXException;
public class WithdrawnItems extends AbstractDSpaceTransformer implements public class WithdrawnItems extends AbstractDSpaceTransformer implements
CacheableProcessingComponent CacheableProcessingComponent
{ {
private final static Logger log = Logger.getLogger(WithdrawnItems.class); private static final Logger log = Logger.getLogger(WithdrawnItems.class);
/** /**
* Static Messages for common text * Static Messages for common text
*/ */
private final static Message T_dspace_home = message("xmlui.general.dspace_home"); private static final Message T_dspace_home = message("xmlui.general.dspace_home");
private final static Message T_go = message("xmlui.general.go"); private static final Message T_go = message("xmlui.general.go");
private final static Message T_update = message("xmlui.general.update"); private static final Message T_update = message("xmlui.general.update");
private final static Message T_choose_month = message("xmlui.ArtifactBrowser.ConfigurableBrowse.general.choose_month"); private static final Message T_choose_month = message("xmlui.ArtifactBrowser.ConfigurableBrowse.general.choose_month");
private final static Message T_choose_year = message("xmlui.ArtifactBrowser.ConfigurableBrowse.general.choose_year"); private static final Message T_choose_year = message("xmlui.ArtifactBrowser.ConfigurableBrowse.general.choose_year");
private final static Message T_jump_year = message("xmlui.ArtifactBrowser.ConfigurableBrowse.general.jump_year"); private static final Message T_jump_year = message("xmlui.ArtifactBrowser.ConfigurableBrowse.general.jump_year");
private final static Message T_jump_year_help = message("xmlui.ArtifactBrowser.ConfigurableBrowse.general.jump_year_help"); private static final Message T_jump_year_help = message("xmlui.ArtifactBrowser.ConfigurableBrowse.general.jump_year_help");
private final static Message T_jump_select = message("xmlui.ArtifactBrowser.ConfigurableBrowse.general.jump_select"); private static final Message T_jump_select = message("xmlui.ArtifactBrowser.ConfigurableBrowse.general.jump_select");
private final static Message T_starts_with = message("xmlui.ArtifactBrowser.ConfigurableBrowse.general.starts_with"); private static final Message T_starts_with = message("xmlui.ArtifactBrowser.ConfigurableBrowse.general.starts_with");
private final static Message T_starts_with_help = message("xmlui.ArtifactBrowser.ConfigurableBrowse.general.starts_with_help"); private static final Message T_starts_with_help = message("xmlui.ArtifactBrowser.ConfigurableBrowse.general.starts_with_help");
private final static Message T_sort_by = message("xmlui.ArtifactBrowser.ConfigurableBrowse.general.sort_by"); private static final Message T_sort_by = message("xmlui.ArtifactBrowser.ConfigurableBrowse.general.sort_by");
private final static Message T_order = message("xmlui.ArtifactBrowser.ConfigurableBrowse.general.order"); private static final Message T_order = message("xmlui.ArtifactBrowser.ConfigurableBrowse.general.order");
private final static Message T_rpp = message("xmlui.ArtifactBrowser.ConfigurableBrowse.general.rpp"); private static final Message T_rpp = message("xmlui.ArtifactBrowser.ConfigurableBrowse.general.rpp");
private final static Message T_order_asc = message("xmlui.ArtifactBrowser.ConfigurableBrowse.order.asc"); private static final Message T_order_asc = message("xmlui.ArtifactBrowser.ConfigurableBrowse.order.asc");
private final static Message T_order_desc = message("xmlui.ArtifactBrowser.ConfigurableBrowse.order.desc"); private static final Message T_order_desc = message("xmlui.ArtifactBrowser.ConfigurableBrowse.order.desc");
private final static String WITHDRAWN_URL_BASE = "withdrawn"; private static final String WITHDRAWN_URL_BASE = "withdrawn";
/** /**
* These variables dictate when the drop down list of years is to break from * These variables dictate when the drop down list of years is to break from
@@ -897,33 +897,33 @@ class BrowseParams
BrowserScope scope; BrowserScope scope;
final static String MONTH = "month"; static final String MONTH = "month";
final static String YEAR = "year"; static final String YEAR = "year";
final static String ETAL = "etal"; static final String ETAL = "etal";
final static String TYPE = "type"; static final String TYPE = "type";
final static String JUMPTO_ITEM = "focus"; static final String JUMPTO_ITEM = "focus";
final static String JUMPTO_VALUE = "vfocus"; static final String JUMPTO_VALUE = "vfocus";
final static String JUMPTO_VALUE_LANG = "vfocus_lang"; static final String JUMPTO_VALUE_LANG = "vfocus_lang";
final static String ORDER = "order"; static final String ORDER = "order";
final static String OFFSET = "offset"; static final String OFFSET = "offset";
final static String RESULTS_PER_PAGE = "rpp"; static final String RESULTS_PER_PAGE = "rpp";
final static String SORT_BY = "sort_by"; static final String SORT_BY = "sort_by";
final static String STARTS_WITH = "starts_with"; static final String STARTS_WITH = "starts_with";
final static String[] FILTER_VALUE = new String[]{"value","authority"}; static final String[] FILTER_VALUE = new String[]{"value","authority"};
final static String FILTER_VALUE_LANG = "value_lang"; static final String FILTER_VALUE_LANG = "value_lang";
/* /*
* Creates a map of the browse options common to all pages (type / value / * Creates a map of the browse options common to all pages (type / value /

16
dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/artifactbrowser/StatisticsViewer.java
View File

@@ -75,18 +75,18 @@ import java.text.SimpleDateFormat;
*/ */
public class StatisticsViewer extends AbstractDSpaceTransformer implements CacheableProcessingComponent public class StatisticsViewer extends AbstractDSpaceTransformer implements CacheableProcessingComponent
{ {
private final static Logger log = Logger.getLogger(StatisticsViewer.class); private static final Logger log = Logger.getLogger(StatisticsViewer.class);
private final static Message T_dspace_home = message("xmlui.general.dspace_home"); private static final Message T_dspace_home = message("xmlui.general.dspace_home");
private final static Message T_choose_report = message("xmlui.ArtifactBrowser.StatisticsViewer.choose_month"); private static final Message T_choose_report = message("xmlui.ArtifactBrowser.StatisticsViewer.choose_month");
private final static Message T_page_title = message("xmlui.ArtifactBrowser.StatisticsViewer.report.title"); private static final Message T_page_title = message("xmlui.ArtifactBrowser.StatisticsViewer.report.title");
private final static Message T_empty_title = message("xmlui.ArtifactBrowser.StatisticsViewer.no_report.title"); private static final Message T_empty_title = message("xmlui.ArtifactBrowser.StatisticsViewer.no_report.title");
private final static Message T_empty_text = message("xmlui.ArtifactBrowser.StatisticsViewer.no_report.text"); private static final Message T_empty_text = message("xmlui.ArtifactBrowser.StatisticsViewer.no_report.text");
private final static SimpleDateFormat sdfDisplay = new SimpleDateFormat("MM'/'yyyy"); private static final SimpleDateFormat sdfDisplay = new SimpleDateFormat("MM'/'yyyy");
private final static SimpleDateFormat sdfLink = new SimpleDateFormat("yyyy'-'M"); private static final SimpleDateFormat sdfLink = new SimpleDateFormat("yyyy'-'M");
private boolean initialised = false; private boolean initialised = false;
private String reportDate = null; private String reportDate = null;

8
dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/eperson/FailedAuthentication.java
View File

@@ -19,11 +19,11 @@ import org.dspace.authorize.AuthorizeException;
import org.xml.sax.SAXException; import org.xml.sax.SAXException;
public class FailedAuthentication extends AbstractDSpaceTransformer { public class FailedAuthentication extends AbstractDSpaceTransformer {
private final static String SESSION_ATTRIBUTE_NAME = "xmlui.Eperson.FailedAuthentication.message"; private static final String SESSION_ATTRIBUTE_NAME = "xmlui.Eperson.FailedAuthentication.message";
public final static Message BAD_CREDENTIALS = message("xmlui.EPerson.FailedAuthentication.BadCreds"); public static final Message BAD_CREDENTIALS = message("xmlui.EPerson.FailedAuthentication.BadCreds");
public final static Message BAD_ARGUMENTS = message("xmlui.EPerson.FailedAuthentication.BadArgs"); public static final Message BAD_ARGUMENTS = message("xmlui.EPerson.FailedAuthentication.BadArgs");
public final static Message NO_SUCH_USER = message("xmlui.EPerson.FailedAuthentication.NoSuchUser"); public static final Message NO_SUCH_USER = message("xmlui.EPerson.FailedAuthentication.NoSuchUser");
/**language strings */ /**language strings */

22
dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/eperson/ResetPassword.java
View File

@@ -68,37 +68,37 @@ import org.xml.sax.SAXException;
public class ResetPassword extends AbstractDSpaceTransformer public class ResetPassword extends AbstractDSpaceTransformer
{ {
/** Language strings */ /** Language strings */
private final static Message T_title = private static final Message T_title =
message("xmlui.EPerson.ResetPassword.title"); message("xmlui.EPerson.ResetPassword.title");
private final static Message T_dspace_home = private static final Message T_dspace_home =
message("xmlui.general.dspace_home"); message("xmlui.general.dspace_home");
private final static Message T_trail_forgot_password = private static final Message T_trail_forgot_password =
message("xmlui.EPerson.trail_forgot_password"); message("xmlui.EPerson.trail_forgot_password");
private final static Message T_head = private static final Message T_head =
message("xmlui.EPerson.ResetPassword.head"); message("xmlui.EPerson.ResetPassword.head");
private final static Message T_para1 = private static final Message T_para1 =
message("xmlui.EPerson.ResetPassword.para1"); message("xmlui.EPerson.ResetPassword.para1");
private final static Message T_email_address = private static final Message T_email_address =
message("xmlui.EPerson.ResetPassword.email_address"); message("xmlui.EPerson.ResetPassword.email_address");
private final static Message T_new_password = private static final Message T_new_password =
message("xmlui.EPerson.ResetPassword.new_password"); message("xmlui.EPerson.ResetPassword.new_password");
private final static Message T_error_invalid_password = private static final Message T_error_invalid_password =
message("xmlui.EPerson.ResetPassword.error_invalid_password"); message("xmlui.EPerson.ResetPassword.error_invalid_password");
private final static Message T_confirm_password = private static final Message T_confirm_password =
message("xmlui.EPerson.ResetPassword.confirm_password"); message("xmlui.EPerson.ResetPassword.confirm_password");
private final static Message T_error_unconfirmed_password = private static final Message T_error_unconfirmed_password =
message("xmlui.EPerson.ResetPassword.error_unconfirmed_password"); message("xmlui.EPerson.ResetPassword.error_unconfirmed_password");
private final static Message T_submit = private static final Message T_submit =
message("xmlui.EPerson.ResetPassword.submit"); message("xmlui.EPerson.ResetPassword.submit");

18
dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/eperson/StartForgotPassword.java
View File

@@ -75,31 +75,31 @@ import org.xml.sax.SAXException;
public class StartForgotPassword extends AbstractDSpaceTransformer public class StartForgotPassword extends AbstractDSpaceTransformer
{ {
/** Language strings */ /** Language strings */
private final static Message T_title = private static final Message T_title =
message("xmlui.EPerson.StartForgotPassword.title"); message("xmlui.EPerson.StartForgotPassword.title");
private final static Message T_dspace_home = private static final Message T_dspace_home =
message("xmlui.general.dspace_home"); message("xmlui.general.dspace_home");
private final static Message T_trail_forgot_password = private static final Message T_trail_forgot_password =
message("xmlui.EPerson.trail_forgot_password"); message("xmlui.EPerson.trail_forgot_password");
private final static Message T_head = private static final Message T_head =
message("xmlui.EPerson.StartForgotPassword.head"); message("xmlui.EPerson.StartForgotPassword.head");
private final static Message T_para1 = private static final Message T_para1 =
message("xmlui.EPerson.StartForgotPassword.para1"); message("xmlui.EPerson.StartForgotPassword.para1");
private final static Message T_email_address = private static final Message T_email_address =
message("xmlui.EPerson.StartForgotPassword.email_address"); message("xmlui.EPerson.StartForgotPassword.email_address");
private final static Message T_email_address_help = private static final Message T_email_address_help =
message("xmlui.EPerson.StartForgotPassword.email_address_help"); message("xmlui.EPerson.StartForgotPassword.email_address_help");
private final static Message T_error_not_found = private static final Message T_error_not_found =
message("xmlui.EPerson.StartForgotPassword.error_not_found"); message("xmlui.EPerson.StartForgotPassword.error_not_found");
private final static Message T_submit = private static final Message T_submit =
message("xmlui.EPerson.StartForgotPassword.submit"); message("xmlui.EPerson.StartForgotPassword.submit");

12
dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/eperson/VerifyEmail.java
View File

@@ -70,22 +70,22 @@ import org.xml.sax.SAXException;
public class VerifyEmail extends AbstractDSpaceTransformer public class VerifyEmail extends AbstractDSpaceTransformer
{ {
/** language strings */ /** language strings */
private final static Message T_title = private static final Message T_title =
message("xmlui.EPerson.VerifyEmail.title"); message("xmlui.EPerson.VerifyEmail.title");
private final static Message T_dspace_home = private static final Message T_dspace_home =
message("xmlui.general.dspace_home"); message("xmlui.general.dspace_home");
private final static Message T_trail_forgot_password = private static final Message T_trail_forgot_password =
message("xmlui.EPerson.trail_forgot_password"); message("xmlui.EPerson.trail_forgot_password");
private final static Message T_trail_new_registration = private static final Message T_trail_new_registration =
message("xmlui.EPerson.trail_new_registration"); message("xmlui.EPerson.trail_new_registration");
private final static Message T_head = private static final Message T_head =
message("xmlui.EPerson.VerifyEmail.head"); message("xmlui.EPerson.VerifyEmail.head");
private final static Message T_para = private static final Message T_para =
message("xmlui.EPerson.VerifyEmail.para"); message("xmlui.EPerson.VerifyEmail.para");

4
dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/submission/FlowUtils.java
View File

@@ -85,10 +85,10 @@ import org.dspace.workflow.WorkflowManager;
public class FlowUtils { public class FlowUtils {
private static Logger log = Logger.getLogger(FlowUtils.class); private static final Logger log = Logger.getLogger(FlowUtils.class);
/** Where the submissionInfo is stored on an HTTP Request object */ /** Where the submissionInfo is stored on an HTTP Request object */
private final static String DSPACE_SUBMISSION_INFO = "dspace.submission.info"; private static final String DSPACE_SUBMISSION_INFO = "dspace.submission.info";
/** /**
* Return the InProgressSubmission, either workspaceItem or workflowItem, * Return the InProgressSubmission, either workspaceItem or workflowItem,

2
dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/aspect/submission/StepAndPage.java
View File

@@ -21,7 +21,7 @@ import org.apache.commons.lang.builder.HashCodeBuilder;
public class StepAndPage implements Comparable<StepAndPage> public class StepAndPage implements Comparable<StepAndPage>
{ {
/** Magic value meaning "no value" */ /** Magic value meaning "no value" */
final static private int UNSET = -1; private static final int UNSET = -1;
/** Step number */ /** Step number */
private int step; private int step;

4
dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/cocoon/ItemExportDownloadReader.java
View File

@@ -75,8 +75,8 @@ public class ItemExportDownloadReader extends AbstractReader implements Recyclab
* a particular bitstream. They will be redirected to the login * a particular bitstream. They will be redirected to the login
* where this message will be displayed. * where this message will be displayed.
*/ */
private final static String AUTH_REQUIRED_HEADER = "xmlui.ItemExportDownloadReader.auth_header"; private static final String AUTH_REQUIRED_HEADER = "xmlui.ItemExportDownloadReader.auth_header";
private final static String AUTH_REQUIRED_MESSAGE = "xmlui.ItemExportDownloadReader.auth_message"; private static final String AUTH_REQUIRED_MESSAGE = "xmlui.ItemExportDownloadReader.auth_message";
/** /**
* How big of a buffer should we use when reading from the bitstream before * How big of a buffer should we use when reading from the bitstream before

4
dspace-xmlui/dspace-xmlui-api/src/main/java/org/dspace/app/xmlui/cocoon/MetadataExportReader.java
View File

@@ -86,8 +86,8 @@ public class MetadataExportReader extends AbstractReader implements Recyclable
* a particular bitstream. They will be redirected to the login * a particular bitstream. They will be redirected to the login
* where this message will be displayed. * where this message will be displayed.
*/ */
private final static String AUTH_REQUIRED_HEADER = "xmlui.ItemExportDownloadReader.auth_header"; private static final String AUTH_REQUIRED_HEADER = "xmlui.ItemExportDownloadReader.auth_header";
private final static String AUTH_REQUIRED_MESSAGE = "xmlui.ItemExportDownloadReader.auth_message"; private static final String AUTH_REQUIRED_MESSAGE = "xmlui.ItemExportDownloadReader.auth_message";
/** /**
* How big of a buffer should we use when reading from the bitstream before * How big of a buffer should we use when reading from the bitstream before

2
dspace-xmlui/dspace-xmlui-wing/src/main/java/org/dspace/app/xmlui/wing/Include.java
View File

@@ -90,7 +90,7 @@ public class Include extends AbstractTransformer implements CacheableProcessingC
* the value is a list of all attributes that the element must match on to * the value is a list of all attributes that the element must match on to
* be considered the same element. * be considered the same element.
*/ */
private final static Map<String, String[]> mergeableMap; private static final Map<String, String[]> mergeableMap;
/** Construct the mergeableMap from constant data */ /** Construct the mergeableMap from constant data */
static static

2
dspace-xmlui/dspace-xmlui-wing/src/main/java/org/dspace/app/xmlui/wing/element/PageMeta.java
View File

@@ -62,7 +62,7 @@ public class PageMeta extends AbstractWingElement implements
WingMergeableElement, MetadataElement WingMergeableElement, MetadataElement
{ {
/** Name of the pageMeta element */ /** Name of the pageMeta element */
public final static String E_PAGE_META = "pageMeta"; public static final String E_PAGE_META = "pageMeta";
/** Has this PageMeta element been merged? */ /** Has this PageMeta element been merged? */
private boolean merged = false; private boolean merged = false;