Re: commons-io git commit: Remove redundant type arguments.

2016-09-22 Thread Jörg Schaible
Kristian Rosenvold wrote:

> Adding .gitattributes just ensures any future changes will be correct. If
> there are committed files with incorrect line endings in the repo they
> will not be automatically be fixed. I fixed the remaining incorrect files
> in 9e2b2c09732ca596331f7ca34ba4e0f03d70093d.

Typically those files had been added in Subversion by a Windows client that 
did not set automatically the text attribute and the svn2git bridge handles 
these files then as binary.

- Jörg


-
To unsubscribe, e-mail: dev-unsubscr...@commons.apache.org
For additional commands, e-mail: dev-h...@commons.apache.org



Re: commons-io git commit: Remove redundant type arguments.

2016-09-22 Thread Kristian Rosenvold
Adding .gitattributes just ensures any future changes will be correct. If
there are committed files with incorrect line endings in the repo they will
not be automatically be fixed. I fixed the remaining incorrect files
in 9e2b2c09732ca596331f7ca34ba4e0f03d70093d.

Kristian


2016-09-22 8:30 GMT+02:00 Benedikt Ritter :

> Gary Gregory  schrieb am Mi., 21. Sep. 2016 um
> 18:57 Uhr:
>
> > My git config --global core.autocrlf is already true... could the file in
> > Git have been stored with Windows EOLs?
> >
>
> Don't know. Looks like Kristian has fixed it via .gitattributes.
>
>
> >
> > Gary
> >
> >
> >
> > On Wed, Sep 21, 2016 at 2:05 AM, Benedikt Ritter 
> > wrote:
> >
> > > Hi Gary,
> > >
> > > is you line ending set up correct? See
> > > https://help.github.com/articles/dealing-with-line-endings/
> > >
> > > Can you please revert the commit and then commit only the stuff you
> > wanted
> > > to change?
> > >
> > > Thank you!
> > > Benedikt
> > >
> > > Gary Gregory  schrieb am Di., 20. Sep. 2016 um
> > > 17:01 Uhr:
> > >
> > > > This annoying :-( it must be an EOL thing.
> > > >
> > > > Gary
> > > >
> > > > On Sep 20, 2016 7:18 AM, "Matt Sicker"  wrote:
> > > >
> > > > > Did the line ending change?
> > > > >
> > > > > On 20 September 2016 at 01:59, Benedikt Ritter  >
> > > > wrote:
> > > > >
> > > > > > Hello Gary,
> > > > > >
> > > > > > why has the whole file changed?
> > > > > >
> > > > > > Regards,
> > > > > > Benedikt
> > > > > >
> > > > > >  schrieb am Di., 20. Sep. 2016 um 07:40
> Uhr:
> > > > > >
> > > > > > > Repository: commons-io
> > > > > > > Updated Branches:
> > > > > > >   refs/heads/master 9ba9b49af -> 822bd135f
> > > > > > >
> > > > > > >
> > > > > > > Remove redundant type arguments.
> > > > > > >
> > > > > > > Project: http://git-wip-us.apache.org/
> repos/asf/commons-io/repo
> > > > > > > Commit:
> > http://git-wip-us.apache.org/repos/asf/commons-io/commit/
> > > > > > 822bd135
> > > > > > > Tree:
> > > > http://git-wip-us.apache.org/repos/asf/commons-io/tree/822bd135
> > > > > > > Diff:
> > > > http://git-wip-us.apache.org/repos/asf/commons-io/diff/822bd135
> > > > > > >
> > > > > > > Branch: refs/heads/master
> > > > > > > Commit: 822bd135f3a54b8fbeb23c313535b13c18198c3a
> > > > > > > Parents: 9ba9b49
> > > > > > > Author: Gary Gregory 
> > > > > > > Authored: Mon Sep 19 22:40:29 2016 -0700
> > > > > > > Committer: Gary Gregory 
> > > > > > > Committed: Mon Sep 19 22:40:29 2016 -0700
> > > > > > >
> > > > > > >
> > > > 
> --
> > > > > > >  .../commons/io/input/ObservableInputStream.java | 476
> > > > > > +--
> > > > > > >  1 file changed, 238 insertions(+), 238 deletions(-)
> > > > > > >
> > > > 
> --
> > > > > > >
> > > > > > >
> > > > > > >
> > > > > > > http://git-wip-us.apache.org/repos/asf/commons-io/blob/
> > > > > > 822bd135/src/main/java/org/apache/commons/io/input/
> > > > > > ObservableInputStream.java
> > > > > > >
> > > > 
> --
> > > > > > > diff --git
> > > > > > >
> > > > a/src/main/java/org/apache/commons/io/input/
> ObservableInputStream.java
> > > > > > >
> > > > b/src/main/java/org/apache/commons/io/input/
> ObservableInputStream.java
> > > > > > > index 7d13472..c580ba4 100644
> > > > > > > --- a/src/main/java/org/apache/commons/io/input/
> > > > > > ObservableInputStream.java
> > > > > > > +++ b/src/main/java/org/apache/commons/io/input/
> > > > > > ObservableInputStream.java
> > > > > > > @@ -1,238 +1,238 @@
> > > > > > > -/*
> > > > > > > - * Licensed to the Apache Software Foundation (ASF) under one
> or
> > > > more
> > > > > > > - * contributor license agreements.  See the NOTICE file
> > > distributed
> > > > > with
> > > > > > > - * this work for additional information regarding copyright
> > > > ownership.
> > > > > > > - * The ASF licenses this file to You under the Apache License,
> > > > Version
> > > > > > 2.0
> > > > > > > - * (the "License"); you may not use this file except in
> > compliance
> > > > > with
> > > > > > > - * the License.  You may obtain a copy of the License at
> > > > > > > - *
> > > > > > > - *  http://www.apache.org/licenses/LICENSE-2.0
> > > > > > > - *
> > > > > > > - * Unless required by applicable law or agreed to in writing,
> > > > software
> > > > > > > - * distributed under the License is distributed on an "AS IS"
> > > BASIS,
> > > > > > > - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
> express
> > or
> > > > > > > implied.
> > > > > > > - * See the License for the specific language governing
> > permissions
> > > > and
> > > > > > > - * limitations under the License.
> > > > > > > - */
> > > > > > > 

Re: commons-io git commit: Remove redundant type arguments.

2016-09-22 Thread Benedikt Ritter
Gary Gregory  schrieb am Mi., 21. Sep. 2016 um
18:57 Uhr:

> My git config --global core.autocrlf is already true... could the file in
> Git have been stored with Windows EOLs?
>

Don't know. Looks like Kristian has fixed it via .gitattributes.


>
> Gary
>
>
>
> On Wed, Sep 21, 2016 at 2:05 AM, Benedikt Ritter 
> wrote:
>
> > Hi Gary,
> >
> > is you line ending set up correct? See
> > https://help.github.com/articles/dealing-with-line-endings/
> >
> > Can you please revert the commit and then commit only the stuff you
> wanted
> > to change?
> >
> > Thank you!
> > Benedikt
> >
> > Gary Gregory  schrieb am Di., 20. Sep. 2016 um
> > 17:01 Uhr:
> >
> > > This annoying :-( it must be an EOL thing.
> > >
> > > Gary
> > >
> > > On Sep 20, 2016 7:18 AM, "Matt Sicker"  wrote:
> > >
> > > > Did the line ending change?
> > > >
> > > > On 20 September 2016 at 01:59, Benedikt Ritter 
> > > wrote:
> > > >
> > > > > Hello Gary,
> > > > >
> > > > > why has the whole file changed?
> > > > >
> > > > > Regards,
> > > > > Benedikt
> > > > >
> > > > >  schrieb am Di., 20. Sep. 2016 um 07:40 Uhr:
> > > > >
> > > > > > Repository: commons-io
> > > > > > Updated Branches:
> > > > > >   refs/heads/master 9ba9b49af -> 822bd135f
> > > > > >
> > > > > >
> > > > > > Remove redundant type arguments.
> > > > > >
> > > > > > Project: http://git-wip-us.apache.org/repos/asf/commons-io/repo
> > > > > > Commit:
> http://git-wip-us.apache.org/repos/asf/commons-io/commit/
> > > > > 822bd135
> > > > > > Tree:
> > > http://git-wip-us.apache.org/repos/asf/commons-io/tree/822bd135
> > > > > > Diff:
> > > http://git-wip-us.apache.org/repos/asf/commons-io/diff/822bd135
> > > > > >
> > > > > > Branch: refs/heads/master
> > > > > > Commit: 822bd135f3a54b8fbeb23c313535b13c18198c3a
> > > > > > Parents: 9ba9b49
> > > > > > Author: Gary Gregory 
> > > > > > Authored: Mon Sep 19 22:40:29 2016 -0700
> > > > > > Committer: Gary Gregory 
> > > > > > Committed: Mon Sep 19 22:40:29 2016 -0700
> > > > > >
> > > > > >
> > > --
> > > > > >  .../commons/io/input/ObservableInputStream.java | 476
> > > > > +--
> > > > > >  1 file changed, 238 insertions(+), 238 deletions(-)
> > > > > >
> > > --
> > > > > >
> > > > > >
> > > > > >
> > > > > > http://git-wip-us.apache.org/repos/asf/commons-io/blob/
> > > > > 822bd135/src/main/java/org/apache/commons/io/input/
> > > > > ObservableInputStream.java
> > > > > >
> > > --
> > > > > > diff --git
> > > > > >
> > > a/src/main/java/org/apache/commons/io/input/ObservableInputStream.java
> > > > > >
> > > b/src/main/java/org/apache/commons/io/input/ObservableInputStream.java
> > > > > > index 7d13472..c580ba4 100644
> > > > > > --- a/src/main/java/org/apache/commons/io/input/
> > > > > ObservableInputStream.java
> > > > > > +++ b/src/main/java/org/apache/commons/io/input/
> > > > > ObservableInputStream.java
> > > > > > @@ -1,238 +1,238 @@
> > > > > > -/*
> > > > > > - * Licensed to the Apache Software Foundation (ASF) under one or
> > > more
> > > > > > - * contributor license agreements.  See the NOTICE file
> > distributed
> > > > with
> > > > > > - * this work for additional information regarding copyright
> > > ownership.
> > > > > > - * The ASF licenses this file to You under the Apache License,
> > > Version
> > > > > 2.0
> > > > > > - * (the "License"); you may not use this file except in
> compliance
> > > > with
> > > > > > - * the License.  You may obtain a copy of the License at
> > > > > > - *
> > > > > > - *  http://www.apache.org/licenses/LICENSE-2.0
> > > > > > - *
> > > > > > - * Unless required by applicable law or agreed to in writing,
> > > software
> > > > > > - * distributed under the License is distributed on an "AS IS"
> > BASIS,
> > > > > > - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
> or
> > > > > > implied.
> > > > > > - * See the License for the specific language governing
> permissions
> > > and
> > > > > > - * limitations under the License.
> > > > > > - */
> > > > > > -package org.apache.commons.io.input;
> > > > > > -
> > > > > > -import java.io.IOException;
> > > > > > -import java.io.InputStream;
> > > > > > -import java.security.MessageDigest;
> > > > > > -import java.util.ArrayList;
> > > > > > -import java.util.List;
> > > > > > -
> > > > > > -
> > > > > > -/**
> > > > > > - * The {@link ObservableInputStream} allows, that an InputStream
> > may
> > > > be
> > > > > > consumed
> > > > > > - * by other receivers, apart from the thread, which is reading
> it.
> > > > > > - * The other consumers are implemented as instances of {@link
> > > > > Observer}. A
> > > > > > - * typical 

Re: commons-io git commit: Remove redundant type arguments.

2016-09-21 Thread Gary Gregory
My git config --global core.autocrlf is already true... could the file in
Git have been stored with Windows EOLs?

Gary



On Wed, Sep 21, 2016 at 2:05 AM, Benedikt Ritter  wrote:

> Hi Gary,
>
> is you line ending set up correct? See
> https://help.github.com/articles/dealing-with-line-endings/
>
> Can you please revert the commit and then commit only the stuff you wanted
> to change?
>
> Thank you!
> Benedikt
>
> Gary Gregory  schrieb am Di., 20. Sep. 2016 um
> 17:01 Uhr:
>
> > This annoying :-( it must be an EOL thing.
> >
> > Gary
> >
> > On Sep 20, 2016 7:18 AM, "Matt Sicker"  wrote:
> >
> > > Did the line ending change?
> > >
> > > On 20 September 2016 at 01:59, Benedikt Ritter 
> > wrote:
> > >
> > > > Hello Gary,
> > > >
> > > > why has the whole file changed?
> > > >
> > > > Regards,
> > > > Benedikt
> > > >
> > > >  schrieb am Di., 20. Sep. 2016 um 07:40 Uhr:
> > > >
> > > > > Repository: commons-io
> > > > > Updated Branches:
> > > > >   refs/heads/master 9ba9b49af -> 822bd135f
> > > > >
> > > > >
> > > > > Remove redundant type arguments.
> > > > >
> > > > > Project: http://git-wip-us.apache.org/repos/asf/commons-io/repo
> > > > > Commit: http://git-wip-us.apache.org/repos/asf/commons-io/commit/
> > > > 822bd135
> > > > > Tree:
> > http://git-wip-us.apache.org/repos/asf/commons-io/tree/822bd135
> > > > > Diff:
> > http://git-wip-us.apache.org/repos/asf/commons-io/diff/822bd135
> > > > >
> > > > > Branch: refs/heads/master
> > > > > Commit: 822bd135f3a54b8fbeb23c313535b13c18198c3a
> > > > > Parents: 9ba9b49
> > > > > Author: Gary Gregory 
> > > > > Authored: Mon Sep 19 22:40:29 2016 -0700
> > > > > Committer: Gary Gregory 
> > > > > Committed: Mon Sep 19 22:40:29 2016 -0700
> > > > >
> > > > >
> > --
> > > > >  .../commons/io/input/ObservableInputStream.java | 476
> > > > +--
> > > > >  1 file changed, 238 insertions(+), 238 deletions(-)
> > > > >
> > --
> > > > >
> > > > >
> > > > >
> > > > > http://git-wip-us.apache.org/repos/asf/commons-io/blob/
> > > > 822bd135/src/main/java/org/apache/commons/io/input/
> > > > ObservableInputStream.java
> > > > >
> > --
> > > > > diff --git
> > > > >
> > a/src/main/java/org/apache/commons/io/input/ObservableInputStream.java
> > > > >
> > b/src/main/java/org/apache/commons/io/input/ObservableInputStream.java
> > > > > index 7d13472..c580ba4 100644
> > > > > --- a/src/main/java/org/apache/commons/io/input/
> > > > ObservableInputStream.java
> > > > > +++ b/src/main/java/org/apache/commons/io/input/
> > > > ObservableInputStream.java
> > > > > @@ -1,238 +1,238 @@
> > > > > -/*
> > > > > - * Licensed to the Apache Software Foundation (ASF) under one or
> > more
> > > > > - * contributor license agreements.  See the NOTICE file
> distributed
> > > with
> > > > > - * this work for additional information regarding copyright
> > ownership.
> > > > > - * The ASF licenses this file to You under the Apache License,
> > Version
> > > > 2.0
> > > > > - * (the "License"); you may not use this file except in compliance
> > > with
> > > > > - * the License.  You may obtain a copy of the License at
> > > > > - *
> > > > > - *  http://www.apache.org/licenses/LICENSE-2.0
> > > > > - *
> > > > > - * Unless required by applicable law or agreed to in writing,
> > software
> > > > > - * distributed under the License is distributed on an "AS IS"
> BASIS,
> > > > > - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
> > > > > implied.
> > > > > - * See the License for the specific language governing permissions
> > and
> > > > > - * limitations under the License.
> > > > > - */
> > > > > -package org.apache.commons.io.input;
> > > > > -
> > > > > -import java.io.IOException;
> > > > > -import java.io.InputStream;
> > > > > -import java.security.MessageDigest;
> > > > > -import java.util.ArrayList;
> > > > > -import java.util.List;
> > > > > -
> > > > > -
> > > > > -/**
> > > > > - * The {@link ObservableInputStream} allows, that an InputStream
> may
> > > be
> > > > > consumed
> > > > > - * by other receivers, apart from the thread, which is reading it.
> > > > > - * The other consumers are implemented as instances of {@link
> > > > Observer}. A
> > > > > - * typical application may be the generation of a {@link
> > > MessageDigest}
> > > > > on the
> > > > > - * fly.
> > > > > - * {@code Note}: The {@link ObservableInputStream} is not
> > > > thread
> > > > > safe,
> > > > > - * as instances of InputStream usually aren't.
> > > > > - * If you must access the stream from multiple threads, then
> > > > > synchronization, locking,
> > > > > - * or a similar means must be used.
> > > > > - * @see 

Re: commons-io git commit: Remove redundant type arguments.

2016-09-21 Thread Benedikt Ritter
Hi Gary,

is you line ending set up correct? See
https://help.github.com/articles/dealing-with-line-endings/

Can you please revert the commit and then commit only the stuff you wanted
to change?

Thank you!
Benedikt

Gary Gregory  schrieb am Di., 20. Sep. 2016 um
17:01 Uhr:

> This annoying :-( it must be an EOL thing.
>
> Gary
>
> On Sep 20, 2016 7:18 AM, "Matt Sicker"  wrote:
>
> > Did the line ending change?
> >
> > On 20 September 2016 at 01:59, Benedikt Ritter 
> wrote:
> >
> > > Hello Gary,
> > >
> > > why has the whole file changed?
> > >
> > > Regards,
> > > Benedikt
> > >
> > >  schrieb am Di., 20. Sep. 2016 um 07:40 Uhr:
> > >
> > > > Repository: commons-io
> > > > Updated Branches:
> > > >   refs/heads/master 9ba9b49af -> 822bd135f
> > > >
> > > >
> > > > Remove redundant type arguments.
> > > >
> > > > Project: http://git-wip-us.apache.org/repos/asf/commons-io/repo
> > > > Commit: http://git-wip-us.apache.org/repos/asf/commons-io/commit/
> > > 822bd135
> > > > Tree:
> http://git-wip-us.apache.org/repos/asf/commons-io/tree/822bd135
> > > > Diff:
> http://git-wip-us.apache.org/repos/asf/commons-io/diff/822bd135
> > > >
> > > > Branch: refs/heads/master
> > > > Commit: 822bd135f3a54b8fbeb23c313535b13c18198c3a
> > > > Parents: 9ba9b49
> > > > Author: Gary Gregory 
> > > > Authored: Mon Sep 19 22:40:29 2016 -0700
> > > > Committer: Gary Gregory 
> > > > Committed: Mon Sep 19 22:40:29 2016 -0700
> > > >
> > > >
> --
> > > >  .../commons/io/input/ObservableInputStream.java | 476
> > > +--
> > > >  1 file changed, 238 insertions(+), 238 deletions(-)
> > > >
> --
> > > >
> > > >
> > > >
> > > > http://git-wip-us.apache.org/repos/asf/commons-io/blob/
> > > 822bd135/src/main/java/org/apache/commons/io/input/
> > > ObservableInputStream.java
> > > >
> --
> > > > diff --git
> > > >
> a/src/main/java/org/apache/commons/io/input/ObservableInputStream.java
> > > >
> b/src/main/java/org/apache/commons/io/input/ObservableInputStream.java
> > > > index 7d13472..c580ba4 100644
> > > > --- a/src/main/java/org/apache/commons/io/input/
> > > ObservableInputStream.java
> > > > +++ b/src/main/java/org/apache/commons/io/input/
> > > ObservableInputStream.java
> > > > @@ -1,238 +1,238 @@
> > > > -/*
> > > > - * Licensed to the Apache Software Foundation (ASF) under one or
> more
> > > > - * contributor license agreements.  See the NOTICE file distributed
> > with
> > > > - * this work for additional information regarding copyright
> ownership.
> > > > - * The ASF licenses this file to You under the Apache License,
> Version
> > > 2.0
> > > > - * (the "License"); you may not use this file except in compliance
> > with
> > > > - * the License.  You may obtain a copy of the License at
> > > > - *
> > > > - *  http://www.apache.org/licenses/LICENSE-2.0
> > > > - *
> > > > - * Unless required by applicable law or agreed to in writing,
> software
> > > > - * distributed under the License is distributed on an "AS IS" BASIS,
> > > > - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
> > > > implied.
> > > > - * See the License for the specific language governing permissions
> and
> > > > - * limitations under the License.
> > > > - */
> > > > -package org.apache.commons.io.input;
> > > > -
> > > > -import java.io.IOException;
> > > > -import java.io.InputStream;
> > > > -import java.security.MessageDigest;
> > > > -import java.util.ArrayList;
> > > > -import java.util.List;
> > > > -
> > > > -
> > > > -/**
> > > > - * The {@link ObservableInputStream} allows, that an InputStream may
> > be
> > > > consumed
> > > > - * by other receivers, apart from the thread, which is reading it.
> > > > - * The other consumers are implemented as instances of {@link
> > > Observer}. A
> > > > - * typical application may be the generation of a {@link
> > MessageDigest}
> > > > on the
> > > > - * fly.
> > > > - * {@code Note}: The {@link ObservableInputStream} is not
> > > thread
> > > > safe,
> > > > - * as instances of InputStream usually aren't.
> > > > - * If you must access the stream from multiple threads, then
> > > > synchronization, locking,
> > > > - * or a similar means must be used.
> > > > - * @see MessageDigestCalculatingInputStream
> > > > - */
> > > > -public class ObservableInputStream extends ProxyInputStream {
> > > > -public static abstract class Observer {
> > > > -/** Called to indicate, that {@link InputStream#read()} has
> > been
> > > > invoked
> > > > - * on the {@link ObservableInputStream}, and will return a
> > > value.
> > > > - * @param pByte The value, which is being returned. This
> will
> > > > never be -1 (EOF),
> > > > -   

Re: commons-io git commit: Remove redundant type arguments.

2016-09-20 Thread Gary Gregory
This annoying :-( it must be an EOL thing.

Gary

On Sep 20, 2016 7:18 AM, "Matt Sicker"  wrote:

> Did the line ending change?
>
> On 20 September 2016 at 01:59, Benedikt Ritter  wrote:
>
> > Hello Gary,
> >
> > why has the whole file changed?
> >
> > Regards,
> > Benedikt
> >
> >  schrieb am Di., 20. Sep. 2016 um 07:40 Uhr:
> >
> > > Repository: commons-io
> > > Updated Branches:
> > >   refs/heads/master 9ba9b49af -> 822bd135f
> > >
> > >
> > > Remove redundant type arguments.
> > >
> > > Project: http://git-wip-us.apache.org/repos/asf/commons-io/repo
> > > Commit: http://git-wip-us.apache.org/repos/asf/commons-io/commit/
> > 822bd135
> > > Tree: http://git-wip-us.apache.org/repos/asf/commons-io/tree/822bd135
> > > Diff: http://git-wip-us.apache.org/repos/asf/commons-io/diff/822bd135
> > >
> > > Branch: refs/heads/master
> > > Commit: 822bd135f3a54b8fbeb23c313535b13c18198c3a
> > > Parents: 9ba9b49
> > > Author: Gary Gregory 
> > > Authored: Mon Sep 19 22:40:29 2016 -0700
> > > Committer: Gary Gregory 
> > > Committed: Mon Sep 19 22:40:29 2016 -0700
> > >
> > > --
> > >  .../commons/io/input/ObservableInputStream.java | 476
> > +--
> > >  1 file changed, 238 insertions(+), 238 deletions(-)
> > > --
> > >
> > >
> > >
> > > http://git-wip-us.apache.org/repos/asf/commons-io/blob/
> > 822bd135/src/main/java/org/apache/commons/io/input/
> > ObservableInputStream.java
> > > --
> > > diff --git
> > > a/src/main/java/org/apache/commons/io/input/ObservableInputStream.java
> > > b/src/main/java/org/apache/commons/io/input/ObservableInputStream.java
> > > index 7d13472..c580ba4 100644
> > > --- a/src/main/java/org/apache/commons/io/input/
> > ObservableInputStream.java
> > > +++ b/src/main/java/org/apache/commons/io/input/
> > ObservableInputStream.java
> > > @@ -1,238 +1,238 @@
> > > -/*
> > > - * Licensed to the Apache Software Foundation (ASF) under one or more
> > > - * contributor license agreements.  See the NOTICE file distributed
> with
> > > - * this work for additional information regarding copyright ownership.
> > > - * The ASF licenses this file to You under the Apache License, Version
> > 2.0
> > > - * (the "License"); you may not use this file except in compliance
> with
> > > - * the License.  You may obtain a copy of the License at
> > > - *
> > > - *  http://www.apache.org/licenses/LICENSE-2.0
> > > - *
> > > - * Unless required by applicable law or agreed to in writing, software
> > > - * distributed under the License is distributed on an "AS IS" BASIS,
> > > - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
> > > implied.
> > > - * See the License for the specific language governing permissions and
> > > - * limitations under the License.
> > > - */
> > > -package org.apache.commons.io.input;
> > > -
> > > -import java.io.IOException;
> > > -import java.io.InputStream;
> > > -import java.security.MessageDigest;
> > > -import java.util.ArrayList;
> > > -import java.util.List;
> > > -
> > > -
> > > -/**
> > > - * The {@link ObservableInputStream} allows, that an InputStream may
> be
> > > consumed
> > > - * by other receivers, apart from the thread, which is reading it.
> > > - * The other consumers are implemented as instances of {@link
> > Observer}. A
> > > - * typical application may be the generation of a {@link
> MessageDigest}
> > > on the
> > > - * fly.
> > > - * {@code Note}: The {@link ObservableInputStream} is not
> > thread
> > > safe,
> > > - * as instances of InputStream usually aren't.
> > > - * If you must access the stream from multiple threads, then
> > > synchronization, locking,
> > > - * or a similar means must be used.
> > > - * @see MessageDigestCalculatingInputStream
> > > - */
> > > -public class ObservableInputStream extends ProxyInputStream {
> > > -public static abstract class Observer {
> > > -/** Called to indicate, that {@link InputStream#read()} has
> been
> > > invoked
> > > - * on the {@link ObservableInputStream}, and will return a
> > value.
> > > - * @param pByte The value, which is being returned. This will
> > > never be -1 (EOF),
> > > - *because, in that case, {link #finished()} will be
> invoked
> > > instead.
> > > - */
> > > -void data(int pByte) throws IOException {}
> > > -/** Called to indicate, that {@link InputStream#read(byte[])},
> > or
> > > - * {@link InputStream#read(byte[], int, int)} have been
> called,
> > > and are about to
> > > - * invoke data.
> > > - * @param pBuffer The byte array, which has been passed to the
> > > read call, and where
> > > - *   data has been stored.
> > > - * @param pOffset 

Re: commons-io git commit: Remove redundant type arguments.

2016-09-20 Thread Matt Sicker
Did the line ending change?

On 20 September 2016 at 01:59, Benedikt Ritter  wrote:

> Hello Gary,
>
> why has the whole file changed?
>
> Regards,
> Benedikt
>
>  schrieb am Di., 20. Sep. 2016 um 07:40 Uhr:
>
> > Repository: commons-io
> > Updated Branches:
> >   refs/heads/master 9ba9b49af -> 822bd135f
> >
> >
> > Remove redundant type arguments.
> >
> > Project: http://git-wip-us.apache.org/repos/asf/commons-io/repo
> > Commit: http://git-wip-us.apache.org/repos/asf/commons-io/commit/
> 822bd135
> > Tree: http://git-wip-us.apache.org/repos/asf/commons-io/tree/822bd135
> > Diff: http://git-wip-us.apache.org/repos/asf/commons-io/diff/822bd135
> >
> > Branch: refs/heads/master
> > Commit: 822bd135f3a54b8fbeb23c313535b13c18198c3a
> > Parents: 9ba9b49
> > Author: Gary Gregory 
> > Authored: Mon Sep 19 22:40:29 2016 -0700
> > Committer: Gary Gregory 
> > Committed: Mon Sep 19 22:40:29 2016 -0700
> >
> > --
> >  .../commons/io/input/ObservableInputStream.java | 476
> +--
> >  1 file changed, 238 insertions(+), 238 deletions(-)
> > --
> >
> >
> >
> > http://git-wip-us.apache.org/repos/asf/commons-io/blob/
> 822bd135/src/main/java/org/apache/commons/io/input/
> ObservableInputStream.java
> > --
> > diff --git
> > a/src/main/java/org/apache/commons/io/input/ObservableInputStream.java
> > b/src/main/java/org/apache/commons/io/input/ObservableInputStream.java
> > index 7d13472..c580ba4 100644
> > --- a/src/main/java/org/apache/commons/io/input/
> ObservableInputStream.java
> > +++ b/src/main/java/org/apache/commons/io/input/
> ObservableInputStream.java
> > @@ -1,238 +1,238 @@
> > -/*
> > - * Licensed to the Apache Software Foundation (ASF) under one or more
> > - * contributor license agreements.  See the NOTICE file distributed with
> > - * this work for additional information regarding copyright ownership.
> > - * The ASF licenses this file to You under the Apache License, Version
> 2.0
> > - * (the "License"); you may not use this file except in compliance with
> > - * the License.  You may obtain a copy of the License at
> > - *
> > - *  http://www.apache.org/licenses/LICENSE-2.0
> > - *
> > - * Unless required by applicable law or agreed to in writing, software
> > - * distributed under the License is distributed on an "AS IS" BASIS,
> > - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
> > implied.
> > - * See the License for the specific language governing permissions and
> > - * limitations under the License.
> > - */
> > -package org.apache.commons.io.input;
> > -
> > -import java.io.IOException;
> > -import java.io.InputStream;
> > -import java.security.MessageDigest;
> > -import java.util.ArrayList;
> > -import java.util.List;
> > -
> > -
> > -/**
> > - * The {@link ObservableInputStream} allows, that an InputStream may be
> > consumed
> > - * by other receivers, apart from the thread, which is reading it.
> > - * The other consumers are implemented as instances of {@link
> Observer}. A
> > - * typical application may be the generation of a {@link MessageDigest}
> > on the
> > - * fly.
> > - * {@code Note}: The {@link ObservableInputStream} is not
> thread
> > safe,
> > - * as instances of InputStream usually aren't.
> > - * If you must access the stream from multiple threads, then
> > synchronization, locking,
> > - * or a similar means must be used.
> > - * @see MessageDigestCalculatingInputStream
> > - */
> > -public class ObservableInputStream extends ProxyInputStream {
> > -public static abstract class Observer {
> > -/** Called to indicate, that {@link InputStream#read()} has been
> > invoked
> > - * on the {@link ObservableInputStream}, and will return a
> value.
> > - * @param pByte The value, which is being returned. This will
> > never be -1 (EOF),
> > - *because, in that case, {link #finished()} will be invoked
> > instead.
> > - */
> > -void data(int pByte) throws IOException {}
> > -/** Called to indicate, that {@link InputStream#read(byte[])},
> or
> > - * {@link InputStream#read(byte[], int, int)} have been called,
> > and are about to
> > - * invoke data.
> > - * @param pBuffer The byte array, which has been passed to the
> > read call, and where
> > - *   data has been stored.
> > - * @param pOffset The offset within the byte array, where data
> > has been stored.
> > - * @param pLength The number of bytes, which have been stored in
> > the byte array.
> > - */
> > -void data(byte[] pBuffer, int pOffset, int pLength) throws
> > IOException {}
> > -/** Called to indicate, that EOF has been seen on the underlying
> > stream.
> > -  

Re: commons-io git commit: Remove redundant type arguments.

2016-09-20 Thread Benedikt Ritter
Hello Gary,

why has the whole file changed?

Regards,
Benedikt

 schrieb am Di., 20. Sep. 2016 um 07:40 Uhr:

> Repository: commons-io
> Updated Branches:
>   refs/heads/master 9ba9b49af -> 822bd135f
>
>
> Remove redundant type arguments.
>
> Project: http://git-wip-us.apache.org/repos/asf/commons-io/repo
> Commit: http://git-wip-us.apache.org/repos/asf/commons-io/commit/822bd135
> Tree: http://git-wip-us.apache.org/repos/asf/commons-io/tree/822bd135
> Diff: http://git-wip-us.apache.org/repos/asf/commons-io/diff/822bd135
>
> Branch: refs/heads/master
> Commit: 822bd135f3a54b8fbeb23c313535b13c18198c3a
> Parents: 9ba9b49
> Author: Gary Gregory 
> Authored: Mon Sep 19 22:40:29 2016 -0700
> Committer: Gary Gregory 
> Committed: Mon Sep 19 22:40:29 2016 -0700
>
> --
>  .../commons/io/input/ObservableInputStream.java | 476 +--
>  1 file changed, 238 insertions(+), 238 deletions(-)
> --
>
>
>
> http://git-wip-us.apache.org/repos/asf/commons-io/blob/822bd135/src/main/java/org/apache/commons/io/input/ObservableInputStream.java
> --
> diff --git
> a/src/main/java/org/apache/commons/io/input/ObservableInputStream.java
> b/src/main/java/org/apache/commons/io/input/ObservableInputStream.java
> index 7d13472..c580ba4 100644
> --- a/src/main/java/org/apache/commons/io/input/ObservableInputStream.java
> +++ b/src/main/java/org/apache/commons/io/input/ObservableInputStream.java
> @@ -1,238 +1,238 @@
> -/*
> - * Licensed to the Apache Software Foundation (ASF) under one or more
> - * contributor license agreements.  See the NOTICE file distributed with
> - * this work for additional information regarding copyright ownership.
> - * The ASF licenses this file to You under the Apache License, Version 2.0
> - * (the "License"); you may not use this file except in compliance with
> - * the License.  You may obtain a copy of the License at
> - *
> - *  http://www.apache.org/licenses/LICENSE-2.0
> - *
> - * Unless required by applicable law or agreed to in writing, software
> - * distributed under the License is distributed on an "AS IS" BASIS,
> - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
> implied.
> - * See the License for the specific language governing permissions and
> - * limitations under the License.
> - */
> -package org.apache.commons.io.input;
> -
> -import java.io.IOException;
> -import java.io.InputStream;
> -import java.security.MessageDigest;
> -import java.util.ArrayList;
> -import java.util.List;
> -
> -
> -/**
> - * The {@link ObservableInputStream} allows, that an InputStream may be
> consumed
> - * by other receivers, apart from the thread, which is reading it.
> - * The other consumers are implemented as instances of {@link Observer}. A
> - * typical application may be the generation of a {@link MessageDigest}
> on the
> - * fly.
> - * {@code Note}: The {@link ObservableInputStream} is not thread
> safe,
> - * as instances of InputStream usually aren't.
> - * If you must access the stream from multiple threads, then
> synchronization, locking,
> - * or a similar means must be used.
> - * @see MessageDigestCalculatingInputStream
> - */
> -public class ObservableInputStream extends ProxyInputStream {
> -public static abstract class Observer {
> -/** Called to indicate, that {@link InputStream#read()} has been
> invoked
> - * on the {@link ObservableInputStream}, and will return a value.
> - * @param pByte The value, which is being returned. This will
> never be -1 (EOF),
> - *because, in that case, {link #finished()} will be invoked
> instead.
> - */
> -void data(int pByte) throws IOException {}
> -/** Called to indicate, that {@link InputStream#read(byte[])}, or
> - * {@link InputStream#read(byte[], int, int)} have been called,
> and are about to
> - * invoke data.
> - * @param pBuffer The byte array, which has been passed to the
> read call, and where
> - *   data has been stored.
> - * @param pOffset The offset within the byte array, where data
> has been stored.
> - * @param pLength The number of bytes, which have been stored in
> the byte array.
> - */
> -void data(byte[] pBuffer, int pOffset, int pLength) throws
> IOException {}
> -/** Called to indicate, that EOF has been seen on the underlying
> stream.
> - * This method may be called multiple times, if the reader keeps
> invoking
> - * either of the read methods, and they will consequently keep
> returning
> - * EOF.
> - */
> -void finished() throws IOException {}
> -/** Called to indicate, that the {@link ObservableInputStream}
> has been closed.
> - */
>