Author: fmui
Date: Thu Dec 6 22:18:46 2012
New Revision: 1418112
URL: http://svn.apache.org/viewvc?rev=1418112&view=rev
Log:
code clean up
Modified:
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/CmisBindingFactory.java
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/browser/CmisBrowserBindingSpi.java
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/cookies/CmisHttpCookie.java
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/http/HttpUtils.java
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/local/CmisLocalSpi.java
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/webservices/CmisWebServicesSpi.java
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/webservices/PortProvider.java
chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/UrlBuilder.java
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/atompub/DiscoveryService.java
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/atompub/MultiFilingService.java
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/atompub/PolicyService.java
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/atompub/RelationshipService.java
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/atompub/VersioningService.java
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/browser/BrowserBindingUtils.java
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/browser/DiscoveryService.java
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/browser/VersioningService.java
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/shared/Dispatcher.java
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/shared/ExceptionHelper.java
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/shared/HttpUtils.java
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/query/CalendarHelper.java
chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tck/src/main/java/org/apache/chemistry/opencmis/tck/impl/AbstractSessionTest.java
chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tck/src/main/java/org/apache/chemistry/opencmis/tck/report/TextReport.java
chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/ClientFrame.java
chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/RepositoryInfoFrame.java
chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/model/ClientSession.java
Modified:
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/CmisBindingFactory.java
URL:
http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/CmisBindingFactory.java?rev=1418112&r1=1418111&r2=1418112&view=diff
==============================================================================
---
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/CmisBindingFactory.java
(original)
+++
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/CmisBindingFactory.java
Thu Dec 6 22:18:46 2012
@@ -235,9 +235,9 @@ public class CmisBindingFactory {
}
// check binding entry
- String SPIClass =
sessionParameters.get(SessionParameter.BINDING_SPI_CLASS);
+ final String spiClass =
sessionParameters.get(SessionParameter.BINDING_SPI_CLASS);
if (mustContainSPI) {
- if ((SPIClass == null) || (SPIClass.trim().length() == 0)) {
+ if ((spiClass == null) || (spiClass.trim().length() == 0)) {
throw new IllegalArgumentException("SPI class entry (" +
SessionParameter.BINDING_SPI_CLASS
+ ") is missing!");
}
Modified:
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/browser/CmisBrowserBindingSpi.java
URL:
http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/browser/CmisBrowserBindingSpi.java?rev=1418112&r1=1418111&r2=1418112&view=diff
==============================================================================
---
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/browser/CmisBrowserBindingSpi.java
(original)
+++
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/browser/CmisBrowserBindingSpi.java
Thu Dec 6 22:18:46 2012
@@ -34,7 +34,7 @@ import org.slf4j.LoggerFactory;
public class CmisBrowserBindingSpi implements CmisSpi {
- private static final Logger log =
LoggerFactory.getLogger(CmisBrowserBindingSpi.class);
+ private static final Logger LOG =
LoggerFactory.getLogger(CmisBrowserBindingSpi.class);
private final BindingSession session;
@@ -52,8 +52,8 @@ public class CmisBrowserBindingSpi imple
* Constructor.
*/
public CmisBrowserBindingSpi(BindingSession session) {
- if (log.isDebugEnabled()) {
- log.debug("Initializing Browser Binding SPI...");
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Initializing Browser Binding SPI...");
}
this.session = session;
Modified:
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/cookies/CmisHttpCookie.java
URL:
http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/cookies/CmisHttpCookie.java?rev=1418112&r1=1418111&r2=1418112&view=diff
==============================================================================
---
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/cookies/CmisHttpCookie.java
(original)
+++
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/cookies/CmisHttpCookie.java
Thu Dec 6 22:18:46 2012
@@ -46,12 +46,12 @@ public final class CmisHttpCookie implem
private static final String LOCAL_STR = ".local";
private static final String QUOTE_STR = "\"";
private static final String COMMA_STR = ",";
- private static Pattern HEAD_PATTERN = Pattern.compile("Set-Cookie2?:",
Pattern.CASE_INSENSITIVE);
- private static Pattern NAME_PATTERN = Pattern.compile(
+ private static final Pattern HEAD_PATTERN =
Pattern.compile("Set-Cookie2?:", Pattern.CASE_INSENSITIVE);
+ private static final Pattern NAME_PATTERN = Pattern.compile(
"([^$=,\u0085\u2028\u2029][^,\n\t\r\r\n\u0085\u2028\u2029]*?)=([^;]*)(;)?",
Pattern.DOTALL
| Pattern.CASE_INSENSITIVE);
- private static Pattern ATTR_PATTERN0 =
Pattern.compile("([^;=]*)(?:=([^;]*))?");
- private static Pattern ATTR_PATTERN1 =
Pattern.compile("(,?[^;=]*)(?:=([^;,]*))?((?=.))?");
+ private static final Pattern ATTR_PATTERN0 =
Pattern.compile("([^;=]*)(?:=([^;]*))?");
+ private static final Pattern ATTR_PATTERN1 =
Pattern.compile("(,?[^;=]*)(?:=([^;,]*))?((?=.))?");
private abstract static class Setter {
boolean set;
Modified:
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/http/HttpUtils.java
URL:
http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/http/HttpUtils.java?rev=1418112&r1=1418111&r2=1418112&view=diff
==============================================================================
---
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/http/HttpUtils.java
(original)
+++
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/http/HttpUtils.java
Thu Dec 6 22:18:46 2012
@@ -55,7 +55,7 @@ import org.slf4j.LoggerFactory;
*/
public class HttpUtils {
- private static final Logger log = LoggerFactory.getLogger(HttpUtils.class);
+ private static final Logger LOG = LoggerFactory.getLogger(HttpUtils.class);
private static final int BUFFER_SIZE = 2 * 1024 * 1024;
@@ -87,8 +87,8 @@ public class HttpUtils {
Output writer, BindingSession session, BigInteger offset,
BigInteger length) {
try {
// log before connect
- if (log.isDebugEnabled()) {
- log.debug(method + " " + url);
+ if (LOG.isDebugEnabled()) {
+ LOG.debug(method + " " + url);
}
// connect
@@ -208,8 +208,8 @@ public class HttpUtils {
}
// log after connect
- if (log.isTraceEnabled()) {
- log.trace(method + " " + url + " > Headers: " +
conn.getHeaderFields());
+ if (LOG.isTraceEnabled()) {
+ LOG.trace(method + " " + url + " > Headers: " +
conn.getHeaderFields());
}
// forward response HTTP headers
Modified:
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/local/CmisLocalSpi.java
URL:
http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/local/CmisLocalSpi.java?rev=1418112&r1=1418111&r2=1418112&view=diff
==============================================================================
---
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/local/CmisLocalSpi.java
(original)
+++
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/local/CmisLocalSpi.java
Thu Dec 6 22:18:46 2012
@@ -45,7 +45,7 @@ import org.slf4j.LoggerFactory;
*/
public class CmisLocalSpi implements CmisSpi {
- private static final Logger log =
LoggerFactory.getLogger(CmisLocalSpi.class);
+ private static final Logger LOG =
LoggerFactory.getLogger(CmisLocalSpi.class);
private final CmisServiceFactory factory;
@@ -63,8 +63,8 @@ public class CmisLocalSpi implements Cmi
* Constructor.
*/
public CmisLocalSpi(BindingSession session) {
- if (log.isDebugEnabled()) {
- log.debug("Initializing local SPI...");
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Initializing local SPI...");
}
// get the service factory class name
Modified:
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/webservices/CmisWebServicesSpi.java
URL:
http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/webservices/CmisWebServicesSpi.java?rev=1418112&r1=1418111&r2=1418112&view=diff
==============================================================================
---
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/webservices/CmisWebServicesSpi.java
(original)
+++
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/webservices/CmisWebServicesSpi.java
Thu Dec 6 22:18:46 2012
@@ -38,7 +38,7 @@ import org.slf4j.LoggerFactory;
*/
public class CmisWebServicesSpi implements CmisSpi {
- private static final Logger log =
LoggerFactory.getLogger(CmisWebServicesSpi.class);
+ private static final Logger LOG =
LoggerFactory.getLogger(CmisWebServicesSpi.class);
private final RepositoryService repositoryService;
private final NavigationService navigationService;
@@ -54,8 +54,8 @@ public class CmisWebServicesSpi implemen
* Constructor.
*/
public CmisWebServicesSpi(BindingSession session) {
- if (log.isDebugEnabled()) {
- log.debug("Initializing Web Services SPI...");
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Initializing Web Services SPI...");
}
AbstractPortProvider portProvider = null;
Modified:
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/webservices/PortProvider.java
URL:
http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/webservices/PortProvider.java?rev=1418112&r1=1418111&r2=1418112&view=diff
==============================================================================
---
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/webservices/PortProvider.java
(original)
+++
chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-bindings/src/main/java/org/apache/chemistry/opencmis/client/bindings/spi/webservices/PortProvider.java
Thu Dec 6 22:18:46 2012
@@ -56,15 +56,15 @@ import com.sun.xml.ws.developer.WSBindin
* headers.
*/
public class PortProvider extends AbstractPortProvider {
- private static final Logger log =
LoggerFactory.getLogger(PortProvider.class);
+ private static final Logger LOG =
LoggerFactory.getLogger(PortProvider.class);
/**
* Creates a port object.
*/
protected Object createPortObject(Service service) {
- if (log.isDebugEnabled()) {
- log.debug("Creating Web Service port object of " + (service ==
null ? "???" : service.getServiceName())
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Creating Web Service port object of " + (service ==
null ? "???" : service.getServiceName())
+ "...");
}
Modified:
chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/UrlBuilder.java
URL:
http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/UrlBuilder.java?rev=1418112&r1=1418111&r2=1418112&view=diff
==============================================================================
---
chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/UrlBuilder.java
(original)
+++
chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/UrlBuilder.java
Thu Dec 6 22:18:46 2012
@@ -167,7 +167,7 @@ public class UrlBuilder {
return this;
}
- public static char[] RFC7232_RESERVED = ";?:@&=+$,[]".toCharArray();
+ public static final char[] RFC7232_RESERVED = ";?:@&=+$,[]".toCharArray();
public static String quoteURIPathComponent(String s, boolean quoteSlash) {
if (s.length() == 0) {
Modified:
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/atompub/DiscoveryService.java
URL:
http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/atompub/DiscoveryService.java?rev=1418112&r1=1418111&r2=1418112&view=diff
==============================================================================
---
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/atompub/DiscoveryService.java
(original)
+++
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/atompub/DiscoveryService.java
Thu Dec 6 22:18:46 2012
@@ -55,7 +55,7 @@ import org.apache.chemistry.opencmis.com
/**
* Discovery Service operations.
*/
-public class DiscoveryService {
+public final class DiscoveryService {
private static final String METHOD_GET = "GET";
private static final String METHOD_POST = "POST";
Modified:
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/atompub/MultiFilingService.java
URL:
http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/atompub/MultiFilingService.java?rev=1418112&r1=1418111&r2=1418112&view=diff
==============================================================================
---
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/atompub/MultiFilingService.java
(original)
+++
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/atompub/MultiFilingService.java
Thu Dec 6 22:18:46 2012
@@ -41,7 +41,7 @@ import org.apache.chemistry.opencmis.com
/**
* MultiFiling Service operations.
*/
-public class MultiFilingService {
+public final class MultiFilingService {
private MultiFilingService() {
}
Modified:
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/atompub/PolicyService.java
URL:
http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/atompub/PolicyService.java?rev=1418112&r1=1418111&r2=1418112&view=diff
==============================================================================
---
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/atompub/PolicyService.java
(original)
+++
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/atompub/PolicyService.java
Thu Dec 6 22:18:46 2012
@@ -43,7 +43,7 @@ import org.apache.chemistry.opencmis.com
/**
* Policy Service operations.
*/
-public class PolicyService {
+public final class PolicyService {
private PolicyService() {
}
Modified:
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/atompub/RelationshipService.java
URL:
http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/atompub/RelationshipService.java?rev=1418112&r1=1418111&r2=1418112&view=diff
==============================================================================
---
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/atompub/RelationshipService.java
(original)
+++
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/atompub/RelationshipService.java
Thu Dec 6 22:18:46 2012
@@ -47,7 +47,7 @@ import org.apache.chemistry.opencmis.com
/**
* Relationship Service operations.
*/
-public class RelationshipService {
+public final class RelationshipService {
private RelationshipService() {
}
Modified:
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/atompub/VersioningService.java
URL:
http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/atompub/VersioningService.java?rev=1418112&r1=1418111&r2=1418112&view=diff
==============================================================================
---
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/atompub/VersioningService.java
(original)
+++
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/atompub/VersioningService.java
Thu Dec 6 22:18:46 2012
@@ -43,7 +43,7 @@ import org.apache.chemistry.opencmis.com
/**
* Versioning Service operations.
*/
-public class VersioningService {
+public final class VersioningService {
private VersioningService() {
}
Modified:
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/browser/BrowserBindingUtils.java
URL:
http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/browser/BrowserBindingUtils.java?rev=1418112&r1=1418111&r2=1418112&view=diff
==============================================================================
---
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/browser/BrowserBindingUtils.java
(original)
+++
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/browser/BrowserBindingUtils.java
Thu Dec 6 22:18:46 2012
@@ -72,7 +72,7 @@ import org.apache.chemistry.opencmis.ser
import org.apache.chemistry.opencmis.server.shared.Dispatcher;
import org.apache.chemistry.opencmis.server.shared.HttpUtils;
-public class BrowserBindingUtils {
+public final class BrowserBindingUtils {
public static final String JSON_MIME_TYPE = "application/json";
public static final String HTML_MIME_TYPE = "text/html";
Modified:
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/browser/DiscoveryService.java
URL:
http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/browser/DiscoveryService.java?rev=1418112&r1=1418111&r2=1418112&view=diff
==============================================================================
---
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/browser/DiscoveryService.java
(original)
+++
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/browser/DiscoveryService.java
Thu Dec 6 22:18:46 2012
@@ -48,7 +48,7 @@ import org.apache.chemistry.opencmis.com
/**
* Discovery Service operations.
*/
-public class DiscoveryService {
+public final class DiscoveryService {
private DiscoveryService() {
}
Modified:
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/browser/VersioningService.java
URL:
http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/browser/VersioningService.java?rev=1418112&r1=1418111&r2=1418112&view=diff
==============================================================================
---
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/browser/VersioningService.java
(original)
+++
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/browser/VersioningService.java
Thu Dec 6 22:18:46 2012
@@ -61,7 +61,7 @@ import org.apache.chemistry.opencmis.com
/**
* Versioning Service operations.
*/
-public class VersioningService {
+public final class VersioningService {
private VersioningService() {
}
Modified:
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/shared/Dispatcher.java
URL:
http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/shared/Dispatcher.java?rev=1418112&r1=1418111&r2=1418112&view=diff
==============================================================================
---
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/shared/Dispatcher.java
(original)
+++
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/shared/Dispatcher.java
Thu Dec 6 22:18:46 2012
@@ -22,7 +22,6 @@ import java.io.Serializable;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.util.HashMap;
-import java.util.Map;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -41,8 +40,8 @@ public class Dispatcher implements Seria
private static final long serialVersionUID = 1L;
- public static final String BASE_URL_ATTRIBUTE=
"org.apache.chemistry.opencmis.baseurl";
-
+ public static final String BASE_URL_ATTRIBUTE =
"org.apache.chemistry.opencmis.baseurl";
+
public static final String METHOD_GET = "GET";
public static final String METHOD_POST = "POST";
public static final String METHOD_PUT = "PUT";
@@ -51,7 +50,7 @@ public class Dispatcher implements Seria
private static final Logger LOG =
LoggerFactory.getLogger(Dispatcher.class.getName());
private final boolean caseSensitive;
- private Map<String, Method> methodMap = new HashMap<String, Method>();
+ private final HashMap<String, Method> methodMap;
public Dispatcher() {
this(true);
@@ -59,6 +58,7 @@ public class Dispatcher implements Seria
public Dispatcher(boolean caseSensitive) {
this.caseSensitive = caseSensitive;
+ methodMap = new HashMap<String, Method>();
}
/**
Modified:
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/shared/ExceptionHelper.java
URL:
http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/shared/ExceptionHelper.java?rev=1418112&r1=1418111&r2=1418112&view=diff
==============================================================================
---
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/shared/ExceptionHelper.java
(original)
+++
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/shared/ExceptionHelper.java
Thu Dec 6 22:18:46 2012
@@ -28,14 +28,14 @@ import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
-public class ExceptionHelper {
+public final class ExceptionHelper {
public static final String STACK_TRACE_PROPERTY =
"org.apache.chemistry.opencmis.stacktrace.disable";
- private static final boolean sendStackTrace;
+ private static final boolean SEND_STACK_TRACE;
static {
- sendStackTrace = System.getProperty(STACK_TRACE_PROPERTY) == null;
+ SEND_STACK_TRACE = System.getProperty(STACK_TRACE_PROPERTY) == null;
}
private ExceptionHelper() {
@@ -45,7 +45,7 @@ public class ExceptionHelper {
* Returns the stack trace as string.
*/
public static String getStacktraceAsString(Throwable t) {
- if (!sendStackTrace || t == null) {
+ if (!SEND_STACK_TRACE || t == null) {
return null;
}
Modified:
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/shared/HttpUtils.java
URL:
http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/shared/HttpUtils.java?rev=1418112&r1=1418111&r2=1418112&view=diff
==============================================================================
---
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/shared/HttpUtils.java
(original)
+++
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/shared/HttpUtils.java
Thu Dec 6 22:18:46 2012
@@ -40,7 +40,7 @@ import org.apache.chemistry.opencmis.ser
/**
* Utility methods that are used by the AtomPub and Browser binding.
*/
-public class HttpUtils {
+public final class HttpUtils {
private HttpUtils() {
}
Modified:
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/query/CalendarHelper.java
URL:
http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/query/CalendarHelper.java?rev=1418112&r1=1418111&r2=1418112&view=diff
==============================================================================
---
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/query/CalendarHelper.java
(original)
+++
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/query/CalendarHelper.java
Thu Dec 6 22:18:46 2012
@@ -31,7 +31,7 @@ import java.util.regex.Pattern;
* Helper dealing with conversion of {@link Calendar} to and from the string
* format specified by CMISQL.
*/
-public class CalendarHelper {
+public final class CalendarHelper {
private static final Pattern CMISQL_PATTERN = Pattern.compile( //
"(\\d{4})-(\\d{2})-(\\d{2})[Tt]" +
"(\\d{2}):(\\d{2}):(\\d{2})(?:\\.(\\d+))?"
Modified:
chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tck/src/main/java/org/apache/chemistry/opencmis/tck/impl/AbstractSessionTest.java
URL:
http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tck/src/main/java/org/apache/chemistry/opencmis/tck/impl/AbstractSessionTest.java?rev=1418112&r1=1418111&r2=1418112&view=diff
==============================================================================
---
chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tck/src/main/java/org/apache/chemistry/opencmis/tck/impl/AbstractSessionTest.java
(original)
+++
chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tck/src/main/java/org/apache/chemistry/opencmis/tck/impl/AbstractSessionTest.java
Thu Dec 6 22:18:46 2012
@@ -248,6 +248,7 @@ public abstract class AbstractSessionTes
} catch (CmisBaseException e) {
addResult(createResult(UNEXPECTED_EXCEPTION, "Folder could not be
created! Exception: " + e.getMessage(),
e, true));
+ return null;
}
try {
@@ -373,6 +374,7 @@ public abstract class AbstractSessionTes
} catch (Exception e) {
addResult(createResult(UNEXPECTED_EXCEPTION, "Document could not
be created! Exception: " + e.getMessage(),
e, true));
+ return null;
}
try {
@@ -463,12 +465,14 @@ public abstract class AbstractSessionTes
"Relationship could not be created! Exception: " +
e.getMessage(), e, true));
}
- try {
- // check the new relationship
- addResult(checkObject(session, result, getAllProperties(result),
"New document object spec compliance"));
- } catch (CmisBaseException e) {
- addResult(createResult(UNEXPECTED_EXCEPTION,
- "Newly created document is invalid! Exception: " +
e.getMessage(), e, true));
+ if (result != null) {
+ try {
+ // check the new relationship
+ addResult(checkObject(session, result,
getAllProperties(result), "New document object spec compliance"));
+ } catch (CmisBaseException e) {
+ addResult(createResult(UNEXPECTED_EXCEPTION,
+ "Newly created document is invalid! Exception: " +
e.getMessage(), e, true));
+ }
}
return result;
Modified:
chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tck/src/main/java/org/apache/chemistry/opencmis/tck/report/TextReport.java
URL:
http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tck/src/main/java/org/apache/chemistry/opencmis/tck/report/TextReport.java?rev=1418112&r1=1418111&r2=1418112&view=diff
==============================================================================
---
chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tck/src/main/java/org/apache/chemistry/opencmis/tck/report/TextReport.java
(original)
+++
chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tck/src/main/java/org/apache/chemistry/opencmis/tck/report/TextReport.java
Thu Dec 6 22:18:46 2012
@@ -36,7 +36,7 @@ import org.apache.chemistry.opencmis.tck
* Text Report.
*/
public class TextReport extends AbstractCmisTestReport {
- public static String NL = System.getProperty("line.separator");
+ public static final String NL = System.getProperty("line.separator");
public TextReport() {
Modified:
chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/ClientFrame.java
URL:
http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/ClientFrame.java?rev=1418112&r1=1418111&r2=1418112&view=diff
==============================================================================
---
chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/ClientFrame.java
(original)
+++
chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/ClientFrame.java
Thu Dec 6 22:18:46 2012
@@ -125,13 +125,6 @@ public class ClientFrame extends JFrame
}
try {
- macAppClass.getMethod("setDockIconImage", new Class<?>[] {
Image.class }).invoke(macApp,
- new Object[] { icon.getImage() });
- } catch (Exception e) {
- // ignore
- }
-
- try {
Class<?> fullscreenClass =
Class.forName("com.apple.eawt.FullScreenUtilities");
fullscreenClass.getMethod("setWindowCanFullScreen", new
Class<?>[] { Window.class, Boolean.TYPE })
.invoke(fullscreenClass, this, true);
Modified:
chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/RepositoryInfoFrame.java
URL:
http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/RepositoryInfoFrame.java?rev=1418112&r1=1418111&r2=1418112&view=diff
==============================================================================
---
chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/RepositoryInfoFrame.java
(original)
+++
chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/RepositoryInfoFrame.java
Thu Dec 6 22:18:46 2012
@@ -35,6 +35,7 @@ import org.apache.chemistry.opencmis.com
import org.apache.chemistry.opencmis.commons.data.RepositoryCapabilities;
import org.apache.chemistry.opencmis.commons.data.RepositoryInfo;
import org.apache.chemistry.opencmis.commons.definitions.PermissionDefinition;
+import org.apache.chemistry.opencmis.commons.enums.BaseTypeId;
import org.apache.chemistry.opencmis.commons.enums.PropertyType;
import org.apache.chemistry.opencmis.workbench.model.ClientModel;
import org.apache.chemistry.opencmis.workbench.swing.InfoPanel;
@@ -107,8 +108,14 @@ public class RepositoryInfoFrame extends
addLine("Principal id
anonymous:").setText(repInfo.getPrincipalIdAnonymous());
addLine("Principal id
anyone:").setText(repInfo.getPrincipalIdAnyone());
addYesNoLabel("Changes
incomplete:").setValue(is(repInfo.getChangesIncomplete()));
- addLine("Changes on type:").setText(
- repInfo.getChangesOnType() == null ? "" :
repInfo.getChangesOnType().toString());
+
+ StringBuilder sb = new StringBuilder();
+ if (repInfo.getChangesOnType() != null) {
+ for (BaseTypeId bt : repInfo.getChangesOnType()) {
+ appendToString(sb, bt.value());
+ }
+ }
+ addLine("Changes on type:").setText(sb.toString());
if (repInfo.getCapabilities() != null) {
RepositoryCapabilities cap = repInfo.getCapabilities();
@@ -131,7 +138,7 @@ public class RepositoryInfoFrame extends
addLine("Changes:").setText(str(cap.getChangesCapability()));
addLine("ACLs:").setText(str(cap.getAclCapability()));
- StringBuilder sb = new StringBuilder();
+ sb = new StringBuilder();
if (cap.getNewTypeSettableAttributes() != null) {
if
(Boolean.TRUE.equals(cap.getNewTypeSettableAttributes().canSetId())) {
appendToString(sb, "id");
Modified:
chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/model/ClientSession.java
URL:
http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/model/ClientSession.java?rev=1418112&r1=1418111&r2=1418112&view=diff
==============================================================================
---
chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/model/ClientSession.java
(original)
+++
chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/model/ClientSession.java
Thu Dec 6 22:18:46 2012
@@ -146,6 +146,7 @@ public class ClientSession {
parameters.put(SessionParameter.AUTHENTICATION_PROVIDER_CLASS,
CmisBindingFactory.NTLM_AUTHENTICATION_PROVIDER);
break;
+ default:
}
if (compression) {
