You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@clerezza.apache.org by to...@apache.org on 2010/01/31 18:39:29 UTC
svn commit: r905079 - in
/incubator/clerezza/trunk/org.apache.clerezza.parent:
org.apache.clerezza.platform.content.imagemetadata/src/main/java/org/apache/clerezza/platform/content/imagemetadata/
org.apache.clerezza.platform.typerendering/org.apache.cl...
Author: tommaso
Date: Sun Jan 31 17:39:28 2010
New Revision: 905079
URL: http://svn.apache.org/viewvc?rev=905079&view=rev
Log:
little code refactoring : use .valueOf instead of new for Integer, Character, etc.
Modified:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.content.imagemetadata/src/main/java/org/apache/clerezza/platform/content/imagemetadata/ImageMetaDataGenerator.java
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.typerendering/org.apache.clerezza.platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/RenderingspecificationException.java
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.rdf.core.test/src/main/java/org/apache/clerezza/rdf/core/test/MGraphTest.java
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.rdf.core/src/main/java/org/apache/clerezza/rdf/core/impl/SimpleLiteralFactory.java
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.rdf.file.storage/src/main/java/org/apache/clerezza/rdf/file/storage/FileTcProvider.java
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.rdf.jena.sparql/src/main/java/org/apache/clerezza/rdf/jena/sparql/JenaSparqlEngine.java
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.triaxrs/org.apache.clerezza.triaxrs/src/main/java/org/apache/clerezza/triaxrs/parameterinjectors/ConversionUtil.java
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.utils.imagemagick/src/main/java/org/apache/clerezza/utils/imagemagick/ImageMagickProvider.java
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.accountcontrolpanel/org.apache.clerezza.platform.accountcontrolpanel.core/src/main/java/org/apache/clerezza/platform/accountcontrolpanel/AccountControlPanel.java
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.core/src/main/java/org/apache/clerezza/platform/concepts/core/ResourceTagger.java
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.content/src/main/java/org/apache/clerezza/platform/content/hierarchy/HierarchyManager.java
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.usermanager.webinterface/src/main/java/org/apache/clerezza/platform/usermanager/webinterface/UserManagerWeb.java
Modified: incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.content.imagemetadata/src/main/java/org/apache/clerezza/platform/content/imagemetadata/ImageMetaDataGenerator.java
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.content.imagemetadata/src/main/java/org/apache/clerezza/platform/content/imagemetadata/ImageMetaDataGenerator.java?rev=905079&r1=905078&r2=905079&view=diff
==============================================================================
--- incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.content.imagemetadata/src/main/java/org/apache/clerezza/platform/content/imagemetadata/ImageMetaDataGenerator.java (original)
+++ incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.content.imagemetadata/src/main/java/org/apache/clerezza/platform/content/imagemetadata/ImageMetaDataGenerator.java Sun Jan 31 17:39:28 2010
@@ -48,7 +48,7 @@
node.addProperty(EXIF.width, LiteralFactory.getInstance().
createTypedLiteral(new Integer(buffImage.getWidth())));
node.addProperty(EXIF.height, LiteralFactory.getInstance().
- createTypedLiteral(new Integer(buffImage.getHeight())));
+ createTypedLiteral(Integer.valueOf(buffImage.getHeight())));
} catch (IOException ex) {
throw new RuntimeException(ex);
}
Modified: incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.typerendering/org.apache.clerezza.platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/RenderingspecificationException.java
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.typerendering/org.apache.clerezza.platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/RenderingspecificationException.java?rev=905079&r1=905078&r2=905079&view=diff
==============================================================================
--- incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.typerendering/org.apache.clerezza.platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/RenderingspecificationException.java (original)
+++ incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.typerendering/org.apache.clerezza.platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/RenderingspecificationException.java Sun Jan 31 17:39:28 2010
@@ -129,7 +129,7 @@
result.addProperty(TYPERENDERING.line, factory.createTypedLiteral(new Integer(lineNumber)));
}
if (columnNumber != -1) {
- result.addProperty(TYPERENDERING.column, factory.createTypedLiteral(new Integer(columnNumber)));
+ result.addProperty(TYPERENDERING.column, factory.createTypedLiteral(Integer.valueOf(columnNumber)));
}
result.addProperty(TYPERENDERING.message, new PlainLiteralImpl(getMessage()));
return result;
Modified: incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.rdf.core.test/src/main/java/org/apache/clerezza/rdf/core/test/MGraphTest.java
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.rdf.core.test/src/main/java/org/apache/clerezza/rdf/core/test/MGraphTest.java?rev=905079&r1=905078&r2=905079&view=diff
==============================================================================
--- incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.rdf.core.test/src/main/java/org/apache/clerezza/rdf/core/test/MGraphTest.java (original)
+++ incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.rdf.core.test/src/main/java/org/apache/clerezza/rdf/core/test/MGraphTest.java Sun Jan 31 17:39:28 2010
@@ -132,7 +132,7 @@
graph.add(new TripleImpl(uriRef1, uriRef2, uriRef3));
graph.add(new TripleImpl(uriRef2, uriRef3, uriRef4));
Assert.assertEquals(2, graph.size());
- graph.removeAll(graph);
+ graph.clear();
Assert.assertEquals(0, graph.size());
}
Modified: incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.rdf.core/src/main/java/org/apache/clerezza/rdf/core/impl/SimpleLiteralFactory.java
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.rdf.core/src/main/java/org/apache/clerezza/rdf/core/impl/SimpleLiteralFactory.java?rev=905079&r1=905078&r2=905079&view=diff
==============================================================================
--- incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.rdf.core/src/main/java/org/apache/clerezza/rdf/core/impl/SimpleLiteralFactory.java (original)
+++ incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.rdf.core/src/main/java/org/apache/clerezza/rdf/core/impl/SimpleLiteralFactory.java Sun Jan 31 17:39:28 2010
@@ -113,7 +113,7 @@
if (!literal.getDataType().equals(booleanUri)) {
throw new InvalidLiteralTypeException(Boolean.class, literal.getDataType());
}
- return new Boolean(literal.getLexicalForm());
+ return Boolean.valueOf(literal.getLexicalForm());
}
}
Modified: incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.rdf.file.storage/src/main/java/org/apache/clerezza/rdf/file/storage/FileTcProvider.java
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.rdf.file.storage/src/main/java/org/apache/clerezza/rdf/file/storage/FileTcProvider.java?rev=905079&r1=905078&r2=905079&view=diff
==============================================================================
--- incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.rdf.file.storage/src/main/java/org/apache/clerezza/rdf/file/storage/FileTcProvider.java (original)
+++ incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.rdf.file.storage/src/main/java/org/apache/clerezza/rdf/file/storage/FileTcProvider.java Sun Jan 31 17:39:28 2010
@@ -121,7 +121,7 @@
initialize();
MGraph mGraph = uriRef2MGraphMap.get(name);
if (mGraph == null) {
- File file = file = new File(URI.create(name.getUnicodeString()));
+ File file = new File(URI.create(name.getUnicodeString()));
if (file.exists()) {
return createMGraph(name);
} else {
Modified: incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.rdf.jena.sparql/src/main/java/org/apache/clerezza/rdf/jena/sparql/JenaSparqlEngine.java
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.rdf.jena.sparql/src/main/java/org/apache/clerezza/rdf/jena/sparql/JenaSparqlEngine.java?rev=905079&r1=905078&r2=905079&view=diff
==============================================================================
--- incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.rdf.jena.sparql/src/main/java/org/apache/clerezza/rdf/jena/sparql/JenaSparqlEngine.java (original)
+++ incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.rdf.jena.sparql/src/main/java/org/apache/clerezza/rdf/jena/sparql/JenaSparqlEngine.java Sun Jan 31 17:39:28 2010
@@ -68,7 +68,7 @@
return new ResultSetWrapper(qexec.execSelect());
} catch (QueryExecException e) {
try {
- return new Boolean(qexec.execAsk());
+ return Boolean.valueOf(qexec.execAsk());
} catch (QueryExecException e2) {
try {
return new JenaGraphAdaptor(
Modified: incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.triaxrs/org.apache.clerezza.triaxrs/src/main/java/org/apache/clerezza/triaxrs/parameterinjectors/ConversionUtil.java
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.triaxrs/org.apache.clerezza.triaxrs/src/main/java/org/apache/clerezza/triaxrs/parameterinjectors/ConversionUtil.java?rev=905079&r1=905078&r2=905079&view=diff
==============================================================================
--- incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.triaxrs/org.apache.clerezza.triaxrs/src/main/java/org/apache/clerezza/triaxrs/parameterinjectors/ConversionUtil.java (original)
+++ incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.triaxrs/org.apache.clerezza.triaxrs/src/main/java/org/apache/clerezza/triaxrs/parameterinjectors/ConversionUtil.java Sun Jan 31 17:39:28 2010
@@ -145,28 +145,28 @@
private static <T> T getPrimitiveValue(String value, Class<T> type) {
//boolean, byte, char, short, int, long, float, and double)
if (type.equals(boolean.class)) {
- return (T) new Boolean(value);
+ return (T) Boolean.valueOf(value);
}
if (type.equals(byte.class)) {
- return (T) new Byte(value);
+ return (T) Byte.valueOf(value);
}
if (type.equals(char.class)) {
- return (T) new Character(value.charAt(0));
+ return (T) Character.valueOf(value.charAt(0));
}
if (type.equals(short.class)) {
- return (T) new Short(value);
+ return (T) Short.valueOf(value);
}
if (type.equals(int.class)) {
- return (T) new Integer(value);
+ return (T) Integer.valueOf(value);
}
if (type.equals(long.class)) {
- return (T) new Long(value);
+ return (T) Long.valueOf(value);
}
if (type.equals(float.class)) {
- return (T) new Float(value);
+ return (T) Float.valueOf(value);
}
if (type.equals(double.class)) {
- return (T) new Double(value);
+ return (T) Double.valueOf(value);
}
throw new RuntimeException(type+" is not a known primitive type");
}
Modified: incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.utils.imagemagick/src/main/java/org/apache/clerezza/utils/imagemagick/ImageMagickProvider.java
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.utils.imagemagick/src/main/java/org/apache/clerezza/utils/imagemagick/ImageMagickProvider.java?rev=905079&r1=905078&r2=905079&view=diff
==============================================================================
--- incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.utils.imagemagick/src/main/java/org/apache/clerezza/utils/imagemagick/ImageMagickProvider.java (original)
+++ incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.utils.imagemagick/src/main/java/org/apache/clerezza/utils/imagemagick/ImageMagickProvider.java Sun Jan 31 17:39:28 2010
@@ -160,7 +160,7 @@
output = br.readLine();
br.close();
- if(!output.contains("Version: ImageMagick")) {
+ if(output!=null && !output.contains("Version: ImageMagick")) {
ok = false;
}
Modified: incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.accountcontrolpanel/org.apache.clerezza.platform.accountcontrolpanel.core/src/main/java/org/apache/clerezza/platform/accountcontrolpanel/AccountControlPanel.java
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.accountcontrolpanel/org.apache.clerezza.platform.accountcontrolpanel.core/src/main/java/org/apache/clerezza/platform/accountcontrolpanel/AccountControlPanel.java?rev=905079&r1=905078&r2=905079&view=diff
==============================================================================
--- incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.accountcontrolpanel/org.apache.clerezza.platform.accountcontrolpanel.core/src/main/java/org/apache/clerezza/platform/accountcontrolpanel/AccountControlPanel.java (original)
+++ incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.accountcontrolpanel/org.apache.clerezza.platform.accountcontrolpanel.core/src/main/java/org/apache/clerezza/platform/accountcontrolpanel/AccountControlPanel.java Sun Jan 31 17:39:28 2010
@@ -169,7 +169,7 @@
} catch (AccessControlException e) {
graphNode.addProperty(CONTROLPANEL.changePasswordPermission,
SimpleLiteralFactory.getInstance().createTypedLiteral(
- new Boolean(false)));
+ Boolean.valueOf(false)));
}
if (changedPassword != null && changedPassword.equals("false")) {
graphNode.addProperty(CONTROLPANEL.changedPassword,
@@ -209,7 +209,7 @@
GraphNode graphNode = new GraphNode(getAgent(userId), unionGraph);
graphNode.addProperty(CONTROLPANEL.userBundlePermission,
SimpleLiteralFactory.getInstance().createTypedLiteral(
- new Boolean(true)));
+ Boolean.valueOf(true)));
return graphNode;
}
});
Modified: incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.core/src/main/java/org/apache/clerezza/platform/concepts/core/ResourceTagger.java
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.core/src/main/java/org/apache/clerezza/platform/concepts/core/ResourceTagger.java?rev=905079&r1=905078&r2=905079&view=diff
==============================================================================
--- incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.core/src/main/java/org/apache/clerezza/platform/concepts/core/ResourceTagger.java (original)
+++ incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.core/src/main/java/org/apache/clerezza/platform/concepts/core/ResourceTagger.java Sun Jan 31 17:39:28 2010
@@ -117,7 +117,7 @@
node.addProperty(DCTERMS.subject, new UriRef(subject));
}
}
- } else if(uri != null){
+ } else {
throw new WebApplicationException(Response.status(
Status.BAD_REQUEST).entity("No resource uri defined.").build());
}
Modified: incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.content/src/main/java/org/apache/clerezza/platform/content/hierarchy/HierarchyManager.java
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.content/src/main/java/org/apache/clerezza/platform/content/hierarchy/HierarchyManager.java?rev=905079&r1=905078&r2=905079&view=diff
==============================================================================
--- incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.content/src/main/java/org/apache/clerezza/platform/content/hierarchy/HierarchyManager.java (original)
+++ incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.content/src/main/java/org/apache/clerezza/platform/content/hierarchy/HierarchyManager.java Sun Jan 31 17:39:28 2010
@@ -255,7 +255,7 @@
result.add(new TripleImpl(memberNode.getNode(),
HIERARCHY.membersNumber,
LiteralFactory.getInstance().createTypedLiteral(
- new Integer(memberCollection.getMembers().size()))));
+ Integer.valueOf(memberCollection.getMembers().size()))));
}
}
return result;
Modified: incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.usermanager.webinterface/src/main/java/org/apache/clerezza/platform/usermanager/webinterface/UserManagerWeb.java
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.usermanager.webinterface/src/main/java/org/apache/clerezza/platform/usermanager/webinterface/UserManagerWeb.java?rev=905079&r1=905078&r2=905079&view=diff
==============================================================================
--- incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.usermanager.webinterface/src/main/java/org/apache/clerezza/platform/usermanager/webinterface/UserManagerWeb.java (original)
+++ incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.usermanager.webinterface/src/main/java/org/apache/clerezza/platform/usermanager/webinterface/UserManagerWeb.java Sun Jan 31 17:39:28 2010
@@ -48,27 +48,18 @@
import javax.ws.rs.core.Response.ResponseBuilder;
import javax.ws.rs.core.Response.Status;
-import org.apache.clerezza.platform.dashboard.GlobalMenuItem;
-import org.apache.felix.scr.annotations.Component;
-import org.apache.felix.scr.annotations.Properties;
-import org.apache.felix.scr.annotations.Property;
-import org.apache.felix.scr.annotations.Reference;
-import org.apache.felix.scr.annotations.Service;
-import org.osgi.framework.Bundle;
-import org.osgi.service.component.ComponentContext;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import org.apache.clerezza.jaxrs.utils.RedirectUtil;
import org.apache.clerezza.jaxrs.utils.TrailingSlash;
import org.apache.clerezza.jaxrs.utils.form.MultiPartBody;
import org.apache.clerezza.platform.config.SystemConfig;
+import org.apache.clerezza.platform.dashboard.GlobalMenuItem;
import org.apache.clerezza.platform.dashboard.GlobalMenuItemsProvider;
import org.apache.clerezza.platform.graphprovider.content.ContentGraphProvider;
import org.apache.clerezza.platform.typerendering.RenderletManager;
import org.apache.clerezza.platform.typerendering.scalaserverpages.ScalaServerPagesRenderlet;
import org.apache.clerezza.platform.typerendering.seedsnipe.SeedsnipeRenderlet;
-import org.apache.clerezza.platform.usermanager.UserManager;
import org.apache.clerezza.platform.usermanager.UserComparator;
+import org.apache.clerezza.platform.usermanager.UserManager;
import org.apache.clerezza.platform.usermanager.webinterface.ontology.USERMANAGER;
import org.apache.clerezza.rdf.core.BNode;
import org.apache.clerezza.rdf.core.LiteralFactory;
@@ -94,7 +85,15 @@
import org.apache.clerezza.utils.customproperty.ontology.CUSTOMPROPERTY;
import org.apache.clerezza.web.fileserver.BundlePathNode;
import org.apache.clerezza.web.fileserver.FileServer;
+import org.apache.felix.scr.annotations.Component;
+import org.apache.felix.scr.annotations.Property;
+import org.apache.felix.scr.annotations.Reference;
+import org.apache.felix.scr.annotations.Service;
import org.apache.felix.scr.annotations.Services;
+import org.osgi.framework.Bundle;
+import org.osgi.service.component.ComponentContext;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.wymiwyg.commons.util.dirbrowser.PathNode;
/**
@@ -420,7 +419,7 @@
UriRef property = customPropertyManager
.getCustomFieldProperty(customField);
- if (userName != null && userName != ""
+ if (userName != null && !userName.equals("")
&& userName.trim().length() > 0) {
NonLiteral user = getCustomUser(contentGraph, userName);
if (user != null) {