Author: rfrovarp
Date: Sun Feb 7 04:18:46 2010
New Revision: 907377
URL: http://svn.apache.org/viewvc?rev=907377&view=rev
Log:
Move away from the inefficient 1.4 operations.
Modified:
lenya/branches/BRANCH_2_1_X/src/java/org/apache/lenya/ac/Password.java
lenya/branches/BRANCH_2_1_X/src/java/org/apache/lenya/cms/workflow/DocumentWorkflowable.java
lenya/branches/BRANCH_2_1_X/src/modules-core/ac/java/src/org/apache/lenya/ac/file/FileItemManager.java
lenya/branches/BRANCH_2_1_X/src/modules-core/ac/java/src/org/apache/lenya/ac/impl/CredentialImpl.java
lenya/branches/BRANCH_2_1_X/src/modules-core/administration/java/src/org/apache/lenya/cms/ac/usecases/AddIPRange.java
lenya/branches/BRANCH_2_1_X/src/modules-core/administration/java/src/org/apache/lenya/cms/ac/usecases/IPRangeProfile.java
lenya/branches/BRANCH_2_1_X/src/modules-core/sitemanagement/java/src/org/apache/lenya/cms/site/usecases/Overview.java
lenya/branches/BRANCH_2_1_X/src/modules/news/java/src/org/apache/lenya/modules/news/usecases/Edit.java
lenya/branches/BRANCH_2_1_X/src/modules/notification/java/src/org/apache/lenya/inbox/usecases/Inbox.java
lenya/branches/BRANCH_2_1_X/src/modules/sourcerepository/java/src/org/apache/lenya/cms/repository/SourceNodeRCML.java
Modified: lenya/branches/BRANCH_2_1_X/src/java/org/apache/lenya/ac/Password.java
URL: http://svn.apache.org/viewvc/lenya/branches/BRANCH_2_1_X/src/java/org/apache/lenya/ac/Password.java?rev=907377&r1=907376&r2=907377&view=diff
==============================================================================
--- lenya/branches/BRANCH_2_1_X/src/java/org/apache/lenya/ac/Password.java (original)
+++ lenya/branches/BRANCH_2_1_X/src/java/org/apache/lenya/ac/Password.java Sun Feb 7 04:18:46 2010
@@ -64,8 +64,8 @@
for (int i = 0; i < buf.length; i++) {
int h = (buf[i] & 0xf0) >> 4;
int l = (buf[i] & 0x0f);
- sb.append(new Character((char) ((h > 9) ? (('a' + h) - 10) : ('0' + h))));
- sb.append(new Character((char) ((l > 9) ? (('a' + l) - 10) : ('0' + l))));
+ sb.append(Character.valueOf((char) ((h > 9) ? (('a' + h) - 10) : ('0' + h))));
+ sb.append(Character.valueOf((char) ((l > 9) ? (('a' + l) - 10) : ('0' + l))));
}
return sb.toString();
Modified: lenya/branches/BRANCH_2_1_X/src/java/org/apache/lenya/cms/workflow/DocumentWorkflowable.java
URL: http://svn.apache.org/viewvc/lenya/branches/BRANCH_2_1_X/src/java/org/apache/lenya/cms/workflow/DocumentWorkflowable.java?rev=907377&r1=907376&r2=907377&view=diff
==============================================================================
--- lenya/branches/BRANCH_2_1_X/src/java/org/apache/lenya/cms/workflow/DocumentWorkflowable.java (original)
+++ lenya/branches/BRANCH_2_1_X/src/java/org/apache/lenya/cms/workflow/DocumentWorkflowable.java Sun Feb 7 04:18:46 2010
@@ -138,7 +138,7 @@
int number = Integer.parseInt(numberString);
String versionString = string.substring(spaceIndex + 1);
Version version = decodeVersion(versionString);
- number2version.put(new Integer(number), version);
+ number2version.put(Integer.valueOf(number), version);
}
int number = 0;
Modified: lenya/branches/BRANCH_2_1_X/src/modules-core/ac/java/src/org/apache/lenya/ac/file/FileItemManager.java
URL: http://svn.apache.org/viewvc/lenya/branches/BRANCH_2_1_X/src/modules-core/ac/java/src/org/apache/lenya/ac/file/FileItemManager.java?rev=907377&r1=907376&r2=907377&view=diff
==============================================================================
--- lenya/branches/BRANCH_2_1_X/src/modules-core/ac/java/src/org/apache/lenya/ac/file/FileItemManager.java (original)
+++ lenya/branches/BRANCH_2_1_X/src/modules-core/ac/java/src/org/apache/lenya/ac/file/FileItemManager.java Sun Feb 7 04:18:46 2010
@@ -444,7 +444,7 @@
}
}
}
- Long lastModified = new Long(files[i].lastModified());
+ Long lastModified = Long.valueOf(files[i].lastModified());
this.canonicalPath2LastModified.put(canonicalPath, lastModified);
}
Modified: lenya/branches/BRANCH_2_1_X/src/modules-core/ac/java/src/org/apache/lenya/ac/impl/CredentialImpl.java
URL: http://svn.apache.org/viewvc/lenya/branches/BRANCH_2_1_X/src/modules-core/ac/java/src/org/apache/lenya/ac/impl/CredentialImpl.java?rev=907377&r1=907376&r2=907377&view=diff
==============================================================================
--- lenya/branches/BRANCH_2_1_X/src/modules-core/ac/java/src/org/apache/lenya/ac/impl/CredentialImpl.java (original)
+++ lenya/branches/BRANCH_2_1_X/src/modules-core/ac/java/src/org/apache/lenya/ac/impl/CredentialImpl.java Sun Feb 7 04:18:46 2010
@@ -107,7 +107,7 @@
}
public int hashCode() {
- Integer integer = new Integer(getAccreditable().hashCode() + getRole().hashCode());
+ Integer integer = Integer.valueOf(getAccreditable().hashCode() + getRole().hashCode());
return integer.hashCode();
}
}
Modified: lenya/branches/BRANCH_2_1_X/src/modules-core/administration/java/src/org/apache/lenya/cms/ac/usecases/AddIPRange.java
URL: http://svn.apache.org/viewvc/lenya/branches/BRANCH_2_1_X/src/modules-core/administration/java/src/org/apache/lenya/cms/ac/usecases/AddIPRange.java?rev=907377&r1=907376&r2=907377&view=diff
==============================================================================
--- lenya/branches/BRANCH_2_1_X/src/modules-core/administration/java/src/org/apache/lenya/cms/ac/usecases/AddIPRange.java (original)
+++ lenya/branches/BRANCH_2_1_X/src/modules-core/administration/java/src/org/apache/lenya/cms/ac/usecases/AddIPRange.java Sun Feb 7 04:18:46 2010
@@ -99,7 +99,7 @@
for (byte i = 0; i < 4; i++) {
setParameter(IPRangeProfile.NETWORK_ADDRESS + "-" + i, new Part(i));
setParameter(IPRangeProfile.SUBNET_MASK + "-" + i, new Part(i));
- partNumbers.add(new Integer(i));
+ partNumbers.add(Integer.valueOf(i));
}
setParameter(IPRangeProfile.PART_NUMBERS, partNumbers);
}
Modified: lenya/branches/BRANCH_2_1_X/src/modules-core/administration/java/src/org/apache/lenya/cms/ac/usecases/IPRangeProfile.java
URL: http://svn.apache.org/viewvc/lenya/branches/BRANCH_2_1_X/src/modules-core/administration/java/src/org/apache/lenya/cms/ac/usecases/IPRangeProfile.java?rev=907377&r1=907376&r2=907377&view=diff
==============================================================================
--- lenya/branches/BRANCH_2_1_X/src/modules-core/administration/java/src/org/apache/lenya/cms/ac/usecases/IPRangeProfile.java (original)
+++ lenya/branches/BRANCH_2_1_X/src/modules-core/administration/java/src/org/apache/lenya/cms/ac/usecases/IPRangeProfile.java Sun Feb 7 04:18:46 2010
@@ -116,7 +116,7 @@
setParameter(NETWORK_ADDRESS + "-" + i, new Part(i, addrPart));
String maskPart = Integer.toString(0xFF & subnetMask.getAddress()[i]);
setParameter(SUBNET_MASK + "-" + i, new Part(i, maskPart));
- partNumbers.add(new Integer(i));
+ partNumbers.add(Integer.valueOf(i));
}
setParameter(IPRangeProfile.PART_NUMBERS, partNumbers);
Modified: lenya/branches/BRANCH_2_1_X/src/modules-core/sitemanagement/java/src/org/apache/lenya/cms/site/usecases/Overview.java
URL: http://svn.apache.org/viewvc/lenya/branches/BRANCH_2_1_X/src/modules-core/sitemanagement/java/src/org/apache/lenya/cms/site/usecases/Overview.java?rev=907377&r1=907376&r2=907377&view=diff
==============================================================================
--- lenya/branches/BRANCH_2_1_X/src/modules-core/sitemanagement/java/src/org/apache/lenya/cms/site/usecases/Overview.java (original)
+++ lenya/branches/BRANCH_2_1_X/src/modules-core/sitemanagement/java/src/org/apache/lenya/cms/site/usecases/Overview.java Sun Feb 7 04:18:46 2010
@@ -70,8 +70,8 @@
URLInformation info = new URLInformation(getSourceURL());
Publication pub = getDocumentFactory().getPublication(info.getPublicationId());
Area area = pub.getArea(info.getArea());
- setParameter(PARAM_NUMBER_OF_DOCUMENTS, new Integer(area.getDocuments().length));
- setParameter(PARAM_NUMBER_OF_SITE_NODES, new Integer(area.getSite().getNodes().length));
+ setParameter(PARAM_NUMBER_OF_DOCUMENTS, Integer.valueOf(area.getDocuments().length));
+ setParameter(PARAM_NUMBER_OF_SITE_NODES, Integer.valueOf(area.getSite().getNodes().length));
}
else {
// read parameters from Dublin Core meta-data
@@ -133,4 +133,4 @@
// don't complain if document is null
}
-}
\ No newline at end of file
+}
Modified: lenya/branches/BRANCH_2_1_X/src/modules/news/java/src/org/apache/lenya/modules/news/usecases/Edit.java
URL: http://svn.apache.org/viewvc/lenya/branches/BRANCH_2_1_X/src/modules/news/java/src/org/apache/lenya/modules/news/usecases/Edit.java?rev=907377&r1=907376&r2=907377&view=diff
==============================================================================
--- lenya/branches/BRANCH_2_1_X/src/modules/news/java/src/org/apache/lenya/modules/news/usecases/Edit.java (original)
+++ lenya/branches/BRANCH_2_1_X/src/modules/news/java/src/org/apache/lenya/modules/news/usecases/Edit.java Sun Feb 7 04:18:46 2010
@@ -44,14 +44,14 @@
NewsWrapper news = new NewsWrapper(doc, getLogger());
setParameter(NEWS_WRAPPER, news);
- setParameter(INCLUDE_ITEM_NUMBER, new Short(news.getIncludeItemNumber()));
+ setParameter(INCLUDE_ITEM_NUMBER, Short.valueOf(news.getIncludeItemNumber()));
setParameter(SHOW_ALL_LANGUAGES, Boolean.valueOf(news.showAllLanguages()));
setParameter(TYPE, news.getType());
setParameter(HREF, news.getHref());
List numbers = new ArrayList();
for (int i = 1; i <= 10; i++) {
- numbers.add(new Integer(i));
+ numbers.add(Integer.valueOf(i));
}
setParameter(NUMBERS, numbers);
}
Modified: lenya/branches/BRANCH_2_1_X/src/modules/notification/java/src/org/apache/lenya/inbox/usecases/Inbox.java
URL: http://svn.apache.org/viewvc/lenya/branches/BRANCH_2_1_X/src/modules/notification/java/src/org/apache/lenya/inbox/usecases/Inbox.java?rev=907377&r1=907376&r2=907377&view=diff
==============================================================================
--- lenya/branches/BRANCH_2_1_X/src/modules/notification/java/src/org/apache/lenya/inbox/usecases/Inbox.java (original)
+++ lenya/branches/BRANCH_2_1_X/src/modules/notification/java/src/org/apache/lenya/inbox/usecases/Inbox.java Sun Feb 7 04:18:46 2010
@@ -51,8 +51,8 @@
nofUnreadMessages++;
}
}
- setParameter(PARAM_NOF_MESSAGES, new Integer(messages.length));
- setParameter(PARAM_NOF_UNREAD_MESSAGES, new Integer(nofUnreadMessages));
+ setParameter(PARAM_NOF_MESSAGES, Integer.valueOf(messages.length));
+ setParameter(PARAM_NOF_UNREAD_MESSAGES, Integer.valueOf(nofUnreadMessages));
}
}
Modified: lenya/branches/BRANCH_2_1_X/src/modules/sourcerepository/java/src/org/apache/lenya/cms/repository/SourceNodeRCML.java
URL: http://svn.apache.org/viewvc/lenya/branches/BRANCH_2_1_X/src/modules/sourcerepository/java/src/org/apache/lenya/cms/repository/SourceNodeRCML.java?rev=907377&r1=907376&r2=907377&view=diff
==============================================================================
--- lenya/branches/BRANCH_2_1_X/src/modules/sourcerepository/java/src/org/apache/lenya/cms/repository/SourceNodeRCML.java (original)
+++ lenya/branches/BRANCH_2_1_X/src/modules/sourcerepository/java/src/org/apache/lenya/cms/repository/SourceNodeRCML.java Sun Feb 7 04:18:46 2010
@@ -76,8 +76,8 @@
protected static final String ATTR_SESSION = "session";
{
- ELEMENTS.put(new Short(ci), ELEMENT_CHECKIN);
- ELEMENTS.put(new Short(co), ELEMENT_CHECKOUT);
+ ELEMENTS.put(Short.valueOf(ci), ELEMENT_CHECKIN);
+ ELEMENTS.put(Short.valueOf(co), ELEMENT_CHECKOUT);
}
/**
@@ -154,7 +154,7 @@
} else {
RCMLEntry latestEntry = getLatestEntry();
if (type == latestEntry.getType()) {
- String elementName = (String) ELEMENTS.get(new Short(type));
+ String elementName = (String) ELEMENTS.get(Short.valueOf(type));
throw new IllegalStateException("RCML entry type <" + elementName
+ "> not allowed twice in a row. Before: [" + latestEntry.getIdentity()
+ "], now: [" + identity + "], node: [" + this.contentSourceUri + "]");
@@ -195,7 +195,7 @@
protected Element saveToXml(NamespaceHelper helper, RCMLEntry entry)
throws RevisionControlException {
- String elementName = (String) ELEMENTS.get(new Short(entry.getType()));
+ String elementName = (String) ELEMENTS.get(Short.valueOf(entry.getType()));
Element entryElement = helper.createElement(elementName);
entryElement.setAttribute(ATTR_IDENTITY, entry.getIdentity());
lmpx.com only provides a reader for public news (NNTP) servers. It is not
affiliated with the servers or forums shown here and is not responsible for
the content of articles, which is written by their respective authors.