projects
/
mir.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
some db code rewriting
[mir.git]
/
source
/
mircoders
/
storage
/
DatabaseContentToTopics.java
diff --git
a/source/mircoders/storage/DatabaseContentToTopics.java
b/source/mircoders/storage/DatabaseContentToTopics.java
index
d3f5571
..
f1d4633
100755
(executable)
--- a/
source/mircoders/storage/DatabaseContentToTopics.java
+++ b/
source/mircoders/storage/DatabaseContentToTopics.java
@@
-30,6
+30,13
@@
package mircoders.storage;
package mircoders.storage;
+import mir.entity.EntityList;
+import mir.log.LoggerWrapper;
+import mir.storage.Database;
+import mir.storage.DatabaseFailure;
+import mircoders.entity.EntityContent;
+import mircoders.entity.EntityTopics;
+
import java.sql.Connection;
import java.sql.ResultSet;
import java.sql.Statement;
import java.sql.Connection;
import java.sql.ResultSet;
import java.sql.Statement;
@@
-38,13
+45,6
@@
import java.util.Arrays;
import java.util.Iterator;
import java.util.List;
import java.util.Iterator;
import java.util.List;
-import mir.entity.EntityList;
-import mir.log.LoggerWrapper;
-import mir.storage.Database;
-import mir.storage.StorageObjectFailure;
-import mircoders.entity.EntityContent;
-import mircoders.entity.EntityTopics;
-
/**
* <b>This class implements the 1-n-relation between
* content and topic
/**
* <b>This class implements the 1-n-relation between
* content and topic
@@
-96,7
+96,7
@@
public class DatabaseContentToTopics extends Database {
* Returns a List of String-Objects from a content-id.
*/
public List getTopicsOfContent(String contentId)
* Returns a List of String-Objects from a content-id.
*/
public List getTopicsOfContent(String contentId)
- throws
StorageObject
Failure {
+ throws
Database
Failure {
ArrayList returnList = new ArrayList();
if (contentId != null) {
ArrayList returnList = new ArrayList();
if (contentId != null) {
@@
-137,14
+137,14
@@
public class DatabaseContentToTopics extends Database {
return result;
}
return result;
}
- public void setTopics(String anArticleId, String [] aTopics) throws
StorageObject
Failure {
+ public void setTopics(String anArticleId, String [] aTopics) throws
Database
Failure {
if (aTopics==null)
setTopics(anArticleId, (List) null);
else
setTopics(anArticleId, Arrays.asList(aTopics));
}
if (aTopics==null)
setTopics(anArticleId, (List) null);
else
setTopics(anArticleId, Arrays.asList(aTopics));
}
- public void setTopics(String anArticleId, List aTopics) throws
StorageObject
Failure {
+ public void setTopics(String anArticleId, List aTopics) throws
Database
Failure {
List newTopics = new ArrayList();
if (aTopics!=null) {
Iterator i = aTopics.iterator();
List newTopics = new ArrayList();
if (aTopics!=null) {
Iterator i = aTopics.iterator();
@@
-218,7
+218,7
@@
public class DatabaseContentToTopics extends Database {
}
public void deleteByContentId(String contentId)
}
public void deleteByContentId(String contentId)
- throws
StorageObject
Failure {
+ throws
Database
Failure {
if (contentId == null) {
//theLog.printDebugInfo("-- delete topics failed -- no content id");
return;
if (contentId == null) {
//theLog.printDebugInfo("-- delete topics failed -- no content id");
return;
@@
-240,7
+240,7
@@
public class DatabaseContentToTopics extends Database {
}
public void deleteByTopicId(String topicId)
}
public void deleteByTopicId(String topicId)
- throws
StorageObject
Failure {
+ throws
Database
Failure {
if (topicId == null) {
//theLog.printDebugInfo("-- delete topics failed -- no topic id");
return;
if (topicId == null) {
//theLog.printDebugInfo("-- delete topics failed -- no topic id");
return;
@@
-267,10
+267,10
@@
public class DatabaseContentToTopics extends Database {
* Returns list of Content for a specific topic
* @param topic
* @return EntityList
* Returns list of Content for a specific topic
* @param topic
* @return EntityList
- * @throws
StorageObject
Failure
+ * @throws
Database
Failure
*/
public EntityList getContent(EntityTopics topic)
*/
public EntityList getContent(EntityTopics topic)
- throws
StorageObject
Failure {
+ throws
Database
Failure {
EntityList returnList=null;
if (topic != null) {
String id = topic.getId();
EntityList returnList=null;
if (topic != null) {
String id = topic.getId();