Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,9 @@ hs_err_pid*
*.ipr
*.iws

/.gradle/3.2.1/taskArtifacts/*
/build/ivy.xml

.project
.settings/
.gradle/

60 changes: 60 additions & 0 deletions ealvatag/pom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">

<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.ealva</groupId>
<artifactId>ealvatag-pom</artifactId>
<version>0.4.7-SNAPSHOT</version>
</parent>

<artifactId>ealvatag</artifactId>
<packaging>jar</packaging>

<dependencies>
<dependency>
<groupId>com.squareup.okio</groupId>
<artifactId>okio</artifactId>
<version>2.9.0</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>20.0</version>
</dependency>
<dependency>
<groupId>com.ealva</groupId>
<artifactId>ealvalog</artifactId>
<version>0.5.6-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.ealva</groupId>
<artifactId>ealvalog-core</artifactId>
<version>0.5.6-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.ealva</groupId>
<artifactId>ealvalog-java</artifactId>
<version>0.5.6-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>3.6.28</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-junit</artifactId>
<version>2.0.0.0</version>
<scope>test</scope>
</dependency>
</dependencies>
</project>
7 changes: 6 additions & 1 deletion ealvatag/src/main/java/ealvatag/BaseException.java
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,12 @@
*/
@SuppressWarnings("unused")
public class BaseException extends RuntimeException {
public BaseException(final String msg, final Object... formatArgs) {
/**
*
*/
private static final long serialVersionUID = -7854594514422418517L;

public BaseException(final String msg, final Object... formatArgs) {
super(String.format(Locale.getDefault(), msg, formatArgs));
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
*/
package ealvatag.audio;

import ealvatag.tag.Tag;
import ealvatag.tag.TagFieldContainer;

import java.io.UnsupportedEncodingException;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ protected GenericAudioHeader read(FileChannel fc, final String fileName) throws
LOG.log(TRACE, "$1%s Reading AIFF file size:$2%d 0x$2%x", fileName, fc.size());
AiffAudioHeader aiffAudioHeader = new AiffAudioHeader();
final AiffFileHeader fileHeader = new AiffFileHeader();
long noOfBytes = fileHeader.readHeader(fc, aiffAudioHeader, fileName);
fileHeader.readHeader(fc, aiffAudioHeader, fileName);
while (fc.position() < fc.size()) {
if (!readChunk(fc, aiffAudioHeader, fileName)) {
LOG.log(ERROR, "%s UnableToReadProcessChunk", fileName);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@ private void rewriteRiffHeaderSize(FileChannel fc) throws IOException {
*
* @throws IOException if something goes wrong
*/
private void deleteTagChunkUsingChannelTransfer(final AiffTag existingTag,
public void deleteTagChunkUsingChannelTransfer(final AiffTag existingTag,
final FileChannel channel,
final long newLength)
throws IOException {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,6 @@
*/
public class CommentsChunk extends Chunk
{
private static final int TIMESTAMP_LENGTH = 4;
private static final int MARKERID_LENGTH = 2;
private static final int COUNT_LENGTH = 2;

private AiffAudioHeader aiffHeader;

/**
Expand Down Expand Up @@ -81,7 +77,7 @@ public boolean readChunk() throws IOException
{
final long timestamp = Utils.convertUnsignedIntToLong(chunkData.getInt());
final Date jTimestamp = AiffUtil.timestampToDate(timestamp);
final int marker = Utils.convertUnsignedShortToInt(chunkData.getShort());
Utils.convertUnsignedShortToInt(chunkData.getShort());
final int count = Utils.convertUnsignedShortToInt(chunkData.getShort());
// Append a timestamp to the comment
final String text = Utils.getString(chunkData, 0, count, StandardCharsets.ISO_8859_1) + " " + AiffUtil.formatDate(jTimestamp);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,12 @@
* @author Raphaël Slinckx
*/
public class CannotReadException extends Exception {
public CannotReadException() {
/**
*
*/
private static final long serialVersionUID = 5227343006975412147L;

public CannotReadException() {
super();
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,11 @@
public class CannotReadVideoException extends CannotReadException
{
/**
*
*/
private static final long serialVersionUID = 5031784427255883755L;

/**
* Creates an instance.
*/
public CannotReadVideoException()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,12 @@
* @author Rapha�l Slinckx
*/
public class CannotWriteException extends Exception {
public CannotWriteException() {
/**
*
*/
private static final long serialVersionUID = -3481365546544721861L;

public CannotWriteException() {
super();
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,12 @@
* Thrown if portion of file thought to be an AudioFrame is found to not be.
*/
public class InvalidAudioFrameException extends Exception {
public InvalidAudioFrameException(String message) {
/**
*
*/
private static final long serialVersionUID = 5124739587065544399L;

public InvalidAudioFrameException(String message) {
super(message);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,12 @@
* Thrown if when trying to read box id the length doesn't make any sense
*/
public class InvalidBoxHeaderException extends BaseException {
public InvalidBoxHeaderException(final String id, final int length) {
/**
*
*/
private static final long serialVersionUID = -71636096814774258L;

public InvalidBoxHeaderException(final String id, final int length) {
super("Unable to find next atom because identifier is invalid %s, length:%d", id, length);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,11 @@ public class ModifyVetoException extends Exception
{

/**
*
*/
private static final long serialVersionUID = -1992365372310254191L;

/**
* (overridden)
*/
public ModifyVetoException()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,11 @@
public class NoReadPermissionsException extends CannotReadException
{
/**
*
*/
private static final long serialVersionUID = 2758840965404356078L;

/**
* Creates an instance.
*/
public NoReadPermissionsException()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,12 @@
*/
public class NoWritePermissionsException extends CannotWriteException {

public NoWritePermissionsException(Throwable ex) {
/**
*
*/
private static final long serialVersionUID = -2545172702325599944L;

public NoWritePermissionsException(Throwable ex) {
super(ex);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,12 @@
* Normally an error, but if occurs at end of file we allow it
*/
public class NullBoxIdException extends RuntimeException {
public NullBoxIdException(String message) {
/**
*
*/
private static final long serialVersionUID = -7114685230539495823L;

public NullBoxIdException(String message) {
super(message);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,11 @@
public class ReadOnlyExcpeption extends RuntimeException
{
/**
*
*/
private static final long serialVersionUID = 8159235342508381197L;

/**
* Creates a new ReadOnlyException datatype.
*/
public ReadOnlyExcpeption()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,12 @@
* you dont have permission to write to the folder that it is in.
*/
public class UnableToCreateFileException extends IOException {
public UnableToCreateFileException(final String message) {
/**
*
*/
private static final long serialVersionUID = 2033271750336981668L;

public UnableToCreateFileException(final String message) {
super(message);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,12 @@
* you dont have permission to modify files in the folder that it is in.
*/
public class UnableToModifyFileException extends IOException {
public UnableToModifyFileException(String message) {
/**
*
*/
private static final long serialVersionUID = 1975509456757617827L;

public UnableToModifyFileException(String message) {
super(message);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,12 @@
* because you do not have Special Permission 'Delete' set to Denied.
*/
public class UnableToRenameFileException extends IOException {
public UnableToRenameFileException(String message) {
/**
*
*/
private static final long serialVersionUID = -5613809571849043924L;

public UnableToRenameFileException(String message) {
super(message);
}

Expand Down
1 change: 0 additions & 1 deletion ealvatag/src/main/java/ealvatag/audio/mp3/LameFrame.java
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
package ealvatag.audio.mp3;

import ealvatag.audio.Utils;
import ealvatag.utils.ArrayUtil;
import ealvatag.utils.StandardCharsets;
import okio.Buffer;

Expand Down
3 changes: 0 additions & 3 deletions ealvatag/src/main/java/ealvatag/audio/mp3/XingFrame.java
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,6 @@ public class XingFrame {
MPEG_VERSION_1_MODE_STEREO_OFFSET + XING_HEADER_BUFFER_SIZE + LameFrame.LAME_HEADER_BUFFER_SIZE;


private static final int BYTE_1 = 0;
private static final int BYTE_2 = 1;
private static final int BYTE_3 = 2;
private static final int BYTE_4 = 3;

/**
Expand Down
Loading