projects
/
jSite.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
work in progress
[jSite.git]
/
src
/
de
/
todesbaum
/
jsite
/
main
/
Configuration.java
diff --git
a/src/de/todesbaum/jsite/main/Configuration.java
b/src/de/todesbaum/jsite/main/Configuration.java
index
49f107b
..
b38e986
100644
(file)
--- a/
src/de/todesbaum/jsite/main/Configuration.java
+++ b/
src/de/todesbaum/jsite/main/Configuration.java
@@
-44,7
+44,7
@@
import de.todesbaum.util.xml.XML;
/**
* The configuration.
/**
* The configuration.
- *
+ *
* @author David ‘Bombe’ Roden <bombe@freenetproject.org>
*/
public class Configuration {
* @author David ‘Bombe’ Roden <bombe@freenetproject.org>
*/
public class Configuration {
@@
-68,7
+68,7
@@
public class Configuration {
/**
* Creates a new configuration that is read from the given file.
/**
* Creates a new configuration that is read from the given file.
- *
+ *
* @param filename
* The name of the configuration file
*/
* @param filename
* The name of the configuration file
*/
@@
-79,7
+79,7
@@
public class Configuration {
/**
* Creates a new configuration that is read from the given file and uses the
* given lock file.
/**
* Creates a new configuration that is read from the given file and uses the
* given lock file.
- *
+ *
* @param filename
* The name of the configuration file
* @param lockFilename
* @param filename
* The name of the configuration file
* @param lockFilename
@@
-93,7
+93,7
@@
public class Configuration {
/**
* Creates the directory of the configuration file.
/**
* Creates the directory of the configuration file.
- *
+ *
* @return <code>true</code> if the directory exists, or if it could be
* created, <code>false</code> otherwise
*/
* @return <code>true</code> if the directory exists, or if it could be
* created, <code>false</code> otherwise
*/
@@
-104,7
+104,7
@@
public class Configuration {
/**
* Creates the lock file.
/**
* Creates the lock file.
- *
+ *
* @return <code>true</code> if the lock file did not already exist and
* could be created, <code>false</code> otherwise
*/
* @return <code>true</code> if the lock file did not already exist and
* could be created, <code>false</code> otherwise
*/
@@
-113,9
+113,12
@@
public class Configuration {
return false;
}
File lockFile = new File(lockFilename);
return false;
}
File lockFile = new File(lockFilename);
- lockFile.deleteOnExit();
try {
try {
- return lockFile.createNewFile();
+ boolean fileLocked = lockFile.createNewFile();
+ if (fileLocked) {
+ lockFile.deleteOnExit();
+ }
+ return fileLocked;
} catch (IOException e) {
/* ignore. */
}
} catch (IOException e) {
/* ignore. */
}
@@
-123,6
+126,13
@@
public class Configuration {
}
/**
}
/**
+ * Tells the VM to remove the lock file on program exit.
+ */
+ public void removeLockfileOnExit() {
+ new File(lockFilename).deleteOnExit();
+ }
+
+ /**
* Reads the configuration from the file.
*/
private void readConfiguration() {
* Reads the configuration from the file.
*/
private void readConfiguration() {
@@
-152,7
+162,7
@@
public class Configuration {
/**
* Saves the configuration.
/**
* Saves the configuration.
- *
+ *
* @return <code>true</code> if the configuration could be saved,
* <code>false</code> otherwise
*/
* @return <code>true</code> if the configuration could be saved,
* <code>false</code> otherwise
*/
@@
-183,7
+193,7
@@
public class Configuration {
/**
* Returns the value of a node.
/**
* Returns the value of a node.
- *
+ *
* @param nodeNames
* The name of all nodes in the chain
* @param defaultValue
* @param nodeNames
* The name of all nodes in the chain
* @param defaultValue
@@
-205,7
+215,7
@@
public class Configuration {
/**
* Returns the integer value of a node.
/**
* Returns the integer value of a node.
- *
+ *
* @param nodeNames
* The names of all nodes in the chain
* @param defaultValue
* @param nodeNames
* The names of all nodes in the chain
* @param defaultValue
@@
-224,7
+234,7
@@
public class Configuration {
/**
* Returns the boolean value of a node.
/**
* Returns the boolean value of a node.
- *
+ *
* @param nodeNames
* The names of all nodes in the chain
* @param defaultValue
* @param nodeNames
* The names of all nodes in the chain
* @param defaultValue
@@
-242,7
+252,7
@@
public class Configuration {
/**
* Returns the hostname of the node.
/**
* Returns the hostname of the node.
- *
+ *
* @return The hostname of the node
* @deprecated Use {@link #getSelectedNode()} instead
*/
* @return The hostname of the node
* @deprecated Use {@link #getSelectedNode()} instead
*/
@@
-253,7
+263,7
@@
public class Configuration {
/**
* Sets the hostname of the node.
/**
* Sets the hostname of the node.
- *
+ *
* @param nodeAddress
* The hostname of the node
* @deprecated Use {@link #setSelectedNode(Node)} instead
* @param nodeAddress
* The hostname of the node
* @deprecated Use {@link #setSelectedNode(Node)} instead
@@
-265,7
+275,7
@@
public class Configuration {
/**
* The port number of the node
/**
* The port number of the node
- *
+ *
* @return The port number of the node
* @deprecated Use {@link #getSelectedNode()} instead.
*/
* @return The port number of the node
* @deprecated Use {@link #getSelectedNode()} instead.
*/
@@
-276,7
+286,7
@@
public class Configuration {
/**
* Sets the port number of the node.
/**
* Sets the port number of the node.
- *
+ *
* @param nodePort
* The port number of the node
* @deprecated Use {@link #setSelectedNode(Node)} instead
* @param nodePort
* The port number of the node
* @deprecated Use {@link #setSelectedNode(Node)} instead
@@
-288,9
+298,9
@@
public class Configuration {
/**
* Returns whether the node configuration page should be skipped on startup.
/**
* Returns whether the node configuration page should be skipped on startup.
- *
- * @return <code>true</code> to skip the node configuration page on
- *
startup,
<code>false</code> to show it
+ *
+ * @return <code>true</code> to skip the node configuration page on
startup,
+ * <code>false</code> to show it
*/
public boolean isSkipNodePage() {
return getNodeBooleanValue(new String[] { "skip-node-page" }, false);
*/
public boolean isSkipNodePage() {
return getNodeBooleanValue(new String[] { "skip-node-page" }, false);
@@
-298,7
+308,7
@@
public class Configuration {
/**
* Sets whether the node configuration page should be skipped on startup.
/**
* Sets whether the node configuration page should be skipped on startup.
- *
+ *
* @param skipNodePage
* <code>true</code> to skip the node configuration page on
* startup, <code>false</code> to show it
* @param skipNodePage
* <code>true</code> to skip the node configuration page on
* startup, <code>false</code> to show it
@@
-309,7
+319,7
@@
public class Configuration {
/**
* Returns all configured projects.
/**
* Returns all configured projects.
- *
+ *
* @return A list of all projects
*/
public Project[] getProjects() {
* @return A list of all projects
*/
public Project[] getProjects() {
@@
-362,7
+372,7
@@
public class Configuration {
/**
* Sets the list of all projects.
/**
* Sets the list of all projects.
- *
+ *
* @param projects
* The list of all projects
*/
* @param projects
* The list of all projects
*/
@@
-401,7
+411,7
@@
public class Configuration {
/**
* Returns the stored locale.
/**
* Returns the stored locale.
- *
+ *
* @return The stored locale
*/
public Locale getLocale() {
* @return The stored locale
*/
public Locale getLocale() {
@@
-415,7
+425,7
@@
public class Configuration {
/**
* Sets the locale to store.
/**
* Sets the locale to store.
- *
+ *
* @param locale
* The locale to store
*/
* @param locale
* The locale to store
*/
@@
-431,7
+441,7
@@
public class Configuration {
/**
* Returns a list of configured nodes.
/**
* Returns a list of configured nodes.
- *
+ *
* @return The list of the configured nodes
*/
public Node[] getNodes() {
* @return The list of the configured nodes
*/
public Node[] getNodes() {
@@
-460,7
+470,7
@@
public class Configuration {
/**
* Sets the list of configured nodes.
/**
* Sets the list of configured nodes.
- *
+ *
* @param nodes
* The list of configured nodes
*/
* @param nodes
* The list of configured nodes
*/
@@
-479,7
+489,7
@@
public class Configuration {
/**
* Sets the selected node.
/**
* Sets the selected node.
- *
+ *
* @param selectedNode
* The selected node
*/
* @param selectedNode
* The selected node
*/
@@
-493,7
+503,7
@@
public class Configuration {
/**
* Returns the selected node.
/**
* Returns the selected node.
- *
+ *
* @return The selected node
*/
public Node getSelectedNode() {
* @return The selected node
*/
public Node getSelectedNode() {