sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1553055 - in /sis/branches/JDK7/core/sis-utility/src: main/java/org/apache/sis/internal/simple/ main/java/org/apache/sis/io/ main/java/org/apache/sis/util/ main/java/org/apache/sis/util/collection/ main/java/org/apache/sis/xml/ test/java/o...
Date Mon, 23 Dec 2013 00:24:36 GMT
Author: desruisseaux
Date: Mon Dec 23 00:24:35 2013
New Revision: 1553055

URL: http://svn.apache.org/r1553055
Log:
Removed Decorator annotation, which probably doesn't worth is weight (SIS-88).
This annotation was used for documentation purpose only.

Removed:
    sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/Decorator.java
Modified:
    sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/simple/SimpleCharacterIterator.java
    sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/io/Appender.java
    sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/io/LineAppender.java
    sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/io/TableAppender.java
    sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/collection/DerivedIterator.java
    sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/collection/DerivedMap.java
    sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/collection/DerivedSet.java
    sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/xml/PooledMarshaller.java
    sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/xml/PooledUnmarshaller.java
    sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/io/EchoAppendable.java

Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/simple/SimpleCharacterIterator.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/simple/SimpleCharacterIterator.java?rev=1553055&r1=1553054&r2=1553055&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/simple/SimpleCharacterIterator.java
[UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/simple/SimpleCharacterIterator.java
[UTF-8] Mon Dec 23 00:24:35 2013
@@ -18,7 +18,6 @@ package org.apache.sis.internal.simple;
 
 import java.io.Serializable;
 import java.text.CharacterIterator;
-import org.apache.sis.util.Decorator;
 import org.apache.sis.util.ArgumentChecks;
 
 
@@ -31,7 +30,6 @@ import org.apache.sis.util.ArgumentCheck
  * @version 0.3
  * @module
  */
-@Decorator(CharSequence.class)
 public class SimpleCharacterIterator implements CharacterIterator, CharSequence, Serializable
{
     /**
      * For cross-version compatibility.

Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/io/Appender.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/io/Appender.java?rev=1553055&r1=1553054&r2=1553055&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/io/Appender.java [UTF-8]
(original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/io/Appender.java [UTF-8]
Mon Dec 23 00:24:35 2013
@@ -18,7 +18,6 @@ package org.apache.sis.io;
 
 import java.io.IOException;
 import java.io.CharConversionException;
-import org.apache.sis.util.Decorator;
 import org.apache.sis.util.ArgumentChecks;
 
 import static org.apache.sis.util.Characters.isLineOrParagraphSeparator;
@@ -52,7 +51,6 @@ import static org.apache.sis.util.Charac
  *
  * @see java.io.FilterWriter
  */
-@Decorator(Appendable.class)
 abstract class Appender implements Appendable {
     /**
      * The underlying character output stream or buffer.

Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/io/LineAppender.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/io/LineAppender.java?rev=1553055&r1=1553054&r2=1553055&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/io/LineAppender.java [UTF-8]
(original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/io/LineAppender.java [UTF-8]
Mon Dec 23 00:24:35 2013
@@ -18,7 +18,6 @@ package org.apache.sis.io;
 
 import java.io.Flushable;
 import java.io.IOException;
-import org.apache.sis.util.Decorator;
 import org.apache.sis.util.Characters;
 import org.apache.sis.util.CharSequences;
 import org.apache.sis.util.ArgumentChecks;
@@ -59,7 +58,6 @@ import org.apache.sis.internal.util.X364
  * @version 0.4
  * @module
  */
-@Decorator(Appendable.class)
 public class LineAppender extends Appender implements Flushable {
     /**
      * The line separator, or {@code null} if not yet determined. If {@code null}, then the

Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/io/TableAppender.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/io/TableAppender.java?rev=1553055&r1=1553054&r2=1553055&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/io/TableAppender.java
[UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/io/TableAppender.java
[UTF-8] Mon Dec 23 00:24:35 2013
@@ -22,7 +22,6 @@ import java.util.List;
 import java.io.Flushable;
 import java.io.IOException;
 import org.apache.sis.util.ArraysExt;
-import org.apache.sis.util.Decorator;
 import org.apache.sis.util.CharSequences;
 import org.apache.sis.util.ArgumentChecks;
 import org.apache.sis.util.resources.Errors;
@@ -76,7 +75,6 @@ import static org.apache.sis.util.Charac
  *
  * @see org.apache.sis.util.collection.TreeTableFormat
  */
-@Decorator(Appendable.class)
 public class TableAppender extends Appender implements Flushable {
     /**
      * A possible value for cell alignment. This specifies that the text is aligned

Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/collection/DerivedIterator.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/collection/DerivedIterator.java?rev=1553055&r1=1553054&r2=1553055&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/collection/DerivedIterator.java
[UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/collection/DerivedIterator.java
[UTF-8] Mon Dec 23 00:24:35 2013
@@ -17,7 +17,6 @@
 package org.apache.sis.util.collection;
 
 import java.util.Iterator;
-import org.apache.sis.util.Decorator;
 import org.apache.sis.util.ObjectConverter;
 
 
@@ -34,7 +33,6 @@ import org.apache.sis.util.ObjectConvert
  * @version 0.3
  * @module
  */
-@Decorator(Iterator.class)
 final class DerivedIterator<S,E> implements Iterator<E> {
     /**
      * The original iterator to wrap.

Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/collection/DerivedMap.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/collection/DerivedMap.java?rev=1553055&r1=1553054&r2=1553055&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/collection/DerivedMap.java
[UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/collection/DerivedMap.java
[UTF-8] Mon Dec 23 00:24:35 2013
@@ -21,7 +21,6 @@ import java.util.Set;
 import java.util.EnumSet;
 import java.util.AbstractMap;
 import java.io.Serializable;
-import org.apache.sis.util.Decorator;
 import org.apache.sis.util.ObjectConverter;
 import org.apache.sis.util.UnconvertibleObjectException;
 import org.apache.sis.util.resources.Errors;
@@ -66,7 +65,6 @@ import org.apache.sis.math.FunctionPrope
  * @version 0.3
  * @module
  */
-@Decorator(Map.class)
 class DerivedMap<SK,SV,K,V> extends AbstractMap<K,V> implements
         ObjectConverter<Map.Entry<SK,SV>, Map.Entry<K,V>>, Serializable
 {

Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/collection/DerivedSet.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/collection/DerivedSet.java?rev=1553055&r1=1553054&r2=1553055&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/collection/DerivedSet.java
[UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/collection/DerivedSet.java
[UTF-8] Mon Dec 23 00:24:35 2013
@@ -20,7 +20,6 @@ import java.util.Set;
 import java.util.Iterator;
 import java.util.AbstractSet;
 import java.io.Serializable;
-import org.apache.sis.util.Decorator;
 import org.apache.sis.util.ObjectConverter;
 import org.apache.sis.math.FunctionProperty;
 import org.apache.sis.util.UnconvertibleObjectException;
@@ -62,7 +61,6 @@ import org.apache.sis.util.resources.Err
  * @version 0.3
  * @module
  */
-@Decorator(Set.class)
 class DerivedSet<S,E> extends AbstractSet<E> implements CheckedContainer<E>,
Serializable {
     /**
      * Serial number for inter-operability with different versions.

Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/xml/PooledMarshaller.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/xml/PooledMarshaller.java?rev=1553055&r1=1553054&r2=1553055&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/xml/PooledMarshaller.java
[UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/xml/PooledMarshaller.java
[UTF-8] Mon Dec 23 00:24:35 2013
@@ -35,7 +35,6 @@ import javax.xml.transform.Result;
 import javax.xml.validation.Schema;
 import org.xml.sax.ContentHandler;
 import org.w3c.dom.Node;
-import org.apache.sis.util.Decorator;
 import org.apache.sis.internal.jaxb.Context;
 import org.apache.sis.internal.system.XMLOutputFactory;
 
@@ -58,7 +57,6 @@ import org.apache.sis.internal.system.XM
  * @version 0.4
  * @module
  */
-@Decorator(Marshaller.class)
 final class PooledMarshaller extends Pooled implements Marshaller {
     /**
      * The wrapper marshaller which does the real work.

Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/xml/PooledUnmarshaller.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/xml/PooledUnmarshaller.java?rev=1553055&r1=1553054&r2=1553055&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/xml/PooledUnmarshaller.java
[UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/xml/PooledUnmarshaller.java
[UTF-8] Mon Dec 23 00:24:35 2013
@@ -38,7 +38,6 @@ import javax.xml.transform.Source;
 import javax.xml.validation.Schema;
 import org.w3c.dom.Node;
 import org.xml.sax.InputSource;
-import org.apache.sis.util.Decorator;
 import org.apache.sis.internal.jaxb.Context;
 import org.apache.sis.internal.system.XMLInputFactory;
 
@@ -61,7 +60,6 @@ import org.apache.sis.internal.system.XM
  * @version 0.4
  * @module
  */
-@Decorator(Unmarshaller.class)
 final class PooledUnmarshaller extends Pooled implements Unmarshaller {
     /**
      * The wrapper marshaller which does the real work.

Modified: sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/io/EchoAppendable.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/io/EchoAppendable.java?rev=1553055&r1=1553054&r2=1553055&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/io/EchoAppendable.java
[UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/io/EchoAppendable.java
[UTF-8] Mon Dec 23 00:24:35 2013
@@ -17,7 +17,6 @@
 package org.apache.sis.io;
 
 import java.io.IOException;
-import org.apache.sis.util.Decorator;
 
 import static org.junit.Assert.*;
 
@@ -33,7 +32,6 @@ import static org.junit.Assert.*;
  * @version 0.3
  * @module
  */
-@Decorator(Appendable.class)
 public class EchoAppendable extends Appender {
     /**
      * The echo writer.



Mime
View raw message