projects
/
jSite2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add package javadoc
[jSite2.git]
/
src
/
net
/
pterodactylus
/
jsite
/
core
/
CoreImpl.java
diff --git
a/src/net/pterodactylus/jsite/core/CoreImpl.java
b/src/net/pterodactylus/jsite/core/CoreImpl.java
index
9073655
..
cd65bf4
100644
(file)
--- a/
src/net/pterodactylus/jsite/core/CoreImpl.java
+++ b/
src/net/pterodactylus/jsite/core/CoreImpl.java
@@
-23,9
+23,9
@@
import java.io.IOException;
import java.net.UnknownHostException;
import java.util.ArrayList;
import java.util.List;
import java.net.UnknownHostException;
import java.util.ArrayList;
import java.util.List;
+import java.util.concurrent.Executor;
+import java.util.concurrent.Executors;
-import net.pterodactylus.jsite.project.Project;
-import net.pterodactylus.jsite.project.ProjectManager;
/**
* The core of jSite.
/**
* The core of jSite.
@@
-37,6
+37,9
@@
public class CoreImpl implements Core, NodeListener, RequestListener {
/** The core listeners. */
private final List<CoreListener> coreListeners = new ArrayList<CoreListener>();
/** The core listeners. */
private final List<CoreListener> coreListeners = new ArrayList<CoreListener>();
+ /** Thread pool. */
+ private Executor threadPool = Executors.newCachedThreadPool();
+
/** The project manager. */
private ProjectManager projectManager;
/** The project manager. */
private ProjectManager projectManager;
@@
-73,7
+76,7
@@
public class CoreImpl implements Core, NodeListener, RequestListener {
* The directory the projects were loaded from
*/
private void fireLoadingProjectsDone(String directory) {
* The directory the projects were loaded from
*/
private void fireLoadingProjectsDone(String directory) {
- for (CoreListener coreListener: coreListeners) {
+ for (CoreListener coreListener
: coreListeners) {
coreListener.loadingProjectsDone(directory);
}
}
coreListener.loadingProjectsDone(directory);
}
}
@@
-88,7
+91,7
@@
public class CoreImpl implements Core, NodeListener, RequestListener {
* The exception that occured when loading projects
*/
private void fireLoadingProjectsFailed(String directory, Throwable throwable) {
* The exception that occured when loading projects
*/
private void fireLoadingProjectsFailed(String directory, Throwable throwable) {
- for (CoreListener coreListener: coreListeners) {
+ for (CoreListener coreListener
: coreListeners) {
coreListener.loadingProjectsFailed(directory, throwable);
}
}
coreListener.loadingProjectsFailed(directory, throwable);
}
}
@@
-100,7
+103,7
@@
public class CoreImpl implements Core, NodeListener, RequestListener {
* The directory the projects were saved to
*/
private void fireSavingProjectsDone(String directory) {
* The directory the projects were saved to
*/
private void fireSavingProjectsDone(String directory) {
- for (CoreListener coreListener: coreListeners) {
+ for (CoreListener coreListener
: coreListeners) {
coreListener.savingProjectsDone(directory);
}
}
coreListener.savingProjectsDone(directory);
}
}
@@
-114,7
+117,7
@@
public class CoreImpl implements Core, NodeListener, RequestListener {
* The exception that occured when saving the projects
*/
private void fireSavingProjectsFailed(String directory, Throwable throwable) {
* The exception that occured when saving the projects
*/
private void fireSavingProjectsFailed(String directory, Throwable throwable) {
- for (CoreListener coreListener: coreListeners) {
+ for (CoreListener coreListener
: coreListeners) {
coreListener.savingProjectsFailed(directory, throwable);
}
}
coreListener.savingProjectsFailed(directory, throwable);
}
}
@@
-126,18
+129,21
@@
public class CoreImpl implements Core, NodeListener, RequestListener {
* The project that was added
*/
private void fireProjectAdded(Project project) {
* The project that was added
*/
private void fireProjectAdded(Project project) {
- for (CoreListener coreListener: coreListeners) {
+ for (CoreListener coreListener
: coreListeners) {
coreListener.projectAdded(project);
}
}
coreListener.projectAdded(project);
}
}
-
+
/**
* Notifies all listeners that a project was cloned.
/**
* Notifies all listeners that a project was cloned.
- * @param clonedProject The project that was cloned
- * @param projectClone The clone of the project
+ *
+ * @param clonedProject
+ * The project that was cloned
+ * @param projectClone
+ * The clone of the project
*/
private void fireProjectCloned(Project clonedProject, Project projectClone) {
*/
private void fireProjectCloned(Project clonedProject, Project projectClone) {
- for (CoreListener coreListener: coreListeners) {
+ for (CoreListener coreListener
: coreListeners) {
coreListener.projectCloned(clonedProject, projectClone);
}
}
coreListener.projectCloned(clonedProject, projectClone);
}
}
@@
-149,7
+155,7
@@
public class CoreImpl implements Core, NodeListener, RequestListener {
* The project that was removed
*/
private void fireProjectRemoved(Project project) {
* The project that was removed
*/
private void fireProjectRemoved(Project project) {
- for (CoreListener coreListener: coreListeners) {
+ for (CoreListener coreListener
: coreListeners) {
coreListener.projectRemoved(project);
}
}
coreListener.projectRemoved(project);
}
}
@@
-161,7
+167,7
@@
public class CoreImpl implements Core, NodeListener, RequestListener {
* The directory the nodes were loaded from
*/
private void fireLoadingNodesDone(String directory) {
* The directory the nodes were loaded from
*/
private void fireLoadingNodesDone(String directory) {
- for (CoreListener coreListener: coreListeners) {
+ for (CoreListener coreListener
: coreListeners) {
coreListener.loadingNodesDone(directory);
}
}
coreListener.loadingNodesDone(directory);
}
}
@@
-175,7
+181,7
@@
public class CoreImpl implements Core, NodeListener, RequestListener {
* The exception that occured while loading the nodes
*/
private void fireLoadingNodesFailed(String directory, Throwable throwable) {
* The exception that occured while loading the nodes
*/
private void fireLoadingNodesFailed(String directory, Throwable throwable) {
- for (CoreListener coreListener: coreListeners) {
+ for (CoreListener coreListener
: coreListeners) {
coreListener.loadingNodesFailed(directory, throwable);
}
}
coreListener.loadingNodesFailed(directory, throwable);
}
}
@@
-187,7
+193,7
@@
public class CoreImpl implements Core, NodeListener, RequestListener {
* The directory the nodes were saved to
*/
private void fireSavingNodesDone(String directory) {
* The directory the nodes were saved to
*/
private void fireSavingNodesDone(String directory) {
- for (CoreListener coreListener: coreListeners) {
+ for (CoreListener coreListener
: coreListeners) {
coreListener.savingNodesDone(directory);
}
}
coreListener.savingNodesDone(directory);
}
}
@@
-201,7
+207,7
@@
public class CoreImpl implements Core, NodeListener, RequestListener {
* The exception that occured while saving the nodes
*/
private void fireSavingNodesFailed(String directory, Throwable throwable) {
* The exception that occured while saving the nodes
*/
private void fireSavingNodesFailed(String directory, Throwable throwable) {
- for (CoreListener coreListener: coreListeners) {
+ for (CoreListener coreListener
: coreListeners) {
coreListener.savingProjectsFailed(directory, throwable);
}
}
coreListener.savingProjectsFailed(directory, throwable);
}
}
@@
-210,7
+216,7
@@
public class CoreImpl implements Core, NodeListener, RequestListener {
* Notifies all core listeners that the core has loaded and is ready to run.
*/
private void fireCoreLoaded() {
* Notifies all core listeners that the core has loaded and is ready to run.
*/
private void fireCoreLoaded() {
- for (CoreListener coreListener: coreListeners) {
+ for (CoreListener coreListener
: coreListeners) {
coreListener.coreLoaded();
}
}
coreListener.coreLoaded();
}
}
@@
-219,7
+225,7
@@
public class CoreImpl implements Core, NodeListener, RequestListener {
* Notifies all listeners that the core was stopped.
*/
private void fireCoreStopped() {
* Notifies all listeners that the core was stopped.
*/
private void fireCoreStopped() {
- for (CoreListener coreListener: coreListeners) {
+ for (CoreListener coreListener
: coreListeners) {
coreListener.coreStopped();
}
}
coreListener.coreStopped();
}
}
@@
-231,7
+237,7
@@
public class CoreImpl implements Core, NodeListener, RequestListener {
* The node that was added
*/
private void fireNodeAdded(Node node) {
* The node that was added
*/
private void fireNodeAdded(Node node) {
- for (CoreListener coreListener: coreListeners) {
+ for (CoreListener coreListener
: coreListeners) {
coreListener.nodeAdded(node);
}
}
coreListener.nodeAdded(node);
}
}
@@
-243,7
+249,7
@@
public class CoreImpl implements Core, NodeListener, RequestListener {
* The node that was removed
*/
private void fireNodeRemoved(Node node) {
* The node that was removed
*/
private void fireNodeRemoved(Node node) {
- for (CoreListener coreListener: coreListeners) {
+ for (CoreListener coreListener
: coreListeners) {
coreListener.nodeRemoved(node);
}
}
coreListener.nodeRemoved(node);
}
}
@@
-256,7
+262,7
@@
public class CoreImpl implements Core, NodeListener, RequestListener {
* The node that is being connected to
*/
private void fireNodeConnecting(Node node) {
* The node that is being connected to
*/
private void fireNodeConnecting(Node node) {
- for (CoreListener coreListener: coreListeners) {
+ for (CoreListener coreListener
: coreListeners) {
coreListener.nodeConnecting(node);
}
}
coreListener.nodeConnecting(node);
}
}
@@
-268,7
+274,7
@@
public class CoreImpl implements Core, NodeListener, RequestListener {
* The node that is now connected
*/
private void fireNodeConnected(Node node) {
* The node that is now connected
*/
private void fireNodeConnected(Node node) {
- for (CoreListener coreListener: coreListeners) {
+ for (CoreListener coreListener
: coreListeners) {
coreListener.nodeConnected(node);
}
}
coreListener.nodeConnected(node);
}
}
@@
-282,7
+288,7
@@
public class CoreImpl implements Core, NodeListener, RequestListener {
* The cause of the failure
*/
private void fireNodeConnectionFailed(Node node, Throwable cause) {
* The cause of the failure
*/
private void fireNodeConnectionFailed(Node node, Throwable cause) {
- for (CoreListener coreListener: coreListeners) {
+ for (CoreListener coreListener
: coreListeners) {
coreListener.nodeConnectionFailed(node, cause);
}
}
coreListener.nodeConnectionFailed(node, cause);
}
}
@@
-297,7
+303,7
@@
public class CoreImpl implements Core, NodeListener, RequestListener {
* if there was no exception
*/
private void fireNodeDisconnected(Node node, Throwable throwable) {
* if there was no exception
*/
private void fireNodeDisconnected(Node node, Throwable throwable) {
- for (CoreListener coreListener: coreListeners) {
+ for (CoreListener coreListener
: coreListeners) {
coreListener.nodeDisconnected(node, throwable);
}
}
coreListener.nodeDisconnected(node, throwable);
}
}
@@
-307,6
+313,13
@@
public class CoreImpl implements Core, NodeListener, RequestListener {
//
/**
//
/**
+ * {@inheritDoc}
+ */
+ public Executor getThreadPool() {
+ return threadPool;
+ }
+
+ /**
* Returns the project manager.
*
* @return The project manager
* Returns the project manager.
*
* @return The project manager
@@
-384,17
+397,17
@@
public class CoreImpl implements Core, NodeListener, RequestListener {
*/
public void start() {
try {
*/
public void start() {
try {
- projectManager.load();
- fireLoadingProjectsDone(projectManager.getDirectory());
- } catch (IOException ioe1) {
- fireLoadingProjectsFailed(projectManager.getDirectory(), ioe1);
- }
- try {
nodeManager.load();
fireLoadingNodesDone(nodeManager.getDirectory());
} catch (IOException ioe1) {
fireLoadingNodesFailed(nodeManager.getDirectory(), ioe1);
}
nodeManager.load();
fireLoadingNodesDone(nodeManager.getDirectory());
} catch (IOException ioe1) {
fireLoadingNodesFailed(nodeManager.getDirectory(), ioe1);
}
+ try {
+ projectManager.load();
+ fireLoadingProjectsDone(projectManager.getDirectory());
+ } catch (IOException ioe1) {
+ fireLoadingProjectsFailed(projectManager.getDirectory(), ioe1);
+ }
fireCoreLoaded();
}
fireCoreLoaded();
}
@@
-461,7
+474,7
@@
public class CoreImpl implements Core, NodeListener, RequestListener {
Project projectClone = projectManager.cloneProject(project);
fireProjectCloned(project, projectClone);
}
Project projectClone = projectManager.cloneProject(project);
fireProjectCloned(project, projectClone);
}
-
+
/**
* {@inheritDoc}
*/
/**
* {@inheritDoc}
*/
@@
-469,7
+482,7
@@
public class CoreImpl implements Core, NodeListener, RequestListener {
projectManager.removeProject(project);
fireProjectRemoved(project);
}
projectManager.removeProject(project);
fireProjectRemoved(project);
}
-
+
//
// PRIVATE METHODS
//
//
// PRIVATE METHODS
//