projects
/
Sone.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
23d984b
)
Rename album name to album title.
author
David ‘Bombe’ Roden
<bombe@pterodactylus.net>
Sun, 10 Apr 2011 18:02:21 +0000
(20:02 +0200)
committer
David ‘Bombe’ Roden
<bombe@pterodactylus.net>
Wed, 13 Apr 2011 04:40:49 +0000
(06:40 +0200)
src/main/java/net/pterodactylus/sone/core/Core.java
patch
|
blob
|
history
src/main/java/net/pterodactylus/sone/data/Album.java
patch
|
blob
|
history
src/main/java/net/pterodactylus/sone/web/CreateAlbumPage.java
patch
|
blob
|
history
diff --git
a/src/main/java/net/pterodactylus/sone/core/Core.java
b/src/main/java/net/pterodactylus/sone/core/Core.java
index
3a0a722
..
06a1467
100644
(file)
--- a/
src/main/java/net/pterodactylus/sone/core/Core.java
+++ b/
src/main/java/net/pterodactylus/sone/core/Core.java
@@
-1327,14
+1327,14
@@
public class Core implements IdentityListener, UpdateListener {
if (albumId == null) {
break;
}
if (albumId == null) {
break;
}
- String album
Name = configuration.getStringValue(albumPrefix + "/Nam
e").getValue(null);
+ String album
Title = configuration.getStringValue(albumPrefix + "/Titl
e").getValue(null);
String albumDescription = configuration.getStringValue(albumPrefix + "/Description").getValue(null);
String albumParentId = configuration.getStringValue(albumPrefix + "/Parent").getValue(null);
String albumDescription = configuration.getStringValue(albumPrefix + "/Description").getValue(null);
String albumParentId = configuration.getStringValue(albumPrefix + "/Parent").getValue(null);
- if ((album
Nam
e == null) || (albumDescription == null)) {
+ if ((album
Titl
e == null) || (albumDescription == null)) {
logger.log(Level.WARNING, "Invalid album found, aborting load!");
return;
}
logger.log(Level.WARNING, "Invalid album found, aborting load!");
return;
}
- Album album = getAlbum(albumId).setSone(sone).set
Name(albumNam
e).setDescription(albumDescription);
+ Album album = getAlbum(albumId).setSone(sone).set
Title(albumTitl
e).setDescription(albumDescription);
if (albumParentId != null) {
Album parentAlbum = getAlbum(albumParentId, false);
if (parentAlbum == null) {
if (albumParentId != null) {
Album parentAlbum = getAlbum(albumParentId, false);
if (parentAlbum == null) {
@@
-1483,7
+1483,7
@@
public class Core implements IdentityListener, UpdateListener {
for (Album album : albums) {
String albumPrefix = sonePrefix + "/Albums/" + albumCounter++;
configuration.getStringValue(albumPrefix + "/ID").setValue(album.getId());
for (Album album : albums) {
String albumPrefix = sonePrefix + "/Albums/" + albumCounter++;
configuration.getStringValue(albumPrefix + "/ID").setValue(album.getId());
- configuration.getStringValue(albumPrefix + "/
Name").setValue(album.getNam
e());
+ configuration.getStringValue(albumPrefix + "/
Title").setValue(album.getTitl
e());
configuration.getStringValue(albumPrefix + "/Description").setValue(album.getDescription());
configuration.getStringValue(albumPrefix + "/Parent").setValue(album.getParent() == null ? null : album.getParent().getId());
}
configuration.getStringValue(albumPrefix + "/Description").setValue(album.getDescription());
configuration.getStringValue(albumPrefix + "/Parent").setValue(album.getParent() == null ? null : album.getParent().getId());
}
diff --git
a/src/main/java/net/pterodactylus/sone/data/Album.java
b/src/main/java/net/pterodactylus/sone/data/Album.java
index
601e68d
..
a0a85de
100644
(file)
--- a/
src/main/java/net/pterodactylus/sone/data/Album.java
+++ b/
src/main/java/net/pterodactylus/sone/data/Album.java
@@
-45,8
+45,8
@@
public class Album implements Fingerprintable {
/** The parent album. */
private Album parent;
/** The parent album. */
private Album parent;
- /** The
nam
e of this album. */
- private String
nam
e;
+ /** The
titl
e of this album. */
+ private String
titl
e;
/** The description of this album. */
private String description;
/** The description of this album. */
private String description;
@@
-220,24
+220,24
@@
public class Album implements Fingerprintable {
}
/**
}
/**
- * Returns the
nam
e of this album.
+ * Returns the
titl
e of this album.
*
*
- * @return The
nam
e of this album
+ * @return The
titl
e of this album
*/
*/
- public String get
Nam
e() {
- return
nam
e;
+ public String get
Titl
e() {
+ return
titl
e;
}
/**
}
/**
- * Sets the
nam
e of this album.
+ * Sets the
titl
e of this album.
*
*
- * @param
nam
e
- * The
nam
e of this album
+ * @param
titl
e
+ * The
titl
e of this album
* @return This album
*/
* @return This album
*/
- public Album set
Name(String nam
e) {
- Validation.begin().isNotNull("Album
Name", nam
e).check();
- this.
name = nam
e;
+ public Album set
Title(String titl
e) {
+ Validation.begin().isNotNull("Album
Title", titl
e).check();
+ this.
title = titl
e;
return this;
}
return this;
}
@@
-275,7
+275,7
@@
public class Album implements Fingerprintable {
StringBuilder fingerprint = new StringBuilder();
fingerprint.append("Album(");
fingerprint.append("ID(").append(id).append(')');
StringBuilder fingerprint = new StringBuilder();
fingerprint.append("Album(");
fingerprint.append("ID(").append(id).append(')');
- fingerprint.append("
Name(").append(nam
e).append(')');
+ fingerprint.append("
Title(").append(titl
e).append(')');
fingerprint.append("Description(").append(description).append(')');
/* add nested albums. */
fingerprint.append("Description(").append(description).append(')');
/* add nested albums. */
diff --git
a/src/main/java/net/pterodactylus/sone/web/CreateAlbumPage.java
b/src/main/java/net/pterodactylus/sone/web/CreateAlbumPage.java
index
5382253
..
afe95b7
100644
(file)
--- a/
src/main/java/net/pterodactylus/sone/web/CreateAlbumPage.java
+++ b/
src/main/java/net/pterodactylus/sone/web/CreateAlbumPage.java
@@
-63,7
+63,7
@@
public class CreateAlbumPage extends SoneTemplatePage {
String parentId = request.getHttpRequest().getPartAsStringFailsafe("parent", 36);
Album parent = webInterface.getCore().getAlbum(parentId, false);
Album album = webInterface.getCore().createAlbum(currentSone, parent);
String parentId = request.getHttpRequest().getPartAsStringFailsafe("parent", 36);
Album parent = webInterface.getCore().getAlbum(parentId, false);
Album album = webInterface.getCore().createAlbum(currentSone, parent);
- album.set
Nam
e(name).setDescription(description);
+ album.set
Titl
e(name).setDescription(description);
webInterface.getCore().saveSone(currentSone);
throw new RedirectException("imageBrowser.html?album=" + album.getId());
}
webInterface.getCore().saveSone(currentSone);
throw new RedirectException("imageBrowser.html?album=" + album.getId());
}