luetzkendorf 2005/02/28 09:25:44
Modified: src/share/org/apache/slide/store AbstractStore.java
ExtendedStore.java
src/share/org/apache/slide/search/basic
ComparableResourceImpl.java
src/share/org/apache/slide/content ContentImpl.java
NodeRevisionDescriptor.java
src/stores/org/apache/slide/index/lucene Index.java
IndexConfiguration.java
src/share/org/apache/slide/macro MacroParameters.java
src/share/org/apache/slide/common Namespace.java
SlideTokenImpl.java
Log:
some minor improvements
Revision Changes Path
1.51 +5 -5
jakarta-slide/src/share/org/apache/slide/store/AbstractStore.java
Index: AbstractStore.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/share/org/apache/slide/store/AbstractStore.java,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- AbstractStore.java 15 Dec 2004 16:38:41 -0000 1.50
+++ AbstractStore.java 28 Feb 2005 17:25:43 -0000 1.51
@@ -202,7 +202,7 @@
public void setParameters(Hashtable parameters)
throws ServiceParameterErrorException,
ServiceParameterMissingException {
- this.parameters = parameters;
+ this.parameters = new Hashtable(parameters);
}
public Object getParameter (Object key) {
1.31 +7 -7
jakarta-slide/src/share/org/apache/slide/store/ExtendedStore.java
Index: ExtendedStore.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/share/org/apache/slide/store/ExtendedStore.java,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- ExtendedStore.java 28 Feb 2005 11:19:18 -0000 1.30
+++ ExtendedStore.java 28 Feb 2005 17:25:43 -0000 1.31
@@ -1129,7 +1129,7 @@
//
public void forget(Xid xid) throws XAException {
- Xid txId = (Xid) XidWrapper.wrap(xid);
+ Xid txId = XidWrapper.wrap(xid);
activeTransactionBranch.set(null);
objectsCache.getTxCache().forget(txId);
@@ -1142,7 +1142,7 @@
}
public void rollback(Xid xid) throws XAException {
- Xid txId = (Xid) XidWrapper.wrap(xid);
+ Xid txId = XidWrapper.wrap(xid);
activeTransactionBranch.set(null);
objectsCache.getTxCache().rollback(txId);
@@ -1155,7 +1155,7 @@
}
public void commit(Xid xid, boolean onePhase) throws XAException {
- Xid txId = (Xid) XidWrapper.wrap(xid);
+ Xid txId = XidWrapper.wrap(xid);
activeTransactionBranch.set(null);
objectsCache.getTxCache().commit(txId);
1.17 +5 -5
jakarta-slide/src/share/org/apache/slide/search/basic/ComparableResourceImpl.java
Index: ComparableResourceImpl.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/share/org/apache/slide/search/basic/ComparableResourceImpl.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- ComparableResourceImpl.java 10 Jan 2005 18:17:28 -0000 1.16
+++ ComparableResourceImpl.java 28 Feb 2005 17:25:44 -0000 1.17
@@ -571,7 +571,7 @@
{
Object otherValue = null;
if (thisValue instanceof Boolean)
- otherValue = new Boolean (literal);
+ otherValue = Boolean.valueOf(literal);
else if (thisValue instanceof Date) {
otherValue = new Date (); // TODO: dateTime.iso8601tz
1.64 +5 -6
jakarta-slide/src/share/org/apache/slide/content/ContentImpl.java
Index: ContentImpl.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/share/org/apache/slide/content/ContentImpl.java,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- ContentImpl.java 21 Dec 2004 16:12:44 -0000 1.63
+++ ContentImpl.java 28 Feb 2005 17:25:44 -0000 1.64
@@ -208,8 +208,7 @@
if (!realRevisionDescriptors.isVersioned()) {
// Invalid function call : we try to create a revision, but the
// descriptors won't allow it
- throw new NodeNotVersionedException
- (realRevisionDescriptors.getUri().toString());
+ throw new
NodeNotVersionedException(realRevisionDescriptors.getUri());
}
if( latestNrn == null ) {
1.44 +7 -7
jakarta-slide/src/share/org/apache/slide/content/NodeRevisionDescriptor.java
Index: NodeRevisionDescriptor.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/share/org/apache/slide/content/NodeRevisionDescriptor.java,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- NodeRevisionDescriptor.java 21 Dec 2004 16:12:44 -0000 1.43
+++ NodeRevisionDescriptor.java 28 Feb 2005 17:25:44 -0000 1.44
@@ -694,7 +694,7 @@
public String getOwner() {
NodeProperty owner = getProperty(PropertyName.OWNER);
if (owner == null) {
- return new String();
+ return "";
} else {
return (String) owner.getValue();
}
@@ -1119,7 +1119,7 @@
public String getRefTarget() {
NodeProperty refTarget = getProperty(PropertyName.REFTARGET);
if (refTarget == null) {
- return new String();
+ return "";
} else {
return (String) refTarget.getValue();
}
@@ -1144,7 +1144,7 @@
public String getRedirectLifetime() {
NodeProperty redirectLifetime =
getProperty(PropertyName.REDIRECT_LIFETIME);
if (redirectLifetime == null) {
- return new String();
+ return "";
} else {
return (String) redirectLifetime.getValue();
}
1.9 +5 -5
jakarta-slide/src/stores/org/apache/slide/index/lucene/Index.java
Index: Index.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/stores/org/apache/slide/index/lucene/Index.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Index.java 7 Dec 2004 17:49:57 -0000 1.8
+++ Index.java 28 Feb 2005 17:25:44 -0000 1.9
@@ -212,7 +212,7 @@
doc.add(unstoredString(Index.KEY_FIELD_NAME,
configuration.generateKey(uri,
descriptor.getRevisionNumber())));
- doc.add(storedString(Index.URI_FIELD_NAME, uri.toString()));
+ doc.add(storedString(Index.URI_FIELD_NAME, uri));
// scopes
StringTokenizer tokenizer = new StringTokenizer(uri, "/");
@@ -298,7 +298,7 @@
doc.add(unstoredString(Index.KEY_FIELD_NAME,
configuration.generateKey(uri,
descriptor.getRevisionNumber())));
- doc.add(storedString(Index.URI_FIELD_NAME, uri.toString()));
+ doc.add(storedString(Index.URI_FIELD_NAME, uri));
// scopes
StringTokenizer tokenizer = new StringTokenizer(uri, "/");
1.8 +4 -4
jakarta-slide/src/stores/org/apache/slide/index/lucene/IndexConfiguration.java
Index: IndexConfiguration.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/stores/org/apache/slide/index/lucene/IndexConfiguration.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- IndexConfiguration.java 7 Dec 2004 17:49:57 -0000 1.7
+++ IndexConfiguration.java 28 Feb 2005 17:25:44 -0000 1.8
@@ -318,7 +318,7 @@
}
public String generateKey(String uri, NodeRevisionNumber number) {
- return uri.toString() + "#" + number;
+ return uri + "#" + number;
}
public String dateToIndexString(Date date) {
1.9 +4 -4
jakarta-slide/src/share/org/apache/slide/macro/MacroParameters.java
Index: MacroParameters.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/share/org/apache/slide/macro/MacroParameters.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- MacroParameters.java 28 Jul 2004 09:35:25 -0000 1.8
+++ MacroParameters.java 28 Feb 2005 17:25:44 -0000 1.9
@@ -105,7 +105,7 @@
}
public void setBooleanParameter( String name, boolean value ) {
- parameters.put( name, new Boolean(value) );
+ parameters.put( name, (value ? Boolean.TRUE : Boolean.FALSE) );
}
public Object getParameter( String name ) {
1.75 +5 -5
jakarta-slide/src/share/org/apache/slide/common/Namespace.java
Index: Namespace.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/share/org/apache/slide/common/Namespace.java,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- Namespace.java 11 Feb 2005 17:30:39 -0000 1.74
+++ Namespace.java 28 Feb 2005 17:25:44 -0000 1.75
@@ -211,7 +211,7 @@
Namespace() {
stores = new Hashtable();
connectedServices = new Vector();
- name = new String();
+ name = "";
uriCache = new Hashtable();
}
1.17 +7 -7
jakarta-slide/src/share/org/apache/slide/common/SlideTokenImpl.java
Index: SlideTokenImpl.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/share/org/apache/slide/common/SlideTokenImpl.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- SlideTokenImpl.java 8 Nov 2004 09:31:57 -0000 1.16
+++ SlideTokenImpl.java 28 Feb 2005 17:25:44 -0000 1.17
@@ -69,7 +69,7 @@
public SlideTokenImpl(CredentialsToken credentialsToken,
Hashtable parameters) {
this.credentialsToken = credentialsToken;
- this.parameters = parameters;
+ this.parameters = new Hashtable(parameters);
}
@@ -305,7 +305,7 @@
*/
public void cachePermission(ObjectNode object, ActionNode action,
boolean permission){
String key = object.getUri()+ action.getUri();
- Boolean perm = new Boolean(permission);
+ Boolean perm = (permission ? Boolean.TRUE : Boolean.FALSE);
permissionCache.put(key,perm);
}
@@ -345,7 +345,7 @@
*/
public void cacheLock(ObjectNode object, ActionNode action, boolean
lock) {
String key = object.getUri()+ action.getUri();
- Boolean locked = new Boolean(lock);
+ Boolean locked = (lock ? Boolean.TRUE : Boolean.FALSE);
lockCache.put(key,locked);
}
@@ -384,7 +384,7 @@
*/
public void cacheMatchPrincipal(SubjectNode checkSubject, SubjectNode
matchSubject, boolean match) {
String key =
String.valueOf(checkSubject)+String.valueOf(matchSubject);
- matchPrincipalCache.put(key, new Boolean(match));
+ matchPrincipalCache.put(key, (match ? Boolean.TRUE : Boolean.FALSE));
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
