knut/album
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

cosmetic

Browse source
This commit is contained in:
Knut Forkalsrud 2026-01-03 21:54:04 -08:00
parent e9bcb1b664
commit 612f078adb
6 changed files with 11 additions and 59 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.cvsignore
View file

@ -1,3 +0,0 @@
build
target
.DS_Store

54
pom.xml
View file

@ -11,14 +11,14 @@
<name>Knut Forkalsrud</name>
<id>knut</id>
<email>knut@forkalsrud.org</email>
<url>http://forkalsrud.org:8080/~knut/</url>
<url>http://aha.forkalsrud.org:8080/~knut/</url>
<timezone>PST</timezone>
</developer>
<developer>
<name>Erik Forkalsrud</name>
<id>erik</id>
<email>erik@forkalsrud.org</email>
<url>http://forkalsrud.org:8080/~erik/</url>
<url>http://aha.forkalsrud.org:8080/~erik/</url>
<timezone>PST</timezone>
</developer>
</developers>
@ -27,8 +27,8 @@
</properties>
<scm>
<url>forkalsrud.org</url>
<developerConnection>scm:git:ssh://forkalsrud.org/home/gitroot/album.git</developerConnection>
<connection>scm:git:ssh://forkalsrud.org/home/gitroot/album.git</connection>
<developerConnection>scm:git:git@code.forkalsrud.org:knut/album.git</developerConnection>
<connection>scm:git:git@code.forkalsrud.org:knut/album.git</connection>
</scm>
<build>
<finalName>photo</finalName>
@ -52,44 +52,6 @@
<stopPort/>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-eclipse-plugin</artifactId>
<version>2.9</version>
<configuration>
<wtpversion>1.5</wtpversion>
<wtpContextName>photo</wtpContextName>
<wtpdefaultserver>J2EE Preview</wtpdefaultserver>
<additionalProjectnatures>
<projectnature>org.maven.ide.eclipse.maven2Nature</projectnature>
<projectnature>org.springframework.ide.eclipse.core.springnature</projectnature>
<projectnature>org.eclipse.wst.common.project.facet.core.nature</projectnature>
<projectnature>org.eclipse.wst.common.modulecore.ModuleCoreNature</projectnature>
<projectnature>org.eclipse.jem.workbench.JavaEMFNature</projectnature>
<projectnature>org.eclipse.wst.jsdt.core.jsNature</projectnature>
</additionalProjectnatures>
<additionalBuildcommands>
<buildCommand><name>org.springframework.ide.eclipse.core.springbuilder</name></buildCommand>
<buildCommand><name>org.eclipse.wst.jsdt.core.javascriptValidator</name></buildCommand>
<buildCommand><name>org.eclipse.wst.common.project.facet.core.builder</name></buildCommand>
<buildCommand><name>org.eclipse.wst.validation.validationbuilder</name></buildCommand>
</additionalBuildcommands>
<additionalProjectFacets>
<jst.java>5.0</jst.java>
<jst.web>2.5</jst.web>
<wst.jsdt.web>1.0</wst.jsdt.web>
</additionalProjectFacets>
</configuration>
</plugin>
<!--
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<configuration>
<repositoryId>central</repositoryId>
</configuration>
</plugin>
-->
</plugins>
</build>
<dependencies>
@ -112,9 +74,9 @@
</exclusions>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
<version>2.6</version>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.20.0</version>
</dependency>
<dependency>
<groupId>com.drewnoakes</groupId>
@ -130,7 +92,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.11</version>
<version>4.13.1</version>
<scope>test</scope>
</dependency>
<dependency>

6
src/main/java/org/forkalsrud/album/db/ThumbnailDatabase.java
View file

@ -3,7 +3,7 @@
*/
package org.forkalsrud.album.db;
import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
import org.forkalsrud.album.web.CachedImage;
@ -23,8 +23,6 @@ import com.sleepycat.je.Transaction;
*/
public class ThumbnailDatabase extends TupleBinding<CachedImage> {
private static Charset UTF8 = Charset.forName("utf-8");
private Environment environment;
private Database db;
@ -76,7 +74,7 @@ public class ThumbnailDatabase extends TupleBinding<CachedImage> {
private DatabaseEntry key(String key) {
DatabaseEntry returnValue = new DatabaseEntry();
returnValue.setData(key.getBytes(UTF8));
returnValue.setData(key.getBytes(StandardCharsets.UTF_8));
return returnValue;
}

2
src/main/java/org/forkalsrud/album/exif/DirectoryMetadataGenerator.java
View file

@ -3,8 +3,6 @@ package org.forkalsrud.album.exif;
import java.awt.image.BufferedImage;
import java.io.File;
import java.io.IOException;
import java.text.DecimalFormat;
import java.text.NumberFormat;
import java.text.SimpleDateFormat;
import java.util.*;

3
src/main/java/org/forkalsrud/album/video/MovieCoder.java
View file

@ -6,12 +6,9 @@ import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.LineNumberReader;
import java.io.OutputStream;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.stream.Stream;
import org.apache.commons.io.IOUtils;
import org.forkalsrud.album.db.Chunk;

2
src/test/java/org/forkalsrud/album/video/FlvMetadataTest.java
View file

@ -8,7 +8,7 @@ import org.forkalsrud.album.exif.Dimension;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertThat;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.core.IsEqual.equalTo;
import static org.hamcrest.core.IsInstanceOf.instanceOf;