projects
/
jSite.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix change detection to include “changed name” attribute.
[jSite.git]
/
src
/
de
/
todesbaum
/
jsite
/
application
/
FileOption.java
diff --git
a/src/de/todesbaum/jsite/application/FileOption.java
b/src/de/todesbaum/jsite/application/FileOption.java
index
9927c33
..
31e6698
100644
(file)
--- a/
src/de/todesbaum/jsite/application/FileOption.java
+++ b/
src/de/todesbaum/jsite/application/FileOption.java
@@
-35,6
+35,9
@@
public class FileOption {
/** The default for the custom key. */
private static final String DEFAULT_CUSTOM_KEY = "CHK@";
/** The default for the custom key. */
private static final String DEFAULT_CUSTOM_KEY = "CHK@";
+ /** The default changed name. */
+ private static final String DEFAULT_CHANGED_NAME = null;
+
/** The default container. */
private static final String DEFAULT_CONTAINER = "";
/** The default container. */
private static final String DEFAULT_CONTAINER = "";
@@
-81,6
+84,7
@@
public class FileOption {
insert = DEFAULT_INSERT;
insertRedirect = DEFAULT_INSERT_REDIRECT;
customKey = DEFAULT_CUSTOM_KEY;
insert = DEFAULT_INSERT;
insertRedirect = DEFAULT_INSERT_REDIRECT;
customKey = DEFAULT_CUSTOM_KEY;
+ changedName = DEFAULT_CHANGED_NAME;
this.defaultMimeType = defaultMimeType;
mimeType = defaultMimeType;
container = DEFAULT_CONTAINER;
this.defaultMimeType = defaultMimeType;
mimeType = defaultMimeType;
container = DEFAULT_CONTAINER;
@@
-303,6
+307,9
@@
public class FileOption {
if (!customKey.equals(DEFAULT_CUSTOM_KEY)) {
return true;
}
if (!customKey.equals(DEFAULT_CUSTOM_KEY)) {
return true;
}
+ if (((changedName != null) && !changedName.equals(DEFAULT_CHANGED_NAME)) || ((DEFAULT_CHANGED_NAME != null) && !DEFAULT_CHANGED_NAME.equals(changedName))) {
+ return true;
+ }
if (!defaultMimeType.equals(mimeType)) {
return true;
}
if (!defaultMimeType.equals(mimeType)) {
return true;
}