Changeset 28926

Show
Ignore:
Timestamp:
01/10/08 15:42:20 (11 months ago)
Author:
sfermigier
Message:

Forward port of [28924] (cosmits and cleanups).

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • org.nuxeo.common/trunk/src/main/java/org/nuxeo/common/persistence/XMLMemento.java

    r28314 r28926  
    152152     */ 
    153153    public static XMLMemento createWriteRoot(String type) { 
    154         Document document; 
    155154        try { 
    156             document = DocumentBuilderFactory.newInstance() 
     155            Document document = DocumentBuilderFactory.newInstance() 
    157156                    .newDocumentBuilder().newDocument(); 
    158157            Element element = document.createElement(type); 
    …… 
    476475 
    477476        private void startTag(Element element, boolean hasChildren) { 
    478             StringBuffer sb = new StringBuffer(); 
     477            StringBuilder sb = new StringBuilder(); 
    479478            sb.append('<'); //$NON-NLS-1$ 
    480479            sb.append(element.getTagName()); 
    …… 
    493492 
    494493        private void endTag(Element element) { 
    495             StringBuffer sb = new StringBuffer(); 
     494            StringBuilder sb = new StringBuilder(); 
    496495            sb.append("</"); //$NON-NLS-1$ 
    497496            sb.append(element.getNodeName()); 

  • org.nuxeo.common/trunk/src/main/java/org/nuxeo/common/utils/ZipUtils.java

    r25064 r28926  
    2121package org.nuxeo.common.utils; 
    2222 
    23 import org.apache.commons.logging.Log; 
    24 import org.apache.commons.logging.LogFactory; 
    25  
    2623import java.io.BufferedInputStream; 
    2724import java.io.BufferedOutputStream; 
    …… 
    4138import java.util.zip.ZipOutputStream; 
    4239 
     40import org.apache.commons.logging.Log; 
     41import org.apache.commons.logging.LogFactory; 
     42 
    4343/** 
    4444 * @author bstefanescu 
    …… 
    327327                continue; 
    328328            } 
    329             log.debug("Extracting " + entry.getName()); 
    330             File file = new File(dir, entry.getName() 
    331                     .substring(prefix.length())); 
     329            File file = new File(dir, entry.getName().substring(prefix.length())); 
    332330            if (entry.isDirectory()) { 
    333331                file.mkdirs(); 
    …… 
    362360        while (entry != null) { 
    363361            String entryName = entry.getName(); 
    364             log.debug("Extracting " + entryName); 
    365362            if (entry.isDirectory()) { 
    366                 log.debug("Directory zip entry. Ignoring .."); 
    367363            } else { 
    368                 log.debug("Extracting file entry: " + entryName); 
    369364                int p = entryName.lastIndexOf('/'); 
    370365                if (p > -1) { 
    371366                    entryName = entryName.substring(p + 1); 
    372                     log.debug("Short entry name: " + entryName); 
    373367                } 
    374368                File file = new File(dir, entryName); 
    …… 
    469463        InputStream resultStream = getEntryContentAsStream(file, 
    470464                searchedEntryName); 
    471         String result = FileUtils.read(resultStream); 
    472465        // resultStream has been closed by FileUtils call 
    473         return result; 
     466        return FileUtils.read(resultStream); 
    474467    } 
    475468 
    …… 
    489482        InputStream resultStream = getEntryContentAsStream(file, 
    490483                searchedEntryName); 
    491         byte[] result = FileUtils.readBytes(resultStream); 
    492484        // resultStream has been closed by FileUtils call 
    493         return result; 
     485        return FileUtils.readBytes(resultStream); 
    494486    } 
    495487 
    …… 
    506498        ZipFile zip = new ZipFile(file); 
    507499        try { 
    508             Enumeration entries = zip.entries(); 
     500            Enumeration<? extends ZipEntry> entries = zip.entries(); 
    509501            while (entries.hasMoreElements()) { 
    510                 ZipEntry entry = (ZipEntry) entries.nextElement(); 
     502                ZipEntry entry = entries.nextElement(); 
    511503                result.add(entry.getName()); 
    512504            } 
    …… 
    527519     * @throws IOException 
    528520     */ 
    529     public static Boolean hasEntry(File file, String searchedEntryName) 
     521    public static boolean hasEntry(File file, String searchedEntryName) 
    530522            throws IOException { 
    531523        List<String> elements = getEntryNames(file); 
    …… 
    550542        InputStream resultStream = getEntryContentAsStream(stream, 
    551543                searchedEntryName); 
    552         String result = FileUtils.read(resultStream); 
    553544        // resultStream has been closed by FileUtils call 
    554         return result; 
     545        return FileUtils.read(resultStream); 
    555546    } 
    556547 
    …… 
    559550        InputStream resultStream = getEntryContentAsStream(stream, 
    560551                searchedEntryName); 
    561         byte[] result = FileUtils.readBytes(resultStream); 
    562552        // resultStream has been closed by FileUtils call 
    563         return result; 
     553        return FileUtils.readBytes(resultStream); 
    564554    } 
    565555 
    …… 
    582572    } 
    583573 
    584     public static Boolean hasEntry(InputStream stream, String searchedEntryName) 
     574    public static boolean hasEntry(InputStream stream, String searchedEntryName) 
    585575            throws IOException { 
    586576        List<String> elements = getEntryNames(stream); 
    …… 
    597587        InputStream resultStream = getEntryContentAsStream(url, 
    598588                searchedEntryName); 
    599         String result = FileUtils.read(resultStream); 
    600589        // resultStream has been closed by FileUtils call 
    601         return result; 
     590        return FileUtils.read(resultStream); 
    602591    } 
    603592 
    …… 
    606595        InputStream resultStream = getEntryContentAsStream(url, 
    607596                searchedEntryName); 
    608         byte[] result = FileUtils.readBytes(resultStream); 
    609597        // resultStream has been closed by FileUtils call 
    610         return result; 
     598        return FileUtils.readBytes(resultStream); 
    611599    } 
    612600 
    …… 
    615603    } 
    616604 
    617     public static Boolean hasEntry(URL url, String searchedEntryName) 
     605    public static boolean hasEntry(URL url, String searchedEntryName) 
    618606            throws IOException { 
    619607        return hasEntry(url.openStream(), searchedEntryName); 
    620608    } 
     609 
    621610} 

  • org.nuxeo.ecm.core/trunk/nuxeo-core-api/src/main/java/org/nuxeo/ecm/core/api/adapter/DocumentAdapterService.java

    r28464 r28926  
    3838public class DocumentAdapterService extends DefaultComponent { 
    3939 
    40     public static final ComponentName NAME 
    41             = new ComponentName(ComponentName.DEFAULT_TYPE, "org.nuxeo.ecm.core.api.DocumentAdapterService"); 
     40    public static final ComponentName NAME = new ComponentName( 
     41            ComponentName.DEFAULT_TYPE, "org.nuxeo.ecm.core.api.DocumentAdapterService"); 
    4242 
    4343    private static final Log log = LogFactory.getLog(DocumentAdapterService.class); 
    …… 
    7474    } 
    7575 
    76     public void registerPropertyFactory(PropertyFactoryDescriptor descriptor) { 
     76    public static void registerPropertyFactory(PropertyFactoryDescriptor descriptor) { 
    7777        try { 
    7878            DefaultPropertyFactory.getInstance().registerFactory( 
    7979                    descriptor.schema, descriptor.type, (PropertyFactory)descriptor.klass.newInstance()); 
    8080        } catch (Exception e) { 
    81             log.error("Failed to instantiate the prioperty type for "+descriptor.schema+":"+descriptor.type); 
     81            log.error( 
     82                    "Failed to instantiate the prioperty type for " 
     83                            + descriptor.schema + ':' + descriptor.type); 
    8284        } 
    8385    } 
    8486 
    85     public void unregisterPropertyFactory(PropertyFactoryDescriptor descriptor) { 
     87    public static void unregisterPropertyFactory(PropertyFactoryDescriptor descriptor) { 
    8688        DefaultPropertyFactory.getInstance().unregisterFactory(descriptor.schema, descriptor.type); 
    8789    } 
    …… 
    8991 
    9092    public PropertyFactory getPropertyFactory(String schema, String type) { 
    91         String key = schema != null && schema.length() > 0 ? schema+":"+type : type; 
     93        String key = schema != null && schema.length() > 0 ? schema + ':' + type : type; 
    9294        PropertyFactory factory = factories.get(key); 
    9395        if (factory == null) { 

  • org.nuxeo.ecm.core/trunk/nuxeo-core-api/src/main/java/org/nuxeo/ecm/core/api/impl/DocumentModelTreeNodeImpl.java

    r27629 r28926  
    5151    @Deprecated 
    5252    public String getTreeLabel() { 
    53         StringBuffer label = new StringBuffer(""); 
     53        StringBuilder label = new StringBuilder(""); 
    5454        for (int i = 0; i < levelTree; i++) { 
    5555            label.append(HTML_TAB); 
    56  
    5756        } 
    5857        label.append(document.getProperty("dublincore", "title")); 

  • org.nuxeo.ecm.core/trunk/nuxeo-core-api/src/main/java/org/nuxeo/ecm/core/api/impl/blob/StreamBlob.java

    r20210 r28926  
    151151 
    152152    public static String readString(Reader reader) throws IOException { 
    153         StringBuffer sb = new StringBuffer(BUFFER_SIZE); 
     153        StringBuilder sb = new StringBuilder(BUFFER_SIZE); 
    154154        try { 
    155155            char[] buffer = new char[BUFFER_SIZE]; 

  • org.nuxeo.ecm.core/trunk/nuxeo-core-api/src/main/java/org/nuxeo/ecm/core/api/model/impl/AbstractProperty.java

    r28190 r28926  
    139139        if (parent != null) { 
    140140            if (parent.isList()) { 
    141                 int i = ((ListProperty)parent).children.indexOf(this); 
    142                 name = name+"["+i+"]"; 
     141                int i = ((ListProperty) parent).children.indexOf(this); 
     142                name = name + '[' + i + ']'; 
    143143            } 
    144144          path = ((AbstractProperty)parent).collectPath(path); 

  • org.nuxeo.ecm.core/trunk/nuxeo-core-facade/src/main/java/org/nuxeo/ecm/core/api/ejb/DocumentManagerBean.java

    r25226 r28926  
    203203 
    204204 
    205  
    206205    // ----------------------- cache interceptors ------------ 
    207206 

  • org.nuxeo.ecm.core/trunk/nuxeo-core-jcr-connector-test/src/test/java/org/nuxeo/ecm/core/jcr/search/TestFtsQuery.java

    r28346 r28926  
    484484     * @throws RepositoryException 
    485485     */ 
     486    @SuppressWarnings({"StringConcatenationInsideStringBufferAppend"}) 
    486487    private static String getNodeDesc(Node node, final String sep) 
    487488            throws RepositoryException { 
    488489        PropertyIterator pi = node.getProperties(); 
    489490 
    490         final StringBuffer buf = new StringBuffer(); 
     491        final StringBuilder buf = new StringBuilder(); 
    491492 
    492493        buf.append("node path : " + node.getPath()); 

  • org.nuxeo.ecm.core/trunk/nuxeo-core-jcr-connector-test/src/test/java/org/nuxeo/ecm/core/jcr/search/TestXPathQuery.java

    r28190 r28926  
    229229     * @throws RepositoryException 
    230230     */ 
     231    @SuppressWarnings({"StringConcatenationInsideStringBufferAppend"}) 
    231232    private static String getNodeDesc(Node node, final String sep) 
    232233            throws RepositoryException { 
    233234        PropertyIterator pi = node.getProperties(); 
    234235 
    235         final StringBuffer buf = new StringBuffer(); 
     236        final StringBuilder buf = new StringBuilder(); 
    236237 
    237238        buf.append("node path : " + node.getPath()); 

  • org.nuxeo.ecm.core/trunk/nuxeo-core-jcr-connector/src/main/java/org/nuxeo/ecm/core/repository/jcr/BlobPropertyAccessor.java

    r27936 r28926  
    4747        JCRBlob jcrBlob = new JCRBlob(node); 
    4848        LazyBlob blob = new LazyBlob(jcrBlob.getStream(), jcrBlob.getEncoding(), 
    49                 jcrBlob.getMimeType(), sid, node.getPath() + "/" 
     49                jcrBlob.getMimeType(), sid, node.getPath() + '/' 
    5050                + JCRBlob.DATA, repo, 
    5151                jcrBlob.getFilename(), jcrBlob.getDigest(), jcrBlob.getLength()); 

  • org.nuxeo.ecm.core/trunk/nuxeo-core-jcr-connector/src/main/java/org/nuxeo/ecm/core/repository/jcr/InternalSessionOperationsProxy.java

    r19493 r28926  
    5252    public static void copy(JCRSession session, String nodePath, String toPath) 
    5353            throws RepositoryException { 
    54  
    55         final String logPrefix = "<copy> "; 
    56  
    57         log.debug(logPrefix + "from: " + nodePath + " to: " + toPath); 
    5854        session.getSession().getWorkspace().copy(nodePath, toPath); 
    5955    } 

  • org.nuxeo.ecm.core/trunk/nuxeo-core-jcr-connector/src/main/java/org/nuxeo/ecm/core/repository/jcr/JCRBlob.java

    r28346 r28926  
    9999 
    100100    public void setLength(long length) { 
    101         if (Long.valueOf(length) != null) { 
    102             try { 
    103                 node.setProperty(LENGTH, length); 
    104             } catch (Exception e) { 
    105                 if (compat_14_adaptNode(node)) { 
    106                     // if node type was invalid and adapting was succesfull - try again 
    107                     try { 
    108                         node.setProperty(LENGTH, length); 
    109                     } catch (Exception ee) { 
    110                         ee.printStackTrace(); 
    111                     } 
     101        try { 
     102            node.setProperty(LENGTH, length); 
     103        } catch (Exception e) { 
     104            if (compat_14_adaptNode(node)) { 
     105                // if node type was invalid and adapting was succesfull - try again 
     106                try { 
     107                    node.setProperty(LENGTH, length); 
     108                } catch (Exception ee) { 
     109                    ee.printStackTrace(); 
    112110                } 
    113111            } 

  • org.nuxeo.ecm.core/trunk/nuxeo-core-jcr-connector/src/main/java/org/nuxeo/ecm/core/repository/jcr/JCRDocument.java

    r28462 r28926  
    612612    public void importMap(Map<String, Map<String, Object>> map) 
    613613            throws DocumentException { 
    614         StringBuffer buf = new StringBuffer(); 
     614        StringBuilder buf = new StringBuilder(); 
    615615        for (Map.Entry<String, Map<String, Object>> entry : map.entrySet()) { 
    616616            String schemaName = entry.getKey(); 
    …… 
    620620                int len = prefix.length(); 
    621621                if (len != 0) { 
    622                     buf.append(prefix).append(":"); 
     622                    buf.append(prefix).append(':'); 
    623623                    len++; 
    624624                } 

  • org.nuxeo.ecm.core/trunk/nuxeo-core-jcr-connector/src/main/java/org/nuxeo/ecm/core/repository/jcr/JCRQuery.java

    r28181 r28926  
    143143            s = s.substring(1, s.length() - 1); 
    144144        } 
    145         StringBuffer buffer = new StringBuffer(); 
     145        StringBuilder buffer = new StringBuilder(); 
    146146        buffer.append(" '/"); 
    147147        buffer.append(NodeConstants.ECM_ROOT.rawname).append('/'); 
    …… 
    152152 
    153153    private static String buildPathRestriction(FromList fromList) { 
    154         StringBuffer sb = new StringBuffer(); 
     154        StringBuilder sb = new StringBuilder(); 
    155155        sb.append("jcr:path LIKE "); 
    156156        // add workspace path 

  • org.nuxeo.ecm.core/trunk/nuxeo-core-jcr-connector/src/main/java/org/nuxeo/ecm/core/repository/jcr/JCRQueryXPath.java

    r19318 r28926  
    5555 
    5656    public QueryResult execute() throws QueryException { 
    57         log.info("execute XPath query: " + rawQuery + ", with params: " + Arrays.asList(queryParams)); 
     57        log.debug("execute XPath query: " + rawQuery + ", with params: " + Arrays.asList(queryParams)); 
    5858        try { 
    5959            final QueryManager qm = session.jcrSession().getWorkspace() 
    …… 
    6262            final String fullQuery = replaceInParams(); 
    6363 
    64             log.info("execute XPath fullQuery: " + fullQuery); 
     64            log.debug("execute XPath fullQuery: " + fullQuery); 
    6565 
    6666            final String xpathQuery = translatePath(fullQuery); 
    …… 
    116116 
    117117        // build the real path 
    118         final StringBuffer buf = new StringBuffer(); 
     118        final StringBuilder buf = new StringBuilder(); 
    119119        buf.append(buildJcrPath(path)); 
    120120        buf.append(rest); 
    …… 
    133133     */ 
    134134    private static String buildJcrPath(String s) { 
    135         StringBuffer buffer = new StringBuffer(); 
     135        StringBuilder buffer = new StringBuilder(); 
    136136        buffer.append("//"); 
    137137        buffer.append(NodeConstants.ECM_ROOT.rawname).append('/'); 

  • org.nuxeo.ecm.core/trunk/nuxeo-core-jcr-connector/src/main/java/org/nuxeo/ecm/core/repository/jcr/ModelAdapter.java

    r25639 r28926  
    112112            return "/"; // the root 
    113113        } 
    114         StringBuffer buf = new StringBuffer(256); 
     114        StringBuilder buf = new StringBuilder(256); 
    115115        if (wsName != null) { 
    116116            buf.append('/').append(wsName); 
    …… 
    131131 
    132132    public static String path2Jcr(org.nuxeo.common.utils.Path path) { 
    133         StringBuffer buf = new StringBuffer(); 
     133        StringBuilder buf = new StringBuilder(); 
    134134        String[] segments = path.segments(); 
    135135        for (int i = 0; i < segments.length; i++) { 

  • org.nuxeo.ecm.core/trunk/nuxeo-core-jcr-connector/src/main/java/org/nuxeo/ecm/core/repository/jcr/properties/BlobProperty.java

    r27936 r28926  
    4646            String repositoryName = getDocument().getRepository().getName(); 
    4747            return new LazyBlob(blob.getStream(), blob.getEncoding(),